@ouro.bot/cli 0.1.0-alpha.540 → 0.1.0-alpha.541

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.541",
+      "changes": [
+        "BlueBubbles recovery now treats message GUID completion as authoritative across repaired session keys, so stale `chat_identifier:unknown` mutation/capture sidecars stop keeping iMessage health in a false pending-recovery state after the real chat turn has completed.",
+        "Adds regression coverage for recovered captured-inbound and mutation backlog records whose original degraded session key differs from the canonical processed chat key."
+      ]
+    },
     {
       "version": "0.1.0-alpha.540",
       "changes": [

package/dist/senses/bluebubbles/index.js

@@ -828,7 +828,8 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, opt
     }
     let ownsInFlightMessage = false;
     if (event.kind === "message") {
-        if ((0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, event.chat.sessionKey, event.messageGuid)) {
+        if ((0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, event.chat.sessionKey, event.messageGuid)
+            || (0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, event.messageGuid)) {
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
                 event: "senses.bluebubbles_recovery_skip",
@@ -1211,6 +1212,7 @@ async function handleBlueBubblesEvent(payload, deps = {}) {
     // normalizeBlueBubblesEvent rejects guidless payloads, so duplicate handling
     // only needs to discriminate between known processed, in-flight, or new.
     const duplicateReason = (0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, normalized.chat.sessionKey, normalized.messageGuid)
+        || (0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, normalized.messageGuid)
         ? "processed"
         : isBlueBubblesMessageInFlight(normalized.chat.sessionKey, normalized.messageGuid)
             ? "in_flight"
@@ -1237,7 +1239,7 @@ async function handleBlueBubblesEvent(payload, deps = {}) {
 }
 function countPendingRecoveryCandidates(agentName) {
     return (0, mutation_log_1.listBlueBubblesRecoveryCandidates)(agentName)
-        .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid))
+        .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, entry.messageGuid))
         .length;
 }
 function countPendingCapturedInboundMessages(agentName) {
@@ -1252,7 +1254,7 @@ function listPendingCapturedInboundMessages(agentName) {
         seenMessageGuids.add(entry.messageGuid);
         return true;
     })
-        .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid));
+        .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, entry.messageGuid));
 }
 function parseTimestampMs(value) {
     if (!value)
@@ -1281,7 +1283,7 @@ function blueBubblesPendingRecoverySnapshot(agentName, nowMs = Date.now()) {
     const pendingRecordedAt = [
         ...listPendingCapturedInboundMessages(agentName).map((entry) => entry.recordedAt),
         ...(0, mutation_log_1.listBlueBubblesRecoveryCandidates)(agentName)
-            .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid))
+            .filter((entry) => !(0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, entry.messageGuid))
             .map((entry) => entry.recordedAt),
     ]
         .map((value) => ({ value, ms: Date.parse(value) }))
@@ -1468,7 +1470,7 @@ async function catchUpMissedBlueBubblesMessages(deps = {}, previousState, option
         result.inspected++;
         if (event.fromMe
             || event.timestamp < catchUpSince
-            || (0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, event.chat.sessionKey, event.messageGuid)
+            || (0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, event.messageGuid)
             || isBlueBubblesMessageInFlight(event.chat.sessionKey, event.messageGuid)) {
             result.skipped++;
             continue;
@@ -1578,6 +1580,7 @@ async function recoverCapturedBlueBubblesInboundMessages(deps = {}) {
         .sort((left, right) => (parseTimestampMs(left.recordedAt) ?? 0) - (parseTimestampMs(right.recordedAt) ?? 0));
     for (const entry of candidates) {
         if ((0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, entry.sessionKey, entry.messageGuid)
+            || (0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, entry.messageGuid)
             || isBlueBubblesMessageInFlight(entry.sessionKey, entry.messageGuid)) {
             result.skipped++;
             continue;
@@ -1627,6 +1630,7 @@ async function recoverMissedBlueBubblesMessages(deps = {}) {
     const result = { recovered: 0, skipped: 0, pending: 0, failed: 0 };
     for (const candidate of (0, mutation_log_1.listBlueBubblesRecoveryCandidates)(agentName)) {
         if ((0, processed_log_1.hasProcessedBlueBubblesMessage)(agentName, candidate.sessionKey, candidate.messageGuid)
+            || (0, processed_log_1.hasProcessedBlueBubblesMessageGuid)(agentName, candidate.messageGuid)
             || isBlueBubblesMessageInFlight(candidate.sessionKey, candidate.messageGuid)) {
             result.skipped++;
             continue;

package/dist/senses/bluebubbles/processed-log.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlueBubblesProcessedLogPath = getBlueBubblesProcessedLogPath;
 exports.hasProcessedBlueBubblesMessage = hasProcessedBlueBubblesMessage;
+exports.hasProcessedBlueBubblesMessageGuid = hasProcessedBlueBubblesMessageGuid;
 exports.recordProcessedBlueBubblesMessage = recordProcessedBlueBubblesMessage;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
@@ -58,12 +59,29 @@ function readEntries(filePath) {
         return [];
     }
 }
+function readAllEntries(agentName) {
+    const processedDir = path.join((0, identity_1.getAgentRoot)(agentName), "state", "senses", "bluebubbles", "processed");
+    try {
+        return fs.readdirSync(processedDir)
+            .filter((name) => name.endsWith(".ndjson"))
+            .sort()
+            .flatMap((name) => readEntries(path.join(processedDir, name)));
+    }
+    catch {
+        return [];
+    }
+}
 function hasProcessedBlueBubblesMessage(agentName, sessionKey, messageGuid) {
     if (!messageGuid.trim())
         return false;
     const filePath = getBlueBubblesProcessedLogPath(agentName, sessionKey);
     return readEntries(filePath).some((entry) => entry.messageGuid === messageGuid);
 }
+function hasProcessedBlueBubblesMessageGuid(agentName, messageGuid) {
+    if (!messageGuid.trim())
+        return false;
+    return readAllEntries(agentName).some((entry) => entry.messageGuid === messageGuid);
+}
 function recordProcessedBlueBubblesMessage(agentName, event, source, outcome) {
     const filePath = getBlueBubblesProcessedLogPath(agentName, event.chat.sessionKey);
     try {

package/package.json

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