mirror of
https://github.com/anthropics/claude-code-action.git
synced 2026-01-23 15:04:13 +08:00
* fix: add baseUrl to Octokit initialization in update_claude_comment Fixes Bad credentials error on GitHub Enterprise Server by passing GITHUB_API_URL as baseUrl when initializing Octokit, consistent with other Octokit instances in the codebase. Fixes #156 Related to #107 Co-authored-by: ashwin-ant <ashwin-ant@users.noreply.github.com> * fix: pass GITHUB_API_URL as env var to MCP server Update the MCP server initialization to pass GITHUB_API_URL as an environment variable, allowing it to work correctly with GitHub Enterprise Server instances. Co-authored-by: ashwin-ant <ashwin-ant@users.noreply.github.com> * fix: import GITHUB_API_URL from config in install-mcp-server Use the centralized GITHUB_API_URL constant from src/github/api/config.ts instead of reading directly from process.env when passing environment variables to the MCP server. This ensures consistency with how the API URL is handled throughout the codebase. Co-authored-by: ashwin-ant <ashwin-ant@users.noreply.github.com> * fix --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: ashwin-ant <ashwin-ant@users.noreply.github.com>
111 lines
3.0 KiB
TypeScript
111 lines
3.0 KiB
TypeScript
import * as core from "@actions/core";
|
|
import { GITHUB_API_URL } from "../github/api/config";
|
|
|
|
type PrepareConfigParams = {
|
|
githubToken: string;
|
|
owner: string;
|
|
repo: string;
|
|
branch: string;
|
|
additionalMcpConfig?: string;
|
|
claudeCommentId?: string;
|
|
allowedTools: string[];
|
|
};
|
|
|
|
export async function prepareMcpConfig(
|
|
params: PrepareConfigParams,
|
|
): Promise<string> {
|
|
const {
|
|
githubToken,
|
|
owner,
|
|
repo,
|
|
branch,
|
|
additionalMcpConfig,
|
|
claudeCommentId,
|
|
allowedTools,
|
|
} = params;
|
|
try {
|
|
const allowedToolsList = allowedTools || [];
|
|
|
|
const hasGitHubMcpTools = allowedToolsList.some((tool) =>
|
|
tool.startsWith("mcp__github__"),
|
|
);
|
|
|
|
const baseMcpConfig: { mcpServers: Record<string, unknown> } = {
|
|
mcpServers: {
|
|
github_file_ops: {
|
|
command: "bun",
|
|
args: [
|
|
"run",
|
|
`${process.env.GITHUB_ACTION_PATH}/src/mcp/github-file-ops-server.ts`,
|
|
],
|
|
env: {
|
|
GITHUB_TOKEN: githubToken,
|
|
REPO_OWNER: owner,
|
|
REPO_NAME: repo,
|
|
BRANCH_NAME: branch,
|
|
REPO_DIR: process.env.GITHUB_WORKSPACE || process.cwd(),
|
|
...(claudeCommentId && { CLAUDE_COMMENT_ID: claudeCommentId }),
|
|
GITHUB_EVENT_NAME: process.env.GITHUB_EVENT_NAME || "",
|
|
IS_PR: process.env.IS_PR || "false",
|
|
GITHUB_API_URL: GITHUB_API_URL,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
if (hasGitHubMcpTools) {
|
|
baseMcpConfig.mcpServers.github = {
|
|
command: "docker",
|
|
args: [
|
|
"run",
|
|
"-i",
|
|
"--rm",
|
|
"-e",
|
|
"GITHUB_PERSONAL_ACCESS_TOKEN",
|
|
"ghcr.io/github/github-mcp-server:sha-e9f748f", // https://github.com/github/github-mcp-server/releases/tag/v0.4.0
|
|
],
|
|
env: {
|
|
GITHUB_PERSONAL_ACCESS_TOKEN: githubToken,
|
|
},
|
|
};
|
|
}
|
|
|
|
// Merge with additional MCP config if provided
|
|
if (additionalMcpConfig && additionalMcpConfig.trim()) {
|
|
try {
|
|
const additionalConfig = JSON.parse(additionalMcpConfig);
|
|
|
|
// Validate that parsed JSON is an object
|
|
if (typeof additionalConfig !== "object" || additionalConfig === null) {
|
|
throw new Error("MCP config must be a valid JSON object");
|
|
}
|
|
|
|
core.info(
|
|
"Merging additional MCP server configuration with built-in servers",
|
|
);
|
|
|
|
// Merge configurations with user config overriding built-in servers
|
|
const mergedConfig = {
|
|
...baseMcpConfig,
|
|
...additionalConfig,
|
|
mcpServers: {
|
|
...baseMcpConfig.mcpServers,
|
|
...additionalConfig.mcpServers,
|
|
},
|
|
};
|
|
|
|
return JSON.stringify(mergedConfig, null, 2);
|
|
} catch (parseError) {
|
|
core.warning(
|
|
`Failed to parse additional MCP config: ${parseError}. Using base config only.`,
|
|
);
|
|
}
|
|
}
|
|
|
|
return JSON.stringify(baseMcpConfig, null, 2);
|
|
} catch (error) {
|
|
core.setFailed(`Install MCP server failed with error: ${error}`);
|
|
process.exit(1);
|
|
}
|
|
}
|