@copilotkit/aimock 1.43.0 → 1.44.0

package/dist/server.js

@@ -1,10 +1,11 @@
 import { DEFAULT_TEST_ID } from "./constants.js";
+import { build, msg, quote } from "./message-text.js";
 import { markAuthenticatedRequest, resolveInboundAuth, validateRequestApiKey, writeApiKeyHttpRejection, writeApiKeyUpgradeRejection } from "./api-key-auth.js";
-import { RequestBodyTooLargeError, buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, buildTextChunks, buildTextCompletion, buildToolCallChunks, buildToolCallCompletion, buildUsageChunk, describeMatch, extractOverrides, flattenHeaders, getContext, getTestId, isAudioResponse, isContentWithToolCallsResponse, isEmbeddingResponse, isErrorResponse, isImageResponse, isJSONResponse, isJsonObject, isResponseFactory, isTextResponse, isToolCallResponse, isTranscriptionResponse, isVideoResponse, markMintedRequestId, readBody, readBodyBufferBounded, resolveFixtureBlockOutcome, resolveReasoningForModel, resolveRequestId, resolveResponse, resolveStrictMode, resolveTestId, resolveUsage, serializeErrorResponse, strictNoMatchLogLine, strictNoMatchMessage, strictOverrideField, wouldProxyMiss } from "./helpers.js";
+import { RequestBodyTooLargeError, buildContentWithToolCallsChunks, buildContentWithToolCallsCompletion, 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 { INJECTED_STATUS_RANGE, claimOneShotError, clearFixtureQueue, entryToFixture, isInjectableStatus, isOneShotError, queueOneShotError, releaseOneShotError, validateFixtures } from "./fixture-loader.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";
@@ -37,6 +38,7 @@ import { handleSearch } from "./search.js";
 import { handleRerank } from "./rerank.js";
 import { handleModeration } from "./moderation.js";
 import { clearFineTuningStore, handleFineTuningCancel, handleFineTuningCreate, handleFineTuningEvents, handleFineTuningList, handleFineTuningRetrieve } from "./fine-tuning.js";
+import { clearVectorStoreStore, handleVectorFileBatchesCancel, handleVectorFileBatchesCreate, handleVectorFileBatchesFiles, handleVectorFileBatchesRetrieve, handleVectorStoreFilesCreate, handleVectorStoreFilesDelete, handleVectorStoreFilesList, handleVectorStoreFilesRetrieve, handleVectorStoresCreate, handleVectorStoresDelete, handleVectorStoresList, handleVectorStoresModify, handleVectorStoresRetrieve, handleVectorStoresSearch } from "./vector-stores.js";
 import { FILES_BODY_DRAIN_MAX_BYTES, FILES_BODY_MAX_BYTES, FILES_BODY_OVERSIZED, clearFileStore, handleFilesContent, handleFilesCreate, handleFilesDelete, handleFilesList, handleFilesRetrieve } from "./files.js";
 import { clearBatchStore, handleBatchesCancel, handleBatchesCreate, handleBatchesList, handleBatchesRetrieve } from "./batches.js";
 import { upgradeToWebSocket } from "./ws-framing.js";
@@ -44,41 +46,17 @@ import { handleLiveSession } from "./ws-live.js";
 import { handleWebSocketResponses } from "./ws-responses.js";
 import { handleWebSocketRealtime } from "./ws-realtime.js";
 import { handleWebSocketGeminiLive } from "./ws-gemini-live.js";
-import { BYTEPLUS_VIDEO_STATUS_RE, BYTEPLUS_VIDEO_SUBMIT_RE, DESTROYED_STATUS_LABEL, FAL_ROUTE_RE, FILES_CONTENT_RE, FILES_ID_RE, GROK_VIDEO_STATUS_RE, GROK_VIDEO_SUBMIT_PATH, OPENROUTER_VIDEO_CONTENT_RE, OPENROUTER_VIDEO_STATUS_RE, VEO_OPERATION_RE, VEO_PREDICT_LRO_RE, createMetricsRegistry, normalizePathLabel } from "./metrics.js";
+import { AZURE_DEPLOYMENT_RE, BATCHES_CANCEL_RE, BATCHES_ID_RE, BATCHES_PATH, BEDROCK_CONVERSE_RE, BEDROCK_CONVERSE_STREAM_RE, BEDROCK_INVOKE_RE, BEDROCK_STREAM_RE, BYTEPLUS_VIDEO_STATUS_RE, BYTEPLUS_VIDEO_SUBMIT_RE, COHERE_CHAT_PATH, COHERE_EMBED_PATH, COMPLETIONS_PATH, CONTROL_PREFIX, ELEVENLABS_MUSIC_RE, ELEVENLABS_SOUND_GENERATION_PATH, ELEVENLABS_TTS_RE, ELEVENLABS_VOICE_CREATE_PATH, ELEVENLABS_VOICE_DESIGN_PATH, ELEVENLABS_VOICE_RE, EMBEDDINGS_PATH, FAL_QUEUE_REQUESTS_RE, FAL_QUEUE_SUBMIT_RE, FAL_ROUTE_RE, FAL_RUN_RE, FILES_CONTENT_RE, FILES_ID_RE, FILES_PATH, FINE_TUNING_CANCEL_RE, FINE_TUNING_EVENTS_RE, FINE_TUNING_ID_RE, FINE_TUNING_JOBS_PATH, GEMINI_EMBED_RE, GEMINI_INTERACTIONS_PATH, GEMINI_LIVE_PATH, GEMINI_PATH_RE, GEMINI_PREDICT_RE, GROK_VIDEO_STATUS_RE, GROK_VIDEO_SUBMIT_PATH, HEALTH_PATH, IMAGES_EDIT_PATH, IMAGES_PATH, IMAGES_VARIATIONS_PATH, LIVE_PATH, MESSAGES_PATH, METRICS_PATH, MODELS_PATH, MODERATIONS_PATH, OLLAMA_CHAT_PATH, OLLAMA_EMBEDDINGS_PATH, OLLAMA_EMBED_PATH, OLLAMA_GENERATE_PATH, OLLAMA_TAGS_PATH, OPENROUTER_CREDITS_PATH, OPENROUTER_KEY_PATH, OPENROUTER_MODELS_PATH, OPENROUTER_VIDEOS_PATH, OPENROUTER_VIDEO_CONTENT_RE, OPENROUTER_VIDEO_MODELS_PATH, OPENROUTER_VIDEO_STATUS_RE, READY_PATH, REALTIME_PATH, REQUESTS_PATH, RERANK_PATH, RESPONSES_PATH, SEARCH_PATH, SPEECH_PATH, TRANSCRIPTIONS_PATH, TRANSLATIONS_PATH, VECTOR_STORES_BATCH_CANCEL_RE, VECTOR_STORES_BATCH_FILES_RE, VECTOR_STORES_BATCH_RE, VECTOR_STORES_FILES_RE, VECTOR_STORES_FILE_BATCHES_RE, VECTOR_STORES_FILE_RE, VECTOR_STORES_ID_RE, VECTOR_STORES_PATH, VECTOR_STORES_SEARCH_RE, VEO_OPERATION_RE, VEO_PREDICT_LRO_RE, VERTEX_AI_RE, VIDEOS_PATH, matchRouteDefinition } from "./route-registry.js";
+import { CATALOG_ROUTES, buildOpenApiDocument } from "./openapi.js";
+import { DESTROYED_STATUS_LABEL, createMetricsRegistry, normalizePathLabel } from "./metrics.js";
+import { MCP_FAKES_DEFAULT_MOUNT, McpFakeStore, McpFakesAddError, blockIdOf } from "./mcp-fakes.js";
+import { MCPMock } from "./mcp-mock.js";
+import { ensureFakeMount, findFakeMount, handOffMcpFakes, isFakeMount, mountConflictDetail } from "./mcp-fakes-mount.js";
 import * as http$1 from "node:http";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/server.ts
 const liveClosers = /* @__PURE__ */ new WeakMap();
-const COMPLETIONS_PATH = "/v1/chat/completions";
-const RESPONSES_PATH = "/v1/responses";
-const LIVE_PATH = "/v1/live/sessions";
-const REALTIME_PATH = "/v1/realtime";
-const GEMINI_LIVE_PATH = "/ws/google.ai.generativelanguage.v1beta.GenerativeService.BidiGenerateContent";
-const MESSAGES_PATH = "/v1/messages";
-const EMBEDDINGS_PATH = "/v1/embeddings";
-const COHERE_CHAT_PATH = "/v2/chat";
-const COHERE_EMBED_PATH = "/v2/embed";
-const SEARCH_PATH = "/search";
-const RERANK_PATH = "/v2/rerank";
-const MODERATIONS_PATH = "/v1/moderations";
-const IMAGES_PATH = "/v1/images/generations";
-const IMAGES_EDIT_PATH = "/v1/images/edits";
-const IMAGES_VARIATIONS_PATH = "/v1/images/variations";
-const SPEECH_PATH = "/v1/audio/speech";
-const TRANSCRIPTIONS_PATH = "/v1/audio/transcriptions";
-const TRANSLATIONS_PATH = "/v1/audio/translations";
-const VIDEOS_PATH = "/v1/videos";
-const GEMINI_PREDICT_RE = /^\/v1beta\/models\/([^:]+):predict$/;
-const ELEVENLABS_SOUND_GENERATION_PATH = "/v1/sound-generation";
-const ELEVENLABS_TTS_RE = /^\/v1\/text-to-speech\/([^/]+)$/;
-const ELEVENLABS_MUSIC_RE = /^\/v1\/music(?:\/(.+))?$/;
-const ELEVENLABS_VOICE_DESIGN_PATH = "/v1/text-to-voice/design";
-const ELEVENLABS_VOICE_CREATE_PATH = "/v1/text-to-voice";
-const ELEVENLABS_VOICE_RE = /^\/v1\/voices\/([^/]+)$/;
-const FAL_QUEUE_SUBMIT_RE = /^\/fal\/queue\/submit\/(.+)$/;
-const FAL_QUEUE_REQUESTS_RE = /^\/fal\/queue\/requests\/(.+)$/;
-const FAL_RUN_RE = /^\/fal\/run\/(.+)$/;
 const DEFAULT_CHUNK_SIZE = 20;
 const COMPAT_SUFFIXES = [
 	"/chat/completions",
@@ -107,34 +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 BATCHES_PATH = "/v1/batches";
-const BATCHES_ID_RE = /^\/v1\/batches\/([^/]+)$/;
-const BATCHES_CANCEL_RE = /^\/v1\/batches\/([^/]+)\/cancel$/;
-const FILES_PATH = "/v1/files";
-const FINE_TUNING_JOBS_PATH = "/v1/fine_tuning/jobs";
-const FINE_TUNING_ID_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)$/;
-const FINE_TUNING_CANCEL_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/cancel$/;
-const FINE_TUNING_EVENTS_RE = /^\/v1\/fine_tuning\/jobs\/([^/]+)\/events$/;
 const DEFAULT_MODELS = [
 	"gpt-4",
 	"gpt-4o",
@@ -144,7 +94,7 @@ const DEFAULT_MODELS = [
 ];
 const CORS_HEADERS = {
 	"Access-Control-Allow-Origin": "*",
-	"Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
+	"Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
 	"Access-Control-Allow-Headers": "*",
 	"Access-Control-Expose-Headers": "X-Total-Count, X-Request-Id"
 };
@@ -163,7 +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. */
@@ -202,6 +151,7 @@ function performFullReset(fixtures, targets) {
 	clearElevenLabsVoices();
 	clearFileStore();
 	clearFineTuningStore();
+	clearVectorStoreStore();
 	resetInteractionCounter();
 	resetEventIdCounter();
 	if (!targets) return;
@@ -214,6 +164,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);
 }
 /**
@@ -268,9 +219,14 @@ function fixtureResponseKind(response) {
 * scoping path does not also do. (Splitting on "," additionally broke every
 * legitimately comma-bearing id.) A raw `path.includes("testId=t1")` both
 * prefix-collides with `t10` and matches unrelated params like `notTestId`.
+*
+* An MCP mount records the test id it resolved on the entry (I9, B3): a
+* decoded header or query value, or the one bound to the session at
+* `initialize`. That value wins; LLM entries carry none and are attributed as
+* before.
 */
 function journalEntryTestId(entry) {
-	return resolveTestId(entry.headers, entry.path);
+	return entry.testId ?? resolveTestId(entry.headers, entry.path);
 }
 /**
 * The testId a chaos override is stored under, and read back with — resolved by
@@ -309,19 +265,186 @@ function effectiveChaos(defaults, scopeId) {
 	if (!current) return {};
 	return isChaosScope(current) ? current.base ?? {} : current;
 }
+/** The `GET /__aimock/mcp/fakes` query-param vocabulary; anything else 400s. */
+const MCP_FAKES_PARAMS = new Set([
+	"testId",
+	"context",
+	"mount"
+]);
+/** A block's `mount` path, read without running getters; the add validates it. */
+function controlFakeMountOf(raw) {
+	if (typeof raw !== "object" || raw === null) return MCP_FAKES_DEFAULT_MOUNT;
+	const value = Object.getOwnPropertyDescriptor(raw, "mount")?.value;
+	return typeof value === "string" ? value : MCP_FAKES_DEFAULT_MOUNT;
+}
+/**
+* Check one `POST /__aimock/fixtures` `mcpFakes` value against the live
+* mounts (F10, W6) without changing anything. Returns every error in input
+* order (an empty list when the value can be added), and `apply`, which adds
+* the blocks (auto-mounting an MCPMock where no mount serves a block's path)
+* and returns the number of blocks added.
+*
+* The whole value is checked before any mount is touched, and the check
+* never adds to a real mount: each group is added to a throwaway store,
+* whose errors are the ones reported (it numbers the add `control-api#1`, as
+* a new mount would; for an existing MCPMock the rejected group is re-run on
+* its atomic add, so the errors name that mount's next `<n>`, I7). A group
+* whose path no request to it can reach (a mount that is not an MCPMock
+* serves it, an MCPMock answers it as its root, or it is under the control
+* prefix) is a mount conflict (one error per block).
+*/
+function planControlApiFakes(raw, mounts) {
+	const items = Array.isArray(raw) ? raw.map((block, position) => ({
+		position,
+		source: {
+			source: "control-api",
+			blockIndex: position,
+			raw: block
+		}
+	})) : [{
+		position: 0,
+		source: {
+			source: "control-api",
+			blockIndex: null,
+			raw
+		}
+	}];
+	const groups = /* @__PURE__ */ new Map();
+	if (items.length === 0) groups.set(MCP_FAKES_DEFAULT_MOUNT, {
+		path: MCP_FAKES_DEFAULT_MOUNT,
+		positions: [],
+		sources: []
+	});
+	for (const { position, source } of items) {
+		const path = controlFakeMountOf(source.raw);
+		const group = groups.get(path) ?? {
+			path,
+			positions: [],
+			sources: []
+		};
+		group.positions.push(position);
+		group.sources.push(source);
+		groups.set(path, group);
+	}
+	const found = [];
+	/** The paths `apply` auto-mounts, in order. */
+	const pending = [];
+	for (const group of groups.values()) {
+		const target = findFakeMount(mounts, group.path, pending);
+		if (target.kind === "conflict") {
+			group.positions.forEach((position) => {
+				const where = Array.isArray(raw) ? msg`mcpFakes[${position}]` : msg`mcpFakes`;
+				found.push({
+					position,
+					error: new FixtureLoadError({
+						rule: "mcp-fakes/mount-conflict",
+						file: null,
+						blockId: null,
+						entryId: null,
+						detail: msg`${where}: ${mountConflictDetail(group.path, target)}`
+					})
+				});
+			});
+			continue;
+		}
+		let failure = addFailure(() => new McpFakeStore().add(group.sources, { kind: "control-api" }));
+		if (target.kind === "none") pending.push(group.path);
+		if (!failure) continue;
+		if (target.kind === "mcp" && target.handler.addMcpFakes === MCPMock.prototype.addMcpFakes) {
+			const handler = target.handler;
+			failure = addFailure(() => handler.addMcpFakes?.(group.sources, { kind: "control-api" })) ?? failure;
+		}
+		for (const error of failure.errors) found.push({
+			position: positionOf(error, group),
+			error
+		});
+	}
+	found.sort((a, b) => a.position - b.position);
+	return {
+		errors: found.map((f) => f.error),
+		apply(wiring) {
+			let added = 0;
+			for (const group of groups.values()) {
+				const target = ensureFakeMount(mounts, group.path, {
+					journal: wiring.journal,
+					registry: wiring.defaults.registry,
+					logger: wiring.defaults.logger
+				}, 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" });
@@ -472,6 +595,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: build(msg`No MCP mount at ${quote(mount ?? "")}`) });
+		return reply(200, {
+			testId,
+			context,
+			mounts: listed
+		});
+	}
 	if (subPath === "/fixtures" && req.method === "POST") {
 		let raw;
 		try {
@@ -493,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") {
 		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 }));
@@ -528,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());
@@ -737,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);
@@ -1146,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();
@@ -1437,9 +1670,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 = http$1.createServer((req, res) => {
@@ -1462,7 +1696,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (recorded) return;
 				recorded = true;
 				try {
-					const normalizedPath = normalizePathLabel(pathname, mounts ? mounts.map((m) => m.path) : []);
+					const normalizedPath = normalizePathLabel(pathname, mountList.map((m) => m.path));
 					const method = req.method ?? "UNKNOWN";
 					registry.incrementCounter("aimock_requests_total", {
 						method,
@@ -1483,7 +1717,36 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 				if (!res.writableFinished) recordOutcome(DESTROYED_STATUS_LABEL);
 			});
 		}
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		let parsedUrl;
+		try {
+			parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		} catch (err) {
+			const route = `${req.method ?? "?"} ${req.url ?? "?"}`;
+			const msg = err instanceof Error ? err.message : "Internal error";
+			logger.error(`${route}: ${msg}`);
+			if (err instanceof Error && err.stack) logger.debug(err.stack);
+			try {
+				journal.add({
+					method: req.method ?? "?",
+					path: req.url ?? "?",
+					headers: flattenHeaders(req.headers),
+					body: null,
+					response: {
+						status: 400,
+						fixture: null,
+						source: "internal"
+					}
+				});
+			} catch (jErr) {
+				logger.warn(`${route}: journal write failed after handler error: ${jErr instanceof Error ? jErr.message : String(jErr)}`);
+			}
+			setCorsHeaders(res);
+			writeErrorResponse(res, 400, JSON.stringify({ error: {
+				message: "Invalid request target",
+				type: "invalid_request_error"
+			} }));
+			return;
+		}
 		pathname = parsedUrl.pathname;
 		const originalPathname = pathname;
 		const isOpenRouter = isOpenRouterPath(originalPathname);
@@ -1492,7 +1755,7 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			handleOptions(res);
 			return;
 		}
-		if (!(req.method === "GET" && (pathname === HEALTH_PATH || pathname === READY_PATH || pathname === "/metrics"))) {
+		if (!(req.method === "GET" && (pathname === HEALTH_PATH || pathname === READY_PATH || pathname === METRICS_PATH))) {
 			if (!validateRequestApiKey(req, resolvedAuth.policy).ok) {
 				writeApiKeyHttpRejection(res, setCorsHeaders);
 				return;
@@ -1500,14 +1763,12 @@ 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 {
@@ -1602,15 +1863,15 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			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;
 		}
@@ -1623,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();
 				}
@@ -1649,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;
@@ -1797,14 +2058,140 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			}
 			return;
 		}
+		const vsSearchMatch = pathname.match(VECTOR_STORES_SEARCH_RE);
+		if (vsSearchMatch && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				await handleVectorStoresSearch(req, res, vsSearchMatch[1], raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchFilesMatch = pathname.match(VECTOR_STORES_BATCH_FILES_RE);
+		if (vsBatchFilesMatch && req.method === "GET") {
+			try {
+				await handleVectorFileBatchesFiles(req, res, vsBatchFilesMatch[1], vsBatchFilesMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchCancelMatch = pathname.match(VECTOR_STORES_BATCH_CANCEL_RE);
+		if (vsBatchCancelMatch && req.method === "POST") {
+			try {
+				await readBody(req);
+				await handleVectorFileBatchesCancel(req, res, vsBatchCancelMatch[1], vsBatchCancelMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsBatchMatch = pathname.match(VECTOR_STORES_BATCH_RE);
+		if (vsBatchMatch && req.method === "GET") {
+			try {
+				await handleVectorFileBatchesRetrieve(req, res, vsBatchMatch[1], vsBatchMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsFileMatch = pathname.match(VECTOR_STORES_FILE_RE);
+		if (vsFileMatch && req.method === "GET") {
+			try {
+				await handleVectorStoreFilesRetrieve(req, res, vsFileMatch[1], vsFileMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsFileMatch && req.method === "DELETE") {
+			try {
+				await handleVectorStoreFilesDelete(req, res, vsFileMatch[1], vsFileMatch[2], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		const vsIdMatch = pathname.match(VECTOR_STORES_ID_RE);
+		if (vsIdMatch && req.method === "GET") {
+			try {
+				await handleVectorStoresRetrieve(req, res, vsIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsIdMatch && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				await handleVectorStoresModify(req, res, vsIdMatch[1], raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (vsIdMatch && req.method === "DELETE") {
+			try {
+				await handleVectorStoresDelete(req, res, vsIdMatch[1], journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				const storeId = pathname.split("/")[3];
+				await handleVectorStoreFilesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILES_RE.test(pathname) && req.method === "GET") {
+			try {
+				const storeId = pathname.split("/")[3];
+				await handleVectorStoreFilesList(req, res, storeId, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (VECTOR_STORES_FILE_BATCHES_RE.test(pathname) && req.method === "POST") {
+			try {
+				const raw = await readBody(req);
+				const storeId = pathname.split("/")[3];
+				await handleVectorFileBatchesCreate(req, res, storeId, raw, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === VECTOR_STORES_PATH && req.method === "GET") {
+			try {
+				await handleVectorStoresList(req, res, journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
+		if (pathname === VECTOR_STORES_PATH && req.method === "POST") {
+			try {
+				await handleVectorStoresCreate(req, res, await readBody(req), journal, defaults, setCorsHeaders);
+			} catch (err) {
+				routeError(req, res, err, pathname, { service: "vector-stores" });
+			}
+			return;
+		}
 		if (pathname === REQUESTS_PATH) {
 			setCorsHeaders(res);
 			if (req.method === "GET") {
 				const limitParam = parsedUrl.searchParams.get("limit");
 				let opts;
 				if (limitParam) {
-					const limit = parseInt(limitParam, 10);
-					if (Number.isNaN(limit) || limit <= 0) {
+					const limit = Number(limitParam);
+					if (!/^\+?\d+$/.test(limitParam.trim()) || !Number.isSafeInteger(limit) || limit <= 0) {
 						writeErrorResponse(res, 400, JSON.stringify({ error: {
 							message: `Invalid limit parameter: "${limitParam}"`,
 							type: "invalid_request_error"
@@ -1873,7 +2260,7 @@ 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) {
 				routeError(req, res, err, pathname);
 			}
@@ -2244,6 +2631,8 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			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;
 		}
@@ -2323,17 +2712,23 @@ async function createServerWithResolvedAuth(fixtures, options, resolvedAuth, mou
 			server.emit("connection", socket);
 			return;
 		}
-		const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		let parsedUrl;
+		try {
+			parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : "Internal error";
+			defaults.logger.warn(`Unhandled upgrade error: ${msg}`);
+			socket.end("HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n");
+			return;
+		}
 		let pathname = parsedUrl.pathname;
 		if (!validateRequestApiKey(req, resolvedAuth.policy).ok) {
 			writeApiKeyUpgradeRejection(socket);
 			return;
 		}
-		if (mounts) {
-			for (const { path: mountPath, handler } of mounts) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
-				const subPath = pathname.slice(mountPath.length) || "/";
-				if (await handler.handleUpgrade(socket, head, subPath)) return;
-			}
+		for (const { path: mountPath, handler } of mountList) if ((pathname === mountPath || pathname.startsWith(mountPath + "/")) && handler.handleUpgrade) {
+			const subPath = pathname.slice(mountPath.length) || "/";
+			if (await handler.handleUpgrade(socket, head, subPath)) return;
 		}
 		if (!pathname.match(AZURE_DEPLOYMENT_RE)) pathname = normalizeCompatPath(pathname, logger);
 		if (pathname !== RESPONSES_PATH && pathname !== REALTIME_PATH && pathname !== GEMINI_LIVE_PATH && pathname !== LIVE_PATH) {
@@ -2443,9 +2838,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,