@ouro.bot/cli 0.1.0-alpha.34 → 0.1.0-alpha.340

package/dist/mind/obligation-steering.js

@@ -0,0 +1,221 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findActivePersistentObligation = findActivePersistentObligation;
+exports.findStatusObligation = findStatusObligation;
+exports.renderActiveObligationSteering = renderActiveObligationSteering;
+exports.renderConcreteStatusGuidance = renderConcreteStatusGuidance;
+exports.renderLiveThreadStatusShape = renderLiveThreadStatusShape;
+exports.buildExactStatusReply = buildExactStatusReply;
+exports.renderExactStatusReplyContract = renderExactStatusReplyContract;
+const config_1 = require("../heart/config");
+const active_work_1 = require("../heart/active-work");
+const runtime_1 = require("../nerves/runtime");
+function findActivePersistentObligation(frame) {
+    if (!frame)
+        return null;
+    return (frame.pendingObligations ?? []).find((ob) => ob.status !== "pending" && ob.status !== "fulfilled") ?? null;
+}
+function obligationTimestampMs(obligation) {
+    return Date.parse(obligation.updatedAt ?? obligation.createdAt);
+}
+function newestObligationFirst(left, right) {
+    return obligationTimestampMs(right) - obligationTimestampMs(left);
+}
+function matchesCurrentSession(frame, obligation) {
+    return matchesSessionOrigin(frame, obligation.origin);
+}
+function matchesSessionOrigin(frame, origin) {
+    return Boolean(frame.currentSession
+        && origin.friendId === frame.currentSession.friendId
+        && origin.channel === frame.currentSession.channel
+        && (0, config_1.sanitizeKey)(origin.key) === (0, config_1.sanitizeKey)(frame.currentSession.key));
+}
+function findStatusObligation(frame) {
+    if (!frame)
+        return null;
+    const openObligations = [...(frame.pendingObligations ?? [])]
+        .filter((obligation) => obligation.status !== "fulfilled")
+        .sort(newestObligationFirst);
+    const sameSession = openObligations.find((obligation) => matchesCurrentSession(frame, obligation));
+    if (sameSession)
+        return sameSession;
+    return openObligations[0] ?? null;
+}
+function findCurrentSessionStatusObligation(frame) {
+    const openObligations = [...(frame.pendingObligations ?? [])]
+        .filter((obligation) => obligation.status !== "fulfilled")
+        .sort(newestObligationFirst);
+    return openObligations.find((obligation) => matchesCurrentSession(frame, obligation)) ?? null;
+}
+function renderActiveObligationSteering(obligation) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "mind",
+        event: "mind.obligation_steering_rendered",
+        message: "rendered active obligation steering",
+        meta: {
+            hasObligation: Boolean(obligation),
+            hasSurface: Boolean(obligation?.currentSurface?.label),
+        },
+    });
+    if (!obligation)
+        return "";
+    const name = obligation.origin.friendId;
+    const surfaceLine = obligation.currentSurface?.label
+        ? `\nright now that work is happening in ${obligation.currentSurface.label}.`
+        : "";
+    return `## where my attention is
+i'm already working on something i owe ${name}.${surfaceLine}
+
+i should close that loop before i act like this is a fresh blank turn.`;
+}
+function mergeArtifactFallback(obligation) {
+    const trimmed = obligation.content.trim();
+    if (!trimmed)
+        return "the fix";
+    const stripped = trimmed.replace(/^merge(?:\s+|$)/i, "").trim();
+    return stripped || "the fix";
+}
+function formatMergeArtifact(obligation) {
+    const currentArtifact = obligation.currentArtifact?.trim();
+    if (currentArtifact)
+        return currentArtifact;
+    if (obligation.currentSurface?.kind === "merge") {
+        const surfaceLabel = obligation.currentSurface.label.trim();
+        if (surfaceLabel)
+            return surfaceLabel;
+    }
+    return mergeArtifactFallback(obligation);
+}
+function formatActiveLane(frame, obligation) {
+    const liveCodingSession = frame.codingSessions?.[0];
+    if (liveCodingSession) {
+        const sameThread = frame.currentSession
+            && liveCodingSession.originSession
+            && liveCodingSession.originSession.friendId === frame.currentSession.friendId
+            && liveCodingSession.originSession.channel === frame.currentSession.channel
+            && liveCodingSession.originSession.key === frame.currentSession.key;
+        return sameThread
+            ? `${liveCodingSession.runner} ${liveCodingSession.id} for this same thread`
+            : liveCodingSession.originSession
+                ? `${liveCodingSession.runner} ${liveCodingSession.id} for ${liveCodingSession.originSession.channel}/${liveCodingSession.originSession.key}`
+                : `${liveCodingSession.runner} ${liveCodingSession.id}`;
+    }
+    return obligation.currentSurface?.label
+        || (matchesCurrentSession(frame, obligation) ? "this same thread" : "this live loop");
+}
+function formatCurrentArtifact(frame, obligation) {
+    if (obligation?.currentArtifact)
+        return obligation.currentArtifact;
+    if (obligation?.currentSurface?.kind === "merge")
+        return obligation.currentSurface.label;
+    if ((frame.codingSessions ?? []).length > 0)
+        return "no PR or merge artifact yet";
+    return obligation ? "no artifact yet" : "";
+}
+function formatNextAction(frame, obligation) {
+    const obligationHasConcreteArtifact = Boolean(obligation?.currentArtifact?.trim())
+        || obligation?.currentSurface?.kind === "merge";
+    if (obligation?.status === "waiting_for_merge") {
+        return obligation.nextAction?.trim() || `wait for checks, merge ${formatMergeArtifact(obligation)}, then update runtime`;
+    }
+    if (obligation?.status === "updating_runtime") {
+        return obligation.nextAction?.trim() || "update runtime, verify version/changelog, then re-observe";
+    }
+    if (obligationHasConcreteArtifact && obligation?.nextAction?.trim()) {
+        return obligation.nextAction.trim();
+    }
+    const liveCodingSession = frame.codingSessions?.[0];
+    if (liveCodingSession?.status === "waiting_input") {
+        return `answer ${liveCodingSession.runner} ${liveCodingSession.id} and continue`;
+    }
+    if (liveCodingSession?.status === "stalled") {
+        return `unstick ${liveCodingSession.runner} ${liveCodingSession.id} and continue`;
+    }
+    if (liveCodingSession) {
+        return "finish the coding pass and bring the result back here";
+    }
+    if (obligation?.nextAction?.trim())
+        return obligation.nextAction.trim();
+    if (obligation?.content?.trim()) {
+        return `work on "${obligation.content.trim()}" and bring back a concrete artifact`;
+    }
+    return obligation ? "continue the active loop and bring the result back here" : "";
+}
+function renderConcreteStatusGuidance(frame, obligation) {
+    const activeLane = obligation ? formatActiveLane(frame, obligation) : "";
+    const currentArtifact = formatCurrentArtifact(frame, obligation);
+    const nextAction = formatNextAction(frame, obligation);
+    const liveConversation = frame.currentSession
+        ? `${frame.currentSession.channel}/${frame.currentSession.key}`
+        : "";
+    if (!activeLane && !currentArtifact && !nextAction)
+        return "";
+    return `if someone asks what i'm doing or for status mid-task, i answer from these live facts instead of copying a canned block.
+the live conversation is ${liveConversation || "not in a live conversation"}.
+the active lane is ${activeLane}.
+the current artifact is ${currentArtifact}.
+if i just finished or verified something concrete in this live lane, i name that as the latest checkpoint.
+the next action is ${nextAction}.
+
+i answer naturally from those facts instead of forcing a canned status block.`;
+}
+function renderLiveThreadStatusShape(frame) {
+    if (!frame.currentSession)
+        return "";
+    return `if someone asks what i'm doing or for status mid-task in this live thread, i answer in these exact lines, in order, with no intro paragraph:
+live conversation: ${frame.currentSession.channel}/${frame.currentSession.key}
+active lane: this same thread
+current artifact: <actual artifact or "no artifact yet">
+latest checkpoint: <freshest concrete thing i just finished or verified>
+next action: <smallest concrete next step i'm taking now>
+
+no recap paragraph before those lines.
+no option list.
+present tense only.
+if a finished step matters, i label it "just finished" instead of presenting it as current work.`;
+}
+function buildExactStatusReply(frame, obligation, latestCheckpoint, statusCheckScope) {
+    const headerObligation = statusCheckScope === "all-sessions-family"
+        ? findCurrentSessionStatusObligation(frame)
+        : obligation;
+    const liveConversation = frame.currentSession
+        ? `${frame.currentSession.channel}/${frame.currentSession.key}`
+        : "not in a live conversation";
+    const activeLane = headerObligation
+        ? formatActiveLane(frame, headerObligation)
+        : (frame.currentSession ? "this same thread" : "this live loop");
+    const currentArtifact = formatCurrentArtifact(frame, headerObligation) || "no artifact yet";
+    const nextAction = formatNextAction(frame, headerObligation) || "continue the active loop and bring the result back here";
+    const latest = latestCheckpoint.trim() || "<freshest concrete thing i just finished or verified>";
+    const lines = [
+        `live conversation: ${liveConversation}`,
+        `active lane: ${activeLane}`,
+        `current artifact: ${currentArtifact}`,
+        `latest checkpoint: ${latest}`,
+        `next action: ${nextAction}`,
+    ];
+    if (statusCheckScope === "all-sessions-family") {
+        lines.push("other active sessions:");
+        const summaries = (0, active_work_1.formatOtherActiveSessionSummaries)(frame);
+        lines.push(...(summaries.length > 0 ? summaries : ["- none"]));
+    }
+    return lines.join("\n");
+}
+function renderExactStatusReplyContract(frame, obligation, statusCheckScope) {
+    const headerObligation = statusCheckScope === "all-sessions-family"
+        ? findCurrentSessionStatusObligation(frame)
+        : obligation;
+    if (statusCheckScope === "all-sessions-family") {
+        return `reply using exactly this status shape and nothing else:
+live conversation: ${frame.currentSession ? `${frame.currentSession.channel}/${frame.currentSession.key}` : "not in a live conversation"}
+active lane: ${headerObligation ? formatActiveLane(frame, headerObligation) : (frame.currentSession ? "this same thread" : "this live loop")}
+current artifact: ${formatCurrentArtifact(frame, headerObligation) || "no artifact yet"}
+latest checkpoint: <freshest concrete thing i just finished or verified>
+next action: ${formatNextAction(frame, headerObligation) || "continue the active loop and bring the result back here"}
+other active sessions:
+- <session label>: <what i'm doing there right now>`;
+    }
+    return `reply using exactly these five lines and nothing else:
+${buildExactStatusReply(frame, obligation, "<freshest concrete thing i just finished or verified>")}
+`;
+}

