@tiny-fish/cli 0.16.1-next.163 → 0.16.1-next.165

package/dist/commands/connect.js

@@ -18,10 +18,15 @@ const SKILL_INSTALL_TIMEOUT_MS = 120_000;
 const HERMES_SEED_TIMEOUT_MS = 120_000;
 // An old install is only one reason a flag can go unseen, so no message asserts the cause.
 const SUPPORT_CHECK_DEBUG_HINT = " Set TINYFISH_DEBUG=1 and retry to print the help output TinyFish read.";
-const MCP_LOGIN_UNAVAILABLE_MESSAGE = "Could not confirm this Claude Code installation exposes `claude mcp login`: `claude mcp " +
-    "--help` did not list it. Update Claude Code and retry, or authenticate TinyFish manually " +
-    "from /mcp." +
+const MCP_ADD_UNAVAILABLE_MESSAGE = "Could not confirm this Claude Code installation exposes `claude mcp add`: `claude mcp " +
+    "--help` did not list it. Update Claude Code with `claude update` and retry." +
     SUPPORT_CHECK_DEBUG_HINT;
+// `claude mcp login` only exists upstream from Claude Code 2.1.186; older installs still register.
+const CLAUDE_CODE_KEYED_FALLBACK_NOTE = "Using your stored TinyFish API key: this Claude Code predates one-command sign-in " +
+    "(`claude mcp login`), so no browser sign-in is needed.";
+const CLAUDE_CODE_DEFERRED_AUTH_NOTE = "TinyFish is registered in Claude Code but not signed in: this Claude Code predates " +
+    "one-command sign-in (`claude mcp login`). Open Claude Code and run `/mcp` to sign in to " +
+    "TinyFish. `claude update` gets you one-command sign-in.";
 const CODEX_OAUTH_RESOURCE_UNAVAILABLE_MESSAGE = "Could not confirm this Codex installation supports one-command MCP authentication: `codex " +
     "mcp add --help` did not list `--oauth-resource`. Update Codex and retry, or add TinyFish " +
     "manually with `codex mcp add`." +
