@vforsh/argus 0.1.13 → 0.1.15

package/dist/commands/evalUntil.js

@@ -1,25 +1,16 @@
-import { evalWithRetries } from '../eval/evalClient.js';
 import { createOutput } from '../output/io.js';
 import { parseDurationMs } from '../time.js';
 import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
-import { parseCount, parseIntervalMs, parseNumber, parseRetryCount, printError, printSuccess, resolveExpression, sleep, wrapForIframeEval, } from './evalShared.js';
+import { pollEval } from './evalPolling.js';
+import { parseCount, parseIntervalMs, parseNumber, parseRetryCount, prepareEvalExpression, printError, printSuccess } from './evalShared.js';
 /** Execute the eval-until command: poll until the expression returns a truthy value. */
 export const runEvalUntil = async (id, rawExpression, options) => {
     const output = createOutput(options);
-    const resolvedExpression = await resolveExpression(rawExpression, options, output);
-    if (resolvedExpression == null) {
+    const prepared = await prepareEvalExpression(rawExpression, options, output);
+    if (prepared == null) {
         process.exitCode = 2;
         return;
     }
-    let expression = resolvedExpression;
-    if (options.iframe) {
-        const iframeTimeoutMs = parseNumber(options.iframeTimeout) ?? 5000;
-        expression = wrapForIframeEval(expression, {
-            selector: options.iframe,
-            namespace: options.iframeNamespace ?? 'argus',
-            timeoutMs: iframeTimeoutMs,
-        });
-    }
     const retryCount = parseRetryCount(options.retry);
     if (retryCount.error) {
         output.writeWarn(retryCount.error);
@@ -50,58 +41,50 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         return;
     const { watcher } = resolved;
     const timeoutMs = parseNumber(options.timeout);
-    let running = true;
-    let interrupted = false;
-    const stop = () => {
-        running = false;
-        interrupted = true;
-    };
-    process.on('SIGINT', stop);
-    process.on('SIGTERM', stop);
-    const startTime = Date.now();
-    let iteration = 0;
-    while (running) {
-        // Check total timeout before evaluating
-        if (totalTimeoutMs.value != null) {
-            const elapsed = Date.now() - startTime;
-            if (elapsed >= totalTimeoutMs.value) {
-                output.writeWarn(`Total timeout exceeded (${options.totalTimeout})`);
-                process.exitCode = 1;
-                return;
+    const pollResult = await pollEval({
+        watcher,
+        expression: prepared.expression,
+        args: prepared.args,
+        awaitPromise: options.await ?? true,
+        returnByValue: options.returnByValue ?? true,
+        timeoutMs,
+        failOnException: options.failOnException ?? true,
+        retryCount: retryCount.value,
+        intervalMs: pollIntervalMs,
+        count: countValue.value,
+        totalTimeoutMs: totalTimeoutMs.value,
+        onResult: (response) => {
+            if (!response.result && options.verbose) {
+                printSuccess(response, options, output, true);
             }
-        }
-        iteration += 1;
-        const iterationResult = await evalWithRetries({
-            watcher,
-            expression,
-            awaitPromise: options.await ?? true,
-            returnByValue: options.returnByValue ?? true,
-            timeoutMs,
-            failOnException: options.failOnException ?? true,
-            retryCount: retryCount.value,
-        });
-        if (!iterationResult.ok) {
-            printError(iterationResult, options, output);
-            process.exitCode = 1;
-            return;
-        }
-        const isTruthy = Boolean(iterationResult.response.result);
-        if (isTruthy) {
-            printSuccess(iterationResult.response, options, output, false);
-            return;
-        }
-        if (options.verbose) {
-            printSuccess(iterationResult.response, options, output, true);
-        }
-        // Check count limit after evaluating
-        if (countValue.value != null && iteration >= countValue.value) {
-            output.writeWarn(`Exhausted after ${iteration} iterations without a truthy result`);
-            process.exitCode = 1;
-            return;
-        }
-        await sleep(pollIntervalMs);
-    }
-    if (interrupted) {
+        },
+        shouldStop: ({ response }) => ({ ok: true, matched: Boolean(response.result) }),
+    });
+    if (pollResult.kind === 'matched') {
+        printSuccess(pollResult.response, options, output, false);
+        return;
+    }
+    if (pollResult.kind === 'eval-error') {
+        printError(pollResult.failure, options, output);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'timeout') {
+        output.writeWarn(`Total timeout exceeded (${options.totalTimeout})`);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'exhausted') {
+        output.writeWarn(`Exhausted after ${pollResult.iterations} iterations without a truthy result`);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'condition-error') {
+        output.writeWarn(pollResult.error);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'interrupted') {
         process.exitCode = 130;
     }
 };

package/dist/commands/evalUntil.js.map

@@ -1 +1 @@
-{"version":3,"file":"evalUntil.js","sourceRoot":"","sources":["../../src/commands/evalUntil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evalUntil.js","sourceRoot":"","sources":["../../src/commands/evalUntil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,qBAAqB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AA+B5I,wFAAwF;AACxF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EAAsB,EAAE,aAAiC,EAAE,OAAyB,EAAiB,EAAE;IACzI,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAC5E,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACjD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACpD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IACD,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,IAAI,GAAG,CAAA;IAE9C,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAC9D,IAAI,cAAc,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACtC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAM;IAErB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;IAC5B,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAE9C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC;QACjC,OAAO;QACP,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI;QACnC,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,IAAI;QAC5C,SAAS;QACT,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI;QAChD,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,UAAU,EAAE,cAAc;QAC1B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,cAAc,EAAE,cAAc,CAAC,KAAK;QACpC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACtB,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACzC,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC9C,CAAC;QACF,CAAC;QACD,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;KAC/E,CAAC,CAAA;IAEF,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACnC,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QACzD,OAAM;IACP,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACtC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,2BAA2B,OAAO,CAAC,YAAY,GAAG,CAAC,CAAA;QACpE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACrC,MAAM,CAAC,SAAS,CAAC,mBAAmB,UAAU,CAAC,UAAU,qCAAqC,CAAC,CAAA;QAC/F,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC3C,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACvC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;IACvB,CAAC;AACF,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAsC,EAAE;IAChF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAA;IACnE,CAAC;IAED,IAAI,MAAqB,CAAA;IACzB,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;SAAM,CAAC;QACP,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC/D,OAAO,EAAE,KAAK,EAAE,sFAAsF,EAAE,CAAA;IACzG,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACzB,CAAC,CAAA"}

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

@@ -0,0 +1,20 @@
+import type { RegistryV1, WatcherRecord } from '@vforsh/argus-core';
+export type ResolveExtensionWatcherInput = {
+    id?: string;
+};
+export type ResolveExtensionWatcherResult = {
+    ok: true;
+    watcher: WatcherRecord;
+    registry: RegistryV1;
+} | {
+    ok: false;
+    error: string;
+    exitCode: 1 | 2;
+    candidates?: WatcherRecord[];
+};
+/**
+ * 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.
+ */
+export declare const resolveExtensionWatcher: (input: ResolveExtensionWatcherInput) => Promise<ResolveExtensionWatcherResult>;
+//# sourceMappingURL=resolveExtensionWatcher.d.ts.map

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

@@ -0,0 +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"}

package/dist/commands/extension/resolveExtensionWatcher.js

@@ -0,0 +1,73 @@
+import { pruneRegistry } from '../../registry.js';
+import { fetchWatcherJson } from '../../watchers/requestWatcher.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.
+ */
+export const resolveExtensionWatcher = async (input) => {
+    let registry;
+    try {
+        registry = await pruneRegistry();
+    }
+    catch (error) {
+        return { ok: false, error: `Failed to load registry: ${error instanceof Error ? error.message : error}`, exitCode: 1 };
+    }
+    const allWatchers = Object.values(registry.watchers);
+    if (input.id) {
+        const watcher = registry.watchers[input.id];
+        if (!watcher) {
+            return { ok: false, error: `Watcher not found: ${input.id}`, exitCode: 2, candidates: allWatchers };
+        }
+        if (watcher.source !== 'extension') {
+            return { ok: false, error: `Watcher ${watcher.id} is not extension-backed.`, exitCode: 2, candidates: getExtensionWatchers(allWatchers) };
+        }
+        return { ok: true, watcher, registry };
+    }
+    const extensionWatchers = getExtensionWatchers(allWatchers);
+    if (extensionWatchers.length === 0) {
+        return {
+            ok: false,
+            error: 'No extension-backed watchers found. Attach a tab in the extension popup first.',
+            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 };
+    }
+    return { ok: false, error: 'Watcher id required.', exitCode: 2, candidates: extensionWatchers };
+};
+const getExtensionWatchers = (watchers) => watchers.filter((watcher) => watcher.source === 'extension');
+const checkWatcherStatus = async (watcher) => {
+    try {
+        const status = await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_500 });
+        return { ok: true, status };
+    }
+    catch (error) {
+        return { ok: false, error: error instanceof Error ? error.message : String(error) };
+    }
+};
+//# sourceMappingURL=resolveExtensionWatcher.js.map

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

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

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

@@ -0,0 +1,8 @@
+export type ExtensionTabsOptions = {
+    id?: string;
+    url?: string;
+    title?: string;
+    json?: boolean;
+};
+export declare const runExtensionTabs: (options: ExtensionTabsOptions) => Promise<void>;
+//# sourceMappingURL=tabs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tabs.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/tabs.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,oBAAoB,GAAG;IAClC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAU,SAAS,oBAAoB,KAAG,OAAO,CAAC,IAAI,CA+ClF,CAAA"}

package/dist/commands/extension/tabs.js

@@ -0,0 +1,85 @@
+import { createOutput } from '../../output/io.js';
+import { formatWatcherLine } from '../../output/format.js';
+import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
+import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
+export const runExtensionTabs = async (options) => {
+    const output = createOutput(options);
+    const resolved = await resolveExtensionWatcher({ id: options.id });
+    if (!resolved.ok) {
+        writeResolveFailure(output, options, resolved);
+        return;
+    }
+    const query = buildTabsQuery(options);
+    let response;
+    try {
+        response = await fetchWatcherJson(resolved.watcher, {
+            path: '/tabs',
+            query,
+            timeoutMs: 5_000,
+            returnErrorResponse: true,
+        });
+    }
+    catch (error) {
+        writeCommandError(output, options, `${resolved.watcher.id}: failed to list extension tabs (${formatError(error)})`, formatError(error));
+        process.exitCode = 1;
+        return;
+    }
+    if (!response.ok) {
+        writeCommandError(output, options, `Error: ${response.error.message}`, response);
+        process.exitCode = 1;
+        return;
+    }
+    if (options.json) {
+        output.writeJson({
+            viaWatcherId: resolved.watcher.id,
+            tabs: response.tabs,
+        });
+        return;
+    }
+    output.writeHuman(`Extension tabs via ${resolved.watcher.id}`);
+    if (response.tabs.length === 0) {
+        output.writeHuman('  (none)');
+        return;
+    }
+    for (const tab of response.tabs) {
+        output.writeHuman(`  ${formatExtensionTabLine(tab)}`);
+    }
+};
+const formatExtensionTabLine = (tab) => {
+    const state = tab.attached ? 'attached' : 'available';
+    const label = tab.title || '(untitled)';
+    return `${tab.tabId} [${state}] ${label} - ${tab.url}`;
+};
+const buildTabsQuery = (options) => {
+    const query = new URLSearchParams();
+    const url = options.url?.trim();
+    const title = options.title?.trim();
+    if (url) {
+        query.set('url', url);
+    }
+    if (title) {
+        query.set('title', title);
+    }
+    return query;
+};
+const writeResolveFailure = (output, options, resolved) => {
+    if (options.json) {
+        output.writeJson({ ok: false, error: resolved.error, candidates: resolved.candidates?.map((watcher) => watcher.id) ?? [] });
+    }
+    output.writeWarn(resolved.error);
+    if (resolved.candidates && resolved.candidates.length > 0) {
+        for (const watcher of resolved.candidates) {
+            output.writeWarn(formatWatcherLine(watcher));
+        }
+        output.writeWarn('Hint: pass --id <watcherId> to pick one extension watcher.');
+    }
+    process.exitCode = resolved.exitCode;
+};
+const writeCommandError = (output, options, humanMessage, jsonPayload) => {
+    if (options.json) {
+        output.writeJson(typeof jsonPayload === 'string' ? { ok: false, error: jsonPayload } : jsonPayload);
+    }
+    output.writeWarn(humanMessage);
+};
+const formatError = (error) => (error instanceof Error ? error.message : String(error));
+//# sourceMappingURL=tabs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tabs.js","sourceRoot":"","sources":["../../../src/commands/extension/tabs.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',

package/dist/commands/locate.js.map

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

package/dist/commands/logs.d.ts

@@ -12,5 +12,5 @@ export type LogsOptions = {
     limit?: string;
 };
 /** Execute the logs command for a watcher id. */
-export declare const runLogs: (id: string | undefined, options: LogsOptions) => Promise<void>;
+export declare const runLogs: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], LogsOptions>;
 //# sourceMappingURL=logs.d.ts.map

package/dist/commands/logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAOA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgDxF,CAAA"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAOA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,gFAalB,CAAA"}

package/dist/commands/logs.js

@@ -1,48 +1,39 @@
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { formatLogEvent } from '../output/format.js';
-import { createOutput } from '../output/io.js';
 import { previewLogEvent } from '../output/preview.js';
-import { requestWatcherJson, writeRequestError } from '../watchers/requestWatcher.js';
 import { appendAfterLimitParams, appendLogFilterParams, appendSinceParam } from '../watchers/queryParams.js';
 /** Execute the logs command for a watcher id. */
-export const runLogs = async (id, options) => {
-    const output = createOutput(options);
+export const runLogs = defineWatcherCommand({
+    isJson: (options) => options.jsonFull === true,
+    build: (_args, options, output) => buildLogsPlan(options, output),
+    formatJson: (response, { options }) => (options.jsonFull ? response.events : response.events.map((event) => previewLogEvent(event))),
+    formatHuman: (response, { output, watcher }) => {
+        for (const event of response.events) {
+            output.writeHuman(formatLogEvent(event, {
+                includeTimestamps: watcher.includeTimestamps,
+            }));
+        }
+    },
+});
+const buildLogsPlan = (options, output) => {
     const params = new URLSearchParams();
     appendAfterLimitParams(params, options);
     const filters = appendLogFilterParams(params, options);
     if (filters.error) {
         output.writeWarn(filters.error);
         process.exitCode = 2;
-        return;
+        return null;
     }
     const since = appendSinceParam(params, options.since);
     if (since.error) {
         output.writeWarn(since.error);
         process.exitCode = 2;
-        return;
+        return null;
     }
-    const result = await requestWatcherJson({
-        id,
+    return {
         path: '/logs',
         query: params,
         timeoutMs: 5_000,
-    });
-    if (!result.ok) {
-        writeRequestError(result, output);
-        return;
-    }
-    if (options.jsonFull) {
-        output.writeJson(result.data.events);
-        return;
-    }
-    if (options.json) {
-        const previewEvents = result.data.events.map((event) => previewLogEvent(event));
-        output.writeJson(previewEvents);
-        return;
-    }
-    for (const event of result.data.events) {
-        output.writeHuman(formatLogEvent(event, {
-            includeTimestamps: result.watcher.includeTimestamps,
-        }));
-    }
+    };
 };
 //# sourceMappingURL=logs.js.map

package/dist/commands/logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACrF,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAgB5G,iDAAiD;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAoB,EAAiB,EAAE;IAC5F,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACrD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAe;QACrD,EAAE;QACF,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,KAAK;KAChB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpC,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/E,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;QAC/B,OAAM;IACP,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,CAAC,UAAU,CAChB,cAAc,CAAC,KAAK,EAAE;YACrB,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB;SACnD,CAAC,CACF,CAAA;IACF,CAAC;AACF,CAAC,CAAA"}
+{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAA2B,MAAM,gCAAgC,CAAA;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAgB5G,iDAAiD;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,oBAAoB,CAA4B;IACtE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI;IAC9C,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC;IACjE,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACpI,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9C,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,CAAC,UAAU,CAChB,cAAc,CAAC,KAAK,EAAE;gBACrB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;aAC5C,CAAC,CACF,CAAA;QACF,CAAC;IACF,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,OAAoB,EAAE,MAAc,EAA6B,EAAE;IACzF,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACrD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,KAAK;KAChB,CAAA;AACF,CAAC,CAAA"}

package/dist/commands/net.d.ts

@@ -4,5 +4,5 @@ export type NetOptions = NetCliListOptions & {
     json?: boolean;
 };
 /** Execute the net command for a watcher id. */
-export declare const runNet: (id: string | undefined, options: NetOptions) => Promise<void>;
+export declare const runNet: import("../cli/defineWatcherCommand.js").WatcherCommandRunner<[], NetOptions>;
 //# sourceMappingURL=net.d.ts.map

package/dist/commands/net.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../src/commands/net.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAMvD,mCAAmC;AACnC,MAAM,MAAM,UAAU,GAAG,iBAAiB,GAAG;IAC5C,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,MAAM,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,UAAU,KAAG,OAAO,CAAC,IAAI,CA+BtF,CAAA"}
+{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../src/commands/net.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAMvD,mCAAmC;AACnC,MAAM,MAAM,UAAU,GAAG,iBAAiB,GAAG;IAC5C,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,MAAM,+EAQjB,CAAA"}

package/dist/commands/net.js

@@ -1,33 +1,28 @@
 import { appendNetCommandParams } from './netShared.js';
+import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
 import { formatNetworkRequest } from '../output/net.js';
-import { createOutput } from '../output/io.js';
-import { requestWatcherJson, writeRequestError } from '../watchers/requestWatcher.js';
 /** Execute the net command for a watcher id. */
-export const runNet = async (id, options) => {
-    const output = createOutput(options);
+export const runNet = defineWatcherCommand({
+    build: (_args, options, output) => buildNetPlan(options, output),
+    formatJson: (response) => response.requests,
+    formatHuman: (response, { output }) => {
+        for (const request of response.requests) {
+            output.writeHuman(formatNetworkRequest(request));
+        }
+    },
+});
+const buildNetPlan = (options, output) => {
     const params = new URLSearchParams();
     const query = appendNetCommandParams(params, options);
     if (query.error) {
         output.writeWarn(query.error);
         process.exitCode = 2;
-        return;
+        return null;
     }
-    const result = await requestWatcherJson({
-        id,
+    return {
         path: '/net',
         query: params,
         timeoutMs: 5_000,
-    });
-    if (!result.ok) {
-        writeRequestError(result, output);
-        return;
-    }
-    if (options.json) {
-        output.writeJson(result.data.requests);
-        return;
-    }
-    for (const request of result.data.requests) {
-        output.writeHuman(formatNetworkRequest(request));
-    }
+    };
 };
 //# sourceMappingURL=net.js.map

package/dist/commands/net.js.map

@@ -1 +1 @@
-{"version":3,"file":"net.js","sourceRoot":"","sources":["../../src/commands/net.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAOrF,gDAAgD;AAChD,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAmB,EAAiB,EAAE;IAC1F,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAc;QACpD,EAAE;QACF,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,KAAK;KAChB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACtC,OAAM;IACP,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;IACjD,CAAC;AACF,CAAC,CAAA"}
+{"version":3,"file":"net.js","sourceRoot":"","sources":["../../src/commands/net.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,oBAAoB,EAA2B,MAAM,gCAAgC,CAAA;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAQvD,gDAAgD;AAChD,MAAM,CAAC,MAAM,MAAM,GAAG,oBAAoB,CAA0B;IACnE,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC;IAChE,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ;IAC3C,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrC,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;QACjD,CAAC;IACF,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,CAAC,OAAmB,EAAE,MAAc,EAA6B,EAAE;IACvF,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,KAAK;KAChB,CAAA;AACF,CAAC,CAAA"}