@browserbridge/bbx 1.11.5 → 1.12.1

package/PRIVACY.md

@@ -82,6 +82,7 @@ You should review the privacy and retention practices of any connected agent, ID
 Browser Bridge keeps data only as long as needed for the current local session and feature behavior.
 
 - Window enablement state is stored in session storage and cleared when disabled or when the browser session ends.
+- To warn about access enabled elsewhere, the daemon shares enabled-window IDs, bounded titles, enablement timestamps, browser names, and session profile labels with connected local Browser Bridge extensions. The side panel uses this in-memory metadata for its other-enabled-windows counter. It does not include page contents or disabled-window details, and disconnecting an extension removes its entry.
 - Action log entries are stored for the current browser session only.
 - Incidental action/log URLs remove credentials and fragments and redact query values; sensitive structured fields and local path prefixes are reduced before persistence.
 - Console and fetch/XHR network buffers are bounded in memory and cleared when disabled or when the page state is reset.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserbridge/bbx",
-  "version": "1.11.5",
+  "version": "1.12.1",
   "private": false,
   "keywords": [
     "agent-tools",
@@ -56,6 +56,8 @@
     "format": "oxfmt .",
     "format:check": "oxfmt --check .",
     "fixture:browser": "node tests/fixtures/browser-reliability/server.mjs",
+    "fixture:interaction": "node tests/fixtures/agent-interaction/server.mjs",
+    "bench:interaction": "node tests/fixtures/agent-interaction/bench.mjs",
     "test:runtime": "node --import tsx --test packages/*/test/*.test.ts packages/integration-tests/*.test.ts tests/fixtures/*/*.test.ts",
     "test": "c8 node --import tsx --test packages/*/test/*.test.ts packages/integration-tests/*.test.ts tests/fixtures/*/*.test.ts",
     "coverage": "c8 report --reporter=text --reporter=text-summary",

package/packages/agent-client/src/client.js

@@ -139,6 +139,18 @@ async function writeSocketLine(socket, line, signal) {
   }
 }
 
