@vforsh/argus 0.1.16 → 0.1.18

package/dist/commands/evalUntil.js

@@ -1,8 +1,8 @@
 import { createOutput } from '../output/io.js';
-import { parseDurationMs } from '../time.js';
 import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
 import { pollEval } from './evalPolling.js';
-import { parseCount, parseIntervalMs, parseNumber, parseRetryCount, prepareEvalExpression, printError, printSuccess } from './evalShared.js';
+import { createEvalEmitter, parseCount, parseDurationFlagMs, parseIntervalMs, parseRetryCount, parseTimeoutMs, prepareEvalExpression, printSuccess, } from './evalShared.js';
+import { validateEvalResultFileOptions } from './evalResultOutput.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);
@@ -30,24 +30,33 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         process.exitCode = 2;
         return;
     }
-    const totalTimeoutMs = parseTotalTimeout(options.totalTimeout);
+    const totalTimeoutMs = parseDurationFlagMs(options.totalTimeout, '--total-timeout');
     if (totalTimeoutMs.error) {
         output.writeWarn(totalTimeoutMs.error);
         process.exitCode = 2;
         return;
     }
+    const timeoutMs = parseTimeoutMs(options.timeout);
+    if (timeoutMs.error) {
+        output.writeWarn(timeoutMs.error);
+        process.exitCode = 2;
+        return;
+    }
+    if (!validateEvalResultFileOptions(options, output)) {
+        return;
+    }
+    const emitter = createEvalEmitter(options, output);
     const resolved = await resolveWatcherOrExit({ id }, output);
     if (!resolved)
         return;
     const { watcher } = resolved;
-    const timeoutMs = parseNumber(options.timeout);
     const pollResult = await pollEval({
         watcher,
         expression: prepared.expression,
         args: prepared.args,
         awaitPromise: options.await ?? true,
         returnByValue: options.returnByValue ?? true,
-        timeoutMs,
+        timeoutMs: timeoutMs.value,
         failOnException: options.failOnException ?? true,
         retryCount: retryCount.value,
         intervalMs: pollIntervalMs,
@@ -61,11 +70,11 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         shouldStop: ({ response }) => ({ ok: true, matched: Boolean(response.result) }),
     });
     if (pollResult.kind === 'matched') {
-        printSuccess(pollResult.response, options, output, false);
+        await emitter.emitSuccess(pollResult.response, false);
         return;
     }
     if (pollResult.kind === 'eval-error') {
-        printError(pollResult.failure, options, output);
+        emitter.emitError(pollResult.failure);
         process.exitCode = 1;
         return;
     }
@@ -88,24 +97,4 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         process.exitCode = 130;
     }
 };
-const parseTotalTimeout = (value) => {
-    if (value == null) {
-        return {};
-    }
-    const trimmed = value.trim();
-    if (!trimmed) {
-        return { error: 'Invalid --total-timeout value: empty duration.' };
-    }
-    let parsed;
-    if (/^[0-9]+$/.test(trimmed)) {
-        parsed = Number(trimmed);
-    }
-    else {
-        parsed = parseDurationMs(trimmed);
-    }
-    if (parsed == null || !Number.isFinite(parsed) || parsed <= 0) {
-        return { error: 'Invalid --total-timeout value: expected milliseconds or a duration like 30s, 2m, 1h.' };
-    }
-    return { value: parsed };
-};
 //# sourceMappingURL=evalUntil.js.map

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":"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"}

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

