@copilotkit/aimock 1.15.0 → 1.16.0

package/dist/bedrock.js

@@ -1,4 +1,4 @@
-import { flattenHeaders, generateMessageId, generateToolUseId, getTestId, isErrorResponse, isTextResponse, isToolCallResponse } from "./helpers.js";
+import { extractOverrides, flattenHeaders, generateMessageId, generateToolUseId, getTestId, isContentWithToolCallsResponse, isErrorResponse, isTextResponse, isToolCallResponse } from "./helpers.js";
 import { matchFixture } from "./router.js";
 import { writeErrorResponse } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
@@ -7,6 +7,23 @@ import { proxyAndRecord } from "./recorder.js";
 import { writeEventStream } from "./aws-event-stream.js";
 
 //#region src/bedrock.ts
+function bedrockStopReason(overrideFinishReason, defaultReason) {
+	if (!overrideFinishReason) return defaultReason;
+	if (overrideFinishReason === "stop") return "end_turn";
+	if (overrideFinishReason === "tool_calls") return "tool_use";
+	if (overrideFinishReason === "length") return "max_tokens";
+	return overrideFinishReason;
+}
+function bedrockUsage(overrides) {
+	if (!overrides?.usage) return {
+		input_tokens: 0,
+		output_tokens: 0
+	};
+	return {
+		input_tokens: overrides.usage.input_tokens ?? overrides.usage.prompt_tokens ?? 0,
+		output_tokens: overrides.usage.output_tokens ?? overrides.usage.completion_tokens ?? 0
+	};
+}
 function extractTextContent(content) {
 	if (typeof content === "string") return content;
 	return content.filter((b) => b.type === "text").map((b) => b.text ?? "").join("");
@@ -88,7 +105,7 @@ function bedrockToCompletionRequest(req, modelId) {
 		tools
 	};
 }
-function buildBedrockTextResponse(content, model, reasoning) {
+function buildBedrockTextResponse(content, model, reasoning, overrides) {
 	const contentBlocks = [];
 	if (reasoning) contentBlocks.push({
 		type: "thinking",
@@ -99,22 +116,19 @@ function buildBedrockTextResponse(content, model, reasoning) {
 		text: content
 	});
 	return {
-		id: generateMessageId(),
+		id: overrides?.id ?? generateMessageId(),
 		type: "message",
 		role: "assistant",
 		content: contentBlocks,
-		model,
-		stop_reason: "end_turn",
+		model: overrides?.model ?? model,
+		stop_reason: bedrockStopReason(overrides?.finishReason, "end_turn"),
 		stop_sequence: null,
-		usage: {
-			input_tokens: 0,
-			output_tokens: 0
-		}
+		usage: bedrockUsage(overrides)
 	};
 }
-function buildBedrockToolCallResponse(toolCalls, model, logger) {
+function buildBedrockToolCallResponse(toolCalls, model, logger, overrides) {
 	return {
-		id: generateMessageId(),
+		id: overrides?.id ?? generateMessageId(),
 		type: "message",
 		role: "assistant",
 		content: toolCalls.map((tc) => {
@@ -132,13 +146,10 @@ function buildBedrockToolCallResponse(toolCalls, model, logger) {
 				input: argsObj
 			};
 		}),
-		model,
-		stop_reason: "tool_use",
+		model: overrides?.model ?? model,
+		stop_reason: bedrockStopReason(overrides?.finishReason, "tool_use"),
 		stop_sequence: null,
-		usage: {
-			input_tokens: 0,
-			output_tokens: 0
-		}
+		usage: bedrockUsage(overrides)
 	};
 }
 async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults, setCorsHeaders) {
@@ -192,10 +203,10 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		path: urlPath,
 		headers: flattenHeaders(req.headers),
 		body: completionReq
-	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
+	}, defaults.registry, defaults.logger)) return;
 	if (!fixture) {
 		if (defaults.record) {
-			if (await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw) !== "not_configured") {
+			if (await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw)) {
 				journal.add({
 					method: req.method ?? "POST",
 					path: urlPath,
@@ -203,7 +214,8 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 					body: completionReq,
 					response: {
 						status: res.statusCode ?? 200,
-						fixture: null
+						fixture: null,
+						source: "proxy"
 					}
 				});
 				return;
@@ -251,7 +263,33 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		writeErrorResponse(res, status, JSON.stringify(anthropicError));
 		return;
 	}
+	if (isContentWithToolCallsResponse(response)) {
+		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock API — ignoring");
+		const overrides = extractOverrides(response);
+		journal.add({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
+		const textBody = buildBedrockTextResponse(response.content, completionReq.model, response.reasoning, overrides);
+		const toolBody = buildBedrockToolCallResponse(response.toolCalls, completionReq.model, logger, overrides);
+		const merged = {
+			...textBody,
+			content: [...textBody.content, ...toolBody.content],
+			stop_reason: bedrockStopReason(overrides?.finishReason, "tool_use")
+		};
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify(merged));
+		return;
+	}
 	if (isTextResponse(response)) {
+		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock API — ignoring");
+		const overrides = extractOverrides(response);
 		journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -262,12 +300,13 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture
 			}
 		});
