@ouro.bot/cli 0.1.0-alpha.729 → 0.1.0-alpha.730

package/dist/senses/private-runtime.js

@@ -64,6 +64,7 @@ const packets_1 = require("../arc/packets");
 const friends_1 = require("@ouro.bot/friends");
 const trust_gate_1 = require("./trust-gate");
 const pipeline_1 = require("./pipeline");
+const session_transaction_1 = require("../mind/session-transaction");
 const nerves_1 = require("../nerves");
 const runtime_1 = require("../nerves/runtime");
 const provider_credentials_1 = require("../heart/provider-credentials");
@@ -857,351 +858,355 @@ async function runPrivateRuntimeTurn(options) {
         reason,
         startedAt: now().toISOString(),
     });
-    try {
-        const loaded = (0, context_1.loadSession)(sessionFilePath);
-        const existingMessages = loaded?.messages ? [...loaded.messages] : [];
-        const instincts = options?.instincts ?? loadPrivateRuntimeInstincts();
-        const state = {
-            cycleCount: 1,
-            resting: false,
-            lastHeartbeatAt: now().toISOString(),
-        };
-        const pendingDir = options?.habitSession?.pendingDir ?? (0, pending_1.getPrivateRuntimePendingDir)(agentName);
-        const shouldUseHeldReturnWake = !options?.taskId && reason !== "habit" && reason !== "await"
-            ? (0, obligations_1.listActiveReturnObligations)(agentName).length > 0
-            : false;
-        // ── Adapter concern: build user message ──────────────────────────
-        let userContent;
-        let habitTools;
-        let habitParsedSuccessfully = false;
-        const isPayloadSpecificWake = !!options?.taskId
-            || (reason === "habit" && !!options?.habitName)
-            || (reason === "await" && !!options?.awaitName);
-        if (existingMessages.length === 0 && !isPayloadSpecificWake) {
-            // 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)());
-            const cleanupNudge = buildNonCanonicalCleanupNudge(nonCanonical);
-            userContent = [
-                buildPrivateRuntimeBootstrapMessage(aspirations, "No prior private-runtime session found."),
-                cleanupNudge,
-            ].filter(Boolean).join("\n\n");
-        }
-        else {
-            // Resumed session: task-triggered or instinct message with checkpoint context
-            const assistantTurns = existingMessages.filter((message) => message.role === "assistant").length;
-            state.cycleCount = assistantTurns + 1;
-            state.checkpoint = deriveResumeCheckpoint(existingMessages);
-            if (options?.taskId) {
-                const taskContent = readTaskFile((0, identity_1.getAgentRoot)(), options.taskId);
-                userContent = buildTaskTriggeredMessage(options.taskId, taskContent, state.checkpoint);
+    const runWithLease = options?._withSessionTurnLease ?? session_transaction_1.withSessionTurnLease;
+    return await runWithLease(sessionFilePath, async (sessionTurnLease) => {
+        try {
+            const loaded = (0, context_1.loadSession)(sessionFilePath);
+            const existingMessages = loaded?.messages ? [...loaded.messages] : [];
+            const instincts = options?.instincts ?? loadPrivateRuntimeInstincts();
+            const state = {
+                cycleCount: 1,
+                resting: false,
+                lastHeartbeatAt: now().toISOString(),
+            };
+            const pendingDir = options?.habitSession?.pendingDir ?? (0, pending_1.getPrivateRuntimePendingDir)(agentName);
+            const shouldUseHeldReturnWake = !options?.taskId && reason !== "habit" && reason !== "await"
+                ? (0, obligations_1.listActiveReturnObligations)(agentName).length > 0
+                : false;
+            // ── Adapter concern: build user message ──────────────────────────
+            let userContent;
+            let habitTools;
+            let habitParsedSuccessfully = false;
+            const isPayloadSpecificWake = !!options?.taskId
+                || (reason === "habit" && !!options?.habitName)
+                || (reason === "await" && !!options?.awaitName);
+            if (existingMessages.length === 0 && !isPayloadSpecificWake) {
+                // 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)());
+                const cleanupNudge = buildNonCanonicalCleanupNudge(nonCanonical);
+                userContent = [
+                    buildPrivateRuntimeBootstrapMessage(aspirations, "No prior private-runtime session found."),
+                    cleanupNudge,
+                ].filter(Boolean).join("\n\n");
             }
-            else if (reason === "habit" && options?.habitName) {
-                const agentRoot = (0, identity_1.getAgentRoot)();
-                const habitName = options.habitName;
-                const habitFilePath = path.join(agentRoot, "habits", `${habitName}.md`);
-                const preparedHabit = options.preparedHabit?.habit.name === habitName ? options.preparedHabit.habit : null;
-                const rsvpHabit = (0, habit_policy_1.isRsvpHabitName)(habitName);
-                // Read and parse the habit file
-                let habitBody;
-                let habitTitle = habitName;
-                let habitLastRun = null;
-                let habitOrigin = null;
-                let habitSurface = { family: true, originator: true, extra: [] };
-                if (preparedHabit) {
-                    if (rsvpHabit && !preparedHabit.rsvp) {
-                        const detail = preparedHabit.status === "degraded"
-                            ? preparedHabit.degradedDetail
-                            : null;
-                        throw new Error(`RSVP habit metadata is required before private runtime execution: ${detail ?? habitName}`);
+            else {
+                // Resumed session: task-triggered or instinct message with checkpoint context
+                const assistantTurns = existingMessages.filter((message) => message.role === "assistant").length;
+                state.cycleCount = assistantTurns + 1;
+                state.checkpoint = deriveResumeCheckpoint(existingMessages);
+                if (options?.taskId) {
+                    const taskContent = readTaskFile((0, identity_1.getAgentRoot)(), options.taskId);
+                    userContent = buildTaskTriggeredMessage(options.taskId, taskContent, state.checkpoint);
+                }
+                else if (reason === "habit" && options?.habitName) {
+                    const agentRoot = (0, identity_1.getAgentRoot)();
+                    const habitName = options.habitName;
+                    const habitFilePath = path.join(agentRoot, "habits", `${habitName}.md`);
+                    const preparedHabit = options.preparedHabit?.habit.name === habitName ? options.preparedHabit.habit : null;
+                    const rsvpHabit = (0, habit_policy_1.isRsvpHabitName)(habitName);
+                    // Read and parse the habit file
+                    let habitBody;
+                    let habitTitle = habitName;
+                    let habitLastRun = null;
+                    let habitOrigin = null;
+                    let habitSurface = { family: true, originator: true, extra: [] };
+                    if (preparedHabit) {
+                        if (rsvpHabit && !preparedHabit.rsvp) {
+                            const detail = preparedHabit.status === "degraded"
+                                ? preparedHabit.degradedDetail
+                                : null;
+                            throw new Error(`RSVP habit metadata is required before private runtime execution: ${detail ?? habitName}`);
+                        }
+                        const blockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(preparedHabit, "private-runtime");
+                        if (blockedReason)
+                            throw new Error(blockedReason);
+                    }
+                    let currentHabit;
+                    try {
+                        const habitContent = fs.readFileSync(habitFilePath, "utf-8");
+                        currentHabit = (0, habit_runtime_state_1.applyHabitRuntimeState)(agentRoot, (0, habit_parser_1.parseHabitFile)(habitContent, habitFilePath));
                     }
-                    const blockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(preparedHabit, "private-runtime");
-                    if (blockedReason)
+                    catch (error) {
+                        const readReason = error instanceof Error ? error.message : String(error);
+                        if (rsvpHabit) {
+                            throw new Error(`RSVP habit metadata is required before private runtime execution: ${readReason}`);
+                        }
+                        const degraded = (0, habit_parser_1.createDegradedHabitFile)(habitFilePath, "read_error", "", readReason);
+                        const blockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(degraded, "private-runtime");
                         throw new Error(blockedReason);
-                }
-                let currentHabit;
-                try {
-                    const habitContent = fs.readFileSync(habitFilePath, "utf-8");
-                    currentHabit = (0, habit_runtime_state_1.applyHabitRuntimeState)(agentRoot, (0, habit_parser_1.parseHabitFile)(habitContent, habitFilePath));
-                }
-                catch (error) {
-                    const readReason = error instanceof Error ? error.message : String(error);
-                    if (rsvpHabit) {
-                        throw new Error(`RSVP habit metadata is required before private runtime execution: ${readReason}`);
                     }
-                    const degraded = (0, habit_parser_1.createDegradedHabitFile)(habitFilePath, "read_error", "", readReason);
-                    const blockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(degraded, "private-runtime");
-                    throw new Error(blockedReason);
-                }
-                if (rsvpHabit && !currentHabit.rsvp) {
-                    const detail = currentHabit.status === "degraded" ? currentHabit.degradedDetail : null;
-                    throw new Error(`RSVP habit metadata is required before private runtime execution: ${detail ?? habitName}`);
-                }
-                const currentBlockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(currentHabit, "private-runtime");
-                if (currentBlockedReason)
-                    throw new Error(currentBlockedReason);
-                const executableHabit = preparedHabit ?? currentHabit;
-                habitBody = executableHabit.body || undefined;
-                habitTitle = executableHabit.title || habitName;
-                habitLastRun = executableHabit.lastRun;
-                habitTools = executableHabit.tools;
-                habitOrigin = executableHabit.origin;
-                habitSurface = executableHabit.surface;
-                // If the habit file couldn't be read at all (no body, no title parsed), error message
-                if (habitBody === undefined && habitTitle === habitName) {
-                    userContent = `habit "${habitName}" could not be read (file not found or unreadable). check habits/${habitName}.md exists.`;
+                    if (rsvpHabit && !currentHabit.rsvp) {
+                        const detail = currentHabit.status === "degraded" ? currentHabit.degradedDetail : null;
+                        throw new Error(`RSVP habit metadata is required before private runtime execution: ${detail ?? habitName}`);
+                    }
+                    const currentBlockedReason = (0, habit_lifecycle_guard_1.privateRuntimeHabitRejectionReason)(currentHabit, "private-runtime");
+                    if (currentBlockedReason)
+                        throw new Error(currentBlockedReason);
+                    const executableHabit = preparedHabit ?? currentHabit;
+                    habitBody = executableHabit.body || undefined;
+                    habitTitle = executableHabit.title || habitName;
+                    habitLastRun = executableHabit.lastRun;
+                    habitTools = executableHabit.tools;
+                    habitOrigin = executableHabit.origin;
+                    habitSurface = executableHabit.surface;
+                    // If the habit file couldn't be read at all (no body, no title parsed), error message
+                    if (habitBody === undefined && habitTitle === habitName) {
+                        userContent = `habit "${habitName}" could not be read (file not found or unreadable). check habits/${habitName}.md exists.`;
+                    }
+                    else {
+                        habitParsedSuccessfully = true;
+                        // Unified path: gather context for ALL habits (heartbeat included)
+                        const obligations = (0, obligations_1.listActiveReturnObligations)(agentName);
+                        const nowMs = now().getTime();
+                        const staleObligations = obligations.map((o) => ({
+                            friendName: o.origin.friendId,
+                            content: o.delegatedContent,
+                            stalenessMs: nowMs - o.createdAt,
+                        }));
+                        const alsoDue = buildAlsoDueLine(agentRoot, habitName, now);
+                        const arcResume = (0, flight_recorder_1.formatFlightRecorderResume)((0, flight_recorder_1.readFlightRecorderResume)(agentRoot));
+                        const deskOrientation = (0, desk_section_1.deskRecordOrientationSection)(agentRoot, now());
+                        const surfacePolicy = buildHabitSurfacePolicy(habitOrigin, habitSurface);
+                        // Degraded state (best-effort: never crash)
+                        let degradedComponents = [];
+                        try {
+                            const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+                            if (health && health.degraded.length > 0) {
+                                degradedComponents = health.degraded.map((d) => ({ component: d.component, reason: d.reason }));
+                            }
+                        }
+                        catch {
+                            // Best-effort: missing file or parse error -> empty array, no crash
+                        }
+                        userContent = (0, habit_turn_message_1.buildHabitTurnMessage)({
+                            habitName,
+                            habitTitle,
+                            habitBody,
+                            lastRun: habitLastRun,
+                            checkpoint: displayCheckpoint(state.checkpoint),
+                            alsoDue: alsoDue || undefined,
+                            staleObligations,
+                            parseErrors: options?.parseErrors ?? [],
+                            degradedComponents,
+                            arcResume,
+                            deskOrientation,
+                            surfacePolicy,
+                            priorSessionSummary: options.preparedHabit?.habit.name === habitName ? options.preparedHabit.priorSessionSummary : undefined,
+                            now,
+                        });
+                    }
                 }
-                else {
-                    habitParsedSuccessfully = true;
-                    // Unified path: gather context for ALL habits (heartbeat included)
-                    const obligations = (0, obligations_1.listActiveReturnObligations)(agentName);
-                    const nowMs = now().getTime();
-                    const staleObligations = obligations.map((o) => ({
-                        friendName: o.origin.friendId,
-                        content: o.delegatedContent,
-                        stalenessMs: nowMs - o.createdAt,
-                    }));
-                    const alsoDue = buildAlsoDueLine(agentRoot, habitName, now);
-                    const arcResume = (0, flight_recorder_1.formatFlightRecorderResume)((0, flight_recorder_1.readFlightRecorderResume)(agentRoot));
-                    const deskOrientation = (0, desk_section_1.deskRecordOrientationSection)(agentRoot, now());
-                    const surfacePolicy = buildHabitSurfacePolicy(habitOrigin, habitSurface);
-                    // Degraded state (best-effort: never crash)
-                    let degradedComponents = [];
+                else if (reason === "await" && options?.awaitName) {
+                    const agentRoot = (0, identity_1.getAgentRoot)();
+                    const awaitName = options.awaitName;
+                    const awaitFilePath = path.join(agentRoot, "awaiting", `${awaitName}.md`);
+                    let awaitBody;
+                    let condition = null;
+                    let lastCheckedAt = null;
+                    let lastObservation = null;
+                    let checkedCount = 0;
+                    let awaitFound = false;
                     try {
-                        const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
-                        if (health && health.degraded.length > 0) {
-                            degradedComponents = health.degraded.map((d) => ({ component: d.component, reason: d.reason }));
-                        }
+                        const awaitContent = fs.readFileSync(awaitFilePath, "utf-8");
+                        const parsed = (0, await_runtime_state_1.applyAwaitRuntimeState)(agentRoot, (0, await_parser_1.parseAwaitFile)(awaitContent, awaitFilePath));
+                        awaitFound = true;
+                        awaitBody = parsed.body || undefined;
+                        condition = parsed.condition;
+                        lastCheckedAt = parsed.last_checked ?? null;
+                        lastObservation = parsed.last_observation ?? null;
+                        checkedCount = parsed.checked_count ?? 0;
                     }
                     catch {
-                        // Best-effort: missing file or parse error -> empty array, no crash
+                        // file missing — fall through to error message
+                    }
+                    if (!awaitFound || !condition) {
+                        userContent = `await "${awaitName}" could not be read (file not found or no condition). check awaiting/${awaitName}.md.`;
+                    }
+                    else {
+                        userContent = (0, await_turn_message_1.buildAwaitTurnMessage)({
+                            awaitName,
+                            condition,
+                            body: awaitBody,
+                            lastCheckedAt,
+                            lastObservation,
+                            checkedCount,
+                            checkpoint: displayCheckpoint(state.checkpoint),
+                            now,
+                        });
                     }
-                    userContent = (0, habit_turn_message_1.buildHabitTurnMessage)({
-                        habitName,
-                        habitTitle,
-                        habitBody,
-                        lastRun: habitLastRun,
-                        checkpoint: displayCheckpoint(state.checkpoint),
-                        alsoDue: alsoDue || undefined,
-                        staleObligations,
-                        parseErrors: options?.parseErrors ?? [],
-                        degradedComponents,
-                        arcResume,
-                        deskOrientation,
-                        surfacePolicy,
-                        priorSessionSummary: options.preparedHabit?.habit.name === habitName ? options.preparedHabit.priorSessionSummary : undefined,
-                        now,
-                    });
-                }
-            }
-            else if (reason === "await" && options?.awaitName) {
-                const agentRoot = (0, identity_1.getAgentRoot)();
-                const awaitName = options.awaitName;
-                const awaitFilePath = path.join(agentRoot, "awaiting", `${awaitName}.md`);
-                let awaitBody;
-                let condition = null;
-                let lastCheckedAt = null;
-                let lastObservation = null;
-                let checkedCount = 0;
-                let awaitFound = false;
-                try {
-                    const awaitContent = fs.readFileSync(awaitFilePath, "utf-8");
-                    const parsed = (0, await_runtime_state_1.applyAwaitRuntimeState)(agentRoot, (0, await_parser_1.parseAwaitFile)(awaitContent, awaitFilePath));
-                    awaitFound = true;
-                    awaitBody = parsed.body || undefined;
-                    condition = parsed.condition;
-                    lastCheckedAt = parsed.last_checked ?? null;
-                    lastObservation = parsed.last_observation ?? null;
-                    checkedCount = parsed.checked_count ?? 0;
-                }
-                catch {
-                    // file missing — fall through to error message
-                }
-                if (!awaitFound || !condition) {
-                    userContent = `await "${awaitName}" could not be read (file not found or no condition). check awaiting/${awaitName}.md.`;
                 }
                 else {
-                    userContent = (0, await_turn_message_1.buildAwaitTurnMessage)({
-                        awaitName,
-                        condition,
-                        body: awaitBody,
-                        lastCheckedAt,
-                        lastObservation,
-                        checkedCount,
-                        checkpoint: displayCheckpoint(state.checkpoint),
-                        now,
-                    });
+                    userContent = buildInstinctUserMessage(instincts, reason, state);
                 }
             }
-            else {
-                userContent = buildInstinctUserMessage(instincts, reason, state);
+            if (shouldUseHeldReturnWake) {
+                userContent = buildHeldReturnWakeMessage();
             }
-        }
-        if (shouldUseHeldReturnWake) {
-            userContent = buildHeldReturnWakeMessage();
-        }
-        const userMessage = { role: "user", content: userContent };
-        // ── Session loader: wraps existing session logic ──────────────────
-        const innerCapabilities = (0, friends_1.getChannelCapabilities)("inner");
-        const selfFriend = createSelfFriend(agentName);
-        const selfContext = { friend: selfFriend, channel: innerCapabilities };
-        const mcpManager = await (0, mcp_manager_1.getSharedMcpManager)() ?? undefined;
-        // ── Habit tool enforcement ───────────────────────────────────────
-        let habitToolsResolved;
-        if (habitTools !== undefined) {
-            const fullTools = (0, tools_1.getToolsForChannel)(innerCapabilities);
-            habitToolsResolved = fullTools.filter((t) => habitTools.includes(t.function.name));
+            const userMessage = { role: "user", content: userContent };
+            // ── Session loader: wraps existing session logic ──────────────────
+            const innerCapabilities = (0, friends_1.getChannelCapabilities)("inner");
+            const selfFriend = createSelfFriend(agentName);
+            const selfContext = { friend: selfFriend, channel: innerCapabilities };
+            const mcpManager = await (0, mcp_manager_1.getSharedMcpManager)() ?? undefined;
+            // ── Habit tool enforcement ───────────────────────────────────────
+            let habitToolsResolved;
+            if (habitTools !== undefined) {
+                const fullTools = (0, tools_1.getToolsForChannel)(innerCapabilities);
+                habitToolsResolved = fullTools.filter((t) => habitTools.includes(t.function.name));
+                (0, runtime_1.emitNervesEvent)({
+                    event: "habit.tools_restricted",
+                    component: "senses",
+                    message: "habit running with restricted tools",
+                    meta: {
+                        habitName: options?.habitName,
+                        declared: habitTools,
+                        resolved: habitToolsResolved.map((t) => t.function.name),
+                    },
+                });
+            }
+            else if (reason === "habit" && options?.habitName && habitParsedSuccessfully) {
+                (0, runtime_1.emitNervesEvent)({
+                    event: "habit.tools_unrestricted",
+                    component: "senses",
+                    message: "habit running with full tool repertoire",
+                    meta: { habitName: options.habitName },
+                });
+            }
+            if (options?.noSend === true) {
+                habitToolsResolved = [];
+            }
+            const effectiveHabitSession = options?.noSend === true
+                ? reduceHabitSessionToNoSend(options.habitSession)
+                : options?.habitSession;
+            const sessionLoader = {
+                loadOrCreate: async () => {
+                    if (existingMessages.length > 0) {
+                        return {
+                            messages: existingMessages,
+                            sessionPath: sessionFilePath,
+                            structuredOutputs: loaded?.structuredOutputs,
+                        };
+                    }
+                    // Fresh session: build system prompt
+                    const systemPrompt = await (0, prompt_1.buildSystem)("inner", {
+                        toolChoiceRequired: true,
+                        flightRecorderResume: (0, flight_recorder_1.readFlightRecorderResume)((0, identity_1.getAgentRoot)()),
+                    });
+                    return {
+                        messages: [{ role: "system", content: (0, prompt_1.flattenSystemPrompt)(systemPrompt) }],
+                        sessionPath: sessionFilePath,
+                        structuredOutputs: [],
+                    };
+                },
+            };
+            // ── Call shared pipeline ──────────────────────────────────────────
+            const callbacks = createPrivateRuntimeCallbacks();
+            const traceId = (0, nerves_1.createTraceId)();
+            // Attention queue: built when pending messages are drained, shared with tool context
+            let attentionQueue = [];
+            const result = await (0, pipeline_1.handleInboundTurn)({
+                channel: "inner",
+                sessionKey: "dialog",
+                capabilities: innerCapabilities,
+                messages: [userMessage],
+                continuityIngressTexts: [],
+                callbacks,
+                sessionTurnLease,
+                friendResolver: { resolve: () => Promise.resolve(selfContext) },
+                sessionLoader,
+                pendingDir,
+                friendStore: createNoOpFriendStore(),
+                enforceTrustGate: trust_gate_1.enforceTrustGate,
+                drainPending: pending_1.drainPending,
+                runAgent: core_1.runAgent,
+                postTurn: (turnMessages, sessionPathArg, usage, hooks, state) => {
+                    const prepared = (0, context_1.postTurnTrim)(turnMessages, usage, hooks);
+                    return (0, context_1.deferPostTurnPersist)(sessionPathArg, prepared, usage, state);
+                },
+                accumulateFriendTokens: friends_1.accumulateFriendTokens,
+                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.listActiveReturnObligations)(agentName);
+                    const builtAttentionQueue = (0, attention_queue_1.buildAttentionQueue)({
+                        drainedPending: drained,
+                        outstandingObligations,
+                        friendNameResolver: (friendId) => {
+                            try {
+                                const raw = fs.readFileSync(path.join((0, identity_1.getAgentRoot)(agentName), "friends", friendId + ".json"), "utf-8");
+                                const parsed = JSON.parse(raw);
+                                return typeof parsed.name === "string" ? parsed.name : null;
+                            }
+                            catch {
+                                return null;
+                            }
+                        },
+                        packetResolver: (packetId) => {
+                            try {
+                                return (0, packets_1.readPonderPacket)((0, identity_1.getAgentRoot)(agentName), packetId);
+                            }
+                            catch {
+                                return null;
+                            }
+                        },
+                    });
+                    attentionQueue.splice(0, attentionQueue.length, ...builtAttentionQueue);
+                    const attentionFrame = (0, attention_queue_1.buildAttentionQueueStatusFrame)(attentionQueue);
+                    return attentionFrame ? [attentionFrame] : [];
+                },
+                /* v8 ignore stop */
+                runAgentOptions: {
+                    traceId,
+                    toolChoiceRequired: true,
+                    mcpManager,
+                    ...(habitToolsResolved !== undefined && { tools: habitToolsResolved }),
+                    toolContext: {
+                        signin: async () => undefined,
+                        delegatedOrigins: attentionQueue,
+                        ...(options?.noSend ? { noSend: true } : {}),
+                        ...(effectiveHabitSession ? { habitSession: effectiveHabitSession } : {}),
+                    },
+                    ...(effectiveHabitSession ? { habitSession: effectiveHabitSession } : {}),
+                },
+            });
+            // Post-turn routeDelegatedCompletion removed: delivery is now inline via surface tool.
+            // settle in the private runtime produces no CompletionMetadata, so routeDelegatedCompletion
+            // would be a no-op. The routing infrastructure is reused by the surface handler.
+            const resultMessages = result.messages ?? [];
+            const assistantPreview = extractAssistantPreview(resultMessages);
+            const toolCalls = extractToolCallNames(resultMessages);
             (0, runtime_1.emitNervesEvent)({
-                event: "habit.tools_restricted",
                 component: "senses",
-                message: "habit running with restricted tools",
+                event: "senses.private_runtime_turn",
+                message: "private-runtime turn completed",
                 meta: {
-                    habitName: options?.habitName,
-                    declared: habitTools,
-                    resolved: habitToolsResolved.map((t) => t.function.name),
+                    reason,
+                    session: sessionFilePath,
+                    ...(options?.taskId && { taskId: options.taskId }),
+                    ...(assistantPreview && { assistantPreview }),
+                    ...(toolCalls.length > 0 && { toolCalls }),
+                    ...(result.usage && {
+                        promptTokens: result.usage.input_tokens,
+                        completionTokens: result.usage.output_tokens,
+                        totalTokens: result.usage.total_tokens,
+                    }),
                 },
             });
+            return {
+                messages: resultMessages,
+                usage: result.usage,
+                sessionPath: result.sessionPath ?? sessionFilePath,
+                completion: result.completion,
+                turnOutcome: result.turnOutcome,
+                restStatus: latestRestStatus(resultMessages),
+            };
         }
-        else if (reason === "habit" && options?.habitName && habitParsedSuccessfully) {
-            (0, runtime_1.emitNervesEvent)({
-                event: "habit.tools_unrestricted",
-                component: "senses",
-                message: "habit running with full tool repertoire",
-                meta: { habitName: options.habitName },
+        finally {
+            writePrivateRuntimeState(sessionFilePath, {
+                status: "idle",
+                lastCompletedAt: now().toISOString(),
             });
         }
-        if (options?.noSend === true) {
-            habitToolsResolved = [];
-        }
-        const effectiveHabitSession = options?.noSend === true
-            ? reduceHabitSessionToNoSend(options.habitSession)
-            : options?.habitSession;
-        const sessionLoader = {
-            loadOrCreate: async () => {
-                if (existingMessages.length > 0) {
-                    return {
-                        messages: existingMessages,
-                        sessionPath: sessionFilePath,
-                        structuredOutputs: loaded?.structuredOutputs,
-                    };
-                }
-                // Fresh session: build system prompt
-                const systemPrompt = await (0, prompt_1.buildSystem)("inner", {
-                    toolChoiceRequired: true,
-                    flightRecorderResume: (0, flight_recorder_1.readFlightRecorderResume)((0, identity_1.getAgentRoot)()),
-                });
-                return {
-                    messages: [{ role: "system", content: (0, prompt_1.flattenSystemPrompt)(systemPrompt) }],
-                    sessionPath: sessionFilePath,
-                    structuredOutputs: [],
-                };
-            },
-        };
-        // ── Call shared pipeline ──────────────────────────────────────────
-        const callbacks = createPrivateRuntimeCallbacks();
-        const traceId = (0, nerves_1.createTraceId)();
-        // Attention queue: built when pending messages are drained, shared with tool context
-        let attentionQueue = [];
-        const result = await (0, pipeline_1.handleInboundTurn)({
-            channel: "inner",
-            sessionKey: "dialog",
-            capabilities: innerCapabilities,
-            messages: [userMessage],
-            continuityIngressTexts: [],
-            callbacks,
-            friendResolver: { resolve: () => Promise.resolve(selfContext) },
-            sessionLoader,
-            pendingDir,
-            friendStore: createNoOpFriendStore(),
-            enforceTrustGate: trust_gate_1.enforceTrustGate,
-            drainPending: pending_1.drainPending,
-            runAgent: core_1.runAgent,
-            postTurn: (turnMessages, sessionPathArg, usage, hooks, state) => {
-                const prepared = (0, context_1.postTurnTrim)(turnMessages, usage, hooks);
-                return (0, context_1.deferPostTurnPersist)(sessionPathArg, prepared, usage, state);
-            },
-            accumulateFriendTokens: friends_1.accumulateFriendTokens,
-            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.listActiveReturnObligations)(agentName);
-                const builtAttentionQueue = (0, attention_queue_1.buildAttentionQueue)({
-                    drainedPending: drained,
-                    outstandingObligations,
-                    friendNameResolver: (friendId) => {
-                        try {
-                            const raw = fs.readFileSync(path.join((0, identity_1.getAgentRoot)(agentName), "friends", friendId + ".json"), "utf-8");
-                            const parsed = JSON.parse(raw);
-                            return typeof parsed.name === "string" ? parsed.name : null;
-                        }
-                        catch {
-                            return null;
-                        }
-                    },
-                    packetResolver: (packetId) => {
-                        try {
-                            return (0, packets_1.readPonderPacket)((0, identity_1.getAgentRoot)(agentName), packetId);
-                        }
-                        catch {
-                            return null;
-                        }
-                    },
-                });
-                attentionQueue.splice(0, attentionQueue.length, ...builtAttentionQueue);
-                const attentionFrame = (0, attention_queue_1.buildAttentionQueueStatusFrame)(attentionQueue);
-                return attentionFrame ? [attentionFrame] : [];
-            },
-            /* v8 ignore stop */
-            runAgentOptions: {
-                traceId,
-                toolChoiceRequired: true,
-                mcpManager,
-                ...(habitToolsResolved !== undefined && { tools: habitToolsResolved }),
-                toolContext: {
-                    signin: async () => undefined,
-                    delegatedOrigins: attentionQueue,
-                    ...(options?.noSend ? { noSend: true } : {}),
-                    ...(effectiveHabitSession ? { habitSession: effectiveHabitSession } : {}),
-                },
-                ...(effectiveHabitSession ? { habitSession: effectiveHabitSession } : {}),
-            },
-        });
-        // Post-turn routeDelegatedCompletion removed: delivery is now inline via surface tool.
-        // settle in the private runtime produces no CompletionMetadata, so routeDelegatedCompletion
-        // would be a no-op. The routing infrastructure is reused by the surface handler.
-        const resultMessages = result.messages ?? [];
-        const assistantPreview = extractAssistantPreview(resultMessages);
-        const toolCalls = extractToolCallNames(resultMessages);
-        (0, runtime_1.emitNervesEvent)({
-            component: "senses",
-            event: "senses.private_runtime_turn",
-            message: "private-runtime turn completed",
-            meta: {
-                reason,
-                session: sessionFilePath,
-                ...(options?.taskId && { taskId: options.taskId }),
-                ...(assistantPreview && { assistantPreview }),
-                ...(toolCalls.length > 0 && { toolCalls }),
-                ...(result.usage && {
-                    promptTokens: result.usage.input_tokens,
-                    completionTokens: result.usage.output_tokens,
-                    totalTokens: result.usage.total_tokens,
-                }),
-            },
-        });
-        return {
-            messages: resultMessages,
-            usage: result.usage,
-            sessionPath: result.sessionPath ?? sessionFilePath,
-            completion: result.completion,
-            turnOutcome: result.turnOutcome,
-            restStatus: latestRestStatus(resultMessages),
-        };
-    }
-    finally {
-        writePrivateRuntimeState(sessionFilePath, {
-            status: "idle",
-            lastCompletedAt: now().toISOString(),
-        });
-    }
+    });
 }