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

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

@@ -118,6 +118,7 @@ function usage() {
         "  ouro link <agent> --friend <id> --provider <provider> --external-id <external-id>",
         "  ouro bluebubbles replay [--agent <name>] --message-guid <guid> [--event-type new-message|updated-message] [--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]",
         "  ouro rsvp <doctor|incident|cutover|legacy-render|replay|config|habit|import-legacy|refresh|compare|smoke> ...",
         "  ouro friend list [--agent <name>]",
         "  ouro friend show <id> [--agent <name>]",
@@ -1543,6 +1544,7 @@ function parseMcpCommand(args) {
     if (sub === "doctor") {
         let socketOverride;
         let json = false;
+        let hostStallObserved = false;
         for (let i = 0; i < rest.length; i++) {
             if (rest[i] === "--socket") {
                 if (!rest[i + 1])
@@ -1554,6 +1556,10 @@ function parseMcpCommand(args) {
                 json = true;
                 continue;
             }
+            if (rest[i] === "--host-stall-observed") {
+                hostStallObserved = true;
+                continue;
+            }
             throw new Error(`Unknown mcp doctor flag: ${rest[i]}`);
         }
         if (!agent)
@@ -1563,6 +1569,7 @@ function parseMcpCommand(args) {
             agent,
             ...(socketOverride ? { socketOverride } : {}),
             ...(json ? { json: true } : {}),
+            ...(hostStallObserved ? { hostStallObserved: true } : {}),
         };
     }
     throw new Error(`Usage\n${usage()}`);
@@ -1751,6 +1758,62 @@ function parseMigrateToDeskCommand(args) {
 }
 function parseBlueBubblesCommand(args) {
     const subcommand = args[0];
+    if (subcommand === "host") {
+        const action = args[1];
+        const usageText = "Usage: ouro bluebubbles host <install|status|repair|remove|collect> [--username <name> --uid <uid> --home <path>] [--request-id <id>] [--json]";
+        if (action === "collect") {
+            let requestId;
+            let json = false;
+            for (let index = 2; index < args.length; index += 1) {
+                if (args[index] === "--request-id" && args[index + 1]) {
+                    requestId = args[++index];
+                }
+                else if (args[index] === "--json") {
+                    json = true;
+                }
+                else {
+                    throw new Error(usageText);
+                }
+            }
+            if (!requestId)
+                throw new Error(`${usageText}\ncollect requires --request-id <id>`);
+            return { kind: "bluebubbles.host.collect", requestId, ...(json ? { json: true } : {}) };
+        }
+        if (action !== "install" && action !== "status" && action !== "repair" && action !== "remove") {
+            throw new Error(usageText);
+        }
+        let username;
+        let uid;
+        let homeDir;
+        let json = false;
+        for (let index = 2; index < args.length; index += 1) {
+            const token = args[index];
+            if (token === "--username" && args[index + 1])
+                username = args[++index];
+            else if (token === "--uid" && args[index + 1]) {
+                const value = Number(args[++index]);
+                if (!Number.isInteger(value))
+                    throw new Error(`${usageText}\n--uid must be an integer`);
+                uid = value;
+            }
+            else if (token === "--home" && args[index + 1])
+                homeDir = args[++index];
+            else if (token === "--json")
+                json = true;
+            else
+                throw new Error(usageText);
+        }
+        const targetFields = [username, uid, homeDir].filter((value) => value !== undefined).length;
+        if (targetFields !== 0 && targetFields !== 3) {
+            throw new Error(`${usageText}\ncross-user setup requires --username, --uid, and --home together`);
+        }
+        return {
+            kind: "bluebubbles.host",
+            action,
+            ...(targetFields === 3 ? { target: { username: username, uid: uid, homeDir: homeDir } } : {}),
+            ...(json ? { json: true } : {}),
+        };
+    }
     if (subcommand !== "replay" && subcommand !== "context-smoke") {
         throw new Error(`Usage\n${usage()}`);
     }
@@ -2442,7 +2505,12 @@ function parseOuroCommand(args) {
     }
     if (head === "up") {
         const noRepair = args.includes("--no-repair");
-        return noRepair ? { kind: "daemon.up", noRepair: true } : { kind: "daemon.up" };
+        const latest = args.includes("--latest");
+        return {
+            kind: "daemon.up",
+            ...(noRepair ? { noRepair: true } : {}),
+            ...(latest ? { latest: true } : {}),
+        };
     }
     if (head === "dev") {
         const devArgs = args.slice(1);

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

@@ -48,6 +48,7 @@ exports.buildStoppedStatusPayload = buildStoppedStatusPayload;
 exports.renderRollupStatusLine = renderRollupStatusLine;
 exports.daemonUnavailableStatusOutput = daemonUnavailableStatusOutput;
 exports.isDaemonUnavailableError = isDaemonUnavailableError;
+exports.isDaemonTimeoutError = isDaemonTimeoutError;
 exports.formatMcpResponse = formatMcpResponse;
 const path = __importStar(require("path"));
 const runtime_metadata_1 = require("./runtime-metadata");
@@ -746,6 +747,12 @@ function isDaemonUnavailableError(error) {
         : "";
     return code === "ENOENT" || code === "ECONNREFUSED";
 }
+function isDaemonTimeoutError(error) {
+    const code = typeof error === "object" && error !== null && "code" in error
+        ? String(error.code ?? "")
+        : "";
+    return code === "ETIMEDOUT";
+}
 function formatMcpResponse(command, response) {
     if (command.kind === "mcp.list") {
         const allTools = response.data;

package/dist/heart/daemon/daemon.js

@@ -39,6 +39,8 @@ exports.parseOrphanPidsFromPs = parseOrphanPidsFromPs;
 exports.filterPidfilePidsToActualOrphans = filterPidfilePidsToActualOrphans;
 exports.mergeUniqueOrphanPids = mergeUniqueOrphanPids;
 exports.waitForOrphanProcessesToSettle = waitForOrphanProcessesToSettle;
+exports.assertOrphanCleanupComplete = assertOrphanCleanupComplete;
+exports.drainOrphanProcessesBeforeStartup = drainOrphanProcessesBeforeStartup;
 exports.killOrphanProcesses = killOrphanProcesses;
 exports.writePidfile = writePidfile;
 exports.handleAgentSenseTurn = handleAgentSenseTurn;
@@ -124,7 +126,8 @@ function parseOrphanPidsFromPs(psOutput, selfPid) {
             && !line.includes("bluebubbles/entry.js")
             && !line.includes("mail-entry.js")
             && !line.includes("teams-entry.js")
-            && !line.includes("a2a-entry.js"))
+            && !line.includes("a2a-entry.js")
+            && !line.includes("voice-entry.js"))
             continue;
         // Parse `<pid> <ppid> <command...>`. ps pads these with leading spaces.
         // Regex guarantees both groups are \d+ so parseInt can't produce NaN.
@@ -228,6 +231,41 @@ async function waitForOrphanProcessesToSettle(pids, deps = {}) {
     }
     return survivors;
 }
+function assertOrphanCleanupComplete(survivingPids) {
+    if (survivingPids.length === 0)
+        return;
+    const errorReason = `refusing startup while ${survivingPids.length} orphaned Ouro processes remain: ${survivingPids.join(", ")}`;
+    (0, runtime_1.emitNervesEvent)({
+        level: "error",
+        component: "daemon",
+        event: "daemon.orphan_cleanup_incomplete",
+        message: errorReason,
+        meta: { survivingPids },
+    });
+    throw new Error(errorReason);
+}
+const ORPHAN_CLEANUP_MAX_SIGNAL_PASSES = 8;
+async function drainOrphanProcessesBeforeStartup(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_PATH, deps = {}) {
+    const signalOrphans = deps.signalOrphans ?? killOrphanProcesses;
+    const settleOrphans = deps.settleOrphans ?? waitForOrphanProcessesToSettle;
+    const maxSignalPasses = deps.maxSignalPasses ?? ORPHAN_CLEANUP_MAX_SIGNAL_PASSES;
+    for (let pass = 0; pass < maxSignalPasses; pass += 1) {
+        const signaledPids = signalOrphans(socketPath);
+        if (signaledPids.length === 0)
+            return;
+        const survivingPids = await settleOrphans(signaledPids);
+        assertOrphanCleanupComplete(survivingPids);
+    }
+    const errorReason = `orphan cleanup did not reach a fixed point after ${maxSignalPasses} signaling round(s)`;
+    (0, runtime_1.emitNervesEvent)({
+        level: "error",
+        component: "daemon",
+        event: "daemon.orphan_cleanup_not_converged",
+        message: errorReason,
+        meta: { maxSignalPasses },
+    });
+    throw new Error(errorReason);
+}
 /* v8 ignore start -- shells out to ps; covered by filterPidfilePidsToActualOrphans unit tests via injected runner @preserve */
 function runPsCheck(pids) {
     try {
@@ -305,7 +343,10 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
             const result = (0, child_process_1.execSync)("ps -eo pid,ppid,command", { encoding: "utf-8", timeout: 5000 });
             scanOrphans = parseOrphanPidsFromPs(result, process.pid);
         }
-        catch { /* ps failed — best effort */ }
+        catch (error) {
+            const detail = error instanceof Error ? error.message : String(error);
+            throw new Error(`could not discover orphaned Ouro processes: ${detail}`);
+        }
         const pidsToKill = mergeUniqueOrphanPids(pidfileOrphans, scanOrphans);
         if (pidsToKill.length > 0) {
             for (const pid of pidsToKill) {
@@ -325,13 +366,13 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
     }
     catch (error) {
         (0, runtime_1.emitNervesEvent)({
-            level: "warn",
+            level: "error",
             component: "daemon",
             event: "daemon.orphan_cleanup_error",
             message: "failed to clean up orphaned ouro processes",
             meta: { error: error instanceof Error ? error.message : String(error) },
         });
-        return [];
+        throw error instanceof Error ? error : new Error(String(error));
     }
 }
 /**
@@ -575,6 +616,7 @@ class OuroDaemon {
     onStopCommandComplete;
     externalEventRoot;
     rsvpHabitRunner;
+    orphanStartupDrain;
     constructor(options) {
         this.socketPath = options.socketPath;
         this.processManager = options.processManager;
@@ -589,6 +631,7 @@ class OuroDaemon {
         this.onStopCommandComplete = options.onStopCommandComplete ?? null;
         this.externalEventRoot = options.externalEventRoot ?? null;
         this.rsvpHabitRunner = options.rsvpHabitRunner;
+        this.orphanStartupDrain = options.orphanStartupDrain ?? drainOrphanProcessesBeforeStartup;
     }
     /* v8 ignore start -- default mailbox server wiring: production-only path, tests inject mailboxServerFactory stub instead. startMailboxHttpServer itself has full coverage in mailbox-http.test.ts @preserve */
     createDefaultMailboxServer() {
@@ -740,10 +783,7 @@ class OuroDaemon {
         }
         // MCP connections are lazily initialized per-agent during senseTurn
         // (daemon manages multiple agents; agent identity must be set before loading MCP config)
-        /* v8 ignore start -- orphan cleanup + pidfile: calls process management functions @preserve */
-        const killedOrphanPids = killOrphanProcesses(this.socketPath);
-        await waitForOrphanProcessesToSettle(killedOrphanPids);
-        /* v8 ignore stop */
+        await this.orphanStartupDrain(this.socketPath);
         await this.openCommandSocket();
         this.triggerAutoStartAgents();
         this.triggerAutoStartSensesWhenAgentsSettled();
@@ -1049,8 +1089,12 @@ class OuroDaemon {
             clearTimeout(this.senseAutostartTimer);
             this.senseAutostartTimer = null;
         }
-        await this.processManager.stopAll();
-        await this.senseManager?.stopAll();
+        const workerStopTasks = [Promise.resolve().then(() => this.processManager.stopAll())];
+        if (this.senseManager) {
+            workerStopTasks.push(Promise.resolve().then(() => this.senseManager.stopAll()));
+        }
+        const workerStopResults = await Promise.allSettled(workerStopTasks);
+        const workerStopFailures = workerStopResults.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
         if (this.server) {
             // DO NOT `await` server.close() here. server.close() resolves only
             // after every open connection has closed. When stop() is invoked
@@ -1113,6 +1157,19 @@ class OuroDaemon {
             });
         }
         this.socketIdentity = null;
+        if (workerStopFailures.length > 0) {
+            const errorReason = `daemon shutdown could not drain ${workerStopFailures.length} managed worker group(s)`;
+            (0, runtime_1.emitNervesEvent)({
+                level: "error",
+                component: "daemon",
+                event: "daemon.worker_shutdown_error",
+                message: errorReason,
+                meta: {
+                    failures: workerStopFailures.map((error) => error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error rejection @preserve */ String(error)),
+                },
+            });
+            throw new AggregateError(workerStopFailures, errorReason);
+        }
     }
     async handleRawPayload(raw) {
         try {
@@ -1477,8 +1534,12 @@ class OuroDaemon {
                 await this.start();
                 return { ok: true, message: "daemon started" };
             case "daemon.stop":
-                await this.stop();
-                this.onStopCommandComplete?.();
+                try {
+                    await this.stop();
+                }
+                finally {
+                    this.onStopCommandComplete?.();
+                }
                 return { ok: true, message: "daemon stopped" };
             case "daemon.restart": {
                 // Restart is "stop + let launchctl respawn." Under launchctl's KeepAlive
@@ -1494,8 +1555,12 @@ class OuroDaemon {
                         requestedBy: command.requestedBy ?? null,
                     },
                 });
-                await this.stop();
-                this.onStopCommandComplete?.();
+                try {
+                    await this.stop();
+                }
+                finally {
+                    this.onStopCommandComplete?.();
+                }
                 return {
                     ok: true,
                     message: "daemon restarting — launchctl will respawn",

package/dist/heart/daemon/doctor.js

@@ -24,6 +24,7 @@ exports.checkLifecycle = checkLifecycle;
 exports.runDoctorChecks = runDoctorChecks;
 const runtime_1 = require("../../nerves/runtime");
 const bluebubbles_health_diagnostics_1 = require("./bluebubbles-health-diagnostics");
+const webhook_registration_1 = require("../../senses/bluebubbles/webhook-registration");
 const freshness_1 = require("./freshness");
 const ouro_path_installer_1 = require("../versioning/ouro-path-installer");
 const runtime_credentials_1 = require("../runtime-credentials");
@@ -35,6 +36,8 @@ const config_1 = require("../../rsvp/config");
 const cutover_1 = require("../../rsvp/cutover");
 const diagnostics_1 = require("../../rsvp/diagnostics");
 const DEFAULT_BLUEBUBBLES_REQUEST_TIMEOUT_MS = 30_000;
+const DEFAULT_BLUEBUBBLES_PORT = 18_790;
+const DEFAULT_BLUEBUBBLES_WEBHOOK_PATH = "/bluebubbles-webhook";
 // ── Category checkers ──
 function checkCliPath(deps) {
     const resolution = (0, ouro_path_installer_1.diagnoseOuroPath)({
@@ -412,10 +415,11 @@ async function checkSenses(deps) {
                 });
                 let upstreamContext = "upstream probe not run in this pass";
                 if (deps.fetchImpl) {
+                    const requestTimeoutMs = numberField(bluebubblesChannel, "requestTimeoutMs", DEFAULT_BLUEBUBBLES_REQUEST_TIMEOUT_MS);
                     const probe = await (0, bluebubbles_health_diagnostics_1.probeBlueBubblesHealth)({
                         serverUrl,
                         password,
-                        requestTimeoutMs: numberField(bluebubblesChannel, "requestTimeoutMs", DEFAULT_BLUEBUBBLES_REQUEST_TIMEOUT_MS),
+                        requestTimeoutMs,
                         fetchImpl: deps.fetchImpl,
                     });
                     checks.push({
@@ -426,6 +430,22 @@ async function checkSenses(deps) {
                     upstreamContext = probe.ok
                         ? "upstream probe reachable — which does not prove inbound delivery"
                         : "upstream probe failing";
+                    const webhook = await (0, webhook_registration_1.inspectBlueBubblesWebhookRegistration)({
+                        serverUrl,
+                        password,
+                        callbackPort: numberField(bluebubblesChannel, "port", DEFAULT_BLUEBUBBLES_PORT),
+                        callbackPath: textField(bluebubblesChannel, "webhookPath") || DEFAULT_BLUEBUBBLES_WEBHOOK_PATH,
+                        agentName,
+                        machineId,
+                        requestTimeoutMs,
+                        listenerReady: true,
+                    }, { fetchImpl: deps.fetchImpl });
+                    checks.push({
+                        id: "senses.bluebubbles.webhook",
+                        label: `${agentDir} bluebubbles webhook`,
+                        status: webhook.ok ? "pass" : "fail",
+                        detail: webhook.detail,
+                    });
                 }
                 const bluebubblesStateRoot = `${deps.bundlesRoot}/${agentDir}/state/senses/bluebubbles`;
                 checks.push(senseInboundDeliveryCheck({