@pentoshi/clai 3.11.4 → 3.11.5

package/dist/agent/runner.js

@@ -38,7 +38,7 @@ function safeEngagementActionsForToolCall(call) {
 }
 import { availableToolNames, normalizeToolCall, runToolCall, BATCH_SAFE_TOOLS, } from "../tools/registry.js";
 import { getToolDefinitions, getCompactToolDefinitions, RUNNER_META_TOOL_NAMES, } from "../tools/definitions.js";
-import { appendAssistantWithTools, ensureUniqueToolCallIds, appendToolResult, assertValidToolProtocol, fillMissingToolResults, repairToolProtocol, } from "./tool-history.js";
+import { appendAssistantWithTools, ensureUniqueToolCallIds, toolCallIdsInHistory, appendToolResult, assertValidToolProtocol, fillMissingToolResults, repairToolProtocol, } from "./tool-history.js";
 import { formatViewportHint, registerViewport } from "../ui/output-pane.js";
 import { compactMessagesWithSummary, shouldApplyAutoCompact, COMPACTION_MEMORY_PREFIX, PLAN_IMPLEMENT_MEMORY_PREFIX, isCompactionMemoryMessage, } from "./context-manager.js";
 import { buildContextBreakdown, contextBreakdownAuditPayload, describeDominantContextBlock, toolSchemaHash, } from "./context-breakdown.js";
@@ -3632,11 +3632,14 @@ export async function runAgentTurn(prompt, options = {}) {
                                         writeNotice("info", `native tool call was truncated — salvaged ${lineCount} lines and wrote to ${salvaged.path}`, chalk.cyan(`  ℹ native tool call was truncated — salvaged ${lineCount} lines to ${salvaged.path}\n`));
                                         // Pair assistant tool_calls with synthetic results so the
                                         // next turn is not orphaned, then nudge for append.
-                                        appendAssistantWithTools(messages, assistantText.visible, nativeToolCalls, completion.reasoningBlock);
-                                        for (const tc of nativeToolCalls) {
-                                            appendToolResult(messages, tc.id, tc.id === writeTc.id
+                                        const salvageHistoryCalls = ensureUniqueToolCallIds(nativeToolCalls, toolCallIdsInHistory(messages));
+                                        const salvagedCallIndex = nativeToolCalls.indexOf(writeTc);
+                                        const salvagedCallId = salvageHistoryCalls[salvagedCallIndex]?.id ?? writeTc.id;
+                                        appendAssistantWithTools(messages, assistantText.visible, salvageHistoryCalls, completion.reasoningBlock);
+                                        for (const tc of salvageHistoryCalls) {
+                                            appendToolResult(messages, tc.id, tc.id === salvagedCallId
                                                 ? `Tool ${tc.name} result (exit=0, ok=true):\nSalvaged partial write: ${lineCount} lines to ${salvaged.path}`
-                                                : `Tool ${tc.name} result (exit=1, ok=false):\nCancelled — sibling write was truncated and salvaged.`, tc.name, tc.id === writeTc.id);
+                                                : `Tool ${tc.name} result (exit=1, ok=false):\nCancelled — sibling write was truncated and salvaged.`, tc.name, tc.id === salvagedCallId);
                                         }
                                         const priorBytes = writeResult.bytesOnDisk;
                                         const salvagedToolName = salvaged.operation === "append"
@@ -4251,7 +4254,7 @@ export async function runAgentTurn(prompt, options = {}) {
                 // assistant toolCalls and role:tool results always share the same id.
                 // Mismatched ids make results look orphaned → repair injects placeholders
                 // → model thrash-retries tools that already succeeded in the UI.
-                const historyNativeCalls = ensureUniqueToolCallIds(bound.map((b) => b.native));
+                const historyNativeCalls = ensureUniqueToolCallIds(bound.map((b) => b.native), toolCallIdsInHistory(messages));
                 for (let i = 0; i < bound.length; i++) {
                     const fixed = historyNativeCalls[i];
                     bound[i] = {