@tiny-fish/cli 0.39.1-next.311 → 0.40.0

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/package.json

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