@copilotkit/aimock 1.42.1 → 1.44.0

package/dist/server.js

@@ -1,15 +1,17 @@
 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 { buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, buildTextChunks, buildTextCompletion, buildToolCallChunks, buildToolCallCompletion, buildUsageChunk, extractOverrides, flattenHeaders, getContext, getTestId, isAudioResponse, isContentWithToolCallsResponse, isEmbeddingResponse, isErrorResponse, isImageResponse, isJSONResponse, isJsonObject, isResponseFactory, isTextResponse, isToolCallResponse, isTranscriptionResponse, isVideoResponse, readBody, resolveFixtureBlocks, resolveReasoningForModel, resolveResponse, resolveStrictMode, resolveUsage, serializeErrorResponse, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField } from "./helpers.js";
+import { RequestBodyTooLargeError, buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, buildTextChunks, buildTextCompletion, buildToolCallChunks, buildToolCallCompletion, buildUsageChunk, describeMatch, extractOverrides, flattenHeaders, getContext, getTestId, isAudioResponse, isContentWithToolCallsResponse, isEmbeddingResponse, isErrorResponse, isImageResponse, isJSONResponse, isJsonObject, isResponseFactory, isTextResponse, isToolCallResponse, isTranscriptionResponse, isVideoResponse, markMintedRequestId, readBody, readBodyBufferBounded, resolveFixtureBlockOutcome, resolveReasoningForModel, resolveRequestId, resolveResponse, resolveStrictMode, resolveTestId, resolveUsage, serializeErrorResponse, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField, validateToolsField, wouldProxyMiss } from "./helpers.js";
+import { normalizeLiveOptions } from "./live-fixture.js";
+import { writeErrorResponse, writeSSEStream } from "./sse-writer.js";
+import { CHAOS_FIELDS, CHAOS_FIELD_NAMES, applyChaosAction, awaitChaosLatency, describeUnwritableReason, evaluateChaos, isChaosScope, parseChaosField, resetChaosWarnings, resolveChaosConfig, responseGoneReason } from "./chaos.js";
+import { FixtureLoadError, INJECTED_STATUS_RANGE, claimOneShotError, clearFixtureQueue, entryToFixture, isInjectableStatus, isOneShotError, queueOneShotError, releaseOneShotError, validateFixtures } from "./fixture-loader.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
+import { proxyAndRecord } from "./recorder.js";
 import { Logger } from "./logger.js";
 import { Journal } from "./journal.js";
-import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
-import { INJECTED_STATUS_RANGE, entryToFixture, isInjectableStatus, validateFixtures } from "./fixture-loader.js";
-import { writeErrorResponse, writeSSEStream } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
 import { buildOpenRouterCandidates, handleOpenRouterCredits, handleOpenRouterKey, handleOpenRouterModels, isOpenRouterPath, resolveOpenRouterShaping, serializeOpenRouterError, shapeOpenRouterChunks, shapeOpenRouterCompletion } from "./openrouter-chat.js";
-import { applyChaosAction, evaluateChaos, isChaosScope } from "./chaos.js";
-import { proxyAndRecord } from "./recorder.js";
 import { handleResponses } from "./responses.js";
 import { handleMessages } from "./messages.js";
 import { handleGemini } from "./gemini.js";
@@ -23,51 +25,38 @@ import { handleImageEdit, handleImageVariations, handleImages } from "./images.j
 import { handleSpeech } from "./speech.js";
 import { VideoStateMap, handleVideoCreate } from "./video.js";
 import { falJobs, handleFalQueue } from "./fal-audio.js";
-import { falQueueStates, handleFal } from "./fal.js";
+import { falQueueStates, falWillHandle, handleFal } from "./fal.js";
 import { OPENROUTER_VIDEO_DEFAULT_MAX_CONTENT_BYTES, OpenRouterVideoJobMap, handleOpenRouterVideoContent, handleOpenRouterVideoCreate, handleOpenRouterVideoModels, handleOpenRouterVideoStatus } from "./openrouter-video.js";
 import { VeoVideoJobMap, handleVeoVideoCreate, handleVeoVideoStatus } from "./veo-video.js";
 import { GrokVideoJobMap, handleGrokVideoCreate, handleGrokVideoStatus } from "./grok-video.js";
 import { BytePlusVideoJobMap, handleBytePlusVideoCreate, handleBytePlusVideoStatus } from "./byteplus-video.js";
 import { handleElevenLabsAudio, handleElevenLabsTTS } from "./elevenlabs-audio.js";
+import { clearElevenLabsVoices, handleElevenLabsVoiceCreate, handleElevenLabsVoiceDelete, handleElevenLabsVoiceDesign, handleElevenLabsVoiceGet } from "./elevenlabs-voice.js";
 import { handleOllama, handleOllamaEmbeddings, handleOllamaGenerate } from "./ollama.js";
 import { handleCohere, handleCohereEmbed } from "./cohere.js";
 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";
