@tiny-fish/cli 0.34.1-next.285 → 0.34.1-next.286

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

@@ -3,6 +3,7 @@ import { NATIVE_BY_HARNESS, openclawSkillUninstall } from './connect-clients.js'
 import { ConnectInterruptedError, spawnRemoval } from './connect-runtime.js';
 import { removeCursorMcpServer, planCursorWrite } from './cursor-config.js';
 import { HERMES_KEY_VAR, hermesEnvPath, removeHermesKey, resolveHermesHome } from './hermes-env.js';
+import { clearHermesWebBackends, HERMES_PLUGIN_SHA } from './hermes-plugin.js';
 import { HARNESS_DISPLAY_NAMES as DISPLAY_NAMES } from './harness-detect.js';
 import { errLine } from './output.js';
 // OpenCode ships no `mcp remove`, so the only removal is editing the config it wrote.
@@ -12,7 +13,9 @@ export function planText(harness, mcpUrl, apiKey) {
         return planCursorWrite(mcpUrl, apiKey);
     // Only the keyed path seeds the .env; a keyless Hermes install writes nothing.
     if (harness === 'hermes' && apiKey) {
-        return `would run \`tinyfish connect hermes\` (harness-owned MCP write; the CLI writes ${HERMES_KEY_VAR} to Hermes' .env)`;
+        return (`would run \`tinyfish connect hermes\` (harness-owned MCP write; the CLI writes ` +
+            `${HERMES_KEY_VAR} to Hermes' .env, installs the tinyfish plugin at ` +
+            `${HERMES_PLUGIN_SHA.slice(0, 12)}, and points its web backends at tinyfish)`);
     }
     return `would run \`tinyfish connect ${harness}\` (harness-owned MCP write; no local file touched by the CLI)`;
 }
@@ -24,7 +27,9 @@ export function uninstallPlanText(harness) {
         return `would print \`${uninstallPointer(harness)}\` (no removal command exists)`;
     }
     // Hermes alone leaves a seeded key behind; `mcp remove` never clears it.
-    const envNote = harness === 'hermes' ? ` and clear ${HERMES_KEY_VAR} from Hermes' .env` : '';
+    const envNote = harness === 'hermes'
+        ? ` and clear ${HERMES_KEY_VAR} from Hermes' .env plus its tinyfish web backends`
+        : '';
     return `would run \`${uninstallPointer(harness)}\`${envNote}`;
 }
 /** Undefined: no harness-CLI removal exists (opencode). */
