muonroi-cli 1.8.4 → 1.9.0

package/dist/src/mcp/auto-setup.js

@@ -27,6 +27,27 @@ function removeDeprecatedToolsMcp(servers) {
     console.error("[mcp:auto-setup] removed deprecated self-spawned muonroi-tools server — its tools are now native in-process builtins");
     return true;
 }
+/**
+ * Remove deprecated external MCP servers that are no longer seeded by default.
+ *
+ * - memory: superseded by native Experience Engine (ee_query + ee_write)
+ * - playwright: heavy browser automation; native research tools (fetch_url/web_search) cover most needs. Can be added manually.
+ * - figma: requires API key + specific workflow; removed from defaults. Can be added manually if needed.
+ */
+function removeDeprecatedExternalMcps(servers) {
+    const idsToRemove = new Set(["memory", "playwright", "figma"]);
+    let removed = false;
+    for (let i = servers.length - 1; i >= 0; i--) {
+        if (idsToRemove.has(servers[i].id)) {
+            servers.splice(i, 1);
+            removed = true;
+        }
+    }
+    if (removed) {
+        console.error("[mcp:auto-setup] removed deprecated external MCPs (memory/playwright/figma). Use native EE for memory; fetch_url + web_search for research. Add playwright/figma manually only if full integration required.");
+    }
+    return removed;
+}
 const DEFAULT_CONFIGS = [
     {
         // Authoritative source for the Muonroi ecosystem (BB/.NET template recipes,
@@ -39,31 +60,6 @@ const DEFAULT_CONFIGS = [
         transport: "http",
         url: "https://docs-mcp.muonroi.com/mcp",
     },
-    {
-        id: "playwright",
-        label: "Playwright",
-        enabled: true,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@playwright/mcp"],
-    },
-    {
-        id: "memory",
-        label: "Memory",
-        enabled: false,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@modelcontextprotocol/server-memory"],
-    },
-    {
-        id: "figma",
-        label: "Figma",
-        enabled: false,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "figma-developer-mcp", "--stdio"],
-        env: { FIGMA_API_KEY: "" },
-    },
     {
         id: "context7",
         label: "Context7 (Library Docs)",
@@ -71,21 +67,24 @@ const DEFAULT_CONFIGS = [
         transport: "http",
         url: "https://mcp.context7.com/mcp",
     },
+    // fetch and tavily are now provided as *native* builtins (fetch_url / web_search).
+    // The external MCP versions are kept in the catalog for users who explicitly want them,
+    // but are no longer enabled by default for the inner agent.
     {
         id: "fetch",
-        label: "Fetch (URL → markdown)",
-        enabled: true,
+        label: "Fetch (URL → markdown) [MCP legacy]",
+        enabled: false,
         transport: "stdio",
-        command: "npx",
-        args: ["-y", "mcp-fetch-server"],
+        command: "bun",
+        args: ["x", "-y", "mcp-fetch-server"],
     },
     {
         id: "tavily",
-        label: "Tavily Web Search",
+        label: "Tavily Web Search [MCP legacy]",
         enabled: false,
         transport: "stdio",
-        command: "npx",
-        args: ["-y", "tavily-mcp"],
+        command: "bun",
+        args: ["x", "-y", "tavily-mcp"],
         env: { TAVILY_API_KEY: "" },
     },
 ];
@@ -108,10 +107,36 @@ function migrateServers(servers) {
     }
     return changed;
 }
