@tiny-fish/cli 0.52.3-next.426 → 0.52.3-next.428

package/dist/lib/connect-runtime.d.ts

@@ -42,12 +42,13 @@ export interface SpawnStepResult {
     status?: number | null;
     signal?: string | null;
     error?: Error;
-    /** Inherited stdio leaves this null; only piped runs yield text. */
+    /** Inherited stdio leaves these null; only piped runs yield text. */
+    stdout?: unknown;
     stderr?: unknown;
 }
 /** Bounded removal spawn shared by install cleanup and --uninstall; Ctrl+C throws. */
 export declare function spawnRemoval(command: string, args: readonly string[], timeoutMs?: number): import("child_process").SpawnSyncReturns<string>;
-/** Outcome plus a bounded stderr tail; the route sanitizes and caps the rest. */
+/** Outcome plus a bounded output tail; the route caps the rest. */
 export declare function spawnFailureDetail(result: SpawnStepResult): string;
 /** Classifies a spawn failure; interrupts throw instead. */
 export declare function spawnStepError(message: string, result: SpawnStepResult, failureDetail?: string): ConnectStepError;

package/dist/lib/connect-runtime.js

@@ -3,7 +3,7 @@ import spawn from 'cross-spawn';
 import { CONNECT_ATTEMPT_ENV, isAttemptId, resolvedApiKey, takePendingConnectAttempt, } from './auth.js';
 import { CLI_INVOCATION_ID, CLI_VERSION } from './constants.js';
 import { detectHarness, detectHumanInitiated, detectRuntimeEnv } from './harness.js';
-import { boundedVersion, errLine, sanitizeLine } from './output.js';
+import { boundedVersion, errLine, noColourEnv, sanitizeLine } from './output.js';
 import { isOlder } from './cli-presence.js';
 import { postConnectEvent, telemetryDisabled } from './setup-telemetry.js';
 import { installSignalGuard } from './signals.js';
@@ -78,15 +78,19 @@ export function spawnRemoval(command, args, timeoutMs = NON_INTERACTIVE_TIMEOUT_
     return result;
 }
 // Sanitized before the cut so the count is not spent on invisible bytes.
