@cyanheads/git-mcp-server 2.2.0 → 2.2.2

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitStatus/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { getGitStatus, GitStatusInputSchema, GitStatusOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_status";
 const TOOL_DESCRIPTION = "Retrieves the status of a Git repository. Returns a JSON object detailing the current branch, cleanliness, and changes. Staged and unstaged changes are grouped by status (e.g., Added, Modified), alongside lists of untracked and conflicted files.";
@@ -45,18 +44,19 @@ export const registerGitStatusTool = 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/gitTag/logic.js

@@ -63,30 +63,11 @@ export async function gitTagLogic(params, context) {
             args.push("-d", params.tagName);
             break;
     }
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout } = await execFileAsync("git", args);
-        if (params.mode === 'list') {
-            const tags = stdout.trim().split("\n").filter(Boolean);
-            return { success: true, mode: params.mode, tags };
-        }
-        return { success: true, mode: params.mode, message: `Tag '${params.tagName}' ${params.mode}d successfully.`, tagName: params.tagName };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git tag 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 === "create" && errorMessage.toLowerCase().includes("already exists")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Tag '${params.tagName}' already exists.`);
-        }
-        if (params.mode === "delete" && errorMessage.toLowerCase().includes("not found")) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Tag '${params.tagName}' not found.`);
-        }
-        if (params.mode === "create" && params.commitRef && /unknown revision or path not in the working tree/i.test(errorMessage)) {
-            throw new McpError(BaseErrorCode.NOT_FOUND, `Commit reference '${params.commitRef}' not found.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git tag ${params.mode} failed: ${errorMessage}`);
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout } = await execFileAsync("git", args);
+    if (params.mode === 'list') {
+        const tags = stdout.trim().split("\n").filter(Boolean);
+        return { success: true, mode: params.mode, tags };
     }
+    return { success: true, mode: params.mode, message: `Tag '${params.tagName}' ${params.mode}d successfully.`, tagName: params.tagName };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitTag/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitTagLogic, GitTagInputSchema, GitTagOutputSchema, GitTagBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_tag";
 const TOOL_DESCRIPTION = "Manages Git tags. Supports listing existing tags, creating new lightweight or annotated tags against specific commits, and deleting local tags. Returns results as a JSON object.";
@@ -47,18 +46,19 @@ export const registerGitTagTool = async (server, getWorkingDirectory, getSession
         }
         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/gitWorktree/logic.js

@@ -129,26 +129,10 @@ export async function gitWorktreeLogic(params, context) {
         return baseArgs;
     };
     const args = buildArgs();
-    try {
-        logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
-        const { stdout } = await execFileAsync("git", args);
-        if (params.mode === 'list' && params.verbose) {
-            return { success: true, mode: params.mode, worktrees: parsePorcelainWorktreeList(stdout) };
-        }
-        return { success: true, mode: params.mode, message: stdout.trim() || `Worktree ${params.mode} operation successful.` };
-    }
-    catch (error) {
-        const errorMessage = error.stderr || error.message || "";
-        logger.error(`Failed to execute git worktree 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.includes("already exists")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Path '${params.worktreePath}' already exists or is a worktree.`);
-        }
-        if (params.mode === "remove" && errorMessage.includes("has unclean changes")) {
-            throw new McpError(BaseErrorCode.CONFLICT, `Worktree '${params.worktreePath}' has uncommitted changes. Use force=true to remove.`);
-        }
-        throw new McpError(BaseErrorCode.INTERNAL_ERROR, `Git worktree ${params.mode} failed: ${errorMessage}`);
+    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    const { stdout } = await execFileAsync("git", args);
+    if (params.mode === 'list' && params.verbose) {
+        return { success: true, mode: params.mode, worktrees: parsePorcelainWorktreeList(stdout) };
     }
+    return { success: true, mode: params.mode, message: stdout.trim() || `Worktree ${params.mode} operation successful.` };
 }

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

