@tiny-fish/cli 0.26.1-next.223 → 0.26.1-next.226

package/dist/commands/connect.js

@@ -5,7 +5,7 @@ import { HoistedFailureReportedError, installTinyFishCli, SKILL_INSTALL_TIMEOUT_
 import { ensureCliAuthenticated } from "../lib/connect-auth.js";
 import { installWebSkill } from "../lib/skill-install.js";
 import { ConnectInterruptedError, ConnectStepError, createConnectTelemetry, finishSetupCommand, requireCommandSupport, runGuarded, settle, spawnStepError, throwIfInterrupted, NON_INTERACTIVE_TIMEOUT_MS, } from "../lib/connect-runtime.js";
-import { cursorInstallDeeplink, cursorMcpPath, writeCursorMcpConfig, } from "../lib/cursor-config.js";
+import { cursorInstallDeeplink, cursorMcpPath, readCursorTinyfishEntry, writeCursorMcpConfig, } from "../lib/cursor-config.js";
 import { runConnectAll } from "../lib/connect-all.js";
 import { AuthMode } from "../lib/harness-detect.js";
 import { detectHumanInitiated } from "../lib/harness.js";
@@ -67,8 +67,8 @@ async function connectNativeMcpClient(client, options) {
                 throw new ConnectStepError(`This ${client.displayName} install cannot take a TinyFish API key, and signing in ` +
                     `needs a terminal. Update it, then re-run: tinyfish connect ${client.connectClient}`, "harness_too_old");
             }
-            throw new Error(`${client.displayName} cannot take a TinyFish API key, and signing in needs a ` +
-                `terminal. Run: tinyfish connect ${client.connectClient}`);
+            throw new ConnectStepError(`${client.displayName} cannot take a TinyFish API key, and signing in needs a ` +
+                `terminal. Run: tinyfish connect ${client.connectClient}`, "key_auth_unsupported");
         }
         telemetry.track("checkpoint", { phase: "prerequisite_ok" });
         state.stage = "registration_cleanup";
@@ -319,7 +319,36 @@ export async function connectOpenClaw(options) {
 }
 /** Writes mcp.json directly — no `cursor mcp add` exists. */
 export async function connectCursor(options) {
-    const telemetry = createConnectTelemetry(options.mcpUrl, "cursor", options);
+    let fallbackAttemptId;
+    const registeredUrl = readCursorTinyfishEntry().url;
+    if (registeredUrl) {
+        try {
+            const registered = new URL(registeredUrl);
+            const requested = new URL(options.mcpUrl);
+            const registeredId = registered.searchParams.get("connect_attempt_id");
+            const registeredSource = registered.searchParams.get("source");
+            const registeredClient = registered.searchParams.get("client");
+            for (const key of ["source", "client", "connect_attempt_id"]) {
+                registered.searchParams.delete(key);
+                requested.searchParams.delete(key);
+            }
+            registered.searchParams.sort();
+            requested.searchParams.sort();
+            if (registered.toString() === requested.toString() &&
+                registeredSource === CONNECT_SOURCE &&
+                registeredClient === "cursor" &&
+                z.uuid().safeParse(registeredId).success) {
+                fallbackAttemptId = registeredId ?? undefined;
+            }
+        }
+        catch {
+            // A hand-edited invalid URL is repaired below with a fresh attempt id.
+        }
+    }
+    const telemetry = createConnectTelemetry(options.mcpUrl, "cursor", {
+        ...options,
+        fallbackAttemptId,
+    });
     // Never degraded: no sign-in command to be missing. False, not absent, so a `= false`
     // filter still catches Cursor.
     const state = {
@@ -347,7 +376,7 @@ export async function connectCursor(options) {
         const mcpUrl = new URL(options.mcpUrl);
         mcpUrl.searchParams.set("source", CONNECT_SOURCE);
         mcpUrl.searchParams.set("client", "cursor");
-        // Attempt id rides telemetry only; persisting it would break idempotency.
+        mcpUrl.searchParams.set("connect_attempt_id", telemetry.attemptId);
         const result = writeCursorMcpConfig(mcpUrl.toString(), resolvedKey);
         if (result.status === "corrupt_skip") {
             throw new ConnectStepError(`Could not update ${cursorMcpPath()}: existing file could not be read or is not valid JSON (${result.error}). ` +

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

@@ -3,7 +3,7 @@ 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", "user_abandoned", "process_terminated", "unexpected_error"];
+export declare const CONNECT_FAILURE_REASONS: readonly ["harness_not_installed", "harness_command_unsupported", "harness_too_old", "key_auth_unsupported", "command_not_found", "timeout", "spawn_error", "nonzero_exit", "invalid_config", "user_abandoned", "process_terminated", "unexpected_error"];
 export 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";
@@ -84,5 +84,6 @@ export declare function requireCommandSupport(client: SupportedCommand): {
 export declare function createConnectTelemetry(mcpUrl: string, client: AgentClient, opts?: {
     apiKey?: string;
     attemptId?: string;
+    fallbackAttemptId?: string;
 }): ConnectTelemetry;
 export {};

package/dist/lib/connect-runtime.js

@@ -12,6 +12,7 @@ export const CONNECT_FAILURE_REASONS = [
     "harness_not_installed",
     "harness_command_unsupported",
     "harness_too_old",
+    "key_auth_unsupported",
     "command_not_found",
     "timeout",
     "spawn_error",
@@ -192,7 +193,7 @@ export function createConnectTelemetry(mcpUrl, client, opts) {
     const seeded = takeSeedAttemptId();
     // A setup-page id (via --url, the env var, or one parked by login) joins "copied the
     // command" to this install attempt.
-    const attemptId = opts?.attemptId ?? seeded ?? randomUUID();
+    const attemptId = opts?.attemptId ?? seeded ?? opts?.fallbackAttemptId ?? randomUUID();
     const endpoint = new URL("/api/cli/connect-event", mcpUrl).toString();
     const pending = [];
     let lastTrackAt;

package/package.json

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