@@ -36,7 +41,8 @@ function uninstallRuns(harness) {
     const native = NATIVE_BY_HARNESS.get(harness);
     if (!native || native.removals.length === 0)
         return undefined;
-    return { command: native.command, runs: native.removals.map((r) => r.args) };
+    const extra = native.uninstallExtra ? [native.uninstallExtra.args] : [];
+    return { command: native.command, runs: [...native.removals.map((r) => r.args), ...extra] };
 }
 /** Derived from the same args the spawn runs, so the advice cannot drift. */
 function uninstallPointer(harness) {
@@ -48,9 +54,29 @@ function uninstallPointer(harness) {
     const joiner = process.platform === 'win32' ? ' && ' : ' ; ';
     return removal.runs.map((args) => `${removal.command} ${args.join(' ')}`).join(joiner);
 }
-/** `mcp remove` leaves this behind; a stale value gets silently reused. */
-function clearHermesEnvKey() {
+/** `mcp remove` clears neither the key nor the backends we wrote. */
+function clearHermesLocalState() {
     const home = resolveHermesHome();
+    const advisories = [clearHermesEnvKey(home), clearHermesBackends(home)].filter((advisory) => advisory !== undefined);
+    return advisories.length > 0 ? advisories.join(' ') : undefined;
+}
+/** Backends left naming an absent provider would break Hermes' web tools. */
+function clearHermesBackends(home) {
+    // The key clearer already reported the unresolved home.
+    if (!home)
+        return undefined;
+    try {
+        clearHermesWebBackends(home);
+        return undefined;
+    }
+    catch (e) {
+        const detail = e instanceof Error ? e.message : String(e);
+        return (`could not unset Hermes' tinyfish web backends (${detail}). Run \`hermes config unset ` +
+            'web.search_backend`, `web.extract_backend` and `web.backend` by hand.');
+    }
+}
+/** `mcp remove` leaves this behind; a stale value gets silently reused. */
+function clearHermesEnvKey(home) {
     const retry = 're-run `tinyfish connect --all --uninstall`';
     if (!home) {
         return (`could not locate Hermes' home, so ${HERMES_KEY_VAR} may still be set in its .env. ` +
@@ -177,7 +203,7 @@ export function uninstallHarness(harness, configPath, verbose, binaryOnPath) {
     // Clearing a key the entry still references would break a working install.
     const removed = !result.removalFailed &&
         (result.outcome === 'uninstalled' || result.outcome === 'uninstall_noop');
-    const advisory = removed ? clearHermesEnvKey() : hermesKeyKeptAdvisory();
+    const advisory = removed ? clearHermesLocalState() : hermesKeyKeptAdvisory();
     if (!advisory)
         return result;
     // Appended, never replacing: an advisory must not hide the removal's message.

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

@@ -74,6 +74,11 @@ interface BaseMcpClient extends SupportedCommand {
         apiKey?: string;
         verbose: boolean;
     }) => void;
+    /** Extra --uninstall row beyond `removals`; never runs pre-add. */
+    uninstallExtra?: {
+        args: string[];
+        label: string;
+    };
 }
 /** Keyless installs use this argv; the harness signs itself in. */
 export interface OauthCapableMcpClient extends BaseMcpClient {

package/dist/lib/connect-clients.js

@@ -7,7 +7,7 @@ import { ConnectStepError, spawnStepError, } from './connect-runtime.js';
 import { TINYFISH_API_KEY_VAR } from './constants.js';
 import { HERMES_KEY_VAR, captureHermesKeyRestore, hermesEnvPath, resolveHermesHome, writeHermesKey, } from './hermes-env.js';
 import { hermesConfigPath, readHermesEntry } from './hermes-config.js';
-import { installHermesPlugin, setHermesWebBackends } from './hermes-plugin.js';
+import { HERMES_PLUGIN_NAME, installHermesPlugin, setHermesWebBackends } from './hermes-plugin.js';
 const HERMES_SEED_TIMEOUT_MS = 120_000;
 // An old install is only one reason a flag can go unseen, so no message asserts the cause.
 const SUPPORT_CHECK_DEBUG_HINT = ' Set TINYFISH_DEBUG=1 and retry to print the help output TinyFish read.';
@@ -332,6 +332,10 @@ export const HERMES = {
     },
     removals: [{ args: ['mcp', 'remove', 'tinyfish'], label: 'TinyFish registration from Hermes' }],
     extraPostInstall: installHermesWebPlugin,
+    uninstallExtra: {
+        args: ['plugins', 'uninstall', HERMES_PLUGIN_NAME],
+        label: 'TinyFish web plugin from Hermes',
+    },
     launchWalkthrough: launchHermesWalkthrough,
     postConnectNote: 'Restart your Hermes session to pick up TinyFish — Hermes discovers MCP servers at startup.',
 };

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

@@ -1,6 +1,9 @@
 import { type InstallOptions } from './cli-install.js';
 export declare const HERMES_PLUGIN_SHA = "496cd63fefd982bbaa8a85ce78ef2270d700984f";
+export declare const HERMES_PLUGIN_NAME = "tinyfish";
 export declare const HERMES_PLUGIN_MANUAL_INSTALL = "hermes plugins install tinyfish-io/tinyfish-web-agent-integrations/hermes --ref 496cd63fefd982bbaa8a85ce78ef2270d700984f --enable";
 export declare function installHermesPlugin(home: string, apiKey: string, { verbose }: Pick<InstallOptions, 'verbose'>): void;
 /** After install only: backends must never name an absent provider. */
 export declare function setHermesWebBackends(home: string): void;
+/** Ours-only unsets: a user-chosen backend value survives the uninstall. */
+export declare function clearHermesWebBackends(home: string): void;

package/dist/lib/hermes-plugin.js

@@ -4,11 +4,13 @@ import * as path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import spawn from 'cross-spawn';
 import { capturedOutput, replay, SKILL_INSTALL_TIMEOUT_MS, STEP_MAX_BUFFER, } from './cli-install.js';
-import { commandNotFound, ConnectStepError, spawnStepError } from './connect-runtime.js';
+import { commandNotFound, ConnectStepError, spawnStepError, throwIfInterrupted, } from './connect-runtime.js';
 import { HARNESS_PROBE_TIMEOUT_MS } from './constants.js';
 import { errLine } from './output.js';
 // Bump per CLI release.
 export const HERMES_PLUGIN_SHA = '496cd63fefd982bbaa8a85ce78ef2270d700984f';
+// Manifest `name:`, not the repo subdir; `plugins uninstall` keys on it.
+export const HERMES_PLUGIN_NAME = 'tinyfish';
 const PLUGIN_SOURCE = 'tinyfish-io/tinyfish-web-agent-integrations/hermes';
 const PLUGIN_REPO_URL = 'https://github.com/tinyfish-io/tinyfish-web-agent-integrations.git';
 export const HERMES_PLUGIN_MANUAL_INSTALL = `hermes plugins install ${PLUGIN_SOURCE} --ref ${HERMES_PLUGIN_SHA} --enable`;
@@ -92,8 +94,26 @@ function configWrite(home, args) {
     throw error;
 }
 const HERMES_BACKEND_KEYS = ['web.search_backend', 'web.extract_backend'];
+// Dispatch falls back to web.backend, and the plugin's own setup can set it.
+const HERMES_OWNED_BACKEND_KEYS = [...HERMES_BACKEND_KEYS, 'web.backend'];
 /** After install only: backends must never name an absent provider. */
 export function setHermesWebBackends(home) {
     for (const key of HERMES_BACKEND_KEYS)
         configWrite(home, ['set', key, 'tinyfish']);
 }
+/** Unset prints empty and exits 0, so a failed read must not read as unset. */
+function configGet(home, key) {
+    const result = hermesConfig(['get', key], home);
+    throwIfInterrupted(result);
+    if (result.error || result.status !== 0) {
+        throw spawnStepError(`Could not read \`hermes config get ${key}\``, result);
+    }
+    return String(result.stdout ?? '').trim() || undefined;
+}
+/** Ours-only unsets: a user-chosen backend value survives the uninstall. */
+export function clearHermesWebBackends(home) {
+    for (const key of HERMES_OWNED_BACKEND_KEYS) {
+        if (configGet(home, key) === 'tinyfish')
+            configWrite(home, ['unset', key]);
+    }
+}

package/package.json

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