+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, 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 * as http$1 from "node:http";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/server.ts
-const COMPLETIONS_PATH = "/v1/chat/completions";
-const RESPONSES_PATH = "/v1/responses";
-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 FAL_QUEUE_SUBMIT_RE = /^\/fal\/queue\/submit\/(.+)$/;
-const FAL_QUEUE_REQUESTS_RE = /^\/fal\/queue\/requests\/(.+)$/;
-const FAL_RUN_RE = /^\/fal\/run\/(.+)$/;
-const FAL_PREFIX_RE = /^\/fal(?:\/.*)?$/;
+const liveClosers = /* @__PURE__ */ new WeakMap();
 const DEFAULT_CHUNK_SIZE = 20;
 const COMPAT_SUFFIXES = [
 	"/chat/completions",
@@ -96,26 +85,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 DEFAULT_MODELS = [
 	"gpt-4",
 	"gpt-4o",
@@ -125,9 +94,9 @@ 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"
+	"Access-Control-Expose-Headers": "X-Total-Count, X-Request-Id"
 };
 function setCorsHeaders(res) {
 	for (const [key, value] of Object.entries(CORS_HEADERS)) res.setHeader(key, value);
@@ -144,7 +113,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. */
@@ -155,14 +123,18 @@ const JOURNAL_PARAMS = new Set([
 	"method",
 	"status",
 	"service",
-	"testId"
+	"testId",
+	"requestId"
 ]);
 /**
 * Perform a full reset: clear the fixtures array, the journal (entries *and*
 * per-test fixture match-counts, i.e. sequence position), the video and fal.ai
-* job/queue state, the Gemini interaction/event-id counters, and any runtime
-* chaos override (reverting to the construction-time chaos config), then
-* re-zero the `aimock_fixtures_loaded` gauge.
+* job/queue state, the fine-tuning store (jobs, their append-only event logs,
+* their poll counts, the create-time suffixes their model names are built from,
+* and the module's monotonic clock), the ElevenLabs Voice Design store, the
+* Gemini interaction/event-id counters, and any runtime chaos override
+* (reverting to the construction-time chaos config), then re-zero the
+* `aimock_fixtures_loaded` gauge.
 *
 * `targets` is `null` when no server is running (an in-process `reset()` before
 * `start()`). The process-global generation state is reset either way, since it
@@ -172,19 +144,27 @@ const JOURNAL_PARAMS = new Set([
 * `POST /__aimock/reset/fixtures` alias, and `LLMock.reset()`.
 */
 function performFullReset(fixtures, targets) {
-	fixtures.length = 0;
+	clearFixtureQueue(fixtures);
 	falJobs.clear();
 	falQueueStates.clear();
+	clearBatchStore();
+	clearElevenLabsVoices();
+	clearFileStore();
+	clearFineTuningStore();
+	clearVectorStoreStore();
 	resetInteractionCounter();
 	resetEventIdCounter();
 	if (!targets) return;
+	liveClosers.get(targets.defaults)?.();
 	targets.journal.clear();
+	resetChaosWarnings(targets.defaults.logger);
 	targets.defaults.chaos = void 0;
 	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);
 }
 /**
@@ -230,22 +210,23 @@ function fixtureResponseKind(response) {
 	return "unknown";
 }
 /**
-* Resolve a journal entry's testId exactly the way `getTestId` resolves an
-* incoming request's: the `X-Test-Id` header wins, then `?testId=` parsed out
-* of the query string, then `DEFAULT_TEST_ID`. The
-* filter and the server's own per-test isolation must never disagree — and a
-* raw `path.includes("testId=t1")` both prefix-collides with `t10` and matches
-* unrelated params like `notTestId`.
+* The testId a journal entry was scoped under — `resolveTestId` applied to the
+* journaled headers and path, i.e. the SAME function that scoped the request
+* (fixture match-counts, chaos) when it arrived. Node folds a repeated
+* `X-Test-Id` into one string ("a, a") before either side sees it, and the
+* request is counted and chaos-evaluated under that folded string, so the
+* `?testId=` filter matches it verbatim too: no token-splitting here that the
+* 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) {
-	const header = entry.headers["x-test-id"];
-	if (header) return header;
-	const qIdx = entry.path.indexOf("?");
-	if (qIdx !== -1) {
-		const queryValue = new URLSearchParams(entry.path.slice(qIdx + 1)).get("testId");
-		if (queryValue) return queryValue;
-	}
-	return DEFAULT_TEST_ID;
+	return entry.testId ?? resolveTestId(entry.headers, entry.path);
 }
 /**
 * The testId a chaos override is stored under, and read back with — resolved by
@@ -272,27 +253,198 @@ function writeBlankTestId(res) {
 	res.end(JSON.stringify({ error: "Invalid 'X-Test-Id': header is present but empty" }));
 	return true;
 }
-/** The chaos config in effect for one testId: its override, else the baseline. */
+/**
+* The chaos config in effect for one testId: its override, else the baseline —
+* one or the other, never the two merged. Mirrors `resolveScopedDefaults` in
+* chaos.ts, so what `GET /__aimock/chaos` reports for a scope is exactly what
+* that scope's traffic is evaluated against.
+*/
 function effectiveChaos(defaults, scopeId) {
-	const scoped = defaults.chaosByTestId?.get(scopeId);
-	if (scoped) return scoped;
+	if (defaults.chaosByTestId?.has(scopeId)) return defaults.chaosByTestId.get(scopeId) ?? {};
 	const current = defaults.chaos;
 	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
+				}, 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;
+}
 /**
 * 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" });
@@ -320,6 +472,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 		const methodFilter = searchParams.get("method");
 		const serviceFilter = searchParams.get("service");
 		const testIdFilter = searchParams.get("testId");
+		const requestIdFilter = searchParams.get("requestId");
 		let entries = journal.getAll();
 		if (methodFilter !== null) {
 			const want = methodFilter.toUpperCase();
@@ -329,6 +482,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 		if (statusFilter !== void 0) entries = entries.filter((e) => e.response.status === statusFilter);
 		if (serviceFilter !== null) entries = entries.filter((e) => e.service === serviceFilter);
 		if (testIdFilter !== null) entries = entries.filter((e) => journalEntryTestId(e) === testIdFilter);
+		if (requestIdFilter !== null) entries = entries.filter((e) => e.headers["x-request-id"] === requestIdFilter);
 		const total = entries.length;
 		if (offset > 0) entries = entries.slice(offset);
 		if (limit >= 0) entries = entries.slice(0, limit);
@@ -362,7 +516,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			fixtures: fixtures.map((fixture, index) => ({
 				index,
 				match: redactForInspection(fixture.match),
-				responseKind: fixtureResponseKind(fixture.response),
+				responseKind: isOneShotError(fixture) ? "error" : fixtureResponseKind(fixture.response),
 				...fixture.latency !== void 0 ? { latency: fixture.latency } : {},
 				...fixture.chaos !== void 0 ? { chaos: fixture.chaos } : {}
 			}))
@@ -412,32 +566,53 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 			res.end(JSON.stringify({ error: "Invalid body: expected a JSON object" }));
 			return true;
 		}
-		const allowed = [
-			"dropRate",
-			"malformedRate",
-			"disconnectRate"
-		];
-		for (const key of Object.keys(parsed)) if (!allowed.includes(key)) {
+		for (const key of Object.keys(parsed)) if (!CHAOS_FIELD_NAMES.includes(key)) {
 			res.writeHead(400, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({ error: `Unknown chaos field: '${key}'` }));
 			return true;
 		}
 		const next = {};
-		for (const key of allowed) {
+		for (const key of CHAOS_FIELD_NAMES) {
 			const value = parsed[key];
 			if (value === void 0) continue;
-			if (typeof value !== "number" || Number.isNaN(value) || value < 0 || value > 1) {
+			const accepted = typeof value === "number" ? parseChaosField(key, value) : void 0;
+			if (accepted === void 0) {
+				const shape = CHAOS_FIELDS[key].integer ? "a whole number of ms" : "a number";
 				res.writeHead(400, { "Content-Type": "application/json" });
-				res.end(JSON.stringify({ error: `Invalid '${key}': must be a number between 0 and 1` }));
+				res.end(JSON.stringify({ error: `Invalid '${key}': must be ${shape} between 0 and ${CHAOS_FIELDS[key].max}` }));
 				return true;
 			}
-			next[key] = value;
+			next[key] = accepted;
+		}
+		const shadowed = effectiveChaos(defaults, scopeId);
+		const droppedFields = Object.keys(shadowed).filter((key) => shadowed[key] !== void 0 && next[key] === void 0);
+		if (droppedFields.length > 0) {
+			const lost = droppedFields.map((key) => `${key}=${shadowed[key]}`).join(", ");
+			defaults.logger.warn(`[chaos] POST /__aimock/chaos (testId '${scopeId}') replaces the chaos config for this scope wholesale, it is not merged: ${lost} no longer applies here. Restate the field in the body to keep it.`);
 		}
 		defaults.chaosByTestId?.set(scopeId, next);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		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 === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
@@ -459,29 +634,60 @@ 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 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 converted = entries.map((e) => entryToFixture(e));
 		const errors = validateFixtures(converted).filter((i) => i.severity === "error");
-		if (errors.length > 0) {
+		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 (errors.length > 0 || fakeErrors.length > 0) return validationFailed([...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") {
-		fixtures.length = 0;
+		clearFixtureQueue(fixtures);
+		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 }));
@@ -494,7 +700,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());
@@ -575,32 +782,7 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 				}
 			}
 		}
-		const errorFixture = {
-			match: { predicate: () => true },
-			response: {
-				error: {
-					message: errorBody?.message ?? "Injected error",
-					type: errorBody?.type ?? "server_error",
-					code: errorBody?.code
-				},
-				status
-			}
-		};
-		fixtures.unshift(errorFixture);
-		let consumed = false;
-		const original = errorFixture.match.predicate;
-		errorFixture.match.predicate = (req) => {
-			if (consumed) return false;
-			const result = original(req);
-			if (result) {
-				consumed = true;
-				queueMicrotask(() => {
-					const idx = fixtures.indexOf(errorFixture);
-					if (idx !== -1) fixtures.splice(idx, 1);
-				});
-			}
-			return result;
-		};
+		queueOneShotError(fixtures, status, errorBody ?? void 0);
 		res.writeHead(200, { "Content-Type": "application/json" });
 		res.end(JSON.stringify({ queued: true }));
 		return true;
@@ -608,6 +790,19 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 	handleNotFound(res, `Unknown control endpoint: ${pathname}`);
 	return true;
 }
+/**
+* The client tore the connection down before its request body had fully
+* arrived. Node rejects the pending body read with `aborted` (ECONNRESET) and
+* destroys the response, so the rejection surfaces in the handler's read arm
+* looking like any other thrown error. It is caller behaviour, not a server
+* fault: no status can reach the client, so none must be journaled as
+* delivered. A body that blew its size cap also leaves the request destroyed
+* and incomplete, but that one is aimock's own decision, not a peer abort.
+*/
+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) {
 	setCorsHeaders(res);
 	let raw;
@@ -615,19 +810,43 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		raw = await readBody(req);
 	} catch (err) {
 		const msg = err instanceof Error ? err.message : "Failed to read request body";
+		const clientFault = err instanceof RequestBodyTooLargeError;
+		const route = `${req.method ?? "POST"} ${req.url ?? COMPLETIONS_PATH}`;
+		const clientAbort = clientAbortedMidBody(req, res, err);
+		const bodyLimitDisconnect = clientFault && (req.destroyed || res.destroyed);
+		if (clientAbort || bodyLimitDisconnect) {
+			const interruptReason = bodyLimitDisconnect ? "request body exceeded size limit" : "client aborted";
+			defaults.logger.warn(bodyLimitDisconnect ? `${route}: ${msg}` : `${route}: client aborted mid-body (${msg})`);
+			journal.add({
+				method: req.method ?? "POST",
+				path: req.url ?? COMPLETIONS_PATH,
+				headers: flattenHeaders(req.headers),
+				body: null,
+				response: {
+					status: 0,
+					fixture: null,
+					interrupted: true,
+					interruptReason
+				}
+			});
+			return;
+		}
+		const status = clientFault ? 400 : 500;
+		if (clientFault) defaults.logger.warn(`${route}: ${msg}`);
+		else defaults.logger.error(`${route}: ${msg}`);
 		journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
 			headers: flattenHeaders(req.headers),
 			body: null,
 			response: {
-				status: 500,
+				status,
 				fixture: null
 			}
 		});
