@copilotkit/aimock 1.34.0 → 1.35.0

package/dist/stream-collapse.cjs

@@ -12,6 +12,88 @@ let node_zlib = require("node:zlib");
 * text followed by tool calls.
 */
 /**
+* Normalize a tool call's accumulated `arguments` into valid JSON exactly like
+* the flat-`toolCalls` recorder path: an empty / whitespace-only / missing
+* value becomes `"{}"`, never `""`. Mirrors `recorder.ts` `toToolCallArguments`
+* so a `blocks[].arguments` value is always parseable JSON and never disagrees
+* with the flat `toolCalls` entry for the same call.
+*/
+function normalizeToolArguments(args) {
+	if (args === void 0 || args.trim() === "") return "{}";
+	return args;
+}
+/**
+* Build a finalized {@link FixtureBlock.toolCall} from a tool-call accumulator,
+* normalizing `arguments` so the block agrees byte-for-byte with the flat
+* `toolCalls` entry built from the SAME accumulator object.
+*/
+function toToolCallBlock(ref) {
+	return {
+		type: "toolCall",
+		name: ref.name,
+		arguments: normalizeToolArguments(ref.arguments),
+		...ref.id ? { id: ref.id } : {}
+	};
+}
+/**
+* Decide whether a recorded atom sequence is "interleaved" and, if so, build
+* the ordered {@link FixtureBlock} list. Returns `undefined` when NOT
+* interleaved (text-first, text-only, or tool-only) so callers leave
+* `CollapseResult.blocks` unset and the recorder keeps the legacy shape.
+*
+* Interleaved ⇔ (a tool atom appears strictly before the first text atom) OR
+* (a text atom appears after any tool atom). A stream with no tool atoms, or
+* with no text atoms, is never interleaved. Text-first-then-tools is the common
+* legacy case and is explicitly NOT interleaved.
+*
+* CONSISTENCY (#274): each toolCall block is derived from the SAME accumulator
+* object referenced by its atom and normalized identically to the flat
+* `toolCalls` path ({@link toToolCallBlock} / {@link normalizeToolArguments}).
+* Because the atom `ref` is the very object the flat list is built from, the
+* block and its flat counterpart describe the same call by identity — even when
+* upstream tool-call indices do not match stream-arrival order. Empty/missing
+* arguments normalize to `"{}"` in BOTH representations, never `""`.
+*/
+function buildOrderedBlocks(atoms) {
+	let firstTextIndex = -1;
+	let firstToolIndex = -1;
+	let textAfterTool = false;
+	let sawTool = false;
+	let sawText = false;
+	for (let i = 0; i < atoms.length; i++) if (atoms[i].kind === "text") {
+		sawText = true;
+		if (firstTextIndex === -1) firstTextIndex = i;
+		if (sawTool) textAfterTool = true;
+	} else {
+		sawTool = true;
+		if (firstToolIndex === -1) firstToolIndex = i;
+	}
+	if (!sawTool || !sawText) return void 0;
+	if (!(firstToolIndex < firstTextIndex) && !textAfterTool) return void 0;
+	const blocks = [];
+	let pendingText = "";
+	let hasPendingText = false;
+	const flushText = () => {
+		if (hasPendingText) {
+			blocks.push({
+				type: "text",
+				text: pendingText
+			});
+			pendingText = "";
+			hasPendingText = false;
+		}
+	};
+	for (const a of atoms) if (a.kind === "text") {
+		pendingText += a.text;
+		hasPendingText = true;
+	} else {
+		flushText();
+		blocks.push(toToolCallBlock(a.ref));
+	}
+	flushText();
+	return blocks;
+}
+/**
 * The opaque `data` of a non-empty Anthropic `redacted_thinking` block, or
 * `undefined` if `block` is not a redacted_thinking block or carries empty/no
 * data. NON-EMPTY is required: the replay-side validator rejects a leading
@@ -96,6 +178,7 @@ function collapseOpenAISSE(body) {
 	const toolCallMap = /* @__PURE__ */ new Map();
 	let nextSyntheticIndex = 1e6;
 	const idKeyMap = /* @__PURE__ */ new Map();
