@ouro.bot/cli 0.1.0-alpha.951 → 0.1.0-alpha.952

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.952",
+      "changes": [
+        "An iMessage held back by the recovery budget or storm breaker is no longer lost: it stays pending, and a later recovery pass handles it once the block lifts. Budget and breaker windows now run on the real clock instead of the message's own timestamp, so the block can actually lift.",
+        "`ouro friend dedupe` now finds records that share the same person identity, such as a stale stranger record holding an iMessage handle that a family record also owns, and proposes merging them into the higher-trust record. Group-chat handles are not treated as a shared identity."
+      ]
+    },
     {
       "version": "0.1.0-alpha.951",
       "changes": [

package/deploy/unraid/sanctuary.ouro/bundle-meta.json

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.951",
+  "runtimeVersion": "0.1.0-alpha.952",
   "bundleSchemaVersion": 3,
   "lastUpdated": "2026-09-03T00:00:00.000Z"
 }

package/deploy/unraid/sanctuary.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>ouro-butler</Name>
-  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.951</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.952</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/mind/friend-merge.js

@@ -41,7 +41,7 @@ exports.dedupeFriends = dedupeFriends;
 // Merging friend records into one person, and retiring the merged-away records.
 //
 // Two product paths use this: redeeming an identity link code (a new channel identity
-// joins its owner's record) and deduplicating records that name the same local person.
+// joins its owner's record) and deduplicating records that name the same person.
 // The target record stays authoritative: a merge never raises trust, admission,
 // initiative or capability, so merging cannot be used to escalate anyone.
 //
@@ -246,7 +246,11 @@ async function mergeFriends(input) {
 function isLocalOnly(record) {
     return record.externalIds.length > 0 && record.externalIds.every((externalId) => externalId.provider === "local");
 }
+const TRUST_RANK = { stranger: 0, acquaintance: 1, friend: 2, family: 3 };
 function canonicalOrder(a, b) {
+    const trust = TRUST_RANK[b.trustLevel ?? "friend"] - TRUST_RANK[a.trustLevel ?? "friend"];
+    if (trust !== 0)
+        return trust;
     const notes = Object.keys(b.notes).length - Object.keys(a.notes).length;
     if (notes !== 0)
         return notes;
@@ -254,46 +258,48 @@ function canonicalOrder(a, b) {
         return a.createdAt < b.createdAt ? -1 : 1;
     return a.id < b.id ? -1 : 1;
 }
+/** A group-chat handle names every member of the chat, so it never identifies one person. */
+function isPersonIdentity(externalId) {
+    return externalId.provider !== "local"
+        && !(externalId.provider === "imessage-handle" && externalId.externalId.startsWith("group:"));
+}
 /**
- * Records are duplicates when they are human, carry only local identities, share the
- * same name and trust level, and are joined through at least one shared local identity.
- * The canonical record is the one with the most notes, then the oldest.
+ * Human records are duplicates when either
+ * - they carry only local identities, share the same name and trust level, and are joined
+ *   through at least one shared local identity, or
+ * - they share an identical person identity (provider, id and tenant). The friends store
+ *   refuses to resolve such an identity because it is bound to more than one record.
+ * The canonical record is the one with the highest trust, then the most notes, then the oldest.
  */
 function planFriendDedupe(records) {
-    const buckets = new Map();
-    for (const record of records) {
-        if ((record.kind ?? "human") !== "human" || !isLocalOnly(record))
-            continue;
-        const key = JSON.stringify([record.name.trim().toLowerCase(), record.trustLevel ?? "friend"]);
-        buckets.set(key, [...(buckets.get(key) ?? []), record]);
-    }
-    const groups = [];
-    for (const bucket of buckets.values()) {
-        // Union records that share any local identity.
-        const parent = bucket.map((_, index) => index);
-        const find = (index) => (parent[index] === index ? index : (parent[index] = find(parent[index])));
-        const owner = new Map();
-        bucket.forEach((record, index) => {
-            for (const externalId of record.externalIds) {
-                const key = externalIdKey(externalId);
-                const seen = owner.get(key);
-                if (seen === undefined)
-                    owner.set(key, index);
-                else
-                    parent[find(index)] = find(seen);
-            }
-        });
-        const components = new Map();
-        bucket.forEach((record, index) => {
-            const root = find(index);
-            components.set(root, [...(components.get(root) ?? []), record]);
-        });
-        for (const members of components.values()) {
-            if (members.length < 2)
+    const humans = records.filter((record) => (record.kind ?? "human") === "human");
+    const parent = humans.map((_, index) => index);
+    const find = (index) => (parent[index] === index ? index : (parent[index] = find(parent[index])));
+    const owner = new Map();
+    humans.forEach((record, index) => {
+        const localBucket = isLocalOnly(record) ? [record.name.trim().toLowerCase(), record.trustLevel ?? "friend"] : null;
+        for (const externalId of record.externalIds) {
+            if (!localBucket && !isPersonIdentity(externalId))
                 continue;
-            const [canonical, ...duplicates] = [...members].sort(canonicalOrder);
-            groups.push({ canonical: canonical, duplicates });
+            const key = JSON.stringify([...(localBucket ?? []), externalIdKey(externalId)]);
+            const seen = owner.get(key);
+            if (seen === undefined)
+                owner.set(key, index);
+            else
+                parent[find(index)] = find(seen);
         }
+    });
+    const components = new Map();
+    humans.forEach((record, index) => {
+        const root = find(index);
+        components.set(root, [...(components.get(root) ?? []), record]);
+    });
+    const groups = [];
+    for (const members of components.values()) {
+        if (members.length < 2)
+            continue;
+        const [canonical, ...duplicates] = [...members].sort(canonicalOrder);
+        groups.push({ canonical: canonical, duplicates });
     }
     return groups.sort((a, b) => canonicalOrder(a.canonical, b.canonical));
 }
@@ -311,7 +317,7 @@ async function dedupeFriends(input) {
             targetId: group.canonical.id,
             sourceIds: duplicateIds,
             actor: input.actor,
-            reason: "duplicate local records of the same person",
+            reason: "duplicate records of the same person",
             dryRun,
             ...(input.now ? { now: input.now } : {}),
         });

package/dist/senses/bluebubbles/index.js

@@ -616,11 +616,6 @@ function getBlueBubblesContinuityIngressTexts(event) {
 function sha256Hex(input) {
     return (0, node_crypto_1.createHash)("sha256").update(input).digest("hex");
 }
-function timestampIsoForAutonomy(event) {
-    return Number.isFinite(event.timestamp)
-        ? new Date(event.timestamp).toISOString()
-        : new Date().toISOString();
-}
 function blueBubblesAutonomyTarget(event) {
     return {
         messageGuid: event.messageGuid,
@@ -659,7 +654,6 @@ function recordBlueBubblesRecoveryFailureForBudget(agentName, event, source) {
     try {
         (0, autonomy_budget_1.recordAutonomyFailure)((0, identity_1.getAgentRoot)(agentName), {
             ...blueBubblesRecoveryStormInput(agentName, event, source),
-            occurredAt: timestampIsoForAutonomy(event),
         });
     }
     catch {
@@ -1488,7 +1482,6 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, opt
             senseOrHabit: "bluebubbles",
             target: blueBubblesAutonomyTarget(event),
             idempotencyKey: `bluebubbles-recovery:${source}:${event.messageGuid}`,
-            now: timestampIsoForAutonomy(event),
             storm: blueBubblesRecoveryStormInput(agentName, event, source),
         });
         if (!decision.allowed) {
@@ -2634,6 +2627,10 @@ async function handleCapturedBlueBubblesSemanticEvent(captured, resolvedDeps, so
                 publishAcceptedReceipt,
             };
             result = await handleBlueBubblesNormalizedEvent(canonicalEvent, resolvedDeps, source, capturedOptions);
+            // A budget or storm-breaker block defers the message; it was never seen.
+            // Leave it pending so a later recovery pass retries it once the block lifts.
+            if (result.reason === "autonomy_budget_blocked")
+                return result;
             handledOutcome = result.notifiedAgent ? "message_completed" : "message_observed";
         }
         if (result.notifiedAgent) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.951",
+  "version": "0.1.0-alpha.952",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ouro.bot/cli",
-      "version": "0.1.0-alpha.951",
+      "version": "0.1.0-alpha.952",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.78.0",
         "@azure/identity": "^4.13.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.951",
+  "version": "0.1.0-alpha.952",
   "engines": {
     "node": ">=22"
   },