@cyanheads/git-mcp-server 2.1.0 → 2.1.2

package/dist/mcp-server/tools/gitAdd/logic.js

@@ -1,20 +1,25 @@
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import { z } from 'zod';
+import { exec } from "child_process";
+import { promisify } from "util";
+import { z } from "zod";
 // Import utils from barrel (logger from ../utils/internal/logger.js)
-import { logger } from '../../../utils/index.js';
+import { logger } from "../../../utils/index.js";
 // Import utils from barrel (RequestContext from ../utils/internal/requestContext.js)
-import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { BaseErrorCode, McpError } from "../../../types-global/errors.js"; // Keep direct import for types-global
 // Import utils from barrel (sanitization from ../utils/security/sanitization.js)
-import { sanitization } from '../../../utils/index.js';
+import { sanitization } from "../../../utils/index.js";
 const execAsync = promisify(exec);
 // Define the input schema for the git_add tool using Zod
 export const GitAddInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
-    files: z.union([
-        z.string().min(1),
-        z.array(z.string().min(1))
-    ]).default('.').describe('Files or patterns to stage, defaults to all changes (\'.\')'),
+    path: z
+        .string()
+        .min(1)
+        .optional()
+        .default(".")
+        .describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
+    files: z
+        .union([z.string().min(1), z.array(z.string().min(1))])
+        .default(".")
+        .describe("Files or patterns to stage, defaults to all changes ('.')"),
 });
 /**
  * Executes the 'git add' command and returns structured JSON output.
@@ -24,16 +29,18 @@ export const GitAddInputSchema = z.object({
  * @returns {Promise<GitAddResult>} A promise that resolves with the structured add result.
  * @throws {McpError} Throws an McpError if path resolution or validation fails, or if the git command fails unexpectedly.
  */
