@copilotkit/aimock 1.43.0 → 1.45.0

package/dist/server.js

@@ -1,10 +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, 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 { 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";
@@ -37,6 +39,7 @@ import { handleSearch } from "./search.js";
 import { handleRerank } from "./rerank.js";
 import { handleModeration } from "./moderation.js";
 import { clearFineTuningStore, handleFineTuningCancel, handleFineTuningCreate, handleFineTuningEvents, handleFineTuningList, handleFineTuningRetrieve } from "./fine-tuning.js";
+import { clearVectorStoreStore, handleVectorFileBatchesCancel, handleVectorFileBatchesCreate, handleVectorFileBatchesFiles, handleVectorFileBatchesRetrieve, handleVectorStoreFilesCreate, handleVectorStoreFilesDelete, handleVectorStoreFilesList, handleVectorStoreFilesRetrieve, handleVectorStoresCreate, handleVectorStoresDelete, handleVectorStoresList, handleVectorStoresModify, handleVectorStoresRetrieve, handleVectorStoresSearch } from "./vector-stores.js";
 import { FILES_BODY_DRAIN_MAX_BYTES, FILES_BODY_MAX_BYTES, FILES_BODY_OVERSIZED, clearFileStore, handleFilesContent, handleFilesCreate, handleFilesDelete, handleFilesList, handleFilesRetrieve } from "./files.js";
 import { clearBatchStore, handleBatchesCancel, handleBatchesCreate, handleBatchesList, handleBatchesRetrieve } from "./batches.js";
 import { upgradeToWebSocket } from "./ws-framing.js";
@@ -44,41 +47,18 @@ import { handleLiveSession } from "./ws-live.js";
 import { handleWebSocketResponses } from "./ws-responses.js";
 import { handleWebSocketRealtime } from "./ws-realtime.js";
 import { handleWebSocketGeminiLive } from "./ws-gemini-live.js";
-import { BYTEPLUS_VIDEO_STATUS_RE, BYTEPLUS_VIDEO_SUBMIT_RE, DESTROYED_STATUS_LABEL, FAL_ROUTE_RE, FILES_CONTENT_RE, FILES_ID_RE, GROK_VIDEO_STATUS_RE, GROK_VIDEO_SUBMIT_PATH, OPENROUTER_VIDEO_CONTENT_RE, OPENROUTER_VIDEO_STATUS_RE, VEO_OPERATION_RE, VEO_PREDICT_LRO_RE, createMetricsRegistry, normalizePathLabel } from "./metrics.js";
+import { AZURE_DEPLOYMENT_RE, BATCHES_CANCEL_RE, BATCHES_ID_RE, BATCHES_PATH, BEDROCK_CONVERSE_RE, BEDROCK_CONVERSE_STREAM_RE, BEDROCK_INVOKE_RE, BEDROCK_STREAM_RE, BYTEPLUS_VIDEO_STATUS_RE, BYTEPLUS_VIDEO_SUBMIT_RE, COHERE_CHAT_PATH, COHERE_EMBED_PATH, COMPLETIONS_PATH, CONTROL_PREFIX, ELEVENLABS_MUSIC_RE, ELEVENLABS_SOUND_GENERATION_PATH, ELEVENLABS_TTS_RE, ELEVENLABS_VOICE_CREATE_PATH, ELEVENLABS_VOICE_DESIGN_PATH, ELEVENLABS_VOICE_RE, EMBEDDINGS_PATH, FAL_QUEUE_REQUESTS_RE, FAL_QUEUE_SUBMIT_RE, FAL_ROUTE_RE, FAL_RUN_RE, FILES_CONTENT_RE, FILES_ID_RE, FILES_PATH, FINE_TUNING_CANCEL_RE, FINE_TUNING_EVENTS_RE, FINE_TUNING_ID_RE, FINE_TUNING_JOBS_PATH, GEMINI_EMBED_RE, GEMINI_INTERACTIONS_PATH, GEMINI_LIVE_PATH, GEMINI_PATH_RE, GEMINI_PREDICT_RE, GROK_VIDEO_STATUS_RE, GROK_VIDEO_SUBMIT_PATH, HEALTH_PATH, IMAGES_EDIT_PATH, IMAGES_PATH, IMAGES_VARIATIONS_PATH, LIVE_PATH, MESSAGES_PATH, METRICS_PATH, MODELS_PATH, MODERATIONS_PATH, OLLAMA_CHAT_PATH, OLLAMA_EMBEDDINGS_PATH, OLLAMA_EMBED_PATH, OLLAMA_GENERATE_PATH, OLLAMA_TAGS_PATH, OPENROUTER_CREDITS_PATH, OPENROUTER_KEY_PATH, OPENROUTER_MODELS_PATH, OPENROUTER_VIDEOS_PATH, OPENROUTER_VIDEO_CONTENT_RE, OPENROUTER_VIDEO_MODELS_PATH, OPENROUTER_VIDEO_STATUS_RE, READY_PATH, REALTIME_PATH, REQUESTS_PATH, RERANK_PATH, RESPONSES_PATH, SEARCH_PATH, SPEECH_PATH, TRANSCRIPTIONS_PATH, TRANSLATIONS_PATH, VECTOR_STORES_BATCH_CANCEL_RE, VECTOR_STORES_BATCH_FILES_RE, VECTOR_STORES_BATCH_RE, VECTOR_STORES_FILES_RE, VECTOR_STORES_FILE_BATCHES_RE, VECTOR_STORES_FILE_RE, VECTOR_STORES_ID_RE, VECTOR_STORES_PATH, VECTOR_STORES_SEARCH_RE, VEO_OPERATION_RE, VEO_PREDICT_LRO_RE, VERTEX_AI_RE, VIDEOS_PATH, matchRouteDefinition } from "./route-registry.js";
+import { CATALOG_ROUTES, buildOpenApiDocument } from "./openapi.js";
+import { DESTROYED_STATUS_LABEL, createMetricsRegistry, normalizePathLabel } from "./metrics.js";
+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";
 
 //#region src/server.ts
 const liveClosers = /* @__PURE__ */ new WeakMap();
-const COMPLETIONS_PATH = "/v1/chat/completions";
-const RESPONSES_PATH = "/v1/responses";
-const LIVE_PATH = "/v1/live/sessions";
-const REALTIME_PATH = "/v1/realtime";
-const GEMINI_LIVE_PATH = "/ws/google.ai.generativelanguage.v1beta.GenerativeService.BidiGenerateContent";
-const MESSAGES_PATH = "/v1/messages";
-const EMBEDDINGS_PATH = "/v1/embeddings";
-const COHERE_CHAT_PATH = "/v2/chat";
-const COHERE_EMBED_PATH = "/v2/embed";
-const SEARCH_PATH = "/search";
-const RERANK_PATH = "/v2/rerank";
-const MODERATIONS_PATH = "/v1/moderations";
-const IMAGES_PATH = "/v1/images/generations";
-const IMAGES_EDIT_PATH = "/v1/images/edits";
-const IMAGES_VARIATIONS_PATH = "/v1/images/variations";
-const SPEECH_PATH = "/v1/audio/speech";
-const TRANSCRIPTIONS_PATH = "/v1/audio/transcriptions";
-const TRANSLATIONS_PATH = "/v1/audio/translations";
-const VIDEOS_PATH = "/v1/videos";
-const GEMINI_PREDICT_RE = /^\/v1beta\/models\/([^:]+):predict$/;
-const ELEVENLABS_SOUND_GENERATION_PATH = "/v1/sound-generation";
-const ELEVENLABS_TTS_RE = /^\/v1\/text-to-speech\/([^/]+)$/;
-const ELEVENLABS_MUSIC_RE = /^\/v1\/music(?:\/(.+))?$/;
-const ELEVENLABS_VOICE_DESIGN_PATH = "/v1/text-to-voice/design";
-const ELEVENLABS_VOICE_CREATE_PATH = "/v1/text-to-voice";
-const ELEVENLABS_VOICE_RE = /^\/v1\/voices\/([^/]+)$/;
-const FAL_QUEUE_SUBMIT_RE = /^\/fal\/queue\/submit\/(.+)$/;
-const FAL_QUEUE_REQUESTS_RE = /^\/fal\/queue\/requests\/(.+)$/;
-const FAL_RUN_RE = /^\/fal\/run\/(.+)$/;
 const DEFAULT_CHUNK_SIZE = 20;
 const COMPAT_SUFFIXES = [
 	"/chat/completions",
@@ -107,34 +87,6 @@ function normalizeCompatPath(pathname, logger) {
 	}
 	return pathname;
 }
-const GEMINI_INTERACTIONS_PATH = "/v1beta/interactions";
-const GEMINI_PATH_RE = /^\/v1beta\/models\/([^:]+):(generateContent|streamGenerateContent)$/;
-const GEMINI_EMBED_RE = /^\/v1beta\/models\/([^:]+):embedContent$/;
-const AZURE_DEPLOYMENT_RE = /^\/openai\/deployments\/([^/]+)\/(chat\/completions|embeddings)$/;
-const BEDROCK_INVOKE_RE = /^\/model\/([^/]+)\/invoke$/;
-const BEDROCK_STREAM_RE = /^\/model\/([^/]+)\/invoke-with-response-stream$/;
-const BEDROCK_CONVERSE_RE = /^\/model\/([^/]+)\/converse$/;
-const BEDROCK_CONVERSE_STREAM_RE = /^\/model\/([^/]+)\/converse-stream$/;
-const VERTEX_AI_RE = /^\/v1\/projects\/[^/]+\/locations\/[^/]+\/publishers\/google\/models\/([^/:]+):(generateContent|streamGenerateContent)$/;
-const OLLAMA_CHAT_PATH = "/api/chat";
-const OLLAMA_GENERATE_PATH = "/api/generate";
-const OLLAMA_EMBEDDINGS_PATH = "/api/embeddings";
-const OLLAMA_EMBED_PATH = "/api/embed";
-const OLLAMA_TAGS_PATH = "/api/tags";
-const OPENROUTER_VIDEOS_PATH = "/api/v1/videos";
-const OPENROUTER_VIDEO_MODELS_PATH = "/api/v1/videos/models";
-const HEALTH_PATH = "/health";
-const READY_PATH = "/ready";
-const MODELS_PATH = "/v1/models";
-const REQUESTS_PATH = "/v1/_requests";
-const BATCHES_PATH = "/v1/batches";
-const BATCHES_ID_RE = /^\/v1\/batches\/([^/]+)$/;
-const BATCHES_CANCEL_RE = /^\/v1\/batches\/([^/]+)\/cancel$/;
-const FILES_PATH = "/v1/files";
-const FINE_TUNING_JOBS_PATH = "/v1/fine_tuning/jobs";
-const FINE_TUNING_ID_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)$/;
-const FINE_TUNING_CANCEL_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/cancel$/;
-const FINE_TUNING_EVENTS_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/events$/;
 const DEFAULT_MODELS = [
 	"gpt-4",
 	"gpt-4o",
@@ -144,7 +96,7 @@ const DEFAULT_MODELS = [
 ];
 const CORS_HEADERS = {
 	"Access-Control-Allow-Origin": "*",
-	"Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
+	"Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
 	"Access-Control-Allow-Headers": "*",
 	"Access-Control-Expose-Headers": "X-Total-Count, X-Request-Id"
 };
@@ -163,7 +115,6 @@ function handleNotFound(res, message) {
 		type: "not_found"
 	} }));
 }
