@ouro.bot/cli 0.1.0-alpha.724 → 0.1.0-alpha.725

package/dist/senses/bluebubbles/model.js

@@ -92,9 +92,11 @@ function buildChatRef(data, threadOriginatorGuid) {
 }
 function extractSender(data, chat) {
     const handle = asRecord(data.handle) ?? asRecord(data.sender) ?? null;
-    const rawId = readString(handle, "address") ??
+    const observedRawId = readString(handle, "address") ??
         readString(handle, "id") ??
-        readString(data, "senderId") ??
+        readString(data, "senderId");
+    const observed = typeof observedRawId === "string" && observedRawId.trim().length > 0;
+    const rawId = observedRawId ??
         chat.chatIdentifier ??
         chat.chatGuid ??
         "unknown";
@@ -105,6 +107,7 @@ function extractSender(data, chat) {
         externalId,
         rawId,
         displayName,
+        observed,
     };
 }
 function extractAttachments(data) {
@@ -163,7 +166,7 @@ function normalizeReactionName(value) {
     return trimmed ? trimmed.toLowerCase() : undefined;
 }
 /**
- * iMessage tapbacks: associated_message_type 2000-2005 add a tapback, 3000-3005
+ * iMessage tapbacks: associated_message_type 2000-2006 add a tapback, 3000-3006
  * remove the same tapback. BlueBubbles may send either the code or the name.
  */
 const REACTION_VOCABULARY = [
@@ -173,17 +176,26 @@ const REACTION_VOCABULARY = [
     { code: 2003, name: "laugh", verb: "laughed at", noun: "laugh" },
     { code: 2004, name: "emphasize", verb: "emphasized", noun: "emphasis" },
     { code: 2005, name: "question", verb: "questioned", noun: "question" },
+    { code: 2006, name: "custom", verb: "reacted with custom emoji to", noun: "custom emoji" },
 ];
 const REACTION_EXCERPT_MAX_LENGTH = 80;
-function describeBlueBubblesReaction(raw) {
+function describeBlueBubblesReaction(raw, rawTransportValue = raw) {
     const stripped = raw.startsWith("-") ? raw.slice(1) : raw;
     const code = /^\d+$/.test(stripped) ? Number(stripped) : undefined;
     const removal = raw.startsWith("-") || (code !== undefined && code >= 3000 && code < 4000);
     const action = removal ? "remove" : "add";
     const entry = REACTION_VOCABULARY.find((candidate) => candidate.name === stripped || candidate.code === code || candidate.code + 1000 === code);
+    const canonicalValue = entry?.name ?? "unknown";
     if (!entry)
-        return { raw, action };
-    return { raw, action, verb: entry.verb, noun: entry.noun };
+        return { raw, rawTransportValue, canonicalValue, action };
+    return {
+        raw,
+        rawTransportValue,
+        canonicalValue,
+        action,
+        verb: entry.verb,
+        noun: entry.noun,
+    };
 }
 function reactionExcerpt(text) {
     return text.length > REACTION_EXCERPT_MAX_LENGTH
@@ -243,17 +255,35 @@ function detectMutationType(eventType, data, reactionName) {
     if (reactionName)
         return "reaction";
     if (eventType === "updated-message") {
-        if (readNumber(data, "dateRetracted"))
+        if (readNumber(data, "dateRetracted") !== undefined)
             return "unsend";
-        if (readNumber(data, "dateEdited"))
+        if (readNumber(data, "dateEdited") !== undefined)
             return "edit";
-        if (readNumber(data, "dateRead"))
+        if (readNumber(data, "dateRead") !== undefined)
             return "read";
-        if (readBoolean(data, "isDelivered") || readNumber(data, "dateDelivered"))
+        if (readBoolean(data, "isDelivered") || readNumber(data, "dateDelivered") !== undefined)
             return "delivery";
     }
     return null;
 }
+function readProviderRevision(data) {
+    const value = data.revision;
+    if (typeof value !== "string" && typeof value !== "number")
+        return undefined;
+    const normalized = String(value).trim();
+    return normalized || undefined;
+}
+function mutationEffectiveTimestamp(mutationType, data) {
+    if (mutationType === "reaction")
+        return readNumber(data, "dateCreated");
+    if (mutationType === "edit")
+        return readNumber(data, "dateEdited");
+    if (mutationType === "unsend")
+        return readNumber(data, "dateRetracted");
+    if (mutationType === "read")
+        return readNumber(data, "dateRead");
+    return readNumber(data, "dateDelivered");
+}
 function normalizeBlueBubblesEvent(payload) {
     const envelope = asRecord(payload);
     const eventType = readString(envelope, "type")?.trim() ?? "";
@@ -286,14 +316,24 @@ function normalizeBlueBubblesEvent(payload) {
     const chat = buildChatRef(data, threadOriginatorGuid);
     const sender = extractSender(data, chat);
     const timestamp = readNumber(data, "dateCreated") ?? Date.now();
-    const fromMe = readBoolean(data, "isFromMe") ?? false;
+    const fromMe = readBoolean(data, "isFromMe") ?? null;
     const attachments = extractAttachments(data);
     const reactionName = normalizeReactionName(data.associatedMessageType);
-    const reaction = reactionName ? describeBlueBubblesReaction(reactionName) : undefined;
+    const reaction = reactionName
+        ? describeBlueBubblesReaction(reactionName, String(data.associatedMessageType))
+        : undefined;
     const targetMessageGuid = reaction
         ? stripPartPrefix(readString(data, "associatedMessageGuid"))
         : undefined;
     const mutationType = detectMutationType(eventType, data, reactionName);
+    const revision = mutationType ? readProviderRevision(data) : undefined;
+    const effectiveTimestamp = mutationType
+        ? mutationEffectiveTimestamp(mutationType, data)
+        : undefined;
+    const editedText = mutationType === "edit" ? readString(data, "text") : undefined;
+    const retractionTimestamp = mutationType === "unsend"
+        ? readNumber(data, "dateRetracted")
+        : undefined;
     const requiresRepair = (readBoolean(data, "hasPayloadData") ?? false) ||
         attachments.length > 0 ||
         eventType === "updated-message";
@@ -314,6 +354,10 @@ function normalizeBlueBubblesEvent(payload) {
                 : buildMutationText(mutationType, data),
             requiresRepair,
             ...(reaction ? { reaction } : {}),
+            ...(editedText !== undefined ? { editedText } : {}),
+            ...(revision ? { revision } : {}),
+            ...(effectiveTimestamp !== undefined ? { effectiveTimestamp } : {}),
+            ...(retractionTimestamp !== undefined ? { retractionTimestamp } : {}),
         }
         : {
             kind: "message",
@@ -323,7 +367,7 @@ function normalizeBlueBubblesEvent(payload) {
             fromMe,
             sender,
             chat,
-            text: readString(data, "text")?.trim() ?? "",
+            text: readString(data, "text") ?? "",
             textForAgent: formatMessageText(data, attachments),
             attachments,
             balloonBundleId: readString(data, "balloonBundleId")?.trim() || undefined,

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

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlueBubblesMutationLogPath = getBlueBubblesMutationLogPath;
 exports.recordBlueBubblesMutation = recordBlueBubblesMutation;
+exports.listRecordedBlueBubblesMutations = listRecordedBlueBubblesMutations;
 exports.listBlueBubblesRecoveryCandidates = listBlueBubblesRecoveryCandidates;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
@@ -73,7 +74,7 @@ function recordBlueBubblesMutation(agentName, event) {
     });
     return filePath;
 }
-function listBlueBubblesRecoveryCandidates(agentName) {
+function readBlueBubblesMutationRows(agentName) {
     const rootDir = path.join((0, identity_1.getAgentRoot)(agentName), "state", "senses", "bluebubbles", "mutations");
     let files;
     try {
@@ -82,7 +83,7 @@ function listBlueBubblesRecoveryCandidates(agentName) {
     catch {
         return [];
     }
-    const deduped = new Map();
+    const entries = [];
     for (const file of files.filter((entry) => entry.endsWith(".ndjson")).sort()) {
         const filePath = path.join(rootDir, file);
         let raw = "";
@@ -98,19 +99,29 @@ function listBlueBubblesRecoveryCandidates(agentName) {
                 continue;
             try {
                 const entry = JSON.parse(trimmed);
-                if (typeof entry.messageGuid !== "string"
-                    || !entry.messageGuid.trim()
-                    || entry.fromMe
-                    || entry.shouldNotifyAgent
-                    || (entry.mutationType !== "read" && entry.mutationType !== "delivery")) {
+                if (typeof entry.messageGuid !== "string" || !entry.messageGuid.trim())
                     continue;
-                }
-                deduped.set(entry.messageGuid, entry);
+                entries.push(entry);
             }
             catch {
-                // ignore malformed recovery candidates
+                // Keep malformed legacy rows inert while retaining readable audit rows.
             }
         }
     }
+    return entries;
+}
+function listRecordedBlueBubblesMutations(agentName) {
+    return readBlueBubblesMutationRows(agentName).filter((entry) => (typeof entry.sessionKey === "string" && entry.sessionKey.trim().length > 0));
+}
+function listBlueBubblesRecoveryCandidates(agentName) {
+    const deduped = new Map();
+    for (const entry of readBlueBubblesMutationRows(agentName)) {
+        if (entry.fromMe !== false
+            || entry.shouldNotifyAgent
+            || (entry.mutationType !== "read" && entry.mutationType !== "delivery")) {
+            continue;
+        }
+        deduped.set(entry.messageGuid, entry);
+    }
     return [...deduped.values()].sort((left, right) => left.recordedAt.localeCompare(right.recordedAt));
 }

package/dist/senses/bluebubbles/reaction-policy.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.classifyBlueBubblesReaction = classifyBlueBubblesReaction;
+const runtime_1 = require("../../nerves/runtime");
+const POSITIVE_REACTIONS = new Set([
+    "love",
+    "like",
+    "laugh",
+    "emphasize",
+]);
+function classifyBlueBubblesReaction(input) {
+    let decision;
+    if (input.fromMe) {
+        decision = { route: "capture_only", outcome: "ignored_self" };
+    }
+    else if (input.action === "remove") {
+        decision = { route: "capture_only", outcome: "capture_only_removal" };
+    }
+    else if (POSITIVE_REACTIONS.has(input.canonicalValue)) {
+        decision = { route: "capture_only", outcome: "capture_only_positive" };
+    }
+    else if (input.canonicalValue === "custom") {
+        decision = { route: "capture_only", outcome: "capture_only_custom" };
+    }
+    else if (input.canonicalValue === "unknown") {
+        decision = { route: "capture_only", outcome: "capture_only_unknown" };
+    }
+    else if (input.targetAuthorship !== "agent") {
+        decision = { route: "capture_only", outcome: "capture_only_target_not_agent" };
+    }
+    else if (input.trustedActor === undefined) {
+        decision = { route: "trust_required" };
+    }
+    else if (!input.trustedActor) {
+        decision = { route: "capture_only", outcome: "capture_only_untrusted_actor" };
+    }
+    else {
+        decision = { route: "restricted_feedback" };
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.bluebubbles_reaction_policy_evaluated",
+        message: "evaluated bluebubbles reaction routing policy",
+        meta: {
+            action: input.action,
+            canonicalValue: input.canonicalValue,
+            fromMe: input.fromMe,
+            targetAuthorship: input.targetAuthorship,
+            trustEvaluated: input.trustedActor !== undefined,
+            route: decision.route,
+            outcome: decision.route === "capture_only" ? decision.outcome : null,
+        },
+    });
+    return decision;
+}