@cyanheads/git-mcp-server 2.2.0 → 2.2.2

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

@@ -1,8 +1,8 @@
+import { BaseErrorCode, McpError } from "../../../types-global/errors.js";
 import { execFile } from "child_process";
 import { promisify } from "util";
 import { z } from "zod";
 import { logger, sanitization } from "../../../utils/index.js";
-import { BaseErrorCode, McpError } from "../../../types-global/errors.js";
 const execFileAsync = promisify(execFile);
 export const GitAddInputSchema = z.object({
     path: z
@@ -33,52 +33,33 @@ export async function addGitFiles(params, context) {
     if (filesToStage.length === 0) {
         filesToStage.push(".");
     }
-    try {
-        const args = ["-C", targetPath, "add", "--", ...filesToStage.map(file => file.startsWith("-") ? `./${file}` : file)];
-        logger.debug(`Executing command: git ${args.join(" ")}`, {
-            ...context,
-            operation,
-        });
-        const { stderr } = await execFileAsync("git", args);
-        if (stderr) {
-            logger.warning(`Git add command produced stderr`, {
-                ...context,
-                operation,
-                stderr,
-            });
-        }
-        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').";
-        return {
-            success: true,
-            statusMessage: `${successMessage}. ${reminder}`,
-            filesStaged: filesToStage,
-        };
-    }
-    catch (error) {
-        logger.error(`Failed to execute git add command`, {
+    const args = ["-C", targetPath, "add", "--", ...filesToStage.map(file => file.startsWith("-") ? `./${file}` : file)];
+    logger.debug(`Executing command: git ${args.join(" ")}`, {
+        ...context,
+        operation,
+    });
+    const { stderr } = await execFileAsync("git", args);
+    if (stderr) {
+        logger.warning(`Git add command produced stderr`, {
             ...context,
             operation,
-            path: targetPath,
-            error: error.message,
-            stderr: error.stderr,
+            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")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Specified files/patterns did not match any files in ${targetPath}: ${filesToStage.join(", ")}`, { context, operation, originalError: error, filesStaged: filesToStage });
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Failed to stage files for path: ${targetPath}. Error: ${errorMessage}`, { context, operation, originalError: error, filesStaged: 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').";
+    return {
+        success: true,
+        statusMessage: `${successMessage}. ${reminder}`,
+        filesStaged: filesToStage,
+    };
 }

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

@@ -1,5 +1,4 @@
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { BaseErrorCode, McpError } from "../../../types-global/errors.js";
 import { addGitFiles, GitAddInputSchema, GitAddOutputSchema, } from "./logic.js";
 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.";
@@ -39,17 +38,19 @@ export const registerGitAddTool = async (server, getWorkingDirectory, getSession
                 };
             }
             catch (error) {
-                const handledError = ErrorHandler.handleError(error, {
+                const mcpError = ErrorHandler.handleError(error, {
                     operation: "gitAddToolHandler",
                     context: logicContext,
                     input: validatedArgs,
                 });
-                const mcpError = handledError instanceof McpError
-                    ? handledError
-                    : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred while staging files.", { originalErrorName: handledError.name });
                 return {
                     isError: true,
                     content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                    structuredContent: {
+                        code: mcpError.code,
+                        message: mcpError.message,
+                        details: mcpError.details,
+                    },
                 };
             }
         });

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

@@ -84,63 +84,46 @@ export async function gitBranchLogic(params, context) {
             args.push("branch", "--show-current");
             break;
     }
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args.filter(Boolean));
-        if (stderr && !stderr.includes("HEAD detached")) {
-            logger.warning(`Git branch command produced stderr`, { ...context, operation, stderr });
-        }
-        if (params.mode === "list") {
-            const branches = stdout.trim().split("\n").filter(Boolean).map(line => {
-                const isCurrent = line.startsWith("* ");
-                const trimmedLine = line.replace(/^\*?\s+/, "");
-                const isRemote = trimmedLine.startsWith("remotes/");
-                const parts = trimmedLine.split(/\s+/);
-                const name = parts[0];
-                return {
-                    name: isRemote ? name.split("/").slice(2).join("/") : name,
-                    isCurrent,
-                    isRemote,
-                    commitHash: parts[1],
-                    commitSubject: parts.slice(2).join(" "),
-                };
-            });
-            return {
-                success: true,
-                mode: params.mode,
-                message: `Found ${branches.length} branches.`,
-                branches,
-                currentBranch: branches.find(b => b.isCurrent)?.name || null,
-            };
-        }
-        if (params.mode === "show-current") {
-            const currentBranchName = stdout.trim() || null;
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args.filter(Boolean));
+    if (stderr && !stderr.includes("HEAD detached")) {
+        logger.warning(`Git branch command produced stderr`, { ...context, operation, stderr });
+    }
+    if (params.mode === "list") {
+        const branches = stdout.trim().split("\n").filter(Boolean).map(line => {
+            const isCurrent = line.startsWith("* ");
+            const trimmedLine = line.replace(/^\*?\s+/, "");
+            const isRemote = trimmedLine.startsWith("remotes/");
+            const parts = trimmedLine.split(/\s+/);
+            const name = parts[0];
             return {
-                success: true,
-                mode: params.mode,
-                message: currentBranchName ? `Current branch is '${currentBranchName}'.` : "Currently in detached HEAD state.",
-                currentBranch: currentBranchName,
+                name: isRemote ? name.split("/").slice(2).join("/") : name,
+                isCurrent,
+                isRemote,
+                commitHash: parts[1],
+                commitSubject: parts.slice(2).join(" "),
             };
-        }
+        });
         return {
             success: true,
             mode: params.mode,
-            message: `Operation '${params.mode}' on branch '${params.branchName || params.newBranchName}' completed successfully.`,
+            message: `Found ${branches.length} branches.`,
+            branches,
+            currentBranch: branches.find(b => b.isCurrent)?.name || null,
         };
     }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Failed to execute git branch command`, { ...context, operation, errorMessage });
-        if (errorMessage.toLowerCase().includes("not a git repository")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`);
-        }
-        // For specific, non-critical failures, we can throw a specific error code that the handler can interpret.
-        if (params.mode === "create" && errorMessage.includes("already exists")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Branch '${params.branchName}' already exists. Use force=true to overwrite.`);
-        }
-        if (params.mode === "delete" && errorMessage.includes("not found")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Branch '${params.branchName}' not found.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git branch ${params.mode} failed: ${errorMessage}`);
+    if (params.mode === "show-current") {
+        const currentBranchName = stdout.trim() || null;
+        return {
+            success: true,
+            mode: params.mode,
+            message: currentBranchName ? `Current branch is '${currentBranchName}'.` : "Currently in detached HEAD state.",
+            currentBranch: currentBranchName,
+        };
     }
+    return {
+        success: true,
+        mode: params.mode,
+        message: `Operation '${params.mode}' on branch '${params.branchName || params.newBranchName}' completed successfully.`,
+    };
 }

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

@@ -2,7 +2,6 @@
  * @fileoverview Handles registration and error handling for the git_branch tool.
  * @module src/mcp-server/tools/gitBranch/registration
  */
-import { BaseErrorCode, McpError } from "../../../types-global/errors.js";
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
 import { GitBranchBaseSchema, gitBranchLogic, GitBranchOutputSchema } from "./logic.js";
 const TOOL_NAME = "git_branch";
@@ -45,18 +44,19 @@ export const registerGitBranchTool = async (server, getWorkingDirectory, getSess
         }
         catch (error) {
             logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
-            const handledError = ErrorHandler.handleError(error, {
+            const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
                 input: params,
             });
-            const mcpError = handledError instanceof McpError
-                ? handledError
-                : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred.", { originalError: handledError });
             return {
                 isError: true,
-                content: [{ type: "text", text: mcpError.message }],
-                structuredContent: mcpError.details,
+                content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                structuredContent: {
+                    code: mcpError.code,
+                    message: mcpError.message,
+                    details: mcpError.details,
+                },
             };
         }
     });

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

@@ -40,44 +40,22 @@ export async function checkoutGit(params, context) {
     if (params.newBranch)
         args.push("-b", params.newBranch);
     args.push(params.branchOrPath);
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    const message = stderr.trim() || stdout.trim();
+    logger.info("git checkout executed successfully", { ...context, operation, message });
+    let currentBranch;
     try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        const message = stderr.trim() || stdout.trim();
-        logger.info("git checkout executed successfully", { ...context, operation, message });
-        let currentBranch;
-        try {
-            const { stdout: branchStdout } = await execFileAsync("git", ["-C", targetPath, "branch", "--show-current"]);
-            currentBranch = branchStdout.trim();
-        }
-        catch {
-            currentBranch = "Detached HEAD";
-        }
-        return {
-            success: true,
-            message,
-            currentBranch,
-            newBranchCreated: !!params.newBranch,
-        };
+        const { stdout: branchStdout } = await execFileAsync("git", ["-C", targetPath, "branch", "--show-current"]);
+        currentBranch = branchStdout.trim();
     }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Failed to execute git checkout command`, { ...context, operation, errorMessage });
-        if (errorMessage.toLowerCase().includes("not a git repository")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`);
-        }
-        if (errorMessage.match(/pathspec '.*?' did not match/)) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Branch or pathspec not found: ${params.branchOrPath}.`);
-        }
-        if (errorMessage.includes("already exists")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Cannot create new branch '${params.newBranch}': it already exists.`);
-        }
-        if (errorMessage.includes("overwritten by checkout")) {
-            throw new McpError(BaseErrorCode.CONFLICT, "Checkout failed due to uncommitted local changes. Stash or commit them, or use --force.");
-        }
-        if (errorMessage.includes("invalid reference")) {
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Invalid branch name or reference: ${params.branchOrPath}.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git checkout failed: ${errorMessage}`);
+    catch {
+        currentBranch = "Detached HEAD";
     }
+    return {
+        success: true,
+        message,
+        currentBranch,
+        newBranchCreated: !!params.newBranch,
+    };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitCheckout/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { checkoutGit, GitCheckoutInputSchema, GitCheckoutOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_checkout";
 const TOOL_DESCRIPTION = "Switches branches or restores working tree files. Can checkout branches, commits, tags, or specific file paths. Supports creating new branches and forcing checkout.";
@@ -45,18 +44,19 @@ export const registerGitCheckoutTool = async (server, getWorkingDirectory, getSe
         }
         catch (error) {
             logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
-            const handledError = ErrorHandler.handleError(error, {
+            const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
                 input: params,
             });
-            const mcpError = handledError instanceof McpError
-                ? handledError
-                : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred.", { originalError: handledError });
             return {
                 isError: true,
-                content: [{ type: "text", text: mcpError.message }],
-                structuredContent: mcpError.details,
+                content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                structuredContent: {
+                    code: mcpError.code,
+                    message: mcpError.message,
+                    details: mcpError.details,
+                },
             };
         }
     });

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

@@ -46,32 +46,13 @@ export async function gitCherryPickLogic(params, context) {
     if (params.signoff)
         args.push("--signoff");
     args.push(params.commitRef);
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        const output = stdout + stderr;
-        const conflicts = /conflict/i.test(output);
-        const commitCreated = !params.noCommit && !conflicts;
-        const message = conflicts
-            ? `Cherry-pick resulted in conflicts for commit(s) '${params.commitRef}'. Manual resolution required.`
-            : `Successfully cherry-picked commit(s) '${params.commitRef}'.`;
-        return { success: true, message, commitCreated, conflicts };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Failed to execute git cherry-pick command`, { ...context, operation, errorMessage });
-        if (errorMessage.toLowerCase().includes("not a git repository")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`);
-        }
-        if (/conflict/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Failed to cherry-pick due to conflicts. Resolve conflicts and use 'git cherry-pick --continue' or '--abort'.`);
-        }
-        if (/bad revision/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Invalid commit reference '${params.commitRef}'.`);
-        }
-        if (/your local changes would be overwritten/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.CONFLICT, "Your local changes would be overwritten. Please commit or stash them first.");
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git cherry-pick failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    const output = stdout + stderr;
+    const conflicts = /conflict/i.test(output);
+    const commitCreated = !params.noCommit && !conflicts;
+    const message = conflicts
+        ? `Cherry-pick resulted in conflicts for commit(s) '${params.commitRef}'. Manual resolution required.`
+        : `Successfully cherry-picked commit(s) '${params.commitRef}'.`;
+    return { success: true, message, commitCreated, conflicts };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitCherryPick/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitCherryPickLogic, GitCherryPickInputSchema, GitCherryPickOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_cherry_pick";
 const TOOL_DESCRIPTION = "Applies the changes introduced by existing commits. Supports picking single commits or ranges, handling merge commits, and options like --no-commit and --signoff. Returns results as a JSON object, indicating success, failure, or conflicts.";
@@ -45,18 +44,19 @@ export const registerGitCherryPickTool = async (server, getWorkingDirectory, get
         }
         catch (error) {
             logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
-            const handledError = ErrorHandler.handleError(error, {
+            const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
                 input: params,
             });
-            const mcpError = handledError instanceof McpError
-                ? handledError
-                : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred.", { originalError: handledError });
             return {
                 isError: true,
-                content: [{ type: "text", text: mcpError.message }],
-                structuredContent: mcpError.details,
+                content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                structuredContent: {
+                    code: mcpError.code,
+                    message: mcpError.message,
+                    details: mcpError.details,
+                },
             };
         }
     });

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

@@ -46,24 +46,14 @@ export async function gitCleanLogic(params, context) {
         args.push("-d");
     if (params.ignored)
         args.push("-x");
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        if (stderr) {
-            logger.warning(`Git clean command produced stderr`, { ...context, operation, stderr });
-        }
-        const filesAffected = stdout.trim().split("\n").map(line => line.replace(/^Would remove |^Removing /i, "").trim()).filter(Boolean);
-        const message = params.dryRun
-            ? `Dry run complete. Files that would be removed: ${filesAffected.length}`
-            : `Clean operation complete. Files removed: ${filesAffected.length}`;
-        return { success: true, message, filesAffected, dryRun: params.dryRun };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git clean command`, { ...context, operation, errorMessage });
-        if (errorMessage.toLowerCase().includes("not a git repository")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git clean failed: ${errorMessage}`);
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    if (stderr) {
+        logger.warning(`Git clean command produced stderr`, { ...context, operation, stderr });
     }
+    const filesAffected = stdout.trim().split("\n").map(line => line.replace(/^Would remove |^Removing /i, "").trim()).filter(Boolean);
+    const message = params.dryRun
+        ? `Dry run complete. Files that would be removed: ${filesAffected.length}`
+        : `Clean operation complete. Files removed: ${filesAffected.length}`;
+    return { success: true, message, filesAffected, dryRun: params.dryRun };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitClean/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitCleanLogic, GitCleanInputSchema, GitCleanOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_clean";
 const TOOL_DESCRIPTION = "Removes untracked files from the working directory. Supports dry runs, removing directories, and removing ignored files. CRITICAL: Requires explicit `force: true` parameter for safety as this is a destructive operation. Returns results as a JSON object.";
@@ -45,18 +44,19 @@ export const registerGitCleanTool = async (server, getWorkingDirectory, getSessi
         }
         catch (error) {
             logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
-            const handledError = ErrorHandler.handleError(error, {
+            const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
                 input: params,
             });
-            const mcpError = handledError instanceof McpError
-                ? handledError
-                : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred.", { originalError: handledError });
             return {
                 isError: true,
-                content: [{ type: "text", text: mcpError.message }],
-                structuredContent: mcpError.details,
+                content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                structuredContent: {
+                    code: mcpError.code,
+                    message: mcpError.message,
+                    details: mcpError.details,
+                },
             };
         }
     });

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

