@copilotkit/aimock 1.43.0 → 1.45.0

package/dist/bedrock-converse.cjs

@@ -1,6 +1,7 @@
 const require_helpers = require('./helpers.cjs');
 const require_sse_writer = require('./sse-writer.cjs');
 const require_chaos = require('./chaos.cjs');
+const require_misbehavior = require('./misbehavior.cjs');
 const require_router = require('./router.cjs');
 const require_recorder = require('./recorder.cjs');
 const require_interruption = require('./interruption.cjs');
@@ -37,13 +38,7 @@ function converseUsage(overrides) {
 	};
 }
 function parseConverseToolArgumentsForStream(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 "{}";
-	}
+	return require_helpers.servedToolArgs(toolCall, "string", logger).text;
 }
 function buildBedrockStreamTextEvents(content, chunkSize, reasoning, overrides) {
 	const events = [{
@@ -311,6 +306,32 @@ function buildBedrockStreamToolCallEvents(toolCalls, chunkSize, logger, reasonin
 	});
 	return events;
 }
+/** Validate only message fields consumed by the user-message converter. */
+function validateConverseMessages(req) {
+	for (const [i, message] of req.messages.entries()) {
+		if (message === null) return `Invalid request: messages[${i}] must not be null`;
+		if (message.role !== "user") continue;
+		if (!Array.isArray(message.content)) return `Invalid request: messages[${i}].content must be an array`;
+		for (const [j, block] of message.content.entries()) {
+			if (block === null) return `Invalid request: messages[${i}].content[${j}] must not be null`;
+			if (block.toolResult && !Array.isArray(block.toolResult.content)) return `Invalid request: messages[${i}].content[${j}].toolResult.content must be an array`;
+		}
+	}
+}
+/** Validate only system fields consumed by the converter. */
+function validateConverseSystem(req) {
+	if (req.system && req.system.length > 0) {
+		if (!Array.isArray(req.system)) return "Invalid request: system must be an array";
+		for (const [i, block] of req.system.entries()) if (block === null) return `Invalid request: system[${i}] must not be null`;
+	}
+}
+/** Validate only tool fields consumed by the converter. */
+function validateConverseTools(req) {
+	if (req.toolConfig?.tools && req.toolConfig.tools.length > 0) {
+		if (!Array.isArray(req.toolConfig.tools)) return "Invalid request: toolConfig.tools must be an array";
+		for (const [i, tool] of req.toolConfig.tools.entries()) if (tool?.toolSpec === null) return `Invalid request: toolConfig.tools[${i}].toolSpec must not be null`;
+	}
+}
 function converseToCompletionRequest(req, modelId, logger) {
 	const messages = [];
 	if (req.system && req.system.length > 0) {
@@ -404,17 +425,11 @@ function buildConverseToolCallResponse(toolCalls, logger, reasoning, overrides)
 	const contentBlocks = [];
 	if (reasoning) contentBlocks.push({ reasoningContent: { reasoningText: { text: reasoning } } });
 	for (const tc of toolCalls) {
-		let argsObj;
-		try {
-			argsObj = JSON.parse(tc.arguments || "{}");
-		} catch {
-			logger.warn(`Malformed JSON in fixture tool call arguments for "${tc.name}": ${tc.arguments}`);
-			argsObj = {};
-		}
+		const args = require_helpers.servedToolArgs(tc, "object", logger);
 		contentBlocks.push({ toolUse: {
 			toolUseId: tc.id || require_helpers.generateToolUseId(),
 			name: tc.name,
-			input: argsObj
+			input: args.value
 		} });
 	}
 	return {
@@ -431,17 +446,11 @@ function buildConverseContentWithToolCallsResponse(content, toolCalls, logger, r
 	const contentBlocks = [];
 	if (reasoning) contentBlocks.push({ reasoningContent: { reasoningText: { text: reasoning } } });
 	const toolUseBlock = (tc) => {
-		let argsObj;
-		try {
-			argsObj = JSON.parse(tc.arguments || "{}");
-		} catch {
-			logger.warn(`Malformed JSON in fixture tool call arguments for "${tc.name}": ${tc.arguments}`);
-			argsObj = {};
-		}
+		const args = require_helpers.servedToolArgs(tc, "object", logger);
 		return { toolUse: {
 			toolUseId: tc.id || require_helpers.generateToolUseId(),
 			name: tc.name,
-			input: argsObj
+			input: args.value
 		} };
 	};
 	let blockHasTools;
@@ -469,6 +478,160 @@ function buildConverseContentWithToolCallsResponse(content, toolCalls, logger, r
 		metrics: { latencyMs: 0 }
 	};
 }
+/** Prepare actual emitted calls and identities before journaling or writing bytes. */
+function prepareConverseMisbehavior(plan, request, stream, defaults, headers) {
+	const response = plan.response;
+	const combined = require_helpers.isCombinedFixtureResponse(response);
+	let blocks = (combined && response.blocks?.length ? require_helpers.resolveFixtureBlockOutcome(response.blocks) : void 0)?.ordered.map((block) => ({ ...block })) ?? [..."content" in response && response.content ? [{
+		type: "text",
+		text: response.content
+	}] : [], ...(combined || require_helpers.isToolCallResponse(response) ? response.toolCalls ?? [] : []).map((call) => ({
+		type: "toolCall",
+		...call
+	}))];
+	const calls = blocks.filter((block) => block.type === "toolCall");
+	const preparedCalls = calls.map((call, index) => {
+		const args = require_helpers.toolArgsForWire(call);
+		return {
+			...call,
+			arguments: args.kind === "parsed" ? args.text : args.raw,
+			...index === plan.duplicateId?.destinationIndex ? {} : { id: call.id || require_helpers.generateToolUseId() }
+		};
+	});
+	if (plan.duplicateId) preparedCalls[plan.duplicateId.destinationIndex].id = preparedCalls[plan.duplicateId.sourceIndex].id;
+	let callIndex = 0;
+	blocks = blocks.map((block) => block.type === "toolCall" ? preparedCalls[callIndex++] : block);
+	let stopReason = converseStopReason("finishReason" in response ? response.finishReason : void 0, calls.length ? "tool_use" : "end_turn");
+	if (plan.stop === "stop") stopReason = "end_turn";
+	if (plan.stop === "length") stopReason = "max_tokens";
+	if (plan.stop === "content_filter") stopReason = "content_filtered";
+	if (!stream && plan.summary.fault === "tool-args-invalid-json") {
+		blocks = blocks.filter((block) => block.type !== "toolCall");
+		stopReason = "malformed_tool_use";
+	}
+	if (!stream && plan.summary.fault === "stop-length-mid-tool") {
+		let index = 0;
+		blocks = blocks.map((block) => {
+			if (block.type !== "toolCall") return block;
+			return index++ === plan.target?.index ? {
+				...block,
+				arguments: "{}"
+			} : block;
+		});
+	}
+	const reasoning = plan.reasoning ?? require_helpers.resolveReasoningForModel("reasoning" in response ? response.reasoning : void 0, request.model, require_helpers.resolveStrictMode(defaults.strict, headers), defaults.logger) ?? "";
+	const servedToolCalls = blocks.flatMap((block) => block.type === "toolCall" ? [{
+		name: block.name,
+		arguments: block.arguments,
+		id: block.id
+	}] : []);
+	const inputTokens = require_helpers.estimatePromptTokens(request.messages);
+	const outputTokens = require_helpers.estimateTokens(reasoning + blocks.map((block) => block.type === "text" ? block.text : block.name + block.arguments).join(""));
+	return {
+		plan: {
+			...plan,
+			summary: {
+				...plan.summary,
+				servedToolCalls
+			}
+		},
+		blocks,
+		reasoning,
+		stopReason,
+		usage: {
+			inputTokens,
+			outputTokens,
+			totalTokens: inputTokens + outputTokens
+		}
+	};
+}
+function buildConverseMisbehaviorResponse(prepared) {
+	const content = prepared.reasoning || prepared.plan.summary.fault === "reasoning-only" ? [{ reasoningContent: { reasoningText: { text: prepared.reasoning } } }] : [];
+	for (const block of prepared.blocks) if (block.type === "text") content.push({ text: block.text });
+	else {
+		const args = require_helpers.toolArgsForWire(block);
+		if (args.kind === "verbatim") throw new require_helpers.InvalidToolArgumentsError(block);
+		content.push({ toolUse: {
+			toolUseId: block.id,
+			name: block.name,
+			input: args.value
+		} });
+	}
+	return {
+		output: { message: {
+			role: "assistant",
+			content
+		} },
+		stopReason: prepared.stopReason,
+		usage: prepared.usage,
+		metrics: { latencyMs: 0 }
+	};
+}
+function buildConverseMisbehaviorEvents(prepared, chunkSize) {
+	const events = [{
+		eventType: "messageStart",
+		payload: { role: "assistant" }
+	}];
+	let index = 0;
+	if (prepared.reasoning || prepared.plan.summary.fault === "reasoning-only") {
+		events.push({
+			eventType: "contentBlockStart",
+			payload: {
+				contentBlockIndex: index,
+				start: { reasoningContent: {} }
+			}
+		});
+		for (let i = 0; i < prepared.reasoning.length; i += chunkSize) events.push({
+			eventType: "contentBlockDelta",
+			payload: {
+				contentBlockIndex: index,
+				delta: { reasoningContent: { text: prepared.reasoning.slice(i, i + chunkSize) } }
+			}
+		});
+		events.push({
+			eventType: "contentBlockStop",
+			payload: { contentBlockIndex: index++ }
+		});
+	}
+	for (const block of prepared.blocks) {
+		events.push({
+			eventType: "contentBlockStart",
+			payload: {
+				contentBlockIndex: index,
+				start: block.type === "toolCall" ? { toolUse: {
+					toolUseId: block.id,
+					name: block.name
+				} } : {}
+			}
+		});
+		const value = block.type === "text" ? block.text : block.arguments;
+		for (let i = 0; i < value.length; i += chunkSize) {
+			const part = value.slice(i, i + chunkSize);
+			events.push({
+				eventType: "contentBlockDelta",
+				payload: {
+					contentBlockIndex: index,
+					delta: block.type === "text" ? { text: part } : { toolUse: { input: part } }
+				}
+			});
+		}
+		events.push({
+			eventType: "contentBlockStop",
+			payload: { contentBlockIndex: index++ }
+		});
+	}
+	events.push({
+		eventType: "messageStop",
+		payload: { stopReason: prepared.stopReason }
+	}, {
+		eventType: "metadata",
+		payload: {
+			usage: prepared.usage,
+			metrics: { latencyMs: 0 }
+		}
+	});
+	return events;
+}
 async function handleConverse(req, res, raw, modelId, fixtures, journal, defaults, setCorsHeaders) {
 	const { logger } = defaults;
 	setCorsHeaders(res);
@@ -511,7 +674,8 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		} }));
 		return;
 	}
