@vforsh/argus 0.1.18 → 0.1.20

package/dist/commands/domDrag.js

@@ -0,0 +1,179 @@
+import { domDragRequestSchema } from '@vforsh/argus-core';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
+import { parseDurationMs } from '../time.js';
+import { describeElementTarget, parseWaitDuration, parseXY, requireElementTarget, writeNoElementFound } from './dom/shared.js';
+import { resolveTestId } from './resolveTestId.js';
+/** CLI definition for the top-level `argus drag` command. */
+export const domDragCommandDefinition = {
+    name: 'drag',
+    description: 'Drag from coordinates or an element using real browser mouse input',
+    arguments: [{ flags: '[id]', description: 'Watcher id to query' }],
+    options: [
+        { flags: '--selector <css>', description: 'CSS selector to drag from' },
+        { flags: '--testid <id>', description: 'Shorthand for --selector "[data-testid=\'<id>\']"' },
+        { flags: '--ref <elementRef>', description: 'Stable element ref from snapshot/locate output' },
+        { flags: '--pos <x,y>', description: 'Viewport start coordinates or offset from element top-left' },
+        { flags: '--to <x,y>', description: 'Absolute viewport destination' },
+        { flags: '--by <dx,dy>', description: 'Destination delta from the resolved start point' },
+        { flags: '--button <type>', description: 'Mouse button: left, middle, right (default: left)' },
+        { flags: '--duration <duration>', description: 'Total drag duration (default: 250ms)' },
+        { flags: '--steps <n>', description: 'Number of mousemove steps (default: 12)' },
+        { flags: '--all', description: 'Allow multiple matches (default: error if >1 match)' },
+        { flags: '--text <string>', description: 'Filter by textContent (trimmed). Supports /regex/flags syntax' },
+        { flags: '--wait <duration>', description: 'Wait for selector to appear (e.g. 5s, 500ms)' },
+        { flags: '--json', description: 'Output JSON for automation' },
+    ],
+    examples: [
+        'argus drag app --pos 200,300 --to 500,300',
+        'argus drag app --selector "#piece" --by 120,0',
+        'argus drag app --selector "canvas" --pos 320,240 --by 80,-30',
+        'argus drag app --ref e7 --by 0,-180 --duration 600ms --steps 30',
+    ],
+    action: async (id, options) => {
+        if (!resolveTestId(options))
+            return;
+        await runDomDrag(id, options);
+    },
+};
+/** Execute the drag command for a watcher id. */
+export const runDomDrag = defineWatcherCommand({
+    schema: domDragRequestSchema,
+    build: (_args, options, output) => buildDragPlan(options, output),
+    formatHuman: (response, { output, options }) => {
+        const target = hasElementTarget(options) ? { selector: options.selector, ref: options.ref } : null;
+        const start = options.pos ? parseXY(options.pos) : null;
+        if (!target) {
+            output.writeHuman(`Dragged from (${start?.x}, ${start?.y}) ${formatDestination(options)}`);
+            return;
+        }
+        if (response.matches === 0) {
+            writeNoElementFound(target.selector ?? target.ref, output);
+            return;
+        }
+        const label = response.dragged === 1 ? 'element' : 'elements';
+        const offset = start ? ` from offset (${start.x}, ${start.y})` : '';
+        output.writeHuman(`Dragged ${response.dragged} ${label} for ${describeElementTarget(target)}${offset} ${formatDestination(options)}`);
+    },
+});
+const hasElementTarget = (options) => Boolean(options.selector?.trim() || options.ref?.trim());
+/** Validate options and assemble the `/dom/drag` request plan. */
+const buildDragPlan = (options, output) => {
+    const hasTarget = hasElementTarget(options);
+    const target = hasTarget ? requireElementTarget({ selector: options.selector, ref: options.ref }, output) : null;
+    if (hasTarget && !target)
+        return null;
+    const start = options.pos != null ? parseXY(options.pos) : undefined;
+    if (options.pos != null && !start) {
+        output.writeWarn('--pos must be in the format "x,y" (e.g. --pos 100,200)');
+        process.exitCode = 2;
+        return null;
+    }
+    if (!target && !start) {
+        output.writeWarn('--selector, --testid, --ref, or --pos is required');
+        process.exitCode = 2;
+        return null;
+    }
+    const destination = parseDestination(options, output);
+    if (!destination)
+        return null;
+    const waitMs = parseWaitDuration(options.wait, output);
+    if (waitMs == null)
+        return null;
+    const durationMs = parseOptionalDuration(options.duration, output);
+    if (durationMs == null)
+        return null;
+    const steps = parseOptionalSteps(options.steps, output);
+    if (steps == null)
+        return null;
+    const body = {};
+    if (target) {
+        if (target.selector)
+            body.selector = target.selector;
+        if (target.ref)
+            body.ref = target.ref;
+        body.all = options.all ?? false;
+        if (options.text != null)
+            body.text = options.text;
+    }
+    if (start) {
+        body.x = start.x;
+        body.y = start.y;
+    }
+    if ('to' in destination)
+        body.to = destination.to;
+    if ('delta' in destination)
+        body.delta = destination.delta;
+    if (options.button)
+        body.button = options.button;
+    if (waitMs > 0)
+        body.wait = waitMs;
+    if (durationMs !== undefined)
+        body.duration = durationMs;
+    if (steps !== undefined)
+        body.steps = steps;
+    return {
+        path: '/dom/drag',
+        method: 'POST',
+        body,
+        timeoutMs: Math.max(30_000, waitMs + (durationMs ?? 250) + 5_000),
+    };
+};
+const parseDestination = (options, output) => {
+    const hasTo = options.to != null;
+    const hasBy = options.by != null;
+    if (hasTo === hasBy) {
+        output.writeWarn('Provide exactly one of --to or --by');
+        process.exitCode = 2;
+        return null;
+    }
+    if (hasTo) {
+        const to = parseXY(options.to);
+        if (!to) {
+            output.writeWarn('--to must be in the format "x,y" (e.g. --to 500,300)');
+            process.exitCode = 2;
+            return null;
+        }
+        return { to };
+    }
+    const delta = parseXY(options.by);
+    if (!delta) {
+        output.writeWarn('--by must be in the format "dx,dy" (e.g. --by 120,0)');
+        process.exitCode = 2;
+        return null;
+    }
+    return { delta };
+};
+const parseOptionalDuration = (value, output) => {
+    if (value == null)
+        return undefined;
+    const parsed = parseDurationMs(value);
+    if (parsed == null || parsed < 0) {
+        output.writeWarn('Invalid --duration value: expected a duration like 250ms, 1s, 2m.');
+        process.exitCode = 2;
+        return null;
+    }
+    return parsed;
+};
+const parseOptionalSteps = (value, output) => {
+    if (value == null)
+        return undefined;
+    const parsed = Number(value);
+    if (!Number.isInteger(parsed) || parsed < 1) {
+        output.writeWarn('--steps must be a positive integer');
+        process.exitCode = 2;
+        return null;
+    }
+    return parsed;
+};
+const formatDestination = (options) => {
+    const to = options.to ? parseXY(options.to) : null;
+    if (to) {
+        return `to (${to.x}, ${to.y})`;
+    }
+    const delta = options.by ? parseXY(options.by) : null;
+    if (delta) {
+        return `by (${delta.x}, ${delta.y})`;
+    }
+    return '';
+};
+//# sourceMappingURL=domDrag.js.map

