@ouro.bot/cli 0.1.0-alpha.726 → 0.1.0-alpha.728

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

@@ -39,6 +39,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runMcpServeCliLifecycle = runMcpServeCliLifecycle;
 exports.summarizeDaemonStartupFailure = summarizeDaemonStartupFailure;
 exports.writeSyncProbeSummary = writeSyncProbeSummary;
 exports.summarizeSyncProbeFindings = summarizeSyncProbeFindings;
@@ -47,6 +48,7 @@ exports.ensureDaemonRunning = ensureDaemonRunning;
 exports.listGithubCopilotModels = listGithubCopilotModels;
 exports.checkManualCloneBundles = checkManualCloneBundles;
 exports.resolveWorkbenchRuntimeMcp = resolveWorkbenchRuntimeMcp;
+exports.setupBlueBubblesHostForConnect = setupBlueBubblesHostForConnect;
 exports.resolveMailImportFilePath = resolveMailImportFilePath;
 exports.runOuroCli = runOuroCli;
 const child_process_1 = require("child_process");
@@ -78,6 +80,7 @@ const provider_binding_resolver_1 = require("../provider-binding-resolver");
 const provider_visibility_1 = require("../provider-visibility");
 const context_loss_sentinel_1 = require("../context-loss-sentinel");
 const machine_identity_1 = require("../machine-identity");
+const bluebubbles_host_1 = require("./bluebubbles-host");
 const provider_models_1 = require("../provider-models");
 const ouro_version_manager_1 = require("../versioning/ouro-version-manager");
 const update_checker_1 = require("../versioning/update-checker");
@@ -120,6 +123,7 @@ const connect_bay_1 = require("./connect-bay");
 const runtime_capability_check_1 = require("../runtime-capability-check");
 const vault_items_1 = require("./vault-items");
 const mcp_canary_1 = require("./mcp-canary");
+const bluebubbles_cli_integration_1 = require("./bluebubbles-cli-integration");
 // ── ensureDaemonRunning ──
 const DEFAULT_DAEMON_STARTUP_TIMEOUT_MS = 60_000;
 const DEFAULT_DAEMON_STARTUP_POLL_INTERVAL_MS = 500;