-		const body = buildBedrockTextResponse(response.content, completionReq.model, response.reasoning);
+		const body = buildBedrockTextResponse(response.content, completionReq.model, response.reasoning, overrides);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify(body));
 		return;
 	}
 	if (isToolCallResponse(response)) {
+		const overrides = extractOverrides(response);
 		journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -278,7 +317,7 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture
 			}
 		});
-		const body = buildBedrockToolCallResponse(response.toolCalls, completionReq.model, logger);
+		const body = buildBedrockToolCallResponse(response.toolCalls, completionReq.model, logger, overrides);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify(body));
 		return;
@@ -298,11 +337,11 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		type: "server_error"
 	} }));
 }
-function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
+function buildBedrockStreamTextEvents(content, chunkSize, reasoning, overrides) {
 	const events = [];
 	events.push({
 		eventType: "messageStart",
-		payload: { role: "assistant" }
+		payload: { messageStart: { role: "assistant" } }
 	});
 	if (reasoning) {
 		const blockIndex = 0;
@@ -310,7 +349,10 @@ function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
 			eventType: "contentBlockStart",
 			payload: {
 				contentBlockIndex: blockIndex,
-				start: { type: "thinking" }
+				contentBlockStart: {
+					contentBlockIndex: blockIndex,
+					start: { type: "thinking" }
+				}
 			}
 		});
 		for (let i = 0; i < reasoning.length; i += chunkSize) {
@@ -319,9 +361,12 @@ function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
 				eventType: "contentBlockDelta",
 				payload: {
 					contentBlockIndex: blockIndex,
-					delta: {
-						type: "thinking_delta",
-						thinking: slice
+					contentBlockDelta: {
+						contentBlockIndex: blockIndex,
+						delta: {
+							type: "thinking_delta",
+							thinking: slice
+						}
 					}
 				}
 			});
@@ -336,7 +381,10 @@ function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
 		eventType: "contentBlockStart",
 		payload: {
 			contentBlockIndex: textBlockIndex,
-			start: {}
+			contentBlockStart: {
+				contentBlockIndex: textBlockIndex,
+				start: { type: "text" }
+			}
 		}
 	});
 	for (let i = 0; i < content.length; i += chunkSize) {
@@ -345,9 +393,12 @@ function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
 			eventType: "contentBlockDelta",
 			payload: {
 				contentBlockIndex: textBlockIndex,
-				delta: {
-					type: "text_delta",
-					text: slice
+				contentBlockDelta: {
+					contentBlockIndex: textBlockIndex,
+					delta: {
+						type: "text_delta",
+						text: slice
+					}
 				}
 			}
 		});
@@ -358,15 +409,135 @@ function buildBedrockStreamTextEvents(content, chunkSize, reasoning) {
 	});
 	events.push({
 		eventType: "messageStop",
-		payload: { stopReason: "end_turn" }
+		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "end_turn") }
 	});
 	return events;
 }
