npm - @ouro.bot/cli - Versions diffs - 0.1.0-alpha.665 → 0.1.0-alpha.666 - Mend

@ouro.bot/cli 0.1.0-alpha.665 → 0.1.0-alpha.666

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/changelog.json +6 -0
package/dist/arc/flight-recorder.js +267 -4
package/dist/heart/core.js +167 -4
package/dist/heart/cross-chat-delivery.js +3 -2
package/dist/heart/daemon/cli-exec.js +50 -1
package/dist/heart/daemon/cli-help.js +1 -1
package/dist/heart/daemon/cli-parse.js +36 -2
package/dist/heart/daemon/daemon-entry.js +24 -5
package/dist/heart/daemon/daemon.js +10 -1
package/dist/heart/habits/habit-scheduler.js +24 -5
package/dist/heart/habits/habit-session.js +563 -0
package/dist/heart/mailbox/mailbox-http-hooks.js +2 -0
package/dist/heart/mailbox/mailbox-http-routes.js +40 -0
package/dist/heart/mailbox/mailbox-read.js +3 -1
package/dist/heart/mailbox/readers/runtime-readers.js +56 -0
package/dist/mailbox-ui/assets/index-CaTIFDmv.js +1 -0
package/dist/mailbox-ui/assets/index-Du_9G9WO.css +1 -0
package/dist/mailbox-ui/assets/vendor-CcN1XpQ9.js +61 -0
package/dist/mailbox-ui/index.html +3 -2
package/dist/repertoire/tools-notes.js +50 -0
package/dist/repertoire/tools-record.js +13 -0
package/dist/repertoire/tools-session.js +14 -0
package/dist/repertoire/tools-surface.js +11 -0
package/dist/repertoire/tools.js +7 -0
package/dist/senses/inner-dialog-worker.js +153 -69
package/dist/senses/inner-dialog.js +5 -3
package/dist/senses/pipeline.js +0 -9
package/dist/senses/surface-tool.js +2 -1
package/package.json +1 -1
package/dist/mailbox-ui/assets/index-BZ60na8O.js +0 -61
package/dist/mailbox-ui/assets/index-DG6Xf5uL.css +0 -1

package/dist/mailbox-ui/index.html CHANGED Viewed

@@ -6,8 +6,9 @@
     <meta name="color-scheme" content="dark" />
     <title>Ouro Mailbox</title>
     <meta name="description" content="The daemon-hosted shared orientation surface for agents alive on this machine." />
-    <script type="module" crossorigin src="/assets/index-BZ60na8O.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DG6Xf5uL.css">
+    <script type="module" crossorigin src="/assets/index-CaTIFDmv.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-CcN1XpQ9.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-Du_9G9WO.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/repertoire/tools-notes.js CHANGED Viewed

@@ -1,13 +1,57 @@
 "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.notesToolDefinitions = void 0;
 const child_process_1 = require("child_process");
+const path = __importStar(require("path"));
 const skills_1 = require("./skills");
 const config_1 = require("../heart/config");
 const runtime_1 = require("../nerves/runtime");
+const identity_1 = require("../heart/identity");
 const diary_1 = require("../mind/diary");
+const record_paths_1 = require("../mind/record-paths");
 const provenance_trust_1 = require("../mind/provenance-trust");
 const CLAUDE_READ_ONLY_TOOLS = "Read,Grep,Glob,LS";