@@ -3,7 +3,6 @@
  * @module src/mcp-server/tools/gitWorktree/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { gitWorktreeLogic, GitWorktreeInputSchema, GitWorktreeOutputSchema, GitWorktreeBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_worktree";
 const TOOL_DESCRIPTION = "Manages Git worktrees. Supports listing, adding, removing, moving, and pruning worktrees. Returns results as a JSON object.";
@@ -47,18 +46,19 @@ export const registerGitWorktreeTool = 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/gitWrapupInstructions/logic.js

@@ -9,6 +9,7 @@ import { getGitStatus, GitStatusOutputSchema } from "../gitStatus/logic.js";
 export const GitWrapupInstructionsInputSchema = z.object({
     acknowledgement: z.enum(["Y", "y", "Yes", "yes"]).describe("Acknowledgement to initiate the wrap-up workflow."),
     updateAgentMetaFiles: z.enum(["Y", "y", "Yes", "yes"]).optional().describe("Include an instruction to update agent-specific meta files."),
+    createTag: z.boolean().optional().describe("If true, instructs the agent to create a Git tag after committing all changes. Only set to true if given permission to do so."),
 });
 // 2. DEFINE the Zod response schema.
 export const GitWrapupInstructionsOutputSchema = z.object({
@@ -37,17 +38,14 @@ export async function getWrapupInstructions(params, context) {
     if (params.updateAgentMetaFiles) {
         finalInstructions += `\nExtra request: review and update if needed the .clinerules and claude.md files if present.`;
     }
+    if (params.createTag) {
+        finalInstructions += `\n5. After all changes are committed and confirmed via 'git_status', use the 'git_tag' tool to create a new annotated tag. The tag name should follow semantic versioning (e.g., v1.2.3), and the annotation message should summarize the key changes in this wrap-up.`;
+    }
     let statusResult;
     let statusError;
     const workingDir = context.getWorkingDirectory();
     if (workingDir) {
-        try {
-            statusResult = await getGitStatus({ path: "." }, context);
-        }
-        catch (error) {
-            logger.warning(`Failed to get git status for wrapup instructions: ${error.message}`, { ...context, operation });
-            statusError = error.message;
-        }
+        statusResult = await getGitStatus({ path: "." }, context);
     }
     else {
         statusError = "No working directory set for session, git status skipped.";

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

@@ -3,10 +3,9 @@
  * @module src/mcp-server/tools/gitWrapupInstructions/registration
  */
 import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
-import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 import { getWrapupInstructions, GitWrapupInstructionsInputSchema, GitWrapupInstructionsOutputSchema, } from "./logic.js";
 const TOOL_NAME = "git_wrapup_instructions";
-const TOOL_DESCRIPTION = "Provides a standard Git wrap-up workflow. This involves reviewing changes with `git_diff`, updating documentation (README, CHANGELOG), and making logical, descriptive commits using the `git_commit` tool. The tool's response also includes the current `git status` output. You should set the working directory using `git_set_working_dir` before running this tool.";
+const TOOL_DESCRIPTION = "Provides a standard Git wrap-up workflow. This involves reviewing changes with `git_diff`, updating documentation (README, CHANGELOG), and making logical, descriptive commits using the `git_commit` tool. Can optionally include instructions to create a Git tag after committing. The tool's response also includes the current `git status` output. You should set the working directory using `git_set_working_dir` before running this tool.";
 /**
  * Registers the git_wrapup_instructions tool with the MCP server instance.
  * @param server The MCP server instance.
@@ -45,18 +44,19 @@ export const registerGitWrapupInstructionsTool = async (server, getWorkingDirect
         }
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "An MCP (Model Context Protocol) server enabling LLMs and AI agents to interact with Git repositories. Provides tools for comprehensive Git operations including clone, commit, branch, diff, log, status, push, pull, merge, rebase, worktree, tag management, and more, via the MCP standard. STDIO & HTTP.",
   "main": "dist/index.js",
   "files": [
@@ -35,16 +35,16 @@
     "clean": "ts-node --esm scripts/clean.ts"
   },
   "dependencies": {
-    "@hono/node-server": "^1.16.0",
-    "@modelcontextprotocol/sdk": "^1.15.1",
-    "@types/node": "^24.0.14",
+    "@hono/node-server": "^1.17.1",
+    "@modelcontextprotocol/sdk": "^1.16.0",
+    "@types/node": "^24.0.15",
     "@types/sanitize-html": "^2.16.0",
     "@types/validator": "^13.15.2",
     "chrono-node": "2.8.0",
     "dotenv": "16.6.1",
     "hono": "^4.8.5",
     "jose": "^6.0.12",
-    "openai": "^5.9.2",
+    "openai": "^5.10.1",
     "partial-json": "^0.1.7",
     "sanitize-html": "^2.17.0",
     "tiktoken": "^1.0.21",