mrmainspring 0.2.9 → 0.3.1

package/README.md

@@ -1,49 +1,49 @@
-# Mr Mainspring
-
-Installable MCP backend for local agent demos. It exposes memory, Grimoire
-policy/secret storage, payment intent tools, audit trail tools, Casper anchoring
-boundaries, and x402 settlement-provider wiring.
-
-## Install
-
-```bash
-npm install -g mrmainspring
-mainspring setup cursor
-```
-
-Run the stdio MCP server:
-
-```bash
-mainspring
-```
-
-For local development from this repository:
-
-```bash
-npm run build
-npm run mcp:stdio
-```
-
-## Environment
-
-No environment variables are required for local memory, Grimoire, audit, or
-payment preflight tools. `mainspring setup` creates the local config, data, and
-logs directories under the user's standard app config folder. Use
-`SIGIL_ENV_FILE` to point at a specific env file for advanced setups.
-
-Important package boundaries:
-
-- Keep `.env`, local keys, and generated demo data outside the npm package.
-- Real Casper submission remains gated by `CASPER_ENABLE_REAL_SUBMISSION=true`.
-- Real x402 settlement remains gated by `X402_ENABLE_REAL_SETTLEMENT=true` and
-  a configured `X402_SIGNER_URL`.
-- The signer private key must live outside the repository workspace.
-
-## Library Entry
-
-```ts
-import { createSigilServer } from "mrmainspring";
-```
-
-The CLI entry is also exported as `mrmainspring/mcp`, but importing it starts
-the stdio server; use the package bin for normal MCP client configuration.
+# Mr Mainspring
+
+Installable MCP backend for local agent demos. It exposes memory, Grimoire
+policy/secret storage, payment intent tools, audit trail tools, Casper anchoring
+boundaries, and x402 settlement-provider wiring.
+
+## Install
+
+```bash
+npm install -g mrmainspring
+mainspring setup cursor
+```
+
+Run the stdio MCP server:
+
+```bash
+mainspring
+```
+
+For local development from this repository:
+
+```bash
+npm run build
+npm run mcp:stdio
+```
+
+## Environment
+
+No environment variables are required for local memory, Grimoire, audit, or
+payment preflight tools. `mainspring setup` creates the local config, data, and
+logs directories under the user's standard app config folder. Use
+`SIGIL_ENV_FILE` to point at a specific env file for advanced setups.
+
+Important package boundaries:
+
+- Keep `.env`, local keys, and generated demo data outside the npm package.
+- Real Casper submission remains gated by `CASPER_ENABLE_REAL_SUBMISSION=true`.
+- Real x402 settlement remains gated by `X402_ENABLE_REAL_SETTLEMENT=true` and
+  a configured `X402_SIGNER_URL`.
+- The signer private key must live outside the repository workspace.
+
+## Library Entry
+
+```ts
+import { createSigilServer } from "mrmainspring";
+```
+
+The CLI entry is also exported as `mrmainspring/mcp`, but importing it starts
+the stdio server; use the package bin for normal MCP client configuration.

package/dist/cli.d.ts

@@ -5,5 +5,5 @@ type InitResult = {
 };
 export declare function runCliCommand(args: string[]): Promise<boolean>;
 export declare function initializeLocalSetup(env?: NodeJS.ProcessEnv): InitResult;
-export declare function formatMcpConfig(): string;
+export declare function formatMcpConfig(target?: string): string;
 export {};

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -9,42 +9,32 @@ import { ensureGrimoireMasterKey, loadLocalEnvFile, resolveEnvPath } from "./env
 import { getDefaultMainspringPaths } from "./paths.js";
 const _pkgRoot = dirname(dirname(fileURLToPath(import.meta.url)));
 const VERSION = JSON.parse(readFileSync(join(_pkgRoot, "package.json"), "utf8")).version;
