@copilotkit/aimock 1.45.1 → 1.47.0

package/dist/bedrock.cjs

@@ -1,39 +1,24 @@
+const require_errors = require('./response/errors.cjs');
+const require_policy = require('./response/policy.cjs');
 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_anthropic = require('./response/usage/codecs/anthropic.cjs');
 const require_recorder = require('./recorder.cjs');
-const require_interruption = require('./interruption.cjs');
-const require_messages = require('./messages.cjs');
+const require_timing = require('./response/timing.cjs');
+const require_deliver = require('./response/deliver.cjs');
+const require_proxy = require('./response/proxy.cjs');
 const require_aws_event_stream = require('./aws-event-stream.cjs');
+const require_raw = require('./response/raw.cjs');
+const require_finish = require('./response/finish.cjs');
+const require_messages = require('./messages.cjs');
 
 //#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;
-}
-/**
-* 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,
-		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
-	};
+	return require_finish.mapAnthropicFinish(overrideFinishReason);
 }
 function extractTextContent(content) {
 	if (content === null || content === void 0) return "";
@@ -146,7 +131,7 @@ function buildBedrockTextResponse(content, model, reasoning, overrides) {
 		model: overrides?.model ?? model,
 		stop_reason: bedrockStopReason(overrides?.finishReason, "end_turn"),
 		stop_sequence: null,
-		usage: bedrockUsage(overrides)
+		usage: require_anthropic.render(require_anthropic.resolve(overrides), "bedrock-final")
 	};
 }
 function buildBedrockToolCallResponse(toolCalls, model, logger, reasoning, overrides) {
@@ -173,7 +158,7 @@ function buildBedrockToolCallResponse(toolCalls, model, logger, reasoning, overr
 		model: overrides?.model ?? model,
 		stop_reason: bedrockStopReason(overrides?.finishReason, "tool_use"),
 		stop_sequence: null,
-		usage: bedrockUsage(overrides)
+		usage: require_anthropic.render(require_anthropic.resolve(overrides), "bedrock-final")
 	};
 }
 /**
@@ -217,7 +202,7 @@ function buildBedrockBlocksResponse(blocks, model, logger, reasoning, overrides)
 		model: overrides?.model ?? model,
 		stop_reason: bedrockStopReason(overrides?.finishReason, outcome.hasToolCalls ? "tool_use" : "end_turn"),
 		stop_sequence: null,
-		usage: bedrockUsage(overrides)
+		usage: require_anthropic.render(require_anthropic.resolve(overrides), "bedrock-final")
 	};
 }
 async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults, setCorsHeaders) {
@@ -239,10 +224,10 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: `Malformed JSON: ${detail}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	if (!require_helpers.isJsonObject(bedrockReq)) {
@@ -256,10 +241,10 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: "Request body must be a JSON object",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const bedrockShapeError = require_helpers.validateChatMessages(bedrockReq.messages, { checkToolCalls: false }) ?? require_helpers.validateToolsField(bedrockReq.tools) ?? (bedrockReq.system !== void 0 && bedrockReq.system !== null && typeof bedrockReq.system !== "string" && !Array.isArray(bedrockReq.system) ? "system must be a string or an array" : null);
@@ -274,17 +259,20 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: `Invalid request: ${bedrockShapeError}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId, logger);
 	completionReq._endpointType = "chat";
 	completionReq._context = require_helpers.getContext(req);
 	const testId = require_helpers.getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, require_router.recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...require_router.recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "bedrock-invoke"
+	});
 	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);
@@ -295,7 +283,7 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 		body: completionReq
 	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
 	if (!fixture) {
-		if (require_helpers.resolveStrictMode(defaults.strict, req.headers)) {
+		if (require_policy.resolveRequestDecisions(defaults.strict, req.headers).fixtureMiss) {
 			const strictStatus = 503;
 			const strictMessage = require_helpers.strictNoMatchMessage(skippedBySequenceOrTurn);
 			logger.error(require_helpers.strictNoMatchLogLine(req.method ?? "POST", urlPath, skippedBySequenceOrTurn));
@@ -307,17 +295,17 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				response: {
 					status: strictStatus,
 					fixture: null,
-					...require_helpers.strictOverrideField(defaults.strict, req.headers)
+					...require_policy.strictOverrideField(defaults.strict, req.headers)
 				}
 			});
-			require_sse_writer.writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
+			require_sse_writer.writeErrorResponse(res, strictStatus, require_errors.renderError("bedrock", "strict-miss", {
 				message: strictMessage,
 				type: "invalid_request_error"
-			} }));
+			}).body);
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await require_recorder.proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await require_proxy.withHangUpDetection(req, res, () => require_recorder.proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -328,7 +316,8 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...require_proxy.proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -342,13 +331,13 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 			response: {
 				status: 404,
 				fixture: null,
-				...require_helpers.strictOverrideField(defaults.strict, req.headers)
+				...require_policy.strictOverrideField(defaults.strict, req.headers)
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 404, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 404, require_errors.renderError("bedrock", "fixture-miss", {
 			message: "No fixture matched",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const response = await require_helpers.resolveResponse(fixture, completionReq);
@@ -385,41 +374,69 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture
 			}
 		});
-		const type = misbehavior.status === 400 ? "ValidationException" : "NotImplementedException";
-		res.setHeader("x-amzn-errortype", type);
-		require_sse_writer.writeErrorResponse(res, misbehavior.status, JSON.stringify({
-			__type: type,
+		const renderedError = require_errors.renderError("bedrock", "misbehavior", {
+			type: misbehavior.status === 400 ? "ValidationException" : "NotImplementedException",
 			code: misbehavior.code,
 			message: misbehavior.message
-		}));
+		});
+		for (const [name, value] of Object.entries(renderedError.headers ?? {})) res.setHeader(name, value);
+		require_sse_writer.writeErrorResponse(res, misbehavior.status, renderedError.body);
 		return;
 	}
+	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
+	const jsonOpts = (payloadLength, duplicateId = false) => ({
+		surface: "other",
+		payloadLength,
+		chunkSize,
+		recordedTimings: fixture.recordedTimings,
+		duplicateId,
+		replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed
+	});
 	if (misbehavior.kind === "applied") {
 		const prepared = require_messages.prepareClaudeMisbehavior(misbehavior, {
 			request: completionReq,
 			stream: false,
-			chunkSize: Math.max(1, fixture.chunkSize ?? defaults.chunkSize),
+			chunkSize,
 			logger,
-			strict: require_helpers.resolveStrictMode(defaults.strict, req.headers)
+			strict: require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression,
+			citations: false
 		});
 		if (prepared.stream) throw new TypeError("InvokeModel requires non-stream Claude output");
+		const entry = journal.add({
+			method: req.method ?? "POST",
+			path: urlPath,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: completionReq,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
 		require_misbehavior.recordMisbehaviorOutcome({
-			entry: journal.add({
-				method: req.method ?? "POST",
-				path: urlPath,
-				headers: require_helpers.flattenHeaders(req.headers),
-				body: completionReq,
-				response: {
-					status: 200,
-					fixture
-				}
-			}),
+			entry,
 			summary: prepared.plan.summary,
 			defaults,
 			testId
 		});
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(prepared.body));
+		const preparedBody = prepared.body;
+		await require_deliver.deliverJson(res, entry, fixture, () => preparedBody, jsonOpts(require_timing.misbehaviorPayloadLength(misbehavior, misbehavior.reasoning === void 0 ? prepared.reasoning : void 0), !!misbehavior.duplicateId));
+		return;
+	}
+	if (require_helpers.isRawResponse(response)) {
+		await require_raw.serveRawResponse({
+			wire: "bedrock-invoke",
+			stream: false,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "bedrock"
+		});
 		return;
 	}
 	if (require_helpers.isErrorResponse(response)) {
@@ -434,21 +451,14 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture
 			}
 		});
-		const anthropicError = {
-			type: "error",
-			error: {
-				type: response.error.type ?? "api_error",
-				message: response.error.message
-			}
-		};
-		require_sse_writer.writeErrorResponse(res, status, JSON.stringify(anthropicError), { retryAfter: response.retryAfter });
+		require_sse_writer.writeErrorResponse(res, status, require_errors.renderError("bedrock", "fixture", response.error).body, { retryAfter: response.retryAfter });
 		return;
 	}
 	if (require_helpers.isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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);
-		addResponseEntry({
+		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -459,28 +469,27 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 			}
 		});
 		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel");
-		if (response.blocks && response.blocks.length > 0) {
-			const blocksBody = buildBedrockBlocksResponse(response.blocks, completionReq.model, logger, effReasoning, overrides);
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(blocksBody));
+		const blocks = response.blocks;
+		if (blocks && blocks.length > 0) {
+			await require_deliver.deliverJson(res, journalEntry, fixture, () => buildBedrockBlocksResponse(blocks, completionReq.model, logger, effReasoning, overrides), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
 			return;
 		}
-		const textBody = buildBedrockTextResponse(response.content ?? "", completionReq.model, effReasoning, overrides);
-		const toolBody = buildBedrockToolCallResponse(functionToolCalls, completionReq.model, logger, void 0, 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));
+		await require_deliver.deliverJson(res, journalEntry, fixture, () => {
+			const textBody = buildBedrockTextResponse(response.content ?? "", completionReq.model, effReasoning, overrides);
+			const toolBody = buildBedrockToolCallResponse(functionToolCalls, completionReq.model, logger, void 0, overrides);
+			return {
+				...textBody,
+				content: [...textBody.content, ...toolBody.content],
+				stop_reason: bedrockStopReason(overrides?.finishReason, "tool_use")
+			};
+		}, jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	if (require_helpers.isTextResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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);
-		addResponseEntry({
+		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		await require_deliver.deliverJson(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -489,17 +498,14 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				status: 200,
 				fixture
 			}
-		});
-		const body = buildBedrockTextResponse(response.content, completionReq.model, effReasoning, overrides);
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(body));
+		}), fixture, () => buildBedrockTextResponse(response.content, completionReq.model, effReasoning, overrides), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	if (require_helpers.isToolCallResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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);
-		addResponseEntry({
+		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -509,9 +515,8 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 				fixture
 			}
 		});
-		const body = buildBedrockToolCallResponse(require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel"), completionReq.model, logger, effReasoning, overrides);
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(body));
+		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel");
+		await require_deliver.deliverJson(res, journalEntry, fixture, () => buildBedrockToolCallResponse(functionToolCalls, completionReq.model, logger, effReasoning, overrides), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
 		return;
 	}
 	addResponseEntry({
@@ -524,19 +529,14 @@ async function handleBedrock(req, res, raw, modelId, fixtures, journal, defaults
 			fixture
 		}
 	});
-	require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
+	require_sse_writer.writeErrorResponse(res, 500, require_errors.renderError("bedrock", "unknown-response", {
 		message: "Fixture response did not match any known type",
 		type: "server_error"
-	} }));
+	}).body);
 }
 const BEDROCK_INVOKE_STREAM_EVENT_TYPE = "chunk";
 /** Serialize Claude events as InvokeModel PayloadPart, leaving generic AWS framing unchanged. */