-const STDERR_TAIL_MAX_CHARS = 400;
-/** Outcome plus a bounded stderr tail; the route sanitizes and caps the rest. */
-export function spawnFailureDetail(result) {
-    const stderr = typeof result.stderr === 'string'
-        ? sanitizeLine(result.stderr.trim()).slice(-STDERR_TAIL_MAX_CHARS)
+const OUTPUT_TAIL_MAX_CHARS = 400;
+function outputTail(stream) {
+    return typeof stream === 'string'
+        ? sanitizeLine(stream.trim()).slice(-OUTPUT_TAIL_MAX_CHARS)
         : '';
+}
+/** Outcome plus a bounded output tail; the route caps the rest. */
+export function spawnFailureDetail(result) {
+    // Rich-based CLIs (Hermes) print refusals to stdout and leave stderr empty.
+    const tail = outputTail(result.stderr) || outputTail(result.stdout);
     // A signal kill leaves status null, where the signal is the diagnosis.
     const outcome = result.signal ? `signal=${result.signal}` : `exit=${result.status}`;
-    return `${outcome}${stderr ? ` | ${stderr}` : ''}`;
+    return `${outcome}${tail ? ` | ${tail}` : ''}`;
 }
 /** Classifies a spawn failure; interrupts throw instead. */
 export function spawnStepError(message, result, failureDetail) {
@@ -221,7 +225,7 @@ function supportProbeOutput(client) {
     const result = spawn.sync(client.command, client.supportCheck.args, {
         encoding: 'utf8',
         // Agent harnesses export FORCE_COLOR, which makes clients colourise even a piped --help.
-        env: { ...process.env, FORCE_COLOR: '0', NO_COLOR: '1' },
+        env: noColourEnv(),
         timeout: probeTimeoutMs(client),
     });
     // 127 is the shell's not-found code; a wrapper shim with no real binary behind it exits that.

package/dist/lib/hermes-env.js

@@ -5,7 +5,7 @@ import { randomUUID } from 'node:crypto';
 import spawn from 'cross-spawn';
 import { HERMES_COLD_START_TIMEOUT_MS } from './constants.js';
 import { throwIfInterrupted } from './connect-runtime.js';
-import { sanitizeLine } from './output.js';
+import { noColourEnv, sanitizeLine } from './output.js';
 // display_hermes_home() abbreviates under $HOME, so the value is not always absolute.
 const HERMES_HOME_LINE = /^\s*hermes_home:\s*(\S.*?)\s*$/m;
 // Consistency, not speed: doctor's second probe timing out would downgrade
@@ -29,7 +29,7 @@ export function resolveHermesHome() {
 function probeHermesHome() {
     const result = spawn.sync('hermes', ['dump'], {
         encoding: 'utf8',
-        env: { ...process.env, FORCE_COLOR: '0', NO_COLOR: '1' },
+        env: noColourEnv(),
         timeout: HERMES_COLD_START_TIMEOUT_MS,
     });
     // Ctrl+C would otherwise read as `exit` and be cached.

package/dist/lib/hermes-plugin.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { type InstallOptions } from './cli-install.js';
-export declare const HERMES_PLUGIN_MANUAL_INSTALL = "hermes plugins install tinyfish --enable";
+export declare const HERMES_PLUGIN_MANUAL_INSTALL = "hermes plugins install tinyfish --enable --force";
 export declare function installHermesPlugin(home: string, apiKey: string, { verbose }: Pick<InstallOptions, 'verbose'>): string | undefined;
 /** Absent `enabled` reads as enabled, so never write this field-by-field. */
 export declare function writeHermesMcpEntry(home: string, mcpUrl: string, mode?: 'api-key' | 'keyless'): void;

package/dist/lib/hermes-plugin.js

@@ -1,26 +1,50 @@
 import spawn from 'cross-spawn';
 import { z } from 'zod';
-import { capturedOutput, replay, SKILL_INSTALL_TIMEOUT_MS, STEP_MAX_BUFFER, } from './cli-install.js';
+import { captureStdio, capturedOutput, replay, STEP_MAX_BUFFER, } from './cli-install.js';
 import { commandNotFound, ConnectStepError, spawnStepError, throwIfInterrupted, } from './connect-runtime.js';
 import { HARNESS_PROBE_TIMEOUT_MS, TINYFISH_ACCESS_MODE_HEADER, TINYFISH_KEYLESS_ACCESS_MODE, } from './constants.js';
 import { HERMES_HEADER_TEMPLATE, HERMES_MCP_SERVER_KEY } from './config/hermes-config.js';
-import { errLine, parseJson } from './output.js';
-export const HERMES_PLUGIN_MANUAL_INSTALL = 'hermes plugins install tinyfish --enable';
-// Bare catalog names install only from this Hermes release onward.
-const HERMES_CATALOG_MIN_VERSION = 'v2026.9.11';
-export function installHermesPlugin(home, apiKey, { verbose }) {
-    errLine('Installing the TinyFish web plugin in Hermes...');
-    const result = spawn.sync('hermes', ['plugins', 'install', 'tinyfish', '--enable', '--force'], {
-        encoding: 'utf8',
-        maxBuffer: STEP_MAX_BUFFER,
-        timeout: SKILL_INSTALL_TIMEOUT_MS,
+import { errLine, noColourEnv, parseJson, sanitizeLine } from './output.js';
+export const HERMES_PLUGIN_MANUAL_INSTALL = 'hermes plugins install tinyfish --enable --force';
+// Older Hermes cannot parse our catalog tier, so the name misses.
+const HERMES_CATALOG_MIN_VERSION = 'v0.22.3';
+const HERMES_PLUGIN_REPO = 'tinyfish-io/tinyfish-web-agent-integrations/hermes';
+// Mirrors the catalog pin; bump it with each catalog re-pin.
+const HERMES_PLUGIN_REF = '770a3765fa6249b1f6a6153ddaaf65b76bf8fdd4';
+const HERMES_PLUGIN_REPO_INSTALL = `${HERMES_PLUGIN_REPO} --ref ${HERMES_PLUGIN_REF}`;
+// Catalog-era Hermes, then the community-index era (<= v2026.8.31).
+const CATALOG_MISSES = ['not in the Hermes plugin catalog', 'not found in the community index'];
+function runPluginInstall(home, apiKey, source) {
+    return spawn.sync('hermes', ['plugins', 'install', ...source, '--enable', '--force'], {
+        ...captureStdio(false),
         // Hermes' install-time requires_env check reads os.environ, not our .env seed.
-        env: { ...process.env, HERMES_HOME: home, TINYFISH_API_KEY: apiKey },
+        env: noColourEnv({ HERMES_HOME: home, TINYFISH_API_KEY: apiKey }),
     });
+}
+// Rich wraps stdout at 80 columns, which can split the phrase.
+function catalogMiss(result) {
+    if (result.error || result.signal || result.status === 0)
+        return false;
+    const output = sanitizeLine(capturedOutput(result)).replace(/\s+/g, ' ');
+    return CATALOG_MISSES.some((miss) => output.includes(miss));
+}
+export function installHermesPlugin(home, apiKey, { verbose }) {
+    errLine('Installing the TinyFish web plugin in Hermes...');
+    let result = runPluginInstall(home, apiKey, ['tinyfish']);
+    throwIfInterrupted(result);
+    const fellBack = catalogMiss(result);
+    if (fellBack) {
+        if (verbose)
+            replay(capturedOutput(result));
+        result = runPluginInstall(home, apiKey, [HERMES_PLUGIN_REPO, '--ref', HERMES_PLUGIN_REF]);
+    }
     if (result.error || result.status !== 0) {
         // A declined security scan exits 1 here, and reconnecting repeats it.
         const error = spawnStepError(`Could not install the TinyFish web plugin in Hermes; to install it yourself run: ` +
-            `${HERMES_PLUGIN_MANUAL_INSTALL} (Hermes older than ${HERMES_CATALOG_MIN_VERSION} needs \`hermes update\` first)`, result);
+            `${HERMES_PLUGIN_MANUAL_INSTALL} (Hermes older than ${HERMES_CATALOG_MIN_VERSION} needs \`hermes update\` first)` +
+            (fellBack
+                ? `, or: hermes plugins install ${HERMES_PLUGIN_REPO_INSTALL} --enable --force`
+                : ''), result);
         replay(capturedOutput(result));
         throw error;
     }
@@ -105,7 +129,7 @@ export function readHermesPluginStatus(home) {
         encoding: 'utf8',
         maxBuffer: STEP_MAX_BUFFER,
         timeout: HARNESS_PROBE_TIMEOUT_MS,
-        env: { ...process.env, HERMES_HOME: home, FORCE_COLOR: '0', NO_COLOR: '1' },
+        env: noColourEnv({ HERMES_HOME: home }),
     });
     // A timeout also lands in result.error, where "not installed" would be a lie.
     if (result.error) {

package/dist/lib/output.d.ts

@@ -4,6 +4,7 @@ export declare class ApiError extends Error {
     constructor(status: number, message: string, code?: string | undefined);
 }
 export declare function out(data: unknown): void;
+export declare function noColourEnv(extra?: Record<string, string>): NodeJS.ProcessEnv;
 /** The only writer for untrusted text: strips ANSI and C0/C1 controls. */
 export declare function sanitizeLine(text: string): string;
 /** Every version the route caps at 32 printable ASCII chars. */

package/dist/lib/output.js

@@ -12,6 +12,12 @@ export class ApiError extends Error {
 export function out(data) {
     process.stdout.write(JSON.stringify(data) + '\n');
 }
+// Rich forces colour on any non-empty FORCE_COLOR, '0' included.
+export function noColourEnv(extra = {}) {
+    const env = { ...process.env, NO_COLOR: '1', ...extra };
+    delete env['FORCE_COLOR'];
+    return env;
+}
 /** The only writer for untrusted text: strips ANSI and C0/C1 controls. */
 export function sanitizeLine(text) {
     // eslint-disable-next-line no-control-regex

package/dist/lib/registration-detect.js

@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { loadConfig, matchesCliKey } from './auth.js';
 import { NATIVE_BY_HARNESS } from './connect-clients.js';
 import { HARNESS_PROBE_TIMEOUT_MS } from './constants.js';
-import { errLine } from './output.js';
+import { errLine, noColourEnv } from './output.js';
 import { readClineTinyfishEntry } from './config/cline-config.js';
 import { readCommandCodeTinyfishEntry } from './config/command-code-config.js';
 import { readCursorTinyfishEntry } from './config/cursor-config.js';
@@ -68,7 +68,7 @@ function runProbe(command, args) {
         timeout: HARNESS_PROBE_TIMEOUT_MS,
         // Belt and braces only: agents export FORCE_COLOR, and `NO_COLOR` does not fully silence
         // OpenCode, so the strip below stays load-bearing rather than a fallback.
-        env: { ...process.env, NO_COLOR: '1', FORCE_COLOR: '0' },
+        env: noColourEnv(),
     });
     if (result.error) {
         const code = result.error.code;

package/package.json

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