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

package/changelog.json

@@ -1,6 +1,20 @@
 {
   "_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.953",
+      "changes": [
+        "Shepherd works both ways on any channel: every notice ends with \"Reply here and I'll pass your answer on.\", and when you answer one in iMessage, Teams or any other conversation, your agent recognizes the notice as its own, reads that coding session in Herdr or cmux, passes your answer on, and tells you what it sent.",
+        "iMessage no longer drops a slow reply: a turn now has ten minutes instead of two before it is treated as hung, and a newer message from you still replaces an older turn. A turn that truly hangs can now mean up to ten minutes of silence, so send another message to move on. The health check calls a turn stalled only after five minutes."
+      ]
+    },
+    {
+      "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.953",
   "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.953</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/mind/outbound-record.js

@@ -56,7 +56,7 @@ function deferredFileName(deliveryId) {
     return `${(0, crypto_1.createHash)("sha256").update(deliveryId).digest("hex").slice(0, 32)}.json`;
 }
 function recordedText(record) {
-    return `[sent by ${record.originLabel}] ${record.content}`;
+    return `[you sent this via ${record.originLabel}] ${record.content}`;
 }
 function recordError(message, meta) {
     (0, runtime_1.emitNervesEvent)({ level: "warn", component: "mind", event: "mind.outbound_record_error", message, meta });
@@ -68,7 +68,10 @@ function parseDeferred(raw) {
         return null;
     return value;
 }
-/** How a recorded message names who sent it: `[sent by <label>]`. */
+/**
+ * How a recorded message names the way it was sent: `[you sent this via <label>]`. Every record is the agent's own
+ * message, so a reply to it on any channel is a reply to the agent, which owns and can act on it.
+ */
 exports.OUTBOUND_ORIGIN_LABELS = {
     shepherd: "Shepherd",
     send_message: "send_message",

package/dist/repertoire/tools-shepherd.js

@@ -229,7 +229,7 @@ exports.shepherdSendToolDefinition = {
         type: "function",
         function: {
             name: "shepherd_send",
-            description: `Type into one coding agent's terminal on this machine for the human you are talking with, because they asked you to. Use it only to submit that human's own instruction or keypress ("tell it to run the tests", "approve that", "stop it"): never on your own initiative, and never for anyone else. Give exactly one of text or key. text is one line (at most ${exports.SEND_TEXT_MAX_CHARS} characters, no control characters), typed as "[<your configured name> for <their name>] <text>" and submitted with Enter. key is pressed alone: one of ${exports.SEND_KEYS.join(", ")} (a menu or permission prompt, escape to interrupt, ctrl-c to cancel). enter, tab, a digit, y and n can approve or choose on a prompt, so they need screen from a shepherd_read made just before, and nothing is sent if the terminal changed since; tell the human what a prompt asks before approving it unless they have seen it. Pass screen with text too when the text answers what is on screen. To interrupt and then instruct, send escape, read again, then send the text. It also types into the terminal the human has focused on this machine. submission.state accepted means only that the terminal host accepted input; it may still be queued behind credential approval or a busy agent. It does not prove receiver receipt, resumed execution, restored capability or useful progress. Report those as unverified, never "unblocked" or "all unblocked" from this result or an unchanged screen. Each stronger claim needs fresh evidence from the exact target instance after this attempt, tied to this instruction; receipt alone is not progress or restored credentials. unknown may already have arrived: preserve the attempt and do not blindly resend.`,
+            description: `Type into one coding agent's terminal on this machine for the human you are talking with, because they asked you to. Use it only to submit that human's own instruction or keypress ("tell it to run the tests", "approve that", "stop it"): never on your own initiative, and never for anyone else. When they answer a Shepherd notice you sent them, on any channel, with something meant for that coding session, that is such a request: shepherd_read the session the notice names, check it still shows the agent and folder the notice named, send their answer, then tell them what you sent. A thank-you or a question for you is not; if it is unclear which session or what to send, ask. Give exactly one of text or key. text is one line (at most ${exports.SEND_TEXT_MAX_CHARS} characters, no control characters), typed as "[<your configured name> for <their name>] <text>" and submitted with Enter. key is pressed alone: one of ${exports.SEND_KEYS.join(", ")} (a menu or permission prompt, escape to interrupt, ctrl-c to cancel). enter, tab, a digit, y and n can approve or choose on a prompt, so they need screen from a shepherd_read made just before, and nothing is sent if the terminal changed since; tell the human what a prompt asks before approving it unless they have seen it. Pass screen with text too when the text answers what is on screen. To interrupt and then instruct, send escape, read again, then send the text. It also types into the terminal the human has focused on this machine. submission.state accepted means only that the terminal host accepted input; it may still be queued behind credential approval or a busy agent. It does not prove receiver receipt, resumed execution, restored capability or useful progress. Report those as unverified, never "unblocked" or "all unblocked" from this result or an unchanged screen. Each stronger claim needs fresh evidence from the exact target instance after this attempt, tied to this instruction; receipt alone is not progress or restored credentials. unknown may already have arrived: preserve the attempt and do not blindly resend.`,
             parameters: {
                 type: "object",
                 properties: {

package/dist/senses/bluebubbles/index.js

@@ -325,9 +325,10 @@ const defaultDeps = {
 const BLUEBUBBLES_RUNTIME_SYNC_INTERVAL_MS = 30_000;
 const BLUEBUBBLES_RECOVERY_PASS_DELAY_MS = 1_000;
 const BLUEBUBBLES_RECOVERY_PASS_INTERVAL_MS = 30_000;
-const BLUEBUBBLES_LIVE_TURN_TIMEOUT_MS = 2 * 60_000;
-const BLUEBUBBLES_RECOVERY_TURN_TIMEOUT_MS = 10 * 60_000;
-const BLUEBUBBLES_LIVE_TURN_STALLED_MS = 90_000;
+// A turn that is still thinking after this long is treated as hung. It is generous on purpose: a slow reply that
+// arrives is worth far more than a dropped one, and a newer message from the person still supersedes an older turn.
+const BLUEBUBBLES_TURN_TIMEOUT_MS = 10 * 60_000;
+const BLUEBUBBLES_LIVE_TURN_STALLED_MS = 5 * 60_000;
 const BLUEBUBBLES_CALLBACK_CLEANUP_TIMEOUT_MS = 2_000;
 const BLUEBUBBLES_ACTIVITY_OPERATION_TIMEOUT_MS = 20_000;
 const BLUEBUBBLES_CATCHUP_PAGE_SIZE = 50;
@@ -616,11 +617,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 +655,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 +1483,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) {
@@ -1735,7 +1729,7 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, opt
                     const [groupHasFamilyMember, hasExistingGroupWithFamily] = trustContext;
                     lifecycleSignal?.throwIfAborted();
                     // ── Call shared pipeline ────────────────────────────────────────
-                    const timeoutMs = options.timeoutMs ?? BLUEBUBBLES_LIVE_TURN_TIMEOUT_MS;
+                    const timeoutMs = options.timeoutMs ?? BLUEBUBBLES_TURN_TIMEOUT_MS;
                     timeoutPromise = new Promise((resolve) => {
                         resolveTimeout = resolve;
                     });
@@ -2634,6 +2628,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) {
@@ -3022,7 +3020,7 @@ async function catchUpMissedBlueBubblesMessages(deps = {}, previousState, option
                 }
                 semanticGenerationOwned = true;
                 const handled = await handleCapturedBlueBubblesSemanticEvent(captured, resolvedDeps, "upstream-catchup", {
-                    timeoutMs: BLUEBUBBLES_RECOVERY_TURN_TIMEOUT_MS,
+                    timeoutMs: BLUEBUBBLES_TURN_TIMEOUT_MS,
                     autonomyBudgetTrigger: "recovery",
                     observationReservation,
                     lifecycleSignal: options.lifecycleSignal,
@@ -3138,7 +3136,7 @@ async function recoverCapturedBlueBubblesInboundMessages(deps = {}, options = {}
                     normalized,
                     writeResult: "semantic_capture_duplicate",
                 }, resolvedDeps, "webhook", {
-                    timeoutMs: BLUEBUBBLES_RECOVERY_TURN_TIMEOUT_MS,
+                    timeoutMs: BLUEBUBBLES_TURN_TIMEOUT_MS,
                     autonomyBudgetTrigger: "recovery",
                     semanticRecovery: true,
                     observationReservation,

package/dist/senses/shepherd/owner-notice.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NOTICE_RETRY_MS = exports.NOTICE_LIST_MAX = exports.NOTICE_COALESCE_MS = void 0;
+exports.NOTICE_REPLY_LINE = exports.NOTICE_RETRY_MS = exports.NOTICE_LIST_MAX = exports.NOTICE_COALESCE_MS = void 0;
 exports.noticeWanted = noticeWanted;
 exports.plain = plain;
 exports.noticeLine = noticeLine;
@@ -132,11 +132,13 @@ function noticeLine(record, location) {
         case "working":
             return `${subject} is still working in the background and has news. ${why}`;
         case "unclear":
-            return `Shepherd could not determine the current state of ${subject}. ${why}`;
+            return `I could not determine the current state of ${subject}. ${why}`;
         default:
-            return `Shepherd could not complete its observation of ${subject}; the agent's state was not determined. ${why}`;
+            return `I could not complete my observation of ${subject}; the agent's state was not determined. ${why}`;
     }
 }
+/** Closes every notice: the person answers in the same conversation, and the agent relays it with `shepherd_send`. */
+exports.NOTICE_REPLY_LINE = "Reply here and I'll pass your answer on.";
 /** A bounded display of latest observations; all input records retain delivery custody. */
 function noticeMessage(records, refs = new Map(), context = {}) {
     const latest = new Map();
@@ -160,7 +162,7 @@ function noticeMessage(records, refs = new Map(), context = {}) {
     const more = sessions.length - lines.length;
     const body = sessions.length === 1 ? lines[0]
         : [`Updates from ${sessions.length} coding sessions:`, ...lines.map(line => `- ${line}`), ...(more > 0 ? [`- and ${more} more.`] : [])].join("\n");
-    return context.recovered ? `Includes recovered historical observations, not live status:\n${body}` : body;
+    return `${context.recovered ? `Includes recovered historical observations, not live status:\n${body}` : body}\n\n${exports.NOTICE_REPLY_LINE}`;
 }
 /**
  * The channels this agent can reach people on from this machine: its enabled Teams sense, and its enabled BlueBubbles

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.951",
+  "version": "0.1.0-alpha.953",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ouro.bot/cli",
-      "version": "0.1.0-alpha.951",
+      "version": "0.1.0-alpha.953",
       "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.953",
   "engines": {
     "node": ">=22"
   },