@copilotkit/aimock 1.39.0 → 1.40.0

package/dist/stream-collapse.d.ts

@@ -55,6 +55,22 @@ interface CollapseResult {
    */
   redactedThinking?: string[];
   webSearches?: string[];
+  /**
+   * The provider-reported `usage` object from the stream's final usage frame,
+   * captured VERBATIM (#368). OpenAI-compatible streams (including OpenRouter)
+   * close with a `chat.completion.chunk` whose `choices` is empty and whose
+   * `usage` carries the real token counts — plus, on OpenRouter,
+   * `cost` / `cost_details` / `native_tokens_*`. Collapsing dropped that frame,
+   * so a recorded fixture could only ever replay estimated (`ceil(len/4)`) token
+   * counts and never a provider-reported cost. Last-usage-wins: a stream that
+   * emits several usage frames keeps the final one. Absent when the upstream
+   * stream carried no usage (e.g. `stream_options.include_usage` unset).
+   *
+   * Kept as a loose record because the field set is provider-specific and
+   * forward-extending; the recorder sanitizes it into the fixture
+   * `response.usage` override shape before persisting.
+   */
+  usage?: Record<string, unknown>;
   toolCalls?: ToolCall[];
   droppedChunks?: number;
   firstDroppedSample?: string;

package/dist/stream-collapse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-collapse.d.ts","names":[],"sources":["../src/stream-collapse.ts"],"sourcesContent":[],"mappings":";;;;;;;;AA2WA;AAmXA;AAkMA;AAyJA;AAmIA;AAyRA;;;;;AA8PA;AAwLA;;;;;;AAKiB,cA12DJ,0BA02DI,EAAA,MAAA;;iBA/1DD,8BAAA;UAgDC,cAAA;;;;gBAID;;;YACJ;;;;;;;;;;;;;;;;;;;;;;cAsBE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgCH;;;;;;;;;;;;;;;;;;;iBA+MK,iBAAA,mBAAoC;;;;;;;;iBAmXpC,oBAAA,mBAAuC;;;;;;;iBAkMvC,iBAAA,mBAAoC;;;;;;;;;;;;;;;iBAyJpC,oBAAA,mBAAuC;;;;;;;iBAmIvC,iBAAA,mBAAoC;;;;;;;iBAyRpC,0BAAA,UAAoC,SAAS;;;;;;;;;;;;;;;iBA8P7C,6BAAA,mBAAgD;;;;;;iBAwLhD,yBAAA,mCAED,kCACE,iBACN,SACR"}
+{"version":3,"file":"stream-collapse.d.ts","names":[],"sources":["../src/stream-collapse.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AA2XA;AAiaA;AAkMA;AAyJA;AAmIA;AA6RA;;;;;AA0RA;AAwLA;;;;;AAKG,cAx8DU,0BAw8DV,EAAA,MAAA;;iBA77Da,8BAAA;UAgDC,cAAA;;;;gBAID;;;YACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAqCF;cACI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgCH;;;;;;;;;;;;;;;;;;;iBA+MK,iBAAA,mBAAoC;;;;;;;;iBAiapC,oBAAA,mBAAuC;;;;;;;iBAkMvC,iBAAA,mBAAoC;;;;;;;;;;;;;;;iBAyJpC,oBAAA,mBAAuC;;;;;;;iBAmIvC,iBAAA,mBAAoC;;;;;;;iBA6RpC,0BAAA,UAAoC,SAAS;;;;;;;;;;;;;;;iBA0R7C,6BAAA,mBAAgD;;;;;;iBAwLhD,yBAAA,mCAED,kCACE,iBACN,SACR"}

package/dist/stream-collapse.js

@@ -244,6 +244,7 @@ function collapseOpenAISSE(rawBody) {
 	let transcriptUsage;
 	let reasoning = "";
 	const webSearchQueries = [];
+	let usage;
 	let droppedChunks = 0;
 	let firstDroppedSample;
 	let harmonyUnparsed = false;
@@ -251,6 +252,7 @@ function collapseOpenAISSE(rawBody) {
 	const toolCallMap = /* @__PURE__ */ new Map();
 	let nextSyntheticIndex = 1e6;
 	const idKeyMap = /* @__PURE__ */ new Map();
+	let lastToolCallKey;
 	const orderAtoms = [];
 	for (const line of lines) {
 		const data = extractSSEData(splitSSELines(line));
@@ -274,7 +276,7 @@ function collapseOpenAISSE(rawBody) {
 			transcript = parsed.text;
 			transcriptSeen = true;
 			if (Array.isArray(parsed.languages)) transcriptLanguages = parsed.languages.filter((language) => typeof language === "object" && language !== null && typeof language.code === "string").map((language) => ({ code: language.code }));
-			if (parsed.usage && typeof parsed.usage === "object") transcriptUsage = parsed.usage;
+			if (parsed.usage && typeof parsed.usage === "object" && !Array.isArray(parsed.usage) && Object.keys(parsed.usage).length > 0) transcriptUsage = parsed.usage;
 			continue;
 		}
 		if (parsed.type === "response.reasoning_summary_text.delta" && typeof parsed.delta === "string") {
@@ -373,6 +375,7 @@ function collapseOpenAISSE(rawBody) {
 			continue;
 		}
 		if (typeof parsed.type === "string" && parsed.type.startsWith("response.")) continue;
+		if (parsed.usage && typeof parsed.usage === "object" && !Array.isArray(parsed.usage) && Object.keys(parsed.usage).length > 0) usage = parsed.usage;
 		const choices = parsed.choices;
 		if (!choices || choices.length === 0) continue;
 		const delta = choices[0].delta;
@@ -398,7 +401,9 @@ function collapseOpenAISSE(rawBody) {
 					index = nextSyntheticIndex++;
 					idKeyMap.set(rawId, index);
 				}
-			} else index = nextSyntheticIndex++;
+			} else if (lastToolCallKey !== void 0) index = lastToolCallKey;
+			else index = nextSyntheticIndex++;
+			lastToolCallKey = index;
 			if (!toolCallMap.has(index)) {
 				const created = {
 					id: rawId ?? "",
@@ -452,6 +457,7 @@ function collapseOpenAISSE(rawBody) {
 			toolCalls: [...blocks ? orderedToolCalls : indexSortedToolCalls, ...harmonyToolCalls],
 			...reasoning ? { reasoning } : {},
 			...webSearchQueries.length > 0 ? { webSearches: webSearchQueries } : {},
+			...usage ? { usage } : {},
 			...droppedChunks > 0 ? { droppedChunks } : {},
 			...firstDroppedSample ? { firstDroppedSample } : {},
 			...harmonyUnparsed ? { harmonyUnparsed: true } : {},
@@ -468,6 +474,7 @@ function collapseOpenAISSE(rawBody) {
 		content,
 		...reasoning ? { reasoning } : {},
 		...webSearchQueries.length > 0 ? { webSearches: webSearchQueries } : {},
+		...usage ? { usage } : {},
 		...droppedChunks > 0 ? { droppedChunks } : {},
 		...firstDroppedSample ? { firstDroppedSample } : {},
 		...harmonyUnparsed ? { harmonyUnparsed: true } : {},
@@ -832,7 +839,6 @@ function collapseCohereSSE(rawBody) {
 			let index;
 			if (typeof parsed.index === "number") index = parsed.index;
 			else index = nextSyntheticIndex++;
-			lastStartKey = index;
 			const toolCalls = (parsed.delta?.message)?.tool_calls;
 			if (toolCalls) {
 				const fn = toolCalls.function;
@@ -842,6 +848,7 @@ function collapseCohereSSE(rawBody) {
 					arguments: ""
 				};
 				toolCallMap.set(index, created);
+				lastStartKey = index;
 				orderAtoms.push({
 					kind: "toolCall",
 					ref: created
@@ -1035,7 +1042,7 @@ function collapseBedrockEventStream(rawBody) {
 			const index = parsed.index;
 			const redactedData = capturedRedactedData(block);
 			if (redactedData !== void 0) redactedThinking.push(redactedData);
-			if (block?.type === "tool_use" && index !== void 0) {
+			if (block?.type === "tool_use") if (index !== void 0) {
 				const created = {
 					id: block.id ?? "",
 					name: block.name ?? "",
@@ -1046,6 +1053,9 @@ function collapseBedrockEventStream(rawBody) {
 					kind: "toolCall",
 					ref: created
 				});
+			} else {
+				droppedChunks++;
+				if (droppedChunks === 1) firstDroppedSample = `tool_use content_block_start with no index — tool call identity lost: ${surrogateSafeSlice(frameStr, 200)}`;
 			}
 			continue;
 		}
@@ -1053,7 +1063,7 @@ function collapseBedrockEventStream(rawBody) {
 			const blockStart = parsed.contentBlockStart;
 			const index = parsed.contentBlockIndex ?? blockStart.contentBlockIndex;
 			const start = blockStart.start;
-			if (start?.toolUse && index !== void 0) {
+			if (start?.toolUse) if (index !== void 0) {
 				const toolUse = start.toolUse;
 				const created = {
 					id: toolUse.toolUseId ?? "",
@@ -1065,6 +1075,9 @@ function collapseBedrockEventStream(rawBody) {
 					kind: "toolCall",
 					ref: created
 				});
+			} else {
+				droppedChunks++;
+				if (droppedChunks === 1) firstDroppedSample = `contentBlockStart toolUse with no index — tool call identity lost: ${surrogateSafeSlice(frameStr, 200)}`;
 			}
 		}
 		if (parsed.contentBlockDelta) {
@@ -1251,7 +1264,8 @@ function collapseStreamingResponse(contentType, providerKey, body, logger) {
 		const str = typeof body === "string" ? body : body.toString("utf8");
 		switch (providerKey) {
 			case "openai":
-			case "azure": return collapseOpenAISSE(str);
+			case "azure":
+			case "openrouter": return collapseOpenAISSE(str);
 			case "anthropic": return collapseAnthropicSSE(str);
 			case "gemini":
 			case "vertexai": return collapseGeminiSSE(str);