@atbash/cli 0.5.15-dev.0 → 0.5.15-dev.2

package/dist/commands/setup.js

@@ -43,6 +43,13 @@ exports.resolveKeySource = resolveKeySource;
 exports.keyFileContents = keyFileContents;
 exports.isJsonc = isJsonc;
 exports.mergeOpenclawConfig = mergeOpenclawConfig;
+exports.detectIndent = detectIndent;
+exports.serializeLike = serializeLike;
+exports.detectMcpClients = detectMcpClients;
+exports.findHermesPython = findHermesPython;
+exports.mergeHermesEnv = mergeHermesEnv;
+exports.hadInlineKey = hadInlineKey;
+exports.mergeMcpServer = mergeMcpServer;
 exports.buildPlan = buildPlan;
 exports.lineDiff = lineDiff;
 exports.renderPlan = renderPlan;
@@ -56,7 +63,7 @@ const child_process_1 = require("child_process");
 const chalk_1 = __importDefault(require("chalk"));
 const jsonc = __importStar(require("jsonc-parser"));
 const sdk_1 = require("@atbash/sdk");
-const connect_1 = require("./connect");
+const atbash_targets_1 = require("../shared/atbash-targets");
 /**
  * `atbash setup` — the write half of onboarding.
  *
@@ -84,9 +91,11 @@ const connect_1 = require("./connect");
  *  2. It never writes the private key into an MCP client config. The documented
  *     `@atbash/mcp` wiring passes the key as an `ATBASH_AGENT_PRIVKEY` env value
  *     inside e.g. `claude_desktop_config.json` — a file people screenshot, sync
- *     and share. That package has no key-file fallback today (verified against
- *     the published 0.1.3), so MCP clients are REPORTED with the snippet to add
- *     by hand rather than silently seeded with a secret.
+ *     and share, and that package has no key-file fallback (verified against the
+ *     published 0.1.3). So the entry setup writes points at `atbash mcp`, which
+ *     reads the 0600 key file and passes the key to the server through the child
+ *     environment. The config file itself gets NO credential — and an entry that
+ *     was hand-wired with one has it removed.
  *  3. It never edits application source. Code-level integrations (LangChain,
  *     LangGraph, AutoGen, Eliza, the SDK boundary) are the owner's to write.
  *  4. It never rewrites a config file that uses comments or trailing commas.
@@ -208,7 +217,45 @@ function normalizePrivkey(raw) {
     const clean = raw.replace(/^0x/i, "").trim().toLowerCase();
     return (0, sdk_1.isValidPrivateKey)(clean) ? clean : "";
 }
-/** Files in a directory that plausibly hold an Atbash agent key, newest first. */
+/** Only sniff the contents of small files — a key file is a few hundred bytes. */
+const MAX_SNIFF_BYTES = 8 * 1024;
+/** Bound the content-sniff so `--keys-dir ~` cannot turn into a directory crawl. */
+const MAX_SNIFF_FILES = 60;
+/** Newest-first, so a freshly downloaded key wins over one from last month. */
+function newestFirst(files) {
+    return files
+        .map((file) => {
+        let mtime = 0;
+        try {
+            mtime = fs.statSync(file).mtimeMs;
+        }
+        catch { /* unreadable — sorts last */ }
+        return { file, mtime };
+    })
+        .sort((a, b) => b.mtime - a.mtime)
+        .map((e) => e.file);
+}
+/**
+ * Files in a directory that plausibly hold an Atbash agent key, newest first.
+ *
+ * TWO PASSES, and the second one is the point.
+ *
+ * By name first — `guard-client-key`, `agent-keys-*.txt` and friends — because
+ * matching the name is cheap and unambiguous. But a name-only match is a cliff:
+ * rename the download, or export from a wallet UI that picks its own filename,
+ * and the operator gets "no key file found" while the key sits right there in the
+ * directory they explicitly pointed at.
+ *
+ * So if no name matches, read the small files and keep the ones that actually
+ * PARSE as key material. That is a narrow test — `privkey=`, the documented JSON
+ * shape, or a file that is nothing but a 64-hex key — not "contains something
+ * hex-looking", so an unrelated file does not get mistaken for an identity.
+ *
+ * Reading files the operator did not name individually is justified by the flag
+ * itself: `--keys-dir` is an explicit instruction to look in that directory. It
+ * is bounded to small regular files and a file count, nothing is transmitted, and
+ * the caller prints WHICH file it used before doing anything with it.
+ */
 function keyCandidatesInDir(dir) {
     let names;
     try {
@@ -217,21 +264,31 @@ function keyCandidatesInDir(dir) {
     catch {
         return [];
     }
-    const matches = names.filter((n) => n === "guard-client-key" ||
+    const byName = names.filter((n) => n === "guard-client-key" ||
         /^agent-keys-.*\.txt$/i.test(n) ||
         /^atbash.*(key|keys).*\.(txt|json)$/i.test(n));
-    return matches
-        .map((n) => path.join(dir, n))
-        .map((file) => {
-        let mtime = 0;
+    if (byName.length)
+        return newestFirst(byName.map((n) => path.join(dir, n)));
+    const byContent = [];
+    let examined = 0;
+    for (const name of names) {
+        if (examined >= MAX_SNIFF_FILES)
+            break;
+        const file = path.join(dir, name);
         try {
-            mtime = fs.statSync(file).mtimeMs;
+            const stat = fs.statSync(file);
+            if (!stat.isFile() || stat.size === 0 || stat.size > MAX_SNIFF_BYTES)
+                continue;
         }
-        catch { /* unreadable — sorts last */ }
-        return { file, mtime };
-    })
-        .sort((a, b) => b.mtime - a.mtime)
-        .map((e) => e.file);
+        catch {
+            continue;
+        }
+        examined++;
+        const text = readTextFile(file);
+        if (text !== null && parseKeyMaterial(text))
+            byContent.push(file);
+    }
+    return newestFirst(byContent);
 }
 /**
  * Read a secret from the terminal without echoing it.
@@ -247,21 +304,27 @@ function keyCandidatesInDir(dir) {
 async function promptForKeyOrPath() {
     const { createInterface } = await Promise.resolve().then(() => __importStar(require("node:readline")));
     return new Promise((resolveP) => {
-        const input = process.stdin;
-        const rl = createInterface({ input, output: process.stdout, terminal: true });
-        // Mute the echo so a pasted key does not sit on screen (or in a scrollback
-        // buffer that gets screenshotted). A pasted path is muted too; that is a
-        // small cost against leaving a private key visible.
-        const asMutable = rl;
         const prompt = "Paste the agent's private key, or the path to its key file: ";
-        asMutable._writeToOutput = function (s) {
-            if (s.includes(prompt))
-                asMutable.output?.write(s);
-            else if (s === "\r\n" || s === "\n")
-                asMutable.output?.write(s);
-            // every other keystroke echo is dropped
+        // Write the prompt ourselves, THEN suppress every subsequent write.
+        //
+        // The obvious implementation compares each write against the prompt text and
+        // lets that one through — but a pasted value containing the prompt as a
+        // substring would then be echoed to the terminal, which is exactly the
+        // failure this mute exists to prevent. Emitting the prompt up front means the
+        // suppressor never has to decide what a write IS: after this point, nothing
+        // is echoed, unconditionally.
+        process.stdout.write(prompt);
+        const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: true });
+        rl._writeToOutput = () => {
+            /* nothing typed after the prompt is ever echoed */
         };
-        rl.question(prompt, (answer) => { rl.close(); resolveP(answer.trim()); });
+        rl.question("", (answer) => {
+            rl.close();
+            // readline's own newline was suppressed along with everything else, so the
+            // next line of output would otherwise land on the prompt line.
+            process.stdout.write("\n");
+            resolveP(answer.trim());
+        });
     });
 }
 /**
@@ -297,7 +360,15 @@ async function resolveKeySource(opts) {
         const dir = expandHome(opts.keysDir, home);
         const candidates = keyCandidatesInDir(dir);
         if (!candidates.length) {
-            return { error: `No agent key file found in ${dir} (looked for guard-client-key and agent-keys-*.txt).` };
+            return {
+                error: [
+                    `No agent key found in ${dir}.`,
+                    "Looked for guard-client-key / agent-keys-*.txt by name, then read the small",
+                    "files there to see if any parsed as an agent key. Neither found one.",
+                    "Point at the file directly with --key-file, or paste the key with no flags",
+                    "at all and setup will prompt for it.",
+                ].join("\n"),
+            };
         }
         return fromFile(candidates[0], "--keys-dir");
     }
@@ -439,6 +510,243 @@ function mergeOpenclawConfig(config, home) {
 function isRecord(v) {
     return !!v && typeof v === "object" && !Array.isArray(v);
 }
+/**
+ * Detect the indentation a JSON file already uses, so a merge does not reformat
+ * the parts it did not touch.
+ *
+ * Without this, `JSON.stringify(obj, null, 2)` re-indents a tab-indented or
+ * 4-space config from top to bottom. The RESULT is still correct, but the diff
+ * shown for approval becomes every line in the file, which buries the two lines
+ * that actually changed — and the operator's own formatting choice is collateral
+ * damage in a file we were asked to make one addition to.
+ *
+ * Falls back to two spaces, which is what the published docs show.
+ */
+function detectIndent(text) {
+    if (!text)
+        return 2;
+    // First line that is indented under an opening brace/bracket tells us the unit.
+    const match = text.match(/\n([ \t]+)\S/);
+    if (!match)
+        return 2;
+    const indent = match[1];
+    return indent.startsWith("\t") ? "\t" : indent.length;
+}
+/**
+ * Serialize a merged config the way the file was already written: same
+ * indentation, and a trailing newline only if the original had one.
+ */
+function serializeLike(original, value) {
+    const body = JSON.stringify(value, null, detectIndent(original));
+    // A file that ended without a newline keeps ending without one. Trivial, but it
+    // is one more line of unexplained diff for someone reviewing the change.
+    const trailing = original === null || original.endsWith("\n") ? "\n" : "";
+    return body + trailing;
+}
+/**
+ * The MCP server entry setup writes into a client's config.
+ *
+ * Note what is NOT here: an `env` block. The published `@atbash/mcp` wiring
+ * carries the agent's private key in one, because that package reads only
+ * ATBASH_AGENT_PRIVKEY. Going through `atbash mcp` instead means the launcher
+ * reads the 0600 key file and passes the key to the server in the child process
+ * environment, so this entry holds no credential and the client's config file is
+ * no more sensitive after setup runs than it was before.
+ *
+ * Deliberately NOT pinned to an exact CLI version: unlike the one-shot connector
+ * command, this entry persists in the operator's config and is re-executed every
+ * time the client starts. Pinning here would freeze their MCP server at whatever
+ * version happened to be current on the day they ran setup.
+ */
+const MCP_SERVER_ENTRY = { command: "npx", args: ["--yes", "@atbash/cli", "mcp"] };
+const MCP_SERVER_NAME = "atbash";
+/**
+ * MCP client configs present under this home directory.
+ *
+ * Paths come from the shared MCP_CONFIGS so the writer and the scanner cannot
+ * drift: a client the scan reports but setup cannot find would look like a bug in
+ * whichever of the two the operator happened to trust.
+ */
+function detectMcpClients(home) {
+    const out = [];
+    const seen = new Set();
+    for (const { label, segs } of atbash_targets_1.MCP_CONFIGS) {
+        if (seen.has(label))
+            continue;
+        const file = path.join(home, ...segs);
+        if (!exists(file))
+            continue;
+        seen.add(label);
+        // Read which key this file already uses rather than assuming. VS Code's
+        // mcp.json uses `servers`; writing `mcpServers` into it would be ignored.
+        const existing = readJsonLoose(file);
+        const serversKey = existing && isRecord(existing.servers) && !isRecord(existing.mcpServers) ? "servers" : "mcpServers";
+        out.push({ label, file, format: "json", serversKey });
+    }
+    // Claude Code and Codex are special-cased in the scanner too — same paths.
+    const claudeCode = path.join(home, ".claude.json");
+    if (exists(claudeCode))
+        out.push({ label: "Claude Code", file: claudeCode, format: "json", serversKey: "mcpServers" });
+    const codex = path.join(home, ".codex", "config.toml");
+    if (exists(codex))
+        out.push({ label: "Codex", file: codex, format: "toml", serversKey: "mcpServers" });
+    return out;
+}
+/** Tolerant read used only to sniff an existing file's shape. */
+function readJsonLoose(file) {
+    const text = readTextFile(file);
+    if (text === null)
+        return null;
+    const value = jsonc.parse(text, [], { allowTrailingComma: true, disallowComments: false });
+    return isRecord(value) ? value : null;
+}
+/**
+ * Add the Atbash server to a client config's server map, in place.
+ *
+ * A merge, like the OpenClaw one: every server the operator already configured
+ * stays exactly as it is. An existing `atbash` entry is REPLACED rather than
+ * merged field-by-field — a stale `env` block carrying a private key from the old
+ * hand-written wiring is precisely what we want gone, and preserving it would
+ * defeat the point of routing through the launcher.
+ */
+/** The Hermes plugin, and the exact version the wiring is written against. */
+const HERMES_PKG = "atbash-hermes-plugin";
+const HERMES_VERSION = "0.4.5";
+/**
+ * Find the Python interpreter that actually runs Hermes.
+ *
+ * This is the difference between installing the plugin and only appearing to.
+ * `pip install atbash-hermes-plugin` puts the package wherever the *shell's*
+ * `pip` points — commonly a system or conda Python — while Hermes typically runs
+ * from its own virtualenv. The install succeeds, prints nothing alarming, and the
+ * plugin is invisible to Hermes forever. Nobody can debug that from the output.
+ *
+ * The launcher knows the answer. A pip-installed console script begins with a
+ * shebang naming the interpreter that created it:
+ *
+ *   $ head -1 $(command -v hermes)
+ *   #!/Users/me/.hermes/hermes-agent/venv/bin/python3
+ *
+ * So resolve `hermes`, read its first line, and use that interpreter directly via
+ * `-m pip`. Falls back to the conventional venv location under ~/.hermes, then to
+ * null — and a null becomes a printed command rather than a guess, because a
+ * wrong guess here is the silent failure this whole function exists to avoid.
+ */
+function findHermesPython(home) {
+    const viable = (candidate) => {
+        try {
+            return fs.statSync(candidate).isFile();
+        }
+        catch {
+            return false;
+        }
+    };
+    // 1. The launcher's own shebang — authoritative, but only for a real run.
+    //
+    // `--home <dir>` exists so a dry run can be hermetic (the release checklist
+    // depends on it). A PATH lookup ignores it entirely: under `--home /tmp/fake`
+    // this would find the operator's ACTUAL hermes and plan an install into their
+    // real virtualenv. So the shebang route is skipped whenever `home` is not the
+    // machine's own home — the caller then falls through to the venv path under the
+    // given home, which is correctly scoped.
+    const realHome = process.env.HOME || os.homedir();
+    const scoped = path.resolve(home) !== path.resolve(realHome);
+    const which = scoped
+        ? { status: 1, stdout: "" }
+        : (0, child_process_1.spawnSync)(process.platform === "win32" ? "where" : "which", ["hermes"], { encoding: "utf8" });
+    const launcher = which.status === 0 ? which.stdout.split(/\r?\n/)[0]?.trim() : "";
+    if (launcher && viable(launcher)) {
+        const firstLine = (readTextFile(launcher) ?? "").split(/\r?\n/)[0] ?? "";
+        const shebang = firstLine.startsWith("#!") ? firstLine.slice(2).trim() : "";
+        // `#!/usr/bin/env python3` names no path; anything else should be absolute.
+        const interpreter = shebang.split(/\s+/).filter((part) => !part.endsWith("/env"))[0] ?? "";
+        if (/python[0-9.]*$/.test(interpreter) && viable(interpreter)) {
+            return { python: interpreter, how: `shebang of ${launcher}` };
+        }
+    }
+    // 2. The conventional venv Hermes ships with.
+    for (const name of ["python3", "python"]) {
+        const candidate = path.join(home, ".hermes", "hermes-agent", "venv", "bin", name);
+        if (viable(candidate))
+            return { python: candidate, how: "Hermes virtualenv under ~/.hermes" };
+    }
+    return null;
+}
+/**
+ * The env vars the Hermes plugin documents, merged into an existing `.env`.
+ *
+ * A `.env` is line-oriented and hand-maintained, so this is a line merge rather
+ * than a parse-and-reserialize: keys Atbash owns are replaced in place (keeping
+ * their position), keys it does not own are never touched, and anything else in
+ * the file — comments, blank lines, unrelated settings, ordering — survives
+ * exactly as written. Reformatting someone's .env to add four lines would be a
+ * poor trade.
+ *
+ * Values are from the published plugin README (PyPI atbash-hermes-plugin 0.4.5).
+ * `ATBASH_ORG_NAME` is deliberately NOT written: its value is the operator's org,
+ * which this command has no reliable way to know, and a wrong org sends the SDK
+ * at the wrong chain. It is called out in the manual step instead.
+ */
+function mergeHermesEnv(existing) {
+    const desired = {
+        ATBASH_KEY_PATH: "$HOME/.config/atbash/guard-client-key",
+        ATBASH_ENFORCE_DECISION: "true",
+    };
+    const lines = existing === null ? [] : existing.split("\n");
+    const seen = new Set();
+    const out = lines.map((line) => {
+        const match = line.match(/^\s*(?:export\s+)?([A-Z_][A-Z0-9_]*)\s*=/);
+        const key = match?.[1];
+        if (!key || !(key in desired) || seen.has(key))
+            return line;
+        seen.add(key);
+        // Already correct — keep the operator's own formatting rather than rewriting.
+        if (line.trim() === `${key}=${desired[key]}`)
+            return line;
+        return `${key}=${desired[key]}`;
+    });
+    const missing = Object.entries(desired).filter(([key]) => !seen.has(key));
+    if (missing.length) {
+        // Separate the block we add from whatever came before it.
+        if (out.length && out[out.length - 1].trim() !== "")
+            out.push("");
+        // ASCII-only comment on purpose: .env files are read by many different
+        // parsers and a stray multi-byte dash is a free way to trip a strict one.
+        if (existing !== null)
+            out.push("# Added by `atbash setup` - Atbash Hermes plugin");
+        for (const [key, value] of missing)
+            out.push(`${key}=${value}`);
+    }
+    let text = out.join("\n");
+    if (!text.endsWith("\n"))
+        text += "\n";
+    return text;
+}
+/**
+ * Does this config's existing Atbash entry carry a key in its `env` block?
+ *
+ * True means the operator hand-wired it from the published docs and their private
+ * key is sitting in that file today. Setup takes it out, but the backup it writes
+ * first still has it — so this exists to make that sayable rather than silently
+ * relocating the leak.
+ */
+function hadInlineKey(config, serversKey = "mcpServers") {
+    const servers = isRecord(config[serversKey]) ? config[serversKey] : undefined;
+    const entry = servers && isRecord(servers[MCP_SERVER_NAME]) ? servers[MCP_SERVER_NAME] : undefined;
+    const env = entry && isRecord(entry.env) ? entry.env : undefined;
+    if (!env)
+        return false;
+    // Any 64-hex value, under any key name — not just the documented one, since a
+    // hand-edited config may well have renamed it.
+    return Object.values(env).some((v) => typeof v === "string" && /^(0x)?[0-9a-fA-F]{64}$/.test(v.trim()));
+}
+function mergeMcpServer(config, serversKey = "mcpServers") {
+    const out = { ...config };
+    const servers = { ...(isRecord(out[serversKey]) ? out[serversKey] : {}) };
+    servers[MCP_SERVER_NAME] = { ...MCP_SERVER_ENTRY, args: [...MCP_SERVER_ENTRY.args] };
+    out[serversKey] = servers;
+    return out;
+}
 /** Is `openclaw` runnable on this machine? Decides install-for-you vs print-it. */
 function hasExecutable(command) {
     const probe = (0, child_process_1.spawnSync)(process.platform === "win32" ? "where" : "which", [command], { stdio: "ignore" });
@@ -522,7 +830,7 @@ function buildPlan(args) {
                         notes.push(`${openclawConfigFile} is not valid JSON — it will be backed up and rewritten from scratch, which loses whatever was in it. Fix the file first if it holds configuration you need.`);
                     }
                 }
