@ouro.bot/cli 0.1.0-alpha.521 → 0.1.0-alpha.523

package/changelog.json

@@ -1,6 +1,22 @@
 {
   "_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.523",
+      "changes": [
+        "Exits the daemon entrypoint after a command-plane `daemon.stop`, preventing a stopped daemon from staying alive without its command socket and leaving Slugger's iMessage worker marked degraded.",
+        "Shares daemon entrypoint cleanup between signal stops and command stops, stopping habit schedulers and daemon health polling before the process exits.",
+        "Keeps BlueBubbles runtime health green as soon as upstream is reachable while queued captured-inbound, mutation, or catch-up recovery work remains visible in `pendingRecoveryCount` instead of making live iMessage look down."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.522",
+      "changes": [
+        "Keeps the BlueBubbles production HTTP worker responsive by changing runtime health sync to queue/discover missed iMessage recovery work instead of running full recovered agent turns inline.",
+        "Counts captured inbound sidecars and mutation backlog as pending recovery in BlueBubbles runtime state, so `ouro status`/health truth can show that live transport is up while old messages still need recovery.",
+        "Queues upstream catch-up candidates into the inbound sidecar during runtime sync without hydrating or invoking the agent, preserving idempotent recovery while preventing startup catch-up from starving live webhooks."
+      ]
+    },
     {
       "version": "0.1.0-alpha.521",
       "changes": [

package/dist/heart/daemon/daemon-entry.js

@@ -149,6 +149,25 @@ const healthMonitor = new health_monitor_1.HealthMonitor({
         catch { /* recovery is best-effort */ }
     },
 });
+const habitSchedulers = [];
+let entryRuntimeStopping = false;
+let stopCommandExitScheduled = false;
+function stopEntryRuntime() {
+    if (entryRuntimeStopping)
+        return;
+    entryRuntimeStopping = true;
+    for (const s of habitSchedulers) {
+        s.stopWatching();
+        s.stop();
+    }
+    healthMonitor.stopPeriodicChecks();
+}
+function scheduleCleanProcessExitAfterStopCommand() {
+    if (stopCommandExitScheduled)
+        return;
+    stopCommandExitScheduled = true;
+    setTimeout(() => process.exit(0), 100);
+}
 const daemon = new daemon_1.OuroDaemon({
     socketPath,
     processManager,
@@ -157,6 +176,10 @@ const daemon = new daemon_1.OuroDaemon({
     healthMonitor,
     router,
     mode,
+    onStopCommandComplete: () => {
+        stopEntryRuntime();
+        scheduleCleanProcessExitAfterStopCommand();
+    },
 });
 const daemonStartedAt = new Date().toISOString();
 const degradedComponents = [];
@@ -298,7 +321,6 @@ const healthWriter = new daemon_health_1.DaemonHealthWriter((0, daemon_health_1.
 const healthSink = (0, daemon_health_1.createHealthNervesSink)(healthWriter, buildDaemonHealthState);
 (0, index_1.registerGlobalLogSink)(healthSink);
 /* v8 ignore stop */
-const habitSchedulers = [];
 /* v8 ignore start -- habit wiring: lambdas delegate to processManager/fs; tested via HabitScheduler unit tests @preserve */
 void daemon.start().then(() => {
     const bundlesRoot = (0, identity_1.getAgentBundlesRoot)();
@@ -392,22 +414,14 @@ process.on("SIGINT", () => {
     // tombstone is strictly better than silence.
     _tombstoneWritten = true;
     (0, daemon_tombstone_1.writeDaemonTombstone)("sigint", new Error("daemon received SIGINT"));
-    for (const s of habitSchedulers) {
-        s.stopWatching();
-        s.stop();
-    }
-    healthMonitor.stopPeriodicChecks();
+    stopEntryRuntime();
     setTimeout(() => process.exit(1), 5_000).unref();
     void daemon.stop().then(() => process.exit(0));
 });
 process.on("SIGTERM", () => {
     _tombstoneWritten = true;
     (0, daemon_tombstone_1.writeDaemonTombstone)("sigterm", new Error("daemon received SIGTERM"));
-    for (const s of habitSchedulers) {
-        s.stopWatching();
-        s.stop();
-    }
-    healthMonitor.stopPeriodicChecks();
+    stopEntryRuntime();
     setTimeout(() => process.exit(1), 5_000).unref();
     void daemon.stop().then(() => process.exit(0));
 });

package/dist/heart/daemon/daemon.js

@@ -418,6 +418,7 @@ class OuroDaemon {
     socketIdentity = null;
     senseAutostartTimer = null;
     outlookServerFactory;
+    onStopCommandComplete;
     constructor(options) {
         this.socketPath = options.socketPath;
         this.processManager = options.processManager;
@@ -428,6 +429,7 @@ class OuroDaemon {
         this.bundlesRoot = options.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
         this.mode = options.mode ?? "production";
         this.outlookServerFactory = options.outlookServerFactory ?? this.createDefaultOutlookServer.bind(this);
+        this.onStopCommandComplete = options.onStopCommandComplete ?? null;
     }
     /* v8 ignore start -- default outlook server wiring: production-only path, tests inject outlookServerFactory stub instead. startOutlookHttpServer itself has full coverage in outlook-http.test.ts @preserve */
     createDefaultOutlookServer() {
@@ -906,6 +908,7 @@ class OuroDaemon {
         (0, update_checker_1.stopUpdateChecker)();
         (0, mcp_manager_1.shutdownSharedMcpManager)();
         this.scheduler.stop?.();
+        this.healthMonitor.stopPeriodicChecks?.();
         if (this.senseAutostartTimer) {
             clearTimeout(this.senseAutostartTimer);
             this.senseAutostartTimer = null;
@@ -1022,6 +1025,7 @@ class OuroDaemon {
                 return { ok: true, message: "daemon started" };
             case "daemon.stop":
                 await this.stop();
+                this.onStopCommandComplete?.();
                 return { ok: true, message: "daemon stopped" };
             case "daemon.status": {
                 const data = this.buildStatusPayload();

package/dist/senses/bluebubbles/index.js

@@ -1165,6 +1165,18 @@ function countPendingRecoveryCandidates(agentName) {
         .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid))
         .length;
 }
+function countPendingCapturedInboundMessages(agentName) {
+    const seenMessageGuids = new Set();
+    return (0, inbound_log_1.listRecordedBlueBubblesInbound)(agentName)
+        .filter((entry) => {
+        if (seenMessageGuids.has(entry.messageGuid))
+            return false;
+        seenMessageGuids.add(entry.messageGuid);
+        return true;
+    })
+        .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid))
+        .length;
+}
 function parseTimestampMs(value) {
     if (!value)
         return null;
@@ -1181,9 +1193,6 @@ function resolveBlueBubblesCatchUpSince(previousState, nowMs = Date.now()) {
     }
     return nowMs - BLUEBUBBLES_FIRST_CATCHUP_LOOKBACK_MS;
 }
-function formatRecoveredCount(count) {
-    return `caught up ${count} missed message(s)`;
-}
 async function syncBlueBubblesRuntime(deps = {}) {
     const resolvedDeps = { ...defaultDeps, ...deps };
     const agentName = resolvedDeps.getAgentName();
@@ -1192,30 +1201,38 @@ async function syncBlueBubblesRuntime(deps = {}) {
     const previousState = (0, runtime_state_1.readBlueBubblesRuntimeState)(agentName);
     try {
         await client.checkHealth();
-        const captured = await recoverCapturedBlueBubblesInboundMessages(resolvedDeps);
-        const recovery = await recoverMissedBlueBubblesMessages(resolvedDeps);
-        const catchUp = await catchUpMissedBlueBubblesMessages(resolvedDeps, previousState);
-        const failed = captured.failed + recovery.failed + catchUp.failed;
-        const recovered = captured.recovered + recovery.recovered + catchUp.recovered;
-        // upstreamStatus reflects whether BlueBubbles itself is healthy and we
-        // have unprocessed work (pendingRecoveryCount). Per-cycle recovery
-        // failures are noted in `detail` for transparency but do NOT flip the
-        // status to error: a single permanently-unrecoverable message would
-        // otherwise stick the sense in "error" forever, contradicting `ouro
+        const capturedPending = countPendingCapturedInboundMessages(agentName);
+        const recoveryPending = countPendingRecoveryCandidates(agentName);
+        (0, runtime_state_1.writeBlueBubblesRuntimeState)(agentName, {
+            upstreamStatus: "ok",
+            detail: "upstream reachable; recovery pass running",
+            lastCheckedAt: checkedAt,
+            pendingRecoveryCount: capturedPending + recoveryPending,
+            lastRecoveredAt: previousState.lastRecoveredAt,
+            lastRecoveredMessageGuid: previousState.lastRecoveredMessageGuid,
+        });
+        const catchUp = await catchUpMissedBlueBubblesMessages(resolvedDeps, previousState, {
+            processTurns: false,
+        });
+        const failed = catchUp.failed;
+        const queued = capturedPending + recoveryPending + (catchUp.queued ?? 0);
+        // upstreamStatus reflects whether BlueBubbles itself is healthy and
+        // whether the local bridge can answer webhook traffic. Queued recovery work
+        // and per-cycle failures are noted in `detail` for transparency but do NOT
+        // flip the status to error: a single permanently-unrecoverable message
+        // would otherwise stick the sense in "error" forever, contradicting `ouro
         // doctor` which only checks upstream reachability.
         (0, runtime_state_1.writeBlueBubblesRuntimeState)(agentName, {
-            upstreamStatus: recovery.pending > 0 ? "error" : "ok",
-            detail: recovery.pending > 0
-                ? `pending recovery: ${recovery.pending}`
+            upstreamStatus: "ok",
+            detail: queued > 0
+                ? `upstream reachable; ${queued} recovery item(s) queued`
                 : failed > 0
                     ? `${failed} message(s) unrecoverable this cycle; upstream ok`
-                    : catchUp.recovered > 0
-                        ? formatRecoveredCount(catchUp.recovered)
-                        : "upstream reachable",
+                    : "upstream reachable",
             lastCheckedAt: checkedAt,
-            pendingRecoveryCount: recovery.pending,
-            lastRecoveredAt: recovered > 0 ? checkedAt : previousState.lastRecoveredAt,
-            lastRecoveredMessageGuid: catchUp.lastRecoveredMessageGuid ?? previousState.lastRecoveredMessageGuid,
+            pendingRecoveryCount: queued,
+            lastRecoveredAt: previousState.lastRecoveredAt,
+            lastRecoveredMessageGuid: previousState.lastRecoveredMessageGuid,
         });
     }
     catch (error) {
@@ -1223,17 +1240,18 @@ async function syncBlueBubblesRuntime(deps = {}) {
             upstreamStatus: "error",
             detail: error instanceof Error ? error.message : String(error),
             lastCheckedAt: checkedAt,
-            pendingRecoveryCount: countPendingRecoveryCandidates(agentName),
+            pendingRecoveryCount: countPendingCapturedInboundMessages(agentName) + countPendingRecoveryCandidates(agentName),
         });
     }
 }
-async function catchUpMissedBlueBubblesMessages(deps = {}, previousState) {
+async function catchUpMissedBlueBubblesMessages(deps = {}, previousState, options = {}) {
     const resolvedDeps = { ...defaultDeps, ...deps };
     const agentName = resolvedDeps.getAgentName();
     const client = resolvedDeps.createClient();
     const result = { inspected: 0, recovered: 0, skipped: 0, failed: 0 };
     const state = previousState ?? (0, runtime_state_1.readBlueBubblesRuntimeState)(agentName);
     const catchUpSince = resolveBlueBubblesCatchUpSince(state);
+    const processTurns = options.processTurns !== false;
     /* v8 ignore next -- older injected test doubles may omit the catch-up query method */
     if (!client.listRecentMessages)
         return result;
@@ -1311,6 +1329,15 @@ async function catchUpMissedBlueBubblesMessages(deps = {}, previousState) {
             result.skipped++;
             continue;
         }
+        if (!processTurns) {
+            if ((0, inbound_log_1.hasRecordedBlueBubblesInbound)(agentName, event.chat.sessionKey, event.messageGuid)) {
+                result.skipped++;
+                continue;
+            }
+            (0, inbound_log_1.recordBlueBubblesInbound)(agentName, event, "upstream-catchup");
+            result.queued = (result.queued ?? 0) + 1;
+            continue;
+        }
         try {
             const repaired = await client.repairEvent(event);
             if (repaired.kind !== "message") {

package/package.json

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