@tiny-fish/cli 0.6.2-next.106 → 0.6.2-next.107

package/README.md

@@ -12,10 +12,11 @@ Requires Node.js 24+.
 
 ### Connect Claude Code
 
-Add TinyFish, complete MCP OAuth, and start the interactive walkthrough with one command:
+Add TinyFish MCP and the global `use-tinyfish` web skill, authenticate the CLI, and start the
+interactive walkthrough with one command:
 
 ```bash
-npx -y @tiny-fish/cli@latest connect claude-code --launch
+npx -y @tiny-fish/cli@latest connect claude-code --launch --api-key sk-tinyfish-...
 ```
 
 One-command OAuth requires a Claude Code release whose `claude mcp` command supports `login`.
@@ -28,10 +29,11 @@ configuration.
 
 ### Connect Codex
 
-Add TinyFish, complete MCP OAuth, and start the interactive walkthrough with one command:
+Add TinyFish MCP and the global `use-tinyfish` web skill, authenticate the CLI, and start the
+interactive walkthrough with one command:
 
 ```bash
-npx -y @tiny-fish/cli@latest connect codex --launch
+npx -y @tiny-fish/cli@latest connect codex --launch --api-key sk-tinyfish-...
 ```
 
 One-command OAuth requires a Codex release whose `codex mcp add` command supports
@@ -40,10 +42,11 @@ One-command OAuth requires a Codex release whose `codex mcp add` command support
 
 ### Connect Hermes
 
-Add TinyFish, complete MCP OAuth, and start the interactive walkthrough with one command:
+Add TinyFish MCP and the global `use-tinyfish` web skill, authenticate the CLI, and start the
+interactive walkthrough with one command:
 
 ```bash
-npx -y @tiny-fish/cli@latest connect hermes --launch
+npx -y @tiny-fish/cli@latest connect hermes --launch --api-key sk-tinyfish-...
 ```
 
 Hermes completes OAuth while adding the MCP server. After setup, the command starts the walkthrough

package/dist/commands/connect.d.ts

@@ -3,14 +3,17 @@ export declare const DEFAULT_ONBOARDING_PROMPT: string;
 export declare const OPENCLAW_ONBOARDING_PROMPT: string;
 export type AgentClient = "claude-code" | "codex" | "hermes" | "openclaw";
 export declare function connectClaudeCode(options: {
+    apiKey?: string;
     mcpUrl: string;
     launch: boolean;
 }): Promise<void>;
 export declare function connectCodex(options: {
+    apiKey?: string;
     mcpUrl: string;
     launch: boolean;
 }): Promise<void>;
 export declare function connectHermes(options: {
+    apiKey?: string;
     mcpUrl: string;
     launch: boolean;
 }): Promise<void>;

package/dist/commands/connect.js

@@ -1,9 +1,12 @@
 import { randomUUID } from "node:crypto";
+import * as path from "node:path";
 import spawn from "cross-spawn";
+import { persistApiKeyToEnvironment, saveConfig, validateKeyFormat } from "../lib/auth.js";
 import { CLI_VERSION } from "../lib/constants.js";
 import { errLine } from "../lib/output.js";
 const DEFAULT_MCP_URL = "https://agent.tinyfish.ai/mcp";
 const NON_INTERACTIVE_TIMEOUT_MS = 10_000;
+const SKILL_INSTALL_TIMEOUT_MS = 120_000;
 const HERMES_SEED_TIMEOUT_MS = 120_000;
 const TELEMETRY_TIMEOUT_MS = 500;
 const MCP_LOGIN_UNAVAILABLE_MESSAGE = "This Claude Code installation does not expose `claude mcp login`, which is required for " +
@@ -16,6 +19,10 @@ const HERMES_OAUTH_UNAVAILABLE_MESSAGE = "This Hermes installation does not supp
 const OPENCLAW_SKILL_UNAVAILABLE_MESSAGE = "This OpenClaw installation does not support global skill installation. Update OpenClaw and " +
     "retry.";
 const TINYFISH_CLI_NOT_FOUND_MESSAGE = "TinyFish CLI installed but is not available on PATH. Open a new terminal and retry.";
+const TINYFISH_CLI_PACKAGE = "@tiny-fish/cli@latest";
+const SKILLS_CLI_PACKAGE = "skills@1.4.6";
+const TINYFISH_WEB_SKILL_SOURCE = "tinyfish-io/tinyfish-cookbook";
+const TINYFISH_WEB_SKILL = "use-tinyfish";
 const OPENCLAW_SKILL = "@tinyfish/tinyfish";
 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 " +