-const HELP = `Mr Mainspring MCP server
-
-Usage:
-  mrmainspring                  Start the MCP stdio server
-  mrmainspring --help           Show this help
-  mrmainspring --version        Show the installed version
-  mrmainspring init             Create local config, data, and logs directories
-  mrmainspring config           Print MCP client config JSON
-  mrmainspring setup            Initialize local files and configure MCP clients
-  mrmainspring setup -i         Force interactive setup wizard (Windows)
-  mrmainspring doctor           Check the local setup
-  mrmainspring update           Show how to update to the latest version
-
-MCP client config:
-  {
-    "mcpServers": {
-      "mainspring": {
-        "command": "npx",
-        "args": ["-y", "mrmainspring"]
-      }
-    }
-  }
-
-Advanced users can set SIGIL_ENV_FILE, SIGIL_DATA_DIR, Supabase, Casper,
-and x402 env vars. No env vars are required for local memory, Grimoire, audit,
-or payment preflight tools.
+const HELP = `Mr Mainspring MCP server
+
+Usage:
+  mainspring                  Start the MCP stdio server
+  mainspring --help           Show this help
+  mainspring --version        Show the installed version
+  mainspring init             Create local config, data, and logs directories
+  mainspring config [client]  Print MCP client config for codex/cursor/claude
+  mainspring setup            Initialize local files and print MCP config
+  mainspring doctor           Check the local setup
+  mainspring update           Show how to update to the latest version
+
+MCP client config:
+  {
+    "mcpServers": {
+      "mainspring": {
+        "command": "npx",
+        "args": ["-y", "mrmainspring"]
+      }
+    }
+  }
+
+Advanced users can still set SIGIL_ENV_FILE, SIGIL_DATA_DIR, Supabase, Casper,
+and x402 env vars. No env vars are required for local memory, Grimoire, audit,
+or payment preflight tools.
 `;
-function appendEnvVars(envFile, vars) {
-    const existing = existsSync(envFile) ? readFileSync(envFile, "utf8") : "";
-    const toWrite = Object.entries(vars).filter(([k]) => !existing.includes(`${k}=`));
-    if (toWrite.length === 0)
-        return [];
-    const block = "\n# Mainspring setup\n" + toWrite.map(([k, v]) => `${k}=${v}`).join("\n") + "\n";
-    appendFileSync(envFile, block, "utf8");
-    return toWrite.map(([k]) => k);
-}
 export async function runCliCommand(args) {
     const [command, target] = args;
     if (!command || command === "stdio" || command === "server" || command === "mcp") {
@@ -64,12 +54,11 @@ export async function runCliCommand(args) {
         return true;
     }
     if (command === "config") {
-        process.stdout.write(`${formatMcpConfig()}\n`);
+        process.stdout.write(`${formatMcpConfig(target)}\n`);
         return true;
     }
     if (command === "setup") {
-        const forceInteractive = args.includes("--interactive") || args.includes("-i");
-        if (forceInteractive || (process.stdin.isTTY ?? process.stdout.isTTY)) {
+        if (process.stdin.isTTY) {
             await runInteractiveSetup();
         }
         else {
@@ -82,23 +71,14 @@ export async function runCliCommand(args) {
             }
             else {
                 process.stdout.write("\nNo MCP clients detected automatically.\n" +
-                    "Add this to your MCP client config:\n\n");
+                    "Add this to your MCP client config (Claude Desktop, Cursor, Windsurf, Zed, VS Code, Continue, or any MCP host):\n\n");
                 process.stdout.write(`${formatMcpConfig()}\n`);
                 process.stdout.write("\nConfig file locations:\n" +
-                    "  Claude Desktop   ~/Library/Application Support/Claude/claude_desktop_config.json\n" +
-                    "  Claude Code      ~/.claude/settings.json\n" +
-                    "  Cursor           ~/.cursor/mcp.json\n" +
-                    "  Windsurf         ~/.codeium/windsurf/mcp_config.json\n" +
-                    "  Zed              ~/.config/zed/settings.json  (context_servers format)\n" +
-                    "  VS Code          ~/.vscode/mcp.json\n" +
-                    "  Cline            ~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json\n" +
-                    "  Roo Code         ~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/cline_mcp_settings.json\n" +
-                    "  Kilo Code        ~/Library/Application Support/Code/User/globalStorage/kilocode.kilo-code/settings/cline_mcp_settings.json\n" +
-                    "  OpenCode         ~/.config/opencode/config.json\n" +
-                    "  Amazon Q         ~/.aws/amazonq/mcp.json\n" +
-                    "  Gemini CLI       ~/.gemini/settings.json\n" +
-                    "  Codex CLI        ~/.codex/config.json\n" +
-                    "  Continue.dev     ~/.continue/config.json  (array format)\n\n");
+                    "  Claude Desktop  ~/Library/Application Support/Claude/claude_desktop_config.json\n" +
+                    "  Cursor          ~/.cursor/mcp.json\n" +
+                    "  Windsurf        ~/.codeium/windsurf/mcp_config.json\n" +
+                    "  Zed             ~/.config/zed/settings.json  (context_servers format)\n" +
+                    "  VS Code         ~/.vscode/mcp.json\n\n");
             }
         }
         return true;
@@ -118,69 +98,42 @@ export async function runCliCommand(args) {
     process.exitCode = 1;
     return true;
 }
-const CLOCK_ART = [
-    "         .-.-.          ",
-    "   ((  (__I__)  ))      ",
-    "     .'_....._'.        ",
-    "    / / .12 . \\ \\      ",
-    "   | | '  |  ' | |     ",
-    "   | | 9  /  3 | |     ",
-    "    \\ \\ '.6.' / /      ",
-    "     '.`-...-'.'        ",
-    "      /'-- --'\\         ",
-    "     `\"\"\"\"\"\"\"\"\"`        ",
-    "                        ",
-    "     Mr Mainspring      ",
-    " Memory · Anchor · Pay  ",
-].join("\n");
 async function runInteractiveSetup() {
-    process.stdout.write(`\n${CLOCK_ART}\n\n`);
-    clack.intro("setup");
-    // ── 1. Local files ──────────────────────────────────────────────────────────
-    const hadKey = !!process.env.GRIMOIRE_MASTER_KEY;
+    clack.intro("Mr Mainspring — setup");
     const result = initializeLocalSetup();
-    const keyNote = hadKey ? "encryption key loaded" : `encryption key generated → ${result.envFile}`;
-    clack.log.success(`Local files ready\n   Config: ${result.envFile}\n   Data:   ${result.dataDir}\n   ${keyNote}`);
-    // ── 2. Storage backend ──────────────────────────────────────────────────────
-    const storageChoice = await clack.select({
-        message: "Storage backend?",
-        options: [
-            { value: "file", label: "Local files", hint: result.dataDir },
-            { value: "supabase", label: "Supabase (cloud)", hint: "requires PROJECT_URL + SECRET_KEY" }
-        ]
-    });
-    if (clack.isCancel(storageChoice)) {
-        clack.cancel("Setup cancelled.");
-        process.exitCode = 1;
-        return;
-    }
-    if (storageChoice === "supabase") {
-        const projectUrl = await clack.text({ message: "Supabase PROJECT_URL:", placeholder: "https://xxx.supabase.co" });
-        if (clack.isCancel(projectUrl)) {
-            clack.cancel("Setup cancelled.");
-            process.exitCode = 1;
-            return;
-        }
-        const secretKey = await clack.text({ message: "Supabase SECRET_KEY (service role):", placeholder: "eyJ..." });
-        if (clack.isCancel(secretKey)) {
-            clack.cancel("Setup cancelled.");
-            process.exitCode = 1;
-            return;
-        }
-        appendFileSync(result.envFile, `\nSIGIL_STORAGE_BACKEND=supabase\nPROJECT_URL=${projectUrl}\nSECRET_KEY=${secretKey}\n`, "utf8");
-        clack.log.success("Supabase config saved.");
-    }
-    // ── 3. MCP clients ──────────────────────────────────────────────────────────
+    clack.log.success(`Local files ready\n   Config: ${result.envFile}\n   Data:   ${result.dataDir}`);
     const clients = detectClients();
     const installed = clients.filter(c => c.installed);
+    const notInstalled = clients.filter(c => !c.installed);
+    let selected;
+    if (installed.length === 0) {
+        clack.log.warn("No MCP clients detected on this machine.");
+        clack.log.info("Add this JSON to your client config manually:\n\n" +
+            formatMcpConfig() + "\n\n" +
+            "  Claude Desktop  ~/Library/Application Support/Claude/claude_desktop_config.json\n" +
+            "  Cursor          ~/.cursor/mcp.json\n" +
+            "  Windsurf        ~/.codeium/windsurf/mcp_config.json\n" +
+            "  Zed             ~/.config/zed/settings.json\n" +
+            "  VS Code         ~/.vscode/mcp.json");
+        clack.outro("Restart your client after updating the config.");
+        return;
+    }
     const choices = await clack.multiselect({
         message: "Which MCP clients should we configure?",
-        options: clients.map(c => ({
-            value: c,
-            label: c.name,
-            hint: c.installed ? c.configPath : "not detected — config will be created"
-        })),
-        initialValues: installed,
+        options: [
+            ...installed.map(c => ({
+                value: c,
+                label: c.name,
+                hint: c.configPath,
+                selected: true
+            })),
+            ...notInstalled.map(c => ({
+                value: c,
+                label: c.name,
+                hint: "not found",
+                selected: false
+            }))
+        ],
         required: false
     });
     if (clack.isCancel(choices)) {
@@ -188,31 +141,13 @@ async function runInteractiveSetup() {
         process.exitCode = 1;
         return;
     }
-    const selected = choices;
+    selected = choices;
     if (selected.length === 0) {
-        clack.log.warn("No clients selected.");
-        const customPath = await clack.text({
-            message: "Enter a config file path to configure manually (or press Enter to skip):",
-            placeholder: "~/.config/myapp/mcp.json",
-            validate: () => undefined
-        });
-        if (!clack.isCancel(customPath) && customPath && customPath.trim()) {
-            const expandedPath = customPath.replace(/^~/, process.env.HOME ?? "");
-            const r = configureClients([{ name: "Custom", configPath: expandedPath, installed: true, format: "standard" }])[0];
-            if (r?.status === "written")
-                clack.log.success(`Configured: ${expandedPath}`);
-            else if (r?.status === "already-set")
-                clack.log.info(`Already configured: ${expandedPath}`);
-            else if (r?.error)
-                clack.log.error(`Failed: ${r.error}`);
-        }
-        else {
-            clack.log.info("Add this JSON to your MCP client config:\n\n" + formatMcpConfig());
-        }
-        clack.outro("Restart your MCP client after updating the config.");
+        clack.log.warn("No clients selected — nothing configured.");
+        clack.outro("Run mainspring setup again when ready.");
         return;
     }
-    const configResults = configureClients(selected);
+    const configResults = configureClients(selected.filter(c => c.installed));
     const written = configResults.filter(r => r.status === "written").map(r => r.name);
     const alreadySet = configResults.filter(r => r.status === "already-set").map(r => r.name);
     const errors = configResults.filter(r => r.status === "error");
@@ -222,154 +157,36 @@ async function runInteractiveSetup() {
         clack.log.info(`Already configured: ${alreadySet.join(", ")}`);
     for (const e of errors)
         clack.log.error(`${e.name}: ${e.error}`);
-    // ── 4. Casper anchoring ─────────────────────────────────────────────────────
-    const wantCasper = await clack.confirm({ message: "Enable Casper on-chain anchoring?", initialValue: false });
+    const wantCasper = await clack.confirm({
+        message: "Enable Casper on-chain anchoring?",
+        initialValue: false
+    });
     if (clack.isCancel(wantCasper)) {
         clack.cancel("Setup cancelled.");
         return;
     }
-    let casperRpcUrl = "https://node.testnet.casper.network/rpc";
-    let casperNetwork = "testnet";
     if (wantCasper) {
-        const network = await clack.select({
-            message: "Which Casper network?",
-            options: [
-                { value: "testnet", label: "Testnet", hint: "safe for testing — free faucet available" },
-                { value: "mainnet", label: "Mainnet", hint: "real CSPR — costs money" }
-            ]
-        });
-        if (clack.isCancel(network)) {
-            clack.cancel("Setup cancelled.");
-            return;
-        }
-        casperNetwork = network;
-        casperRpcUrl = casperNetwork === "mainnet"
-            ? "https://node.mainnet.casper.network/rpc"
-            : "https://node.testnet.casper.network/rpc";
-        const casperBin = process.env.CASPER_CLIENT_BIN ?? "casper-client";
-        const casperAvailable = !spawnSync(casperBin, ["--version"], { stdio: "pipe" }).error;
-        const keyOptions = [
-            { value: "have", label: "I already have a key pair (.pem)" },
-            { value: "skip", label: "Skip for now" }
-        ];
-        if (casperAvailable) {
-            keyOptions.splice(1, 0, { value: "generate", label: "Generate a new key pair now", hint: "runs casper-client keygen ./keys" });
-        }
-        const keyAction = await clack.select({ message: "Casper key pair?", options: keyOptions });
-        if (clack.isCancel(keyAction)) {
-            clack.cancel("Setup cancelled.");
-            return;
-        }
-        if (keyAction === "generate") {
-            mkdirSync("./keys", { recursive: true });
-            const keygen = spawnSync(casperBin, ["keygen", "./keys"], { stdio: "pipe" });
-            if (keygen.status === 0) {
-                clack.log.success("Key pair generated in ./keys/\n   Secret: ./keys/secret_key.pem\n   Public: ./keys/public_key.pem");
-            }
-            else {
-                clack.log.error("keygen failed: " + (keygen.stderr?.toString() ?? "unknown error"));
-            }
-        }
-        const keyPath = keyAction === "generate" ? "./keys/secret_key.pem" : "./keys/your-secret-key.pem";
-        const casperVars = {
-            CASPER_ENABLE_REAL_SUBMISSION: "true",
-            CASPER_RPC_URL: casperRpcUrl,
-            CASPER_ACCOUNT_KEY_PATH: keyPath
-        };
-        clack.log.info("Casper vars:\n\n" +
-            Object.entries(casperVars).map(([k, v]) => `  ${k}=${v}`).join("\n") +
-            `\n\n  .env: ${result.envFile}`);
-        const writeCasper = await clack.confirm({ message: "Write these to your .env now?", initialValue: true });
-        if (!clack.isCancel(writeCasper) && writeCasper) {
-            const written = appendEnvVars(result.envFile, casperVars);
-            if (written.length > 0)
-                clack.log.success(`Written: ${written.join(", ")}`);
-            else
-                clack.log.info("Already set in .env — skipped.");
-        }
+        clack.log.info("Add to your .env file:\n\n" +
+            "  CASPER_ENABLE_REAL_SUBMISSION=true\n" +
+            "  CASPER_RPC_URL=https://node.testnet.casper.network/rpc\n" +
+            "  CASPER_ACCOUNT_KEY_PATH=./keys/your-key.pem\n\n" +
+            "Then restart your MCP client.");
     }
-    // ── 5. x402 payments ────────────────────────────────────────────────────────
-    const wantX402 = await clack.confirm({ message: "Enable x402 micropayments?", initialValue: false });
+    const wantX402 = await clack.confirm({
+        message: "Enable x402 micropayments?",
+        initialValue: false
+    });
     if (clack.isCancel(wantX402)) {
         clack.cancel("Setup cancelled.");
         return;
     }
     if (wantX402) {
-        let x402RpcUrl = casperRpcUrl;
-        let x402Network = casperNetwork;
-        if (!wantCasper) {
-            const network = await clack.select({
-                message: "Which Casper network for payments?",
-                options: [
-                    { value: "testnet", label: "Testnet", hint: "free faucet available" },
-                    { value: "mainnet", label: "Mainnet", hint: "real CSPR" }
-                ]
-            });
-            if (!clack.isCancel(network)) {
-                x402Network = network;
-                x402RpcUrl = x402Network === "mainnet"
-                    ? "https://node.mainnet.casper.network/rpc"
-                    : "https://node.testnet.casper.network/rpc";
-            }
-        }
-        const explorerBase = x402Network === "mainnet" ? "https://cspr.live" : "https://testnet.cspr.live";
-        clack.log.info("x402 setup — 3 steps:");
-        clack.log.info("Step 1 — Get your Casper account hash\n\n" +
-            "  Your account hash identifies your wallet on-chain.\n" +
-            "  From a .pem file:\n\n" +
-            "    casper-client account-address --public-key ./keys/public_key.pem\n\n" +
-            "  From a hex public key:\n\n" +
-            "    casper-client account-address --public-key 02<your-hex-pubkey>\n\n" +
-            "  Output looks like:\n" +
-            "    account-hash-d0a57c6a95e74463de156cac761e17f0923eafc730ce3ce3a0c747c6598b0500\n\n" +
-            "  No casper-client? Install: cargo install casper-client");
-        const x402Vars = {
-            X402_ENABLE_REAL_SETTLEMENT: "true",
-            X402_SETTLEMENT_MODE: "casper-cli",
-            X402_BUYER_ACCOUNT_HASH: "account-hash-REPLACE_WITH_YOUR_HASH",
-            CASPER_ENABLE_REAL_SUBMISSION: "true",
-            CASPER_RPC_URL: x402RpcUrl,
-            CASPER_ACCOUNT_KEY_PATH: "./keys/secret_key.pem"
-        };
-        clack.log.info("Step 2 — .env vars:\n\n" +
-            Object.entries(x402Vars).map(([k, v]) => `  ${k}=${v}`).join("\n") +
-            `\n\n  .env: ${result.envFile}`);
-        const writeX402 = await clack.confirm({
-            message: "Write these to your .env? (you'll still need to replace X402_BUYER_ACCOUNT_HASH)",
-            initialValue: true
-        });
-        if (!clack.isCancel(writeX402) && writeX402) {
-            const written = appendEnvVars(result.envFile, x402Vars);
-            if (written.length > 0) {
-                clack.log.success(`Written: ${written.join(", ")}`);
-                if (written.includes("X402_BUYER_ACCOUNT_HASH")) {
-                    clack.log.warn(`Edit X402_BUYER_ACCOUNT_HASH in ${result.envFile} with your actual account hash after running Step 1.`);
-                }
-            }
-            else {
-                clack.log.info("Already set in .env — skipped.");
-            }
-        }
-        clack.log.info("Step 3 — Fund your account\n\n" +
-            (x402Network === "testnet"
-                ? `  Faucet: ${explorerBase}/tools/faucet\n`
-                : "  Transfer CSPR to your account.\n") +
-            `  Verify balance: ${explorerBase} → search your account hash`);
-    }
-    // ── 6. Doctor check ─────────────────────────────────────────────────────────
-    const doctorOutput = formatDoctorReport();
-    const doctorLines = doctorOutput.split("\n").filter(Boolean);
-    const hasIssues = doctorLines.some(l => l.startsWith("[warn]") || l.startsWith("[error]"));
-    const doctorMsg = doctorLines
-        .slice(1)
-        .map(l => l.startsWith("[ok]") ? `  ✓ ${l.slice(5)}` :
-        l.startsWith("[warn]") ? `  ⚠ ${l.slice(7)}` :
-            l.startsWith("[error]") ? `  ✗ ${l.slice(8)}` : `  ${l}`).join("\n");
-    if (hasIssues) {
-        clack.log.warn(`System check:\n${doctorMsg}`);
-    }
-    else {
-        clack.log.success(`System check:\n${doctorMsg}`);
+        clack.log.info("Add to your .env file:\n\n" +
+            "  X402_ENABLE_REAL_SETTLEMENT=true\n" +
+            "  X402_SETTLEMENT_MODE=casper-cli\n" +
+            "  X402_BUYER_ACCOUNT_HASH=account-hash-<64 hex chars>\n" +
+            "  CASPER_ENABLE_REAL_SUBMISSION=true\n\n" +
+            "Get your account hash: casper-client account-address --public-key <your-pubkey-hex>");
     }
     clack.outro("Restart your MCP clients to load the server.");
 }
@@ -397,7 +214,17 @@ export function initializeLocalSetup(env = process.env) {
         logsDir: paths.logsDir
     };
 }
-export function formatMcpConfig() {
+export function formatMcpConfig(target) {
+    if (normalizeMcpClientTarget(target) === "codex") {
+        return [
+            "[mcp_servers.mainspring]",
+            'command = "npx"',
+            'args = ["-y", "mrmainspring"]',
+            "startup_timeout_sec = 20",
+            "tool_timeout_sec = 60",
+            "enabled = true"
+        ].join("\n");
+    }
     return JSON.stringify({
         mcpServers: {
             mainspring: {
@@ -445,14 +272,15 @@ function formatDoctorReport(env = process.env) {
 function formatCheck(ok, success, failure) {
     return ok ? `[ok] ${success}` : `[warn] ${failure}`;
 }
-function formatClientName(target) {
-    if (!target)
-        return "your";
-    if (target.toLowerCase() === "cursor")
-        return "Cursor";
-    if (target.toLowerCase() === "claude")
-        return "Claude Desktop";
-    return target;
+function normalizeMcpClientTarget(target) {
+    const normalized = target?.trim().toLowerCase();
+    if (normalized === "codex")
+        return "codex";
+    if (normalized === "cursor")
+        return "cursor";
+    if (normalized === "claude" || normalized === "claude-desktop" || normalized === "claude_desktop")
+        return "claude";
+    return "generic";
 }
 function quoteEnvValue(value) {
     return `"${value.replace(/"/g, "")}"`;

package/dist/client-setup.js

@@ -11,106 +11,20 @@ const CLIENTS = [
     { name: "Claude Desktop", path: "%APPDATA%/Claude/claude_desktop_config.json", platforms: ["win32"], format: "standard" },
     { name: "Claude Desktop", path: "~/.config/Claude/claude_desktop_config.json", platforms: ["linux"], format: "standard" },
     // Claude Code CLI
-    {
-        name: "Claude Code", path: "~/.claude/settings.json", platforms: ["darwin", "linux", "win32"], format: "standard",
-        appPaths: ["/usr/local/bin/claude", "/usr/bin/claude"]
-    },
+    { name: "Claude Code", path: "~/.claude/settings.json", platforms: ["darwin", "linux", "win32"], format: "standard" },
     // Cursor
-    {
-        name: "Cursor", path: "~/.cursor/mcp.json", platforms: ["darwin", "linux"], format: "standard",
-        appPaths: ["/Applications/Cursor.app", `${homedir()}/Applications/Cursor.app`]
-    },
-    {
-        name: "Cursor", path: "%USERPROFILE%/.cursor/mcp.json", platforms: ["win32"], format: "standard",
-        appPaths: ["C:/Users/Default/AppData/Local/Programs/cursor/Cursor.exe"]
-    },
+    { name: "Cursor", path: "~/.cursor/mcp.json", platforms: ["darwin", "linux"], format: "standard" },
+    { name: "Cursor", path: "%USERPROFILE%/.cursor/mcp.json", platforms: ["win32"], format: "standard" },
     // Windsurf
-    {
-        name: "Windsurf", path: "~/.codeium/windsurf/mcp_config.json", platforms: ["darwin", "linux", "win32"], format: "standard",
-        appPaths: ["/Applications/Windsurf.app", `${homedir()}/Applications/Windsurf.app`]
-    },
+    { name: "Windsurf", path: "~/.codeium/windsurf/mcp_config.json", platforms: ["darwin", "linux", "win32"], format: "standard" },
+    // Windsurf (also on Windows via AppData)
     { name: "Windsurf", path: "%APPDATA%/Windsurf/User/globalStorage/codeium.windsurf/mcp_config.json", platforms: ["win32"], format: "standard" },
     // Zed
-    {
-        name: "Zed", path: "~/.config/zed/settings.json", platforms: ["darwin", "linux"], format: "zed",
-        appPaths: ["/Applications/Zed.app", `${homedir()}/Applications/Zed.app`]
-    },
+    { name: "Zed", path: "~/.config/zed/settings.json", platforms: ["darwin", "linux"], format: "zed" },
     // Continue.dev
     { name: "Continue", path: "~/.continue/config.json", platforms: ["darwin", "linux", "win32"], format: "continue" },
-    // VS Code (user-level MCP config — requires GitHub Copilot or MCP extension)
-    {
-        name: "VS Code", path: "~/.vscode/mcp.json", platforms: ["darwin", "linux"], format: "standard",
-        appPaths: ["/Applications/Visual Studio Code.app", `${homedir()}/Applications/Visual Studio Code.app`, "/usr/bin/code", "/usr/local/bin/code"]
-    },
-    { name: "VS Code", path: "~/.vscode/mcp.json", platforms: ["win32"], format: "standard" },
-    // Cline (VS Code extension by saoudrizwan)
-    {
-        name: "Cline",
-        path: "~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json",
-        detectDir: "~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev",
-        platforms: ["darwin"], format: "standard"
-    },
-    {
-        name: "Cline",
-        path: "~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json",
-        detectDir: "~/.config/Code/User/globalStorage/saoudrizwan.claude-dev",
-        platforms: ["linux"], format: "standard"
-    },
-    {
-        name: "Cline",
-        path: "%APPDATA%/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json",
-        detectDir: "%APPDATA%/Code/User/globalStorage/saoudrizwan.claude-dev",
-        platforms: ["win32"], format: "standard"
-    },
-    // Roo Code (VS Code extension, fork of Cline)
-    {
-        name: "Roo Code",
-        path: "~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/cline_mcp_settings.json",
-        detectDir: "~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline",
-        platforms: ["darwin"], format: "standard"
-    },
-    {
-        name: "Roo Code",
-        path: "~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/cline_mcp_settings.json",
-        detectDir: "~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline",
-        platforms: ["linux"], format: "standard"
-    },
-    {
-        name: "Roo Code",
-        path: "%APPDATA%/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/cline_mcp_settings.json",
-        detectDir: "%APPDATA%/Code/User/globalStorage/rooveterinaryinc.roo-cline",
-        platforms: ["win32"], format: "standard"
-    },
-    // Kilo Code (VS Code extension)
-    {
-        name: "Kilo Code",
-        path: "~/Library/Application Support/Code/User/globalStorage/kilocode.kilo-code/settings/cline_mcp_settings.json",
-        detectDir: "~/Library/Application Support/Code/User/globalStorage/kilocode.kilo-code",
-        platforms: ["darwin"], format: "standard"
-    },
-    {
-        name: "Kilo Code",
-        path: "~/.config/Code/User/globalStorage/kilocode.kilo-code/settings/cline_mcp_settings.json",
-        detectDir: "~/.config/Code/User/globalStorage/kilocode.kilo-code",
-        platforms: ["linux"], format: "standard"
-    },
-    {
-        name: "Kilo Code",
-        path: "%APPDATA%/Code/User/globalStorage/kilocode.kilo-code/settings/cline_mcp_settings.json",
-        detectDir: "%APPDATA%/Code/User/globalStorage/kilocode.kilo-code",
-        platforms: ["win32"], format: "standard"
-    },
-    // OpenCode (terminal AI coding assistant)
-    { name: "OpenCode", path: "~/.config/opencode/config.json", platforms: ["darwin", "linux"], format: "standard" },
-    { name: "OpenCode", path: "%APPDATA%/opencode/config.json", platforms: ["win32"], format: "standard" },
-    // Amazon Q Developer
-    { name: "Amazon Q", path: "~/.aws/amazonq/mcp.json", platforms: ["darwin", "linux"], format: "standard" },
-    { name: "Amazon Q", path: "%USERPROFILE%/.aws/amazonq/mcp.json", platforms: ["win32"], format: "standard" },
-    // Gemini CLI (Google)
-    { name: "Gemini CLI", path: "~/.gemini/settings.json", platforms: ["darwin", "linux"], format: "standard" },
-    { name: "Gemini CLI", path: "%USERPROFILE%/.gemini/settings.json", platforms: ["win32"], format: "standard" },
-    // Codex CLI (OpenAI)
-    { name: "Codex CLI", path: "~/.codex/config.json", platforms: ["darwin", "linux", "win32"], format: "standard" },
+    // VS Code (workspace-agnostic user MCP config — requires MCP extension)
+    { name: "VS Code", path: "~/.vscode/mcp.json", platforms: ["darwin", "linux", "win32"], format: "standard" },
 ];
 function expandPath(p, env) {
     const home = env.HOME ?? env.USERPROFILE ?? homedir();
@@ -119,11 +33,8 @@ function expandPath(p, env) {
         .replace(/%APPDATA%/gi, env.APPDATA ?? "")
         .replace(/%USERPROFILE%/gi, env.USERPROFILE ?? home);
 }
-function isInstalled(configPath, detectDir, appPaths) {
-    const dir = detectDir ?? dirname(configPath);
-    if (existsSync(dir) || existsSync(configPath))
-        return true;
-    return appPaths?.some(p => existsSync(p)) ?? false;
+function isInstalled(configPath) {
+    return existsSync(dirname(configPath)) || existsSync(configPath);
 }
 function readJson(path) {
     if (!existsSync(path))
@@ -183,14 +94,17 @@ export function detectClients(env = process.env) {
         if (seen.has(key))
             continue;
         seen.add(key);
-        const detectDir = client.detectDir ? expandPath(client.detectDir, env) : undefined;
-        results.push({ name: client.name, configPath, installed: isInstalled(configPath, detectDir, client.appPaths), format: client.format });
+        results.push({ name: client.name, configPath, installed: isInstalled(configPath), format: client.format });
     }
     return results;
 }
 export function configureClients(selected, env = process.env) {
     const results = [];
     for (const client of selected) {
+        if (!client.installed) {
+            results.push({ name: client.name, configPath: client.configPath, status: "not-installed" });
+            continue;
+        }
         try {
             const json = readJson(client.configPath);
             if (alreadySet(json, client.format)) {
@@ -219,8 +133,7 @@ export function setupAllClients(env = process.env) {
         if (seen.has(key))
             continue;
         seen.add(key);
-        const detectDir = client.detectDir ? expandPath(client.detectDir, env) : undefined;
-        if (!isInstalled(configPath, detectDir, client.appPaths)) {
+        if (!isInstalled(configPath)) {
             results.push({ name: client.name, configPath, status: "not-installed" });
             continue;
         }

package/dist/mcp/grimoireTools.js

@@ -26,11 +26,6 @@ export function registerGrimoireTools(server, grimoireService) {
         }
     }, async (input) => {
         const secret = await grimoireService.putSecret(input);
-        server.sendLoggingMessage({
-            level: "info",
-            logger: "mainspring",
-            data: `Secret stored [${input.type}] ${input.name} (agent=${input.agent_id})`
-        }).catch(() => { });
         return jsonResult({
             status: "stored",
             secret
@@ -67,11 +62,6 @@ export function registerGrimoireTools(server, grimoireService) {
         }
     }, async (input) => {
         const policy = await grimoireService.setPolicy(input);
-        server.sendLoggingMessage({
-            level: "info",
-            logger: "mainspring",
-            data: `Policy set [${input.policy_id}] max=${input.max_amount_per_call} per call (agent=${input.agent_id})`
-        }).catch(() => { });
         return jsonResult({
             status: "stored",
             policy

package/dist/mcp/memoryTools.js

@@ -18,14 +18,6 @@ export function registerMemoryTools(server, memoryService) {
         }
     }, async (input) => {
         const memory = await memoryService.write(input);
-        const anchorNote = memory.anchor_status === "anchored" && memory.casper_transaction_hash
-            ? ` · anchored tx=${memory.casper_transaction_hash.slice(0, 12)}…`
-            : memory.anchor_status === "pending" ? " · anchor pending" : "";
-        server.sendLoggingMessage({
-            level: "info",
-            logger: "mainspring",
-            data: `Memory saved [${input.type}] ${memory.memory_id}${anchorNote}`
-        }).catch(() => { });
         return jsonResult({
             memory_id: memory.memory_id,
             content_hash: memory.content_hash,

package/dist/mcp/paymentTools.js

@@ -21,14 +21,6 @@ export function registerPaymentTools(server, paymentService) {
         }
     }, async (input) => {
         const result = await paymentService.fetch(input);
-        const status = result.status ?? "unknown";
-        const level = status === "settlement_unavailable" || status === "policy_blocked"
-            ? "warning" : "info";
-        server.sendLoggingMessage({
-            level,
-            logger: "mainspring",
-            data: `Payment [${status}] ${input.method} ${input.url} (policy=${input.policy_id})`
-        }).catch(() => { });
         return jsonResult(result);
     });
     server.registerTool("payment.receipt", {

package/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "mrmainspring",
-  "version": "0.2.9",
-  "description": "Mr Mainspring MCP backend with memory, Grimoire policies, audit, Casper anchoring, and x402 settlement boundaries.",
-  "license": "MIT",
-  "type": "module",
-  "bin": {
-    "mainspring": "dist/index.js",
-    "mrmainspring": "dist/index.js"
-  },
-  "main": "./dist/server.js",
-  "types": "./dist/server.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/server.d.ts",
-      "import": "./dist/server.js"
-    },
-    "./mcp": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "LICENSE",
-    "README.md",
-    "package.json"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "demo:stdio": "npm run build && tsx scripts/demo-stdio.ts",
-    "demo:x402-http": "tsx scripts/x402-demo-http-server.ts",
-    "demo:x402-sidecars": "tsx scripts/x402-local-sidecars.ts",
-    "demo:x402-sidecars:smoke": "tsx scripts/x402-local-sidecars.ts --smoke",
-    "dev": "tsx src/index.ts",
-    "mcp:stdio": "node dist/index.js",
-    "prepack": "npm run build",
-    "smoke:x402-payment-fetch": "tsx scripts/x402-payment-fetch-smoke.ts",
-    "test": "vitest run",
-    "x402:facilitator": "tsx scripts/x402-facilitator-sidecar.ts",
-    "x402:resource": "tsx scripts/x402-local-sidecars.ts",
-    "x402:signer": "tsx scripts/x402-signer-sidecar.ts"
-  },
-  "dependencies": {
-    "@clack/prompts": "^1.5.1",
-    "@modelcontextprotocol/sdk": "^1.13.0",
-    "zod": "^3.25.76"
-  },
-  "devDependencies": {
-    "@types/node": "^22.15.30",
-    "tsx": "^4.19.4",
-    "typescript": "^5.8.3",
-    "vitest": "^4.1.8"
-  },
-  "engines": {
-    "node": ">=20.0.0"
-  }
-}
+{
+  "name": "mrmainspring",
+  "version": "0.3.1",
+  "description": "Mr Mainspring MCP backend with memory, Grimoire policies, audit, Casper anchoring, and x402 settlement boundaries.",
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "mainspring": "dist/index.js",
+    "mrmainspring": "dist/index.js"
+  },
+  "main": "./dist/server.js",
+  "types": "./dist/server.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/server.d.ts",
+      "import": "./dist/server.js"
+    },
+    "./mcp": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist/**/*.js",
+    "dist/**/*.d.ts",
+    "LICENSE",
+    "README.md",
+    "package.json"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "demo:stdio": "npm run build && tsx scripts/demo-stdio.ts",
+    "demo:x402-http": "tsx scripts/x402-demo-http-server.ts",
+    "demo:x402-sidecars": "tsx scripts/x402-local-sidecars.ts",
+    "demo:x402-sidecars:smoke": "tsx scripts/x402-local-sidecars.ts --smoke",
+    "dev": "tsx src/index.ts",
+    "mcp:stdio": "node dist/index.js",
+    "prepack": "npm run build",
+    "smoke:x402-payment-fetch": "tsx scripts/x402-payment-fetch-smoke.ts",
+    "test": "vitest run",
+    "x402:facilitator": "tsx scripts/x402-facilitator-sidecar.ts",
+    "x402:resource": "tsx scripts/x402-local-sidecars.ts",
+    "x402:signer": "tsx scripts/x402-signer-sidecar.ts"
+  },
+  "dependencies": {
+    "@clack/prompts": "^1.5.1",
+    "@modelcontextprotocol/sdk": "^1.13.0",
+    "zod": "^3.25.76"
+  },
+  "devDependencies": {
+    "@types/node": "^22.15.30",
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3",
+    "vitest": "^4.1.8"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}