@cyanheads/git-mcp-server 2.1.0 → 2.1.2

package/dist/mcp-server/tools/gitLog/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 { GitLogInputSchema, logGitHistory } from './logic.js';
+import { BaseErrorCode } from "../../../types-global/errors.js"; // Keep direct import for types-global
+import { requestContextService } from "../../../utils/index.js";
+import { GitLogInputSchema, logGitHistory, } from "./logic.js";
 let _getWorkingDirectory;
 let _getSessionId;
 /**
@@ -17,9 +17,9 @@ let _getSessionId;
 export function initializeGitLogStateAccessors(getWdFn, getSidFn) {
     _getWorkingDirectory = getWdFn;
     _getSessionId = getSidFn;
-    logger.info('State accessors initialized for git_log tool registration.');
+    logger.info("State accessors initialized for git_log tool registration.");
 }
-const TOOL_NAME = 'git_log';
+const TOOL_NAME = "git_log";
 const TOOL_DESCRIPTION = "Shows commit logs for the repository. Supports limiting count, filtering by author, date range, and specific branch/file. Returns a JSON object containing a list of commit objects (`commits` array) by default. If `showSignature: true` is used, it returns a JSON object where the `commits` array is empty and the raw signature verification output is included in the `message` field.";
 /**
  * Registers the git_log tool with the MCP server.
@@ -29,15 +29,18 @@ const TOOL_DESCRIPTION = "Shows commit logs for the repository. Supports limitin
  */
 export async function registerGitLogTool(server) {
     if (!_getWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_log must be initialized before registration.');
+        throw new Error("State accessors for git_log must be initialized before registration.");
     }
-    const operation = 'registerGitLogTool';
+    const operation = "registerGitLogTool";
     const context = requestContextService.createRequestContext({ operation });
     await ErrorHandler.tryCatch(async () => {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitLogInputSchema.shape, // Provide the Zod schema shape
         async (validatedArgs, callContext) => {
-            const toolOperation = 'tool:git_log';
-            const requestContext = requestContextService.createRequestContext({ operation: toolOperation, parentContext: callContext });
+            const toolOperation = "tool:git_log";
+            const requestContext = requestContextService.createRequestContext({
+                operation: toolOperation,
+                parentContext: callContext,
+            });
             const sessionId = _getSessionId(requestContext);
             const getWorkingDirectoryForSession = () => {
                 return _getWorkingDirectory(sessionId);
@@ -53,10 +56,10 @@ export async function registerGitLogTool(server) {
                 const logResult = await logGitHistory(validatedArgs, logicContext);
                 // Format the result (array of commits) as a JSON string within TextContent
                 const resultContent = {
-                    type: 'text',
+                    type: "text",
                     // Stringify the entire GitLogResult object which includes the commits array and success flag
                     text: JSON.stringify(logResult, null, 2), // Pretty-print JSON
-                    contentType: 'application/json',
+                    contentType: "application/json",
                 };
                 logger.info(`Tool ${TOOL_NAME} executed successfully, returning JSON`, logicContext);
                 // Success is determined by the logic function and included in the result object
@@ -71,4 +74,3 @@ export async function registerGitLogTool(server) {
         logger.info(`Tool registered: ${TOOL_NAME}`, context);
     }, { operation, context, critical: true });
 }
-;

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

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

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

@@ -1,22 +1,42 @@
-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 path from 'path'; // Import path module
-import { sanitization } from '../../../utils/index.js';
+import path from "path"; // Import path module
+import { sanitization } from "../../../utils/index.js";
 const execAsync = promisify(exec);
 // Define the input schema for the git_merge tool
 export const GitMergeInputSchema = 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."),
-    branch: z.string().min(1).describe('The name of the branch to merge into the current branch.'),
-    commitMessage: z.string().optional().describe('Commit message to use for the merge commit (if required, e.g., not fast-forward).'),
-    noFf: z.boolean().default(false).describe('Create a merge commit even when the merge resolves as a fast-forward (`--no-ff`).'),
-    squash: z.boolean().default(false).describe('Combine merged changes into a single commit (`--squash`). Requires manual commit afterwards.'),
-    abort: z.boolean().default(false).describe('Abort the current merge process (resolves conflicts).'),
+    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."),
+    branch: z
+        .string()
+        .min(1)
+        .describe("The name of the branch to merge into the current branch."),
+    commitMessage: z
+        .string()
+        .optional()
+        .describe("Commit message to use for the merge commit (if required, e.g., not fast-forward)."),
+    noFf: z
+        .boolean()
+        .default(false)
+        .describe("Create a merge commit even when the merge resolves as a fast-forward (`--no-ff`)."),
+    squash: z
+        .boolean()
+        .default(false)
+        .describe("Combine merged changes into a single commit (`--squash`). Requires manual commit afterwards."),
+    abort: z
+        .boolean()
+        .default(false)
+        .describe("Abort the current merge process (resolves conflicts)."),
     // 'continue' might be too complex for initial implementation due to requiring index manipulation
 });
 /**
@@ -28,13 +48,13 @@ export const GitMergeInputSchema = z.object({
  * @throws {McpError} Throws an McpError for path issues, command failures, or unexpected errors.
  */
 export async function gitMergeLogic(input, context) {
-    const operation = 'gitMergeLogic';
+    const operation = "gitMergeLogic";
     logger.debug(`Executing ${operation}`, { ...context, input });
     let targetPath;
     try {
         // Resolve the target path
         let resolvedPath;
-        if (input.path && input.path !== '.') {
+        if (input.path && input.path !== ".") {
             // If a specific path is given, resolve it absolutely first
             // Assuming input.path could be relative *to the server's CWD* if no session WD is set,
             // but it's safer to require absolute paths or rely on session WD.
@@ -50,7 +70,10 @@ export async function gitMergeLogic(input, context) {
                 // If relative path given without session WD, it's ambiguous. Error out.
                 throw new McpError(BaseErrorCode.VALIDATION_ERROR, "Relative path provided but no working directory set for the session.", { context, operation });
             }
-            logger.debug(`Resolved provided path: ${resolvedPath}`, { ...context, operation });
+            logger.debug(`Resolved provided path: ${resolvedPath}`, {
+                ...context,
+                operation,
+            });
         }
         else {
             const workingDir = context.getWorkingDirectory();
@@ -58,16 +81,26 @@ export async function gitMergeLogic(input, context) {
                 throw new McpError(BaseErrorCode.VALIDATION_ERROR, "No path provided and no working directory set for the session.", { context, operation });
             }
             resolvedPath = workingDir; // Use session working directory
-            logger.debug(`Using session working directory: ${resolvedPath}`, { ...context, operation, sessionId: context.sessionId });
+            logger.debug(`Using session working directory: ${resolvedPath}`, {
+                ...context,
+                operation,
+                sessionId: context.sessionId,
+            });
         }
         // Sanitize the resolved path
         // We assume the resolved path should be absolute for git commands.
         // sanitizePath checks for traversal and normalizes.
-        targetPath = sanitization.sanitizePath(resolvedPath, { allowAbsolute: true }).sanitizedPath;
+        targetPath = sanitization.sanitizePath(resolvedPath, {
+            allowAbsolute: true,
+        }).sanitizedPath;
         logger.debug(`Sanitized path: ${targetPath}`, { ...context, operation });
     }
     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;
         }
@@ -76,15 +109,16 @@ export async function gitMergeLogic(input, context) {
     // --- Construct the git merge command ---
     let command = `git -C "${targetPath}" merge`;
     if (input.abort) {
-        command += ' --abort';
+        command += " --abort";
     }
     else {
         // Standard merge options
         if (input.noFf)
-            command += ' --no-ff';
+            command += " --no-ff";
         if (input.squash)
-            command += ' --squash';
-        if (input.commitMessage && !input.squash) { // Commit message only relevant if not squashing (squash requires separate commit)
+            command += " --squash";
+        if (input.commitMessage && !input.squash) {
+            // Commit message only relevant if not squashing (squash requires separate commit)
             command += ` -m "${input.commitMessage.replace(/"/g, '\\"')}"`;
         }
         else if (input.squash && input.commitMessage) {
@@ -99,62 +133,69 @@ export async function gitMergeLogic(input, context) {
         logger.debug(`Command stdout: ${stdout}`, { ...context, operation });
         if (stderr)
             logger.debug(`Command stderr: ${stderr}`, { ...context, operation }); // Log stderr even on success
+        const result = {
+            success: true,
+            message: stdout.trim() || stderr.trim() || "Merge command executed.",
+        };
         if (input.abort) {
-            return { success: true, message: 'Merge aborted successfully.', aborted: true };
-        }
-        // Check stdout/stderr for specific success messages
-        if (stdout.includes('Fast-forward')) {
-            return { success: true, message: `Merge successful (fast-forward): ${stdout.trim()}`, fastForward: true };
-        }
-        if (stdout.includes('Merge made by') || stdout.includes('merging')) { // Check for recursive strategy message etc.
-            const match = stdout.match(/Merge commit '([a-f0-9]+)'/); // Try to get merge commit hash
-            return {
-                success: true,
-                message: `Merge successful: ${stdout.trim()}`,
-                mergedCommitHash: match ? match[1] : undefined,
-                fastForward: false, // Explicitly not FF
-            };
-        }
-        if (stdout.includes('Squash commit -- not updating HEAD')) {
-            return {
-                success: true,
-                message: `Merge successful (--squash): Changes staged. Manual commit required. ${stdout.trim()}`,
-                needsManualCommit: true,
-            };
-        }
-        if (stdout.includes('Already up to date')) {
-            return { success: true, message: `Already up to date.`, fastForward: true }; // Treat as success/FF
-        }
-        // If none of the above, return generic success based on exit code 0
-        return { success: true, message: `Merge command completed: ${stdout.trim()}` };
+            result.aborted = true;
+            result.message = "Merge aborted successfully.";
+        }
+        else if (stdout.includes("Fast-forward")) {
+            result.fastForward = true;
+        }
+        else if (stdout.includes("Merge made by") || stdout.includes("merging")) {
+            const match = stdout.match(/Merge commit '([a-f0-9]+)'/);
+            result.mergedCommitHash = match ? match[1] : undefined;
+            result.fastForward = false;
+        }
+        else if (stdout.includes("Squash commit -- not updating HEAD")) {
+            result.needsManualCommit = true;
+        }
+        else if (stdout.includes("Already up to date")) {
+            result.fastForward = true;
+        }
+        logger.info("git merge executed successfully", {
+            ...context,
+            operation,
+            path: targetPath,
+            result,
+        });
+        return result;
     }
     catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || ''; // Git often puts errors in stdout/stderr
-        logger.error(`Git merge command failed`, { ...context, operation, path: targetPath, error: error.message, output: errorMessage });
+        const errorMessage = error.stderr || error.stdout || error.message || ""; // Git often puts errors in stdout/stderr
+        logger.error(`Git merge command failed`, {
+            ...context,
+            operation,
+            path: targetPath,
+            error: error.message,
+            output: errorMessage,
+        });
         if (input.abort) {
             // If abort failed, it's likely there was no merge in progress
-            if (errorMessage.includes('fatal: There is no merge to abort')) {
-                return { success: false, message: 'No merge in progress to abort.', aborted: false };
+            if (errorMessage.includes("fatal: There is no merge to abort")) {
+                throw new McpError(BaseErrorCode.VALIDATION_ERROR, `No merge in progress to abort.`, { context, operation, originalError: error });
             }
             throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Failed to abort merge: ${errorMessage}`, { context, operation, originalError: error });
         }
         // Check for specific failure scenarios
-        if (errorMessage.includes('CONFLICT')) {
-            return { success: false, message: `Merge failed due to conflicts. Please resolve conflicts and commit. Output: ${errorMessage}`, conflict: true };
+        if (errorMessage.includes("CONFLICT")) {
+            throw new McpError(BaseErrorCode.CONFLICT, `Merge failed due to conflicts. Please resolve conflicts and commit. Output: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('refusing to merge unrelated histories')) {
+        if (errorMessage.includes("refusing to merge unrelated histories")) {
             throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Merge failed: Refusing to merge unrelated histories. Consider using '--allow-unrelated-histories'.`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('fatal: Not possible to fast-forward, aborting.')) {
+        if (errorMessage.includes("fatal: Not possible to fast-forward, aborting.")) {
             throw new McpError(BaseErrorCode.CONFLICT, `Merge failed: Not possible to fast-forward. Merge required.`, { context, operation, originalError: error });
         }
         if (errorMessage.match(/fatal: '.*?' does not point to a commit/)) {
             throw new McpError(BaseErrorCode.NOT_FOUND, `Merge failed: Branch '${input.branch}' not found or does not point to a commit.`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('fatal: You have not concluded your merge')) {
-            return { success: false, message: `Merge failed: Conflicts still exist from a previous merge. Resolve conflicts or abort. Output: ${errorMessage}`, conflict: true };
+        if (errorMessage.includes("fatal: You have not concluded your merge")) {
+            throw new McpError(BaseErrorCode.CONFLICT, `Merge failed: Conflicts still exist from a previous merge. Resolve conflicts or abort. Output: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('error: Your local changes to the following files would be overwritten by merge')) {
+        if (errorMessage.includes("error: Your local changes to the following files would be overwritten by merge")) {
             throw new McpError(BaseErrorCode.CONFLICT, `Merge failed: Local changes would be overwritten. Please commit or stash them.`, { context, operation, originalError: error });
         }
         // Generic error

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

@@ -1,11 +1,11 @@
 // 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 { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
-import { requestContextService } from '../../../utils/index.js';
-import { GitMergeInputSchema, gitMergeLogic } from './logic.js';
+import { BaseErrorCode } from "../../../types-global/errors.js"; // Keep direct import for types-global
+import { requestContextService } from "../../../utils/index.js";
+import { GitMergeInputSchema, gitMergeLogic, } from "./logic.js";
 let _getWorkingDirectory;
 let _getSessionId;
 /**
@@ -16,10 +16,10 @@ let _getSessionId;
 export function initializeGitMergeStateAccessors(getWdFn, getSidFn) {
     _getWorkingDirectory = getWdFn;
     _getSessionId = getSidFn;
-    logger.info('State accessors initialized for git_merge tool registration.');
+    logger.info("State accessors initialized for git_merge tool registration.");
 }
-const TOOL_NAME = 'git_merge';
-const TOOL_DESCRIPTION = 'Merges the specified branch into the current branch. Supports options like --no-ff, --squash, and --abort. Returns the merge result as a JSON object.';
+const TOOL_NAME = "git_merge";
+const TOOL_DESCRIPTION = "Merges the specified branch into the current branch. Supports options like --no-ff, --squash, and --abort. Returns the merge result as a JSON object.";
 /**
  * Registers the git_merge tool with the MCP server.
  *
@@ -29,15 +29,18 @@ const TOOL_DESCRIPTION = 'Merges the specified branch into the current branch. S
  */
 export const registerGitMergeTool = async (server) => {
     if (!_getWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_merge must be initialized before registration.');
+        throw new Error("State accessors for git_merge must be initialized before registration.");
     }
-    const operation = 'registerGitMergeTool';
+    const operation = "registerGitMergeTool";
     const context = requestContextService.createRequestContext({ operation });
     await ErrorHandler.tryCatch(async () => {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitMergeInputSchema.shape, // Provide the Zod schema shape
         async (validatedArgs, callContext) => {
-            const toolOperation = 'tool:git_merge';
-            const requestContext = requestContextService.createRequestContext({ operation: toolOperation, parentContext: callContext });
+            const toolOperation = "tool:git_merge";
+            const requestContext = requestContextService.createRequestContext({
+                operation: toolOperation,
+                parentContext: callContext,
+            });
             const sessionId = _getSessionId(requestContext);
             const getWorkingDirectoryForSession = () => {
                 return _getWorkingDirectory(sessionId);
@@ -53,9 +56,9 @@ export const registerGitMergeTool = async (server) => {
                 const mergeResult = await gitMergeLogic(validatedArgs, logicContext);
                 // Format the result as a JSON string within TextContent
                 const resultContent = {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify(mergeResult, null, 2), // Pretty-print JSON
-                    contentType: 'application/json',
+                    contentType: "application/json",
                 };
                 // Log based on the success flag in the result
                 if (mergeResult.success) {

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

@@ -1,6 +1,6 @@
 /**
  * @fileoverview Barrel file for the gitPull tool.
  */
-export { registerGitPullTool, initializeGitPullStateAccessors } from './registration.js';
+export { registerGitPullTool, initializeGitPullStateAccessors, } from "./registration.js";
 // Export types if needed elsewhere, e.g.:
 // export type { GitPullInput, GitPullResult } from './logic.js';

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

@@ -1,20 +1,39 @@
-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_pull tool using Zod
 export const GitPullInputSchema = 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 pull from (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
-    branch: z.string().optional().describe("The remote branch to pull (e.g., 'main'). Defaults to the current branch's upstream."),
-    rebase: z.boolean().optional().default(false).describe("Use 'git pull --rebase' instead of merge."),
-    ffOnly: z.boolean().optional().default(false).describe("Use '--ff-only' to only allow fast-forward merges."),
+    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 pull from (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
+    branch: z
+        .string()
+        .optional()
+        .describe("The remote branch to pull (e.g., 'main'). Defaults to the current branch's upstream."),
+    rebase: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Use 'git pull --rebase' instead of merge."),
+    ffOnly: z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe("Use '--ff-only' to only allow fast-forward merges."),
     // Add other relevant git pull options as needed (e.g., --prune, --tags, --depth)
 });
 /**
@@ -26,14 +45,17 @@ export const GitPullInputSchema = z.object({
  * @throws {McpError} Throws an McpError if path resolution, validation, or the git command fails unexpectedly.
  */
 export async function pullGitChanges(input, context) {
-    const operation = 'pullGitChanges';
+    const operation = "pullGitChanges";
     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,14 +63,28 @@ export async function pullGitChanges(input, 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
-        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 });
@@ -57,88 +93,73 @@ export async function pullGitChanges(input, context) {
         // Construct the git pull command
         let command = `git -C "${targetPath}" pull`;
         if (input.rebase) {
-            command += ' --rebase';
+            command += " --rebase";
         }
         if (input.ffOnly) {
-            command += ' --ff-only';
+            command += " --ff-only";
         }
         if (input.remote) {
             // Sanitize remote and branch names - basic alphanumeric + common chars
-            const safeRemote = input.remote.replace(/[^a-zA-Z0-9_.\-/]/g, '');
+            const safeRemote = input.remote.replace(/[^a-zA-Z0-9_.\-/]/g, "");
             command += ` ${safeRemote}`;
             if (input.branch) {
-                const safeBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, '');
+                const safeBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, "");
                 command += ` ${safeBranch}`;
             }
         }
         else if (input.branch) {
             // If only branch is specified, assume 'origin' or tracked remote
-            const safeBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, '');
+            const safeBranch = input.branch.replace(/[^a-zA-Z0-9_.\-/]/g, "");
             command += ` origin ${safeBranch}`; // Defaulting to origin if remote not specified but branch is
             logger.warning(`Remote not specified, defaulting to 'origin' for branch pull`, { ...context, operation });
         }
         logger.debug(`Executing command: ${command}`, { ...context, operation });
         const { stdout, stderr } = await execAsync(command);
-        logger.info(`Git pull stdout: ${stdout}`, { ...context, operation });
+        logger.debug(`Git pull stdout: ${stdout}`, { ...context, operation });
         if (stderr) {
-            // Stderr might contain progress or non-error info, log as warning unless it indicates a clear failure handled below
-            logger.warning(`Git pull stderr: ${stderr}`, { ...context, operation });
+            logger.debug(`Git pull stderr: ${stderr}`, { ...context, operation });
         }
         // Analyze stdout/stderr to determine the outcome
-        let message = stdout.trim() || stderr.trim(); // Use stdout first, fallback to stderr for message
-        let success = true;
-        let conflict = false;
-        let summary = undefined;
-        if (message.includes('Already up to date')) {
-            message = 'Already up to date.';
-        }
-        else if (message.includes('Fast-forward')) {
-            message = 'Pull successful (fast-forward).';
-            // Try to extract summary
-            const summaryMatch = stdout.match(/(\d+ files? changed.*)/);
-            if (summaryMatch)
-                summary = summaryMatch[1];
-        }
-        else if (message.includes('Merge made by the') || message.includes('merging')) { // Covers recursive and octopus
-            message = 'Pull successful (merge).';
-            const summaryMatch = stdout.match(/(\d+ files? changed.*)/);
-            if (summaryMatch)
-                summary = summaryMatch[1];
-        }
-        else if (message.includes('Automatic merge failed; fix conflicts and then commit the result.')) {
-            message = 'Pull resulted in merge conflicts.';
-            success = false; // Indicate failure due to conflicts
-            conflict = true;
-        }
-        else if (message.includes('fatal:')) {
-            // If a fatal error wasn't caught by the execAsync catch block but is in stdout/stderr
-            success = false;
-            message = `Pull failed: ${message}`;
-            logger.error(`Git pull command indicated failure: ${message}`, { ...context, operation, stdout, stderr });
-        }
-        // Add more specific checks based on git pull output variations if needed
-        logger.info(`${operation} completed`, { ...context, operation, path: targetPath, success, message, conflict });
-        return { success, message, summary, conflict };
+        const message = stdout.trim() || stderr.trim() || "Pull command executed.";
+        const summary = message;
+        const conflict = message.includes("CONFLICT");
+        logger.info("git pull executed successfully", {
+            ...context,
+            operation,
+            path: targetPath,
+            summary,
+            conflict,
+        });
+        return { success: true, message, summary, conflict };
     }
     catch (error) {
-        logger.error(`Failed to execute git pull command`, { ...context, operation, path: targetPath, error: error.message, stderr: error.stderr, stdout: error.stdout });
-        const errorMessage = error.stderr || error.stdout || error.message || ''; // Check stdout too for errors
+        logger.error(`Failed to execute git pull command`, {
+            ...context,
+            operation,
+            path: targetPath,
+            error: error.message,
+            stderr: error.stderr,
+            stdout: error.stdout,
+        });
+        const errorMessage = error.stderr || error.stdout || error.message || ""; // Check stdout too for errors
         // 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')) {
+        if (errorMessage.includes("resolve host") ||
+            errorMessage.includes("Could not read from remote repository")) {
             throw new McpError(BaseErrorCode.SERVICE_UNAVAILABLE, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('merge conflict') || errorMessage.includes('fix conflicts')) {
+        if (errorMessage.includes("merge conflict") ||
+            errorMessage.includes("fix conflicts")) {
             // This might be caught here if execAsync throws due to non-zero exit code during conflict
-            logger.warning('Pull resulted in merge conflicts (caught as error)', { ...context, operation, path: targetPath, errorMessage });
-            return { success: false, message: 'Pull resulted in merge conflicts.', conflict: true };
+            throw new McpError(BaseErrorCode.CONFLICT, `Pull resulted in merge conflicts. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('You have unstaged changes') || errorMessage.includes('Your local changes to the following files would be overwritten by merge')) {
+        if (errorMessage.includes("You have unstaged changes") ||
+            errorMessage.includes("Your local changes to the following files would be overwritten by merge")) {
             throw new McpError(BaseErrorCode.CONFLICT, `Pull failed due to uncommitted local changes. Please commit or stash them first. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
-        if (errorMessage.includes('refusing to merge unrelated histories')) {
+        if (errorMessage.includes("refusing to merge unrelated histories")) {
             throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Pull failed: Refusing to merge unrelated histories. Use '--allow-unrelated-histories' if intended.`, { context, operation, originalError: error });
         }
         // Generic internal error for other failures