@tiny-fish/cli 0.30.2-next.264 → 0.30.2-next.265

package/dist/commands/run.js

@@ -124,6 +124,194 @@ async function loadOutputSchema(opts) {
     }
     return parseOutputSchema(fileContents, '--output-schema-file');
 }
+function validateRunInvocation(goal, opts) {
+    if (!opts.url) {
+        err({ error: "required option '--url <url>' not specified" });
+        process.exit(1);
+    }
+    if (opts.sync && opts.async) {
+        err({ error: '--sync and --async are mutually exclusive' });
+        process.exit(1);
+    }
+    // Normalise URL: accept bare hostnames by prepending https://.
+    // The server requires a valid URL — it does not auto-prefix.
+    let normalizedUrl = opts.url;
+    try {
+        new URL(opts.url);
+    }
+    catch {
+        try {
+            new URL(`https://${opts.url}`);
+            normalizedUrl = `https://${opts.url}`;
+        }
+        catch {
+            err({
+                error: `Invalid --url "${opts.url}". Provide a valid URL, e.g. https://example.com or example.com`,
+            });
+            process.exit(1);
+        }
+    }
+    if (!goal.trim()) {
+        err({ error: 'Goal cannot be empty' });
+        process.exit(1);
+    }
+    // The server rejects credential_item_ids without use_vault (400); fail fast here.
+    if (opts.credentialItemId.length > 0 && !opts.useVault) {
+        err({ error: '--credential-item-id requires --use-vault' });
+        process.exit(1);
+    }
+    // The server rejects profile_id without use_profile (400); fail fast here.
+    if (opts.profileId !== undefined && !opts.useProfile) {
+        err({ error: '--profile-id requires --use-profile' });
+        process.exit(1);
+    }
+    return normalizedUrl;
+}
+function buildAgentConfig(opts) {
+    const mode = parseChoice(opts.mode, VALID_MODES, '--mode');
+    const cursorStyle = parseChoice(opts.cursorStyle, VALID_CURSOR_STYLES, '--cursor-style');
+    const maxSteps = parsePositiveInteger(opts.maxSteps, '--max-steps', MAX_STEPS_LIMIT);
+    const maxDurationSeconds = parsePositiveInteger(opts.maxDurationSeconds, '--max-duration-seconds');
+    if (mode === undefined &&
+        cursorStyle === undefined &&
+        maxSteps === undefined &&
+        maxDurationSeconds === undefined) {
+        return undefined;
+    }
+    return {
+        ...(mode !== undefined ? { mode } : {}),
+        ...(cursorStyle !== undefined ? { cursor_style: cursorStyle } : {}),
+        ...(maxSteps !== undefined ? { max_steps: maxSteps } : {}),
+        ...(maxDurationSeconds !== undefined ? { max_duration_seconds: maxDurationSeconds } : {}),
+    };
+}
+function buildCaptureConfig(opts) {
+    if (opts.captureElements === undefined &&
+        opts.captureSnapshots === undefined &&
+        opts.captureScreenshots === undefined &&
+        opts.captureRecording === undefined &&
+        opts.captureHtml === undefined) {
+        return undefined;
+    }
+    return {
+        ...(opts.captureElements !== undefined ? { elements: opts.captureElements } : {}),
+        ...(opts.captureSnapshots !== undefined ? { snapshots: opts.captureSnapshots } : {}),
+        ...(opts.captureScreenshots !== undefined ? { screenshots: opts.captureScreenshots } : {}),
+        ...(opts.captureRecording !== undefined ? { recording: opts.captureRecording } : {}),
+        ...(opts.captureHtml !== undefined ? { html: opts.captureHtml } : {}),
+    };
+}
+async function buildRunRequest(goal, normalizedUrl, opts) {
+    const outputSchema = await loadOutputSchema(opts);
+    const browserProfile = parseChoice(opts.browserProfile, VALID_BROWSER_PROFILES, '--browser-profile');
+    const agentConfig = buildAgentConfig(opts);
+    const captureConfig = buildCaptureConfig(opts);
+    const sessionId = parseSessionId(opts.sessionId);
+    const webhookUrl = parseHttpsUrl(opts.webhookUrl, '--webhook-url');
+    return {
+        goal,
+        url: normalizedUrl,
+        ...(outputSchema !== undefined ? { output_schema: outputSchema } : {}),
+        ...(browserProfile !== undefined ? { browser_profile: browserProfile } : {}),
+        ...(agentConfig !== undefined ? { agent_config: agentConfig } : {}),
+        ...(captureConfig !== undefined ? { capture_config: captureConfig } : {}),
+        ...(webhookUrl !== undefined ? { webhook_url: webhookUrl } : {}),
+        ...(opts.useProfile !== undefined ? { use_profile: opts.useProfile } : {}),
+        ...(opts.profileId !== undefined ? { profile_id: opts.profileId } : {}),
+        ...(sessionId !== undefined ? { session_id: sessionId } : {}),
+        ...(opts.useVault ? { use_vault: true } : {}),
+        ...(opts.credentialItemId.length > 0 ? { credential_item_ids: opts.credentialItemId } : {}),
+    };
+}
+async function runAsyncPath(req, apiKey, pretty) {
+    let result;
+    try {
+        result = await runAsync(req, apiKey);
+    }
+    catch (e) {
+        handleApiError(e);
+    }
+    checkRunResult(result, false); // async = PENDING is expected
+    const asyncResultWithUrl = {
+        ...result,
+        status: RunStatus.PENDING,
+        run_url: `${BASE_URL}/runs/${result.run_id}`,
+    };
+    if (pretty) {
+        outLine(`Run submitted\nID:     ${asyncResultWithUrl.run_id}\nURL:    ${asyncResultWithUrl.run_url}`);
+    }
+    else {
+        out(asyncResultWithUrl);
+    }
+}
+async function runSyncPath(req, apiKey, pretty) {
+    errLine('Waiting for result...');
+    let result;
+    try {
+        result = await runSync(req, apiKey);
+    }
+    catch (e) {
+        handleApiError(e);
+    }
+    checkRunResult(result);
+    const syncResultWithUrl = {
+        ...result,
+        run_url: `${BASE_URL}/runs/${result.run_id}`,
+    };
+    if (pretty) {
+        outLine(`Status: ${syncResultWithUrl.status}\n\n${JSON.stringify(syncResultWithUrl.result ?? {}, null, 2)}`);
+    }
+    else {
+        out(syncResultWithUrl);
+    }
+}
+// Default: SSE stream — Ctrl+C cancels the active run.
+async function runStreamPath(req, apiKey, pretty) {
+    const controller = new AbortController();
+    let siginted = false;
+    let capturedRunId = null;
+    const onSigint = () => {
+        siginted = true;
+        controller.abort();
+    };
+    process.once('SIGINT', onSigint);
+    let streamFailed = false;
+    try {
+        for await (const event of runStream(req, apiKey, controller.signal)) {
+            if (!handleStreamEvent(event, pretty, (id) => {
+                capturedRunId = id;
+            })) {
+                streamFailed = true;
+                break;
+            }
+            if (event.type === EventType.COMPLETE) {
+                break;
+            }
+        }
+    }
+    catch (e) {
+        if (controller.signal.aborted && siginted) {
+            let cancelled = false;
+            if (capturedRunId) {
+                try {
+                    await cancelRun(capturedRunId, apiKey);
+                    cancelled = true;
+                }
+                catch {
+                    /* ignore */
+                }
+            }
+            process.stderr.write(cancelled ? '\nRun cancelled.\n' : '\n');
+            process.exit(130);
+        }
+        handleApiError(e);
+    }
+    finally {
+        process.removeListener('SIGINT', onSigint);
+    }
+    if (streamFailed)
+        process.exit(1);
+}
 export function registerRun(agentCmd) {
     const runCmd = agentCmd
         .command('run')
@@ -159,187 +347,18 @@ export function registerRun(agentCmd) {
             runCmd.help();
             return;
         }
-        if (!opts.url) {
-            err({ error: "required option '--url <url>' not specified" });
-            process.exit(1);
-        }
-        if (opts.sync && opts.async) {
-            err({ error: '--sync and --async are mutually exclusive' });
-            process.exit(1);
-        }
-        // Normalise URL: accept bare hostnames by prepending https://.
-        // The server requires a valid URL — it does not auto-prefix.
-        let normalizedUrl = opts.url;
-        try {
-            new URL(opts.url);
-        }
-        catch {
-            try {
-                new URL(`https://${opts.url}`);
-                normalizedUrl = `https://${opts.url}`;
-            }
-            catch {
-                err({
-                    error: `Invalid --url "${opts.url}". Provide a valid URL, e.g. https://example.com or example.com`,
-                });
-                process.exit(1);
-            }
-        }
-        if (!goal.trim()) {
-            err({ error: 'Goal cannot be empty' });
-            process.exit(1);
-        }
-        // The server rejects credential_item_ids without use_vault (400); fail fast here.
-        const hasCredentialItemIds = opts.credentialItemId.length > 0;
-        if (hasCredentialItemIds && !opts.useVault) {
-            err({ error: '--credential-item-id requires --use-vault' });
-            process.exit(1);
-        }
-        // The server rejects profile_id without use_profile (400); fail fast here.
-        if (opts.profileId !== undefined && !opts.useProfile) {
-            err({ error: '--profile-id requires --use-profile' });
-            process.exit(1);
-        }
-        const outputSchema = await loadOutputSchema(opts);
-        const browserProfile = parseChoice(opts.browserProfile, VALID_BROWSER_PROFILES, '--browser-profile');
-        const mode = parseChoice(opts.mode, VALID_MODES, '--mode');
-        const cursorStyle = parseChoice(opts.cursorStyle, VALID_CURSOR_STYLES, '--cursor-style');
-        const maxSteps = parsePositiveInteger(opts.maxSteps, '--max-steps', MAX_STEPS_LIMIT);
-        const maxDurationSeconds = parsePositiveInteger(opts.maxDurationSeconds, '--max-duration-seconds');
-        const sessionId = parseSessionId(opts.sessionId);
-        const webhookUrl = parseHttpsUrl(opts.webhookUrl, '--webhook-url');
-        const agentConfig = mode !== undefined ||
-            cursorStyle !== undefined ||
-            maxSteps !== undefined ||
-            maxDurationSeconds !== undefined
-            ? {
-                ...(mode !== undefined ? { mode } : {}),
-                ...(cursorStyle !== undefined ? { cursor_style: cursorStyle } : {}),
-                ...(maxSteps !== undefined ? { max_steps: maxSteps } : {}),
-                ...(maxDurationSeconds !== undefined
-                    ? { max_duration_seconds: maxDurationSeconds }
-                    : {}),
-            }
-            : undefined;
-        const captureConfig = opts.captureElements !== undefined ||
-            opts.captureSnapshots !== undefined ||
-            opts.captureScreenshots !== undefined ||
-            opts.captureRecording !== undefined ||
-            opts.captureHtml !== undefined
-            ? {
-                ...(opts.captureElements !== undefined ? { elements: opts.captureElements } : {}),
-                ...(opts.captureSnapshots !== undefined ? { snapshots: opts.captureSnapshots } : {}),
-                ...(opts.captureScreenshots !== undefined
-                    ? { screenshots: opts.captureScreenshots }
-                    : {}),
-                ...(opts.captureRecording !== undefined ? { recording: opts.captureRecording } : {}),
-                ...(opts.captureHtml !== undefined ? { html: opts.captureHtml } : {}),
-            }
-            : undefined;
+        const normalizedUrl = validateRunInvocation(goal, opts);
+        const req = await buildRunRequest(goal, normalizedUrl, opts);
         const apiKey = getApiKey();
-        const req = {
-            goal,
-            url: normalizedUrl,
-            ...(outputSchema !== undefined ? { output_schema: outputSchema } : {}),
-            ...(browserProfile !== undefined ? { browser_profile: browserProfile } : {}),
-            ...(agentConfig !== undefined ? { agent_config: agentConfig } : {}),
-            ...(captureConfig !== undefined ? { capture_config: captureConfig } : {}),
-            ...(webhookUrl !== undefined ? { webhook_url: webhookUrl } : {}),
-            ...(opts.useProfile !== undefined ? { use_profile: opts.useProfile } : {}),
-            ...(opts.profileId !== undefined ? { profile_id: opts.profileId } : {}),
-            ...(sessionId !== undefined ? { session_id: sessionId } : {}),
-            ...(opts.useVault ? { use_vault: true } : {}),
-            ...(hasCredentialItemIds ? { credential_item_ids: opts.credentialItemId } : {}),
-        };
         if (opts.async) {
-            let result;
-            try {
-                result = await runAsync(req, apiKey);
-            }
-            catch (e) {
-                handleApiError(e);
-            }
-            checkRunResult(result, false); // async = PENDING is expected
-            const asyncResultWithUrl = {
-                ...result,
-                status: RunStatus.PENDING,
-                run_url: `${BASE_URL}/runs/${result.run_id}`,
-            };
-            if (opts.pretty) {
-                outLine(`Run submitted\nID:     ${asyncResultWithUrl.run_id}\nURL:    ${asyncResultWithUrl.run_url}`);
-            }
-            else {
-                out(asyncResultWithUrl);
-            }
+            await runAsyncPath(req, apiKey, opts.pretty);
             return;
         }
         if (opts.sync) {
-            errLine('Waiting for result...');
-            let result;
-            try {
-                result = await runSync(req, apiKey);
-            }
-            catch (e) {
-                handleApiError(e);
-            }
-            checkRunResult(result);
-            const syncResultWithUrl = {
-                ...result,
-                run_url: `${BASE_URL}/runs/${result.run_id}`,
-            };
-            if (opts.pretty) {
-                outLine(`Status: ${syncResultWithUrl.status}\n\n${JSON.stringify(syncResultWithUrl.result ?? {}, null, 2)}`);
-            }
-            else {
-                out(syncResultWithUrl);
-            }
+            await runSyncPath(req, apiKey, opts.pretty);
             return;
         }
-        // Default: SSE stream — Ctrl+C cancels the active run.
-        const controller = new AbortController();
-        let siginted = false;
-        let capturedRunId = null;
-        const onSigint = () => {
-            siginted = true;
-            controller.abort();
-        };
-        process.once('SIGINT', onSigint);
-        let streamFailed = false;
-        try {
-            for await (const event of runStream(req, apiKey, controller.signal)) {
-                if (!handleStreamEvent(event, opts.pretty, (id) => {
-                    capturedRunId = id;
-                })) {
-                    streamFailed = true;
-                    break;
-                }
-                if (event.type === EventType.COMPLETE) {
-                    break;
-                }
-            }
-        }
-        catch (e) {
-            if (controller.signal.aborted && siginted) {
-                let cancelled = false;
-                if (capturedRunId) {
-                    try {
-                        await cancelRun(capturedRunId, apiKey);
-                        cancelled = true;
-                    }
-                    catch {
-                        /* ignore */
-                    }
-                }
-                process.stderr.write(cancelled ? '\nRun cancelled.\n' : '\n');
-                process.exit(130);
-            }
-            handleApiError(e);
-        }
-        finally {
-            process.removeListener('SIGINT', onSigint);
-        }
-        if (streamFailed)
-            process.exit(1);
+        await runStreamPath(req, apiKey, opts.pretty);
     });
     return runCmd;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiny-fish/cli",
-  "version": "0.30.2-next.264",
+  "version": "0.30.2-next.265",
   "description": "TinyFish CLI — run web automations from your terminal",
   "type": "module",
   "bin": {