+function bundleRelativeLocator(filePath, ctx) {
+    const agentRoot = ctx?.agentRoot ?? (0, identity_1.getAgentRoot)();
+    const relativePath = path.relative(agentRoot, filePath);
+    if (relativePath && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
+        return relativePath.split(path.sep).join("/");
+    }
+    return filePath.split(path.sep).join("/");
+}
 exports.notesToolDefinitions = [
     {
         tool: {
@@ -252,6 +296,12 @@ exports.notesToolDefinitions = [
                 about: typeof a.about === "string" ? a.about : undefined,
                 provenance,
             });
+            if (result.added > 0) {
+                ctx?.habitSession?.recordProducedRef?.({
+                    kind: "desk_record",
+                    locator: bundleRelativeLocator(path.join((0, record_paths_1.resolveRecordDiaryRoot)(), "facts.jsonl"), ctx),
+                });
+            }
             return `saved diary entry (added=${result.added}, skipped=${result.skipped})`;
         },
         summaryKeys: ["entry", "about"],

package/dist/repertoire/tools-record.js CHANGED Viewed

@@ -42,6 +42,7 @@ const note_search_1 = require("../mind/note-search");
 const record_paths_1 = require("../mind/record-paths");
 const types_1 = require("../mind/friends/types");
 const runtime_1 = require("../nerves/runtime");
+const identity_1 = require("../heart/identity");
 const NOTES_INDEX_VERSION = 1;
 const NOTE_SLUG_MAX_CHARS = 40;
 const DEFAULT_LIMIT = 5;
@@ -61,6 +62,14 @@ function hasRecordReadTrust(ctx) {
     const friend = ctx?.context?.friend;
     return Boolean(friend) && (0, types_1.isTrustedLevel)(friend?.trustLevel);
 }
+function bundleRelativeLocator(filePath, ctx) {
+    const agentRoot = ctx?.agentRoot ?? (0, identity_1.getAgentRoot)();
+    const relativePath = path.relative(agentRoot, filePath);
+    if (relativePath && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
+        return relativePath.split(path.sep).join("/");
+    }
+    return filePath.split(path.sep).join("/");
+}
 function normalizeTags(value) {
     if (value === undefined || value === null)
         return undefined;
@@ -371,6 +380,10 @@ exports.recordToolDefinitions = [
                 const savedPath = ensureUniquePath(notesDir, date, slugForContent(content));
                 fs.writeFileSync(savedPath, renderNote(createdAt, cappedContent, tags), "utf8");
                 await updateIndexForSavedNote(notesDir, indexPath, savedPath, provider);
+                ctx?.habitSession?.recordProducedRef?.({
+                    kind: "desk_record",
+                    locator: bundleRelativeLocator(savedPath, ctx),
+                });
                 (0, runtime_1.emitNervesEvent)({
                     component: "repertoire",
                     event: "repertoire.record_note_saved",

package/dist/repertoire/tools-session.js CHANGED Viewed

@@ -127,6 +127,19 @@ function renderCrossChatDeliveryStatus(target, result) {
         outcomeText: `${lead}\n${result.detail}`,
     }));
 }
+function normalizeHabitSendStatus(status) {
+    return status === "queued_for_later" ? "queued" : status;
+}
+function recordHabitSendAttempt(ctx, args, result) {
+    ctx?.habitSession?.recordSurfaceAttempt?.({
+        recipient: args.friendId,
+        channel: args.channel,
+        reason: result.status === "blocked" ? "blocked" : result.status === "failed" ? "other" : "status",
+        result: normalizeHabitSendStatus(result.status),
+        rawStatus: result.rawStatus ?? result.status,
+        ...(result.status === "blocked" || result.status === "failed" ? { error: result.detail } : {}),
+    });
+}
 async function deliverVoiceChannelMessage(request, agentName, initialAudio) {
     const result = await (0, outbound_1.placeTrustedFriendVoiceOutboundCall)({
         agentName,
@@ -724,6 +737,7 @@ exports.sessionToolDefinitions = [
                     voice: async (request) => deliverVoiceChannelMessage(request, agentName, voiceInitialAudio),
                 },
             });
+            recordHabitSendAttempt(ctx, { friendId, channel, key }, deliveryResult);
             return renderCrossChatDeliveryStatus(`${friendId} on ${channel}/${key}`, deliveryResult);
         },
         riskProfile: sendMessageRiskProfile,

package/dist/repertoire/tools-surface.js CHANGED Viewed

@@ -332,6 +332,17 @@ exports.surfaceToolDefinition = {
                 }
                 /* v8 ignore stop */
             },
+            onRouteResult: ({ targetFriendId, queueItem, result }) => {
+                ctx?.habitSession?.recordSurfaceAttempt?.({
+                    recipient: targetFriendId,
+                    channel: queueItem?.channel ?? args.channel ?? "surface",
+                    reason: result.status === "failed" ? "blocked" : "answer",
+                    result: result.status,
+                    rawStatus: result.status,
+                    ...(queueItem ? { routeKind: "originator" } : {}),
+                    ...(result.status === "failed" ? { error: result.detail ?? "surface route failed" } : {}),
+                });
+            },
         });
     },
     summaryKeys: ["content", "delegationId", "friendId", "channel"],

