@tiny-fish/cli 0.39.1-next.311 → 0.40.1-next.317

package/dist/lib/pi-config.d.ts

@@ -0,0 +1,26 @@
+import { type McpJsonServerEntry, type McpJsonWriteResult } from './mcp-json-config.js';
+/** Mirrors pi's own getAgentDir: the override wins, else `~/.pi/agent`. */
+export declare function piAgentDir(): string;
+export declare function piMcpPath(): string;
+/** Reports the header's shape, never its value. */
+export declare function readPiTinyfishEntry(): McpJsonServerEntry;
+/** Merges only the `tinyfish` key. */
+export declare function writePiMcpConfig(mcpUrl: string, apiKey?: string): McpJsonWriteResult;
+/** Dry-run description of the pending write; touches nothing. */
+export declare function planPiWrite(mcpUrl: string, apiKey?: string): string;
+/** Removes only the `tinyfish` key. */
+export declare function removePiMcpServer(): McpJsonWriteResult;
+export declare const PI_ADAPTER_INSTALL_COMMAND = "pi install npm:pi-mcp-adapter";
+/** `unknown` keeps a settings file we could not read apart from one that lists no adapter. */
+export type PiAdapterState = 'installed' | 'absent' | 'unknown';
+/** Core pi has no MCP, so without this package the entry we write is never read. */
+export declare function piMcpAdapterState(cwd?: string): PiAdapterState;
+/** Tests share one process; the probe result must not. */
+export declare function resetPiBinaryCache(): void;
+/** npm ships an unrelated `pi` that prints `3`; only a semver answer is the harness. */
+export declare function piBinaryIsPi(): boolean;
+/** `skills` hardcodes the default dir, so an override leaves the skill where pi will not look. */
+export declare function piSkillDirMismatch(): {
+    installedTo: string;
+    readFrom: string;
+} | undefined;

package/dist/lib/pi-config.js

