@ouro.bot/cli 0.1.0-alpha.322 → 0.1.0-alpha.323

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_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.323",
+      "changes": [
+        "fix(bluebubbles): drain missed upstream BlueBubbles messages after an outage by querying recent messages when the upstream health probe recovers, deduping against the inbound sidecar, repairing candidates, and replaying them through the normal BlueBubbles turn path oldest-first.",
+        "fix(bluebubbles): make upstream catch-up bounded, paginated, and observable with nerves events for query start/end/skip/error, catch-up start/complete/error, runtime status updates, and explicit failure state if the bounded page limit is reached before the outage window is drained."
+      ]
+    },
     {
       "version": "0.1.0-alpha.322",
       "changes": [

package/dist/senses/bluebubbles/client.js

@@ -58,6 +58,9 @@ async function parseJsonBody(response) {
         return null;
     }
 }
+function describeCaughtValue(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 function buildRepairUrl(baseUrl, messageGuid, password) {
     const url = buildBlueBubblesApiUrl(baseUrl, `/api/v1/message/${encodeURIComponent(messageGuid)}`, password);
     const parsed = new URL(url);
@@ -102,6 +105,17 @@ function extractChatQueryRows(payload) {
     }
     return data.map((entry) => asRecord(entry)).filter((entry) => entry !== null);
 }
+function extractMessageQueryRows(payload) {
+    const record = asRecord(payload);
+    const data = asRecord(record?.data);
+    const rows = Array.isArray(record?.data) ? record.data
+        : Array.isArray(data?.messages) ? data.messages
+            : Array.isArray(data?.results) ? data.results
+                : Array.isArray(record?.messages) ? record.messages
+                    : Array.isArray(payload) ? payload
+                        : [];
+    return rows.map((entry) => asRecord(entry)).filter((entry) => entry !== null);
+}
 async function resolveChatGuidForIdentifier(config, channelConfig, chatIdentifier) {
     const trimmedIdentifier = chatIdentifier.trim();
     if (!trimmedIdentifier)
@@ -368,6 +382,71 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                 meta: { serverUrl: config.serverUrl },
             });
         },