package/dist/mind/pending.js

@@ -33,7 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.INNER_DIALOG_PENDING = void 0;
 exports.getPendingDir = getPendingDir;
+exports.getDeferredReturnDir = getDeferredReturnDir;
+exports.getInnerDialogPendingDir = getInnerDialogPendingDir;
+exports.hasPendingMessages = hasPendingMessages;
+exports.queuePendingMessage = queuePendingMessage;
+exports.enqueueDeferredReturn = enqueueDeferredReturn;
+exports.drainDeferredReturns = drainDeferredReturns;
 exports.drainPending = drainPending;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -42,15 +49,44 @@ const runtime_1 = require("../nerves/runtime");
 function getPendingDir(agentName, friendId, channel, key) {
     return path.join((0, identity_1.getAgentRoot)(agentName), "state", "pending", friendId, channel, key);
 }
-function drainPending(pendingDir) {
+function getDeferredReturnDir(agentName, friendId) {
+    return path.join((0, identity_1.getAgentRoot)(agentName), "state", "pending-returns", friendId);
+}
+/** Canonical inner-dialog pending path segments. */
+exports.INNER_DIALOG_PENDING = { friendId: "self", channel: "inner", key: "dialog" };
+/** Returns the pending dir for this agent's inner dialog. */
+function getInnerDialogPendingDir(agentName) {
+    return getPendingDir(agentName, exports.INNER_DIALOG_PENDING.friendId, exports.INNER_DIALOG_PENDING.channel, exports.INNER_DIALOG_PENDING.key);
+}
+function hasPendingMessages(pendingDir) {
     if (!fs.existsSync(pendingDir))
-        return [];
+        return false;
+    try {
+        return fs.readdirSync(pendingDir).some((entry) => entry.endsWith(".json") || entry.endsWith(".json.processing"));
+    }
+    catch {
+        return false;
+    }
+}
+function writeQueueFile(queueDir, message) {
+    fs.mkdirSync(queueDir, { recursive: true });
+    const fileName = `${message.timestamp}-${Math.random().toString(36).slice(2, 10)}.json`;
+    const filePath = path.join(queueDir, fileName);
+    fs.writeFileSync(filePath, JSON.stringify(message, null, 2));
+    return filePath;
+}
+function queuePendingMessage(pendingDir, message) {
+    writeQueueFile(pendingDir, message);
+}
+function drainQueue(queueDir) {
+    if (!fs.existsSync(queueDir))
+        return { messages: [], recovered: 0 };
     let entries;
     try {
-        entries = fs.readdirSync(pendingDir);
+        entries = fs.readdirSync(queueDir);
     }
     catch {
-        return [];
+        return { messages: [], recovered: 0 };
     }
     // Collect both .json (new) and .processing (crash recovery)
     const jsonFiles = entries.filter(f => f.endsWith(".json") && !f.endsWith(".processing"));
@@ -62,9 +98,9 @@ function drainPending(pendingDir) {
     ].sort((a, b) => a.file.localeCompare(b.file));
     const messages = [];
     for (const { file, needsRename } of allFiles) {
-        const srcPath = path.join(pendingDir, file);
+        const srcPath = path.join(queueDir, file);
         const processingPath = needsRename
-            ? path.join(pendingDir, file + ".processing")
+            ? path.join(queueDir, file + ".processing")
             : srcPath;
         try {
             if (needsRename) {
@@ -83,11 +119,42 @@ function drainPending(pendingDir) {
             catch { /* ignore */ }
         }
     }
+    return {
+        messages,
+        recovered: processingFiles.length,
+    };
+}
+function enqueueDeferredReturn(agentName, friendId, message) {
+    const queueDir = getDeferredReturnDir(agentName, friendId);
+    const filePath = writeQueueFile(queueDir, message);
+    (0, runtime_1.emitNervesEvent)({
+        event: "mind.deferred_return_enqueued",
+        component: "mind",
+        message: "deferred return queued for later friend delivery",
+        meta: { friendId, queueDir },
+    });
+    return filePath;
+}
+function drainDeferredReturns(agentName, friendId) {
+    const queueDir = getDeferredReturnDir(agentName, friendId);
+    const { messages } = drainQueue(queueDir);
+    (0, runtime_1.emitNervesEvent)({
+        event: "mind.deferred_returns_drained",
+        component: "mind",
+        message: "deferred friend returns drained",
+        meta: { friendId, queueDir, count: messages.length },
+    });
+    return messages;
+}
+function drainPending(pendingDir) {
+    if (!fs.existsSync(pendingDir))
+        return [];
+    const { messages, recovered } = drainQueue(pendingDir);
     (0, runtime_1.emitNervesEvent)({
         event: "mind.pending_drained",
         component: "mind",
         message: "pending queue drained",
-        meta: { pendingDir, count: messages.length, recovered: processingFiles.length },
+        meta: { pendingDir, count: messages.length, recovered },
     });
     return messages;
 }