Fix MCP server undefined error and file path resolution

- Add error field to MCP error responses to fix 'undefined' errors
- Add REPO_DIR environment variable to fix file path resolution
- Use GITHUB_WORKSPACE for correct repository directory
- Simplify path processing logic in commit_files tool

This fixes the issue where mcp__github_file_ops__commit_files would fail
with 'Error calling tool commit_files: undefined' by ensuring error messages
are properly formatted and files are read from the correct directory.
This commit is contained in:
Lina Tawfik
2025-05-23 11:17:05 -07:00
parent 57ae256d38
commit c60a8fb69b
2 changed files with 18 additions and 13 deletions

View File

@@ -4,6 +4,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
import { z } from "zod"; import { z } from "zod";
import { readFile } from "fs/promises"; import { readFile } from "fs/promises";
import { join } from "path";
import fetch from "node-fetch"; import fetch from "node-fetch";
import { GITHUB_API_URL } from "../github/api/config"; import { GITHUB_API_URL } from "../github/api/config";
@@ -36,6 +37,7 @@ type GitHubNewCommit = {
const REPO_OWNER = process.env.REPO_OWNER; const REPO_OWNER = process.env.REPO_OWNER;
const REPO_NAME = process.env.REPO_NAME; const REPO_NAME = process.env.REPO_NAME;
const BRANCH_NAME = process.env.BRANCH_NAME; const BRANCH_NAME = process.env.BRANCH_NAME;
const REPO_DIR = process.env.REPO_DIR || process.cwd();
if (!REPO_OWNER || !REPO_NAME || !BRANCH_NAME) { if (!REPO_OWNER || !REPO_NAME || !BRANCH_NAME) {
console.error( console.error(
@@ -71,18 +73,11 @@ server.tool(
throw new Error("GITHUB_TOKEN environment variable is required"); throw new Error("GITHUB_TOKEN environment variable is required");
} }
// Convert absolute paths to relative if they match CWD // Process file paths - keep them as-is for now
const cwd = process.cwd();
const processedFiles = files.map((filePath) => { const processedFiles = files.map((filePath) => {
// Remove leading slash if present to ensure relative paths
if (filePath.startsWith("/")) { if (filePath.startsWith("/")) {
if (filePath.startsWith(cwd)) { return filePath.slice(1);
// Strip CWD from absolute path
return filePath.slice(cwd.length + 1);
} else {
throw new Error(
`Path '${filePath}' must be relative to repository root or within current working directory`,
);
}
} }
return filePath; return filePath;
}); });
@@ -126,7 +121,12 @@ server.tool(
// 3. Create tree entries for all files // 3. Create tree entries for all files
const treeEntries = await Promise.all( const treeEntries = await Promise.all(
processedFiles.map(async (filePath) => { processedFiles.map(async (filePath) => {
const content = await readFile(filePath, "utf-8"); // Construct the full path using REPO_DIR
const fullPath = filePath.startsWith('/')
? filePath
: join(REPO_DIR, filePath);
const content = await readFile(fullPath, "utf-8");
return { return {
path: filePath, path: filePath,
mode: "100644", mode: "100644",
@@ -232,13 +232,15 @@ server.tool(
], ],
}; };
} catch (error) { } catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
return { return {
content: [ content: [
{ {
type: "text", type: "text",
text: `Error: ${error instanceof Error ? error.message : String(error)}`, text: `Error: ${errorMessage}`,
}, },
], ],
error: errorMessage,
isError: true, isError: true,
}; };
} }
@@ -423,13 +425,15 @@ server.tool(
], ],
}; };
} catch (error) { } catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
return { return {
content: [ content: [
{ {
type: "text", type: "text",
text: `Error: ${error instanceof Error ? error.message : String(error)}`, text: `Error: ${errorMessage}`,
}, },
], ],
error: errorMessage,
isError: true, isError: true,
}; };
} }

View File

@@ -34,6 +34,7 @@ export async function prepareMcpConfig(
REPO_OWNER: owner, REPO_OWNER: owner,
REPO_NAME: repo, REPO_NAME: repo,
BRANCH_NAME: branch, BRANCH_NAME: branch,
REPO_DIR: process.env.GITHUB_WORKSPACE || process.cwd(), // Use GitHub workspace directory
}, },
}, },
}, },