@@ -1,4 +1,6 @@
-export type ExtensionAttachOptions = ExtensionTabActionOptions;
+export type ExtensionAttachOptions = ExtensionTabActionOptions & {
+    show?: boolean;
+};
 export type ExtensionDetachOptions = ExtensionTabActionOptions;
 type ExtensionTabActionOptions = {
     tab?: string | number;

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":"AAMA,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAC9D,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;AAWD,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAEtF,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":"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"}

package/dist/commands/extension/attach.js

@@ -2,7 +2,15 @@ import { createOutput } from '../../output/io.js';
 import { formatWatcherLine } from '../../output/format.js';
 import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
 import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
+import { runExtensionShow } from './show.js';
+import { fetchExtensionTabs, formatExtensionTabLine, parseTabSelector, resolveTab, } from './tabSelection.js';
 export const runExtensionAttach = async (options) => {
+    if (options.show) {
+        await runExtensionShow(undefined, options, {
+            missingSelectorReason: 'Specify --tab <tabId>, --url <substring>, or --title <substring>.',
+        });
+        return;
+    }
     await runExtensionTabAction('attach', options);
 };
 export const runExtensionDetach = async (options) => {
@@ -15,16 +23,17 @@ const runExtensionTabAction = async (action, options) => {
         writeResolveFailure(output, options, resolved);
         return;
     }
-    const selector = parseTabSelector(options);
+    const selector = parseTabSelector(options, 'Specify --tab <tabId>, --url <substring>, or --title <substring>.');
     if (!selector.ok) {
         writeTabResolutionFailure(output, options, selector);
         return;
     }
-    const tabs = await fetchTabs(resolved.watcher, selector.selector, output, options);
-    if (!tabs) {
+    const tabs = await fetchExtensionTabs(resolved.watcher, selector.selector);
+    if (!tabs.ok) {
+        writeCommandError(output, options, tabs.error, tabs.error);
         return;
     }
-    const tab = resolveTab(tabs, selector.selector);
+    const tab = resolveTab(tabs.tabs, selector.selector);
     if (!tab.ok) {
         writeTabResolutionFailure(output, options, tab);
         return;
@@ -60,75 +69,6 @@ const runExtensionTabAction = async (action, options) => {
     output.writeHuman(`${verb} request sent via ${resolved.watcher.id}`);
     output.writeHuman(`  ${formatExtensionTabLine(tab.tab)}`);
 };
-const fetchTabs = async (watcher, selector, output, options) => {
-    const query = buildTabsQuery(selector);
-    try {
-        const response = await fetchWatcherJson(watcher, {
-            path: '/tabs',
-            query,
-            timeoutMs: 5_000,
-            returnErrorResponse: true,
-        });
-        if (!response.ok) {
-            writeCommandError(output, options, `Error: ${response.error.message}`, response);
-            return null;
-        }
-        return response.tabs;
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        writeCommandError(output, options, `${watcher.id}: failed to list extension tabs (${message})`, message);
-        return null;
-    }
-};
-const 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 } };
-};
-const 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] };
-};
-const parseTabId = (value) => {
-    if (value === undefined) {
-        return null;
-    }
-    const tabId = typeof value === 'number' ? value : Number(value);
-    return Number.isInteger(tabId) ? tabId : null;
-};
-const buildTabsQuery = (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;
-};
 const writeTabResolutionFailure = (output, options, result) => {
     const matches = 'matches' in result ? result.matches : undefined;
     if (options.json) {
@@ -167,9 +107,4 @@ const writeCommandError = (output, options, humanMessage, jsonPayload) => {
     }
     process.exitCode = 1;
 };
-const formatExtensionTabLine = (tab) => {
-    const state = tab.attached ? 'attached' : 'available';
-    const label = tab.title || '(untitled)';
-    return `${tab.tabId} [${state}] ${label} - ${tab.url}`;
-};
 //# sourceMappingURL=attach.js.map

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":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EACN,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,UAAU,GAGV,MAAM,mBAAmB,CAAA;AAmB1B,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA+B,EAAiB,EAAE;IAC1F,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE;YAC1C,qBAAqB,EAAE,mEAAmE;SAC1F,CAAC,CAAA;QACF,OAAM;IACP,CAAC;IAED,MAAM,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA+B,EAAiB,EAAE;IAC1F,MAAM,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,KAAK,EAAE,MAA0B,EAAE,OAAkC,EAAiB,EAAE;IACrH,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,EAAE,CAAC,CAAA;IAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC9C,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,mEAAmE,CAAC,CAAA;IAC/G,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QACpD,OAAM;IACP,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC1E,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACd,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAM;IACP,CAAC;IAED,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACpD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACb,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QAC/C,OAAM;IACP,CAAC;IAED,IAAI,QAAwC,CAAA;IAC5C,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,gBAAgB,CAAiC,QAAQ,CAAC,OAAO,EAAE;YACnF,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACjD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE;YAC9B,SAAS,EAAE,KAAK;YAChB,mBAAmB,EAAE,IAAI;SACzB,CAAC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtE,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,MAAM,SAAS,OAAO,GAAG,EAAE,OAAO,CAAC,CAAA;QAC3G,OAAM;IACP,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAA;QAChF,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC;YAChB,EAAE,EAAE,IAAI;YACR,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;SAC9B,CAAC,CAAA;QACF,OAAM;IACP,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IACtD,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,qBAAqB,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;IACpE,MAAM,CAAC,UAAU,CAAC,KAAK,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAA;AAID,MAAM,yBAAyB,GAAG,CAAC,MAAuC,EAAE,OAAkC,EAAE,MAAwB,EAAQ,EAAE;IACjJ,MAAM,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;IAChE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAA;IAC9E,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/B,IAAI,OAAO,EAAE,CAAC;YACb,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,SAAS,CAAC,KAAK,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACrD,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAC3B,MAAuC,EACvC,OAAkC,EAClC,QAAoF,EAC7E,EAAE;IACT,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAC5H,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAChC,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC3C,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;YAC7C,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CACzB,MAAuC,EACvC,OAAkC,EAClC,YAAoB,EACpB,WAAmC,EAC5B,EAAE;IACT,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;IACpG,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IAC/B,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;AACrB,CAAC,CAAA"}

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

