@@ -3,6 +3,7 @@ import {
33 normalizeOpenAICompatibleToolCallInputs,
44 sanitizeGeminiToolMessagesWithMetadata,
55 stripOpenAIHistoryTransforms,
6+ stripToolRuntimeInputFields,
67 } from "./history-transforms.ts";
78 import { getCacheFamily } from "./provider-options.ts";
89 import type { CoreMessage } from "./turn.ts";
@@ -51,9 +52,15 @@ export function prepareTurnMessages(input: {
5152
5253 const apiLogOn = isApiLogEnabled();
5354
54- // 1. Provider-specific sanitisation
55+ // 1. Strip runtime-only tool input fields before provider-specific sanitisation.
56+ const strippedRuntimeToolFields = stripToolRuntimeInputFields(messages);
57+ if (strippedRuntimeToolFields !== messages && apiLogOn) {
58+ logApiEvent("runtime tool input fields stripped", { modelString });
59+ }
60+
61+ // 2. Provider-specific sanitisation
5562 const geminiResult = sanitizeGeminiToolMessagesWithMetadata(
56- messages,
63+ strippedRuntimeToolFields,
5764 modelString,
5865 toolCount > 0,
5966 );
@@ -83,7 +90,7 @@ export function prepareTurnMessages(input: {
8390 logApiEvent("openai-compatible tool input normalized", { modelString });
8491 }
8592
86- // 2. Context pruning
93+ // 3. Context pruning
8794 const preStats = apiLogOn
8895 ? getMessageDiagnostics(normalised)
8996 : getMessageStats(normalised);
@@ -96,7 +103,7 @@ export function prepareTurnMessages(input: {
96103 : getMessageStats(pruned);
97104 if (apiLogOn) logApiEvent("turn context post-prune", postStats);
98105
99- // 3. Payload compaction
106+ // 4. Payload compaction
100107 const compacted = compactToolResultPayloads(
101108 pruned,
102109 toolResultPayloadCapBytes,
@@ -108,7 +115,7 @@ export function prepareTurnMessages(input: {
108115 });
109116 }
110117
111- // 4. Anthropic prompt caching breakpoints
118+ // 5. Anthropic prompt caching breakpoints
112119 let finalMessages = compacted;
113120 let finalSystemPrompt = systemPrompt;
114121
@@ -120,8 +127,9 @@ export function prepareTurnMessages(input: {
120127 );
121128 finalMessages = annotated.messages;
122129 finalSystemPrompt = annotated.systemPrompt;
123- if (apiLogOn)
130+ if (apiLogOn) {
124131 logApiEvent("Anthropic prompt caching", annotated.diagnostics);
132+ }
125133 }
126134
127135 const wasPruned =