@vforsh/argus 0.3.1 → 0.4.0

package/dist/commands/evalEmit.d.ts

@@ -0,0 +1,35 @@
+import type { EvalResponse } from '@vforsh/argus-core';
+import type { Output } from '../output/io.js';
+import { type EvalResultFileOptions } from './evalResultOutput.js';
+/**
+ * Where an eval result goes: stdout/stderr, and optionally the `--out` file.
+ *
+ * Split out of `evalShared.ts`, which had grown to hold five unrelated concerns.
+ */
+/** Format an exception response into a human-readable string. */
+export declare const formatException: (response: EvalResponse) => string;
+/** Failure shape used by eval emitters. */
+export type EvalAttemptFailure = {
+    ok: false;
+    kind: 'transport' | 'exception';
+    error: string;
+    response?: EvalResponse;
+    attempt: number;
+};
+export type EvalEmitOptions = EvalResultFileOptions & {
+    json?: boolean;
+    silent?: boolean;
+};
+/** Writes eval results to stdout/stderr and optionally to `--out`. */
+export type EvalEmitter = {
+    emitSuccess: (response: EvalResponse, streaming: boolean) => Promise<void>;
+    emitError: (error: EvalAttemptFailure | {
+        kind: 'until';
+        error: string;
+    }) => void;
+};
+/** Create stdout/stderr and optional file sinks for eval command output. */
+export declare const createEvalEmitter: (options: EvalEmitOptions, output: Output) => EvalEmitter;
+/** Write a successful eval response to stdout/stderr only. */
+export declare const writeEvalSuccess: (response: EvalResponse, options: EvalEmitOptions, output: Output, streaming: boolean) => void;
+//# sourceMappingURL=evalEmit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"evalEmit.d.ts","sourceRoot":"","sources":["../../src/commands/evalEmit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAA4B,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAE5F;;;;GAIG;AAEH,iEAAiE;AACjE,eAAO,MAAM,eAAe,GAAI,UAAU,YAAY,KAAG,MAQxD,CAAA;AAMD,2CAA2C;AAC3C,MAAM,MAAM,kBAAkB,GAAG;IAChC,EAAE,EAAE,KAAK,CAAA;IACT,IAAI,EAAE,WAAW,GAAG,WAAW,CAAA;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG;IACrD,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,sEAAsE;AACtE,MAAM,MAAM,WAAW,GAAG;IACzB,WAAW,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,SAAS,EAAE,CAAC,KAAK,EAAE,kBAAkB,GAAG;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CACjF,CAAA;AAED,4EAA4E;AAC5E,eAAO,MAAM,iBAAiB,GAAI,SAAS,eAAe,EAAE,QAAQ,MAAM,KAAG,WAgB5E,CAAA;AAED,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,GAAI,UAAU,YAAY,EAAE,SAAS,eAAe,EAAE,QAAQ,MAAM,EAAE,WAAW,OAAO,KAAG,IAoBvH,CAAA"}

package/dist/commands/evalEmit.js

@@ -0,0 +1,65 @@
+import { previewStringify } from '@vforsh/argus-core';
+import { createEvalResultFileSink } from './evalResultOutput.js';
+/**
+ * Where an eval result goes: stdout/stderr, and optionally the `--out` file.
+ *
+ * Split out of `evalShared.ts`, which had grown to hold five unrelated concerns.
+ */
+/** 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);
+        },
+    };
+};
+/** Write a successful eval response to stdout/stderr only. */
+export 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));
+};
+/** Write an eval error to stdout/stderr only. */
+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);
+};
+//# sourceMappingURL=evalEmit.js.map

package/dist/commands/evalEmit.js.map

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

package/dist/commands/evalIframe.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Cross-frame eval: the CLI can only talk to the top-level page, so an `--iframe` expression is
+ * wrapped in a postMessage round-trip that the iframe's Argus helper script answers.
+ */
+/** Configuration for wrapping an expression for iframe eval via postMessage. */
+export type IframeWrapConfig = {
+    selector: string;
+    namespace: string;
+    timeoutMs: number;
+};
+/**
+ * Wrap an expression to eval it in an iframe via postMessage.
+ * The iframe must have the argus helper script loaded.
+ */
+export declare const wrapForIframeEval: (code: string, config: IframeWrapConfig) => string;
+//# sourceMappingURL=evalIframe.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"evalIframe.d.ts","sourceRoot":"","sources":["../../src/commands/evalIframe.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,QAAQ,gBAAgB,KAAG,MA6B1E,CAAA"}

package/dist/commands/evalIframe.js

