diff --git a/packages/@ant/claude-for-chrome-mcp/src/bridgeClient.ts b/packages/@ant/claude-for-chrome-mcp/src/bridgeClient.ts
index 3669f8fdd..3c5e01a3d 100644
--- a/packages/@ant/claude-for-chrome-mcp/src/bridgeClient.ts
+++ b/packages/@ant/claude-for-chrome-mcp/src/bridgeClient.ts
@@ -71,6 +71,8 @@ export class BridgeClient implements SocketClient {
   private peerConnectedWaiters: Array<(arrived: boolean) => void> = []
   /** The request_id of the current pending pairing broadcast. */
   private pendingPairingRequestId: string | undefined
+  /** Whether a pairing broadcast is in progress (multiple extensions, no persisted selection). */
+  private pairingInProgress = false
   /** The deviceId from a previous persisted pairing. */
   private persistedDeviceId: string | undefined
   /** Resolve callback for a blocking switchBrowser() call. */
diff --git a/packages/@ant/ink/src/core/ink.tsx b/packages/@ant/ink/src/core/ink.tsx
index c8ccad037..99a5edb9b 100644
--- a/packages/@ant/ink/src/core/ink.tsx
+++ b/packages/@ant/ink/src/core/ink.tsx
@@ -329,7 +329,6 @@ export default class Ink {
       }
     };
 
-    // @ts-expect-error createContainer arg count varies across react-reconciler versions
     this.container = reconciler.createContainer(
       this.rootNode,
       ConcurrentRoot,
@@ -881,7 +880,6 @@ export default class Ink {
 
   pause(): void {
     // Flush pending React updates and render before pausing.
-    // @ts-expect-error flushSyncFromReconciler exists in react-reconciler but not in @types
     reconciler.flushSyncFromReconciler();
     this.onRender();
 
@@ -1580,9 +1578,7 @@ export default class Ink {
       </App>
     );
 
-    // @ts-expect-error updateContainerSync exists in react-reconciler but not in @types
     reconciler.updateContainerSync(tree, this.container, null, noop);
-    // @ts-expect-error flushSyncWork exists in react-reconciler but not in @types
     reconciler.flushSyncWork();
   }
 
@@ -1651,9 +1647,7 @@ export default class Ink {
       this.drainTimer = null;
     }
 
-    // @ts-expect-error updateContainerSync exists in react-reconciler but not in @types
     reconciler.updateContainerSync(null, this.container, null, noop);
-    // @ts-expect-error flushSyncWork exists in react-reconciler but not in @types
     reconciler.flushSyncWork();
     instances.delete(this.options.stdout);
 
diff --git a/packages/remote-control-server/web/src/acp/client.ts b/packages/remote-control-server/web/src/acp/client.ts
index 80ec3cd13..9893fd34b 100644
--- a/packages/remote-control-server/web/src/acp/client.ts
+++ b/packages/remote-control-server/web/src/acp/client.ts
@@ -118,6 +118,7 @@ export class ACPClient {
     reject: (err: Error) => void
     timer: ReturnType<typeof setTimeout>
   } | null = null
+  private pendingSessionTarget: string | null = null
 
   private connectResolve: ((value: undefined) => void) | null = null
   private connectReject: ((error: Error) => void) | null = null