-function writeBedrockInvokeStream(res, events, options) {
-	return require_aws_event_stream.writeEventStream(res, events.map((event) => ({
-		eventType: event.eventType,
-		payload: { bytes: Buffer.from(JSON.stringify(event.payload), "utf8").toString("base64") }
-	})), options);
-}
+const bedrockInvokeCodec = require_aws_event_stream.eventStreamCodec((event) => require_aws_event_stream.encodeEventStreamMessage(event.eventType, { bytes: Buffer.from(JSON.stringify(event.payload), "utf8").toString("base64") }));
 function buildBedrockInvokeMessageStart(model, overrides) {
 	return {
 		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
@@ -550,12 +550,12 @@ function buildBedrockInvokeMessageStart(model, overrides) {
 				model: overrides?.model ?? model,
 				stop_reason: null,
 				stop_sequence: null,
-				usage: bedrockUsage(overrides)
+				usage: require_anthropic.render(require_anthropic.resolve(overrides), "bedrock-start")
 			}
 		}
 	};
 }
-function buildBedrockInvokeMessageDelta(stopReason) {
+function buildBedrockInvokeMessageDelta(stopReason, overrides) {
 	return {
 		eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 		payload: {
@@ -564,7 +564,7 @@ function buildBedrockInvokeMessageDelta(stopReason) {
 				stop_reason: stopReason,
 				stop_sequence: null
 			},
-			usage: { output_tokens: 0 }
+			usage: require_anthropic.render(require_anthropic.resolve(overrides), "bedrock-delta")
 		}
 	};
 }
@@ -660,7 +660,7 @@ function buildBedrockStreamTextEvents(content, model, chunkSize, reasoning, over
 			index: textBlockIndex
 		}
 	});
