@tiny-fish/cli 0.2.0 → 0.2.1-next.83

package/README.md

@@ -10,6 +10,34 @@ npm install -g @tiny-fish/cli
 
 Requires Node.js 24+.
 
+### Connect Claude Code
+
+Add TinyFish, complete MCP OAuth, and start the interactive walkthrough with one command:
+
+```bash
+npx -y @tiny-fish/cli@latest connect claude-code --launch
+```
+
+One-command OAuth requires a Claude Code release whose `claude mcp` command supports `login`.
+Update Claude Code if the command reports that support is unavailable; older versions require
+manual authentication from `/mcp`.
+
+The command replaces existing user- and local-scope TinyFish registrations. It intentionally
+leaves project-scoped `.mcp.json` entries unchanged because those are shared repository
+configuration.
+
+### Connect Codex
+
+Add TinyFish, complete MCP OAuth, and start the interactive walkthrough with one command:
+
+```bash
+npx -y @tiny-fish/cli@latest connect codex --launch
+```
+
+One-command OAuth requires a Codex release whose `codex mcp add` command supports
+`--oauth-resource`. Update Codex if support is unavailable, or add TinyFish manually with
+`codex mcp add`.
+
 ## Authentication
 
 Get your API key from [agent.tinyfish.ai](https://agent.tinyfish.ai).

package/dist/commands/connect.d.ts

@@ -0,0 +1,11 @@
+import { Command } from "commander";
+export declare const DEFAULT_ONBOARDING_PROMPT: string;
+export declare function connectClaudeCode(options: {
+    mcpUrl: string;
+    launch: boolean;
+}): void;
+export declare function connectCodex(options: {
+    mcpUrl: string;
+    launch: boolean;
+}): void;
+export declare function registerConnect(program: Command): void;

package/dist/commands/connect.js

@@ -0,0 +1,164 @@
+import spawn from "cross-spawn";
+import { errLine } from "../lib/output.js";
+const DEFAULT_MCP_URL = "https://agent.tinyfish.ai/mcp";
+const NON_INTERACTIVE_TIMEOUT_MS = 10_000;
+const MCP_LOGIN_UNAVAILABLE_MESSAGE = "This Claude Code installation does not expose `claude mcp login`, which is required for " +
+    "one-command MCP authentication. Update Claude Code and retry, or authenticate TinyFish " +
+    "manually from /mcp.";
+const CODEX_OAUTH_RESOURCE_UNAVAILABLE_MESSAGE = "This Codex installation does not support one-command MCP authentication. Update Codex and " +
+    "retry, or add TinyFish manually with `codex mcp add`.";
+export const DEFAULT_ONBOARDING_PROMPT = "I just connected TinyFish. Call the guide_next_step tool now to begin. Then follow its " +
+    "instructions one step at a time. Ask for my input and wait for my reply before each subsequent " +
+    "TinyFish tool call.";
+const CLAUDE_CODE = {
+    command: "claude",
+    displayName: "Claude Code",
+    supportCheck: {
+        args: ["mcp", "--help"],
+        pattern: /^\s*login(?:\s|\[)/m,
+        unavailableMessage: MCP_LOGIN_UNAVAILABLE_MESSAGE,
+    },
+    loginArgs: ["mcp", "login", "tinyfish"],
+    // 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" },
+        {
+            args: ["mcp", "remove", "tinyfish", "--scope", "local"],
+            label: "local TinyFish registration",
+        },
+    ],
+    addArgs: (mcpUrl) => ["mcp", "add", "--scope", "user", "--transport", "http", "tinyfish", mcpUrl],
+};
+const CODEX = {
+    command: "codex",
+    displayName: "Codex",
+    supportCheck: {
+        args: ["mcp", "add", "--help"],
+        pattern: /--oauth-resource(?:\s|<)/,
+        unavailableMessage: CODEX_OAUTH_RESOURCE_UNAVAILABLE_MESSAGE,
+    },
+    removals: [{ args: ["mcp", "remove", "tinyfish"], label: "TinyFish registration from Codex" }],
+    addArgs: (mcpUrl) => [
+        "mcp",
+        "add",
+        "tinyfish",
+        "--url",
+        mcpUrl,
+        "--oauth-resource",
+        mcpUrl,
+    ],
+};
+function requireNativeMcpSupport(client) {
+    const result = spawn.sync(client.command, client.supportCheck.args, {
+        encoding: "utf8",
+        timeout: NON_INTERACTIVE_TIMEOUT_MS,
+    });
+    if (result.error?.code === "ENOENT") {
+        throw new Error(`${client.displayName} is not installed or not available on PATH.`, {
+            cause: result.error,
+        });
+    }
+    if (result.error || result.status !== 0) {
+        throw new Error(client.supportCheck.unavailableMessage, { cause: result.error });
+    }
+    const output = `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
+    if (!client.supportCheck.pattern.test(output)) {
+        throw new Error(client.supportCheck.unavailableMessage);
+    }
+}
+function removeExistingRegistration(client, removal) {
+    const result = spawn.sync(client.command, removal.args, {
+        encoding: "utf8",
+        timeout: NON_INTERACTIVE_TIMEOUT_MS,
+    });
+    if (result.status === 0)
+        return;
+    const details = result.stderr?.trim() || result.error?.message || "unknown error";
+    if (/No MCP server named "tinyfish"/i.test(details))
+        return;
+    if (result.error) {
+        throw new Error(`Could not remove existing ${removal.label}: ${details}`, {
+            cause: result.error,
+        });
+    }
+    throw new Error(`Could not remove existing ${removal.label}: ${details}`);
+}
+function connectNativeMcpClient(client, options) {
+    requireNativeMcpSupport(client);
+    for (const removal of client.removals)
+        removeExistingRegistration(client, removal);
+    errLine(`Adding TinyFish to ${client.displayName}...`);
+    const addResult = spawn.sync(client.command, client.addArgs(options.mcpUrl), {
+        stdio: "inherit",
+    });
+    if (addResult.error || addResult.status !== 0) {
+        throw new Error(`Could not add TinyFish to ${client.displayName}`, {
+            cause: addResult.error,
+        });
+    }
+    if (client.loginArgs) {
+        errLine("Signing in to TinyFish...");
+        const loginResult = spawn.sync(client.command, client.loginArgs, {
+            stdio: "inherit",
+        });
+        if (loginResult.error || loginResult.status !== 0) {
+            throw new Error(`Could not authenticate TinyFish in ${client.displayName}`, {
+                cause: loginResult.error,
+            });
+        }
+    }
+    if (!options.launch) {
+        errLine(`TinyFish is connected. Open ${client.displayName} to start using it.`);
+        return;
+    }
+    errLine(`Starting the TinyFish walkthrough in ${client.displayName}...`);
+    const result = spawn.sync(client.command, [DEFAULT_ONBOARDING_PROMPT], { stdio: "inherit" });
+    if (result.error) {
+        throw new Error(`Could not launch ${client.displayName}`, { cause: result.error });
+    }
+    if (result.signal === "SIGINT" || result.signal === "SIGTERM")
+        return;
+    if (result.status !== 0) {
+        throw new Error(`${client.displayName} walkthrough exited with status ${result.status ?? "unknown"}`);
+    }
+}
+export function connectClaudeCode(options) {
+    connectNativeMcpClient(CLAUDE_CODE, options);
+}
+export function connectCodex(options) {
+    connectNativeMcpClient(CODEX, options);
+}
+export function registerConnect(program) {
+    program
+        .command("connect")
+        .description("Connect TinyFish to an AI agent")
+        .argument("<client>", "Agent client to connect (claude-code or codex)")
+        .option("--launch", "Launch the agent and start the TinyFish walkthrough")
+        .option("--url <mcpUrl>", "MCP endpoint override")
+        .action((client, options) => {
+        const mcpUrl = options.url ?? DEFAULT_MCP_URL;
+        if (mcpUrl.startsWith("-")) {
+            throw new Error(`Invalid --url value: ${mcpUrl}`);
+        }
+        let parsedUrl;
+        try {
+            parsedUrl = new URL(mcpUrl);
+        }
+        catch {
+            throw new Error(`Invalid --url value: ${mcpUrl}`);
+        }
+        if (!["http:", "https:"].includes(parsedUrl.protocol)) {
+            throw new Error(`Invalid --url value: ${mcpUrl}`);
+        }
+        const connectOptions = { mcpUrl, launch: options.launch ?? false };
+        if (client === "claude-code") {
+            connectClaudeCode(connectOptions);
+        }
+        else if (client === "codex") {
+            connectCodex(connectOptions);
+        }
+        else {
+            throw new Error(`Unsupported client: ${client}. Supported clients: claude-code, codex`);
+        }
+    });
+}

package/dist/commands/fetch.js

@@ -1,7 +1,7 @@
 import { InvalidArgumentError } from "commander";
 import { getApiKey } from "../lib/auth.js";
 import { fetchContentGet } from "../lib/client.js";
-import { handleApiError, out, outLine } from "../lib/output.js";
+import { err, handleApiError, out, outLine } from "../lib/output.js";
 const MIN_PER_URL_TIMEOUT_MS = 1;
 const MAX_PER_URL_TIMEOUT_MS = 110000;
 function parsePerUrlTimeoutMs(value) {
@@ -26,6 +26,12 @@ function printPrettyFetch(response) {
                 outLine(`  Title: ${result.title}`);
             if (result.final_url && result.final_url !== result.url)
                 outLine(`  Final URL: ${result.final_url}`);
+            if (result.not_modified)
+                outLine(`  Not Modified: true`);
+            if (result.etag)
+                outLine(`  ETag: ${result.etag}`);
+            if (result.last_modified)
+                outLine(`  Last-Modified: ${result.last_modified}`);
             outLine("");
         }
     }
@@ -55,8 +61,18 @@ export function registerFetch(program) {
         .option("--links", "Include extracted links")
         .option("--image-links", "Include extracted image links")
         .option("--per-url-timeout-ms <milliseconds>", "Per-URL timeout budget in milliseconds", parsePerUrlTimeoutMs)
+        .option("--if-none-match <etag>", "ETag validator for a conditional GET (single URL only)")
+        .option("--if-modified-since <http-date>", "Last-Modified validator for a conditional GET (single URL only)")
+        .option("--include-etag-and-last-modified", "Include etag / last_modified validators on each result")
         .option("--pretty", "Human-readable output")
         .action(async (urls, opts) => {
+        if ((opts.ifNoneMatch !== undefined || opts.ifModifiedSince !== undefined) &&
+            urls.length > 1) {
+            err({
+                error: "--if-none-match and --if-modified-since can only be used with a single URL, not a batch",
+            });
+            process.exit(1);
+        }
         const apiKey = getApiKey();
         try {
             const response = await fetchContentGet({
@@ -67,6 +83,13 @@ export function registerFetch(program) {
                 ...(opts.perUrlTimeoutMs !== undefined
                     ? { per_url_timeout_ms: opts.perUrlTimeoutMs }
                     : {}),
+                ...(opts.ifNoneMatch !== undefined ? { if_none_match: opts.ifNoneMatch } : {}),
+                ...(opts.ifModifiedSince !== undefined
+                    ? { if_modified_since: opts.ifModifiedSince }
+                    : {}),
+                ...(opts.includeEtagAndLastModified !== undefined
+                    ? { include_etag_and_last_modified: opts.includeEtagAndLastModified }
+                    : {}),
             }, apiKey);
             if (opts.pretty) {
                 printPrettyFetch(response);

package/dist/index.js

@@ -11,6 +11,7 @@ import { registerRun } from "./commands/run.js";
 import { registerRuns } from "./commands/runs.js";
 import { registerConfigureClaude } from "./commands/config-claude.js";
 import { registerSearch } from "./commands/search.js";
+import { registerConnect } from "./commands/connect.js";
 const { version } = createRequire(import.meta.url)("../package.json");
 const program = new Command();
 program
@@ -27,6 +28,7 @@ program
     }
 });
 registerAuth(program);
+registerConnect(program);
 registerConfigureClaude(program);
 registerBrowser(program);
 registerProfile(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiny-fish/cli",
-  "version": "0.2.0",
+  "version": "0.2.1-next.83",
   "description": "TinyFish CLI — run web automations from your terminal",
   "type": "module",
   "bin": {
@@ -32,14 +32,16 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@tiny-fish/sdk": "^0.0.7",
+    "@tiny-fish/sdk": "^0.0.11",
     "chrome-cookies-secure": "^3.0.2",
     "commander": "^12.0.0",
+    "cross-spawn": "^7.0.6",
     "globals": "^17.4.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^20.0.0",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.2",
@@ -51,9 +53,9 @@
   "overrides": {
     "esbuild": "0.28.1",
     "vite": "7.3.5",
-    "brace-expansion": "^5.0.6",
+    "brace-expansion": "^5.0.7",
     "postcss": "8.5.10",
-    "tar": "^7"
+    "tar": "^7.5.20"
   },
   "engines": {
     "node": ">=24.0.0"