package/dist/repertoire/tools.js CHANGED Viewed

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.surfaceToolDef = exports.speakTool = exports.restTool = exports.ponderTool = exports.observeTool = exports.settleTool = exports.tools = void 0;
 exports.resetMcpDefinitions = resetMcpDefinitions;
 exports.getToolsForChannel = getToolsForChannel;
+exports.shellRiskProfile = shellRiskProfile;
+exports.riskProfileForTool = riskProfileForTool;
+exports.riskProfileForToolName = riskProfileForToolName;
 exports.execTool = execTool;
 exports.summarizeArgs = summarizeArgs;
 exports.buildToolResultSummary = buildToolResultSummary;
@@ -202,6 +205,10 @@ function riskProfileForTool(def, name, args) {
         return def.riskProfile(args);
     return def.riskProfile ?? { mutates: "none", risk: "low" };
 }
+function riskProfileForToolName(name, args) {
+    const def = findDefinition(name);
+    return def ? riskProfileForTool(def, name, args) : null;
+}
 function orientationHoldMessage(name, profile, reason) {
     return `orientation hold: ${reason} Available: orientation_get plus read-only inspection tools like trip_status, query_session, read_config, read_file, grep, search_facts, consult_diary, and consult_notes. Resolve the referent/correction, then retry ${name} if the action is still correct. Blocked ${mutationKindsFor(profile).join(", ")}. ${profile.reason}.`;
 }

package/dist/senses/inner-dialog-worker.js CHANGED Viewed

@@ -36,13 +36,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HEARTBEAT_OK_REST_SUPPRESSION_MS = exports.HABIT_RECURSION_BURST_THRESHOLD = exports.HABIT_RECURSION_BURST_WINDOW_MS = exports.HABIT_RECURSION_MIN_INTERVAL_MS = exports.MAX_CONSECUTIVE_INSTINCT_TURNS = void 0;
 exports.createInnerDialogWorker = createInnerDialogWorker;
 exports.startInnerDialogWorker = startInnerDialogWorker;
+const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const inner_dialog_1 = require("./inner-dialog");
 const runtime_1 = require("../nerves/runtime");
 const identity_1 = require("../heart/identity");
 const pending_1 = require("../mind/pending");
-const habit_runtime_state_1 = require("../heart/habits/habit-runtime-state");
+const habit_parser_1 = require("../heart/habits/habit-parser");
+const habit_session_1 = require("../heart/habits/habit-session");
 const flight_recorder_1 = require("../arc/flight-recorder");
