@assistant-ui/mcp-docs-server 0.3.0 → 0.3.2

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { runProxy } from "./proxy.js";
 //#region src/index.d.ts
-declare function runServer(): Promise<void>;
+export declare function runServer(): Promise<void>;
 //#endregion
-export { runProxy, runServer };
+export { runProxy };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;iBAIsB,aAAS"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;wBAIsB,aAAS"}

package/dist/proxy.d.ts

@@ -1,9 +1,8 @@
 //#region src/proxy.d.ts
-declare function runProxy({ url, stdin, stdout }?: {
+export declare function runProxy({ url, stdin, stdout }?: {
   url?: URL;
   stdin?: NodeJS.ReadableStream;
   stdout?: NodeJS.WritableStream;
 }): Promise<void>;
 //#endregion
-export { runProxy };
 //# sourceMappingURL=proxy.d.ts.map

package/dist/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","names":[],"sources":["../src/proxy.ts"],"mappings":";iBAesB,WACpB,KACA,OACA;EAEA,MAAM;EACN,QAAQ,OAAO;EACf,SAAS,OAAO;IACZ"}
+{"version":3,"file":"proxy.d.ts","names":[],"sources":["../src/proxy.ts"],"mappings":";wBAesB,WACpB,KACA,OACA;EAEA,MAAM;EACN,QAAQ,OAAO;EACf,SAAS,OAAO;IACZ"}

package/dist/proxy.js

@@ -1,12 +1,14 @@
 import { StreamableHTTPClientTransport, isInitializeRequest, isJSONRPCRequest, isJSONRPCResultResponse } from "@modelcontextprotocol/client";
 import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { finished } from "node:stream";
 //#region src/proxy.ts
 const DEFAULT_URL = "https://www.assistant-ui.com/mcp";
 const logError = (message, error) => {
 	console.error(`assistant-ui MCP proxy: ${message}`, error);
 };
 async function runProxy({ url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFAULT_URL), stdin = process.stdin, stdout = process.stdout } = {}) {
-	const stdio = new StdioServerTransport(stdin, stdout);
+	const input = stdin;
+	const stdio = new StdioServerTransport(input, stdout);
 	const http = new StreamableHTTPClientTransport(url);
 	let initializeRequestId;
 	let closing = false;
@@ -21,9 +23,14 @@ async function runProxy({ url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFA
 			logError("failed to close transport", error);
 		}).then(resolveClosed);
 	};
+	const logUnlessClosing = (message, error) => {
+		if (closing) return;
+		logError(message, error);
+	};
 	stdio.onmessage = (message) => {
-		if (isInitializeRequest(message)) initializeRequestId = message.id;
+		if (isJSONRPCRequest(message) && isInitializeRequest(message)) initializeRequestId = message.id;
 		http.send(message).catch(async (error) => {
+			if (closing) return;
 			logError("failed to forward message to hosted endpoint", error);
 			if (!isJSONRPCRequest(message)) return;
 			await stdio.send({
@@ -34,7 +41,7 @@ async function runProxy({ url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFA
 					message: "Failed to proxy request to the hosted MCP server"
 				}
 			}).catch((sendError) => {
-				logError("failed to return proxy error response", sendError);
+				logUnlessClosing("failed to return proxy error response", sendError);
 			});
 		});
 	};
@@ -44,14 +51,14 @@ async function runProxy({ url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFA
 			if (typeof protocolVersion === "string") http.setProtocolVersion(protocolVersion);
 		}
 		stdio.send(message).catch((error) => {
-			logError("failed to forward message to stdio", error);
+			logUnlessClosing("failed to forward message to stdio", error);
 		});
 	};
 	stdio.onerror = (error) => {
-		logError("stdio transport error", error);
+		logUnlessClosing("stdio transport error", error);
 	};
 	http.onerror = (error) => {
-		logError("HTTP transport error", error);
+		logUnlessClosing("HTTP transport error", error);
 	};
 	stdio.onclose = () => {
 		closeCounterpart(http);
@@ -59,16 +66,24 @@ async function runProxy({ url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFA
 	http.onclose = () => {
 		closeCounterpart(stdio);
 	};
+	let releaseInput;
 	try {
 		await http.start();
 		await stdio.start();
+		releaseInput = finished(input, { writable: false }, () => {
+			stdio.close().catch((error) => {
+				logError("failed to close transport", error);
+			});
+		});
+		await closed;
 	} catch (error) {
 		closing = true;
 		await Promise.allSettled([http.close(), stdio.close()]);
 		resolveClosed();
 		throw error;
+	} finally {
+		releaseInput?.();
 	}
-	await closed;
 }
 //#endregion
 export { runProxy };

package/dist/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","names":[],"sources":["../src/proxy.ts"],"sourcesContent":["import {\n  StreamableHTTPClientTransport,\n  isInitializeRequest,\n  isJSONRPCRequest,\n  isJSONRPCResultResponse,\n} from \"@modelcontextprotocol/client\";\nimport { StdioServerTransport } from \"@modelcontextprotocol/server/stdio\";\nimport type { Readable, Writable } from \"node:stream\";\n\nconst DEFAULT_URL = \"https://www.assistant-ui.com/mcp\";\n\nconst logError = (message: string, error: unknown) => {\n  console.error(`assistant-ui MCP proxy: ${message}`, error);\n};\n\nexport async function runProxy({\n  url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFAULT_URL),\n  stdin = process.stdin,\n  stdout = process.stdout,\n}: {\n  url?: URL;\n  stdin?: NodeJS.ReadableStream;\n  stdout?: NodeJS.WritableStream;\n} = {}) {\n  const stdio = new StdioServerTransport(stdin as Readable, stdout as Writable);\n  const http = new StreamableHTTPClientTransport(url);\n  let initializeRequestId: string | number | undefined;\n  let closing = false;\n  let resolveClosed = () => {};\n  const closed = new Promise<void>((resolve) => {\n    resolveClosed = resolve;\n  });\n\n  const closeCounterpart = (counterpart: { close(): Promise<void> }) => {\n    if (closing) return;\n    closing = true;\n    void counterpart\n      .close()\n      .catch((error: unknown) => {\n        logError(\"failed to close transport\", error);\n      })\n      .then(resolveClosed);\n  };\n\n  stdio.onmessage = (message) => {\n    if (isInitializeRequest(message)) {\n      initializeRequestId = message.id;\n    }\n\n    void http.send(message).catch(async (error: unknown) => {\n      logError(\"failed to forward message to hosted endpoint\", error);\n      if (!isJSONRPCRequest(message)) return;\n\n      await stdio\n        .send({\n          jsonrpc: \"2.0\",\n          id: message.id,\n          error: {\n            code: -32603,\n            message: \"Failed to proxy request to the hosted MCP server\",\n          },\n        })\n        .catch((sendError: unknown) => {\n          logError(\"failed to return proxy error response\", sendError);\n        });\n    });\n  };\n\n  http.onmessage = (message) => {\n    if (\n      isJSONRPCResultResponse(message) &&\n      message.id === initializeRequestId\n    ) {\n      const protocolVersion = (\n        message.result as { protocolVersion?: unknown } | null\n      )?.protocolVersion;\n      if (typeof protocolVersion === \"string\") {\n        http.setProtocolVersion(protocolVersion);\n      }\n    }\n\n    void stdio.send(message).catch((error: unknown) => {\n      logError(\"failed to forward message to stdio\", error);\n    });\n  };\n\n  stdio.onerror = (error) => {\n    logError(\"stdio transport error\", error);\n  };\n  http.onerror = (error) => {\n    logError(\"HTTP transport error\", error);\n  };\n  stdio.onclose = () => {\n    closeCounterpart(http);\n  };\n  http.onclose = () => {\n    closeCounterpart(stdio);\n  };\n\n  try {\n    await http.start();\n    await stdio.start();\n  } catch (error) {\n    closing = true;\n    await Promise.allSettled([http.close(), stdio.close()]);\n    resolveClosed();\n    throw error;\n  }\n\n  await closed;\n}\n"],"mappings":";;;AASA,MAAM,cAAc;AAEpB,MAAM,YAAY,SAAiB,UAAmB;CACpD,QAAQ,MAAM,2BAA2B,WAAW,KAAK;AAC3D;AAEA,eAAsB,SAAS,EAC7B,MAAM,IAAI,IAAI,QAAQ,IAAI,wBAAwB,WAAW,GAC7D,QAAQ,QAAQ,OAChB,SAAS,QAAQ,WAKf,CAAC,GAAG;CACN,MAAM,QAAQ,IAAI,qBAAqB,OAAmB,MAAkB;CAC5E,MAAM,OAAO,IAAI,8BAA8B,GAAG;CAClD,IAAI;CACJ,IAAI,UAAU;CACd,IAAI,sBAAsB,CAAC;CAC3B,MAAM,SAAS,IAAI,SAAe,YAAY;EAC5C,gBAAgB;CAClB,CAAC;CAED,MAAM,oBAAoB,gBAA4C;EACpE,IAAI,SAAS;EACb,UAAU;EACV,YACG,MAAM,CAAC,CACP,OAAO,UAAmB;GACzB,SAAS,6BAA6B,KAAK;EAC7C,CAAC,CAAC,CACD,KAAK,aAAa;CACvB;CAEA,MAAM,aAAa,YAAY;EAC7B,IAAI,oBAAoB,OAAO,GAC7B,sBAAsB,QAAQ;EAGhC,KAAU,KAAK,OAAO,CAAC,CAAC,MAAM,OAAO,UAAmB;GACtD,SAAS,gDAAgD,KAAK;GAC9D,IAAI,CAAC,iBAAiB,OAAO,GAAG;GAEhC,MAAM,MACH,KAAK;IACJ,SAAS;IACT,IAAI,QAAQ;IACZ,OAAO;KACL,MAAM;KACN,SAAS;IACX;GACF,CAAC,CAAC,CACD,OAAO,cAAuB;IAC7B,SAAS,yCAAyC,SAAS;GAC7D,CAAC;EACL,CAAC;CACH;CAEA,KAAK,aAAa,YAAY;EAC5B,IACE,wBAAwB,OAAO,KAC/B,QAAQ,OAAO,qBACf;GACA,MAAM,kBACJ,QAAQ,QACP;GACH,IAAI,OAAO,oBAAoB,UAC7B,KAAK,mBAAmB,eAAe;EAE3C;EAEA,MAAW,KAAK,OAAO,CAAC,CAAC,OAAO,UAAmB;GACjD,SAAS,sCAAsC,KAAK;EACtD,CAAC;CACH;CAEA,MAAM,WAAW,UAAU;EACzB,SAAS,yBAAyB,KAAK;CACzC;CACA,KAAK,WAAW,UAAU;EACxB,SAAS,wBAAwB,KAAK;CACxC;CACA,MAAM,gBAAgB;EACpB,iBAAiB,IAAI;CACvB;CACA,KAAK,gBAAgB;EACnB,iBAAiB,KAAK;CACxB;CAEA,IAAI;EACF,MAAM,KAAK,MAAM;EACjB,MAAM,MAAM,MAAM;CACpB,SAAS,OAAO;EACd,UAAU;EACV,MAAM,QAAQ,WAAW,CAAC,KAAK,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC;EACtD,cAAc;EACd,MAAM;CACR;CAEA,MAAM;AACR"}
+{"version":3,"file":"proxy.js","names":[],"sources":["../src/proxy.ts"],"sourcesContent":["import {\n  StreamableHTTPClientTransport,\n  isInitializeRequest,\n  isJSONRPCRequest,\n  isJSONRPCResultResponse,\n} from \"@modelcontextprotocol/client\";\nimport { StdioServerTransport } from \"@modelcontextprotocol/server/stdio\";\nimport { type Readable, type Writable, finished } from \"node:stream\";\n\nconst DEFAULT_URL = \"https://www.assistant-ui.com/mcp\";\n\nconst logError = (message: string, error: unknown) => {\n  console.error(`assistant-ui MCP proxy: ${message}`, error);\n};\n\nexport async function runProxy({\n  url = new URL(process.env.ASSISTANT_UI_MCP_URL ?? DEFAULT_URL),\n  stdin = process.stdin,\n  stdout = process.stdout,\n}: {\n  url?: URL;\n  stdin?: NodeJS.ReadableStream;\n  stdout?: NodeJS.WritableStream;\n} = {}) {\n  const input = stdin as Readable;\n  const stdio = new StdioServerTransport(input, stdout as Writable);\n  const http = new StreamableHTTPClientTransport(url);\n  let initializeRequestId: string | number | undefined;\n  let closing = false;\n  let resolveClosed = () => {};\n  const closed = new Promise<void>((resolve) => {\n    resolveClosed = resolve;\n  });\n\n  const closeCounterpart = (counterpart: { close(): Promise<void> }) => {\n    if (closing) return;\n    closing = true;\n    void counterpart\n      .close()\n      .catch((error: unknown) => {\n        logError(\"failed to close transport\", error);\n      })\n      .then(resolveClosed);\n  };\n\n  const logUnlessClosing = (message: string, error: unknown) => {\n    if (closing) return;\n    logError(message, error);\n  };\n\n  stdio.onmessage = (message) => {\n    if (isJSONRPCRequest(message) && isInitializeRequest(message)) {\n      initializeRequestId = message.id;\n    }\n\n    void http.send(message).catch(async (error: unknown) => {\n      if (closing) return;\n      logError(\"failed to forward message to hosted endpoint\", error);\n      if (!isJSONRPCRequest(message)) return;\n\n      await stdio\n        .send({\n          jsonrpc: \"2.0\",\n          id: message.id,\n          error: {\n            code: -32603,\n            message: \"Failed to proxy request to the hosted MCP server\",\n          },\n        })\n        .catch((sendError: unknown) => {\n          logUnlessClosing(\"failed to return proxy error response\", sendError);\n        });\n    });\n  };\n\n  http.onmessage = (message) => {\n    if (\n      isJSONRPCResultResponse(message) &&\n      message.id === initializeRequestId\n    ) {\n      const protocolVersion = (\n        message.result as { protocolVersion?: unknown } | null\n      )?.protocolVersion;\n      if (typeof protocolVersion === \"string\") {\n        http.setProtocolVersion(protocolVersion);\n      }\n    }\n\n    void stdio.send(message).catch((error: unknown) => {\n      logUnlessClosing(\"failed to forward message to stdio\", error);\n    });\n  };\n\n  stdio.onerror = (error) => {\n    logUnlessClosing(\"stdio transport error\", error);\n  };\n  http.onerror = (error) => {\n    logUnlessClosing(\"HTTP transport error\", error);\n  };\n  stdio.onclose = () => {\n    closeCounterpart(http);\n  };\n  http.onclose = () => {\n    closeCounterpart(stdio);\n  };\n\n  let releaseInput: (() => void) | undefined;\n\n  try {\n    await http.start();\n    await stdio.start();\n    releaseInput = finished(input, { writable: false }, () => {\n      void stdio.close().catch((error: unknown) => {\n        logError(\"failed to close transport\", error);\n      });\n    });\n    await closed;\n  } catch (error) {\n    closing = true;\n    await Promise.allSettled([http.close(), stdio.close()]);\n    resolveClosed();\n    throw error;\n  } finally {\n    releaseInput?.();\n  }\n}\n"],"mappings":";;;;AASA,MAAM,cAAc;AAEpB,MAAM,YAAY,SAAiB,UAAmB;CACpD,QAAQ,MAAM,2BAA2B,WAAW,KAAK;AAC3D;AAEA,eAAsB,SAAS,EAC7B,MAAM,IAAI,IAAI,QAAQ,IAAI,wBAAwB,WAAW,GAC7D,QAAQ,QAAQ,OAChB,SAAS,QAAQ,WAKf,CAAC,GAAG;CACN,MAAM,QAAQ;CACd,MAAM,QAAQ,IAAI,qBAAqB,OAAO,MAAkB;CAChE,MAAM,OAAO,IAAI,8BAA8B,GAAG;CAClD,IAAI;CACJ,IAAI,UAAU;CACd,IAAI,sBAAsB,CAAC;CAC3B,MAAM,SAAS,IAAI,SAAe,YAAY;EAC5C,gBAAgB;CAClB,CAAC;CAED,MAAM,oBAAoB,gBAA4C;EACpE,IAAI,SAAS;EACb,UAAU;EACV,YACG,MAAM,CAAC,CACP,OAAO,UAAmB;GACzB,SAAS,6BAA6B,KAAK;EAC7C,CAAC,CAAC,CACD,KAAK,aAAa;CACvB;CAEA,MAAM,oBAAoB,SAAiB,UAAmB;EAC5D,IAAI,SAAS;EACb,SAAS,SAAS,KAAK;CACzB;CAEA,MAAM,aAAa,YAAY;EAC7B,IAAI,iBAAiB,OAAO,KAAK,oBAAoB,OAAO,GAC1D,sBAAsB,QAAQ;EAGhC,KAAU,KAAK,OAAO,CAAC,CAAC,MAAM,OAAO,UAAmB;GACtD,IAAI,SAAS;GACb,SAAS,gDAAgD,KAAK;GAC9D,IAAI,CAAC,iBAAiB,OAAO,GAAG;GAEhC,MAAM,MACH,KAAK;IACJ,SAAS;IACT,IAAI,QAAQ;IACZ,OAAO;KACL,MAAM;KACN,SAAS;IACX;GACF,CAAC,CAAC,CACD,OAAO,cAAuB;IAC7B,iBAAiB,yCAAyC,SAAS;GACrE,CAAC;EACL,CAAC;CACH;CAEA,KAAK,aAAa,YAAY;EAC5B,IACE,wBAAwB,OAAO,KAC/B,QAAQ,OAAO,qBACf;GACA,MAAM,kBACJ,QAAQ,QACP;GACH,IAAI,OAAO,oBAAoB,UAC7B,KAAK,mBAAmB,eAAe;EAE3C;EAEA,MAAW,KAAK,OAAO,CAAC,CAAC,OAAO,UAAmB;GACjD,iBAAiB,sCAAsC,KAAK;EAC9D,CAAC;CACH;CAEA,MAAM,WAAW,UAAU;EACzB,iBAAiB,yBAAyB,KAAK;CACjD;CACA,KAAK,WAAW,UAAU;EACxB,iBAAiB,wBAAwB,KAAK;CAChD;CACA,MAAM,gBAAgB;EACpB,iBAAiB,IAAI;CACvB;CACA,KAAK,gBAAgB;EACnB,iBAAiB,KAAK;CACxB;CAEA,IAAI;CAEJ,IAAI;EACF,MAAM,KAAK,MAAM;EACjB,MAAM,MAAM,MAAM;EAClB,eAAe,SAAS,OAAO,EAAE,UAAU,MAAM,SAAS;GACxD,MAAW,MAAM,CAAC,CAAC,OAAO,UAAmB;IAC3C,SAAS,6BAA6B,KAAK;GAC7C,CAAC;EACH,CAAC;EACD,MAAM;CACR,SAAS,OAAO;EACd,UAAU;EACV,MAAM,QAAQ,WAAW,CAAC,KAAK,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC;EACtD,cAAc;EACd,MAAM;CACR,UAAU;EACR,eAAe;CACjB;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/mcp-docs-server",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Stdio proxy for the hosted assistant-ui documentation MCP server",
   "keywords": [
     "mcp",
@@ -35,11 +35,11 @@
     "@modelcontextprotocol/server": "^2.0.0"
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.25",
+    "@assistant-ui/x-buildutils": "0.0.28",
     "@modelcontextprotocol/core": "^2.0.0",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.5.1",
     "tsx": "^4.23.13",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -58,6 +58,7 @@
     "build": "aui-build",
     "dev": "tsx src/stdio.ts",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit",
     "test:watch": "vitest"
   }
 }

package/src/proxy.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it, vi } from "vitest";
+import { once } from "node:events";
 import {
   createServer,
   type IncomingMessage,
@@ -147,6 +149,139 @@ const createRpcClient = (stdin: PassThrough, stdout: PassThrough) => {
 };
 
 describe("runProxy", () => {
+  it.each([
+    {
+      scenario: "stdin reached EOF before startup",
+      createStdin: async () => {
+        const stdin = new PassThrough();
+        const ended = once(stdin, "end");
+        stdin.resume();
+        stdin.end();
+        await ended;
+        return stdin;
+      },
+      stopInput: (stdin: PassThrough) => stdin.end(),
+    },
+    {
+      scenario: "stdin reaches EOF after startup",
+      createStdin: async () => new PassThrough(),
+      stopInput: (stdin: PassThrough) => stdin.end(),
+    },
+    {
+      scenario: "stdin ends without emitting close",
+      createStdin: async () => new PassThrough({ autoDestroy: false }),
+      stopInput: (stdin: PassThrough) => stdin.end(),
+    },
+    {
+      scenario: "stdin is destroyed without EOF",
+      createStdin: async () => new PassThrough(),
+      stopInput: (stdin: PassThrough) => stdin.destroy(),
+    },
+  ])("closes when $scenario", async ({ createStdin, stopInput }) => {
+    const stdin = await createStdin();
+    const stdout = new PassThrough();
+    const stderr = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => undefined);
+    const proxy = runProxy({
+      url: new URL("https://example.invalid/mcp"),
+      stdin,
+      stdout,
+    });
+    let closed = false;
+
+    try {
+      await new Promise<void>((resolve) => setImmediate(resolve));
+      stopInput(stdin);
+      await expect(
+        withTimeout(proxy, "proxy shutdown after stdin closed"),
+      ).resolves.toBeUndefined();
+      closed = true;
+    } finally {
+      stdout.destroy(closed ? undefined : new Error("Proxy test cleanup"));
+      await proxy;
+      stdin.destroy();
+      stderr.mockRestore();
+    }
+  });
+
+  it("does not log errors caused by clean shutdown", async () => {
+    let resolvePendingRequest = () => {};
+    const pendingRequest = new Promise<void>((resolve) => {
+      resolvePendingRequest = resolve;
+    });
+    const httpServer = createServer(async (request, response) => {
+      if (request.method !== "POST") {
+        response.statusCode = 405;
+        response.end();
+        return;
+      }
+
+      let body = "";
+      for await (const chunk of request) body += chunk.toString();
+      const message = JSON.parse(body) as { method: string; id?: number };
+      if (message.method === "initialize") {
+        response.setHeader("content-type", "application/json");
+        response.end(
+          JSON.stringify({
+            jsonrpc: "2.0",
+            id: message.id,
+            result: {
+              protocolVersion: "2025-11-25",
+              capabilities: {},
+              serverInfo: { name: "proxy-test", version: "1.0.0" },
+            },
+          }),
+        );
+        return;
+      }
+
+      response.writeHead(200, {
+        "content-type": "text/event-stream",
+        "cache-control": "no-cache",
+      });
+      response.write(": keep-alive\n\n");
+      resolvePendingRequest();
+    });
+    const url = await listen(httpServer);
+    const proxyStdin = new PassThrough();
+    const proxyStdout = new PassThrough();
+    const stderr = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => undefined);
+    const proxy = runProxy({ url, stdin: proxyStdin, stdout: proxyStdout });
+    const client = createRpcClient(proxyStdin, proxyStdout);
+    let proxyClosed = false;
+
+    try {
+      const initialize = await client.request("initialize", {
+        protocolVersion: "2025-11-25",
+        capabilities: {},
+        clientInfo: { name: "proxy-test-client", version: "1.0.0" },
+      });
+      expect(initialize.error).toBeUndefined();
+
+      client.notify("notifications/initialized");
+      await withTimeout(pendingRequest, "pending request");
+      proxyStdin.end();
+      await expect(
+        withTimeout(proxy, "proxy shutdown after stdin closed"),
+      ).resolves.toBeUndefined();
+      proxyClosed = true;
+
+      expect(stderr).not.toHaveBeenCalled();
+    } finally {
+      if (!proxyClosed) {
+        proxyStdin.destroy();
+        await proxy.catch(() => undefined);
+      }
+      await closeHttpServer(httpServer);
+      proxyStdout.destroy();
+      proxyStdin.destroy();
+      stderr.mockRestore();
+    }
+  });
+
   it("proxies MCP requests and returns transport failures", async () => {
     const inputSchema = fromJsonSchema<{ text: string }>({
       type: "object",

package/src/proxy.ts

@@ -5,7 +5,7 @@ import {
   isJSONRPCResultResponse,
 } from "@modelcontextprotocol/client";
 import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
-import type { Readable, Writable } from "node:stream";
+import { type Readable, type Writable, finished } from "node:stream";
 
 const DEFAULT_URL = "https://www.assistant-ui.com/mcp";
 
@@ -22,7 +22,8 @@ export async function runProxy({
   stdin?: NodeJS.ReadableStream;
   stdout?: NodeJS.WritableStream;
 } = {}) {
-  const stdio = new StdioServerTransport(stdin as Readable, stdout as Writable);
+  const input = stdin as Readable;
+  const stdio = new StdioServerTransport(input, stdout as Writable);
   const http = new StreamableHTTPClientTransport(url);
   let initializeRequestId: string | number | undefined;
   let closing = false;
@@ -42,12 +43,18 @@ export async function runProxy({
       .then(resolveClosed);
   };
 
+  const logUnlessClosing = (message: string, error: unknown) => {
+    if (closing) return;
+    logError(message, error);
+  };
+
   stdio.onmessage = (message) => {
-    if (isInitializeRequest(message)) {
+    if (isJSONRPCRequest(message) && isInitializeRequest(message)) {
       initializeRequestId = message.id;
     }
 
     void http.send(message).catch(async (error: unknown) => {
+      if (closing) return;
       logError("failed to forward message to hosted endpoint", error);
       if (!isJSONRPCRequest(message)) return;
 
@@ -61,7 +68,7 @@ export async function runProxy({
           },
         })
         .catch((sendError: unknown) => {
-          logError("failed to return proxy error response", sendError);
+          logUnlessClosing("failed to return proxy error response", sendError);
         });
     });
   };
@@ -80,15 +87,15 @@ export async function runProxy({
     }
 
     void stdio.send(message).catch((error: unknown) => {
-      logError("failed to forward message to stdio", error);
+      logUnlessClosing("failed to forward message to stdio", error);
     });
   };
 
   stdio.onerror = (error) => {
-    logError("stdio transport error", error);
+    logUnlessClosing("stdio transport error", error);
   };
   http.onerror = (error) => {
-    logError("HTTP transport error", error);
+    logUnlessClosing("HTTP transport error", error);
   };
   stdio.onclose = () => {
     closeCounterpart(http);
@@ -97,15 +104,23 @@ export async function runProxy({
     closeCounterpart(stdio);
   };
 
+  let releaseInput: (() => void) | undefined;
+
   try {
     await http.start();
     await stdio.start();
+    releaseInput = finished(input, { writable: false }, () => {
+      void stdio.close().catch((error: unknown) => {
+        logError("failed to close transport", error);
+      });
+    });
+    await closed;
   } catch (error) {
     closing = true;
     await Promise.allSettled([http.close(), stdio.close()]);
     resolveClosed();
     throw error;
+  } finally {
+    releaseInput?.();
   }
-
-  await closed;
 }