-const CONTROL_PREFIX = "/__aimock";
 /** The complete `GET /__aimock/fixtures` query-param vocabulary; anything else 400s. */
 const FIXTURES_PARAMS = new Set(["include"]);
 /** The complete `GET /__aimock/journal` query-param vocabulary; anything else 400s. */
@@ -202,6 +153,7 @@ function performFullReset(fixtures, targets) {
 	clearElevenLabsVoices();
 	clearFileStore();
 	clearFineTuningStore();
+	clearVectorStoreStore();
 	resetInteractionCounter();
 	resetEventIdCounter();
 	if (!targets) return;
@@ -209,11 +161,13 @@ 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();
 	targets.grokVideoJobs.clear();
 	targets.bytePlusVideoJobs.clear();
+	for (const { handler } of targets.mounts ?? []) handler.clearMcpFakes?.();
 	if (targets.defaults.registry) targets.defaults.registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 }
 /**
@@ -253,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";
@@ -268,9 +222,14 @@ function fixtureResponseKind(response) {
 * scoping path does not also do. (Splitting on "," additionally broke every
 * legitimately comma-bearing id.) A raw `path.includes("testId=t1")` both
 * prefix-collides with `t10` and matches unrelated params like `notTestId`.
+*
+* An MCP mount records the test id it resolved on the entry (I9, B3): a
+* decoded header or query value, or the one bound to the session at
+* `initialize`. That value wins; LLM entries carry none and are attributed as
+* before.
 */
 function journalEntryTestId(entry) {
-	return resolveTestId(entry.headers, entry.path);
+	return entry.testId ?? resolveTestId(entry.headers, entry.path);
 }
 /**
 * The testId a chaos override is stored under, and read back with — resolved by
@@ -309,19 +268,188 @@ function effectiveChaos(defaults, scopeId) {
 	if (!current) return {};
 	return isChaosScope(current) ? current.base ?? {} : current;
 }
+/** The `GET /__aimock/mcp/fakes` query-param vocabulary; anything else 400s. */
+const MCP_FAKES_PARAMS = new Set([
+	"testId",
+	"context",
+	"mount"
+]);
+/** A block's `mount` path, read without running getters; the add validates it. */
+function controlFakeMountOf(raw) {
+	if (typeof raw !== "object" || raw === null) return MCP_FAKES_DEFAULT_MOUNT;
+	const value = Object.getOwnPropertyDescriptor(raw, "mount")?.value;
+	return typeof value === "string" ? value : MCP_FAKES_DEFAULT_MOUNT;
+}
+/**
+* Check one `POST /__aimock/fixtures` `mcpFakes` value against the live
+* mounts (F10, W6) without changing anything. Returns every error in input
+* order (an empty list when the value can be added), and `apply`, which adds
+* the blocks (auto-mounting an MCPMock where no mount serves a block's path)
+* and returns the number of blocks added.
+*
+* The whole value is checked before any mount is touched, and the check
+* never adds to a real mount: each group is added to a throwaway store,
+* whose errors are the ones reported (it numbers the add `control-api#1`, as
+* a new mount would; for an existing MCPMock the rejected group is re-run on
+* its atomic add, so the errors name that mount's next `<n>`, I7). A group
+* whose path no request to it can reach (a mount that is not an MCPMock
+* serves it, an MCPMock answers it as its root, or it is under the control
+* prefix) is a mount conflict (one error per block).
+*/
+function planControlApiFakes(raw, mounts) {
+	const items = Array.isArray(raw) ? raw.map((block, position) => ({
+		position,
+		source: {
+			source: "control-api",
+			blockIndex: position,
+			raw: block
+		}
+	})) : [{
+		position: 0,
+		source: {
+			source: "control-api",
+			blockIndex: null,
+			raw
+		}
+	}];
+	const groups = /* @__PURE__ */ new Map();
+	if (items.length === 0) groups.set(MCP_FAKES_DEFAULT_MOUNT, {
+		path: MCP_FAKES_DEFAULT_MOUNT,
+		positions: [],
+		sources: []
+	});
+	for (const { position, source } of items) {
+		const path = controlFakeMountOf(source.raw);
+		const group = groups.get(path) ?? {
+			path,
+			positions: [],
+			sources: []
+		};
+		group.positions.push(position);
+		group.sources.push(source);
+		groups.set(path, group);
+	}
+	const found = [];
+	/** The paths `apply` auto-mounts, in order. */
+	const pending = [];
+	for (const group of groups.values()) {
+		const target = findFakeMount(mounts, group.path, pending);
+		if (target.kind === "conflict") {
+			group.positions.forEach((position) => {
+				const where = Array.isArray(raw) ? msg`mcpFakes[${position}]` : msg`mcpFakes`;
+				found.push({
+					position,
+					error: new FixtureLoadError({
+						rule: "mcp-fakes/mount-conflict",
+						file: null,
+						blockId: null,
+						entryId: null,
+						detail: msg`${where}: ${mountConflictDetail(group.path, target)}`
+					})
+				});
+			});
+			continue;
+		}
+		let failure = addFailure(() => new McpFakeStore().add(group.sources, { kind: "control-api" }));
+		if (target.kind === "none") pending.push(group.path);
+		if (!failure) continue;
+		if (target.kind === "mcp" && target.handler.addMcpFakes === MCPMock.prototype.addMcpFakes) {
+			const handler = target.handler;
+			failure = addFailure(() => handler.addMcpFakes?.(group.sources, { kind: "control-api" })) ?? failure;
+		}
+		for (const error of failure.errors) found.push({
+			position: positionOf(error, group),
+			error
+		});
+	}
+	found.sort((a, b) => a.position - b.position);
+	return {
+		errors: found.map((f) => f.error),
+		apply(wiring) {
+			let added = 0;
+			for (const group of groups.values()) {
+				const target = ensureFakeMount(mounts, group.path, {
+					journal: wiring.journal,
+					registry: wiring.defaults.registry,
+					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" });
+				for (const warning of result?.warnings ?? []) wiring.defaults.logger.warn(warning.message);
+				added += group.sources.length;
+			}
+			return added;
+		}
+	};
+}
+/** The `McpFakesAddError` that `add` throws, or `null` when it adds. */
+function addFailure(add) {
+	try {
+		add();
+		return null;
+	} catch (err) {
+		if (err instanceof McpFakesAddError) return err;
+		throw err;
+	}
+}
+/**
+* The request position of the block an add error names. The add numbers a
+* run-time group's blocks by their place in the group (`[<j>]`), or gives no
+* index to a single-object value; an error tied to no block sorts with the
+* group's first block.
+*/
+function positionOf(error, group) {
+	const first = group.positions[0] ?? 0;
+	if (error.blockId == null || error.file === null) return first;
+	const at = group.positions.findIndex((_, j) => error.blockId === blockIdOf(error.file ?? "", "", j));
+	return at === -1 ? first : group.positions[at];
+}
+function hasFakesSnapshot(handler) {
+	return "fakesSnapshot" in handler && typeof handler.fakesSnapshot === "function";
+}
+/**
+* `GET /__aimock/mcp/fakes` (spec 6.5, I9): for each MCP mount (or the one
+* named by `mount`), the blocks that apply to the requested test id and
+* context, with every entry id and its consumed state for that test id.
+* A mount is listed when it takes fakes (it implements `addMcpFakes`, the
+* check every other fakes path uses); one with no `fakesSnapshot` lists no
+* blocks.
+*/
+function listControlApiFakes(mounts, testId, context, mount) {
+	const listed = mounts.flatMap(({ path, handler }) => isFakeMount(handler) && (mount === null || path === mount) ? [{
+		mount: path,
+		blocks: hasFakesSnapshot(handler) ? handler.fakesSnapshot(testId, context) : []
+	}] : []);
+	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.
 */
-async function handleControlAPI(req, res, pathname, searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults) {
+async function handleControlAPI(req, res, pathname, searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults, mounts) {
 	if (!pathname.startsWith(CONTROL_PREFIX)) return false;
-	const subPath = pathname.slice(9);
+	const subPath = pathname.slice(CONTROL_PREFIX.length);
 	setCorsHeaders(res);
 	if (subPath === "/health" && req.method === "GET") {
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify({ status: "ok" }));
 		return true;
 	}
+	if (subPath === "/openapi.json" && req.method === "GET") {
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify(buildOpenApiDocument()));
+		return true;
+	}
+	if (subPath === "/routes" && req.method === "GET") {
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify({
+			count: CATALOG_ROUTES.length,
+			routes: CATALOG_ROUTES
+		}));
+		return true;
+	}
 	if (subPath === "/journal" && req.method === "GET") {
 		const bad = (message) => {
 			res.writeHead(400, { "Content-Type": "application/json" });
@@ -367,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") {
@@ -387,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);
@@ -472,6 +651,25 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 		res.end(JSON.stringify({ chaos: effectiveChaos(defaults, scopeId) }));
 		return true;
 	}
+	if (subPath === "/mcp/fakes" && req.method === "GET") {
+		const reply = (status, body) => {
+			res.writeHead(status, { "Content-Type": "application/json" });
+			res.end(JSON.stringify(body));
+			return true;
+		};
+		for (const key of searchParams.keys()) if (!MCP_FAKES_PARAMS.has(key)) return reply(400, { error: `Unknown query parameter: '${key}'. Supported: ${[...MCP_FAKES_PARAMS].join(", ")}` });
+		const testId = searchParams.get("testId") || null;
+		const context = searchParams.get("context") || null;
+		const mount = searchParams.get("mount") || null;
+		const listed = listControlApiFakes(mounts, testId, context, mount);
+		if (listed === null) return reply(404, { error: build(msg`No MCP mount at ${quote(mount ?? "")}`) });
+		return reply(200, {
+			testId,
+			context,
+			mounts: listed
+		});
+	}
+	if (subPath === "/mcp/fakes/report" && req.method === "GET") return handleFakesReportRoute(res, searchParams, mounts);
 	if (subPath === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
@@ -493,29 +691,82 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			res.end(JSON.stringify({ error: `Invalid JSON: ${msg}` }));
 			return true;
 		}
-		if (!Array.isArray(parsed.fixtures)) {
+		const withFakes = typeof parsed === "object" && parsed !== null && Object.hasOwn(parsed, "mcpFakes");
+		if (parsed === null || !Array.isArray(parsed.fixtures) && !(withFakes && parsed.fixtures === void 0)) {
 			res.writeHead(400, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({ error: "Missing or invalid \"fixtures\" array" }));
 			return true;
 		}
-		const converted = parsed.fixtures.map((e) => entryToFixture(e));
-		const errors = validateFixtures(converted).filter((i) => i.severity === "error");
-		if (errors.length > 0) {
+		const entries = Array.isArray(parsed.fixtures) ? parsed.fixtures : [];
+		const missingMatchIndex = entries.findIndex((entry) => entry !== null && typeof entry === "object" && !Array.isArray(entry) && entry.match == null);
+		if (missingMatchIndex !== -1) {
+			res.writeHead(400, { "Content-Type": "application/json" });
+			res.end(JSON.stringify({ error: `Fixture at index ${missingMatchIndex} is missing match` }));
+			return true;
+		}
+		const invalidMatchIndex = entries.findIndex((entry) => entry !== null && typeof entry === "object" && !Array.isArray(entry) && entry.match != null && (typeof entry.match !== "object" || Array.isArray(entry.match)));
+		if (invalidMatchIndex !== -1) {
+			res.writeHead(400, { "Content-Type": "application/json" });
+			res.end(JSON.stringify({ error: `Fixture at index ${invalidMatchIndex}: match must be an object` }));
+			return true;
+		}
+		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) => {
 			res.writeHead(400, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({
 				error: "Validation failed",
-				details: errors
+				details
 			}));
 			return true;
+		};
+		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({
+				journal,
+				defaults
+			});
+		} catch (err) {
+			if (!(err instanceof McpFakesAddError)) throw err;
+			return validationFailed(err.errors.map((e) => e.toJSON()));
 		}
 		fixtures.push(...converted);
 		if (defaults.registry) defaults.registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify({ added: converted.length }));
+		res.end(JSON.stringify(withFakes ? {
+			added: converted.length,
+			mcpFakesAdded
+		} : { added: converted.length }));
 		return true;
 	}
 	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" });
 		res.end(JSON.stringify({ cleared: true }));
