@cjhyy/code-shell-core 0.6.0-rc.9 → 0.7.0

package/dist/engine/turn-loop.js

@@ -6,6 +6,7 @@
  */
 import { initialTurnState, newTurnId } from "./turn-state.js";
 import { formatFriendlyError } from "./friendly-error.js";
+import { projectGoalJudgeToolResult, } from "../hooks/goal-stop-hook.js";
 import { wrapHookMessages } from "../hooks/inject.js";
 import { ContextLimitError } from "../exceptions.js";
 import { logger } from "../logging/logger.js";
@@ -17,8 +18,9 @@ import { isAbortError } from "../llm/client-base.js";
 import { crossedReactiveThreshold } from "./reactive-threshold.js";
 import { COMPLETE_GOAL_TOOL_NAME } from "../tool-system/builtin/complete-goal.js";
 import { CANCEL_GOAL_TOOL_NAME } from "../tool-system/builtin/cancel-goal.js";
+import { redactSensitiveToolResultsInMessages, toolResultForDisplay, toolResultTranscriptText, toolResultsForDisplay, } from "../tool-system/tool-result-redaction.js";
 import { addTokenUsage, cacheHitRateFromUsage, cumulativeCacheHitRate, } from "./session-usage.js";
-import { createGoalBudgetTracker, recordGoalUsage, goalBudgetExceeded, applyGoalExtension, limitProximity, GOAL_DEFAULT_MAX_STOP_BLOCKS, } from "./goal.js";
+import { createGoalBudgetTracker, recordGoalUsage, goalBudgetTerminationReason, applyGoalExtension, limitProximity, GOAL_DEFAULT_MAX_STOP_BLOCKS, } from "./goal.js";
 /**
  * 把一个 ToolResult 映射成发给 LLM 的 tool_result ContentBlock。
  * 有 contentBlocks(view_image 的图片块)就原样用作 content;否则
@@ -59,7 +61,9 @@ export class TurnLoop {
         cacheCreationTokens: 0,
     };
     currentCumulativeUsage;
+    sensitiveToolResultRedactions = new Map();
     pendingImageMessages = new Set();
+    volatileContextMessages = new Set();
     /**
      * Consecutive on_stop blocks (Goal mode kept the agent going). Reset to 0
      * on any unblocked completion. When it reaches config.maxStopBlocks the
@@ -158,6 +162,9 @@ export class TurnLoop {
         for (const msg of this.config.freshImageMessages ?? []) {
             this.pendingImageMessages.add(msg);
         }
+        for (const msg of this.config.volatileContextMessages ?? []) {
+            this.volatileContextMessages.add(msg);
+        }
         // Wrap onStream so a single throwing handler can't silently break
         // the channel for the rest of the run. A 2026-05-25 incident saw a
         // sub-agent's events stop reaching the renderer ~23s into its run —
@@ -222,6 +229,23 @@ export class TurnLoop {
         }
         return result.messages;
     }
+    stripVolatileContextMessages(messages) {
+        if (this.volatileContextMessages.size === 0)
+            return messages;
+        let changed = false;
+        const stripped = messages.filter((message) => {
+            const keep = !this.volatileContextMessages.has(message);
+            if (!keep)
+                changed = true;
+            return keep;
+        });
+        return changed ? stripped : messages;
+    }
+    appendVolatileContextMessages(messages) {
+        if (this.volatileContextMessages.size === 0)
+            return messages;
+        return [...this.stripVolatileContextMessages(messages), ...this.volatileContextMessages];
+    }
     markPendingImagesConsumed(messages) {
         if (this.pendingImageMessages.size === 0)
             return messages;
@@ -237,6 +261,20 @@ export class TurnLoop {
         }
         return result.messages;
     }
+    redactConsumedSensitiveToolResults(messages) {
+        if (this.sensitiveToolResultRedactions.size === 0)
+            return messages;
+        const redacted = redactSensitiveToolResultsInMessages(messages, this.sensitiveToolResultRedactions);
+        this.sensitiveToolResultRedactions.clear();
+        return redacted;
+    }
+    modelCallRecordingOptions() {
+        if (this.sensitiveToolResultRedactions.size === 0)
+            return undefined;
+        return {
+            sensitiveToolResultRedactions: new Map(this.sensitiveToolResultRedactions),
+        };
+    }
     trackFreshImageMessage(message) {
         if (messageHasBase64ImagePayload(message)) {
             this.pendingImageMessages.add(message);
@@ -281,11 +319,17 @@ export class TurnLoop {
         if (ctx === this.lastCtxEmit)
             return;
         this.lastCtxEmit = ctx;
-        this.config.onStream({ type: "usage_update", promptTokens: ctx });
+        this.config.onStream({
+            type: "usage_update",
+            promptTokens: ctx,
+            promptTokensSource: overhead > 0 ? "calibrated_estimate" : "heuristic_estimate",
+            promptTokensConfidence: overhead > 0 ? "medium" : "low",
+        });
     }
     recordResponseUsage(usage) {
         this.currentTurnUsage = addTokenUsage(this.currentTurnUsage, usage);
         this.currentCumulativeUsage = this.deps.recordCumulativeUsage?.(usage);
+        this.deps.recordCacheReadDiagnostics?.(usage);
     }
     emitCtxFromUsage(usage, messages) {
         if (!this.config.onStream)
@@ -320,6 +364,8 @@ export class TurnLoop {
         this.config.onStream({
             type: "usage_update",
             promptTokens,
+            promptTokensSource: "provider_usage",
+            promptTokensConfidence: "high",
             ...(usage.cacheReadTokens !== undefined ? { cacheReadTokens: usage.cacheReadTokens } : {}),
             ...(usage.cacheCreationTokens !== undefined
                 ? { cacheCreationTokens: usage.cacheCreationTokens }
@@ -349,9 +395,17 @@ export class TurnLoop {
      * Run the multi-turn agent loop until completion.
      */
     async run(initialMessages) {
+        const result = await this.runUnredacted(initialMessages);
+        return { ...result, messages: this.redactConsumedSensitiveToolResults(result.messages) };
+    }
+    async runUnredacted(initialMessages) {
         let messages = [...initialMessages];
         let finalText = "";
         const budgetTracker = createBudgetTracker();
+        // Recent execution evidence for the built-in Goal judge. Values enter this
+        // window only after irreversible sensitive-data removal, non-text omission,
+        // and per-item truncation at the current-round ToolResult boundary.
+        const goalToolResults = [];
         // Goal-mode run-scoped budget tracker (P0). Null when no goal. Stamps a
         // wall-clock start now and accumulates prompt+completion tokens across
         // every turn; the guardrail below force-stops the run once any configured
@@ -398,7 +452,7 @@ export class TurnLoop {
                 // they join THIS step's request — no abort, no lost in-flight work. Same
                 // loop-top user-push pattern as turnStartInjection / turn-limit warnings
                 // below. Push to transcript too so they persist + survive resume.
-                this.consumeQueuedSteer(messages, "normal_step");
+                await this.consumeQueuedSteer(messages, "normal_step");
                 const state = initialTurnState(this.turnCount);
                 // Per-turn correlation ID. Every log written through `tlog` (or any
                 // child derived from it) is stamped with `turn` + `turnId`, so
@@ -407,13 +461,18 @@ export class TurnLoop {
                 // returns; instead, each return-causing branch logs its own terminal
                 // event (model_error, completed, etc.).
                 const turnId = newTurnId();
+                const assistantMessageId = `assistant_${turnId}`;
                 const tlog = logger.child({ turn: this.turnCount, turnId });
                 this.currentTurnLog = tlog;
                 const turnStartedAt = Date.now();
                 tlog.info("turn.start", { cat: "turn", messageCount: messages.length });
                 // Tag downstream tool-exec / permission lines with this turn's IDs.
                 this.deps.toolExecutor.setLogger(tlog);
-                this.config.onStream?.({ type: "stream_request_start", turnNumber: this.turnCount });
+                this.config.onStream?.({
+                    type: "stream_request_start",
+                    turnNumber: this.turnCount,
+                    messageId: assistantMessageId,
+                });
                 const turnStartHook = await this.emitHook("on_turn_start", {
                     turnNumber: this.turnCount,
                 });
@@ -453,16 +512,26 @@ export class TurnLoop {
                 // Pre-check: downgrade image payloads that have already had their one
                 // model-consumption turn, then run context management. Fresh images in
                 // pendingImageMessages are preserved through this next model request.
+                const hasPendingSensitiveToolResults = this.sensitiveToolResultRedactions.size > 0;
                 messages = this.prepareMessagesForModel(messages);
-                // Context management (async — may trigger LLM summarization)
-                messages = await this.deps.contextManager.manageAsync(messages);
-                // manageAsync can itself issue an LLM summarization call lasting several
-                // seconds; if the signal aborted during it, stop here rather than
-                // proceeding into the (expensive) main model call. Belt to the loop-top
-                // brace: this catches an abort that landed *inside* context management.
-                if (this.config.signal?.aborted) {
-                    this.markStopped();
-                    return { text: finalText, reason: "aborted_streaming", messages };
+                messages = this.stripVolatileContextMessages(messages);
+                if (hasPendingSensitiveToolResults) {
+                    tlog.info("turn.sensitive_tool_result_context_management_skipped", {
+                        cat: "turn",
+                        count: this.sensitiveToolResultRedactions.size,
+                    });
+                }
+                else {
+                    // Context management (async — may trigger LLM summarization)
+                    messages = await this.deps.contextManager.manageAsync(messages);
+                    // manageAsync can itself issue an LLM summarization call lasting several
+                    // seconds; if the signal aborted during it, stop here rather than
+                    // proceeding into the (expensive) main model call. Belt to the loop-top
+                    // brace: this catches an abort that landed *inside* context management.
+                    if (this.config.signal?.aborted) {
+                        this.markStopped();
+                        return { text: finalText, reason: "aborted_streaming", messages };
+                    }
                 }
                 // No pre-llm ctx emit here: the messages-only estimate would be ~16k
                 // smaller than the real prompt (system + tools not included), making
@@ -476,7 +545,9 @@ export class TurnLoop {
                 // call. Microcompact is lossless (just clearing redundant
                 // tool_results) so we suppress hook emits for it to keep token
                 // overhead down.
-                const pending = this.deps.consumePendingCompactInfo?.();
+                const pending = hasPendingSensitiveToolResults
+                    ? null
+                    : this.deps.consumePendingCompactInfo?.();
                 if (pending && pending.strategy !== "micro") {
                     const compactHook = await this.emitHook("post_compact", {
                         strategy: pending.strategy,
@@ -488,14 +559,16 @@ export class TurnLoop {
                         messages.push(compactInjection);
                     }
                 }
+                messages = this.appendVolatileContextMessages(messages);
                 // Model call (with streaming fallback and max_output_tokens continuation)
                 // Track tool IDs streamed during this turn to avoid duplicate UI events
                 this.streamedToolIds.clear();
-                // Streaming tool queue: start concurrency-safe tools during streaming
+                // Tool queue is created before the call, but enqueue happens only after
+                // the complete LLMResponse is available below.
                 const streamingQueue = new StreamingToolQueue(this.deps.toolExecutor);
                 let response;
                 try {
-                    response = await this.callModelWithFallback(messages);
+                    response = await this.callModelWithFallback(messages, assistantMessageId);
                 }
                 catch (err) {
                     if (err instanceof ContextLimitError) {
@@ -506,13 +579,14 @@ export class TurnLoop {
                             tlog.warn("turn.ptl_recovery", { cat: "turn", retry, roundsToDrop: retry });
                             messages = dropOldestRounds(messages, retry);
                             try {
-                                response = await this.callModelWithFallback(messages);
+                                response = await this.callModelWithFallback(messages, assistantMessageId);
                                 recovered = true;
                                 break;
                             }
                             catch (retryErr) {
                                 if (!(retryErr instanceof ContextLimitError)) {
                                     this.config.onStream?.({ type: "error", error: formatFriendlyError(retryErr) });
+                                    messages = this.redactConsumedSensitiveToolResults(messages);
                                     return { text: finalText, reason: "model_error", messages };
                                 }
                             }
@@ -523,6 +597,7 @@ export class TurnLoop {
                                 type: "error",
                                 error: "Context limit exceeded after 3 recovery attempts",
                             });
+                            messages = this.redactConsumedSensitiveToolResults(messages);
                             return { text: finalText, reason: "prompt_too_long", messages };
                         }
                     }
@@ -536,14 +611,17 @@ export class TurnLoop {
                         // interrupted turn folds behind the process-card header on reload).
                         this.patchOrphanedToolUses(messages);
                         this.markStopped();
+                        messages = this.redactConsumedSensitiveToolResults(messages);
                         return { text: finalText, reason: "aborted_streaming", messages };
                     }
                     else {
                         this.patchOrphanedToolUses(messages);
                         this.config.onStream?.({ type: "error", error: formatFriendlyError(err) });
+                        messages = this.redactConsumedSensitiveToolResults(messages);
                         return { text: finalText, reason: "model_error", messages };
                     }
                 }
+                messages = this.redactConsumedSensitiveToolResults(messages);
                 // Record the response once into current-turn and whole-session counters.
                 if (response.usage?.promptTokens !== undefined) {
                     this.recordResponseUsage(response.usage);
@@ -553,7 +631,10 @@ export class TurnLoop {
                 // compaction decisions use hybrid (actual + delta) estimation rather than
                 // pure heuristics. Without this the manager falls back to char/4 estimates.
                 if (response.usage?.promptTokens !== undefined) {
-                    this.deps.contextManager.recordActualUsage(response.usage.promptTokens, messages.length);
+                    const contextAnchorMessages = this.stripVolatileContextMessages(messages);
+                    const anchor = this.deps.contextManager.recordActualUsage(response.usage.promptTokens, contextAnchorMessages.length, contextAnchorMessages);
+                    if (anchor)
+                        this.deps.recordContextUsageAnchor?.(anchor);
                 }
                 messages = this.markPendingImagesConsumed(messages);
                 // Truncation that cut off a TOOL CALL: the model overflowed
@@ -641,7 +722,10 @@ export class TurnLoop {
                 // is force-stopped regardless of what the model wants to do next (stop OR
                 // continue with tool calls). This is the unattended-safety backstop, so
                 // it sits BEFORE the "tool calls?" branch — both paths pass the gate.
-                if (goalTracker && goalBudgetExceeded(goalTracker, Date.now())) {
+                const budgetTermination = goalTracker
+                    ? goalBudgetTerminationReason(goalTracker, Date.now())
+                    : undefined;
+                if (goalTracker && budgetTermination) {
                     tlog.info("turn.goal_budget_exhausted", {
                         cat: "goal",
                         tokensUsed: goalTracker.tokensUsed,
@@ -650,18 +734,25 @@ export class TurnLoop {
                     });
                     this.config.onStream?.({
                         type: "assistant_message",
+                        messageId: assistantMessageId,
                         message: {
                             role: "assistant",
                             content: "（Goal 预算已耗尽，强制停止。）",
                         },
                     });
-                    return { text: finalText, reason: "goal_budget_exhausted", messages };
+                    return {
+                        text: finalText,
+                        reason: "goal_budget_exhausted",
+                        messages,
+                        goalTermination: budgetTermination,
+                    };
                 }
                 // Post-check: tool calls?
                 if (response.toolCalls.length === 0) {
                     // No tool use — final answer
                     this.config.onStream?.({
                         type: "assistant_message",
+                        messageId: assistantMessageId,
                         message: { role: "assistant", content: finalText },
                     });
                     await this.emitHook("on_turn_end", {
@@ -669,7 +760,7 @@ export class TurnLoop {
                         hasToolUse: false,
                     });
                     messages.push({ role: "assistant", content: finalText });
-                    if (this.consumeQueuedSteer(messages, "finalize_backfill")) {
+                    if (await this.consumeQueuedSteer(messages, "finalize_backfill")) {
                         continue;
                     }
                     // on_stop seam: the model wants to stop. Give handlers (Goal mode)
@@ -678,6 +769,23 @@ export class TurnLoop {
                     // we run another turn instead of returning. Bounded by
                     // maxStopBlocks (consecutive) and the outer maxTurns ceiling.
                     const maxStopBlocks = this.config.maxStopBlocks ?? GOAL_DEFAULT_MAX_STOP_BLOCKS;
+                    if (goalTracker) {
+                        this.deps.updateGoalJudgeContext?.({
+                            toolResults: goalToolResults.map((item) => ({
+                                ...item,
+                            })),
+                            progress: {
+                                turnCount: this.turnCount,
+                                stopRound: this.stopBlockCount + 1,
+                                elapsedMs: Math.max(0, Date.now() - goalTracker.startedAtMs),
+                                tokensUsed: goalTracker.tokensUsed,
+                                tokenBudget: goalTracker.goal.tokenBudget,
+                                timeBudgetMs: goalTracker.goal.timeBudgetMs,
+                                maxTurns: this.config.maxTurns,
+                                maxStopBlocks,
+                            },
+                        });
+                    }
                     const stopHook = await this.emitHook("on_stop", {
                         goal: this.config.goal,
                         finalText,
@@ -722,6 +830,7 @@ export class TurnLoop {
                         });
                         continue;
                     }
+                    let goalTermination;
                     if (stopHook.continueSession && this.stopBlockCount >= maxStopBlocks) {
                         // Cap hit: stop anyway, but tell the user why we're not looping
                         // forever on an unsatisfiable goal.
@@ -735,8 +844,10 @@ export class TurnLoop {
                             status: "exhausted",
                             round: this.stopBlockCount,
                         });
+                        goalTermination = "stop_blocks_exhausted";
                         this.config.onStream?.({
                             type: "assistant_message",
+                            messageId: assistantMessageId,
                             message: {
                                 role: "assistant",
                                 content: `（Goal 续跑已达 ${maxStopBlocks} 次上限，先停下。）`,
@@ -753,10 +864,11 @@ export class TurnLoop {
                         });
                     }
                     this.stopBlockCount = 0;
-                    if (this.consumeQueuedSteer(messages, "finalize_backfill")) {
+                    if (await this.consumeQueuedSteer(messages, "finalize_backfill")) {
                         continue;
                     }
-                    return { text: finalText, reason: "completed", messages };
+                    messages = this.redactConsumedSensitiveToolResults(messages);
+                    return { text: finalText, reason: "completed", messages, goalTermination };
                 }
                 // Tool execution phase
                 tlog.info("turn.tool_use", {
@@ -799,9 +911,21 @@ export class TurnLoop {
                 // Record results in transcript and stream
                 const resultBlocks = [];
                 for (const result of results) {
+                    if (goalTracker) {
+                        goalToolResults.push(projectGoalJudgeToolResult(result, this.turnCount));
+                        // The prompt renderer keeps at most 12, but retaining a few extra
+                        // bounded projections lets its total-char budget choose the newest useful subset.
+                        if (goalToolResults.length > 20)
+                            goalToolResults.splice(0, goalToolResults.length - 20);
+                    }
                     resultBlocks.push(toolResultToBlock(result));
-                    this.deps.transcript.appendToolResult(result.id, result.toolName, result.result, result.error);
-                    this.config.onStream?.({ type: "tool_result", result });
+                    const streamResult = toolResultForDisplay(result);
+                    const transcriptResult = toolResultTranscriptText(result);
+                    if (result.sensitive && transcriptResult !== undefined) {
+                        this.sensitiveToolResultRedactions.set(result.id, transcriptResult);
+                    }
+                    this.deps.transcript.appendToolResult(result.id, result.toolName, transcriptResult, result.error, result.sensitive ? undefined : result.contentBlocks);
+                    this.config.onStream?.({ type: "tool_result", result: streamResult });
                 }
                 // Fire-and-forget tool use summary (non-blocking). The whole chain is
                 // best-effort observability — a thrown onStream handler, a failed dynamic
@@ -812,9 +936,13 @@ export class TurnLoop {
                         .then(({ generateToolUseSummary }) => {
                         if (!this.deps.model.summarize)
                             return;
-                        return generateToolUseSummary(toolCalls, results, this.deps.model.summarize).then((summary) => {
+                        return generateToolUseSummary(toolCalls, toolResultsForDisplay(results), this.deps.model.summarize).then((summary) => {
                             if (summary) {
-                                this.config.onStream?.({ type: "tool_summary", summary });
+                                this.config.onStream?.({
+                                    type: "tool_summary",
+                                    summary,
+                                    toolCallIds: toolCalls.map((toolCall) => toolCall.id),
+                                });
                             }
                         });
                     })
@@ -866,9 +994,10 @@ export class TurnLoop {
                     tlog.info("turn.goal_self_reported_complete", { cat: "goal" });
                     this.stopBlockCount = 0;
                     this.deps.clearPersistedGoal?.();
-                    if (this.consumeQueuedSteer(messages, "finalize_backfill")) {
+                    if (await this.consumeQueuedSteer(messages, "finalize_backfill")) {
                         continue;
                     }
+                    messages = this.redactConsumedSensitiveToolResults(messages);
                     return { text: finalText, reason: "completed", messages };
                 }
                 // Goal mode: user-initiated cancellation. cancel_goal is the "strong
@@ -881,7 +1010,7 @@ export class TurnLoop {
                     tlog.info("turn.goal_user_cancelled", { cat: "goal" });
                     this.stopBlockCount = 0;
                     this.deps.clearPersistedGoal?.();
-                    if (this.consumeQueuedSteer(messages, "finalize_backfill")) {
+                    if (await this.consumeQueuedSteer(messages, "finalize_backfill")) {
                         continue;
                     }
                     return { text: finalText, reason: "completed", messages };
@@ -897,12 +1026,14 @@ export class TurnLoop {
                     });
                     this.config.onStream?.({
                         type: "assistant_message",
+                        messageId: assistantMessageId,
                         message: { role: "assistant", content: finalText },
                     });
                     messages.push({ role: "assistant", content: finalText });
-                    if (this.consumeQueuedSteer(messages, "finalize_backfill")) {
+                    if (await this.consumeQueuedSteer(messages, "finalize_backfill")) {
                         continue;
                     }
+                    messages = this.redactConsumedSensitiveToolResults(messages);
                     return { text: finalText, reason: "completed", messages };
                 }
                 if (budgetDecision === "nudge") {
@@ -963,6 +1094,7 @@ export class TurnLoop {
             // no error event, so the UI shows only the "你停止了本轮" line.
             if (isAbortError(err) || this.config.signal?.aborted) {
                 this.markStopped();
+                messages = this.redactConsumedSensitiveToolResults(messages);
                 return { text: finalText, reason: "aborted_streaming", messages };
             }
             this.currentTurnLog.error("turn.unhandled_error", {
@@ -971,6 +1103,7 @@ export class TurnLoop {
                 stack: err.stack?.split("\n").slice(0, 4).join("\n"),
             });
             this.config.onStream?.({ type: "error", error: formatFriendlyError(err) });
+            messages = this.redactConsumedSensitiveToolResults(messages);
             return { text: finalText, reason: "model_error", messages };
         }
         // Max turns reached — do one final summarization call (no tools)
@@ -979,9 +1112,19 @@ export class TurnLoop {
             maxTurns: this.config.maxTurns,
             turnCount: this.turnCount,
         });
-        this.consumeQueuedSteer(messages, "finalize_backfill");
+        await this.consumeQueuedSteer(messages, "finalize_backfill");
+        const hasPendingSensitiveToolResults = this.sensitiveToolResultRedactions.size > 0;
         messages = this.prepareMessagesForModel(messages);
-        messages = this.deps.contextManager.manage(messages);
+        if (hasPendingSensitiveToolResults) {
+            logger.info("turn.sensitive_tool_result_context_management_skipped", {
+                cat: "turn",
+                count: this.sensitiveToolResultRedactions.size,
+                phase: "max_turns_summary",
+            });
+        }
+        else {
+            messages = this.deps.contextManager.manage(messages);
+        }
         messages.push({
             role: "user",
             content: "<system-reminder>Turn limit reached. Provide a final summary of what you accomplished and what remains to be done. Do NOT call any tools.</system-reminder>",
@@ -989,7 +1132,7 @@ export class TurnLoop {
         this.emitCtxFromMessages(messages);
         try {
             const summaryResponse = await this.deps.model.call(this.deps.systemPrompt, this.prepareMessagesForModel(messages), [], // No tools available for summary turn
-            this.config.onStream, this.config.signal);
+            this.config.onStream, this.config.signal, this.modelCallRecordingOptions());
             messages = this.markPendingImagesConsumed(messages);
             if (summaryResponse.text) {
                 finalText = summaryResponse.text;
@@ -1006,14 +1149,19 @@ export class TurnLoop {
             });
             messages.push({ role: "assistant", content: finalText });
         }
-        this.config.onStream?.({ type: "turn_complete", reason: "max_turns" });
-        return { text: finalText, reason: "max_turns", messages };
+        messages = this.redactConsumedSensitiveToolResults(messages);
+        return {
+            text: finalText,
+            reason: "max_turns",
+            messages,
+            ...(this.config.goal ? { goalTermination: "max_turns_exhausted" } : {}),
+        };
     }
     /**
      * Call model with streaming fallback.
      * If streaming fails, emit tombstone and retry non-streaming.
      */
-    async callModelWithFallback(messages) {
+    async callModelWithFallback(messages, assistantMessageId) {
         // Wrap stream callback to track tool_use_start events and reactive compaction
         let streamingResponseTokens = 0;
         let reactiveBucket = -1;
@@ -1045,7 +1193,7 @@ export class TurnLoop {
             }
             : undefined;
         try {
-            return await this.deps.model.call(this.deps.systemPrompt, messages, this.deps.tools, wrappedStream, this.config.signal);
+            return await this.deps.model.call(this.deps.systemPrompt, messages, this.deps.tools, wrappedStream, this.config.signal, this.modelCallRecordingOptions());
         }
         catch (err) {
             // If it's a context or rate limit error, don't fallback — propagate
@@ -1065,23 +1213,36 @@ export class TurnLoop {
             // really just a cancel. The signal is the authoritative cancel source.
             if (isAbortError(err) || this.config.signal?.aborted)
                 throw err;
+            // Sensitive tool results are model-facing exactly once. A streaming
+            // fallback would re-send the same pending plaintext in a second request,
+            // so fail the turn and let the unified exit redact returned history.
+            if (this.sensitiveToolResultRedactions.size > 0) {
+                this.config.onStream?.({ type: "tombstone", messageId: assistantMessageId });
+                this.currentTurnLog.warn("turn.streaming_fallback_skipped_sensitive", {
+                    cat: "turn",
+                    error: err.message,
+                });
+                throw err;
+            }
             // Streaming might have partially emitted — send tombstone to revoke
-            this.config.onStream?.({ type: "tombstone", messageId: `turn_${this.turnCount}` });
+            this.config.onStream?.({ type: "tombstone", messageId: assistantMessageId });
             this.currentTurnLog.warn("turn.streaming_fallback", {
                 cat: "turn",
                 error: err.message,
             });
             // Retry without streaming
-            return await this.deps.model.callWithoutStreaming(this.deps.systemPrompt, messages, this.deps.tools, this.config.signal);
+            return await this.deps.model.callWithoutStreaming(this.deps.systemPrompt, messages, this.deps.tools, this.config.signal, this.modelCallRecordingOptions());
         }
     }
     get currentTurn() {
         return this.turnCount;
     }
-    consumeQueuedSteer(messages, source) {
+    async consumeQueuedSteer(messages, source) {
         const steered = this.deps.consumeSteer?.(source) ?? [];
         let consumed = false;
-        for (const { id, text, clientMessageId } of steered) {
+        for (let index = 0; index < steered.length; index++) {
+            const item = steered[index];
+            const { id, text, clientMessageId } = item;
             if (!text)
                 continue;
             if (clientMessageId && this.deps.claimClientMessageId?.(clientMessageId, "steer") === false) {
@@ -1093,9 +1254,33 @@ export class TurnLoop {
                 });
                 continue;
             }
+            let content;
+            try {
+                content = this.deps.buildSteerUserMessageContent
+                    ? await this.deps.buildSteerUserMessageContent(item)
+                    : text;
+            }
+            catch (err) {
+                if (clientMessageId)
+                    this.deps.releaseClientMessageId?.(clientMessageId);
+                const pendingSuffix = steered.slice(index);
+                this.deps.restoreSteer?.(pendingSuffix);
+                logger.warn("steer.prepare.failed_requeued", {
+                    clientMessageId,
+                    steerId: id,
+                    sessionId: this.deps.sessionId,
+                    source,
+                    restoredCount: pendingSuffix.length,
+                    error: err.message,
+                });
+                break;
+            }
             consumed = true;
-            messages.push({ role: "user", content: text });
-            this.deps.transcript.appendMessage("user", text, { steerId: id, clientMessageId });
+            this.deps.setOriginClientMessageId?.(clientMessageId);
+            const message = { role: "user", content };
+            messages.push(message);
+            this.trackFreshImageMessage(message);
+            this.deps.transcript.appendMessage("user", content, { steerId: id, clientMessageId });
             this.config.onStream?.({ type: "steer_injected", text, id });
         }
         return consumed;

package/dist/engine/types.d.ts

@@ -75,6 +75,8 @@ export interface EngineConfig {
     /** Browser automation bridge (browser_* tools). Wired by the host (desktop)
      *  after construction via setBrowserBridge. Undefined → tools degrade. */
     browserBridge?: import("../tool-system/browser-bridge.js").BrowserBridge;
+    /** Host-backed workspace switch bridge (desktop only). */
+    workspaceBridge?: import("../tool-system/workspace-bridge.js").WorkspaceBridge;
     /** Inject a cookie credential into the built-in browser (InjectCredential
      *  tool). Wired by the host after construction via setInjectCredential.
      *  Undefined → the tool degrades with a clear "no browser" error. */
@@ -127,6 +129,12 @@ export interface EngineConfig {
      * automation shown; tui hidden). Sub-agents override to "subagent".
      */
     origin?: SessionOrigin;
+    /**
+     * Host-specific builtin tool surface. Desktop replaces the legacy core
+     * worktree tools with SwitchSessionWorkspace because Electron main owns the
+     * authoritative workspace switch service and UI refresh path.
+     */
+    builtinToolHost?: "desktop";
     /**
      * Optional shared EngineRuntime providing pre-constructed shared resources
      * (modelPool, toolRegistry, etc.). When provided, Engine uses these instead