@copilotkit/aimock 1.45.1 → 1.47.0

package/dist/bedrock-converse.js

@@ -1,19 +1,23 @@
-import { InvalidToolArgumentsError, estimatePromptTokens, estimateTokens, extractOverrides, flattenHeaders, generateToolUseId, getContext, getTestId, isCombinedFixtureResponse, isErrorResponse, isJsonObject, isTextResponse, isToolCallResponse, requireEmittedFunctionToolCalls, resolveFixtureBlockOutcome, resolveReasoningForModel, resolveResponse, resolveStrictMode, servedToolArgs, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField, toolArgsForWire } from "./helpers.js";
+import { renderError } from "./response/errors.js";
+import { resolveRequestDecisions, strictOverrideField } from "./response/policy.js";
+import { InvalidToolArgumentsError, estimatePromptTokens, estimateTokens, extractOverrides, flattenHeaders, generateToolUseId, getContext, getTestId, isCombinedFixtureResponse, isErrorResponse, isJsonObject, isRawResponse, isTextResponse, isToolCallResponse, requireEmittedFunctionToolCalls, resolveFixtureBlockOutcome, resolveReasoningForModel, resolveResponse, servedToolArgs, strictNoMatchLogLine, strictNoMatchMessage, toolArgsForWire } from "./helpers.js";
 import { writeErrorResponse } from "./sse-writer.js";
 import { applyChaosAsync } from "./chaos.js";
 import { planMisbehavior, recordMisbehaviorOutcome } from "./misbehavior.js";
 import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { proxyAndRecord } from "./recorder.js";
-import { createInterruptionSignal } from "./interruption.js";
-import { writeEventStream } from "./aws-event-stream.js";
+import { misbehaviorPayloadLength, servedPayloadLength } from "./response/timing.js";
+import { deliverJson, deliverStream } from "./response/deliver.js";
+import { proxyInterruption, withHangUpDetection } from "./response/proxy.js";
+import { eventStreamCodec } from "./aws-event-stream.js";
+import { serveRawResponse } from "./response/raw.js";
+import { mapAnthropicFinish } from "./response/finish.js";
+import { render } from "./response/usage/codecs/converse.js";
 
 //#region src/bedrock-converse.ts
 function converseStopReason(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;
+	return mapAnthropicFinish(overrideFinishReason);
 }
 /**
 * Build Converse-format usage from fixture overrides.
@@ -24,18 +28,7 @@ function converseStopReason(overrideFinishReason, defaultReason) {
 * usage should supply explicit `usage` overrides in their fixture.
 */
 function converseUsage(overrides) {
-	if (!overrides?.usage) return {
-		inputTokens: 0,
-		outputTokens: 0,
-		totalTokens: 0
-	};
-	const inputTokens = overrides.usage.input_tokens ?? overrides.usage.prompt_tokens ?? 0;
-	const outputTokens = overrides.usage.output_tokens ?? overrides.usage.completion_tokens ?? 0;
-	return {
-		inputTokens,
-		outputTokens,
-		totalTokens: inputTokens + outputTokens
-	};
+	return render(overrides);
 }
 function parseConverseToolArgumentsForStream(toolCall, logger) {
 	return servedToolArgs(toolCall, "string", logger).text;
@@ -519,7 +512,7 @@ function prepareConverseMisbehavior(plan, request, stream, defaults, headers) {
 			} : block;
 		});
 	}