package/dist/commands/domDrag.js.map

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

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

@@ -6,6 +6,8 @@ type ExtensionTabActionOptions = {
     tab?: string | number;
     url?: string;
     title?: string;
+    as?: string;
+    wait?: boolean;
     json?: boolean;
 };
 export declare const runExtensionAttach: (options: ExtensionAttachOptions) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACnF,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAE9D,KAAK,yBAAyB,GAAG;IAChC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AASD,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAStF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAEtF,CAAA"}
+{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACnF,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAE9D,KAAK,yBAAyB,GAAG;IAChC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAID,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAStF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAEtF,CAAA"}

package/dist/commands/extension/attach.js

@@ -3,6 +3,7 @@ import { formatWatcherLine } from '../../output/format.js';
 import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
 import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
 import { runExtensionShow } from './show.js';
+import { waitForTabWatcher } from './tabAttach.js';
 import { fetchExtensionTabs, formatExtensionTabLine, parseTabSelector, resolveTab, } from './tabSelection.js';
 export const runExtensionAttach = async (options) => {
     if (options.show) {
@@ -43,7 +44,7 @@ const runExtensionTabAction = async (action, options) => {
         response = await fetchWatcherJson(resolved.watcher, {
             path: action === 'attach' ? '/attach' : '/detach',
             method: 'POST',
-            body: { tabId: tab.tab.tabId },
+            body: { tabId: tab.tab.tabId, watcherId: action === 'attach' ? options.as : undefined },
             timeoutMs: 5_000,
             returnErrorResponse: true,
         });
@@ -57,17 +58,41 @@ const runExtensionTabAction = async (action, options) => {
         writeCommandError(output, options, `Error: ${response.error.message}`, response);
         return;
     }
+    if (action === 'attach' && options.wait !== false) {
+        const watcher = await waitForTabWatcher(resolved.watcher, { kind: 'tab', tabId: response.tab.tabId }, { ...response.tab, attached: true }, response.watcherId ?? options.as);
+        if (!watcher.ok) {
+            writeCommandError(output, options, watcher.reason, {
+                ok: false,
+                error: watcher.reason,
+                tab: response.tab,
+                watcherId: response.watcherId ?? options.as,
+            });
+            return;
+        }
+        if (options.json) {
+            output.writeJson({
+                ok: true,
+                tab: watcher.tab,
+                watcherId: watcher.watcher.id,
+                status: watcher.status,
+            });
+            return;
+        }
+        output.writeHuman(`attached ${watcher.watcher.id}`);
+        output.writeHuman(`  ${formatExtensionTabLine(watcher.tab)}`);
+        return;
+    }
     if (options.json) {
         output.writeJson({
             ok: true,
-            tab: tab.tab,
-            watcherId: resolved.watcher.id,
+            tab: response.tab,
+            watcherId: response.watcherId,
         });
         return;
     }
-    const verb = action === 'attach' ? 'Attach' : 'Detach';
-    output.writeHuman(`${verb} request sent via ${resolved.watcher.id}`);
-    output.writeHuman(`  ${formatExtensionTabLine(tab.tab)}`);
+    const verb = action === 'attach' ? 'attached' : 'detached';
+    output.writeHuman(`${verb}${response.watcherId ? ` ${response.watcherId}` : ''}`);
+    output.writeHuman(`  ${formatExtensionTabLine(response.tab)}`);
 };
 const writeTabResolutionFailure = (output, options, result) => {
     const matches = 'matches' in result ? result.matches : undefined;

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

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

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

@@ -0,0 +1,6 @@
+export type ExtensionDoctorOptions = {
+    watcher?: string;
+    json?: boolean;
+};
+export declare const runExtensionDoctor: (options: ExtensionDoctorOptions) => Promise<void>;
+//# sourceMappingURL=doctor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/doctor.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CA+GtF,CAAA"}

package/dist/commands/extension/doctor.js

@@ -0,0 +1,185 @@
+import { createOutput } from '../../output/io.js';
+import { formatWatcherLine } from '../../output/format.js';
+import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
+import { resolveWatcher } from '../../watchers/resolveWatcher.js';
+import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
+import { getPlatform, inspectNativeHosts } from './nativeHost.js';
+import { fetchExtensionTargets, formatExtensionTargetLine } from './targetSelection.js';
+export const runExtensionDoctor = async (options) => {
+    const output = createOutput(options);
+    const issues = [];
+    const hostState = inspectNativeHostState();
+    issues.push(...hostState.issues);
+    const { configured, hosts } = hostState;
+    const configuredExtensionId = hosts.find((host) => host.extensionId)?.extensionId ?? null;
+    const control = await resolveExtensionWatcher({});
+    let diagnostics = null;
+    let watcherDiagnostics = null;
+    if (!control.ok) {
+        issues.push(control.error);
+    }
+    else {
+        const result = await fetchExtensionDiagnostics(control.watcher);
+        if (result.ok) {
+            diagnostics = result.diagnostics;
+        }
+        else {
+            issues.push(result.error);
+        }
+    }
+    if (options.watcher) {
+        const result = await inspectWatcher(options.watcher, diagnostics);
+        if (result.ok) {
+            watcherDiagnostics = result.diagnostics;
+            issues.push(...result.issues);
+        }
+        else {
+            issues.push(result.error);
+        }
+    }
+    if (configuredExtensionId && diagnostics?.extension.id && configuredExtensionId !== diagnostics.extension.id) {
+        issues.push(`Native host is configured for ${configuredExtensionId}, but the connected extension is ${diagnostics.extension.id}.`);
+    }
+    if (diagnostics && !diagnostics.control.connected) {
+        issues.push('Extension control bridge is disconnected.');
+    }
+    const ok = issues.length === 0;
+    if (options.json) {
+        output.writeJson({
+            ok,
+            configured,
+            hosts,
+            controlWatcher: control.ok ? control.watcher : null,
+            diagnostics,
+            watcherDiagnostics,
+            issues,
+        });
+        if (!ok) {
+            process.exitCode = 1;
+        }
+        return;
+    }
+    output.writeHuman(ok ? 'Extension control looks healthy' : 'Extension control has issues');
+    output.writeHuman('');
+    output.writeHuman(`Native hosts: ${configured ? 'configured' : 'incomplete'}`);
+    for (const host of hosts) {
+        output.writeHuman(`  ${host.hostName}: ${host.configured ? 'ok' : 'broken'}`);
+    }
+    if (configuredExtensionId) {
+        output.writeHuman(`  configured extension: ${configuredExtensionId}`);
+    }
+    output.writeHuman('');
+    if (control.ok) {
+        output.writeHuman(`Control watcher: ${formatWatcherLine(control.watcher)}`);
+    }
+    else {
+        output.writeHuman(`Control watcher: ${control.error}`);
+        for (const watcher of control.candidates ?? []) {
+            output.writeHuman(`  ${formatWatcherLine(watcher)}`);
+        }
+    }
+    if (diagnostics) {
+        output.writeHuman(`Runtime extension: ${diagnostics.extension.id ?? 'unknown'} ${diagnostics.extension.version ?? ''}`.trim());
+        output.writeHuman(`Control bridge: ${diagnostics.control.connected ? 'connected' : 'disconnected'}`);
+        output.writeHuman(`Tab watchers: ${diagnostics.tabWatchers.length}`);
+        for (const watcher of diagnostics.tabWatchers) {
+            output.writeHuman(`  ${watcher.tabId}: ${watcher.watcherId ?? 'unknown'} ${watcher.targetReady === false ? '(target pending)' : ''}`.trim());
+        }
+    }
+    if (watcherDiagnostics) {
+        output.writeHuman('');
+        output.writeHuman(`Watcher ${watcherDiagnostics.watcher.id}:`);
+        output.writeHuman(`  Status: attached=${watcherDiagnostics.status?.attached ?? false} targetReady=${watcherDiagnostics.status?.targetReady ?? null}`);
+        if (watcherDiagnostics.selectedTarget) {
+            output.writeHuman(`  Selected: ${formatExtensionTargetLine(watcherDiagnostics.selectedTarget)}`);
+        }
+        if (watcherDiagnostics.bridge) {
+            output.writeHuman(`  Bridge: connected=${watcherDiagnostics.bridge.connected} tab=${watcherDiagnostics.bridge.tabId} pid=${watcherDiagnostics.bridge.pid ?? 'unknown'}`);
+        }
+        output.writeHuman(`  Targets: ${watcherDiagnostics.targets.length}`);
+    }
+    if (issues.length > 0) {
+        output.writeHuman('');
+        output.writeHuman('Issues:');
+        for (const issue of issues) {
+            output.writeHuman(`  ${issue}`);
+        }
+        process.exitCode = 1;
+    }
+};
+const inspectNativeHostState = () => {
+    try {
+        const hosts = inspectNativeHosts(getPlatform());
+        const configured = hosts.length > 0 && hosts.every((host) => host.configured);
+        return {
+            configured,
+            hosts,
+            issues: configured ? [] : ['Native messaging hosts are not fully configured.'],
+        };
+    }
+    catch (error) {
+        return { configured: false, hosts: [], issues: [formatError(error)] };
+    }
+};
+const fetchExtensionDiagnostics = async (watcher) => {
+    try {
+        const response = await fetchWatcherJson(watcher, {
+            path: '/extension/diagnostics',
+            timeoutMs: 5_000,
+            returnErrorResponse: true,
+        });
+        if (response.ok) {
+            return { ok: true, diagnostics: response };
+        }
+        return { ok: false, error: response.error.message };
+    }
+    catch (error) {
+        return { ok: false, error: `${watcher.id}: failed to read extension diagnostics (${formatError(error)})` };
+    }
+};
+const inspectWatcher = async (id, diagnostics) => {
+    const resolved = await resolveWatcher({ id });
+    if (!resolved.ok) {
+        return { ok: false, error: resolved.error };
+    }
+    if (resolved.watcher.source !== 'extension') {
+        return { ok: false, error: `Watcher ${resolved.watcher.id} is not extension-backed.` };
+    }
+    const [status, targets] = await Promise.all([fetchWatcherStatus(resolved.watcher), fetchExtensionTargets(resolved.watcher)]);
+    if (!targets.ok) {
+        return { ok: false, error: targets.error };
+    }
+    const selectedTarget = targets.targets.find((target) => target.attached === true) ?? null;
+    const bridge = diagnostics?.tabWatchers.find((watcher) => watcher.watcherId === resolved.watcher.id) ?? null;
+    const issues = [];
+    if (!status.ok) {
+        issues.push(status.error);
+    }
+    if (!bridge) {
+        issues.push(`Watcher ${resolved.watcher.id} is not present in extension diagnostics.`);
+    }
+    if (status.ok && status.status.attached && !selectedTarget) {
+        issues.push(`Watcher ${resolved.watcher.id} is attached, but no selected target was reported by /targets.`);
+    }
+    return {
+        ok: true,
+        diagnostics: {
+            watcher: resolved.watcher,
+            status: status.ok ? status.status : null,
+            targets: targets.targets,
+            selectedTarget,
+            bridge,
+        },
+        issues,
+    };
+};
+const fetchWatcherStatus = async (watcher) => {
+    try {
+        return { ok: true, status: await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_000 }) };
+    }
+    catch (error) {
+        return { ok: false, error: `${watcher.id}: failed to read status (${formatError(error)})` };
+    }
+};
+const formatError = (error) => (error instanceof Error ? error.message : String(error));
+//# sourceMappingURL=doctor.js.map

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

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

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

@@ -0,0 +1,27 @@
+/**
+ * Stable Chrome extension ID for the Argus CDP Bridge.
+ *
+ * The extension's `manifest.json` pins a public `key`, so Chrome derives this
+ * exact ID on every machine and install path (instead of a path-dependent id).
+ * Because the ID is constant, `argus extension setup`/`install` need no ID
+ * argument and the native messaging host manifest never has to be rewritten.
+ *
+ * Source of truth: `packages/argus-extension/key.pem` (gitignored). Regenerate
+ * both values with `bun run --cwd packages/argus-extension generate-key`, which
+ * updates the manifest `key` and prints the matching id. The drift guard in
+ * `packages/argus/test/extension-id.test.ts` keeps these three in sync.
+ */
+export declare const ARGUS_EXTENSION_ID = "ibhecpfiodfmkpflcnnkkgnjifheefhb";
+/** Base64 SPKI public key pinned as the extension manifest `key` field. */
+export declare const ARGUS_EXTENSION_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1lmJWE8y/3by5FlIta/a35cckp3mOVkFSmn8imDO+6S4xsD7naFwonrRMlMMd6lljOBG+sa5YgiMEeR1XwwyZlSDqXIOaNdizChK8wjtjhYldRmax9NQCbhejFWRyIDsR+B7xmbRsroCnSG667JR6D3q8L5v2Qbd/4rH+zZniqUdZKOPJEyjOBEbWoytX3nTWbJvCy+AHznAtnkIWysQyibUkMIBxDGNBSpx507Cc6kMrWZpnCSkjKtRj7qLpMEat4xQdkOhh3mZCisSimQoMD2Axhnqmyacj8IoKDQX+xkb6qLArO7nWr6QD4rOVWrTdgSBg+4TfW3C2zDCP5UhwIDAQAB";
+/**
+ * Derive a Chrome extension ID from a base64 SPKI public key, matching Chrome's
+ * algorithm: SHA-256 of the DER public key, first 16 bytes, each hex nibble
+ * mapped 0-f -> a-p.
+ *
+ * @param publicKeyBase64 - Base64-encoded DER (SPKI) public key, i.e. the value
+ *   of the manifest `key` field.
+ * @returns The 32-character extension ID.
+ */
+export declare const deriveExtensionId: (publicKeyBase64: string) => string;
+//# sourceMappingURL=extensionId.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extensionId.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/extensionId.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,qCAAqC,CAAA;AAEpE,2EAA2E;AAC3E,eAAO,MAAM,0BAA0B,6YACoW,CAAA;AAE3Y;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,GAAI,iBAAiB,MAAM,KAAG,MAS3D,CAAA"}

package/dist/commands/extension/extensionId.js

@@ -0,0 +1,37 @@
+import { createHash } from 'node:crypto';
+/**
+ * Stable Chrome extension ID for the Argus CDP Bridge.
+ *
+ * The extension's `manifest.json` pins a public `key`, so Chrome derives this
+ * exact ID on every machine and install path (instead of a path-dependent id).
+ * Because the ID is constant, `argus extension setup`/`install` need no ID
+ * argument and the native messaging host manifest never has to be rewritten.
+ *
+ * Source of truth: `packages/argus-extension/key.pem` (gitignored). Regenerate
+ * both values with `bun run --cwd packages/argus-extension generate-key`, which
+ * updates the manifest `key` and prints the matching id. The drift guard in
+ * `packages/argus/test/extension-id.test.ts` keeps these three in sync.
+ */
+export const ARGUS_EXTENSION_ID = 'ibhecpfiodfmkpflcnnkkgnjifheefhb';
+/** Base64 SPKI public key pinned as the extension manifest `key` field. */
+export const ARGUS_EXTENSION_PUBLIC_KEY = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1lmJWE8y/3by5FlIta/a35cckp3mOVkFSmn8imDO+6S4xsD7naFwonrRMlMMd6lljOBG+sa5YgiMEeR1XwwyZlSDqXIOaNdizChK8wjtjhYldRmax9NQCbhejFWRyIDsR+B7xmbRsroCnSG667JR6D3q8L5v2Qbd/4rH+zZniqUdZKOPJEyjOBEbWoytX3nTWbJvCy+AHznAtnkIWysQyibUkMIBxDGNBSpx507Cc6kMrWZpnCSkjKtRj7qLpMEat4xQdkOhh3mZCisSimQoMD2Axhnqmyacj8IoKDQX+xkb6qLArO7nWr6QD4rOVWrTdgSBg+4TfW3C2zDCP5UhwIDAQAB';
+/**
+ * Derive a Chrome extension ID from a base64 SPKI public key, matching Chrome's
+ * algorithm: SHA-256 of the DER public key, first 16 bytes, each hex nibble
+ * mapped 0-f -> a-p.
+ *
+ * @param publicKeyBase64 - Base64-encoded DER (SPKI) public key, i.e. the value
+ *   of the manifest `key` field.
+ * @returns The 32-character extension ID.
+ */
+export const deriveExtensionId = (publicKeyBase64) => {
+    const der = Buffer.from(publicKeyBase64, 'base64');
+    const hash = createHash('sha256').update(der).digest();
+    const hex = hash.subarray(0, 16).toString('hex');
+    let id = '';
+    for (const char of hex) {
+        id += String.fromCharCode(parseInt(char, 16) + 'a'.charCodeAt(0));
+    }
+    return id;
+};
+//# sourceMappingURL=extensionId.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extensionId.js","sourceRoot":"","sources":["../../../src/commands/extension/extensionId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,kCAAkC,CAAA;AAEpE,2EAA2E;AAC3E,MAAM,CAAC,MAAM,0BAA0B,GACtC,0YAA0Y,CAAA;AAE3Y;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,eAAuB,EAAU,EAAE;IACpE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;IAClD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;IACtD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAChD,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACxB,EAAE,IAAI,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,EAAE,CAAA;AACV,CAAC,CAAA"}

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

@@ -0,0 +1,15 @@
+export type ExtensionPathOptions = {
+    json?: boolean;
+};
+/**
+ * Print the absolute path to the unpacked Argus extension to load via
+ * chrome://extensions ("Load unpacked"). The built extension ships inside the
+ * CLI package (`dist/extension`), so end users never run a build step.
+ */
+export declare const runExtensionPath: (options: ExtensionPathOptions) => void;
+/**
+ * Resolve the directory of the loadable unpacked extension, or `null` if no
+ * candidate contains both a manifest and a built service worker.
+ */
+export declare const resolveExtensionDir: () => string | null;
+//# sourceMappingURL=extensionPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extensionPath.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/extensionPath.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,oBAAoB,KAAG,IAqBhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAAO,MAAM,GAAG,IAO/C,CAAA"}