+	const orderAtoms = [];
 	for (const line of lines) {
 		const data = extractSSEData(splitSSELines(line));
 		if (data === void 0) continue;
@@ -133,7 +216,13 @@ function collapseOpenAISSE(body) {
 		const delta = choices[0].delta;
 		if (!delta) continue;
 		if (typeof delta.reasoning_content === "string") reasoning += delta.reasoning_content;
-		if (typeof delta.content === "string") content += delta.content;
+		if (typeof delta.content === "string") {
+			content += delta.content;
+			if (delta.content.length > 0) orderAtoms.push({
+				kind: "text",
+				text: delta.content
+			});
+		}
 		const toolCalls = delta.tool_calls;
 		if (toolCalls) for (const tc of toolCalls) {
 			const fn = tc.function;
@@ -148,11 +237,18 @@ function collapseOpenAISSE(body) {
 					idKeyMap.set(rawId, index);
 				}
 			} else index = nextSyntheticIndex++;
-			if (!toolCallMap.has(index)) toolCallMap.set(index, {
-				id: rawId ?? "",
-				name: fn?.name ?? "",
-				arguments: ""
-			});
+			if (!toolCallMap.has(index)) {
+				const created = {
+					id: rawId ?? "",
+					name: fn?.name ?? "",
+					arguments: ""
+				};
+				toolCallMap.set(index, created);
+				orderAtoms.push({
+					kind: "toolCall",
+					ref: created
+				});
+			}
 			const entry = toolCallMap.get(index);
 			if (fn?.name && typeof fn.name === "string" && !entry.name) entry.name = fn.name;
 			if (tc.id && typeof tc.id === "string" && !entry.id) entry.id = tc.id;
@@ -172,14 +268,21 @@ function collapseOpenAISSE(body) {
 		}
 	}
 	if (toolCallMap.size > 0 || harmonyToolCalls.length > 0) {
-		const sorted = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b);
+		const blocks = buildOrderedBlocks(orderAtoms);
+		const orderedToolCalls = orderAtoms.filter((a) => a.kind === "toolCall").map((a) => ({
+			name: a.ref.name,
+			arguments: normalizeToolArguments(a.ref.arguments),
+			...a.ref.id ? { id: a.ref.id } : {}
+		}));
+		const indexSortedToolCalls = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b).map(([, tc]) => ({
+			name: tc.name,
+			arguments: normalizeToolArguments(tc.arguments),
+			...tc.id ? { id: tc.id } : {}
+		}));
 		return {
+			...blocks ? { blocks } : {},
 			...content ? { content } : {},
-			toolCalls: [...sorted.map(([, tc]) => ({
-				name: tc.name,
-				arguments: tc.arguments,
-				...tc.id ? { id: tc.id } : {}
-			})), ...harmonyToolCalls],
+			toolCalls: [...blocks ? orderedToolCalls : indexSortedToolCalls, ...harmonyToolCalls],
 			...reasoning ? { reasoning } : {},
 			...webSearchQueries.length > 0 ? { webSearches: webSearchQueries } : {},
 			...droppedChunks > 0 ? { droppedChunks } : {},
@@ -216,6 +319,7 @@ function collapseAnthropicSSE(body) {
 	const toolCallMap = /* @__PURE__ */ new Map();
 	let nextSyntheticIndex = 1e6;
 	let lastSyntheticIndex;
+	const orderAtoms = [];
 	for (const block of blocks) {
 		const lines = splitSSELines(block);
 		const eventLine = lines.find((l) => l.startsWith("event:"));
@@ -240,17 +344,28 @@ function collapseAnthropicSSE(body) {
 				if (typeof parsed.index === "number") index = parsed.index;
 				else index = nextSyntheticIndex++;
 				lastSyntheticIndex = index;
-				toolCallMap.set(index, {
+				const created = {
 					id: contentBlock.id ?? "",
 					name: contentBlock.name ?? "",
 					arguments: ""
+				};
+				toolCallMap.set(index, created);
+				orderAtoms.push({
+					kind: "toolCall",
+					ref: created
 				});
 			}
 		}
 		if (eventType === "content_block_delta") {
 			const delta = parsed.delta;
 			if (!delta) continue;
-			if (delta.type === "text_delta" && typeof delta.text === "string") content += delta.text;
+			if (delta.type === "text_delta" && typeof delta.text === "string") {
+				content += delta.text;
+				if (delta.text.length > 0) orderAtoms.push({
+					kind: "text",
+					text: delta.text
+				});
+			}
 			if (delta.type === "thinking_delta" && typeof delta.thinking === "string") reasoning += delta.thinking;
 			if (delta.type === "signature_delta" && typeof delta.signature === "string") reasoningSignature = delta.signature;
 			if (delta.type === "input_json_delta" && typeof delta.partial_json === "string") {
@@ -265,14 +380,21 @@ function collapseAnthropicSSE(body) {
 		}
 	}
 	if (toolCallMap.size > 0) {
-		const sorted = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b);
+		const orderedBlocks = buildOrderedBlocks(orderAtoms);
+		const orderedToolCalls = orderAtoms.filter((a) => a.kind === "toolCall").map((a) => ({
+			name: a.ref.name,
+			arguments: normalizeToolArguments(a.ref.arguments),
+			...a.ref.id ? { id: a.ref.id } : {}
+		}));
+		const indexSortedToolCalls = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b).map(([, tc]) => ({
+			name: tc.name,
+			arguments: normalizeToolArguments(tc.arguments),
+			...tc.id ? { id: tc.id } : {}
+		}));
 		return {
+			...orderedBlocks ? { blocks: orderedBlocks } : {},
 			...content ? { content } : {},
-			toolCalls: sorted.map(([, tc]) => ({
-				name: tc.name,
-				arguments: tc.arguments,
-				...tc.id ? { id: tc.id } : {}
-			})),
+			toolCalls: orderedBlocks ? orderedToolCalls : indexSortedToolCalls,
 			...reasoning ? { reasoning } : {},
 			...reasoningSignature ? { reasoningSignature } : {},
 			...redactedThinking.length > 0 ? { redactedThinking } : {},
@@ -304,6 +426,7 @@ function collapseGeminiSSE(body) {
 	let audioB64 = "";
 	let audioMimeType;
 	const toolCalls = [];
+	const orderAtoms = [];
 	for (const line of lines) {
 		const data = extractSSEData(splitSSELines(line));
 		if (data === void 0) continue;
@@ -324,33 +447,52 @@ function collapseGeminiSSE(body) {
 		if (!parts || parts.length === 0) continue;
 		for (const part of parts) if (part.functionCall) {
 			const fc = part.functionCall;
-			toolCalls.push({
+			const created = {
 				name: String(fc.name ?? ""),
 				arguments: typeof fc.args === "string" ? fc.args : JSON.stringify(fc.args ?? {})
+			};
+			toolCalls.push(created);
+			orderAtoms.push({
+				kind: "toolCall",
+				ref: created
 			});
 		} else if (part.inlineData && typeof part.inlineData.mimeType === "string" && part.inlineData.mimeType.startsWith("audio/")) {
 			const inlineData = part.inlineData;
 			if (!audioMimeType) audioMimeType = inlineData.mimeType;
 			if (typeof inlineData.data === "string") audioB64 += inlineData.data;
 		} else if (typeof part.text === "string") if (part.thought) reasoning += part.text;
-		else content += part.text;
+		else {
+			content += part.text;
+			if (part.text.length > 0) orderAtoms.push({
+				kind: "text",
+				text: part.text
+			});
+		}
 	}
+	const normalizedToolCalls = toolCalls.map((tc) => ({
+		...tc,
+		arguments: normalizeToolArguments(tc.arguments)
+	}));
 	if (audioB64) return {
 		audioB64,
 		audioMimeType,
 		...content ? { content } : {},
 		...reasoning ? { reasoning } : {},
-		...toolCalls.length > 0 ? { toolCalls } : {},
-		...droppedChunks > 0 ? { droppedChunks } : {},
-		...firstDroppedSample ? { firstDroppedSample } : {}
-	};
-	if (toolCalls.length > 0) return {
-		...content ? { content } : {},
-		toolCalls,
-		...reasoning ? { reasoning } : {},
+		...normalizedToolCalls.length > 0 ? { toolCalls: normalizedToolCalls } : {},
 		...droppedChunks > 0 ? { droppedChunks } : {},
 		...firstDroppedSample ? { firstDroppedSample } : {}
 	};
+	if (toolCalls.length > 0) {
+		const blocks = buildOrderedBlocks(orderAtoms);
+		return {
+			...blocks ? { blocks } : {},
+			...content ? { content } : {},
+			toolCalls: normalizedToolCalls,
+			...reasoning ? { reasoning } : {},
+			...droppedChunks > 0 ? { droppedChunks } : {},
+			...firstDroppedSample ? { firstDroppedSample } : {}
+		};
+	}
 	return {
 		content,
 		...reasoning ? { reasoning } : {},
@@ -381,6 +523,7 @@ function collapseOllamaNDJSON(body) {
 	let harmonyUnparsed = false;
 	let harmonyNote;
 	const toolCalls = [];
+	const orderAtoms = [];
 	for (const line of lines) {
 		let parsed;
 		try {
@@ -392,15 +535,34 @@ function collapseOllamaNDJSON(body) {
 		}
 		const message = parsed.message;
 		if (message) {
-			if (typeof message.content === "string") content += message.content;
+			if (typeof message.content === "string") {
+				content += message.content;
+				if (message.content.length > 0) orderAtoms.push({
+					kind: "text",
+					text: message.content
+				});
+			}
 			if (Array.isArray(message.tool_calls)) for (const tc of message.tool_calls) {
 				const fn = tc.function;
-				if (fn) toolCalls.push({
-					name: String(fn.name ?? ""),
-					arguments: typeof fn.arguments === "string" ? fn.arguments : JSON.stringify(fn.arguments ?? {})
-				});
+				if (fn) {
+					const created = {
+						name: String(fn.name ?? ""),
+						arguments: typeof fn.arguments === "string" ? fn.arguments : JSON.stringify(fn.arguments ?? {})
+					};
+					toolCalls.push(created);
+					orderAtoms.push({
+						kind: "toolCall",
+						ref: created
+					});
+				}
 			}
-		} else if (typeof parsed.response === "string") content += parsed.response;
+		} else if (typeof parsed.response === "string") {
+			content += parsed.response;
+			if (parsed.response.length > 0) orderAtoms.push({
+				kind: "text",
+				text: parsed.response
+			});
+		}
 	}
 	if (toolCalls.length === 0 && require_harmony.isHarmonyContent(content)) {
 		const parsedHarmony = require_harmony.parseHarmonyContent(content);
@@ -413,15 +575,23 @@ function collapseOllamaNDJSON(body) {
 			toolCalls.push(...parsedHarmony.toolCalls);
 		}
 	}
-	if (toolCalls.length > 0) return {
-		...content ? { content } : {},
-		toolCalls,
-		...reasoning ? { reasoning } : {},
-		...droppedChunks > 0 ? { droppedChunks } : {},
-		...firstDroppedSample ? { firstDroppedSample } : {},
-		...harmonyUnparsed ? { harmonyUnparsed: true } : {},
-		...harmonyNote ? { harmonyNote } : {}
-	};
+	if (toolCalls.length > 0) {
+		const blocks = buildOrderedBlocks(orderAtoms);
+		const normalizedToolCalls = toolCalls.map((tc) => ({
+			...tc,
+			arguments: normalizeToolArguments(tc.arguments)
+		}));
+		return {
+			...blocks ? { blocks } : {},
+			...content ? { content } : {},
+			toolCalls: normalizedToolCalls,
+			...reasoning ? { reasoning } : {},
+			...droppedChunks > 0 ? { droppedChunks } : {},
+			...firstDroppedSample ? { firstDroppedSample } : {},
+			...harmonyUnparsed ? { harmonyUnparsed: true } : {},
+			...harmonyNote ? { harmonyNote } : {}
+		};
+	}
 	return {
 		content,
 		...reasoning ? { reasoning } : {},
@@ -446,6 +616,7 @@ function collapseCohereSSE(body) {
 	const toolCallMap = /* @__PURE__ */ new Map();
 	let nextSyntheticIndex = 1e6;
 	let lastStartKey;
+	const orderAtoms = [];
 	for (const block of blocks) {
 		const lines = splitSSELines(block);
 		const eventLine = lines.find((l) => l.startsWith("event:"));
@@ -464,7 +635,13 @@ function collapseCohereSSE(body) {
 		if (eventType === "content-delta") {
 			const contentObj = (parsed.delta?.message)?.content;
 			if (contentObj && contentObj.type === "thinking" && typeof contentObj.thinking === "string") reasoning += contentObj.thinking;
-			else if (contentObj && typeof contentObj.text === "string") content += contentObj.text;
+			else if (contentObj && typeof contentObj.text === "string") {
+				content += contentObj.text;
+				if (contentObj.text.length > 0) orderAtoms.push({
+					kind: "text",
+					text: contentObj.text
+				});
+			}
 		}
 		if (eventType === "tool-call-start") {
 			let index;
@@ -474,10 +651,15 @@ function collapseCohereSSE(body) {
 			const toolCalls = (parsed.delta?.message)?.tool_calls;
 			if (toolCalls) {
 				const fn = toolCalls.function;
-				toolCallMap.set(index, {
+				const created = {
 					id: toolCalls.id ?? "",
 					name: fn?.name ?? "",
 					arguments: ""
+				};
+				toolCallMap.set(index, created);
+				orderAtoms.push({
+					kind: "toolCall",
+					ref: created
 				});
 			}
 		}
@@ -498,14 +680,21 @@ function collapseCohereSSE(body) {
 		}
 	}
 	if (toolCallMap.size > 0) {
-		const sorted = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b);
+		const orderedBlocks = buildOrderedBlocks(orderAtoms);
+		const orderedToolCalls = orderAtoms.filter((a) => a.kind === "toolCall").map((a) => ({
+			name: a.ref.name,
+			arguments: normalizeToolArguments(a.ref.arguments),
+			...a.ref.id ? { id: a.ref.id } : {}
+		}));
+		const indexSortedToolCalls = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b).map(([, tc]) => ({
+			name: tc.name,
+			arguments: normalizeToolArguments(tc.arguments),
+			...tc.id ? { id: tc.id } : {}
+		}));
 		return {
+			...orderedBlocks ? { blocks: orderedBlocks } : {},
 			...content ? { content } : {},
-			toolCalls: sorted.map(([, tc]) => ({
-				name: tc.name,
-				arguments: tc.arguments,
-				...tc.id ? { id: tc.id } : {}
-			})),
+			toolCalls: orderedBlocks ? orderedToolCalls : indexSortedToolCalls,
 			...reasoning ? { reasoning } : {},
 			...droppedChunks > 0 ? { droppedChunks } : {},
 			...firstDroppedSample ? { firstDroppedSample } : {}
@@ -618,6 +807,7 @@ function collapseBedrockEventStream(body) {
 	let droppedChunks = 0;
 	let firstDroppedSample;
 	const toolCallMap = /* @__PURE__ */ new Map();
+	const orderAtoms = [];
 	for (const frame of frames) {
 		const frameStr = frame.payload.toString("utf8");
 		let parsed;
@@ -630,7 +820,13 @@ function collapseBedrockEventStream(body) {
 		}
 		if (parsed.type === "content_block_delta") {
 			const delta = parsed.delta;
-			if (delta?.type === "text_delta" && typeof delta.text === "string") content += delta.text;
+			if (delta?.type === "text_delta" && typeof delta.text === "string") {
+				content += delta.text;
+				if (delta.text.length > 0) orderAtoms.push({
+					kind: "text",
+					text: delta.text
+				});
+			}
 			if (delta?.type === "thinking_delta" && typeof delta.thinking === "string") reasoning += delta.thinking;
 			if (delta?.type === "signature_delta" && typeof delta.signature === "string") reasoningSignature = delta.signature;
 			if (delta?.type === "input_json_delta" && typeof delta.partial_json === "string") {
@@ -649,11 +845,18 @@ function collapseBedrockEventStream(body) {
 			const index = parsed.index;
 			const redactedData = capturedRedactedData(block);
 			if (redactedData !== void 0) redactedThinking.push(redactedData);
-			if (block?.type === "tool_use" && index !== void 0) toolCallMap.set(index, {
-				id: block.id ?? "",
-				name: block.name ?? "",
-				arguments: ""
-			});
+			if (block?.type === "tool_use" && index !== void 0) {
+				const created = {
+					id: block.id ?? "",
+					name: block.name ?? "",
+					arguments: ""
+				};
+				toolCallMap.set(index, created);
+				orderAtoms.push({
+					kind: "toolCall",
+					ref: created
+				});
+			}
 			continue;
 		}
 		if (parsed.contentBlockStart) {
@@ -662,10 +865,15 @@ function collapseBedrockEventStream(body) {
 			const start = blockStart.start;
 			if (start?.toolUse && index !== void 0) {
 				const toolUse = start.toolUse;
-				toolCallMap.set(index, {
+				const created = {
 					id: toolUse.toolUseId ?? "",
 					name: toolUse.name ?? "",
 					arguments: ""
+				};
+				toolCallMap.set(index, created);
+				orderAtoms.push({
+					kind: "toolCall",
+					ref: created
 				});
 			}
 		}
@@ -674,7 +882,13 @@ function collapseBedrockEventStream(body) {
 			const index = parsed.contentBlockIndex ?? blockDelta.contentBlockIndex;
 			const delta = blockDelta.delta;
 			if (!delta) continue;
-			if (typeof delta.text === "string") content += delta.text;
+			if (typeof delta.text === "string") {
+				content += delta.text;
+				if (delta.text.length > 0) orderAtoms.push({
+					kind: "text",
+					text: delta.text
+				});
+			}
 			if (typeof delta.reasoningContent === "object" && delta.reasoningContent !== null) {
 				const reasoningDelta = delta.reasoningContent;
 				if (typeof reasoningDelta.text === "string") reasoning += reasoningDelta.text;
@@ -692,19 +906,30 @@ function collapseBedrockEventStream(body) {
 			}
 		}
 	}
-	if (toolCallMap.size > 0) return {
-		toolCalls: Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b).map(([, tc]) => ({
+	if (toolCallMap.size > 0) {
+		const orderedBlocks = buildOrderedBlocks(orderAtoms);
+		const orderedToolCalls = orderAtoms.filter((a) => a.kind === "toolCall").map((a) => ({
+			name: a.ref.name,
+			arguments: normalizeToolArguments(a.ref.arguments),
+			...a.ref.id ? { id: a.ref.id } : {}
+		}));
+		const indexSortedToolCalls = Array.from(toolCallMap.entries()).sort(([a], [b]) => a - b).map(([, tc]) => ({
 			name: tc.name,
-			arguments: tc.arguments,
+			arguments: normalizeToolArguments(tc.arguments),
 			...tc.id ? { id: tc.id } : {}
-		})),
-		...reasoning ? { reasoning } : {},
-		...reasoningSignature ? { reasoningSignature } : {},
-		...redactedThinking.length > 0 ? { redactedThinking } : {},
-		...droppedChunks > 0 ? { droppedChunks } : {},
-		...firstDroppedSample ? { firstDroppedSample } : {},
-		...truncated ? { truncated } : {}
-	};
+		}));
+		return {
+			...orderedBlocks ? { blocks: orderedBlocks } : {},
+			...content ? { content } : {},
+			toolCalls: orderedBlocks ? orderedToolCalls : indexSortedToolCalls,
+			...reasoning ? { reasoning } : {},
+			...reasoningSignature ? { reasoningSignature } : {},
+			...redactedThinking.length > 0 ? { redactedThinking } : {},
+			...droppedChunks > 0 ? { droppedChunks } : {},
+			...firstDroppedSample ? { firstDroppedSample } : {},
+			...truncated ? { truncated } : {}
+		};
+	}
 	return {
 		content,
 		...reasoning ? { reasoning } : {},
@@ -778,7 +1003,7 @@ function collapseGeminiInteractionsSSE(body) {
 				}
 			} else if (delta.type === "function_call") toolCalls.push({
 				name: String(delta.name ?? ""),
-				arguments: typeof delta.arguments === "string" ? delta.arguments : JSON.stringify(delta.arguments ?? {}),
+				arguments: typeof delta.arguments === "string" ? normalizeToolArguments(delta.arguments) : JSON.stringify(delta.arguments ?? {}),
 				...delta.id ? { id: String(delta.id) } : {}
 			});
 			else if (delta.type === "thought_summary") {
@@ -797,11 +1022,12 @@ function collapseGeminiInteractionsSSE(body) {
 			} catch {
 				droppedChunks++;
 				if (droppedChunks === 1) firstDroppedSample = `assembled arguments_delta not valid JSON for "${tc.name}": ${surrogateSafeSlice(args, 200)}`;
+				args = "{}";
 			}
 		} else args = typeof tc.argsObj === "string" ? tc.argsObj : JSON.stringify(tc.argsObj ?? {});
 		toolCalls.push({
 			name: tc.name,
-			arguments: args,
+			arguments: normalizeToolArguments(args),
 			...tc.id ? { id: tc.id } : {}
 		});
 	}