@@ -27,6 +34,7 @@ export const OPENCLAW_ONBOARDING_PROMPT = "I just installed the TinyFish skill.
 const CLAUDE_CODE = {
     command: "claude",
     connectClient: "claude-code",
+    skillAgent: "claude-code",
     displayName: "Claude Code",
     supportCheck: {
         args: ["mcp", "--help"],
@@ -62,6 +70,7 @@ function launchCodexWalkthrough() {
 const CODEX = {
     command: "codex",
     connectClient: "codex",
+    skillAgent: "codex",
     displayName: "Codex",
     supportCheck: {
         args: ["mcp", "add", "--help"],
@@ -107,6 +116,7 @@ function launchHermesWalkthrough() {
 const HERMES = {
     command: "hermes",
     connectClient: "hermes",
+    skillAgent: "hermes-agent",
     displayName: "Hermes",
     supportCheck: {
         args: ["mcp", "add", "--help"],
@@ -181,6 +191,73 @@ function requireCommandSupport(client) {
 function commandNotFound(error) {
     return error?.code === "ENOENT";
 }
+function installTinyFishCli() {
+    errLine("Installing the TinyFish CLI...");
+    const result = spawn.sync("npm", ["install", "--global", TINYFISH_CLI_PACKAGE], {
+        stdio: "inherit",
+        timeout: SKILL_INSTALL_TIMEOUT_MS,
+    });
+    if (result.error || result.status !== 0) {
+        throw new Error("Could not install the TinyFish CLI", { cause: result.error });
+    }
+}
+function installWebSkill(client) {
+    errLine(`Installing the TinyFish web skill in ${client.displayName}...`);
+    const result = spawn.sync("npx", [
+        "-y",
+        SKILLS_CLI_PACKAGE,
+        "add",
+        TINYFISH_WEB_SKILL_SOURCE,
+        "--skill",
+        TINYFISH_WEB_SKILL,
+        "--global",
+        "--agent",
+        client.skillAgent,
+        "--yes",
+    ], {
+        env: {
+            ...process.env,
+            PATH: `${path.dirname(process.execPath)}${path.delimiter}${process.env.PATH ?? ""}`,
+        },
+        stdio: "inherit",
+        timeout: SKILL_INSTALL_TIMEOUT_MS,
+    });
+    if (result.error || result.status !== 0) {
+        throw new Error(`Could not install the TinyFish web skill in ${client.displayName}`, {
+            cause: result.error,
+        });
+    }
+}
+function ensureCliAuthenticated(source, apiKey) {
+    const envKey = apiKey ?? process.env["TINYFISH_API_KEY"];
+    if (envKey) {
+        if (!validateKeyFormat(envKey)) {
+            throw new Error("TINYFISH_API_KEY has invalid format");
+        }
+        saveConfig(envKey);
+        persistApiKeyToEnvironment(envKey);
+        return;
+    }
+    const authStatus = spawn.sync("tinyfish", ["auth", "status"], {
+        stdio: "ignore",
+        timeout: NON_INTERACTIVE_TIMEOUT_MS,
+    });
+    if (commandNotFound(authStatus.error)) {
+        throw new Error(TINYFISH_CLI_NOT_FOUND_MESSAGE, { cause: authStatus.error });
+    }
+    if (authStatus.status === 0)
+        return;
+    errLine("Signing in to the TinyFish CLI...");
+    const loginResult = spawn.sync("tinyfish", ["auth", "login", "--source", source], {
+        stdio: "inherit",
+    });
+    if (commandNotFound(loginResult.error)) {
+        throw new Error(TINYFISH_CLI_NOT_FOUND_MESSAGE, { cause: loginResult.error });
+    }
+    if (loginResult.error || loginResult.status !== 0) {
+        throw new Error("Could not authenticate the TinyFish CLI", { cause: loginResult.error });
+    }
+}
 function removeExistingRegistration(client, removal) {
     const result = spawn.sync(client.command, removal.args, {
         encoding: "utf8",
@@ -265,6 +342,12 @@ async function connectNativeMcpClient(client, options) {
                 });
             }
         }
+        failureStage = "cli_install";
+        installTinyFishCli();
+        failureStage = "skill_install";
+        installWebSkill(client);
+        failureStage = "authentication";
+        ensureCliAuthenticated(client.connectClient, options.apiKey);
         if (!options.launch) {
             errLine(`TinyFish is connected. Open ${client.displayName} to start using it.`);
             await telemetry.track("completed");
@@ -300,6 +383,7 @@ export async function connectOpenClaw(options) {
             errLine("Installing the TinyFish CLI...");
             const cliInstallResult = spawn.sync("npm", ["install", "--global", "@tiny-fish/cli@latest"], {
                 stdio: "inherit",
+                timeout: SKILL_INSTALL_TIMEOUT_MS,
             });
             if (cliInstallResult.error || cliInstallResult.status !== 0) {
                 throw new Error("Could not install the TinyFish CLI", { cause: cliInstallResult.error });
@@ -314,7 +398,10 @@ export async function connectOpenClaw(options) {
             });
         }
         failureStage = "authentication";
-        const authStatus = spawn.sync("tinyfish", ["auth", "status"], { stdio: "ignore" });
+        const authStatus = spawn.sync("tinyfish", ["auth", "status"], {
+            stdio: "ignore",
+            timeout: NON_INTERACTIVE_TIMEOUT_MS,
+        });
         if (commandNotFound(authStatus.error)) {
             throw new Error(TINYFISH_CLI_NOT_FOUND_MESSAGE, { cause: authStatus.error });
         }
@@ -366,9 +453,13 @@ export function registerConnect(program) {
         .command("connect")
         .description("Connect TinyFish to an AI agent")
         .argument("<client>", "Agent client to connect (claude-code, codex, hermes, or openclaw)")
+        .option("--api-key <apiKey>", "TinyFish API key to persist for the installed skill")
         .option("--launch", "Launch the agent and start the TinyFish walkthrough")
         .option("--url <mcpUrl>", "MCP endpoint override")
         .action(async (client, options) => {
+        if (options.apiKey && !validateKeyFormat(options.apiKey)) {
+            throw new Error("Invalid --api-key value");
+        }
         const mcpUrl = options.url ?? DEFAULT_MCP_URL;
         if (mcpUrl.startsWith("-")) {
             throw new Error(`Invalid --url value: ${mcpUrl}`);
@@ -383,7 +474,7 @@ export function registerConnect(program) {
         if (!["http:", "https:"].includes(parsedUrl.protocol)) {
             throw new Error(`Invalid --url value: ${mcpUrl}`);
         }
-        const connectOptions = { mcpUrl, launch: options.launch ?? false };
+        const connectOptions = { apiKey: options.apiKey, mcpUrl, launch: options.launch ?? false };
         if (client === "claude-code") {
             await connectClaudeCode(connectOptions);
         }
@@ -394,7 +485,7 @@ export function registerConnect(program) {
             await connectHermes(connectOptions);
         }
         else if (client === "openclaw") {
-            await connectOpenClaw(connectOptions);
+            await connectOpenClaw({ mcpUrl: connectOptions.mcpUrl, launch: connectOptions.launch });
         }
         else {
             throw new Error(`Unsupported client: ${client}. Supported clients: claude-code, codex, hermes, openclaw`);

package/dist/lib/auth.d.ts

@@ -5,6 +5,11 @@ interface TinyfishConfig {
 }
 export declare function loadConfig(): TinyfishConfig;
 export declare function saveConfig(apiKey: string): void;
+interface EnvironmentOptions {
+    platform?: typeof process.platform;
+    shell?: string;
+}
+export declare function persistApiKeyToEnvironment(apiKey: string, options?: EnvironmentOptions): void;
 export declare function clearConfig(): boolean;
 export declare function validateKeyFormat(key: string): boolean;
 export declare function maskKey(key: string): string;

package/dist/lib/auth.js

@@ -1,6 +1,7 @@
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
+import spawn from "cross-spawn";
 import { err } from "./output.js";
 const KEY_PREFIXES = ["sk-tinyfish-", "sk-mino-"];
 const MIN_KEY_LENGTH = 20;
@@ -41,6 +42,46 @@ export function saveConfig(apiKey) {
         process.exit(1);
     }
 }
+export function persistApiKeyToEnvironment(apiKey, options = {}) {
+    const platform = options.platform ?? process.platform;
+    if (platform === "win32") {
+        const result = spawn.sync("setx", ["TINYFISH_API_KEY", apiKey], { stdio: "ignore" });
+        if (result.error || result.status !== 0) {
+            throw new Error("Could not set TINYFISH_API_KEY in the Windows user environment", {
+                cause: result.error,
+            });
+        }
+        return;
+    }
+    const home = os.homedir();
+    const shell = path.basename(options.shell ?? process.env["SHELL"] ?? "");
+    const fish = shell === "fish";
+    const macBashProfile = [".bash_profile", ".bash_login", ".profile"]
+        .map((name) => path.join(home, name)) // nosemgrep: path-join-resolve-traversal -- fixed filenames under os.homedir()
+        .find((candidate) => fs.existsSync(candidate)) ?? path.join(home, ".bash_profile");
+    const profile = shell === "zsh"
+        ? path.join(home, ".zshrc")
+        : shell === "bash"
+            ? platform === "darwin"
+                ? macBashProfile
+                : path.join(home, ".bashrc")
+            : fish
+                ? path.join(home, ".config", "fish", "config.fish")
+                : path.join(home, ".profile");
+    const quotedKey = `'${apiKey.replaceAll("'", "'\\''")}'`;
+    const assignment = fish
+        ? `set -gx TINYFISH_API_KEY ${quotedKey}`
+        : `export TINYFISH_API_KEY=${quotedKey}`;
+    const matcher = fish
+        ? /^set -gx TINYFISH_API_KEY .*(?:\r?\n|$)/gm
+        : /^export TINYFISH_API_KEY=.*(?:\r?\n|$)/gm;
+    const existing = fs.existsSync(profile) ? fs.readFileSync(profile, "utf8") : "";
+    const cleaned = existing.replace(matcher, "");
+    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);
+}
 export function clearConfig() {
     const config = loadConfig();
     if (!config.api_key)

package/package.json

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