+const store_file_1 = require("../mind/friends/store-file");
+const tools_base_1 = require("../repertoire/tools-base");
+const tools_surface_1 = require("../repertoire/tools-surface");
+const tools_1 = require("../repertoire/tools");
 /**
  * Cap on consecutive `instinct` follow-on turns triggered by `hasPendingWork()`
  * with no externally-queued work in between. Without this cap, a turn that
@@ -83,62 +89,87 @@ function isHeartbeatOkRestResult(result) {
     const maybeResult = result;
     return maybeResult.turnOutcome === "rested" && maybeResult.restStatus === "HEARTBEAT_OK";
 }
-function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runInnerDialogTurn)(options), hasPendingWork = () => (0, pending_1.hasPendingMessages)((0, pending_1.getInnerDialogPendingDir)((0, identity_1.getAgentName)())), nowSource = () => Date.now()) {
+function fallbackHabitFile(habitName) {
+    return {
+        name: habitName,
+        title: habitName,
+        cadence: null,
+        status: "active",
+        lastRun: null,
+        created: null,
+        tools: [],
+        origin: null,
+        surface: { family: false, originator: false, extra: [] },
+        body: "",
+    };
+}
+function readHabitForRun(agentRoot, habitName, errors) {
+    const habitPath = path.join(agentRoot, "habits", `${habitName}.md`);
+    try {
+        return (0, habit_parser_1.parseHabitFile)(fs.readFileSync(habitPath, "utf-8"), habitPath);
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        errors.push(`habit file could not be read: ${reason}`);
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.habit_file_read_error",
+            message: "habit file could not be read for habit session",
+            meta: { habitName, habitPath, reason },
+        });
+        return fallbackHabitFile(habitName);
+    }
+}
+async function prepareHabitRun(habitName, trigger, startedAt) {
+    const agentRoot = (0, identity_1.getAgentRoot)();
+    const errors = [];
+    const habit = readHabitForRun(agentRoot, habitName, errors);
+    const runId = (0, flight_recorder_1.createHabitRunId)(habitName, new Date(startedAt));
+    const paths = (0, habit_session_1.createHabitSessionPaths)(agentRoot, runId, habit.name);
+    const friendStore = new store_file_1.FileFriendStore(path.join(agentRoot, "friends"));
+    const permissionEnvelope = await (0, habit_session_1.normalizeHabitPermissionEnvelope)(habit, { agentRoot, friendStore });
+    const toolPolicy = (0, habit_session_1.filterHabitToolsForEnvelope)([...tools_base_1.baseToolDefinitions, tools_surface_1.surfaceToolDefinition], habit.tools ?? null, permissionEnvelope, riskProfileForHabitPolicy);
+    return {
+        agentRoot,
+        habit,
+        runId,
+        trigger,
+        startedAt,
+        paths,
+        permissionEnvelope,
+        toolPolicy,
+        friendStore,
+        results: [],
+        errors,
+        producedRefs: [],
+        surfaceAttempts: [],
+    };
+}
+function riskProfileForHabitPolicy(definition, name) {
+    const probeArgs = name === "shell" ? { command: "touch /tmp/habit-policy-probe" } : {};
+    return (0, tools_1.riskProfileForTool)(definition, name, probeArgs);
+}
+function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runInnerDialogTurn)(options), hasPendingWork = (pendingDir) => (0, pending_1.hasPendingMessages)(pendingDir ?? (0, pending_1.getInnerDialogPendingDir)((0, identity_1.getAgentName)())), nowSource = () => Date.now()) {
     let running = false;
     const queue = [];
     const lastFireByHabit = new Map();
     const recentHabitFires = [];
     let heartbeatOkRestedAt = null;
-    function habitOutcomeForTurn(result, errors) {
-        if (errors.length > 0)
-            return { outcome: "error", producedRefs: [] };
-        const toolNames = new Set();
-        if (result && typeof result === "object" && Array.isArray(result.messages)) {
-            for (const message of result.messages) {
-                const toolCalls = message.tool_calls;
-                if (!Array.isArray(toolCalls))
-                    continue;
-                for (const call of toolCalls) {
-                    const functionName = call.function?.name;
-                    if (typeof functionName === "string")
-                        toolNames.add(functionName);
-                }
-            }
-        }
-        if (toolNames.has("send_message") || toolNames.has("surface")) {
-            return { outcome: "surfaced", producedRefs: [{ kind: "surface", locator: "tool:send_message_or_surface" }] };
-        }
-        if (toolNames.has("diary_write") || toolNames.has("note")) {
-            return { outcome: "wrote_record", producedRefs: [{ kind: "desk_record", locator: "desk/_record" }] };
-        }
-        if ([...toolNames].some((name) => name.startsWith("mcp__desk__"))) {
-            return { outcome: "updated_desk", producedRefs: [{ kind: "desk_task", locator: "desk/" }] };
-        }
-        return { outcome: "no_change", producedRefs: [] };
-    }
-    function recordHabitCompletion(habitName, startedAt = new Date(nowSource()).toISOString(), endedAt = startedAt, trigger = "overdue", result, errors = []) {
-        try {
-            const agentRoot = (0, identity_1.getAgentRoot)();
-            (0, habit_runtime_state_1.recordHabitRun)(agentRoot, habitName, endedAt, {
-                definitionPath: path.join(agentRoot, "habits", `${habitName}.md`),
-            });
-            const { outcome, producedRefs } = habitOutcomeForTurn(result, errors);
-            (0, flight_recorder_1.writeHabitRunReceipt)(agentRoot, {
-                schemaVersion: 1,
-                runId: (0, flight_recorder_1.createHabitRunId)(habitName, new Date(startedAt)),
-                habitName,
-                trigger,
-                startedAt,
-                endedAt,
-                outcome,
-                producedRefs,
-                surfaceAttempts: [],
-                errors,
-            });
-        }
-        catch {
-            // Habit file/state may be unavailable during the turn — skip gracefully
-        }
+    function recordHabitCompletion(habitRun, endedAt = habitRun.startedAt) {
+        (0, habit_session_1.completeHabitRun)({
+            agentRoot: habitRun.agentRoot,
+            habit: habitRun.habit,
+            runId: habitRun.runId,
+            trigger: habitRun.trigger,
+            startedAt: habitRun.startedAt,
+            endedAt,
+            permissionEnvelope: habitRun.permissionEnvelope,
+            toolPolicy: habitRun.toolPolicy,
+            producedRefs: habitRun.producedRefs,
+            surfaceAttempts: habitRun.surfaceAttempts,
+            errors: habitRun.errors,
+        });
     }
     function clearHeartbeatRestShield() {
         heartbeatOkRestedAt = null;
@@ -154,9 +185,11 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
         }
         return true;
     }
-    function reuseHeartbeatOkRest(habitName) {
+    async function reuseHeartbeatOkRest(habitName) {
         const nowIso = new Date(nowSource()).toISOString();
-        recordHabitCompletion(habitName, nowIso, nowIso, "overdue", { turnOutcome: "rested", restStatus: "HEARTBEAT_OK" });
+        const habitRun = await prepareHabitRun(habitName, "overdue", nowIso);
+        habitRun.results.push({ turnOutcome: "rested", restStatus: "HEARTBEAT_OK" });
+        recordHabitCompletion(habitRun, nowIso);
         (0, runtime_1.emitNervesEvent)({
             level: "info",
             component: "senses",
@@ -220,19 +253,54 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
             let nextHabitName = habitName;
             let nextAwaitName = awaitName;
             let nextTrigger = trigger;
+            let nextHabitRun = null;
             let consecutiveInstinctTurns = reason === "instinct" ? 1 : 0;
             runLoop: do {
                 const currentReason = nextReason;
                 const currentHabitName = nextHabitName;
                 const currentTrigger = nextTrigger ?? "overdue";
-                const habitStartedAt = currentReason === "habit" && currentHabitName ? new Date(nowSource()).toISOString() : null;
+                const currentHabitRun = currentReason === "habit" && currentHabitName
+                    ? nextHabitRun && nextHabitRun.habit.name === currentHabitName
+                        ? nextHabitRun
+                        : await prepareHabitRun(currentHabitName, currentTrigger, new Date(nowSource()).toISOString())
+                    : null;
+                nextHabitRun = null;
+                let currentHabitRunFinalized = false;
+                const finalizeCurrentHabitRun = () => {
+                    if (!currentHabitRun || currentHabitRunFinalized)
+                        return;
+                    recordHabitCompletion(currentHabitRun, new Date(nowSource()).toISOString());
+                    currentHabitRunFinalized = true;
+                };
                 const turnErrors = [];
                 if (!(currentReason === "habit" && currentHabitName === "heartbeat")) {
                     clearHeartbeatRestShield();
                 }
                 let turnResult;
                 try {
-                    turnResult = await runTurn({ reason: nextReason, taskId: nextTaskId, habitName: nextHabitName, awaitName: nextAwaitName });
+                    const turnOptions = {
+                        reason: nextReason,
+                        taskId: nextTaskId,
+                        habitName: nextHabitName,
+                        awaitName: nextAwaitName,
+                        ...(currentHabitRun
+                            ? {
+                                trigger: currentHabitRun.trigger,
+                                habitSession: {
+                                    runId: currentHabitRun.runId,
+                                    sessionPath: currentHabitRun.paths.sessionPath,
+                                    pendingDir: currentHabitRun.paths.pendingDir,
+                                    permissionEnvelope: currentHabitRun.permissionEnvelope,
+                                    toolPolicy: currentHabitRun.toolPolicy,
+                                    friendStore: currentHabitRun.friendStore,
+                                    recordProducedRef: (ref) => { currentHabitRun.producedRefs.push(ref); },
+                                    recordSurfaceAttempt: (attempt) => { currentHabitRun.surfaceAttempts.push(attempt); },
+                                    recordError: (error) => { currentHabitRun.errors.push(error); },
+                                },
+                            }
+                            : {}),
+                    };
+                    turnResult = await runTurn(turnOptions);
                 }
                 catch (error) {
                     clearHeartbeatRestShield();
@@ -251,21 +319,23 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
                 if (currentReason === "habit" && currentHabitName === "heartbeat") {
                     heartbeatOkRestedAt = isHeartbeatOkRestResult(turnResult) ? nowSource() : null;
                 }
-                // Record lastRun after a habit turn without dirtying the tracked habit file.
-                if (currentReason === "habit" && currentHabitName && habitStartedAt) {
-                    recordHabitCompletion(currentHabitName, habitStartedAt, new Date(nowSource()).toISOString(), currentTrigger, turnResult, turnErrors);
+                if (currentHabitRun) {
+                    currentHabitRun.results.push(turnResult);
+                    currentHabitRun.errors.push(...turnErrors);
                 }
                 // Drain queue first. Externally-queued work resets the instinct cap
                 // because a real outside trigger arrived between turns.
                 while (queue.length > 0) {
                     const next = queue.shift();
                     if (next.reason === "habit" && next.habitName === "heartbeat" && shouldReuseHeartbeatOkRest(next.habitName)) {
-                        reuseHeartbeatOkRest(next.habitName);
+                        finalizeCurrentHabitRun();
+                        await reuseHeartbeatOkRest(next.habitName);
                         continue;
                     }
                     if (!(next.reason === "habit" && next.habitName === "heartbeat")) {
                         clearHeartbeatRestShield();
                     }
+                    finalizeCurrentHabitRun();
                     nextReason = next.reason;
                     nextTaskId = next.taskId;
                     nextHabitName = next.habitName;
@@ -278,7 +348,7 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
                 // tool that writes to the inner-dialog pending dir during a turn
                 // would cause hasPendingWork() to be true here, producing a
                 // self-sustaining "instinct" loop with no external input. Cap it.
-                if (hasPendingWork()) {
+                if (hasPendingWork(currentHabitRun?.paths.pendingDir)) {
                     clearHeartbeatRestShield();
                     if (consecutiveInstinctTurns >= exports.MAX_CONSECUTIVE_INSTINCT_TURNS) {
                         (0, runtime_1.emitNervesEvent)({
@@ -292,16 +362,30 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
                                 lastReason: nextReason,
                             },
                         });
+                        finalizeCurrentHabitRun();
                         break;
                     }
-                    consecutiveInstinctTurns += 1;
-                    nextReason = "instinct";
-                    nextTaskId = undefined;
-                    nextHabitName = undefined;
-                    nextAwaitName = undefined;
-                    nextTrigger = undefined;
+                    if (currentReason === "habit" && currentHabitName && currentHabitRun) {
+                        consecutiveInstinctTurns += 1;
+                        nextReason = "habit";
+                        nextTaskId = undefined;
+                        nextHabitName = currentHabitName;
+                        nextAwaitName = undefined;
+                        nextTrigger = currentTrigger;
+                        nextHabitRun = currentHabitRun;
+                    }
+                    else {
+                        finalizeCurrentHabitRun();
+                        consecutiveInstinctTurns += 1;
+                        nextReason = "instinct";
+                        nextTaskId = undefined;
+                        nextHabitName = undefined;
+                        nextAwaitName = undefined;
+                        nextTrigger = undefined;
+                    }
                     continue;
                 }
+                finalizeCurrentHabitRun();
                 break;
             } while (true);
         }
@@ -317,7 +401,7 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
             /* v8 ignore next -- defensive fallback: live habit dispatch always sets habitName @preserve */
             const habitName = maybeMessage.habitName ?? "(unnamed)";
             if (shouldReuseHeartbeatOkRest(habitName)) {
-                reuseHeartbeatOkRest(habitName);
+                await reuseHeartbeatOkRest(habitName);
                 return;
             }
             recordHabitFireForRecursion(habitName);