@@ -0,0 +1,111 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import spawn from 'cross-spawn';
+import { z } from 'zod';
+import { HARNESS_PROBE_TIMEOUT_MS } from './constants.js';
+import { planWrite, readTinyfishEntry, removeServer, writeMcpConfig, } from './mcp-json-config.js';
+// pi expands `~` and `~/`; writing one literally would mkdir '~'.
+function expandTilde(dir) {
+    if (dir === '~')
+        return os.homedir();
+    // nosemgrep: path-join-resolve-traversal -- $PI_CODING_AGENT_DIR names the caller's own dir, resolved as pi does
+    return dir.startsWith('~/') ? path.join(os.homedir(), dir.slice(2)) : dir;
+}
+/** Mirrors pi's own getAgentDir: the override wins, else `~/.pi/agent`. */
+export function piAgentDir() {
+    const override = process.env['PI_CODING_AGENT_DIR'];
+    return override ? path.resolve(expandTilde(override)) : path.join(os.homedir(), '.pi', 'agent');
+}
+// Resolved per call, not cached: nothing here spawns, so drift is impossible.
+const PI_MCP_TARGET = {
+    serverKey: 'tinyfish',
+    dir: piAgentDir,
+    file: () => path.join(piAgentDir(), 'mcp.json'),
+};
+export function piMcpPath() {
+    return PI_MCP_TARGET.file();
+}
+/** Reports the header's shape, never its value. */
+export function readPiTinyfishEntry() {
+    return readTinyfishEntry(PI_MCP_TARGET);
+}
+/** Merges only the `tinyfish` key. */
+export function writePiMcpConfig(mcpUrl, apiKey) {
+    return writeMcpConfig(PI_MCP_TARGET, mcpUrl, apiKey);
+}
+/** Dry-run description of the pending write; touches nothing. */
+export function planPiWrite(mcpUrl, apiKey) {
+    return planWrite(PI_MCP_TARGET, mcpUrl, apiKey);
+}
+/** Removes only the `tinyfish` key. */
+export function removePiMcpServer() {
+    return removeServer(PI_MCP_TARGET);
+}
+export const PI_ADAPTER_INSTALL_COMMAND = 'pi install npm:pi-mcp-adapter';
+// Matches `npm:pi-mcp-adapter`, a pinned version, and git or path installs ending in the name.
+const ADAPTER_SOURCE = /(?:^|[/:])pi-mcp-adapter(?:@|$)/;
+// pi's PackageSource is a bare source or an object carrying it; `pi install` writes both.
+const packageSourceSchema = z.union([z.string(), z.object({ source: z.string() })]);
+const settingsSchema = z.object({ packages: z.array(packageSourceSchema).optional() });
+function adapterInSettings(file) {
+    let raw;
+    try {
+        raw = fs.readFileSync(file, 'utf8');
+    }
+    catch (e) {
+        // No settings file means nothing is installed; any other read failure tells us nothing.
+        return e?.code === 'ENOENT' ? 'absent' : 'unknown';
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return 'unknown';
+    }
+    const settings = settingsSchema.safeParse(parsed);
+    if (!settings.success)
+        return 'unknown';
+    const sources = (settings.data.packages ?? []).map((p) => (typeof p === 'string' ? p : p.source));
+    return sources.some((source) => ADAPTER_SOURCE.test(source)) ? 'installed' : 'absent';
+}
+/** Core pi has no MCP, so without this package the entry we write is never read. */
+export function piMcpAdapterState(cwd = process.cwd()) {
+    // `pi install -l` records the adapter project-locally, where pi reads it just the same.
+    const scopes = [
+        path.join(piAgentDir(), 'settings.json'),
+        path.join(cwd, '.pi', 'settings.json'), // nosemgrep: path-join-resolve-traversal -- fixed names under the caller's cwd
+    ].map(adapterInSettings);
+    if (scopes.includes('installed'))
+        return 'installed';
+    return scopes.includes('unknown') ? 'unknown' : 'absent';
+}
+// Cached: detection runs more than once per command and the answer cannot change mid-run.
+let cachedBinaryIsPi;
+/** Tests share one process; the probe result must not. */
+export function resetPiBinaryCache() {
+    cachedBinaryIsPi = undefined;
+}
+/** npm ships an unrelated `pi` that prints `3`; only a semver answer is the harness. */
+export function piBinaryIsPi() {
+    cachedBinaryIsPi ??= { value: probeVersion() };
+    return cachedBinaryIsPi.value;
+}
+function probeVersion() {
+    const result = spawn.sync('pi', ['--version'], {
+        encoding: 'utf8',
+        timeout: HARNESS_PROBE_TIMEOUT_MS,
+    });
+    if (result.error || result.status !== 0)
+        return false;
+    return /^\d+\.\d+\.\d+/.test((result.stdout ?? '').trim());
+}
+/** `skills` hardcodes the default dir, so an override leaves the skill where pi will not look. */
+export function piSkillDirMismatch() {
+    const agentDir = piAgentDir();
+    const fallback = path.join(os.homedir(), '.pi', 'agent');
+    if (agentDir === fallback)
+        return undefined;
+    return { installedTo: path.join(fallback, 'skills'), readFrom: path.join(agentDir, 'skills') };
+}

package/dist/lib/registration-detect.js

@@ -8,6 +8,7 @@ import { HARNESS_PROBE_TIMEOUT_MS } from './constants.js';
 import { errLine } from './output.js';
 import { readCursorTinyfishEntry } from './cursor-config.js';
 import { readOmpTinyfishEntry } from './omp-config.js';
+import { readPiTinyfishEntry } from './pi-config.js';
 import { readHermesKey, resolveHermesHome } from './hermes-env.js';
 import { readHermesEntry } from './hermes-config.js';
 import { detectInstalledHarnesses, harnessConfigPath, harnessDisplayPath, AuthMode, Registered, } from './harness-detect.js';
@@ -315,6 +316,30 @@ function probeOmp() {
         ...keyVerdict,
     };
 }
