@vforsh/argus 0.1.15 → 0.1.16

package/dist/argus.js

@@ -5,29 +5,15 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
@@ -2144,7 +2130,7 @@ var {
 // package.json
 var package_default = {
   name: "@vforsh/argus",
-  version: "0.1.15",
+  version: "0.1.16",
   repository: {
     type: "git",
     url: "git+https://github.com/vforsh/argus.git",
@@ -2172,12 +2158,13 @@ var package_default = {
   dependencies: {
     "@vforsh/argus-plugin-api": "workspace:*",
     commander: "14.0.2",
+    esbuild: "0.25.12",
     prettier: "3.7.4"
   },
   scripts: {
     clean: "node ../../scripts/clean-dist.mjs",
     build: "npm run clean && tsc -b && bun run bundle",
-    bundle: "bun build dist/bin.js --outfile dist/argus.js --target node",
+    bundle: "bun build dist/bin.js --outfile dist/argus.js --target node --external esbuild",
     typecheck: "tsc -b --pretty false",
     "chrome:start": "bun src/bin.ts chrome start"
   }
@@ -11320,6 +11307,7 @@ var createVisibilityController = () => {
 // ../argus-watcher/dist/runtime/watcherSetup.js
 var normalizeWatcherSetup = (options, watcherId) => {
   const sourceMode = options.source ?? "cdp";
+  const extensionRole = options.extensionRole ?? "tab";
   const host = options.host ?? "127.0.0.1";
   const port = options.port ?? 0;
   const chrome = options.chrome ?? { host: "127.0.0.1", port: 9222 };
@@ -11363,6 +11351,7 @@ var normalizeWatcherSetup = (options, watcherId) => {
   };
   return {
     sourceMode,
+    extensionRole,
     host,
     port,
     chrome,
@@ -14068,6 +14057,57 @@ var createNativeMessaging = () => {
   };
 };
 
+// ../argus-watcher/dist/native-messaging/control-session-manager.js
+class ControlSessionManager {
+  messaging;
+  pendingTabsRequest = null;
+  constructor(messaging) {
+    this.messaging = messaging;
+    this.messaging.onMessage((message) => {
+      this.handleMessage(message);
+    });
+  }
+  attachTabWatcher(tabId) {
+    this.messaging.send({
+      type: "attach_tab_watcher",
+      tabId
+    });
+  }
+  detachTabWatcher(tabId) {
+    this.messaging.send({
+      type: "detach_tab_watcher",
+      tabId
+    });
+  }
+  async listTabs(filter) {
+    return new Promise((resolve2, reject) => {
+      this.pendingTabsRequest = { resolve: resolve2, reject };
+      this.messaging.send({
+        type: "list_tabs",
+        filter
+      });
+      setTimeout(() => {
+        if (!this.pendingTabsRequest) {
+          return;
+        }
+        this.pendingTabsRequest.reject(new Error("List tabs request timed out"));
+        this.pendingTabsRequest = null;
+      }, 5000);
+    });
+  }
+  handleMessage(message) {
+    switch (message.type) {
+      case "list_tabs_response":
+        this.handleListTabsResponse(message);
+        return;
+    }
+  }
+  handleListTabsResponse(message) {
+    this.pendingTabsRequest?.resolve(message.tabs);
+    this.pendingTabsRequest = null;
+  }
+}
+
 // ../argus-watcher/dist/native-messaging/session-manager.js
 var nextRequestId = 1;
 
@@ -14077,7 +14117,6 @@ class SessionManager {
   pendingRequests = new Map;
   eventHandlers = new Map;
   events;
-  pendingTabsRequest = null;
   constructor(messaging, events) {
     this.messaging = messaging;
     this.events = events;
@@ -14105,9 +14144,6 @@ class SessionManager {
       case "cookie_query_response":
         this.handleCookieQueryResponse(message);
         break;
-      case "list_tabs_response":
-        this.handleListTabsResponse(message);
-        break;
       case "target_selected":
         this.events.onTargetSelected(message.tabId, message.frameId ?? null);
         break;
@@ -14160,13 +14196,6 @@ class SessionManager {
       pending.resolve(result);
     }
   }
-  handleListTabsResponse(message) {
-    if (this.pendingTabsRequest) {
-      this.pendingTabsRequest.resolve(message.tabs);
-      this.pendingTabsRequest = null;
-    }
-    this.events.onTabsUpdated(message.tabs);
-  }
   createSession(message) {
     const { tabId, url, title, faviconUrl } = message;
     const enabledDomains = new Set;
@@ -14247,22 +14276,6 @@ class SessionManager {
     };
     this.messaging.send(message);
   }
-  async listTabs(filter) {
-    return new Promise((resolve2, reject) => {
-      this.pendingTabsRequest = { resolve: resolve2, reject };
-      const message = {
-        type: "list_tabs",
-        filter
-      };
-      this.messaging.send(message);
-      setTimeout(() => {
-        if (this.pendingTabsRequest) {
-          this.pendingTabsRequest.reject(new Error("List tabs request timed out"));
-          this.pendingTabsRequest = null;
-        }
-      }, 5000);
-    });
-  }
   getSession(tabId) {
     return this.sessions.get(tabId);
   }
@@ -14923,7 +14936,87 @@ var TARGET_RECOVERY_INTERVAL_MS = 500;
 var TARGET_RECOVERY_TIMEOUT_MS = 30000;
 var FRAME_COMMAND_READY_TIMEOUT_MS = 3000;
 var FRAME_COMMAND_READY_POLL_MS = 100;
+var createDetachedSession = (message) => ({
+  isAttached: () => false,
+  sendAndWait: async () => {
+    const error = new Error(message);
+    error.code = "cdp_not_attached";
+    throw error;
+  },
+  onEvent: () => () => {}
+});
+var createControlExtensionSource = (options) => {
+  const { events, watcherId, watcherHost, watcherPort } = options;
+  const messaging = createNativeMessaging();
+  const controlSession = new ControlSessionManager(messaging);
+  const hostInfo = {
+    watcherId: watcherId ?? "extension-control",
+    watcherHost: watcherHost ?? "127.0.0.1",
+    watcherPort: watcherPort ?? 0,
+    watcherPid: process.pid
+  };
+  let stopping = false;
+  messaging.start();
+  messaging.send({ type: "host_ready" });
+  sendHostInfo();
+  events.onStatus({
+    attached: false,
+    target: null,
+    reason: "control_watcher"
+  });
+  messaging.onDisconnect(() => {
+    console.error("[ExtensionControlSource] Extension disconnected");
+    if (!stopping) {
+      events.onStatus({ attached: false, target: null, reason: "extension_disconnected" });
+      events.onDetach?.("extension_disconnected");
+    }
+  });
+  return {
+    session: createDetachedSession("Extension control watcher does not expose a CDP tab session"),
+    syncWatcherInfo: (info) => {
+      hostInfo.watcherId = info.watcherId;
+      hostInfo.watcherHost = info.watcherHost;
+      hostInfo.watcherPort = info.watcherPort;
+      hostInfo.watcherPid = info.watcherPid;
+      sendHostInfo();
+    },
+    stop: async () => {
+      stopping = true;
+      messaging.stop();
+    },
+    listTargets: async () => [],
+    listTabs: async (filter) => await controlSession.listTabs(filter),
+    attachTarget: (targetId) => {
+      controlSession.attachTabWatcher(parseControlTabTarget(targetId, "attach"));
+    },
+    detachTarget: (targetId) => {
+      controlSession.detachTabWatcher(parseControlTabTarget(targetId, "detach"));
+    }
+  };
+  function sendHostInfo() {
+    messaging.send({
+      type: "host_info",
+      watcherId: hostInfo.watcherId,
+      watcherHost: hostInfo.watcherHost,
+      watcherPort: hostInfo.watcherPort,
+      pid: hostInfo.watcherPid
+    });
+  }
+};
+var parseControlTabTarget = (targetId, action) => {
+  const target = parseExtensionTargetId(targetId);
+  if (!target.frameId) {
+    return target.tabId;
+  }
+  if (action === "attach") {
+    throw new Error(`Cannot attach iframe ${target.frameId} from extension-control before tab ${target.tabId} has a tab watcher`);
+  }
+  throw new Error(`Cannot detach iframe ${target.frameId} from extension-control. Detach tab ${target.tabId} instead.`);
+};
 var createExtensionSource = (options) => {
+  if (options.role === "control") {
+    return createControlExtensionSource(options);
+  }
   const { events, ignoreMatcher, stripUrlPrefixes: stripUrlPrefixes2, watcherId, watcherHost, watcherPort } = options;
   const messaging = createNativeMessaging();
   const hostInfo = {
@@ -14962,7 +15055,6 @@ var createExtensionSource = (options) => {
       emitStatus(null, reason);
       events.onDetach?.(reason);
     },
-    onTabsUpdated: () => {},
     onTargetSelected: (tabId, frameId) => {
       const session = currentSession;
       if (!session || session.tabId !== tabId) {
@@ -15002,6 +15094,7 @@ var createExtensionSource = (options) => {
   });
   delegatingSessions.add(pageController);
   messaging.start();
+  messaging.send({ type: "host_ready" });
   sendHostInfo();
   messaging.onDisconnect(() => {
     console.error("[ExtensionSource] Extension disconnected");
@@ -15034,13 +15127,26 @@ var createExtensionSource = (options) => {
   };
   const attachTarget = (targetId) => {
     const target = parseExtensionTargetId(targetId);
-    const session = requireOwnedSession(target.tabId);
+    const session = currentSession;
+    if (!session) {
+      if (target.frameId) {
+        throw new Error(`Cannot attach iframe ${target.frameId} before tab ${target.tabId} is attached`);
+      }
+      throw new Error(`Watcher ${hostInfo.watcherId} is a tab watcher. Use extension-control to attach tab ${target.tabId}.`);
+    }
+    if (session.tabId !== target.tabId) {
+      throw new Error(`Watcher ${hostInfo.watcherId} is pinned to tab ${session.tabId}, not tab ${target.tabId}`);
+    }
     requestTargetSelection(session, target.frameId);
   };
   const detachTarget = (targetId) => {
     const target = parseExtensionTargetId(targetId);
-    const session = requireOwnedSession(target.tabId);
-    sessionManager.detachTab(session.tabId);
+    const session = currentSession;
+    if (!session || session.tabId === target.tabId) {
+      sessionManager.detachTab(target.tabId);
+      return;
+    }
+    throw new Error(`Watcher ${hostInfo.watcherId} is pinned to tab ${session.tabId}, not tab ${target.tabId}`);
   };
   return {
     session: proxySession,
@@ -15084,9 +15190,6 @@ var createExtensionSource = (options) => {
     },
     stop,
     listTargets,
-    listTabs: async (filter) => {
-      return await sessionManager.listTabs(filter);
-    },
     attachTarget,
     detachTarget
   };
@@ -15099,16 +15202,6 @@ var createExtensionSource = (options) => {
       pid: hostInfo.watcherPid
     });
   }
-  function requireOwnedSession(tabId) {
-    const session = currentSession;
-    if (!session) {
-      throw createNotAttachedError();
-    }
-    if (session.tabId !== tabId) {
-      throw new Error(`Watcher ${hostInfo.watcherId} is pinned to tab ${session.tabId}, not tab ${tabId}`);
-    }
-    return session;
-  }
   function rebindDelegatingSessions() {
     for (const controller of delegatingSessions) {
       controller.rebind();
@@ -15360,7 +15453,7 @@ function delay4(ms) {
 
 // ../argus-watcher/dist/runtime/watcherServices.js
 var createWatcherRuntimeServices = (options, setup, callbacks) => {
-  const { sourceMode, chrome, artifactsBaseDir, netBuffer, realtimeNetBuffer, sessionHandle, ignoreMatcher, stripUrlPrefixes: stripUrlPrefixes2, watcherId, host, record } = setup;
+  const { sourceMode, chrome, artifactsBaseDir, netBuffer, realtimeNetBuffer, sessionHandle, ignoreMatcher, stripUrlPrefixes: stripUrlPrefixes2, watcherId, host, record, extensionRole } = setup;
   if (sourceMode === "extension") {
     const sourceHandle2 = createExtensionSource({
       events: {
@@ -15378,6 +15471,7 @@ var createWatcherRuntimeServices = (options, setup, callbacks) => {
       watcherId,
       watcherHost: host,
       watcherPort: record.port,
+      role: extensionRole,
       ignoreMatcher: ignoreMatcher ? (url) => ignoreMatcher.matches(url) : null,
       stripUrlPrefixes: stripUrlPrefixes2
     });
@@ -16968,21 +17062,27 @@ var checkWatcherReachable = async (watcher) => {
 // dist/commands/watcherNativeHost.js
 var runWatcherNativeHost = async (options) => {
   const watcherId = options.id?.trim() || "extension";
+  const role = options.role?.trim() || "tab";
+  if (role !== "tab" && role !== "control") {
+    console.error(`Invalid native host role: ${role}. Expected "tab" or "control".`);
+    process.exit(2);
+  }
   let handle51;
   try {
     handle51 = await startWatcher({
       id: watcherId,
       source: "extension",
+      extensionRole: role,
       host: "127.0.0.1",
       port: 0,
       net: { enabled: true },
-      pageIndicator: { enabled: true }
+      pageIndicator: { enabled: role === "tab" }
     });
   } catch (error) {
     console.error(`Failed to start watcher: ${error instanceof Error ? error.message : error}`);
     process.exit(1);
   }
-  console.error(`[NativeHost] Watcher started: id=${handle51.watcher.id} port=${handle51.watcher.port}`);
+  console.error(`[NativeHost] Watcher started: id=${handle51.watcher.id} role=${role} port=${handle51.watcher.port}`);
   const cleanup = async () => {
     try {
       await handle51.close();
@@ -17105,7 +17205,7 @@ Examples:
 `).action(async (options) => {
     await runWatcherPrune(options);
   });
-  watcher.command("native-host").description("[internal] Start as Native Messaging host for Chrome extension").option("--id <watcherId>", "Watcher id (default: extension)").option("--json", "Output JSON for automation").action(async (options) => {
+  watcher.command("native-host").description("[internal] Start as Native Messaging host for Chrome extension").option("--id <watcherId>", "Watcher id (default: extension)").option("--role <role>", "Native host role: tab or control (default: tab)").option("--json", "Output JSON for automation").action(async (options) => {
     await runWatcherNativeHost(options);
   });
 }
@@ -18019,7 +18119,7 @@ var runNetClear = defineWatcherCommand({
 
 // dist/commands/netExport.js
 import fs9 from "node:fs/promises";
-import path11 from "node:path";
+import path12 from "node:path";
 
 // dist/eval/evalClient.js
 var evalOnce = async (input) => {
@@ -18195,6 +18295,117 @@ var resolveDerivedNetFilters = (options) => {
 
 // dist/commands/evalShared.js
 import { readFile as readFile2 } from "node:fs/promises";
+
+// dist/commands/evalBundle.js
+import { realpath } from "node:fs/promises";
+import path11 from "node:path";
+var esbuildModulePromise;
+var nodeModulesSegment = `${path11.sep}node_modules${path11.sep}`;
+var loadEsbuild = () => esbuildModulePromise ??= import("esbuild");
+var bundleEvalEntry = async (entryPath) => {
+  let entryPoint;
+  try {
+    entryPoint = await realpath(path11.resolve(entryPath));
+  } catch {
+    return { ok: false, error: `Failed to read entry file: ${entryPath}` };
+  }
+  const bundleRoot = path11.dirname(entryPoint);
+  try {
+    const esbuild = await loadEsbuild();
+    const result = await esbuild.build({
+      absWorkingDir: bundleRoot,
+      entryPoints: [entryPoint],
+      bundle: true,
+      write: false,
+      splitting: false,
+      format: "esm",
+      platform: "browser",
+      target: "es2022",
+      sourcemap: false,
+      logLevel: "silent",
+      plugins: [createLocalFilesPlugin(bundleRoot)]
+    });
+    const output = result.outputFiles[0];
+    if (output == null) {
+      return { ok: false, error: "Bundle produced no output." };
+    }
+    const code = `${output.text.trimEnd()}
+//# sourceURL=argus-file://${entryPoint}
+`;
+    return { ok: true, code };
+  } catch (error) {
+    return { ok: false, error: formatBundleFailure(error) };
+  }
+};
+var createLocalFilesPlugin = (bundleRoot) => {
+  const bundleRootPrefix = bundleRoot.endsWith(path11.sep) ? bundleRoot : `${bundleRoot}${path11.sep}`;
+  return {
+    name: "argus-eval-bundle",
+    setup(build) {
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (args.kind === "entry-point") {
+          return;
+        }
+        if (args.path.startsWith("node:")) {
+          return bundleError(`Node built-in import ${JSON.stringify(args.path)} is not allowed in page eval.`);
+        }
+        if (!args.path.startsWith(".") && !path11.isAbsolute(args.path)) {
+          return bundleError(`Import ${JSON.stringify(args.path)} is not allowed. Use relative local files under ${bundleRoot}.`);
+        }
+        return;
+      });
+      build.onLoad({ filter: /.*/ }, async (args) => {
+        let resolvedPath;
+        try {
+          resolvedPath = await realpath(args.path);
+        } catch {
+          return bundleError(`Failed to read file: ${args.path}`);
+        }
+        if (resolvedPath !== bundleRoot && !resolvedPath.startsWith(bundleRootPrefix)) {
+          return bundleError(`Import escapes the entry directory: ${args.path}`);
+        }
+        if (resolvedPath.includes(nodeModulesSegment)) {
+          return bundleError(`Import from node_modules is not allowed: ${args.path}`);
+        }
+        return;
+      });
+      build.onEnd((result) => {
+        if (result.errors.length > 0) {
+          return;
+        }
+        const outputs = result.outputFiles ?? [];
+        if (outputs.length !== 1) {
+          return bundleError(`Bundle produced ${outputs.length} outputs; expected exactly one script.`);
+        }
+        if (/\bexport\b/.test(outputs[0]?.text ?? "")) {
+          return bundleError("Bundled script contains top-level export statements, which page eval cannot run. Remove exports from the entry file (helpers may still export symbols for import).");
+        }
+      });
+    }
+  };
+};
+var bundleError = (text) => ({ errors: [{ text }] });
+var formatBundleFailure = (error) => {
+  if (isEsbuildFailure(error)) {
+    return error.errors.map(formatEsbuildMessage).join(`
+`);
+  }
+  return error instanceof Error ? error.message : String(error);
+};
+var isEsbuildFailure = (error) => error instanceof Error && ("errors" in error) && Array.isArray(error.errors) && error.errors.length > 0;
+var formatEsbuildMessage = (issue) => {
+  const message = issue.text || "Bundle failed.";
+  const { file, line, column } = issue.location ?? {};
+  if (!file) {
+    return message;
+  }
+  if (line == null || column == null) {
+    return `${file}: ${message}`;
+  }
+  return `${file}:${line}:${column}: ${message}`;
+};
+
+// dist/commands/evalShared.js
 var prepareEvalExpression = async (inline, options, output) => {
   const evalArgs = parseEvalArgs(options.arg);
   if (evalArgs.error) {
@@ -18223,7 +18434,8 @@ var prepareEvalExpression = async (inline, options, output) => {
 var resolveExpression = async (inline, options, output) => {
   const wantsStdin = options.stdin === true || inline === "-";
   const hasInline = inline != null && inline !== "-";
-  const hasFile = options.file != null;
+  const filePath = options.file;
+  const hasFile = filePath != null;
   if (hasInline && hasFile) {
     output.writeWarn("Cannot combine an inline expression with --file");
     return null;
@@ -18236,10 +18448,25 @@ var resolveExpression = async (inline, options, output) => {
     output.writeWarn("Cannot combine --file with stdin input");
     return null;
   }
+  if (options.bundle && !hasFile) {
+    output.writeWarn("--bundle requires --file");
+    return null;
+  }
   let expression;
-  if (hasFile) {
+  if (hasFile && options.bundle) {
+    const bundled = await bundleEvalEntry(filePath);
+    if (!bundled.ok) {
+      output.writeWarn(`Failed to bundle --file: ${bundled.error}`);
+      return null;
+    }
+    if (!bundled.code.trim()) {
+      output.writeWarn(`Bundled file is empty: ${options.file}`);
+      return null;
+    }
+    expression = bundled.code;
+  } else if (hasFile) {
     try {
-      const content = await readFile2(options.file ?? "", "utf8");
+      const content = await readFile2(filePath, "utf8");
       if (!content.trim()) {
         output.writeWarn(`File is empty: ${options.file}`);
         return null;
@@ -18804,7 +19031,7 @@ var validateNetExportOptions = (options) => {
   return { value: { out, format: "har" } };
 };
 var writeHarFile = async (outPath, har) => {
-  await fs9.mkdir(path11.dirname(outPath), { recursive: true });
+  await fs9.mkdir(path12.dirname(outPath), { recursive: true });
   await fs9.writeFile(outPath, `${JSON.stringify(har, null, 2)}
 `, "utf8");
 };
@@ -19151,10 +19378,10 @@ var fetchNetRequestBody = async (watcher, query, part, output, config = {}) => {
   bodyQuery.set("part", part);
   return await fetchNetRequestRoute(watcher, "/net/request/body", bodyQuery, NET_REQUEST_BODY_TIMEOUT_MS, output, config);
 };
-var fetchNetRequestRoute = async (watcher, path12, query, timeoutMs, output, config = {}) => {
+var fetchNetRequestRoute = async (watcher, path13, query, timeoutMs, output, config = {}) => {
   try {
     const response = await fetchWatcherJson(watcher, {
-      path: path12,
+      path: path13,
       query,
       timeoutMs,
       returnErrorResponse: true
@@ -20133,20 +20360,20 @@ var fetchAuthCookies = async (id, input, output) => {
 var normalizeCookieIdentityInput = (input, output) => {
   const name = input.name.trim();
   const domain = input.domain.trim();
-  const path12 = input.path.trim();
+  const path13 = input.path.trim();
   if (!name) {
     return writeCookieInputError(output, "name is required");
   }
   if (!domain) {
     return writeCookieInputError(output, "domain is required");
   }
-  if (!path12) {
+  if (!path13) {
     return writeCookieInputError(output, "path is required");
   }
-  if (!path12.startsWith("/")) {
+  if (!path13.startsWith("/")) {
     return writeCookieInputError(output, 'path must start with "/"');
   }
-  return { name, domain, path: path12 };
+  return { name, domain, path: path13 };
 };
 var parseCookieSetInput = (input, output) => {
   const identity = normalizeCookieIdentityInput(input, output);
@@ -20894,11 +21121,12 @@ ${script}})();
 // dist/cli/register/registerEval.js
 var collectValue = (value, previous = []) => [...previous, value];
 function registerEval(program2) {
-  const evalCmd = program2.command("eval").alias("js").argument("[id]", "Watcher id to query").argument("[expression]", "JS expression to evaluate (or use --file / --stdin)").description("Evaluate a JS expression in the connected page").option("--no-await", "Do not await promises").option("--timeout <ms>", "Eval timeout in milliseconds").option("--json", "Output JSON for automation").option("--no-return-by-value", "Disable returnByValue (use preview)").option("--no-fail-on-exception", "Do not exit with code 1 when the evaluation throws").option("--retry <n>", "Retry failed evaluations up to N times").option("-q, --silent", "Suppress success output; only emit output on error").option("--interval <ms|duration>", "Re-evaluate every interval (e.g. 500, 3s)").option("--count <n>", "Stop after N iterations (requires --interval)").option("--until <condition>", "Stop when local condition becomes truthy (requires --interval)").option("-f, --file <path>", "Read expression from a file").option("--stdin", "Read expression from stdin").option("--inject <path>", "Read setup code from a file and run it before the expression").option("--iframe <selector>", "Eval in iframe via postMessage (requires helper script)").option("--iframe-namespace <name>", "Message type prefix for iframe eval (default: argus)").option("--iframe-timeout <ms>", "Timeout for iframe postMessage response (default: 5000)").option("--arg <key=value>", "Argument exposed to eval scripts as args[key]", collectValue, []).addHelpText("after", `
+  const evalCmd = program2.command("eval").alias("js").argument("[id]", "Watcher id to query").argument("[expression]", "JS expression to evaluate (or use --file / --stdin)").description("Evaluate a JS expression in the connected page").option("--no-await", "Do not await promises").option("--timeout <ms>", "Eval timeout in milliseconds").option("--json", "Output JSON for automation").option("--no-return-by-value", "Disable returnByValue (use preview)").option("--no-fail-on-exception", "Do not exit with code 1 when the evaluation throws").option("--retry <n>", "Retry failed evaluations up to N times").option("-q, --silent", "Suppress success output; only emit output on error").option("--interval <ms|duration>", "Re-evaluate every interval (e.g. 500, 3s)").option("--count <n>", "Stop after N iterations (requires --interval)").option("--until <condition>", "Stop when local condition becomes truthy (requires --interval)").option("-f, --file <path>", "Read expression from a file").option("--bundle", "Bundle local imports from --file into one script before eval").option("--stdin", "Read expression from stdin").option("--inject <path>", "Read setup code from a file and run it before the expression").option("--iframe <selector>", "Eval in iframe via postMessage (requires helper script)").option("--iframe-namespace <name>", "Message type prefix for iframe eval (default: argus)").option("--iframe-timeout <ms>", "Timeout for iframe postMessage response (default: 5000)").option("--arg <key=value>", "Argument exposed to eval scripts as args[key]", collectValue, []).addHelpText("after", `
 Examples:
   $ argus eval app "location.href"
   $ argus eval app "await fetch('/ping').then(r => r.status)"
   $ argus eval app --file ./script.js
+  $ argus eval app --file ./script.js --bundle
   $ argus eval app "window.store.getState()" --inject ./debug-hooks.js
   $ argus eval app --file ./script.js --arg level=10 --arg mode=fast
   $ cat script.js | argus eval app --stdin
@@ -20923,6 +21151,7 @@ Examples:
       count: options.count,
       until: options.until,
       file: options.file,
+      bundle: options.bundle,
       stdin: options.stdin,
       inject: options.inject,
       iframe: options.iframe,
@@ -20940,7 +21169,7 @@ Examples:
 `).action(async (options) => {
     await runIframeHelper(options);
   });
-  program2.command("eval-until").alias("wait").argument("[id]", "Watcher id to query").argument("[expression]", "JS expression to poll until truthy (or use --file / --stdin)").description("Poll a JS expression until it returns a truthy value").option("--no-await", "Do not await promises").option("--timeout <ms>", "Per-eval timeout in milliseconds").option("--json", "Output JSON for automation").option("--no-return-by-value", "Disable returnByValue (use preview)").option("--no-fail-on-exception", "Do not exit with code 1 when the evaluation throws").option("--retry <n>", "Retry failed evaluations up to N times").option("-q, --silent", "Suppress success output; only emit output on error").option("--interval <ms|duration>", "Polling interval (default: 250ms)").option("--count <n>", "Stop after N iterations").option("--total-timeout <duration>", "Max wall-clock time (e.g. 30s, 2m)").option("--verbose", "Print intermediate (falsy) results").option("-f, --file <path>", "Read expression from a file").option("--stdin", "Read expression from stdin").option("--inject <path>", "Read setup code from a file and run it before the expression").option("--iframe <selector>", "Eval in iframe via postMessage (requires helper script)").option("--iframe-namespace <name>", "Message type prefix for iframe eval (default: argus)").option("--iframe-timeout <ms>", "Timeout for iframe postMessage response (default: 5000)").option("--arg <key=value>", "Argument exposed to eval scripts as args[key]", collectValue, []).addHelpText("after", `
+  program2.command("eval-until").alias("wait").argument("[id]", "Watcher id to query").argument("[expression]", "JS expression to poll until truthy (or use --file / --stdin)").description("Poll a JS expression until it returns a truthy value").option("--no-await", "Do not await promises").option("--timeout <ms>", "Per-eval timeout in milliseconds").option("--json", "Output JSON for automation").option("--no-return-by-value", "Disable returnByValue (use preview)").option("--no-fail-on-exception", "Do not exit with code 1 when the evaluation throws").option("--retry <n>", "Retry failed evaluations up to N times").option("-q, --silent", "Suppress success output; only emit output on error").option("--interval <ms|duration>", "Polling interval (default: 250ms)").option("--count <n>", "Stop after N iterations").option("--total-timeout <duration>", "Max wall-clock time (e.g. 30s, 2m)").option("--verbose", "Print intermediate (falsy) results").option("-f, --file <path>", "Read expression from a file").option("--bundle", "Bundle local imports from --file into one script before eval").option("--stdin", "Read expression from stdin").option("--inject <path>", "Read setup code from a file and run it before the expression").option("--iframe <selector>", "Eval in iframe via postMessage (requires helper script)").option("--iframe-namespace <name>", "Message type prefix for iframe eval (default: argus)").option("--iframe-timeout <ms>", "Timeout for iframe postMessage response (default: 5000)").option("--arg <key=value>", "Argument exposed to eval scripts as args[key]", collectValue, []).addHelpText("after", `
 Examples:
   $ argus eval-until app "document.querySelector('#loaded')"
   $ argus eval-until app "await window.appReadyPromise"
@@ -20949,6 +21178,7 @@ Examples:
   $ argus eval-until app "window.data" --verbose
   $ argus eval-until app "window.data" --count 20 --interval 1s
   $ argus eval-until app --file ./check.js --total-timeout 1m
+  $ argus eval-until app --file ./check.js --bundle --total-timeout 1m
   $ argus wait app "window.appReady" --inject ./debug-hooks.js --total-timeout 20s
   $ argus wait app --file ./ready.js --arg level=10 --total-timeout 20s
 `).action(async (id, expression, options) => {
@@ -20965,6 +21195,7 @@ Examples:
       totalTimeout: options.totalTimeout,
       verbose: options.verbose,
       file: options.file,
+      bundle: options.bundle,
       stdin: options.stdin,
       inject: options.inject,
       iframe: options.iframe,
@@ -22779,7 +23010,7 @@ function resolveActionOptions(options, command) {
 
 // dist/commands/configInit.js
 import fs12 from "node:fs/promises";
-import path12 from "node:path";
+import path13 from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 var DEFAULT_CONFIG_PATH = ".argus/config.json";
 var buildConfigTemplate = (schemaRef) => ({
@@ -22806,12 +23037,12 @@ var buildConfigTemplate = (schemaRef) => ({
 });
 var resolveConfigPath = (cwd, targetPath) => {
   if (!targetPath) {
-    return path12.resolve(cwd, DEFAULT_CONFIG_PATH);
+    return path13.resolve(cwd, DEFAULT_CONFIG_PATH);
   }
-  return path12.isAbsolute(targetPath) ? targetPath : path12.resolve(cwd, targetPath);
+  return path13.isAbsolute(targetPath) ? targetPath : path13.resolve(cwd, targetPath);
 };
 var ensureParentDir2 = async (filePath) => {
-  const dir = path12.dirname(filePath);
+  const dir = path13.dirname(filePath);
   try {
     await fs12.mkdir(dir, { recursive: true });
     return true;
@@ -22890,33 +23121,33 @@ Examples:
   });
 }
 
-// dist/commands/extension/setup.js
-import fs14 from "node:fs";
-import { execSync as execSync2 } from "node:child_process";
-
 // dist/commands/extension/nativeHost.js
 import fs13 from "node:fs";
-import path13 from "node:path";
+import path14 from "node:path";
 import os4 from "node:os";
 import { execSync } from "node:child_process";
-var HOST_NAME = "com.vforsh.argus.bridge";
+var BRIDGE_HOST_NAME = "com.vforsh.argus.bridge";
+var CONTROL_HOST_NAME = "com.vforsh.argus.control";
+var CONTROL_WATCHER_ID = "extension-control";
+var HOST_NAMES = [BRIDGE_HOST_NAME, CONTROL_HOST_NAME];
 var getManifestDir = (platform) => {
   switch (platform) {
     case "darwin":
-      return path13.join(os4.homedir(), "Library/Application Support/Google/Chrome/NativeMessagingHosts");
+      return path14.join(os4.homedir(), "Library/Application Support/Google/Chrome/NativeMessagingHosts");
     case "linux":
-      return path13.join(os4.homedir(), ".config/google-chrome/NativeMessagingHosts");
+      return path14.join(os4.homedir(), ".config/google-chrome/NativeMessagingHosts");
     case "win32":
-      return path13.join(process.env.LOCALAPPDATA ?? os4.homedir(), "Google/Chrome/User Data/NativeMessagingHosts");
+      return path14.join(process.env.LOCALAPPDATA ?? os4.homedir(), "Google/Chrome/User Data/NativeMessagingHosts");
     default:
       throw new Error(`Unsupported platform: ${platform}`);
   }
 };
-var getManifestPath = (platform) => {
-  return path13.join(getManifestDir(platform), `${HOST_NAME}.json`);
+var getManifestPath = (platform, hostName = BRIDGE_HOST_NAME) => {
+  return path14.join(getManifestDir(platform), `${hostName}.json`);
 };
-var getWrapperPath = (platform) => {
-  return path13.join(getManifestDir(platform), "argus-native-host.sh");
+var getWrapperPath = (platform, hostName = BRIDGE_HOST_NAME) => {
+  const filename = hostName === CONTROL_HOST_NAME ? "argus-native-control-host.sh" : "argus-native-host.sh";
+  return path14.join(getManifestDir(platform), filename);
 };
 var getPlatform = () => {
   const platform = os4.platform();
@@ -22928,7 +23159,7 @@ var getPlatform = () => {
 var findArgusExecutable = () => {
   try {
     const npmGlobalPrefix = execSync("npm config get prefix", { encoding: "utf8" }).trim();
-    const globalBinPath = path13.join(npmGlobalPrefix, "bin", "argus");
+    const globalBinPath = path14.join(npmGlobalPrefix, "bin", "argus");
     if (fs13.existsSync(globalBinPath)) {
       return globalBinPath;
     }
@@ -22944,25 +23175,71 @@ var findArgusExecutable = () => {
 var findNodePath = () => {
   return fs13.realpathSync(process.execPath);
 };
-var createManifest = (extensionId, executablePath) => {
+var createManifest = (extensionId, executablePath, hostName = BRIDGE_HOST_NAME) => {
   return {
-    name: HOST_NAME,
-    description: "Argus Watcher Native Messaging Host",
+    name: hostName,
+    description: hostName === CONTROL_HOST_NAME ? "Argus Extension Control Native Messaging Host" : "Argus Watcher Native Messaging Host",
     path: executablePath,
     type: "stdio",
     allowed_origins: [`chrome-extension://${extensionId}/`]
   };
 };
-var createWrapperScript = (platform, executablePath) => {
-  const wrapperDir = getManifestDir(platform);
-  const wrapperPath = path13.join(wrapperDir, "argus-native-host.sh");
+var createWrapperScript = (platform, executablePath, hostName = BRIDGE_HOST_NAME) => {
+  const wrapperPath = getWrapperPath(platform, hostName);
   const nodePath = findNodePath();
+  const args = hostName === CONTROL_HOST_NAME ? `watcher native-host --role control --id ${CONTROL_WATCHER_ID}` : "watcher native-host --role tab";
   const script = `#!/bin/bash
-exec "${nodePath}" "${executablePath}" watcher native-host
+exec "${nodePath}" "${executablePath}" ${args}
 `;
   fs13.writeFileSync(wrapperPath, script, { mode: 493 });
   return wrapperPath;
 };
+var installNativeHosts = (platform, extensionId, executablePath) => {
+  fs13.mkdirSync(getManifestDir(platform), { recursive: true });
+  return HOST_NAMES.map((hostName) => {
+    const wrapperPath = createWrapperScript(platform, executablePath, hostName);
+    const manifestPath = getManifestPath(platform, hostName);
+    const manifest = createManifest(extensionId, wrapperPath, hostName);
+    fs13.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+    registerWindowsNativeHost(platform, hostName, manifestPath);
+    return { hostName, manifestPath, wrapperPath };
+  });
+};
+var inspectNativeHosts = (platform) => {
+  return HOST_NAMES.map((hostName) => inspectNativeHost(platform, hostName));
+};
+var removeNativeHosts = (platform) => {
+  return HOST_NAMES.map((hostName) => {
+    const host = inspectNativeHost(platform, hostName);
+    const manifestRemoved = removeFileIfExists(host.manifestPath);
+    const wrapperRemoved = removeFileIfExists(host.wrapperPath);
+    unregisterWindowsNativeHost(platform, hostName);
+    return { ...host, manifestRemoved, wrapperRemoved };
+  });
+};
+var inspectNativeHost = (platform, hostName) => {
+  const manifestPath = getManifestPath(platform, hostName);
+  const wrapperPath = getWrapperPath(platform, hostName);
+  const manifestExists = fs13.existsSync(manifestPath);
+  const wrapperExists = fs13.existsSync(wrapperPath);
+  const wrapperExecutable = wrapperExists && isWrapperExecutable(wrapperPath);
+  const manifest = manifestExists ? readManifest(manifestPath) : null;
+  const manifestValid = Boolean(manifest && manifest.name === hostName && manifest.type === "stdio" && Array.isArray(manifest.allowed_origins));
+  const extensionId = extractExtensionId(manifest?.allowed_origins?.[0]);
+  return {
+    hostName,
+    manifestPath,
+    wrapperPath,
+    manifestExists,
+    manifestValid,
+    wrapperExists,
+    wrapperExecutable,
+    configured: manifestExists && manifestValid && wrapperExists && wrapperExecutable,
+    installed: manifestExists && wrapperExists,
+    extensionId,
+    argusPath: manifest?.path ?? null
+  };
+};
 var readManifest = (manifestPath) => {
   try {
     const content = fs13.readFileSync(manifestPath, "utf8");
@@ -22986,6 +23263,36 @@ var shortenPath = (filePath) => {
   }
   return filePath;
 };
+var extractExtensionId = (origin) => {
+  if (!origin) {
+    return null;
+  }
+  const match = origin.match(/^chrome-extension:\/\/([^/]+)\/$/);
+  return match?.[1] ?? null;
+};
+var removeFileIfExists = (filePath) => {
+  if (!fs13.existsSync(filePath)) {
+    return false;
+  }
+  fs13.unlinkSync(filePath);
+  return true;
+};
+var registerWindowsNativeHost = (platform, hostName, manifestPath) => {
+  if (platform !== "win32") {
+    return;
+  }
+  const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}`;
+  execSync(`reg add "${regKey}" /ve /t REG_SZ /d "${manifestPath}" /f`, { stdio: "pipe" });
+};
+var unregisterWindowsNativeHost = (platform, hostName) => {
+  if (platform !== "win32") {
+    return;
+  }
+  const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}`;
+  try {
+    execSync(`reg delete "${regKey}" /f`, { stdio: "pipe" });
+  } catch {}
+};
 
 // dist/commands/extension/setup.js
 var runExtensionSetup = async (options) => {
@@ -23003,10 +23310,6 @@ var runExtensionSetup = async (options) => {
     process.exitCode = 1;
     return;
   }
-  const manifestDir = getManifestDir(platform);
-  const manifestPath = getManifestPath(platform);
-  const wrapperPath = getWrapperPath(platform);
-  fs14.mkdirSync(manifestDir, { recursive: true });
   let executablePath;
   try {
     executablePath = findArgusExecutable();
@@ -23019,51 +23322,44 @@ var runExtensionSetup = async (options) => {
     process.exitCode = 1;
     return;
   }
-  createWrapperScript(platform, executablePath);
-  const manifest = createManifest(extensionId, wrapperPath);
-  fs14.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
-  if (platform === "win32") {
-    const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${HOST_NAME}`;
-    try {
-      execSync2(`reg add "${regKey}" /ve /t REG_SZ /d "${manifestPath}" /f`, { stdio: "pipe" });
-    } catch (error) {
-      if (options.json) {
-        output.writeJson({ success: false, error: `Failed to add registry key: ${error.message}` });
-      } else {
-        console.error("Failed to add registry key:", error);
-      }
-      process.exitCode = 1;
-      return;
+  let installedHosts;
+  try {
+    installedHosts = installNativeHosts(platform, extensionId, executablePath);
+  } catch (error) {
+    if (options.json) {
+      output.writeJson({ success: false, error: `Failed to install native hosts: ${error.message}` });
+    } else {
+      console.error("Failed to install native hosts:", error);
     }
+    process.exitCode = 1;
+    return;
   }
   if (options.json) {
     output.writeJson({
       success: true,
-      hostName: HOST_NAME,
       extensionId,
-      manifestPath,
-      wrapperPath,
+      hosts: installedHosts,
       argusPath: executablePath
     });
   } else {
     output.writeHuman("");
-    output.writeHuman("Native messaging host installed");
+    output.writeHuman("Native messaging hosts installed");
     output.writeHuman("");
-    output.writeHuman(`  Host name:    ${HOST_NAME}`);
     output.writeHuman(`  Extension ID: ${extensionId}`);
-    output.writeHuman(`  Manifest:     ${shortenPath(manifestPath)}`);
-    output.writeHuman(`  Wrapper:      ${shortenPath(wrapperPath)}`);
+    for (const host of installedHosts) {
+      output.writeHuman(`  Host name:    ${host.hostName}`);
+      output.writeHuman(`  Manifest:     ${shortenPath(host.manifestPath)}`);
+      output.writeHuman(`  Wrapper:      ${shortenPath(host.wrapperPath)}`);
+    }
     output.writeHuman("");
     output.writeHuman("Next steps:");
     output.writeHuman("  1. Reload the extension in chrome://extensions");
-    output.writeHuman("  2. Open the extension popup and attach a tab");
+    output.writeHuman("  2. Run `argus ext tabs` or open the extension popup and attach a tab");
     output.writeHuman("");
   }
 };
 
 // dist/commands/extension/remove.js
-import fs15 from "node:fs";
-import { execSync as execSync3 } from "node:child_process";
 var runExtensionRemove = async (options) => {
   const output = createOutput(options);
   let platform;
@@ -23078,55 +23374,42 @@ var runExtensionRemove = async (options) => {
     process.exitCode = 1;
     return;
   }
-  const manifestPath = getManifestPath(platform);
-  const wrapperPath = getWrapperPath(platform);
-  let manifestRemoved = false;
-  let wrapperRemoved = false;
-  if (fs15.existsSync(manifestPath)) {
-    fs15.unlinkSync(manifestPath);
-    manifestRemoved = true;
-  }
-  if (fs15.existsSync(wrapperPath)) {
-    fs15.unlinkSync(wrapperPath);
-    wrapperRemoved = true;
-  }
-  if (platform === "win32") {
-    const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${HOST_NAME}`;
-    try {
-      execSync3(`reg delete "${regKey}" /f`, { stdio: "pipe" });
-    } catch {}
-  }
+  const removedHosts = removeNativeHosts(platform);
+  const manifestRemoved = removedHosts.some((host) => host.manifestRemoved);
+  const wrapperRemoved = removedHosts.some((host) => host.wrapperRemoved);
   if (options.json) {
     output.writeJson({
       success: true,
       manifestRemoved,
       wrapperRemoved,
-      manifestPath,
-      wrapperPath
+      hosts: removedHosts
     });
   } else {
     output.writeHuman("");
     if (manifestRemoved || wrapperRemoved) {
-      output.writeHuman("Native messaging host removed");
+      output.writeHuman("Native messaging hosts removed");
       output.writeHuman("");
-      if (manifestRemoved) {
-        output.writeHuman(`  Removed manifest: ${shortenPath(manifestPath)}`);
-      }
-      if (wrapperRemoved) {
-        output.writeHuman(`  Removed wrapper:  ${shortenPath(wrapperPath)}`);
+      for (const host of removedHosts) {
+        if (host.manifestRemoved) {
+          output.writeHuman(`  Removed manifest: ${shortenPath(host.manifestPath)}`);
+        }
+        if (host.wrapperRemoved) {
+          output.writeHuman(`  Removed wrapper:  ${shortenPath(host.wrapperPath)}`);
+        }
       }
     } else {
-      output.writeHuman("Native messaging host was not installed");
+      output.writeHuman("Native messaging hosts were not installed");
       output.writeHuman("");
-      output.writeHuman(`  Manifest not found: ${shortenPath(manifestPath)}`);
-      output.writeHuman(`  Wrapper not found:  ${shortenPath(wrapperPath)}`);
+      for (const host of removedHosts) {
+        output.writeHuman(`  Manifest not found: ${shortenPath(host.manifestPath)}`);
+        output.writeHuman(`  Wrapper not found:  ${shortenPath(host.wrapperPath)}`);
+      }
     }
     output.writeHuman("");
   }
 };
 
 // dist/commands/extension/status.js
-import fs16 from "node:fs";
 var runExtensionStatus = async (options) => {
   const output = createOutput(options);
   let platform;
@@ -23141,40 +23424,14 @@ var runExtensionStatus = async (options) => {
     process.exitCode = 1;
     return;
   }
-  const manifestPath = getManifestPath(platform);
-  const wrapperPath = getWrapperPath(platform);
-  const manifestExists = fs16.existsSync(manifestPath);
-  const wrapperExists = fs16.existsSync(wrapperPath);
-  const wrapperExecutable = wrapperExists && isWrapperExecutable(wrapperPath);
-  let manifest = null;
-  let manifestValid = false;
-  let extensionId = null;
-  if (manifestExists) {
-    manifest = readManifest(manifestPath);
-    if (manifest && manifest.name === HOST_NAME && manifest.type === "stdio" && Array.isArray(manifest.allowed_origins)) {
-      manifestValid = true;
-      const origin = manifest.allowed_origins[0];
-      if (origin) {
-        const match = origin.match(/^chrome-extension:\/\/([^/]+)\/$/);
-        if (match) {
-          extensionId = match[1];
-        }
-      }
-    }
-  }
-  const configured = manifestExists && manifestValid && wrapperExists && wrapperExecutable;
+  const hosts = inspectNativeHosts(platform);
+  const configured = hosts.every((host) => host.configured);
+  const extensionId = hosts.find((host) => host.extensionId)?.extensionId ?? null;
   if (options.json) {
     output.writeJson({
       configured,
-      hostName: HOST_NAME,
-      manifestPath,
-      wrapperPath,
-      manifestExists,
-      manifestValid,
-      wrapperExists,
-      wrapperExecutable,
-      extensionId,
-      argusPath: manifest?.path ?? null
+      hosts,
+      extensionId
     });
     if (!configured) {
       process.exitCode = 1;
@@ -23183,16 +23440,17 @@ var runExtensionStatus = async (options) => {
   }
   output.writeHuman("");
   if (configured) {
-    output.writeHuman("Native messaging host is configured");
+    output.writeHuman("Native messaging hosts are configured");
     output.writeHuman("");
-    output.writeHuman(`  Manifest:     exists`);
-    output.writeHuman(`  Wrapper:      exists, executable`);
     output.writeHuman(`  Extension ID: ${extensionId}`);
   } else {
-    output.writeHuman("Native messaging host not configured");
+    output.writeHuman("Native messaging hosts not configured");
     output.writeHuman("");
-    output.writeHuman(`  Manifest:     ${manifestExists ? manifestValid ? "exists" : "exists, invalid" : "not found"}`);
-    output.writeHuman(`  Wrapper:      ${wrapperExists ? wrapperExecutable ? "exists, executable" : "exists, not executable" : "not found"}`);
+    for (const host of hosts) {
+      output.writeHuman(`  ${host.hostName}`);
+      output.writeHuman(`    Manifest: ${host.manifestExists ? host.manifestValid ? "exists" : "exists, invalid" : "not found"}`);
+      output.writeHuman(`    Wrapper:  ${host.wrapperExists ? host.wrapperExecutable ? "exists, executable" : "exists, not executable" : "not found"}`);
+    }
     if (extensionId) {
       output.writeHuman(`  Extension ID: ${extensionId}`);
     }
@@ -23204,7 +23462,6 @@ var runExtensionStatus = async (options) => {
 };
 
 // dist/commands/extension/info.js
-import fs17 from "node:fs";
 var runExtensionInfo = async (options) => {
   const output = createOutput(options);
   let platform;
@@ -23219,51 +23476,32 @@ var runExtensionInfo = async (options) => {
     process.exitCode = 1;
     return;
   }
-  const manifestPath = getManifestPath(platform);
-  const wrapperPath = getWrapperPath(platform);
-  const manifestExists = fs17.existsSync(manifestPath);
-  const wrapperExists = fs17.existsSync(wrapperPath);
-  let extensionId = null;
-  let argusPath = null;
-  if (manifestExists) {
-    const manifest = readManifest(manifestPath);
-    if (manifest) {
-      argusPath = manifest.path;
-      const origin = manifest.allowed_origins?.[0];
-      if (origin) {
-        const match = origin.match(/^chrome-extension:\/\/([^/]+)\/$/);
-        if (match) {
-          extensionId = match[1];
-        }
-      }
-    }
-  }
-  const installed = manifestExists && wrapperExists;
+  const hosts = inspectNativeHosts(platform);
+  const installed = hosts.every((host) => host.installed);
   if (options.json) {
     output.writeJson({
-      hostName: HOST_NAME,
       platform,
-      manifestPath,
-      wrapperPath,
       installed,
-      extensionId,
-      argusPath
+      hosts
     });
     return;
   }
   output.writeHuman("");
   output.writeHuman("Native Messaging Host Info");
   output.writeHuman("");
-  output.writeHuman(`  Host name:     ${HOST_NAME}`);
   output.writeHuman(`  Platform:      ${platform}`);
-  output.writeHuman(`  Manifest path: ${shortenPath(manifestPath)}`);
-  output.writeHuman(`  Wrapper path:  ${shortenPath(wrapperPath)}`);
+  for (const host of hosts) {
+    output.writeHuman(`  Host name:     ${host.hostName}`);
+    output.writeHuman(`  Manifest path: ${shortenPath(host.manifestPath)}`);
+    output.writeHuman(`  Wrapper path:  ${shortenPath(host.wrapperPath)}`);
+  }
   output.writeHuman("");
   output.writeHuman("Current configuration:");
   output.writeHuman(`  Installed:     ${installed ? "yes" : "no"}`);
-  if (installed) {
-    output.writeHuman(`  Extension ID:  ${extensionId ?? "(unknown)"}`);
-    output.writeHuman(`  Argus path:    ${argusPath ?? "(unknown)"}`);
+  for (const host of hosts.filter((entry) => entry.installed)) {
+    output.writeHuman(`  ${host.hostName}`);
+    output.writeHuman(`    Extension ID: ${host.extensionId ?? "(unknown)"}`);
+    output.writeHuman(`    Argus path:   ${host.argusPath ?? "(unknown)"}`);
   }
   output.writeHuman("");
 };
@@ -23291,38 +23529,23 @@ var resolveExtensionWatcher = async (input) => {
   if (extensionWatchers.length === 0) {
     return {
       ok: false,
-      error: "No extension-backed watchers found. Attach a tab in the extension popup first.",
+      error: "No extension-backed watchers found. Reload the extension after `argus extension setup`, or attach a tab in the extension popup.",
       exitCode: 2
     };
   }
-  const reachability = await Promise.all(extensionWatchers.map(async (watcher) => ({
-    watcher,
-    status: await checkWatcherStatus3(watcher)
-  })));
-  const attached = reachability.filter((entry) => entry.status.ok && entry.status.status.attached);
-  if (attached.length === 1) {
-    return { ok: true, watcher: attached[0].watcher, registry: registry2 };
-  }
-  const cwd = process.cwd();
-  const cwdMatches = extensionWatchers.filter((watcher) => watcher.cwd === cwd);
-  const attachedCwdMatches = attached.filter((entry) => entry.watcher.cwd === cwd);
-  if (attachedCwdMatches.length === 1) {
-    return { ok: true, watcher: attachedCwdMatches[0].watcher, registry: registry2 };
-  }
-  if (attached.length > 1) {
-    return { ok: false, error: "Watcher id required.", exitCode: 2, candidates: attached.map((entry) => entry.watcher) };
-  }
-  if (cwdMatches.length === 1) {
-    return { ok: true, watcher: cwdMatches[0], registry: registry2 };
-  }
-  if (cwdMatches.length > 1) {
-    return { ok: false, error: "Watcher id required.", exitCode: 2, candidates: cwdMatches };
-  }
-  const reachable = reachability.filter((entry) => entry.status.ok);
-  if (reachable.length === 1) {
-    return { ok: true, watcher: reachable[0].watcher, registry: registry2 };
+  const controlWatcher = registry2.watchers[CONTROL_WATCHER_ID];
+  if (controlWatcher?.source === "extension") {
+    const status = await checkWatcherStatus3(controlWatcher);
+    if (status.ok) {
+      return { ok: true, watcher: controlWatcher, registry: registry2 };
+    }
   }
-  return { ok: false, error: "Watcher id required.", exitCode: 2, candidates: extensionWatchers };
+  return {
+    ok: false,
+    error: "extension-control watcher is unavailable. Reload the extension after `argus extension setup`.",
+    exitCode: 2,
+    candidates: extensionWatchers
+  };
 };
 var getExtensionWatchers = (watchers) => watchers.filter((watcher) => watcher.source === "extension");
 var checkWatcherStatus3 = async (watcher) => {
@@ -23415,6 +23638,173 @@ var writeCommandError = (output, options, humanMessage, jsonPayload) => {
 };
 var formatError4 = (error) => error instanceof Error ? error.message : String(error);
 
+// dist/commands/extension/attach.js
+var runExtensionAttach = async (options) => {
+  await runExtensionTabAction("attach", options);
+};
+var runExtensionDetach = async (options) => {
+  await runExtensionTabAction("detach", options);
+};
+var runExtensionTabAction = async (action, options) => {
+  const output = createOutput(options);
+  const resolved = await resolveExtensionWatcher({});
+  if (!resolved.ok) {
+    writeResolveFailure2(output, options, resolved);
+    return;
+  }
+  const selector = parseTabSelector(options);
+  if (!selector.ok) {
+    writeTabResolutionFailure(output, options, selector);
+    return;
+  }
+  const tabs = await fetchTabs(resolved.watcher, selector.selector, output, options);
+  if (!tabs) {
+    return;
+  }
+  const tab = resolveTab(tabs, selector.selector);
+  if (!tab.ok) {
+    writeTabResolutionFailure(output, options, tab);
+    return;
+  }
+  let response;
+  try {
+    response = await fetchWatcherJson(resolved.watcher, {
+      path: action === "attach" ? "/attach" : "/detach",
+      method: "POST",
+      body: { tabId: tab.tab.tabId },
+      timeoutMs: 5000,
+      returnErrorResponse: true
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    writeCommandError2(output, options, `${resolved.watcher.id}: failed to ${action} tab (${message})`, message);
+    return;
+  }
+  if (!response.ok) {
+    writeCommandError2(output, options, `Error: ${response.error.message}`, response);
+    return;
+  }
+  if (options.json) {
+    output.writeJson({
+      ok: true,
+      tab: tab.tab,
+      watcherId: resolved.watcher.id
+    });
+    return;
+  }
+  const verb = action === "attach" ? "Attach" : "Detach";
+  output.writeHuman(`${verb} request sent via ${resolved.watcher.id}`);
+  output.writeHuman(`  ${formatExtensionTabLine2(tab.tab)}`);
+};
+var fetchTabs = async (watcher, selector, output, options) => {
+  const query = buildTabsQuery2(selector);
+  try {
+    const response = await fetchWatcherJson(watcher, {
+      path: "/tabs",
+      query,
+      timeoutMs: 5000,
+      returnErrorResponse: true
+    });
+    if (!response.ok) {
+      writeCommandError2(output, options, `Error: ${response.error.message}`, response);
+      return null;
+    }
+    return response.tabs;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    writeCommandError2(output, options, `${watcher.id}: failed to list extension tabs (${message})`, message);
+    return null;
+  }
+};
+var parseTabSelector = (options) => {
+  const tabId = parseTabId(options.tab);
+  const url = options.url?.trim();
+  const title = options.title?.trim();
+  if (tabId !== null && (url || title)) {
+    return { ok: false, reason: "Use --tab by itself, or resolve by --url/--title.", exitCode: 2 };
+  }
+  if (tabId === null && !url && !title) {
+    return { ok: false, reason: "Specify --tab <tabId>, --url <substring>, or --title <substring>.", exitCode: 2 };
+  }
+  if (options.tab != null && tabId === null) {
+    return { ok: false, reason: `Invalid --tab value: ${options.tab}`, exitCode: 2 };
+  }
+  if (tabId !== null) {
+    return { ok: true, selector: { kind: "tab", tabId } };
+  }
+  return { ok: true, selector: { kind: "query", url, title } };
+};
+var resolveTab = (tabs, selector) => {
+  const matches = selector.kind === "tab" ? tabs.filter((tab) => tab.tabId === selector.tabId) : tabs;
+  if (matches.length === 0) {
+    return { ok: false, reason: "No extension tab matched.", exitCode: 2 };
+  }
+  if (matches.length > 1) {
+    return { ok: false, reason: "Multiple extension tabs matched. Use --tab to pick one.", exitCode: 2, matches };
+  }
+  return { ok: true, tab: matches[0] };
+};
+var parseTabId = (value) => {
+  if (value === undefined) {
+    return null;
+  }
+  const tabId = typeof value === "number" ? value : Number(value);
+  return Number.isInteger(tabId) ? tabId : null;
+};
+var buildTabsQuery2 = (selector) => {
+  const query = new URLSearchParams;
+  if (selector.kind === "tab") {
+    return query;
+  }
+  if (selector.url) {
+    query.set("url", selector.url);
+  }
+  if (selector.title) {
+    query.set("title", selector.title);
+  }
+  return query;
+};
+var writeTabResolutionFailure = (output, options, result) => {
+  const matches = "matches" in result ? result.matches : undefined;
+  if (options.json) {
+    output.writeJson({ ok: false, error: result.reason, matches: matches ?? [] });
+  } else {
+    output.writeWarn(result.reason);
+    if (matches) {
+      for (const tab of matches) {
+        output.writeWarn(`  ${formatExtensionTabLine2(tab)}`);
+      }
+    }
+  }
+  process.exitCode = result.exitCode;
+};
+var writeResolveFailure2 = (output, options, resolved) => {
+  if (options.json) {
+    output.writeJson({ ok: false, error: resolved.error, candidates: resolved.candidates?.map((watcher) => watcher.id) ?? [] });
+  } else {
+    output.writeWarn(resolved.error);
+    if (resolved.candidates && resolved.candidates.length > 0) {
+      for (const watcher of resolved.candidates) {
+        output.writeWarn(formatWatcherLine(watcher));
+      }
+    }
+  }
+  process.exitCode = resolved.exitCode;
+};
+var writeCommandError2 = (output, options, humanMessage, jsonPayload) => {
+  if (options.json) {
+    output.writeJson(typeof jsonPayload === "string" ? { ok: false, error: jsonPayload } : jsonPayload);
+  } else {
+    output.writeWarn(humanMessage);
+  }
+  process.exitCode = 1;
+};
+var formatExtensionTabLine2 = (tab) => {
+  const state2 = tab.attached ? "attached" : "available";
+  const label = tab.title || "(untitled)";
+  return `${tab.tabId} [${state2}] ${label} - ${tab.url}`;
+};
+
 // dist/cli/register/registerExtension.js
 function registerExtension(program2) {
   const extension = program2.command("extension").alias("ext").description("Browser extension management");
@@ -23436,7 +23826,7 @@ To get your extension ID:
   extension.command("info").description("Show native messaging host paths and configuration").option("--json", "Output JSON for automation").action(async (options) => {
     await runExtensionInfo(options);
   });
-  extension.command("tabs").description("List browser tabs visible to the extension transport").option("--id <watcherId>", "Extension-backed watcher id to use as the transport").option("--url <substring>", "Filter tabs by URL substring").option("--title <substring>", "Filter tabs by title substring").option("--json", "Output JSON for automation").addHelpText("after", `
+  extension.command("tabs").description("List browser tabs visible to the extension transport").option("--id <watcherId>", "Extension-backed watcher id to use as the transport (default: extension-control)").option("--url <substring>", "Filter tabs by URL substring").option("--title <substring>", "Filter tabs by title substring").option("--json", "Output JSON for automation").addHelpText("after", `
 Examples:
   $ argus ext tabs
   $ argus ext tabs --url localhost
@@ -23445,6 +23835,22 @@ Examples:
 `).action(async (options) => {
     await runExtensionTabs(options);
   });
+  extension.command("attach").description("Ask the extension control watcher to attach a browser tab").option("--tab <tabId>", "Browser tab id to attach").option("--url <substring>", "Resolve tab by URL substring").option("--title <substring>", "Resolve tab by title substring").option("--json", "Output JSON for automation").addHelpText("after", `
+Examples:
+  $ argus ext attach --tab 123
+  $ argus ext attach --url localhost
+  $ argus ext attach --title Docs --json
+`).action(async (options) => {
+    await runExtensionAttach(options);
+  });
+  extension.command("detach").description("Ask the extension control watcher to detach a browser tab").option("--tab <tabId>", "Browser tab id to detach").option("--url <substring>", "Resolve tab by URL substring").option("--title <substring>", "Resolve tab by title substring").option("--json", "Output JSON for automation").addHelpText("after", `
+Examples:
+  $ argus ext detach --tab 123
+  $ argus ext detach --url localhost
+  $ argus ext detach --title Docs --json
+`).action(async (options) => {
+    await runExtensionDetach(options);
+  });
 }
 
 // dist/output/code.js
@@ -33707,7 +34113,7 @@ function hr2(a2, t, e) {
   }
   return t;
 }
-var fs18 = hr2;
+var fs14 = hr2;
 function cr2(a2, t) {
   return t === false ? false : a2.charAt(t) === "/" && a2.charAt(t + 1) === "/" ? ls(a2, t) : t;
 }
@@ -33715,7 +34121,7 @@ var ds = cr2;
 function lr2(a2, t) {
   let e = null, s = t;
   for (;s !== e; )
-    e = s, s = cs(a2, s), s = ps(a2, s), s = ds(a2, s), s = fs18(a2, s);
+    e = s, s = cs(a2, s), s = ps(a2, s), s = ds(a2, s), s = fs14(a2, s);
   return s;
 }
 var ms = lr2;
@@ -35715,13 +36121,13 @@ function kc({ node: e, parent: t }) {
   let r = /^[fx]?(?:describe|it|test)$/u;
   return t.type === "TaggedTemplateExpression" && t.quasi === e && t.tag.type === "MemberExpression" && t.tag.property.type === "Identifier" && t.tag.property.name === "each" && (t.tag.object.type === "Identifier" && r.test(t.tag.object.name) || t.tag.object.type === "MemberExpression" && t.tag.object.property.type === "Identifier" && (t.tag.object.property.name === "only" || t.tag.object.property.name === "skip") && t.tag.object.object.type === "Identifier" && r.test(t.tag.object.object.name));
 }
-var fs19 = [(e, t) => e.type === "ObjectExpression" && t === "properties", (e, t) => e.type === "CallExpression" && e.callee.type === "Identifier" && e.callee.name === "Component" && t === "arguments", (e, t) => e.type === "Decorator" && t === "expression"];
+var fs15 = [(e, t) => e.type === "ObjectExpression" && t === "properties", (e, t) => e.type === "CallExpression" && e.callee.type === "Identifier" && e.callee.name === "Component" && t === "arguments", (e, t) => e.type === "Decorator" && t === "expression"];
 function oo2(e) {
   let t = (n) => n.type === "TemplateLiteral", r = (n, s) => Oe3(n) && !n.computed && n.key.type === "Identifier" && n.key.name === "styles" && s === "value";
-  return e.match(t, (n, s) => q3(n) && s === "elements", r, ...fs19) || e.match(t, r, ...fs19);
+  return e.match(t, (n, s) => q3(n) && s === "elements", r, ...fs15) || e.match(t, r, ...fs15);
 }
 function ys2(e) {
-  return e.match((t) => t.type === "TemplateLiteral", (t, r) => Oe3(t) && !t.computed && t.key.type === "Identifier" && t.key.name === "template" && r === "value", ...fs19);
+  return e.match((t) => t.type === "TemplateLiteral", (t, r) => Oe3(t) && !t.computed && t.key.type === "Identifier" && t.key.name === "template" && r === "value", ...fs15);
 }
 function Ds2(e, t) {
   return T3(e, x2.Block | x2.Leading, ({ value: r }) => r === ` ${t} `);
@@ -39628,7 +40034,7 @@ var ft4 = w4((gx, Mi3) => {
   ct4.default = ct4;
 });
 var fe3 = w4((wx, zi3) => {
-  var Bi3 = Me4(), Ui3 = ft4(), Fc2 = ut4(), { isClean: Fi3, my: $i3 } = Ht4(), fs20, Wi3, Gi3, ps3;
+  var Bi3 = Me4(), Ui3 = ft4(), Fc2 = ut4(), { isClean: Fi3, my: $i3 } = Ht4(), fs16, Wi3, Gi3, ps3;
   function Yi3(t) {
     return t.map((e) => (e.nodes && (e.nodes = Yi3(e.nodes)), delete e.source, e));
   }
@@ -39727,7 +40133,7 @@ var fe3 = w4((wx, zi3) => {
       } else if (e.selector || e.selectors)
         e = [new ps3(e)];
       else if (e.name)
-        e = [new fs20(e)];
+        e = [new fs16(e)];
       else if (e.text)
         e = [new Bi3(e)];
       else
@@ -39829,7 +40235,7 @@ var fe3 = w4((wx, zi3) => {
     ps3 = t;
   };
   z3.registerAtRule = (t) => {
-    fs20 = t;
+    fs16 = t;
   };
   z3.registerRoot = (t) => {
     Gi3 = t;
@@ -39837,7 +40243,7 @@ var fe3 = w4((wx, zi3) => {
   zi3.exports = z3;
   z3.default = z3;
   z3.rebuild = (t) => {
-    t.type === "atrule" ? Object.setPrototypeOf(t, fs20.prototype) : t.type === "rule" ? Object.setPrototypeOf(t, ps3.prototype) : t.type === "decl" ? Object.setPrototypeOf(t, Ui3.prototype) : t.type === "comment" ? Object.setPrototypeOf(t, Bi3.prototype) : t.type === "root" && Object.setPrototypeOf(t, Gi3.prototype), t[$i3] = true, t.nodes && t.nodes.forEach((e) => {
+    t.type === "atrule" ? Object.setPrototypeOf(t, fs16.prototype) : t.type === "rule" ? Object.setPrototypeOf(t, ps3.prototype) : t.type === "decl" ? Object.setPrototypeOf(t, Ui3.prototype) : t.type === "comment" ? Object.setPrototypeOf(t, Bi3.prototype) : t.type === "root" && Object.setPrototypeOf(t, Gi3.prototype), t[$i3] = true, t.nodes && t.nodes.forEach((e) => {
       z3.rebuild(e);
     });
   };
@@ -45242,9 +45648,9 @@ async function resolveEditSource(id, url, options, output) {
   }
   return readStdinSource(output);
 }
-async function readFileSource(path14, output) {
+async function readFileSource(path15, output) {
   try {
-    return { text: await readFile6(path14, "utf8") };
+    return { text: await readFile6(path15, "utf8") };
   } catch (error) {
     output.writeWarn(`Failed to read file: ${error instanceof Error ? error.message : error}`);
     process.exitCode = 1;
@@ -45453,7 +45859,7 @@ var runLocateLabel = async (id, label, options) => {
     exact: options.exact
   }, options);
 };
-var runLocateRequest = async (id, path14, body, options) => {
+var runLocateRequest = async (id, path15, body, options) => {
   const output = createOutput(options);
   const action = normalizeLocateAction(options.action, output);
   if (action == null && options.action) {
@@ -45471,7 +45877,7 @@ var runLocateRequest = async (id, path14, body, options) => {
   }
   const result = await requestWatcherCommandAction({
     id,
-    path: path14,
+    path: path15,
     method: "POST",
     body,
     timeoutMs: 30000
@@ -45559,7 +45965,7 @@ Examples:
 }
 
 // dist/cli/plugins/registerPlugins.js
-import path14 from "node:path";
+import path15 from "node:path";
 import { existsSync as existsSync3 } from "node:fs";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 
@@ -45579,9 +45985,9 @@ var resolvePluginAlias = (spec, aliases) => {
 
 // dist/cli/plugins/pluginHost.js
 var DEFAULT_TIMEOUT_MS2 = 30000;
-var postWatcherJson = (id, path14, body, timeoutMs = DEFAULT_TIMEOUT_MS2) => requestWatcherJson({
+var postWatcherJson = (id, path15, body, timeoutMs = DEFAULT_TIMEOUT_MS2) => requestWatcherJson({
   id,
-  path: path14,
+  path: path15,
   method: "POST",
   body,
   timeoutMs
@@ -45663,7 +46069,7 @@ var resolvePluginModuleUrl = (specifier, baseDirs) => {
   if (isPathLikeSpecifier(trimmed)) {
     for (const baseDir of baseDirs) {
       try {
-        const resolvedPath = path14.resolve(baseDir, trimmed);
+        const resolvedPath = path15.resolve(baseDir, trimmed);
         if (existsSync3(resolvedPath)) {
           return { ok: true, url: pathToFileURL2(resolvedPath).href };
         }
@@ -45685,7 +46091,7 @@ ${errors.map((e) => `- ${e}`).join(`
   }
   for (const baseDir of baseDirs) {
     try {
-      const baseUrl = pathToFileURL2(path14.join(baseDir, "noop.js")).href;
+      const baseUrl = pathToFileURL2(path15.join(baseDir, "noop.js")).href;
       return { ok: true, url: resolveWithImportMeta(trimmed, baseUrl) };
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -45836,14 +46242,14 @@ var runPluginList = (options) => {
 };
 
 // dist/commands/pluginConfig.js
-import fs20 from "node:fs/promises";
+import fs16 from "node:fs/promises";
 import { existsSync as existsSync4 } from "node:fs";
-import path15 from "node:path";
+import path16 from "node:path";
 var DEFAULT_CONFIG_PATH2 = ".argus/config.json";
 var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var resolveTargetConfigPath = (cwd, cliPath) => {
   if (cliPath) {
-    const resolved = path15.isAbsolute(cliPath) ? cliPath : path15.resolve(cwd, cliPath);
+    const resolved = path16.isAbsolute(cliPath) ? cliPath : path16.resolve(cwd, cliPath);
     return { path: resolved, exists: existsSync4(resolved) };
   }
   const discovered = resolveArgusConfigPath({ cwd });
@@ -45851,14 +46257,14 @@ var resolveTargetConfigPath = (cwd, cliPath) => {
     return { path: discovered, exists: true };
   if (process.exitCode)
     return null;
-  return { path: path15.resolve(cwd, DEFAULT_CONFIG_PATH2), exists: false };
+  return { path: path16.resolve(cwd, DEFAULT_CONFIG_PATH2), exists: false };
 };
 var readConfigObject = async (configPath, exists) => {
   if (!exists)
     return {};
   let raw;
   try {
-    raw = await fs20.readFile(configPath, "utf8");
+    raw = await fs16.readFile(configPath, "utf8");
   } catch (error) {
     console.error(`Failed to read Argus config at ${configPath}: ${error instanceof Error ? error.message : String(error)}`);
     process.exitCode = 2;
@@ -45910,8 +46316,8 @@ var getPluginAliases = (config, configPath) => {
 };
 var writeConfigObject = async (configPath, config) => {
   try {
-    await fs20.mkdir(path15.dirname(configPath), { recursive: true });
-    await fs20.writeFile(configPath, `${JSON.stringify(config, null, "\t")}
+    await fs16.mkdir(path16.dirname(configPath), { recursive: true });
+    await fs16.writeFile(configPath, `${JSON.stringify(config, null, "\t")}
 `, "utf8");
     return true;
   } catch (error) {