@@ -0,0 +1,12 @@
+export type ExtensionShowOptions = {
+    tab?: string | number;
+    url?: string;
+    title?: string;
+    json?: boolean;
+};
+type ExtensionShowConfig = {
+    missingSelectorReason?: string;
+};
+export declare const runExtensionShow: (id: string | undefined, options: ExtensionShowOptions, config?: ExtensionShowConfig) => Promise<void>;
+export {};
+//# sourceMappingURL=show.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/show.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,oBAAoB,GAAG;IAClC,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;AAED,KAAK,mBAAmB,GAAG;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAgBD,eAAO,MAAM,gBAAgB,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,oBAAoB,EAAE,SAAQ,mBAAwB,KAAG,OAAO,CAAC,IAAI,CAkE5I,CAAA"}

package/dist/commands/extension/show.js

@@ -0,0 +1,208 @@
+import { createOutput } from '../../output/io.js';
+import { pruneRegistry } from '../../registry.js';
+import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
+import { resolveWatcher } from '../../watchers/resolveWatcher.js';
+import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
+import { fetchExtensionTabs, formatExtensionTabLine, hasTabSelector, isExtensionTab, parseTabSelector, resolveTab, } from './tabSelection.js';
+const WATCHER_POLL_TIMEOUT_MS = 5_000;
+const WATCHER_POLL_INTERVAL_MS = 200;
+export const runExtensionShow = async (id, options, config = {}) => {
+    const output = createOutput(options);
+    if (id && hasTabSelector(options)) {
+        writeFailure(output, options, 'Use either watcher id or --tab/--url/--title, not both.', 2);
+        return;
+    }
+    if (id) {
+        const resolved = await resolveWatcher({ id });
+        if (!resolved.ok) {
+            writeFailure(output, options, resolved.error, resolved.exitCode);
+            return;
+        }
+        if (resolved.watcher.source !== 'extension') {
+            writeFailure(output, options, `Watcher ${resolved.watcher.id} is not extension-backed. Use argus page show ${resolved.watcher.id}.`, 2);
+            return;
+        }
+        await showWatcher(resolved.watcher, null, output, options);
+        return;
+    }
+    const selector = parseTabSelector(options, config.missingSelectorReason ?? 'Specify a watcher id, --tab <tabId>, --url <substring>, or --title <substring>.');
+    if (!selector.ok) {
+        writeFailure(output, options, selector.reason, selector.exitCode);
+        return;
+    }
+    const control = await resolveExtensionWatcher({});
+    if (!control.ok) {
+        writeFailure(output, options, control.error, control.exitCode);
+        return;
+    }
+    const tabs = await fetchExtensionTabs(control.watcher, selector.selector);
+    if (!tabs.ok) {
+        writeFailure(output, options, tabs.error, 1);
+        return;
+    }
+    const tabResult = resolveTab(tabs.tabs, selector.selector);
+    if (!tabResult.ok) {
+        writeTabFailure(output, options, tabResult);
+        return;
+    }
+    const tab = tabResult.tab;
+    if (!tab.attached) {
+        const attached = await attachTab(control.watcher, tab);
+        if (!attached.ok) {
+            writeFailure(output, options, attached.error, 1);
+            return;
+        }
+    }
+    const watcherResult = await waitForTabWatcher(control.watcher, selector.selector, { ...tab, attached: true });
+    if (!watcherResult.ok) {
+        writeWatcherFailure(output, options, watcherResult);
+        return;
+    }
+    await showWatcher(watcherResult.watcher, watcherResult.tab, output, options);
+};
+const showWatcher = async (watcher, tab, output, options) => {
+    let response;
+    try {
+        response = await fetchWatcherJson(watcher, {
+            path: '/visibility',
+            method: 'POST',
+            body: { action: 'show' },
+            timeoutMs: 5_000,
+            returnErrorResponse: true,
+        });
+    }
+    catch (error) {
+        writeFailure(output, options, `${watcher.id}: failed to show page (${formatError(error)})`, 1);
+        return;
+    }
+    if (!response.ok) {
+        writeFailure(output, options, `Error: ${response.error.message}`, 1);
+        return;
+    }
+    if (options.json) {
+        output.writeJson({
+            ok: true,
+            watcherId: watcher.id,
+            tab,
+            visibility: response,
+        });
+        return;
+    }
+    const suffix = response.attached ? '' : ' (will apply on reattach)';
+    output.writeHuman(`shown ${watcher.id}${suffix}`);
+    if (tab) {
+        output.writeHuman(`  ${formatExtensionTabLine(tab)}`);
+    }
+};
+const attachTab = async (controlWatcher, tab) => {
+    let response;
+    try {
+        response = await fetchWatcherJson(controlWatcher, {
+            path: '/attach',
+            method: 'POST',
+            body: { tabId: tab.tabId },
+            timeoutMs: 5_000,
+            returnErrorResponse: true,
+        });
+    }
+    catch (error) {
+        return { ok: false, error: `${controlWatcher.id}: failed to attach tab (${formatError(error)})` };
+    }
+    if (!response.ok) {
+        return { ok: false, error: `Error: ${response.error.message}` };
+    }
+    return { ok: true };
+};
+const waitForTabWatcher = async (controlWatcher, selector, tab) => {
+    const startedAt = Date.now();
+    let lastResult = { ok: false, reason: 'No extension watcher matched the tab.', exitCode: 1 };
+    while (Date.now() - startedAt <= WATCHER_POLL_TIMEOUT_MS) {
+        const latestTab = await refreshTab(controlWatcher, selector, tab);
+        if (latestTab?.watcherId) {
+            // Fresh extension attaches report their tab-scoped watcher id asynchronously through `ext tabs`.
+            const watcher = await resolveWatcherById(latestTab.watcherId);
+            if (watcher) {
+                return { ok: true, watcher, tab: latestTab };
+            }
+        }
+        lastResult = await resolveTabWatcher(latestTab ?? tab);
+        if (lastResult.ok) {
+            return lastResult;
+        }
+        await delay(WATCHER_POLL_INTERVAL_MS);
+    }
+    return lastResult;
+};
+const resolveTabWatcher = async (tab) => {
+    const registry = await pruneRegistry();
+    const extensionWatchers = Object.values(registry.watchers).filter((watcher) => watcher.source === 'extension' && watcher.id !== 'extension-control');
+    const entries = await Promise.all(extensionWatchers.map(async (watcher) => {
+        const status = await fetchStatus(watcher);
+        return status ? { watcher, status } : null;
+    }));
+    const matches = entries.filter((entry) => Boolean(entry?.status.attached && entry.status.target && targetMatchesTab(entry.status.target, tab)));
+    if (matches.length === 0) {
+        return { ok: false, reason: 'No attached extension watcher matched the tab.', exitCode: 1 };
+    }
+    if (matches.length > 1) {
+        return { ok: false, reason: 'Multiple attached extension watchers matched the tab. Use watcher id instead.', exitCode: 2, matches };
+    }
+    return { ok: true, watcher: matches[0].watcher, status: matches[0].status, tab };
+};
+const refreshTab = async (controlWatcher, selector, fallback) => {
+    const tabs = await fetchExtensionTabs(controlWatcher, selector);
+    if (!tabs.ok) {
+        return null;
+    }
+    const tab = resolveTab(tabs.tabs, { kind: 'tab', tabId: fallback.tabId });
+    return tab.ok ? { ...tab.tab, attached: true } : null;
+};
+const resolveWatcherById = async (id) => {
+    const resolved = await resolveWatcher({ id });
+    return resolved.ok && resolved.watcher.source === 'extension' ? resolved.watcher : null;
+};
+const fetchStatus = async (watcher) => {
+    try {
+        return await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_000 });
+    }
+    catch {
+        return null;
+    }
+};
+const targetMatchesTab = (target, tab) => {
+    if (target.url && target.url === tab.url) {
+        return true;
+    }
+    return Boolean(target.title && target.title === tab.title && target.url === tab.url);
+};
+const writeTabFailure = (output, options, result) => {
+    writeFailure(output, options, result.reason, result.exitCode, { matches: result.matches ?? [] });
+};
+const writeWatcherFailure = (output, options, result) => {
+    writeFailure(output, options, result.reason, result.exitCode, {
+        matches: result.matches?.map((entry) => ({
+            watcherId: entry.watcher.id,
+            target: entry.status.target,
+        })),
+    });
+};
+const writeFailure = (output, options, error, exitCode, extra = {}) => {
+    if (options.json) {
+        output.writeJson({ ok: false, error, ...extra });
+    }
+    else {
+        output.writeWarn(error);
+        const matches = extra.matches;
+        if (Array.isArray(matches)) {
+            for (const match of matches) {
+                if (isExtensionTab(match)) {
+                    output.writeWarn(`  ${formatExtensionTabLine(match)}`);
+                }
+            }
+        }
+    }
+    process.exitCode = exitCode;
+};
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const formatError = (error) => (error instanceof Error ? error.message : String(error));
+//# sourceMappingURL=show.js.map

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

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

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

