@copilotkit/aimock 1.21.0 → 1.22.1

package/dist/server.cjs

@@ -113,21 +113,6 @@ const CORS_HEADERS = {
 function setCorsHeaders(res) {
 	for (const [key, value] of Object.entries(CORS_HEADERS)) res.setHeader(key, value);
 }
-const DEFAULT_MAX_BODY_BYTES = 10 * 1024 * 1024;
-async function readBody(req, maxBytes = DEFAULT_MAX_BODY_BYTES) {
-	const buffers = [];
-	let totalBytes = 0;
-	for await (const chunk of req) {
-		const buf = chunk;
-		totalBytes += buf.length;
-		if (totalBytes > maxBytes) {
-			req.destroy();
-			throw new Error(`Request body exceeded size limit of ${maxBytes} bytes`);
-		}
-		buffers.push(buf);
-	}
-	return Buffer.concat(buffers).toString();
-}
 function handleOptions(res) {
 	setCorsHeaders(res);
 	res.writeHead(204);
@@ -162,7 +147,7 @@ async function handleControlAPI(req, res, pathname, fixtures, journal, videoStat
 	if (subPath === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
-			raw = await readBody(req);
+			raw = await require_helpers.readBody(req);
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
 			defaults.logger.error(`POST /__aimock/fixtures: failed to read body: ${msg}`);
@@ -214,6 +199,8 @@ async function handleControlAPI(req, res, pathname, fixtures, journal, videoStat
 		videoStates.clear();
 		require_fal_audio.falJobs.clear();
 		require_fal.falQueueStates.clear();
+		require_gemini_interactions.resetInteractionCounter();
+		require_gemini_interactions.resetEventIdCounter();
 		if (defaults.registry) defaults.registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify({ reset: true }));
@@ -222,7 +209,7 @@ async function handleControlAPI(req, res, pathname, fixtures, journal, videoStat
 	if (subPath === "/error" && req.method === "POST") {
 		let raw;
 		try {
-			raw = await readBody(req);
+			raw = await require_helpers.readBody(req);
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
 			defaults.logger.error(`POST /__aimock/error: failed to read body: ${msg}`);
@@ -254,12 +241,17 @@ async function handleControlAPI(req, res, pathname, fixtures, journal, videoStat
 			}
 		};
 		fixtures.unshift(errorFixture);
+		let consumed = false;
 		const original = errorFixture.match.predicate;
 		errorFixture.match.predicate = (req) => {
+			if (consumed) return false;
 			const result = original(req);
 			if (result) {
-				const idx = fixtures.indexOf(errorFixture);
-				if (idx !== -1) fixtures.splice(idx, 1);
+				consumed = true;
+				queueMicrotask(() => {
+					const idx = fixtures.indexOf(errorFixture);
+					if (idx !== -1) fixtures.splice(idx, 1);
+				});
 			}
 			return result;
 		};
@@ -274,7 +266,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	setCorsHeaders(res);
 	let raw;
 	try {
-		raw = await readBody(req);
+		raw = await require_helpers.readBody(req);
 	} catch (err) {
 		const msg = err instanceof Error ? err.message : "Failed to read request body";
 		journal.add({
@@ -297,7 +289,8 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	try {
 		body = JSON.parse(raw);
 		if (modelFallback && !body.model) body.model = modelFallback;
-	} catch {
+	} catch (parseErr) {
+		const detail = parseErr instanceof Error ? parseErr.message : "unknown parse error";
 		journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
@@ -309,7 +302,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			}
 		});
 		require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
-			message: "Malformed JSON",
+			message: `Malformed JSON: ${detail}`,
 			type: "invalid_request_error",
 			param: null,
 			code: "invalid_json"
@@ -365,6 +358,29 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		return;
 	}
 	if (!fixture) {
+		if (require_helpers.resolveStrictMode(defaults.strict, req.headers)) {
+			const strictStatus = 503;
+			const strictMessage = "Strict mode: no fixture matched";
+			defaults.logger.error(`STRICT: No fixture matched for ${req.method ?? "POST"} ${req.url ?? COMPLETIONS_PATH}`);
+			journal.add({
+				method: req.method ?? "POST",
+				path: req.url ?? COMPLETIONS_PATH,
+				headers: require_helpers.flattenHeaders(req.headers),
+				body,
+				response: {
+					status: strictStatus,
+					fixture: null,
+					...require_helpers.strictOverrideField(defaults.strict, req.headers)
+				}
+			});
+			require_sse_writer.writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
+				message: strictMessage,
+				type: "invalid_request_error",
+				param: null,
+				code: "no_fixture_match"
+			} }));
+			return;
+		}
 		if (defaults.record && providerKey) {
 			const hookOptions = chaosAction === "malformed" ? {
 				beforeWriteResponse: () => {
@@ -372,7 +388,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 					return true;
 				},
 				onHookBypassed: (reason) => {
-					defaults.logger.warn(`[chaos] malformed bypassed on proxy: upstream returned SSE (${reason})`);
+					defaults.logger.warn(`[chaos] malformed bypassed on proxy: upstream returned streaming response (${reason})`);
 					defaults.registry?.incrementCounter("aimock_chaos_bypassed_total", {
 						action: "malformed",
 						source: "proxy",
@@ -382,7 +398,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			} : void 0;
 			const outcome = await require_recorder.proxyAndRecord(req, res, body, providerKey, req.url ?? COMPLETIONS_PATH, fixtures, defaults, raw, hookOptions);
 			if (outcome === "handled_by_hook") return;
-			if (outcome === "relayed") {
+			if (outcome !== "not_configured") {
 				journal.add({
 					method: req.method ?? "POST",
 					path: req.url ?? COMPLETIONS_PATH,
@@ -397,21 +413,19 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				return;
 			}
 		}
-		const strictStatus = defaults.strict ? 503 : 404;
-		const strictMessage = defaults.strict ? "Strict mode: no fixture matched" : "No fixture matched";
-		if (defaults.strict) defaults.logger.error(`STRICT: No fixture matched for ${req.method ?? "POST"} ${req.url ?? COMPLETIONS_PATH}`);
 		journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
-				status: strictStatus,
-				fixture: null
+				status: 404,
+				fixture: null,
+				...require_helpers.strictOverrideField(defaults.strict, req.headers)
 			}
 		});
-		require_sse_writer.writeErrorResponse(res, strictStatus, JSON.stringify({ error: {
-			message: strictMessage,
+		require_sse_writer.writeErrorResponse(res, 404, JSON.stringify({ error: {
+			message: "No fixture matched",
 			type: "invalid_request_error",
 			param: null,
 			code: "no_fixture_match"
@@ -433,13 +447,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				fixture
 			}
 		});
-		const errorBody = { error: {
-			message: response.error.message,
-			type: response.error.type ?? "server_error",
-			param: null,
-			code: response.error.code ?? null
-		} };
-		require_sse_writer.writeErrorResponse(res, status, JSON.stringify(errorBody));
+		require_sse_writer.writeErrorResponse(res, status, require_helpers.serializeErrorResponse(response));
 		return;
 	}
 	if (require_helpers.isAudioResponse(response)) {
@@ -528,6 +536,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		return;
 	}
 	if (require_helpers.isToolCallResponse(response)) {
+		if (response.webSearches?.length) defaults.logger.warn("webSearches in fixture response are not supported for Chat Completions API — ignoring");
 		const overrides = require_helpers.extractOverrides(response);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
@@ -636,7 +645,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 					message: msg,
 					type: "server_error"
 				} }));
-			}
+			} else if (!res.writableEnded) res.end();
 		});
 	});
 	async function handleHttpRequest(req, res) {
@@ -770,60 +779,54 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === RESPONSES_PATH && req.method === "POST") {
 			try {
-				await require_responses.handleResponses(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_responses.handleResponses(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
 		}
 		if (pathname === MESSAGES_PATH && req.method === "POST") {
 			try {
-				await require_messages.handleMessages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_messages.handleMessages(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
 		}
 		if (pathname === COHERE_CHAT_PATH && req.method === "POST") {
 			try {
-				await require_cohere.handleCohere(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_cohere.handleCohere(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
@@ -832,14 +835,16 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 			try {
 				const deploymentId = azureDeploymentId;
 				const embeddingsProvider = azureDeploymentId ? "azure" : "openai";
-				let raw = await readBody(req);
+				let raw = await require_helpers.readBody(req);
 				if (deploymentId) try {
 					const parsed = JSON.parse(raw);
 					if (!parsed.model) {
 						parsed.model = deploymentId;
 						raw = JSON.stringify(parsed);
 					}
-				} catch {}
+				} catch (err) {
+					if (!(err instanceof SyntaxError)) defaults.logger.error(`Unexpected error in Azure model injection: ${err instanceof Error ? err.message : String(err)}`);
+				}
 				await require_embeddings.handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
@@ -853,7 +858,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === IMAGES_PATH && req.method === "POST") {
 			try {
-				await require_images.handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_images.handleImages(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -866,7 +871,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === SPEECH_PATH && req.method === "POST") {
 			try {
-				await require_speech.handleSpeech(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_speech.handleSpeech(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -879,7 +884,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === TRANSCRIPTIONS_PATH && req.method === "POST") {
 			try {
-				await require_transcription.handleTranscription(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_transcription.handleTranscription(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -892,7 +897,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === VIDEOS_PATH && req.method === "POST") {
 			try {
-				await require_video.handleVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, videoStates);
+				await require_video.handleVideoCreate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, videoStates);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -913,7 +918,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (geminiPredictMatch && req.method === "POST") {
 			const predictModel = geminiPredictMatch[1];
 			try {
-				await require_images.handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "gemini", predictModel);
+				await require_images.handleImages(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, "gemini", predictModel);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -926,20 +931,18 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === GEMINI_INTERACTIONS_PATH && req.method === "POST") {
 			try {
-				await require_gemini_interactions.handleGeminiInteractions(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_gemini_interactions.handleGeminiInteractions(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
@@ -949,20 +952,18 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 			const geminiModel = geminiMatch[1];
 			const streaming = geminiMatch[2] === "streamGenerateContent";
 			try {
-				await require_gemini.handleGemini(req, res, await readBody(req), geminiModel, streaming, fixtures, journal, defaults, setCorsHeaders);
+				await require_gemini.handleGemini(req, res, await require_helpers.readBody(req), geminiModel, streaming, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
@@ -972,20 +973,18 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 			const vertexModel = vertexMatch[1];
 			const streaming = vertexMatch[2] === "streamGenerateContent";
 			try {
-				await require_gemini.handleGemini(req, res, await readBody(req), vertexModel, streaming, fixtures, journal, defaults, setCorsHeaders, "vertexai");
+				await require_gemini.handleGemini(req, res, await require_helpers.readBody(req), vertexModel, streaming, fixtures, journal, defaults, setCorsHeaders, "vertexai");
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
 					message: msg,
 					type: "server_error"
 				} }));
-				else if (!res.writableEnded) {
-					try {
-						res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					} catch (writeErr) {
-						logger.debug("Failed to write error recovery response:", writeErr);
-					}
+				else if (!res.writableEnded) try {
+					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
 					res.end();
+				} catch (writeErr) {
+					logger.debug("Failed to write error recovery response:", writeErr);
 				}
 			}
 			return;
@@ -994,7 +993,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (bedrockMatch && req.method === "POST") {
 			const bedrockModelId = bedrockMatch[1];
 			try {
-				await require_bedrock.handleBedrock(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
+				await require_bedrock.handleBedrock(req, res, await require_helpers.readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1009,7 +1008,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (bedrockStreamMatch && req.method === "POST") {
 			const bedrockModelId = bedrockStreamMatch[1];
 			try {
-				await require_bedrock.handleBedrockStream(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
+				await require_bedrock.handleBedrockStream(req, res, await require_helpers.readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1024,7 +1023,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (converseMatch && req.method === "POST") {
 			const converseModelId = converseMatch[1];
 			try {
-				await require_bedrock_converse.handleConverse(req, res, await readBody(req), converseModelId, fixtures, journal, defaults, setCorsHeaders);
+				await require_bedrock_converse.handleConverse(req, res, await require_helpers.readBody(req), converseModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1039,7 +1038,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (converseStreamMatch && req.method === "POST") {
 			const converseStreamModelId = converseStreamMatch[1];
 			try {
-				await require_bedrock_converse.handleConverseStream(req, res, await readBody(req), converseStreamModelId, fixtures, journal, defaults, setCorsHeaders);
+				await require_bedrock_converse.handleConverseStream(req, res, await require_helpers.readBody(req), converseStreamModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1052,7 +1051,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === OLLAMA_CHAT_PATH && req.method === "POST") {
 			try {
-				await require_ollama.handleOllama(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_ollama.handleOllama(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1065,7 +1064,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === OLLAMA_GENERATE_PATH && req.method === "POST") {
 			try {
-				await require_ollama.handleOllamaGenerate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				await require_ollama.handleOllamaGenerate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1094,7 +1093,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === SEARCH_PATH && req.method === "POST") {
 			try {
-				await require_search.handleSearch(req, res, await readBody(req), serviceFixtures?.search ?? [], journal, defaults, setCorsHeaders);
+				await require_search.handleSearch(req, res, await require_helpers.readBody(req), serviceFixtures?.search ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1107,7 +1106,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === RERANK_PATH && req.method === "POST") {
 			try {
-				await require_rerank.handleRerank(req, res, await readBody(req), serviceFixtures?.rerank ?? [], journal, defaults, setCorsHeaders);
+				await require_rerank.handleRerank(req, res, await require_helpers.readBody(req), serviceFixtures?.rerank ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1120,7 +1119,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		}
 		if (pathname === MODERATIONS_PATH && req.method === "POST") {
 			try {
-				await require_moderation.handleModeration(req, res, await readBody(req), serviceFixtures?.moderation ?? [], journal, defaults, setCorsHeaders);
+				await require_moderation.handleModeration(req, res, await require_helpers.readBody(req), serviceFixtures?.moderation ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1134,21 +1133,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (pathname === ELEVENLABS_SOUND_GENERATION_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				const raw = await readBody(req);
-				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
-				if (chaosAction) {
-					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
-						method: req.method ?? "POST",
-						path: pathname,
-						headers: require_helpers.flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
-					return;
-				}
-				await require_elevenlabs_audio.handleElevenLabsAudio(req, res, raw, fixtures, defaults, journal, "sound-generation");
+				await require_elevenlabs_audio.handleElevenLabsAudio(req, res, await require_helpers.readBody(req), fixtures, defaults, journal, "sound-generation");
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1164,21 +1149,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 			setCorsHeaders(res);
 			const musicSubType = musicMatch[1] ?? "music";
 			try {
-				const raw = await readBody(req);
-				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
-				if (chaosAction) {
-					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
-						method: req.method ?? "POST",
-						path: pathname,
-						headers: require_helpers.flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
-					return;
-				}
-				await require_elevenlabs_audio.handleElevenLabsAudio(req, res, raw, fixtures, defaults, journal, musicSubType);
+				await require_elevenlabs_audio.handleElevenLabsAudio(req, res, await require_helpers.readBody(req), fixtures, defaults, journal, musicSubType);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1189,10 +1160,12 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 			}
 			return;
 		}
+		let falBody;
 		if (FAL_PREFIX_RE.test(pathname) && req.headers["x-fal-target-host"]) {
 			setCorsHeaders(res);
 			try {
-				const raw = req.method === "POST" || req.method === "PUT" ? await readBody(req) : "";
+				falBody = req.method === "POST" || req.method === "PUT" ? await require_helpers.readBody(req) : "";
+				const raw = falBody;
 				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
 				if (chaosAction) {
 					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
@@ -1220,21 +1193,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (pathname.match(FAL_QUEUE_SUBMIT_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				const raw = await readBody(req);
-				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
-				if (chaosAction) {
-					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
-						method: req.method ?? "POST",
-						path: pathname,
-						headers: require_helpers.flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
-					return;
-				}
-				await require_fal_audio.handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
+				await require_fal_audio.handleFalQueue(req, res, falBody ?? await require_helpers.readBody(req), pathname, fixtures, defaults, journal);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1248,7 +1207,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (pathname.match(FAL_QUEUE_REQUESTS_RE) && (req.method === "GET" || req.method === "POST" || req.method === "PUT")) {
 			setCorsHeaders(res);
 			try {
-				const raw = req.method === "POST" ? await readBody(req) : "{}";
+				const raw = req.method === "POST" || req.method === "PUT" ? falBody ?? await require_helpers.readBody(req) : "{}";
 				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
 				if (chaosAction) {
 					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
@@ -1276,21 +1235,7 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (pathname.match(FAL_RUN_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				const raw = await readBody(req);
-				const chaosAction = require_chaos.evaluateChaos(null, defaults.chaos, req.headers, defaults.logger);
-				if (chaosAction) {
-					require_chaos.applyChaosAction(chaosAction, res, null, journal, {
-						method: req.method ?? "POST",
-						path: pathname,
-						headers: require_helpers.flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
-					return;
-				}
-				await require_fal_audio.handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
+				await require_fal_audio.handleFalQueue(req, res, falBody ?? await require_helpers.readBody(req), pathname, fixtures, defaults, journal);
 			} catch (err) {
 				const msg = err instanceof Error ? err.message : "Internal error";
 				if (!res.headersSent) require_sse_writer.writeErrorResponse(res, 500, JSON.stringify({ error: {
@@ -1318,16 +1263,14 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 				message: msg,
 				type: "server_error"
 			} }));
-			else if (!res.writableEnded) {
-				try {
-					res.write(`data: ${JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} })}\n\n`);
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+			else if (!res.writableEnded) try {
+				res.write(`data: ${JSON.stringify({ error: {
+					message: msg,
+					type: "server_error"
+				} })}\n\n`);
 				res.end();
+			} catch (writeErr) {
+				logger.debug("Failed to write error recovery response:", writeErr);
 			}
 		}
 	}
@@ -1376,19 +1319,22 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 		if (pathname === RESPONSES_PATH) require_ws_responses.handleWebSocketResponses(ws, fixtures, journal, {
 			...defaults,
 			model: "gpt-4",
-			testId: wsTestId
+			testId: wsTestId,
+			upgradeHeaders: req.headers
 		});
 		else if (pathname === REALTIME_PATH) {
 			const model = parsedUrl.searchParams.get("model") ?? "gpt-4o-realtime";
 			require_ws_realtime.handleWebSocketRealtime(ws, fixtures, journal, {
 				...defaults,
 				model,
-				testId: wsTestId
+				testId: wsTestId,
+				upgradeHeaders: req.headers
 			});
 		} else if (pathname === GEMINI_LIVE_PATH) require_ws_gemini_live.handleWebSocketGeminiLive(ws, fixtures, journal, {
 			...defaults,
 			model: "gemini-2.0-flash",
-			testId: wsTestId
+			testId: wsTestId,
+			upgradeHeaders: req.headers
 		});
 	}
 	const originalClose = server.close.bind(server);