@@ -129,6 +133,23 @@ 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`;
 }
+async function runMcpServeCliLifecycle(server, input) {
+    server.start();
+    await new Promise((resolve) => {
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            input.removeListener("end", finish);
+            input.removeListener("close", finish);
+            server.stop();
+            resolve();
+        };
+        input.once("end", finish);
+        input.once("close", finish);
+    });
+}
 function commandFailureText(error) {
     const parts = [];
     if (error instanceof Error)
@@ -656,6 +677,16 @@ function daemonUnavailableStatusJsonOutput(socketPath, healthFilePath) {
         ...(healthFilePath ? { healthFilePath } : {}),
     }, null, 2);
 }
+function daemonTimeoutStatusJsonOutput(socketPath, error) {
+    return JSON.stringify({
+        ok: false,
+        error: "daemon timeout",
+        classification: "timeout",
+        code: "ETIMEDOUT",
+        socketPath,
+        detail: error instanceof Error ? error.message : String(error),
+    }, null, 2);
+}
 function providerRepairCountSummary(count) {
     if (count === 0)
         return "selected providers answered live checks";
@@ -3545,6 +3576,45 @@ async function executeConnectTeams(agent, deps) {
         ],
     });
 }
+async function setupBlueBubblesHostForConnect(bridgeUsername, serverUrl, requestTimeoutMs, deps, hostAccountDeps = {
+    userInfo: os.userInfo,
+    execFileSync: child_process_1.execFileSync,
+}) {
+    if (deps.setupBlueBubblesHost)
+        return deps.setupBlueBubblesHost({ bridgeUsername });
+    (0, bluebubbles_host_1.installBlueBubblesHostSharedHelper)({
+        assetPath: path.resolve(__dirname, "../../../assets/bluebubbles-host"),
+    });
+    const currentUser = hostAccountDeps.userInfo();
+    if (bridgeUsername === currentUser.username) {
+        const host = await (0, bluebubbles_host_1.runBlueBubblesHostAction)("install", (0, bluebubbles_host_1.createDefaultBlueBubblesHostDeps)({ serverUrl, requestTimeoutMs, fetchImpl: deps.fetchImpl }));
+        return {
+            summary: `host: native LaunchAgent ${host.state.service}; process ${host.state.process}`,
+            bridgeUsername,
+            bridgeUid: currentUser.uid,
+            bridgeHomeDir: currentUser.homedir,
+        };
+    }
+    const uidText = hostAccountDeps.execFileSync("id", ["-u", bridgeUsername], { encoding: "utf8" }).trim();
+    const bridgeUid = Number(uidText);
+    const homeRecord = hostAccountDeps.execFileSync("dscl", [".", "-read", `/Users/${bridgeUsername}`, "NFSHomeDirectory"], { encoding: "utf8" }).trim();
+    const bridgeHomeDir = homeRecord.replace(/^NFSHomeDirectory:\s*/, "").trim();
+    if (!Number.isInteger(bridgeUid) || !bridgeHomeDir)
+        throw new Error(`could not resolve BlueBubbles macOS account ${bridgeUsername}`);
+    const handoff = (0, bluebubbles_host_1.requestCrossUserBlueBubblesHostAction)({
+        action: "install",
+        username: bridgeUsername,
+        uid: bridgeUid,
+        targetHomeDir: bridgeHomeDir,
+        originHomeDir: deps.homeDir ?? os.homedir(),
+    });
+    return {
+        summary: `human-required: run in ${bridgeUsername}'s logged-in desktop Terminal: ${handoff.helperCommand}\ncollect: ${handoff.collectCommand}`,
+        bridgeUsername,
+        bridgeUid,
+        bridgeHomeDir,
+    };
+}
 async function executeConnectBlueBubbles(agent, deps) {
     if (agent === "SerpentGuide") {
         throw new Error("SerpentGuide has no persistent runtime credentials. Attach BlueBubbles on the hatchling agent instead.");
@@ -3600,10 +3670,14 @@ async function executeConnectBlueBubbles(agent, deps) {
     const ownHandles = ownHandlesRaw
         ? ownHandlesRaw.split(",").map((h) => h.trim()).filter((h) => h.length > 0)
         : [];
+    const bridgeUsernameAnswer = (await promptInput(`BlueBubbles macOS account username [${os.userInfo().username}]: `)).trim();
+    const bridgeUsername = bridgeUsernameAnswer || os.userInfo().username;
     const machineId = currentMachineId(deps);
     const progress = createHumanCommandProgress(deps, "connect bluebubbles");
     let stored;
     let daemonApply = "not applied";
+    let hostSetup;
+    let webhookRegistration;
     try {
         progress.startPhase("saving BlueBubbles attachment");
         progress.updateDetail("checking existing machine runtime config");
@@ -3612,6 +3686,8 @@ async function executeConnectBlueBubbles(agent, deps) {
             progress.end();
             throw new Error(`cannot read existing machine runtime credentials from ${current.itemPath}: ${current.error}`);
         }
+        progress.updateDetail("configuring native BlueBubbles host continuity");
+        hostSetup = await setupBlueBubblesHostForConnect(bridgeUsername, serverUrl, requestTimeoutMs, deps);
         const blueBubblesPatch = {
             bluebubbles: {
                 serverUrl,
@@ -3623,6 +3699,9 @@ async function executeConnectBlueBubbles(agent, deps) {
                 port,
                 webhookPath,
                 requestTimeoutMs,
+                bridgeUsername: hostSetup.bridgeUsername,
+                bridgeUid: hostSetup.bridgeUid,
+                bridgeHomeDir: hostSetup.bridgeHomeDir,
             },
         };
         progress.updateDetail("storing local machine config");
@@ -3631,6 +3710,22 @@ async function executeConnectBlueBubbles(agent, deps) {
         enableAgentSense(agent, "bluebubbles", deps);
         progress.completePhase("saving BlueBubbles attachment", "secret stored");
         daemonApply = await runCommandProgressPhase(progress, "applying BlueBubbles to running Ouro", () => applyLocalSenseChangeToRunningDaemon(agent, "BlueBubbles", deps, (message) => progress.updateDetail(message)), (result) => result);
+        progress.startPhase("verifying BlueBubbles webhook");
+        const webhookInput = {
+            serverUrl,
+            password,
+            callbackPort: port,
+            callbackPath: webhookPath,
+            agentName: agent,
+            machineId,
+            requestTimeoutMs,
+            listenerReady: (0, bluebubbles_cli_integration_1.blueBubblesListenerReadyAfterApply)(daemonApply),
+        };
+        webhookRegistration = await (0, bluebubbles_cli_integration_1.reconcileBlueBubblesWebhookAfterConnect)(webhookInput, {
+            ...(deps.reconcileBlueBubblesWebhook ? { reconcile: deps.reconcileBlueBubblesWebhook } : {}),
+            ...(deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}),
+        });
+        progress.completePhase("verifying BlueBubbles webhook", webhookRegistration.detail);
         progress.end();
     }
     catch (error) {
@@ -3646,13 +3741,17 @@ async function executeConnectBlueBubbles(agent, deps) {
             `Stored: ${stored.itemPath}`,
             "agent.json: senses.bluebubbles.enabled = true",
             `Runtime: ${daemonApply}`,
+            hostSetup.summary,
+            (0, bluebubbles_cli_integration_1.formatBlueBubblesWebhookConnectLine)(webhookRegistration),
             `ownHandles: ${ownHandles.length > 0 ? ownHandles.join(", ") : "(none — group self-talk filter inactive)"}`,
             "secret was not printed",
             ...(syncSummary ? [syncSummary] : []),
         ],
         nextMoves: [
-            `Point BlueBubbles at this machine's webhook listener on port ${port}${webhookPath}.`,
-            "If BlueBubbles was already pointed there, messages can now reach the agent.",
+            webhookRegistration.ok
+                ? `Ouro owns and repairs the BlueBubbles [*] webhook for port ${port}${webhookPath}.`
+                : "Run `ouro doctor --category Senses` after Ouro and BlueBubbles are running; the periodic reconciler will retry every 180 seconds.",
+            "Run the collect command after any human-required cross-user helper handoff.",
             `Attach other machines separately if ${agent} should use BlueBubbles there too.`,
         ],
         fallbackLines: [
@@ -3661,9 +3760,11 @@ async function executeConnectBlueBubbles(agent, deps) {
             `stored: ${stored.itemPath}`,
             "agent.json: senses.bluebubbles.enabled = true",
             `runtime: ${daemonApply}`,
+            hostSetup.summary,
+            (0, bluebubbles_cli_integration_1.formatBlueBubblesWebhookConnectLine)(webhookRegistration),
             "secret was not printed",
             "",
-            `Next: point BlueBubbles at this machine's webhook listener on port ${port}${webhookPath}.`,
+            `webhook target: Ouro reconciles [*] automatically on port ${port}${webhookPath}`,
             ...(syncSummary ? [syncSummary] : []),
         ],
     });
@@ -5648,6 +5749,24 @@ async function registerOuroBundleTypeNonBlocking(deps) {
         });
     }
 }
+function writeVersionIntentWithRecoveryLauncher(deps, intent) {
+    if (!deps.writeVersionIntent)
+        return;
+    if (!deps.installOuroCommand) {
+        throw new Error("cannot change Ouro version intent without a verified recovery launcher: installer unavailable");
+    }
+    let installResult;
+    try {
+        installResult = deps.installOuroCommand();
+    }
+    catch (error) {
+        throw new Error(`cannot change Ouro version intent without a verified recovery launcher: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (!installResult.scriptPath) {
+        throw new Error(`cannot change Ouro version intent without a verified recovery launcher: ${installResult.skippedReason ?? "installation was not verified"}`);
+    }
+    deps.writeVersionIntent(intent);
+}
 async function performSystemSetup(deps) {
     // Install ouro command to PATH (non-blocking)
     if (deps.installOuroCommand) {
@@ -6214,6 +6333,43 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         deps.writeStdout(text);
         return text;
     }
+    if (command.kind === "bluebubbles.host") {
+        if (command.target) {
+            (0, bluebubbles_host_1.installBlueBubblesHostSharedHelper)({
+                assetPath: path.resolve(__dirname, "../../../assets/bluebubbles-host"),
+            });
+            const handoff = (0, bluebubbles_host_1.requestCrossUserBlueBubblesHostAction)({
+                action: command.action,
+                username: command.target.username,
+                uid: command.target.uid,
+                targetHomeDir: command.target.homeDir,
+                originHomeDir: deps.homeDir ?? os.homedir(),
+            });
+            const text = command.json
+                ? JSON.stringify(handoff, null, 2)
+                : [
+                    `human-required: run in ${command.target.username}'s logged-in desktop Terminal: ${handoff.helperCommand}`,
+                    `collect: ${handoff.collectCommand}`,
+                ].join("\n");
+            deps.writeStdout(text);
+            return text;
+        }
+        const outcome = await (0, bluebubbles_host_1.runBlueBubblesHostAction)(command.action, (0, bluebubbles_host_1.createDefaultBlueBubblesHostDeps)());
+        const text = command.json
+            ? JSON.stringify(outcome, null, 2)
+            : (0, bluebubbles_cli_integration_1.formatBlueBubblesHostActionText)(outcome);
+        deps.writeStdout(text);
+        return text;
+    }
+    if (command.kind === "bluebubbles.host.collect") {
+        const collection = (0, bluebubbles_host_1.collectCrossUserBlueBubblesHostAction)({
+            requestId: command.requestId,
+            originHomeDir: deps.homeDir ?? os.homedir(),
+        });
+        const text = command.json ? JSON.stringify(collection, null, 2) : collection.detail;
+        deps.writeStdout(text);
+        return text;
+    }
     if (command.kind === "bluebubbles.context-smoke") {
         const { smokeBlueBubblesContext, formatBlueBubblesContextSmokeText } = await Promise.resolve().then(() => __importStar(require("../../senses/bluebubbles/context-smoke")));
         const smoke = await smokeBlueBubblesContext({
@@ -6287,25 +6443,43 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         const daemonAliveAtBootStart = await deps.checkSocketAlive(deps.socketPath);
         progress.setPhasePlan?.(bootPhasePlan(daemonAliveAtBootStart));
         // ── versioned CLI update check ──
-        if (deps.checkForCliUpdate) {
+        const versionIntent = deps.readVersionIntent?.() ?? null;
+        const pinnedUpdate = versionIntent?.mode === "pinned" && !command.latest;
+        if (deps.checkForCliUpdate && pinnedUpdate) {
+            progress.startPhase("update check");
+            progress.completePhase("update check", `pinned to ${versionIntent.targetVersion}`);
+        }
+        else if (deps.checkForCliUpdate) {
             progress.startPhase("update check");
             progress.updateDetail(`current runtime: ${(0, bundle_manifest_1.getPackageVersion)()}\nchecking npm registry\ncontinuing startup if it stays quiet`);
             let pendingReExec = false;
             let updateCheckStatus = "up to date";
             try {
                 const { result: updateResult, timedOut } = await runCliUpdateCheckWithTimeout(deps.checkForCliUpdate, deps.updateCheckTimeoutMs ?? update_checker_1.CLI_UPDATE_CHECK_TIMEOUT_MS);
-                if (updateResult.available && updateResult.latestVersion) {
+                const shouldAdoptLatestTarget = Boolean(updateResult.latestVersion && (updateResult.available || command.latest || !versionIntent));
+                if (shouldAdoptLatestTarget && updateResult.latestVersion) {
                     /* v8 ignore next -- fallback: getCurrentCliVersion always injected in tests @preserve */
                     const currentVersion = linkedVersionBeforeUp ?? "unknown";
-                    await deps.installCliVersion(updateResult.latestVersion);
-                    deps.activateCliVersion(updateResult.latestVersion);
-                    progress.completePhase("update check", `installed ${updateResult.latestVersion}`);
-                    const changelogCommand = (0, ouro_version_manager_1.buildChangelogCommand)(currentVersion, updateResult.latestVersion);
-                    /* v8 ignore next -- buildChangelogCommand is non-null when an actual newer version is installed @preserve */
-                    if (changelogCommand) {
-                        deps.writeStdout(`review changes with: ${changelogCommand}`);
+                    const targetVersion = updateResult.latestVersion;
+                    const needsActivation = updateResult.available || linkedVersionBeforeUp !== targetVersion;
+                    if (needsActivation) {
+                        await deps.installCliVersion(targetVersion);
+                        const validation = deps.validateCliVersionForActivation?.(targetVersion);
+                        if (validation && !validation.ok) {
+                            throw new Error(`refusing to activate ${targetVersion}: ${validation.message}`);
+                        }
+                    }
+                    writeVersionIntentWithRecoveryLauncher(deps, { schemaVersion: 1, mode: "latest", targetVersion });
+                    if (needsActivation) {
+                        deps.activateCliVersion(targetVersion);
+                        progress.completePhase("update check", `installed ${targetVersion}`);
+                        const changelogCommand = (0, ouro_version_manager_1.buildChangelogCommand)(currentVersion, targetVersion);
+                        /* v8 ignore next -- buildChangelogCommand is non-null when an actual newer version is installed @preserve */
+                        if (changelogCommand) {
+                            deps.writeStdout(`review changes with: ${changelogCommand}`);
+                        }
+                        pendingReExec = true;
                     }
-                    pendingReExec = true;
                 }
                 else if (updateResult.error) {
                     updateCheckStatus = summarizeCliUpdateCheckStatus(updateResult.error, timedOut);
@@ -6755,7 +6929,9 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     /* v8 ignore start -- rollback/versions: tested via daemon-cli-rollback/versions tests @preserve */
     if (command.kind === "rollback") {
         const currentVersion = deps.getCurrentCliVersion?.() ?? "unknown";
+        let targetVersion;
         if (command.version) {
+            targetVersion = command.version;
             // Rollback to a specific version
             const installed = deps.listCliVersions?.() ?? [];
             if (!installed.includes(command.version)) {
@@ -6773,7 +6949,6 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                 const message = `refusing to roll back to ${command.version}: ${validation.message}`;
                 return returnCliFailure(deps, message);
             }
-            deps.activateCliVersion(command.version);
         }
         else {
             // Rollback to previous version
@@ -6788,9 +6963,10 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                 const message = `refusing to roll back to ${previousVersion}: ${validation.message}`;
                 return returnCliFailure(deps, message);
             }
-            deps.activateCliVersion(previousVersion);
-            command = { ...command, version: previousVersion };
+            targetVersion = previousVersion;
         }
+        writeVersionIntentWithRecoveryLauncher(deps, { schemaVersion: 1, mode: "pinned", targetVersion });
+        deps.activateCliVersion(targetVersion);
         // Stop daemon (non-fatal if not running)
         try {
             await deps.sendCommand(deps.socketPath, { kind: "daemon.stop" });
@@ -6798,7 +6974,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         catch {
             // Daemon may not be running — that's fine
         }
-        const message = `rolled back to ${command.version} (was ${currentVersion})`;
+        const message = `rolled back to ${targetVersion} (was ${currentVersion})`;
         deps.writeStdout(message);
         return message;
     }
@@ -6817,7 +6993,11 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                     line += " (previous)";
                 return line;
             }).join("\n");
-        const sections = [localSection];
+        const intent = deps.readVersionIntent?.() ?? null;
+        const intentLine = intent
+            ? `version intent: ${intent.mode === "pinned" ? `pinned to ${intent.targetVersion}` : `latest (${intent.targetVersion})`}`
+            : "version intent: legacy (not yet recorded)";
+        const sections = [localSection, intentLine];
         if (deps.checkForCliUpdate) {
             try {
                 const { result: updateResult, timedOut } = await runCliUpdateCheckWithTimeout(deps.checkForCliUpdate, deps.updateCheckTimeoutMs ?? update_checker_1.CLI_UPDATE_CHECK_TIMEOUT_MS);
@@ -6843,9 +7023,13 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
                         title: "Installed versions",
                         lines: localSection.split("\n"),
                     },
+                    {
+                        title: "Version intent",
+                        lines: [intentLine],
+                    },
                     {
                         title: "Published latest",
-                        lines: sections.slice(1).length > 0 ? sections.slice(1) : ["published latest: unavailable"],
+                        lines: sections.slice(2).length > 0 ? sections.slice(2) : ["published latest: unavailable"],
                     },
                 ],
             })
@@ -7082,13 +7266,32 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             const mcpAddCmd = `codex mcp add ouro-${setupAgent} -- ${mcpServeCommand}`;
             const mcpRemoveCmd = `codex mcp remove ouro-${setupAgent}`;
             const mcpRegistration = registerMcpServer(mcpAddCmd, mcpRemoveCmd);
+            const canary = await (0, mcp_canary_1.runMcpStatusCanary)({
+                agent: setupAgent,
+                socketPath: deps.socketPath,
+                command: process.execPath,
+                commandArgs: [
+                    path.join(__dirname, "ouro-bot-entry.js"),
+                    "mcp-serve",
+                    "--agent",
+                    setupAgent,
+                    "--socket",
+                    deps.socketPath,
+                ],
+                timeoutMs: mcp_canary_1.SETUP_CANARY_TIMEOUT_MS,
+            });
+            if (!canary.ok)
+                deps.setExitCode?.(1);
             (0, runtime_1.emitNervesEvent)({
                 component: "daemon",
                 event: "daemon.setup_complete",
                 message: "dev tool setup complete",
-                meta: { tool, agent: setupAgent, runtimeMode, platform, mcpRegistration },
+                meta: { tool, agent: setupAgent, runtimeMode, platform, mcpRegistration, canary: canary.classification },
             });
-            const message = `setup complete: codex + ${setupAgent}\n  MCP server ${mcpRegistration}\n${setupReloadNotice("codex")}`;
+            const canarySummary = canary.ok
+                ? canary.summary
+                : `registration succeeded; bridge health failed — ${canary.summary}`;
+            const message = `setup complete: codex + ${setupAgent}\n  MCP registration: ${mcpRegistration}\n  MCP server ${mcpRegistration}\n  MCP canary: ${canary.classification}\n  ${canarySummary}\n${setupReloadNotice("codex")}`;
             deps.writeStdout(message);
             return message;
         }
@@ -7123,6 +7326,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             command: process.execPath,
             ignoreOverviewHealth: true,
             ignoreSenseHealth: true,
+            hostStallObserved: command.hostStallObserved === true,
             commandArgs: [
                 path.join(__dirname, "ouro-bot-entry.js"),
                 "mcp-serve",
@@ -7143,12 +7347,13 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         deps.writeStdout(message);
         return message;
     }
-    /* v8 ignore start — mcp-serve block binds to process.stdin/stdout; tested via mcp-server unit tests */
     // ── mcp-serve: start MCP server in-process on stdin/stdout ──
     if (command.kind === "mcp-serve") {
-        const { createMcpServer } = await Promise.resolve().then(() => __importStar(require("../mcp/mcp-server")));
+        const createMcpServer = deps.createMcpServer ?? (await Promise.resolve().then(() => __importStar(require("../mcp/mcp-server")))).createMcpServer;
         const friendId = command.friendId ?? `local-${os.userInfo().username}`;
         const mcpSocketPath = command.socketOverride ?? deps.socketPath;
+        const mcpInput = deps.mcpServeInput ?? process.stdin;
+        const mcpOutput = deps.mcpServeOutput ?? process.stdout;
         // Resolve the optional --workbench-mcp flag into a concrete runtime MCP
         // override. A string is taken as the explicit binary path (falling back to
         // discovery if it does not exist); a boolean opt-in (true) self-discovers
@@ -7161,27 +7366,19 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             agent: command.agent,
             friendId,
             socketPath: mcpSocketPath,
-            stdin: process.stdin,
-            stdout: process.stdout,
+            stdin: mcpInput,
+            stdout: mcpOutput,
             ...(runtimeMcp ? { runtimeMcp } : {}),
         });
-        server.start();
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.mcp_serve_started",
             message: "MCP server started via CLI",
             meta: { agent: command.agent, friendId, workbenchRuntimeMcp: !!runtimeMcp },
         });
-        // Keep process alive until stdin closes
-        await new Promise((resolve) => {
-            process.stdin.on("end", () => {
-                server.stop();
-                resolve();
-            });
-        });
+        await runMcpServeCliLifecycle(server, mcpInput);
         return "";
     }
-    /* v8 ignore stop */
     if (command.kind === "private.decisions") {
         let response;
         try {
@@ -8354,6 +8551,14 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             deps.writeStdout(message);
             return message;
         }
+        if (command.kind === "daemon.status" && (0, cli_render_1.isDaemonTimeoutError)(error)) {
+            const detail = error instanceof Error ? error.message : String(error);
+            const message = command.json
+                ? daemonTimeoutStatusJsonOutput(deps.socketPath, error)
+                : `daemon status timed out: ${detail}`;
+            deps.writeStdout(message);
+            return message;
+        }
         if (command.kind === "daemon.status" && (0, cli_render_1.isDaemonUnavailableError)(error)) {
             const message = command.json
                 ? daemonUnavailableStatusJsonOutput(deps.socketPath, deps.healthFilePath)

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

@@ -15,8 +15,8 @@ const core_1 = require("../../nerves/review/core");
 exports.COMMAND_REGISTRY = {
     up: {
         category: "Lifecycle",
-        description: "Start and check Ouro: bring up the background runtime, refresh what this machine needs, and show anything that still needs attention. In a human TTY, bare `ouro` opens the home screen instead; noninteractive shells still route bare `ouro` to `ouro up`.",
-        usage: "ouro [up] [--no-repair]",
+        description: "Start and check Ouro: bring up the background runtime, refresh what this machine needs, and show anything that still needs attention. A pinned rollback stays pinned during ordinary starts; use `--latest` to preflight and explicitly return to the latest release. In a human TTY, bare `ouro` opens the home screen instead; noninteractive shells still route bare `ouro` to `ouro up`.",
+        usage: "ouro [up] [--no-repair] [--latest]",
         example: "ouro up --no-repair",
     },
     stop: {
@@ -58,13 +58,13 @@ exports.COMMAND_REGISTRY = {
     },
     rollback: {
         category: "Lifecycle",
-        description: "Roll back to a previous CLI version",
+        description: "Pin Ouro to an exact installed CLI version; ordinary `ouro up` preserves the pinned intent until `ouro up --latest` succeeds",
         usage: "ouro rollback [<version>]",
         example: "ouro rollback 0.1.0-alpha.250",
     },
     versions: {
         category: "Lifecycle",
-        description: "List installed CLI versions",
+        description: "List installed CLI versions and show the active version intent mode and target",
         usage: "ouro versions",
         example: "ouro versions",
     },
@@ -363,9 +363,10 @@ exports.COMMAND_REGISTRY = {
         usage: [
             "ouro bluebubbles replay [--agent <name>] --message-guid <guid> [--event-type <type>] [--json]",
             "ouro bluebubbles context-smoke [--agent <name>] --message-guid <guid> [--persist] [--json]",
+            "ouro bluebubbles host <install|status|repair|remove|collect> [--username <name> --uid <uid> --home <path>] [--request-id <id>] [--json]",
         ].join("\n"),
         example: "ouro bluebubbles context-smoke --agent slugger --message-guid abc123 --persist --json",
-        subcommands: ["replay", "context-smoke"],
+        subcommands: ["replay", "context-smoke", "host"],
     },
 };
 const SUBCOMMAND_HELP = {
@@ -420,10 +421,20 @@ const SUBCOMMAND_HELP = {
         example: "ouro connect teams",
     },
     "connect bluebubbles": {
-        description: "Attach BlueBubbles iMessage to this machine only; it does not travel with the agent",
+        description: "Attach BlueBubbles iMessage to this machine only, install or hand off its native host lifecycle, and reconcile the Ouro-owned webhook; it does not travel with the agent",
         usage: "ouro connect bluebubbles [--agent <name>]",
         example: "ouro connect bluebubbles",
     },
+    "bluebubbles host": {
+        description: "Inspect or repair the native BlueBubbles host. Same-user actions run directly; dedicated-user actions return one nonce-bound `human-required` Terminal command and a matching collect command.",
+        usage: "ouro bluebubbles host <install|status|repair|remove> [--username <name> --uid <uid> --home <path>] [--json]\nouro bluebubbles host collect --request-id <uid>-<nonce> [--json]",
+        example: "ouro bluebubbles host status --json",
+    },
+    "mcp doctor": {
+        description: "Run a bounded direct MCP bridge check. Use `--host-stall-observed` only when the host app was independently observed stalled; `host-stall-unexplained` preserves that evidence but does not prove a host-app cause.",
+        usage: "ouro mcp doctor --agent <name> [--socket <path>] [--host-stall-observed] [--json]",
+        example: "ouro mcp doctor --agent slugger --json",
+    },
     "connect mail": {
         description: "Provision portable Agent Mail / Mailroom access and enable the Mail sense",
         usage: "ouro connect mail [--agent <name>] [--owner-email <email> --source <label>|--no-delegated-source] [--rotate-missing-mail-keys]",