@ouro.bot/cli 0.1.0-alpha.202 → 0.1.0-alpha.203

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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.203",
+      "changes": [
+        "refactor: unify obligation systems — mind/obligations.ts merged into heart/obligations.ts with prefixed ReturnObligation API"
+      ]
+    },
     {
       "version": "0.1.0-alpha.202",
       "changes": [

package/dist/heart/daemon/daemon-cli.js

@@ -3116,9 +3116,9 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
     if (command.kind === "attention.list" || command.kind === "attention.show" || command.kind === "attention.history") {
         try {
             const agentName = command.agent ?? (0, identity_1.getAgentName)();
-            const { listActiveObligations, readObligation } = await Promise.resolve().then(() => __importStar(require("../../mind/obligations")));
+            const { listActiveReturnObligations, readReturnObligation } = await Promise.resolve().then(() => __importStar(require("../obligations")));
             if (command.kind === "attention.list") {
-                const obligations = listActiveObligations(agentName);
+                const obligations = listActiveReturnObligations(agentName);
                 if (obligations.length === 0) {
                     const message = "nothing held — attention queue is empty";
                     deps.writeStdout(message);
@@ -3130,7 +3130,7 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
                 return message;
             }
             if (command.kind === "attention.show") {
-                const obligation = readObligation(agentName, command.id);
+                const obligation = readReturnObligation(agentName, command.id);
                 if (!obligation) {
                     const message = `no obligation found with id ${command.id}`;
                     deps.writeStdout(message);
@@ -3141,8 +3141,8 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
                 return message;
             }
             // attention.history: show returned obligations
-            const { getObligationsDir } = await Promise.resolve().then(() => __importStar(require("../../mind/obligations")));
-            const obligationsDir = getObligationsDir(agentName);
+            const { getReturnObligationsDir } = await Promise.resolve().then(() => __importStar(require("../obligations")));
+            const obligationsDir = getReturnObligationsDir(agentName);
             let entries = [];
             try {
                 entries = fs.readdirSync(obligationsDir);
@@ -3189,7 +3189,7 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
             const { sessionPath: getSessionPath } = await Promise.resolve().then(() => __importStar(require("../config")));
             const { parseCadenceToMs: parseCadenceMs, DEFAULT_CADENCE_MS } = await Promise.resolve().then(() => __importStar(require("./cadence")));
             const { parseFrontmatter } = await Promise.resolve().then(() => __importStar(require("../../repertoire/tasks/parser")));
-            const { listActiveObligations } = await Promise.resolve().then(() => __importStar(require("../../mind/obligations")));
+            const { listActiveReturnObligations } = await Promise.resolve().then(() => __importStar(require("../obligations")));
             // Read runtime state
             const innerSessionPath = getSessionPath("inner-dialog", "inner", "session");
             const runtimeJsonPath = path.join(path.dirname(innerSessionPath), "runtime.json");
@@ -3242,7 +3242,7 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
             }
             catch { /* no habits — heartbeat unknown */ }
             // Attention count
-            const activeObligations = listActiveObligations(agentName);
+            const activeObligations = listActiveReturnObligations(agentName);
             const message = buildInnerStatusOutput({
                 agentName,
                 runtimeState,

package/dist/heart/obligations.js

@@ -42,8 +42,15 @@ exports.advanceObligation = advanceObligation;
 exports.fulfillObligation = fulfillObligation;
 exports.findPendingObligationForOrigin = findPendingObligationForOrigin;
 exports.enrichObligation = enrichObligation;
+exports.generateObligationId = generateObligationId;
+exports.getReturnObligationsDir = getReturnObligationsDir;
+exports.createReturnObligation = createReturnObligation;
+exports.readReturnObligation = readReturnObligation;
+exports.advanceReturnObligation = advanceReturnObligation;
+exports.listActiveReturnObligations = listActiveReturnObligations;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const identity_1 = require("./identity");
 const runtime_1 = require("../nerves/runtime");
 const sync_1 = require("./sync");
 function obligationsDir(agentRoot) {
@@ -223,3 +230,92 @@ function enrichObligation(agentRoot, id, meaning) {
     });
     return obligation;
 }
+function generateObligationId(timestamp) {
+    return `${timestamp}-${Math.random().toString(36).slice(2, 10)}`;
+}
+function getReturnObligationsDir(agentName) {
+    return path.join((0, identity_1.getAgentRoot)(agentName), "arc", "obligations", "inner");
+}
+function createReturnObligation(agentName, obligation) {
+    const dir = getReturnObligationsDir(agentName);
+    fs.mkdirSync(dir, { recursive: true });
+    const filePath = path.join(dir, `${obligation.id}.json`);
+    fs.writeFileSync(filePath, JSON.stringify(obligation, null, 2), "utf8");
+    (0, sync_1.trackSyncWrite)(filePath);
+    (0, runtime_1.emitNervesEvent)({
+        event: "mind.obligation_created",
+        component: "mind",
+        message: "return obligation created",
+        meta: {
+            obligationId: obligation.id,
+            origin: `${obligation.origin.friendId}/${obligation.origin.channel}/${obligation.origin.key}`,
+            status: obligation.status,
+        },
+    });
+    return filePath;
+}
+function readReturnObligation(agentName, obligationId) {
+    const dir = getReturnObligationsDir(agentName);
+    try {
+        const raw = fs.readFileSync(path.join(dir, `${obligationId}.json`), "utf-8");
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+}
+function advanceReturnObligation(agentName, obligationId, update) {
+    const existing = readReturnObligation(agentName, obligationId);
+    if (!existing)
+        return null;
+    const updated = {
+        ...existing,
+        status: update.status,
+        ...(update.startedAt !== undefined ? { startedAt: update.startedAt } : {}),
+        ...(update.returnedAt !== undefined ? { returnedAt: update.returnedAt } : {}),
+        ...(update.returnTarget !== undefined ? { returnTarget: update.returnTarget } : {}),
+    };
+    const dir = getReturnObligationsDir(agentName);
+    const advancedFilePath = path.join(dir, `${obligationId}.json`);
+    fs.writeFileSync(advancedFilePath, JSON.stringify(updated, null, 2), "utf8");
+    (0, sync_1.trackSyncWrite)(advancedFilePath);
+    (0, runtime_1.emitNervesEvent)({
+        event: "mind.obligation_advanced",
+        component: "mind",
+        message: `obligation advanced to ${update.status}`,
+        meta: {
+            obligationId,
+            status: update.status,
+            ...(update.returnTarget ? { returnTarget: update.returnTarget } : {}),
+        },
+    });
+    return updated;
+}
+function listActiveReturnObligations(agentName) {
+    const dir = getReturnObligationsDir(agentName);
+    if (!fs.existsSync(dir))
+        return [];
+    let entries;
+    try {
+        entries = fs.readdirSync(dir);
+    }
+    catch {
+        return [];
+    }
+    const obligations = [];
+    for (const file of entries) {
+        if (!file.endsWith(".json"))
+            continue;
+        try {
+            const raw = fs.readFileSync(path.join(dir, file), "utf-8");
+            const parsed = JSON.parse(raw);
+            if (parsed.status === "queued" || parsed.status === "running") {
+                obligations.push(parsed);
+            }
+        }
+        catch {
+            // skip unparseable
+        }
+    }
+    return obligations.sort((a, b) => a.createdAt - b.createdAt);
+}

package/dist/repertoire/tools-base.js

@@ -58,10 +58,9 @@ const coding_1 = require("./coding");
 const diary_1 = require("../mind/diary");
 const tasks_1 = require("./tasks");
 const pending_1 = require("../mind/pending");
-const obligations_1 = require("../mind/obligations");
+const obligations_1 = require("../heart/obligations");
 const progress_story_1 = require("../heart/progress-story");
 const cross_chat_delivery_1 = require("../heart/cross-chat-delivery");
-const obligations_2 = require("../heart/obligations");
 const episodes_1 = require("../mind/episodes");
 const cares_1 = require("../heart/cares");
 const presence_1 = require("../heart/presence");
@@ -220,7 +219,7 @@ function readActiveWorkInnerState() {
         const { pendingMessages, turns, runtimeState } = (0, thoughts_1.readInnerDialogRawData)(sessionPath, pendingDir);
         const dialogStatus = (0, thoughts_1.deriveInnerDialogStatus)(pendingMessages, turns, runtimeState);
         const job = (0, thoughts_1.deriveInnerJob)(pendingMessages, turns, runtimeState);
-        const storeObligationPending = (0, obligations_2.readPendingObligations)(agentRoot).length > 0;
+        const storeObligationPending = (0, obligations_1.readPendingObligations)(agentRoot).length > 0;
         return {
             status: dialogStatus.processing === "started" ? "running" : "idle",
             hasPending: dialogStatus.queue !== "clear",
@@ -269,7 +268,7 @@ async function buildToolActiveWorkFrame(ctx) {
     }
     const pendingObligations = (() => {
         try {
-            return (0, obligations_2.readPendingObligations)(agentRoot);
+            return (0, obligations_1.readPendingObligations)(agentRoot);
         }
         catch {
             return [];
@@ -1296,7 +1295,7 @@ exports.baseToolDefinitions = [
                 writePendingEnvelope(pendingDir, envelope);
                 if (delegatedFrom) {
                     try {
-                        (0, obligations_2.createObligation)((0, identity_1.getAgentRoot)(), {
+                        (0, obligations_1.createObligation)((0, identity_1.getAgentRoot)(), {
                             origin: {
                                 friendId: delegatedFrom.friendId,
                                 channel: delegatedFrom.channel,
@@ -1311,7 +1310,7 @@ exports.baseToolDefinitions = [
                     }
                     /* v8 ignore next -- obligationId always set when delegatedFrom is set (see generateObligationId above) @preserve */
                     if (obligationId) {
-                        (0, obligations_1.createObligation)(agentName, {
+                        (0, obligations_1.createReturnObligation)(agentName, {
                             id: obligationId,
                             origin: delegatedFrom,
                             status: "queued",

package/dist/repertoire/tools.js

@@ -48,8 +48,7 @@ const runtime_1 = require("../nerves/runtime");
 const guardrails_1 = require("./guardrails");
 const identity_1 = require("../heart/identity");
 const surface_tool_1 = require("../senses/surface-tool");
-const obligations_1 = require("../mind/obligations");
-const obligations_2 = require("../heart/obligations");
+const obligations_1 = require("../heart/obligations");
 const session_activity_1 = require("../heart/session-activity");
 const path = __importStar(require("path"));
 function safeGetAgentRoot() {
@@ -198,7 +197,7 @@ const surfaceToolDefinition = {
                     catch {
                         return "unknown";
                     } })();
-                    (0, obligations_1.advanceObligation)(name, obligationId, {
+                    (0, obligations_1.advanceReturnObligation)(name, obligationId, {
                         status: update.status,
                         ...(update.returnedAt !== undefined ? { returnedAt: update.returnedAt } : {}),
                         ...(update.returnTarget !== undefined ? { returnTarget: update.returnTarget } : {}),
@@ -213,9 +212,9 @@ const surfaceToolDefinition = {
                 /* v8 ignore start -- heart obligation fulfillment: tested via surface-tool.test.ts @preserve */
                 try {
                     const agentRoot = (0, identity_1.getAgentRoot)();
-                    const heartObligation = (0, obligations_2.findPendingObligationForOrigin)(agentRoot, origin);
+                    const heartObligation = (0, obligations_1.findPendingObligationForOrigin)(agentRoot, origin);
                     if (heartObligation) {
-                        (0, obligations_2.fulfillObligation)(agentRoot, heartObligation.id);
+                        (0, obligations_1.fulfillObligation)(agentRoot, heartObligation.id);
                     }
                 }
                 catch {

package/dist/senses/inner-dialog.js

@@ -55,7 +55,7 @@ const prompt_1 = require("../mind/prompt");
 const mcp_manager_1 = require("../repertoire/mcp-manager");
 const bundle_manifest_1 = require("../mind/bundle-manifest");
 const pending_1 = require("../mind/pending");
-const obligations_1 = require("../mind/obligations");
+const obligations_1 = require("../heart/obligations");
 const attention_queue_1 = require("./attention-queue");
 const channel_1 = require("../mind/friends/channel");
 const trust_gate_1 = require("./trust-gate");
@@ -66,7 +66,6 @@ const runtime_1 = require("../nerves/runtime");
 const manager_1 = require("../heart/bridges/manager");
 const session_activity_1 = require("../heart/session-activity");
 const bluebubbles_1 = require("./bluebubbles");
-const obligations_2 = require("../heart/obligations");
 const habit_turn_message_1 = require("./habit-turn-message");
 const journal_index_1 = require("../mind/journal-index");
 const habit_parser_1 = require("../heart/daemon/habit-parser");
@@ -324,7 +323,7 @@ function advanceObligationQuietly(agentName, obligationId, update) {
     if (!obligationId)
         return;
     try {
-        (0, obligations_1.advanceObligation)(agentName, obligationId, update);
+        (0, obligations_1.advanceReturnObligation)(agentName, obligationId, update);
         /* v8 ignore start -- best-effort: obligation fs errors must never block return routing @preserve */
     }
     catch {
@@ -352,14 +351,14 @@ async function routeDelegatedCompletion(agentRoot, agentName, completion, draine
     if (delegated.obligationStatus === "pending") {
         // Fulfill the persistent obligation in the store
         try {
-            const pending = (0, obligations_2.findPendingObligationForOrigin)(agentRoot, {
+            const pending = (0, obligations_1.findPendingObligationForOrigin)(agentRoot, {
                 friendId: delegatedFrom.friendId,
                 channel: delegatedFrom.channel,
                 key: delegatedFrom.key,
             });
             /* v8 ignore next 2 -- obligation fulfillment tested via obligations.test.ts; integration requires real disk state @preserve */
             if (pending) {
-                (0, obligations_2.fulfillObligation)(agentRoot, pending.id);
+                (0, obligations_1.fulfillObligation)(agentRoot, pending.id);
             }
         }
         catch {
@@ -577,7 +576,7 @@ async function runInnerDialogTurn(options) {
                 }
                 else {
                     // Unified path: gather context for ALL habits (heartbeat included)
-                    const obligations = (0, obligations_1.listActiveObligations)(agentName);
+                    const obligations = (0, obligations_1.listActiveReturnObligations)(agentName);
                     const nowMs = now().getTime();
                     const staleObligations = obligations.map((o) => ({
                         friendName: o.origin.friendId,
@@ -670,7 +669,7 @@ async function runInnerDialogTurn(options) {
             signal: options?.signal,
             /* v8 ignore start -- attention queue: callback invoked by pipeline during pending drain; tested via attention-queue unit tests @preserve */
             onPendingDrained: (drained) => {
-                const outstandingObligations = (0, obligations_1.listActiveObligations)(agentName);
+                const outstandingObligations = (0, obligations_1.listActiveReturnObligations)(agentName);
                 attentionQueue = (0, attention_queue_1.buildAttentionQueue)({
                     drainedPending: drained,
                     outstandingObligations,

package/dist/senses/pipeline.js

@@ -57,7 +57,6 @@ const target_resolution_1 = require("../heart/target-resolution");
 const thoughts_1 = require("../heart/daemon/thoughts");
 const pending_1 = require("../mind/pending");
 const obligations_1 = require("../heart/obligations");
-const obligations_2 = require("../mind/obligations");
 const provider_failover_1 = require("../heart/provider-failover");
 const provider_ping_1 = require("../heart/provider-ping");
 const auth_flow_1 = require("../heart/daemon/auth-flow");
@@ -466,7 +465,7 @@ async function handleInboundTurn(input) {
                 targetCandidates,
                 innerReturnObligations: (() => {
                     try {
-                        return (0, obligations_2.listActiveObligations)((0, identity_1.getAgentName)());
+                        return (0, obligations_1.listActiveReturnObligations)((0, identity_1.getAgentName)());
                     }
                     catch {
                         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.202",
+  "version": "0.1.0-alpha.203",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",

package/dist/mind/obligations.js

@@ -1,138 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObligationsDir = getObligationsDir;
-exports.generateObligationId = generateObligationId;
-exports.createObligation = createObligation;
-exports.readObligation = readObligation;
-exports.advanceObligation = advanceObligation;
-exports.listActiveObligations = listActiveObligations;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const identity_1 = require("../heart/identity");
-const runtime_1 = require("../nerves/runtime");
-const sync_1 = require("../heart/sync");
-// ── Paths ────────────────────────────────────────────────────────
-function getObligationsDir(agentName) {
-    return path.join((0, identity_1.getAgentRoot)(agentName), "arc", "obligations", "inner");
-}
-// ── ID generation ────────────────────────────────────────────────
-function generateObligationId(timestamp) {
-    return `${timestamp}-${Math.random().toString(36).slice(2, 10)}`;
-}
-// ── Store operations ─────────────────────────────────────────────
-function createObligation(agentName, obligation) {
-    const dir = getObligationsDir(agentName);
-    fs.mkdirSync(dir, { recursive: true });
-    const filePath = path.join(dir, `${obligation.id}.json`);
-    fs.writeFileSync(filePath, JSON.stringify(obligation, null, 2), "utf8");
-    (0, sync_1.trackSyncWrite)(filePath);
-    (0, runtime_1.emitNervesEvent)({
-        event: "mind.obligation_created",
-        component: "mind",
-        message: "return obligation created",
-        meta: {
-            obligationId: obligation.id,
-            origin: `${obligation.origin.friendId}/${obligation.origin.channel}/${obligation.origin.key}`,
-            status: obligation.status,
-        },
-    });
-    return filePath;
-}
-function readObligation(agentName, obligationId) {
-    const dir = getObligationsDir(agentName);
-    try {
-        const raw = fs.readFileSync(path.join(dir, `${obligationId}.json`), "utf-8");
-        return JSON.parse(raw);
-    }
-    catch {
-        return null;
-    }
-}
-function advanceObligation(agentName, obligationId, update) {
-    const existing = readObligation(agentName, obligationId);
-    if (!existing)
-        return null;
-    const updated = {
-        ...existing,
-        status: update.status,
-        ...(update.startedAt !== undefined ? { startedAt: update.startedAt } : {}),
-        ...(update.returnedAt !== undefined ? { returnedAt: update.returnedAt } : {}),
-        ...(update.returnTarget !== undefined ? { returnTarget: update.returnTarget } : {}),
-    };
-    const dir = getObligationsDir(agentName);
-    const advancedFilePath = path.join(dir, `${obligationId}.json`);
-    fs.writeFileSync(advancedFilePath, JSON.stringify(updated, null, 2), "utf8");
-    (0, sync_1.trackSyncWrite)(advancedFilePath);
-    (0, runtime_1.emitNervesEvent)({
-        event: "mind.obligation_advanced",
-        component: "mind",
-        message: `obligation advanced to ${update.status}`,
-        meta: {
-            obligationId,
-            status: update.status,
-            ...(update.returnTarget ? { returnTarget: update.returnTarget } : {}),
-        },
-    });
-    return updated;
-}
-function listActiveObligations(agentName) {
-    const dir = getObligationsDir(agentName);
-    if (!fs.existsSync(dir))
-        return [];
-    let entries;
-    try {
-        entries = fs.readdirSync(dir);
-    }
-    catch {
-        return [];
-    }
-    const obligations = [];
-    for (const file of entries) {
-        if (!file.endsWith(".json"))
-            continue;
-        try {
-            const raw = fs.readFileSync(path.join(dir, file), "utf-8");
-            const parsed = JSON.parse(raw);
-            if (parsed.status === "queued" || parsed.status === "running") {
-                obligations.push(parsed);
-            }
-        }
-        catch {
-            // skip unparseable
-        }
-    }
-    return obligations.sort((a, b) => a.createdAt - b.createdAt);
-}