@cyanheads/git-mcp-server
Version:
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,
73 lines • 3.01 kB
JavaScript
/**
* @fileoverview Handles registration and error handling for the git_merge tool.
* @module src/mcp-server/tools/gitMerge/registration
*/
import { ErrorHandler, logger, requestContextService, } from "../../../utils/index.js";
import { gitMergeLogic, GitMergeInputSchema, GitMergeOutputSchema, } from "./logic.js";
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 instance.
* @param server The MCP server instance.
* @param getWorkingDirectory Function to get the session's working directory.
* @param getSessionId Function to get the session ID from context.
*/
export const registerGitMergeTool = async (server, getWorkingDirectory, getSessionId) => {
const operation = "registerGitMergeTool";
const context = requestContextService.createRequestContext({ operation });
server.registerTool(TOOL_NAME, {
title: "Git Merge",
description: TOOL_DESCRIPTION,
inputSchema: GitMergeInputSchema.shape,
outputSchema: GitMergeOutputSchema.shape,
annotations: {
readOnlyHint: false,
destructiveHint: true, // Can create merge commits and change history
idempotentHint: false,
openWorldHint: false,
},
}, async (params, callContext) => {
const handlerContext = requestContextService.createRequestContext({
toolName: TOOL_NAME,
parentContext: callContext,
});
try {
const sessionId = getSessionId(handlerContext);
const result = await gitMergeLogic(params, {
...handlerContext,
getWorkingDirectory: () => getWorkingDirectory(sessionId),
});
return {
structuredContent: result,
content: [
{
type: "text",
text: `Success: ${JSON.stringify(result, null, 2)}`,
},
],
};
}
catch (error) {
logger.error(`Error in ${TOOL_NAME} handler`, {
error,
...handlerContext,
});
const mcpError = ErrorHandler.handleError(error, {
operation: `tool:${TOOL_NAME}`,
context: handlerContext,
input: params,
});
return {
isError: true,
content: [{ type: "text", text: `Error: ${mcpError.message}` }],
structuredContent: {
code: mcpError.code,
message: mcpError.message,
details: mcpError.details,
},
};
}
});
logger.info(`Tool '${TOOL_NAME}' registered successfully.`, context);
};
//# sourceMappingURL=registration.js.map