@cyanheads/git-mcp-server 2.2.0 → 2.2.2

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitPull/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { pullGitChanges, GitPullInputSchema, GitPullOutputSchema, } from "./logic.js";
 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.";
@@ -45,18 +44,19 @@ export const registerGitPullTool = async (server, getWorkingDirectory, getSessio
         }
         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/gitPush/logic.js

@@ -66,32 +66,13 @@ export async function pushGitChanges(params, context) {
             args.push(params.branch);
         }
     }
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        const message = stderr.trim() || stdout.trim() || "Push command executed successfully.";
-        return {
-            success: true,
-            message,
-            rejected: message.includes("[rejected]"),
-            deleted: message.includes("[deleted]"),
-        };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Failed to execute git push 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.includes("Could not read from remote repository")) {
-            throw new McpError(BaseErrorCode.SERVICE_UNAVAILABLE, "Failed to connect to remote repository.");
-        }
-        if (errorMessage.includes("rejected")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Push rejected: ${errorMessage}`);
-        }
-        if (errorMessage.includes("Authentication failed")) {
-            throw new McpError(BaseErrorCode.UNAUTHORIZED, "Authentication failed for remote repository.");
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git push failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    const message = stderr.trim() || stdout.trim() || "Push command executed successfully.";
+    return {
+        success: true,
+        message,
+        rejected: message.includes("[rejected]"),
+        deleted: message.includes("[deleted]"),
+    };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitPush/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { pushGitChanges, GitPushOutputSchema, GitPushBaseSchema, } from "./logic.js";
 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.";
@@ -45,18 +44,19 @@ export const registerGitPushTool = async (server, getWorkingDirectory, getSessio
         }
         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/gitRebase/logic.js

@@ -62,32 +62,13 @@ export async function gitRebaseLogic(params, context) {
             args.push(`--${params.mode}`);
             break;
     }
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        const output = stdout + stderr;
-        return {
-            success: true,
-            message: `Rebase ${params.mode} executed successfully.`,
-            rebaseCompleted: /successfully rebased/i.test(output),
-            needsManualAction: /conflict|stopped at|edit/i.test(output),
-        };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Git rebase ${params.mode} command failed`, { ...context, operation, errorMessage });
-        if (/conflict/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Rebase failed due to conflicts. Please resolve them and use 'git rebase --continue'.`);
-        }
-        if (/no rebase in progress/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Failed to ${params.mode} rebase: No rebase is currently in progress.`);
-        }
-        if (/your local changes would be overwritten/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.CONFLICT, "Rebase failed: Your local changes would be overwritten. Please commit or stash them.");
-        }
-        if (/not a git repository/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git rebase ${params.mode} failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    const output = stdout + stderr;
+    return {
+        success: true,
+        message: `Rebase ${params.mode} executed successfully.`,
+        rebaseCompleted: /successfully rebased/i.test(output),
+        needsManualAction: /conflict|stopped at|edit/i.test(output),
+    };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitRebase/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitRebaseLogic, GitRebaseOutputSchema, GitRebaseBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_rebase";
 const TOOL_DESCRIPTION = "Reapplies commits on top of another base tip. Supports starting a rebase (standard or interactive), continuing, aborting, or skipping steps in an ongoing rebase. Returns results as a JSON object.";
@@ -45,18 +44,19 @@ export const registerGitRebaseTool = 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/gitRemote/logic.js

@@ -62,44 +62,28 @@ export async function gitRemoteLogic(params, context) {
             args.push("show", params.name);
             break;
     }
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout } = await execFileAsync("git", args);
-        if (params.mode === 'list') {
-            const remoteMap = new Map();
-            stdout.trim().split("\n").forEach(line => {
-                const parts = line.split(/\s+/);
-                if (parts.length < 3)
-                    return;
-                const [name, url, type] = parts;
-                const cleanType = type.replace(/[()]/g, "");
-                if (!remoteMap.has(name))
-                    remoteMap.set(name, {});
-                if (cleanType === 'fetch')
-                    remoteMap.get(name).fetchUrl = url;
-                if (cleanType === 'push')
-                    remoteMap.get(name).pushUrl = url;
-            });
-            const remotes = Array.from(remoteMap.entries()).map(([name, urls]) => ({ name, fetchUrl: urls.fetchUrl || 'N/A', pushUrl: urls.pushUrl || urls.fetchUrl || 'N/A' }));
-            return { success: true, mode: params.mode, remotes };
-        }
-        if (params.mode === 'show') {
-            return { success: true, mode: params.mode, details: stdout.trim() };
-        }
-        return { success: true, mode: params.mode, message: `Remote '${params.name}' ${params.mode === 'add' ? 'added' : 'removed'} successfully.` };
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout } = await execFileAsync("git", args);
+    if (params.mode === 'list') {
+        const remoteMap = new Map();
+        stdout.trim().split("\n").forEach(line => {
+            const parts = line.split(/\s+/);
+            if (parts.length < 3)
+                return;
+            const [name, url, type] = parts;
+            const cleanType = type.replace(/[()]/g, "");
+            if (!remoteMap.has(name))
+                remoteMap.set(name, {});
+            if (cleanType === 'fetch')
+                remoteMap.get(name).fetchUrl = url;
+            if (cleanType === 'push')
+                remoteMap.get(name).pushUrl = url;
+        });
+        const remotes = Array.from(remoteMap.entries()).map(([name, urls]) => ({ name, fetchUrl: urls.fetchUrl || 'N/A', pushUrl: urls.pushUrl || urls.fetchUrl || 'N/A' }));
+        return { success: true, mode: params.mode, remotes };
     }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git remote 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 (params.mode === "add" && errorMessage.toLowerCase().includes("already exists")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Remote '${params.name}' already exists.`);
-        }
-        if ((params.mode === "remove" || params.mode === "show") && errorMessage.toLowerCase().includes("no such remote")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Remote '${params.name}' does not exist.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git remote ${params.mode} failed: ${errorMessage}`);
+    if (params.mode === 'show') {
+        return { success: true, mode: params.mode, details: stdout.trim() };
     }
