@ouro.bot/cli 0.1.0-alpha.967 → 0.1.0-alpha.969

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_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.969",
+      "changes": [
+        "When someone replies to an earlier message in Telegram, iMessage or Teams, the agent now sees what they replied to and whose words it was, even when that message isn't in its own history."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.968",
+      "changes": [
+        "The context-loss Sentinel takes over its write lock when the process that left it is gone. A lock left by a crash or a reboot used to block every Sentinel refresh until someone deleted it, which turned daemon health critical, so `ouro up` failed and self-update rolled new releases back."
+      ]
+    },
     {
       "version": "0.1.0-alpha.967",
       "changes": [

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

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.967",
+  "runtimeVersion": "0.1.0-alpha.969",
   "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.967</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.969</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/heart/context-loss-sentinel.js

@@ -92,6 +92,49 @@ function atomicWriteJson(filePath, value) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function processGone(pid) {
+    try {
+        process.kill(pid, 0);
+        return false;
+    }
+    catch (error) {
+        return error.code === "ESRCH";
+    }
+}
+/**
+ * A lock whose writer died (a crash, a reboot) would otherwise block every refresh forever. It is taken over only when it
+ * names a process that no longer exists; any other content waits as before. The lock is renamed aside first, so of two
+ * waiters only one takes it, and a lock that changed owner in the meantime is put back.
+ */
+function breakDeadOwnerLock(lockPath) {
+    let owner;
+    try {
+        owner = fs.readFileSync(lockPath, "utf-8").trim();
+    }
+    catch {
+        return false;
+    }
+    if (!/^\d+$/.test(owner) || !processGone(Number(owner)))
+        return false;
+    const aside = `${lockPath}.${process.pid}.${Date.now()}.stale`;
+    try {
+        fs.renameSync(lockPath, aside);
+    }
+    catch {
+        return false;
+    }
+    if (fs.readFileSync(aside, "utf-8").trim() !== owner) {
+        try {
+            fs.linkSync(aside, lockPath);
+        }
+        catch { /* a newer lock exists; it owns the path */ }
+        fs.rmSync(aside, { force: true });
+        return false;
+    }
+    fs.rmSync(aside, { force: true });
+    (0, runtime_1.emitNervesEvent)({ level: "warn", component: "heart", event: "heart.context_loss_sentinel_stale_lock", message: "took over a context-loss Sentinel lock whose owner process is gone", meta: { owner: Number(owner) } });
+    return true;
+}
 async function withFileLock(lockPath, timeoutMs, fn) {
     fs.mkdirSync(path.dirname(lockPath), { recursive: true });
     const startedAt = Date.now();
@@ -112,6 +155,8 @@ async function withFileLock(lockPath, timeoutMs, fn) {
             if (code !== "EEXIST") {
                 throw error;
             }
+            if (breakDeadOwnerLock(lockPath))
+                continue;
             if (Date.now() - startedAt > timeoutMs) {
                 throw new Error(`context-loss Sentinel lock timed out: ${lockPath}`);
             }

package/dist/heart/orientation-frame.js

@@ -191,14 +191,26 @@ function deriveActionPolicy(signals, combinedSpeech, priorAssistantReferents, la
 }
 // A reply names the message it answers. The sense stamps that message's text on the
 // user message, so "yes" binds to what was replied to, not to the latest thing said.
-function stampReplyingToText(message, text) {
-    ;
-    message._replyingToText = text;
+// The author says whose words they were; a person can quote their own earlier message.
+function stampReplyingToText(message, text, author) {
+    const record = message;
+    record._replyingToText = text;
+    if (author)
+        record._replyingToAuthor = author;
 }
-function replyingToTextOf(message) {
-    const text = message._replyingToText;
-    return typeof text === "string" && text.trim() ? text.trim() : undefined;
+function replyingToOf(message) {
+    const record = message;
+    const text = record._replyingToText;
+    if (typeof text !== "string" || !text.trim())
+        return undefined;
+    const author = record._replyingToAuthor;
+    return author === "agent" || author === "person" || author === "other" ? { text: text.trim(), author } : { text: text.trim() };
 }
+const REPLYING_TO_LABEL = {
+    agent: " (your message)",
+    person: " (their own earlier message)",
+    other: " (someone else's message)",
+};
 function buildOrientationFrame(input) {
     const derivedCurrent = input.currentUserMessages
         ? { messages: input.currentUserMessages, firstIndex: input.messages.length }
@@ -206,10 +218,14 @@ function buildOrientationFrame(input) {
     const currentUserSpeech = derivedCurrent.messages
         .map((message) => extractMessageText(message))
         .filter((text) => text.length > 0);
-    const replyingToText = derivedCurrent.messages.map(replyingToTextOf).find((text) => text !== undefined);
+    const replyingTo = derivedCurrent.messages.map(replyingToOf).find((reply) => reply !== undefined);
     const previousAssistant = latestAssistantBefore(input.messages, derivedCurrent.firstIndex);
-    const priorAssistantReferents = extractOrderedListReferents(replyingToText ?? extractMessageText(previousAssistant));
-    const source = replyingToText && !input.source?.replyingToText ? { kind: input.channel, ...input.source, replyingToText } : input.source;
+    // Only the agent's own message holds the list a "the second one" points into.
+    const replyListText = replyingTo && (replyingTo.author ?? "agent") === "agent" ? replyingTo.text : undefined;
+    const priorAssistantReferents = extractOrderedListReferents(replyListText ?? extractMessageText(previousAssistant));
+    const source = replyingTo && !input.source?.replyingToText
+        ? { kind: input.channel, ...input.source, replyingToText: replyingTo.text, ...(replyingTo.author ? { replyingToAuthor: replyingTo.author } : {}) }
+        : input.source;
     const candidateStructuredOutput = latestStructuredOutputFrom(input.structuredOutputs);
     const speechKind = input.speechKind ?? "utterance";
     const signals = deriveSignals(currentUserSpeech, priorAssistantReferents, candidateStructuredOutput, speechKind);
@@ -316,8 +332,10 @@ function renderOrientationFrame(frame) {
             lines.push(`- default reply target: ${frame.source.defaultReplyTarget}`);
         if (frame.source.threadId)
             lines.push(`- thread id: ${frame.source.threadId}`);
-        if (frame.source.replyingToText)
-            lines.push(`- replying to: ${frame.source.replyingToText}`);
+        if (frame.source.replyingToText) {
+            const label = frame.source.replyingToAuthor ? REPLYING_TO_LABEL[frame.source.replyingToAuthor] : "";
+            lines.push(`- replying to${label}: ${frame.source.replyingToText}`);
+        }
         if (frame.source.repairNotice)
             lines.push(`- repair notice: ${frame.source.repairNotice}`);
         if (frame.source.routingHint)

package/dist/senses/bluebubbles/client.js

@@ -774,6 +774,9 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
             }
         },
         async getMessageText(messageGuid) {
+            return (await this.getRepliedMessage(messageGuid))?.text ?? null;
+        },
+        async getRepliedMessage(messageGuid) {
             await assertHostAccount();
             const url = buildRepairUrl(config.serverUrl, messageGuid, config.password);
             try {
@@ -809,7 +812,12 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                     message: "fetched message text by guid",
                     meta: { messageGuid },
                 });
-                return data.text.trim() || null;
+                const text = data.text.trim();
+                if (!text)
+                    return null;
+                const handle = asRecord(data.handle);
+                const senderAddress = handle ? readString(handle, "address")?.trim() : undefined;
+                return { text, fromMe: data.isFromMe === true, ...(senderAddress ? { senderAddress } : {}) };
             }
             catch (error) {
                 (0, runtime_1.emitNervesEvent)({

package/dist/senses/bluebubbles/index.js

@@ -531,7 +531,13 @@ function extractHistoricalLaneSummary(messages) {
     }
     return summaries;
 }
-function buildBlueBubblesOrientationSource(event, existingMessages, evidence, conversationKind, repliedToText) {
+// Whose words the replied-to message was: the agent's own account, the person replying, or someone else.
+function repliedMessageAuthor(replied, actorExternalId) {
+    if (replied.fromMe)
+        return "agent";
+    return replied.senderAddress && replied.senderAddress === actorExternalId ? "person" : "other";
+}
+function buildBlueBubblesOrientationSource(event, existingMessages, evidence, conversationKind, repliedToText, repliedToAuthor) {
     const repairNotice = event.repairNotice?.trim();
     const actor = evidence.actor;
     const participants = evidence.participants
@@ -569,7 +575,7 @@ function buildBlueBubblesOrientationSource(event, existingMessages, evidence, co
         lane: threadId ? "thread" : "top_level",
         defaultReplyTarget: threadId ? "current_lane" : "top_level",
         ...(threadId ? { threadId } : {}),
-        ...(repliedToText ? { replyingToText: repliedToText } : {}),
+        ...(repliedToText ? { replyingToText: repliedToText, ...(repliedToAuthor ? { replyingToAuthor: repliedToAuthor } : {}) } : {}),
         ...(repairNotice ? { repairNotice } : {}),
         ...(summaries.length > 0 ? { recentLanes: summaries } : {}),
         ...(hasThreadRoute
@@ -1602,8 +1608,16 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, opt
                 // Fetch the text of the message being replied to (if this is a threaded reply)
                 const threadGuid = event.threadOriginatorGuid?.trim();
                 let repliedToText = null;
+                let repliedToAuthor;
                 if (threadGuid) {
-                    repliedToText = await client.getMessageText(threadGuid).catch(() => null);
+                    if (client.getRepliedMessage) {
+                        const replied = await client.getRepliedMessage(threadGuid).catch(() => null);
+                        repliedToText = replied?.text ?? null;
+                        repliedToAuthor = replied ? repliedMessageAuthor(replied, options.orientationEvidence.actor.externalId) : undefined;
+                    }
+                    else {
+                        repliedToText = await client.getMessageText(threadGuid).catch(() => null);
+                    }
                     (0, runtime_1.emitNervesEvent)({
                         component: "senses",
                         event: "senses.bluebubbles_reply_context",
@@ -1619,7 +1633,7 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, opt
                     messages: [...priorMessages, userMessage],
                     currentUserMessages: [userMessage],
                     structuredOutputs: existing?.structuredOutputs ?? [],
-                    source: buildBlueBubblesOrientationSource(event, priorMessages, options.orientationEvidence, options.orientationConversationKind, repliedToText),
+                    source: buildBlueBubblesOrientationSource(event, priorMessages, options.orientationEvidence, options.orientationConversationKind, repliedToText, repliedToAuthor),
                 });
                 if (!(0, latest_turn_1.isCurrent)(options.latestTurnCapability)) {
                     return { handled: true, notifiedAgent: false, kind: event.kind, reason: "superseded" };

package/dist/senses/shared-turn.js

@@ -481,7 +481,11 @@ async function runSenseTurnExclusive(options, owner) {
                 }
             }
             const replyToEventId = precommittedIngressEvent?.relations.replyToEventId ?? options.ingressRelations?.replyToEventId;
-            const repliedToText = spokenText(existing?.events?.find((event) => event.id === replyToEventId));
+            const matchedReplyText = spokenText(existing?.events?.find((event) => event.id === replyToEventId));
+            const fallbackReplyText = options.replyingTo?.text.trim().slice(0, 1200) ?? "";
+            const repliedTo = matchedReplyText
+                ? { text: matchedReplyText, author: "agent" }
+                : fallbackReplyText ? { text: fallbackReplyText, author: options.replyingTo.author } : undefined;
             if (precommittedIngressEvent) {
                 const projectedIngress = exactProjectedIngressMessage(existing, sessionMessages, precommittedIngressEvent.id, baseSession.value);
                 if (!projectedIngress || projectedIngress.role !== "user" || projectedIngress.content !== userMessage)
@@ -491,8 +495,8 @@ async function runSenseTurnExclusive(options, owner) {
                     threadRootEventId: precommittedIngressEvent.relations.threadRootEventId,
                     references: precommittedIngressEvent.relations.references,
                 });
-                if (repliedToText)
-                    (0, orientation_frame_1.stampReplyingToText)(projectedIngress, repliedToText);
+                if (repliedTo)
+                    (0, orientation_frame_1.stampReplyingToText)(projectedIngress, repliedTo.text, repliedTo.author);
             }
             // Pending dir
             const pendingDir = (0, pending_1.getPendingDir)(agentName, friendId, channel, sessionKey);
@@ -602,8 +606,8 @@ async function runSenseTurnExclusive(options, owner) {
                 (0, session_events_1.stampIngressTime)(userMsg);
                 if (options.ingressRelations)
                     (0, session_events_1.stampIngressRelations)(userMsg, options.ingressRelations);
-                if (repliedToText)
-                    (0, orientation_frame_1.stampReplyingToText)(userMsg, repliedToText);
+                if (repliedTo)
+                    (0, orientation_frame_1.stampReplyingToText)(userMsg, repliedTo.text, repliedTo.author);
                 inboundMessages.push(userMsg);
             }
             const turnResult = await (0, pipeline_1.handleInboundTurn)({

package/dist/senses/teams.js

@@ -43,6 +43,7 @@ exports.buildWelcomeCard = buildWelcomeCard;
 exports.createTeamsCallbacks = createTeamsCallbacks;
 exports.reasoningStatus = reasoningStatus;
 exports.withConversationLock = withConversationLock;
+exports.parseTeamsQuotedReply = parseTeamsQuotedReply;
 exports.handleTeamsMessage = handleTeamsMessage;
 exports.createTeamsSdkLogger = createTeamsSdkLogger;
 exports.sendProactiveTeamsMessageToSession = sendProactiveTeamsMessageToSession;
@@ -76,6 +77,7 @@ const node_crypto_1 = require("node:crypto");
 const outbound_record_1 = require("../mind/outbound-record");
 const trust_gate_1 = require("./trust-gate");
 const pipeline_1 = require("./pipeline");
+const orientation_frame_1 = require("../heart/orientation-frame");
 const session_transaction_1 = require("../mind/session-transaction");
 const teamsFailoverStates = new Map();
 const pending_1 = require("../mind/pending");
@@ -737,6 +739,52 @@ function getFriendStore() {
     const friendsPath = path.join((0, identity_1.getAgentRoot)(), "friends");
     return new friends_1.FileFriendStore(friendsPath);
 }
+function decodeHtmlText(html) {
+    return html
+        .replace(/<br\s*\/?>/giu, "\n")
+        .replace(/<[^>]*>/gu, "")
+        .replace(/&nbsp;/gu, " ")
+        .replace(/&lt;/gu, "<")
+        .replace(/&gt;/gu, ">")
+        .replace(/&quot;/gu, '"')
+        .replace(/&#39;/gu, "'")
+        .replace(/&amp;/gu, "&")
+        .replace(/\s+/gu, " ")
+        .trim();
+}
+/**
+ * Teams carries a quoted reply as a text/html attachment holding a
+ * schema.skype.com/Reply blockquote: the quoted author's id (itemprop="mri")
+ * and a preview of their words (itemprop="preview"). Ids compare without the
+ * "28:"/"29:" channel prefixes, so the bot's own words read as the agent's.
+ */
+// The person's message, with the quote they replied to stamped on it for the orientation frame.
+function teamsUserMessage(content, quotedReply) {
+    const message = { role: "user", content };
+    if (quotedReply)
+        (0, orientation_frame_1.stampReplyingToText)(message, quotedReply.text, quotedReply.author);
+    return message;
+}
+function parseTeamsQuotedReply(attachments, ids) {
+    for (const attachment of attachments ?? []) {
+        if (attachment.contentType !== "text/html" || typeof attachment.content !== "string")
+            continue;
+        const quote = /<blockquote[^>]*itemtype="http:\/\/schema\.skype\.com\/Reply"[^>]*>([\s\S]*?)<\/blockquote>/iu.exec(attachment.content);
+        if (!quote)
+            continue;
+        const preview = /<p[^>]*itemprop="preview"[^>]*>([\s\S]*?)<\/p>/iu.exec(quote[1]);
+        const text = decodeHtmlText(preview ? preview[1] : quote[1]).slice(0, 1200);
+        if (!text)
+            continue;
+        const mri = /itemprop="mri"[^>]*itemid="([^"]+)"/iu.exec(quote[1])?.[1];
+        const bare = (id) => id?.replace(/^\d+:/u, "");
+        const author = !mri ? undefined
+            : bare(mri) === bare(ids.botId) ? "agent"
+                : bare(mri) === bare(ids.userId) ? "person" : "other";
+        return { text, ...(author ? { author } : {}) };
+    }
+    return undefined;
+}
 function reportTeamsRequest(stage, conversationId, context, details = {}) {
     if (!context?.inboundActivityId)
         return;
@@ -894,7 +942,7 @@ async function handleTeamsMessage(text, stream, conversationId, teamsContext, se
                     channel: "teams",
                     sessionKey: conversationId,
                     capabilities: teamsCapabilities,
-                    messages: [{ role: "user", content: currentText }],
+                    messages: [teamsUserMessage(currentText, currentText === text ? teamsContext?.quotedReply : undefined)],
                     continuityIngressTexts: [currentText],
                     callbacks: failoverAwareCallbacks,
                     sessionTurnLease,
@@ -1375,6 +1423,7 @@ function registerBotHandlers(app, label) {
                     const teamsContext = {
                         inboundActivityId: activity.id,
                         replyToId: activity.replyToId,
+                        quotedReply: parseTeamsQuotedReply(activity.attachments, { botId: activity.recipient?.id ?? app.id, userId }),
                         graphToken,
                         adoToken,
                         githubToken,

package/dist/senses/telegram-client.js

@@ -525,6 +525,12 @@ function createTelegramLongPoll(options) {
     const rawAttachmentCount = (message) => [
         message.document, message.audio, message.video, message.voice, message.animation, message.sticker,
     ].filter(Boolean).length + (message.photo?.length ? 1 : 0);
+    const repliedTo = (message, userId) => {
+        const reply = message.reply_to_message;
+        const quoted = [message.quote?.text, reply.text, reply.caption].find((value) => typeof value === "string" && value.trim());
+        const author = reply.from?.is_bot ? "agent" : reply.from && String(reply.from.id) === userId ? "person" : reply.from ? "other" : undefined;
+        return { ...(quoted ? { replyToText: quoted.trim() } : {}), ...(author ? { replyToAuthor: author } : {}) };
+    };
     const authorizedMessage = (update, authority) => {
         const message = update.message;
         const userId = message?.from ? String(message.from.id) : "";
@@ -548,7 +554,7 @@ function createTelegramLongPoll(options) {
             attachments,
             ...(attachmentNotices.length ? { attachmentNotices } : {}),
             ...(Number.isSafeInteger(message.reply_to_message?.message_id) && message.reply_to_message.message_id > 0
-                ? { replyToMessageId: String(message.reply_to_message.message_id) }
+                ? { replyToMessageId: String(message.reply_to_message.message_id), ...repliedTo(message, userId) }
                 : {}),
             ...(authority ? { authority } : {}),
         };

package/dist/senses/telegram.js

@@ -1605,6 +1605,7 @@ function createTelegramSenseApp(options) {
                 },
                 userMessage: message.text,
                 ingressRelations,
+                ...(message.replyToText ? { replyingTo: { text: message.replyToText, ...(message.replyToAuthor ? { author: message.replyToAuthor } : {}) } } : {}),
                 ...(ingressReceipt ? { precommittedIngress: ingressReceipt } : {}),
                 turnMetricsObserver,
                 emptyResponseFallback: fullVisibility.emptyResponseFallback,

package/npm-shrinkwrap.json

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