@evan_zhong/browser-attach 0.21.0 → 0.22.1

package/extension/upload.js

@@ -0,0 +1,57 @@
+export function createUploads(cdp, value) {
+  const fileChoosers = new Map();
+  async function upload(tabId, node, args) {
+    const send = (target, method, params) => args.budget.run(() => cdp(target, method, params));
+    if (!Array.isArray(args.files) || args.files.length > 100 || args.files.some(file => typeof file !== 'string' || !file || file.includes('\0'))) {
+      throw new Error('files must contain at most 100 valid absolute file paths; [] clears selection');
+    }
+    const chooser = fileChoosers.get(tabId);
+    let target = node;
+    if (!target) {
+      if (!chooser) throw new Error('No pending file chooser. Supply a fresh file-input/label ref, or click the upload button first.');
+      const resolved = await send({ tabId, ...(chooser.sessionId ? { sessionId: chooser.sessionId } : {}) }, 'DOM.resolveNode', { backendNodeId: chooser.backendNodeId, objectGroup: 'browser-attach' });
+      if (!resolved.object?.objectId) throw new Error('File chooser input no longer exists. Observe again.');
+      target = { objectId: resolved.object.objectId, target: { tabId, ...(chooser.sessionId ? { sessionId: chooser.sessionId } : {}) } };
+    }
+    const resolved = await send(target.target, 'Runtime.callFunctionOn', {
+      objectId: target.objectId, arguments: [{ value: args.files.length }],
+      functionDeclaration: `function(count) {
+        const input = this.tagName === 'LABEL' ? this.control : this;
+        if (!input || input.tagName !== 'INPUT' || input.type !== 'file') throw new Error('Ref is not a file input or associated label');
+        if (!input.isConnected) throw new Error('File input is detached');
+        if (input.matches(':disabled')) throw new Error('File input is disabled');
+        if (input.webkitdirectory) throw new Error('Directory upload is unsupported; use a regular file input');
+        if (count > 1 && !input.multiple) throw new Error('Single-file input cannot accept multiple files');
+        return input;
+      }`, objectGroup: 'browser-attach',
+    });
+    if (resolved.exceptionDetails) value(resolved);
+    if (!resolved.result?.objectId) throw new Error('Could not resolve the file input');
+    args.budget.dispatch();
+    if (args.files.length === 0) {
+      // Chromium's native empty-path assignment does not emit input/change.
+      // Like Playwright's empty payload path, explicitly clear and notify the app.
+      value(await send(target.target, 'Runtime.callFunctionOn', { objectId: resolved.result.objectId, returnByValue: true,
+        functionDeclaration: `function() {
+          this.value = '';
+          const Event = this.ownerDocument.defaultView.Event;
+          this.dispatchEvent(new Event('input', { bubbles: true, composed: true }));
+          this.dispatchEvent(new Event('change', { bubbles: true }));
+          return true;
+        }` }));
+    } else {
+      // Native CDP assignment emits input/change and preserves actual file metadata.
+      await send(target.target, 'DOM.setFileInputFiles', { objectId: resolved.result.objectId, files: args.files });
+    }
+    fileChoosers.delete(tabId);
+    return { files_set: args.files.length, cleared: args.files.length === 0, events_trusted: args.files.length > 0, observe_again: true };
+  }
+  return { upload,
+    opened(tabId, params, sessionId) {
+      if (params.backendNodeId) fileChoosers.set(tabId, { sessionId, backendNodeId: params.backendNodeId, mode: params.mode, frame_id: params.frameId });
+    },
+    pending: tabId => fileChoosers.get(tabId),
+    forget: tabId => fileChoosers.delete(tabId),
+    forgetFrames(tabId, affected) { if (affected.has(fileChoosers.get(tabId)?.frame_id)) fileChoosers.delete(tabId); },
+  };
+}

package/extension/wait.js