@@ -0,0 +1,45 @@
+import type { ExtensionBrowserTab, WatcherRecord } from '@vforsh/argus-core';
+export type ExtensionTabSelectorOptions = {
+    tab?: string | number;
+    url?: string;
+    title?: string;
+};
+export type TabSelector = {
+    kind: 'tab';
+    tabId: number;
+} | {
+    kind: 'query';
+    url?: string;
+    title?: string;
+};
+export type SelectorResult = {
+    ok: true;
+    selector: TabSelector;
+} | {
+    ok: false;
+    reason: string;
+    exitCode: 2;
+};
+export type TabResolutionResult = {
+    ok: true;
+    tab: ExtensionBrowserTab;
+} | {
+    ok: false;
+    reason: string;
+    exitCode: 2;
+    matches?: ExtensionBrowserTab[];
+};
+export type ExtensionTabsFetchResult = {
+    ok: true;
+    tabs: ExtensionBrowserTab[];
+} | {
+    ok: false;
+    error: string;
+};
+export declare const parseTabSelector: (options: ExtensionTabSelectorOptions, missingReason: string) => SelectorResult;
+export declare const resolveTab: (tabs: ExtensionBrowserTab[], selector: TabSelector) => TabResolutionResult;
+export declare const fetchExtensionTabs: (watcher: WatcherRecord, selector: TabSelector) => Promise<ExtensionTabsFetchResult>;
+export declare const hasTabSelector: (options: ExtensionTabSelectorOptions) => boolean;
+export declare const isExtensionTab: (value: unknown) => value is ExtensionBrowserTab;
+export declare const formatExtensionTabLine: (tab: ExtensionBrowserTab) => string;
+//# sourceMappingURL=tabSelection.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tabSelection.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/tabSelection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,mBAAmB,EAAyB,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGlH,MAAM,MAAM,2BAA2B,GAAG;IACzC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1G,MAAM,MAAM,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,CAAA;CAAE,CAAA;AAE7G,MAAM,MAAM,mBAAmB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,mBAAmB,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAAA;AAEtJ,MAAM,MAAM,wBAAwB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,mBAAmB,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/G,eAAO,MAAM,gBAAgB,GAAI,SAAS,2BAA2B,EAAE,eAAe,MAAM,KAAG,cAmB9F,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,mBAAmB,EAAE,EAAE,UAAU,WAAW,KAAG,mBAS/E,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,OAAO,CAAC,wBAAwB,CAiBxH,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,SAAS,2BAA2B,KAAG,OAAuE,CAAA;AAE7I,eAAO,MAAM,cAAc,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,mBAC6C,CAAA;AAEtG,eAAO,MAAM,sBAAsB,GAAI,KAAK,mBAAmB,KAAG,MAIjE,CAAA"}

