@ouro.bot/cli 0.1.0-alpha.724 → 0.1.0-alpha.725

package/dist/heart/providers/anthropic.js

@@ -290,6 +290,7 @@ async function streamAnthropicMessages(client, model, request) {
     const thinkingBlocks = new Map();
     const redactedBlocks = new Map();
     const answerStreamer = new streaming_1.SettleStreamer(request.callbacks, request.eagerSettleStreaming);
+    const textOutput = new streaming_1.ProviderTextOutput(request.callbacks);
     try {
         for await (const event of response) {
             if (request.signal?.aborted)
@@ -319,6 +320,7 @@ async function streamAnthropicMessages(client, model, request) {
                     /* v8 ignore next -- settle streaming activation, tested via SettleStreamer unit tests @preserve */
                     if (name === "settle" && toolCalls.size === 1) {
                         answerStreamer.activate();
+                        textOutput.suppress();
                     }
                 }
                 continue;
@@ -333,7 +335,7 @@ async function streamAnthropicMessages(client, model, request) {
                     }
                     const text = String(delta?.text ?? "");
                     content += text;
-                    request.callbacks.onTextChunk(text);
+                    textOutput.emit(text);
                     continue;
                 }
                 if (deltaType === "thinking_delta") {
@@ -387,8 +389,26 @@ async function streamAnthropicMessages(client, model, request) {
         }
     }
     catch (error) {
+        textOutput.discard();
+        answerStreamer.cancel();
         throw error instanceof Error ? error : /* v8 ignore next -- defensive: stream errors are always Error @preserve */ new Error(String(error));
     }
+    const completedToolCalls = [...toolCalls.values()];
+    let settleFinalization;
+    if (request.signal?.aborted) {
+        textOutput.discard();
+        answerStreamer.cancel();
+    }
+    else if (completedToolCalls.length === 1
+        && completedToolCalls[0].name === "settle"
+        && answerStreamer.detected) {
+        textOutput.discard();
+        settleFinalization = (0, streaming_1.finalizeSettleStream)(answerStreamer, completedToolCalls[0].arguments);
+    }
+    else {
+        answerStreamer.cancel();
+        textOutput.flush();
+    }
     // Collect all thinking blocks (regular + redacted) sorted by index to preserve ordering
     const allThinkingIndices = [...thinkingBlocks.keys(), ...redactedBlocks.keys()].sort((a, b) => a - b);
     const outputItems = allThinkingIndices.map((idx) => {
@@ -399,10 +419,11 @@ async function streamAnthropicMessages(client, model, request) {
     });
     return {
         content,
-        toolCalls: [...toolCalls.values()],
+        toolCalls: completedToolCalls,
         outputItems,
         usage,
         settleStreamed: answerStreamer.streamed,
+        ...(settleFinalization ? { settleFinalization } : {}),
     };
 }
 function createAnthropicProviderRuntime(model, anthropicConfig = (0, config_1.getAnthropicConfig)()) {

package/dist/heart/start-of-turn-packet.js

@@ -44,6 +44,7 @@ const bundle_state_1 = require("./bundle-state");
 const tempo_1 = require("./tempo");
 const flight_recorder_1 = require("../arc/flight-recorder");
 const context_loss_sentinel_1 = require("./context-loss-sentinel");
+const orientation_frame_1 = require("./orientation-frame");
 function estimateTokens(text) {
     return Math.ceil(text.length / 4);
 }
@@ -224,8 +225,9 @@ function buildStartOfTurnPacket(view, opts) {
  * So presence is truncated first, then plotLine, then cares, then obligations.
  * resumeHint is never truncated.
  */
-function renderStartOfTurnPacket(packet) {
+function renderStartOfTurnPacket(packet, options = {}) {
     const budget = packet.tokenBudget;
+    const resumePriorWork = options.resumePriorWork === true;
     // Assemble sections in priority order (highest priority first for budget allocation)
     // Each section is { label, content, priority } where lower priority number = truncated first
     const sections = [
@@ -257,7 +259,7 @@ function renderStartOfTurnPacket(packet) {
         return "";
     }
     // Build the rendered output, truncating lower-priority sections first
-    let rendered = formatSections(sections);
+    let rendered = formatSections(sections, resumePriorWork);
     let tokens = estimateTokens(rendered);
     // Truncate sections from lowest priority until we fit budget
     const sortedByPriority = [...sections].sort((a, b) => a.priority - b.priority);
@@ -270,7 +272,7 @@ function renderStartOfTurnPacket(packet) {
         // Remove this section entirely
         const idx = sections.findIndex((s) => s.label === section.label);
         sections.splice(idx, 1);
-        rendered = formatSections(sections);
+        rendered = formatSections(sections, resumePriorWork);
         tokens = estimateTokens(rendered);
     }
     // If still over budget after removing all non-protected sections, trim what's left
@@ -286,18 +288,18 @@ function renderStartOfTurnPacket(packet) {
     });
     return rendered;
 }
-function formatSections(sections) {
+function formatSections(sections, resumePriorWork) {
     const parts = [];
     for (const section of sections) {
         switch (section.label) {
             case "resume":
-                parts.push(`**Next:** ${section.content}`);
+                parts.push((0, orientation_frame_1.labelPriorWorkSurface)(`**Next:**\n${section.content}`, resumePriorWork));
                 break;
             case "arc":
-                parts.push(`**Arc:**\n${section.content}`);
+                parts.push((0, orientation_frame_1.labelPriorWorkSurface)(`**Arc:**\n${section.content}`, resumePriorWork));
                 break;
             case "recoverySentinel":
-                parts.push(`**Recovery Sentinel:**\n${section.content}`);
+                parts.push((0, orientation_frame_1.labelPriorWorkSurface)(`**Recovery Sentinel:**\n${section.content}`, resumePriorWork));
                 break;
             case "sessionTiming":
                 parts.push(`**Thread timing:** ${section.content}`);
@@ -306,7 +308,7 @@ function formatSections(sections) {
                 parts.push(`**Recent contact:** ${section.content}`);
                 break;
             case "obligations":
-                parts.push(`**Owed:**\n${section.content}`);
+                parts.push((0, orientation_frame_1.labelPriorWorkSurface)(`**Owed:**\n${section.content}`, resumePriorWork));
                 break;
             case "cares":
                 parts.push(`**Cares:**\n${section.content}`);
@@ -337,15 +339,16 @@ function formatSections(sections) {
  * Ultra-compact version for coding context (max 200 tokens).
  * Just resumeHint + top obligation + top care, single-line bullets.
  */
-function renderCompactStartOfTurnPacket(packet) {
+function renderCompactStartOfTurnPacket(packet, options = {}) {
     const parts = [];
+    const instruction = (0, orientation_frame_1.priorWorkInstruction)(options.resumePriorWork === true);
     if (packet.resumeHint) {
-        parts.push(`next: ${packet.resumeHint}`);
+        parts.push(`next:\n${instruction}\n${packet.resumeHint}`);
     }
     if (packet.obligations) {
         // Just first line of obligations
         const firstOb = packet.obligations.split("\n")[0];
-        parts.push(`owed: ${firstOb.replace(/^- /, "")}`);
+        parts.push(`owed:\n${instruction}\n${firstOb.replace(/^- /, "")}`);
     }
     if (packet.cares) {
         const firstCare = packet.cares.split("\n")[0];