@@ -4,7 +4,6 @@
  */
 import { z } from "zod";
 import { logger } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 // 1. DEFINE the Zod input schema.
 export const GitClearWorkingDirInputSchema = z.object({});
 // 2. DEFINE the Zod response schema.
@@ -19,14 +18,8 @@ export const GitClearWorkingDirOutputSchema = z.object({
 export async function gitClearWorkingDirLogic(params, context) {
     const operation = "gitClearWorkingDirLogic";
     logger.debug(`Executing ${operation}`, { ...context, params });
-    try {
-        context.clearWorkingDirectory();
-        const message = "Session working directory cleared successfully.";
-        logger.info(message, { ...context, operation });
-        return { success: true, message };
-    }
-    catch (error) {
-        logger.error("Failed to clear working directory in session state", { ...context, operation, error });
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, "Failed to update session state.");
-    }
+    context.clearWorkingDirectory();
+    const message = "Session working directory cleared successfully.";
+    logger.info(message, { ...context, operation });
+    return { success: true, message };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitClearWorkingDir/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitClearWorkingDirLogic, GitClearWorkingDirInputSchema, GitClearWorkingDirOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_clear_working_dir";
 const TOOL_DESCRIPTION = "Clears the session-specific working directory previously set by `git_set_working_dir`. Subsequent Git tool calls in this session will require an explicit `path` parameter or will default to the server's current working directory. Returns the result as a JSON object.";
@@ -45,18 +44,19 @@ export const registerGitClearWorkingDirTool = async (server, clearWorkingDirecto
         }
         catch (error) {
             logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
-            const handledError = ErrorHandler.handleError(error, {
+            const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
                 input: params,
             });
-            const mcpError = handledError instanceof McpError
-                ? handledError
-                : new McpError(BaseErrorCode.INTERNAL_ERROR, "An unexpected error occurred.", { originalError: handledError });
             return {
                 isError: true,
-                content: [{ type: "text", text: mcpError.message }],
-                structuredContent: mcpError.details,
+                content: [{ type: "text", text: `Error: ${mcpError.message}` }],
+                structuredContent: {
+                    code: mcpError.code,
+                    message: mcpError.message,
+                    details: mcpError.details,
+                },
             };
         }
     });

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

