@vforsh/argus 0.3.0 → 0.4.0

package/dist/commands/evalShared.js

@@ -1,15 +1,11 @@
-import { previewStringify } from '@vforsh/argus-core';
 import { readFile } from 'node:fs/promises';
-import { formatError, parseNumber } from '../cli/parse.js';
-import { parseDurationMs } from '../time.js';
+import { formatError } from '../cli/parse.js';
+import { parseDurationMs } from '@vforsh/argus-core';
 import { hasEvalArgs, resolveEvalArgs } from './evalArgs.js';
 import { bundleEvalEntry } from './evalBundle.js';
 import { fileUsesModuleSyntax } from './evalModuleSyntax.js';
-import { createEvalResultFileSink } from './evalResultOutput.js';
-// Re-export eval arg helpers for existing imports and tests.
-export { hasEvalArgs, parseEvalArgFlags as parseEvalArgs } from './evalArgs.js';
-// Re-export shared parsers so existing eval imports keep working.
-export { formatError, parseNumber } from '../cli/parse.js';
+import { wrapForIframeEval } from './evalIframe.js';
+import { readTextInput, selectTextInput } from './inputSource.js';
 /** Resolve script input, eval args, and iframe wrapping into the payload sent to the watcher. */
 export const prepareEvalExpression = async (inline, options, output) => {
     const args = await resolveEvalArgs(options, output);
@@ -50,81 +46,56 @@ export const resolveExpression = async (inline, options, output) => {
     return resolved?.expression ?? null;
 };
 const resolveExpressionSource = async (inline, options, output) => {
-    const wantsStdin = options.stdin === true || inline === '-';
-    const hasInline = inline != null && inline !== '-';
-    const filePath = options.file;
-    const hasFile = filePath != null;
-    if (hasInline && hasFile) {
-        output.writeWarn('Cannot combine an inline expression with --file');
+    // Checked before the source is picked: "--bundle needs --file" is the more actionable message
+    // when a user passes --bundle with no expression at all.
+    if ((options.bundle || options.noBundle) && options.file == null) {
+        output.writeWarn('--bundle and --no-bundle require --file');
         return null;
     }
-    if (hasInline && wantsStdin) {
-        output.writeWarn('Cannot combine an inline expression with --stdin');
+    const selection = selectTextInput({ inline, file: options.file, stdin: options.stdin }, EXPRESSION_INPUT_NAMES, output);
+    if (!selection) {
         return null;
     }
-    if (hasFile && wantsStdin) {
-        output.writeWarn('Cannot combine --file with stdin input');
+    const source = selection.kind === 'file' ? await resolveFileExpression(selection.path, options, output) : await readInlineExpression(selection, output);
+    if (!source) {
         return null;
     }
-    if ((options.bundle || options.noBundle) && !hasFile) {
-        output.writeWarn('--bundle and --no-bundle require --file');
+    const injected = await prependInjectSource(source.expression, options.inject, output);
+    return injected == null ? null : { expression: injected, scenario: source.scenario };
+};
+const EXPRESSION_INPUT_NAMES = {
+    inline: 'an inline expression',
+    file: '--file',
+    stdin: '--stdin',
+    missing: 'Expression is required. Provide an inline expression, --file, or --stdin (or pass - as expression).',
+};
+const readInlineExpression = async (selection, output) => {
+    const expression = await readTextInput(selection, EXPRESSION_INPUT_NAMES, output, 'Expression');
+    return expression == null ? null : { expression };
+};
+/** A `--file` expression may be bundled first; `--bundle`/`--no-bundle` and module syntax decide. */
+const resolveFileExpression = async (filePath, options, output) => {
+    const fileContent = await readTextInput({ kind: 'file', path: filePath }, EXPRESSION_INPUT_NAMES, output, 'File');
+    if (fileContent == null) {
         return null;
     }
-    let expression;
-    let scenario;
-    if (hasFile) {
-        const fileContent = await readFileContent(filePath, options.file, output);
-        if (fileContent == null) {
-            return null;
-        }
-        const bundleDecision = resolveBundleDecision(options, fileContent);
-        if (bundleDecision.autoEnabled) {
-            output.writeWarn('Detected import/export in --file; bundling automatically. Pass --no-bundle to read the file as-is.');
-        }
-        if (bundleDecision.shouldBundle) {
-            const bundled = await bundleEvalEntry(filePath);
-            if (!bundled.ok) {
-                output.writeWarn(`Failed to bundle --file: ${bundled.error}`);
-                return null;
-            }
-            if (!bundled.code.trim()) {
-                output.writeWarn(`Bundled file is empty: ${options.file}`);
-                return null;
-            }
-            expression = bundled.code;
-            scenario = true;
-        }
-        else {
-            expression = fileContent;
-        }
+    const bundleDecision = resolveBundleDecision(options, fileContent);
+    if (bundleDecision.autoEnabled) {
+        output.writeWarn('Detected import/export in --file; bundling automatically. Pass --no-bundle to read the file as-is.');
     }
-    else if (wantsStdin) {
-        try {
-            const content = await readStdin();
-            if (!content.trim()) {
-                output.writeWarn('Stdin input is empty');
-                return null;
-            }
-            expression = content;
-        }
-        catch (error) {
-            output.writeWarn(`Failed to read stdin: ${formatError(error)}`);
-            return null;
-        }
+    if (!bundleDecision.shouldBundle) {
+        return { expression: fileContent };
     }
-    else if (hasInline) {
-        if (!inline.trim()) {
-            output.writeWarn('Expression is empty');
-            return null;
-        }
-        expression = inline;
+    const bundled = await bundleEvalEntry(filePath);
+    if (!bundled.ok) {
+        output.writeWarn(`Failed to bundle --file: ${bundled.error}`);
+        return null;
     }
-    else {
-        output.writeWarn('Expression is required. Provide an inline expression, --file, or --stdin (or pass - as expression).');
+    if (!bundled.code.trim()) {
+        output.writeWarn(`Bundled file is empty: ${filePath}`);
         return null;
     }
-    const injected = await prependInjectSource(expression, options.inject, output);
-    return injected == null ? null : { expression: injected, scenario };
+    return { expression: bundled.code, scenario: true };
 };
 /**
  * `--no-bundle` wins over `--bundle` and auto-detection.
@@ -142,20 +113,6 @@ export const resolveBundleDecision = (options, fileContent) => {
     }
     return { shouldBundle: true, autoEnabled: true };
 };
-const readFileContent = async (filePath, displayPath, output) => {
-    try {
-        const content = await readFile(filePath, 'utf8');
-        if (!content.trim()) {
-            output.writeWarn(`File is empty: ${displayPath}`);
-            return null;
-        }
-        return content;
-    }
-    catch (error) {
-        output.writeWarn(`Failed to read --file: ${formatError(error)}`);
-        return null;
-    }
-};
 const prependInjectSource = async (expression, injectPath, output) => {
     if (injectPath == null) {
         return expression;
@@ -173,17 +130,6 @@ const prependInjectSource = async (expression, injectPath, output) => {
         return null;
     }
 };
-/** Read all of stdin into a string. */
-export const readStdin = async () => new Promise((resolve, reject) => {
-    let data = '';
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', (chunk) => {
-        data += chunk;
-    });
-    process.stdin.on('end', () => resolve(data));
-    process.stdin.on('error', (error) => reject(error));
-    process.stdin.resume();
-});
 // ---------------------------------------------------------------------------
 // Parsing helpers
 // ---------------------------------------------------------------------------
@@ -239,105 +185,31 @@ export const wrapExpressionWithArgs = (source, args) => {
     }
     return `const args = Object.freeze(${JSON.stringify(args)});\n${source}`;
 };
-// ---------------------------------------------------------------------------
-// Timing
-// ---------------------------------------------------------------------------
-/** Sleep for `durationMs` milliseconds. */
-export const sleep = async (durationMs) => {
-    await new Promise((resolve) => setTimeout(resolve, durationMs));
-};
-// ---------------------------------------------------------------------------
-// Formatting
-// ---------------------------------------------------------------------------
-/** Format an exception response into a human-readable string. */
-export const formatException = (response) => {
-    if (!response.exception) {
-        return '';
-    }
-    if (response.exception.details) {
-        return `Exception: ${response.exception.text}\n${previewStringify(response.exception.details)}`;
-    }
-    return `Exception: ${response.exception.text}`;
-};
-/** Create stdout/stderr and optional file sinks for eval command output. */
-export const createEvalEmitter = (options, output) => {
-    const fileSink = createEvalResultFileSink(options);
-    return {
-        emitSuccess: async (response, streaming) => {
-            await fileSink?.write(response, streaming);
-            writeEvalSuccess(response, options, output, streaming);
-            if (fileSink && !streaming && !options.silent) {
-                output.writeHuman(`Result saved: ${fileSink.displayPath}`);
-            }
-        },
-        emitError: (error) => {
-            writeEvalError(error, options, output);
-        },
-    };
-};
-const writeEvalSuccess = (response, options, output, streaming) => {
-    if (options.silent) {
-        return;
-    }
-    if (options.json) {
-        if (streaming) {
-            output.writeJsonLine(response);
-        }
-        else {
-            output.writeJson(response);
-        }
-        return;
-    }
-    if (response.exception) {
-        output.writeHuman(formatException(response));
-        return;
-    }
-    output.writeHuman(previewStringify(response.result));
-};
-const writeEvalError = (error, options, output) => {
-    if (options.json && 'response' in error && error.response) {
-        output.writeJsonLine(error.response);
-    }
-    if (error.kind === 'exception' && 'response' in error && error.response?.exception) {
-        output.writeWarn(formatException(error.response));
-        return;
-    }
-    output.writeWarn(error.error);
-};
-/** Write a successful eval response to stdout/stderr only. */
-export const printSuccess = writeEvalSuccess;
-/** Write an eval error to stdout/stderr only. */
-export const printError = writeEvalError;
 /**
- * Wrap an expression to eval it in an iframe via postMessage.
- * The iframe must have the argus helper script loaded.
+ * Parse the flags both eval commands share, reporting the first failure.
+ *
+ * Each command used to walk the same six-rung parse-warn-exit ladder inline.
+ *
+ * @returns The parsed values, or `null` when a warning has been written and
+ *   `process.exitCode` set.
  */
-export const wrapForIframeEval = (code, config) => {
-    const { selector, namespace, timeoutMs } = config;
-    const evalType = `${namespace}:eval`;
-    const resultType = `${namespace}:eval-result`;
-    // Escape the code for embedding in a string
-    const escapedCode = JSON.stringify(code);
-    return `(async () => {
-  const iframe = document.querySelector(${JSON.stringify(selector)});
-  if (!iframe) throw new Error('Iframe not found: ${selector.replace(/'/g, "\\'")}');
-  if (!iframe.contentWindow) throw new Error('Iframe has no contentWindow');
-  const id = crypto.randomUUID();
-  return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      window.removeEventListener('message', handler);
-      reject(new Error('Iframe eval timeout after ${timeoutMs}ms'));
-    }, ${timeoutMs});
-    const handler = (e) => {
-      if (e.data?.type !== '${resultType}' || e.data.id !== id) return;
-      clearTimeout(timeout);
-      window.removeEventListener('message', handler);
-      if (e.data.ok) resolve(e.data.result);
-      else reject(new Error(e.data.error));
+export const parseEvalCommonFlags = (options, output) => {
+    const retryCount = parseRetryCount(options.retry);
+    const intervalMs = parseIntervalMs(options.interval);
+    const count = parseCount(options.count);
+    const timeoutMs = parseTimeoutMs(options.timeout);
+    for (const parsed of [retryCount, intervalMs, count, timeoutMs]) {
+        if (parsed.error) {
+            output.writeWarn(parsed.error);
+            process.exitCode = 2;
+            return null;
+        }
+    }
+    return {
+        retryCount: retryCount.value,
+        intervalMs: intervalMs.value,
+        count: count.value,
+        timeoutMs: timeoutMs.value,
     };
-    window.addEventListener('message', handler);
-    iframe.contentWindow.postMessage({ type: '${evalType}', id, code: ${escapedCode} }, '*');
-  });
-})()`;
 };
 //# sourceMappingURL=evalShared.js.map

package/dist/commands/evalShared.js.map

@@ -1 +1 @@
-{"version":3,"file":"evalShared.js","sourceRoot":"","sources":["../../src/commands/evalShared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evalShared.js","sourceRoot":"","sources":["../../src/commands/evalShared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAA8C,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,eAAe,EAA2B,MAAM,kBAAkB,CAAA;AA8B1F,iGAAiG;AACjG,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACzC,MAA0B,EAC1B,OAA8B,EAC9B,MAAc,EAC2B,EAAE;IAC3C,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACnD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACvE,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACrB,OAAO;YACN,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC1C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC3B,CAAA;IACF,CAAC;IAED,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA;IACtF,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;QACvC,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,UAAU,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE;YAChF,QAAQ,EAAE,OAAO,CAAC,MAAM;YACxB,SAAS,EAAE,OAAO,CAAC,eAAe,IAAI,OAAO;YAC7C,SAAS,EAAE,eAAe,CAAC,KAAK,IAAI,IAAI;SACxC,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;KAC3B,CAAA;AACF,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAA0B,EAAE,OAAgC,EAAE,MAAc,EAA0B,EAAE;IAC/I,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACvE,OAAO,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAA;AACpC,CAAC,CAAA;AAID,MAAM,uBAAuB,GAAG,KAAK,EACpC,MAA0B,EAC1B,OAAgC,EAChC,MAAc,EAC6B,EAAE;IAC7C,8FAA8F;IAC9F,yDAAyD;IACzD,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAClE,MAAM,CAAC,SAAS,CAAC,yCAAyC,CAAC,CAAA;QAC3D,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,sBAAsB,EAAE,MAAM,CAAC,CAAA;IACvH,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IACvJ,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrF,OAAO,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAA;AACrF,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG;IAC9B,MAAM,EAAE,sBAAsB;IAC9B,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,qGAAqG;CACrG,CAAA;AAEV,MAAM,oBAAoB,GAAG,KAAK,EACjC,SAA6B,EAC7B,MAAc,EAC6B,EAAE;IAC7C,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,sBAAsB,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;IAC/F,OAAO,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAA;AAClD,CAAC,CAAA;AAED,qGAAqG;AACrG,MAAM,qBAAqB,GAAG,KAAK,EAClC,QAAgB,EAChB,OAAgC,EAChC,MAAc,EAC6B,EAAE;IAC7C,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACjH,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAClE,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,CAAC,SAAS,CAAC,oGAAoG,CAAC,CAAA;IACvH,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QAClC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAA;IACnC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC/C,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,4BAA4B,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QAC7D,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1B,MAAM,CAAC,SAAS,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAA;QACtD,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;AACpD,CAAC,CAAA;AAID;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAgC,EAAE,WAAmB,EAAkB,EAAE;IAC9G,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;IACnD,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;IAClD,CAAC;IAED,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;IACnD,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;AACjD,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAkB,EAAE,UAA8B,EAAE,MAAc,EAA0B,EAAE;IAChI,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,UAAU,CAAA;IAClB,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACvD,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1B,MAAM,CAAC,SAAS,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAA;YACvD,OAAO,IAAI,CAAA;QACZ,CAAC;QAED,OAAO,GAAG,YAAY,KAAK,UAAU,EAAE,CAAA;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,CAAC,4BAA4B,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAClE,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA;AAED,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAqC,EAAE;IACpF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,yDAAyD,EAAE,CAAA;IACtF,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,oGAAoG;AACpG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAsC,EAAE;IACrF,OAAO,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;AAChD,CAAC,CAAA;AAED,sHAAsH;AACtH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAc,EAAsC,EAAE;IACpF,OAAO,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,kGAAkG;AAClG,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAyB,EAAE,QAAgB,EAAsC,EAAE;IACtH,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,WAAW,QAAQ,yBAAyB,EAAE,CAAA;IAC/D,CAAC;IAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IACjG,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC/D,OAAO,EAAE,KAAK,EAAE,WAAW,QAAQ,kEAAkE,EAAE,CAAA;IACxG,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,oDAAoD;AACpD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAc,EAAsC,EAAE;IAChF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC9C,OAAO,EAAE,KAAK,EAAE,qDAAqD,EAAE,CAAA;IACxE,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,IAAgB,EAAU,EAAE;IAClF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAA;IACd,CAAC;IAED,OAAO,8BAA8B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,MAAM,EAAE,CAAA;AACzE,CAAC,CAAA;AAoDD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAA0B,EAAE,MAAc,EAA0B,EAAE;IAC1G,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACvC,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAEjD,KAAK,MAAM,MAAM,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;QACjE,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC9B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAO,IAAI,CAAA;QACZ,CAAC;IACF,CAAC;IAED,OAAO;QACN,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,SAAS,EAAE,SAAS,CAAC,KAAK;KAC1B,CAAA;AACF,CAAC,CAAA"}

package/dist/commands/evalUntil.d.ts

@@ -1,38 +1,10 @@
+import { type EvalCommonOptions } from './evalShared.js';
 /** Options for the eval-until command. */
-export type EvalUntilOptions = {
-    json?: boolean;
-    await?: boolean;
-    timeout?: string;
-    returnByValue?: boolean;
-    failOnException?: boolean;
-    retry?: string;
-    silent?: boolean;
-    interval?: string;
-    count?: string;
+export type EvalUntilOptions = EvalCommonOptions & {
+    /** Give up after this much wall-clock time. */
     totalTimeout?: string;
+    /** Report each poll instead of only the match. */
     verbose?: boolean;
-    /** Read expression from a file path. */
-    file?: string;
-    /** Bundle local imports from `--file` before eval. */
-    bundle?: boolean;
-    /** Do not bundle `--file` (disables auto-bundle for import/export). */
-    noBundle?: boolean;
-    /** Read expression from stdin. Also activated when expression is `-`. */
-    stdin?: boolean;
-    /** Read setup code from a file and run it before the expression. */
-    inject?: string;
-    /** CSS selector for iframe to eval in via postMessage (extension mode). */
-    iframe?: string;
-    /** Message type prefix for iframe eval (default: argus). */
-    iframeNamespace?: string;
-    /** Timeout for iframe postMessage response (default: 5000; accepts duration syntax). */
-    iframeTimeout?: string;
-    /** Repeated key=value arguments exposed to scripts as `args`. */
-    arg?: string[];
-    /** Load args from a JSON object file. */
-    args?: string;
-    /** Write the matched eval result to a file. */
-    out?: string;
 };
 /** Execute the eval-until command: poll until the expression returns a truthy value. */
 export declare const runEvalUntil: (id: string | undefined, rawExpression: string | undefined, options: EvalUntilOptions) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"evalUntil.d.ts","sourceRoot":"","sources":["../../src/commands/evalUntil.ts"],"names":[],"mappings":"AAeA,0CAA0C;AAC1C,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,yEAAyE;IACzE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4DAA4D;IAC5D,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,wFAAwF;IACxF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,wFAAwF;AACxF,eAAO,MAAM,YAAY,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,eAAe,MAAM,GAAG,SAAS,EAAE,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CA6GrI,CAAA"}
+{"version":3,"file":"evalUntil.d.ts","sourceRoot":"","sources":["../../src/commands/evalUntil.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAG1H,0CAA0C;AAC1C,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAClD,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kDAAkD;IAClD,OAAO,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wFAAwF;AACxF,eAAO,MAAM,YAAY,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,eAAe,MAAM,GAAG,SAAS,EAAE,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAoFrI,CAAA"}

package/dist/commands/evalUntil.js

@@ -1,7 +1,8 @@
 import { createOutput } from '../output/io.js';
 import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
 import { pollEval } from './evalPolling.js';
-import { createEvalEmitter, parseCount, parseDurationFlagMs, parseIntervalMs, parseRetryCount, parseTimeoutMs, prepareEvalExpression, printSuccess, } from './evalShared.js';
+import { createEvalEmitter, writeEvalSuccess } from './evalEmit.js';
+import { parseDurationFlagMs, parseEvalCommonFlags, prepareEvalExpression } 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) => {
@@ -11,37 +12,16 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         process.exitCode = 2;
         return;
     }
-    const retryCount = parseRetryCount(options.retry);
-    if (retryCount.error) {
-        output.writeWarn(retryCount.error);
-        process.exitCode = 2;
-        return;
-    }
-    const intervalMs = parseIntervalMs(options.interval);
-    if (intervalMs.error) {
-        output.writeWarn(intervalMs.error);
-        process.exitCode = 2;
+    const flags = parseEvalCommonFlags(options, output);
+    if (!flags)
         return;
-    }
-    const pollIntervalMs = intervalMs.value ?? 250;
-    const countValue = parseCount(options.count);
-    if (countValue.error) {
-        output.writeWarn(countValue.error);
-        process.exitCode = 2;
-        return;
-    }
+    const pollIntervalMs = flags.intervalMs ?? 250;
     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;
     }
@@ -56,16 +36,16 @@ export const runEvalUntil = async (id, rawExpression, options) => {
         args: prepared.args,
         awaitPromise: options.await ?? true,
         returnByValue: options.returnByValue ?? true,
-        timeoutMs: timeoutMs.value,
+        timeoutMs: flags.timeoutMs,
         failOnException: options.failOnException ?? true,
-        retryCount: retryCount.value,
+        retryCount: flags.retryCount,
         scenario: prepared.scenario,
         intervalMs: pollIntervalMs,
-        count: countValue.value,
+        count: flags.count,
         totalTimeoutMs: totalTimeoutMs.value,
         onResult: (response) => {
             if (!response.result && options.verbose) {
-                printSuccess(response, options, output, true);
+                writeEvalSuccess(response, options, output, true);
             }
         },
         shouldStop: ({ response }) => ({ ok: true, matched: Boolean(response.result) }),

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.map

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

@@ -1,10 +1,11 @@
+import { emitFailure, emitResolveFailure } from './failures.js';
 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 { waitForTabWatcher } from './tabAttach.js';
 import { fetchExtensionTabs, formatExtensionTabLine, parseTabSelector, resolveTab, } from './tabSelection.js';
+import { formatError } from '../../cli/parse.js';
 export const runExtensionAttach = async (options) => {
     if (options.show) {
         await runExtensionShow(undefined, options, {
@@ -50,7 +51,7 @@ const runExtensionTabAction = async (action, options) => {
         });
     }
     catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
+        const message = formatError(error);
         writeCommandError(output, options, `${resolved.watcher.id}: failed to ${action} tab (${message})`, message);
         return;
     }
@@ -94,34 +95,17 @@ const runExtensionTabAction = async (action, options) => {
     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;
-    if (options.json) {
-        output.writeJson({ ok: false, error: result.reason, matches: matches ?? [] });
-    }
-    else {
-        output.writeWarn(result.reason);
-        if (matches) {
-            for (const tab of matches) {
-                output.writeWarn(`  ${formatExtensionTabLine(tab)}`);
-            }
-        }
-    }
-    process.exitCode = result.exitCode;
+const writeTabResolutionFailure = (output, _options, result) => {
+    const matches = 'matches' in result ? (result.matches ?? []) : [];
+    emitFailure(output, {
+        error: result.reason,
+        exitCode: result.exitCode,
+        hints: matches.map((tab) => `  ${formatExtensionTabLine(tab)}`),
+        details: { matches },
+    });
 };
 const writeResolveFailure = (output, options, resolved) => {
-    if (options.json) {
-        output.writeJson({ ok: false, error: resolved.error, candidates: resolved.candidates?.map((watcher) => watcher.id) ?? [] });
-    }
-    else {
-        output.writeWarn(resolved.error);
-        if (resolved.candidates && resolved.candidates.length > 0) {
-            for (const watcher of resolved.candidates) {
-                output.writeWarn(formatWatcherLine(watcher));
-            }
-        }
-    }
-    process.exitCode = resolved.exitCode;
+    emitResolveFailure(output, resolved);
 };
 const writeCommandError = (output, options, humanMessage, jsonPayload) => {
     if (options.json) {

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.map

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

@@ -1,3 +1,4 @@
+import { formatError } from '../../cli/parse.js';
 import { createOutput } from '../../output/io.js';
 import { formatWatcherLine } from '../../output/format.js';
 import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
@@ -158,6 +159,15 @@ const inspectWatcher = async (id, diagnostics) => {
     if (!bridge) {
         issues.push(`Watcher ${resolved.watcher.id} is not present in extension diagnostics.`);
     }
+    else if (!bridge.connected) {
+        issues.push(`Watcher ${resolved.watcher.id} native bridge is disconnected.`);
+    }
+    if (status.ok && !status.status.attached) {
+        issues.push(`Watcher ${resolved.watcher.id} has no debugger-attached target.`);
+    }
+    if (status.ok && status.status.targetReady === false) {
+        issues.push(`Watcher ${resolved.watcher.id} selected target is not ready for commands.`);
+    }
     if (status.ok && status.status.attached && !selectedTarget) {
         issues.push(`Watcher ${resolved.watcher.id} is attached, but no selected target was reported by /targets.`);
     }
@@ -181,5 +191,4 @@ const fetchWatcherStatus = async (watcher) => {
         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