@copilotkit/aimock 1.44.0 → 1.45.1

package/dist/server.js

@@ -1,11 +1,12 @@
 import { DEFAULT_TEST_ID } from "./constants.js";
 import { build, msg, quote } from "./message-text.js";
 import { markAuthenticatedRequest, resolveInboundAuth, validateRequestApiKey, writeApiKeyHttpRejection, writeApiKeyUpgradeRejection } from "./api-key-auth.js";
-import { RequestBodyTooLargeError, buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, buildTextChunks, buildTextCompletion, buildToolCallChunks, buildToolCallCompletion, buildUsageChunk, describeMatch, extractOverrides, flattenHeaders, getContext, getTestId, isAudioResponse, isContentWithToolCallsResponse, isEmbeddingResponse, isErrorResponse, isImageResponse, isJSONResponse, isJsonObject, isResponseFactory, isTextResponse, isToolCallResponse, isTranscriptionResponse, isVideoResponse, markMintedRequestId, readBody, readBodyBufferBounded, resolveFixtureBlockOutcome, resolveReasoningForModel, resolveRequestId, resolveResponse, resolveStrictMode, resolveTestId, resolveUsage, serializeErrorResponse, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField, validateToolsField, wouldProxyMiss } from "./helpers.js";
+import { RequestBodyTooLargeError, buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, buildOpenAIContentFilterChunks, buildOpenAIContentFilterCompletion, buildOpenAIReasoningChunks, buildOpenAIReasoningCompletion, buildOpenAIRefusalChunks, buildOpenAIRefusalCompletion, buildTextChunks, buildTextCompletion, buildToolCallChunks, buildToolCallCompletion, buildUsageChunk, createServerFixtureList, describeMatch, extractOverrides, fixtureToolCallErrorCode, flattenHeaders, getContext, getTestId, googleFixtureToolCallErrorDetails, isAudioResponse, isCombinedFixtureResponse, isEmbeddingResponse, isErrorResponse, isExtendedResponsesToolsList, isFixtureToolCallError, isImageResponse, isJSONResponse, isJsonObject, isResponseFactory, isServerOwnedFixtures, isTextResponse, isToolCallResponse, isTranscriptionResponse, isVideoResponse, markMintedRequestId, prepareOpenAIChatMisbehavior, readBody, readBodyBufferBounded, requireEmittedFunctionToolCalls, requireServedFunctionToolCalls, resolveFixtureBlockOutcome, resolveOpenAIChatMisbehaviorUsage, resolveReasoningForModel, resolveRequestId, resolveResponse, resolveStrictMode, resolveTestId, resolveUsage, runWithToolArgumentsScope, serializeErrorResponse, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField, validateToolsField, withoutResponsesToolKeys, wouldProxyMiss } from "./helpers.js";
 import { normalizeLiveOptions } from "./live-fixture.js";
 import { writeErrorResponse, writeSSEStream } from "./sse-writer.js";
 import { CHAOS_FIELDS, CHAOS_FIELD_NAMES, applyChaosAction, awaitChaosLatency, describeUnwritableReason, evaluateChaos, isChaosScope, parseChaosField, resetChaosWarnings, resolveChaosConfig, responseGoneReason } from "./chaos.js";
-import { FixtureLoadError, INJECTED_STATUS_RANGE, claimOneShotError, clearFixtureQueue, entryToFixture, isInjectableStatus, isOneShotError, queueOneShotError, releaseOneShotError, validateFixtures } from "./fixture-loader.js";
+import { MISBEHAVIOR_CATALOG, WIRE_SUPPORT, getFixtureMisbehaviorPosition, parseMisbehavior, parseMisbehaviorHeader, planMisbehavior, recordMisbehaviorOutcome, resolveMisbehaviorSeed, resolveMisbehaviorShortCircuit, setFixtureMisbehaviorPosition } from "./misbehavior.js";
+import { FixtureLoadError, INJECTED_STATUS_RANGE, MisbehaviorConfigError, claimOneShotError, clearFixtureQueue, enableHeldFixtureMisbehavior, entryToFixture, isInjectableStatus, isOneShotError, markFixtureResponsesToolsExtended, queueOneShotError, releaseOneShotError, responsesToolsExtendedView, responsesToolsViewSource, validateFixtures } from "./fixture-loader.js";
 import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { proxyAndRecord } from "./recorder.js";
 import { Logger } from "./logger.js";
@@ -52,6 +53,7 @@ import { DESTROYED_STATUS_LABEL, createMetricsRegistry, normalizePathLabel } fro
 import { MCP_FAKES_DEFAULT_MOUNT, McpFakeStore, McpFakesAddError, blockIdOf } from "./mcp-fakes.js";
 import { MCPMock } from "./mcp-mock.js";
 import { ensureFakeMount, findFakeMount, handOffMcpFakes, isFakeMount, mountConflictDetail } from "./mcp-fakes-mount.js";
+import { handleFakesReportRoute } from "./mcp-fakes-report.js";
 import * as http$1 from "node:http";
 import { AsyncLocalStorage } from "node:async_hooks";
 
@@ -159,6 +161,7 @@ function performFullReset(fixtures, targets) {
 	targets.journal.clear();
 	resetChaosWarnings(targets.defaults.logger);
 	targets.defaults.chaos = void 0;
+	targets.defaults.misbehavior?.byTestId.clear();
 	targets.videoStates.clear();
 	targets.openRouterVideoJobs.clear();
 	targets.veoVideoJobs.clear();
@@ -204,7 +207,7 @@ function fixtureResponseKind(response) {
 	if (isImageResponse(response)) return "image";
 	if (isEmbeddingResponse(response)) return "embedding";
 	if (isJSONResponse(response)) return "json";
-	if (isContentWithToolCallsResponse(response)) return "contentWithToolCalls";
+	if (isCombinedFixtureResponse(response)) return "contentWithToolCalls";
 	if (isToolCallResponse(response)) return "toolCalls";
 	if (isTextResponse(response)) return "text";
 	return "unknown";
@@ -368,7 +371,8 @@ function planControlApiFakes(raw, mounts) {
 				const target = ensureFakeMount(mounts, group.path, {
 					journal: wiring.journal,
 					registry: wiring.defaults.registry,
-					logger: wiring.defaults.logger
+					logger: wiring.defaults.logger,
+					replaySpeed: wiring.defaults.replaySpeed
 				}, wiring.defaults.logger);
 				if ("conflict" in target) continue;
 				const result = target.handler.addMcpFakes?.(group.sources, { kind: "control-api" });
@@ -419,6 +423,7 @@ function listControlApiFakes(mounts, testId, context, mount) {
 	}] : []);
 	return mount !== null && listed.length === 0 ? null : listed;
 }
