@@ -122,32 +122,41 @@ test.describe('background executor', () => {
     )
     const readConsent = launched.app.waitForEvent('window')
     const localRead = sim.issue(deviceId, CHAT_B, 'read_local_file', { path: readable })
-    await answerShellDialog(await readConsent, 'Allow folder')
-
-    await window.goto(`${sim.origin}/workspace/ws-other/home`)
-    await window.reload()
-    await window.goto(`${sim.origin}/workspace/${WORKSPACE}/chat/${CHAT_C}`)
-
-    // Chat B's first command holds its queue until released, so a claim that waited for the
-    // calls ahead of it to run could never happen in time.
-    await check("A: every call is claimed while chat B's first command still runs", async () => {
-      await expect
-        .poll(
-          () =>
-            [...sim.calls.values()]
-              .filter((call) => call.claimedAt === undefined)
-              .map((call) => call.toolCallId),
-          { timeout: SIM_PICKUP_GRACE_MS }
-        )
-        .toEqual([])
-    })
+    try {
+      await answerShellDialog(await readConsent, 'Allow folder')
+
+      await window.goto(`${sim.origin}/workspace/ws-other/home`)
+      await window.reload()
+      await window.goto(`${sim.origin}/workspace/${WORKSPACE}/chat/${CHAT_C}`)
+
+      // Chat B's first command holds its queue until released, so a claim that waited for the
+      // calls ahead of it to run could never happen in time.
+      await check("A: every call is claimed while chat B's first command still runs", async () => {
+        await expect
+          .poll(
+            () =>
+              [...sim.calls.values()]
+                .filter((call) => call.claimedAt === undefined)
+                .map((call) => call.toolCallId),
+            { timeout: SIM_PICKUP_GRACE_MS }
+          )
+          .toEqual([])
+        for (const call of sim.calls.values()) {
+          expect(
+            (call.claimedAt ?? Number.POSITIVE_INFINITY) - call.issuedAt,
+            call.toolCallId
+          ).toBeLessThan(SIM_PICKUP_GRACE_MS)
+        }
+      })
 
-    await check('A: the lease is renewed while calls wait and run', async () => {
-      await expect
-        .poll(() => terminalRuns.filter((id) => sim.requireCall(id).renewals === 0))
-        .toEqual([])
-    })
-    writeFileSync(releaseCommands, '')
+      await check('A: the lease is renewed while calls wait and run', async () => {
+        await expect
+          .poll(() => terminalRuns.filter((id) => sim.requireCall(id).renewals === 0))
+          .toEqual([])
+      })
+    } finally {
+      writeFileSync(releaseCommands, '')
+    }
 
     await check('A: every call completes exactly once with its own token', async () => {
       for (const id of [...clicks, ...terminalRuns, localRead]) {
 
@@ -1093,6 +1093,17 @@ export function clearAgentContextMenu(contents: WebContents): void {
   agentContextClicks.delete(contents)
 }
 
+/**
+ * The final release of a click was sent to a live tab, and the tab was gone when that release
+ * was rejected. The press and release both reached the page; only the acknowledgement was lost.
+ */
+export class TabClosedOnReleaseError extends Error {
+  constructor() {
+    super('The tab closed as the click was released.')
+    this.name = 'TabClosedOnReleaseError'
+  }
+}
+
 /**
  * Clicks at viewport coordinates. An already-aborted `signal` rejects before any input is sent.
  * During a press-and-hold it ends the hold early: the click rejects with the abort reason and the
@@ -1140,15 +1151,21 @@ export async function clickAt(
         }
         signal?.throwIfAborted()
       }
-      await sendInput(contents, 'Input.dispatchMouseEvent', {
-        type: 'mouseReleased',
-        x,
-        y,
-        button,
-        buttons: 0,
-        modifiers,
-        clickCount: count,
-      })
+      const finalReleaseToLiveTab = count === clickCount && !contents.isDestroyed()
+      try {
+        await sendInput(contents, 'Input.dispatchMouseEvent', {
+          type: 'mouseReleased',
+          x,
+          y,
+          button,
+          buttons: 0,
+          modifiers,
+          clickCount: count,
+        })
+      } catch (error) {
+        if (finalReleaseToLiveTab && contents.isDestroyed()) throw new TabClosedOnReleaseError()
+        throw error
+      }
     }
     pressed = false
   } finally {
 
@@ -1803,32 +1803,30 @@ function navigationRescue(
 }
 
 /**
- * A page that closes itself from the click's own handler (a sign-in popup's Allow that calls
- * window.close()) can destroy its tab before Chromium acknowledges the release, and Electron then
- * rejects the pending input command with "target closed while handling command" although the press
- * landed. The same click otherwise reads as a failed dispatch whenever the close wins that race.
+ * The click's final release was sent to a live tab that was destroyed before Chromium
+ * acknowledged it (cdp.clickAt raises TabClosedOnReleaseError only then), so the press and
+ * release reached the page. Any other dispatch failure keeps its own error.
  */
 function closedTabRescue(
-  contents: WebContents,
   error: unknown,
   base: { trusted: boolean; activation: string }
 ): Record<string, unknown> | null {
-  if (!contents.isDestroyed() && !getErrorMessage(error).includes('target closed')) return null
+  if (!(error instanceof cdp.TabClosedOnReleaseError)) return null
   const activeTab = session.automationTab()
-  const nowActive = activeTab && activeTab.view.webContents !== contents ? activeTab : null
   return {
     dispatched: true,
     trusted: base.trusted,
     activation: base.activation,
     effectObserved: true,
     possibleEffectObserved: true,
     closedDuringDispatch: true,
+    doNotRetry: true,
     effect: { tabChanged: true },
     dialogs: [],
-    ...(nowActive
-      ? { activeTab: { tabId: nowActive.id, url: nowActive.view.webContents.getURL() } }
+    ...(activeTab
+      ? { activeTab: { tabId: activeTab.id, url: activeTab.view.webContents.getURL() } }
       : {}),
-    note: 'The tab closed while the click was being delivered, which is how a page that closes itself in response (a sign-in or permission popup) ends; that is why no postconditions are reported. Take a fresh browser_snapshot of the tab that is now active.',
+    note: 'The tab closed as the click was released, so no postconditions could be read. Do not repeat the click. If this page was not expected to close itself, verify the outcome with browser_snapshot before relying on it.',
   }
 }
 
@@ -3329,7 +3327,7 @@ async function executeToolInner(
           const nativePointer = { trusted: true, activation: 'native-pointer' }
           const rescued =
             navigationRescue(contents, epochAtDispatch, urlAtDispatch, nativePointer) ??
-            closedTabRescue(contents, error, nativePointer)
+            closedTabRescue(error, nativePointer)
           if (rescued) return rescued
           throw new ToolError(
             `Native click dispatch failed (${getErrorMessage(error)}). The action was not retried because a partial pointer press may already have reached the page. Take a fresh snapshot before continuing.`
@@ -3371,7 +3369,7 @@ async function executeToolInner(
             const nativePointer = { trusted: true, activation: 'native-pointer' }
             const rescued =
               navigationRescue(contents, epochAtDispatch, urlAtDispatch, nativePointer) ??
-              closedTabRescue(contents, error, nativePointer)
+              closedTabRescue(error, nativePointer)
             if (rescued) return rescued
             throw new ToolError(
               `Native framed click dispatch failed (${getErrorMessage(error)}). The action was not retried because a partial pointer press may already have reached the page. Take a fresh snapshot before continuing.`
@@ -4796,7 +4794,7 @@ async function executeToolInner(
         const nativePointer = { trusted: true, activation: 'native-pointer' }
         const rescued =
           navigationRescue(contents, clickNavigationEpoch, urlAtDispatch, nativePointer) ??
-          closedTabRescue(contents, error, nativePointer)
+          closedTabRescue(error, nativePointer)
         if (rescued) return rescued
         throw new ToolError(
           `Native click dispatch failed (${getErrorMessage(error)}). The action was not retried because a partial pointer press may already have reached the page. Take a fresh snapshot before continuing.`