-	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "end_turn")));
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "end_turn"), overrides));
 	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
@@ -794,7 +794,7 @@ function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, model,
 			});
 			blockIndex++;
 		}
-		events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, outcome.hasToolCalls ? "tool_use" : "end_turn")));
+		events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, outcome.hasToolCalls ? "tool_use" : "end_turn"), overrides));
 		events.push(buildBedrockInvokeMessageStop());
 		return events;
 	}
@@ -871,7 +871,7 @@ function buildBedrockStreamContentWithToolCallsEvents(content, toolCalls, model,
 			}
 		});
 	}
-	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use")));
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use"), overrides));
 	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
@@ -966,7 +966,7 @@ function buildBedrockStreamToolCallEvents(toolCalls, model, chunkSize, logger, r
 			}
 		});
 	}
-	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use")));
+	events.push(buildBedrockInvokeMessageDelta(bedrockStopReason(overrides?.finishReason, "tool_use"), overrides));
 	events.push(buildBedrockInvokeMessageStop());
 	return events;
 }
@@ -989,10 +989,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: `Malformed JSON: ${detail}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	if (!require_helpers.isJsonObject(bedrockReq)) {
@@ -1006,10 +1006,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: "Request body must be a JSON object",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const bedrockShapeError = require_helpers.validateChatMessages(bedrockReq.messages, { checkToolCalls: false }) ?? require_helpers.validateToolsField(bedrockReq.tools) ?? (bedrockReq.system !== void 0 && bedrockReq.system !== null && typeof bedrockReq.system !== "string" && !Array.isArray(bedrockReq.system) ? "system must be a string or an array" : null);
@@ -1024,10 +1024,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture: null
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 400, require_errors.renderError("bedrock", "validation", {
 			message: `Invalid request: ${bedrockShapeError}`,
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const completionReq = bedrockToCompletionRequest(bedrockReq, modelId, logger);
@@ -1035,7 +1035,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 	completionReq._endpointType = "chat";
 	completionReq._context = require_helpers.getContext(req);
 	const testId = require_helpers.getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, require_router.recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...require_router.recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "bedrock-invoke"
+	});
 	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);
@@ -1046,7 +1049,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 		body: completionReq
 	}, fixture ? "fixture" : "proxy", defaults.registry, defaults.logger)) return;
 	if (!fixture) {
-		if (require_helpers.resolveStrictMode(defaults.strict, req.headers)) {
+		if (require_policy.resolveRequestDecisions(defaults.strict, req.headers).fixtureMiss) {
 			const strictStatus = 503;
 			const strictMessage = require_helpers.strictNoMatchMessage(skippedBySequenceOrTurn);
 			logger.error(require_helpers.strictNoMatchLogLine(req.method ?? "POST", urlPath, skippedBySequenceOrTurn));
@@ -1058,17 +1061,17 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				response: {
 					status: strictStatus,
 					fixture: null,
-					...require_helpers.strictOverrideField(defaults.strict, req.headers)
+					...require_policy.strictOverrideField(defaults.strict, req.headers)
 				}
 			});
-			require_sse_writer.writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
+			require_sse_writer.writeErrorResponse(res, strictStatus, require_errors.renderError("bedrock", "strict-miss", {
 				message: strictMessage,
 				type: "invalid_request_error"
-			} }));
+			}).body);
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await require_recorder.proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await require_proxy.withHangUpDetection(req, res, () => require_recorder.proxyAndRecord(req, res, completionReq, "bedrock", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -1079,7 +1082,8 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...require_proxy.proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -1093,13 +1097,13 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 			response: {
 				status: 404,
 				fixture: null,
-				...require_helpers.strictOverrideField(defaults.strict, req.headers)
+				...require_policy.strictOverrideField(defaults.strict, req.headers)
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, 404, JSON.stringify({ error: {
+		require_sse_writer.writeErrorResponse(res, 404, require_errors.renderError("bedrock", "fixture-miss", {
 			message: "No fixture matched",
 			type: "invalid_request_error"
-		} }));
+		}).body);
 		return;
 	}
 	const response = await require_helpers.resolveResponse(fixture, completionReq);
@@ -1136,24 +1140,30 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const type = misbehavior.status === 400 ? "ValidationException" : "NotImplementedException";
-		res.setHeader("x-amzn-errortype", type);
-		require_sse_writer.writeErrorResponse(res, misbehavior.status, JSON.stringify({
-			__type: type,
+		const renderedError = require_errors.renderError("bedrock", "misbehavior", {
+			type: misbehavior.status === 400 ? "ValidationException" : "NotImplementedException",
 			code: misbehavior.code,
 			message: misbehavior.message
-		}));
+		});
+		for (const [name, value] of Object.entries(renderedError.headers ?? {})) res.setHeader(name, value);
+		require_sse_writer.writeErrorResponse(res, misbehavior.status, renderedError.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 = require_messages.prepareClaudeMisbehavior(misbehavior, {
 			request: completionReq,
 			stream: true,
 			chunkSize,
 			logger,
-			strict: require_helpers.resolveStrictMode(defaults.strict, req.headers)
+			strict: require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression,
+			citations: false
 		});
 		if (!prepared.stream) throw new TypeError("InvokeModel stream requires Claude events");
 		const entry = journal.add({
@@ -1172,27 +1182,27 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 			defaults,
 			testId
 		});
-		const events = prepared.events.map((event) => ({
+		await require_deliver.deliverStream(res, entry, fixture, bedrockInvokeCodec, prepared.events.map((event) => ({
 			eventType: BEDROCK_INVOKE_STREAM_EVENT_TYPE,
 			payload: event
-		}));
-		const interruption = require_interruption.createInterruptionSignal(fixture);
-		try {
-			if (!await writeBedrockInvokeStream(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();
-			}
-		} finally {
-			interruption?.cleanup();
-		}
+		})), streamTiming);
+		return;
+	}
+	if (require_helpers.isRawResponse(response)) {
+		await require_raw.serveRawResponse({
+			wire: "bedrock-invoke",
+			stream: true,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "bedrock"
+		});
 		return;
 	}
 	if (require_helpers.isErrorResponse(response)) {
@@ -1207,20 +1217,13 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				fixture
 			}
 		});
-		const anthropicError = {
-			type: "error",
-			error: {
-				type: response.error.type ?? "api_error",
-				message: response.error.message
-			}
-		};
-		require_sse_writer.writeErrorResponse(res, status, JSON.stringify(anthropicError), { retryAfter: response.retryAfter });
+		require_sse_writer.writeErrorResponse(res, status, require_errors.renderError("bedrock", "fixture", response.error).body, { retryAfter: response.retryAfter });
 		return;
 	}
 	if (require_helpers.isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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 effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
 		const journalEntry = addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -1232,28 +1235,14 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 			}
 		});
 		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel");
-		const events = buildBedrockStreamContentWithToolCallsEvents(response.content ?? "", functionToolCalls, completionReq.model, chunkSize, logger, effReasoning, overrides, response.blocks);
-		const interruption = require_interruption.createInterruptionSignal(fixture);
-		if (!await writeBedrockInvokeStream(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 require_deliver.deliverStream(res, journalEntry, fixture, bedrockInvokeCodec, buildBedrockStreamContentWithToolCallsEvents(response.content ?? "", functionToolCalls, completionReq.model, chunkSize, logger, effReasoning, overrides, response.blocks), streamTiming);
 		return;
 	}
 	if (require_helpers.isTextResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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 = addResponseEntry({
+		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		await require_deliver.deliverStream(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -1262,29 +1251,14 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				status: 200,
 				fixture
 			}
-		});
-		const events = buildBedrockStreamTextEvents(response.content, completionReq.model, chunkSize, effReasoning, overrides);
-		const interruption = require_interruption.createInterruptionSignal(fixture);
-		if (!await writeBedrockInvokeStream(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();
+		}), fixture, bedrockInvokeCodec, buildBedrockStreamTextEvents(response.content, completionReq.model, chunkSize, effReasoning, overrides), streamTiming);
 		return;
 	}
 	if (require_helpers.isToolCallResponse(response)) {
 		if (response.webSearches?.length) logger.warn("webSearches in fixture response are not supported for Bedrock 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 = addResponseEntry({
+		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		await require_deliver.deliverStream(res, addResponseEntry({
 			method: req.method ?? "POST",
 			path: urlPath,
 			headers: require_helpers.flattenHeaders(req.headers),
@@ -1293,22 +1267,7 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 				status: 200,
 				fixture
 			}
-		});
-		const events = buildBedrockStreamToolCallEvents(require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel"), completionReq.model, chunkSize, logger, effReasoning, overrides);
-		const interruption = require_interruption.createInterruptionSignal(fixture);
-		if (!await writeBedrockInvokeStream(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();
+		}), fixture, bedrockInvokeCodec, buildBedrockStreamToolCallEvents(require_helpers.requireEmittedFunctionToolCalls(response, "Bedrock InvokeModel"), completionReq.model, chunkSize, logger, effReasoning, overrides), streamTiming);
 		return;
 	}
 	addResponseEntry({
@@ -1321,10 +1280,10 @@ async function handleBedrockStream(req, res, raw, modelId, fixtures, journal, de
 			fixture
 		}
 	});
-	require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
+	require_sse_writer.writeErrorResponse(res, 500, require_errors.renderError("bedrock", "unknown-response", {
 		message: "Fixture response did not match any known type",
 		type: "server_error"
-	} }));
+	}).body);
 }
 
 //#endregion