@agimon-ai/mcp-proxy 0.4.2 → 0.4.3

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-Cm2AVRBA.cjs');
+const require_src = require('./src-G1hs2GLZ.cjs');
 let node_crypto = require("node:crypto");
 let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
@@ -141,21 +141,16 @@ const CONFIG_FILE_NAMES = [
 	"mcp-config.json"
 ];
 const MCP_ENDPOINT_PATH = "/mcp";
-const DEFAULT_PORT = 3e3;
 const DEFAULT_HOST$1 = "localhost";
 const TRANSPORT_TYPE_STDIO = "stdio";
 const TRANSPORT_TYPE_HTTP = "http";
 const TRANSPORT_TYPE_SSE = "sse";
 const TRANSPORT_TYPE_STDIO_HTTP = "stdio-http";
 const RUNTIME_TRANSPORT = TRANSPORT_TYPE_HTTP;
-const STDIO_HTTP_PROXY_STOP_LABEL = "Failed stopping stdio-http proxy";
-const INTERNAL_HTTP_STOP_LABEL = "Failed stopping internal HTTP transport";
 const PORT_REGISTRY_SERVICE_HTTP = "mcp-proxy-http";
-const PORT_REGISTRY_SERVICE_STDIO_HTTP = "mcp-proxy-stdio-http";
 const PORT_REGISTRY_SERVICE_TYPE = "service";
 const PORT_REGISTRY_REPOSITORY_PATH = process.cwd();
 const PROCESS_REGISTRY_SERVICE_HTTP = "mcp-proxy-http";