-		writeErrorResponse(res, 500, openRouter ? serializeOpenRouterError(500, `Request body read failed: ${msg}`) : JSON.stringify({ error: {
+		writeErrorResponse(res, status, openRouter ? serializeOpenRouterError(status, `Request body read failed: ${msg}`) : JSON.stringify({ error: {
 			message: `Request body read failed: ${msg}`,
-			type: "server_error"
+			type: clientFault ? "invalid_request_error" : "server_error"
 		} }));
 		return;
 	}
@@ -691,6 +910,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);
@@ -703,7 +967,15 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	let preResolvedResponse = null;
 	let responseModel = body.model;
 	let fixtureCountIncremented = false;
-	if (openRouter && Array.isArray(body.models) && body.models.length > 0) {
+	const openRouterFallback = openRouter && Array.isArray(body.models) && body.models.length > 0;
+	const selectFixture = (probe, counts) => {
+		for (;;) {
+			const attempt = matchFixtureDiagnostic(fixtures, probe, counts, defaults.requestTransform, matchOptions);
+			if (attempt.fixture && isOneShotError(attempt.fixture) && !claimOneShotError(fixtures, attempt.fixture)) continue;
+			return attempt;
+		}
+	};
+	if (openRouterFallback) {
 		const candidates = buildOpenRouterCandidates(body);
 		let matchCounts = journal.getFixtureMatchCountsForTest(testId);
 		const allowFallbacks = body.provider?.allow_fallbacks !== false;
@@ -714,7 +986,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				...body,
 				model: candidate
 			};
-			const attempt = matchFixtureDiagnostic(fixtures, probe, matchCounts, defaults.requestTransform, matchOptions);
+			const attempt = selectFixture(probe, matchCounts);
 			skippedBySequenceOrTurn = Math.max(skippedBySequenceOrTurn, attempt.skippedBySequenceOrTurn);
 			if (!attempt.fixture) return null;
 			const response = await resolveResponse(attempt.fixture, probe);
@@ -751,35 +1023,48 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			preResolvedResponse = lastErrorResponse;
 		}
 	} else {
-		const single = matchFixtureDiagnostic(fixtures, body, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, matchOptions);
+		const single = selectFixture(body, journal.getFixtureMatchCountsForTest(testId));
 		fixture = single.fixture;
 		skippedBySequenceOrTurn = single.skippedBySequenceOrTurn;
 	}
 	if (fixture) {
 		if (!fixtureCountIncremented) journal.incrementFixtureMatchCount(fixture, fixtures, testId);
-		defaults.logger.debug(`Fixture matched: ${JSON.stringify(fixture.match).slice(0, 120)}`);
+		defaults.logger.debug(`Fixture matched: ${describeMatch(fixture.match, fixtures.indexOf(fixture))}`);
 	} else {
 		const lastUserMsg = body.messages.filter((m) => m.role === "user").pop();
 		const snippet = typeof lastUserMsg?.content === "string" ? lastUserMsg.content.slice(0, 80) : "";
 		defaults.logger.debug(`No fixture matched for request (model=${body.model ?? "?"}, msg="${snippet}")`);
 	}
-	const chaosAction = evaluateChaos(fixture, defaults.chaos, req.headers, defaults.logger, req.url);
+	const chaosConfig = resolveChaosConfig(fixture, defaults.chaos, req.headers, defaults.logger, req.url);
+	await awaitChaosLatency(fixture, defaults.chaos, req.headers, defaults.logger, req.url, res, chaosConfig);
+	const goneAfterLatency = responseGoneReason(res);
+	if (goneAfterLatency !== null) {
+		releaseOneShotError(fixtures, fixture);
+		defaults.logger.debug(`[chaos] ${method} ${path}: ${describeUnwritableReason(goneAfterLatency)} after the latency delay — not served, not journalled`);
+		return;
+	}
+	const chaosAction = evaluateChaos(fixture, defaults.chaos, req.headers, defaults.logger, req.url, chaosConfig);
 	const chaosContext = {
 		method,
 		path,
 		headers: flatHeaders,
 		body
 	};
-	if (chaosAction === "drop" || chaosAction === "disconnect") {
-		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, fixture ? "fixture" : "proxy", defaults.registry);
+	const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
+	const missWouldProxy = wouldProxyMiss(effectiveStrict, defaults.record, providerKey);
+	const noFixtureSource = missWouldProxy ? "proxy" : "internal";
+	if (chaosAction === "drop" || chaosAction === "disconnect" || chaosAction === "rateLimit") {
+		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, fixture ? "fixture" : noFixtureSource, defaults.registry, defaults.logger);
+		releaseOneShotError(fixtures, fixture);
 		return;
 	}