+const controlFixtureAdditions = /* @__PURE__ */ new WeakMap();
 /**
 * Handle requests under `/__aimock/`. Returns `true` if the request was
 * handled, `false` if the path doesn't match the control prefix.
@@ -490,7 +495,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			"Content-Type": "application/json",
 			"X-Total-Count": String(total)
 		});
-		res.end(JSON.stringify(entries));
+		res.end(journalJson(entries, journal));
 		return true;
 	}
 	if (subPath === "/fixtures" && req.method === "GET") {
@@ -510,19 +515,70 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			res.end(JSON.stringify({ error: "Invalid 'include': expected 'fixtures'" }));
 			return true;
 		}
+		const extendedTools = isExtendedResponsesToolsList(fixtures);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify({
 			count: fixtures.length,
 			fixtures: fixtures.map((fixture, index) => ({
 				index,
 				match: redactForInspection(fixture.match),
-				responseKind: isOneShotError(fixture) ? "error" : fixtureResponseKind(fixture.response),
+				responseKind: isOneShotError(fixture) ? "error" : fixtureResponseKind(extendedTools || typeof fixture.response === "function" ? fixture.response : withoutResponsesToolKeys(fixture.response)),
 				...fixture.latency !== void 0 ? { latency: fixture.latency } : {},
 				...fixture.chaos !== void 0 ? { chaos: fixture.chaos } : {}
 			}))
 		}));
 		return true;
 	}
+	if (subPath === "/misbehavior/catalog" && req.method === "GET") {
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify({
+			catalog: MISBEHAVIOR_CATALOG,
+			WIRE_SUPPORT
+		}));
+		return true;
+	}
+	if (subPath === "/misbehavior" && (req.method === "GET" || req.method === "POST" || req.method === "DELETE")) {
+		const scopeId = chaosScopeId(req);
+		if (scopeId === null) return writeBlankTestId(res);
+		const reply = (status, body) => {
+			res.writeHead(status, { "Content-Type": "application/json" });
+			res.end(JSON.stringify(body));
+			return true;
+		};
+		const scope = defaults.misbehavior;
+		if (!scope && req.method !== "GET") return reply(409, { error: "misbehavior is not enabled: start aimock with enableMisbehavior: true (CLI: --misbehavior)" });
+		if (req.method === "POST") {
+			let raw;
+			try {
+				raw = await readBody(req);
+			} catch (err) {
+				const msg = err instanceof Error ? err.message : String(err);
+				defaults.logger.error(`POST /__aimock/misbehavior: failed to read body: ${msg}`);
+				return reply(400, { error: `Failed to read request body: ${msg}` });
+			}
+			let input;
+			try {
+				input = JSON.parse(raw);
+			} catch (err) {
+				const msg = err instanceof Error ? err.message : String(err);
+				defaults.logger.error(`POST /__aimock/misbehavior: invalid JSON: ${msg}`);
+				return reply(400, { error: `Invalid JSON: ${msg}` });
+			}
+			if (isJsonObject(input) && Object.keys(input).length === 0) input = { faults: [] };
+			const parsed = parseMisbehavior(input);
+			if (!parsed.ok) return reply(400, {
+				error: "Validation failed",
+				rule: parsed.issue.rule,
+				message: parsed.issue.message
+			});
+			const config = parsed.config.seed === "random" ? {
+				...parsed.config,
+				seed: resolveMisbehaviorSeed(parsed.config.seed, defaults.logger)
+			} : parsed.config;
+			scope?.byTestId.set(scopeId, config);
+		} else if (req.method === "DELETE") scope?.byTestId.delete(scopeId);
+		return reply(200, { misbehavior: scope?.byTestId.get(scopeId) ?? scope?.baseline ?? { faults: [] } });
+	}
 	if (subPath === "/chaos" && req.method === "GET") {
 		const scopeId = chaosScopeId(req);
 		if (scopeId === null) return writeBlankTestId(res);
@@ -613,6 +669,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			mounts: listed
 		});
 	}
+	if (subPath === "/mcp/fakes/report" && req.method === "GET") return handleFakesReportRoute(res, searchParams, mounts);
 	if (subPath === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
@@ -653,8 +710,25 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			res.end(JSON.stringify({ error: `Fixture at index ${invalidMatchIndex}: match must be an object` }));
 			return true;
 		}
-		const converted = entries.map((e) => entryToFixture(e));
-		const errors = validateFixtures(converted).filter((i) => i.severity === "error");
+		const extendedResponsesTools = defaults.responsesTools === "extended";
+		const markInPlace = extendedResponsesTools && isServerOwnedFixtures(fixtures);
+		const addition = controlFixtureAdditions.get(defaults) ?? 0;
+		controlFixtureAdditions.set(defaults, addition + 1);
+		const converted = [];
+		const loadErrors = [];
+		for (const [index, entry] of entries.entries()) try {
+			const fixture = entryToFixture(entry, void 0, void 0, {
+				file: `control-api#${addition}`,
+				index
+			});
+			if (defaults.misbehavior) enableHeldFixtureMisbehavior(fixture);
+			if (markInPlace) markFixtureResponsesToolsExtended(fixture);
+			converted.push(fixture);
+		} catch (error) {
+			if (!(error instanceof FixtureLoadError || error instanceof MisbehaviorConfigError)) throw error;
+			loadErrors.push(error);
+		}
+		const errors = (loadErrors.length === 0 ? validateFixtures(extendedResponsesTools ? converted.map(responsesToolsExtendedView) : converted) : []).filter((i) => i.severity === "error");
 		const fakes = withFakes ? planControlApiFakes(parsed.mcpFakes, mounts) : null;
 		const fakeErrors = fakes?.errors ?? [];
 		const validationFailed = (details) => {
@@ -665,7 +739,11 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			}));
 			return true;
 		};
-		if (errors.length > 0 || fakeErrors.length > 0) return validationFailed([...errors, ...fakeErrors.map((e) => e.toJSON())]);
+		if (loadErrors.length > 0 || errors.length > 0 || fakeErrors.length > 0) return validationFailed([
+			...loadErrors.map((e) => e.toJSON()),
+			...errors,
+			...fakeErrors.map((e) => e.toJSON())
+		]);
 		let mcpFakesAdded = 0;
 		if (fakes) try {
 			mcpFakesAdded = fakes.apply({
@@ -687,6 +765,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 	}
 	if (subPath === "/fixtures" && req.method === "DELETE") {
 		clearFixtureQueue(fixtures);
+		journal.clearMisbehaviorCounters();
 		for (const { handler } of mounts) handler.clearMcpFakes?.();
 		if (defaults.registry) defaults.registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 		res.writeHead(200, { "Content-Type": "application/json" });
@@ -803,8 +882,9 @@ function clientAbortedMidBody(req, res, err) {
 	if (err instanceof RequestBodyTooLargeError) return false;
 	return res.destroyed && !req.complete;
 }
-async function handleCompletions(req, res, fixtures, journal, defaults, modelFallback, providerKey, openRouter = false) {
+async function handleCompletions(req, res, fixtures, journal, defaults, getRequestEntry, modelFallback, providerKey, openRouter = false, beforeFixtureSelection, bytePlusPath = false) {
 	setCorsHeaders(res);
+	const wire = providerKey === "azure" ? "Azure OpenAI Chat Completions" : providerKey === "openrouter" ? "OpenRouter Chat Completions" : providerKey === "byteplus" || bytePlusPath ? "BytePlus ModelArk Chat Completions" : "OpenAI Chat Completions";
 	let raw;
 	try {
 		raw = await readBody(req);
@@ -970,6 +1050,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	const openRouterFallback = openRouter && Array.isArray(body.models) && body.models.length > 0;
 	const selectFixture = (probe, counts) => {
 		for (;;) {
+			beforeFixtureSelection?.();
 			const attempt = matchFixtureDiagnostic(fixtures, probe, counts, defaults.requestTransform, matchOptions);
 			if (attempt.fixture && isOneShotError(attempt.fixture) && !claimOneShotError(fixtures, attempt.fixture)) continue;
 			return attempt;
@@ -1053,13 +1134,32 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
 	const missWouldProxy = wouldProxyMiss(effectiveStrict, defaults.record, providerKey);
 	const noFixtureSource = missWouldProxy ? "proxy" : "internal";
+	const recordBypass = (reason) => {
+		const entry = getRequestEntry();
+		if (!entry) return;
+		recordMisbehaviorOutcome({
+			entry,
+			summary: resolveMisbehaviorShortCircuit({
+				wire: "openai-chat",
+				fixture: fixture ?? void 0,
+				defaults,
+				rawHeaders: req.headers,
+				url: req.url,
+				reason
+			}),
+			defaults,
+			testId
+		});
+	};
 	if (chaosAction === "drop" || chaosAction === "disconnect" || chaosAction === "rateLimit") {
 		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, fixture ? "fixture" : noFixtureSource, defaults.registry, defaults.logger);
+		recordBypass("chaos-fired");
 		releaseOneShotError(fixtures, fixture);
 		return;
 	}
 	if (chaosAction === "malformed" && (fixture || !missWouldProxy)) {
 		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, fixture ? "fixture" : "internal", defaults.registry, defaults.logger);
+		recordBypass("chaos-fired");
 		releaseOneShotError(fixtures, fixture);
 		return;
 	}
@@ -1091,6 +1191,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			const hookOptions = chaosAction === "malformed" ? {
 				beforeWriteResponse: () => {
 					applyChaosAction(chaosAction, res, null, journal, chaosContext, "proxy", defaults.registry, defaults.logger);
+					recordBypass("chaos-fired");
 					return true;
 				},
 				onHookBypassed: (reason) => {
@@ -1133,10 +1234,12 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 						} : {}
 					}
 				});
+				recordBypass("proxied");
 				return;
 			}
 			if (chaosAction === "malformed") {
 				applyChaosAction(chaosAction, res, null, journal, chaosContext, "internal", defaults.registry, defaults.logger);
+				recordBypass("chaos-fired");
 				return;
 			}
 		}
@@ -1159,13 +1262,71 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		} }));
 		return;
 	}
-	const response = preResolvedResponse ?? await resolveResponse(fixture, body);
+	const resolvedResponse = preResolvedResponse ?? await resolveResponse(fixture, body);
+	const evaluation = planMisbehavior({
+		wire: "openai-chat",
+		fixture,
+		response: resolvedResponse,
+		request: body,
+		stream: body.stream === true,
+		defaults,
+		rawHeaders: req.headers,
+		url: req.url
+	});
+	if (evaluation.kind === "error") {
+		recordMisbehaviorOutcome({
+			entry: journal.add({
+				method,
+				path,
+				headers: flatHeaders,
+				body,
+				response: {
+					status: evaluation.status,
+					fixture
+				}
+			}),
+			summary: evaluation.summary,
+			defaults,
+			testId
+		});
+		if (!evaluation.summary?.evaluations.some((row) => row.outcome === "error")) defaults.logger.error(`${evaluation.code}: ${evaluation.message}`);
+		writeErrorResponse(res, evaluation.status, openRouter ? serializeOpenRouterError(evaluation.status, `${evaluation.code}: ${evaluation.message}`) : JSON.stringify({ error: {
+			message: evaluation.message,
+			type: "invalid_request_error",
+			param: null,
+			code: evaluation.code
+		} }));
+		return;
+	}
+	const appliedPlan = evaluation.kind === "applied" ? prepareOpenAIChatMisbehavior(evaluation) : void 0;
+	const response = appliedPlan?.response ?? resolvedResponse;
+	const summary = appliedPlan?.summary ?? evaluation.summary;
+	const recordOutcome = (entry) => {
+		recordMisbehaviorOutcome({
+			entry,
+			summary,
+			defaults,
+			testId
+		});
+	};
+	const appliedReasoning = appliedPlan && appliedPlan.reasoning === void 0 && (isTextResponse(response) || isToolCallResponse(response) || isCombinedFixtureResponse(response)) ? resolveReasoningForModel(response.reasoning, responseModel, resolveStrictMode(defaults.strict, req.headers), defaults.logger) : void 0;
+	const appliedUsage = appliedPlan ? resolveOpenAIChatMisbehaviorUsage(appliedPlan, body, appliedPlan.reasoning === void 0 ? appliedReasoning !== void 0 : openRouter) : void 0;
 	const latency = fixture.latency ?? defaults.latency;
 	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
 	const emitStreamingUsage = body.stream === true && body.stream_options?.include_usage === true || openRouter;
 	const streamingPromptText = body.messages.map((m) => typeof m.content === "string" ? m.content : Array.isArray(m.content) ? m.content.map((p) => p.text ?? "").join("") : "").join("");
-	const resolveStreamingUsageTokens = (overrides, completionText) => resolveUsage(overrides, streamingPromptText, completionText);
+	const resolveStreamingUsageTokens = (overrides, completionText) => appliedUsage ?? resolveUsage(overrides, streamingPromptText, completionText);
+	const resolveRecordedTimings = (chunks) => {
+		const timings = fixture.recordedTimings;
+		if (!appliedPlan?.duplicateId || !timings) return timings;
+		const gaps = timings.interChunkDelaysMs;
+		return {
+			...timings,
+			interChunkDelaysMs: Array.from({ length: Math.max(gaps.length, chunks.length - 1) }, (_, index) => gaps[index] ?? gaps.at(-1) ?? 0)
+		};
+	};
 	const shapeORCompletion = (completion, overrides) => {
+		if (appliedUsage) completion.usage = appliedUsage;
 		if (!openRouter) return completion;
 		return shapeOpenRouterCompletion(completion, resolveOpenRouterShaping(overrides, overrides?.model ?? responseModel), overrides?.id !== void 0);
 	};
@@ -1178,7 +1339,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	const openRouterProcessing = !!(openRouter && fixture.openRouterProcessing);
 	if (isErrorResponse(response)) {
 		const status = response.status ?? 500;
-		journal.add({
+		recordOutcome(journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
 			headers: flattenHeaders(req.headers),
@@ -1187,12 +1348,12 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				status,
 				fixture
 			}
-		});
+		}));
 		writeErrorResponse(res, status, openRouter ? serializeOpenRouterError(status, response.error.message, response.error.metadata) : serializeErrorResponse(response), { retryAfter: response.retryAfter });
 		return;
 	}
 	if (isAudioResponse(response)) {
-		journal.add({
+		recordOutcome(journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
 			headers: flattenHeaders(req.headers),
@@ -1201,18 +1362,58 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				status: 422,
 				fixture
 			}
-		});
+		}));
 		writeErrorResponse(res, 422, openRouter ? serializeOpenRouterError(422, "Audio responses are not supported on the chat completions endpoint. Use Gemini generateContent or a dedicated audio endpoint.") : JSON.stringify({ error: {
 			message: "Audio responses are not supported on the chat completions endpoint. Use Gemini generateContent or a dedicated audio endpoint.",
 			type: "invalid_request_error"
 		} }));
 		return;
 	}
-	if (isContentWithToolCallsResponse(response)) {
+	if (appliedPlan && isTextResponse(response) && (appliedPlan.stop === "refusal" || appliedPlan.stop === "content_filter" || appliedPlan.reasoning !== void 0)) {
+		const overrides = extractOverrides(response);
+		const entry = journal.add({
+			method,
+			path,
+			headers: flatHeaders,
+			body,
+			response: {
+				status: 200,
+				fixture
+			}
+		});
+		recordOutcome(entry);
+		if (body.stream !== true) {
+			const completion = appliedPlan.stop === "refusal" ? buildOpenAIRefusalCompletion(appliedPlan.refusal ?? "", responseModel, overrides, body.messages) : appliedPlan.stop === "content_filter" ? buildOpenAIContentFilterCompletion(responseModel, overrides, body.messages) : buildOpenAIReasoningCompletion(appliedPlan.reasoning ?? "", responseModel, openRouter, overrides, body.messages);
+			res.writeHead(200, { "Content-Type": "application/json" });
+			res.end(JSON.stringify(shapeORCompletion(completion, overrides)));
+		} else {
+			const chunks = appliedPlan.stop === "refusal" ? buildOpenAIRefusalChunks(appliedPlan.refusal ?? "", responseModel, chunkSize, overrides) : appliedPlan.stop === "content_filter" ? buildOpenAIContentFilterChunks(responseModel, overrides) : buildOpenAIReasoningChunks(appliedPlan.reasoning ?? "", responseModel, chunkSize, openRouter, overrides);
+			const usageChunk = emitStreamingUsage ? buildUsageChunk(chunks[0].id, overrides?.model ?? responseModel, chunks[0].created, resolveStreamingUsageTokens(overrides, ""), overrides?.systemFingerprint) : void 0;
+			shapeORChunks(chunks, usageChunk, overrides);
+			const interruption = createInterruptionSignal(fixture);
+			if (!await writeSSEStream(res, chunks, {
+				latency,
+				streamingProfile: fixture.streamingProfile,
+				signal: interruption?.signal,
+				onChunkSent: interruption?.tick,
+				usageChunk,
+				recordedTimings: resolveRecordedTimings(chunks),
+				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
+				openRouterProcessing
+			})) {
+				if (!res.writableEnded) res.destroy();
+				entry.response.interrupted = true;
+				entry.response.interruptReason = interruption?.reason();
+			}
+			interruption?.cleanup();
+		}
+		return;
+	}
+	if (isCombinedFixtureResponse(response)) {
 		if (response.webSearches?.length) defaults.logger.warn("webSearches in fixture response are not supported for Chat Completions API — ignoring");
 		const overrides = extractOverrides(response);
 		const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
-		const effReasoning = resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
+		const effReasoning = appliedPlan ? appliedReasoning : resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const streaming = body.stream === true;
 		const blockOutcome = response.blocks && response.blocks.length > 0 ? resolveFixtureBlockOutcome(response.blocks) : void 0;
 		const journalEntry = journal.add({
@@ -1225,16 +1426,18 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				fixture
 			}
 		});
+		recordOutcome(journalEntry);
+		const toolCalls = requireEmittedFunctionToolCalls(response, wire);
 		if (!streaming) {
-			const completion = buildContentWithToolCallsCompletion(blockOutcome?.content ?? response.content ?? "", blockOutcome?.toolCalls ?? response.toolCalls ?? [], responseModel, effReasoning, blockOutcome ? {
+			const completion = buildContentWithToolCallsCompletion(blockOutcome?.content ?? response.content ?? "", blockOutcome?.toolCalls ?? toolCalls, responseModel, effReasoning, blockOutcome ? {
 				...overrides,
 				finishReason: overrides?.finishReason ?? (blockOutcome.hasToolCalls ? "tool_calls" : "stop")
 			} : overrides, body.messages);
 			res.writeHead(200, { "Content-Type": "application/json" });
 			res.end(JSON.stringify(shapeORCompletion(completion, overrides)));
 		} else {
-			const chunks = buildContentWithToolCallsChunks(blockOutcome?.content ?? response.content ?? "", blockOutcome?.toolCalls ?? response.toolCalls ?? [], responseModel, chunkSize, effReasoning, overrides, blockOutcome?.ordered);
-			const completionText = blockOutcome ? blockOutcome.content + blockOutcome.toolCalls.map((tc) => tc.name + tc.arguments).join("") : (response.content ?? "") + (response.toolCalls ?? []).map((tc) => tc.name + tc.arguments).join("");
+			const chunks = buildContentWithToolCallsChunks(blockOutcome?.content ?? response.content ?? "", blockOutcome?.toolCalls ?? toolCalls, responseModel, chunkSize, effReasoning, overrides, blockOutcome?.ordered);
+			const completionText = blockOutcome ? blockOutcome.content + blockOutcome.toolCalls.map((tc) => tc.name + tc.arguments).join("") : (response.content ?? "") + toolCalls.map((tc) => tc.name + tc.arguments).join("");
 			const usageChunk = emitStreamingUsage ? buildUsageChunk(chunks[0]?.id ?? "chatcmpl-unknown", overrides?.model ?? responseModel, chunks[0]?.created ?? Math.floor(Date.now() / 1e3), resolveStreamingUsageTokens(overrides, completionText), overrides?.systemFingerprint) : void 0;
 			shapeORChunks(chunks, usageChunk, overrides);
 			const interruption = createInterruptionSignal(fixture);
@@ -1244,7 +1447,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				signal: interruption?.signal,
 				onChunkSent: interruption?.tick,
 				usageChunk,
-				recordedTimings: fixture.recordedTimings,
+				recordedTimings: resolveRecordedTimings(chunks),
 				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
 				openRouterProcessing
 			})) {
@@ -1260,7 +1463,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		if (response.webSearches?.length) defaults.logger.warn("webSearches in fixture response are not supported for Chat Completions API — ignoring");
 		const overrides = extractOverrides(response);
 		const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
-		const effReasoning = resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
+		const effReasoning = appliedPlan ? appliedReasoning : resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
@@ -1271,6 +1474,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				fixture
 			}
 		});
+		recordOutcome(journalEntry);
 		if (body.stream !== true) {
 			const completion = buildTextCompletion(response.content, responseModel, effReasoning, overrides, body.messages);
 			res.writeHead(200, { "Content-Type": "application/json" });
@@ -1286,7 +1490,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				signal: interruption?.signal,
 				onChunkSent: interruption?.tick,
 				usageChunk,
-				recordedTimings: fixture.recordedTimings,
+				recordedTimings: resolveRecordedTimings(chunks),
 				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
 				openRouterProcessing
 			})) {
@@ -1302,7 +1506,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		if (response.webSearches?.length) defaults.logger.warn("webSearches in fixture response are not supported for Chat Completions API — ignoring");
 		const overrides = extractOverrides(response);
 		const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
-		const effReasoning = resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
+		const effReasoning = appliedPlan ? appliedReasoning : resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
@@ -1313,13 +1517,15 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				fixture
 			}
 		});
+		recordOutcome(journalEntry);
+		const toolCalls = requireServedFunctionToolCalls(response, wire);
 		if (body.stream !== true) {
-			const completion = buildToolCallCompletion(response.toolCalls, responseModel, effReasoning, overrides, body.messages);
+			const completion = buildToolCallCompletion(toolCalls, responseModel, effReasoning, overrides, body.messages);
 			res.writeHead(200, { "Content-Type": "application/json" });
 			res.end(JSON.stringify(shapeORCompletion(completion, overrides)));
 		} else {
-			const chunks = buildToolCallChunks(response.toolCalls, responseModel, chunkSize, effReasoning, overrides);
-			const completionText = response.toolCalls.map((tc) => tc.name + tc.arguments).join("");
+			const chunks = buildToolCallChunks(toolCalls, responseModel, chunkSize, effReasoning, overrides);
+			const completionText = toolCalls.map((tc) => tc.name + tc.arguments).join("");
 			const usageChunk = emitStreamingUsage ? buildUsageChunk(chunks[0]?.id ?? "chatcmpl-unknown", overrides?.model ?? responseModel, chunks[0]?.created ?? Math.floor(Date.now() / 1e3), resolveStreamingUsageTokens(overrides, completionText), overrides?.systemFingerprint) : void 0;
 			shapeORChunks(chunks, usageChunk, overrides);
 			const interruption = createInterruptionSignal(fixture);
@@ -1329,7 +1535,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				signal: interruption?.signal,
 				onChunkSent: interruption?.tick,
 				usageChunk,
-				recordedTimings: fixture.recordedTimings,
+				recordedTimings: resolveRecordedTimings(chunks),
 				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
 				openRouterProcessing
 			})) {
@@ -1341,7 +1547,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		}
 		return;
 	}
-	journal.add({
+	recordOutcome(journal.add({
 		method: req.method ?? "POST",
 		path: req.url ?? COMPLETIONS_PATH,
 		headers: flattenHeaders(req.headers),
@@ -1350,7 +1556,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			status: 500,
 			fixture
 		}
-	});
+	}));
 	writeErrorResponse(res, 500, openRouter ? serializeOpenRouterError(500, "Fixture response did not match any known type") : JSON.stringify({ error: {
 		message: "Fixture response did not match any known type",
 		type: "server_error"
@@ -1375,22 +1581,90 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 	}
 }
 /**
+* The journal as JSON. An entry names the caller's fixture; the JSON shows
+* the fixture the request was served from (`Journal.servedFixture`): an
+* extended server's view, with the held keys applied, or LLMock's
+* per-addition copy with misbehavior enabled. The journal therefore reads as
+* it did when the entries held those objects.
+*/
+function journalJson(entries, journal) {
+	if (!entries.some((entry) => journal.servedFixture(entry) !== entry.response.fixture)) return JSON.stringify(entries);
+	return JSON.stringify(entries.map((entry) => {
+		const fixture = entry.response.fixture;
+		let served = journal.servedFixture(entry);
+		if (served === fixture || !served) return entry;
+		const viewSource = responsesToolsViewSource(served);
+		if (viewSource !== served) served = responsesToolsExtendedView(viewSource);
+		return {
+			...entry,
+			response: {
+				...entry.response,
+				fixture: served
+			}
+		};
+	}));
+}
+/**
 * The server of `createServerWithResolvedAuth`, after the MCP fakes hand-off.
 * `commitHandOff` runs once the server listens; if it throws, the server is
 * closed and start rejects.
 */
 async function startServer(fixtures, options, resolvedAuth, mountList, logger, serviceFixtures, commitHandOff) {
+	const callerFixtures = fixtures;
+	let rawFixtureAddition = 0;
+	function ensureRawFixturePositions() {
+		const existingPositions = new Set(callerFixtures.map(getFixtureMisbehaviorPosition).filter((position) => position !== void 0));
+		for (const fixture of callerFixtures) {
+			if (getFixtureMisbehaviorPosition(fixture) !== void 0) continue;
+			let position;
+			do
+				position = `createServer#${rawFixtureAddition++}`;
+			while (existingPositions.has(position));
+			setFixtureMisbehaviorPosition(fixture, position);
+			existingPositions.add(position);
+		}
+	}
+	ensureRawFixturePositions();
 	const host = options?.host ?? "127.0.0.1";
 	const port = options?.port ?? 0;
 	const registry = options?.metrics ? createMetricsRegistry() : void 0;
 	const serverOptions = options ?? {};
+	const validResponsesTools = (mode) => mode === "legacy" || mode === "extended";
+	if (serverOptions.responsesTools !== void 0 && !validResponsesTools(serverOptions.responsesTools)) new Logger("warn").warn(`Ignoring responsesTools because it must be "legacy" or "extended", got ${JSON.stringify(serverOptions.responsesTools)}. Using "legacy".`);
+	fixtures = createServerFixtureList(callerFixtures, () => serverOptions.responsesTools, responsesToolsExtendedView);
 	const chaosByTestId = /* @__PURE__ */ new Map();
+	let misbehaviorBaseline;
+	const misbehavior = {
+		byTestId: /* @__PURE__ */ new Map(),
+		get baseline() {
+			return this.byTestId.get(DEFAULT_TEST_ID) ?? misbehaviorBaseline;
+		},
+		set baseline(config) {
+			misbehaviorBaseline = config;
+			if (config === void 0) this.byTestId.delete(DEFAULT_TEST_ID);
+			else if (this.byTestId.has(DEFAULT_TEST_ID)) this.byTestId.set(DEFAULT_TEST_ID, config);
+		}
+	};
+	const misbehaviorEnabled = serverOptions.enableMisbehavior === true;
+	if (misbehaviorEnabled) callerFixtures.forEach(enableHeldFixtureMisbehavior);
+	if (misbehaviorEnabled && serverOptions.misbehavior !== void 0) {
+		const parsed = parseMisbehavior(serverOptions.misbehavior);
+		if (!parsed.ok) throw new TypeError(`${parsed.issue.rule}: ${parsed.issue.message}`);
+		misbehavior.baseline = parsed.config.seed === "random" ? {
+			...parsed.config,
+			seed: resolveMisbehaviorSeed(parsed.config.seed, logger)
+		} : parsed.config;
+	}
 	const defaults = {
 		latency: serverOptions.latency ?? 0,
 		chunkSize: Math.max(1, serverOptions.chunkSize ?? DEFAULT_CHUNK_SIZE),
 		replaySpeed: serverOptions.replaySpeed ?? 1,
 		logger,
 		chaosByTestId,
+		misbehavior: misbehaviorEnabled ? misbehavior : void 0,
+		get misbehaviorCounters() {
+			return journal;
+		},
 		get chaos() {
 			return {
 				base: chaosByTestId.get(DEFAULT_TEST_ID) ?? serverOptions.chaos,
@@ -1413,6 +1687,13 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		get strict() {
 			return serverOptions.strict;
 		},
+		get strictToolArguments() {
+			return serverOptions.strictToolArguments;
+		},
+		get responsesTools() {
+			const mode = serverOptions.responsesTools;
+			return validResponsesTools(mode) ? mode : void 0;
+		},
 		get requestTransform() {
 			return serverOptions.requestTransform;
 		},
@@ -1503,6 +1784,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			if (req) ownJournalEntry.set(req, entry);
 		}
 	});
+	if (serverOptions.responsesTools === "extended") journal.configureFixtureViewSource(responsesToolsViewSource);
 	const videoStates = new VideoStateMap();
 	const openRouterVideoJobs = new OpenRouterVideoJobMap();
 	const veoVideoJobs = new VeoVideoJobMap();
@@ -1517,6 +1799,85 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		return status >= 400 && status < 500 ? "invalid_request_error" : "server_error";
 	}
 	/**
+	* Envelope for a fixture tool-call error (see isFixtureToolCallError: invalid
+	* JSON arguments on an object wire, a custom tool call on a non-Responses
+	* wire, or a malformed fixture tool call). It is the provider envelope aimock
+	* emits for that route, with the aimock `code` in it: Google's
+	* `google.rpc.ErrorInfo` detail on Gemini and Vertex AI, a string
+	* `error.code` on Gemini Interactions and Anthropic Messages, a `reason`
+	* member on Bedrock (a `code` member would replace `__type` as the AWS SDK's
+	* error name), and a sibling `code` on Ollama's bare string error. Every
+	* other route, Cohere included, gets the OpenAI-style
+	* `{error: {message, type, code}}`. OpenRouter routes pass their own
+	* `toolCallEnvelope` instead of using this one.
+	*/
+	function invalidToolArgumentsEnvelope(pathname, message, code) {
+		if (pathname === OLLAMA_CHAT_PATH) return JSON.stringify({
+			error: message,
+			code
+		});
+		if (pathname === GEMINI_INTERACTIONS_PATH) return JSON.stringify({ error: {
+			code,
+			message
+		} });
+		if (GEMINI_PATH_RE.test(pathname) || VERTEX_AI_RE.test(pathname)) return JSON.stringify({ error: {
+			code: 500,
+			message,
+			status: "INTERNAL",
+			details: googleFixtureToolCallErrorDetails(code)
+		} });
+		if (pathname === MESSAGES_PATH) return JSON.stringify({
+			type: "error",
+			error: {
+				type: "api_error",
+				code,
+				message
+			}
+		});
+		if (BEDROCK_INVOKE_RE.test(pathname) || BEDROCK_STREAM_RE.test(pathname) || BEDROCK_CONVERSE_RE.test(pathname) || BEDROCK_CONVERSE_STREAM_RE.test(pathname)) return JSON.stringify({
+			__type: "InternalServerException",
+			message,
+			reason: code
+		});
+		return JSON.stringify({ error: {
+			message,
+			type: "server_error",
+			code
+		} });
+	}
+	function invalidMisbehaviorHeaderEnvelope(pathname, detail) {
+		const code = "aimock_misbehavior_invalid";
+		const message = `${code}: ${detail}`;
+		if (pathname === OLLAMA_CHAT_PATH || pathname === OLLAMA_GENERATE_PATH) return JSON.stringify({ error: message });
+		if (pathname === COHERE_CHAT_PATH) return JSON.stringify({ message });
+		if (pathname === GEMINI_INTERACTIONS_PATH) return JSON.stringify({ error: {
+			code,
+			message
+		} });
+		if (GEMINI_PATH_RE.test(pathname) || VERTEX_AI_RE.test(pathname)) return JSON.stringify({ error: {
+			code: 400,
+			message,
+			status: "INVALID_ARGUMENT"
+		} });
+		if (pathname === MESSAGES_PATH) return JSON.stringify({
+			type: "error",
+			error: {
+				type: "invalid_request_error",
+				code,
+				message
+			}
+		});
+		if (BEDROCK_INVOKE_RE.test(pathname) || BEDROCK_STREAM_RE.test(pathname) || BEDROCK_CONVERSE_RE.test(pathname) || BEDROCK_CONVERSE_STREAM_RE.test(pathname)) return JSON.stringify({
+			__type: "ValidationException",
+			message
+		});
+		return JSON.stringify({ error: {
+			message,
+			type: "invalid_request_error",
+			code
+		} });
+	}
+	/**
 	* The newest journal entry this request already produced, or null.
 	*
 	* Attribution is by the identity of the `IncomingMessage` the entry was
@@ -1567,6 +1928,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 	function routeError(req, res, err, pathname, opts) {
 		const route = `${req.method ?? "?"} ${pathname}`;
 		const msg = err instanceof Error ? err.message : "Internal error";
+		const invalidToolArguments = isFixtureToolCallError(err);
 		const clientFault = err instanceof RequestBodyTooLargeError;
 		const clientAbort = clientAbortedMidBody(req, res, err);
 		const status = clientFault ? 400 : 500;
@@ -1607,8 +1969,10 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			return;
 		}
 		if (!res.headersSent) {
-			if (existing) existing.response.status = status;
-			else try {
+			if (existing) {
+				existing.response.status = status;
+				if (invalidToolArguments) existing.response.error = msg;
+			} else try {
 				journal.add({
 					method: req.method ?? "?",
 					path: req.url ?? "?",
@@ -1618,14 +1982,15 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 					response: {
 						status,
 						fixture: null,
-						source: "internal"
+						source: "internal",
+						...invalidToolArguments ? { error: msg } : {}
 					}
 				});
 			} catch (jErr) {
 				logger.warn(`${route}: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
 			}
 			setCorsHeaders(res);
-			writeErrorResponse(res, status, opts?.envelope ? opts.envelope(msg, status) : JSON.stringify({ error: {
+			writeErrorResponse(res, status, invalidToolArguments ? (opts?.toolCallEnvelope ?? ((m, c) => invalidToolArgumentsEnvelope(pathname, m, c)))(msg, fixtureToolCallErrorCode(err)) : opts?.envelope ? opts.envelope(msg, status) : JSON.stringify({ error: {
 				message: msg,
 				type: errorTypeForStatus(status)
 			} }));
@@ -1674,13 +2039,17 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (handler.setJournal) handler.setJournal(journal);
 		if (registry && handler.setRegistry) handler.setRegistry(registry);
 		if (handler.setLogger) handler.setLogger(logger);
+		if (handler instanceof MCPMock) handler.setReplaySpeed(defaults.replaySpeed);
 	}
 	if (registry) registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 	const server = http$1.createServer((req, res) => {
 		requestScope.run(req, () => {
-			handleHttpRequest(req, res).catch((err) => {
+			runWithToolArgumentsScope({
+				strict: defaults.strictToolArguments === true,
+				logger
+			}, () => handleHttpRequest(req, res).catch((err) => {
 				routeError(req, res, err, req.url ?? "?");
-			});
+			}));
 		});
 	});
 	async function handleHttpRequest(req, res) {
@@ -1763,16 +2132,40 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			markAuthenticatedRequest(req, resolvedAuth.policy);
 		}
 		if (pathname.startsWith(CONTROL_PREFIX)) {
+			ensureRawFixturePositions();
 			await handleControlAPI(req, res, pathname, parsedUrl.searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults, mountList);
 			return;
 		}
+		const misbehaviorHeader = defaults.misbehavior ? parseMisbehaviorHeader(req.headers["x-aimock-misbehavior"]) : void 0;
+		if (misbehaviorHeader && !misbehaviorHeader.ok) {
+			const detail = misbehaviorHeader.issue.message;
+			const message = `aimock_misbehavior_invalid: ${detail}`;
+			logger.error(`${req.method ?? "?"} ${pathname}: ${message}`);
+			journal.add({
+				method: req.method ?? "?",
+				path: req.url ?? pathname,
+				headers: flattenHeaders(req.headers),
+				body: null,
+				response: {
+					status: 400,
+					fixture: null,
+					source: "internal",
+					error: message
+				}
+			});
+			setCorsHeaders(res);
+			writeErrorResponse(res, 400, invalidMisbehaviorHeaderEnvelope(normalizeCompatPath(pathname), detail));
+			return;
+		}
 		for (const { path: mountPath, handler } of mountList) if (pathname === mountPath || pathname.startsWith(mountPath + "/")) {
 			const subPath = pathname.slice(mountPath.length) || "/";
 			if (await handler.handleRequest(req, res, subPath)) return;
 		}
 		if (pathname === OLLAMA_CHAT_PATH && req.method === "POST") {
 			try {
-				await handleOllama(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleOllama(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -1780,7 +2173,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === OLLAMA_GENERATE_PATH && req.method === "POST") {
 			try {
-				await handleOllamaGenerate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleOllamaGenerate(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -1788,7 +2183,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if ((pathname === OLLAMA_EMBEDDINGS_PATH || pathname === OLLAMA_EMBED_PATH) && req.method === "POST") {
 			try {
-				await handleOllamaEmbeddings(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleOllamaEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -1821,6 +2218,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === OPENROUTER_VIDEO_MODELS_PATH && req.method === "GET") {
 			try {
+				ensureRawFixturePositions();
 				await handleOpenRouterVideoModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -1830,6 +2228,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		const openRouterVideoStatusMatch = pathname.match(OPENROUTER_VIDEO_STATUS_RE);
 		if (openRouterVideoStatusMatch && req.method === "GET") {
 			try {
+				ensureRawFixturePositions();
 				await handleOpenRouterVideoStatus(req, res, openRouterVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -1839,7 +2238,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname === OPENROUTER_VIDEOS_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleOpenRouterVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleOpenRouterVideoCreate(req, res, raw, fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -1848,6 +2249,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		const bytePlusVideoStatusMatch = pathname.match(BYTEPLUS_VIDEO_STATUS_RE);
 		if (bytePlusVideoStatusMatch && req.method === "GET") {
 			try {
+				ensureRawFixturePositions();
 				await handleBytePlusVideoStatus(req, res, bytePlusVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -1857,13 +2259,16 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (BYTEPLUS_VIDEO_SUBMIT_RE.test(pathname) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleBytePlusVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleBytePlusVideoCreate(req, res, raw, fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
 			return;
 		}
 		if (pathname === OPENROUTER_MODELS_PATH && req.method === "GET") {
+			ensureRawFixturePositions();
 			handleOpenRouterModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			return;
 		}
@@ -2202,7 +2607,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 				}
 				const entries = journal.getAll(opts);
 				res.writeHead(200, { "Content-Type": "application/json" });
-				res.end(JSON.stringify(entries));
+				res.end(journalJson(entries, journal));
 				return;
 			}
 			if (req.method === "DELETE") {
@@ -2216,7 +2621,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === RESPONSES_PATH && req.method === "POST") {
 			try {
-				await handleResponses(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleResponses(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2224,7 +2631,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === MESSAGES_PATH && req.method === "POST") {
 			try {
-				await handleMessages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleMessages(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2232,7 +2641,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === COHERE_CHAT_PATH && req.method === "POST") {
 			try {
-				await handleCohere(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleCohere(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2240,7 +2651,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === COHERE_EMBED_PATH && req.method === "POST") {
 			try {
-				await handleCohereEmbed(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleCohereEmbed(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2260,6 +2673,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 				} catch (err) {
 					if (!(err instanceof SyntaxError)) defaults.logger.error(`Unexpected error in Azure model injection: ${err instanceof Error ? err.message : String(err)}`);
 				}
+				ensureRawFixturePositions();
 				await handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider, originalPathname === EMBEDDINGS_PATH);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2268,7 +2682,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === IMAGES_PATH && req.method === "POST") {
 			try {
-				await handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "openai", void 0, isBytePlusArk ? "byteplus" : void 0);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleImages(req, res, raw, fixtures, journal, defaults, setCorsHeaders, "openai", void 0, isBytePlusArk ? "byteplus" : void 0);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2276,7 +2692,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === IMAGES_EDIT_PATH && req.method === "POST") {
 			try {
-				await handleImageEdit(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleImageEdit(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2284,7 +2702,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === IMAGES_VARIATIONS_PATH && req.method === "POST") {
 			try {
-				await handleImageVariations(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleImageVariations(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2292,7 +2712,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === SPEECH_PATH && req.method === "POST") {
 			try {
-				await handleSpeech(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleSpeech(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2300,7 +2722,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === TRANSCRIPTIONS_PATH && req.method === "POST") {
 			try {
-				await handleTranscription(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleTranscription(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2308,7 +2732,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === TRANSLATIONS_PATH && req.method === "POST") {
 			try {
-				await handleTranscription(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "translation");
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleTranscription(req, res, raw, fixtures, journal, defaults, setCorsHeaders, "translation");
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2317,7 +2743,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname === GROK_VIDEO_SUBMIT_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleGrokVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, grokVideoJobs);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleGrokVideoCreate(req, res, raw, fixtures, journal, defaults, setCorsHeaders, grokVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2325,7 +2753,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === VIDEOS_PATH && req.method === "POST") {
 			try {
-				await handleVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, videoStates);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleVideoCreate(req, res, raw, fixtures, journal, defaults, setCorsHeaders, videoStates);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2334,6 +2764,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		const grokVideoStatusMatch = pathname.match(GROK_VIDEO_STATUS_RE);
 		if (grokVideoStatusMatch && grokVideoStatusMatch[1] !== "generations" && req.method === "GET") {
 			try {
+				ensureRawFixturePositions();
 				await handleGrokVideoStatus(req, res, grokVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, grokVideoJobs, videoStates);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2344,7 +2775,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (veoPredictMatch && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleVeoVideoCreate(req, res, await readBody(req), veoPredictMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleVeoVideoCreate(req, res, raw, veoPredictMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2353,6 +2786,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		const veoOperationMatch = pathname.match(VEO_OPERATION_RE);
 		if (veoOperationMatch && req.method === "GET") {
 			try {
+				ensureRawFixturePositions();
 				await handleVeoVideoStatus(req, res, veoOperationMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2363,7 +2797,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (geminiPredictMatch && req.method === "POST") {
 			const predictModel = geminiPredictMatch[1];
 			try {
-				await handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "gemini", predictModel);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleImages(req, res, raw, fixtures, journal, defaults, setCorsHeaders, "gemini", predictModel);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2371,7 +2807,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		if (pathname === GEMINI_INTERACTIONS_PATH && req.method === "POST") {
 			try {
-				await handleGeminiInteractions(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleGeminiInteractions(req, res, raw, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2381,7 +2819,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (geminiEmbedMatch && req.method === "POST") {
 			const embedModel = geminiEmbedMatch[1];
 			try {
-				await handleGeminiEmbedContent(req, res, await readBody(req), embedModel, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleGeminiEmbedContent(req, res, raw, embedModel, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2392,7 +2832,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			const geminiModel = geminiMatch[1];
 			const streaming = geminiMatch[2] === "streamGenerateContent";
 			try {
-				await handleGemini(req, res, await readBody(req), geminiModel, streaming, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleGemini(req, res, raw, geminiModel, streaming, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2403,7 +2845,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			const vertexModel = vertexMatch[1];
 			const streaming = vertexMatch[2] === "streamGenerateContent";
 			try {
-				await handleGemini(req, res, await readBody(req), vertexModel, streaming, fixtures, journal, defaults, setCorsHeaders, "vertexai");
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleGemini(req, res, raw, vertexModel, streaming, fixtures, journal, defaults, setCorsHeaders, "vertexai");
 			} catch (err) {
 				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
@@ -2413,7 +2857,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (bedrockMatch && req.method === "POST") {
 			const bedrockModelId = bedrockMatch[1];
 			try {
-				await handleBedrock(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleBedrock(req, res, raw, bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2423,7 +2869,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (bedrockStreamMatch && req.method === "POST") {
 			const bedrockModelId = bedrockStreamMatch[1];
 			try {
-				await handleBedrockStream(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleBedrockStream(req, res, raw, bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2433,7 +2881,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (converseMatch && req.method === "POST") {
 			const converseModelId = converseMatch[1];
 			try {
-				await handleConverse(req, res, await readBody(req), converseModelId, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleConverse(req, res, raw, converseModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2443,7 +2893,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (converseStreamMatch && req.method === "POST") {
 			const converseStreamModelId = converseStreamMatch[1];
 			try {
-				await handleConverseStream(req, res, await readBody(req), converseStreamModelId, fixtures, journal, defaults, setCorsHeaders);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleConverseStream(req, res, raw, converseStreamModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2476,7 +2928,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname === ELEVENLABS_SOUND_GENERATION_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleElevenLabsAudio(req, res, await readBody(req), fixtures, defaults, journal, "sound-generation");
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleElevenLabsAudio(req, res, raw, fixtures, defaults, journal, "sound-generation");
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2485,7 +2939,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname === ELEVENLABS_VOICE_DESIGN_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleElevenLabsVoiceDesign(req, res, await readBody(req), fixtures, defaults, journal);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleElevenLabsVoiceDesign(req, res, raw, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
 			}
@@ -2494,7 +2950,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname === ELEVENLABS_VOICE_CREATE_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleElevenLabsVoiceCreate(req, res, await readBody(req), fixtures, defaults, journal);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleElevenLabsVoiceCreate(req, res, raw, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
 			}
@@ -2525,8 +2983,13 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 				return;
 			}
 			try {
-				if (req.method === "GET") await handleElevenLabsVoiceGet(req, res, voiceId, fixtures, defaults, journal);
-				else await handleElevenLabsVoiceDelete(req, res, voiceId, fixtures, defaults, journal);
+				if (req.method === "GET") {
+					ensureRawFixturePositions();
+					await handleElevenLabsVoiceGet(req, res, voiceId, fixtures, defaults, journal);
+				} else {
+					ensureRawFixturePositions();
+					await handleElevenLabsVoiceDelete(req, res, voiceId, fixtures, defaults, journal);
+				}
 			} catch (err) {
 				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
 			}
@@ -2537,7 +3000,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			setCorsHeaders(res);
 			const voiceId = elevenLabsTTSMatch[1];
 			try {
-				await handleElevenLabsTTS(req, res, await readBody(req), fixtures, defaults, journal, voiceId);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleElevenLabsTTS(req, res, raw, fixtures, defaults, journal, voiceId);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2548,7 +3013,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			setCorsHeaders(res);
 			const musicSubType = musicMatch[1] ?? "music";
 			try {
-				await handleElevenLabsAudio(req, res, await readBody(req), fixtures, defaults, journal, musicSubType);
+				const raw = await readBody(req);
+				ensureRawFixturePositions();
+				await handleElevenLabsAudio(req, res, raw, fixtures, defaults, journal, musicSubType);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2579,6 +3046,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 						return;
 					}
 				}
+				ensureRawFixturePositions();
 				if (await handleFal(req, res, raw, pathname, fixtures, defaults, journal) === "handled") return;
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2588,7 +3056,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname.match(FAL_QUEUE_SUBMIT_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleFalQueue(req, res, falBody ?? await readBody(req), pathname, fixtures, defaults, journal);
+				const raw = falBody ?? await readBody(req);
+				ensureRawFixturePositions();
+				await handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2615,6 +3085,7 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 					}, "internal", defaults.registry, defaults.logger);
 					return;
 				}
+				ensureRawFixturePositions();
 				await handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2624,7 +3095,9 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		if (pathname.match(FAL_RUN_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
-				await handleFalQueue(req, res, falBody ?? await readBody(req), pathname, fixtures, defaults, journal);
+				const raw = falBody ?? await readBody(req);
+				ensureRawFixturePositions();
+				await handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -2642,13 +3115,14 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 		}
 		const completionsProvider = azureDeploymentId ? "azure" : isOpenRouter ? "openrouter" : isBytePlusArk ? "byteplus" : "openai";
 		try {
-			await handleCompletions(req, res, fixtures, journal, defaults, azureDeploymentId, completionsProvider, isOpenRouter);
+			await handleCompletions(req, res, fixtures, journal, defaults, () => lastJournalEntryFor(req), azureDeploymentId, completionsProvider, isOpenRouter, ensureRawFixturePositions, originalPathname.startsWith("/api/v3/"));
 		} catch (err) {
 			routeError(req, res, err, pathname, {
 				envelope: (m, status) => isOpenRouter ? serializeOpenRouterError(status, m) : JSON.stringify({ error: {
 					message: m,
 					type: errorTypeForStatus(status)
 				} }),
+				...isOpenRouter ? { toolCallEnvelope: (m, code) => serializeOpenRouterError(500, m, { reason: code }) } : {},
 				streamEvent: (m, status) => `data: ${isOpenRouter ? serializeOpenRouterError(status, m) : JSON.stringify({ error: {
 					message: m,
 					type: errorTypeForStatus(status)
@@ -2736,6 +3210,25 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			socket.destroy();
 			return;
 		}
+		if (defaults.misbehavior && pathname !== LIVE_PATH && req.headers["x-aimock-misbehavior"] !== void 0) {
+			const code = "aimock_misbehavior_invalid";
+			const message = "use the runtime scope: POST /__aimock/misbehavior with X-Test-Id";
+			const body = JSON.stringify({ error: pathname === GEMINI_LIVE_PATH ? {
+				code: 400,
+				status: "INVALID_ARGUMENT",
+				message: `${code}: ${message}`
+			} : {
+				type: "invalid_request_error",
+				code,
+				message
+			} });
+			socket.end(`HTTP/1.1 400 Bad Request\r
+Content-Type: application/json\r
+Content-Length: ${Buffer.byteLength(body)}\r\nConnection: close\r
+\r
+` + body);
+			return;
+		}
 		let liveId;
 		if (pathname === LIVE_PATH) {
 			if (req.method !== "GET" || parsedUrl.searchParams.has("model")) {
@@ -2797,7 +3290,8 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 			...defaults,
 			model: "gpt-4",
 			testId: wsTestId,
-			upgradeHeaders: req.headers
+			upgradeHeaders: req.headers,
+			beforeProcessMessage: ensureRawFixturePositions
 		});
 		else if (pathname === REALTIME_PATH) {
 			const transcriptionIntent = parsedUrl.searchParams.get("intent") === "transcription";
@@ -2807,13 +3301,15 @@ async function startServer(fixtures, options, resolvedAuth, mountList, logger, s
 				model,
 				transcriptionIntent,
 				testId: wsTestId,
-				upgradeHeaders: req.headers
+				upgradeHeaders: req.headers,
+				beforeProcessMessage: ensureRawFixturePositions
 			});
 		} else if (pathname === GEMINI_LIVE_PATH) handleWebSocketGeminiLive(ws, fixtures, journal, {
 			...defaults,
 			model: "gemini-2.0-flash",
 			testId: wsTestId,
-			upgradeHeaders: req.headers
+			upgradeHeaders: req.headers,
+			beforeProcessMessage: ensureRawFixturePositions
 		});
 	}
 	const originalClose = server.close.bind(server);