+/**
+ * Migrate any legacy "npx" stdio entries (from older default seeds or manual config)
+ * to "bun x" form. npx shims frequently produce immediate "Connection closed"
+ * under Bun on Windows; bun x gives clean stdio pipes. Idempotent.
+ */
+function migrateNpxToBunx(servers) {
+    let changed = false;
+    for (const server of servers) {
+        if (server.transport === "stdio" && server.command === "npx") {
+            server.command = "bun";
+            const rest = (server.args ?? []).filter((a) => a !== "-y");
+            server.args = ["x", "-y", ...rest];
+            changed = true;
+        }
+    }
+    if (changed) {
+        console.error("[mcp:auto-setup] migrated legacy npx-based MCP servers to bun x (fixes Connection closed on Bun/Windows)");
+    }
+    return changed;
+}
 export function ensureDefaultMcpServers() {
     try {
         const existing = loadMcpServers();
         let dirty = migrateServers(existing);
+        // Upgrade legacy npx runners (most important fix for "Connection closed" during warm-up).
+        if (migrateNpxToBunx(existing))
+            dirty = true;
+        // Remove deprecated external MCPs (memory/playwright/figma) — replaced by native or manual opt-in.
+        if (removeDeprecatedExternalMcps(existing))
+            dirty = true;
         // muonroi-tools is no longer self-spawned by the CLI — its capabilities
         // (ee_query/ee_feedback/ee_health/usage_forensics/lsp_query/setup_guide/
         // selfverify_*) are NATIVE in-process builtins now (src/tools/native-tools.ts).

package/dist/src/mcp/client-pool.js

@@ -237,30 +237,58 @@ export async function acquireMcpTools(servers, opts) {
  * evicted by getOrConnect so a real turn retries.
  */
 export async function warmMcpClients(servers, syncAndLog = false) {
-    const validServers = servers.filter(s => s.enabled && validateMcpServerConfig(s).ok);
-    if (syncAndLog && validServers.length > 0) {
-        console.log(`[MCP] Warming up ${validServers.length} server(s)...`);
+    const validServers = servers.filter((s) => s.enabled && validateMcpServerConfig(s).ok);
+    // Fire-and-forget background warmup — no user-facing output.
+    if (!syncAndLog) {
+        void Promise.all(validServers.map((s) => getOrConnect(s).catch((e) => {
+            // Intentionally non-fatal: getOrConnect evicts the failed entry so a
+            // real turn retries. Surface at debug level only (No Silent Catch).
+            if (process.env.MUONROI_DEBUG_MCP) {
+                console.error(`[mcp:warm] background warmup failed for ${s.id}: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        })));
+        return;
     }
-    const promises = validServers.map(async (s) => {
+    if (validServers.length === 0)
+        return;
+    // Synchronous warmup (fresh start): render ONE compact in-place progress line
+    // instead of a line per server — e.g. "⏳ Starting MCP servers (0/4): a, b, c".
+    const total = validServers.length;
+    const names = validServers.map((s) => s.id).join(", ");
+    const isTTY = Boolean(process.stdout.isTTY);
+    let done = 0;
+    const failures = [];
+    const render = () => {
+        // \r + clear-line (\x1b[2K) rewrites the same terminal row each tick.
+        process.stdout.write(`\r\x1b[2K⏳ Starting MCP servers (${done}/${total}): ${names}`);
+    };
+    if (isTTY)
+        render();
+    else
+        console.log(`[MCP] Starting ${total} server(s): ${names}`);
+    await Promise.all(validServers.map(async (s) => {
         try {
             await getOrConnect(s);
-            if (syncAndLog) {
-                console.log(`[MCP] ✅ ${s.id}: healthy`);
-            }
         }
         catch (e) {
-            if (syncAndLog) {
-                const msg = e instanceof Error ? e.message : String(e);
-                console.log(`[MCP] ❌ ${s.id}: failed - ${msg}`);
-            }
+            failures.push(`${s.id}: ${e instanceof Error ? e.message : String(e)}`);
         }
-    });
-    if (syncAndLog) {
-        await Promise.all(promises);
+        finally {
+            done += 1;
+            if (isTTY)
+                render();
+        }
+    }));
+    const ok = total - failures.length;
+    if (isTTY) {
+        process.stdout.write(`\r\x1b[2K✅ MCP servers ready (${ok}/${total})\n`);
     }
     else {
-        // Fire-and-forget for background warmup
-        void Promise.all(promises);
+        console.log(`[MCP] ${ok}/${total} server(s) ready`);
+    }
+    // Compact failure summary (one line, not per-server spam) — keeps errors visible.
+    if (failures.length > 0) {
+        console.warn(`[MCP] ⚠️ ${failures.length} unavailable: ${failures.join(" | ")}`);
     }
 }
 /** Tear down every pooled client. Call on orchestrator/process shutdown. */

package/dist/src/mcp/lsp-tools.d.ts

@@ -8,9 +8,13 @@
  * deps are injected so unit tests never spawn a real language server.
  */
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { type LspQueryInput, type LspToolResponse } from "../lsp/types.js";
+import { type ImpactOfChangeResult, type LspQueryInput, type LspQueryResult, type LspToolResponse, type MutationPreviewResult, type PolicyAction } from "../lsp/types.js";
 export interface LspToolDeps {
     query?: (cwd: string, input: LspQueryInput) => Promise<LspToolResponse>;
     enabled?: (cwd: string) => boolean | Promise<boolean>;
+    waitForDiagnostics?: (cwd: string, filePath: string, timeout?: number) => Promise<LspQueryResult>;
+    impactOfChange?: (cwd: string, filePath: string, query?: string) => Promise<ImpactOfChangeResult>;
+    lspMutationPreview?: (cwd: string, filePath: string, change: string) => Promise<MutationPreviewResult>;
+    lspBeforeGrep?: (cwd: string, filePath: string, query?: string) => Promise<PolicyAction>;
 }
 export declare function registerLspTools(server: McpServer, deps?: LspToolDeps): void;

package/dist/src/mcp/lsp-tools.js

@@ -8,7 +8,7 @@
  * deps are injected so unit tests never spawn a real language server.
  */
 import { z } from "zod";
-import { LSP_TOOL_OPERATIONS } from "../lsp/types.js";
+import { LSP_TOOL_OPERATIONS, } from "../lsp/types.js";
 function ok(data) {
     return { content: [{ type: "text", text: JSON.stringify(data) }] };
 }
@@ -18,6 +18,17 @@ function fail(error, message) {
         isError: true,
     };
 }
+/** Map a thrown error to the LspError tagged-union shape. */
+function mapLspError(e) {
+    if (e && typeof e === "object" && "kind" in e && "message" in e) {
+        const lspErr = e;
+        return { error: lspErr.kind, message: lspErr.message };
+    }
+    return {
+        error: "lsp_error",
+        message: e instanceof Error ? e.message : String(e),
+    };
+}
 async function defaultQuery(cwd, input) {
     const { queryLsp } = await import("../lsp/runtime.js");
     return queryLsp(cwd, input);
@@ -26,9 +37,29 @@ async function defaultEnabled(cwd) {
     const { isLspToolEnabled } = await import("../lsp/runtime.js");
     return isLspToolEnabled(cwd);
 }
+async function defaultWaitForDiagnostics(cwd, filePath, timeout = 1500) {
+    const { getOrCreateManager } = await import("../lsp/runtime.js");
+    return getOrCreateManager(cwd).waitForDiagnostics(filePath, timeout);
+}
+async function defaultImpactOfChange(cwd, filePath, query) {
+    const { getOrCreateManager } = await import("../lsp/runtime.js");
+    return getOrCreateManager(cwd).impactOfChange(filePath, query);
+}
+async function defaultMutationPreview(cwd, filePath, change) {
+    const { getOrCreateManager } = await import("../lsp/runtime.js");
+    return getOrCreateManager(cwd).lspMutationPreview(filePath, change);
+}
+async function defaultBeforeGrep(cwd, filePath, query) {
+    const { getOrCreateManager } = await import("../lsp/runtime.js");
+    return getOrCreateManager(cwd).lspBeforeGrep(filePath, query);
+}
 export function registerLspTools(server, deps = {}) {
     const query = deps.query ?? defaultQuery;
     const enabled = deps.enabled ?? defaultEnabled;
+    const waitForDiagnostics = deps.waitForDiagnostics ?? defaultWaitForDiagnostics;
+    const impactOfChange = deps.impactOfChange ?? defaultImpactOfChange;
+    const mutationPreview = deps.lspMutationPreview ?? defaultMutationPreview;
+    const lspBeforeGrep = deps.lspBeforeGrep ?? defaultBeforeGrep;
     server.registerTool("lsp_query", {
         description: "Semantic code intelligence via language servers. operation is one of: goToDefinition, findReferences, hover, documentSymbol, workspaceSymbol, goToImplementation, prepareCallHierarchy, incomingCalls, outgoingCalls. " +
             "filePath: absolute, or relative to the workspace root (cwd). line/character: 1-based (line 1 = first line, like an editor or file:line reference) — required for position-based ops; omit for documentSymbol; use query (not position) for workspaceSymbol. " +
@@ -48,7 +79,8 @@ export function registerLspTools(server, deps = {}) {
             isEnabled = await enabled(cwd);
         }
         catch (e) {
-            return fail("lsp_error", e instanceof Error ? e.message : String(e));
+            const m = mapLspError(e);
+            return fail(m.error, m.message);
         }
         if (!isEnabled) {
             return fail("lsp_disabled", "LSP tool is disabled in settings (lsp.enabled / lsp.tool)");
@@ -57,9 +89,68 @@ export function registerLspTools(server, deps = {}) {
             const resp = await query(cwd, args);
             return ok(resp);
         }
+        catch (e) {
+            const m = mapLspError(e);
+            return fail(m.error, m.message);
+        }
+    });
+    server.registerTool("lsp_waitForDiagnostics", {
+        description: "Wait for LSP diagnostics for a file. Returns { diagnostics, lspStatus, clean, metadata }. " +
+            "lspStatus: 'ok'|'partial'|'unavailable'. clean: true when zero error-level diagnostics. " +
+            "timeout defaults to 1500ms, max 5000ms. The lsp-before-grep policy allows grep fallback when lspStatus !== 'ok'.",
+        inputSchema: {
+            operation: z.literal("waitForDiagnostics"),
+            filePath: z.string().min(1).max(1000),
+            timeout: z.number().int().min(0).optional(),
+        },
+    }, async (args) => {
+        const cwd = process.cwd();
+        let isEnabled;
+        try {
+            isEnabled = await enabled(cwd);
+        }
+        catch (e) {
+            return fail("lsp_error", e instanceof Error ? e.message : String(e));
+        }
+        if (!isEnabled) {
+            return fail("lsp_disabled", "LSP tool is disabled in settings (lsp.enabled / lsp.tool)");
+        }
+        return ok(await waitForDiagnostics(cwd, args.filePath, args.timeout));
+    });
+    server.registerTool("lsp_impactOfChange", {
+        description: "Composite LSP analysis: returns { references, diagnostics, referencesComplete, safeToRename, clean, " +
+            "suggestedGuard, degraded, lspStatus, metadata }. Fans in diagnostics + references + rename safety over the " +
+            "frozen union (symbol file + reference files). Grep fallback allowed when lspStatus !== 'ok'.",
+        inputSchema: {
+            operation: z.literal("impactOfChange"),
+            filePath: z.string().min(1).max(1000),
+            query: z.string().max(1000).optional(),
+        },
+    }, async (args) => {
+        const cwd = process.cwd();
+        let isEnabled;
+        try {
+            isEnabled = await enabled(cwd);
+        }
         catch (e) {
             return fail("lsp_error", e instanceof Error ? e.message : String(e));
         }
+        if (!isEnabled) {
+            return fail("lsp_disabled", "LSP tool is disabled in settings (lsp.enabled / lsp.tool)");
+        }
+        return ok(await impactOfChange(cwd, args.filePath, args.query));
+    });
+    server.registerTool("lsp_mutationPreview", {
+        description: "Preview an LSP code mutation (stub). Returns { preview: [] }. " +
+            "No side-effects in slice 1. Registered in MUTATION_TOOLS set for routing through the mutation gate.",
+        inputSchema: {
+            operation: z.literal("mutationPreview"),
+            filePath: z.string().min(1).max(1000),
+            change: z.string().min(1).max(10000),
+        },
+    }, async (args) => {
+        const cwd = process.cwd();
+        return ok(await mutationPreview(cwd, args.filePath, args.change));
     });
 }
 //# sourceMappingURL=lsp-tools.js.map

package/dist/src/mcp/mcp-keychain.d.ts

@@ -1,11 +1,9 @@
 /**
  * src/mcp/mcp-keychain.ts
  *
- * Per-MCP keychain loader with env-var fallback.
- * Parallel module to src/providers/keychain.ts but keyed by McpKeyId
- * (MCP servers like Tavily) instead of ProviderId (LLM providers).
- *
- * Priority: OS keychain (keytar) > environment variable > null.
+ * Per-MCP key store, keyed by McpKeyId (MCP servers like Tavily). Backed by the
+ * env-store (`.env` file + process.env + Windows registry mirror) — the OS
+ * keychain (keytar) has been removed. Reads come straight from process.env.
  */
 export type McpKeyId = "tavily";
 export declare function setMcpKey(id: McpKeyId, key: string): Promise<boolean>;

package/dist/src/mcp/mcp-keychain.js

@@ -1,63 +1,24 @@
 /**
  * src/mcp/mcp-keychain.ts
  *
- * Per-MCP keychain loader with env-var fallback.
- * Parallel module to src/providers/keychain.ts but keyed by McpKeyId
- * (MCP servers like Tavily) instead of ProviderId (LLM providers).
- *
- * Priority: OS keychain (keytar) > environment variable > null.
+ * Per-MCP key store, keyed by McpKeyId (MCP servers like Tavily). Backed by the
+ * env-store (`.env` file + process.env + Windows registry mirror) — the OS
+ * keychain (keytar) has been removed. Reads come straight from process.env.
  */
+import { clearEnvVar, persistEnvVar } from "../providers/env-store.js";
 import { redactor } from "../utils/redactor.js";
-const KEYCHAIN_SERVICE = "muonroi-cli";
-const ACCOUNT_BY_MCP = {
-    tavily: "mcp-tavily",
-};
 const ENV_BY_MCP = {
     tavily: "TAVILY_API_KEY",
 };
 const MIN_KEY_LEN = 16;
-async function loadKeytar() {
-    try {
-        return (await import("keytar"));
-    }
-    catch {
-        return null;
-    }
-}
 export async function setMcpKey(id, key) {
     if (!key || key.length < MIN_KEY_LEN) {
         throw new Error(`Key for MCP '${id}' is too short (< ${MIN_KEY_LEN} chars).`);
     }
-    const kt = await loadKeytar();
-    if (!kt?.setPassword)
-        return false;
-    redactor.enrollSecret(key);
-    try {
-        await kt.setPassword(KEYCHAIN_SERVICE, ACCOUNT_BY_MCP[id], key);
-        return true;
-    }
-    catch (err) {
-        // Runtime backend failure (e.g. Linux without libsecret or no active secret service).
-        if (process.env.DEBUG || process.env.MUONROI_DEBUG_KEYCHAIN) {
-            console.error(`[mcp-keychain] setPassword backend error for ${id}:`, err?.message || err);
-        }
-        return false;
-    }
+    persistEnvVar(ENV_BY_MCP[id], key);
+    return true;
 }
 export async function getMcpKey(id) {
-    const kt = await loadKeytar();
-    if (kt) {
-        try {
-            const k = await kt.getPassword(KEYCHAIN_SERVICE, ACCOUNT_BY_MCP[id]);
-            if (k && k.length >= MIN_KEY_LEN) {
-                redactor.enrollSecret(k);
-                return k;
-            }
-        }
-        catch {
-            /* keytar backend failure → fall through to env */
-        }
-    }
     const envKey = process.env[ENV_BY_MCP[id]];
     if (envKey && envKey.length >= MIN_KEY_LEN) {
         redactor.enrollSecret(envKey);
@@ -66,9 +27,8 @@ export async function getMcpKey(id) {
     return null;
 }
 export async function deleteMcpKey(id) {
-    const kt = await loadKeytar();
-    if (!kt?.deletePassword)
-        return false;
-    return kt.deletePassword(KEYCHAIN_SERVICE, ACCOUNT_BY_MCP[id]);
+    const had = !!process.env[ENV_BY_MCP[id]];
+    clearEnvVar(ENV_BY_MCP[id]);
+    return had;
 }
 //# sourceMappingURL=mcp-keychain.js.map

package/dist/src/mcp/research-onboarding.js

@@ -53,10 +53,10 @@ async function promptForKeyWithRetry(io) {
     return null;
 }
 export async function runResearchOnboarding(io) {
-    io.log("\nWeb research is available via MCP servers:\n");
-    io.log("  - context7 - version-pinned library docs (free, no key)\n");
-    io.log("  - fetch - URL to markdown extraction (free, no key)\n");
-    io.log("  - tavily - LLM-tuned web search (free tier 1k/mo, needs API key)\n");
+    io.log("\nWeb research tools (native builtins):\n");
+    io.log("  - fetch_url — fetch any public URL and return clean markdown/text (always available)\n");
+    io.log("  - web_search — Tavily-powered web search (free tier, needs API key)\n");
+    io.log("  - context7 / muonroi-docs — still available via MCP (library + ecosystem docs)\n");
     io.log("\nTip: if you keep keys in Bitwarden, run `muonroi-cli mcp import-bw tavily` instead.\n\n");
     const yn = (await io.askYesNo("Enable Tavily web search now? [Y/n]: ")).trim().toLowerCase();
     let tavilyEnabled = false;
@@ -85,9 +85,10 @@ export async function runResearchMigrationPrompt(io) {
     if (settings.webResearchPrompted === true) {
         return { shown: false, tavilyEnabled: false };
     }
-    io.log("\nNew: web research is available.\n");
-    io.log("  - context7 (library docs) and fetch (URL extraction) - already enabled.\n");
-    io.log("  - Tavily web search needs a free API key (tavily.com).\n\n");
+    io.log("\nNew: web research tools are available natively.\n");
+    io.log("  - fetch_url (URL → markdown) is always available.\n");
+    io.log("  - web_search (Tavily) needs a free API key (tavily.com).\n");
+    io.log("  - context7 + muonroi-docs remain as optional MCP for specialized docs.\n\n");
     const choice = (await io.askChoice("Set up Tavily now? [Y/n/never]: ")).trim().toLowerCase();
     let tavilyEnabled = false;
     if (choice === "y" || choice === "yes" || choice === "") {

package/dist/src/mcp/runtime.js

@@ -65,11 +65,34 @@ function stripMcpInputSchema(tool) {
         inputSchema: jsonSchema(LAZY_MCP_INPUT_SCHEMA),
     };
 }
+function getMcpStdioRunner() {
+    // Prefer Bun's runner because:
+    // - The CLI is launched via `bun run`
+    // - npx .cmd shims have been observed to cause immediate "Connection closed"
+    //   (MCPClientError) for StdioClientTransport on Windows + Bun (see probe results).
+    // - bun x resolves + spawns package bins with clean stdio pipes.
+    return { command: "bun", prefixArgs: ["x", "-y"] };
+}
+/**
+ * Upgrade legacy "npx" (or npm exec) invocations recorded in user settings
+ * to the bun-based runner. This heals persisted configs from before the fix
+ * without requiring the user to re-run setup.
+ */
+function normalizeStdioCommand(command, args) {
+    const a = args ?? [];
+    if (command === "npx" || (command === "npm" && a[0] === "exec")) {
+        const r = getMcpStdioRunner();
+        const pkgArgs = a.filter((x) => x !== "-y");
+        return { command: r.command, args: [...r.prefixArgs, ...pkgArgs] };
+    }
+    return { command, args: a };
+}
 function toTransport(server, authProvider) {
     if (server.transport === "stdio") {
+        const { command, args } = normalizeStdioCommand(server.command ?? "", server.args);
         return new StdioClientTransport({
-            command: server.command ?? "",
-            args: server.args,
+            command,
+            args,
             env: server.env ? { ...getDefaultEnvironment(), ...server.env } : undefined,
             cwd: server.cwd,
             stderr: "pipe",
@@ -111,6 +134,15 @@ export async function connectOneServer(rawServer, opts) {
     // Hydrate env vars from the OS keychain before spawning — e.g. inject
     // TAVILY_API_KEY for the tavily MCP if stored via the research-onboarding wizard.
     const server = await hydrateServerEnv(rawServer);
+    // Fast-fail for servers that require keys but have none. Prevents "Connection closed"
+    // with zero actionable info. The server binary may start and list tools, but first
+    // use would fail — better to give clear guidance at warmup time.
+    if (server.id === "tavily") {
+        const key = server.env?.TAVILY_API_KEY;
+        if (!key || key.length < 16) {
+            throw new Error("Tavily is enabled but TAVILY_API_KEY is missing. Run `muonroi-cli mcp setup-research` or `muonroi-cli mcp key tavily`, or disable the server in /mcp config.");
+        }
+    }
     let authProvider;
     let cleanup;
     if (server.transport !== "stdio" && opts?.onOAuthRequired) {

package/dist/src/mcp/setup-guide-text.d.ts

@@ -6,4 +6,4 @@
  * and the muonroi-tools MCP server (src/mcp/tools-server.ts, for external agents).
  * Keeping it here avoids duplicating ~70 lines across the two.
  */
-export declare const SETUP_GUIDE_TEXT = "# muonroi-cli Setup Guide\n\n## Install (Recommended \u2014 NPM/Bun global install)\nNPM (requires Node >= 20):\n  npm install -g muonroi-cli\n\nBun (requires Bun >= 1.3):\n  bun add -g muonroi-cli\n\n## Install (Alternative \u2014 Prebuilt standalone binary, requires repo access)\nLinux / macOS:\n  curl -fsSL https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.sh | bash\n\nWindows PowerShell:\n  irm https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.ps1 | iex\n\nThe installers fetch a pre-compiled single binary from GitHub Releases.\n\n## First run\n- Wizard appears automatically.\n- Lists supported providers (DeepSeek + SiliconFlow ready; others via BYOK).\n- Four credential options: paste key, Bitwarden sync (B in /providers), keys export/import (encrypted bundle), or skip for later.\n- Keys land in OS keychain (keytar). Settings written to ~/.muonroi-cli/user-settings.json.\n- Role routing (leader/implement/verify/research) is configured for you.\n\nAfter setup: run `muonroi-cli doctor` to validate.\n\n## Essential commands\n- Interactive TUI: `muonroi-cli` (or `node dist/index.js` after build)\n- Headless one-shot: `muonroi-cli --prompt \"your task\" --max-tool-rounds 8`\n- Health + MCP nudge: `muonroi-cli doctor`\n- Update: `muonroi-cli update` (or set \"autoUpdate\": true in user-settings)\n- Keys move between machines: `muonroi-cli keys export file.json` then import on target\n- Native tools MCP (for external agents): `muonroi-cli tools-mcp` (stdio)\n- Harness driver MCP: `muonroi-cli mcp-driver`\n\n## MCP integration (for Claude Desktop, Cursor, other agents)\nAdd to your MCP client config:\n\n{\n  \"mcpServers\": {\n    \"muonroi-tools\": {\n      \"command\": \"bun\",\n      \"args\": [\"run\", \"/absolute/path/to/muonroi-cli/src/index.ts\", \"tools-mcp\"]\n    }\n  }\n}\n\n(Use absolute path. After `bun run build`: \"node\", \"dist/index.js\", \"tools-mcp\")\n\nThe CLI's OWN inner agent exposes these as NATIVE in-process tools (no MCP self-spawn):\n- setup_guide (this document)\n- ee_query / ee_health / ee_feedback \u2014 Experience Engine semantic recall + compaction checkpoints + feedback for learning\n- usage_forensics <id-prefix> \u2014 per-session cost/token forensics (peak input, cache hits, anomalies)\n- lsp_query \u2014 goToDefinition, findReferences, hover, symbols, call hierarchy etc.\n- selfverify_* \u2014 Tier-1 heuristic + Tier-2 agentic self-QA harness runs (start/poll/result/cancel/list)\n\nFor BB/.NET template recipes and package docs, also connect an external \"muonroi-docs\" MCP server if available (provides docs_search + setup_guide for the templates).\n\n## Development\ngit clone https://github.com/muonroi/muonroi-cli.git\ncd muonroi-cli && bun install\n\nbun run dev                 # run from source (TUI)\nbun run typecheck           # tsc --noEmit\nbun run test                # vitest (unit + headless)\nbunx vitest -c vitest.harness.config.ts run tests/harness/   # TUI E2E (named-pipes on Win, fd3/4 on POSIX)\nbun run build               # or build:binary for standalone exe\n\nSee AGENTS.md (quick ref + rules), CLAUDE.md (harness verification), README.md.\n\n## Verify\nmuonroi-cli doctor\n# Checks runtimes, catalog load, keychain, MCP servers enabled, council research MCP nudge, EE reachability, recent error rate.\n# Any \"warn\" entries tell you exactly what to enable (e.g. tavily for web research in council).\n\nFor BB-aware scaffolding (/ideal on a muonroi-building-block target): ensure dotnet SDK + the three Muonroi.*.Template packages are installed via NuGet; doctor surfaces missing feed/template cases.\n";
+export declare const SETUP_GUIDE_TEXT = "# muonroi-cli Setup Guide\n\n## Install (Recommended \u2014 NPM/Bun global install)\nNPM (requires Node >= 20):\n  npm install -g muonroi-cli\n\nBun (requires Bun >= 1.3):\n  bun add -g muonroi-cli\n\n## Install (Alternative \u2014 Prebuilt standalone binary, requires repo access)\nLinux / macOS:\n  curl -fsSL https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.sh | bash\n\nWindows PowerShell:\n  irm https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.ps1 | iex\n\nThe installers fetch a pre-compiled single binary from GitHub Releases.\n\n## First run\n- Wizard appears automatically.\n- Lists supported providers (DeepSeek + SiliconFlow ready; others via BYOK).\n- Four credential options: paste key, Bitwarden sync (bw in /providers), keys export/import (encrypted bundle), or skip for later.\n- Keys land in OS keychain (keytar). Settings written to ~/.muonroi-cli/user-settings.json.\n- Role routing (leader/implement/verify/research) is configured for you.\n\nAfter setup: run `muonroi-cli doctor` to validate.\n\n## Essential commands\n- Interactive TUI: `muonroi-cli` (or `node dist/index.js` after build)\n- Headless one-shot: `muonroi-cli --prompt \"your task\" --max-tool-rounds 8`\n- Health + MCP nudge: `muonroi-cli doctor`\n- Update: `muonroi-cli update` (or set \"autoUpdate\": true in user-settings)\n- Keys move between machines: `muonroi-cli keys export file.json` then import on target\n- Native tools MCP (for external agents): `muonroi-cli tools-mcp` (stdio)\n- Harness driver MCP: `muonroi-cli mcp-driver`\n\n## MCP integration (for Claude Desktop, Cursor, other agents)\nAdd to your MCP client config:\n\n{\n  \"mcpServers\": {\n    \"muonroi-tools\": {\n      \"command\": \"bun\",\n      \"args\": [\"run\", \"/absolute/path/to/muonroi-cli/src/index.ts\", \"tools-mcp\"]\n    }\n  }\n}\n\n(Use absolute path. After `bun run build`: \"node\", \"dist/index.js\", \"tools-mcp\")\n\nThe CLI's OWN inner agent exposes these as NATIVE in-process tools (no MCP self-spawn):\n- setup_guide (this document)\n- ee_query / ee_health / ee_feedback / ee_write \u2014 Experience Engine semantic recall + compaction checkpoints + feedback for learning\n- usage_forensics <id-prefix> \u2014 per-session cost/token forensics (peak input, cache hits, anomalies)\n- lsp_query \u2014 goToDefinition, findReferences, hover, symbols, call hierarchy etc.\n- selfverify_* \u2014 Tier-1 heuristic + Tier-2 agentic self-QA harness runs (start/poll/result/cancel/list)\n\n## Experience Engine over MCP (other agents)\n\nThe ee_* tools above are native to this CLI's agent. To give ANOTHER agent\n(Claude Code, Codex, Gemini CLI\u2026) the same brain, install the engine and register\nits own MCP server \u2014 no muonroi-cli needed:\n\n    npm i -g @muonroi/experience-engine\n    claude mcp add experience-engine -- exp-mcp\n\nOr in any mcpServers config:\n\n{\n  \"mcpServers\": {\n    \"experience-engine\": { \"command\": \"exp-mcp\" }\n  }\n}\n\nThe \"muonroi-tools\" server above deliberately does NOT serve ee_* \u2014 same brain,\none implementation, reachable without installing a CLI you have no use for.\n\nFor BB/.NET template recipes and package docs, also connect an external \"muonroi-docs\" MCP server if available (provides docs_search + setup_guide for the templates).\n\n## Development\ngit clone https://github.com/muonroi/muonroi-cli.git\ncd muonroi-cli && bun install\n\nbun run dev                 # run from source (TUI)\nbun run typecheck           # tsc --noEmit\nbun run test                # vitest (unit + headless)\nbunx vitest -c vitest.harness.config.ts run tests/harness/   # TUI E2E (named-pipes on Win, fd3/4 on POSIX)\nbun run build               # or build:binary for standalone exe\n\nSee AGENTS.md (quick ref + rules), CLAUDE.md (harness verification), README.md.\n\n## Verify\nmuonroi-cli doctor\n# Checks runtimes, catalog load, keychain, MCP servers enabled, council research MCP nudge, EE reachability, recent error rate.\n# Any \"warn\" entries tell you exactly what to enable (e.g. tavily for web research in council).\n\nFor BB-aware scaffolding (/ideal on a muonroi-building-block target): ensure dotnet SDK + the three Muonroi.*.Template packages are installed via NuGet; doctor surfaces missing feed/template cases.\n";

package/dist/src/mcp/setup-guide-text.js

@@ -27,7 +27,7 @@ The installers fetch a pre-compiled single binary from GitHub Releases.
 ## First run
 - Wizard appears automatically.
 - Lists supported providers (DeepSeek + SiliconFlow ready; others via BYOK).
-- Four credential options: paste key, Bitwarden sync (B in /providers), keys export/import (encrypted bundle), or skip for later.
+- Four credential options: paste key, Bitwarden sync (bw in /providers), keys export/import (encrypted bundle), or skip for later.
 - Keys land in OS keychain (keytar). Settings written to ~/.muonroi-cli/user-settings.json.
 - Role routing (leader/implement/verify/research) is configured for you.
 
@@ -58,11 +58,31 @@ Add to your MCP client config:
 
 The CLI's OWN inner agent exposes these as NATIVE in-process tools (no MCP self-spawn):
 - setup_guide (this document)
-- ee_query / ee_health / ee_feedback — Experience Engine semantic recall + compaction checkpoints + feedback for learning
+- ee_query / ee_health / ee_feedback / ee_write — Experience Engine semantic recall + compaction checkpoints + feedback for learning
 - usage_forensics <id-prefix> — per-session cost/token forensics (peak input, cache hits, anomalies)
 - lsp_query — goToDefinition, findReferences, hover, symbols, call hierarchy etc.
 - selfverify_* — Tier-1 heuristic + Tier-2 agentic self-QA harness runs (start/poll/result/cancel/list)
 
+## Experience Engine over MCP (other agents)
+
+The ee_* tools above are native to this CLI's agent. To give ANOTHER agent
+(Claude Code, Codex, Gemini CLI…) the same brain, install the engine and register
+its own MCP server — no muonroi-cli needed:
+
+    npm i -g @muonroi/experience-engine
+    claude mcp add experience-engine -- exp-mcp
+
+Or in any mcpServers config:
+
+{
+  "mcpServers": {
+    "experience-engine": { "command": "exp-mcp" }
+  }
+}
+
+The "muonroi-tools" server above deliberately does NOT serve ee_* — same brain,
+one implementation, reachable without installing a CLI you have no use for.
+
 For BB/.NET template recipes and package docs, also connect an external "muonroi-docs" MCP server if available (provides docs_search + setup_guide for the templates).
 
 ## Development

package/dist/src/mcp/tools-server.d.ts

@@ -12,6 +12,16 @@
  * (src/tools/native-tools.ts) — it no longer self-spawns this server. The two
  * surfaces share their cores (self-verify-runner.ts, setup-guide-text.ts, the
  * ee/forensics/lsp modules) so behaviour is identical.
+ *
+ * The ee_* tools are deliberately NOT here. The brain is the product and
+ * muonroi-cli is one consumer of it, so serving the brain to foreign agents is
+ * experience-engine's job, not ours: `npm i -g @muonroi/experience-engine` then
+ * `claude mcp add experience-engine -- exp-mcp`. Shipping them from here forced
+ * anyone who wanted the brain over MCP to install a whole CLI they had no use
+ * for, and left two implementations of the same four tools to drift apart. The
+ * CLI's own agent is unaffected — it calls the brain natively via
+ * src/ee/search.ts (no MCP hop), which is where ee_query/ee_write/ee_feedback
+ * live for us.
  */
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { JobManager, type Runner } from "./self-verify-jobs.js";

package/dist/src/mcp/tools-server.js

@@ -12,11 +12,20 @@
  * (src/tools/native-tools.ts) — it no longer self-spawns this server. The two
  * surfaces share their cores (self-verify-runner.ts, setup-guide-text.ts, the
  * ee/forensics/lsp modules) so behaviour is identical.
+ *
+ * The ee_* tools are deliberately NOT here. The brain is the product and
+ * muonroi-cli is one consumer of it, so serving the brain to foreign agents is
+ * experience-engine's job, not ours: `npm i -g @muonroi/experience-engine` then
+ * `claude mcp add experience-engine -- exp-mcp`. Shipping them from here forced
+ * anyone who wanted the brain over MCP to install a whole CLI they had no use
+ * for, and left two implementations of the same four tools to drift apart. The
+ * CLI's own agent is unaffected — it calls the brain natively via
+ * src/ee/search.ts (no MCP hop), which is where ee_query/ee_write/ee_feedback
+ * live for us.
  */
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
-import { registerEETools } from "./ee-tools.js";
 import { registerForensicsTools } from "./forensics-tools.js";
 import { registerLspTools } from "./lsp-tools.js";
 import { JobManager } from "./self-verify-jobs.js";
@@ -129,7 +138,6 @@ export function createToolsServer(runner = defaultRunner) {
     const server = new McpServer({ name: "muonroi-tools", version: "0.1.0" });
     const jm = new JobManager(runner);
     registerSelfVerifyTools(server, jm);
-    registerEETools(server);
     registerForensicsTools(server);
     registerLspTools(server);
     registerSetupGuideTool(server);