@vforsh/argus 0.1.14 → 0.1.16

package/dist/commands/extension/nativeHost.js

@@ -2,7 +2,10 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { execSync } from 'node:child_process';
-export const HOST_NAME = 'com.vforsh.argus.bridge';
+export const BRIDGE_HOST_NAME = 'com.vforsh.argus.bridge';
+export const CONTROL_HOST_NAME = 'com.vforsh.argus.control';
+export const CONTROL_WATCHER_ID = 'extension-control';
+export const HOST_NAMES = [BRIDGE_HOST_NAME, CONTROL_HOST_NAME];
 export const getManifestDir = (platform) => {
     switch (platform) {
         case 'darwin':
@@ -15,11 +18,12 @@ export const getManifestDir = (platform) => {
             throw new Error(`Unsupported platform: ${platform}`);
     }
 };
-export const getManifestPath = (platform) => {
-    return path.join(getManifestDir(platform), `${HOST_NAME}.json`);
+export const getManifestPath = (platform, hostName = BRIDGE_HOST_NAME) => {
+    return path.join(getManifestDir(platform), `${hostName}.json`);
 };
-export const getWrapperPath = (platform) => {
-    return path.join(getManifestDir(platform), 'argus-native-host.sh');
+export const getWrapperPath = (platform, hostName = BRIDGE_HOST_NAME) => {
+    const filename = hostName === CONTROL_HOST_NAME ? 'argus-native-control-host.sh' : 'argus-native-host.sh';
+    return path.join(getManifestDir(platform), filename);
 };
 export const getPlatform = () => {
     const platform = os.platform();
@@ -57,27 +61,73 @@ export const findNodePath = () => {
     // This is important for fnm/nvm which use symlinks in temporary directories
     return fs.realpathSync(process.execPath);
 };
-export const createManifest = (extensionId, executablePath) => {
+export const 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}/`],
     };
 };
-export const createWrapperScript = (platform, executablePath) => {
-    const wrapperDir = getManifestDir(platform);
-    const wrapperPath = path.join(wrapperDir, 'argus-native-host.sh');
+export const 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';
     // Create a wrapper script that launches argus in native-host mode
     // Use absolute path to node since Chrome spawns without shell profile
     const script = `#!/bin/bash
-exec "${nodePath}" "${executablePath}" watcher native-host
+exec "${nodePath}" "${executablePath}" ${args}
 `;
     fs.writeFileSync(wrapperPath, script, { mode: 0o755 });
     return wrapperPath;
 };
+export const installNativeHosts = (platform, extensionId, executablePath) => {
+    fs.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);
+        fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+        registerWindowsNativeHost(platform, hostName, manifestPath);
+        return { hostName, manifestPath, wrapperPath };
+    });
+};
+export const inspectNativeHosts = (platform) => {
+    return HOST_NAMES.map((hostName) => inspectNativeHost(platform, hostName));
+};
+export const 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 };
+    });
+};
+export const inspectNativeHost = (platform, hostName) => {
+    const manifestPath = getManifestPath(platform, hostName);
+    const wrapperPath = getWrapperPath(platform, hostName);
+    const manifestExists = fs.existsSync(manifestPath);
+    const wrapperExists = fs.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,
+    };
+};
 export const readManifest = (manifestPath) => {
     try {
         const content = fs.readFileSync(manifestPath, 'utf8');
@@ -103,4 +153,37 @@ export const shortenPath = (filePath) => {
     }
     return filePath;
 };
+const extractExtensionId = (origin) => {
+    if (!origin) {
+        return null;
+    }
+    const match = origin.match(/^chrome-extension:\/\/([^/]+)\/$/);
+    return match?.[1] ?? null;
+};
+const removeFileIfExists = (filePath) => {
+    if (!fs.existsSync(filePath)) {
+        return false;
+    }
+    fs.unlinkSync(filePath);
+    return true;
+};
+const 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' });
+};
+const unregisterWindowsNativeHost = (platform, hostName) => {
+    if (platform !== 'win32') {
+        return;
+    }
+    const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}`;
+    try {
+        execSync(`reg delete "${regKey}" /f`, { stdio: 'pipe' });
+    }
+    catch {
+        // Key might not exist.
+    }
+};
 //# sourceMappingURL=nativeHost.js.map

package/dist/commands/extension/nativeHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeHost.js","sourceRoot":"","sources":["../../../src/commands/extension/nativeHost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nativeHost.js","sourceRoot":"","sources":["../../../src/commands/extension/nativeHost.ts"],"names":[],"mappings":"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"}

package/dist/commands/extension/remove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/remove.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,sBAAsB,GAAG;IACpC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAuEtF,CAAA"}
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/remove.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,sBAAsB,GAAG;IACpC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAmDtF,CAAA"}

package/dist/commands/extension/remove.js

@@ -1,7 +1,5 @@
-import fs from 'node:fs';
-import { execSync } from 'node:child_process';
 import { createOutput } from '../../output/io.js';
-import { HOST_NAME, getPlatform, getManifestPath, getWrapperPath, shortenPath } from './nativeHost.js';
+import { getPlatform, removeNativeHosts, shortenPath } from './nativeHost.js';
 export const runExtensionRemove = async (options) => {
     const output = createOutput(options);
     let platform;
@@ -18,56 +16,38 @@ export const runExtensionRemove = async (options) => {
         process.exitCode = 1;
         return;
     }
-    const manifestPath = getManifestPath(platform);
-    const wrapperPath = getWrapperPath(platform);
-    let manifestRemoved = false;
-    let wrapperRemoved = false;
-    // Remove manifest
-    if (fs.existsSync(manifestPath)) {
-        fs.unlinkSync(manifestPath);
-        manifestRemoved = true;
-    }
-    // Remove wrapper script
-    if (fs.existsSync(wrapperPath)) {
-        fs.unlinkSync(wrapperPath);
-        wrapperRemoved = true;
-    }
-    // Windows: Remove registry key
-    if (platform === 'win32') {
-        const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${HOST_NAME}`;
-        try {
-            execSync(`reg delete "${regKey}" /f`, { stdio: 'pipe' });
-        }
-        catch {
-            // Key might not exist
-        }
-    }
+    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('');
     }

package/dist/commands/extension/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/extension/remove.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/extension/remove.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAM7E,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA+B,EAAiB,EAAE;IAC1F,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACJ,QAAQ,GAAG,WAAW,EAAE,CAAA;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;QACtE,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAEhD,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IACzE,MAAM,cAAc,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAEvE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC;YAChB,OAAO,EAAE,IAAI;YACb,eAAe;YACf,cAAc;YACd,KAAK,EAAE,YAAY;SACnB,CAAC,CAAA;IACH,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QACrB,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;YACvC,MAAM,CAAC,UAAU,CAAC,gCAAgC,CAAC,CAAA;YACnD,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACrB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC1B,MAAM,CAAC,UAAU,CAAC,uBAAuB,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;gBAC3E,CAAC;gBACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACzB,MAAM,CAAC,UAAU,CAAC,uBAAuB,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;gBAC1E,CAAC;YACF,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,UAAU,CAAC,2CAA2C,CAAC,CAAA;YAC9D,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACrB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,yBAAyB,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;gBAC5E,MAAM,CAAC,UAAU,CAAC,yBAAyB,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YAC5E,CAAC;QACF,CAAC;QACD,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IACtB,CAAC;AACF,CAAC,CAAA"}

package/dist/commands/extension/resolveExtensionWatcher.d.ts

@@ -14,7 +14,7 @@ export type ResolveExtensionWatcherResult = {
 };
 /**
  * Resolve a watcher that is known to be backed by the Chrome extension transport.
- * When id is omitted, mirror the generic watcher heuristics but only across extension watchers.
+ * When id is omitted, use the browser-level control watcher.
  */
 export declare const resolveExtensionWatcher: (input: ResolveExtensionWatcherInput) => Promise<ResolveExtensionWatcherResult>;
 //# sourceMappingURL=resolveExtensionWatcher.d.ts.map

package/dist/commands/extension/resolveExtensionWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveExtensionWatcher.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/resolveExtensionWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAInF,MAAM,MAAM,4BAA4B,GAAG;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,6BAA6B,GACtC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,QAAQ,EAAE,UAAU,CAAA;CAAE,GAC1D;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,EAAE,CAAA;CAAE,CAAA;AAE9E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAU,OAAO,4BAA4B,KAAG,OAAO,CAAC,6BAA6B,CAiExH,CAAA"}
+{"version":3,"file":"resolveExtensionWatcher.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/resolveExtensionWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAKnF,MAAM,MAAM,4BAA4B,GAAG;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,6BAA6B,GACtC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,QAAQ,EAAE,UAAU,CAAA;CAAE,GAC1D;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,EAAE,CAAA;CAAE,CAAA;AAE9E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAU,OAAO,4BAA4B,KAAG,OAAO,CAAC,6BAA6B,CA4CxH,CAAA"}

package/dist/commands/extension/resolveExtensionWatcher.js

@@ -1,8 +1,9 @@
 import { pruneRegistry } from '../../registry.js';
 import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
+import { CONTROL_WATCHER_ID } from './nativeHost.js';
 /**
  * Resolve a watcher that is known to be backed by the Chrome extension transport.
- * When id is omitted, mirror the generic watcher heuristics but only across extension watchers.
+ * When id is omitted, use the browser-level control watcher.
  */
 export const resolveExtensionWatcher = async (input) => {
     let registry;
@@ -27,38 +28,23 @@ export const 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 checkWatcherStatus(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 };
-    }
-    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 };
-    }
-    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 };
-    }
-    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 };
+    const controlWatcher = registry.watchers[CONTROL_WATCHER_ID];
+    if (controlWatcher?.source === 'extension') {
+        const status = await checkWatcherStatus(controlWatcher);
+        if (status.ok) {
+            return { ok: true, watcher: controlWatcher, registry };
+        }
     }
-    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,
+    };
 };
 const getExtensionWatchers = (watchers) => watchers.filter((watcher) => watcher.source === 'extension');
 const checkWatcherStatus = async (watcher) => {

package/dist/commands/extension/resolveExtensionWatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveExtensionWatcher.js","sourceRoot":"","sources":["../../../src/commands/extension/resolveExtensionWatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveExtensionWatcher.js","sourceRoot":"","sources":["../../../src/commands/extension/resolveExtensionWatcher.ts"],"names":[],"mappings":"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"}

package/dist/commands/extension/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/setup.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,qBAAqB,GAAG;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,SAAS,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAoFpF,CAAA"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/setup.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,qBAAqB,GAAG;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,SAAS,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAmEpF,CAAA"}

package/dist/commands/extension/setup.js

@@ -1,7 +1,5 @@
-import fs from 'node:fs';
-import { execSync } from 'node:child_process';
 import { createOutput } from '../../output/io.js';
-import { HOST_NAME, getPlatform, getManifestDir, getManifestPath, getWrapperPath, findArgusExecutable, createManifest, createWrapperScript, shortenPath, } from './nativeHost.js';
+import { getPlatform, findArgusExecutable, installNativeHosts, shortenPath } from './nativeHost.js';
 export const runExtensionSetup = async (options) => {
     const output = createOutput(options);
     const { extensionId } = options;
@@ -19,11 +17,6 @@ export const runExtensionSetup = async (options) => {
         process.exitCode = 1;
         return;
     }
-    const manifestDir = getManifestDir(platform);
-    const manifestPath = getManifestPath(platform);
-    const wrapperPath = getWrapperPath(platform);
-    // Ensure directory exists
-    fs.mkdirSync(manifestDir, { recursive: true });
     // Find argus executable
     let executablePath;
     try {
@@ -39,50 +32,42 @@ export const runExtensionSetup = async (options) => {
         process.exitCode = 1;
         return;
     }
-    // Create wrapper script
-    createWrapperScript(platform, executablePath);
-    // Create manifest
-    const manifest = createManifest(extensionId, wrapperPath);
-    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
-    // Windows: Add registry key
-    if (platform === 'win32') {
-        const regKey = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${HOST_NAME}`;
-        try {
-            execSync(`reg add "${regKey}" /ve /t REG_SZ /d "${manifestPath}" /f`, { stdio: 'pipe' });
+    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}` });
         }
-        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;
+        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('');
     }
 };

package/dist/commands/extension/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/extension/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/extension/setup.ts"],"names":[],"mappings":"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"}

package/dist/commands/extension/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/status.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,sBAAsB,GAAG;IACpC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAkFtF,CAAA"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/status.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,sBAAsB,GAAG;IACpC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAuDtF,CAAA"}

package/dist/commands/extension/status.js

@@ -1,6 +1,5 @@
-import fs from 'node:fs';
 import { createOutput } from '../../output/io.js';
-import { HOST_NAME, getPlatform, getManifestPath, getWrapperPath, readManifest, isWrapperExecutable } from './nativeHost.js';
+import { getPlatform, inspectNativeHosts } from './nativeHost.js';
 export const runExtensionStatus = async (options) => {
     const output = createOutput(options);
     let platform;
@@ -17,40 +16,14 @@ export const runExtensionStatus = async (options) => {
         process.exitCode = 1;
         return;
     }
-    const manifestPath = getManifestPath(platform);
-    const wrapperPath = getWrapperPath(platform);
-    const manifestExists = fs.existsSync(manifestPath);
-    const wrapperExists = fs.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,
+            hosts,
             extensionId,
-            argusPath: manifest?.path ?? null,
         });
         if (!configured) {
             process.exitCode = 1;
@@ -59,17 +32,18 @@ export const 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}`);
         }

package/dist/commands/extension/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/extension/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/extension/status.ts"],"names":[],"mappings":"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"}

package/dist/commands/locate.js

@@ -1,6 +1,6 @@
+import { requestWatcherCommandAction } from '../cli/defineWatcherCommand.js';
 import { createOutput } from '../output/io.js';
 import { formatLocatedElements } from '../output/locate.js';
-import { requestWatcherAction } from '../watchers/requestWatcher.js';
 import { runDomClick } from './domClick.js';
 import { runDomFill } from './domFill.js';
 import { runDomFocus } from './domFocus.js';
@@ -55,7 +55,7 @@ const runLocateRequest = async (id, path, body, options) => {
         process.exitCode = 2;
         return;
     }
-    const result = await requestWatcherAction({
+    const result = await requestWatcherCommandAction({
         id,
         path,
         method: 'POST',