-function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger) {
+function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, chunkSize, logger, reasoning, overrides) {
 	const events = [];
 	events.push({
 		eventType: "messageStart",
-		payload: { role: "assistant" }
+		payload: { messageStart: { role: "assistant" } }
+	});
+	let blockIndex = 0;
+	if (reasoning) {
+		events.push({
+			eventType: "contentBlockStart",
+			payload: {
+				contentBlockIndex: blockIndex,
+				contentBlockStart: {
+					contentBlockIndex: blockIndex,
+					start: { type: "thinking" }
+				}
+			}
+		});
+		for (let i = 0; i < reasoning.length; i += chunkSize) {
+			const slice = reasoning.slice(i, i + chunkSize);
+			events.push({
+				eventType: "contentBlockDelta",
+				payload: {
+					contentBlockIndex: blockIndex,
+					contentBlockDelta: {
+						contentBlockIndex: blockIndex,
+						delta: {
+							type: "thinking_delta",
+							thinking: slice
+						}
+					}
+				}
+			});
+		}
+		events.push({
+			eventType: "contentBlockStop",
+			payload: { contentBlockIndex: blockIndex }
+		});
+		blockIndex++;
+	}
+	events.push({
+		eventType: "contentBlockStart",
+		payload: {
+			contentBlockIndex: blockIndex,
+			contentBlockStart: {
+				contentBlockIndex: blockIndex,
+				start: { type: "text" }
+			}
+		}
+	});
+	for (let i = 0; i < content.length; i += chunkSize) {
+		const slice = content.slice(i, i + chunkSize);
+		events.push({
+			eventType: "contentBlockDelta",
+			payload: {
+				contentBlockIndex: blockIndex,
+				contentBlockDelta: {
+					contentBlockIndex: blockIndex,
+					delta: {
+						type: "text_delta",
+						text: slice
+					}
+				}
+			}
+		});
+	}
+	events.push({
+		eventType: "contentBlockStop",
+		payload: { contentBlockIndex: blockIndex }
+	});
+	blockIndex++;
+	for (let tcIdx = 0; tcIdx < toolCalls.length; tcIdx++) {
+		const tc = toolCalls[tcIdx];
+		const toolUseId = tc.id || generateToolUseId();
+		const currentBlock = blockIndex + tcIdx;
+		events.push({
+			eventType: "contentBlockStart",
+			payload: {
+				contentBlockIndex: currentBlock,
+				contentBlockStart: {
+					contentBlockIndex: currentBlock,
+					start: { toolUse: {
+						toolUseId,
+						name: tc.name
+					} }
+				}
+			}
+		});
+		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 = "{}";
+		}
+		for (let i = 0; i < argsStr.length; i += chunkSize) {
+			const slice = argsStr.slice(i, i + chunkSize);
+			events.push({
+				eventType: "contentBlockDelta",
+				payload: {
+					contentBlockIndex: currentBlock,
+					contentBlockDelta: {
+						contentBlockIndex: currentBlock,
+						delta: { toolUse: { input: slice } }
+					}
+				}
+			});
+		}
+		events.push({
+			eventType: "contentBlockStop",
+			payload: { contentBlockIndex: currentBlock }
+		});
+	}
+	events.push({
+		eventType: "messageStop",
+		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "tool_use") }
+	});
+	return events;
+}
+function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger, overrides) {
+	const events = [];
+	events.push({
+		eventType: "messageStart",
+		payload: { messageStart: { role: "assistant" } }
 	});
 	for (let tcIdx = 0; tcIdx < toolCalls.length; tcIdx++) {
 		const tc = toolCalls[tcIdx];
@@ -375,10 +546,13 @@ function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger) {
 			eventType: "contentBlockStart",
 			payload: {
 				contentBlockIndex: tcIdx,
-				start: { toolUse: {
-					toolUseId,
-					name: tc.name
-				} }
+				contentBlockStart: {
+					contentBlockIndex: tcIdx,
+					start: { toolUse: {
+						toolUseId,
+						name: tc.name
+					} }
+				}
 			}
 		});
 		let argsStr;