+// Whether anything reads the entry is the pi-adapter check's question, not this one.
+function probePi() {
+    const entry = readPiTinyfishEntry();
+    if (entry.error) {
+        return {
+            registered: Registered.Unknown,
+            authMode: AuthMode.Unknown,
+            reason: 'mcp.json exists but could not be read or parsed',
+        };
+    }
+    if (!entry.present)
+        return { registered: Registered.No, authMode: AuthMode.Unknown };
+    const keyVerdict = entry.keyTemplateVar
+        ? envKeyVerdict(entry.keyTemplateVar)
+        : entry.keyMatchesCliKey
+            ? { keyMatchesCliKey: true }
+            : {};
+    return {
+        registered: Registered.Yes,
+        authMode: entry.hasApiKeyHeader ? AuthMode.ApiKey : AuthMode.Unknown,
+        ...(entry.url ? { registeredUrl: entry.url } : {}),
+        ...keyVerdict,
+    };
+}
 // Both list commands print this header in every state, including "no servers configured".
 // Exit 0 with output we cannot recognise is not evidence of absence: reporting `no` there would
 // earn a connect repair off a parse failure, which is the bug class this command exists to kill.
@@ -337,10 +362,11 @@ function fromMcpList(command, output, registeredMode, urlPattern) {
 }
 // `hermes mcp list` only pretty-prints this file, so connect's gate reads it too.
 function probeHermes() {
-    const home = resolveHermesHome();
-    if (!home) {
+    const resolved = resolveHermesHome();
+    if (typeof resolved !== 'string') {
         return unverified('`hermes dump` did not report a home directory');
     }
+    const home = resolved;
     const entry = readHermesEntry(home);
     if (entry.state === 'unreadable' || entry.state === 'unparseable') {
         return unverified(`Hermes' config.yaml could not be ${entry.state === 'unreadable' ? 'read' : 'parsed'}`);
@@ -479,6 +505,7 @@ const PROBES = {
     omp: probeOmp,
     openclaw: probeOpenClaw,
     opencode: probeOpencode,
+    pi: probePi,
 };
 /** Never throws; a failed probe is `unknown` with a reason, so no caller can read it as healthy. */
 export function detectRegistrations(harnesses) {

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

@@ -29,6 +29,7 @@ declare const harnessResultSchema: z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
     }>;
     detected: z.ZodBoolean;
@@ -63,6 +64,7 @@ export declare const setupCompletedPayloadSchema: z.ZodObject<{
             codex: "codex";
             hermes: "hermes";
             opencode: "opencode";
+            pi: "pi";
             "claude-code": "claude-code";
         }>;
         detected: z.ZodBoolean;
@@ -124,6 +126,7 @@ declare const doctorCompletedPayloadSchema: z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
         all: "all";
     }>;
@@ -137,6 +140,7 @@ declare const doctorCompletedPayloadSchema: z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
     }>>;
     harnesses: z.ZodArray<z.ZodObject<{
@@ -148,6 +152,7 @@ declare const doctorCompletedPayloadSchema: z.ZodObject<{
             codex: "codex";
             hermes: "hermes";
             opencode: "opencode";
+            pi: "pi";
             "claude-code": "claude-code";
         }>;
         detected: z.ZodBoolean;
@@ -183,6 +188,7 @@ declare const doctorCouldNotRunPayloadSchema: z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
         all: "all";
     }>;
@@ -219,6 +225,7 @@ declare const doctorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
         all: "all";
     }>;
@@ -232,6 +239,7 @@ declare const doctorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
     }>>;
     harnesses: z.ZodArray<z.ZodObject<{
@@ -243,6 +251,7 @@ declare const doctorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
             codex: "codex";
             hermes: "hermes";
             opencode: "opencode";
+            pi: "pi";
             "claude-code": "claude-code";
         }>;
         detected: z.ZodBoolean;
@@ -277,6 +286,7 @@ declare const doctorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         codex: "codex";
         hermes: "hermes";
         opencode: "opencode";
+        pi: "pi";
         "claude-code": "claude-code";
         all: "all";
     }>;

package/dist/lib/skill-install.d.ts

@@ -1,5 +1,6 @@
 import { type InstallOptions } from './cli-install.js';
 import { type SkillAgent } from './connect-clients.js';