-	if (fixture && chaosAction === "malformed") {
-		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, "fixture", defaults.registry);
+	if (chaosAction === "malformed" && (fixture || !missWouldProxy)) {
+		applyChaosAction(chaosAction, res, fixture, journal, chaosContext, fixture ? "fixture" : "internal", defaults.registry, defaults.logger);
+		releaseOneShotError(fixtures, fixture);
 		return;
 	}
 	if (!fixture) {
-		if (resolveStrictMode(defaults.strict, req.headers)) {
+		if (effectiveStrict) {
 			const strictStatus = 503;
 			const strictMessage = strictNoMatchMessage(skippedBySequenceOrTurn);
 			defaults.logger.error(strictNoMatchLogLine(req.method ?? "POST", req.url ?? COMPLETIONS_PATH, skippedBySequenceOrTurn));
@@ -805,7 +1090,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		if (defaults.record && providerKey) {
 			const hookOptions = chaosAction === "malformed" ? {
 				beforeWriteResponse: () => {
-					applyChaosAction(chaosAction, res, null, journal, chaosContext, "proxy", defaults.registry);
+					applyChaosAction(chaosAction, res, null, journal, chaosContext, "proxy", defaults.registry, defaults.logger);
 					return true;
 				},
 				onHookBypassed: (reason) => {
@@ -817,9 +1102,22 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 					});
 				}
 			} : void 0;
-			const outcome = await proxyAndRecord(req, res, body, providerKey, req.url ?? COMPLETIONS_PATH, fixtures, defaults, raw, hookOptions);
+			let clientHungUp = false;
+			const noteClientHangUp = () => {
+				if (!res.writableEnded) clientHungUp = true;
+			};
+			req.socket?.on("end", noteClientHangUp);
+			req.socket?.on("error", noteClientHangUp);
+			let outcome;
+			try {
+				outcome = await proxyAndRecord(req, res, body, providerKey, req.url ?? COMPLETIONS_PATH, fixtures, defaults, raw, hookOptions);
+			} finally {
+				req.socket?.off("end", noteClientHangUp);
+				req.socket?.off("error", noteClientHangUp);
+			}
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
+				const destroyedMidStream = res.destroyed && !res.writableEnded;
 				journal.add({
 					method: req.method ?? "POST",
 					path: req.url ?? COMPLETIONS_PATH,
@@ -828,11 +1126,19 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...destroyedMidStream ? {
+							interrupted: true,
+							interruptReason: clientHungUp ? "client aborted" : "proxy stream destroyed"
+						} : {}
 					}
 				});
 				return;
 			}