@@ -395,9 +569,9 @@ function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger) {
 				eventType: "contentBlockDelta",
 				payload: {
 					contentBlockIndex: tcIdx,
-					delta: {
-						type: "input_json_delta",
-						inputJSON: slice
+					contentBlockDelta: {
+						contentBlockIndex: tcIdx,
+						delta: { toolUse: { input: slice } }
 					}
 				}
 			});
@@ -409,7 +583,7 @@ function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger) {
 	}
 	events.push({
 		eventType: "messageStop",
-		payload: { stopReason: "tool_use" }
+		payload: { stopReason: bedrockStopReason(overrides?.finishReason, "tool_use") }
 	});
 	return events;
 }
@@ -464,10 +638,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 		path: urlPath,
 		headers: flattenHeaders(req.headers),
 		body: completionReq
-	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
+	}, defaults.registry, defaults.logger)) return;
 	if (!fixture) {
 		if (defaults.record) {
-			if (await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw) !== "not_configured") {
+			if (await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw)) {
 				journal.add({
 					method: req.method ?? "POST",
 					path: urlPath,
@@ -475,7 +649,8 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 					body: completionReq,
 					response: {
 						status: res.statusCode ?? 200,
-						fixture: null
+						fixture: null,
+						source: "proxy"
 					}
 				});
 				return;
@@ -515,10 +690,47 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		writeErrorResponse(res, status, JSON.stringify(response));
+		const anthropicError = {
+			type: "error",
+			error: {
+				type: response.error.type ?? "api_error",
+				message: response.error.message
+			}
+		};
+		writeErrorResponse(res, status, JSON.stringify(anthropicError));
+		return;
+	}
+	if (isContentWithToolCallsResponse(response)) {
+		if (response.webSearches?.length) 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",
+			path: urlPath,
+			headers: flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
+		const events = buildBedrockStreamContentWithToolCallsEvents(response.content, response.toolCalls, chunkSize, logger, response.reasoning, overrides);
+		const interruption = createInterruptionSignal(fixture);
+		if (!await writeEventStream(res, events, {
+			latency,
+			streamingProfile: fixture.streamingProfile,
+			signal: interruption?.signal,
+			onChunkSent: interruption?.tick
+		})) {
+			if (!res.writableEnded) res.destroy();
+			journalEntry.response.interrupted = true;
+			journalEntry.response.interruptReason = interruption?.reason();
+		}
+		interruption?.cleanup();
 		return;
 	}
 	if (isTextResponse(response)) {
+		if (response.webSearches?.length) 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",
 			path: urlPath,
@@ -529,7 +741,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const events = buildBedrockStreamTextEvents(response.content, chunkSize, response.reasoning);
+		const events = buildBedrockStreamTextEvents(response.content, chunkSize, response.reasoning, overrides);
 		const interruption = createInterruptionSignal(fixture);
 		if (!await writeEventStream(res, events, {
 			latency,
@@ -545,6 +757,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 		return;
 	}
 	if (isToolCallResponse(response)) {
+		const overrides = extractOverrides(response);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -555,7 +768,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const events = buildBedrockStreamToolCallEvents(response.toolCalls, chunkSize, logger);
+		const events = buildBedrockStreamToolCallEvents(response.toolCalls, chunkSize, logger, overrides);
 		const interruption = createInterruptionSignal(fixture);
 		if (!await writeEventStream(res, events, {
 			latency,
@@ -587,5 +800,5 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 }
 
 //#endregion
-export { bedrockToCompletionRequest, buildBedrockStreamTextEvents, buildBedrockStreamToolCallEvents, handleBedrock, handleBedrockStream };
+export { bedrockToCompletionRequest, buildBedrockStreamContentWithToolCallsEvents, buildBedrockStreamTextEvents, buildBedrockStreamToolCallEvents, handleBedrock, handleBedrockStream };
 //# sourceMappingURL=bedrock.js.map