+export declare const SKILLS_CLI_PACKAGE = "skills@1.5.15";
 export declare function installWebSkill(client: {
     skillAgent?: SkillAgent;
     displayName: string;

package/dist/lib/skill-install.js

@@ -1,14 +1,15 @@
+import * as fs from 'node:fs';
+import * as os from 'node:os';
 import * as path from 'node:path';
 import spawn from 'cross-spawn';
-import { z } from 'zod';
 import { loadConfig } from './auth.js';
 import { captureStdio, capturedOutput, replay, SKILL_INSTALL_TIMEOUT_MS, STEP_MAX_BUFFER, } from './cli-install.js';
 import { CURSOR_SKILL_TARGET, NATIVE_MCP_CLIENTS, OPENCLAW, openclawSkillInstallArgs, } from './connect-clients.js';
-import { ConnectInterruptedError, ConnectStepError, probeSupportVariant, spawnFailureDetail, spawnStepError, throwIfInterrupted, } from './connect-runtime.js';
+import { ConnectInterruptedError, ConnectStepError, probeSupportVariant, spawnStepError, throwIfInterrupted, } from './connect-runtime.js';
 import { CLI_AGENT_IDENTITY } from './constants.js';
-import { errLine, parseJson } from './output.js';
+import { errLine, sanitizeLine } from './output.js';
 // Supports Hermes without node:util.styleText, so the installer still runs on Node 20.11.
-const SKILLS_CLI_PACKAGE = 'skills@1.5.15';
+export const SKILLS_CLI_PACKAGE = 'skills@1.5.15';
 const TINYFISH_WEB_SKILL_SOURCE = 'tinyfish-io/tinyfish-cookbook';
 const TINYFISH_WEB_SKILL = 'use-tinyfish';
 /** `skills add` is an unconditional overwrite, so it doubles as the refresh path. */
@@ -44,27 +45,34 @@ const SKILL_ALREADY_CURRENT_PATTERN = /All global skills are up to date/;
 // A lock entry with no recorded hash is untrackable, so `skills` reports it as skipped rather
 // than failed. Left undetected that reads as "up to date" while nothing was refreshed.
 const SKILL_UNCHECKABLE_PATTERN = /cannot be checked automatically/;
-const skillListSchema = z.array(z.object({ name: z.string() }));
-// `add` exits 0 on per-skill failure; the piped list is the verdict.
-function failedListVerdict() {
-    const list = spawn.sync('npx', ['-y', SKILLS_CLI_PACKAGE, 'list', '--global', '--json'], {
-        encoding: 'utf8',
-        env: skillSpawnEnv(),
-        maxBuffer: STEP_MAX_BUFFER,
-        timeout: SKILL_INSTALL_TIMEOUT_MS,
-    });
-    const listRan = !list.error && list.status === 0;
-    if (listRan && skillListed(list.stdout ?? ''))
-        return null;
-    // A clean list that omits the skill is not a real exit (PF-3680).
-    const tag = listRan ? 'skill_absent_after_add' : `skill_list_failed ${spawnFailureDetail(list)}`;
-    return { result: list, tag };
+// `skills` writes here for the universal agents, whose own config dirs it never touches.
+function canonicalSkillsDir() {
+    return path.join(os.homedir(), '.agents', 'skills'); // nosemgrep: path-join-resolve-traversal -- fixed dir names under os.homedir()
 }
-// Entry presence is the whole verdict: `agents` names the harnesses `skills` detects,
-// so an install for a harness with no config dir yet lists none (PF-3680).
-function skillListed(stdout) {
-    const parsed = skillListSchema.safeParse(parseJson(stdout));
-    return parsed.success && parsed.data.some((skill) => skill.name === TINYFISH_WEB_SKILL);
+// Where the harness reads. Both of the modes `add` picks land the skill here.
+const SKILL_DIR_BY_AGENT = {
+    'claude-code': () => path.join(agentHome('CLAUDE_CONFIG_DIR', '.claude'), 'skills'),
+    // The env value, not resolveHermesHome(): the child we spawn reads the env.
+    'hermes-agent': () => path.join(agentHome('HERMES_HOME', '.hermes'), 'skills'),
+    codex: canonicalSkillsDir,
+    cursor: canonicalSkillsDir,
+    opencode: canonicalSkillsDir,
+    // `skills` writes pi's here whatever PI_CODING_AGENT_DIR says.
+    pi: () => path.join(os.homedir(), '.pi', 'agent', 'skills'), // nosemgrep: path-join-resolve-traversal -- fixed dir names under os.homedir()
+};
+function agentHome(override, fallback) {
+    return process.env[override]?.trim() || path.join(os.homedir(), fallback); // nosemgrep: path-join-resolve-traversal -- fixed dir names under os.homedir()
+}
+/** `add` exits 0 on per-agent failure, so the file it should have written is the verdict. */
+function skillOnDisk(agent) {
+    // SKILL.md, not the dir: `skills` mkdirs before it copies, so a failed copy leaves one.
+    return fs.existsSync(path.join(SKILL_DIR_BY_AGENT[agent](), TINYFISH_WEB_SKILL, 'SKILL.md'));
+}
+// The route tail-slices to 500, so an over-long tail would cut the tag off the front.
+const SKILL_DETAIL_TAIL_MAX_CHARS = 425;
+function absentDetail(addOutput) {
+    const tail = sanitizeLine(addOutput).trim().slice(-SKILL_DETAIL_TAIL_MAX_CHARS);
+    return tail ? `skill_absent_after_add | ${tail}` : 'skill_absent_after_add';
 }
 export function installWebSkill(client, { verbose }) {
     if (!client.skillAgent)
@@ -74,14 +82,13 @@ export function installWebSkill(client, { verbose }) {
         ...captureStdio(verbose),
         env: skillSpawnEnv(),
     });
+    const output = capturedOutput(add);
     const addFailed = Boolean(add.error) || add.status !== 0;
-    const verdict = addFailed ? null : failedListVerdict();
-    const failed = addFailed ? add : verdict?.result;
-    if (failed) {
+    const absent = !addFailed && !skillOnDisk(client.skillAgent);
+    if (addFailed || absent) {
         // Built first: its interrupt check must run before any replay.
-        const error = spawnStepError(`Could not install the TinyFish web skill in ${client.displayName}`, failed, verdict?.tag);
-        // The add carries the failure prose; the list is JSON only.
-        replay(capturedOutput(add));
+        const error = spawnStepError(`Could not install the TinyFish web skill in ${client.displayName}`, add, absent ? absentDetail(output) : undefined);
+        replay(output);
         throw error;
     }
 }
@@ -168,18 +175,18 @@ function reinstallWebSkill(skillAgents, verbose) {
         timeout: SKILL_INSTALL_TIMEOUT_MS,
     });
     const output = capturedOutput(result);
-    // Quiet capture stays (#4434); the list verdict replaced prose matching.
+    // Quiet capture stays (#4434); the on-disk check replaced prose matching.
     const addFailed = Boolean(result.error) || result.status !== 0;
-    const failedList = addFailed ? null : failedListVerdict();
-    const failed = addFailed || failedList !== null;
+    const missing = addFailed ? undefined : skillAgents.find((agent) => !skillOnDisk(agent));
+    const failed = addFailed || missing !== undefined;
     if (failed)
-        throwIfInterrupted(failedList?.result ?? result);
+        throwIfInterrupted(result);
     if (verbose || failed)
         replay(output);
     if (failed) {
-        throw new Error('Could not refresh the TinyFish web skill', {
-            cause: (failedList?.result ?? result).error,
-        });
+        // Upgrade telemetry carries no detail, so the agent has to ride the message.
+        const scope = missing ? ` for ${missing}` : '';
+        throw new Error(`Could not refresh the TinyFish web skill${scope}`, { cause: result.error });
     }
 }
 /** Fallback when no skill-bearing harness is recorded: refresh whatever `skills` tracks. */

package/dist/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { AgentRunParams, BrowserProfile, Run, RunStatus } from '@tiny-fish/sdk';
+import type { AgentRunParams, BrowserProfile, FetchGetContentsParams, Run, RunStatus } from '@tiny-fish/sdk';
 export type OutputSchema = Record<string, unknown>;
 export interface CliAgentRunParams extends AgentRunParams {
     output_schema?: OutputSchema;
@@ -91,6 +91,15 @@ export interface RunStepsResponse {
     status: RunStatus;
     steps: RunStep[];
 }
+export interface CliFetchHighlightsParams {
+    query: string;
+    max_snippets?: number;
+    max_characters?: number;
+    include_full_page_text?: boolean;
+}
+export interface CliFetchGetContentsParams extends FetchGetContentsParams {
+    highlights?: CliFetchHighlightsParams;
+}
 export interface CliBrowserSessionCreateParams {
     url?: string;
     browser_profile?: 'lite' | 'stealth';

package/package.json

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