diff --git a/src/client/cross-spawn.test.ts b/src/client/cross-spawn.test.ts index 11e81bf63..8480d94f7 100644 --- a/src/client/cross-spawn.test.ts +++ b/src/client/cross-spawn.test.ts @@ -1,4 +1,4 @@ -import { StdioClientTransport } from "./stdio.js"; +import { StdioClientTransport, getDefaultEnvironment } from "./stdio.js"; import spawn from "cross-spawn"; import { JSONRPCMessage } from "../types.js"; import { ChildProcess } from "node:child_process"; @@ -67,12 +67,33 @@ describe("StdioClientTransport using cross-spawn", () => { await transport.start(); - // verify environment variables are passed correctly + // verify environment variables are merged correctly expect(mockSpawn).toHaveBeenCalledWith( "test-command", [], expect.objectContaining({ - env: customEnv + env: { + ...getDefaultEnvironment(), + ...customEnv + } + }) + ); + }); + + test("should use default environment when env is undefined", async () => { + const transport = new StdioClientTransport({ + command: "test-command", + env: undefined + }); + + await transport.start(); + + // verify default environment is used + expect(mockSpawn).toHaveBeenCalledWith( + "test-command", + [], + expect.objectContaining({ + env: getDefaultEnvironment() }) ); }); diff --git a/src/client/stdio.ts b/src/client/stdio.ts index e9c9fa8f0..62292ce10 100644 --- a/src/client/stdio.ts +++ b/src/client/stdio.ts @@ -122,7 +122,11 @@ export class StdioClientTransport implements Transport { this._serverParams.command, this._serverParams.args ?? [], { - env: this._serverParams.env ?? getDefaultEnvironment(), + // merge default env with server env because mcp server needs some env vars + env: { + ...getDefaultEnvironment(), + ...this._serverParams.env, + }, stdio: ["pipe", "pipe", this._serverParams.stderr ?? "inherit"], shell: false, signal: this._abortController.signal,