-	const reasoning = plan.reasoning ?? resolveReasoningForModel("reasoning" in response ? response.reasoning : void 0, request.model, resolveStrictMode(defaults.strict, headers), defaults.logger) ?? "";
+	const reasoning = plan.reasoning ?? resolveReasoningForModel("reasoning" in response ? response.reasoning : void 0, request.model, resolveRequestDecisions(defaults.strict, headers).reasoningSuppression, defaults.logger) ?? "";
 	const servedToolCalls = blocks.flatMap((block) => block.type === "toolCall" ? [{
 		name: block.name,
 		arguments: block.arguments,
@@ -538,11 +531,10 @@ function prepareConverseMisbehavior(plan, request, stream, defaults, headers) {
 		blocks,
 		reasoning,
 		stopReason,
-		usage: {
-			inputTokens,
-			outputTokens,
-			totalTokens: inputTokens + outputTokens
-		}
+		usage: render(void 0, {
+			input: inputTokens,
+			output: outputTokens
+		})
 	};
 }
 function buildConverseMisbehaviorResponse(prepared) {
@@ -651,10 +643,10 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: `Malformed JSON: ${detail}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	if (!isJsonObject(converseReq)) {
@@ -668,10 +660,10 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: "Request body must be a JSON object",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const messageError = !Array.isArray(converseReq.messages) ? "Invalid request: messages array is required" : validateConverseMessages(converseReq) ?? validateConverseSystem(converseReq) ?? validateConverseTools(converseReq);
@@ -686,17 +678,20 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: messageError,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const completionReq = converseToCompletionRequest(converseReq, modelId, logger);
 	completionReq._endpointType = "chat";
 	completionReq._context = getContext(req);
 	const testId = getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "bedrock-converse"
+	});
 	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);
@@ -707,7 +702,7 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		body: completionReq
 	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
 	if (!fixture) {
-		if (resolveStrictMode(defaults.strict, req.headers)) {
+		if (resolveRequestDecisions(defaults.strict, req.headers).fixtureMiss) {
 			const strictStatus = 503;
 			const strictMessage = strictNoMatchMessage(skippedBySequenceOrTurn);
 			logger.error(strictNoMatchLogLine(req.method ?? "POST", urlPath, skippedBySequenceOrTurn));
@@ -722,14 +717,14 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 					...strictOverrideField(defaults.strict, req.headers)
 				}
 			});
-			writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
+			writeErrorResponse(res, strictStatus, renderError("bedrock", "strict-miss", {
 				message: strictMessage,
 				type: "invalid_request_error"
-			} }));
+			}).body);
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await withHangUpDetection(req, res, () => proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -740,7 +735,8 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -757,10 +753,10 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				...strictOverrideField(defaults.strict, req.headers)
 			}
 		});
-		writeErrorResponse(res, 404, JSON.stringify({ error: {
+		writeErrorResponse(res, 404, renderError("bedrock", "fixture-miss", {
 			message: "No fixture matched",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const response = await resolveResponse(fixture, completionReq);
@@ -800,18 +796,26 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 		});
 		const type = misbehavior.status === 400 ? "ValidationException" : "InternalServerException";
 		res.setHeader("x-amzn-errortype", type);
-		writeErrorResponse(res, misbehavior.status, JSON.stringify({
-			__type: type,
+		writeErrorResponse(res, misbehavior.status, renderError("bedrock-converse", "misbehavior", {
+			type,
 			message: misbehavior.message,
 			code: misbehavior.code
-		}));
+		}).body);
 		return;
 	}
+	const jsonOpts = (payloadLength, duplicateId = false) => ({
+		surface: "other",
+		payloadLength,
+		chunkSize: Math.max(1, fixture.chunkSize ?? defaults.chunkSize),
+		recordedTimings: fixture.recordedTimings,
+		duplicateId,
+		replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed
+	});
 	if (misbehavior.kind === "applied") {
 		const prepared = prepareConverseMisbehavior(misbehavior, completionReq, false, defaults, req.headers);
 		misbehavior = prepared.plan;
 		const body = buildConverseMisbehaviorResponse(prepared);
-		addResponseEntry({
+		await deliverJson(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: flattenHeaders(req.headers),
@@ -820,9 +824,24 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				status: 200,
 				fixture
 			}
+		}), fixture, () => body, jsonOpts(misbehaviorPayloadLength(prepared.plan, prepared.plan.reasoning === void 0 ? prepared.reasoning : void 0), !!prepared.plan.duplicateId));
+		return;
+	}
+	if (isRawResponse(response)) {
+		await serveRawResponse({
+			wire: "bedrock-converse",
+			stream: false,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "bedrock-converse"
 		});
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(body));
 		return;
 	}
 	if (isErrorResponse(response)) {
@@ -837,21 +856,17 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture
 			}
 		});
-		const errBody = {
-			type: "error",
-			error: {
-				type: response.error.type ?? "invalid_request_error",
-				message: response.error.message
-			}
-		};
-		writeErrorResponse(res, status, JSON.stringify(errBody), { retryAfter: response.retryAfter });
+		writeErrorResponse(res, status, renderError("bedrock", "fixture", {
+			message: response.error.message,
+			type: response.error.type ?? "invalid_request_error"
+		}).body, { retryAfter: response.retryAfter });
 		return;
 	}
 	if (isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
-		addResponseEntry({
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: flattenHeaders(req.headers),
@@ -862,16 +877,14 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 			}
 		});
 		const functionToolCalls = 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));
+		await deliverJson(res, journalEntry, fixture, () => buildConverseContentWithToolCallsResponse(response.content ?? "", functionToolCalls, logger, effReasoning, overrides, response.blocks), jsonOpts(servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	if (isTextResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
-		addResponseEntry({
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		await deliverJson(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: flattenHeaders(req.headers),
@@ -880,17 +893,14 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				status: 200,
 				fixture
 			}
-		});
-		const body = buildConverseTextResponse(response.content, effReasoning, overrides);
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(body));
+		}), fixture, () => buildConverseTextResponse(response.content, effReasoning, overrides), jsonOpts(servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	if (isToolCallResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
-		addResponseEntry({
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: flattenHeaders(req.headers),
@@ -900,9 +910,8 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 				fixture
 			}
 		});
-		const body = buildConverseToolCallResponse(requireEmittedFunctionToolCalls(response, "Bedrock Converse"), logger, effReasoning, overrides);
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(body));
+		const functionToolCalls = requireEmittedFunctionToolCalls(response, "Bedrock Converse");
+		await deliverJson(res, journalEntry, fixture, () => buildConverseToolCallResponse(functionToolCalls, logger, effReasoning, overrides), jsonOpts(servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	addResponseEntry({
@@ -915,10 +924,10 @@ async function handleConverse(req, res, raw, modelId, fixtures, journal, default
 			fixture
 		}
 	});
-	writeErrorResponse(res, 500, JSON.stringify({ error: {
+	writeErrorResponse(res, 500, renderError("bedrock", "unknown-response", {
 		message: "Fixture response did not match any known type",
 		type: "server_error"
-	} }));
+	}).body);
 }
 async function handleConverseStream(req, res, raw, modelId, fixtures, journal, defaults, setCorsHeaders) {
 	const { logger } = defaults;
@@ -939,10 +948,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: `Malformed JSON: ${detail}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	if (!isJsonObject(converseReq)) {
@@ -956,10 +965,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: "Request body must be a JSON object",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const messageError = !Array.isArray(converseReq.messages) ? "Invalid request: messages array is required" : validateConverseMessages(converseReq) ?? validateConverseSystem(converseReq) ?? validateConverseTools(converseReq);
@@ -974,10 +983,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 400, JSON.stringify({ error: {
+		writeErrorResponse(res, 400, renderError("bedrock", "validation", {
 			message: messageError,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const completionReq = converseToCompletionRequest(converseReq, modelId, logger);
@@ -985,7 +994,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 	completionReq._endpointType = "chat";
 	completionReq._context = getContext(req);
 	const testId = getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "bedrock-converse"
+	});
 	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);
@@ -996,7 +1008,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		body: completionReq
 	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
 	if (!fixture) {
-		if (resolveStrictMode(defaults.strict, req.headers)) {
+		if (resolveRequestDecisions(defaults.strict, req.headers).fixtureMiss) {
 			const strictStatus = 503;
 			const strictMessage = strictNoMatchMessage(skippedBySequenceOrTurn);
 			logger.error(strictNoMatchLogLine(req.method ?? "POST", urlPath, skippedBySequenceOrTurn));
@@ -1011,14 +1023,14 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 					...strictOverrideField(defaults.strict, req.headers)
 				}
 			});
-			writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
+			writeErrorResponse(res, strictStatus, renderError("bedrock", "strict-miss", {
 				message: strictMessage,
 				type: "invalid_request_error"
-			} }));
+			}).body);
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await withHangUpDetection(req, res, () => proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -1029,7 +1041,8 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -1046,10 +1059,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				...strictOverrideField(defaults.strict, req.headers)
 			}
 		});
-		writeErrorResponse(res, 404, JSON.stringify({ error: {
+		writeErrorResponse(res, 404, renderError("bedrock", "fixture-miss", {
 			message: "No fixture matched",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const response = await resolveResponse(fixture, completionReq);
@@ -1089,20 +1102,25 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		});
 		const type = misbehavior.status === 400 ? "ValidationException" : "InternalServerException";
 		res.setHeader("x-amzn-errortype", type);
-		writeErrorResponse(res, misbehavior.status, JSON.stringify({
-			__type: type,
+		writeErrorResponse(res, misbehavior.status, renderError("bedrock-converse", "misbehavior", {
+			type,
 			message: misbehavior.message,
 			code: misbehavior.code
-		}));
+		}).body);
 		return;
 	}
-	const latency = fixture.latency ?? defaults.latency;
 	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
+	const streamTiming = {
+		latency: fixture.latency ?? defaults.latency,
+		streamingProfile: fixture.streamingProfile,
+		recordedTimings: fixture.recordedTimings,
+		replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed
+	};
 	if (misbehavior.kind === "applied") {
 		const prepared = prepareConverseMisbehavior(misbehavior, completionReq, true, defaults, req.headers);
 		misbehavior = prepared.plan;
 		const events = buildConverseMisbehaviorEvents(prepared, chunkSize);
-		const entry = addResponseEntry({
+		await deliverStream(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: flattenHeaders(req.headers),
@@ -1111,21 +1129,24 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				status: 200,
 				fixture
 			}
+		}), fixture, eventStreamCodec(), events, streamTiming);
+		return;
+	}
+	if (isRawResponse(response)) {
+		await serveRawResponse({
+			wire: "bedrock-converse",
+			stream: true,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "bedrock-converse"
 		});
-		const interruption = createInterruptionSignal(fixture);
-		if (!await 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 (isErrorResponse(response)) {
@@ -1140,20 +1161,16 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 				fixture
 			}
 		});
-		const errBody = {
-			type: "error",
-			error: {
-				type: response.error.type ?? "invalid_request_error",
-				message: response.error.message
-			}
-		};
-		writeErrorResponse(res, status, JSON.stringify(errBody), { retryAfter: response.retryAfter });
+		writeErrorResponse(res, status, renderError("bedrock", "fixture", {
+			message: response.error.message,
+			type: response.error.type ?? "invalid_request_error"
+		}).body, { retryAfter: response.retryAfter });
 		return;
 	}
 	if (isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
 		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -1166,26 +1183,13 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 		});
 		const functionToolCalls = requireEmittedFunctionToolCalls(response, "Bedrock Converse");
 		const events = buildBedrockStreamContentWithToolCallsEvents(response.content ?? "", functionToolCalls, chunkSize, logger, effReasoning, overrides, response.blocks);
-		const interruption = createInterruptionSignal(fixture);
-		if (!await 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();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-		}
-		interruption?.cleanup();
+		await deliverStream(res, journalEntry, fixture, eventStreamCodec(), events, streamTiming);
 		return;
 	}
 	if (isTextResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
 		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -1197,26 +1201,13 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 			}
 		});
 		const events = buildBedrockStreamTextEvents(response.content, chunkSize, effReasoning, overrides);