-export async function addGitFiles(input, context // Add getter to context
-) {
-    const operation = 'addGitFiles';
+export async function addGitFiles(input, context) {
+    const operation = "addGitFiles";
     logger.debug(`Executing ${operation}`, { ...context, input });
     let targetPath;
     try {
         // Resolve the target path
-        if (input.path && input.path !== '.') {
+        if (input.path && input.path !== ".") {
             targetPath = input.path;
-            logger.debug(`Using provided path: ${targetPath}`, { ...context, operation });
+            logger.debug(`Using provided path: ${targetPath}`, {
+                ...context,
+                operation,
+            });
         }
         else {
             const workingDir = context.getWorkingDirectory();
@@ -41,15 +48,29 @@ export async function addGitFiles(input, context // Add getter to context
                 throw new McpError(BaseErrorCode.VALIDATION_ERROR, "No path provided and no working directory set for the session.", { context, operation });
             }
             targetPath = workingDir;
-            logger.debug(`Using session working directory: ${targetPath}`, { ...context, operation, sessionId: context.sessionId });
+            logger.debug(`Using session working directory: ${targetPath}`, {
+                ...context,
+                operation,
+                sessionId: context.sessionId,
+            });
         }
         // Sanitize the resolved path
-        const sanitizedPathInfo = sanitization.sanitizePath(targetPath, { allowAbsolute: true });
-        logger.debug('Sanitized repository path', { ...context, operation, sanitizedPathInfo });
+        const sanitizedPathInfo = sanitization.sanitizePath(targetPath, {
+            allowAbsolute: true,
+        });
+        logger.debug("Sanitized repository path", {
+            ...context,
+            operation,
+            sanitizedPathInfo,
+        });
         targetPath = sanitizedPathInfo.sanitizedPath; // Use the sanitized path going forward
     }
     catch (error) {
-        logger.error('Path resolution or sanitization failed', { ...context, operation, error });
+        logger.error("Path resolution or sanitization failed", {
+            ...context,
+            operation,
+            error,
+        });
         if (error instanceof McpError) {
             throw error;
         }
@@ -61,30 +82,40 @@ export async function addGitFiles(input, context // Add getter to context
     try {
         if (Array.isArray(filesToStage)) {
             if (filesToStage.length === 0) {
-                logger.warning('Empty array provided for files, defaulting to staging all changes.', { ...context, operation });
-                filesArg = '.'; // Default to staging all if array is empty
+                logger.warning("Empty array provided for files, defaulting to staging all changes.", { ...context, operation });
+                filesArg = "."; // Default to staging all if array is empty
             }
             else {
                 // Quote each file path individually
-                filesArg = filesToStage.map(file => {
-                    const sanitizedFile = file.startsWith('-') ? `./${file}` : file; // Prefix with './' if it starts with a dash
+                filesArg = filesToStage
+                    .map((file) => {
+                    const sanitizedFile = file.startsWith("-") ? `./${file}` : file; // Prefix with './' if it starts with a dash
                     return `"${sanitizedFile.replace(/"/g, '\\"')}"`; // Escape quotes within path
-                }).join(' ');
+                })
+                    .join(" ");
             }
         }
-        else { // Single string case
-            const sanitizedFile = filesToStage.startsWith('-') ? `./${filesToStage}` : filesToStage; // Prefix with './' if it starts with a dash
+        else {
+            // Single string case
+            const sanitizedFile = filesToStage.startsWith("-")
+                ? `./${filesToStage}`
+                : filesToStage; // Prefix with './' if it starts with a dash
             filesArg = `"${sanitizedFile.replace(/"/g, '\\"')}"`;
         }
     }
     catch (err) {
-        logger.error('File path validation/quoting failed', { ...context, operation, files: filesToStage, error: err });
+        logger.error("File path validation/quoting failed", {
+            ...context,
+            operation,
+            files: filesToStage,
+            error: err,
+        });
         throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Invalid file path/pattern provided: ${err instanceof Error ? err.message : String(err)}`, { context, operation, originalError: err });
     }
     // This check should ideally not be needed now due to the logic above
     if (!filesArg) {
-        logger.error('Internal error: filesArg is unexpectedly empty after processing.', { ...context, operation });
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, 'Internal error preparing git add command.', { context, operation });
+        logger.error("Internal error: filesArg is unexpectedly empty after processing.", { ...context, operation });
+        throw new McpError(BaseErrorCode.INTERNAL_ERROR, "Internal error preparing git add command.", { context, operation });
     }
     try {
         // Use the resolved targetPath
@@ -93,25 +124,43 @@ export async function addGitFiles(input, context // Add getter to context
         const { stdout, stderr } = await execAsync(command);
         if (stderr) {
             // Log stderr as warning, as 'git add' can produce warnings but still succeed.
-            logger.warning(`Git add command produced stderr`, { ...context, operation, stderr });
+            logger.warning(`Git add command produced stderr`, {
+                ...context,
+                operation,
+                stderr,
+            });
         }
-        logger.info(`${operation} executed successfully`, { ...context, operation, path: targetPath, files: filesToStage });
-        const filesAddedDesc = Array.isArray(filesToStage) ? filesToStage.join(', ') : filesToStage;
+        const filesAddedDesc = Array.isArray(filesToStage)
+            ? filesToStage.join(", ")
+            : filesToStage;
+        const successMessage = `Successfully staged: ${filesAddedDesc}`;
+        logger.info(successMessage, {
+            ...context,
+            operation,
+            path: targetPath,
+            files: filesToStage,
+        });
         const reminder = "Remember to write clear, concise commit messages using the Conventional Commits format (e.g., 'feat(scope): subject').";
         // Use statusMessage and add reminder
         return {
             success: true,
-            statusMessage: `Successfully staged: ${filesAddedDesc}. ${reminder}`,
-            filesStaged: filesToStage
+            statusMessage: `${successMessage}. ${reminder}`,
+            filesStaged: filesToStage,
         };
     }
     catch (error) {
-        logger.error(`Failed to execute git add command`, { ...context, operation, path: targetPath, error: error.message, stderr: error.stderr });
-        const errorMessage = error.stderr || error.message || '';
-        if (errorMessage.toLowerCase().includes('not a git repository')) {
+        logger.error(`Failed to execute git add command`, {
+            ...context,
+            operation,
+            path: targetPath,
+            error: error.message,
+            stderr: error.stderr,
+        });
+        const errorMessage = error.stderr || error.message || "";
+        if (errorMessage.toLowerCase().includes("not a git repository")) {
             throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`, { context, operation, originalError: error });
         }
-        if (errorMessage.toLowerCase().includes('did not match any files')) {
+        if (errorMessage.toLowerCase().includes("did not match any files")) {
             // Still throw an error, but return structured info in the catch block of the registration
             throw new McpError(BaseErrorCode.NOT_FOUND, `Specified files/patterns did not match any files in ${targetPath}: ${filesArg}`, { context, operation, originalError: error, filesStaged: filesToStage });
         }

package/dist/mcp-server/tools/gitAdd/registration.js

@@ -1,12 +1,12 @@
 // Import utils from barrel (logger from ../utils/internal/logger.js)
-import { logger } from '../../../utils/index.js';
+import { logger } from "../../../utils/index.js";
 // Import utils from barrel (ErrorHandler from ../utils/internal/errorHandler.js)
-import { ErrorHandler } from '../../../utils/index.js';
+import { ErrorHandler } from "../../../utils/index.js";
 // Import utils from barrel (requestContextService from ../utils/internal/requestContext.js)
-import { requestContextService } from '../../../utils/index.js';
+import { requestContextService } from "../../../utils/index.js";
 // Import the result type along with the function and input schema
-import { BaseErrorCode } from '../../../types-global/errors.js'; // Import BaseErrorCode
-import { addGitFiles, GitAddInputSchema } from './logic.js';
+import { BaseErrorCode } from "../../../types-global/errors.js"; // Import BaseErrorCode
+import { addGitFiles, GitAddInputSchema, } from "./logic.js";
 let _getWorkingDirectory;
 let _getSessionId;
 /**
@@ -18,10 +18,10 @@ let _getSessionId;
 export function initializeGitAddStateAccessors(getWdFn, getSidFn) {
     _getWorkingDirectory = getWdFn;
     _getSessionId = getSidFn;
-    logger.info('State accessors initialized for git_add tool registration.');
+    logger.info("State accessors initialized for git_add tool registration.");
 }
-const TOOL_NAME = 'git_add';
-const TOOL_DESCRIPTION = 'Stages changes in the Git repository for the next commit by adding file contents to the index (staging area). Can stage specific files/patterns or all changes (default: \'.\'). Returns the result as a JSON object.';
+const TOOL_NAME = "git_add";
+const TOOL_DESCRIPTION = "Stages changes in the Git repository for the next commit by adding file contents to the index (staging area). Can stage specific files/patterns or all changes (default: '.'). Returns the result as a JSON object.";
 /**
  * Registers the git_add tool with the MCP server.
  * Uses the high-level server.tool() method for registration, schema validation, and routing.
@@ -32,15 +32,18 @@ const TOOL_DESCRIPTION = 'Stages changes in the Git repository for the next comm
  */
 export const registerGitAddTool = async (server) => {
     if (!_getWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_add must be initialized before registration.');
+        throw new Error("State accessors for git_add must be initialized before registration.");
     }
-    const operation = 'registerGitAddTool';
+    const operation = "registerGitAddTool";
     const context = requestContextService.createRequestContext({ operation });
     await ErrorHandler.tryCatch(async () => {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitAddInputSchema.shape, // Provide the Zod schema shape
         async (validatedArgs, callContext) => {
-            const toolOperation = 'tool:git_add';
-            const requestContext = requestContextService.createRequestContext({ operation: toolOperation, parentContext: callContext });
+            const toolOperation = "tool:git_add";
+            const requestContext = requestContextService.createRequestContext({
+                operation: toolOperation,
+                parentContext: callContext,
+            });
             const sessionId = _getSessionId(requestContext);
             const getWorkingDirectoryForSession = () => {
                 return _getWorkingDirectory(sessionId);
@@ -56,10 +59,10 @@ export const registerGitAddTool = async (server) => {
                 const addResult = await addGitFiles(validatedArgs, logicContext);
                 // Format the successful result as a JSON string within TextContent
                 const resultContent = {
-                    type: 'text',
+                    type: "text",
                     // Stringify the JSON object for the response content
                     text: JSON.stringify(addResult, null, 2), // Pretty-print JSON
-                    contentType: 'application/json',
+                    contentType: "application/json",
                 };
                 logger.info(`Tool ${TOOL_NAME} executed successfully, returning JSON`, logicContext);
                 return { content: [resultContent] };

package/dist/mcp-server/tools/gitBranch/index.js

@@ -2,6 +2,6 @@
  * @fileoverview Barrel file for the git_branch tool.
  * Exports the registration function and state accessor initialization function.
  */
-export { registerGitBranchTool, initializeGitBranchStateAccessors } from './registration.js';
+export { registerGitBranchTool, initializeGitBranchStateAccessors, } from "./registration.js";
 // Export types if needed elsewhere, e.g.:
 // export type { GitBranchInput, GitBranchResult } from './logic.js';