@@ -335,7 +419,7 @@ function createInnerDialogWorker(runTurn = (options) => (0, inner_dialog_1.runIn
         if (maybeMessage.type === "heartbeat") {
             // Backward compatibility: heartbeat -> habit/heartbeat
             if (shouldReuseHeartbeatOkRest("heartbeat")) {
-                reuseHeartbeatOkRest("heartbeat");
+                await reuseHeartbeatOkRest("heartbeat");
                 return;
             }
             recordHabitFireForRecursion("heartbeat");

package/dist/senses/inner-dialog.js CHANGED Viewed

@@ -645,7 +645,7 @@ function buildHabitSurfacePolicy(origin, surface) {
 async function runInnerDialogTurn(options) {
     const now = options?.now ?? (() => new Date());
     const reason = options?.reason ?? "instinct";
-    const sessionFilePath = innerDialogSessionPath();
+    const sessionFilePath = options?.habitSession?.sessionPath ?? innerDialogSessionPath();
     const agentName = (0, identity_1.getAgentName)();
     writeInnerDialogRuntimeState(sessionFilePath, {
         status: "running",
@@ -661,7 +661,7 @@ async function runInnerDialogTurn(options) {
             resting: false,
             lastHeartbeatAt: now().toISOString(),
         };
-        const pendingDir = (0, pending_1.getInnerDialogPendingDir)(agentName);
+        const pendingDir = options?.habitSession?.pendingDir ?? (0, pending_1.getInnerDialogPendingDir)(agentName);
         const shouldUseHeldReturnWake = !options?.taskId && reason !== "habit" && reason !== "await"
             ? (0, obligations_1.listActiveReturnObligations)(agentName).length > 0
             : false;
@@ -669,7 +669,7 @@ async function runInnerDialogTurn(options) {
         let userContent;
         let habitTools;
         let habitParsedSuccessfully = false;
-        if (existingMessages.length === 0) {
+        if (existingMessages.length === 0 && !(reason === "habit" && options?.habitName)) {
             // Fresh session: bootstrap message with non-canonical cleanup nudge
             const aspirations = readAspirations((0, identity_1.getAgentRoot)());
             const nonCanonical = (0, bundle_manifest_1.findNonCanonicalBundlePaths)((0, identity_1.getAgentRoot)());
@@ -917,7 +917,9 @@ async function runInnerDialogTurn(options) {
                 toolContext: {
                     signin: async () => undefined,
                     delegatedOrigins: attentionQueue,
+                    ...(options?.habitSession ? { habitSession: options.habitSession } : {}),
                 },
+                ...(options?.habitSession ? { habitSession: options.habitSession } : {}),
             },
         });
         // Post-turn routeDelegatedCompletion removed: delivery is now inline via surface tool.

package/dist/senses/pipeline.js CHANGED Viewed

@@ -48,7 +48,6 @@ const continuity_1 = require("./continuity");
 const manager_1 = require("../heart/bridges/manager");
 const identity_1 = require("../heart/identity");
 const auth_flow_1 = require("../heart/auth/auth-flow");
-const socket_client_1 = require("../heart/daemon/socket-client");
 const active_work_1 = require("../heart/active-work");
 const delegation_1 = require("../heart/delegation");
 const obligations_1 = require("../arc/obligations");
@@ -949,14 +948,6 @@ async function handleInboundTurn(input) {
                 friendId: resolvedContext.friend.id,
             },
         });
-        // DRY cross-session awareness: notify inner dialog that activity happened on another channel
-        // Inner dialog's next checkpoint will include this session's state
-        if (input.channel !== "inner") {
-            try {
-                (0, socket_client_1.requestInnerWake)((0, identity_1.getAgentName)(), existingToolContext?.daemonSocketPath).catch(/* v8 ignore next */ () => { });
-            }
-            catch { /* getAgentName may fail in test environments */ }
-        }
         return {
             resolvedContext,
             gateResult,

package/dist/senses/surface-tool.js CHANGED Viewed

@@ -4,7 +4,7 @@ exports.handleSurface = handleSurface;
 const attention_queue_1 = require("./attention-queue");
 const runtime_1 = require("../nerves/runtime");
 async function handleSurface(input) {
-    const { content, delegationId, friendId, deliveryHint, queue, routeToFriend, advanceObligation, completePonderPacket, fulfillHeartObligation, } = input;
+    const { content, delegationId, friendId, deliveryHint, queue, routeToFriend, advanceObligation, completePonderPacket, fulfillHeartObligation, onRouteResult, } = input;
     // Resolve target friend
     let targetFriendId;
     let queueItem;
@@ -68,6 +68,7 @@ async function handleSurface(input) {
             ...(result.detail ? { detail: result.detail } : {}),
         },
     });
+    onRouteResult?.({ targetFriendId, queueItem, result });
     // On successful routing with delegationId:
     // 1. Advance obligation to "returned" (disk FIRST — crash safety)
     // 2. Dequeue from process-local queue (AFTER obligation advance)

package/package.json CHANGED Viewed

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