@copilotkit/aimock 1.43.0 → 1.44.0

package/dist/server.cjs

@@ -1,5 +1,6 @@
 const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_constants = require('./constants.cjs');
+const require_message_text = require('./message-text.cjs');
 const require_api_key_auth = require('./api-key-auth.cjs');
 const require_helpers = require('./helpers.cjs');
 const require_live_fixture = require('./live-fixture.cjs');
@@ -38,6 +39,7 @@ const require_search = require('./search.cjs');
 const require_rerank = require('./rerank.cjs');
 const require_moderation = require('./moderation.cjs');
 const require_fine_tuning = require('./fine-tuning.cjs');
+const require_vector_stores = require('./vector-stores.cjs');
 const require_files = require('./files.cjs');
 const require_batches = require('./batches.cjs');
 const require_ws_framing = require('./ws-framing.cjs');
@@ -45,42 +47,18 @@ const require_ws_live = require('./ws-live.cjs');
 const require_ws_responses = require('./ws-responses.cjs');
 const require_ws_realtime = require('./ws-realtime.cjs');
 const require_ws_gemini_live = require('./ws-gemini-live.cjs');
+const require_route_registry = require('./route-registry.cjs');
+const require_openapi = require('./openapi.cjs');
 const require_metrics = require('./metrics.cjs');
+const require_mcp_fakes = require('./mcp-fakes.cjs');
+const require_mcp_mock = require('./mcp-mock.cjs');
+const require_mcp_fakes_mount = require('./mcp-fakes-mount.cjs');
 let node_http = require("node:http");
 node_http = require_runtime.__toESM(node_http);
 let node_async_hooks = require("node:async_hooks");
 
 //#region src/server.ts
 const liveClosers = /* @__PURE__ */ new WeakMap();
-const COMPLETIONS_PATH = "/v1/chat/completions";
-const RESPONSES_PATH = "/v1/responses";
-const LIVE_PATH = "/v1/live/sessions";
-const REALTIME_PATH = "/v1/realtime";
-const GEMINI_LIVE_PATH = "/ws/google.ai.generativelanguage.v1beta.GenerativeService.BidiGenerateContent";
-const MESSAGES_PATH = "/v1/messages";
-const EMBEDDINGS_PATH = "/v1/embeddings";
-const COHERE_CHAT_PATH = "/v2/chat";
-const COHERE_EMBED_PATH = "/v2/embed";
-const SEARCH_PATH = "/search";
-const RERANK_PATH = "/v2/rerank";
-const MODERATIONS_PATH = "/v1/moderations";
-const IMAGES_PATH = "/v1/images/generations";
-const IMAGES_EDIT_PATH = "/v1/images/edits";
-const IMAGES_VARIATIONS_PATH = "/v1/images/variations";
-const SPEECH_PATH = "/v1/audio/speech";
-const TRANSCRIPTIONS_PATH = "/v1/audio/transcriptions";
-const TRANSLATIONS_PATH = "/v1/audio/translations";
-const VIDEOS_PATH = "/v1/videos";
-const GEMINI_PREDICT_RE = /^\/v1beta\/models\/([^:]+):predict$/;
-const ELEVENLABS_SOUND_GENERATION_PATH = "/v1/sound-generation";
-const ELEVENLABS_TTS_RE = /^\/v1\/text-to-speech\/([^/]+)$/;
-const ELEVENLABS_MUSIC_RE = /^\/v1\/music(?:\/(.+))?$/;
-const ELEVENLABS_VOICE_DESIGN_PATH = "/v1/text-to-voice/design";
-const ELEVENLABS_VOICE_CREATE_PATH = "/v1/text-to-voice";
-const ELEVENLABS_VOICE_RE = /^\/v1\/voices\/([^/]+)$/;
-const FAL_QUEUE_SUBMIT_RE = /^\/fal\/queue\/submit\/(.+)$/;
-const FAL_QUEUE_REQUESTS_RE = /^\/fal\/queue\/requests\/(.+)$/;
-const FAL_RUN_RE = /^\/fal\/run\/(.+)$/;
 const DEFAULT_CHUNK_SIZE = 20;
 const COMPAT_SUFFIXES = [
 	"/chat/completions",
@@ -109,34 +87,6 @@ function normalizeCompatPath(pathname, logger) {
 	}
 	return pathname;
 }
-const GEMINI_INTERACTIONS_PATH = "/v1beta/interactions";
-const GEMINI_PATH_RE = /^\/v1beta\/models\/([^:]+):(generateContent|streamGenerateContent)$/;
-const GEMINI_EMBED_RE = /^\/v1beta\/models\/([^:]+):embedContent$/;
-const AZURE_DEPLOYMENT_RE = /^\/openai\/deployments\/([^/]+)\/(chat\/completions|embeddings)$/;
-const BEDROCK_INVOKE_RE = /^\/model\/([^/]+)\/invoke$/;
-const BEDROCK_STREAM_RE = /^\/model\/([^/]+)\/invoke-with-response-stream$/;
-const BEDROCK_CONVERSE_RE = /^\/model\/([^/]+)\/converse$/;
-const BEDROCK_CONVERSE_STREAM_RE = /^\/model\/([^/]+)\/converse-stream$/;
-const VERTEX_AI_RE = /^\/v1\/projects\/[^/]+\/locations\/[^/]+\/publishers\/google\/models\/([^/:]+):(generateContent|streamGenerateContent)$/;
-const OLLAMA_CHAT_PATH = "/api/chat";
-const OLLAMA_GENERATE_PATH = "/api/generate";
-const OLLAMA_EMBEDDINGS_PATH = "/api/embeddings";
-const OLLAMA_EMBED_PATH = "/api/embed";
-const OLLAMA_TAGS_PATH = "/api/tags";
-const OPENROUTER_VIDEOS_PATH = "/api/v1/videos";
-const OPENROUTER_VIDEO_MODELS_PATH = "/api/v1/videos/models";
-const HEALTH_PATH = "/health";
-const READY_PATH = "/ready";
-const MODELS_PATH = "/v1/models";
-const REQUESTS_PATH = "/v1/_requests";
-const BATCHES_PATH = "/v1/batches";
-const BATCHES_ID_RE = /^\/v1\/batches\/([^/]+)$/;
-const BATCHES_CANCEL_RE = /^\/v1\/batches\/([^/]+)\/cancel$/;
-const FILES_PATH = "/v1/files";
-const FINE_TUNING_JOBS_PATH = "/v1/fine_tuning/jobs";
-const FINE_TUNING_ID_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)$/;
-const FINE_TUNING_CANCEL_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/cancel$/;
-const FINE_TUNING_EVENTS_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/events$/;
 const DEFAULT_MODELS = [
 	"gpt-4",
 	"gpt-4o",
@@ -146,7 +96,7 @@ const DEFAULT_MODELS = [
 ];
 const CORS_HEADERS = {
 	"Access-Control-Allow-Origin": "*",
-	"Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
+	"Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
 	"Access-Control-Allow-Headers": "*",
 	"Access-Control-Expose-Headers": "X-Total-Count, X-Request-Id"
 };
@@ -165,7 +115,6 @@ function handleNotFound(res, message) {
 		type: "not_found"
 	} }));
 }