-	if (!converseReq.messages || !Array.isArray(converseReq.messages)) {
+	const messageError = !Array.isArray(converseReq.messages) ? "Invalid request: messages array is required" : validateConverseMessages(converseReq) ?? validateConverseSystem(converseReq) ?? validateConverseTools(converseReq);
+	if (messageError) {
 		journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -523,7 +687,7 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 			}
 		});
 		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
-			message: "Invalid request: messages array is required",
+			message: messageError,
 			type: "invalid_request_error"
 		} }));
 		return;
@@ -600,9 +764,70 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		return;
 	}
 	const response = await require_helpers.resolveResponse(fixture, completionReq);
+	let misbehavior = require_misbehavior.planMisbehavior({
+		wire: "bedrock-converse",
+		emitsToolCallIds: true,
+		fixture,
+		response,
+		request: completionReq,
+		stream: false,
+		defaults,
+		rawHeaders: req.headers,
+		url: req.url
+	});
+	const addResponseEntry = (input) => {
+		const entry = journal.add(input);
+		require_misbehavior.recordMisbehaviorOutcome({
+			entry,
+			summary: misbehavior.summary,
+			defaults,
+			testId
+		});
+		return entry;
+	};
+	if (misbehavior.kind === "error") {
+		if (!misbehavior.summary?.evaluations.length) logger.error(misbehavior.message);
+		addResponseEntry({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: misbehavior.status,
+				fixture,
+				error: misbehavior.message
+			}
+		});
+		const type = misbehavior.status === 400 ? "ValidationException" : "InternalServerException";
+		res.setHeader("x-amzn-errortype", type);
+		require_sse_writer.writeErrorResponse(res, misbehavior.status, JSON.stringify({
+			__type: type,
+			message: misbehavior.message,
+			code: misbehavior.code
+		}));
+		return;
+	}
+	if (misbehavior.kind === "applied") {
+		const prepared = prepareConverseMisbehavior(misbehavior, completionReq, false, defaults, req.headers);
+		misbehavior = prepared.plan;
+		const body = buildConverseMisbehaviorResponse(prepared);
+		addResponseEntry({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify(body));
+		return;
+	}
 	if (require_helpers.isErrorResponse(response)) {
 		const status = response.status ?? 500;
-		journal.add({
+		addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -622,11 +847,11 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		require_sse_writer.writeErrorResponse(res, status, JSON.stringify(errBody), { retryAfter: response.retryAfter });
 		return;
 	}
-	if (require_helpers.isContentWithToolCallsResponse(response)) {
+	if (require_helpers.isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		journal.add({
+		addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -636,7 +861,8 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture
 			}
 		});
-		const body = buildConverseContentWithToolCallsResponse(response.content ?? "", response.toolCalls ?? [], logger, effReasoning, overrides, response.blocks);
+		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock Converse");
+		const body = buildConverseContentWithToolCallsResponse(response.content ?? "", functionToolCalls, logger, effReasoning, overrides, response.blocks);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify(body));
 		return;
@@ -645,7 +871,7 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		journal.add({
+		addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -664,7 +890,7 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		journal.add({
+		addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -674,12 +900,12 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture
 			}
 		});
-		const body = buildConverseToolCallResponse(response.toolCalls, logger, effReasoning, overrides);
+		const body = buildConverseToolCallResponse(require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock Converse"), logger, effReasoning, overrides);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify(body));
 		return;
 	}
-	journal.add({
+	addResponseEntry({
 		method: req.method ?? "POST",
 		path: urlPath,
 		headers: require_helpers.flattenHeaders(req.headers),
@@ -736,7 +962,8 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		} }));
 		return;
 	}
-	if (!converseReq.messages || !Array.isArray(converseReq.messages)) {
+	const messageError = !Array.isArray(converseReq.messages) ? "Invalid request: messages array is required" : validateConverseMessages(converseReq) ?? validateConverseSystem(converseReq) ?? validateConverseTools(converseReq);
+	if (messageError) {
 		journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -748,7 +975,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 			}
 		});
 		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
-			message: "Invalid request: messages array is required",
+			message: messageError,
 			type: "invalid_request_error"
 		} }));
 		return;
