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

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.205",
+      "changes": [
+        "refactor: enforce subsystem boundaries — eliminate all heart/ and nerves/ static imports from senses/, move AttentionItem type to heart/, surfaceToolDef to repertoire/, SteeringFollowUpEffect to heart/turn-coordinator, inline BlueBubbles runtime state reader in daemon"
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.204",
+      "changes": [
+        "refactor: introduce TurnContext snapshot — centralize state assembly from pipeline.ts into buildTurnContext(), thread pre-read state through prompt assembly to eliminate ad-hoc filesystem reads"
+      ]
+    },
     {
       "version": "0.1.0-alpha.203",
       "changes": [

package/dist/heart/agent-entry.js

@@ -1,4 +1,37 @@
 "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 });
 // Unified agent runtime entrypoint.
 // Requires --agent before importing runtime modules that rely on identity.
@@ -7,10 +40,12 @@ if (!process.argv.includes("--agent")) {
     console.error("Missing required --agent <name> argument.\nUsage: node dist/heart/agent-entry.js --agent ouroboros");
     process.exit(1);
 }
-const inner_dialog_worker_1 = require("../senses/inner-dialog-worker");
 const cli_logging_1 = require("../nerves/cli-logging");
 (0, cli_logging_1.configureCliRuntimeLogger)("self");
-(0, inner_dialog_worker_1.startInnerDialogWorker)().catch((error) => {
+// Dynamic import: agent-entry is boot-time wiring that starts a sense process.
+// Using dynamic import avoids a static heart/ -> senses/ dependency.
+Promise.resolve().then(() => __importStar(require("../senses/inner-dialog-worker"))).then(({ startInnerDialogWorker }) => startInnerDialogWorker())
+    .catch((error) => {
     // eslint-disable-next-line no-console -- fatal startup guard for worker process
     console.error(error instanceof Error ? error.message : String(error));
     process.exit(1);

package/dist/heart/attention-types.js

@@ -0,0 +1,8 @@
+"use strict";
+/**
+ * Shared attention queue types.
+ *
+ * Canonical home for the AttentionItem interface — consumed by heart/, repertoire/, nerves/, and senses/.
+ * Placed in heart/ because attention is a turn-coordination concern.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/heart/core.js

@@ -18,7 +18,7 @@ const config_1 = require("./config");
 const identity_1 = require("./identity");
 const tools_1 = require("../repertoire/tools");
 const channel_1 = require("../mind/friends/channel");
-const surface_tool_1 = require("../senses/surface-tool");
+const tools_2 = require("../repertoire/tools");
 const runtime_1 = require("../nerves/runtime");
 const context_1 = require("../mind/context");
 const prompt_1 = require("../mind/prompt");
@@ -148,11 +148,11 @@ function getProviderDisplayLabel(facing = "human") {
     return providerLabelBuilders[provider]();
 }
 // Re-export tools, execTool, summarizeArgs from ./tools for backward compat
-var tools_2 = require("../repertoire/tools");
-Object.defineProperty(exports, "tools", { enumerable: true, get: function () { return tools_2.tools; } });
-Object.defineProperty(exports, "execTool", { enumerable: true, get: function () { return tools_2.execTool; } });
-Object.defineProperty(exports, "summarizeArgs", { enumerable: true, get: function () { return tools_2.summarizeArgs; } });
-Object.defineProperty(exports, "getToolsForChannel", { enumerable: true, get: function () { return tools_2.getToolsForChannel; } });
+var tools_3 = require("../repertoire/tools");
+Object.defineProperty(exports, "tools", { enumerable: true, get: function () { return tools_3.tools; } });
+Object.defineProperty(exports, "execTool", { enumerable: true, get: function () { return tools_3.execTool; } });
+Object.defineProperty(exports, "summarizeArgs", { enumerable: true, get: function () { return tools_3.summarizeArgs; } });
+Object.defineProperty(exports, "getToolsForChannel", { enumerable: true, get: function () { return tools_3.getToolsForChannel; } });
 // Re-export streaming functions for backward compat
 var streaming_1 = require("./streaming");
 Object.defineProperty(exports, "streamChatCompletion", { enumerable: true, get: function () { return streaming_1.streamChatCompletion; } });
@@ -530,7 +530,7 @@ async function runAgent(messages, callbacks, channel, signal, options) {
         const activeTools = [
             ...filteredBaseTools,
             tools_1.ponderTool,
-            ...(isInnerDialog ? [surface_tool_1.surfaceToolDef, tools_1.restTool] : []),
+            ...(isInnerDialog ? [tools_2.surfaceToolDef, tools_1.restTool] : []),
             ...((currentContext?.isGroupChat || options?.isReactionSignal) && !isInnerDialog ? [tools_1.observeTool] : []),
             ...(!isInnerDialog ? [tools_1.settleTool] : []),
         ];

package/dist/heart/daemon/daemon.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OuroDaemon = void 0;
 exports.killOrphanProcesses = killOrphanProcesses;
 exports.writePidfile = writePidfile;
+exports.handleAgentSenseTurn = handleAgentSenseTurn;
 const fs = __importStar(require("fs"));
 const net = __importStar(require("net"));
 const os = __importStar(require("os"));
@@ -177,6 +178,33 @@ function parseIncomingCommand(raw) {
     }
     return parsed;
 }
+/**
+ * Handle agent.senseTurn command: runs a full agent turn via the daemon process.
+ * Dynamic import lazy-loads shared-turn. Hot-reload works because ouro dev
+ * restarts the daemon process (fresh module cache).
+ */
+async function handleAgentSenseTurn(command) {
+    try {
+        const { runSenseTurn } = await Promise.resolve().then(() => __importStar(require("../../senses/shared-turn")));
+        const result = await runSenseTurn({
+            agentName: command.agent,
+            channel: command.channel,
+            sessionKey: command.sessionKey,
+            friendId: command.friendId,
+            userMessage: command.message,
+        });
+        return {
+            ok: true,
+            message: result.response,
+            data: { ponderDeferred: result.ponderDeferred },
+        };
+    }
+    catch (error) {
+        /* v8 ignore next -- branch: String(error) fallback only for non-Error throws @preserve */
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return { ok: false, error: `sense turn failed: ${errorMessage}` };
+    }
+}
 class OuroDaemon {
     socketPath;
     processManager;
@@ -683,6 +711,9 @@ class OuroDaemon {
                 return (0, agent_service_1.handleAgentReportBlocker)(command);
             case "agent.reportComplete":
                 return (0, agent_service_1.handleAgentReportComplete)(command);
+            case "agent.senseTurn":
+                return handleAgentSenseTurn(command);
+            /* v8 ignore stop */
             case "cron.list": {
                 const jobs = this.scheduler.listJobs();
                 const summary = jobs.length === 0

package/dist/heart/daemon/mcp-server.js

@@ -38,7 +38,6 @@ exports.getToolSchemas = getToolSchemas;
 const socket_client_1 = require("./socket-client");
 const agentService = __importStar(require("./agent-service"));
 const runtime_1 = require("../../nerves/runtime");
-const shared_turn_1 = require("../../senses/shared-turn");
 const session_id_resolver_1 = require("./session-id-resolver");
 const pending_1 = require("../../mind/pending");
 /**
@@ -249,19 +248,22 @@ function createMcpServer(options) {
             const message = toolArgs.message ?? "";
             /* v8 ignore stop */
             try {
-                const result = await (0, shared_turn_1.runSenseTurn)({
-                    agentName: agent,
+                const response = await (0, socket_client_1.sendDaemonCommand)(socketPath, {
+                    kind: "agent.senseTurn",
+                    agent,
+                    friendId,
                     channel: "mcp",
                     sessionKey: sessionId,
-                    friendId,
-                    userMessage: message,
+                    message,
                 });
+                /* v8 ignore next -- branch: ?? fallback for empty daemon response @preserve */
+                const text = response.message ?? "(empty response)";
                 writeResponse({
                     jsonrpc: "2.0",
                     id: request.id,
                     result: {
-                        content: [{ type: "text", text: result.response }],
-                        isError: false,
+                        content: [{ type: "text", text }],
+                        isError: !response.ok,
                     },
                 });
             }
@@ -269,11 +271,17 @@ function createMcpServer(options) {
                 /* v8 ignore start — instanceof guard defensive; thrown errors are always Error */
                 const errorMessage = error instanceof Error ? error.message : String(error);
                 /* v8 ignore stop */
+                /* v8 ignore start -- daemon-down detection: only triggers with real socket I/O @preserve */
+                const isDaemonDown = errorMessage.includes("ECONNREFUSED") || errorMessage.includes("ENOENT");
+                const userMessage = isDaemonDown
+                    ? "The daemon is not running. Start it with `ouro up` (production) or `ouro dev` (development), then retry."
+                    : `Error: ${errorMessage}`;
+                /* v8 ignore stop */
                 writeResponse({
                     jsonrpc: "2.0",
                     id: request.id,
                     result: {
-                        content: [{ type: "text", text: `Error: ${errorMessage}` }],
+                        content: [{ type: "text", text: userMessage }],
                         isError: true,
                     },
                 });
@@ -306,7 +314,7 @@ function createMcpServer(options) {
             }
             return;
         }
-        // ── delegate: full conversation turn via runSenseTurn ──
+        // ── delegate: full conversation turn via daemon ──
         if (toolName === "delegate") {
             /* v8 ignore start — ?? fallback defensive; MCP clients always send task */
             const task = toolArgs.task ?? "";
@@ -314,19 +322,22 @@ function createMcpServer(options) {
             const context = toolArgs.context;
             const delegateMessage = context ? `[delegate] ${task}\n\ncontext: ${context}` : `[delegate] ${task}`;
             try {
-                const result = await (0, shared_turn_1.runSenseTurn)({
-                    agentName: agent,
+                const response = await (0, socket_client_1.sendDaemonCommand)(socketPath, {
+                    kind: "agent.senseTurn",
+                    agent,
+                    friendId,
                     channel: "mcp",
                     sessionKey: sessionId,
-                    friendId,
-                    userMessage: delegateMessage,
+                    message: delegateMessage,
                 });
+                /* v8 ignore next -- branch: ?? fallback for empty daemon response @preserve */
+                const text = response.message ?? "(empty response)";
                 writeResponse({
                     jsonrpc: "2.0",
                     id: request.id,
                     result: {
-                        content: [{ type: "text", text: result.response }],
-                        isError: false,
+                        content: [{ type: "text", text }],
+                        isError: !response.ok,
                     },
                 });
             }
@@ -334,11 +345,17 @@ function createMcpServer(options) {
                 /* v8 ignore start — instanceof guard defensive; thrown errors are always Error */
                 const errorMessage = error instanceof Error ? error.message : String(error);
                 /* v8 ignore stop */
+                /* v8 ignore start -- daemon-down detection: only triggers with real socket I/O @preserve */
+                const isDaemonDown = errorMessage.includes("ECONNREFUSED") || errorMessage.includes("ENOENT");
+                const userMessage = isDaemonDown
+                    ? "The daemon is not running. Start it with `ouro up` (production) or `ouro dev` (development), then retry."
+                    : `Error: ${errorMessage}`;
+                /* v8 ignore stop */
                 writeResponse({
                     jsonrpc: "2.0",
                     id: request.id,
                     result: {
-                        content: [{ type: "text", text: `Error: ${errorMessage}` }],
+                        content: [{ type: "text", text: userMessage }],
                         isError: true,
                     },
                 });

package/dist/heart/daemon/sense-manager.js

@@ -38,7 +38,6 @@ const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../../nerves/runtime");
-const bluebubbles_runtime_state_1 = require("../../senses/bluebubbles-runtime-state");
 const identity_1 = require("../identity");
 const sense_truth_1 = require("../sense-truth");
 const process_manager_1 = require("./process-manager");
@@ -187,13 +186,35 @@ function blueBubblesRuntimeStateIsFresh(lastCheckedAt, now = Date.now()) {
     }
     return checkedAt >= now - BLUEBUBBLES_RUNTIME_FRESHNESS_WINDOW_MS;
 }
+function readBlueBubblesRuntimeJson(runtimePath) {
+    try {
+        const raw = fs.readFileSync(runtimePath, "utf-8");
+        const parsed = JSON.parse(raw);
+        /* v8 ignore start -- branches: ternary fallbacks for missing/malformed BB runtime fields @preserve */
+        return {
+            upstreamStatus: parsed.upstreamStatus === "ok" || parsed.upstreamStatus === "error"
+                ? parsed.upstreamStatus
+                : "unknown",
+            detail: typeof parsed.detail === "string" && parsed.detail.trim()
+                ? parsed.detail
+                : "startup health probe pending",
+            lastCheckedAt: typeof parsed.lastCheckedAt === "string" ? parsed.lastCheckedAt : undefined,
+        };
+        /* v8 ignore stop */
+        /* v8 ignore start -- defensive: catch for missing/corrupt BB runtime state file @preserve */
+    }
+    catch {
+        return { upstreamStatus: "unknown", detail: "startup health probe pending" };
+    }
+    /* v8 ignore stop */
+}
 function readBlueBubblesRuntimeFacts(agent, bundlesRoot, snapshot) {
     const agentRoot = path.join(bundlesRoot, `${agent}.ouro`);
     const runtimePath = path.join(agentRoot, "state", "senses", "bluebubbles", "runtime.json");
     if (!fs.existsSync(runtimePath)) {
         return { runtime: snapshot?.runtime };
     }
-    const state = (0, bluebubbles_runtime_state_1.readBlueBubblesRuntimeState)(agent, agentRoot);
+    const state = readBlueBubblesRuntimeJson(runtimePath);
     if (!blueBubblesRuntimeStateIsFresh(state.lastCheckedAt)) {
         return { runtime: snapshot?.runtime };
     }

package/dist/heart/turn-context.js

@@ -0,0 +1,358 @@
+"use strict";
+/**
+ * TurnContext: a single pre-read snapshot of all state sources needed
+ * by the inbound-turn pipeline and prompt assembly.
+ *
+ * Before this module existed, pipeline.ts read ~10 state sources inline
+ * and prompt.ts did several ad-hoc filesystem reads. This centralizes
+ * all reads into one place so the rest of the turn is pure derivation.
+ */
+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.buildTurnContext = buildTurnContext;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const runtime_1 = require("../nerves/runtime");
+const manager_1 = require("./bridges/manager");
+const identity_1 = require("./identity");
+const tasks_1 = require("../repertoire/tasks");
+const coding_1 = require("../repertoire/coding");
+const session_activity_1 = require("./session-activity");
+const thoughts_1 = require("./daemon/thoughts");
+const pending_1 = require("../mind/pending");
+const obligations_1 = require("./obligations");
+const target_resolution_1 = require("./target-resolution");
+const episodes_1 = require("../mind/episodes");
+const cares_1 = require("./cares");
+const config_1 = require("./config");
+const daemon_health_1 = require("./daemon/daemon-health");
+const prompt_1 = require("../mind/prompt");
+// ── Helpers ─────────────────────────────────────────────────────────
+const DAEMON_SOCKET_PATH = "/tmp/ouroboros-daemon.sock";
+function isLiveCodingSessionStatus(status) {
+    return status === "spawning"
+        || status === "running"
+        || status === "waiting_input"
+        || status === "stalled";
+}
+function emptyTaskBoard() {
+    return {
+        compact: "",
+        full: "",
+        byStatus: {
+            drafting: [],
+            processing: [],
+            validating: [],
+            collaborating: [],
+            paused: [],
+            blocked: [],
+            done: [],
+            cancelled: [],
+        },
+        issues: [],
+        actionRequired: [],
+        unresolvedDependencies: [],
+        activeSessions: [],
+        activeBridges: [],
+    };
+}
+function readInnerWorkState() {
+    const defaultJob = {
+        status: "idle",
+        content: null,
+        origin: null,
+        mode: "reflect",
+        obligationStatus: null,
+        surfacedResult: null,
+        queuedAt: null,
+        startedAt: null,
+        surfacedAt: null,
+    };
+    try {
+        const agentRoot = (0, identity_1.getAgentRoot)();
+        const pendingDir = (0, pending_1.getInnerDialogPendingDir)((0, identity_1.getAgentName)());
+        const sessionPath = (0, thoughts_1.getInnerDialogSessionPath)(agentRoot);
+        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_1.readPendingObligations)(agentRoot).length > 0;
+        return {
+            status: dialogStatus.processing === "started" ? "running" : "idle",
+            hasPending: dialogStatus.queue !== "clear",
+            origin: dialogStatus.origin,
+            contentSnippet: dialogStatus.contentSnippet,
+            obligationPending: dialogStatus.obligationPending || storeObligationPending,
+            job,
+        };
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        return {
+            status: "idle",
+            hasPending: false,
+            job: defaultJob,
+            /* v8 ignore stop */
+        };
+    }
+}
+function checkDaemonRunning() {
+    try {
+        return fs.existsSync(DAEMON_SOCKET_PATH);
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        return false;
+        /* v8 ignore stop */
+    }
+}
+function hasTextField(record, key) {
+    return typeof record?.[key] === "string" && record[key].trim().length > 0;
+}
+function readSenseStatusLines() {
+    const config = (0, identity_1.loadAgentConfig)();
+    const senses = config.senses ?? {
+        cli: { enabled: true },
+        teams: { enabled: false },
+        bluebubbles: { enabled: false },
+    };
+    let payload = {};
+    try {
+        const raw = fs.readFileSync((0, identity_1.getAgentSecretsPath)(), "utf-8");
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            payload = parsed;
+        }
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        payload = {};
+        /* v8 ignore stop */
+    }
+    const teams = payload.teams;
+    const bluebubbles = payload.bluebubbles;
+    const configured = {
+        cli: true,
+        teams: hasTextField(teams, "clientId") && hasTextField(teams, "clientSecret") && hasTextField(teams, "tenantId"),
+        bluebubbles: hasTextField(bluebubbles, "serverUrl") && hasTextField(bluebubbles, "password"),
+    };
+    const rows = [
+        { label: "CLI", status: "interactive" },
+        {
+            label: "Teams",
+            status: !senses.teams.enabled ? "disabled" : configured.teams ? "ready" : "needs_config",
+        },
+        {
+            label: "BlueBubbles",
+            status: !senses.bluebubbles.enabled ? "disabled" : configured.bluebubbles ? "ready" : "needs_config",
+        },
+    ];
+    return rows.map((row) => `- ${row.label}: ${row.status}`);
+}
+function readBundleMetaFile() {
+    try {
+        const metaPath = path.join((0, identity_1.getAgentRoot)(), "bundle-meta.json");
+        const raw = fs.readFileSync(metaPath, "utf-8");
+        return JSON.parse(raw);
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        return null;
+        /* v8 ignore stop */
+    }
+}
+// ── Builder ─────────────────────────────────────────────────────────
+async function buildTurnContext(input) {
+    const agentRoot = (0, identity_1.getAgentRoot)();
+    const agentName = (0, identity_1.getAgentName)();
+    // Sync config
+    let syncConfig = { enabled: false, remote: "origin" };
+    try {
+        syncConfig = (0, config_1.getSyncConfig)();
+    }
+    catch { /* v8 ignore next -- defensive @preserve */ /* config not available */ }
+    // Bridges
+    const activeBridges = (0, manager_1.createBridgeManager)().findBridgesForSession({
+        friendId: input.currentSession.friendId,
+        channel: input.currentSession.channel,
+        key: input.currentSession.key,
+    });
+    // Session activity
+    let sessionActivity = [];
+    try {
+        sessionActivity = (0, session_activity_1.listSessionActivity)({
+            sessionsDir: `${agentRoot}/state/sessions`,
+            friendsDir: `${agentRoot}/friends`,
+            agentName,
+            currentSession: {
+                friendId: input.currentSession.friendId,
+                channel: input.currentSession.channel,
+                key: input.currentSession.key,
+            },
+        });
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        sessionActivity = [];
+        /* v8 ignore stop */
+    }
+    // Target candidates
+    let targetCandidates = [];
+    try {
+        if (input.channel !== "inner") {
+            targetCandidates = await (0, target_resolution_1.listTargetSessionCandidates)({
+                sessionsDir: `${agentRoot}/state/sessions`,
+                friendsDir: `${agentRoot}/friends`,
+                agentName,
+                currentSession: {
+                    friendId: input.currentSession.friendId,
+                    channel: input.currentSession.channel,
+                    key: input.currentSession.key,
+                },
+                friendStore: input.friendStore,
+            });
+        }
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        targetCandidates = [];
+        /* v8 ignore stop */
+    }
+    // Pending obligations
+    let pendingObligations = [];
+    try {
+        pendingObligations = (0, obligations_1.readPendingObligations)(agentRoot);
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        pendingObligations = [];
+        /* v8 ignore stop */
+    }
+    // Coding sessions
+    let codingSessions = [];
+    let otherCodingSessions = [];
+    try {
+        const liveCodingSessions = (0, coding_1.getCodingSessionManager)()
+            .listSessions()
+            .filter((session) => isLiveCodingSessionStatus(session.status) && Boolean(session.originSession));
+        codingSessions = liveCodingSessions.filter((session) => session.originSession?.friendId === input.currentSession.friendId
+            && session.originSession.channel === input.currentSession.channel
+            && session.originSession.key === input.currentSession.key);
+        otherCodingSessions = liveCodingSessions.filter((session) => !(session.originSession?.friendId === input.currentSession.friendId
+            && session.originSession.channel === input.currentSession.channel
+            && session.originSession.key === input.currentSession.key));
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        codingSessions = [];
+        otherCodingSessions = [];
+        /* v8 ignore stop */
+    }
+    // Inner work state
+    const innerWorkState = readInnerWorkState();
+    // Task board
+    let taskBoard;
+    try {
+        taskBoard = (0, tasks_1.getTaskModule)().getBoard();
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        taskBoard = emptyTaskBoard();
+        /* v8 ignore stop */
+    }
+    // Return obligations
+    let returnObligations = [];
+    try {
+        returnObligations = (0, obligations_1.listActiveReturnObligations)(agentName);
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        returnObligations = [];
+        /* v8 ignore stop */
+    }
+    // Recent episodes
+    const recentEpisodes = (0, episodes_1.readRecentEpisodes)(agentRoot, { limit: 20 });
+    // Active cares
+    const activeCares = (0, cares_1.readActiveCares)(agentRoot);
+    // ── Prompt-assembly pre-reads ──────────────────────────────────────
+    const daemonRunning = checkDaemonRunning();
+    let senseStatusLines = [];
+    try {
+        senseStatusLines = readSenseStatusLines();
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        senseStatusLines = [];
+        /* v8 ignore stop */
+    }
+    const bundleMeta = readBundleMetaFile();
+    let daemonHealth = null;
+    try {
+        daemonHealth = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        daemonHealth = null;
+        /* v8 ignore stop */
+    }
+    let journalFiles = [];
+    try {
+        const journalDir = path.join(agentRoot, "journal");
+        journalFiles = (0, prompt_1.readJournalFiles)(journalDir);
+    }
+    catch { /* v8 ignore start -- defensive: fallback on read failure @preserve */
+        journalFiles = [];
+        /* v8 ignore stop */
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.turn_context_built",
+        message: "turn context snapshot assembled",
+        meta: {
+            channel: input.channel,
+            obligationCount: pendingObligations.length,
+            bridgeCount: activeBridges.length,
+            codingSessionCount: codingSessions.length,
+            episodeCount: recentEpisodes.length,
+        },
+    });
+    return {
+        activeBridges,
+        sessionActivity,
+        targetCandidates,
+        pendingObligations,
+        codingSessions,
+        otherCodingSessions,
+        innerWorkState,
+        taskBoard,
+        returnObligations,
+        recentEpisodes,
+        activeCares,
+        syncConfig,
+        syncFailure: undefined, // Set by pipeline after preTurnPull
+        daemonRunning,
+        senseStatusLines,
+        bundleMeta,
+        daemonHealth,
+        journalFiles,
+    };
+}

package/dist/mind/prompt.js

@@ -257,7 +257,11 @@ function processTypeLabel(channel) {
     return PROCESS_TYPE_LABELS[channel];
 }
 const DAEMON_SOCKET_PATH = "/tmp/ouroboros-daemon.sock";
-function daemonStatus() {
+function daemonStatus(preRead) {
+    /* v8 ignore next 2 -- pre-read branch: exercised via pipeline TurnContext path, not unit-testable in isolation @preserve */
+    if (preRead !== undefined) {
+        return preRead ? "running" : "not running";
+    }
     try {
         return fs.existsSync(DAEMON_SOCKET_PATH) ? "running" : "not running";
     }
@@ -265,14 +269,15 @@ function daemonStatus() {
         return "unknown";
     }
 }
-function runtimeInfoSection(channel) {
+function runtimeInfoSection(channel, options) {
     const lines = [];
     const agentName = (0, identity_1.getAgentName)();
     const currentVersion = (0, bundle_manifest_1.getPackageVersion)();
     lines.push(`## runtime`);
     lines.push(`agent: ${agentName}`);
     lines.push(`runtime version: ${currentVersion}`);
-    const bundleMeta = readBundleMeta();
+    /* v8 ignore next -- branch: pre-read path exercised via pipeline TurnContext, not unit-testable in isolation @preserve */
+    const bundleMeta = options?.bundleMeta !== undefined ? options.bundleMeta : readBundleMeta();
     if (bundleMeta?.previousRuntimeVersion && bundleMeta.previousRuntimeVersion !== currentVersion) {
         lines.push(`previously: ${bundleMeta.previousRuntimeVersion}`);
         const changelogCommand = (0, ouro_version_manager_1.buildChangelogCommand)(bundleMeta.previousRuntimeVersion, currentVersion);
@@ -289,7 +294,7 @@ function runtimeInfoSection(channel) {
     lines.push(`channel: ${channel}`);
     lines.push(`current sense: ${channel}`);
     lines.push(`process type: ${processTypeLabel(channel)}`);
-    lines.push(`daemon: ${daemonStatus()}`);
+    lines.push(`daemon: ${daemonStatus(options?.daemonRunning)}`);
     lines.push(`mcp serve: i can expose my tools to dev tools via \`ouro mcp-serve\`. see the configure-dev-tools skill for setup.`);
     if (channel === "cli") {
         lines.push("i introduce myself on boot with a fun random greeting.");
@@ -308,7 +313,7 @@ function runtimeInfoSection(channel) {
         lines.push("i am responding in Microsoft Teams. i keep responses concise. i use markdown formatting. i do not introduce myself on boot.");
     }
     lines.push("");
-    lines.push(...senseRuntimeGuidance(channel));
+    lines.push(...senseRuntimeGuidance(channel, options?.senseStatusLines));
     return lines.join("\n");
 }
 function hasTextField(record, key) {
@@ -356,9 +361,9 @@ function localSenseStatusLines() {
     _senseStatusLinesCache = rows.map((row) => `- ${row.label}: ${row.status}`);
     return [..._senseStatusLinesCache];
 }
-function senseRuntimeGuidance(channel) {
+function senseRuntimeGuidance(channel, preReadStatusLines) {
     const lines = ["available senses:"];
-    lines.push(...localSenseStatusLines());
+    lines.push(...(preReadStatusLines ?? localSenseStatusLines()));
     lines.push("sense states:");
     lines.push("- interactive = available when opened by the user instead of kept running by the daemon");
     lines.push("- disabled = turned off in agent.json");
@@ -876,9 +881,8 @@ function formatRelativeTime(nowMs, mtimeMs) {
     const days = Math.floor(hours / 24);
     return `${days} day${days === 1 ? "" : "s"} ago`;
 }
-function journalSection(agentRoot, now) {
-    const journalDir = path.join(agentRoot, "journal");
-    const files = readJournalFiles(journalDir);
+function journalSection(agentRoot, now, preReadFiles) {
+    const files = preReadFiles ?? readJournalFiles(path.join(agentRoot, "journal"));
     if (files.length === 0)
         return "";
     const nowMs = (now ?? new Date()).getTime();
@@ -977,9 +981,10 @@ function formatElapsedBrief(ms) {
     const hours = Math.floor(minutes / 60);
     return `${hours}h ago`;
 }
-function rhythmStatusSection() {
+function rhythmStatusSection(preReadHealth) {
     try {
-        const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+        /* v8 ignore next -- branch: pre-read path exercised via pipeline TurnContext @preserve */
+        const health = preReadHealth !== undefined ? preReadHealth : (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
         if (!health)
             return "";
         const habitNames = Object.keys(health.habits);
@@ -1032,8 +1037,8 @@ async function buildSystem(channel = "cli", options, context) {
         // Group 2: my body & environment
         "# my body & environment",
         bodyMapSection((0, identity_1.getAgentName)()),
-        runtimeInfoSection(channel),
-        rhythmStatusSection(),
+        runtimeInfoSection(channel, options),
+        rhythmStatusSection(options?.daemonHealth),
         channelNatureSection((0, channel_1.getChannelCapabilities)(channel)),
         providerSection(channel),
         dateSection(),
@@ -1055,7 +1060,7 @@ async function buildSystem(channel = "cli", options, context) {
         ...(channel === "inner" ? [
             "# my inner life",
             metacognitiveFramingSection(channel),
-            journalSection((0, identity_1.getAgentRoot)()),
+            journalSection((0, identity_1.getAgentRoot)(), undefined, options?.journalFiles),
         ] : []),
         // Group 6: social context (non-local, non-inner channels)
         // Individual sections self-gate on isRemoteChannel/channel checks.

package/dist/repertoire/tools.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restTool = exports.ponderTool = exports.observeTool = exports.settleTool = exports.tools = void 0;
+exports.surfaceToolDef = exports.restTool = exports.ponderTool = exports.observeTool = exports.settleTool = exports.tools = void 0;
 exports.getToolsForChannel = getToolsForChannel;
 exports.isConfirmationRequired = isConfirmationRequired;
 exports.execTool = execTool;
@@ -66,10 +66,36 @@ Object.defineProperty(exports, "settleTool", { enumerable: true, get: function (
 Object.defineProperty(exports, "observeTool", { enumerable: true, get: function () { return tools_base_2.observeTool; } });
 Object.defineProperty(exports, "ponderTool", { enumerable: true, get: function () { return tools_base_2.ponderTool; } });
 Object.defineProperty(exports, "restTool", { enumerable: true, get: function () { return tools_base_2.restTool; } });
+// Surface tool schema — canonical home. Handler lives in senses/surface-tool.ts.
+exports.surfaceToolDef = {
+    type: "function",
+    function: {
+        name: "surface",
+        description: "share a thought outward — deliver an answer, ask a follow-up, or surface progress to whoever needs to hear it. pass delegationId to address a held thought (see your attention queue above), or friendId for spontaneous outreach. does not end your turn.",
+        parameters: {
+            type: "object",
+            properties: {
+                content: {
+                    type: "string",
+                    description: "the message to deliver",
+                },
+                delegationId: {
+                    type: "string",
+                    description: "ID from your attention queue — addresses a specific held thought",
+                },
+                friendId: {
+                    type: "string",
+                    description: "friend to reach out to spontaneously (when not addressing a held thought)",
+                },
+            },
+            required: ["content"],
+        },
+    },
+};
 // Surface tool handler: routes content to friend's freshest session
 /* v8 ignore start -- surface handler wiring: core logic tested via surface-tool.test.ts; this wires identity/routing deps @preserve */
 const surfaceToolDefinition = {
-    tool: surface_tool_1.surfaceToolDef,
+    tool: exports.surfaceToolDef,
     handler: async (args, ctx) => {
         const queue = ctx?.delegatedOrigins ?? [];
         const agentName = (() => { try {

package/dist/senses/pipeline.js

@@ -47,15 +47,9 @@ const commands_1 = require("./commands");
 const continuity_1 = require("./continuity");
 const manager_1 = require("../heart/bridges/manager");
 const identity_1 = require("../heart/identity");
-const tasks_1 = require("../repertoire/tasks");
-const coding_1 = require("../repertoire/coding");
-const session_activity_1 = require("../heart/session-activity");
 const socket_client_1 = require("../heart/daemon/socket-client");
 const active_work_1 = require("../heart/active-work");
 const delegation_1 = require("../heart/delegation");
-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 provider_failover_1 = require("../heart/provider-failover");
 const provider_ping_1 = require("../heart/provider-ping");
@@ -67,7 +61,7 @@ const sync_1 = require("../heart/sync");
 const config_1 = require("../heart/config");
 const presence_1 = require("../heart/presence");
 const episodes_1 = require("../mind/episodes");
-const cares_1 = require("../heart/cares");
+const turn_context_1 = require("../heart/turn-context");
 /**
  * Emit episodes for obligation state transitions detected during a turn.
  * Exported for direct testability (avoids v8 coverage merge issues in multi-file test suites).
@@ -88,33 +82,6 @@ function emitObligationTransitionEpisodes(agentRoot, preTurnObligationIds, postT
         }
     }
 }
-function emptyTaskBoard() {
-    return {
-        compact: "",
-        full: "",
-        byStatus: {
-            drafting: [],
-            processing: [],
-            validating: [],
-            collaborating: [],
-            paused: [],
-            blocked: [],
-            done: [],
-            cancelled: [],
-        },
-        issues: [],
-        actionRequired: [],
-        unresolvedDependencies: [],
-        activeSessions: [],
-        activeBridges: [],
-    };
-}
-function isLiveCodingSessionStatus(status) {
-    return status === "spawning"
-        || status === "running"
-        || status === "waiting_input"
-        || status === "stalled";
-}
 function prependTurnSections(message, sections) {
     /* v8 ignore next -- defensive: only user messages with non-empty sections reach here @preserve */
     if (message.role !== "user" || sections.length === 0)
@@ -136,44 +103,6 @@ function prependTurnSections(message, sections) {
     };
     /* v8 ignore stop */
 }
-function readInnerWorkState() {
-    const defaultJob = {
-        status: "idle",
-        content: null,
-        origin: null,
-        mode: "reflect",
-        obligationStatus: null,
-        surfacedResult: null,
-        queuedAt: null,
-        startedAt: null,
-        surfacedAt: null,
-    };
-    try {
-        const agentRoot = (0, identity_1.getAgentRoot)();
-        const pendingDir = (0, pending_1.getInnerDialogPendingDir)((0, identity_1.getAgentName)());
-        const sessionPath = (0, thoughts_1.getInnerDialogSessionPath)(agentRoot);
-        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);
-        // Derive obligationPending from both the pending message field and the obligation store
-        const storeObligationPending = (0, obligations_1.readPendingObligations)(agentRoot).length > 0;
-        return {
-            status: dialogStatus.processing === "started" ? "running" : "idle",
-            hasPending: dialogStatus.queue !== "clear",
-            origin: dialogStatus.origin,
-            contentSnippet: dialogStatus.contentSnippet,
-            obligationPending: dialogStatus.obligationPending || storeObligationPending,
-            job,
-        };
-    }
-    catch {
-        return {
-            status: "idle",
-            hasPending: false,
-            job: defaultJob,
-        };
-    }
-}
 // ── Pipeline ──────────────────────────────────────────────────────
 let _lastSessionKey = null;
 async function handleInboundTurn(input) {
@@ -377,100 +306,29 @@ async function handleInboundTurn(input) {
                 }
             }
             /* v8 ignore stop */
-            const activeBridges = (0, manager_1.createBridgeManager)().findBridgesForSession({
-                friendId: currentSession.friendId,
-                channel: currentSession.channel,
-                key: currentSession.key,
+            // Build the turn context snapshot — centralizes all state reads
+            const ctx = await (0, turn_context_1.buildTurnContext)({
+                currentSession,
+                channel: input.channel,
+                friendStore: input.friendStore,
             });
+            // Propagate sync failure from pre-turn pull
+            ctx.syncFailure = syncFailure;
+            const { activeBridges, sessionActivity, pendingObligations, codingSessions, otherCodingSessions } = ctx;
             const bridgeContext = (0, manager_1.formatBridgeContext)(activeBridges) || undefined;
-            let sessionActivity = [];
-            try {
-                const agentRoot = (0, identity_1.getAgentRoot)();
-                sessionActivity = (0, session_activity_1.listSessionActivity)({
-                    sessionsDir: `${agentRoot}/state/sessions`,
-                    friendsDir: `${agentRoot}/friends`,
-                    agentName: (0, identity_1.getAgentName)(),
-                    currentSession: {
-                        friendId: currentSession.friendId,
-                        channel: currentSession.channel,
-                        key: currentSession.key,
-                    },
-                });
-            }
-            catch {
-                sessionActivity = [];
-            }
-            let targetCandidates = [];
-            try {
-                if (input.channel !== "inner") {
-                    const agentRoot = (0, identity_1.getAgentRoot)();
-                    targetCandidates = await (0, target_resolution_1.listTargetSessionCandidates)({
-                        sessionsDir: `${agentRoot}/state/sessions`,
-                        friendsDir: `${agentRoot}/friends`,
-                        agentName: (0, identity_1.getAgentName)(),
-                        currentSession: {
-                            friendId: currentSession.friendId,
-                            channel: currentSession.channel,
-                            key: currentSession.key,
-                        },
-                        friendStore: input.friendStore,
-                    });
-                }
-            }
-            catch {
-                targetCandidates = [];
-            }
-            let pendingObligations = [];
-            try {
-                pendingObligations = (0, obligations_1.readPendingObligations)((0, identity_1.getAgentRoot)());
-            }
-            catch {
-                pendingObligations = [];
-            }
-            let codingSessions = [];
-            let otherCodingSessions = [];
-            try {
-                const liveCodingSessions = (0, coding_1.getCodingSessionManager)()
-                    .listSessions()
-                    .filter((session) => isLiveCodingSessionStatus(session.status) && Boolean(session.originSession));
-                codingSessions = liveCodingSessions.filter((session) => session.originSession?.friendId === currentSession.friendId
-                    && session.originSession.channel === currentSession.channel
-                    && session.originSession.key === currentSession.key);
-                otherCodingSessions = liveCodingSessions.filter((session) => !(session.originSession?.friendId === currentSession.friendId
-                    && session.originSession.channel === currentSession.channel
-                    && session.originSession.key === currentSession.key));
-            }
-            catch {
-                codingSessions = [];
-                otherCodingSessions = [];
-            }
             const activeWorkFrame = (0, active_work_1.buildActiveWorkFrame)({
                 currentSession,
                 currentObligation,
                 mustResolveBeforeHandoff,
-                inner: readInnerWorkState(),
+                inner: ctx.innerWorkState,
                 bridges: activeBridges,
                 codingSessions,
                 otherCodingSessions,
                 pendingObligations,
-                taskBoard: (() => {
-                    try {
-                        return (0, tasks_1.getTaskModule)().getBoard();
-                    }
-                    catch {
-                        return emptyTaskBoard();
-                    }
-                })(),
+                taskBoard: ctx.taskBoard,
                 friendActivity: sessionActivity,
-                targetCandidates,
-                innerReturnObligations: (() => {
-                    try {
-                        return (0, obligations_1.listActiveReturnObligations)((0, identity_1.getAgentName)());
-                    }
-                    catch {
-                        return [];
-                    }
-                })(),
+                targetCandidates: ctx.targetCandidates,
+                innerReturnObligations: ctx.returnObligations,
             });
             const delegationDecision = (0, delegation_1.decideDelegation)({
                 channel: input.channel,
@@ -501,8 +359,7 @@ async function handleInboundTurn(input) {
             try {
                 const agentRoot = (0, identity_1.getAgentRoot)();
                 const agentName = (0, identity_1.getAgentName)();
-                const recentEpisodes = (0, episodes_1.readRecentEpisodes)(agentRoot, { limit: 20 });
-                const activeCares = (0, cares_1.readActiveCares)(agentRoot);
+                const { recentEpisodes, activeCares } = ctx;
                 const tempoState = (0, tempo_1.deriveTempo)({
                     activeSessions: sessionActivity.length + 1,
                     openObligations: pendingObligations.length,
@@ -570,6 +427,12 @@ async function handleInboundTurn(input) {
                 setMustResolveBeforeHandoff: (value) => {
                     mustResolveBeforeHandoff = value;
                 },
+                // Pre-read state from TurnContext for prompt assembly
+                daemonRunning: ctx.daemonRunning,
+                senseStatusLines: ctx.senseStatusLines,
+                bundleMeta: ctx.bundleMeta,
+                daemonHealth: ctx.daemonHealth,
+                journalFiles: ctx.journalFiles,
                 toolContext: {
                     /* v8 ignore next -- default no-op signin satisfies interface; real signin injected by sense adapter @preserve */
                     signin: async () => undefined,

package/dist/senses/surface-tool.js

@@ -1,35 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.surfaceToolDef = void 0;
 exports.handleSurface = handleSurface;
 const attention_queue_1 = require("./attention-queue");
 const runtime_1 = require("../nerves/runtime");
-// ── Tool definition ──────────────────────────────────────────────
-exports.surfaceToolDef = {
-    type: "function",
-    function: {
-        name: "surface",
-        description: "share a thought outward — deliver an answer, ask a follow-up, or surface progress to whoever needs to hear it. pass delegationId to address a held thought (see your attention queue above), or friendId for spontaneous outreach. does not end your turn.",
-        parameters: {
-            type: "object",
-            properties: {
-                content: {
-                    type: "string",
-                    description: "the message to deliver",
-                },
-                delegationId: {
-                    type: "string",
-                    description: "ID from your attention queue — addresses a specific held thought",
-                },
-                friendId: {
-                    type: "string",
-                    description: "friend to reach out to spontaneously (when not addressing a held thought)",
-                },
-            },
-            required: ["content"],
-        },
-    },
-};
 async function handleSurface(input) {
     const { content, delegationId, friendId, queue, routeToFriend, advanceObligation, fulfillHeartObligation } = input;
     // Resolve target friend

package/package.json

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