@@ -31,8 +31,12 @@ export async function gitCloneLogic(params, context) {
     const operation = "gitCloneLogic";
     logger.debug(`Executing ${operation}`, { ...context, params });
     const sanitizedTargetPath = sanitization.sanitizePath(params.targetPath, { allowAbsolute: true }).sanitizedPath;
-    try {
-        const stats = await fs.stat(sanitizedTargetPath);
+    const stats = await fs.stat(sanitizedTargetPath).catch(err => {
+        if (err.code === 'ENOENT')
+            return null;
+        throw err;
+    });
+    if (stats) {
         if (stats.isDirectory()) {
             const files = await fs.readdir(sanitizedTargetPath);
             if (files.length > 0) {
@@ -43,13 +47,6 @@ export async function gitCloneLogic(params, context) {
             throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Target path exists but is not a directory: ${sanitizedTargetPath}`);
         }
     }
-    catch (error) {
-        if (error instanceof McpError)
-            throw error;
-        if (error.code !== "ENOENT") {
-            throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Failed to check target directory: ${error.message}`);
-        }
-    }
     const args = ["clone"];
     if (params.quiet)
         args.push("--quiet");
@@ -58,24 +55,8 @@ export async function gitCloneLogic(params, context) {
     if (params.depth)
         args.push("--depth", String(params.depth));
     args.push(params.repositoryUrl, sanitizedTargetPath);
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        await execFileAsync("git", args, { timeout: 300000 }); // 5 minutes timeout
-        const successMessage = `Repository cloned successfully into ${sanitizedTargetPath}`;
-        return { success: true, message: successMessage, path: sanitizedTargetPath };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git clone command`, { ...context, operation, errorMessage });
-        if (errorMessage.toLowerCase().includes("repository not found")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Repository not found or access denied: ${params.repositoryUrl}`);
-        }
-        if (errorMessage.toLowerCase().includes("permission denied")) {
-            throw new McpError(BaseErrorCode.FORBIDDEN, `Permission denied for path: ${sanitizedTargetPath}`);
-        }
-        if (errorMessage.toLowerCase().includes("timeout")) {
-            throw new McpError(BaseErrorCode.TIMEOUT, `Git clone operation timed out for repository: ${params.repositoryUrl}`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Failed to clone repository: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    await execFileAsync("git", args, { timeout: 300000 }); // 5 minutes timeout
+    const successMessage = `Repository cloned successfully into ${sanitizedTargetPath}`;
+    return { success: true, message: successMessage, path: sanitizedTargetPath };
 }