@@ -826,11 +1053,84 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		return;
 	}
 	const response = await require_helpers.resolveResponse(fixture, completionReq);
+	let misbehavior = require_misbehavior.planMisbehavior({
+		wire: "bedrock-converse",
+		emitsToolCallIds: true,
+		fixture,
+		response,
+		request: completionReq,
+		stream: true,
+		defaults,
+		rawHeaders: req.headers,
+		url: req.url
+	});
+	const addResponseEntry = (input) => {
+		const entry = journal.add(input);
+		require_misbehavior.recordMisbehaviorOutcome({
+			entry,
+			summary: misbehavior.summary,
+			defaults,
+			testId
+		});
+		return entry;
+	};
+	if (misbehavior.kind === "error") {
+		if (!misbehavior.summary?.evaluations.length) logger.error(misbehavior.message);
+		addResponseEntry({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: misbehavior.status,
+				fixture,
+				error: misbehavior.message
+			}
+		});
+		const type = misbehavior.status === 400 ? "ValidationException" : "InternalServerException";
+		res.setHeader("x-amzn-errortype", type);
+		require_sse_writer.writeErrorResponse(res, misbehavior.status, JSON.stringify({
+			__type: type,
+			message: misbehavior.message,
+			code: misbehavior.code
+		}));
+		return;
+	}
 	const latency = fixture.latency ?? defaults.latency;
 	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