@@ -0,0 +1,37 @@
+/**
+ * Cross-frame eval: the CLI can only talk to the top-level page, so an `--iframe` expression is
+ * wrapped in a postMessage round-trip that the iframe's Argus helper script answers.
+ */
+/**
+ * Wrap an expression to eval it in an iframe via postMessage.
+ * The iframe must have the argus helper script loaded.
+ */
+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));
+    };
+    window.addEventListener('message', handler);
+    iframe.contentWindow.postMessage({ type: '${evalType}', id, code: ${escapedCode} }, '*');
+  });
+})()`;
+};
+//# sourceMappingURL=evalIframe.js.map

package/dist/commands/evalIframe.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalIframe.js","sourceRoot":"","sources":["../../src/commands/evalIframe.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,MAAwB,EAAU,EAAE;IACnF,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IACjD,MAAM,QAAQ,GAAG,GAAG,SAAS,OAAO,CAAA;IACpC,MAAM,UAAU,GAAG,GAAG,SAAS,cAAc,CAAA;IAE7C,4CAA4C;IAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAExC,OAAO;0CACkC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;oDACd,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;;;;;;oDAM7B,SAAS;SACpD,SAAS;;8BAEY,UAAU;;;;;;;gDAOQ,QAAQ,gBAAgB,WAAW;;KAE9E,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/evalShared.d.ts

@@ -1,9 +1,5 @@
-import type { EvalResponse } from '@vforsh/argus-core';
 import type { Output } from '../output/io.js';
 import { type EvalArgMap, type EvalArgSourceOptions } from './evalArgs.js';
-import { type EvalResultFileOptions } from './evalResultOutput.js';
-export { type EvalArgMap, hasEvalArgs, parseEvalArgFlags as parseEvalArgs } from './evalArgs.js';
-export { formatError, parseNumber } from '../cli/parse.js';
 type ExpressionSourceOptions = {
     file?: string;
     stdin?: boolean;
@@ -40,8 +36,6 @@ type BundleDecision = {
  * Auto-bundle applies when leading script text uses import/export.
  */
 export declare const resolveBundleDecision: (options: ExpressionSourceOptions, fileContent: string) => BundleDecision;
-/** Read all of stdin into a string. */
-export declare const readStdin: () => Promise<string>;
 /** Parse `--retry` flag into a non-negative integer. */
 export declare const parseRetryCount: (value?: string) => {
     value: number;
@@ -69,48 +63,62 @@ export declare const parseCount: (value?: string) => {
 };
 /** Prepend the reserved `args` binding only when eval arguments were supplied. */
 export declare const wrapExpressionWithArgs: (source: string, args: EvalArgMap) => string;
-/** Sleep for `durationMs` milliseconds. */
-export declare const sleep: (durationMs: number) => Promise<void>;
-/** Format an exception response into a human-readable string. */
-export declare const formatException: (response: EvalResponse) => string;
-/** Failure shape used by eval emitters. */
-export type EvalAttemptFailure = {
-    ok: false;
-    kind: 'transport' | 'exception';
-    error: string;
-    response?: EvalResponse;
-    attempt: number;
-};
-export type EvalEmitOptions = EvalResultFileOptions & {
+/**
+ * Flags `eval` and `eval-until` both accept.
+ *
+ * The two commands share their entire expression/args/iframe/out surface; only `--until`
+ * versus `--total-timeout` semantics differ. Declaring the shared half once means a new
+ * shared flag is added in one place instead of four.
+ */
+export type EvalCommonOptions = {
     json?: boolean;
+    await?: boolean;
+    timeout?: string;
+    returnByValue?: boolean;
+    failOnException?: boolean;
+    retry?: string;
     silent?: boolean;
+    interval?: string;
+    count?: string;
+    /** 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 eval result to a file. */
+    out?: string;
 };
-/** Writes eval results to stdout/stderr and optionally to `--out`. */
-export type EvalEmitter = {
-    emitSuccess: (response: EvalResponse, streaming: boolean) => Promise<void>;
-    emitError: (error: EvalAttemptFailure | {
-        kind: 'until';
-        error: string;
-    }) => void;
-};
-/** Create stdout/stderr and optional file sinks for eval command output. */
-export declare const createEvalEmitter: (options: EvalEmitOptions, output: Output) => EvalEmitter;
-/** Write a successful eval response to stdout/stderr only. */
-export declare const printSuccess: (response: EvalResponse, options: EvalEmitOptions, output: Output, streaming: boolean) => void;
-/** Write an eval error to stdout/stderr only. */
-export declare const printError: (error: EvalAttemptFailure | {
-    kind: "until";
-    error: string;
-}, options: EvalEmitOptions, output: Output) => void;
-/** Configuration for wrapping an expression for iframe eval via postMessage. */
-export type IframeWrapConfig = {
-    selector: string;
-    namespace: string;
-    timeoutMs: number;
+/** Values both eval commands derive from {@link EvalCommonOptions}. */
+export type EvalCommonFlags = {
+    /** Retry attempts. `parseRetryCount` defaults this to 0, so it is never absent. */
+    retryCount: number;
+    intervalMs: number | undefined;
+    count: number | undefined;
+    timeoutMs: number | undefined;
 };
 /**
- * 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 declare const wrapForIframeEval: (code: string, config: IframeWrapConfig) => string;
+export declare const parseEvalCommonFlags: (options: EvalCommonOptions, output: Output) => EvalCommonFlags | null;
+export {};
 //# sourceMappingURL=evalShared.d.ts.map

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

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

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