+/**
+ * Agent session that keeps tab routing sticky across separate CLI processes.
+ * Set `BBX_SESSION` to give one agent its own working tab; unset callers share
+ * the extension's default session.
+ *
+ * @returns {string | null}
+ */
+export function getDefaultAgentSession() {
+  const value = process.env.BBX_SESSION?.trim();
+  return value ? value : null;
+}
+
 export class BridgeClient extends EventEmitter {
   /**
    * @param {BridgeClientOptions} [options={}]
@@ -156,6 +168,7 @@ export class BridgeClient extends EventEmitter {
     exitProcessOnNpmUpdate = false,
     updateCompatibleNpmPackageFn = updateCompatibleNpmPackage,
     authToken = undefined,
+    agentSession = getDefaultAgentSession(),
   } = {}) {
     super();
     this.transport = socketPath ? createSocketBridgeTransport(socketPath) : transport;
@@ -171,6 +184,7 @@ export class BridgeClient extends EventEmitter {
     this.exitProcessOnNpmUpdate = exitProcessOnNpmUpdate;
     this.updateCompatibleNpmPackageFn = updateCompatibleNpmPackageFn;
     this.authToken = authToken;
+    this.agentSession = agentSession;
     this.socket = null;
     this.connected = false;
     this.protocolCompatibility = null;
@@ -488,7 +502,10 @@ export class BridgeClient extends EventEmitter {
       method,
       params,
       tabId,
-      meta,
+      meta:
+        this.agentSession && meta.agent_session === undefined
+          ? { ...meta, agent_session: this.agentSession }
+          : meta,
     });
 
     if (method === 'page.extract_content') {

package/packages/agent-client/src/types.ts

@@ -124,6 +124,8 @@ export interface BridgeClientOptions {
     supportedVersions: readonly string[];
   }) => Promise<NpmUpdateResult>;
   authToken?: string | null;
+  /** Stable agent session id used for sticky working-tab routing. */
+  agentSession?: string | null;
 }
 
 export interface ShortcutCommand {

package/packages/mcp-server/src/handlers-capture.js

@@ -326,10 +326,17 @@ export const INPUT_ACTION_METHODS = {
  *
  * @param {unknown} elementRef
  * @param {unknown} selector
+ * @param {unknown} [locator]
  * @returns {import('../../protocol/src/types.js').InputTarget | null}
  */
-function createInputTarget(elementRef, selector) {
+function createInputTarget(elementRef, selector, locator) {
   if (typeof elementRef === 'string' && elementRef) return { elementRef };
+  if (locator && typeof locator === 'object' && Object.keys(locator).length) {
+    return {
+      ...(typeof selector === 'string' && selector ? { selector } : {}),
+      .../** @type {Record<string, unknown>} */ (locator),
+    };
+  }
   if (typeof selector === 'string' && selector) return { selector };
   return null;
 }
@@ -337,18 +344,20 @@ function createInputTarget(elementRef, selector) {
 /**
  * Avoid changing legacy handler payloads when new options are omitted.
  *
- * @param {{ executionMode?: 'dom' | 'cdp', recoverStale?: boolean }} args
- * @returns {{ executionMode?: 'dom' | 'cdp', recoverStale?: boolean }}
+ * @param {{ executionMode?: 'dom' | 'cdp', recoverStale?: boolean, timeoutMs?: number, observe?: boolean | { settleMs?: number } }} args
+ * @returns {{ executionMode?: 'dom' | 'cdp', recoverStale?: boolean, timeoutMs?: number, observe?: boolean | { settleMs?: number } }}
  */
 function createInputOptions(args) {
   return {
     ...(args.executionMode ? { executionMode: args.executionMode } : {}),
     ...(typeof args.recoverStale === 'boolean' ? { recoverStale: args.recoverStale } : {}),
+    ...(typeof args.timeoutMs === 'number' ? { timeoutMs: args.timeoutMs } : {}),
+    ...(args.observe !== undefined ? { observe: args.observe } : {}),
   };
 }
 
 /**
- * @param {{ action: string, elementRef?: string, selector?: string, button?: string, clickCount?: number, holdMs?: number, text?: string, value?: string, mode?: 'auto' | 'setter' | 'keystrokes', executionMode?: 'dom' | 'cdp', recoverStale?: boolean, clear?: boolean, submit?: boolean, key?: string, code?: string, modifiers?: string[], checked?: boolean, values?: string[], labels?: string[], indexes?: number[], duration?: number, sourceElementRef?: string, sourceSelector?: string, destinationElementRef?: string, destinationSelector?: string, offsetX?: number, offsetY?: number, tabId?: number, destinationId?: string, budgetPreset?: 'quick' | 'normal' | 'deep' }} args
+ * @param {{ action: string, elementRef?: string, selector?: string, button?: string, clickCount?: number, holdMs?: number, text?: string, value?: string, mode?: 'auto' | 'setter' | 'keystrokes', executionMode?: 'dom' | 'cdp', recoverStale?: boolean, clear?: boolean, submit?: boolean, key?: string, code?: string, modifiers?: string[], checked?: boolean, values?: string[], labels?: string[], indexes?: number[], duration?: number, sourceElementRef?: string, sourceSelector?: string, destinationElementRef?: string, destinationSelector?: string, offsetX?: number, offsetY?: number, tabId?: number, destinationId?: string, budgetPreset?: 'quick' | 'normal' | 'deep', locator?: Record<string, unknown>, timeoutMs?: number, observe?: boolean | { settleMs?: number } }} args
  * @returns {Promise<ToolResult>}
  */
 export async function handleInputTool(args) {
@@ -374,9 +383,9 @@ export async function handleInputTool(args) {
     async (client) => {
       const requestedTabId = typeof args.tabId === 'number' ? args.tabId : null;
       const elementTarget = () => {
-        const target = createInputTarget(args.elementRef, args.selector);
+        const target = createInputTarget(args.elementRef, args.selector, args.locator);
         if (!target) {
-          throw new BridgeError('INVALID_REQUEST', 'Provide either elementRef or selector.');
+          throw new BridgeError('INVALID_REQUEST', 'Provide elementRef, selector, or locator.');
         }
         return target;
       };
@@ -457,7 +466,8 @@ export async function handleInputTool(args) {
           return summarizeToolResponse(response, 'input.fill');
         }
         case 'press_key': {
-          const target = args.elementRef || args.selector ? elementTarget() : undefined;
+          const target =
+            args.elementRef || args.selector || args.locator ? elementTarget() : undefined;
           const response = await requestBridgeWithRetry(
             client,
             'input.press_key',

package/packages/mcp-server/src/handlers-dom.js

@@ -87,6 +87,7 @@ export const DOM_ACTIONS = {
       exact: a.exact,
       selector: a.selector,
       maxResults: a.maxResults,
+      ...(a.includeHidden !== undefined ? { includeHidden: a.includeHidden } : {}),
     }),
   },
   find_role: {
@@ -95,8 +96,10 @@ export const DOM_ACTIONS = {
     params: (a) => ({
       role: a.role,
       name: a.name,
+      ...(a.exact !== undefined ? { exact: a.exact } : {}),
       selector: a.selector,
       maxResults: a.maxResults,
+      ...(a.includeHidden !== undefined ? { includeHidden: a.includeHidden } : {}),
     }),
   },
   html: {
@@ -117,12 +120,14 @@ export const DOM_ACTIONS = {
       maxDepth: a.maxDepth,
       compact: a.compact,
       interactiveOnly: a.interactiveOnly,
+      ...(a.source !== undefined ? { source: a.source } : {}),
+      ...(a.format !== undefined ? { format: a.format } : {}),
     }),
   },
 };
 
 /**
- * @param {{ action: string, baselineId?: string, maxChanges?: number, selector?: string, elementRef?: string, withinRef?: string, maxNodes?: number, maxDepth?: number, compact?: boolean, interactiveOnly?: boolean, textBudget?: number, includeBbox?: boolean, attributeAllowlist?: string[], attributes?: string[], text?: string, exact?: boolean, maxResults?: number, role?: string, name?: string, state?: string, timeoutMs?: number, outer?: boolean, maxLength?: number, tabId?: number, destinationId?: string, budgetPreset?: 'quick' | 'normal' | 'deep' }} args
+ * @param {{ action: string, baselineId?: string, maxChanges?: number, selector?: string, elementRef?: string, withinRef?: string, maxNodes?: number, maxDepth?: number, compact?: boolean, interactiveOnly?: boolean, source?: 'cdp' | 'dom', format?: 'tree' | 'outline', includeHidden?: boolean, textBudget?: number, includeBbox?: boolean, attributeAllowlist?: string[], attributes?: string[], text?: string, exact?: boolean, maxResults?: number, role?: string, name?: string, state?: string, timeoutMs?: number, outer?: boolean, maxLength?: number, tabId?: number, destinationId?: string, budgetPreset?: 'quick' | 'normal' | 'deep' }} args
  * @returns {Promise<ToolResult>}
  */
 export async function handleDomTool(args) {

package/packages/mcp-server/src/handlers-utils.js

@@ -47,6 +47,8 @@ import { annotateBridgeSummary, summarizeBridgeResponse } from '../../agent-clie
 
 export const REQUEST_SOURCE = 'mcp';
 const MCP_CLIENT_ID = `mcp_${randomUUID()}`;
+// One MCP server process serves one agent conversation, so it owns one working tab.
+const MCP_AGENT_SESSION = process.env.BBX_SESSION?.trim() || MCP_CLIENT_ID;
 /** @type {AsyncLocalStorage<{ era: import('../../protocol/src/types.js').McpProtocolEra, signal?: AbortSignal }>} */
 const MCP_REQUEST_ERA = new AsyncLocalStorage();
 
@@ -346,6 +348,7 @@ export async function withMcpRequestClient(callback, options = {}) {
   const client = await createBridgeClientForDestination(options.destinationId, {
     checkProtocolOnConnect: false,
     clientId: MCP_CLIENT_ID,
+    agentSession: MCP_AGENT_SESSION,
   });
   let completed = false;
   try {

package/packages/mcp-server/src/server.js

@@ -284,7 +284,7 @@ export function createBridgeMcpServer(options = {}) {
     {
       title: 'Browser DOM',
       description:
-        'Query, describe, read, search, or wait for DOM elements. Reuse elementRef from prior results. For full-page text, use browser_page action "text". accessibility_tree is debugger-backed and depth-limited - use query/find first.',
+        'Query, describe, read, search, or wait for DOM elements. Reuse elementRef from prior results. For a page overview to act on, use accessibility_tree with source "dom": a compact outline (`- role "name" [ref]`) whose refs work directly as input targets, with no debugger. find_text/find_role search shadow DOM, use real accessible names (labels, aria-*), and skip hidden matches. For full-page text, use browser_page action "text".',
       inputSchema: z.object({
         action: z
           .enum([
@@ -350,6 +350,16 @@ export function createBridgeMcpServer(options = {}) {
           .describe(
             'Return semantically interactive AX nodes; actionable state is reported separately'
           ),
+        source: z
+          .enum(['dom', 'cdp'])
+          .optional()
+          .describe(
+            'accessibility_tree source: dom = actionable outline with refs, no debugger (recommended); cdp = Chrome AX tree (default)'
+          ),
+        format: z
+          .enum(['outline', 'tree'])
+          .optional()
+          .describe('accessibility_tree format (outline is default for source dom)'),
         textBudget: z
           .number()
           .int()
@@ -381,6 +391,10 @@ export function createBridgeMcpServer(options = {}) {
           .describe('Maximum search results (default: 10)'),
         role: z.string().optional().describe('ARIA role to search for (for find_role action)'),
         name: z.string().optional().describe('Accessible name to match with role'),
+        includeHidden: z
+          .boolean()
+          .optional()
+          .describe('Include hidden matches in find_text/find_role (default: false; counted)'),
         state: z
           .enum(['attached', 'detached', 'visible', 'hidden'])
           .optional()
@@ -658,7 +672,7 @@ export function createBridgeMcpServer(options = {}) {
     {
       title: 'Browser Input',
       description:
-        'Dispatch browser input. Targeted click, focus, type, fill, press_key, set_checked, select_option, hover, and drag actions perform actionability checks and report resolution/execution metadata. cdp_press_key and scroll_into_view use separate contracts. Reuse elementRef values and verify application state after mutations.',
+        'Dispatch browser input. Target by elementRef, selector, or a semantic locator ({role,name} / text / label / placeholder / testId) in one call. Targeted actions auto-wait for the element to become actionable (timeoutMs) and click/press_key/set_checked/select_option/submits return observed effects (URL change, dialogs, alerts, focus, DOM churn, target state), so a follow-up read is usually unnecessary. cdp_press_key and scroll_into_view use separate contracts.',
       inputSchema: z.object({
         action: z
           .enum([
@@ -769,6 +783,39 @@ export function createBridgeMcpServer(options = {}) {
           .describe('Drag destination selector (alternative to destinationElementRef)'),
         offsetX: z.number().optional().describe('Drag drop offset X (default: 0)'),
         offsetY: z.number().optional().describe('Drag drop offset Y (default: 0)'),
+        locator: z
+          .object({
+            role: z.string().max(500).optional().describe('ARIA role, e.g. button, textbox, link'),
+            name: z.string().max(500).optional().describe('Accessible name (labels, aria-*, text)'),
+            text: z.string().max(500).optional().describe('Visible text of the element'),
+            label: z.string().max(500).optional().describe('Form control label text'),
+            placeholder: z.string().max(500).optional(),
+            testId: z.string().max(500).optional().describe('data-testid / data-test / data-qa'),
+            exact: z.boolean().optional().describe('Exact instead of substring match'),
+            nth: z.number().int().min(0).max(49).optional().describe('Pick the nth visible match'),
+          })
+          .optional()
+          .describe(
+            'Find the target semantically in the same call (instead of elementRef/selector); selector narrows candidates'
+          ),
+        timeoutMs: z
+          .number()
+          .int()
+          .min(0)
+          .max(15000)
+          .optional()
+          .describe(
+            'Wait for the target to appear and become actionable (default: 2500; 0 = no wait)'
+          ),
+        observe: z
+          .union([
+            z.boolean(),
+            z.object({ settleMs: z.number().int().min(0).max(5000).optional() }),
+          ])
+          .optional()
+          .describe(
+            'Report effects (URL, dialogs, alerts, focus, DOM churn, target state) after the action; default on for click, press_key, set_checked, select_option, and submits'
+          ),
       }),
     },
     handleInputTool

package/packages/native-host/src/daemon.js

@@ -32,6 +32,7 @@ import {
   parseJsonLines,
   RecoveryTelemetryCollector,
   normalizeRecoveryTelemetrySummary,
+  sanitizeIncidentalText,
   sanitizeIncidentalValue,
   setProtocolPackageVersion,
   validateBridgeRequest,
@@ -54,6 +55,7 @@ import {
 import { normalizeDaemonLogger } from './daemon-logger.js';
 import { DomBaselineOwnerRegistry, isValidBaselineId } from './dom-baseline-owners.js';
 import { writeJsonLine } from './framing.js';
+import { WindowActionRouter } from './window-actions.js';
 
 const DAEMON_VERSION = loadDaemonVersion();
 setProtocolPackageVersion(DAEMON_VERSION);
@@ -65,7 +67,7 @@ setProtocolPackageVersion(DAEMON_VERSION);
 /** @typedef {import('./config.js').BridgeTransport} BridgeTransport */
 /** @typedef {import('./daemon-logger.js').DaemonLoggerLike} DaemonLoggerLike */
 /** @typedef {'agent' | 'extension'} SocketRole */
-/** @typedef {import('node:net').Socket & { readonly __role?: SocketRole, __localControl?: boolean, __registrationTimeoutId?: NodeJS.Timeout, __invalidLineCount?: number, __clientId?: string, __extensionId?: string, __browserName?: string, __profileLabel?: string, __browserExtensionId?: string, __accessEnabled?: boolean, __lastActiveAt?: number }} ClientSocket */
+/** @typedef {import('node:net').Socket & { readonly __role?: SocketRole, __localControl?: boolean, __registrationTimeoutId?: NodeJS.Timeout, __invalidLineCount?: number, __clientId?: string, __extensionId?: string, __browserName?: string, __profileLabel?: string, __browserExtensionId?: string, __accessEnabled?: boolean, __windowAccessUpdates?: boolean, __windowActions?: boolean, __enabledWindow?: import('../../protocol/src/window-access.js').EnabledWindowInfo | null, __lastActiveAt?: number }} ClientSocket */
 /** @typedef {{ socket: ClientSocket, timeoutId: NodeJS.Timeout, source?: string, mcpEra?: string, method?: string, protocolVersion?: string, baselineId?: string | null, automaticMcpRetry?: boolean, targets: Set<ClientSocket>, lastErrorResponse?: import('../../protocol/src/types.js').BridgeResponse }} PendingEntry */
 /**
  * @typedef {{
@@ -410,12 +412,20 @@ export function isWindowsNamedPipePath(socketPath) {
  *   entry?: Record<string, unknown>,
  *   request?: BridgeRequest,
  *   status?: SetupStatus,
- *   error?: { message?: string },
+ *   error?: { message?: string } | string,
  *   response?: import('../../protocol/src/types.js').BridgeResponse,
  *   browserName?: string,
  *   profileLabel?: string,
  *   browserExtensionId?: string,
  *   accessEnabled?: boolean,
+ *   enabledWindow?: unknown,
+ *   windowAccessUpdates?: boolean,
+ *   windowActions?: boolean,
+ *   action?: unknown,
+ *   windowId?: unknown,
+ *   enabledAt?: unknown,
+ *   extensionId?: unknown,
+ *   ok?: unknown,
  *   authToken?: string,
  *   at?: number
  *   artifactId?: string,
@@ -466,6 +476,7 @@ export class BridgeDaemon {
     this.serverAddress = null;
     /** @type {Map<string, ClientSocket>} */
     this.extensionSockets = new Map();
+    this.windowActions = new WindowActionRouter(this.extensionSockets);
     /** @type {Map<string, ClientSocket>} */
     this.agentSockets = new Map();
     /** @type {Set<ClientSocket>} */
@@ -788,7 +799,9 @@ export class BridgeDaemon {
           if (typedSocket.destroyed) return;
           const message = /** @type {DaemonMessage} */ (raw);
           const admitted =
-            message?.type === 'agent.request' || message?.type === 'extension.setup_status.request';
+            message?.type === 'agent.request' ||
+            message?.type === 'extension.setup_status.request' ||
+            message?.type === 'extension.window_action.request';
           const active = this.activeHandlers.get(typedSocket) ?? 0;
           if (
             admitted &&
@@ -882,6 +895,7 @@ export class BridgeDaemon {
    * @returns {Promise<void>}
    */
   async stopInternal() {
+    this.windowActions.clear();
     for (const pending of this.pendingRequests.values()) {
       clearTimeout(pending.timeoutId);
     }
@@ -978,6 +992,17 @@ export class BridgeDaemon {
       return this.handleExtensionAccessUpdate(socket, message);
     }
 
+    if (
+      message?.type === 'extension.window_action.request' ||
+      message?.type === 'extension.window_action.result'
+    ) {
+      if (socket.__role !== 'extension') return this.rejectMessageForRole(socket, message);
+      if (message.type === 'extension.window_action.request')
+        return this.windowActions.request(socket, message);
+      this.windowActions.result(socket, message);
+      return;
+    }
+
     if (message?.type === 'extension.activity') {
       if (socket.__role !== 'extension') {
         return this.rejectMessageForRole(socket, message);
@@ -1380,6 +1405,7 @@ export class BridgeDaemon {
       if (target.__extensionId && this.extensionSockets.get(target.__extensionId) === target) {
         this.extensionSockets.delete(target.__extensionId);
         this.invalidateConnectedExtensionsCache();
+        this.broadcastWindowAccess();
       }
       target.destroy(error instanceof Error ? error : undefined);
       await this.finishPendingRequestIfExhausted(request.id, pending);
@@ -1495,6 +1521,10 @@ export class BridgeDaemon {
    */
   handleExtensionIdentity(socket, message) {
     let changed = false;
+    if (message.windowAccessUpdates === true) {
+      socket.__windowAccessUpdates = true;
+    }
+    if (message.windowActions === true) socket.__windowActions = true;
     const browserName = normalizeRoutingLabel(message.browserName);
     if (browserName) {
       changed = changed || socket.__browserName !== browserName;
@@ -1513,6 +1543,7 @@ export class BridgeDaemon {
     if (changed) {
       this.invalidateConnectedExtensionsCache();
     }
+    this.broadcastWindowAccess();
   }
 
   /**
@@ -1522,6 +1553,24 @@ export class BridgeDaemon {
    */
   handleExtensionAccessUpdate(socket, message) {
     const accessEnabled = Boolean(message.accessEnabled);
+    const value = message.enabledWindow;
+    const window =
+      value && typeof value === 'object' ? /** @type {Record<string, unknown>} */ (value) : null;
+    socket.__enabledWindow =
+      accessEnabled &&
+      window &&
+      typeof window.windowId === 'number' &&
+      Number.isInteger(window.windowId) &&
+      window.windowId > 0 &&
+      typeof window.title === 'string' &&
+      typeof window.enabledAt === 'number' &&
+      Number.isFinite(window.enabledAt)
+        ? {
+            windowId: window.windowId,
+            title: sanitizeIncidentalText(window.title).slice(0, 200),
+            enabledAt: window.enabledAt,
+          }
+        : null;
     if (!accessEnabled && socket.__extensionId) {
       this.artifactStore.deleteByExtension(socket.__extensionId);
       this.domBaselines.clearForSocket(socket);
@@ -1529,9 +1578,32 @@ export class BridgeDaemon {
     if (socket.__accessEnabled !== accessEnabled) {
       socket.__accessEnabled = accessEnabled;
       this.invalidateConnectedExtensionsCache();
-      return;
     }
     socket.__accessEnabled = accessEnabled;
+    this.broadcastWindowAccess();
+  }
+
+  /** Broadcast access metadata only to locally authenticated extension connections.
+   * @returns {void}
+   */
+  broadcastWindowAccess() {
+    /** @type {import('../../protocol/src/window-access.js').BrowserWindowAccess[]} */
+    const enabledWindows = [...this.extensionSockets.entries()]
+      .filter(([, socket]) => socket.__accessEnabled === true && !socket.destroyed)
+      .map(([extensionId, socket]) => ({
+        extensionId,
+        browserName: socket.__browserName ?? null,
+        profileLabel: socket.__profileLabel ?? null,
+        window: socket.__enabledWindow ?? null,
+        ...(socket.__windowActions ? { canControl: true } : {}),
+      }));
+    for (const [extensionId, socket] of this.extensionSockets) {
+      if (socket.destroyed || !socket.__windowAccessUpdates) continue;
+      void writeJsonLine(socket, {
+        type: 'extension.window_access',
+        otherEnabledWindows: enabledWindows.filter((window) => window.extensionId !== extensionId),
+      }).catch(() => socket.destroy());
+    }
   }
 
   /**
@@ -1787,6 +1859,7 @@ export class BridgeDaemon {
    * @returns {void}
    */
   handleSocketClose(socket) {
+    this.windowActions.disconnect(socket);
     this.clientSockets.delete(socket);
     if (socket.__registrationTimeoutId) {
       clearTimeout(socket.__registrationTimeoutId);
@@ -1799,6 +1872,7 @@ export class BridgeDaemon {
       if (this.extensionSockets.get(socket.__extensionId) === socket) {
         this.extensionSockets.delete(socket.__extensionId);
         this.invalidateConnectedExtensionsCache();
+        this.broadcastWindowAccess();
       }
     }
 

package/packages/native-host/src/native-host.js

@@ -34,14 +34,17 @@ import { createNativeMessageReader, createNativeMessageWriter, writeJsonLine } f
  *   type?: string,
  *   browserName?: string,
  *   profileLabel?: string,
- *   browserExtensionId?: string
+ *   browserExtensionId?: string,
+ *   windowAccessUpdates?: boolean,
+ *   windowActions?: boolean
  * }} HostIdentityMessage
  */
 
 /**
  * @typedef {{
  *   type?: string,
- *   accessEnabled: boolean
+ *   accessEnabled: boolean,
+ *   enabledWindow?: unknown
  * }} HostAccessUpdateMessage
  */
 
@@ -187,6 +190,23 @@ export async function runNativeHost({
           });
           return;
         }
+        if (message.type === 'extension.window_access') {
+          await writeNativeMessageQueued({
+            type: 'host.window_access',
+            otherEnabledWindows: message.otherEnabledWindows,
+          });
+          return;
+        }
+        if (
+          message.type === 'extension.window_action.command' ||
+          message.type === 'extension.window_action.response'
+        ) {
+          await writeNativeMessageQueued({
+            ...message,
+            type: message.type.replace(/^extension\./u, 'host.'),
+          });
+          return;
+        }
         if (
           message.type === 'extension.setup_status.response' ||
           message.type === 'extension.setup_status.error'
@@ -244,6 +264,8 @@ export async function runNativeHost({
             browserName: message.browserName,
             profileLabel: message.profileLabel,
             browserExtensionId: message.browserExtensionId,
+            ...(message.windowAccessUpdates === true ? { windowAccessUpdates: true } : {}),
+            ...(message.windowActions === true ? { windowActions: true } : {}),
           });
           return;
         }
@@ -251,6 +273,9 @@ export async function runNativeHost({
           await writeJsonLine(socket, {
             type: 'extension.access_update',
             accessEnabled: message.accessEnabled,
+            ...(message.enabledWindow !== undefined
+              ? { enabledWindow: message.enabledWindow }
+              : {}),
           });
           return;
         }
@@ -261,6 +286,19 @@ export async function runNativeHost({
           });
           return;
         }
+        if (message && typeof message === 'object') {
+          const record = /** @type {Record<string, unknown>} */ (message);
+          if (
+            record.type === 'host.window_action.request' ||
+            record.type === 'host.window_action.result'
+          ) {
+            await writeJsonLine(socket, {
+              ...record,
+              type: record.type.replace(/^host\./u, 'extension.'),
+            });
+            return;
+          }
+        }
         if (isHostArtifactMessage(message)) {
           const record = /** @type {Record<string, unknown>} */ (message);
           await writeJsonLine(socket, {