@@ -1,117 +1,119 @@
-import { deadline, inspectTarget } from './actionability.js';
-import { queryElement, targetOptions, resolveSelector, resolveFrame } from './locator.js';
-
-export const WAIT_CONDITIONS = ['attached', 'absent', 'visible', 'actionable', 'text', 'value', 'checked', 'selected', 'expanded', 'url', 'network_idle'];
-
-export function waitOptions(args) {
-  if (!WAIT_CONDITIONS.includes(args.condition)) throw new Error('Unknown wait condition');
-  const element = !['url', 'network_idle'].includes(args.condition);
-  if (element) {
-    if (!args.selector || args.ref != null) throw new Error(`${args.condition} wait requires a reusable selector${args.condition === 'text' ? '; use selector="body" for whole-page rendered text' : ''}`);
-    targetOptions(args);
-  } else if (args.selector != null || args.ref != null || args.frame_id != null || args.frame != null || args.nth != null || args.selector_type != null || args.name != null) throw new Error('This wait condition does not use an element target');
-  if (args.condition === 'text' && (Number(typeof args.expected === 'string') + Number(typeof args.previous === 'string') !== 1)) throw new Error('text wait requires exactly one of expected (substring) or previous (full prior text)');
-  if (args.condition === 'url' && typeof args.expected !== 'string') throw new Error('url wait requires expected text (substring)');
-  if (args.condition === 'value' && typeof args.expected !== 'string') throw new Error('value wait requires an exact expected string');
-  if (['checked', 'selected', 'expanded'].includes(args.condition) && typeof args.expected !== 'boolean' && !(args.condition === 'checked' && args.expected === 'mixed')) throw new Error(`${args.condition} wait requires expected=true/false${args.condition === 'checked' ? ' or "mixed"' : ''}`);
-  if (!['text', 'url', 'value', 'checked', 'selected', 'expanded'].includes(args.condition) && args.expected != null) throw new Error('expected is not used by this wait condition');
-  if (args.condition !== 'text' && args.previous != null) throw new Error('previous is only valid for text waits');
-  if (args.condition === 'network_idle' && (!Number.isInteger(args.idle_ms ?? 500) || (args.idle_ms ?? 500) < 100 || (args.idle_ms ?? 500) > 10000)) throw new Error('idle_ms must be 100..10000');
-}
-
-export async function waitFor(cdp, value, sessions, diagnostics, mouse, tabId, args) {
-  waitOptions(args);
-  const budget = args.budget || deadline(args.timeout_ms ?? 5000, 'wait');
-  let current = 'not observed', previous;
-  const description = `${args.condition}${args.selector ? ` selector=${JSON.stringify(args.selector)}` : ''}${args.name != null ? ` name=${JSON.stringify(args.name)}` : ''}${args.expected != null && args.condition !== 'value' ? ` expected${['text', 'url'].includes(args.condition) ? ' substring' : ''}=${JSON.stringify(args.expected)}` : ''}${args.previous != null ? ` text different from=${JSON.stringify(args.previous).slice(0, 500)}` : ''}`;
-  try {
-    while (true) {
-      if (args.condition === 'network_idle') {
-        current = diagnostics.networkStatus(tabId);
-        if (!current.tracking_overflow && current.inflight === 0 && current.idle_ms >= (args.idle_ms ?? 500)) return { satisfied: true, condition: args.condition, current };
-      } else if (args.condition === 'url') {
-        current = value(await budget.run(() => cdp(tabId, 'Runtime.evaluate', { expression: 'location.href', returnByValue: true })));
-        if (current.includes(args.expected)) return { satisfied: true, condition: args.condition, current };
-      } else {
-        try {
-          const frameId = await resolveFrame(cdp, value, sessions, tabId, args, budget);
-          const target = sessions.target(tabId, frameId);
-          if (args.selector_type === 'role') {
-            const node = await resolveSelector(cdp, value, sessions, tabId, args, budget, { wait: false });
-            try {
-              current = node ? value(await budget.run(() => cdp(node.target, 'Runtime.callFunctionOn', { objectId: node.objectId, returnByValue: true,
-                functionDeclaration: `function(args) { return (${inspectWait.toString()})(() => this, (${inspectTarget.toString()}), args); }`, arguments: [{ value: { selector: args.selector, condition: args.condition, expected: args.expected, previous: args.previous } }] }))) : { satisfied: args.condition === 'absent', state: 'absent' };
-            } finally {
-              if (node) await budget.run(() => cdp(node.target, 'Runtime.releaseObjectGroup', { objectGroup: 'browser-attach' }));
-            }
-          } else {
-            const { executionContextId } = await budget.run(() => cdp(target, 'Page.createIsolatedWorld', { frameId, worldName: 'browser-attach-locator' }));
-            current = value(await budget.run(() => cdp(target, 'Runtime.evaluate', { contextId: executionContextId, returnByValue: true,
-              expression: `(${inspectWait.toString()})((${queryElement.toString()}),(${inspectTarget.toString()}),${JSON.stringify(args)})` })));
-          }
-          const stable = current?.ready && previous?.ready && JSON.stringify(current) === JSON.stringify(previous);
-          if (current?.satisfied && (args.condition !== 'actionable' || stable)) {
-            if (args.condition === 'actionable') {
-              try {
-                const node = await resolveSelector(cdp, value, sessions, tabId, args, budget);
-                try {
-                  await mouse.prepare(tabId, node, { budget, scroll: false });
-                  current = { ...current, state: 'actionable' };
-                } finally {
-                  await budget.run(() => cdp(node.target, 'Runtime.releaseObjectGroup', { objectGroup: 'browser-attach' }));
-                }
-              } catch (error) {
-                if (!/covers|no visible click point|detached before resolution/i.test(error.message)) throw error;
-                current = { satisfied: false, reason: error.message, ...(error.diagnostics ? { diagnostics: error.diagnostics } : {}) };
-              }
-            }
-            if (current.satisfied) return { satisfied: true, condition: args.condition, current };
-          }
-          previous = current;
-        } catch (error) {
-          if (!/context.*(destroyed|not found)|cannot find context|no frame with given id|inspected target navigated|detached before resolution|no node|could not find node|node.*(detached|not found)/i.test(error.message)) throw error;
-          current = 'document/frame changing'; previous = null;
-        }
-      }
-      await budget.run(() => new Promise(resolve => setTimeout(resolve, 50)));
-    }
-  } catch (error) {
-    throw Object.assign(new Error(`Wait for ${description} failed: ${error.message}; current=${JSON.stringify(current)}`), {
-      input_dispatched: false, diagnostics: error.diagnostics ?? { reason: 'wait_unsatisfied', condition: args.condition, current },
-    });
-  }
-}
-
-export function inspectWait(query, inspect, args) {
-  const element = query(args.selector, args.selector_type ?? 'css', args.nth, true);
-  if (!element) return { satisfied: args.condition === 'absent', state: 'absent' };
-  if (element.isConnected === false) return { satisfied: false, state: 'detached_during_observation' };
-  if (args.condition === 'attached') return { satisfied: true, state: 'attached' };
-  if (args.condition === 'absent') return { satisfied: false, state: 'attached' };
-  if (args.condition === 'text') {
-    const text = element.innerText ?? '';
-    return { satisfied: args.previous != null ? text !== args.previous : text.includes(args.expected), text: text.slice(0, 500) };
-  }
-  if (args.condition === 'value') {
-    const text = ['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName) ? element.value : element.isContentEditable ? element.innerText : undefined;
-    // Field values may contain credentials. Report the comparison, not its contents.
-    return { satisfied: typeof text === 'string' && text === args.expected, state: typeof text === 'string' ? 'value' : 'unavailable' };
-  }
-  if (['checked', 'selected', 'expanded'].includes(args.condition)) {
-    let state, source = 'property';
-    if (args.condition === 'checked' && element.tagName === 'INPUT' && ['checkbox', 'radio'].includes(element.type)) state = element.type === 'checkbox' && element.indeterminate ? 'mixed' : element.checked;
-    else if (args.condition === 'selected' && element.tagName === 'OPTION') state = element.selected;
-    else if (args.condition === 'expanded' && element.tagName === 'DETAILS') state = element.open;
-    else {
-      source = `aria-${args.condition}`;
-      const attribute = element.getAttribute(source);
-      state = attribute === 'true' ? true : attribute === 'false' ? false : args.condition === 'checked' && attribute === 'mixed' ? 'mixed' : undefined;
-    }
-    return { satisfied: state !== undefined && state === args.expected, state: state === undefined ? 'unavailable' : args.condition, value: state ?? null, source };
-  }
-  const bounds = inspect.call(element);
-  if (args.condition === 'visible') return { ...bounds,
-    // Visibility is independent of disabled/inert state.
-    satisfied: element.getBoundingClientRect().width > 0 && element.getBoundingClientRect().height > 0 && element.ownerDocument.defaultView.getComputedStyle(element).visibility === 'visible' };
-  return { ...bounds, satisfied: !!bounds.ready };
-}
+import { deadline, inspectTarget } from './actionability.js';
+import { queryElement, targetOptions, resolveSelector, resolveFrame } from './locator.js';
+import { checkedValue } from './errors.js';
+
+export const WAIT_CONDITIONS = ['attached', 'absent', 'visible', 'actionable', 'text', 'value', 'checked', 'selected', 'expanded', 'url', 'network_idle'];
+
+export function waitOptions(args) {
+  if (!WAIT_CONDITIONS.includes(args.condition)) throw new Error('Unknown wait condition');
+  const element = !['url', 'network_idle'].includes(args.condition);
+  if (element) {
+    if (!args.selector || args.ref != null) throw new Error(`${args.condition} wait requires a reusable selector${args.condition === 'text' ? '; use selector="body" for whole-page rendered text' : ''}`);
+    targetOptions(args);
+  } else if (args.selector != null || args.ref != null || args.frame_id != null || args.frame != null || args.nth != null || args.selector_type != null || args.name != null) throw new Error('This wait condition does not use an element target');
+  if (args.condition === 'text' && (Number(typeof args.expected === 'string') + Number(typeof args.previous === 'string') !== 1)) throw new Error('text wait requires exactly one of expected (substring) or previous (full prior text)');
+  if (args.condition === 'url' && typeof args.expected !== 'string') throw new Error('url wait requires expected text (substring)');
+  if (args.condition === 'value' && typeof args.expected !== 'string') throw new Error('value wait requires an exact expected string');
+  if (['checked', 'selected', 'expanded'].includes(args.condition) && typeof args.expected !== 'boolean' && !(args.condition === 'checked' && args.expected === 'mixed')) throw new Error(`${args.condition} wait requires expected=true/false${args.condition === 'checked' ? ' or "mixed"' : ''}`);
+  if (!['text', 'url', 'value', 'checked', 'selected', 'expanded'].includes(args.condition) && args.expected != null) throw new Error('expected is not used by this wait condition');
+  if (args.condition !== 'text' && args.previous != null) throw new Error('previous is only valid for text waits');
+  if (args.condition === 'network_idle' && (!Number.isInteger(args.idle_ms ?? 500) || (args.idle_ms ?? 500) < 100 || (args.idle_ms ?? 500) > 10000)) throw new Error('idle_ms must be 100..10000');
+}
+
+export async function waitFor(cdp, value, sessions, network, pointer, tabId, args) {
+  waitOptions(args);
+  const budget = args.budget || deadline(args.timeout_ms ?? 5000, 'wait');
+  let current = 'not observed', previous;
+  const description = `${args.condition}${args.selector ? ` selector=${JSON.stringify(args.selector)}` : ''}${args.name != null ? ` name=${JSON.stringify(args.name)}` : ''}${args.expected != null && args.condition !== 'value' ? ` expected${['text', 'url'].includes(args.condition) ? ' substring' : ''}=${JSON.stringify(args.expected)}` : ''}${args.previous != null ? ` text different from=${JSON.stringify(args.previous).slice(0, 500)}` : ''}`;
+  try {
+    while (true) {
+      if (args.condition === 'network_idle') {
+        current = network.networkStatus(tabId);
+        if (!current.tracking_overflow && current.inflight === 0 && current.idle_ms >= (args.idle_ms ?? 500)) return { satisfied: true, condition: args.condition, current };
+      } else if (args.condition === 'url') {
+        current = value(await budget.run(() => cdp(tabId, 'Runtime.evaluate', { expression: 'location.href', returnByValue: true })));
+        if (current.includes(args.expected)) return { satisfied: true, condition: args.condition, current };
+      } else {
+        try {
+          const frameId = await resolveFrame(cdp, value, sessions, tabId, args, budget);
+          const target = sessions.target(tabId, frameId);
+          if (args.selector_type === 'role') {
+            const node = await resolveSelector(cdp, value, sessions, tabId, args, budget, { wait: false });
+            try {
+              current = node ? value(await budget.run(() => cdp(node.target, 'Runtime.callFunctionOn', { objectId: node.objectId, returnByValue: true,
+                functionDeclaration: `function(args) { return (${inspectWait.toString()})(() => this, (${inspectTarget.toString()}), args); }`, arguments: [{ value: { selector: args.selector, condition: args.condition, expected: args.expected, previous: args.previous } }] }))) : { satisfied: args.condition === 'absent', state: 'absent' };
+            } finally {
+              if (node) await budget.run(() => cdp(node.target, 'Runtime.releaseObjectGroup', { objectGroup: 'browser-attach' }));
+            }
+          } else {
+            const { executionContextId } = await budget.run(() => cdp(target, 'Page.createIsolatedWorld', { frameId, worldName: 'browser-attach-locator' }));
+            const send = (method, params) => budget.run(() => cdp(target, method, params));
+            current = await checkedValue(await send('Runtime.evaluate', { contextId: executionContextId, returnByValue: true,
+              expression: `(${inspectWait.toString()})((${queryElement.toString()}),(${inspectTarget.toString()}),${JSON.stringify(args)})` }), send, value);
+          }
+          const stable = current?.ready && previous?.ready && JSON.stringify(current) === JSON.stringify(previous);
+          if (current?.satisfied && (args.condition !== 'actionable' || stable)) {
+            if (args.condition === 'actionable') {
+              try {
+                const node = await resolveSelector(cdp, value, sessions, tabId, args, budget);
+                try {
+                  await pointer.prepare(tabId, node, { budget, scroll: false });
+                  current = { ...current, state: 'actionable' };
+                } finally {
+                  await budget.run(() => cdp(node.target, 'Runtime.releaseObjectGroup', { objectGroup: 'browser-attach' }));
+                }
+              } catch (error) {
+                if (!/covers|no visible click point|detached before resolution/i.test(error.message)) throw error;
+                current = { satisfied: false, reason: error.message, ...(error.diagnostics ? { diagnostics: error.diagnostics } : {}) };
+              }
+            }
+            if (current.satisfied) return { satisfied: true, condition: args.condition, current };
+          }
+          previous = current;
+        } catch (error) {
+          if (!/context.*(destroyed|not found)|cannot find context|no frame with given id|inspected target navigated|detached before resolution|no node|could not find node|node.*(detached|not found)/i.test(error.message)) throw error;
+          current = 'document/frame changing'; previous = null;
+        }
+      }
+      await budget.run(() => new Promise(resolve => setTimeout(resolve, 50)));
+    }
+  } catch (error) {
+    throw Object.assign(new Error(`Wait for ${description} failed: ${error.message}; current=${JSON.stringify(current)}`), {
+      input_dispatched: false, diagnostics: error.diagnostics ?? { reason: 'wait_unsatisfied', condition: args.condition, current },
+    });
+  }
+}
+
+export function inspectWait(query, inspect, args) {
+  const element = query(args.selector, args.selector_type ?? 'css', args.nth, true);
+  if (!element) return { satisfied: args.condition === 'absent', state: 'absent' };
+  if (element.isConnected === false) return { satisfied: false, state: 'detached_during_observation' };
+  if (args.condition === 'attached') return { satisfied: true, state: 'attached' };
+  if (args.condition === 'absent') return { satisfied: false, state: 'attached' };
+  if (args.condition === 'text') {
+    const text = element.innerText ?? '';
+    return { satisfied: args.previous != null ? text !== args.previous : text.includes(args.expected), text: text.slice(0, 500) };
+  }
+  if (args.condition === 'value') {
+    const text = ['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName) ? element.value : element.isContentEditable ? element.innerText : undefined;
+    // Field values may contain credentials. Report the comparison, not its contents.
+    return { satisfied: typeof text === 'string' && text === args.expected, state: typeof text === 'string' ? 'value' : 'unavailable' };
+  }
+  if (['checked', 'selected', 'expanded'].includes(args.condition)) {
+    let state, source = 'property';
+    if (args.condition === 'checked' && element.tagName === 'INPUT' && ['checkbox', 'radio'].includes(element.type)) state = element.type === 'checkbox' && element.indeterminate ? 'mixed' : element.checked;
+    else if (args.condition === 'selected' && element.tagName === 'OPTION') state = element.selected;
+    else if (args.condition === 'expanded' && element.tagName === 'DETAILS') state = element.open;
+    else {
+      source = `aria-${args.condition}`;
+      const attribute = element.getAttribute(source);
+      state = attribute === 'true' ? true : attribute === 'false' ? false : args.condition === 'checked' && attribute === 'mixed' ? 'mixed' : undefined;
+    }
+    return { satisfied: state !== undefined && state === args.expected, state: state === undefined ? 'unavailable' : args.condition, value: state ?? null, source };
+  }
+  const bounds = inspect.call(element);
+  if (args.condition === 'visible') return { ...bounds,
+    // Visibility is independent of disabled/inert state.
+    satisfied: element.getBoundingClientRect().width > 0 && element.getBoundingClientRect().height > 0 && element.ownerDocument.defaultView.getComputedStyle(element).visibility === 'visible' };
+  return { ...bounds, satisfied: !!bounds.ready };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evan_zhong/browser-attach",
-  "version": "0.21.0",
+  "version": "0.22.1",
   "description": "MCP for existing signed-in Chrome and Edge tabs through a locally paired extension",
   "type": "module",
   "license": "MIT",

package/scripts/check-package.mjs

@@ -15,6 +15,7 @@ for (const path of names) {
   if (/config\.generated\.js|(^|\/)(\.local|\.venv|test-results|node_modules)\//.test(path)) throw new Error(`Private file included in package: ${path}`);
 }
 for (const path of ['extension/connection.js', 'extension/version.js', 'extension/errors.js', 'extension/page-url.js']) if (!names.includes(path)) throw new Error(`Package is missing ${path}`);
+for (const path of ['src/hub-runtime.mjs', 'extension/observation.js', 'extension/pointer.js', 'extension/dialogs.js', 'extension/network.js', 'extension/log-data.js', 'extension/fetch-page.js', 'extension/screenshot.js', 'extension/upload.js']) if (!names.includes(path)) throw new Error(`Package is missing ${path}`);
 for (const path of ['bin/browser-attach.mjs', 'src/mcp.mjs', 'src/hub.mjs', 'extension/manifest.json', 'extension/evaluate.js', 'extension/fetch.js', 'extension/locator.js', 'extension/batch.js', 'extension/wait.js', 'extension/outcomes.js', 'extension/scroll.js', 'extension/drag.js', 'extension/text.js', 'extension/diagnostics.js', 'extension/sessions.js', 'extension/actionability.js', 'extension/limits.js', 'extension/icons/BrowserAttach.png']) {
   if (!names.includes(path)) throw new Error(`Package is missing ${path}`);
 }

package/src/client.mjs

@@ -1,135 +1,50 @@
-import { CLIENT_RESPONSE_TIMEOUT_MS } from '../extension/limits.js';
-import { errorFromData } from '../extension/errors.js';
-import { spawn } from 'node:child_process';
-import { open, mkdir } from 'node:fs/promises';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import WebSocket from 'ws';
-import { loadConfig, VERSION } from './config.mjs';
-import { compareVersions } from '../extension/version.js';
-
-async function hubHealth(config) {
-  let response;
-  try {
-    response = await fetch(`http://127.0.0.1:${config.port}/health`, {
-      headers: { Authorization: `Bearer ${config.token}` }, signal: AbortSignal.timeout(1000),
-    });
-  } catch (error) {
-    if (['ECONNREFUSED', 'ECONNRESET', 'ECONNABORTED', 'UND_ERR_SOCKET'].includes(error.cause?.code) || error.name === 'TimeoutError') return null;
-    throw error;
-  }
-  if (!response.ok) throw new Error('BrowserAttach port is occupied by an unpaired service');
-  const health = await response.json();
-  if (health.service !== 'browser-attach') throw new Error('BrowserAttach port is occupied by another service');
-  compareVersions(health.version, VERSION);
-  return health;
-}
-
-export async function hubIsRunning(config) {
-  const health = await hubHealth(config);
-  if (!health) return false;
-  if (health.version !== VERSION) throw new Error(`Hub ${health.version} differs from this package ${VERSION}; reconnect MCP to coordinate an upgrade`);
-  return health.state === 'ready';
-}
-
-export async function ensureHub(configPath) {
-  configPath = resolve(configPath);
-  const config = await loadConfig(configPath);
-  const deadline = Date.now() + 18000;
-  const expected = new Set();
-  let spawned = false, requested = false, readyAfter = 0, spawnError;
-  while (Date.now() < deadline) {
-    if (spawnError) throw spawnError;
-    const health = await hubHealth(config);
-    if (!health) {
-      if (!spawned) {
-        spawned = true;
-        await spawnHub(configPath, error => { spawnError = error; });
-        readyAfter = Date.now() + 2500;
-      }
-    } else {
-      const comparison = compareVersions(health.version, VERSION);
-      if (comparison > 0) throw new Error(`Hub ${health.version} is newer than this package ${VERSION}; refusing to downgrade`);
-      if (comparison < 0 && health.state == null) {
-        throw new Error(`Hub ${health.version} predates coordinated upgrades; run browser-attach stop, restart MCP, and reload the extension manually if it was already loaded`);
-      }
-      if (comparison < 0 && health.state === 'ready' && !requested) {
-        requested = true;
-        for (const item of health.extensions) expected.add(item.instance_id);
-        const response = await fetch(`http://127.0.0.1:${config.port}/upgrade`, { method: 'POST',
-          headers: { Authorization: `Bearer ${config.token}`, 'X-Browser-Attach-Version': VERSION }, signal: AbortSignal.timeout(10000) });
-        const result = await response.json();
-        if (!response.ok) {
-          const current = await hubHealth(config);
-          if (current && compareVersions(current.version, VERSION) < 0 && !['upgrading', 'stopping'].includes(current.state)) throw new Error(result.error);
-        } else for (const id of result.extensions) expected.add(id);
-      } else if (comparison < 0 && health.state === 'ready' && requested) {
-        throw new Error(health.upgrade_error || 'Hub upgrade did not complete; reconnect MCP to retry');
-      } else if (comparison === 0 && health.state === 'ready') {
-        const failure = health.extensions.find(item => item.error);
-        if (failure) throw new Error(`Extension upgrade failed (${failure.instance_id}): ${failure.error}`);
-        for (const item of health.extensions) if (item.ready) expected.delete(item.instance_id);
-        if (!expected.size && health.extensions.every(item => item.ready) && Date.now() >= readyAfter) return config;
-      }
-    }
-    await new Promise(resolve => setTimeout(resolve, 150));
-  }
-  throw new Error(`Hub/extension upgrade did not become ready${expected.size ? `; waiting for ${[...expected].join(', ')}` : ''}. See ${join(dirname(configPath), 'hub.log')}`);
-}
-
-async function spawnHub(configPath, onError) {
-  await mkdir(dirname(configPath), { recursive: true, mode: 0o700 });
-  const log = await open(join(dirname(configPath), 'hub.log'), 'a', 0o600);
-  const child = spawn(process.execPath, [fileURLToPath(new URL('../bin/browser-attach.mjs', import.meta.url)), 'hub', '--config', configPath], {
-    detached: true, windowsHide: true, stdio: ['ignore', log.fd, log.fd],
-    env: { ...process.env, BROWSER_ATTACH_HOME: dirname(configPath) },
-  });
-  child.on('error', onError);
-  child.unref(); await log.close();
-}
-
-export class AttachClient {
-  constructor(config) { this.config = config; this.pending = new Map(); this.counter = 0; }
-  async connect() {
-    if (this.socket?.readyState === WebSocket.OPEN) return;
-    if (this.connecting) return this.connecting;
-    this.connecting = new Promise((resolve, reject) => {
-      const ws = new WebSocket(`ws://127.0.0.1:${this.config.port}/client`, {
-        headers: { Authorization: `Bearer ${this.config.token}`, 'X-Browser-Attach-Version': VERSION }, maxPayload: 24 * 1024 * 1024,
-      });
-      this.socket = ws;
-      ws.once('open', resolve); ws.once('error', reject);
-      ws.on('message', raw => {
-        let data;
-        try { data = JSON.parse(raw.toString()); } catch { ws.close(); return; }
-        const item = this.pending.get(data.id);
-        if (!item) return;
-        this.pending.delete(data.id); clearTimeout(item.timer);
-        if ('error' in data) item.reject(errorFromData(data)); else item.resolve(data.result);
-      });
-      ws.on('close', () => {
-        reject(new Error('Hub connection closed'));
-        for (const item of this.pending.values()) { clearTimeout(item.timer); item.reject(new Error('Hub disconnected; outcome may be unknown. Observe again.')); }
-        this.pending.clear(); this.connecting = null;
-      });
-    });
-    return this.connecting;
-  }
-  async call(method, args = {}) {
-    await this.connect();
-    return new Promise((resolve, reject) => {
-      const id = ++this.counter;
-      const timer = setTimeout(() => {
-        this.pending.delete(id); this.socket.close();
-        reject(new Error('Hub response timed out; outcome may be unknown. Observe again.'));
-      }, CLIENT_RESPONSE_TIMEOUT_MS);
-      this.pending.set(id, { resolve, reject, timer });
-      this.socket.send(JSON.stringify({ id, method, arguments: args }));
-    });
-  }
-  async close() {
-    const ws = this.socket;
-    if (!ws || ws.readyState === WebSocket.CLOSED) return;
-    await new Promise(resolve => { ws.once('close', resolve); ws.close(); });
-  }
-}
+import { CLIENT_RESPONSE_TIMEOUT_MS } from '../extension/limits.js';
+import { errorFromData } from '../extension/errors.js';
+import WebSocket from 'ws';
+import { VERSION } from './config.mjs';
+
+export class AttachClient {
+  constructor(config) { this.config = config; this.pending = new Map(); this.counter = 0; }
+  async connect() {
+    if (this.socket?.readyState === WebSocket.OPEN) return;
+    if (this.connecting) return this.connecting;
+    this.connecting = new Promise((resolve, reject) => {
+      const ws = new WebSocket(`ws://127.0.0.1:${this.config.port}/client`, {
+        headers: { Authorization: `Bearer ${this.config.token}`, 'X-Browser-Attach-Version': VERSION }, maxPayload: 24 * 1024 * 1024,
+      });
+      this.socket = ws;
+      ws.once('open', resolve); ws.once('error', reject);
+      ws.on('message', raw => {
+        let data;
+        try { data = JSON.parse(raw.toString()); } catch { ws.close(); return; }
+        const item = this.pending.get(data.id);
+        if (!item) return;
+        this.pending.delete(data.id); clearTimeout(item.timer);
+        if ('error' in data) item.reject(errorFromData(data)); else item.resolve(data.result);
+      });
+      ws.on('close', () => {
+        reject(new Error('Hub connection closed'));
+        for (const item of this.pending.values()) { clearTimeout(item.timer); item.reject(new Error('Hub disconnected; outcome may be unknown. Observe again.')); }
+        this.pending.clear(); this.connecting = null;
+      });
+    });
+    return this.connecting;
+  }
+  async call(method, args = {}) {
+    await this.connect();
+    return new Promise((resolve, reject) => {
+      const id = ++this.counter;
+      const timer = setTimeout(() => {
+        this.pending.delete(id); this.socket.close();
+        reject(new Error('Hub response timed out; outcome may be unknown. Observe again.'));
+      }, CLIENT_RESPONSE_TIMEOUT_MS);
+      this.pending.set(id, { resolve, reject, timer });
+      this.socket.send(JSON.stringify({ id, method, arguments: args }));
+    });
+  }
+  async close() {
+    const ws = this.socket;
+    if (!ws || ws.readyState === WebSocket.CLOSED) return;
+    await new Promise(resolve => { ws.once('close', resolve); ws.close(); });
+  }
+}

package/src/config.mjs

@@ -15,7 +15,7 @@ export const DATA_DIR = configuredHome
   : process.platform === 'win32' ? join(homedir(), '.browser-attach')
     : join(process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share'), 'browser-attach');
 export const DEFAULT_CONFIG = join(DATA_DIR, 'config.json');
-export const VERSION = '0.21.0';
+export const VERSION = '0.22.1';
 
 export async function loadConfig(path = DEFAULT_CONFIG) {
   let config;