+	if (misbehavior.kind === "applied") {
+		const prepared = prepareConverseMisbehavior(misbehavior, completionReq, true, defaults, req.headers);
+		misbehavior = prepared.plan;
+		const events = buildConverseMisbehaviorEvents(prepared, chunkSize);
+		const entry = addResponseEntry({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
+		const interruption = require_interruption.createInterruptionSignal(fixture);
+		if (!await require_aws_event_stream.writeEventStream(res, events, {
+			latency,
+			streamingProfile: fixture.streamingProfile,
+			recordedTimings: fixture.recordedTimings,
+			replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
+			signal: interruption?.signal,
+			onChunkSent: interruption?.tick
+		})) {
+			if (!res.writableEnded) res.destroy();
+			entry.response.interrupted = true;
+			entry.response.interruptReason = interruption?.reason();
+		}
+		interruption?.cleanup();
+		return;
+	}
 	if (require_helpers.isErrorResponse(response)) {
 		const status = response.status ?? 500;
-		journal.add({
+		addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -850,11 +1150,11 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		require_sse_writer.writeErrorResponse(res, status, JSON.stringify(errBody), { retryAfter: response.retryAfter });
 		return;
 	}
-	if (require_helpers.isContentWithToolCallsResponse(response)) {
+	if (require_helpers.isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		const journalEntry = journal.add({
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -864,7 +1164,8 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture
 			}
 		});
-		const events = buildBedrockStreamContentWithToolCallsEvents(response.content ?? "", response.toolCalls ?? [], chunkSize, logger, effReasoning, overrides, response.blocks);
+		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock Converse");
+		const events = buildBedrockStreamContentWithToolCallsEvents(response.content ?? "", functionToolCalls, chunkSize, logger, effReasoning, overrides, response.blocks);
 		const interruption = require_interruption.createInterruptionSignal(fixture);
 		if (!await require_aws_event_stream.writeEventStream(res, events, {
 			latency,
@@ -885,7 +1186,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		const journalEntry = journal.add({
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -916,7 +1217,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_helpers.resolveStrictMode(defaults.strict, req.headers), logger);
-		const journalEntry = journal.add({
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -926,7 +1227,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture
 			}
 		});
-		const events = buildBedrockStreamToolCallEvents(response.toolCalls, chunkSize, logger, effReasoning, overrides);
+		const events = buildBedrockStreamToolCallEvents(require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock Converse"), chunkSize, logger, effReasoning, overrides);
 		const interruption = require_interruption.createInterruptionSignal(fixture);
 		if (!await require_aws_event_stream.writeEventStream(res, events, {
 			latency,
@@ -943,7 +1244,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		interruption?.cleanup();
 		return;
 	}
-	journal.add({
+	addResponseEntry({
 		method: req.method ?? "POST",
 		path: urlPath,
 		headers: require_helpers.flattenHeaders(req.headers),