@@ -528,7 +779,8 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 		veoVideoJobs,
 		grokVideoJobs,
 		bytePlusVideoJobs,
-		defaults
+		defaults,
+		mounts
 	});
 	if (subPath === "/reset" && req.method === "POST") {
 		performFullReset(fixtures, resetTargets());
@@ -630,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);
@@ -737,6 +990,51 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		} }));
 		return;
 	}
+	const nullMessageIndex = body.messages.findIndex((message) => message === null);
+	if (nullMessageIndex !== -1) {
+		const message = `Invalid request: messages[${nullMessageIndex}] must be an object`;
+		journal.add({
+			method: req.method ?? "POST",
+			path: req.url ?? COMPLETIONS_PATH,
+			headers: flattenHeaders(req.headers),
+			body: null,
+			response: {
+				status: 400,
+				fixture: null
+			}
+		});
+		writeErrorResponse(res, 400, openRouter ? serializeOpenRouterError(400, message) : JSON.stringify({ error: {
+			message,
+			type: "invalid_request_error",
+			param: null,
+			code: null
+		} }));
+		return;
+	}
+	if (new URL(req.url ?? COMPLETIONS_PATH, "http://localhost").pathname === COMPLETIONS_PATH) {
+		let toolsError = validateToolsField(body.tools);
+		if (!toolsError && Array.isArray(body.tools)) {
+			const nullFunctionIndex = body.tools.findIndex((tool) => tool?.function === null);
+			if (nullFunctionIndex !== -1) toolsError = `tools[${nullFunctionIndex}].function must not be null`;
+		}
+		if (toolsError) {
+			journal.add({
+				method: req.method ?? "POST",
+				path: req.url ?? COMPLETIONS_PATH,
+				headers: flattenHeaders(req.headers),
+				body: null,
+				response: {
+					status: 400,
+					fixture: null
+				}
+			});
+			writeErrorResponse(res, 400, JSON.stringify({ error: {
+				message: toolsError,
+				type: "invalid_request_error"
+			} }));
+			return;
+		}
+	}
 	const method = req.method ?? "POST";
 	const path = req.url ?? COMPLETIONS_PATH;
 	const flatHeaders = flattenHeaders(req.headers);
