@cyanheads/git-mcp-server 2.8.1 → 2.8.3

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.8.1-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.3-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.1",
+    version: "2.8.3",
     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",
@@ -15855,9 +15855,9 @@ var init_config = __esm(() => {
     git: exports_external.object({
       provider: exports_external.preprocess(emptyStringAsUndefined, exports_external.enum(["auto", "cli", "isomorphic"]).default("auto")),
       signCommits: exports_external.coerce.boolean().default(false),
-      authorName: exports_external.string().optional(),
+      authorName: exports_external.string().regex(/^[^\n\r\0]*$/, "Git author name must not contain newlines or null bytes").optional(),
       authorEmail: exports_external.string().email().optional(),
-      committerName: exports_external.string().optional(),
+      committerName: exports_external.string().regex(/^[^\n\r\0]*$/, "Git committer name must not contain newlines or null bytes").optional(),
       committerEmail: exports_external.string().email().optional(),
       wrapupInstructionsPath: exports_external.preprocess(expandTildePath, exports_external.string().optional()),
       baseDir: exports_external.preprocess((val) => expandTildePath(emptyStringAsUndefined(val)), exports_external.string().refine((p) => !p || isAbsolutePath(p), {
@@ -194057,6 +194057,25 @@ async function resolveWorkingDirectory(pathInput, appContext, storage) {
   });
   return sanitizedPath;
 }
+var DEFAULT_PROTECTION = {
+  protectedBranches: ["main", "master", "production", "prod", "develop", "dev"],
+  enforce: true
+};
+function isProtectedBranch(branchName, config3 = DEFAULT_PROTECTION) {
+  return config3.protectedBranches.includes(branchName.toLowerCase());
+}
+function validateProtectedBranchOperation(branchName, operation, confirmed, config3 = DEFAULT_PROTECTION) {
+  if (!config3.enforce) {
+    return;
+  }
+  if (isProtectedBranch(branchName, config3) && !confirmed) {
+    throw new McpError(-32007 /* ValidationError */, `Cannot perform '${operation}' on protected branch '${branchName}' without explicit confirmation.`, {
+      branch: branchName,
+      operation,
+      hint: "Set the confirmation parameter to true to proceed."
+    });
+  }
+}
 
 // src/mcp-server/tools/utils/toolHandlerFactory.ts
 function validateSdkContext(ctx) {
@@ -196243,7 +196262,8 @@ var InputSchema23 = exports_external.object({
   tags: exports_external.boolean().default(false).describe("Push all tags to the remote."),
   dryRun: DryRunSchema,
   delete: exports_external.boolean().default(false).describe("Delete the specified remote branch."),
-  remoteBranch: BranchNameSchema.optional().describe("Remote branch name to push to (if different from local branch name).")
+  remoteBranch: BranchNameSchema.optional().describe("Remote branch name to push to (if different from local branch name)."),
+  confirmed: exports_external.boolean().default(false).describe("Explicit confirmation required for force push or branch deletion on protected branches (main, master, production, etc.).")
 });
 var OutputSchema24 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -196254,6 +196274,21 @@ var OutputSchema24 = exports_external.object({
   rejectedRefs: exports_external.array(exports_external.string()).describe("References that were rejected by the remote.")
 });
 async function gitPushLogic(input, { provider, targetPath, appContext }) {
+  if (input.force || input.delete) {
+    let branchToCheck = input.branch;
+    if (!branchToCheck) {
+      const status = await provider.status({ includeUntracked: false }, {
+        workingDirectory: targetPath,
+        requestContext: appContext,
+        tenantId: appContext.tenantId || "default-tenant"
+      });
+      branchToCheck = status?.currentBranch ?? undefined;
+    }
+    if (branchToCheck) {
+      const operation = input.force ? "force push" : "branch deletion";
+      validateProtectedBranchOperation(branchToCheck, operation, input.confirmed);
+    }
+  }
   const pushOptions = {};
   if (input.remote !== undefined) {
     pushOptions.remote = input.remote;
@@ -196414,7 +196449,8 @@ var InputSchema25 = exports_external.object({
   path: PathSchema,
   mode: exports_external.enum(["soft", "mixed", "hard", "merge", "keep"]).default("mixed").describe("Reset mode: soft (keep changes staged), mixed (unstage changes), hard (discard all changes), merge (reset and merge), keep (reset but keep local changes)."),
   target: CommitRefSchema.optional().describe("Target commit to reset to (default: HEAD)."),
-  paths: exports_external.array(exports_external.string()).optional().describe("Specific file paths to reset (leaves HEAD unchanged).")
+  paths: exports_external.array(exports_external.string()).optional().describe("Specific file paths to reset (leaves HEAD unchanged)."),
+  confirmed: exports_external.boolean().default(false).describe("Explicit confirmation required for hard reset on protected branches (main, master, production, etc.).")
 });
 var OutputSchema26 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -196423,6 +196459,16 @@ var OutputSchema26 = exports_external.object({
   filesReset: exports_external.array(exports_external.string()).describe("Files that were affected by the reset.")
 });
 async function gitResetLogic(input, { provider, targetPath, appContext }) {
+  if (input.mode === "hard") {
+    const status = await provider.status({ includeUntracked: false }, {
+      workingDirectory: targetPath,
+      requestContext: appContext,
+      tenantId: appContext.tenantId || "default-tenant"
+    });
+    if (status?.currentBranch) {
+      validateProtectedBranchOperation(status.currentBranch, "reset --hard", input.confirmed);
+    }
+  }
   const resetOptions = {
     mode: input.mode
   };
@@ -201929,6 +201975,7 @@ class SessionManager {
   cleanupIntervalId = null;
   staleTimeoutMs;
   cleanupIntervalMs;
+  onSessionExpired = null;
   constructor(staleTimeoutMs = 30 * 60 * 1000, cleanupIntervalMs = 5 * 60 * 1000) {
     this.staleTimeoutMs = staleTimeoutMs;
     this.cleanupIntervalMs = cleanupIntervalMs;
@@ -201984,6 +202031,7 @@ class SessionManager {
         staleTimeoutMs: this.staleTimeoutMs
       });
       this.sessions.delete(sessionId);
+      this.onSessionExpired?.(sessionId);
       return false;
     }
     return true;
@@ -202051,6 +202099,7 @@ class SessionManager {
       const age = now2 - metadata.lastActivityAt;
       if (age > this.staleTimeoutMs) {
         this.sessions.delete(sessionId);
+        this.onSessionExpired?.(sessionId);
         removedCount++;
       }
     }
@@ -202079,26 +202128,36 @@ 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
   });
-  const allowedOrigin = Array.isArray(config2.mcpAllowedOrigins) && config2.mcpAllowedOrigins.length > 0 ? config2.mcpAllowedOrigins : "*";
+  const explicitOrigins = config2.mcpAllowedOrigins;
+  const allowedOrigin = explicitOrigins && explicitOrigins.length > 0 ? explicitOrigins : "*";
+  if (allowedOrigin === "*" && config2.environment === "production") {
+    logger.warning("MCP_ALLOWED_ORIGINS is not configured. CORS will allow all origins. " + "Set MCP_ALLOWED_ORIGINS to restrict cross-origin access in production.", transportContext);
+  }
   app.use("*", cors({
     origin: allowedOrigin,
     allowMethods: ["GET", "POST", "DELETE", "OPTIONS"],
@@ -202125,19 +202184,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,
-        environment: config2.environment,
-        transport: config2.mcpTransportType,
-        sessionMode: config2.mcpSessionMode
-      }
-    });
-  });
   const authStrategy = createAuthStrategy();
   if (authStrategy) {
     const authMiddleware = createAuthMiddleware(authStrategy);
@@ -202146,113 +202192,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,13 +202378,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;
@@ -202494,10 +202561,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.1",
+  "version": "2.8.3",
   "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",