@tiny-fish/cli 0.48.2-next.386 → 0.48.2-next.388

package/dist/lib/connect-all-uninstall.js

@@ -22,7 +22,7 @@ export function planText(harness, mcpUrl, apiKey) {
         return planCommandCodeWrite(mcpUrl, apiKey);
     if (harness === 'hermes' && apiKey) {
         return (`would run \`tinyfish connect hermes\` (harness-owned MCP write; the CLI writes ` +
-            `${HERMES_KEY_VAR} to Hermes' .env, installs the tinyfish plugin from npm @latest, ` +
+            `${HERMES_KEY_VAR} to Hermes' .env, installs the tinyfish plugin from the Hermes catalog, ` +
             `and points its web backends at tinyfish)`);
     }
     if (harness === 'hermes') {

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

@@ -67,7 +67,7 @@ interface ConnectStageDetail {
     phase?: ConnectCheckpoint;
     failureReason?: ConnectFailureReason;
     harnessVersion?: string;
-    /** The plugin the client pins, not a probe of what landed. */
+    /** Probed after install; absent when the probe cannot answer. */
     pluginVersion?: string;
     authMode?: ConnectAuthMode;
     /** Orthogonal to `authMode`: a stored key wins over `mcp login` on a healthy client too. */

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

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import { type InstallOptions } from './cli-install.js';
-export declare const HERMES_PLUGIN_PACKAGE = "@tiny-fish/hermes";
-export declare const HERMES_PLUGIN_MANUAL_INSTALL = "hermes plugins install tinyfish-io/tinyfish-web-agent-integrations/hermes --enable";
+export declare const HERMES_PLUGIN_MANUAL_INSTALL = "hermes plugins install tinyfish --enable";
 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,7 +1,3 @@
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { pathToFileURL } from 'node:url';
 import spawn from 'cross-spawn';
 import { z } from 'zod';
 import { capturedOutput, replay, SKILL_INSTALL_TIMEOUT_MS, STEP_MAX_BUFFER, } from './cli-install.js';
@@ -9,131 +5,35 @@ import { commandNotFound, ConnectStepError, spawnStepError, throwIfInterrupted,
 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';
-// Resolved at connect time, so plugin releases need no CLI release.
-export const HERMES_PLUGIN_PACKAGE = '@tiny-fish/hermes';
-// Anchored to --ref: an older Hermes rejects the flag and needs the plain URL.
-const REF_UNSUPPORTED_PATTERN = /unrecognized arguments:[^\n]*--ref/;
-// Tracks the repo head; npm @latest can trail a merge by one publish run.
-export const HERMES_PLUGIN_MANUAL_INSTALL = 'hermes plugins install tinyfish-io/tinyfish-web-agent-integrations/hermes --enable';
-function installSpawnEnv(home, apiKey) {
-    // Hermes' install-time requires_env check reads os.environ, not our .env seed.
-    return { ...process.env, HERMES_HOME: home, TINYFISH_API_KEY: apiKey };
-}
-function runPluginInstall(source, env) {
-    // Captured even under --verbose: the fallback matches on stderr.
-    return spawn.sync('hermes', ['plugins', 'install', ...source, '--enable', '--force'], {
-        encoding: 'utf8',
-        maxBuffer: STEP_MAX_BUFFER,
-        timeout: SKILL_INSTALL_TIMEOUT_MS,
-        env,
-    });
-}
-function refUnsupported(result) {
-    return result.status !== 0 && REF_UNSUPPORTED_PATTERN.test(String(result.stderr ?? ''));
-}
-function runGit(args) {
-    const result = spawn.sync('git', args, {
+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,
+        // Hermes' install-time requires_env check reads os.environ, not our .env seed.
+        env: { ...process.env, HERMES_HOME: home, TINYFISH_API_KEY: apiKey },
     });
-    if (!result.error && result.status === 0)
-        return result;
-    if (commandNotFound(result.error)) {
-        throw new ConnectStepError('git is required to stage the plugin for Hermes; install git and run connect again', 'command_not_found');
-    }
-    // Built first: its interrupt check must run before any replay.
-    const error = spawnStepError('Could not stage the TinyFish Hermes plugin', result);
-    replay(capturedOutput(result));
-    throw error;
-}
-function runNpmDownload(tmp) {
-    // --prefix both downloads and extracts, so no tar dependency anywhere.
-    const result = spawn.sync('npm', [
-        'install',
-        `${HERMES_PLUGIN_PACKAGE}@latest`,
-        '--prefix',
-        tmp,
-        // Lifecycle scripts would run arbitrary code with the key in env.
-        '--ignore-scripts',
-        '--no-save',
-        '--no-audit',
-        '--no-fund',
-        '--loglevel=error',
-    ], { encoding: 'utf8', maxBuffer: STEP_MAX_BUFFER, timeout: SKILL_INSTALL_TIMEOUT_MS });
-    if (!result.error && result.status === 0)
-        return;
-    if (commandNotFound(result.error)) {
-        throw new ConnectStepError(`npm is required to download the TinyFish Hermes plugin; to install it yourself run: ${HERMES_PLUGIN_MANUAL_INSTALL}`, 'command_not_found');
-    }
-    // Built first: its interrupt check must run before any replay.
-    const error = spawnStepError(`Could not download ${HERMES_PLUGIN_PACKAGE} from npm; to install it yourself run: ${HERMES_PLUGIN_MANUAL_INSTALL}`, result);
-    replay(capturedOutput(result));
-    throw error;
-}
-function stagedPluginVersion(dir) {
-    try {
-        const parsed = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
-        const version = parsed.version;
-        return typeof version === 'string' && version ? version : undefined;
-    }
-    catch {
-        return undefined;
+    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);
+        replay(capturedOutput(result));
+        throw error;
     }
-}
-// Hermes installs plugins only by git clone, so the payload gets a throwaway repo.
-function stagePluginFromNpm(tmp) {
-    runNpmDownload(tmp);
-    const dir = path.join(tmp, 'node_modules', ...HERMES_PLUGIN_PACKAGE.split('/'));
-    // Empty hooksPath: a global hooks dir or init template must not run here.
-    const hooksDir = path.join(tmp, 'git-hooks');
-    fs.mkdirSync(hooksDir);
-    runGit(['-C', dir, 'init', '--quiet']);
-    runGit(['-C', dir, 'add', '-A']);
-    // Inline identity: fresh machines have no git config and commit fails without it.
-    runGit([
-        '-C',
-        dir,
-        '-c',
-        `core.hooksPath=${hooksDir}`,
-        '-c',
-        'user.name=tinyfish-cli',
-        '-c',
-        'user.email=support@tinyfish.io',
-        'commit',
-        '--quiet',
-        // A global commit.gpgSign would summon a signer this commit must not need.
-        '--no-gpg-sign',
-        '-m',
-        'stage @tiny-fish/hermes for install',
-    ]);
-    const sha = String(runGit(['-C', dir, 'rev-parse', 'HEAD']).stdout ?? '').trim();
-    return { dir, sha, version: stagedPluginVersion(dir) };
-}
-export function installHermesPlugin(home, apiKey, { verbose }) {
-    errLine('Installing the TinyFish web plugin in Hermes...');
-    const env = installSpawnEnv(home, apiKey);
-    const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'tinyfish-hermes-plugin-'));
-    try {
-        const staged = stagePluginFromNpm(tmp);
-        const url = pathToFileURL(staged.dir).href;
-        // --ref: a prior pinned install rejects an unpinned reinstall of the same name.
-        const primary = runPluginInstall([url, '--ref', staged.sha], env);
-        // A pre---ref Hermes never pins, so the plain URL is safe there.
-        const result = refUnsupported(primary) ? runPluginInstall([url], env) : primary;
-        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}`, result);
-            replay(capturedOutput(result));
-            throw error;
-        }
-        if (verbose)
+    if (verbose)
+        replay(capturedOutput(result));
+    const probe = readHermesPluginStatus(home);
+    // A refused enable exits 0; backends need a present provider.
+    if (probe.state === 'not_installed') {
+        if (!verbose)
             replay(capturedOutput(result));
-        return staged.version;
-    }
-    finally {
-        fs.rmSync(tmp, { recursive: true, force: true });
+        throw new ConnectStepError('Hermes installed the TinyFish web plugin but did not enable it; run: hermes plugins enable tinyfish', 'invalid_config');
     }
+    return probe.state === 'ok' ? (probe.status.plugin_version ?? undefined) : undefined;
 }
 function hermesConfig(args, home) {
     return spawn.sync('hermes', ['config', ...args], {

package/package.json

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