-const CONTROL_PREFIX = "/__aimock";
 /** The complete `GET /__aimock/fixtures` query-param vocabulary; anything else 400s. */
 const FIXTURES_PARAMS = new Set(["include"]);
 /** The complete `GET /__aimock/journal` query-param vocabulary; anything else 400s. */
@@ -204,6 +153,7 @@ function performFullReset(fixtures, targets) {
 	require_elevenlabs_voice.clearElevenLabsVoices();
 	require_files.clearFileStore();
 	require_fine_tuning.clearFineTuningStore();
+	require_vector_stores.clearVectorStoreStore();
 	require_gemini_interactions.resetInteractionCounter();
 	require_gemini_interactions.resetEventIdCounter();
 	if (!targets) return;
@@ -216,6 +166,7 @@ function performFullReset(fixtures, targets) {
 	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);
 }
 /**
@@ -270,9 +221,14 @@ function fixtureResponseKind(response) {
 * scoping path does not also do. (Splitting on "," additionally broke every
 * legitimately comma-bearing id.) A raw `path.includes("testId=t1")` both
 * prefix-collides with `t10` and matches unrelated params like `notTestId`.
+*
+* An MCP mount records the test id it resolved on the entry (I9, B3): a
+* decoded header or query value, or the one bound to the session at
+* `initialize`. That value wins; LLM entries carry none and are attributed as
+* before.
 */
 function journalEntryTestId(entry) {
-	return require_helpers.resolveTestId(entry.headers, entry.path);
+	return entry.testId ?? require_helpers.resolveTestId(entry.headers, entry.path);
 }
 /**
 * The testId a chaos override is stored under, and read back with — resolved by
@@ -311,19 +267,186 @@ function effectiveChaos(defaults, scopeId) {
 	if (!current) return {};
 	return require_chaos.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 require_mcp_fakes.MCP_FAKES_DEFAULT_MOUNT;
+	const value = Object.getOwnPropertyDescriptor(raw, "mount")?.value;
+	return typeof value === "string" ? value : require_mcp_fakes.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(require_mcp_fakes.MCP_FAKES_DEFAULT_MOUNT, {
+		path: require_mcp_fakes.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 = require_mcp_fakes_mount.findFakeMount(mounts, group.path, pending);
+		if (target.kind === "conflict") {
+			group.positions.forEach((position) => {
+				const where = Array.isArray(raw) ? require_message_text.msg`mcpFakes[${position}]` : require_message_text.msg`mcpFakes`;
+				found.push({
+					position,
+					error: new require_fixture_loader.FixtureLoadError({
+						rule: "mcp-fakes/mount-conflict",
+						file: null,
+						blockId: null,
+						entryId: null,
+						detail: require_message_text.msg`${where}: ${require_mcp_fakes_mount.mountConflictDetail(group.path, target)}`
+					})
+				});
+			});
+			continue;
+		}
+		let failure = addFailure(() => new require_mcp_fakes.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 === require_mcp_mock.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 = require_mcp_fakes_mount.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 require_mcp_fakes.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 === require_mcp_fakes.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 }) => require_mcp_fakes_mount.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) {
-	if (!pathname.startsWith(CONTROL_PREFIX)) return false;
-	const subPath = pathname.slice(9);
+async function handleControlAPI(req, res, pathname, searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults, mounts) {
+	if (!pathname.startsWith(require_route_registry.CONTROL_PREFIX)) return false;
+	const subPath = pathname.slice(require_route_registry.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(require_openapi.buildOpenApiDocument()));
+		return true;
+	}
+	if (subPath === "/routes" && req.method === "GET") {
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify({
+			count: require_openapi.CATALOG_ROUTES.length,
+			routes: require_openapi.CATALOG_ROUTES
+		}));
+		return true;
+	}
 	if (subPath === "/journal" && req.method === "GET") {
 		const bad = (message) => {
 			res.writeHead(400, { "Content-Type": "application/json" });
@@ -474,6 +597,24 @@ async function handleControlAPI(req, res, pathname, searchParams, fixtures, jour
 		res.end(JSON.stringify({ chaos: effectiveChaos(defaults, scopeId) }));
 		return true;
 	}
+	if (subPath === "/mcp/fakes" && req.method === "GET") {
+		const reply = (status, body) => {
+			res.writeHead(status, { "Content-Type": "application/json" });
+			res.end(JSON.stringify(body));
+			return true;
+		};
+		for (const key of searchParams.keys()) if (!MCP_FAKES_PARAMS.has(key)) return reply(400, { error: `Unknown query parameter: '${key}'. Supported: ${[...MCP_FAKES_PARAMS].join(", ")}` });
+		const testId = searchParams.get("testId") || null;
+		const context = searchParams.get("context") || null;
+		const mount = searchParams.get("mount") || null;
+		const listed = listControlApiFakes(mounts, testId, context, mount);
+		if (listed === null) return reply(404, { error: require_message_text.build(require_message_text.msg`No MCP mount at ${require_message_text.quote(mount ?? "")}`) });
+		return reply(200, {
+			testId,
+			context,
+			mounts: listed
+		});
+	}
 	if (subPath === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
@@ -495,29 +636,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) => require_fixture_loader.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) => require_fixture_loader.entryToFixture(e));
 		const errors = require_fixture_loader.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 require_mcp_fakes.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") {
 		require_fixture_loader.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 }));
@@ -530,7 +702,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());
@@ -640,7 +813,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	} catch (err) {
 		const msg = err instanceof Error ? err.message : "Failed to read request body";
 		const clientFault = err instanceof require_helpers.RequestBodyTooLargeError;
-		const route = `${req.method ?? "POST"} ${req.url ?? COMPLETIONS_PATH}`;
+		const route = `${req.method ?? "POST"} ${req.url ?? require_route_registry.COMPLETIONS_PATH}`;
 		const clientAbort = clientAbortedMidBody(req, res, err);
 		const bodyLimitDisconnect = clientFault && (req.destroyed || res.destroyed);
 		if (clientAbort || bodyLimitDisconnect) {
@@ -648,7 +821,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			defaults.logger.warn(bodyLimitDisconnect ? `${route}: ${msg}` : `${route}: client aborted mid-body (${msg})`);
 			journal.add({
 				method: req.method ?? "POST",
-				path: req.url ?? COMPLETIONS_PATH,
+				path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 				headers: require_helpers.flattenHeaders(req.headers),
 				body: null,
 				response: {
@@ -665,7 +838,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		else defaults.logger.error(`${route}: ${msg}`);
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body: null,
 			response: {
@@ -686,7 +859,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const detail = parseErr instanceof Error ? parseErr.message : "unknown parse error";
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body: null,
 			response: {
@@ -705,7 +878,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	if (!require_helpers.isJsonObject(body)) {
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body: null,
 			response: {
@@ -723,7 +896,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	if (!Array.isArray(body.messages)) {
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body: null,
 			response: {
@@ -739,8 +912,53 @@ 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 ?? require_route_registry.COMPLETIONS_PATH,
+			headers: require_helpers.flattenHeaders(req.headers),
+			body: null,
+			response: {
+				status: 400,
+				fixture: null
+			}
+		});
+		require_sse_writer.writeErrorResponse(res, 400, openRouter ? require_openrouter_chat.serializeOpenRouterError(400, message) : JSON.stringify({ error: {
+			message,
+			type: "invalid_request_error",
+			param: null,
+			code: null
+		} }));
+		return;
+	}
+	if (new URL(req.url ?? require_route_registry.COMPLETIONS_PATH, "http://localhost").pathname === require_route_registry.COMPLETIONS_PATH) {
+		let toolsError = require_helpers.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 ?? require_route_registry.COMPLETIONS_PATH,
+				headers: require_helpers.flattenHeaders(req.headers),
+				body: null,
+				response: {
+					status: 400,
+					fixture: null
+				}
+			});
+			require_sse_writer.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 path = req.url ?? require_route_registry.COMPLETIONS_PATH;
 	const flatHeaders = require_helpers.flattenHeaders(req.headers);
 	body._endpointType = "chat";
 	body._context = require_helpers.getContext(req);
@@ -851,10 +1069,10 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		if (effectiveStrict) {
 			const strictStatus = 503;
 			const strictMessage = require_helpers.strictNoMatchMessage(skippedBySequenceOrTurn);
-			defaults.logger.error(require_helpers.strictNoMatchLogLine(req.method ?? "POST", req.url ?? COMPLETIONS_PATH, skippedBySequenceOrTurn));
+			defaults.logger.error(require_helpers.strictNoMatchLogLine(req.method ?? "POST", req.url ?? require_route_registry.COMPLETIONS_PATH, skippedBySequenceOrTurn));
 			journal.add({
 				method: req.method ?? "POST",
-				path: req.url ?? COMPLETIONS_PATH,
+				path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 				headers: require_helpers.flattenHeaders(req.headers),
 				body,
 				response: {
@@ -894,7 +1112,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 			req.socket?.on("error", noteClientHangUp);
 			let outcome;
 			try {
-				outcome = await require_recorder.proxyAndRecord(req, res, body, providerKey, req.url ?? COMPLETIONS_PATH, fixtures, defaults, raw, hookOptions);
+				outcome = await require_recorder.proxyAndRecord(req, res, body, providerKey, req.url ?? require_route_registry.COMPLETIONS_PATH, fixtures, defaults, raw, hookOptions);
 			} finally {
 				req.socket?.off("end", noteClientHangUp);
 				req.socket?.off("error", noteClientHangUp);
@@ -904,7 +1122,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 				const destroyedMidStream = res.destroyed && !res.writableEnded;
 				journal.add({
 					method: req.method ?? "POST",
-					path: req.url ?? COMPLETIONS_PATH,
+					path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 					headers: require_helpers.flattenHeaders(req.headers),
 					body,
 					response: {
@@ -926,7 +1144,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		}
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -964,7 +1182,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const status = response.status ?? 500;
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -978,7 +1196,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	if (require_helpers.isAudioResponse(response)) {
 		journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -1001,7 +1219,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const blockOutcome = response.blocks && response.blocks.length > 0 ? require_helpers.resolveFixtureBlockOutcome(response.blocks) : void 0;
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -1047,7 +1265,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -1089,7 +1307,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, responseModel, effectiveStrict, defaults.logger);
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
-			path: req.url ?? COMPLETIONS_PATH,
+			path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 			headers: require_helpers.flattenHeaders(req.headers),
 			body,
 			response: {
@@ -1127,7 +1345,7 @@ async function handleCompletions(req, res, fixtures, journal, defaults, modelFal
 	}
 	journal.add({
 		method: req.method ?? "POST",
-		path: req.url ?? COMPLETIONS_PATH,
+		path: req.url ?? require_route_registry.COMPLETIONS_PATH,
 		headers: require_helpers.flattenHeaders(req.headers),
 		body,
 		response: {
@@ -1148,9 +1366,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 require_logger.Logger(options?.logLevel ?? "silent");
+	const mountList = mounts ?? [];
+	const handOff = serviceFixtures?.mcpFakes && serviceFixtures.mcpFakes.length > 0 ? require_mcp_fakes_mount.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 require_logger.Logger(options?.logLevel ?? "silent");
 	const registry = options?.metrics ? require_metrics.createMetricsRegistry() : void 0;
 	const serverOptions = options ?? {};
 	const chaosByTestId = /* @__PURE__ */ new Map();
