@ouro.bot/cli 0.1.0-alpha.719 → 0.1.0-alpha.720

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.720",
+      "changes": [
+        "Make MCP setup repair commands replace existing stale dev-tool registrations."
+      ]
+    },
     {
       "version": "0.1.0-alpha.719",
       "changes": [

package/dist/heart/daemon/cli-exec.js

@@ -129,6 +129,42 @@ function setupReloadNotice(tool) {
     const host = tool === "codex" ? "Codex" : "Claude Code";
     return `  reload required: open a fresh ${host} session so the host launches the newly registered MCP bridge; existing MCP processes keep their old runtime`;
 }
+function commandFailureText(error) {
+    const parts = [];
+    if (error instanceof Error)
+        parts.push(error.message);
+    else if (error !== undefined && error !== null)
+        parts.push(String(error));
+    const maybeOutput = error;
+    if (maybeOutput?.stdout)
+        parts.push(String(maybeOutput.stdout));
+    if (maybeOutput?.stderr)
+        parts.push(String(maybeOutput.stderr));
+    if (Array.isArray(maybeOutput?.output)) {
+        for (const chunk of maybeOutput.output) {
+            if (chunk)
+                parts.push(String(chunk));
+        }
+    }
+    return parts.join("\n");
+}
+function isExistingMcpServerFailure(error) {
+    return /mcp server .+ already exists/i.test(commandFailureText(error))
+        || /already exists in .+ config/i.test(commandFailureText(error));
+}
+function registerMcpServer(addCommand, removeCommand) {
+    try {
+        (0, child_process_1.execSync)(addCommand, { stdio: "pipe" });
+        return "registered";
+    }
+    catch (error) {
+        if (!isExistingMcpServerFailure(error))
+            throw error;
+        (0, child_process_1.execSync)(removeCommand, { stdio: "pipe" });
+        (0, child_process_1.execSync)(addCommand, { stdio: "pipe" });
+        return "replaced";
+    }
+}
 const DEFAULT_DAEMON_STARTUP_LOG_LINES = 10;
 const RSVP_CLI_KINDS = new Set([
     "rsvp.doctor",
@@ -6910,7 +6946,8 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         if (tool === "claude-code") {
             // 1. Register MCP server with Claude Code
             const mcpAddCmd = `${claudeCmd} mcp add ouro-${setupAgent} -s user -- ${mcpServeCommand}`;
-            (0, child_process_1.execSync)(mcpAddCmd, { stdio: "pipe" });
+            const mcpRemoveCmd = `${claudeCmd} mcp remove -s user ouro-${setupAgent}`;
+            const mcpRegistration = registerMcpServer(mcpAddCmd, mcpRemoveCmd);
             // 2. Write hooks config
             const settingsPath = path.join(claudeConfigDir, "settings.json");
             let settings = {};
@@ -6932,7 +6969,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                 component: "daemon",
                 event: "daemon.setup_complete",
                 message: "dev tool setup complete",
-                meta: { tool, agent: setupAgent, runtimeMode, platform },
+                meta: { tool, agent: setupAgent, runtimeMode, platform, mcpRegistration },
             });
             // 3. Write conversation formatting instructions
             const claudeMdPath = path.join(claudeConfigDir, "CLAUDE.md");
@@ -6944,21 +6981,22 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             if (!existingClaudeMd.includes("Agent conversations (ouro)")) {
                 fs.writeFileSync(claudeMdPath, existingClaudeMd + agentInstructions);
             }
-            const message = `setup complete: claude-code + ${setupAgent}\n  MCP server registered\n  hooks configured\n  conversation formatting instructions added\n${setupReloadNotice("claude-code")}`;
+            const message = `setup complete: claude-code + ${setupAgent}\n  MCP server ${mcpRegistration}\n  hooks configured\n  conversation formatting instructions added\n${setupReloadNotice("claude-code")}`;
             deps.writeStdout(message);
             return message;
         }
         else {
             // tool === "codex" (parseSetupCommand validates tool, so this is the only remaining option)
             const mcpAddCmd = `codex mcp add ouro-${setupAgent} -- ${mcpServeCommand}`;
-            (0, child_process_1.execSync)(mcpAddCmd, { stdio: "pipe" });
+            const mcpRemoveCmd = `codex mcp remove ouro-${setupAgent}`;
+            const mcpRegistration = registerMcpServer(mcpAddCmd, mcpRemoveCmd);
             (0, runtime_1.emitNervesEvent)({
                 component: "daemon",
                 event: "daemon.setup_complete",
                 message: "dev tool setup complete",
-                meta: { tool, agent: setupAgent, runtimeMode, platform },
+                meta: { tool, agent: setupAgent, runtimeMode, platform, mcpRegistration },
             });
-            const message = `setup complete: codex + ${setupAgent}\n  MCP server registered\n${setupReloadNotice("codex")}`;
+            const message = `setup complete: codex + ${setupAgent}\n  MCP server ${mcpRegistration}\n${setupReloadNotice("codex")}`;
             deps.writeStdout(message);
             return message;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.719",
+  "version": "0.1.0-alpha.720",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",