Revert "Revert "[wrangler] fix: prevent remote binding sessions expiring during long dev sessions""

[penalosa]

Reverts #13464

---

[changeset-bot]

🦋 Changeset detected

Latest commit: e750b57

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[workers-devprod]

Codeowners approval required for this PR:

• ✅ @cloudflare/wrangler

Show detailed file reviewers

[ask-bonk]

I've now thoroughly reviewed all the changes in this PR. The code is well-structured, the proactive refresh logic is correct, the timer cleanup is properly handled in all lifecycle events (bundleStart, teardown), the error handling changes are sound, and the lazy auth resolution is a good improvement. The tests are comprehensive and cover the key scenarios (proactive refresh, timer cancellation on bundle start, timer cancellation on teardown).

LGTM

github run

[github-actions]

✅ All changesets look good

[pkg-pr-new]

create-cloudflare

npm i https://pkg.pr.new/create-cloudflare@13470

@cloudflare/kv-asset-handler

npm i https://pkg.pr.new/@cloudflare/kv-asset-handler@13470

miniflare

npm i https://pkg.pr.new/miniflare@13470

@cloudflare/pages-shared

npm i https://pkg.pr.new/@cloudflare/pages-shared@13470

@cloudflare/unenv-preset

npm i https://pkg.pr.new/@cloudflare/unenv-preset@13470

@cloudflare/vite-plugin

npm i https://pkg.pr.new/@cloudflare/vite-plugin@13470

@cloudflare/vitest-pool-workers

npm i https://pkg.pr.new/@cloudflare/vitest-pool-workers@13470

@cloudflare/workers-editor-shared

npm i https://pkg.pr.new/@cloudflare/workers-editor-shared@13470

wrangler

npm i https://pkg.pr.new/wrangler@13470

commit: e750b57

[penalosa]

/bonk can you fix the E2E test that is failing on this pr?

[devin-ai-integration]

Devin Review found 1 potential issue.

View 6 additional findings in Devin Review.

[ask-bonk]

E2E Test Fix

The failing E2E test e2e/start-worker-auth-opts.test.ts expected the user's auth callback (validAuth) to be called exactly once, but it was being called twice.

Root Cause

The PR changed LocalRuntimeController to pass data.config.dev.auth (the auth hook function) lazily to maybeStartOrUpdateRemoteProxySession, instead of eagerly resolving it with await unwrapHook(data.config.dev.auth).

This caused the user's auth callback to be invoked twice during initial startup of the remote proxy session:

1. First call: In the nested startWorker (created by startRemoteProxySession with dev.remote: "minimal"), resolveDevConfig eagerly calls auth() at line 121 for zone validation when input.dev?.remote is truthy. This unwinds through the wrapper chain to call the user's validAuth.

2. Second call: RemoteRuntimeController.#onBundleComplete calls unwrapHook(config.dev.auth), which again unwinds through the wrapper chain to call validAuth.

Previously, when the resolved CfAccount object was passed (not the function), unwrapHook on a plain object simply returned it without calling the user's auth function again.

Fix

Reverted the LocalRuntimeController change to eagerly resolve auth before passing it to maybeStartOrUpdateRemoteProxySession. This restores the original behavior where the resolved CfAccount object flows through the nested startWorker chain without triggering additional auth calls. All other improvements from the PR (proactive refresh timer, timer cleanup, error handling) are preserved.

Other Failing Tests

• Tests (Linux, fixtures) - worker-basic ECONNREFUSED: flaky infrastructure test, unrelated to this PR
• Check - PR description validation: missing tests/docs justification, unrelated to code

[ask-bonk]

The fix has been committed and pushed. Here's a summary:

Problem: The E2E test e2e/start-worker-auth-opts.test.ts was failing with "expected vi.fn() to be called once, but got 2 times" because the user's auth callback was being invoked twice during initial startup.

Root cause: The PR changed LocalRuntimeController to pass the auth hook function lazily (instead of the eagerly-resolved CfAccount object) to maybeStartOrUpdateRemoteProxySession. When this hook function reached the nested startWorker created by startRemoteProxySession, it was unwrapped twice: once during resolveDevConfig zone validation and once in RemoteRuntimeController.#onBundleComplete.

Fix: Restored eager auth resolution in LocalRuntimeController.#onBundleComplete (packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts), so the resolved CfAccount object is passed through the chain without triggering additional auth calls. All other PR improvements (proactive refresh timer, timer cleanup, error handling changes) are preserved.

github run

[penalosa]

/bonk that's absolutely not the right fix. eagerly resolving auth is a bug, not a solution. resolving auth twice is fine, since the second time it'll be cached and the lookup will be fast. update the e2e test assertion instead

[devin-ai-integration]

Devin Review found 1 new potential issue.

View 7 additional findings in Devin Review.

[ask-bonk]

UnknownError: ProviderInitError

github run

[ask-bonk]

@penalosa Bonk workflow failed. Check the logs for details.

View workflow run · To retry, trigger Bonk again.

[penalosa]

/bonk retry the previous task

[ask-bonk]

Done. Here's what I did:

1. Reverted the previous wrong fix (commit 587471f) that eagerly resolved auth in LocalRuntimeController - as @penalosa noted, eager resolution is a bug, not a solution.

2. Updated the E2E test assertions in packages/wrangler/e2e/start-worker-auth-opts.test.ts - changed 4 instances of toHaveBeenCalledOnce() to toHaveBeenCalled(). With lazy auth passing, the auth callback may be called twice during startup (once in resolveDevConfig for zone validation, once in RemoteRuntimeController#onBundleComplete), but the second call is cached and fast, so this is expected and correct behavior. The not.toHaveBeenCalled() assertion for the no-remote-bindings test was left unchanged.

github run

[workers-devprod]

Codeowners reviews satisfied