@tiny-fish/cli 0.25.1-next.216 → 0.25.2-next.220

package/dist/commands/connect.js

@@ -88,9 +88,7 @@ async function connectNativeMcpClient(client, options) {
         const addArgs = keyedAdd
             ? keyedAdd.spec.addArgs(mcpUrl.toString(), keyedAdd.key)
             : client.addArgs(mcpUrl.toString(), options.mcpUrl);
-        const addResult = spawn.sync(client.command, addArgs, {
-            stdio: "inherit",
-        });
+        const addResult = spawn.sync(client.command, addArgs, { stdio: "inherit" });
         if (addResult.error || addResult.status !== 0) {
             throw spawnStepError(`Could not add TinyFish to ${client.displayName}`, addResult);
         }
@@ -111,18 +109,19 @@ async function connectNativeMcpClient(client, options) {
         // A probed client signs in again only when its inline OAuth is known to have been abandoned.
         const retryLogin = client.probeAuthenticated ? addSignedIn === false : true;
         const pendingLogin = !useKeyAuth && retryLogin ? loginArgs : undefined;
+        let signInDeferred = !useKeyAuth && !addSignedIn && !pendingLogin;
         if (pendingLogin) {
             state.stage = "client_oauth";
             errLine("Signing in to TinyFish...");
-            const loginResult = spawn.sync(client.command, pendingLogin, {
-                stdio: "inherit",
-            });
+            const loginResult = spawn.sync(client.command, pendingLogin, { stdio: "inherit" });
             if (loginResult.error || loginResult.status !== 0) {
                 throw spawnStepError(`Could not authenticate TinyFish in ${client.displayName}`, loginResult);
             }
-            telemetry.track("checkpoint", { phase: "oauth_done" });
+            if (client.probeAuthenticated?.() === false)
+                signInDeferred = true;
+            else
+                telemetry.track("checkpoint", { phase: "oauth_done" });
         }
-        const signInDeferred = !useKeyAuth && !addSignedIn && !pendingLogin;
         const authMode = useKeyAuth
             ? AuthMode.ApiKey
             : signInDeferred
@@ -212,7 +211,10 @@ function runCliInstallStep(options, telemetry) {
             throw firstTake ? outcome.error : new HoistedFailureReportedError(outcome.error.message);
         }
         if (firstTake) {
-            telemetry.track("checkpoint", { phase: "cli_installed", stageDurationMs: outcome.durationMs });
+            telemetry.track("checkpoint", {
+                phase: "cli_installed",
+                stageDurationMs: outcome.durationMs,
+            });
         }
         return;
     }
@@ -231,7 +233,7 @@ function trackPostInstallFailure(displayName, state, telemetry, error) {
     if (!(error instanceof HoistedFailureReportedError)) {
         telemetry.track("post_install_failed", {
             failedStage: state.stage,
-            ...(error instanceof ConnectStepError ? { failureReason: error.failureReason } : {}),
+            failureReason: error instanceof ConnectStepError ? error.failureReason : "unexpected_error",
         });
     }
     errLine(`The ${displayName} MCP connection succeeded, but a finishing step ` +

package/dist/lib/connect-clients.d.ts

@@ -53,5 +53,5 @@ export declare const OPENCODE: NativeMcpClient;
 /** Every native MCP client. Derive from this, so a new harness cannot be missed. */
 export declare const NATIVE_MCP_CLIENTS: readonly NativeMcpClient[];
 export declare const OPENCLAW: SupportedCommand;
-export declare function launchNativeMcpClient(client: NativeMcpClient): boolean;
-export declare function launchOpenClawWalkthrough(): boolean;
+export declare function launchNativeMcpClient(client: NativeMcpClient): void;
+export declare function launchOpenClawWalkthrough(): void;

package/dist/lib/connect-clients.js

@@ -192,6 +192,13 @@ export const GROK = {
     removals: [{ args: ["mcp", "remove", "tinyfish"], label: "TinyFish registration from Grok" }],
     addArgs: grokAddArgs,
 };
+// Handover: spawn errors are ours; the exit is the user's.
+function handOverTerminal(command, args, displayName) {
+    const result = spawn.sync(command, args, { stdio: "inherit" });
+    if (result.error) {
+        throw spawnStepError(`Could not launch ${displayName}`, result);
+    }
+}
 function launchHermesWalkthrough() {
     const seedResult = spawn.sync("hermes", ["chat", "-Q", "-q", DEFAULT_ONBOARDING_PROMPT], {
         encoding: "utf8",
@@ -205,15 +212,7 @@ function launchHermesWalkthrough() {
     if (!sessionId) {
         throw new Error("Hermes did not return a walkthrough session ID");
     }
-    const result = spawn.sync("hermes", ["--resume", sessionId], { stdio: "inherit" });
-    if (result.error) {
-        throw spawnStepError("Could not launch Hermes", result);
-    }
-    if (result.signal === "SIGINT" || result.signal === "SIGTERM")
-        return;
-    if (result.status !== 0) {
-        throw spawnStepError(`Hermes walkthrough exited with status ${result.status ?? "unknown"}`, result);
-    }
+    handOverTerminal("hermes", ["--resume", sessionId], "Hermes");
 }
 export const HERMES = {
     command: "hermes",
@@ -235,17 +234,7 @@ export const HERMES = {
 // would be read as a folder. The `--prompt` flag seeds the interactive TUI with a first message
 // (opencode.ai/docs/cli), so the onboarding guide fires just like the other agents.
 function launchOpencode() {
-    const result = spawn.sync("opencode", ["--prompt", DEFAULT_ONBOARDING_PROMPT], {
-        stdio: "inherit",
-    });
-    if (result.error) {
-        throw spawnStepError("Could not launch OpenCode", result);
-    }
-    if (result.signal === "SIGINT" || result.signal === "SIGTERM")
-        return;
-    if (result.status !== 0) {
-        throw spawnStepError(`OpenCode exited with status ${result.status ?? "unknown"}`, result);
-    }
+    handOverTerminal("opencode", ["--prompt", DEFAULT_ONBOARDING_PROMPT], "OpenCode");
 }
 export const OPENCODE = {
     command: "opencode",
@@ -288,31 +277,11 @@ export function launchNativeMcpClient(client) {
     errLine(`Starting the TinyFish walkthrough in ${client.displayName}...`);
     if (client.launchWalkthrough) {
         client.launchWalkthrough();
-        return true;
-    }
-    const result = spawn.sync(client.command, [DEFAULT_ONBOARDING_PROMPT], { stdio: "inherit" });
-    if (result.error) {
-        throw spawnStepError(`Could not launch ${client.displayName}`, result);
-    }
-    if (result.signal === "SIGINT" || result.signal === "SIGTERM")
-        return false;
-    if (result.status !== 0) {
-        throw spawnStepError(`${client.displayName} walkthrough exited with status ${result.status ?? "unknown"}`, result);
+        return;
     }
-    return true;
+    handOverTerminal(client.command, [DEFAULT_ONBOARDING_PROMPT], client.displayName);
 }
 export function launchOpenClawWalkthrough() {
     errLine("Starting the TinyFish walkthrough in OpenClaw...");
-    const result = spawn.sync("openclaw", ["chat", "--message", OPENCLAW_ONBOARDING_PROMPT], {
-        stdio: "inherit",
-    });
-    if (result.error) {
-        throw spawnStepError("Could not launch OpenClaw", result);
-    }
-    if (result.signal === "SIGINT" || result.signal === "SIGTERM")
-        return false;
-    if (result.status !== 0) {
-        throw spawnStepError(`OpenClaw walkthrough exited with status ${result.status ?? "unknown"}`, result);
-    }
-    return true;
+    handOverTerminal("openclaw", ["chat", "--message", OPENCLAW_ONBOARDING_PROMPT], "OpenClaw");
 }

package/dist/lib/connect-runtime.d.ts

@@ -3,11 +3,11 @@ export declare const NON_INTERACTIVE_TIMEOUT_MS = 10000;
 export type AgentClient = "claude-code" | "codex" | "cursor" | "grok" | "hermes" | "openclaw" | "opencode";
 type ConnectStage = "started" | "checkpoint" | "completed" | "failed" | "aborted" | "post_install_failed";
 type ConnectFailureStage = "prerequisite_check" | "registration_cleanup" | "registration" | "registration_or_authentication" | "client_oauth" | "cli_install" | "skill_install" | "authentication" | "walkthrough_launch";
-export declare const CONNECT_FAILURE_REASONS: readonly ["harness_not_installed", "harness_command_unsupported", "harness_too_old", "command_not_found", "timeout", "spawn_error", "nonzero_exit", "invalid_config"];
+export declare const CONNECT_FAILURE_REASONS: readonly ["harness_not_installed", "harness_command_unsupported", "harness_too_old", "command_not_found", "timeout", "spawn_error", "nonzero_exit", "invalid_config", "user_abandoned", "process_terminated", "unexpected_error"];
 type ConnectFailureReason = (typeof CONNECT_FAILURE_REASONS)[number];
 export type ConnectAuthMode = Exclude<AuthMode, AuthMode.Unknown> | "deferred";
 type ConnectCheckpoint = "prerequisite_ok" | "registered" | "oauth_done" | "cli_installed" | "skill_installed" | "authenticated";
-/** Ctrl+C/SIGTERM killed a setup child — abandonment, not error. */
+/** Ctrl+C killed a setup child — abandonment, not error. */
 export declare class ConnectInterruptedError extends Error {
 }
 /** A classified step failure; runGuarded forwards the reason. */

package/dist/lib/connect-runtime.js

@@ -17,8 +17,11 @@ export const CONNECT_FAILURE_REASONS = [
     "spawn_error",
     "nonzero_exit",
     "invalid_config",
+    "user_abandoned",
+    "process_terminated",
+    "unexpected_error",
 ];
-/** Ctrl+C/SIGTERM killed a setup child — abandonment, not error. */
+/** Ctrl+C killed a setup child — abandonment, not error. */
 export class ConnectInterruptedError extends Error {
 }
 /** A classified step failure; runGuarded forwards the reason. */
@@ -41,7 +44,7 @@ export function throwIfInterrupted(result) {
     const code = result.error?.code;
     if (code && NOT_INTERRUPTIONS.has(code))
         return;
-    if (result.signal === "SIGINT" || result.signal === "SIGTERM") {
+    if (result.signal === "SIGINT") {
         throw new ConnectInterruptedError("Setup interrupted");
     }
 }
@@ -75,9 +78,12 @@ export function settle(state, telemetry, stage, detail) {
 // Raw-mode children still surface via throwIfInterrupted; cooked-mode stages
 // (npm/npx/OAuth waits) land here.
 function installConnectSignalGuard(state, telemetry) {
-    return installSignalGuard(async () => {
+    return installSignalGuard(async (signal) => {
         if (!state.settled) {
-            settle(state, telemetry, "aborted", { failedStage: state.stage });
+            settle(state, telemetry, "aborted", {
+                failedStage: state.stage,
+                failureReason: signal === "SIGINT" ? "user_abandoned" : "process_terminated",
+            });
             errLine("Setup interrupted — run the command again to finish.");
         }
         // Settled spans the whole post-install phase; the `completed` POST may still be in flight.
@@ -92,16 +98,18 @@ export async function runGuarded(state, telemetry, body) {
     }
     catch (error) {
         if (error instanceof ConnectInterruptedError) {
-            settle(state, telemetry, "aborted", { failedStage: state.stage });
+            settle(state, telemetry, "aborted", {
+                failedStage: state.stage,
+                failureReason: "user_abandoned",
+            });
             errLine("Setup interrupted — run the command again to finish.");
             process.exitCode = 130;
             return;
         }
         settle(state, telemetry, "failed", {
             failedStage: state.stage,
-            ...(error instanceof ConnectStepError
-                ? { failureReason: error.failureReason, harnessVersion: error.harnessVersion }
-                : {}),
+            failureReason: error instanceof ConnectStepError ? error.failureReason : "unexpected_error",
+            ...(error instanceof ConnectStepError ? { harnessVersion: error.harnessVersion } : {}),
         });
         throw error;
     }
@@ -146,7 +154,11 @@ export function requireCommandSupport(client) {
             harnessVersion: probeHarnessVersion(client.command),
         });
     }
-    return { optionalSupported, keyAuthSupported, harnessVersion: probeHarnessVersion(client.command) };
+    return {
+        optionalSupported,
+        keyAuthSupported,
+        harnessVersion: probeHarnessVersion(client.command),
+    };
 }
 /** Best-effort; the server rejects non-printable characters and >32 chars. */
 function probeHarnessVersion(command) {

package/package.json

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