package/dist/commands/extension/tabSelection.js

@@ -0,0 +1,76 @@
+import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
+export const parseTabSelector = (options, missingReason) => {
+    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: missingReason, 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 } };
+};
+export const 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] };
+};
+export const fetchExtensionTabs = async (watcher, selector) => {
+    const query = buildTabsQuery(selector);
+    try {
+        const response = await fetchWatcherJson(watcher, {
+            path: '/tabs',
+            query,
+            timeoutMs: 5_000,
+            returnErrorResponse: true,
+        });
+        if (!response.ok) {
+            return { ok: false, error: `Error: ${response.error.message}` };
+        }
+        return { ok: true, tabs: response.tabs };
+    }
+    catch (error) {
+        return { ok: false, error: `${watcher.id}: failed to list extension tabs (${formatError(error)})` };
+    }
+};
+export const hasTabSelector = (options) => Boolean(options.tab != null || options.url || options.title);
+export const isExtensionTab = (value) => Boolean(value && typeof value === 'object' && 'tabId' in value && 'url' in value && 'title' in value);
+export const formatExtensionTabLine = (tab) => {
+    const state = tab.attached ? 'attached' : 'available';
+    const label = tab.title || '(untitled)';
+    return `${tab.tabId} [${state}] ${label} - ${tab.url}`;
+};
+const parseTabId = (value) => {
+    if (value === undefined) {
+        return null;
+    }
+    const tabId = typeof value === 'number' ? value : Number(value);
+    return Number.isInteger(tabId) ? tabId : null;
+};
+const buildTabsQuery = (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;
+};
+const formatError = (error) => (error instanceof Error ? error.message : String(error));
+//# sourceMappingURL=tabSelection.js.map