+    return { success: true, mode: params.mode, message: `Remote '${params.name}' ${params.mode === 'add' ? 'added' : 'removed'} successfully.` };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitRemote/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitRemoteLogic, GitRemoteOutputSchema, GitRemoteBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_remote";
 const TOOL_DESCRIPTION = "Manages remote repositories (list, add, remove, show).";
@@ -45,18 +44,19 @@ export const registerGitRemoteTool = 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/gitReset/logic.js

@@ -36,25 +36,9 @@ export async function resetGitState(params, context) {
     args.push(`--${params.mode}`);
     if (params.commit)
         args.push(params.commit);
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        const message = stderr.trim() || stdout.trim() || `Reset successful (mode: ${params.mode}).`;
-        const changesSummary = stderr.includes("Unstaged changes after reset") ? stderr : undefined;
-        return { success: true, message, changesSummary };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.stdout || error.message || "";
-        logger.error(`Failed to execute git reset 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.includes("bad revision")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Invalid commit reference specified: '${params.commit}'.`);
-        }
-        if (errorMessage.includes("unmerged paths")) {
-            throw new McpError(BaseErrorCode.CONFLICT, "Cannot reset due to unmerged files. Please resolve conflicts first.");
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git reset failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    const message = stderr.trim() || stdout.trim() || `Reset successful (mode: ${params.mode}).`;
+    const changesSummary = stderr.includes("Unstaged changes after reset") ? stderr : undefined;
+    return { success: true, message, changesSummary };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitReset/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { resetGitState, GitResetInputSchema, GitResetOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_reset";
 const TOOL_DESCRIPTION = "Resets the current HEAD to a specified state. Supports different modes ('soft', 'mixed', 'hard', 'merge', 'keep') to control how the index and working tree are affected. Can reset to a specific commit. USE 'hard' MODE WITH EXTREME CAUTION as it discards local changes.";
@@ -45,18 +44,19 @@ export const registerGitResetTool = 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/gitSetWorkingDir/logic.js

@@ -23,13 +23,8 @@ export const GitSetWorkingDirOutputSchema = z.object({
     initialized: z.boolean().describe("Indicates if a new repository was initialized."),
 });
 async function checkIsGitRepo(path) {
-    try {
-        const { stdout } = await execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], { cwd: path });
-        return stdout.trim() === "true";
-    }
-    catch {
-        return false;
-    }
+    const { stdout } = await execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], { cwd: path }).catch(() => ({ stdout: "false" }));
+    return stdout.trim() === "true";
 }
 /**
  * 4. IMPLEMENT the core logic function.
@@ -39,28 +34,16 @@ export async function gitSetWorkingDirLogic(params, context) {
     const operation = "gitSetWorkingDirLogic";
     logger.debug(`Executing ${operation}`, { ...context, params });
     const sanitizedPath = sanitization.sanitizePath(params.path, { allowAbsolute: true }).sanitizedPath;
-    try {
-        const stats = await fs.stat(sanitizedPath);
-        if (!stats.isDirectory()) {
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Path is not a directory: ${sanitizedPath}`);
-        }
-    }
-    catch (error) {
-        if (error instanceof McpError)
-            throw error;
-        throw new McpError(BaseErrorCode.NOT_FOUND, `Directory does not exist or is inaccessible: ${sanitizedPath}`);
+    const stats = await fs.stat(sanitizedPath);
+    if (!stats.isDirectory()) {
+        throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Path is not a directory: ${sanitizedPath}`);
     }
     let isGitRepo = await checkIsGitRepo(sanitizedPath);
     let initializedRepo = false;
     if (!isGitRepo && params.initializeIfNotPresent) {
-        try {
-            await execFileAsync("git", ["init", "--initial-branch=main"], { cwd: sanitizedPath });
-            initializedRepo = true;
-            isGitRepo = true;
-        }
-        catch (initError) {
-            throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Failed to initialize Git repository: ${initError.message}`);
-        }
+        await execFileAsync("git", ["init", "--initial-branch=main"], { cwd: sanitizedPath });
+        initializedRepo = true;
+        isGitRepo = true;
     }
     if (params.validateGitRepo && !isGitRepo) {
         throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Path is not a valid Git repository: ${sanitizedPath}.`);

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitSetWorkingDir/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitSetWorkingDirLogic, GitSetWorkingDirInputSchema, GitSetWorkingDirOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_set_working_dir";
 const TOOL_DESCRIPTION = "Sets the default working directory for the current session. Subsequent Git tool calls within this session can use '.' for the `path` parameter, which will resolve to this directory. Optionally validates if the path is a Git repository (`validateGitRepo: true`). Can optionally initialize a Git repository with 'git init' if it's not already one and `initializeIfNotPresent: true` is set. Returns the result as a JSON object. IMPORTANT: The provided path must be absolute.";
@@ -45,18 +44,19 @@ export const registerGitSetWorkingDirTool = async (server, setWorkingDirectory,
         }
         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/gitShow/logic.js

@@ -33,23 +33,7 @@ export async function gitShowLogic(params, context) {
     const targetPath = sanitization.sanitizePath(params.path === "." ? workingDir : params.path, { allowAbsolute: true }).sanitizedPath;
     const refSpec = params.filePath ? `${params.ref}:${params.filePath}` : params.ref;
     const args = ["-C", targetPath, "show", refSpec];
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout } = await execFileAsync("git", args);
-        return { success: true, content: stdout };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git show 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 (/unknown revision or path not in the working tree/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Reference or pathspec not found: '${refSpec}'.`);
-        }
-        if (/ambiguous argument/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Reference '${params.ref}' is ambiguous.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git show failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout } = await execFileAsync("git", args);
+    return { success: true, content: stdout };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitShow/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitShowLogic, GitShowInputSchema, GitShowOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_show";
 const TOOL_DESCRIPTION = "Shows information about Git objects (commits, tags, blobs, trees) based on a reference. Can optionally show the content of a specific file at that reference. Returns the raw output.";
@@ -45,18 +44,19 @@ export const registerGitShowTool = async (server, getWorkingDirectory, getSessio
         }
         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/gitStash/logic.js

@@ -65,36 +65,20 @@ export async function gitStashLogic(params, context) {
         return baseArgs;
     };
     const args = buildArgs();
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout, stderr } = await execFileAsync("git", args);
-        if (params.mode === 'list') {
-            const stashes = stdout.trim().split("\n").filter(Boolean).map(line => {
-                const match = line.match(/^(stash@\{(\d+)\}):\s*(?:(?:WIP on|On)\s*([^:]+):\s*)?(.*)$/);
-                return match ? { ref: match[1], branch: match[3] || "unknown", description: match[4] } : { ref: "unknown", branch: "unknown", description: line };
-            });
-            return { success: true, mode: params.mode, stashes };
-        }
-        const output = stdout + stderr;
-        const conflicts = /conflict/i.test(output);
-        if (params.mode === 'save') {
-            const stashCreated = !/no local changes to save/i.test(output);
-            return { success: true, mode: params.mode, message: stashCreated ? "Changes stashed." : "No local changes to save.", stashCreated };
-        }
-        return { success: true, mode: params.mode, message: `${params.mode} operation successful.`, conflicts };
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout, stderr } = await execFileAsync("git", args);
+    if (params.mode === 'list') {
+        const stashes = stdout.trim().split("\n").filter(Boolean).map(line => {
+            const match = line.match(/^(stash@\{(\d+)\}):\s*(?:(?:WIP on|On)\s*([^:]+):\s*)?(.*)$/);
+            return match ? { ref: match[1], branch: match[3] || "unknown", description: match[4] } : { ref: "unknown", branch: "unknown", description: line };
+        });
+        return { success: true, mode: params.mode, stashes };
     }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git stash 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 (/no such stash/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Stash '${params.stashRef}' not found.`);
-        }
-        if (/conflict/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Stash ${params.mode} failed due to conflicts.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git stash ${params.mode} failed: ${errorMessage}`);
+    const output = stdout + stderr;
+    const conflicts = /conflict/i.test(output);
+    if (params.mode === 'save') {
+        const stashCreated = !/no local changes to save/i.test(output);
+        return { success: true, mode: params.mode, message: stashCreated ? "Changes stashed." : "No local changes to save.", stashCreated };
     }
+    return { success: true, mode: params.mode, message: `${params.mode} operation successful.`, conflicts };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitStash/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitStashLogic, GitStashOutputSchema, GitStashBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_stash";
 const TOOL_DESCRIPTION = "Manages stashed changes in the working directory. Supports listing stashes, applying/popping specific stashes (with conflict detection), dropping stashes, and saving current changes to a new stash with an optional message. Returns results as a JSON object.";
@@ -45,18 +44,19 @@ export const registerGitStashTool = 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/gitStatus/logic.js

@@ -104,17 +104,7 @@ export async function getGitStatus(params, context) {
     }
     const targetPath = sanitization.sanitizePath(params.path === "." ? workingDir : params.path, { allowAbsolute: true }).sanitizedPath;
     const args = ["-C", targetPath, "status", "--porcelain=v1", "-b"];
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout } = await execFileAsync("git", args);
-        return parseGitStatus(stdout);
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git status 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 status failed: ${errorMessage}`);
-    }
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout } = await execFileAsync("git", args);
+    return parseGitStatus(stdout);
 }