@tiny-fish/cli 0.52.4-next.429 → 0.52.4-next.431

package/dist/lib/dotenv-file.d.ts

@@ -0,0 +1,6 @@
+export declare function dotenvMarkerHead(client: string): string;
+export declare function writeDotenvKey(envPath: string, varName: string, key: string, markerHead: string): void;
+export declare function readDotenvKey(envPath: string, varName: string): string | undefined;
+/** Restores the exact line writeDotenvKey replaces, quotes and comment included. */
+export declare function captureDotenvKeyRestore(envPath: string, varName: string, markerHead: string): () => void;
+export declare function removeDotenvKey(envPath: string, varName: string, markerHead: string): boolean;

package/dist/lib/dotenv-file.js

@@ -0,0 +1,117 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+const MARKER_TAIL = '# tinyfish-cli: end';
+// Keys are `sk-tinyfish-<alnum>`; refusing anything else beats shipping unreachable escaping.
+const BARE_SAFE = /^[A-Za-z0-9._\-/:+=]+$/;
+export function dotenvMarkerHead(client) {
+    return `# tinyfish-cli: TinyFish MCP key, managed by \`tinyfish connect ${client}\``;
+}
+/** Mirrors Hermes' _env_line_defines_key: load_env() parses the export form too. */
+function definesKey(line, varName) {
+    const stripped = line.trim().replace(/^export\s+/, '');
+    return stripped.startsWith(`${varName}=`);
+}
+// A leading BOM would otherwise ride into the first key's name.
+function readLines(envPath) {
+    if (!fs.existsSync(envPath))
+        return [];
+    const raw = fs.readFileSync(envPath);
+    // A valid UTF-8 .env has no NUL; every wide encoding does.
+    if (raw.includes(0)) {
+        throw new Error(`${envPath} contains NUL bytes, so it is a wide encoding or corrupt; TinyFish can only ` +
+            `edit a UTF-8 .env. Re-save it as UTF-8 and retry.`);
+    }
+    return raw
+        .toString('utf8')
+        .replace(/^\uFEFF/, '')
+        .split(/(?<=\n)/);
+}
+// Hermes preserves the original mode so Docker volume mounts survive (config.py:3921-3929).
+function writeAtomic(envPath, lines) {
+    let mode = 0o600;
+    try {
+        mode = fs.statSync(envPath).mode & 0o777;
+    }
+    catch {
+        // No existing file: 0600 is the right default for credentials.
+    }
+    const tmp = `${envPath}.${randomUUID()}.tmp`;
+    try {
+        fs.writeFileSync(tmp, lines.join(''), { encoding: 'utf8', mode });
+        // open() applies mode through umask; chmod bypasses it, preserving bits.
+        fs.chmodSync(tmp, mode);
+        fs.renameSync(tmp, envPath);
+    }
+    catch (error) {
+        fs.rmSync(tmp, { force: true });
+        throw error;
+    }
+}
+export function writeDotenvKey(envPath, varName, key, markerHead) {
+    const clean = key.replace(/[\r\n]/g, '').trim();
+    // An empty key reads as "bad characters" without its own branch.
+    if (!clean)
+        throw new Error(`TinyFish API key is empty; nothing to write to ${envPath}`);
+    if (!BARE_SAFE.test(clean)) {
+        throw new Error('TinyFish API key contains characters that cannot be written to a .env file');
+    }
+    fs.mkdirSync(path.dirname(envPath), { recursive: true });
+    const lines = readLines(envPath);
+    const assignment = `${varName}=${clean}\n`;
+    const index = lines.findIndex((line) => definesKey(line, varName));
+    if (index < 0) {
+        if (lines.length && !lines[lines.length - 1].endsWith('\n'))
+            lines[lines.length - 1] += '\n';
+        lines.push(`${markerHead}\n`, assignment, `${MARKER_TAIL}\n`);
+        writeAtomic(envPath, lines);
+        return;
+    }
+    lines[index] = assignment;
+    // Dotenv loaders are last-wins; a surviving duplicate would beat this value.
+    writeAtomic(envPath, lines.filter((line, i) => i === index || !definesKey(line, varName)));
+}
+export function readDotenvKey(envPath, varName) {
+    const line = readLines(envPath).find((l) => definesKey(l, varName));
+    if (!line)
+        return undefined;
+    // We never write quoted values, so a quoted one isn't ours.
+    const raw = line
+        .trim()
+        .replace(/^export\s+/, '')
+        .slice(varName.length + 1)
+        .trim();
+    return BARE_SAFE.test(raw) ? raw : undefined;
+}
+/** Restores the exact line writeDotenvKey replaces, quotes and comment included. */
+export function captureDotenvKeyRestore(envPath, varName, markerHead) {
+    // Raw, not readDotenvKey: its parse drops quoted and comment-trailed values.
+    const previous = readLines(envPath).find((line) => definesKey(line, varName));
+    return () => {
+        if (previous === undefined) {
+            removeDotenvKey(envPath, varName, markerHead);
+            return;
+        }
+        let restored = false;
+        const lines = readLines(envPath).flatMap((line) => {
+            if (!definesKey(line, varName))
+                return [line];
+            if (restored)
+                return [];
+            restored = true;
+            return [previous];
+        });
+        writeAtomic(envPath, restored ? lines : [...lines, previous]);
+    };
+}
+export function removeDotenvKey(envPath, varName, markerHead) {
+    const lines = readLines(envPath);
+    if (!lines.length)
+        return false;
+    const isMarker = (line) => line.trim() === markerHead || line.trim() === MARKER_TAIL;
+    const kept = lines.filter((line) => !definesKey(line, varName) && !isMarker(line));
+    if (kept.length === lines.length)
+        return false;
+    writeAtomic(envPath, kept);
+    return true;
+}

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