@@ -1439,9 +1672,10 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			else res.destroy();
 		}
 	}
-	if (mounts) for (const { handler } of mounts) {
+	for (const { handler } of mountList) {
 		if (handler.setJournal) handler.setJournal(journal);
 		if (registry && handler.setRegistry) handler.setRegistry(registry);
+		if (handler.setLogger) handler.setLogger(logger);
 	}
 	if (registry) registry.setGauge("aimock_fixtures_loaded", {}, fixtures.length);
 	const server = node_http.createServer((req, res) => {
@@ -1464,7 +1698,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (recorded) return;
 				recorded = true;
 				try {
-					const normalizedPath = require_metrics.normalizePathLabel(pathname, mounts ? mounts.map((m) => m.path) : []);
+					const normalizedPath = require_metrics.normalizePathLabel(pathname, mountList.map((m) => m.path));
 					const method = req.method ?? "UNKNOWN";
 					registry.incrementCounter("aimock_requests_total", {
 						method,
@@ -1485,7 +1719,36 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (!res.writableFinished) recordOutcome(require_metrics.DESTROYED_STATUS_LABEL);
 			});
 		}
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		let parsedUrl;
+		try {
+			parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		} catch (err) {
+			const route = `${req.method ?? "?"} ${req.url ?? "?"}`;
+			const msg = err instanceof Error ? err.message : "Internal error";
+			logger.error(`${route}: ${msg}`);
+			if (err instanceof Error && err.stack) logger.debug(err.stack);
+			try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: require_helpers.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);
+			require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
+				message: "Invalid request target",
+				type: "invalid_request_error"
+			} }));
+			return;
+		}
 		pathname = parsedUrl.pathname;
 		const originalPathname = pathname;
 		const isOpenRouter = require_openrouter_chat.isOpenRouterPath(originalPathname);
