@copilotkit/aimock 1.16.0 → 1.16.2

package/dist/bedrock.js

@@ -14,6 +14,15 @@ function bedrockStopReason(overrideFinishReason, defaultReason) {
 	if (overrideFinishReason === "length") return "max_tokens";
 	return overrideFinishReason;
 }
+/**
+* Build a Bedrock-style usage object from optional overrides.
+*
+* When no overrides are provided (the common case for mock fixtures),
+* returns all-zero token counts. This is intentional — aimock does not
+* attempt to estimate token usage from fixture content. Callers that
+* need realistic usage numbers should set `usage` in their fixture's
+* response overrides.
+*/
 function bedrockUsage(overrides) {
 	if (!overrides?.usage) return {
 		input_tokens: 0,
@@ -28,7 +37,7 @@ function extractTextContent(content) {
 	if (typeof content === "string") return content;
 	return content.filter((b) => b.type === "text").map((b) => b.text ?? "").join("");
 }
-function bedrockToCompletionRequest(req, modelId) {
+function bedrockToCompletionRequest(req, modelId, logger) {
 	const messages = [];
 	if (req.system) {
 		const systemText = typeof req.system === "string" ? req.system : req.system.filter((b) => b.type === "text").map((b) => b.text ?? "").join("");
@@ -39,6 +48,11 @@ function bedrockToCompletionRequest(req, modelId) {
 	}
 	for (const msg of req.messages) if (msg.role === "user") {
 		if (typeof msg.content !== "string" && Array.isArray(msg.content)) {
+			const unsupportedBlocks = msg.content.filter((b) => b.type !== "text" && b.type !== "tool_result");
+			if (unsupportedBlocks.length > 0 && logger) {
+				const types = [...new Set(unsupportedBlocks.map((b) => b.type))].join(", ");
+				logger.warn(`Bedrock user message contains unsupported content block types [${types}] — these will be dropped during conversion`);
+			}
 			const toolResults = msg.content.filter((b) => b.type === "tool_result");
 			const textBlocks = msg.content.filter((b) => b.type === "text");
 			if (toolResults.length > 0) {
@@ -70,24 +84,28 @@ function bedrockToCompletionRequest(req, modelId) {
 		const textContent = extractTextContent(msg.content);
 		if (toolUseBlocks.length > 0) messages.push({
 			role: "assistant",
-			content: textContent || null,
-			tool_calls: toolUseBlocks.map((b) => ({
-				id: b.id ?? generateToolUseId(),
-				type: "function",
-				function: {
-					name: b.name ?? "",
-					arguments: typeof b.input === "string" ? b.input : JSON.stringify(b.input ?? {})
-				}
-			}))
+			content: textContent ?? null,
+			tool_calls: toolUseBlocks.map((b, index) => {
+				if (!b.id && logger) logger.warn(`Bedrock assistant tool_use block at index ${index} is missing an id — using deterministic fallback "tool_use_${index}"`);
+				return {
+					id: b.id ?? `tool_use_${index}`,
+					type: "function",
+					function: {
+						name: b.name ?? "",
+						arguments: typeof b.input === "string" ? b.input : JSON.stringify(b.input ?? {})
+					}
+				};
+			})
 		});
 		else messages.push({
 			role: "assistant",
-			content: textContent || null
+			content: textContent ?? null
 		});
 	} else messages.push({
 		role: "assistant",
 		content: null
 	});
+	else if (logger) logger.warn(`Bedrock message has unexpected role "${msg.role}" — skipping`);
 	let tools;
 	if (req.tools && req.tools.length > 0) tools = req.tools.map((t) => ({
 		type: "function",
@@ -193,10 +211,12 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		} }));
 		return;
 	}
-	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId);
+	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId, logger);
 	completionReq._endpointType = "chat";
 	const testId = getTestId(req);
 	const fixture = matchFixture(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform);
+	if (fixture) logger.debug(`Fixture matched: ${JSON.stringify(fixture.match).slice(0, 120)}`);
+	else logger.debug(`No fixture matched for request`);
 	if (fixture) journal.incrementFixtureMatchCount(fixture, fixtures, testId);
 	if (applyChaos(res, fixture, defaults.chaos, req.headers, journal, {
 		method: req.method ?? "POST",
@@ -306,6 +326,7 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		return;
 	}
 	if (isToolCallResponse(response)) {
+		if ("webSearches" in response) logger.warn("webSearches in fixture response are not supported for Bedrock API — ignoring");
 		const overrides = extractOverrides(response);
 		journal.add({
 			method: req.method ?? "POST",
@@ -337,151 +358,198 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		type: "server_error"
 	} }));
 }
-function buildBedrockStreamTextEvents(content, chunkSize, reasoning, overrides) {
+const BEDROCK_INVOKE_STREAM_EVENT_TYPE = "chunk";
+function buildBedrockInvokeMessageStart(model, overrides) {
+	return {
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+		payload: {
+			type: "message_start",
+			message: {
+				id: overrides?.id ?? generateMessageId(),
+				type: "message",
+				role: "assistant",
+				content: [],
+				model: overrides?.model ?? model,
+				stop_reason: null,
+				stop_sequence: null,
+				usage: bedrockUsage(overrides)
+			}
+		}
+	};
+}
+function buildBedrockInvokeMessageDelta(stopReason) {
+	return {
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+		payload: {
+			type: "message_delta",
+			delta: {
+				stop_reason: stopReason,
+				stop_sequence: null
+			},
+			usage: { output_tokens: 0 }
+		}
+	};
+}
+function buildBedrockInvokeMessageStop() {
+	return {
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+		payload: { type: "message_stop" }
+	};
+}
+function parseToolArgumentsForStream(toolCall, logger) {
+	try {
+		const parsed = JSON.parse(toolCall.arguments || "{}");
+		return JSON.stringify(parsed);
+	} catch {
+		logger.warn(`Malformed JSON in fixture tool call arguments for "${toolCall.name}": ${toolCall.arguments}`);
+		return "{}";
+	}
+}
+function buildBedrockStreamTextEvents(content, model, chunkSize, reasoning, overrides) {
 	const events = [];
-	events.push({
-		eventType: "messageStart",
-		payload: { messageStart: { role: "assistant" } }
-	});
+	events.push(buildBedrockInvokeMessageStart(model, overrides));
 	if (reasoning) {
 		const blockIndex = 0;
 		events.push({
-			eventType: "contentBlockStart",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: blockIndex,
-				contentBlockStart: {
-					contentBlockIndex: blockIndex,
-					start: { type: "thinking" }
+				type: "content_block_start",
+				index: blockIndex,
+				content_block: {
+					type: "thinking",
+					thinking: ""
 				}
 			}
 		});
 		for (let i = 0; i < reasoning.length; i += chunkSize) {
 			const slice = reasoning.slice(i, i + chunkSize);
 			events.push({
-				eventType: "contentBlockDelta",
+				eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 				payload: {
-					contentBlockIndex: blockIndex,
-					contentBlockDelta: {
-						contentBlockIndex: blockIndex,
-						delta: {
-							type: "thinking_delta",
-							thinking: slice
-						}
+					type: "content_block_delta",
+					index: blockIndex,
+					delta: {
+						type: "thinking_delta",
+						thinking: slice
 					}
 				}
 			});
 		}
 		events.push({
-			eventType: "contentBlockStop",
-			payload: { contentBlockIndex: blockIndex }
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+			payload: {
+				type: "content_block_stop",
+				index: blockIndex
+			}
 		});
 	}
 	const textBlockIndex = reasoning ? 1 : 0;
 	events.push({
-		eventType: "contentBlockStart",
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 		payload: {
-			contentBlockIndex: textBlockIndex,
-			contentBlockStart: {
-				contentBlockIndex: textBlockIndex,
-				start: { type: "text" }
+			type: "content_block_start",
+			index: textBlockIndex,
+			content_block: {
+				type: "text",
+				text: ""
 			}
 		}
 	});
 	for (let i = 0; i < content.length; i += chunkSize) {
 		const slice = content.slice(i, i + chunkSize);
 		events.push({
-			eventType: "contentBlockDelta",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: textBlockIndex,
-				contentBlockDelta: {
-					contentBlockIndex: textBlockIndex,
-					delta: {
-						type: "text_delta",
-						text: slice
-					}
+				type: "content_block_delta",
+				index: textBlockIndex,
+				delta: {
+					type: "text_delta",
+					text: slice
 				}
 			}
 		});
 	}
 	events.push({
-		eventType: "contentBlockStop",
-		payload: { contentBlockIndex: textBlockIndex }
-	});
-	events.push({
-		eventType: "messageStop",
-		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "end_turn") }
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+		payload: {
+			type: "content_block_stop",
+			index: textBlockIndex
+		}
 	});
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "end_turn")));
+	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
-function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, chunkSize, logger, reasoning, overrides) {
+function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, model, chunkSize, logger, reasoning, overrides) {
 	const events = [];
-	events.push({
-		eventType: "messageStart",
-		payload: { messageStart: { role: "assistant" } }
-	});
+	events.push(buildBedrockInvokeMessageStart(model, overrides));
 	let blockIndex = 0;
 	if (reasoning) {
 		events.push({
-			eventType: "contentBlockStart",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: blockIndex,
-				contentBlockStart: {
-					contentBlockIndex: blockIndex,
-					start: { type: "thinking" }
+				type: "content_block_start",
+				index: blockIndex,
+				content_block: {
+					type: "thinking",
+					thinking: ""
 				}
 			}
 		});
 		for (let i = 0; i < reasoning.length; i += chunkSize) {
 			const slice = reasoning.slice(i, i + chunkSize);
 			events.push({
-				eventType: "contentBlockDelta",
+				eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 				payload: {
-					contentBlockIndex: blockIndex,
-					contentBlockDelta: {
-						contentBlockIndex: blockIndex,
-						delta: {
-							type: "thinking_delta",
-							thinking: slice
-						}
+					type: "content_block_delta",
+					index: blockIndex,
+					delta: {
+						type: "thinking_delta",
+						thinking: slice
 					}
 				}
 			});
 		}
 		events.push({
-			eventType: "contentBlockStop",
-			payload: { contentBlockIndex: blockIndex }
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+			payload: {
+				type: "content_block_stop",
+				index: blockIndex
+			}
 		});
 		blockIndex++;
 	}
 	events.push({
-		eventType: "contentBlockStart",
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 		payload: {
-			contentBlockIndex: blockIndex,
-			contentBlockStart: {
-				contentBlockIndex: blockIndex,
-				start: { type: "text" }
+			type: "content_block_start",
+			index: blockIndex,
+			content_block: {
+				type: "text",
+				text: ""
 			}
 		}
 	});
 	for (let i = 0; i < content.length; i += chunkSize) {
 		const slice = content.slice(i, i + chunkSize);
 		events.push({
-			eventType: "contentBlockDelta",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: blockIndex,
-				contentBlockDelta: {
-					contentBlockIndex: blockIndex,
-					delta: {
-						type: "text_delta",
-						text: slice
-					}
+				type: "content_block_delta",
+				index: blockIndex,
+				delta: {
+					type: "text_delta",
+					text: slice
 				}
 			}
 		});
 	}
 	events.push({
-		eventType: "contentBlockStop",
-		payload: { contentBlockIndex: blockIndex }
+		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+		payload: {
+			type: "content_block_stop",
+			index: blockIndex
+		}
 	});
 	blockIndex++;
 	for (let tcIdx = 0; tcIdx < toolCalls.length; tcIdx++) {
@@ -489,102 +557,89 @@ function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, chunkS
 		const toolUseId = tc.id || generateToolUseId();
 		const currentBlock = blockIndex + tcIdx;
 		events.push({
-			eventType: "contentBlockStart",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: currentBlock,
-				contentBlockStart: {
-					contentBlockIndex: currentBlock,
-					start: { toolUse: {
-						toolUseId,
-						name: tc.name
-					} }
+				type: "content_block_start",
+				index: currentBlock,
+				content_block: {
+					type: "tool_use",
+					id: toolUseId,
+					name: tc.name,
+					input: {}
 				}
 			}
 		});
-		let argsStr;
-		try {
-			const parsed = JSON.parse(tc.arguments || "{}");
-			argsStr = JSON.stringify(parsed);
-		} catch {
-			logger.warn(`Malformed JSON in fixture tool call arguments for "${tc.name}": ${tc.arguments}`);
-			argsStr = "{}";
-		}
+		const argsStr = parseToolArgumentsForStream(tc, logger);
 		for (let i = 0; i < argsStr.length; i += chunkSize) {
 			const slice = argsStr.slice(i, i + chunkSize);
 			events.push({
-				eventType: "contentBlockDelta",
+				eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 				payload: {
-					contentBlockIndex: currentBlock,
-					contentBlockDelta: {
-						contentBlockIndex: currentBlock,
-						delta: { toolUse: { input: slice } }
+					type: "content_block_delta",
+					index: currentBlock,
+					delta: {
+						type: "input_json_delta",
+						partial_json: slice
 					}
 				}
 			});
 		}
 		events.push({
-			eventType: "contentBlockStop",
-			payload: { contentBlockIndex: currentBlock }
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+			payload: {
+				type: "content_block_stop",
+				index: currentBlock
+			}
 		});
 	}
-	events.push({
-		eventType: "messageStop",
-		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "tool_use") }
-	});
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use")));
+	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
-function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger, overrides) {
+function buildBedrockStreamToolCallEvents(toolCalls, model, chunkSize, logger, overrides) {
 	const events = [];
-	events.push({
-		eventType: "messageStart",
-		payload: { messageStart: { role: "assistant" } }
-	});
+	events.push(buildBedrockInvokeMessageStart(model, overrides));
 	for (let tcIdx = 0; tcIdx < toolCalls.length; tcIdx++) {
 		const tc = toolCalls[tcIdx];
 		const toolUseId = tc.id || generateToolUseId();
 		events.push({
-			eventType: "contentBlockStart",
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: {
-				contentBlockIndex: tcIdx,
-				contentBlockStart: {
-					contentBlockIndex: tcIdx,
-					start: { toolUse: {
-						toolUseId,
-						name: tc.name
-					} }
+				type: "content_block_start",
+				index: tcIdx,
+				content_block: {
+					type: "tool_use",
+					id: toolUseId,
+					name: tc.name,
+					input: {}
 				}
 			}
 		});
-		let argsStr;
-		try {
-			const parsed = JSON.parse(tc.arguments || "{}");
-			argsStr = JSON.stringify(parsed);
-		} catch {
-			logger.warn(`Malformed JSON in fixture tool call arguments for "${tc.name}": ${tc.arguments}`);
-			argsStr = "{}";
-		}
+		const argsStr = parseToolArgumentsForStream(tc, logger);
 		for (let i = 0; i < argsStr.length; i += chunkSize) {
 			const slice = argsStr.slice(i, i + chunkSize);
 			events.push({
-				eventType: "contentBlockDelta",
+				eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 				payload: {
-					contentBlockIndex: tcIdx,
-					contentBlockDelta: {
-						contentBlockIndex: tcIdx,
-						delta: { toolUse: { input: slice } }
+					type: "content_block_delta",
+					index: tcIdx,
+					delta: {
+						type: "input_json_delta",
+						partial_json: slice
 					}
 				}
 			});
 		}
 		events.push({
-			eventType: "contentBlockStop",
-			payload: { contentBlockIndex: tcIdx }
+			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
+			payload: {
+				type: "content_block_stop",
+				index: tcIdx
+			}
 		});
 	}
-	events.push({
-		eventType: "messageStop",
-		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "tool_use") }
-	});
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use")));
+	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
 async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, defaults, setCorsHeaders) {
@@ -628,10 +683,13 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 		} }));
 		return;
 	}