@@ -14,6 +14,5 @@ export declare function hermesEnvPath(home: string): string;
 export declare function writeHermesKey(home: string, key: string): void;
 /** Doctor needs this to tell key auth from OAuth. */
 export declare function readHermesKey(home: string): string | undefined;
-/** Restores the exact line writeHermesKey replaces, quotes and comment included. */
 export declare function captureHermesKeyRestore(home: string): () => void;
 export declare function removeHermesKey(home: string): boolean;

package/dist/lib/hermes-env.js

@@ -1,11 +1,10 @@
 import os from 'node:os';
 import path from 'node:path';
-import fs from 'node:fs';
-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 { noColourEnv, sanitizeLine } from './output.js';
+import { captureDotenvKeyRestore, dotenvMarkerHead, readDotenvKey, removeDotenvKey, writeDotenvKey, } from './dotenv-file.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
@@ -46,125 +45,21 @@ function probeHermesHome() {
     return path.isAbsolute(expanded) ? expanded : { reason: 'relative' };
 }
 export const HERMES_KEY_VAR = 'MCP_TINYFISH_API_KEY';
+const MARKER_HEAD = dotenvMarkerHead('hermes');
 /** Named in every message about the seeded key, so no caller rebuilds the path. */
 export function hermesEnvPath(home) {
     return path.join(home, '.env');
 }
