@cyanheads/git-mcp-server 2.1.0 → 2.1.2

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

@@ -1,11 +1,11 @@
 // 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 (logger from ../utils/internal/logger.js)
-import { logger } from '../../../utils/index.js';
+import { logger } from "../../../utils/index.js";
 // Import utils from barrel (requestContextService, RequestContext from ../utils/internal/requestContext.js)
-import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
-import { requestContextService } from '../../../utils/index.js';
-import { GitPullInputSchema, pullGitChanges } from './logic.js';
+import { BaseErrorCode } from "../../../types-global/errors.js"; // Keep direct import for types-global
+import { requestContextService } from "../../../utils/index.js";
+import { GitPullInputSchema, pullGitChanges, } from "./logic.js";
 let _getWorkingDirectory;
 let _getSessionId;
 /**
@@ -17,9 +17,9 @@ let _getSessionId;
 export function initializeGitPullStateAccessors(getWdFn, getSidFn) {
     _getWorkingDirectory = getWdFn;
     _getSessionId = getSidFn;
-    logger.info('State accessors initialized for git_pull tool registration.');
+    logger.info("State accessors initialized for git_pull tool registration.");
 }
-const TOOL_NAME = 'git_pull';
+const TOOL_NAME = "git_pull";
 const TOOL_DESCRIPTION = "Fetches from and integrates with another repository or a local branch (e.g., 'git pull origin main'). Supports rebase and fast-forward only options. Returns the pull result as a JSON object.";
 /**
  * Registers the git_pull tool with the MCP server.
@@ -29,15 +29,18 @@ const TOOL_DESCRIPTION = "Fetches from and integrates with another repository or
  */
 export async function registerGitPullTool(server) {
     if (!_getWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_pull must be initialized before registration.');
+        throw new Error("State accessors for git_pull must be initialized before registration.");
     }
-    const operation = 'registerGitPullTool';
+    const operation = "registerGitPullTool";
     const context = requestContextService.createRequestContext({ operation });
     await ErrorHandler.tryCatch(async () => {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitPullInputSchema.shape, // Provide the Zod schema shape
         async (validatedArgs, callContext) => {
-            const toolOperation = 'tool:git_pull';
-            const requestContext = requestContextService.createRequestContext({ operation: toolOperation, parentContext: callContext });
+            const toolOperation = "tool:git_pull";
+            const requestContext = requestContextService.createRequestContext({
+                operation: toolOperation,
+                parentContext: callContext,
+            });
             const sessionId = _getSessionId(requestContext);
             const getWorkingDirectoryForSession = () => {
                 return _getWorkingDirectory(sessionId);
@@ -53,9 +56,9 @@ export async function registerGitPullTool(server) {
                 const pullResult = await pullGitChanges(validatedArgs, logicContext);
                 // Format the result as a JSON string within TextContent
                 const resultContent = {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify(pullResult, null, 2), // Pretty-print JSON
-                    contentType: 'application/json',
+                    contentType: "application/json",
                 };
                 // Log based on the success flag in the result
                 if (pullResult.success) {
@@ -81,4 +84,3 @@ export async function registerGitPullTool(server) {
         logger.info(`Tool registered: ${TOOL_NAME}`, context);
     }, { operation, context, critical: true });
 }
-;

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

@@ -1,6 +1,6 @@
 /**
  * @fileoverview Barrel file for the gitPush tool.
  */
-export { registerGitPushTool, initializeGitPushStateAccessors } from './registration.js';
+export { registerGitPushTool, initializeGitPushStateAccessors, } from "./registration.js";
 // Export types if needed elsewhere, e.g.:
 // export type { GitPushInput, GitPushResult } from './logic.js';

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

@@ -1,24 +1,58 @@
-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_push tool using Zod
 export const GitPushInputSchema = 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."),
-    remote: z.string().optional().describe("The remote repository to push to (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
-    branch: z.string().optional().describe("The local branch to push (e.g., 'main', 'feat/new-login'). Defaults to the current branch."),
-    remoteBranch: z.string().optional().describe("The remote branch to push to (e.g., 'main', 'develop'). Defaults to the same name as the local branch."),
-    force: z.boolean().optional().default(false).describe("Force the push (use with caution: `--force-with-lease` is generally safer)."),
-    forceWithLease: z.boolean().optional().default(false).describe("Force the push only if the remote ref is the expected value (`--force-with-lease`). Safer than --force."),
-    setUpstream: z.boolean().optional().default(false).describe("Set the upstream tracking configuration (`-u` or `--set-upstream`)."),
-    tags: z.boolean().optional().default(false).describe("Push all tags (`--tags`)."),
-    delete: z.boolean().optional().default(false).describe("Delete the remote branch (`--delete`). Requires `branch` to be specified. Use with caution, as deleting remote branches can affect collaborators."),
+    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."),
+    remote: z
+        .string()
+        .optional()
+        .describe("The remote repository to push to (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
+    branch: z
+        .string()
+        .optional()
+        .describe("The local branch to push (e.g., 'main', 'feat/new-login'). Defaults to the current branch."),
+    remoteBranch: z
+        .string()
+        .optional()
+        .describe("The remote branch to push to (e.g., 'main', 'develop'). Defaults to the same name as the local branch."),
+    force: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Force the push (use with caution: `--force-with-lease` is generally safer)."),
+    forceWithLease: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Force the push only if the remote ref is the expected value (`--force-with-lease`). Safer than --force."),
+    setUpstream: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Set the upstream tracking configuration (`-u` or `--set-upstream`)."),
+    tags: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Push all tags (`--tags`)."),
+    delete: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Delete the remote branch (`--delete`). Requires `branch` to be specified. Use with caution, as deleting remote branches can affect collaborators."),
     // Add other relevant git push options as needed (e.g., --prune, --all)
 });
 /**
@@ -30,12 +64,12 @@ export const GitPushInputSchema = z.object({
  * @throws {McpError} Throws an McpError if path resolution, validation, or the git command fails unexpectedly.
  */
 export async function pushGitChanges(input, context) {
-    const operation = 'pushGitChanges';
+    const operation = "pushGitChanges";
     logger.debug(`Executing ${operation}`, { ...context, input });
     let targetPath;
     try {
         // Resolve and sanitize the target path
-        if (input.path && input.path !== '.') {
+        if (input.path && input.path !== ".") {
             targetPath = input.path;
         }
         else {
@@ -45,11 +79,21 @@ export async function pushGitChanges(input, context) {
             }
             targetPath = workingDir;
         }
-        targetPath = sanitization.sanitizePath(targetPath, { allowAbsolute: true }).sanitizedPath;
-        logger.debug('Sanitized path', { ...context, operation, sanitizedPath: targetPath });
+        targetPath = sanitization.sanitizePath(targetPath, {
+            allowAbsolute: true,
+        }).sanitizedPath;
+        logger.debug("Sanitized path", {
+            ...context,
+            operation,
+            sanitizedPath: targetPath,
+        });
     }
     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;
         throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Invalid path: ${error instanceof Error ? error.message : String(error)}`, { context, operation, originalError: error });
@@ -61,35 +105,39 @@ export async function pushGitChanges(input, context) {
     if (input.force && input.forceWithLease) {
         throw new McpError(BaseErrorCode.VALIDATION_ERROR, "Cannot use --force and --force-with-lease together.", { context, operation });
     }
-    if (input.delete && (input.force || input.forceWithLease || input.setUpstream || input.tags)) {
+    if (input.delete &&
+        (input.force || input.forceWithLease || input.setUpstream || input.tags)) {
         throw new McpError(BaseErrorCode.VALIDATION_ERROR, "Cannot combine --delete with --force, --force-with-lease, --set-upstream, or --tags.", { context, operation });
     }
     try {
         // Construct the git push command
         let command = `git -C "${targetPath}" push`;
         if (input.force) {
-            command += ' --force';
+            command += " --force";
         }
         else if (input.forceWithLease) {
-            command += ' --force-with-lease';
+            command += " --force-with-lease";
         }
         if (input.setUpstream) {
-            command += ' --set-upstream';
+            command += " --set-upstream";
         }
         if (input.tags) {
-            command += ' --tags';
+            command += " --tags";
         }
         if (input.delete) {
-            command += ' --delete';
+            command += " --delete";
         }
         // Add remote and branch specification
-        const remote = input.remote ? input.remote.replace(/[^a-zA-Z0-9_.\-/]/g, '') : 'origin'; // Default to origin
+        const remote = input.remote
+            ? input.remote.replace(/[^a-zA-Z0-9_.\-/]/g, "")
+            : "origin"; // Default to origin
         command += ` ${remote}`;
         if (input.branch) {
-            const localBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, '');
+            const localBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, "");
             command += ` ${localBranch}`;
-            if (input.remoteBranch && !input.delete) { // remoteBranch only makes sense if not deleting
-                const remoteBranch = input.remoteBranch.replace(/[^a-zA-Z0-9_.\-/]/g, '');
+            if (input.remoteBranch && !input.delete) {
+                // remoteBranch only makes sense if not deleting
+                const remoteBranch = input.remoteBranch.replace(/[^a-zA-Z0-9_.\-/]/g, "");
                 command += `:${remoteBranch}`;
             }
         }
@@ -97,92 +145,60 @@ export async function pushGitChanges(input, context) {
             // If no branch, tags, or delete specified, push the current branch by default
             // Git might handle this automatically, but being explicit can be clearer
             // command += ' HEAD'; // Or let git figure out the default push behavior
-            logger.debug('No specific branch, tags, or delete specified. Relying on default git push behavior for current branch.', { ...context, operation });
+            logger.debug("No specific branch, tags, or delete specified. Relying on default git push behavior for current branch.", { ...context, operation });
         }
         logger.debug(`Executing command: ${command}`, { ...context, operation });
         // Execute command. Note: Git push often uses stderr for progress and success messages.
         const { stdout, stderr } = await execAsync(command);
-        logger.info(`Git push stdout: ${stdout}`, { ...context, operation });
-        logger.info(`Git push stderr: ${stderr}`, { ...context, operation }); // Log stderr as info as it's commonly used
-        // Analyze stderr primarily, fallback to stdout
-        let message = stderr.trim() || stdout.trim();
-        let success = true;
-        let rejected = false;
-        let deleted = false;
-        let summary = undefined;
-        // Check for common success/status messages in stderr
-        if (message.includes('Everything up-to-date')) {
-            message = 'Everything up-to-date.';
-        }
-        else if (message.match(/->\s+\[new branch\]/) || message.match(/->\s+\[new tag\]/)) {
-            message = 'Push successful (new branch/tag created).';
-            // Extract summary if possible (e.g., commit range)
-            const summaryMatch = message.match(/([a-f0-9]+\.\.[a-f0-9]+)\s+\S+\s+->\s+\S+/);
-            if (summaryMatch)
-                summary = summaryMatch[1];
-        }
-        else if (message.includes('Done.')) { // Common part of successful push output
-            // Try to find a more specific message
-            if (stderr.includes('updating') || stdout.includes('updating')) {
-                message = 'Push successful.';
-                const summaryMatch = message.match(/([a-f0-9]+\.\.[a-f0-9]+)\s+\S+\s+->\s+\S+/);
-                if (summaryMatch)
-                    summary = summaryMatch[1];
-            }
-            else {
-                message = 'Push completed (check logs for details).'; // Generic success if specific pattern not found
-            }
+        logger.debug(`Git push stdout: ${stdout}`, { ...context, operation });
+        if (stderr) {
+            logger.debug(`Git push stderr: ${stderr}`, { ...context, operation });
         }
-        else if (message.includes('[rejected]')) {
-            message = 'Push rejected.';
-            success = false;
-            rejected = true;
-            // Extract reason if possible
-            const reasonMatch = message.match(/\[rejected\].*->.*?\((.*?)\)/);
-            if (reasonMatch) {
-                message += ` Reason: ${reasonMatch[1]}.`;
-                if (reasonMatch[1].includes('non-fast-forward')) {
-                    message += ' Hint: Try pulling first or use force options if necessary.';
-                }
-            }
-        }
-        else if (message.includes('[deleted]')) {
-            message = 'Remote branch deleted successfully.';
-            deleted = true;
-        }
-        else if (message.includes('fatal:')) {
-            // If a fatal error wasn't caught by execAsync but is in stderr/stdout
-            success = false;
-            message = `Push failed: ${message}`;
-            logger.error(`Git push command indicated failure: ${message}`, { ...context, operation, stdout, stderr });
-        }
-        else if (!message && !stdout && !stderr) {
-            // If command succeeds with no output (can happen in some cases)
-            message = 'Push command executed, but no output received.';
-            logger.warning(message, { ...context, operation });
-        }
-        logger.info(`${operation} completed`, { ...context, operation, path: targetPath, success, message, rejected, deleted });
-        return { success, message, summary, rejected, deleted };
+        // Analyze stderr primarily, fallback to stdout
+        const message = stderr.trim() || stdout.trim() || "Push command executed.";
+        const summary = message;
+        const rejected = message.includes("[rejected]");
+        const deleted = message.includes("[deleted]");
+        logger.info("git push executed successfully", {
+            ...context,
+            operation,
+            path: targetPath,
+            summary,
+            rejected,
+            deleted,
+        });
+        return { success: true, message, summary, rejected, deleted };
     }
     catch (error) {
-        logger.error(`Failed to execute git push command`, { ...context, operation, path: targetPath, error: error.message, stderr: error.stderr, stdout: error.stdout });
-        const errorMessage = error.stderr || error.stdout || error.message || '';
+        logger.error(`Failed to execute git push command`, {
+            ...context,
+            operation,
+            path: targetPath,
+            error: error.message,
+            stderr: error.stderr,
+            stdout: error.stdout,
+        });
+        const errorMessage = error.stderr || error.stdout || error.message || "";
         // Handle specific error cases
-        if (errorMessage.toLowerCase().includes('not a git repository')) {
+        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.includes('resolve host') || errorMessage.includes('Could not read from remote repository') || errorMessage.includes('Connection timed out')) {
+        if (errorMessage.includes("resolve host") ||
+            errorMessage.includes("Could not read from remote repository") ||
+            errorMessage.includes("Connection timed out")) {
             throw new McpError(BaseErrorCode.SERVICE_UNAVAILABLE, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('rejected') || errorMessage.includes('failed to push some refs')) {
+        if (errorMessage.includes("rejected") ||
+            errorMessage.includes("failed to push some refs")) {
             // This might be caught here if execAsync throws due to non-zero exit code on rejection
-            logger.warning('Push rejected (caught as error)', { ...context, operation, path: targetPath, errorMessage });
-            return { success: false, message: `Push rejected: ${errorMessage}`, rejected: true };
+            throw new McpError(BaseErrorCode.CONFLICT, `Push rejected: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('Authentication failed') || errorMessage.includes('Permission denied')) {
+        if (errorMessage.includes("Authentication failed") ||
+            errorMessage.includes("Permission denied")) {
             throw new McpError(BaseErrorCode.UNAUTHORIZED, `Authentication failed for remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('src refspec') && errorMessage.includes('does not match any')) {
+        if (errorMessage.includes("src refspec") &&
+            errorMessage.includes("does not match any")) {
             throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Push failed: Source branch/refspec does not exist locally. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
         // Generic internal error for other failures

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

@@ -1,11 +1,11 @@
 // 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 (logger from ../utils/internal/logger.js)
-import { logger } from '../../../utils/index.js';
+import { logger } from "../../../utils/index.js";
 // Import utils from barrel (requestContextService, RequestContext from ../utils/internal/requestContext.js)
-import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
-import { requestContextService } from '../../../utils/index.js';
-import { GitPushInputSchema, pushGitChanges } from './logic.js';
+import { BaseErrorCode } from "../../../types-global/errors.js"; // Keep direct import for types-global
+import { requestContextService } from "../../../utils/index.js";
+import { GitPushInputSchema, pushGitChanges, } from "./logic.js";
 let _getWorkingDirectory;
 let _getSessionId;
 /**
@@ -17,9 +17,9 @@ let _getSessionId;
 export function initializeGitPushStateAccessors(getWdFn, getSidFn) {
     _getWorkingDirectory = getWdFn;
     _getSessionId = getSidFn;
-    logger.info('State accessors initialized for git_push tool registration.');
+    logger.info("State accessors initialized for git_push tool registration.");
 }
-const TOOL_NAME = 'git_push';
+const TOOL_NAME = "git_push";
 const TOOL_DESCRIPTION = "Updates remote refs using local refs, sending objects necessary to complete the given refs. Supports pushing specific branches, tags, forcing, setting upstream, and deleting remote branches. Returns the push result as a JSON object.";
 /**
  * Registers the git_push tool with the MCP server.
@@ -29,15 +29,18 @@ const TOOL_DESCRIPTION = "Updates remote refs using local refs, sending objects
  */
 export async function registerGitPushTool(server) {
     if (!_getWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_push must be initialized before registration.');
+        throw new Error("State accessors for git_push must be initialized before registration.");
     }
-    const operation = 'registerGitPushTool';
+    const operation = "registerGitPushTool";
     const context = requestContextService.createRequestContext({ operation });
     await ErrorHandler.tryCatch(async () => {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitPushInputSchema.shape, // Provide the Zod schema shape
         async (validatedArgs, callContext) => {
-            const toolOperation = 'tool:git_push';
-            const requestContext = requestContextService.createRequestContext({ operation: toolOperation, parentContext: callContext });
+            const toolOperation = "tool:git_push";
+            const requestContext = requestContextService.createRequestContext({
+                operation: toolOperation,
+                parentContext: callContext,
+            });
             const sessionId = _getSessionId(requestContext);
             const getWorkingDirectoryForSession = () => {
                 return _getWorkingDirectory(sessionId);
@@ -53,9 +56,9 @@ export async function registerGitPushTool(server) {
                 const pushResult = await pushGitChanges(validatedArgs, logicContext);
                 // Format the result as a JSON string within TextContent
                 const resultContent = {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify(pushResult, null, 2), // Pretty-print JSON
-                    contentType: 'application/json',
+                    contentType: "application/json",
                 };
                 // Log based on the success flag in the result
                 if (pushResult.success) {
@@ -81,4 +84,3 @@ export async function registerGitPushTool(server) {
         logger.info(`Tool registered: ${TOOL_NAME}`, context);
     }, { operation, context, critical: true });
 }
-;

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

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