+			if (chaosAction === "malformed") {
+				applyChaosAction(chaosAction, res, null, journal, chaosContext, "internal", defaults.registry, defaults.logger);
+				return;
+			}
 		}
 		journal.add({
 			method: req.method ?? "POST",
@@ -908,7 +1214,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const effectiveStrict = resolveStrictMode(defaults.strict, req.headers);
 		const effReasoning = resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const streaming = body.stream === true;
-		const streamingBlocks = streaming && response.blocks && response.blocks.length > 0 ? resolveFixtureBlocks(response.blocks) : void 0;
+		const blockOutcome = response.blocks && response.blocks.length > 0 ? resolveFixtureBlockOutcome(response.blocks) : void 0;
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
 			path: req.url ?? COMPLETIONS_PATH,
@@ -920,12 +1226,15 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			}
 		});
 		if (!streaming) {
-			const completion = buildContentWithToolCallsCompletion(response.content ?? "", response.toolCalls ?? [], responseModel, effReasoning, overrides, body.messages);
+			const completion = buildContentWithToolCallsCompletion(blockOutcome?.content ?? response.content ?? "", blockOutcome?.toolCalls ?? response.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(response.content ?? "", response.toolCalls ?? [], responseModel, chunkSize, effReasoning, overrides, streamingBlocks);
-			const completionText = streamingBlocks ? streamingBlocks.map((b) => b.type === "text" ? b.text : b.name + b.arguments).join("") : (response.content ?? "") + (response.toolCalls ?? []).map((tc) => tc.name + tc.arguments).join("");
+			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 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);
@@ -1055,9 +1364,24 @@ 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 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 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 chaosByTestId = /* @__PURE__ */ new Map();
@@ -1109,21 +1433,14 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		}
 	};
 	if (options?.chaos) {
-		const chaosRates = [
-			{
-				name: "dropRate",
-				value: options.chaos.dropRate
-			},
-			{
-				name: "malformedRate",
-				value: options.chaos.malformedRate
-			},
-			{
-				name: "disconnectRate",
-				value: options.chaos.disconnectRate
-			}
-		];
-		for (const { name, value } of chaosRates) if (value !== void 0 && (value < 0 || value > 1)) logger.warn(`Chaos ${name} (${value}) is outside 0-1 range — will be clamped at runtime`);
+		const chaosDefaults = options.chaos;
+		for (const field of CHAOS_FIELD_NAMES) {
+			const value = chaosDefaults[field];
+			if (value === void 0) continue;
+			if (typeof value === "number" && parseChaosField(field, value) !== void 0) continue;
+			const shape = CHAOS_FIELDS[field].integer ? "a whole number of ms" : "a number";
+			logger.warn(`Chaos default ${field} value ${JSON.stringify(value)} — must be ${shape} in [0,${CHAOS_FIELDS[field].max}]; rejected at runtime, never clamped: this default is ignored`);
+		}
 	}
 	for (const { name, config } of [
 		{
@@ -1169,67 +1486,276 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			if (basePath !== void 0 && /(^|\/)api\/v3\/?$/.test(basePath)) throw new Error(`record.providers.byteplus (${bytePlusBase}) ends in /api/v3, but aimock appends the /api/v3 prefix itself — every BytePlus request would go to /api/v3/api/v3/... and fail upstream. Configure the ORIGIN only (e.g. https://ark.ap-southeast.bytepluses.com).`);
 		}
 	}
+	/**
+	* The in-flight request, scoped to the async execution that serves it.
+	* Entered once in the `http.createServer` callback, so every handler —
+	* including the ones in other modules that only ever see the shared
+	* `journal` — runs inside it.
+	*/
+	const requestScope = new AsyncLocalStorage();
+	/** The journal entry each request produced, keyed by the request object. */
+	const ownJournalEntry = /* @__PURE__ */ new WeakMap();
 	const journal = new Journal({
 		maxEntries: options?.journalMaxEntries ?? 1e3,
-		fixtureCountsMaxTestIds: options?.fixtureCountsMaxTestIds ?? 500
+		fixtureCountsMaxTestIds: options?.fixtureCountsMaxTestIds ?? 500,
+		onAdd: (entry) => {
+			const req = requestScope.getStore();
+			if (req) ownJournalEntry.set(req, entry);
+		}
 	});
 	const videoStates = new VideoStateMap();
 	const openRouterVideoJobs = new OpenRouterVideoJobMap();
 	const veoVideoJobs = new VeoVideoJobMap();
 	const grokVideoJobs = new GrokVideoJobMap();
 	const bytePlusVideoJobs = new BytePlusVideoJobMap();
-	if (mounts) for (const { handler } of mounts) {
+	/**
+	* The OpenAI error `type` that goes with a status: 4xx is the caller's
+	* fault, everything else is ours. Shared by `routeError` and the envelopes
+	* it calls so the body can never disagree with the status line.
+	*/
+	function errorTypeForStatus(status) {
+		return status >= 400 && status < 500 ? "invalid_request_error" : "server_error";
+	}
+	/**
+	* The newest journal entry this request already produced, or null.
+	*
+	* Attribution is by the identity of the `IncomingMessage` the entry was
+	* written under — never by `x-request-id`. That header is CALLER-supplied
+	* (`resolveRequestId` echoes a well-formed one) and nothing makes it
+	* unique: a retry, a harness that pins one id, or a load generator sends
+	* the same id on many requests, and keying off it made a crash rewrite an
+	* EARLIER request's entry while leaving the crashing request untraced. The
+	* request object cannot be collided by a caller, so one entry belongs to
+	* exactly one request. A handler writes at most one entry; if it writes
+	* more, the newest wins, which is the entry the old scan would have found.
+	*/
+	function lastJournalEntryFor(req) {
+		return ownJournalEntry.get(req) ?? null;
+	}
+	/**
+	* Uniform terminal arm for a route handler that threw. Every route error
+	* path logs the route, journals the failure, sets CORS and answers the error
+	* envelope — so a handler crash is never invisible in the logs or in
+	* `/__aimock/journal`.
+	*
+	* ONE request produces ONE entry. `res.headersSent` is not the test for that:
+	* a handler that journaled its 200 and then threw before `writeHead` has
+	* sent no headers, and journaling again would leave two contradicting
+	* entries for one request. So the existing entry is looked up by request
+	* identity ({@link lastJournalEntryFor}) and AMENDED — status to what the
+	* client actually got when the response is still changeable, or interrupted
+	* when it isn't — and a fresh entry is
+	* added only when the handler journaled nothing. That holds after the
+	* response too: a handler that answered and then crashed before its own
+	* journal write gets an entry carrying the status already sent, so a
+	* post-response crash is never invisible.
+	*
+	* Once headers are on the wire the status can't change, so the socket is
+	* destroyed: a clean `end()` reads as EOF and the client treats a truncated
+	* stream as a complete response. The chat-style SSE routes whose clients
+	* surface an error frame pass `streamEvent`; that frame is written first,
+	* but the tear-down still follows it.
+	*
+	* A body that blew its size cap is the CALLER's fault, not a server fault:
+	* it logs at warn, but if the reader destroyed the socket it journals an
+	* interruption with status 0 because no 4xx reached the client. A client
+	* that hung up before its body arrived
+	* ({@link clientAbortedMidBody}) is not a fault at all: it logs at warn and
+	* journals a torn socket (`interrupted`, status 0), never a 500 the client
+	* could not have received.
+	*/
+	function routeError(req, res, err, pathname, opts) {
+		const route = `${req.method ?? "?"} ${pathname}`;
+		const msg = err instanceof Error ? err.message : "Internal error";
+		const clientFault = err instanceof RequestBodyTooLargeError;
+		const clientAbort = clientAbortedMidBody(req, res, err);
+		const status = clientFault ? 400 : 500;
+		if (clientAbort) logger.warn(`${route}: client aborted mid-body (${msg})`);
+		else if (clientFault) logger.warn(`${route}: ${msg}`);
+		else logger.error(`${route}: ${msg}`);
+		if (err instanceof Error && err.stack) logger.debug(err.stack);
+		const existing = lastJournalEntryFor(req);
+		const bodyLimitDisconnect = clientFault && (req.destroyed || res.destroyed);
+		if ((clientAbort || bodyLimitDisconnect) && !res.headersSent) {
+			const interruptReason = bodyLimitDisconnect ? "request body exceeded size limit" : "client aborted";
+			if (existing) {
+				if (!existing.response.interrupted) {
+					existing.response.status = 0;
+					existing.response.interrupted = true;
+					existing.response.interruptReason = interruptReason;
+				}
+				return;
+			}
+			try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: flattenHeaders(req.headers),
+					body: null,
+					...opts?.service ? { service: opts.service } : {},
+					response: {
+						status: 0,
+						fixture: null,
+						source: "internal",
+						interrupted: true,
+						interruptReason
+					}
+				});
+			} catch (jErr) {
+				logger.warn(`${route}: journal write failed after body-read interruption: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
+			}
+			return;
+		}
+		if (!res.headersSent) {
+			if (existing) existing.response.status = status;
+			else try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: flattenHeaders(req.headers),
+					body: null,
+					...opts?.service ? { service: opts.service } : {},
+					response: {
+						status,
+						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, status, opts?.envelope ? opts.envelope(msg, status) : JSON.stringify({ error: {
+				message: msg,
+				type: errorTypeForStatus(status)
+			} }));
+		} else {
+			const midStreamReason = clientAbort ? "client aborted" : "handler crashed mid-stream";
+			if (existing) {
+				if (res.writableEnded) {
+					if (existing.response.error === void 0) existing.response.error = msg;
+				} else if (!existing.response.interrupted) {
+					existing.response.interrupted = true;
+					existing.response.interruptReason = midStreamReason;
+				}
+			} else try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: flattenHeaders(req.headers),
+					body: null,
+					...opts?.service ? { service: opts.service } : {},
+					response: {
+						status: res.statusCode,
+						fixture: null,
+						source: "internal",
+						...res.writableEnded ? { error: msg } : {
+							interrupted: true,
+							interruptReason: midStreamReason
+						}
+					}
+				});
+			} catch (jErr) {
+				logger.warn(`${route}: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
+			}
+			if (res.writableEnded) return;
+			if (opts?.streamEvent) try {
+				res.write(opts.streamEvent(msg, status), () => {
+					if (!res.destroyed) res.destroy();
+				});
+			} catch (writeErr) {
+				logger.debug("Failed to write error recovery response:", writeErr);
+				res.destroy();
+			}
+			else res.destroy();
+		}
+	}
+	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 (registry) registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 	const server = http$1.createServer((req, res) => {
-		handleHttpRequest(req, res).catch((err) => {
-			const msg = err instanceof Error ? err.message : "Internal error";
-			const stack = err instanceof Error ? err.stack ?? msg : msg;
-			const method = req.method ?? "?";
-			const url = req.url ?? "?";
-			defaults.logger.warn(`Unhandled request error on ${method} ${url}: ${msg}\n${stack}`);
-			if (!res.headersSent) {
-				res.writeHead(500, { "Content-Type": "application/json" });
-				res.end(JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-			} else if (!res.writableEnded) res.end();
+		requestScope.run(req, () => {
+			handleHttpRequest(req, res).catch((err) => {
+				routeError(req, res, err, req.url ?? "?");
+			});
 		});
 	});
 	async function handleHttpRequest(req, res) {
 		const startTime = registry ? process.hrtime.bigint() : 0n;
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
-		let pathname = parsedUrl.pathname;
+		const { id: requestId, generated: requestIdMinted } = resolveRequestId(req.headers);
+		req.headers["x-request-id"] = requestId;
+		markMintedRequestId(req, requestIdMinted);
+		res.setHeader("X-Request-Id", requestId);
+		let pathname = "";
+		if (registry) {
+			let recorded = false;
+			const recordOutcome = (status) => {
+				if (recorded) return;
+				recorded = true;
+				try {
+					const normalizedPath = normalizePathLabel(pathname, mountList.map((m) => m.path));
+					const method = req.method ?? "UNKNOWN";
+					registry.incrementCounter("aimock_requests_total", {
+						method,
+						path: normalizedPath,
+						status
+					});
+					const elapsed = Number(process.hrtime.bigint() - startTime) / 1e9;
+					registry.observeHistogram("aimock_request_duration_seconds", {
+						method,
+						path: normalizedPath
+					}, elapsed);
+				} catch (err) {
+					defaults.logger.warn("metrics instrumentation error", err);
+				}
+			};
+			res.on("finish", () => recordOutcome(String(res.statusCode)));
+			res.on("close", () => {
+				if (!res.writableFinished) recordOutcome(DESTROYED_STATUS_LABEL);
+			});
+		}
+		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);
 		const isBytePlusArk = defaults.record?.providers.byteplus !== void 0 && originalPathname.startsWith("/api/v3/");
-		if (registry) res.on("finish", () => {
-			try {
-				const normalizedPath = normalizePathLabel(pathname);
-				const method = req.method ?? "UNKNOWN";
-				const status = String(res.statusCode);
-				registry.incrementCounter("aimock_requests_total", {
-					method,
-					path: normalizedPath,
-					status
-				});
-				const elapsed = Number(process.hrtime.bigint() - startTime) / 1e9;
-				registry.observeHistogram("aimock_request_duration_seconds", {
-					method,
-					path: normalizedPath
-				}, elapsed);
-			} catch (err) {
-				defaults.logger.warn("metrics instrumentation error", err);
-			}
-		});
 		if (req.method === "OPTIONS" && (!resolvedAuth.policy.enabled || req.headers.origin !== void 0 && req.headers["access-control-request-method"] !== void 0)) {
 			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;
@@ -1237,25 +1763,18 @@ 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);
+			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;
-			}
+		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);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1263,12 +1782,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOllamaGenerate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1276,12 +1790,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOllamaEmbeddings(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1306,28 +1815,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOpenRouterVideoContent(req, res, openRouterVideoContentMatch[1], journal, defaults, setCorsHeaders, openRouterVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`openrouter-video content: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`openrouter-video content: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1335,28 +1823,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOpenRouterVideoModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`openrouter-video models: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`openrouter-video models: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1365,28 +1832,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOpenRouterVideoStatus(req, res, openRouterVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`openrouter-video status: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`openrouter-video status: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1395,28 +1841,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleOpenRouterVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`openrouter-video submit: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "POST",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`openrouter-video submit: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1425,28 +1850,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleBytePlusVideoStatus(req, res, bytePlusVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`byteplus-video status: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`byteplus-video status: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1455,40 +1859,19 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleBytePlusVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`byteplus-video submit: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "POST",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`byteplus-video submit: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
-		if (pathname === "/api/v1/models" && req.method === "GET") {
+		if (pathname === OPENROUTER_MODELS_PATH && req.method === "GET") {
 			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;
 		}
@@ -1501,12 +1884,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();
 				}
@@ -1527,7 +1910,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;
@@ -1554,14 +1937,261 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}));
 			return;
 		}
+		const batchesCancelMatch = pathname.match(BATCHES_CANCEL_RE);
+		if (batchesCancelMatch && req.method === "POST") {
+			try {
+				await readBody(req);
+				await handleBatchesCancel(req, res, batchesCancelMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "batches" });
+			}
+			return;
+		}
+		const batchesIdMatch = pathname.match(BATCHES_ID_RE);
+		if (batchesIdMatch && req.method === "GET") {
+			try {
+				await handleBatchesRetrieve(req, res, batchesIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "batches" });
+			}
+			return;
+		}
+		if (pathname === BATCHES_PATH && req.method === "GET") {
+			try {
+				await handleBatchesList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "batches" });
+			}
+			return;
+		}
+		if (pathname === BATCHES_PATH && req.method === "POST") {
+			try {
+				await handleBatchesCreate(req, res, await readBody(req), journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "batches" });
+			}
+			return;
+		}
+		const filesContentMatch = pathname.match(FILES_CONTENT_RE);
+		if (filesContentMatch && req.method === "GET") {
+			try {
+				await handleFilesContent(req, res, filesContentMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "files" });
+			}
+			return;
+		}
+		const filesIdMatch = pathname.match(FILES_ID_RE);
+		if (filesIdMatch && req.method === "GET") {
+			try {
+				await handleFilesRetrieve(req, res, filesIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "files" });
+			}
+			return;
+		}
+		if (filesIdMatch && req.method === "DELETE") {
+			try {
+				await handleFilesDelete(req, res, filesIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "files" });
+			}
+			return;
+		}
+		if (pathname === FILES_PATH && req.method === "GET") {
+			try {
+				await handleFilesList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "files" });
+			}
+			return;
+		}
+		if (pathname === FILES_PATH && req.method === "POST") {
+			try {
+				await handleFilesCreate(req, res, (await readBodyBufferBounded(req, FILES_BODY_MAX_BYTES, FILES_BODY_DRAIN_MAX_BYTES)).buffer ?? FILES_BODY_OVERSIZED, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "files" });
+			}
+			return;
+		}
+		const ftCancelMatch = pathname.match(FINE_TUNING_CANCEL_RE);
+		if (ftCancelMatch && req.method === "POST") {
+			try {
+				await readBody(req);
+				await handleFineTuningCancel(req, res, ftCancelMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "fine-tuning" });
+			}
+			return;
+		}
+		const ftEventsMatch = pathname.match(FINE_TUNING_EVENTS_RE);
+		if (ftEventsMatch && req.method === "GET") {
+			try {
+				await handleFineTuningEvents(req, res, ftEventsMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "fine-tuning" });
+			}
+			return;
+		}
+		const ftIdMatch = pathname.match(FINE_TUNING_ID_RE);
+		if (ftIdMatch && req.method === "GET") {
+			try {
+				await handleFineTuningRetrieve(req, res, ftIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "fine-tuning" });
+			}
+			return;
+		}
+		if (pathname === FINE_TUNING_JOBS_PATH && req.method === "GET") {
+			try {
+				await handleFineTuningList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "fine-tuning" });
+			}
+			return;
+		}
+		if (pathname === FINE_TUNING_JOBS_PATH && req.method === "POST") {
+			try {
+				await handleFineTuningCreate(req, res, await readBody(req), journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "fine-tuning" });
+			}
+			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"
@@ -1588,17 +2218,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleResponses(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1606,17 +2226,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleMessages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1624,17 +2234,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleCohere(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`event: error\ndata: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `event: error\ndata: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1642,12 +2242,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleCohereEmbed(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1665,14 +2260,9 @@ 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);
+				await handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider, originalPathname === EMBEDDINGS_PATH);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1680,12 +2270,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "openai", void 0, isBytePlusArk ? "byteplus" : void 0);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1693,12 +2278,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleImageEdit(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1706,12 +2286,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleImageVariations(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1719,12 +2294,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleSpeech(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1732,12 +2302,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleTranscription(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1745,12 +2310,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleTranscription(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "translation");
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1759,28 +2319,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGrokVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, grokVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`grok-video submit: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "POST",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`grok-video submit: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1788,12 +2327,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleVideoCreate(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, videoStates);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1802,28 +2336,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGrokVideoStatus(req, res, grokVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, grokVideoJobs, videoStates);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`grok-video status: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`grok-video status: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1833,28 +2346,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleVeoVideoCreate(req, res, await readBody(req), veoPredictMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`veo-video submit: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "POST",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`veo-video submit: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1863,28 +2355,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleVeoVideoStatus(req, res, veoOperationMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				defaults.logger.error(`veo-video status: ${msg}`);
-				if (!res.headersSent) {
-					try {
-						journal.add({
-							method: req.method ?? "GET",
-							path: req.url ?? pathname,
-							headers: flattenHeaders(req.headers),
-							body: null,
-							response: {
-								status: 500,
-								fixture: null
-							}
-						});
-					} catch (jErr) {
-						defaults.logger.warn(`veo-video status: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
-					}
-					writeErrorResponse(res, 500, JSON.stringify({ error: {
-						message: msg,
-						type: "server_error"
-					} }));
-				} else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1894,12 +2365,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleImages(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders, "gemini", predictModel);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1907,17 +2373,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGeminiInteractions(req, res, await readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1927,12 +2383,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGeminiEmbedContent(req, res, await readBody(req), embedModel, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1943,17 +2394,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGemini(req, res, await readBody(req), geminiModel, streaming, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1964,17 +2405,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleGemini(req, res, await readBody(req), vertexModel, streaming, fixtures, journal, defaults, setCorsHeaders, "vertexai");
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) try {
-					res.write(`data: ${JSON.stringify({ error: { message: msg } })}\n\n`);
-					res.end();
-				} catch (writeErr) {
-					logger.debug("Failed to write error recovery response:", writeErr);
-				}
+				routeError(req, res, err, pathname, { streamEvent: (m) => `data: ${JSON.stringify({ error: { message: m } })}\n\n` });
 			}
 			return;
 		}
@@ -1984,12 +2415,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleBedrock(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -1999,12 +2425,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleBedrockStream(req, res, await readBody(req), bedrockModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2014,12 +2435,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleConverse(req, res, await readBody(req), converseModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2029,12 +2445,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleConverseStream(req, res, await readBody(req), converseStreamModelId, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2042,12 +2453,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleSearch(req, res, await readBody(req), serviceFixtures?.search ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname, { service: "search" });
 			}
 			return;
 		}
@@ -2055,12 +2461,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleRerank(req, res, await readBody(req), serviceFixtures?.rerank ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname, { service: "rerank" });
 			}
 			return;
 		}
@@ -2068,12 +2469,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleModeration(req, res, await readBody(req), serviceFixtures?.moderation ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname, { service: "moderation" });
 			}
 			return;
 		}
@@ -2082,12 +2478,57 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleElevenLabsAudio(req, res, await readBody(req), fixtures, defaults, journal, "sound-generation");
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
+				routeError(req, res, err, pathname);
+			}
+			return;
+		}
+		if (pathname === ELEVENLABS_VOICE_DESIGN_PATH && req.method === "POST") {
+			setCorsHeaders(res);
+			try {
+				await handleElevenLabsVoiceDesign(req, res, await readBody(req), fixtures, defaults, journal);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
+			}
+			return;
+		}
+		if (pathname === ELEVENLABS_VOICE_CREATE_PATH && req.method === "POST") {
+			setCorsHeaders(res);
+			try {
+				await handleElevenLabsVoiceCreate(req, res, await readBody(req), fixtures, defaults, journal);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
+			}
+			return;
+		}
+		const elevenLabsVoiceMatch = pathname.match(ELEVENLABS_VOICE_RE);
+		if (elevenLabsVoiceMatch && (req.method === "GET" || req.method === "DELETE")) {
+			setCorsHeaders(res);
+			let voiceId;
+			try {
+				voiceId = decodeURIComponent(elevenLabsVoiceMatch[1]);
+			} catch {
+				writeErrorResponse(res, 400, JSON.stringify({ error: {
+					message: `Invalid voice id '${elevenLabsVoiceMatch[1]}': malformed percent-encoding`,
+					type: "invalid_request_error"
 				} }));
-				else if (!res.writableEnded) res.destroy();
+				journal.add({
+					method: req.method ?? "GET",
+					path: req.url ?? pathname,
+					headers: flattenHeaders(req.headers),
+					service: "elevenlabs-voice",
+					body: null,
+					response: {
+						status: 400,
+						fixture: null
+					}
+				});
+				return;
+			}
+			try {
+				if (req.method === "GET") await handleElevenLabsVoiceGet(req, res, voiceId, fixtures, defaults, journal);
+				else await handleElevenLabsVoiceDelete(req, res, voiceId, fixtures, defaults, journal);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "elevenlabs-voice" });
 			}
 			return;
 		}
@@ -2098,12 +2539,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleElevenLabsTTS(req, res, await readBody(req), fixtures, defaults, journal, voiceId);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2114,42 +2550,38 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleElevenLabsAudio(req, res, await readBody(req), fixtures, defaults, journal, musicSubType);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
 		let falBody;
-		if (FAL_PREFIX_RE.test(pathname) && req.headers["x-fal-target-host"]) {
+		if (FAL_ROUTE_RE.test(pathname) && req.headers["x-fal-target-host"]) {
 			setCorsHeaders(res);
 			try {
 				falBody = req.method === "POST" || req.method === "PUT" ? await readBody(req) : "";
 				const raw = falBody;
-				const chaosAction = evaluateChaos(null, defaults.chaos, req.headers, defaults.logger, req.url);
-				if (chaosAction) {
-					applyChaosAction(chaosAction, res, null, journal, {
-						method: req.method ?? "GET",
-						path: pathname,
-						headers: flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
-					return;
+				if (falWillHandle(req, pathname)) {
+					const chaosConfig = resolveChaosConfig(null, defaults.chaos, req.headers, defaults.logger, req.url);
+					await awaitChaosLatency(null, defaults.chaos, req.headers, defaults.logger, req.url, res, chaosConfig);
+					const goneAfterLatency = responseGoneReason(res);
+					if (goneAfterLatency !== null) {
+						defaults.logger.debug(`[chaos] ${req.method ?? "GET"} ${pathname}: ${describeUnwritableReason(goneAfterLatency)} after the latency delay — not served, not journalled`);
+						return;
+					}
+					const chaosAction = evaluateChaos(null, defaults.chaos, req.headers, defaults.logger, req.url, chaosConfig);
+					if (chaosAction) {
+						applyChaosAction(chaosAction, res, null, journal, {
+							method: req.method ?? "GET",
+							path: pathname,
+							headers: flattenHeaders(req.headers),
+							body: null
+						}, "internal", defaults.registry, defaults.logger);
+						return;
+					}
 				}
 				if (await handleFal(req, res, raw, pathname, fixtures, defaults, journal) === "handled") return;
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 				return;
 			}
 		}
@@ -2158,12 +2590,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleFalQueue(req, res, falBody ?? await readBody(req), pathname, fixtures, defaults, journal);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2171,27 +2598,26 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			setCorsHeaders(res);
 			try {
 				const raw = req.method === "POST" || req.method === "PUT" ? falBody ?? await readBody(req) : "{}";
-				const chaosAction = evaluateChaos(null, defaults.chaos, req.headers, defaults.logger, req.url);
+				const chaosConfig = resolveChaosConfig(null, defaults.chaos, req.headers, defaults.logger, req.url);
+				await awaitChaosLatency(null, defaults.chaos, req.headers, defaults.logger, req.url, res, chaosConfig);
+				const goneAfterLatency = responseGoneReason(res);
+				if (goneAfterLatency !== null) {
+					defaults.logger.debug(`[chaos] ${req.method ?? "GET"} ${pathname}: ${describeUnwritableReason(goneAfterLatency)} after the latency delay — not served, not journalled`);
+					return;
+				}
+				const chaosAction = evaluateChaos(null, defaults.chaos, req.headers, defaults.logger, req.url, chaosConfig);
 				if (chaosAction) {
 					applyChaosAction(chaosAction, res, null, journal, {
 						method: req.method ?? "GET",
 						path: pathname,
 						headers: flattenHeaders(req.headers),
-						body: {
-							model: "",
-							messages: []
-						}
-					}, "fixture", defaults.registry);
+						body: null
+					}, "internal", defaults.registry, defaults.logger);
 					return;
 				}
 				await handleFalQueue(req, res, raw, pathname, fixtures, defaults, journal);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				routeError(req, res, err, pathname);
 			}
 			return;
 		}
@@ -2200,16 +2626,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			try {
 				await handleFalQueue(req, res, falBody ?? await readBody(req), pathname, fixtures, defaults, journal);
 			} catch (err) {
-				const msg = err instanceof Error ? err.message : "Internal error";
-				if (!res.headersSent) writeErrorResponse(res, 500, JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} }));
-				else if (!res.writableEnded) res.destroy();
+				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;
 		}
@@ -2221,23 +2644,25 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		try {
 			await handleCompletions(req, res, fixtures, journal, defaults, azureDeploymentId, completionsProvider, isOpenRouter);
 		} catch (err) {
-			const msg = err instanceof Error ? err.message : "Internal error";
-			if (!res.headersSent) writeErrorResponse(res, 500, isOpenRouter ? serializeOpenRouterError(500, msg) : JSON.stringify({ error: {
-				message: msg,
-				type: "server_error"
-			} }));
-			else if (!res.writableEnded) try {
-				res.write(`data: ${isOpenRouter ? serializeOpenRouterError(500, msg) : JSON.stringify({ error: {
-					message: msg,
-					type: "server_error"
-				} })}\n\n`);
-				res.end();
-			} catch (writeErr) {
-				logger.debug("Failed to write error recovery response:", writeErr);
-			}
+			routeError(req, res, err, pathname, {
+				envelope: (m, status) => isOpenRouter ? serializeOpenRouterError(status, m) : JSON.stringify({ error: {
+					message: m,
+					type: errorTypeForStatus(status)
+				} }),
+				streamEvent: (m, status) => `data: ${isOpenRouter ? serializeOpenRouterError(status, m) : JSON.stringify({ error: {
+					message: m,
+					type: errorTypeForStatus(status)
+				} })}\n\n`
+			});
 		}
 	}
 	const activeConnections = /* @__PURE__ */ new Set();
+	const liveLimits = normalizeLiveOptions(options?.live);
+	const liveSessions = /* @__PURE__ */ new Map();
+	const closeLiveSessions = (testId) => {
+		for (const session of [...liveSessions.values()]) if (testId === void 0 || session.testId === testId) session.dispose();
+	};
+	liveClosers.set(defaults, closeLiveSessions);
 	server.on("upgrade", (req, socket, head) => {
 		handleUpgradeRequest(req, socket, head).catch((err) => {
 			const msg = err instanceof Error ? err.message : "Internal error";
@@ -2287,30 +2712,57 @@ 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) {
+		if (pathname !== RESPONSES_PATH && pathname !== REALTIME_PATH && pathname !== GEMINI_LIVE_PATH && pathname !== LIVE_PATH) {
 			socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
 			socket.destroy();
 			return;
 		}
+		let liveId;
+		if (pathname === LIVE_PATH) {
+			if (req.method !== "GET" || parsedUrl.searchParams.has("model")) {
+				socket.end("HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n");
+				return;
+			}
+			if (liveSessions.size >= liveLimits.maxSessions) {
+				socket.end("HTTP/1.1 429 Too Many Requests\r\nConnection: close\r\n\r\n");
+				return;
+			}
+			liveId = Symbol("live-session");
+			const reservedId = liveId;
+			liveSessions.set(reservedId, {
+				testId: getTestId(req),
+				dispose: () => {
+					socket.destroy();
+					liveSessions.delete(reservedId);
+				}
+			});
+		}
 		if (head.length > 0) socket.unshift(head);
 		let ws;
 		try {
-			ws = upgradeToWebSocket(req, socket);
+			ws = upgradeToWebSocket(req, socket, pathname === LIVE_PATH ? liveLimits : void 0);
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : "WebSocket upgrade failed";
+			if (liveId !== void 0) liveSessions.delete(liveId);
 			logger.error(`WebSocket upgrade error: ${msg}`);
 			if (!socket.destroyed) socket.destroy();
 			return;
@@ -2324,7 +2776,24 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			activeConnections.delete(ws);
 		});
 		const wsTestId = getTestId(req);
-		if (pathname === RESPONSES_PATH) handleWebSocketResponses(ws, fixtures, journal, {
+		if (pathname === LIVE_PATH && liveId !== void 0) {
+			const sessionId = liveId;
+			const dispose = handleLiveSession(ws, fixtures, journal, {
+				defaults,
+				limits: liveLimits,
+				localApiKeys: resolvedAuth.publicConfig?.apiKeys,
+				testId: wsTestId,
+				headers: req.headers,
+				onDispose: () => {
+					liveSessions.delete(sessionId);
+					activeConnections.delete(ws);
+				}
+			});
+			liveSessions.set(sessionId, {
+				testId: wsTestId,
+				dispose
+			});
+		} else if (pathname === RESPONSES_PATH) handleWebSocketResponses(ws, fixtures, journal, {
 			...defaults,
 			model: "gpt-4",
 			testId: wsTestId,
@@ -2349,6 +2818,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 	}
 	const originalClose = server.close.bind(server);
 	server.close = function(callback) {
+		closeLiveSessions();
 		for (const ws of activeConnections) ws.close(1001, "Server shutting down");
 		activeConnections.clear();
 		videoStates.clear();
@@ -2368,10 +2838,15 @@ 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,
 				journal,
 				url,