-	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId);
+	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId, logger);
+	completionReq.stream = true;
 	completionReq._endpointType = "chat";
 	const testId = getTestId(req);
 	const fixture = matchFixture(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform);
+	if (fixture) logger.debug(`Fixture matched: ${JSON.stringify(fixture.match).slice(0, 120)}`);
+	else logger.debug(`No fixture matched for request`);
 	if (fixture) journal.incrementFixtureMatchCount(fixture, fixtures, testId);
 	if (applyChaos(res, fixture, defaults.chaos, req.headers, journal, {
 		method: req.method ?? "POST",
@@ -713,7 +771,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const events = buildBedrockStreamContentWithToolCallsEvents(response.content, response.toolCalls, chunkSize, logger, response.reasoning, overrides);
+		const events = buildBedrockStreamContentWithToolCallsEvents(response.content, response.toolCalls, completionReq.model, chunkSize, logger, response.reasoning, overrides);
 		const interruption = createInterruptionSignal(fixture);
 		if (!await writeEventStream(res, events, {
 			latency,
@@ -741,7 +799,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const events = buildBedrockStreamTextEvents(response.content, chunkSize, response.reasoning, overrides);
+		const events = buildBedrockStreamTextEvents(response.content, completionReq.model, chunkSize, response.reasoning, overrides);
 		const interruption = createInterruptionSignal(fixture);
 		if (!await writeEventStream(res, events, {
 			latency,
@@ -757,6 +815,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 		return;
 	}
 	if (isToolCallResponse(response)) {
+		if ("webSearches" in response) logger.warn("webSearches in fixture response are not supported for Bedrock API — ignoring");
 		const overrides = extractOverrides(response);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
@@ -768,7 +827,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const events = buildBedrockStreamToolCallEvents(response.toolCalls, chunkSize, logger, overrides);
+		const events = buildBedrockStreamToolCallEvents(response.toolCalls, completionReq.model, chunkSize, logger, overrides);
 		const interruption = createInterruptionSignal(fixture);
 		if (!await writeEventStream(res, events, {
 			latency,
@@ -800,5 +859,5 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 }
 
 //#endregion
-export { bedrockToCompletionRequest, buildBedrockStreamContentWithToolCallsEvents, buildBedrockStreamTextEvents, buildBedrockStreamToolCallEvents, handleBedrock, handleBedrockStream };
+export { bedrockToCompletionRequest, handleBedrock, handleBedrockStream };
 //# sourceMappingURL=bedrock.js.map