@cyanheads/git-mcp-server 2.8.2 → 2.8.4

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.8.2-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.26.0-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^5.9.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.2.21-blueviolet.svg?style=flat-square)](https://bun.sh/)
+[![Version](https://img.shields.io/badge/Version-2.8.4-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.26.0-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^5.9.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.2.21-blueviolet.svg?style=flat-square)](https://bun.sh/)
 
 </div>
 

package/dist/index.js

@@ -15335,7 +15335,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.8.2",
+    version: "2.8.4",
     mcpName: "io.github.cyanheads/git-mcp-server",
     description: "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
     main: "dist/index.js",
@@ -169396,7 +169396,7 @@ var require_compile = __commonJS((exports) => {
     const schOrFunc = root.refs[ref];
     if (schOrFunc)
       return schOrFunc;
-    let _sch = resolve.call(this, root, ref);
+    let _sch = resolve2.call(this, root, ref);
     if (_sch === undefined) {
       const schema2 = (_a4 = root.localRefs) === null || _a4 === undefined ? undefined : _a4[ref];
       const { schemaId } = this.opts;
@@ -169423,7 +169423,7 @@ var require_compile = __commonJS((exports) => {
   function sameSchemaEnv(s1, s2) {
     return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
   }
-  function resolve(root, ref) {
+  function resolve2(root, ref) {
     let sch;
     while (typeof (sch = this.refs[ref]) == "string")
       ref = sch;
@@ -169953,7 +169953,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return uri;
   }
-  function resolve(baseURI, relativeURI, options) {
+  function resolve2(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
     const resolved = resolveComponent(parse7(baseURI, schemelessOptions), parse7(relativeURI, schemelessOptions), schemelessOptions, true);
     schemelessOptions.skipEscape = true;
@@ -170181,7 +170181,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   var fastUri = {
     SCHEMES,
     normalize,
-    resolve,
+    resolve: resolve2,
     resolveComponent,
     equal,
     serialize,
@@ -176024,9 +176024,12 @@ async function executeInit(options, context, execGit) {
   }
 }
 // src/services/git/providers/cli/operations/core/clone.ts
+import { dirname, resolve } from "node:path";
 async function executeClone(options, context, execGit) {
   try {
-    const args = [options.remoteUrl, options.localPath];
+    const resolvedLocalPath = resolve(context.workingDirectory, options.localPath);
+    const cloneCwd = dirname(resolvedLocalPath);
+    const args = [options.remoteUrl, resolvedLocalPath];
     if (options.branch) {
       args.push("--branch", options.branch);
     }
@@ -176043,7 +176046,7 @@ async function executeClone(options, context, execGit) {
       args.push("--recurse-submodules");
     }
     const cmd = buildGitCommand({ command: "clone", args });
-    await execGit(cmd, context.workingDirectory, context.requestContext);
+    await execGit(cmd, cloneCwd, context.requestContext);
     const result = {
       success: true,
       localPath: options.localPath,
@@ -177964,7 +177967,7 @@ var safeJSON = (text) => {
 };
 
 // node_modules/openai/internal/utils/sleep.mjs
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 
 // node_modules/openai/version.mjs
 var VERSION = "6.21.0";
@@ -178968,8 +178971,8 @@ var _APIPromise_client;
 
 class APIPromise extends Promise {
   constructor(client, responsePromise, parseResponse = defaultParseResponse) {
-    super((resolve) => {
-      resolve(null);
+    super((resolve2) => {
+      resolve2(null);
     });
     this.responsePromise = responsePromise;
     this.parseResponse = parseResponse;
@@ -179487,12 +179490,12 @@ class EventStream {
     _EventStream_errored.set(this, false);
     _EventStream_aborted.set(this, false);
     _EventStream_catchingPromiseCreated.set(this, false);
-    __classPrivateFieldSet(this, _EventStream_connectedPromise, new Promise((resolve, reject) => {
-      __classPrivateFieldSet(this, _EventStream_resolveConnectedPromise, resolve, "f");
+    __classPrivateFieldSet(this, _EventStream_connectedPromise, new Promise((resolve2, reject) => {
+      __classPrivateFieldSet(this, _EventStream_resolveConnectedPromise, resolve2, "f");
       __classPrivateFieldSet(this, _EventStream_rejectConnectedPromise, reject, "f");
     }), "f");
-    __classPrivateFieldSet(this, _EventStream_endPromise, new Promise((resolve, reject) => {
-      __classPrivateFieldSet(this, _EventStream_resolveEndPromise, resolve, "f");
+    __classPrivateFieldSet(this, _EventStream_endPromise, new Promise((resolve2, reject) => {
+      __classPrivateFieldSet(this, _EventStream_resolveEndPromise, resolve2, "f");
       __classPrivateFieldSet(this, _EventStream_rejectEndPromise, reject, "f");
     }), "f");
     __classPrivateFieldGet(this, _EventStream_connectedPromise, "f").catch(() => {});
@@ -179544,11 +179547,11 @@ class EventStream {
     return this;
   }
   emitted(event) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       __classPrivateFieldSet(this, _EventStream_catchingPromiseCreated, true, "f");
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve);
+      this.once(event, resolve2);
     });
   }
   async done() {
@@ -180466,7 +180469,7 @@ class ChatCompletionStream extends AbstractChatCompletionRunner {
           if (done) {
             return { value: undefined, done: true };
           }
-          return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: undefined, done: true });
+          return new Promise((resolve2, reject) => readQueue.push({ resolve: resolve2, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: undefined, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -181054,7 +181057,7 @@ class AssistantStream extends EventStream {
           if (done) {
             return { value: undefined, done: true };
           }
-          return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: undefined, done: true });
+          return new Promise((resolve2, reject) => readQueue.push({ resolve: resolve2, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: undefined, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -182485,7 +182488,7 @@ class ResponseStream extends EventStream {
           if (done) {
             return { value: undefined, done: true };
           }
-          return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: undefined, done: true });
+          return new Promise((resolve2, reject) => readQueue.push({ resolve: resolve2, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: undefined, done: true });
         }
         const event = pushQueue.shift();
         return { value: event, done: false };
@@ -191752,7 +191755,7 @@ class Protocol {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1000;
-        await new Promise((resolve) => setTimeout(resolve, pollInterval));
+        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error49) {
@@ -191764,7 +191767,7 @@ class Protocol {
   }
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const earlyReject = (error49) => {
         reject(error49);
       };
@@ -191842,7 +191845,7 @@ class Protocol {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve(parseResult.data);
+            resolve2(parseResult.data);
           }
         } catch (error49) {
           reject(error49);
@@ -192033,12 +192036,12 @@ class Protocol {
         interval = task.pollInterval;
       }
     } catch {}
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       if (signal.aborted) {
         reject(new McpError2(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve, interval);
+      const timeoutId = setTimeout(resolve2, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError2(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -193056,7 +193059,7 @@ class McpServer {
     let task = createTaskResult.task;
     const pollInterval = task.pollInterval ?? 5000;
     while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
+      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
       const updatedTask = await extra.taskStore.getTask(taskId);
       if (!updatedTask) {
         throw new McpError2(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -194610,7 +194613,7 @@ async function gitCloneLogic(input, { provider, appContext }) {
     cloneOptions.depth = input.depth;
   }
   const result = await provider.clone(cloneOptions, {
-    workingDirectory: input.localPath,
+    workingDirectory: process.cwd(),
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
@@ -199204,14 +199207,14 @@ var StreamableHTTPTransport = class {
         if (!this.#enableJsonResponse && this.sessionId !== undefined)
           ctx.header("mcp-session-id", this.sessionId);
         if (this.#enableJsonResponse)
-          return await new Promise((resolve) => {
+          return await new Promise((resolve2) => {
             for (const message of messages)
               if (isJSONRPCRequest(message)) {
                 this.#streamMapping.set(streamId, {
                   ctx: {
                     header: ctx.header,
                     json: (data) => {
-                      resolve(ctx.json(data));
+                      resolve2(ctx.json(data));
                     }
                   },
                   cleanup: () => {
@@ -199902,7 +199905,7 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
         });
         if (!chunk) {
           if (i2 === 1) {
-            await new Promise((resolve) => setTimeout(resolve));
+            await new Promise((resolve2) => setTimeout(resolve2));
             maxReadCount = 3;
             continue;
           }
@@ -201975,6 +201978,7 @@ class SessionManager {
   cleanupIntervalId = null;
   staleTimeoutMs;
   cleanupIntervalMs;
+  onSessionExpired = null;
   constructor(staleTimeoutMs = 30 * 60 * 1000, cleanupIntervalMs = 5 * 60 * 1000) {
     this.staleTimeoutMs = staleTimeoutMs;
     this.cleanupIntervalMs = cleanupIntervalMs;
@@ -202030,6 +202034,7 @@ class SessionManager {
         staleTimeoutMs: this.staleTimeoutMs
       });
       this.sessions.delete(sessionId);
+      this.onSessionExpired?.(sessionId);
       return false;
     }
     return true;
@@ -202097,6 +202102,7 @@ class SessionManager {
       const age = now2 - metadata.lastActivityAt;
       if (age > this.staleTimeoutMs) {
         this.sessions.delete(sessionId);
+        this.onSessionExpired?.(sessionId);
         removedCount++;
       }
     }
@@ -202125,21 +202131,27 @@ class SessionManager {
 
 // src/mcp-server/transports/http/httpTransport.ts
 init_utils();
-
-class McpSessionTransport extends StreamableHTTPTransport {
-  sessionId;
-  constructor(sessionId) {
-    super();
-    this.sessionId = sessionId;
-  }
-}
-function createHttpApp(mcpServer, parentContext) {
+function createHttpApp(createMcpServer, parentContext) {
   const app = new Hono2;
   const transportContext = {
     ...parentContext,
     component: "HttpTransportSetup"
   };
+  const transports = new Map;
   const sessionManager = SessionManager.getInstance(config2.mcpStatefulSessionStaleTimeoutMs);
+  sessionManager.onSessionExpired = (sessionId) => {
+    const transport = transports.get(sessionId);
+    if (transport) {
+      transport.close().catch((err) => {
+        logger.warning("Failed to close transport for expired session", {
+          ...transportContext,
+          sessionId,
+          error: err instanceof Error ? err.message : String(err)
+        });
+      });
+      transports.delete(sessionId);
+    }
+  };
   logger.info("Session manager initialized", {
     ...transportContext,
     staleTimeoutMs: config2.mcpStatefulSessionStaleTimeoutMs
@@ -202175,18 +202187,6 @@ function createHttpApp(mcpServer, parentContext) {
       ...config2.oauthJwksUri && { jwks_uri: config2.oauthJwksUri }
     });
   });
-  app.get(config2.mcpHttpEndpointPath, (c) => {
-    return c.json({
-      status: "ok",
-      server: {
-        name: config2.mcpServerName,
-        version: config2.mcpServerVersion,
-        description: config2.mcpServerDescription,
-        transport: config2.mcpTransportType,
-        sessionMode: config2.mcpSessionMode
-      }
-    });
-  });
   const authStrategy = createAuthStrategy();
   if (authStrategy) {
     const authMiddleware = createAuthMiddleware(authStrategy);
@@ -202195,113 +202195,134 @@ function createHttpApp(mcpServer, parentContext) {
   } else {
     logger.info("Authentication is disabled; MCP endpoint is unprotected.", transportContext);
   }
-  app.delete(config2.mcpHttpEndpointPath, (c) => {
-    const sessionId = c.req.header("mcp-session-id");
-    if (!sessionId) {
-      return c.json({
+  const getSessionTransport = (sessionId) => {
+    if (!sessionManager.isSessionValid(sessionId)) {
+      const stale = transports.get(sessionId);
+      if (stale) {
+        stale.close().catch(() => {});
+        transports.delete(sessionId);
+      }
+      return Response.json({
         jsonrpc: "2.0",
         error: {
-          code: -32600,
-          message: "Mcp-Session-Id header required for DELETE"
+          code: -32001,
+          message: "Session expired or invalid. Please reinitialize."
         },
         id: null
-      }, 400);
+      }, { status: 404 });
     }
-    const terminated = sessionManager.terminateSession(sessionId);
-    if (!terminated) {
-      return c.json({
+    const transport = transports.get(sessionId);
+    if (!transport) {
+      return Response.json({
         jsonrpc: "2.0",
         error: {
           code: -32001,
-          message: "Session not found or already expired"
+          message: "Session not found. Please reinitialize."
         },
         id: null
-      }, 404);
+      }, { status: 404 });
     }
-    logger.info("Session terminated via DELETE", {
-      ...transportContext,
-      sessionId
-    });
-    return c.body(null, 204);
-  });
-  app.all(config2.mcpHttpEndpointPath, async (c) => {
-    const protocolVersion = c.req.header("mcp-protocol-version") ?? "2025-03-26";
-    logger.debug("Handling MCP request.", {
-      ...transportContext,
-      path: c.req.path,
-      method: c.req.method,
-      protocolVersion
-    });
-    const supportedVersions = ["2025-03-26", "2025-06-18"];
-    if (!supportedVersions.includes(protocolVersion)) {
-      logger.warning("Unsupported MCP protocol version requested.", {
-        ...transportContext,
-        protocolVersion,
-        supportedVersions
+    sessionManager.touchSession(sessionId);
+    return transport;
+  };
+  app.get(config2.mcpHttpEndpointPath, async (c) => {
+    const sessionId = c.req.header("mcp-session-id");
+    if (!sessionId) {
+      return c.json({
+        status: "ok",
+        server: {
+          name: config2.mcpServerName,
+          version: config2.mcpServerVersion,
+          description: config2.mcpServerDescription,
+          transport: config2.mcpTransportType,
+          sessionMode: config2.mcpSessionMode
+        }
       });
+    }
+    const transportOrError = getSessionTransport(sessionId);
+    if (transportOrError instanceof Response)
+      return transportOrError;
+    const response = await transportOrError.handleRequest(c);
+    return response ?? c.body(null, 204);
+  });
+  app.delete(config2.mcpHttpEndpointPath, async (c) => {
+    const sessionId = c.req.header("mcp-session-id");
+    if (!sessionId) {
       return c.json({
         jsonrpc: "2.0",
         error: {
           code: -32600,
-          message: `Unsupported MCP protocol version: ${protocolVersion}`,
-          data: {
-            requested: protocolVersion,
-            supported: supportedVersions
-          }
+          message: "Mcp-Session-Id header required for DELETE"
         },
         id: null
       }, 400);
     }
-    const sessionId = c.req.header("mcp-session-id") ?? randomUUID();
-    if (c.req.header("mcp-session-id") && !sessionManager.isSessionValid(sessionId)) {
-      logger.warning("Invalid or expired session ID", {
-        ...transportContext,
-        sessionId
-      });
+    const transport = transports.get(sessionId);
+    if (!transport) {
       return c.json({
         jsonrpc: "2.0",
         error: {
           code: -32001,
-          message: "Session expired or invalid. Please reinitialize."
+          message: "Session not found or already expired"
         },
         id: null
       }, 404);
     }
-    if (!c.req.header("mcp-session-id")) {
-      logger.debug("New session will be created", {
-        ...transportContext,
-        sessionId
+    const response = await transport.handleRequest(c);
+    transports.delete(sessionId);
+    sessionManager.terminateSession(sessionId);
+    logger.info("Session terminated via DELETE", {
+      ...transportContext,
+      sessionId
+    });
+    return response ?? c.body(null, 204);
+  });
+  app.post(config2.mcpHttpEndpointPath, async (c) => {
+    logger.debug("Handling MCP POST request.", {
+      ...transportContext,
+      path: c.req.path
+    });
+    const sessionId = c.req.header("mcp-session-id");
+    const handleRequest = async () => {
+      if (sessionId) {
+        const transportOrError = getSessionTransport(sessionId);
+        if (transportOrError instanceof Response)
+          return transportOrError;
+        const response2 = await transportOrError.handleRequest(c);
+        return response2 ?? c.body(null, 204);
+      }
+      const server = await createMcpServer();
+      const transport = new StreamableHTTPTransport({
+        sessionIdGenerator: () => randomUUID(),
+        onsessioninitialized: (sid) => {
+          transports.set(sid, transport);
+          const store = authContext.getStore();
+          sessionManager.createSession(sid, store?.authInfo.clientId, store?.authInfo.tenantId);
+          logger.debug("New MCP session initialized", {
+            ...transportContext,
+            sessionId: sid
+          });
+        },
+        onsessionclosed: (sid) => {
+          transports.delete(sid);
+          sessionManager.terminateSession(sid);
+          logger.debug("MCP session closed via transport", {
+            ...transportContext,
+            sessionId: sid
+          });
+        }
       });
-    } else {
-      sessionManager.touchSession(sessionId);
-    }
-    const transport = new McpSessionTransport(sessionId);
-    const handleRpc = async () => {
-      await mcpServer.connect(transport);
+      await server.connect(transport);
       const response = await transport.handleRequest(c);
-      if (response && !c.req.header("mcp-session-id")) {
-        const store = authContext.getStore();
-        sessionManager.createSession(sessionId, store?.authInfo.clientId, store?.authInfo.tenantId);
-      }
-      if (response) {
-        return response;
-      }
-      return c.body(null, 204);
+      return response ?? c.body(null, 204);
     };
     try {
       const store = authContext.getStore();
       if (store) {
-        return await authContext.run(store, handleRpc);
+        return await authContext.run(store, handleRequest);
       }
-      return await handleRpc();
+      return await handleRequest();
     } catch (err) {
-      await transport.close?.().catch((closeErr) => {
-        logger.warning("Failed to close transport after error", {
-          ...transportContext,
-          sessionId,
-          error: closeErr instanceof Error ? closeErr.message : String(closeErr)
-        });
-      });
       throw err instanceof Error ? err : new Error(String(err));
     }
   });
@@ -202311,9 +202332,9 @@ function createHttpApp(mcpServer, parentContext) {
 async function isPortInUse(port, host, parentContext) {
   const context = { ...parentContext, operation: "isPortInUse", port, host };
   logger.debug(`Checking if port ${port} is in use...`, context);
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const tempServer = http.createServer();
-    tempServer.once("error", (err) => resolve(err.code === "EADDRINUSE")).once("listening", () => tempServer.close(() => resolve(false))).listen(port, host);
+    tempServer.once("error", (err) => resolve2(err.code === "EADDRINUSE")).once("listening", () => tempServer.close(() => resolve2(false))).listen(port, host);
   });
 }
 function startHttpServerWithRetry(app, initialPort, host, maxRetries, parentContext) {
@@ -202322,7 +202343,7 @@ function startHttpServerWithRetry(app, initialPort, host, maxRetries, parentCont
     operation: "startHttpServerWithRetry"
   };
   logger.info(`Attempting to start HTTP server on port ${initialPort} with ${maxRetries} retries.`, startContext);
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const tryBind = (port, attempt) => {
       if (attempt > maxRetries + 1) {
         const error49 = new Error(`Failed to bind to any port after ${maxRetries} retries.`);
@@ -202350,7 +202371,7 @@ function startHttpServerWithRetry(app, initialPort, host, maxRetries, parentCont
             logStartupBanner(`
 \uD83D\uDE80 MCP Server running at: ${serverAddress}`, "http");
           });
-          resolve(serverInstance);
+          resolve2(serverInstance);
         } catch (err) {
           logger.warning(`Binding attempt failed for port ${port}, retrying...`, { ...startContext, port, attempt, error: String(err) });
           setTimeout(() => tryBind(port + 1, attempt + 1), config2.mcpHttpPortRetryDelayMs);
@@ -202360,13 +202381,13 @@ function startHttpServerWithRetry(app, initialPort, host, maxRetries, parentCont
     tryBind(initialPort, 1);
   });
 }
-async function startHttpTransport(mcpServer, parentContext) {
+async function startHttpTransport(createMcpServer, parentContext) {
   const transportContext = {
     ...parentContext,
     component: "HttpTransportStart"
   };
   logger.info("Starting HTTP transport.", transportContext);
-  const app = createHttpApp(mcpServer, transportContext);
+  const app = createHttpApp(createMcpServer, transportContext);
   const server = await startHttpServerWithRetry(app, config2.mcpHttpPort, config2.mcpHttpHost, config2.mcpHttpMaxPortRetries, transportContext);
   logger.info("HTTP transport started successfully.", transportContext);
   return server;
@@ -202381,14 +202402,14 @@ async function stopHttpTransport(server, parentContext) {
   const sessionManager = SessionManager.getInstance();
   sessionManager.stopCleanupInterval();
   logger.info("Session cleanup interval stopped", operationContext);
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     server.close((err) => {
       if (err) {
         logger.error("Error closing HTTP server.", err, operationContext);
         return reject(err);
       }
       logger.info("HTTP server closed successfully.", operationContext);
-      resolve();
+      resolve2();
     });
   });
 }
@@ -202473,12 +202494,12 @@ class StdioServerTransport {
     this.onclose?.();
   }
   send(message2) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       const json3 = serializeMessage(message2);
       if (this._stdout.write(json3)) {
-        resolve();
+        resolve2();
       } else {
-        this._stdout.once("drain", resolve);
+        this._stdout.once("drain", resolve2);
       }
     });
   }
@@ -202543,10 +202564,10 @@ class TransportManager {
       transport: this.config.mcpTransportType
     });
     this.logger.info(`Starting transport: ${this.config.mcpTransportType}`, context);
-    const mcpServer = await this.createMcpServer();
     if (this.config.mcpTransportType === "http") {
-      this.serverInstance = await startHttpTransport(mcpServer, context);
+      this.serverInstance = await startHttpTransport(this.createMcpServer, context);
     } else if (this.config.mcpTransportType === "stdio") {
+      const mcpServer = await this.createMcpServer();
       this.serverInstance = await startStdioTransport(mcpServer, context);
     } else {
       const transportType = String(this.config.mcpTransportType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "mcpName": "io.github.cyanheads/git-mcp-server",
   "description": "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
   "main": "dist/index.js",