@ouro.bot/cli 0.1.0-alpha.966 → 0.1.0-alpha.968

package/changelog.json

@@ -1,6 +1,19 @@
 {
   "_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.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": [
+        "When you reply to an older Telegram message, the Butler now sees which message you are answering, so a quick \"yes\" goes to the question you meant instead of the newest one.",
+        "Replies to the Butler's control cards and notices are not mistaken for answers to his questions."
+      ]
+    },
     {
       "version": "0.1.0-alpha.966",
       "changes": [

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

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.966",
+  "runtimeVersion": "0.1.0-alpha.968",
   "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.966</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.968</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

@@ -5,6 +5,7 @@ exports.priorWorkInstruction = priorWorkInstruction;
 exports.labelPriorWorkSurface = labelPriorWorkSurface;
 exports.extractMessageText = extractMessageText;
 exports.extractOrderedListReferents = extractOrderedListReferents;
+exports.stampReplyingToText = stampReplyingToText;
 exports.buildOrientationFrame = buildOrientationFrame;
 exports.renderOrientationFrame = renderOrientationFrame;
 const runtime_1 = require("../nerves/runtime");
@@ -188,6 +189,16 @@ function deriveActionPolicy(signals, combinedSpeech, priorAssistantReferents, la
         clearedBy: CORRECTION_HOLD_CLEARED_BY,
     };
 }
+// 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;
+}
+function replyingToTextOf(message) {
+    const text = message._replyingToText;
+    return typeof text === "string" && text.trim() ? text.trim() : undefined;
+}
 function buildOrientationFrame(input) {
     const derivedCurrent = input.currentUserMessages
         ? { messages: input.currentUserMessages, firstIndex: input.messages.length }
@@ -195,8 +206,10 @@ 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 previousAssistant = latestAssistantBefore(input.messages, derivedCurrent.firstIndex);
-    const priorAssistantReferents = extractOrderedListReferents(extractMessageText(previousAssistant));
+    const priorAssistantReferents = extractOrderedListReferents(replyingToText ?? extractMessageText(previousAssistant));
+    const source = replyingToText && !input.source?.replyingToText ? { kind: input.channel, ...input.source, replyingToText } : input.source;
     const candidateStructuredOutput = latestStructuredOutputFrom(input.structuredOutputs);
     const speechKind = input.speechKind ?? "utterance";
     const signals = deriveSignals(currentUserSpeech, priorAssistantReferents, candidateStructuredOutput, speechKind);
@@ -213,7 +226,7 @@ function buildOrientationFrame(input) {
         ...(latestStructuredOutput ? { latestStructuredOutput } : {}),
         signals,
         actionPolicy,
-        ...(input.source ? { source: input.source } : {}),
+        ...(source ? { source } : {}),
         ...(speechKind === "utterance" ? {} : { speechKind }),
     };
     (0, runtime_1.emitNervesEvent)({

package/dist/senses/shared-turn.js

@@ -62,6 +62,7 @@ const pipeline_1 = require("./pipeline");
 const mcp_manager_1 = require("../repertoire/mcp-manager");
 const runtime_1 = require("../nerves/runtime");
 const session_transaction_1 = require("../mind/session-transaction");
+const orientation_frame_1 = require("../heart/orientation-frame");
 const turn_execution_lease_1 = require("../heart/turn-execution-lease");
 const RESPONSE_CAP = 50_000;
 const OUTWARD_DELIVERY_TOOL_ACKS = new Map([
@@ -270,6 +271,23 @@ function rawSessionEvents(value) {
     const record = value;
     return record.version === 2 && Array.isArray(record.events) ? record.events : [];
 }
+// What the agent said in a replied-to message: the settle answer it delivered, else its text.
+// Only the agent's own messages are quoted; a control card or notice is not something it asked.
+function spokenText(event) {
+    if (event?.role !== "assistant")
+        return "";
+    for (const call of event.toolCalls) {
+        if (call.function.name !== "settle")
+            continue;
+        try {
+            const answer = JSON.parse(call.function.arguments).answer;
+            if (typeof answer === "string" && answer.trim())
+                return answer.trim().slice(0, 1200);
+        }
+        catch { /* a malformed settle names nothing */ }
+    }
+    return typeof event.content === "string" ? event.content.trim().slice(0, 1200) : "";
+}
 function exactProjectedIngressMessage(existing, messages, eventId, nativeValue) {
     if (!nativeValue || typeof nativeValue !== "object" || Array.isArray(nativeValue))
         return null;
@@ -462,6 +480,8 @@ async function runSenseTurnExclusive(options, owner) {
                     system.content = system.content.split(`\n${marker}`)[0] + `\n${marker}\n${JSON.stringify(options.shepherdSession)}\nUse this exact UUID for shepherd_read/shepherd_send. If gone, fail explicitly; never substitute a short ref. This locator grants no authority.`;
                 }
             }
+            const replyToEventId = precommittedIngressEvent?.relations.replyToEventId ?? options.ingressRelations?.replyToEventId;
+            const repliedToText = spokenText(existing?.events?.find((event) => event.id === replyToEventId));
             if (precommittedIngressEvent) {
                 const projectedIngress = exactProjectedIngressMessage(existing, sessionMessages, precommittedIngressEvent.id, baseSession.value);
                 if (!projectedIngress || projectedIngress.role !== "user" || projectedIngress.content !== userMessage)
@@ -471,6 +491,8 @@ async function runSenseTurnExclusive(options, owner) {
                     threadRootEventId: precommittedIngressEvent.relations.threadRootEventId,
                     references: precommittedIngressEvent.relations.references,
                 });
+                if (repliedToText)
+                    (0, orientation_frame_1.stampReplyingToText)(projectedIngress, repliedToText);
             }
             // Pending dir
             const pendingDir = (0, pending_1.getPendingDir)(agentName, friendId, channel, sessionKey);
@@ -580,6 +602,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);
                 inboundMessages.push(userMsg);
             }
             const turnResult = await (0, pipeline_1.handleInboundTurn)({

package/npm-shrinkwrap.json

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