mrmainspring 0.2.2 → 0.2.4

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -126,8 +126,41 @@ const CLOCK_ART = [
 async function runInteractiveSetup() {
     process.stdout.write(`\n${CLOCK_ART}\n\n`);
     clack.intro("setup");
+    // ── 1. Local files ──────────────────────────────────────────────────────────
+    const hadKey = !!process.env.GRIMOIRE_MASTER_KEY;
     const result = initializeLocalSetup();
-    clack.log.success(`Local files ready\n   Config: ${result.envFile}\n   Data:   ${result.dataDir}`);
+    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 ──────────────────────────────────────────────────────────
     const clients = detectClients();
     const installed = clients.filter(c => c.installed);
     const choices = await clack.multiselect({
@@ -155,10 +188,7 @@ async function runInteractiveSetup() {
         });
         if (!clack.isCancel(customPath) && customPath && customPath.trim()) {
             const expandedPath = customPath.replace(/^~/, process.env.HOME ?? "");
-            const configResults = configureClients([
-                { name: "Custom", configPath: expandedPath, installed: true, format: "standard" }
-            ]);
-            const r = configResults[0];
+            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")
@@ -182,53 +212,124 @@ async function runInteractiveSetup() {
         clack.log.info(`Already configured: ${alreadySet.join(", ")}`);
     for (const e of errors)
         clack.log.error(`${e.name}: ${e.error}`);
-    const wantCasper = await clack.confirm({
-        message: "Enable Casper on-chain anchoring?",
-        initialValue: false
-    });
+    // ── 4. Casper anchoring ─────────────────────────────────────────────────────
+    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";
         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.");
+            `  CASPER_ENABLE_REAL_SUBMISSION=true\n` +
+            `  CASPER_RPC_URL=${casperRpcUrl}\n` +
+            `  CASPER_ACCOUNT_KEY_PATH=${keyPath}\n\n` +
+            `  Your .env: ${result.envFile}`);
     }
-    const wantX402 = await clack.confirm({
-        message: "Enable x402 micropayments?",
-        initialValue: false
-    });
+    // ── 5. x402 payments ────────────────────────────────────────────────────────
+    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 Casper wallet on-chain.\n" +
-            "  You need a Casper key pair (.pem file). If you already have one:\n\n" +
-            "    casper-client account-address --public-key <path-to-public-key.pem>\n\n" +
-            "  Or from a hex public key:\n\n" +
-            "    casper-client account-address --public-key 02<your-66-char-hex-pubkey>\n\n" +
-            "  The output looks like:\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" +
-            "  Don't have casper-client? Install it:\n" +
-            "    cargo install casper-client  (or download from github.com/casper-ecosystem/casper-client-rs)");
+            "  No casper-client? Install: cargo install casper-client");
         clack.log.info("Step 2 — 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-<paste your hash here>\n" +
+            "  X402_BUYER_ACCOUNT_HASH=account-hash-<your hash>\n" +
             "  CASPER_ENABLE_REAL_SUBMISSION=true\n" +
-            "  CASPER_RPC_URL=https://node.testnet.casper.network/rpc\n" +
-            "  CASPER_ACCOUNT_KEY_PATH=./keys/your-secret-key.pem\n\n" +
-            "  Your .env is at:\n" +
-            `  ${result.envFile}`);
+            `  CASPER_RPC_URL=${x402RpcUrl}\n` +
+            "  CASPER_ACCOUNT_KEY_PATH=./keys/secret_key.pem\n\n" +
+            `  Your .env: ${result.envFile}`);
         clack.log.info("Step 3 — Fund your account\n\n" +
-            "  Testnet: use the Casper faucet at https://testnet.cspr.live/tools/faucet\n" +
-            "  Search your account hash on https://testnet.cspr.live to verify balance.");
+            (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.outro("Restart your MCP clients to load the server.");
 }

package/dist/client-setup.js

@@ -11,19 +11,38 @@ 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" },
+    {
+        name: "Claude Code", path: "~/.claude/settings.json", platforms: ["darwin", "linux", "win32"], format: "standard",
+        appPaths: ["/usr/local/bin/claude", "/usr/bin/claude"]
+    },
     // Cursor
-    { name: "Cursor", path: "~/.cursor/mcp.json", platforms: ["darwin", "linux"], format: "standard" },
-    { name: "Cursor", path: "%USERPROFILE%/.cursor/mcp.json", platforms: ["win32"], format: "standard" },
+    {
+        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"]
+    },
     // Windsurf
-    { name: "Windsurf", path: "~/.codeium/windsurf/mcp_config.json", platforms: ["darwin", "linux", "win32"], format: "standard" },
+    {
+        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: "%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" },
+    {
+        name: "Zed", path: "~/.config/zed/settings.json", platforms: ["darwin", "linux"], format: "zed",
+        appPaths: ["/Applications/Zed.app", `${homedir()}/Applications/Zed.app`]
+    },
     // 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", "win32"], format: "standard" },
+    {
+        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",
@@ -100,9 +119,11 @@ function expandPath(p, env) {
         .replace(/%APPDATA%/gi, env.APPDATA ?? "")
         .replace(/%USERPROFILE%/gi, env.USERPROFILE ?? home);
 }
-function isInstalled(configPath, detectDir) {
+function isInstalled(configPath, detectDir, appPaths) {
     const dir = detectDir ?? dirname(configPath);
-    return existsSync(dir) || existsSync(configPath);
+    if (existsSync(dir) || existsSync(configPath))
+        return true;
+    return appPaths?.some(p => existsSync(p)) ?? false;
 }
 function readJson(path) {
     if (!existsSync(path))
@@ -163,7 +184,7 @@ export function detectClients(env = process.env) {
             continue;
         seen.add(key);
         const detectDir = client.detectDir ? expandPath(client.detectDir, env) : undefined;
-        results.push({ name: client.name, configPath, installed: isInstalled(configPath, detectDir), format: client.format });
+        results.push({ name: client.name, configPath, installed: isInstalled(configPath, detectDir, client.appPaths), format: client.format });
     }
     return results;
 }
@@ -199,7 +220,7 @@ export function setupAllClients(env = process.env) {
             continue;
         seen.add(key);
         const detectDir = client.detectDir ? expandPath(client.detectDir, env) : undefined;
-        if (!isInstalled(configPath, detectDir)) {
+        if (!isInstalled(configPath, detectDir, client.appPaths)) {
             results.push({ name: client.name, configPath, status: "not-installed" });
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmainspring",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Mr Mainspring MCP backend with memory, Grimoire policies, audit, Casper anchoring, and x402 settlement boundaries.",
   "license": "MIT",
   "type": "module",