@@ -1494,24 +1757,22 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			handleOptions(res);
 			return;
 		}
-		if (!(req.method === "GET" && (pathname === HEALTH_PATH || pathname === READY_PATH || pathname === "/metrics"))) {
+		if (!(req.method === "GET" && (pathname === require_route_registry.HEALTH_PATH || pathname === require_route_registry.READY_PATH || pathname === require_route_registry.METRICS_PATH))) {
 			if (!require_api_key_auth.validateRequestApiKey(req, resolvedAuth.policy).ok) {
 				require_api_key_auth.writeApiKeyHttpRejection(res, setCorsHeaders);
 				return;
 			}
 			require_api_key_auth.markAuthenticatedRequest(req, resolvedAuth.policy);
 		}
-		if (pathname.startsWith(CONTROL_PREFIX)) {
-			await handleControlAPI(req, res, pathname, parsedUrl.searchParams, fixtures, journal, videoStates, openRouterVideoJobs, veoVideoJobs, grokVideoJobs, bytePlusVideoJobs, defaults);
+		if (pathname.startsWith(require_route_registry.CONTROL_PREFIX)) {
+			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") {
+		if (pathname === require_route_registry.OLLAMA_CHAT_PATH && req.method === "POST") {
 			try {
 				await require_ollama.handleOllama(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1519,7 +1780,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === OLLAMA_GENERATE_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.OLLAMA_GENERATE_PATH && req.method === "POST") {
 			try {
 				await require_ollama.handleOllamaGenerate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1527,7 +1788,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if ((pathname === OLLAMA_EMBEDDINGS_PATH || pathname === OLLAMA_EMBED_PATH) && req.method === "POST") {
+		if ((pathname === require_route_registry.OLLAMA_EMBEDDINGS_PATH || pathname === require_route_registry.OLLAMA_EMBED_PATH) && req.method === "POST") {
 			try {
 				await require_ollama.handleOllamaEmbeddings(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1535,7 +1796,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === OLLAMA_TAGS_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.OLLAMA_TAGS_PATH && req.method === "GET") {
 			setCorsHeaders(res);
 			const modelIds = /* @__PURE__ */ new Set();
 			for (const f of fixtures) if (f.match.model && typeof f.match.model === "string") modelIds.add(f.match.model);
@@ -1551,7 +1812,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			res.end(JSON.stringify({ models }));
 			return;
 		}
-		const openRouterVideoContentMatch = pathname.match(require_metrics.OPENROUTER_VIDEO_CONTENT_RE);
+		const openRouterVideoContentMatch = pathname.match(require_route_registry.OPENROUTER_VIDEO_CONTENT_RE);
 		if (openRouterVideoContentMatch && req.method === "GET") {
 			try {
 				await require_openrouter_video.handleOpenRouterVideoContent(req, res, openRouterVideoContentMatch[1], journal, defaults, setCorsHeaders, openRouterVideoJobs);
@@ -1560,7 +1821,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === OPENROUTER_VIDEO_MODELS_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.OPENROUTER_VIDEO_MODELS_PATH && req.method === "GET") {
 			try {
 				await require_openrouter_video.handleOpenRouterVideoModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1568,7 +1829,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const openRouterVideoStatusMatch = pathname.match(require_metrics.OPENROUTER_VIDEO_STATUS_RE);
+		const openRouterVideoStatusMatch = pathname.match(require_route_registry.OPENROUTER_VIDEO_STATUS_RE);
 		if (openRouterVideoStatusMatch && req.method === "GET") {
 			try {
 				await require_openrouter_video.handleOpenRouterVideoStatus(req, res, openRouterVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
@@ -1577,7 +1838,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === OPENROUTER_VIDEOS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.OPENROUTER_VIDEOS_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_openrouter_video.handleOpenRouterVideoCreate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, openRouterVideoJobs);
@@ -1586,7 +1847,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const bytePlusVideoStatusMatch = pathname.match(require_metrics.BYTEPLUS_VIDEO_STATUS_RE);
+		const bytePlusVideoStatusMatch = pathname.match(require_route_registry.BYTEPLUS_VIDEO_STATUS_RE);
 		if (bytePlusVideoStatusMatch && req.method === "GET") {
 			try {
 				await require_byteplus_video.handleBytePlusVideoStatus(req, res, bytePlusVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
@@ -1595,7 +1856,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (require_metrics.BYTEPLUS_VIDEO_SUBMIT_RE.test(pathname) && req.method === "POST") {
+		if (require_route_registry.BYTEPLUS_VIDEO_SUBMIT_RE.test(pathname) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_byteplus_video.handleBytePlusVideoCreate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, bytePlusVideoJobs);
@@ -1604,33 +1865,33 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === "/api/v1/models" && req.method === "GET") {
+		if (pathname === require_route_registry.OPENROUTER_MODELS_PATH && req.method === "GET") {
 			require_openrouter_chat.handleOpenRouterModels(req, res, fixtures, journal, defaults, setCorsHeaders);
 			return;
 		}
-		if (pathname === "/api/v1/key" && req.method === "GET") {
+		if (pathname === require_route_registry.OPENROUTER_KEY_PATH && req.method === "GET") {
 			require_openrouter_chat.handleOpenRouterKey(req, res, journal, setCorsHeaders);
 			return;
 		}
-		if (pathname === "/api/v1/credits" && req.method === "GET") {
+		if (pathname === require_route_registry.OPENROUTER_CREDITS_PATH && req.method === "GET") {
 			require_openrouter_chat.handleOpenRouterCredits(req, res, journal, setCorsHeaders);
 			return;
 		}
 		let azureDeploymentId;
-		const azureMatch = pathname.match(AZURE_DEPLOYMENT_RE);
+		const azureMatch = pathname.match(require_route_registry.AZURE_DEPLOYMENT_RE);
 		if (azureMatch && req.method === "POST") {
 			azureDeploymentId = azureMatch[1];
 			pathname = `/v1/${azureMatch[2]}`;
 		}
 		if (!azureDeploymentId) pathname = normalizeCompatPath(pathname, logger);
-		if (pathname === HEALTH_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.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();
 				}
@@ -1645,13 +1906,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === READY_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.READY_PATH && req.method === "GET") {
 			setCorsHeaders(res);
 			res.writeHead(200, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({ status: "ready" }));
 			return;
 		}
-		if (pathname === "/metrics" && req.method === "GET") {
+		if (pathname === require_route_registry.METRICS_PATH && req.method === "GET") {
 			if (!registry) {
 				handleNotFound(res, "Not found");
 				return;
@@ -1661,7 +1922,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			res.end(registry.serialize());
 			return;
 		}
-		if (pathname === MODELS_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.MODELS_PATH && req.method === "GET") {
 			setCorsHeaders(res);
 			const modelIds = /* @__PURE__ */ new Set();
 			for (const f of fixtures) if (f.match.model && typeof f.match.model === "string") modelIds.add(f.match.model);
@@ -1678,7 +1939,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}));
 			return;
 		}
-		const batchesCancelMatch = pathname.match(BATCHES_CANCEL_RE);
+		const batchesCancelMatch = pathname.match(require_route_registry.BATCHES_CANCEL_RE);
 		if (batchesCancelMatch && req.method === "POST") {
 			try {
 				await require_helpers.readBody(req);
@@ -1688,7 +1949,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const batchesIdMatch = pathname.match(BATCHES_ID_RE);
+		const batchesIdMatch = pathname.match(require_route_registry.BATCHES_ID_RE);
 		if (batchesIdMatch && req.method === "GET") {
 			try {
 				await require_batches.handleBatchesRetrieve(req, res, batchesIdMatch[1], journal, defaults, setCorsHeaders);
@@ -1697,7 +1958,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === BATCHES_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.BATCHES_PATH && req.method === "GET") {
 			try {
 				await require_batches.handleBatchesList(req, res, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1705,7 +1966,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === BATCHES_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.BATCHES_PATH && req.method === "POST") {
 			try {
 				await require_batches.handleBatchesCreate(req, res, await require_helpers.readBody(req), journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1713,7 +1974,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const filesContentMatch = pathname.match(require_metrics.FILES_CONTENT_RE);
+		const filesContentMatch = pathname.match(require_route_registry.FILES_CONTENT_RE);
 		if (filesContentMatch && req.method === "GET") {
 			try {
 				await require_files.handleFilesContent(req, res, filesContentMatch[1], journal, defaults, setCorsHeaders);
@@ -1722,7 +1983,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const filesIdMatch = pathname.match(require_metrics.FILES_ID_RE);
+		const filesIdMatch = pathname.match(require_route_registry.FILES_ID_RE);
 		if (filesIdMatch && req.method === "GET") {
 			try {
 				await require_files.handleFilesRetrieve(req, res, filesIdMatch[1], journal, defaults, setCorsHeaders);
@@ -1739,7 +2000,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === FILES_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.FILES_PATH && req.method === "GET") {
 			try {
 				await require_files.handleFilesList(req, res, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1747,7 +2008,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === FILES_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.FILES_PATH && req.method === "POST") {
 			try {
 				await require_files.handleFilesCreate(req, res, (await require_helpers.readBodyBufferBounded(req, require_files.FILES_BODY_MAX_BYTES, require_files.FILES_BODY_DRAIN_MAX_BYTES)).buffer ?? require_files.FILES_BODY_OVERSIZED, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1755,7 +2016,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const ftCancelMatch = pathname.match(FINE_TUNING_CANCEL_RE);
+		const ftCancelMatch = pathname.match(require_route_registry.FINE_TUNING_CANCEL_RE);
 		if (ftCancelMatch && req.method === "POST") {
 			try {
 				await require_helpers.readBody(req);
@@ -1765,7 +2026,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const ftEventsMatch = pathname.match(FINE_TUNING_EVENTS_RE);
+		const ftEventsMatch = pathname.match(require_route_registry.FINE_TUNING_EVENTS_RE);
 		if (ftEventsMatch && req.method === "GET") {
 			try {
 				await require_fine_tuning.handleFineTuningEvents(req, res, ftEventsMatch[1], journal, defaults, setCorsHeaders);
@@ -1774,7 +2035,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const ftIdMatch = pathname.match(FINE_TUNING_ID_RE);
+		const ftIdMatch = pathname.match(require_route_registry.FINE_TUNING_ID_RE);
 		if (ftIdMatch && req.method === "GET") {
 			try {
 				await require_fine_tuning.handleFineTuningRetrieve(req, res, ftIdMatch[1], journal, defaults, setCorsHeaders);
@@ -1783,7 +2044,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === FINE_TUNING_JOBS_PATH && req.method === "GET") {
+		if (pathname === require_route_registry.FINE_TUNING_JOBS_PATH && req.method === "GET") {
 			try {
 				await require_fine_tuning.handleFineTuningList(req, res, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1791,7 +2052,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === FINE_TUNING_JOBS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.FINE_TUNING_JOBS_PATH && req.method === "POST") {
 			try {
 				await require_fine_tuning.handleFineTuningCreate(req, res, await require_helpers.readBody(req), journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1799,14 +2060,140 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === REQUESTS_PATH) {
+		const vsSearchMatch = pathname.match(require_route_registry.VECTOR_STORES_SEARCH_RE);
+		if (vsSearchMatch && req.method === "POST") {
+			try {
+				const raw = await require_helpers.readBody(req);
+				await require_vector_stores.handleVectorStoresSearch(req, res, vsSearchMatch[1], raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchFilesMatch = pathname.match(require_route_registry.VECTOR_STORES_BATCH_FILES_RE);
+		if (vsBatchFilesMatch && req.method === "GET") {
+			try {
+				await require_vector_stores.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(require_route_registry.VECTOR_STORES_BATCH_CANCEL_RE);
+		if (vsBatchCancelMatch && req.method === "POST") {
+			try {
+				await require_helpers.readBody(req);
+				await require_vector_stores.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(require_route_registry.VECTOR_STORES_BATCH_RE);
+		if (vsBatchMatch && req.method === "GET") {
+			try {
+				await require_vector_stores.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(require_route_registry.VECTOR_STORES_FILE_RE);
+		if (vsFileMatch && req.method === "GET") {
+			try {
+				await require_vector_stores.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 require_vector_stores.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(require_route_registry.VECTOR_STORES_ID_RE);
+		if (vsIdMatch && req.method === "GET") {
+			try {
+				await require_vector_stores.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 require_helpers.readBody(req);
+				await require_vector_stores.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 require_vector_stores.handleVectorStoresDelete(req, res, vsIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (require_route_registry.VECTOR_STORES_FILES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await require_helpers.readBody(req);
+				const storeId = pathname.split("/")[3];
+				await require_vector_stores.handleVectorStoreFilesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (require_route_registry.VECTOR_STORES_FILES_RE.test(pathname) && req.method === "GET") {
+			try {
+				const storeId = pathname.split("/")[3];
+				await require_vector_stores.handleVectorStoreFilesList(req, res, storeId, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (require_route_registry.VECTOR_STORES_FILE_BATCHES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await require_helpers.readBody(req);
+				const storeId = pathname.split("/")[3];
+				await require_vector_stores.handleVectorFileBatchesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === require_route_registry.VECTOR_STORES_PATH && req.method === "GET") {
+			try {
+				await require_vector_stores.handleVectorStoresList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === require_route_registry.VECTOR_STORES_PATH && req.method === "POST") {
+			try {
+				await require_vector_stores.handleVectorStoresCreate(req, res, await require_helpers.readBody(req), journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === require_route_registry.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) {
 						require_sse_writer.writeErrorResponse(res, 400, JSON.stringify({ error: {
 							message: `Invalid limit parameter: "${limitParam}"`,
 							type: "invalid_request_error"
@@ -1829,7 +2216,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			handleNotFound(res, "Not found");
 			return;
 		}
-		if (pathname === RESPONSES_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.RESPONSES_PATH && req.method === "POST") {
 			try {
 				await require_responses.handleResponses(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1837,7 +2224,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === MESSAGES_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.MESSAGES_PATH && req.method === "POST") {
 			try {
 				await require_messages.handleMessages(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1845,7 +2232,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === COHERE_CHAT_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.COHERE_CHAT_PATH && req.method === "POST") {
 			try {
 				await require_cohere.handleCohere(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1853,7 +2240,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === COHERE_EMBED_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.COHERE_EMBED_PATH && req.method === "POST") {
 			try {
 				await require_cohere.handleCohereEmbed(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1861,7 +2248,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === EMBEDDINGS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.EMBEDDINGS_PATH && req.method === "POST") {
 			try {
 				const deploymentId = azureDeploymentId;
 				const embeddingsProvider = azureDeploymentId ? "azure" : "openai";
@@ -1875,13 +2262,13 @@ 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 require_embeddings.handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider);
+				await require_embeddings.handleEmbeddings(req, res, raw, fixtures, journal, defaults, setCorsHeaders, embeddingsProvider, originalPathname === require_route_registry.EMBEDDINGS_PATH);
 			} catch (err) {
 				routeError(req, res, err, pathname);
 			}
 			return;
 		}
-		if (pathname === IMAGES_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.IMAGES_PATH && req.method === "POST") {
 			try {
 				await require_images.handleImages(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, "openai", void 0, isBytePlusArk ? "byteplus" : void 0);
 			} catch (err) {
@@ -1889,7 +2276,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === IMAGES_EDIT_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.IMAGES_EDIT_PATH && req.method === "POST") {
 			try {
 				await require_images.handleImageEdit(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1897,7 +2284,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === IMAGES_VARIATIONS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.IMAGES_VARIATIONS_PATH && req.method === "POST") {
 			try {
 				await require_images.handleImageVariations(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1905,7 +2292,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === SPEECH_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.SPEECH_PATH && req.method === "POST") {
 			try {
 				await require_speech.handleSpeech(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1913,7 +2300,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === TRANSCRIPTIONS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.TRANSCRIPTIONS_PATH && req.method === "POST") {
 			try {
 				await require_transcription.handleTranscription(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1921,7 +2308,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === TRANSLATIONS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.TRANSLATIONS_PATH && req.method === "POST") {
 			try {
 				await require_transcription.handleTranscription(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, "translation");
 			} catch (err) {
@@ -1929,7 +2316,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === require_metrics.GROK_VIDEO_SUBMIT_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.GROK_VIDEO_SUBMIT_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_grok_video.handleGrokVideoCreate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, grokVideoJobs);
@@ -1938,7 +2325,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === VIDEOS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.VIDEOS_PATH && req.method === "POST") {
 			try {
 				await require_video.handleVideoCreate(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders, videoStates);
 			} catch (err) {
@@ -1946,7 +2333,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const grokVideoStatusMatch = pathname.match(require_metrics.GROK_VIDEO_STATUS_RE);
+		const grokVideoStatusMatch = pathname.match(require_route_registry.GROK_VIDEO_STATUS_RE);
 		if (grokVideoStatusMatch && grokVideoStatusMatch[1] !== "generations" && req.method === "GET") {
 			try {
 				await require_grok_video.handleGrokVideoStatus(req, res, grokVideoStatusMatch[1], fixtures, journal, defaults, setCorsHeaders, grokVideoJobs, videoStates);
@@ -1955,7 +2342,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const veoPredictMatch = pathname.match(require_metrics.VEO_PREDICT_LRO_RE);
+		const veoPredictMatch = pathname.match(require_route_registry.VEO_PREDICT_LRO_RE);
 		if (veoPredictMatch && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
@@ -1965,7 +2352,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const veoOperationMatch = pathname.match(require_metrics.VEO_OPERATION_RE);
+		const veoOperationMatch = pathname.match(require_route_registry.VEO_OPERATION_RE);
 		if (veoOperationMatch && req.method === "GET") {
 			try {
 				await require_veo_video.handleVeoVideoStatus(req, res, veoOperationMatch[1], fixtures, journal, defaults, setCorsHeaders, veoVideoJobs);
@@ -1974,7 +2361,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const geminiPredictMatch = pathname.match(GEMINI_PREDICT_RE);
+		const geminiPredictMatch = pathname.match(require_route_registry.GEMINI_PREDICT_RE);
 		if (geminiPredictMatch && req.method === "POST") {
 			const predictModel = geminiPredictMatch[1];
 			try {
@@ -1984,7 +2371,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === GEMINI_INTERACTIONS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.GEMINI_INTERACTIONS_PATH && req.method === "POST") {
 			try {
 				await require_gemini_interactions.handleGeminiInteractions(req, res, await require_helpers.readBody(req), fixtures, journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -1992,7 +2379,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const geminiEmbedMatch = pathname.match(GEMINI_EMBED_RE);
+		const geminiEmbedMatch = pathname.match(require_route_registry.GEMINI_EMBED_RE);
 		if (geminiEmbedMatch && req.method === "POST") {
 			const embedModel = geminiEmbedMatch[1];
 			try {
@@ -2002,7 +2389,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const geminiMatch = pathname.match(GEMINI_PATH_RE);
+		const geminiMatch = pathname.match(require_route_registry.GEMINI_PATH_RE);
 		if (geminiMatch && req.method === "POST") {
 			const geminiModel = geminiMatch[1];
 			const streaming = geminiMatch[2] === "streamGenerateContent";
@@ -2013,7 +2400,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const vertexMatch = pathname.match(VERTEX_AI_RE);
+		const vertexMatch = pathname.match(require_route_registry.VERTEX_AI_RE);
 		if (vertexMatch && req.method === "POST") {
 			const vertexModel = vertexMatch[1];
 			const streaming = vertexMatch[2] === "streamGenerateContent";
@@ -2024,7 +2411,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const bedrockMatch = pathname.match(BEDROCK_INVOKE_RE);
+		const bedrockMatch = pathname.match(require_route_registry.BEDROCK_INVOKE_RE);
 		if (bedrockMatch && req.method === "POST") {
 			const bedrockModelId = bedrockMatch[1];
 			try {
@@ -2034,7 +2421,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const bedrockStreamMatch = pathname.match(BEDROCK_STREAM_RE);
+		const bedrockStreamMatch = pathname.match(require_route_registry.BEDROCK_STREAM_RE);
 		if (bedrockStreamMatch && req.method === "POST") {
 			const bedrockModelId = bedrockStreamMatch[1];
 			try {
@@ -2044,7 +2431,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const converseMatch = pathname.match(BEDROCK_CONVERSE_RE);
+		const converseMatch = pathname.match(require_route_registry.BEDROCK_CONVERSE_RE);
 		if (converseMatch && req.method === "POST") {
 			const converseModelId = converseMatch[1];
 			try {
@@ -2054,7 +2441,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const converseStreamMatch = pathname.match(BEDROCK_CONVERSE_STREAM_RE);
+		const converseStreamMatch = pathname.match(require_route_registry.BEDROCK_CONVERSE_STREAM_RE);
 		if (converseStreamMatch && req.method === "POST") {
 			const converseStreamModelId = converseStreamMatch[1];
 			try {
@@ -2064,7 +2451,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === SEARCH_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.SEARCH_PATH && req.method === "POST") {
 			try {
 				await require_search.handleSearch(req, res, await require_helpers.readBody(req), serviceFixtures?.search ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -2072,7 +2459,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === RERANK_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.RERANK_PATH && req.method === "POST") {
 			try {
 				await require_rerank.handleRerank(req, res, await require_helpers.readBody(req), serviceFixtures?.rerank ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -2080,7 +2467,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === MODERATIONS_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.MODERATIONS_PATH && req.method === "POST") {
 			try {
 				await require_moderation.handleModeration(req, res, await require_helpers.readBody(req), serviceFixtures?.moderation ?? [], journal, defaults, setCorsHeaders);
 			} catch (err) {
@@ -2088,7 +2475,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === ELEVENLABS_SOUND_GENERATION_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.ELEVENLABS_SOUND_GENERATION_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_elevenlabs_audio.handleElevenLabsAudio(req, res, await require_helpers.readBody(req), fixtures, defaults, journal, "sound-generation");
@@ -2097,7 +2484,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === ELEVENLABS_VOICE_DESIGN_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.ELEVENLABS_VOICE_DESIGN_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_elevenlabs_voice.handleElevenLabsVoiceDesign(req, res, await require_helpers.readBody(req), fixtures, defaults, journal);
@@ -2106,7 +2493,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname === ELEVENLABS_VOICE_CREATE_PATH && req.method === "POST") {
+		if (pathname === require_route_registry.ELEVENLABS_VOICE_CREATE_PATH && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_elevenlabs_voice.handleElevenLabsVoiceCreate(req, res, await require_helpers.readBody(req), fixtures, defaults, journal);
@@ -2115,7 +2502,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const elevenLabsVoiceMatch = pathname.match(ELEVENLABS_VOICE_RE);
+		const elevenLabsVoiceMatch = pathname.match(require_route_registry.ELEVENLABS_VOICE_RE);
 		if (elevenLabsVoiceMatch && (req.method === "GET" || req.method === "DELETE")) {
 			setCorsHeaders(res);
 			let voiceId;
@@ -2147,7 +2534,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const elevenLabsTTSMatch = pathname.match(ELEVENLABS_TTS_RE);
+		const elevenLabsTTSMatch = pathname.match(require_route_registry.ELEVENLABS_TTS_RE);
 		if (elevenLabsTTSMatch && req.method === "POST") {
 			setCorsHeaders(res);
 			const voiceId = elevenLabsTTSMatch[1];
@@ -2158,7 +2545,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		const musicMatch = pathname.match(ELEVENLABS_MUSIC_RE);
+		const musicMatch = pathname.match(require_route_registry.ELEVENLABS_MUSIC_RE);
 		if (musicMatch && req.method === "POST") {
 			setCorsHeaders(res);
 			const musicSubType = musicMatch[1] ?? "music";
@@ -2170,7 +2557,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			return;
 		}
 		let falBody;
-		if (require_metrics.FAL_ROUTE_RE.test(pathname) && req.headers["x-fal-target-host"]) {
+		if (require_route_registry.FAL_ROUTE_RE.test(pathname) && req.headers["x-fal-target-host"]) {
 			setCorsHeaders(res);
 			try {
 				falBody = req.method === "POST" || req.method === "PUT" ? await require_helpers.readBody(req) : "";
@@ -2200,7 +2587,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				return;
 			}
 		}
-		if (pathname.match(FAL_QUEUE_SUBMIT_RE) && req.method === "POST") {
+		if (pathname.match(require_route_registry.FAL_QUEUE_SUBMIT_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_fal_audio.handleFalQueue(req, res, falBody ?? await require_helpers.readBody(req), pathname, fixtures, defaults, journal);
@@ -2209,7 +2596,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname.match(FAL_QUEUE_REQUESTS_RE) && (req.method === "GET" || req.method === "POST" || req.method === "PUT")) {
+		if (pathname.match(require_route_registry.FAL_QUEUE_REQUESTS_RE) && (req.method === "GET" || req.method === "POST" || req.method === "PUT")) {
 			setCorsHeaders(res);
 			try {
 				const raw = req.method === "POST" || req.method === "PUT" ? falBody ?? await require_helpers.readBody(req) : "{}";
@@ -2236,7 +2623,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname.match(FAL_RUN_RE) && req.method === "POST") {
+		if (pathname.match(require_route_registry.FAL_RUN_RE) && req.method === "POST") {
 			setCorsHeaders(res);
 			try {
 				await require_fal_audio.handleFalQueue(req, res, falBody ?? await require_helpers.readBody(req), pathname, fixtures, defaults, journal);
@@ -2245,7 +2632,9 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
-		if (pathname !== COMPLETIONS_PATH) {
+		if (pathname !== require_route_registry.COMPLETIONS_PATH) {
+			const catalogMatch = require_route_registry.matchRouteDefinition(req.method ?? "", pathname);
+			if (catalogMatch && !(pathname === require_route_registry.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;
 		}
@@ -2325,26 +2714,32 @@ 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 (!require_api_key_auth.validateRequestApiKey(req, resolvedAuth.policy).ok) {
 			require_api_key_auth.writeApiKeyUpgradeRejection(socket);
 			return;
 		}
-		if (mounts) {
-			for (const { path: mountPath, handler } of mounts) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
-				const subPath = pathname.slice(mountPath.length) || "/";
-				if (await handler.handleUpgrade(socket, head, subPath)) return;
-			}
+		for (const { path: mountPath, handler } of mountList) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
+			const subPath = pathname.slice(mountPath.length) || "/";
+			if (await handler.handleUpgrade(socket, head, subPath)) return;
 		}
-		if (!pathname.match(AZURE_DEPLOYMENT_RE)) pathname = normalizeCompatPath(pathname, logger);
-		if (pathname !== RESPONSES_PATH && pathname !== REALTIME_PATH && pathname !== GEMINI_LIVE_PATH && pathname !== LIVE_PATH) {
+		if (!pathname.match(require_route_registry.AZURE_DEPLOYMENT_RE)) pathname = normalizeCompatPath(pathname, logger);
+		if (pathname !== require_route_registry.RESPONSES_PATH && pathname !== require_route_registry.REALTIME_PATH && pathname !== require_route_registry.GEMINI_LIVE_PATH && pathname !== require_route_registry.LIVE_PATH) {
 			socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
 			socket.destroy();
 			return;
 		}
 		let liveId;
-		if (pathname === LIVE_PATH) {
+		if (pathname === require_route_registry.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;
@@ -2366,7 +2761,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 		if (head.length > 0) socket.unshift(head);
 		let ws;
 		try {
-			ws = require_ws_framing.upgradeToWebSocket(req, socket, pathname === LIVE_PATH ? liveLimits : void 0);
+			ws = require_ws_framing.upgradeToWebSocket(req, socket, pathname === require_route_registry.LIVE_PATH ? liveLimits : void 0);
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : "WebSocket upgrade failed";
 			if (liveId !== void 0) liveSessions.delete(liveId);
@@ -2383,7 +2778,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			activeConnections.delete(ws);
 		});
 		const wsTestId = require_helpers.getTestId(req);
-		if (pathname === LIVE_PATH && liveId !== void 0) {
+		if (pathname === require_route_registry.LIVE_PATH && liveId !== void 0) {
 			const sessionId = liveId;
 			const dispose = require_ws_live.handleLiveSession(ws, fixtures, journal, {
 				defaults,
@@ -2400,13 +2795,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				testId: wsTestId,
 				dispose
 			});
-		} else if (pathname === RESPONSES_PATH) require_ws_responses.handleWebSocketResponses(ws, fixtures, journal, {
+		} else if (pathname === require_route_registry.RESPONSES_PATH) require_ws_responses.handleWebSocketResponses(ws, fixtures, journal, {
 			...defaults,
 			model: "gpt-4",
 			testId: wsTestId,
 			upgradeHeaders: req.headers
 		});
-		else if (pathname === REALTIME_PATH) {
+		else if (pathname === require_route_registry.REALTIME_PATH) {
 			const transcriptionIntent = parsedUrl.searchParams.get("intent") === "transcription";
 			const model = transcriptionIntent ? "gpt-transcribe" : parsedUrl.searchParams.get("model") ?? "gpt-realtime-2";
 			require_ws_realtime.handleWebSocketRealtime(ws, fixtures, journal, {
@@ -2416,7 +2811,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				testId: wsTestId,
 				upgradeHeaders: req.headers
 			});
-		} else if (pathname === GEMINI_LIVE_PATH) require_ws_gemini_live.handleWebSocketGeminiLive(ws, fixtures, journal, {
+		} else if (pathname === require_route_registry.GEMINI_LIVE_PATH) require_ws_gemini_live.handleWebSocketGeminiLive(ws, fixtures, journal, {
 			...defaults,
 			model: "gemini-2.0-flash",
 			testId: wsTestId,
@@ -2445,9 +2840,13 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				return;
 			}
 			const url = `http://${addr.address}:${addr.port}`;
-			if (mounts) {
-				for (const { path: mountPath, handler } of mounts) if (handler.setBaseUrl) handler.setBaseUrl(url + mountPath);
+			try {
+				commitHandOff();
+			} catch (err) {
+				server.close(() => reject(err));
+				return;
 			}
+			for (const { path: mountPath, handler } of mountList) if (handler.setBaseUrl) handler.setBaseUrl(url + mountPath);
 			resolve({
 				closeLiveSessions,
 				server,