@tiny-fish/cli 0.54.1-next.448 → 0.56.1-next.455

package/dist/commands/auth.js

@@ -1,9 +1,12 @@
 import { spawn } from 'child_process';
 import * as readline from 'readline';
 import { Option } from 'commander';
-import { CONNECT_ATTEMPT_ENV, clearConfig, getDashboardUrl, loadConfig, maskKey, savePendingConnectAttempt, saveConfig, validateKeyFormat, } from '../lib/auth.js';
+import { CONNECT_ATTEMPT_ENV, clearConfig, getDashboardUrl, loadConfig, maskKey, persistApiKeyToEnvironment, savePendingConnectAttempt, saveConfig, validateKeyFormat, } from '../lib/auth.js';
+import { createStdinPrompt } from '../lib/connect-fallback.js';
+import { ConnectInterruptedError } from '../lib/connect-runtime.js';
 import { TINYFISH_API_KEY_VAR } from '../lib/constants.js';
 import { err, errLine, out, outLine, warnLine } from '../lib/output.js';
+import { verifyMcpAuth } from '../lib/verify.js';
 /**
  * Read a key from stdin without echoing it to the terminal.
  * Uses setRawMode on TTY so characters are never written to the screen.
@@ -82,6 +85,56 @@ function warnIfEnvShadows(savedKey) {
     warnLine(`Warning: ${TINYFISH_API_KEY_VAR} is set in your environment and overrides the key just saved. ` +
         `Unset it or update your shell profile, then check with 'tinyfish auth status'.`);
 }
+async function confirmReplaceEnvKey() {
+    try {
+        const answer = await createStdinPrompt()(`${TINYFISH_API_KEY_VAR} in your environment is invalid or expired. Replace it with the new key? [Y/n] `);
+        return !/^n/i.test(answer.trim());
+    }
+    catch (error) {
+        if (error instanceof ConnectInterruptedError)
+            process.exit(130);
+        return false;
+    }
+}
+function replaceEnvKey(key, envKey) {
+    let persisted;
+    try {
+        persisted = persistApiKeyToEnvironment(key, { previousKey: envKey });
+    }
+    catch (error) {
+        errLine(`Could not update your shell profile (${error instanceof Error ? error.message : String(error)}).`);
+        warnIfEnvShadows(key);
+        return;
+    }
+    if (!persisted.replacedPrevious) {
+        warnLine(`Could not find where ${TINYFISH_API_KEY_VAR} is set; unset it manually.`);
+        return;
+    }
+    errLine(process.platform === 'win32'
+        ? `Updated ${persisted.location}. Open a new terminal to use the new key.`
+        : `Updated ${persisted.location}. Run 'source ${persisted.location}' or open a new terminal.`);
+}
+// Only a 401 blames a key; piped input never verifies.
+async function saveKey(key, dashboardUrl) {
+    const envKey = process.env[TINYFISH_API_KEY_VAR];
+    const shadowed = process.stdin.isTTY && envKey && envKey !== key ? envKey : undefined;
+    const [pasted, env] = shadowed
+        ? await Promise.all([verifyMcpAuth(key), verifyMcpAuth(shadowed)])
+        : [];
+    if (pasted?.status === 401) {
+        err(`That key was rejected by TinyFish. Copy a fresh one from ${dashboardUrl}.`);
+        process.exit(1);
+    }
+    saveConfig(key);
+    parkSeedAttempt();
+    out({ status: 'ok', message: 'API key saved', key_preview: maskKey(key) });
+    if (shadowed && env?.status === 401 && (await confirmReplaceEnvKey())) {
+        replaceEnvKey(key, shadowed);
+    }
+    else {
+        warnIfEnvShadows(key);
+    }
+}
 export function registerAuth(program) {
     const auth = program.command('auth').description('Manage your TinyFish API key');
     auth
@@ -125,10 +178,7 @@ export function registerAuth(program) {
             err('Invalid key format. Expected sk-tinyfish-... or sk-mino-...');
             process.exit(1);
         }
-        saveConfig(key);
-        parkSeedAttempt();
-        out({ status: 'ok', message: 'API key saved', key_preview: maskKey(key) });
-        warnIfEnvShadows(key);
+        await saveKey(key, dashboardUrl);
     });
     auth
         .command('set')
@@ -147,10 +197,7 @@ export function registerAuth(program) {
             err('Invalid key format. Expected sk-tinyfish-... or sk-mino-...');
             process.exit(1);
         }
-        saveConfig(key);
-        parkSeedAttempt();
-        out({ status: 'ok', message: 'API key saved', key_preview: maskKey(key) });
-        warnIfEnvShadows(key);
+        await saveKey(key, getDashboardUrl());
     });
     auth
         .command('status')

package/dist/lib/auth.d.ts

@@ -47,8 +47,13 @@ export declare function clearConnectContext(client: string): void;
 interface EnvironmentOptions {
     platform?: typeof process.platform;
     shell?: string;
+    previousKey?: string;
 }
-export declare function persistApiKeyToEnvironment(apiKey: string, options?: EnvironmentOptions): void;
+export interface PersistedEnvironment {
+    location: string;
+    replacedPrevious: boolean;
+}
+export declare function persistApiKeyToEnvironment(apiKey: string, options?: EnvironmentOptions): PersistedEnvironment;
 export declare function clearConfig(): boolean;
 export declare function validateKeyFormat(key: string): boolean;
 export declare function maskKey(key: string): string;

package/dist/lib/auth.js

@@ -229,7 +229,7 @@ export function persistApiKeyToEnvironment(apiKey, options = {}) {
                 cause: result.error,
             });
         }
-        return;
+        return { location: 'your Windows user environment', replacedPrevious: true };
     }
     const shell = path.basename(options.shell ?? process.env['SHELL'] ?? '');
     const fish = shell === 'fish';
@@ -238,15 +238,17 @@ export function persistApiKeyToEnvironment(apiKey, options = {}) {
     const prefix = fish ? `set -gx ${TINYFISH_API_KEY_VAR} ` : `export ${TINYFISH_API_KEY_VAR}=`;
     const assignment = `${prefix}${quotedKey}`;
     const existing = fs.existsSync(profile) ? fs.readFileSync(profile, 'utf8') : '';
+    const lines = existing.split('\n');
     // Drops prior assignments, so repeated logins do not stack stale keys.
-    const cleaned = existing
-        .split('\n')
-        .filter((line) => !line.startsWith(prefix))
-        .join('\n');
+    const cleaned = lines.filter((line) => !line.startsWith(prefix)).join('\n');
+    const { previousKey } = options;
+    const replacedPrevious = previousKey !== undefined &&
+        lines.some((line) => line.startsWith(prefix) && line.includes(previousKey));
     const updated = `${cleaned}${cleaned && !cleaned.endsWith('\n') ? '\n' : ''}${assignment}\n`;
     fs.mkdirSync(path.dirname(profile), { recursive: true });
     fs.writeFileSync(profile, updated, { mode: 0o600 });
     fs.chmodSync(profile, 0o600);
+    return { location: profile, replacedPrevious };
 }
 export function clearConfig() {
     if (!loadConfig().api_key)

package/dist/lib/claude-plugin.js

@@ -1,9 +1,9 @@
 import spawn from 'cross-spawn';
 import { z } from 'zod';
-import { CONNECT_SOURCE, loadConfig, matchesCliKey } from './auth.js';
+import { loadConfig, matchesCliKey } from './auth.js';
 import { captureStdio, capturedOutput, replay } from './cli-install.js';
 import { throwIfInterrupted } from './connect-runtime.js';
-import { CLAUDE_PLUGIN_ID, HARNESS_PROBE_TIMEOUT_MS, TINYFISH_API_KEY_VAR } from './constants.js';
+import { CLAUDE_PLUGIN_ID, HARNESS_PROBE_TIMEOUT_MS, PLUGIN_CONNECT_ATTEMPT_VAR, TINYFISH_API_KEY_VAR, } from './constants.js';
 import { claudeSettingsPath, readSettingsEnv, writeSettingsEnv } from './config/claude-config.js';
 import { noColourEnv, parseJson } from './output.js';
 export const CLAUDE_PLUGIN_SERVER = 'plugin:tinyfish:tinyfish';
@@ -27,21 +27,8 @@ function pluginEnabled(command) {
     const parsed = pluginListSchema.safeParse(parseJson(String(result.stdout ?? '')));
     return parsed.success && parsed.data.some((p) => p.id === CLAUDE_PLUGIN_ID && p.enabled);
 }
-function runInstall(command, attemptId, verbose) {
-    const config = {
-        connect_source: CONNECT_SOURCE,
-        connect_client: 'claude-code',
-        connect_attempt_id: attemptId,
-    };
-    const configArgs = Object.entries(config).flatMap(([k, v]) => ['--config', `${k}=${v}`]);
-    const result = claudeJson(command, [
-        'plugin',
-        'install',
-        CLAUDE_PLUGIN_ID,
-        '--json',
-        '-y',
-        ...configArgs,
-    ]);
+function runInstall(command, verbose) {
+    const result = claudeJson(command, ['plugin', 'install', CLAUDE_PLUGIN_ID, '--json', '-y']);
     if (verbose)
         replay(capturedOutput(result));
     const parsed = installResultSchema.safeParse(parseJson(String(result.stdout ?? '').trim()));
@@ -55,6 +42,17 @@ function runInstall(command, attemptId, verbose) {
     // The connect-event route folds codes it cannot hold to `other`.
     return { installed: false, fallbackReason: parsed.data.failureCode ?? 'unknown' };
 }
+// The plugin templates this into its X-TF-Connect-Attempt-Id header.
+function setPluginAttemptId(attemptId) {
+    try {
+        if (attemptId !== undefined || readSettingsEnv(PLUGIN_CONNECT_ATTEMPT_VAR) !== undefined) {
+            writeSettingsEnv(PLUGIN_CONNECT_ATTEMPT_VAR, attemptId);
+        }
+    }
+    catch {
+        // Malformed settings.json only loses attribution, never the install.
+    }
+}
 /** Seeds the key first; a fallback restores the prior value. */
 export function installClaudeDirectoryPlugin(options) {
     const { command, attemptId, apiKey, verbose } = options;
@@ -72,12 +70,13 @@ export function installClaudeDirectoryPlugin(options) {
     }
     let outcome;
     try {
-        outcome = runInstall(command, attemptId, verbose);
+        outcome = runInstall(command, verbose);
     }
     catch (error) {
         restore?.();
         throw error;
     }
+    setPluginAttemptId(outcome.installed ? attemptId : undefined);
     if (!outcome.installed) {
         restore?.();
         return outcome;
@@ -91,6 +90,7 @@ export function installClaudeDirectoryPlugin(options) {
 }
 /** Compare-only: a key the user set themselves stays. */
 export function removeClaudeSettingsKey() {
+    setPluginAttemptId(undefined);
     if (matchesCliKey(readSettingsEnv(TINYFISH_API_KEY_VAR))) {
         writeSettingsEnv(TINYFISH_API_KEY_VAR, undefined);
     }

package/dist/lib/client.d.ts

@@ -238,7 +238,7 @@ export declare function createDataset(req: datasets.CreateRequest, apiKey: strin
             column: string;
         } | undefined;
     };
-    status: "ready" | "empty" | "populating" | "failed" | "cancelled";
+    status: "failed" | "empty" | "populating" | "ready" | "cancelled";
     target_rows: number;
     row_count: number;
     run: {
@@ -300,7 +300,7 @@ export declare function listDatasets(opts: datasets.ListQuery, apiKey: string):
                 column: string;
             } | undefined;
         };
-        status: "ready" | "empty" | "populating" | "failed" | "cancelled";
+        status: "failed" | "empty" | "populating" | "ready" | "cancelled";
         target_rows: number;
         row_count: number;
         run: {
@@ -343,7 +343,7 @@ export declare function getDataset(id: string, apiKey: string): Promise<{
             column: string;
         } | undefined;
     };
-    status: "ready" | "empty" | "populating" | "failed" | "cancelled";
+    status: "failed" | "empty" | "populating" | "ready" | "cancelled";
     target_rows: number;
     row_count: number;
     run: {
@@ -398,7 +398,7 @@ export declare function populateDataset(id: string, req: datasets.PopulateReques
             column: string;
         } | undefined;
     };
-    status: "ready" | "empty" | "populating" | "failed" | "cancelled";
+    status: "failed" | "empty" | "populating" | "ready" | "cancelled";
     target_rows: number;
     row_count: number;
     run: {

package/dist/lib/connect-native.js

@@ -317,14 +317,16 @@ function performLoginStep(client, pendingLogin, options) {
 }
 // Upper bound only: the URL normally prints within two seconds.
 const SIGN_IN_URL_WAIT_MS = 15_000;
-// 2.x's service lags `mcp add` by under a second (measured on 2.1.4).
+// 2.x's service lags `mcp add` by under a second (measured on 2.1.4 and 2.2.4).
 const STALE_REGISTRATION_RETRIES = 3;
 const STALE_REGISTRATION_DELAY_MS = 1_000;
+// 2.1.x wording, then 2.2.x.
+const STALE_REGISTRATION = /Integration not found|MCP server not found/;
 /** Relays the sign-in link; the harness service finishes it after we exit. */
 async function printDetachedLoginUrl(client, pendingLogin) {
     errLine('Starting TinyFish sign-in...');
     let run = await waitForSignInUrl(client.command, pendingLogin, SIGN_IN_URL_WAIT_MS);
-    for (let retry = 0; retry < STALE_REGISTRATION_RETRIES && run.output.includes('Integration not found'); retry++) {
+    for (let retry = 0; retry < STALE_REGISTRATION_RETRIES && STALE_REGISTRATION.test(run.output); retry++) {
         await new Promise((resolve) => setTimeout(resolve, STALE_REGISTRATION_DELAY_MS));
         run = await waitForSignInUrl(client.command, pendingLogin, SIGN_IN_URL_WAIT_MS);
     }

package/dist/lib/constants.d.ts

@@ -10,6 +10,7 @@ export declare const WEB_SKILL_NAMES: readonly ["tinyfish-authenticated", "tinyf
 export declare const LEGACY_SKILL_NAMES: readonly ["use-tinyfish"];
 /** The descriptor hands this name to harnesses; the probes resolve it. */
 export declare const TINYFISH_API_KEY_VAR = "TINYFISH_API_KEY";
+export declare const PLUGIN_CONNECT_ATTEMPT_VAR = "TINYFISH_PLUGIN_CONNECT_ATTEMPT_ID";
 export declare const TINYFISH_ACCESS_MODE_HEADER = "X-TinyFish-Access-Mode";
 export declare const TINYFISH_KEYLESS_ACCESS_MODE = "keyless";
 export declare const BASE_URL: string;

package/dist/lib/constants.js

@@ -22,6 +22,8 @@ export const WEB_SKILL_NAMES = [
 export const LEGACY_SKILL_NAMES = ['use-tinyfish'];
 /** The descriptor hands this name to harnesses; the probes resolve it. */
 export const TINYFISH_API_KEY_VAR = 'TINYFISH_API_KEY';
+// Not TINYFISH_CONNECT_ATTEMPT_ID: the CLI reads that as an install seed.
+export const PLUGIN_CONNECT_ATTEMPT_VAR = 'TINYFISH_PLUGIN_CONNECT_ATTEMPT_ID';
 export const TINYFISH_ACCESS_MODE_HEADER = 'X-TinyFish-Access-Mode';
 export const TINYFISH_KEYLESS_ACCESS_MODE = 'keyless';
 /** Base URL for the TinyFish API. Override with TINYFISH_API_URL for staging/self-hosted. */

package/dist/lib/datasets.d.ts

@@ -11,10 +11,10 @@ export declare const reattachDelayMs: (attempt: number) => number;
 export declare function pause(ms: number, signal: AbortSignal): Promise<void>;
 export declare const idSchema: z.ZodUUID;
 export declare const statusSchema: z.ZodEnum<{
-    ready: "ready";
+    failed: "failed";
     empty: "empty";
     populating: "populating";
-    failed: "failed";
+    ready: "ready";
     cancelled: "cancelled";
 }>;
 export declare const runStatusSchema: z.ZodEnum<{
@@ -77,10 +77,10 @@ export declare const datasetSchema: z.ZodObject<{
         }, z.core.$loose>>;
     }, z.core.$loose>;
     status: z.ZodEnum<{
-        ready: "ready";
+        failed: "failed";
         empty: "empty";
         populating: "populating";
-        failed: "failed";
+        ready: "ready";
         cancelled: "cancelled";
     }>;
     target_rows: z.ZodNumber;
@@ -172,10 +172,10 @@ export declare const listSchema: z.ZodObject<{
             }, z.core.$loose>>;
         }, z.core.$loose>;
         status: z.ZodEnum<{
-            ready: "ready";
+            failed: "failed";
             empty: "empty";
             populating: "populating";
-            failed: "failed";
+            ready: "ready";
             cancelled: "cancelled";
         }>;
         target_rows: z.ZodNumber;

package/dist/lib/research.d.ts

@@ -3,6 +3,7 @@ export declare const RESEARCH_TIMEOUT_MS = 2700000;
 export declare const START_TIMEOUT_MS = 30000;
 export declare const READ_TIMEOUT_MS = 15000;
 export declare const CANCEL_TIMEOUT_MS = 5000;
+export declare const RESEARCH_QUERY_MAX_LENGTH = 10000;
 export declare const requestSchema: z.ZodObject<{
     query: z.ZodString;
     mode: z.ZodOptional<z.ZodEnum<{

package/dist/lib/research.js

@@ -4,8 +4,9 @@ export const RESEARCH_TIMEOUT_MS = 2_700_000;
 export const START_TIMEOUT_MS = 30_000;
 export const READ_TIMEOUT_MS = 15_000;
 export const CANCEL_TIMEOUT_MS = 5_000;
+export const RESEARCH_QUERY_MAX_LENGTH = 10_000;
 export const requestSchema = z.object({
-    query: z.string().trim().min(1).max(2000),
+    query: z.string().trim().min(1).max(RESEARCH_QUERY_MAX_LENGTH),
     mode: z.enum(['deep', 'max']).optional(),
     output_language: z.string().optional(),
 });

package/dist/lib/setup-telemetry.d.ts

@@ -218,8 +218,8 @@ declare const doctorCompletedPayloadSchema: z.ZodObject<{
 declare const doctorCouldNotRunPayloadSchema: z.ZodObject<{
     outcome: z.ZodLiteral<"could_not_run">;
     error_class: z.ZodEnum<{
-        timeout: "timeout";
         command_not_found: "command_not_found";
+        timeout: "timeout";
         spawn_error: "spawn_error";
         nonzero_exit: "nonzero_exit";
         unexpected_error: "unexpected_error";
@@ -364,8 +364,8 @@ declare const doctorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
 }, z.core.$strip>, z.ZodObject<{
     outcome: z.ZodLiteral<"could_not_run">;
     error_class: z.ZodEnum<{
-        timeout: "timeout";
         command_not_found: "command_not_found";
+        timeout: "timeout";
         spawn_error: "spawn_error";
         nonzero_exit: "nonzero_exit";
         unexpected_error: "unexpected_error";

package/package.json

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

package/skill/pi/tinyfish-research/references/searching.md

@@ -22,7 +22,7 @@ signal. You always know your own task, so there is never a reason to omit it.
 }
 ```
 
-Max 2000 characters. Describe the goal, not the query.
+Max 10,000 characters. Describe the goal, not the query.
 
 ## Writing the query
 

package/skill/tinyfish-research/references/searching.md

@@ -22,7 +22,7 @@ signal. You always know your own task, so there is never a reason to omit it.
 }
 ```
 
-Max 2000 characters. Describe the goal, not the query.
+Max 10,000 characters. Describe the goal, not the query.
 
 ## Writing the query