-		const interruption = createInterruptionSignal(fixture);
-		if (!await 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();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-		}
-		interruption?.cleanup();
+		await deliverStream(res, journalEntry, fixture, eventStreamCodec(), events, streamTiming);
 		return;
 	}
 	if (isToolCallResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock Converse API — ignoring");
 		const overrides = extractOverrides(response);
-		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveStrictMode(defaults.strict, req.headers), logger);
+		const effReasoning = resolveReasoningForModel(response.reasoning, completionReq.model, resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
 		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -1228,20 +1219,7 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 			}
 		});
 		const events = buildBedrockStreamToolCallEvents(requireEmittedFunctionToolCalls(response, "Bedrock Converse"), chunkSize, logger, effReasoning, overrides);
-		const interruption = createInterruptionSignal(fixture);
-		if (!await 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();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-		}
-		interruption?.cleanup();
+		await deliverStream(res, journalEntry, fixture, eventStreamCodec(), events, streamTiming);
 		return;
 	}
 	addResponseEntry({
@@ -1254,10 +1232,10 @@ async function handleConverseStream(req, res, raw, modelId, fixtures, journal, d
 			fixture
 		}
 	});
-	writeErrorResponse(res, 500, JSON.stringify({ error: {
+	writeErrorResponse(res, 500, renderError("bedrock", "unknown-response", {
 		message: "Fixture response did not match any known type",
 		type: "server_error"
-	} }));
+	}).body);
 }
 
 //#endregion