@@ -752,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;
@@ -835,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;
 	}
@@ -873,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) => {
@@ -915,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;
 			}
 		}
@@ -941,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);
 	};
@@ -960,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),
@@ -969,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),
@@ -983,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({
@@ -1007,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);
@@ -1026,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
 			})) {
@@ -1042,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,
@@ -1053,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" });
@@ -1068,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
 			})) {
@@ -1084,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,
@@ -1095,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);
@@ -1111,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
 			})) {
@@ -1123,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),
@@ -1132,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"
@@ -1146,18 +1570,101 @@ async function createServer(fixtures, options, mounts, serviceFixtures) {
 }
 /** @internal Config startup uses this to avoid parsing a selected auth source twice. */
 async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mounts, serviceFixtures) {
+	const logger = new Logger(options?.logLevel ?? "silent");
+	const mountList = mounts ?? [];
+	const handOff = serviceFixtures?.mcpFakes && serviceFixtures.mcpFakes.length > 0 ? handOffMcpFakes(mountList, serviceFixtures.mcpFakes, logger) : null;
+	try {
+		return await startServer(fixtures, options, resolvedAuth, mountList, logger, serviceFixtures, () => handOff?.commit());
+	} catch (err) {
+		handOff?.undo();
+		throw err;
+	}
+}
+/**
+* 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 logger = new Logger(options?.logLevel ?? "silent");
 	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,
@@ -1180,6 +1687,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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;
 		},
@@ -1270,6 +1784,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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();
@@ -1284,6 +1799,85 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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
@@ -1334,6 +1928,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 	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;
@@ -1374,8 +1969,10 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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 ?? "?",
@@ -1385,14 +1982,15 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 					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)
 			} }));
@@ -1437,16 +2035,21 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			else res.destroy();
 		}
 	}
-	if (mounts) for (const { handler } of mounts) {
+	for (const { handler } of mountList) {
 		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) {
@@ -1462,7 +2065,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (recorded) return;
 				recorded = true;
 				try {
-					const normalizedPath = normalizePathLabel(pathname, mounts ? mounts.map((m) => m.path) : []);
+					const normalizedPath = normalizePathLabel(pathname, mountList.map((m) => m.path));
 					const method = req.method ?? "UNKNOWN";
 					registry.incrementCounter("aimock_requests_total", {
 						method,
@@ -1483,7 +2086,36 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (!res.writableFinished) recordOutcome(DESTROYED_STATUS_LABEL);
 			});
 		}
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		let parsedUrl;
+		try {
+			parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		} catch (err) {
+			const route = `${req.method ?? "?"} ${req.url ?? "?"}`;
+			const msg = err instanceof Error ? err.message : "Internal error";
+			logger.error(`${route}: ${msg}`);
+			if (err instanceof Error && err.stack) logger.debug(err.stack);
+			try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: flattenHeaders(req.headers),
+					body: null,
+					response: {
+						status: 400,
+						fixture: null,
+						source: "internal"
+					}
+				});
+			} catch (jErr) {
+				logger.warn(`${route}: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
+			}
+			setCorsHeaders(res);
+			writeErrorResponse(res, 400, JSON.stringify({ error: {
+				message: "Invalid request target",
+				type: "invalid_request_error"
+			} }));
+			return;
+		}
 		pathname = parsedUrl.pathname;
 		const originalPathname = pathname;
 		const isOpenRouter = isOpenRouterPath(originalPathname);
@@ -1492,7 +2124,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			handleOptions(res);
 			return;
 		}
-		if (!(req.method === "GET" && (pathname === HEALTH_PATH || pathname === READY_PATH || pathname === "/metrics"))) {
+		if (!(req.method === "GET" && (pathname === HEALTH_PATH || pathname === READY_PATH || pathname === METRICS_PATH))) {
 			if (!validateRequestApiKey(req, resolvedAuth.policy).ok) {
 				writeApiKeyHttpRejection(res, setCorsHeaders);
 				return;
@@ -1500,18 +2132,40 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			markAuthenticatedRequest(req, resolvedAuth.policy);
 		}
 		if (pathname.startsWith(CONTROL_PREFIX)) {
-			await handleControlAPI(req, res, pathname, parsedUrl.searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults);
+			ensureRawFixturePositions();
+			await handleControlAPI(req, res, pathname, parsedUrl.searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults, mountList);
 			return;
 		}
-		if (mounts) {
-			for (const { path: mountPath, handler } of mounts) if (pathname === mountPath || pathname.startsWith(mountPath + "/")) {
-				const subPath = pathname.slice(mountPath.length) || "/";
-				if (await handler.handleRequest(req, res, subPath)) 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);
 			}
@@ -1519,7 +2173,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1527,7 +2183,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1560,6 +2218,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
@@ -1569,6 +2228,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
@@ -1578,7 +2238,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -1587,6 +2249,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
@@ -1596,21 +2259,24 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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 === "/api/v1/models" && req.method === "GET") {
+		if (pathname === OPENROUTER_MODELS_PATH && req.method === "GET") {
+			ensureRawFixturePositions();
 			handleOpenRouterModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			return;
 		}
-		if (pathname === "/api/v1/key" && req.method === "GET") {
+		if (pathname === OPENROUTER_KEY_PATH && req.method === "GET") {
 			handleOpenRouterKey(req, res, journal, setCorsHeaders);
 			return;
 		}
-		if (pathname === "/api/v1/credits" && req.method === "GET") {
+		if (pathname === OPENROUTER_CREDITS_PATH && req.method === "GET") {
 			handleOpenRouterCredits(req, res, journal, setCorsHeaders);
 			return;
 		}
@@ -1623,12 +2289,12 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		if (!azureDeploymentId) pathname = normalizeCompatPath(pathname, logger);
 		if (pathname === HEALTH_PATH && req.method === "GET") {
 			setCorsHeaders(res);
-			if (mounts && mounts.length > 0) {
+			if (mountList.length > 0) {
 				const services = { llm: {
 					status: "ok",
 					fixtures: fixtures.length
 				} };
-				for (const { path: mountPath, handler } of mounts) if (handler.health) {
+				for (const { path: mountPath, handler } of mountList) if (handler.health) {
 					const name = mountPath.replace(/^\//, "");
 					services[name] = handler.health();
 				}
@@ -1649,7 +2315,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			res.end(JSON.stringify({ status: "ready" }));
 			return;
 		}
-		if (pathname === "/metrics" && req.method === "GET") {
+		if (pathname === METRICS_PATH && req.method === "GET") {
 			if (!registry) {
 				handleNotFound(res, "Not found");
 				return;
@@ -1797,14 +2463,140 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
+		const vsSearchMatch = pathname.match(VECTOR_STORES_SEARCH_RE);
+		if (vsSearchMatch && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				await handleVectorStoresSearch(req, res, vsSearchMatch[1], raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchFilesMatch = pathname.match(VECTOR_STORES_BATCH_FILES_RE);
+		if (vsBatchFilesMatch && req.method === "GET") {
+			try {
+				await handleVectorFileBatchesFiles(req, res, vsBatchFilesMatch[1], vsBatchFilesMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchCancelMatch = pathname.match(VECTOR_STORES_BATCH_CANCEL_RE);
+		if (vsBatchCancelMatch && req.method === "POST") {
+			try {
+				await readBody(req);
+				await handleVectorFileBatchesCancel(req, res, vsBatchCancelMatch[1], vsBatchCancelMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchMatch = pathname.match(VECTOR_STORES_BATCH_RE);
+		if (vsBatchMatch && req.method === "GET") {
+			try {
+				await handleVectorFileBatchesRetrieve(req, res, vsBatchMatch[1], vsBatchMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsFileMatch = pathname.match(VECTOR_STORES_FILE_RE);
+		if (vsFileMatch && req.method === "GET") {
+			try {
+				await handleVectorStoreFilesRetrieve(req, res, vsFileMatch[1], vsFileMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsFileMatch && req.method === "DELETE") {
+			try {
+				await handleVectorStoreFilesDelete(req, res, vsFileMatch[1], vsFileMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsIdMatch = pathname.match(VECTOR_STORES_ID_RE);
+		if (vsIdMatch && req.method === "GET") {
+			try {
+				await handleVectorStoresRetrieve(req, res, vsIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsIdMatch && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				await handleVectorStoresModify(req, res, vsIdMatch[1], raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsIdMatch && req.method === "DELETE") {
+			try {
+				await handleVectorStoresDelete(req, res, vsIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				const storeId = pathname.split("/")[3];
+				await handleVectorStoreFilesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILES_RE.test(pathname) && req.method === "GET") {
+			try {
+				const storeId = pathname.split("/")[3];
+				await handleVectorStoreFilesList(req, res, storeId, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILE_BATCHES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				const storeId = pathname.split("/")[3];
+				await handleVectorFileBatchesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === VECTOR_STORES_PATH && req.method === "GET") {
+			try {
+				await handleVectorStoresList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === VECTOR_STORES_PATH && req.method === "POST") {
+			try {
+				await handleVectorStoresCreate(req, res, await readBody(req), journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
 		if (pathname === REQUESTS_PATH) {
 			setCorsHeaders(res);
 			if (req.method === "GET") {
 				const limitParam = parsedUrl.searchParams.get("limit");
 				let opts;
 				if (limitParam) {
-					const limit = parseInt(limitParam, 10);
-					if (Number.isNaN(limit) || limit <= 0) {
+					const limit = Number(limitParam);
+					if (!/^\+?\d+$/.test(limitParam.trim()) || !Number.isSafeInteger(limit) || limit <= 0) {
 						writeErrorResponse(res, 400, JSON.stringify({ error: {
 							message: `Invalid limit parameter: "${limitParam}"`,
 							type: "invalid_request_error"
@@ -1815,7 +2607,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				}
 				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") {
@@ -1829,7 +2621,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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` });
 			}
@@ -1837,7 +2631,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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` });
 			}
@@ -1845,7 +2641,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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` });
 			}
@@ -1853,7 +2651,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1873,7 +2673,8 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				} catch (err) {
 					if (!(err instanceof SyntaxError)) defaults.logger.error(`Unexpected error in Azure model injection: ${err instanceof Error ? err.message : String(err)}`);
 				}
-				await handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider);
+				ensureRawFixturePositions();
+				await handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider, originalPathname === EMBEDDINGS_PATH);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
@@ -1881,7 +2682,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1889,7 +2692,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1897,7 +2702,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1905,7 +2712,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1913,7 +2722,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1921,7 +2732,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1930,7 +2743,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -1938,7 +2753,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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);
 			}
@@ -1947,6 +2764,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
@@ -1957,7 +2775,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -1966,6 +2786,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
@@ -1976,7 +2797,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -1984,7 +2807,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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` });
 			}
@@ -1994,7 +2819,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2005,7 +2832,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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` });
 			}
@@ -2016,7 +2845,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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` });
 			}
@@ -2026,7 +2857,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2036,7 +2869,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2046,7 +2881,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2056,7 +2893,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2089,7 +2928,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2098,7 +2939,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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" });
 			}
@@ -2107,7 +2950,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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" });
 			}
@@ -2138,8 +2983,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				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" });
 			}
@@ -2150,7 +3000,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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);
 			}
@@ -2161,7 +3013,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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);
 			}
@@ -2192,6 +3046,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 						return;
 					}
 				}
+				ensureRawFixturePositions();
 				if (await handleFal(req, res, raw, pathname, fixtures, defaults, journal) === "handled") return;
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2201,7 +3056,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
@@ -2228,6 +3085,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 					}, "internal", defaults.registry, defaults.logger);
 					return;
 				}
+				ensureRawFixturePositions();
 				await handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
 			} catch (err) {
 				routeError(req, res, err, pathname);
@@ -2237,13 +3095,17 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		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);
 			}
 			return;
 		}
 		if (pathname !== COMPLETIONS_PATH) {
+			const catalogMatch = matchRouteDefinition(req.method ?? "", pathname);
+			if (catalogMatch && !(pathname === METRICS_PATH && !registry)) defaults.logger.warn(`Route drift: ${req.method ?? "?"} ${pathname} matches the route catalog (${catalogMatch.method} ${catalogMatch.path} — ${catalogMatch.description}) but no dispatcher branch served it. The catalog entry or the dispatcher is stale — see route-registry.ts.`);
 			handleNotFound(res, "Not found");
 			return;
 		}
@@ -2253,13 +3115,14 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 		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)
@@ -2323,17 +3186,23 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			server.emit("connection", socket);
 			return;
 		}
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		let parsedUrl;
+		try {
+			parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : "Internal error";
+			defaults.logger.warn(`Unhandled upgrade error: ${msg}`);
+			socket.end("HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n");
+			return;
+		}
 		let pathname = parsedUrl.pathname;
 		if (!validateRequestApiKey(req, resolvedAuth.policy).ok) {
 			writeApiKeyUpgradeRejection(socket);
 			return;
 		}
-		if (mounts) {
-			for (const { path: mountPath, handler } of mounts) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
-				const subPath = pathname.slice(mountPath.length) || "/";
-				if (await handler.handleUpgrade(socket, head, subPath)) return;
-			}
+		for (const { path: mountPath, handler } of mountList) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
+			const subPath = pathname.slice(mountPath.length) || "/";
+			if (await handler.handleUpgrade(socket, head, subPath)) return;
 		}
 		if (!pathname.match(AZURE_DEPLOYMENT_RE)) pathname = normalizeCompatPath(pathname, logger);
 		if (pathname !== RESPONSES_PATH && pathname !== REALTIME_PATH && pathname !== GEMINI_LIVE_PATH && pathname !== LIVE_PATH) {
@@ -2341,6 +3210,25 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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")) {
@@ -2402,7 +3290,8 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			...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";
@@ -2412,13 +3301,15 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				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);
@@ -2443,9 +3334,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				return;
 			}
 			const url = `http://${addr.address}:${addr.port}`;
-			if (mounts) {
-				for (const { path: mountPath, handler } of mounts) if (handler.setBaseUrl) handler.setBaseUrl(url + mountPath);
+			try {
+				commitHandOff();
+			} catch (err) {
+				server.close(() => reject(err));
+				return;
 			}
+			for (const { path: mountPath, handler } of mountList) if (handler.setBaseUrl) handler.setBaseUrl(url + mountPath);
 			resolve({
 				closeLiveSessions,
 				server,