-const MARKER_HEAD = `# tinyfish-cli: TinyFish MCP key, managed by \`tinyfish connect hermes\``;
-const MARKER_TAIL = '# tinyfish-cli: end';
-// Keys are `sk-tinyfish-<alnum>`; refusing anything else beats shipping unreachable escaping.
-const BARE_SAFE = /^[A-Za-z0-9._\-/:+=]+$/;
-/** Mirrors Hermes' _env_line_defines_key: load_env() parses the export form too. */
-function definesKey(line) {
-    const stripped = line.trim().replace(/^export\s+/, '');
-    return stripped.startsWith(`${HERMES_KEY_VAR}=`);
-}
-function isMarker(line) {
-    return line.trim() === MARKER_HEAD || line.trim() === MARKER_TAIL;
-}
-// A leading BOM would otherwise ride into the first key's name.
-function readLines(envPath) {
-    if (!fs.existsSync(envPath))
-        return [];
-    const raw = fs.readFileSync(envPath);
-    // A valid UTF-8 .env has no NUL; every wide encoding does.
-    if (raw.includes(0)) {
-        throw new Error(`${envPath} contains NUL bytes, so it is a wide encoding or corrupt; TinyFish can only ` +
-            `edit a UTF-8 .env. Re-save it as UTF-8 and retry.`);
-    }
-    return raw
-        .toString('utf8')
-        .replace(/^\uFEFF/, '')
-        .split(/(?<=\n)/);
-}
-// Hermes preserves the original mode so Docker volume mounts survive (config.py:3921-3929).
-function writeAtomic(envPath, lines) {
-    let mode = 0o600;
-    try {
-        mode = fs.statSync(envPath).mode & 0o777;
-    }
-    catch {
-        // No existing file: 0600 is the right default for credentials.
-    }
-    const tmp = `${envPath}.${randomUUID()}.tmp`;
-    try {
-        fs.writeFileSync(tmp, lines.join(''), { encoding: 'utf8', mode });
-        // open() applies mode through umask; chmod bypasses it, preserving bits.
-        fs.chmodSync(tmp, mode);
-        fs.renameSync(tmp, envPath);
-    }
-    catch (error) {
-        fs.rmSync(tmp, { force: true });
-        throw error;
-    }
-}
 export function writeHermesKey(home, key) {
-    const clean = key.replace(/[\r\n]/g, '').trim();
-    // An empty key reads as "bad characters" without its own branch.
-    if (!clean)
-        throw new Error("TinyFish API key is empty; nothing to write to Hermes' .env");
-    if (!BARE_SAFE.test(clean)) {
-        throw new Error('TinyFish API key contains characters that cannot be written to a .env file');
-    }
-    const envPath = hermesEnvPath(home);
-    fs.mkdirSync(home, { recursive: true });
-    const lines = readLines(envPath);
-    const assignment = `${HERMES_KEY_VAR}=${clean}\n`;
-    const index = lines.findIndex(definesKey);
-    if (index < 0) {
-        if (lines.length && !lines[lines.length - 1].endsWith('\n'))
-            lines[lines.length - 1] += '\n';
-        lines.push(`${MARKER_HEAD}\n`, assignment, `${MARKER_TAIL}\n`);
-        writeAtomic(envPath, lines);
-        return;
-    }
-    lines[index] = assignment;
-    // load_env() is last-wins; a surviving duplicate would beat this value.
-    writeAtomic(envPath, lines.filter((line, i) => i === index || !definesKey(line)));
+    writeDotenvKey(hermesEnvPath(home), HERMES_KEY_VAR, key, MARKER_HEAD);
 }
 /** Doctor needs this to tell key auth from OAuth. */
 export function readHermesKey(home) {
-    const line = readLines(hermesEnvPath(home)).find(definesKey);
-    if (!line)
-        return undefined;
-    // We never write quoted values, so a quoted one isn't ours.
-    const raw = line
-        .trim()
-        .replace(/^export\s+/, '')
-        .slice(HERMES_KEY_VAR.length + 1)
-        .trim();
-    return BARE_SAFE.test(raw) ? raw : undefined;
+    return readDotenvKey(hermesEnvPath(home), HERMES_KEY_VAR);
 }
-/** Restores the exact line writeHermesKey replaces, quotes and comment included. */
 export function captureHermesKeyRestore(home) {
-    // Raw, not readHermesKey: its parse drops quoted and comment-trailed values.
-    const previous = readLines(hermesEnvPath(home)).find(definesKey);
-    return () => {
-        if (previous === undefined) {
-            removeHermesKey(home);
-            return;
-        }
-        const envPath = hermesEnvPath(home);
-        let restored = false;
-        const lines = readLines(envPath).flatMap((line) => {
-            if (!definesKey(line))
-                return [line];
-            if (restored)
-                return [];
-            restored = true;
-            return [previous];
-        });
-        writeAtomic(envPath, restored ? lines : [...lines, previous]);
-    };
+    return captureDotenvKeyRestore(hermesEnvPath(home), HERMES_KEY_VAR, MARKER_HEAD);
 }
 export function removeHermesKey(home) {
-    const envPath = hermesEnvPath(home);
-    const lines = readLines(envPath);
-    if (!lines.length)
-        return false;
-    const kept = lines.filter((line) => !definesKey(line) && !isMarker(line));
-    if (kept.length === lines.length)
-        return false;
-    writeAtomic(envPath, kept);
-    return true;
+    return removeDotenvKey(hermesEnvPath(home), HERMES_KEY_VAR, MARKER_HEAD);
 }

package/package.json

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