+        async listRecentMessages(params = {}) {
+            const limit = Math.max(1, Math.min(100, Math.floor(params.limit ?? 50)));
+            const offset = Math.max(0, Math.floor(params.offset ?? 0));
+            const url = buildBlueBubblesApiUrl(config.serverUrl, "/api/v1/message/query", config.password);
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.bluebubbles_query_recent_start",
+                message: "querying recent bluebubbles messages",
+                meta: { limit, offset },
+            });
+            const response = await fetch(url, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    limit,
+                    offset,
+                    sort: "DESC",
+                    with: ["chats", "attachments", "payloadData", "messageSummaryInfo"],
+                }),
+                signal: AbortSignal.timeout(channelConfig.requestTimeoutMs),
+            });
+            if (!response.ok) {
+                const errorText = await response.text().catch(() => "");
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "senses",
+                    event: "senses.bluebubbles_query_recent_error",
+                    message: "bluebubbles recent message query failed",
+                    meta: {
+                        status: response.status,
+                        reason: errorText || "unknown",
+                    },
+                });
+                throw new Error(`BlueBubbles recent message query failed (${response.status}): ${errorText || "unknown"}`);
+            }
+            const payload = await parseJsonBody(response);
+            const rows = extractMessageQueryRows(payload);
+            const messages = [];
+            for (const row of rows) {
+                try {
+                    messages.push((0, model_1.normalizeBlueBubblesEvent)({ type: "new-message", data: row }));
+                }
+                catch (error) {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "senses",
+                        event: "senses.bluebubbles_query_recent_skip",
+                        message: "skipped unusable bluebubbles recent message row",
+                        meta: {
+                            reason: describeCaughtValue(error),
+                        },
+                    });
+                }
+            }
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.bluebubbles_query_recent_end",
+                message: "queried recent bluebubbles messages",
+                meta: {
+                    rows: rows.length,
+                    normalized: messages.length,
+                },
+            });
+            return messages;
+        },
         async repairEvent(event) {
             if (!event.requiresRepair) {
                 (0, runtime_1.emitNervesEvent)({

package/dist/senses/bluebubbles/index.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichReactionText = enrichReactionText;
 exports.createStatusBatcher = createStatusBatcher;
 exports.handleBlueBubblesEvent = handleBlueBubblesEvent;
+exports.catchUpMissedBlueBubblesMessages = catchUpMissedBlueBubblesMessages;
 exports.recoverMissedBlueBubblesMessages = recoverMissedBlueBubblesMessages;
 exports.createBlueBubblesWebhookHandler = createBlueBubblesWebhookHandler;
 exports.sendProactiveBlueBubblesMessageToSession = sendProactiveBlueBubblesMessageToSession;
@@ -135,6 +136,11 @@ const defaultDeps = {
     createServer: http.createServer,
 };
 const BLUEBUBBLES_RUNTIME_SYNC_INTERVAL_MS = 30_000;
+const BLUEBUBBLES_CATCHUP_PAGE_SIZE = 50;
+const BLUEBUBBLES_CATCHUP_MAX_PAGES = 20;
+const BLUEBUBBLES_HEALTHY_CATCHUP_OVERLAP_MS = 90_000;
+const BLUEBUBBLES_RECOVERY_CATCHUP_LOOKBACK_MS = 24 * 60 * 60 * 1000;
+const BLUEBUBBLES_FIRST_CATCHUP_LOOKBACK_MS = 10 * 60 * 1000;
 function resolveFriendParams(event) {
     if (event.chat.isGroup) {
         const groupKey = event.chat.chatGuid ?? event.chat.chatIdentifier ?? event.sender.externalId;
@@ -921,24 +927,50 @@ function countPendingRecoveryCandidates(agentName) {
         .filter((entry) => !(0, inbound_log_1.hasRecordedBlueBubblesInbound)(agentName, entry.sessionKey, entry.messageGuid))
         .length;
 }
+function parseTimestampMs(value) {
+    if (!value)
+        return null;
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function resolveBlueBubblesCatchUpSince(previousState, nowMs = Date.now()) {
+    if (previousState.upstreamStatus === "error") {
+        return nowMs - BLUEBUBBLES_RECOVERY_CATCHUP_LOOKBACK_MS;
+    }
+    const lastCheckedAt = parseTimestampMs(previousState.lastCheckedAt);
+    if (lastCheckedAt !== null) {
+        return Math.max(0, lastCheckedAt - BLUEBUBBLES_HEALTHY_CATCHUP_OVERLAP_MS);
+    }
+    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();
     const client = resolvedDeps.createClient();
     const checkedAt = new Date().toISOString();
+    const previousState = (0, runtime_state_1.readBlueBubblesRuntimeState)(agentName);
     try {
         await client.checkHealth();
         const recovery = await recoverMissedBlueBubblesMessages(resolvedDeps);
+        const catchUp = await catchUpMissedBlueBubblesMessages(resolvedDeps, previousState);
+        const failed = recovery.failed + catchUp.failed;
+        const recovered = recovery.recovered + catchUp.recovered;
         (0, runtime_state_1.writeBlueBubblesRuntimeState)(agentName, {
-            upstreamStatus: recovery.pending > 0 || recovery.failed > 0 ? "error" : "ok",
-            detail: recovery.failed > 0
-                ? `recovery failures: ${recovery.failed}`
+            upstreamStatus: recovery.pending > 0 || failed > 0 ? "error" : "ok",
+            detail: failed > 0
+                ? `recovery failures: ${failed}`
                 : recovery.pending > 0
                     ? `pending recovery: ${recovery.pending}`
-                    : "upstream reachable",
+                    : catchUp.recovered > 0
+                        ? formatRecoveredCount(catchUp.recovered)
+                        : "upstream reachable",
             lastCheckedAt: checkedAt,
             pendingRecoveryCount: recovery.pending,
-            lastRecoveredAt: recovery.recovered > 0 ? checkedAt : undefined,
+            lastRecoveredAt: recovered > 0 ? checkedAt : previousState.lastRecoveredAt,
+            lastRecoveredMessageGuid: catchUp.lastRecoveredMessageGuid ?? previousState.lastRecoveredMessageGuid,
         });
     }
     catch (error) {
@@ -950,6 +982,128 @@ async function syncBlueBubblesRuntime(deps = {}) {
         });
     }
 }
+async function catchUpMissedBlueBubblesMessages(deps = {}, previousState) {
+    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);
+    /* v8 ignore next -- older injected test doubles may omit the catch-up query method */
+    if (!client.listRecentMessages)
+        return result;
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.bluebubbles_catchup_start",
+        message: "bluebubbles upstream catch-up pass started",
+        meta: {
+            since: new Date(catchUpSince).toISOString(),
+            pageSize: BLUEBUBBLES_CATCHUP_PAGE_SIZE,
+            maxPages: BLUEBUBBLES_CATCHUP_MAX_PAGES,
+        },
+    });
+    const recentEvents = [];
+    for (let page = 0; page < BLUEBUBBLES_CATCHUP_MAX_PAGES; page++) {
+        let pageEvents;
+        try {
+            pageEvents = await client.listRecentMessages({
+                limit: BLUEBUBBLES_CATCHUP_PAGE_SIZE,
+                offset: page * BLUEBUBBLES_CATCHUP_PAGE_SIZE,
+            });
+        }
+        catch (error) {
+            result.failed++;
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "senses",
+                event: "senses.bluebubbles_catchup_error",
+                message: "bluebubbles upstream catch-up query failed",
+                meta: {
+                    offset: page * BLUEBUBBLES_CATCHUP_PAGE_SIZE,
+                    reason: error instanceof Error ? error.message : String(error),
+                },
+            });
+            break;
+        }
+        recentEvents.push(...pageEvents);
+        if (pageEvents.length < BLUEBUBBLES_CATCHUP_PAGE_SIZE)
+            break;
+        const oldestMessageTimestamp = pageEvents
+            .filter((event) => event.kind === "message")
+            .reduce((oldest, event) => Math.min(oldest, event.timestamp), Number.POSITIVE_INFINITY);
+        if (oldestMessageTimestamp <= catchUpSince)
+            break;
+        if (page === BLUEBUBBLES_CATCHUP_MAX_PAGES - 1) {
+            result.failed++;
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "senses",
+                event: "senses.bluebubbles_catchup_error",
+                message: "bluebubbles upstream catch-up reached the bounded page limit",
+                meta: {
+                    inspectedPages: BLUEBUBBLES_CATCHUP_MAX_PAGES,
+                    reason: "catch-up page limit reached before the outage window cutoff",
+                },
+            });
+        }
+    }
+    const seenMessageGuids = new Set();
+    const candidates = recentEvents
+        .filter((event) => event.kind === "message")
+        .filter((event) => {
+        if (seenMessageGuids.has(event.messageGuid))
+            return false;
+        seenMessageGuids.add(event.messageGuid);
+        return true;
+    })
+        .sort((left, right) => left.timestamp - right.timestamp);
+    for (const event of candidates) {
+        result.inspected++;
+        if (event.fromMe
+            || event.timestamp < catchUpSince
+            || (0, inbound_log_1.hasRecordedBlueBubblesInbound)(agentName, event.chat.sessionKey, event.messageGuid)) {
+            result.skipped++;
+            continue;
+        }
+        try {
+            const repaired = await client.repairEvent(event);
+            if (repaired.kind !== "message") {
+                result.skipped++;
+                continue;
+            }
+            const handled = await handleBlueBubblesNormalizedEvent(repaired, resolvedDeps, "upstream-catchup");
+            if (handled.reason === "already_processed") {
+                result.skipped++;
+            }
+            else {
+                result.recovered++;
+                result.lastRecoveredMessageGuid = repaired.messageGuid;
+            }
+        }
+        catch (error) {
+            result.failed++;
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "senses",
+                event: "senses.bluebubbles_catchup_error",
+                message: "bluebubbles upstream catch-up message failed",
+                meta: {
+                    messageGuid: event.messageGuid,
+                    reason: error instanceof Error ? error.message : String(error),
+                },
+            });
+        }
+    }
+    if (result.inspected > 0 || result.recovered > 0 || result.skipped > 0 || result.failed > 0) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.bluebubbles_catchup_complete",
+            message: "bluebubbles upstream catch-up pass completed",
+            meta: { ...result },
+        });
+    }
+    return result;
+}
 async function recoverMissedBlueBubblesMessages(deps = {}) {
     const resolvedDeps = { ...defaultDeps, ...deps };
     const agentName = resolvedDeps.getAgentName();

package/package.json

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