@@ -141,11 +146,16 @@ const CLAUDE_CODE = {
     displayName: "Claude Code",
     supportCheck: {
         args: ["mcp", "--help"],
-        patterns: [/^\s*login(?:\s|\[)/m],
-        unavailableMessage: MCP_LOGIN_UNAVAILABLE_MESSAGE,
+        patterns: [/^\s*add(?:\s|\[)/m],
+        optionalPatterns: [/^\s*login(?:\s|\[)/m],
+        unavailableMessage: MCP_ADD_UNAVAILABLE_MESSAGE,
     },
     headerAuthSupported: true,
     loginArgs: ["mcp", "login", "tinyfish"],
+    degradedAuthNotes: {
+        keyed: CLAUDE_CODE_KEYED_FALLBACK_NOTE,
+        deferred: CLAUDE_CODE_DEFERRED_AUTH_NOTE,
+    },
     // Project scope is shared in .mcp.json; a user setup command must not rewrite it.
     removals: [
         { args: ["mcp", "remove", "tinyfish", "--scope", "user"], label: "user TinyFish registration" },
@@ -336,14 +346,18 @@ function requireCommandSupport(client) {
     }
     // Belt and braces with the colour env: a client that ignores NO_COLOR still has to match.
     const output = sanitizeLine(`${result.stdout ?? ""}\n${result.stderr ?? ""}`);
-    if (!client.supportCheck.patterns.every((pattern) => pattern.test(output))) {
-        if (process.env["TINYFISH_DEBUG"]) {
-            errLine(`${client.command} ${client.supportCheck.args.join(" ")} printed:\n${output.trim()}`);
-        }
+    const listed = (patterns) => patterns.every((pattern) => pattern.test(output));
+    const essential = listed(client.supportCheck.patterns);
+    const optionalSupported = listed(client.supportCheck.optionalPatterns ?? []);
+    if ((!essential || !optionalSupported) && process.env["TINYFISH_DEBUG"]) {
+        errLine(`${client.command} ${client.supportCheck.args.join(" ")} printed:\n${output.trim()}`);
+    }
+    if (!essential) {
         throw new PrerequisiteError(client.supportCheck.unavailableMessage, "harness_too_old", {
             harnessVersion: probeHarnessVersion(client.command),
         });
     }
+    return { optionalSupported };
 }
 /** Best-effort; the server rejects non-printable characters and >32 chars. */
 function probeHarnessVersion(command) {
@@ -583,7 +597,7 @@ async function connectNativeMcpClient(client, options) {
     const state = { stage: "prerequisite_check", settled: false };
     await runGuarded(state, telemetry, () => {
         telemetry.track("started");
-        requireCommandSupport(client);
+        const { optionalSupported } = requireCommandSupport(client);
         telemetry.track("checkpoint", { phase: "prerequisite_ok" });
         state.stage = "registration_cleanup";
         for (const removal of client.removals)
@@ -595,7 +609,10 @@ async function connectNativeMcpClient(client, options) {
         // Prod MCP accepts X-API-Key, so a stored key replaces the browser OAuth hop.
         const storedKey = validatedApiKey(options.apiKey);
         const useKeyAuth = client.headerAuthSupported === true && !!storedKey;
-        state.stage = client.loginArgs ? "registration" : "registration_or_authentication";
+        // Undefining `loginArgs` reuses the deferred-auth path codex/hermes already take.
+        const loginDegraded = !!client.loginArgs && !optionalSupported;
+        const loginArgs = loginDegraded ? undefined : client.loginArgs;
+        state.stage = loginArgs ? "registration" : "registration_or_authentication";
         errLine(`Adding TinyFish to ${client.displayName}...`);
         const addResult = spawn.sync(client.command, [
             ...client.addArgs(mcpUrl.toString(), options.mcpUrl),
@@ -612,13 +629,18 @@ async function connectNativeMcpClient(client, options) {
             });
         }
         telemetry.track("checkpoint", { phase: "registered" });
+        const degradedNotes = loginDegraded ? client.degradedAuthNotes : undefined;
         if (useKeyAuth) {
-            errLine("Using your stored TinyFish API key — no browser sign-in needed.");
+            errLine(degradedNotes?.keyed ?? "Using your stored TinyFish API key — no browser sign-in needed.");
+        }
+        else if (degradedNotes) {
+            // Printed here, not with the closing line, so a `--launch` run sees it before the handover.
+            errLine(degradedNotes.deferred);
         }
-        if (client.loginArgs && !useKeyAuth) {
+        if (loginArgs && !useKeyAuth) {
             state.stage = "client_oauth";
             errLine("Signing in to TinyFish...");
-            const loginResult = spawn.sync(client.command, client.loginArgs, {
+            const loginResult = spawn.sync(client.command, loginArgs, {
                 stdio: "inherit",
             });
             if (loginResult.error || loginResult.status !== 0) {
@@ -631,19 +653,19 @@ async function connectNativeMcpClient(client, options) {
         }
         // Registration/OAuth make MCP work; later steps are cosmetic and must not fail the attempt.
         settle(state, telemetry, "completed");
-        runPostInstallSteps(client, options, state, telemetry, useKeyAuth);
+        runPostInstallSteps(client, options, state, telemetry, !loginArgs && !useKeyAuth);
     });
 }
-function connectedLine(client, useKeyAuth) {
-    // Deferred OAuth (codex/hermes): the CLI never observes auth, so don't claim "connected".
-    if (!client.loginArgs && !useKeyAuth) {
+function connectedLine(client, signInDeferred) {
+    // The CLI never observes deferred auth, so don't claim "connected".
+    if (signInDeferred) {
         return (`TinyFish is configured in ${client.displayName}. ${client.displayName} will ask you ` +
             "to sign in to TinyFish the first time you use it.");
     }
     return `TinyFish is connected. Open ${client.displayName} to start using it.`;
 }
 // Runs after `completed` settled: failures warn and report post_install_failed, exit 0.
-function runPostInstallSteps(client, options, state, telemetry, useKeyAuth) {
+function runPostInstallSteps(client, options, state, telemetry, signInDeferred) {
     try {
         state.stage = "cli_install";
         installTinyFishCli();
@@ -661,7 +683,7 @@ function runPostInstallSteps(client, options, state, telemetry, useKeyAuth) {
         if (client.postConnectNote)
             errLine(client.postConnectNote);
         if (!options.launch) {
-            errLine(connectedLine(client, useKeyAuth));
+            errLine(connectedLine(client, signInDeferred));
             return;
         }
         state.stage = "walkthrough_launch";

package/package.json

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