-const PROCESS_REGISTRY_SERVICE_STDIO_HTTP = "mcp-proxy-stdio-http";
 const PROCESS_REGISTRY_SERVICE_TYPE = "service";
 const PROCESS_REGISTRY_REPOSITORY_PATH = process.cwd();
 function toErrorMessage$9(error) {
@@ -167,13 +162,6 @@ function isValidTransportType(type) {
 function isValidProxyMode(mode) {
 	return mode === "meta" || mode === "flat" || mode === "search";
 }
-function isAddressInUseError(error) {
-	if (error instanceof Error && error.message.includes("EADDRINUSE")) return true;
-	if (typeof error !== "object" || error === null) return false;
-	if ("code" in error && error.code === "EADDRINUSE") return true;
-	if ("message" in error && typeof error.message === "string" && error.message.includes("EADDRINUSE")) return true;
-	return false;
-}
 async function pathExists(filePath) {
 	try {
 		await (0, node_fs_promises.access)(filePath, node_fs.constants.F_OK);
@@ -224,7 +212,7 @@ function createTransportConfig(options, mode) {
 	const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
 	return {
 		mode,
-		port: options.port ?? (Number.isFinite(envPort) ? envPort : void 0) ?? DEFAULT_PORT,
+		port: options.port ?? (Number.isFinite(envPort) ? envPort : void 0),
 		host: options.host || process.env.MCP_HOST || DEFAULT_HOST$1
 	};
 }
@@ -241,7 +229,7 @@ function createServerOptions(options, resolvedConfigPath, serverId) {
 function formatStartError(type, host, port, error) {
 	const startErrorMessage = toErrorMessage$9(error);
 	if (type === TRANSPORT_TYPE_STDIO) return `Failed to start MCP server with transport '${type}': ${startErrorMessage}`;
-	return `Failed to start MCP server with transport '${type}' on ${host}:${port}: ${startErrorMessage}`;
+	return `Failed to start MCP server with transport '${type}' on ${port === void 0 ? `${host} (dynamic port)` : `${host}:${port}`}: ${startErrorMessage}`;
 }
 function createRuntimeRecord(serverId, config, port, shutdownToken, configPath) {
 	return {
@@ -264,10 +252,10 @@ function createProcessRegistryService() {
 function getRegistryEnvironment() {
 	return process.env.NODE_ENV ?? "development";
 }
-async function createPortRegistryLease(serviceName, host, preferredPort, serverId, transport, configPath, portRange = {
+async function createPortRegistryLease(serviceName, host, preferredPort, serverId, transport, configPath, portRange = preferredPort !== void 0 ? {
 	min: preferredPort,
 	max: preferredPort
-}) {
+} : __agimon_ai_foundation_port_registry.DEFAULT_PORT_RANGE) {
 	const portRegistry = createPortRegistryService();
 	const result = await portRegistry.reservePort({
 		repositoryPath: PORT_REGISTRY_REPOSITORY_PATH,
@@ -285,7 +273,10 @@ async function createPortRegistryLease(serviceName, host, preferredPort, serverI
 			...configPath ? { configPath } : {}
 		}
 	});
-	if (!result.success || !result.record) throw new Error(result.error || `Failed to reserve port ${preferredPort} in port registry`);
+	if (!result.success || !result.record) {
+		const requestedPortLabel = preferredPort === void 0 ? "dynamic port" : `port ${preferredPort}`;
+		throw new Error(result.error || `Failed to reserve ${requestedPortLabel} in port registry`);
+	}
 	let released = false;
 	return {
 		port: result.record.port,
@@ -394,27 +385,6 @@ async function cleanupFailedRuntimeStartup(handler, runtimeStateService, serverI
 		await removeRuntimeRecord(runtimeStateService, serverId);
 	}
 }
-async function stopTransportWithContext(label, stopOperation) {
-	try {
-		await stopOperation();
-	} catch (error) {
-		throw new Error(`${label}: ${toErrorMessage$9(error)}`);
-	}
-}
-async function removeRuntimeRecordDuringStop(runtimeStateService, serverId) {
-	try {
-		await removeRuntimeRecord(runtimeStateService, serverId);
-	} catch (error) {
-		throw new Error(`Failed to remove runtime state during HTTP stop callback for '${serverId}': ${toErrorMessage$9(error)}`);
-	}
-}
-function createStdioHttpInternalTransport(sharedServices, config, adminOptions) {
-	try {
-		return new require_src.HttpTransportHandler(() => require_src.createSessionServer(sharedServices), config, adminOptions);
-	} catch (error) {
-		throw new Error(`Failed to create internal HTTP transport for stdio-http proxy: ${toErrorMessage$9(error)}`);
-	}
-}
 /**
 * Start MCP server with given transport handler
 * @param handler - The transport handler to start
@@ -445,14 +415,23 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 	const runtimeStateService = new require_src.RuntimeStateService();
 	const shutdownToken = (0, node_crypto.randomUUID)();
 	const runtimeServerId = serverOptions.serverId ?? require_src.generateServerId();
-	const runtimePort = config.port ?? DEFAULT_PORT;
-	const processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
-	const portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
+	const requestedPort = config.port;
+	const portRange = requestedPort !== void 0 ? {
+		min: requestedPort,
+		max: requestedPort
+	} : __agimon_ai_foundation_port_registry.DEFAULT_PORT_RANGE;
+	const portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, requestedPort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath, portRange);
+	const runtimePort = portLease.port;
+	const runtimeConfig = {
+		...config,
+		port: runtimePort
+	};
+	const processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_HTTP, runtimeConfig.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
 	let releasePort = async () => {
 		await releasePortLease(portLease ?? null);
 		releasePort = async () => void 0;
 	};
-	const runtimeRecord = createRuntimeRecord(runtimeServerId, config, runtimePort, shutdownToken, resolvedConfigPath);
+	const runtimeRecord = createRuntimeRecord(runtimeServerId, runtimeConfig, runtimePort, shutdownToken, resolvedConfigPath);
 	let handler;
 	let isStopping = false;
 	const stopHandler = async () => {
@@ -468,7 +447,7 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 		}
 	};
 	try {
-		handler = new require_src.HttpTransportHandler(() => require_src.createSessionServer(sharedServices), config, createHttpAdminOptions(runtimeRecord.serverId, shutdownToken, stopHandler));
+		handler = new require_src.HttpTransportHandler(() => require_src.createSessionServer(sharedServices), runtimeConfig, createHttpAdminOptions(runtimeRecord.serverId, shutdownToken, stopHandler));
 	} catch (error) {
 		await releasePort();
 		await processLease.release({
@@ -486,7 +465,7 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 				kill: false,
 				releasePort: false
 			});
-			await removeRuntimeRecordDuringStop(runtimeStateService, runtimeRecord.serverId);
+			await removeRuntimeRecord(runtimeStateService, runtimeRecord.serverId);
 		});
 		await writeRuntimeRecord(runtimeStateService, runtimeRecord);
 	} catch (error) {
@@ -501,19 +480,6 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 	}
 	console.error(`Runtime state: http://${runtimeRecord.host}:${runtimeRecord.port} (${runtimeRecord.serverId})`);
 }
-async function stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport) {
-	try {
-		const stopOperations = [stopTransportWithContext(STDIO_HTTP_PROXY_STOP_LABEL, async () => {
-			await stdioHttpHandler.stop();
-		})];
-		if (ownsInternalHttpTransport && httpHandler) stopOperations.push(stopTransportWithContext(INTERNAL_HTTP_STOP_LABEL, async () => {
-			await httpHandler.stop();
-		}));
-		await Promise.all(stopOperations);
-	} catch (error) {
-		throw new Error(`Failed to stop stdio-http transport: ${toErrorMessage$9(error)}`);
-	}
-}
 async function startStdioTransport(serverOptions) {
 	try {
 		await startServer(new require_src.StdioTransportHandler(await require_src.createServer(serverOptions)));
@@ -528,111 +494,21 @@ async function startSseTransport(serverOptions, config) {
 		throw new Error(`Failed to start SSE transport: ${toErrorMessage$9(error)}`);
 	}
 }
-async function startStdioHttpTransport(serverOptions, config, resolvedConfigPath, options) {
-	const shared = { services: null };
-	let processLease;
-	let portLease;
+async function resolveStdioHttpEndpoint(config) {
+	if (config.port !== void 0) return new URL(`http://${config.host ?? DEFAULT_HOST$1}:${config.port}${MCP_ENDPOINT_PATH}`);
+	const result = await createPortRegistryService().getPort({
+		repositoryPath: PORT_REGISTRY_REPOSITORY_PATH,
+		serviceName: PORT_REGISTRY_SERVICE_HTTP,
+		serviceType: PORT_REGISTRY_SERVICE_TYPE,
+		environment: getRegistryEnvironment()
+	});
+	if (!result.success || !result.record) throw new Error(result.error || "No prestarted HTTP backend found for stdio-http transport");
+	return new URL(`http://${config.host ?? result.record.host}:${result.record.port}${MCP_ENDPOINT_PATH}`);
+}
+async function startStdioHttpTransport(config) {
 	try {
-		const serverId = serverOptions.serverId ?? require_src.generateServerId();
-		const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
-		const requestedPort = options.port ?? (Number.isFinite(envPort) ? envPort : void 0) ?? DEFAULT_PORT;
-		const portRange = options.port !== void 0 || Number.isFinite(envPort) ? {
-			min: requestedPort,
-			max: requestedPort
-		} : __agimon_ai_foundation_port_registry.DEFAULT_PORT_RANGE;
-		portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_STDIO_HTTP, config.host ?? DEFAULT_HOST$1, requestedPort, serverId, TRANSPORT_TYPE_STDIO_HTTP, resolvedConfigPath, portRange);
-		const internalPort = portLease.port;
-		const transportConfig = {
-			...config,
-			port: internalPort
-		};
-		const stdioHttpHandler = new require_src.StdioHttpTransportHandler({ endpoint: new URL(`http://${transportConfig.host}:${transportConfig.port}${MCP_ENDPOINT_PATH}`) });
-		const runtimeStateService = new require_src.RuntimeStateService();
-		const shutdownToken = (0, node_crypto.randomUUID)();
-		processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_STDIO_HTTP, transportConfig.host ?? DEFAULT_HOST$1, internalPort, serverId, TRANSPORT_TYPE_STDIO_HTTP, resolvedConfigPath);
-		let httpHandler = null;
-		let ownsInternalHttpTransport = false;
-		let isStopping = false;
-		const stopOwnedRuntime = async () => {
-			if (isStopping) return;
-			isStopping = true;
-			try {
-				await Promise.all([stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport), removeRuntimeRecord(runtimeStateService, serverId)]);
-				await releasePortLease(portLease ?? null);
-				if (shared.services) await shared.services.dispose();
-				ownsInternalHttpTransport = false;
-				process.exit(0);
-			} catch (error) {
-				console.error(`Unexpected error during admin shutdown: ${toErrorMessage$9(error)}`);
-				process.exit(1);
-			}
-		};
-		const adminOptions = createHttpAdminOptions(serverId, shutdownToken, stopOwnedRuntime);
-		await startServer({
-			async start() {
-				let initialProxyConnectError;
-				try {
-					await stdioHttpHandler.start();
-					return;
-				} catch (error) {
-					initialProxyConnectError = error;
-				}
-				if (!shared.services) shared.services = await require_src.initializeSharedServices(serverOptions);
-				try {
-					httpHandler = createStdioHttpInternalTransport(shared.services, transportConfig, adminOptions);
-					await httpHandler.start();
-					ownsInternalHttpTransport = true;
-				} catch (error) {
-					if (!isAddressInUseError(error)) throw new Error(`Failed to start internal HTTP transport for stdio-http proxy: ${toErrorMessage$9(error)}`);
-				}
-				try {
-					await stdioHttpHandler.start();
-				} catch (error) {
-					let rollbackStopErrorMessage = "";
-					if (ownsInternalHttpTransport && httpHandler) {
-						try {
-							await httpHandler.stop();
-						} catch (stopError) {
-							rollbackStopErrorMessage = toErrorMessage$9(stopError);
-						}
-						ownsInternalHttpTransport = false;
-					}
-					const retryErrorMessage = toErrorMessage$9(error);
-					const initialErrorMessage = toErrorMessage$9(initialProxyConnectError);
-					const rollbackMessage = rollbackStopErrorMessage ? `; rollback stop failed: ${rollbackStopErrorMessage}` : "";
-					throw new Error(`Failed to start stdio-http proxy bridge: initial connect failed (${initialErrorMessage}); retry failed (${retryErrorMessage})${rollbackMessage}`);
-				}
-				if (ownsInternalHttpTransport) try {
-					await writeRuntimeRecord(runtimeStateService, createRuntimeRecord(serverId, transportConfig, internalPort, shutdownToken, resolvedConfigPath));
-				} catch (error) {
-					throw new Error(`Failed to persist runtime state for stdio-http server '${serverId}': ${toErrorMessage$9(error)}`);
-				}
-			},
-			async stop() {
-				try {
-					await Promise.all([stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport), removeRuntimeRecord(runtimeStateService, serverId)]);
-					await releasePortLease(portLease ?? null);
-					await processLease?.release({
-						kill: false,
-						releasePort: false
-					});
-					ownsInternalHttpTransport = false;
-					if (shared.services) await shared.services.dispose();
-				} catch (error) {
-					ownsInternalHttpTransport = false;
-					throw new Error(`Failed during stdio-http shutdown for '${serverId}': ${toErrorMessage$9(error)}`);
-				}
-			}
-		});
+		await startServer(new require_src.StdioHttpTransportHandler({ endpoint: await resolveStdioHttpEndpoint(config) }));
 	} catch (error) {
-		try {
-			await portLease?.release();
-			await processLease?.release({
-				kill: false,
-				releasePort: false
-			});
-		} catch {}
-		if (shared.services) await shared.services.dispose();
 		throw new Error(`Failed to start stdio-http transport: ${toErrorMessage$9(error)}`);
 	}
 }
@@ -650,7 +526,7 @@ async function startTransport(transportType, options, resolvedConfigPath, server
 			await startSseTransport(serverOptions, createTransportConfig(options, require_src.TRANSPORT_MODE.SSE));
 			return;
 		}
-		await startStdioHttpTransport(serverOptions, createTransportConfig(options, require_src.TRANSPORT_MODE.HTTP), resolvedConfigPath, options);
+		await startStdioHttpTransport(createTransportConfig(options, require_src.TRANSPORT_MODE.HTTP));
 	} catch (error) {
 		throw new Error(`Failed to start transport '${transportType}': ${toErrorMessage$9(error)}`);
 	}
@@ -658,7 +534,7 @@ async function startTransport(transportType, options, resolvedConfigPath, server
 /**
 * MCP Serve command
 */
-const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", `Transport type: ${TRANSPORT_TYPE_STDIO}, ${TRANSPORT_TYPE_HTTP}, ${TRANSPORT_TYPE_SSE}, or ${TRANSPORT_TYPE_STDIO_HTTP}`, TRANSPORT_TYPE_STDIO).option("-p, --port <port>", "Port to listen on (http/sse/stdio-http internal HTTP)", (val) => parseInt(val, 10)).option("--host <host>", "Host to bind to (http/sse/stdio-http internal HTTP)", DEFAULT_HOST$1).option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--definitions-cache <path>", "Path to prefetched tool/prompt/skill definitions cache file").option("--clear-definitions-cache", "Delete definitions cache before startup", false).option("--proxy-mode <mode>", "How mcp-proxy exposes downstream tools: meta, flat, or search", "meta").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
+const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", `Transport type: ${TRANSPORT_TYPE_STDIO}, ${TRANSPORT_TYPE_HTTP}, ${TRANSPORT_TYPE_SSE}, or ${TRANSPORT_TYPE_STDIO_HTTP}`, TRANSPORT_TYPE_STDIO).option("-p, --port <port>", "Port to listen on (http/sse) or backend port for stdio-http", (val) => parseInt(val, 10)).option("--host <host>", "Host to bind to (http/sse) or backend host for stdio-http", DEFAULT_HOST$1).option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--definitions-cache <path>", "Path to prefetched tool/prompt/skill definitions cache file").option("--clear-definitions-cache", "Delete definitions cache before startup", false).option("--proxy-mode <mode>", "How mcp-proxy exposes downstream tools: meta, flat, or search", "meta").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
 	try {
 		const transportType = validateTransportType(options.type.toLowerCase());
 		validateProxyMode(options.proxyMode);
@@ -667,7 +543,9 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 	} catch (error) {
 		const rawTransportType = options.type.toLowerCase();
 		const transportType = isValidTransportType(rawTransportType) ? rawTransportType : TRANSPORT_TYPE_STDIO;
-		console.error(formatStartError(transportType, options.host, options.port ?? DEFAULT_PORT, error));
+		const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
+		const requestedPort = options.port ?? (Number.isFinite(envPort) ? envPort : void 0);
+		console.error(formatStartError(transportType, options.host, requestedPort, error));
 		process.exit(1);
 	}
 });

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as findConfigFile, E as generateServerId, T as DefinitionsCacheService, d as version, f as StdioHttpTransportHandler, h as HttpTransportHandler, m as SseTransportHandler, n as createServer, o as createProxyIoCContainer, p as StdioTransportHandler, r as createSessionServer, t as TRANSPORT_MODE, u as initializeSharedServices, v as RuntimeStateService } from "./src-CNXwWpA2.mjs";
+import { D as findConfigFile, E as generateServerId, T as DefinitionsCacheService, d as version, f as StdioHttpTransportHandler, h as HttpTransportHandler, m as SseTransportHandler, n as createServer, o as createProxyIoCContainer, p as StdioTransportHandler, r as createSessionServer, t as TRANSPORT_MODE, u as initializeSharedServices, v as RuntimeStateService } from "./src-0OJqEpGA.mjs";
 import { randomUUID } from "node:crypto";
 import { access, writeFile } from "node:fs/promises";
 import path, { join, resolve } from "node:path";
@@ -140,21 +140,16 @@ const CONFIG_FILE_NAMES = [
 	"mcp-config.json"
 ];
 const MCP_ENDPOINT_PATH = "/mcp";
-const DEFAULT_PORT = 3e3;
 const DEFAULT_HOST$1 = "localhost";
 const TRANSPORT_TYPE_STDIO = "stdio";
 const TRANSPORT_TYPE_HTTP = "http";
 const TRANSPORT_TYPE_SSE = "sse";
 const TRANSPORT_TYPE_STDIO_HTTP = "stdio-http";
 const RUNTIME_TRANSPORT = TRANSPORT_TYPE_HTTP;
-const STDIO_HTTP_PROXY_STOP_LABEL = "Failed stopping stdio-http proxy";
-const INTERNAL_HTTP_STOP_LABEL = "Failed stopping internal HTTP transport";
 const PORT_REGISTRY_SERVICE_HTTP = "mcp-proxy-http";
-const PORT_REGISTRY_SERVICE_STDIO_HTTP = "mcp-proxy-stdio-http";
 const PORT_REGISTRY_SERVICE_TYPE = "service";
 const PORT_REGISTRY_REPOSITORY_PATH = process.cwd();
 const PROCESS_REGISTRY_SERVICE_HTTP = "mcp-proxy-http";
-const PROCESS_REGISTRY_SERVICE_STDIO_HTTP = "mcp-proxy-stdio-http";
 const PROCESS_REGISTRY_SERVICE_TYPE = "service";
 const PROCESS_REGISTRY_REPOSITORY_PATH = process.cwd();
 function toErrorMessage$9(error) {
@@ -166,13 +161,6 @@ function isValidTransportType(type) {
 function isValidProxyMode(mode) {
 	return mode === "meta" || mode === "flat" || mode === "search";
 }
-function isAddressInUseError(error) {
-	if (error instanceof Error && error.message.includes("EADDRINUSE")) return true;
-	if (typeof error !== "object" || error === null) return false;
-	if ("code" in error && error.code === "EADDRINUSE") return true;
-	if ("message" in error && typeof error.message === "string" && error.message.includes("EADDRINUSE")) return true;
-	return false;
-}
 async function pathExists(filePath) {
 	try {
 		await access(filePath, constants.F_OK);
@@ -223,7 +211,7 @@ function createTransportConfig(options, mode) {
 	const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
 	return {
 		mode,
-		port: options.port ?? (Number.isFinite(envPort) ? envPort : void 0) ?? DEFAULT_PORT,
+		port: options.port ?? (Number.isFinite(envPort) ? envPort : void 0),
 		host: options.host || process.env.MCP_HOST || DEFAULT_HOST$1
 	};
 }
@@ -240,7 +228,7 @@ function createServerOptions(options, resolvedConfigPath, serverId) {
 function formatStartError(type, host, port, error) {
 	const startErrorMessage = toErrorMessage$9(error);
 	if (type === TRANSPORT_TYPE_STDIO) return `Failed to start MCP server with transport '${type}': ${startErrorMessage}`;
-	return `Failed to start MCP server with transport '${type}' on ${host}:${port}: ${startErrorMessage}`;
+	return `Failed to start MCP server with transport '${type}' on ${port === void 0 ? `${host} (dynamic port)` : `${host}:${port}`}: ${startErrorMessage}`;
 }
 function createRuntimeRecord(serverId, config, port, shutdownToken, configPath) {
 	return {
@@ -263,10 +251,10 @@ function createProcessRegistryService() {
 function getRegistryEnvironment() {
 	return process.env.NODE_ENV ?? "development";
 }
-async function createPortRegistryLease(serviceName, host, preferredPort, serverId, transport, configPath, portRange = {
+async function createPortRegistryLease(serviceName, host, preferredPort, serverId, transport, configPath, portRange = preferredPort !== void 0 ? {
 	min: preferredPort,
 	max: preferredPort
-}) {
+} : DEFAULT_PORT_RANGE) {
 	const portRegistry = createPortRegistryService();
 	const result = await portRegistry.reservePort({
 		repositoryPath: PORT_REGISTRY_REPOSITORY_PATH,
@@ -284,7 +272,10 @@ async function createPortRegistryLease(serviceName, host, preferredPort, serverI
 			...configPath ? { configPath } : {}
 		}
 	});
-	if (!result.success || !result.record) throw new Error(result.error || `Failed to reserve port ${preferredPort} in port registry`);
+	if (!result.success || !result.record) {
+		const requestedPortLabel = preferredPort === void 0 ? "dynamic port" : `port ${preferredPort}`;
+		throw new Error(result.error || `Failed to reserve ${requestedPortLabel} in port registry`);
+	}
 	let released = false;
 	return {
 		port: result.record.port,
@@ -393,27 +384,6 @@ async function cleanupFailedRuntimeStartup(handler, runtimeStateService, serverI
 		await removeRuntimeRecord(runtimeStateService, serverId);
 	}
 }
-async function stopTransportWithContext(label, stopOperation) {
-	try {
-		await stopOperation();
-	} catch (error) {
-		throw new Error(`${label}: ${toErrorMessage$9(error)}`);
-	}
-}
-async function removeRuntimeRecordDuringStop(runtimeStateService, serverId) {
-	try {
-		await removeRuntimeRecord(runtimeStateService, serverId);
-	} catch (error) {
-		throw new Error(`Failed to remove runtime state during HTTP stop callback for '${serverId}': ${toErrorMessage$9(error)}`);
-	}
-}
-function createStdioHttpInternalTransport(sharedServices, config, adminOptions) {
-	try {
-		return new HttpTransportHandler(() => createSessionServer(sharedServices), config, adminOptions);
-	} catch (error) {
-		throw new Error(`Failed to create internal HTTP transport for stdio-http proxy: ${toErrorMessage$9(error)}`);
-	}
-}
 /**
 * Start MCP server with given transport handler
 * @param handler - The transport handler to start
@@ -444,14 +414,23 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 	const runtimeStateService = new RuntimeStateService();
 	const shutdownToken = randomUUID();
 	const runtimeServerId = serverOptions.serverId ?? generateServerId();
-	const runtimePort = config.port ?? DEFAULT_PORT;
-	const processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
-	const portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
+	const requestedPort = config.port;
+	const portRange = requestedPort !== void 0 ? {
+		min: requestedPort,
+		max: requestedPort
+	} : DEFAULT_PORT_RANGE;
+	const portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_HTTP, config.host ?? DEFAULT_HOST$1, requestedPort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath, portRange);
+	const runtimePort = portLease.port;
+	const runtimeConfig = {
+		...config,
+		port: runtimePort
+	};
+	const processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_HTTP, runtimeConfig.host ?? DEFAULT_HOST$1, runtimePort, runtimeServerId, TRANSPORT_TYPE_HTTP, resolvedConfigPath);
 	let releasePort = async () => {
 		await releasePortLease(portLease ?? null);
 		releasePort = async () => void 0;
 	};
-	const runtimeRecord = createRuntimeRecord(runtimeServerId, config, runtimePort, shutdownToken, resolvedConfigPath);
+	const runtimeRecord = createRuntimeRecord(runtimeServerId, runtimeConfig, runtimePort, shutdownToken, resolvedConfigPath);
 	let handler;
 	let isStopping = false;
 	const stopHandler = async () => {
@@ -467,7 +446,7 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 		}
 	};
 	try {
-		handler = new HttpTransportHandler(() => createSessionServer(sharedServices), config, createHttpAdminOptions(runtimeRecord.serverId, shutdownToken, stopHandler));
+		handler = new HttpTransportHandler(() => createSessionServer(sharedServices), runtimeConfig, createHttpAdminOptions(runtimeRecord.serverId, shutdownToken, stopHandler));
 	} catch (error) {
 		await releasePort();
 		await processLease.release({
@@ -485,7 +464,7 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 				kill: false,
 				releasePort: false
 			});
-			await removeRuntimeRecordDuringStop(runtimeStateService, runtimeRecord.serverId);
+			await removeRuntimeRecord(runtimeStateService, runtimeRecord.serverId);
 		});
 		await writeRuntimeRecord(runtimeStateService, runtimeRecord);
 	} catch (error) {
@@ -500,19 +479,6 @@ async function createAndStartHttpRuntime(serverOptions, config, resolvedConfigPa
 	}
 	console.error(`Runtime state: http://${runtimeRecord.host}:${runtimeRecord.port} (${runtimeRecord.serverId})`);
 }
-async function stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport) {
-	try {
-		const stopOperations = [stopTransportWithContext(STDIO_HTTP_PROXY_STOP_LABEL, async () => {
-			await stdioHttpHandler.stop();
-		})];
-		if (ownsInternalHttpTransport && httpHandler) stopOperations.push(stopTransportWithContext(INTERNAL_HTTP_STOP_LABEL, async () => {
-			await httpHandler.stop();
-		}));
-		await Promise.all(stopOperations);
-	} catch (error) {
-		throw new Error(`Failed to stop stdio-http transport: ${toErrorMessage$9(error)}`);
-	}
-}
 async function startStdioTransport(serverOptions) {
 	try {
 		await startServer(new StdioTransportHandler(await createServer(serverOptions)));
@@ -527,111 +493,21 @@ async function startSseTransport(serverOptions, config) {
 		throw new Error(`Failed to start SSE transport: ${toErrorMessage$9(error)}`);
 	}
 }
-async function startStdioHttpTransport(serverOptions, config, resolvedConfigPath, options) {
-	const shared = { services: null };
-	let processLease;
-	let portLease;
+async function resolveStdioHttpEndpoint(config) {
+	if (config.port !== void 0) return new URL(`http://${config.host ?? DEFAULT_HOST$1}:${config.port}${MCP_ENDPOINT_PATH}`);
+	const result = await createPortRegistryService().getPort({
+		repositoryPath: PORT_REGISTRY_REPOSITORY_PATH,
+		serviceName: PORT_REGISTRY_SERVICE_HTTP,
+		serviceType: PORT_REGISTRY_SERVICE_TYPE,
+		environment: getRegistryEnvironment()
+	});
+	if (!result.success || !result.record) throw new Error(result.error || "No prestarted HTTP backend found for stdio-http transport");
+	return new URL(`http://${config.host ?? result.record.host}:${result.record.port}${MCP_ENDPOINT_PATH}`);
+}
+async function startStdioHttpTransport(config) {
 	try {
-		const serverId = serverOptions.serverId ?? generateServerId();
-		const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
-		const requestedPort = options.port ?? (Number.isFinite(envPort) ? envPort : void 0) ?? DEFAULT_PORT;
-		const portRange = options.port !== void 0 || Number.isFinite(envPort) ? {
-			min: requestedPort,
-			max: requestedPort
-		} : DEFAULT_PORT_RANGE;
-		portLease = await createPortRegistryLease(PORT_REGISTRY_SERVICE_STDIO_HTTP, config.host ?? DEFAULT_HOST$1, requestedPort, serverId, TRANSPORT_TYPE_STDIO_HTTP, resolvedConfigPath, portRange);
-		const internalPort = portLease.port;
-		const transportConfig = {
-			...config,
-			port: internalPort
-		};
-		const stdioHttpHandler = new StdioHttpTransportHandler({ endpoint: new URL(`http://${transportConfig.host}:${transportConfig.port}${MCP_ENDPOINT_PATH}`) });
-		const runtimeStateService = new RuntimeStateService();
-		const shutdownToken = randomUUID();
-		processLease = await createProcessRegistryLease(PROCESS_REGISTRY_SERVICE_STDIO_HTTP, transportConfig.host ?? DEFAULT_HOST$1, internalPort, serverId, TRANSPORT_TYPE_STDIO_HTTP, resolvedConfigPath);
-		let httpHandler = null;
-		let ownsInternalHttpTransport = false;
-		let isStopping = false;
-		const stopOwnedRuntime = async () => {
-			if (isStopping) return;
-			isStopping = true;
-			try {
-				await Promise.all([stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport), removeRuntimeRecord(runtimeStateService, serverId)]);
-				await releasePortLease(portLease ?? null);
-				if (shared.services) await shared.services.dispose();
-				ownsInternalHttpTransport = false;
-				process.exit(0);
-			} catch (error) {
-				console.error(`Unexpected error during admin shutdown: ${toErrorMessage$9(error)}`);
-				process.exit(1);
-			}
-		};
-		const adminOptions = createHttpAdminOptions(serverId, shutdownToken, stopOwnedRuntime);
-		await startServer({
-			async start() {
-				let initialProxyConnectError;
-				try {
-					await stdioHttpHandler.start();
-					return;
-				} catch (error) {
-					initialProxyConnectError = error;
-				}
-				if (!shared.services) shared.services = await initializeSharedServices(serverOptions);
-				try {
-					httpHandler = createStdioHttpInternalTransport(shared.services, transportConfig, adminOptions);
-					await httpHandler.start();
-					ownsInternalHttpTransport = true;
-				} catch (error) {
-					if (!isAddressInUseError(error)) throw new Error(`Failed to start internal HTTP transport for stdio-http proxy: ${toErrorMessage$9(error)}`);
-				}
-				try {
-					await stdioHttpHandler.start();
-				} catch (error) {
-					let rollbackStopErrorMessage = "";
-					if (ownsInternalHttpTransport && httpHandler) {
-						try {
-							await httpHandler.stop();
-						} catch (stopError) {
-							rollbackStopErrorMessage = toErrorMessage$9(stopError);
-						}
-						ownsInternalHttpTransport = false;
-					}
-					const retryErrorMessage = toErrorMessage$9(error);
-					const initialErrorMessage = toErrorMessage$9(initialProxyConnectError);
-					const rollbackMessage = rollbackStopErrorMessage ? `; rollback stop failed: ${rollbackStopErrorMessage}` : "";
-					throw new Error(`Failed to start stdio-http proxy bridge: initial connect failed (${initialErrorMessage}); retry failed (${retryErrorMessage})${rollbackMessage}`);
-				}
-				if (ownsInternalHttpTransport) try {
-					await writeRuntimeRecord(runtimeStateService, createRuntimeRecord(serverId, transportConfig, internalPort, shutdownToken, resolvedConfigPath));
-				} catch (error) {
-					throw new Error(`Failed to persist runtime state for stdio-http server '${serverId}': ${toErrorMessage$9(error)}`);
-				}
-			},
-			async stop() {
-				try {
-					await Promise.all([stopInternalHttpTransport(stdioHttpHandler, httpHandler, ownsInternalHttpTransport), removeRuntimeRecord(runtimeStateService, serverId)]);
-					await releasePortLease(portLease ?? null);
-					await processLease?.release({
-						kill: false,
-						releasePort: false
-					});
-					ownsInternalHttpTransport = false;
-					if (shared.services) await shared.services.dispose();
-				} catch (error) {
-					ownsInternalHttpTransport = false;
-					throw new Error(`Failed during stdio-http shutdown for '${serverId}': ${toErrorMessage$9(error)}`);
-				}
-			}
-		});
+		await startServer(new StdioHttpTransportHandler({ endpoint: await resolveStdioHttpEndpoint(config) }));
 	} catch (error) {
-		try {
-			await portLease?.release();
-			await processLease?.release({
-				kill: false,
-				releasePort: false
-			});
-		} catch {}
-		if (shared.services) await shared.services.dispose();
 		throw new Error(`Failed to start stdio-http transport: ${toErrorMessage$9(error)}`);
 	}
 }
@@ -649,7 +525,7 @@ async function startTransport(transportType, options, resolvedConfigPath, server
 			await startSseTransport(serverOptions, createTransportConfig(options, TRANSPORT_MODE.SSE));
 			return;
 		}
-		await startStdioHttpTransport(serverOptions, createTransportConfig(options, TRANSPORT_MODE.HTTP), resolvedConfigPath, options);
+		await startStdioHttpTransport(createTransportConfig(options, TRANSPORT_MODE.HTTP));
 	} catch (error) {
 		throw new Error(`Failed to start transport '${transportType}': ${toErrorMessage$9(error)}`);
 	}
@@ -657,7 +533,7 @@ async function startTransport(transportType, options, resolvedConfigPath, server
 /**
 * MCP Serve command
 */
-const mcpServeCommand = new Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", `Transport type: ${TRANSPORT_TYPE_STDIO}, ${TRANSPORT_TYPE_HTTP}, ${TRANSPORT_TYPE_SSE}, or ${TRANSPORT_TYPE_STDIO_HTTP}`, TRANSPORT_TYPE_STDIO).option("-p, --port <port>", "Port to listen on (http/sse/stdio-http internal HTTP)", (val) => parseInt(val, 10)).option("--host <host>", "Host to bind to (http/sse/stdio-http internal HTTP)", DEFAULT_HOST$1).option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--definitions-cache <path>", "Path to prefetched tool/prompt/skill definitions cache file").option("--clear-definitions-cache", "Delete definitions cache before startup", false).option("--proxy-mode <mode>", "How mcp-proxy exposes downstream tools: meta, flat, or search", "meta").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
+const mcpServeCommand = new Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", `Transport type: ${TRANSPORT_TYPE_STDIO}, ${TRANSPORT_TYPE_HTTP}, ${TRANSPORT_TYPE_SSE}, or ${TRANSPORT_TYPE_STDIO_HTTP}`, TRANSPORT_TYPE_STDIO).option("-p, --port <port>", "Port to listen on (http/sse) or backend port for stdio-http", (val) => parseInt(val, 10)).option("--host <host>", "Host to bind to (http/sse) or backend host for stdio-http", DEFAULT_HOST$1).option("-c, --config <path>", "Path to MCP server configuration file").option("--no-cache", "Disable configuration caching, always reload from config file").option("--definitions-cache <path>", "Path to prefetched tool/prompt/skill definitions cache file").option("--clear-definitions-cache", "Delete definitions cache before startup", false).option("--proxy-mode <mode>", "How mcp-proxy exposes downstream tools: meta, flat, or search", "meta").option("--id <id>", "Unique server identifier (overrides config file id, auto-generated if not provided)").action(async (options) => {
 	try {
 		const transportType = validateTransportType(options.type.toLowerCase());
 		validateProxyMode(options.proxyMode);
@@ -666,7 +542,9 @@ const mcpServeCommand = new Command("mcp-serve").description("Start MCP server w
 	} catch (error) {
 		const rawTransportType = options.type.toLowerCase();
 		const transportType = isValidTransportType(rawTransportType) ? rawTransportType : TRANSPORT_TYPE_STDIO;
-		console.error(formatStartError(transportType, options.host, options.port ?? DEFAULT_PORT, error));
+		const envPort = process.env.MCP_PORT ? Number(process.env.MCP_PORT) : void 0;
+		const requestedPort = options.port ?? (Number.isFinite(envPort) ? envPort : void 0);
+		console.error(formatStartError(transportType, options.host, requestedPort, error));
 		process.exit(1);
 	}
 });

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_src = require('./src-Cm2AVRBA.cjs');
+const require_src = require('./src-G1hs2GLZ.cjs');
 
 exports.ConfigFetcherService = require_src.ConfigFetcherService;
 exports.DefinitionsCacheService = require_src.DefinitionsCacheService;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { C as SearchListToolsTool, D as findConfigFile, E as generateServerId, S as UseToolTool, T as DefinitionsCacheService, _ as StopServerService, a as createProxyContainer, b as createProxyLogger, c as createStdioHttpTransportHandler, f as StdioHttpTransportHandler, g as SkillService, h as HttpTransportHandler, i as createHttpTransportHandler, l as createStdioTransportHandler, m as SseTransportHandler, n as createServer, p as StdioTransportHandler, r as createSessionServer, s as createSseTransportHandler, t as TRANSPORT_MODE, u as initializeSharedServices, v as RuntimeStateService, w as DescribeToolsTool, x as ConfigFetcherService, y as McpClientManagerService } from "./src-CNXwWpA2.mjs";
+import { C as SearchListToolsTool, D as findConfigFile, E as generateServerId, S as UseToolTool, T as DefinitionsCacheService, _ as StopServerService, a as createProxyContainer, b as createProxyLogger, c as createStdioHttpTransportHandler, f as StdioHttpTransportHandler, g as SkillService, h as HttpTransportHandler, i as createHttpTransportHandler, l as createStdioTransportHandler, m as SseTransportHandler, n as createServer, p as StdioTransportHandler, r as createSessionServer, s as createSseTransportHandler, t as TRANSPORT_MODE, u as initializeSharedServices, v as RuntimeStateService, w as DescribeToolsTool, x as ConfigFetcherService, y as McpClientManagerService } from "./src-0OJqEpGA.mjs";
 
 export { ConfigFetcherService, DefinitionsCacheService, DescribeToolsTool, HttpTransportHandler, McpClientManagerService, RuntimeStateService, SearchListToolsTool, SkillService, SseTransportHandler, StdioHttpTransportHandler, StdioTransportHandler, StopServerService, TRANSPORT_MODE, UseToolTool, createHttpTransportHandler, createProxyContainer, createProxyLogger, createServer, createSessionServer, createSseTransportHandler, createStdioHttpTransportHandler, createStdioTransportHandler, findConfigFile, generateServerId, initializeSharedServices };

package/dist/{src-CNXwWpA2.mjs → src-0OJqEpGA.mjs}

@@ -4313,7 +4313,7 @@ var StdioHttpTransportHandler = class {
 
 //#endregion
 //#region package.json
-var version = "0.4.1";
+var version = "0.4.2";
 
 //#endregion
 //#region src/container/index.ts

package/dist/{src-Cm2AVRBA.cjs → src-G1hs2GLZ.cjs}

@@ -4342,7 +4342,7 @@ var StdioHttpTransportHandler = class {
 
 //#endregion
 //#region package.json
-var version = "0.4.1";
+var version = "0.4.2";
 
 //#endregion
 //#region src/container/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agimon-ai/mcp-proxy",
   "description": "MCP proxy server package",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "license": "AGPL-3.0",
   "keywords": [
     "mcp",
@@ -27,9 +27,9 @@
     "js-yaml": "^4.1.0",
     "liquidjs": "^10.21.0",
     "zod": "^3.24.1",
-    "@agimon-ai/foundation-port-registry": "0.2.6",
-    "@agimon-ai/log-sink-mcp": "0.2.6",
-    "@agimon-ai/foundation-process-registry": "0.2.2"
+    "@agimon-ai/foundation-process-registry": "0.2.3",
+    "@agimon-ai/foundation-port-registry": "0.2.7",
+    "@agimon-ai/log-sink-mcp": "0.2.7"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",