-                const after = JSON.stringify(mergeOpenclawConfig(current, home), null, 2) + "\n";
+                const after = serializeLike(raw, mergeOpenclawConfig(current, home));
                 if (raw !== after) {
                     steps.push({
                         kind: "write",
@@ -547,47 +855,135 @@ function buildPlan(args) {
     // judged. Setup places the key file and says so; it does not pretend to wire it.
     if (exists(home, ...HERMES_AGENT_REL)) {
         found.push("Hermes");
-        notes.push("Hermes is installed here. It shares this agent's skills and signing key, but the Atbash hook lives in the OpenClaw gateway — actions driven through the Hermes API are NOT judged, even while the OpenClaw side reports enforcing. Route that work through OpenClaw, or guard it in code with @atbash/sdk.");
-    }
-    // ── 4. MCP clients: detected and reported, never seeded.
-    // The documented @atbash/mcp wiring carries the private key as an
-    // ATBASH_AGENT_PRIVKEY env value inside the client's own config file, and that
-    // package has no key-file fallback (checked against the published 0.1.3). We
-    // will not write a private key into a file people share and sync, so this is
-    // the one place setup deliberately stays manual.
-    const mcpClients = [];
-    const seenClients = new Set();
-    for (const { label, segs } of connect_1.MCP_CONFIGS) {
-        if (seenClients.has(label))
-            continue;
-        if (exists(home, ...segs)) {
-            seenClients.add(label);
-            mcpClients.push(`${label} (${path.join(home, ...segs)})`);
-        }
-    }
-    // Claude Code and Codex live outside MCP_CONFIGS in the scanner too — same paths.
-    if (exists(home, ".claude.json"))
-        mcpClients.push(`Claude Code (${path.join(home, ".claude.json")})`);
-    if (exists(home, ".codex", "config.toml"))
-        mcpClients.push(`Codex (${path.join(home, ".codex", "config.toml")})`);
-    if (mcpClients.length) {
-        found.push(`${mcpClients.length} MCP client config${mcpClients.length === 1 ? "" : "s"}`);
-        steps.push({
-            kind: "manual",
-            label: `Optional: expose Atbash as an MCP server to ${mcpClients.length} detected client${mcpClients.length === 1 ? "" : "s"}`,
-            detail: [
-                `Detected: ${mcpClients.join(", ")}.`,
-                "",
-                "This step is NOT done for you, on purpose. The published @atbash/mcp wiring takes the agent's private key as an ATBASH_AGENT_PRIVKEY value inside the client's own config file, and that package has no key-file fallback today. Atbash will not write your private key into a file that gets synced, shared and screenshotted.",
-                "",
-                "If you want it anyway, add this yourself and fill in the key — and treat that config file as a secret from then on:",
-            ].join("\n"),
-            snippet: JSON.stringify({
-                mcpServers: {
-                    atbash: { command: "npx", args: ["-y", "@atbash/mcp"], env: { ATBASH_AGENT_PRIVKEY: "<your agent private key>" } },
-                },
-            }, null, 2),
-        });
+        if (wanted("hermes")) {
+            const envFile = path.join(home, ".hermes", ".env");
+            const raw = readTextFile(envFile);
+            const merged = mergeHermesEnv(raw);
+            if (merged !== raw) {
+                steps.push({
+                    kind: "write",
+                    label: raw === null
+                        ? "Create ~/.hermes/.env pointing the Hermes plugin at the agent key"
+                        : "Point the Hermes plugin at the agent key in ~/.hermes/.env (a merge — your other settings are kept)",
+                    file: envFile,
+                    before: raw,
+                    after: merged,
+                });
+            }
+            else {
+                notes.push(`${envFile} already points the Hermes plugin at this key — left untouched.`);
+            }
+            // The Python package must land in the interpreter that RUNS Hermes, not
+            // whichever pip the shell happens to resolve. When we can identify that
+            // interpreter we install into it directly; when we cannot, we hand the
+            // command over rather than guess, because guessing wrong installs
+            // successfully and governs nothing.
+            if (!noInstall) {
+                const hermesPython = findHermesPython(home);
+                if (hermesPython) {
+                    steps.push({
+                        kind: "exec",
+                        label: `Install ${HERMES_PKG} into the interpreter that runs Hermes (found via ${hermesPython.how})`,
+                        command: hermesPython.python,
+                        args: ["-m", "pip", "install", `${HERMES_PKG}==${HERMES_VERSION}`],
+                    });
+                }
+                else {
+                    steps.push({
+                        kind: "manual",
+                        label: "Install the Hermes plugin",
+                        detail: [
+                            "The `hermes` launcher is not on this machine's PATH, so setup cannot tell which Python interpreter runs Hermes — and installing into the wrong one succeeds while governing nothing.",
+                            "",
+                            "Run this with the interpreter Hermes uses (if it runs in a virtualenv, that venv's python):",
+                        ].join("\n"),
+                        snippet: `/path/to/hermes/venv/bin/python -m pip install ${HERMES_PKG}==${HERMES_VERSION}`,
+                    });
+                }
+            }
+            notes.push("Restart Hermes — it reads .env and discovers plugins at startup. Then confirm with `hermes plugins list | grep atbash`.");
+            notes.push("ATBASH_ENFORCE_DECISION=true is fail-closed: if Atbash cannot be reached, the Hermes tool call is blocked rather than allowed.");
+            notes.push("ATBASH_ORG_NAME is not set for you — it decides which chain the SDK uses, and a wrong value points at the wrong one. Add it to ~/.hermes/.env yourself if your org needs it.");
+        }
+    }
+    // ── 4. MCP clients.
+    //
+    // This used to be a manual step, and the reason was specific: `@atbash/mcp`
+    // reads its identity from ATBASH_AGENT_PRIVKEY with no key-file fallback, so
+    // the documented wiring puts a raw private key inside the client's own config —
+    // `claude_desktop_config.json` and friends, files that get synced between
+    // machines and pasted into help requests. Automating that would have meant the
+    // automation's whole job was planting a secret somewhere worse.
+    //
+    // `atbash mcp` removes the reason. The client spawns the launcher, which reads
+    // the key from the 0600 file and hands it to the server through the child
+    // environment only. The config entry carries NO credential, so it is safe to
+    // write — and a config with no secret in it is strictly better than the one the
+    // operator would have hand-written from the docs.
+    if (wanted("mcp")) {
+        for (const client of detectMcpClients(home)) {
+            found.push(client.label);
+            if (client.format !== "json") {
+                // TOML (Codex) — @iarna/toml can round-trip values but not comments, and
+                // a config.toml is usually hand-maintained. Print it instead.
+                steps.push({
+                    kind: "manual",
+                    label: `Add Atbash to ${client.label}`,
+                    detail: `${client.file} is TOML, and rewriting it would drop any comments in it. Add this table by hand:`,
+                    snippet: ["[mcp_servers.atbash]", 'command = "npx"', 'args = ["--yes", "@atbash/cli", "mcp"]'].join("\n"),
+                });
+                continue;
+            }
+            const raw = readTextFile(client.file);
+            if (raw !== null && isJsonc(raw)) {
+                steps.push({
+                    kind: "manual",
+                    label: `Add Atbash to ${client.label}`,
+                    detail: `${client.file} uses comments or trailing commas, and rewriting it as strict JSON would delete them. Merge this in by hand — note it holds no key, so the file stays as non-secret as it is today:`,
+                    snippet: JSON.stringify({ mcpServers: { atbash: MCP_SERVER_ENTRY } }, null, 2),
+                });
+                continue;
+            }
+            let current = {};
+            if (raw !== null) {
+                try {
+                    const parsed = JSON.parse(raw);
+                    if (isRecord(parsed))
+                        current = parsed;
+                }
+                catch {
+                    notes.push(`${client.file} is not valid JSON, so it was left alone. Fix the file and re-run to wire ${client.label}.`);
+                    continue;
+                }
+            }
+            const after = serializeLike(raw, mergeMcpServer(current, client.serversKey));
+            if (raw !== after) {
+                // A hand-wired entry from the old documented shape carries the private key
+                // in an `env` block. Replacing it REMOVES that secret from the live config
+                // — good — but the backup we are about to take still contains it, and an
+                // operator who does not know that has simply moved the leak to a new file.
+                if (hadInlineKey(current, client.serversKey)) {
+                    notes.push(`${client.file} currently holds your private key in an env block. Setup replaces that entry with the keyless launcher, but the .atbash-bak it leaves behind WILL still contain the key — delete that backup once you have confirmed the client works.`);
+                }
+                steps.push({
+                    kind: "write",
+                    label: `Add Atbash as an MCP server in ${client.label} (a merge — existing servers are kept${hadInlineKey(current, client.serversKey) ? ", and your key is removed from this file" : ""})`,
+                    file: client.file,
+                    before: raw,
+                    after,
+                });
+            }
+            else {
+                notes.push(`${client.label} already has the Atbash MCP server — left untouched.`);
+            }
+        }
+        if (found.some((f) => f !== "OpenClaw" && f !== "Hermes")) {
+            notes.push("Restart any MCP client that was changed — clients read their server list at startup.");
+            // A client whose first launch of the server takes ~12s can report a startup
+            // timeout that looks like a broken config. Say so, so the first thing an
+            // operator does is retry rather than undo the wiring.
+            notes.push("The first time a client starts the Atbash server it takes ~10-15s while npx caches the package; after that it is about a second. If a client reports a startup timeout on the very first try, start it again.");
+        }
     }
     if (!found.length) {
         notes.push("No OpenClaw, Hermes or MCP client configuration was found under this home directory. The key file is still placed, so an SDK-level integration in your own code will find it — but nothing on this machine is wired to a runtime.");
@@ -771,10 +1167,27 @@ function applyPlan(plan) {
             continue;
         const label = `${step.command} ${step.args.join(" ")}`;
         const run = (0, child_process_1.spawnSync)(step.command, step.args, { stdio: "inherit" });
-        if (run.status === 0)
+        // Three distinct outcomes, and they used to collapse into one misleading
+        // message. `spawnSync` reports a binary it could not launch via `.error` with
+        // `status` left null — so an ENOENT printed "exited on a signal", which reads
+        // like the plugin installer crashed rather than "that command is not here".
+        // The distinction matters because only one of them is the operator's to fix,
+        // and the fix is to run it somewhere the CLI exists.
+        if (run.error) {
+            const missing = run.error.code === "ENOENT";
+            result.failures.push(missing
+                ? `${step.command} is not on this machine's PATH, so \`${label}\` did not run. Everything else above was applied — run that one command wherever the ${step.command} CLI lives.`
+                : `${label} could not start: ${run.error.message}`);
+        }
+        else if (run.status === 0) {
             result.ran.push(label);
-        else
-            result.failures.push(`${label} exited ${run.status ?? "on a signal"}`);
+        }
+        else if (run.signal) {
+            result.failures.push(`${label} was killed by ${run.signal}`);
+        }
+        else {
+            result.failures.push(`${label} exited with code ${run.status}`);
+        }
     }
     return result;
 }
@@ -852,7 +1265,7 @@ function registerSetupCommand(program) {
         console.log(chalk_1.default.dim(`\n  Agent key source: ${keySource.from}`));
         // ── Registration check. Only the public key crosses the network.
         if (!opts.skipVerify) {
-            const endpoint = (opts.host || (0, sdk_1.resolve)("judgeEndpoint") || connect_1.DEFAULT_HOST || sdk_1.DEFAULT_ENDPOINT).replace(/\/$/, "");
+            const endpoint = (opts.host || (0, sdk_1.resolve)("judgeEndpoint") || atbash_targets_1.DEFAULT_HOST || sdk_1.DEFAULT_ENDPOINT).replace(/\/$/, "");
             let hostname = "";
             try {
                 hostname = new URL(endpoint).hostname.toLowerCase();
@@ -864,7 +1277,8 @@ function registerSetupCommand(program) {
             // An unrecognized host could answer "registered" for any key, which is
             // exactly the confirmation this check exists to provide. Exact hostname
             // match, never a suffix — "atbash.ai.evil.com" must not pass.
-            if (!connect_1.KNOWN_HOSTS.has(hostname) && !opts.allowUnrecognizedHost) {
+            const recognizedHost = atbash_targets_1.KNOWN_HOSTS.has(hostname);
+            if (!recognizedHost && !opts.allowUnrecognizedHost) {
                 console.error(chalk_1.default.red(`\n  ${hostname} is not a recognized Atbash deployment.`) +
                     chalk_1.default.dim("\n  Re-run with --allow-unrecognized-host if you meant to point at a self-hosted instance,\n  or with --skip-verify to configure this machine without any network call.\n"));
                 process.exit(1);
@@ -883,9 +1297,22 @@ function registerSetupCommand(program) {
                     return;
                 }
             }
-            else {
+            else if (recognizedHost) {
                 console.log(chalk_1.default.green(`  Agent is registered on ${hostname}.`));
             }
+            else {
+                // --allow-unrecognized-host is a real bypass, and its most dangerous
+                // property is that the check still PRINTS a reassuring answer. A host
+                // chosen by an attacker returns "registered" for any key at all, so a
+                // "✓ registered" line here would be the attacker's own claim wearing
+                // Atbash's voice. Never let that line stand unqualified: say the answer
+                // came from an unvouched-for server, so a talked-into-it operator sees
+                // the one thing that would tell them something is wrong.
+                console.log(chalk_1.default.yellow(`  ${hostname} answered "registered" — but this is NOT a recognized Atbash deployment.`));
+                console.log(chalk_1.default.yellow("  A registration check against an unrecognized host proves nothing: any server") +
+                    chalk_1.default.yellow("\n  can answer \"registered\" for any key. Treat this as UNVERIFIED."));
+                console.log(chalk_1.default.dim(`  Recognized deployments: ${[...atbash_targets_1.KNOWN_HOSTS].join(", ")}`));
+            }
         }
         // ── Plan, show, then (maybe) apply.
         const plan = buildPlan({