When a PR modifies .mcp.json, the checked-out working directory contains a version that may differ from the base branch. Blindly setting enableAllProjectMcpServers=true in that context auto-approves those MCP servers without the user having reviewed them. Fix: before calling setupClaudeCodeSettings, check whether .mcp.json changed in the triggering PR using the GitHub REST API (pulls.listFiles). If it did, pass mcpJsonChanged=true to suppress the enableAllProjectMcpServers=true override. When .mcp.json is unmodified (the common case), behaviour is unchanged. - Add mcpJsonChanged parameter to setupClaudeCodeSettings - Add PR file-list check in src/entrypoints/run.ts - Update tests: update existing override test, add two new mcpJsonChanged=true tests
181 lines
5.9 KiB
TypeScript
181 lines
5.9 KiB
TypeScript
#!/usr/bin/env bun
|
|
|
|
import { describe, test, expect, beforeEach, afterEach } from "bun:test";
|
|
import { setupClaudeCodeSettings } from "../src/setup-claude-code-settings";
|
|
import { tmpdir } from "os";
|
|
import { mkdir, writeFile, readFile, rm } from "fs/promises";
|
|
import { join } from "path";
|
|
|
|
const testHomeDir = join(
|
|
tmpdir(),
|
|
"claude-code-test-home",
|
|
Date.now().toString(),
|
|
);
|
|
const settingsPath = join(testHomeDir, ".claude", "settings.json");
|
|
const testSettingsDir = join(testHomeDir, ".claude-test");
|
|
const testSettingsPath = join(testSettingsDir, "test-settings.json");
|
|
|
|
describe("setupClaudeCodeSettings", () => {
|
|
beforeEach(async () => {
|
|
// Create test home directory and test settings directory
|
|
await mkdir(testHomeDir, { recursive: true });
|
|
await mkdir(testSettingsDir, { recursive: true });
|
|
});
|
|
|
|
afterEach(async () => {
|
|
// Clean up test home directory
|
|
await rm(testHomeDir, { recursive: true, force: true });
|
|
});
|
|
|
|
test("should always set enableAllProjectMcpServers to true when no input", async () => {
|
|
await setupClaudeCodeSettings(undefined, false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
});
|
|
|
|
test("should merge settings from JSON string input", async () => {
|
|
const inputSettings = JSON.stringify({
|
|
model: "claude-sonnet-4-20250514",
|
|
env: { API_KEY: "test-key" },
|
|
});
|
|
|
|
await setupClaudeCodeSettings(inputSettings, false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
expect(settings.model).toBe("claude-sonnet-4-20250514");
|
|
expect(settings.env).toEqual({ API_KEY: "test-key" });
|
|
});
|
|
|
|
test("should merge settings from file path input", async () => {
|
|
const testSettings = {
|
|
hooks: {
|
|
PreToolUse: [
|
|
{
|
|
matcher: "Bash",
|
|
hooks: [{ type: "command", command: "echo test" }],
|
|
},
|
|
],
|
|
},
|
|
permissions: {
|
|
allow: ["Bash", "Read"],
|
|
},
|
|
};
|
|
|
|
await writeFile(testSettingsPath, JSON.stringify(testSettings, null, 2));
|
|
|
|
await setupClaudeCodeSettings(testSettingsPath, false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
expect(settings.hooks).toEqual(testSettings.hooks);
|
|
expect(settings.permissions).toEqual(testSettings.permissions);
|
|
});
|
|
|
|
test("should override enableAllProjectMcpServers even if false in input when mcpJsonChanged is false", async () => {
|
|
const inputSettings = JSON.stringify({
|
|
enableAllProjectMcpServers: false,
|
|
model: "test-model",
|
|
});
|
|
|
|
await setupClaudeCodeSettings(inputSettings, false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
expect(settings.model).toBe("test-model");
|
|
});
|
|
|
|
test("should not set enableAllProjectMcpServers to true when mcpJsonChanged is true", async () => {
|
|
const inputSettings = JSON.stringify({
|
|
model: "test-model",
|
|
});
|
|
|
|
await setupClaudeCodeSettings(inputSettings, true, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBeUndefined();
|
|
expect(settings.model).toBe("test-model");
|
|
});
|
|
|
|
test("should not override enableAllProjectMcpServers when mcpJsonChanged is true and input sets it false", async () => {
|
|
const inputSettings = JSON.stringify({
|
|
enableAllProjectMcpServers: false,
|
|
model: "test-model",
|
|
});
|
|
|
|
await setupClaudeCodeSettings(inputSettings, true, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(false);
|
|
expect(settings.model).toBe("test-model");
|
|
});
|
|
|
|
test("should throw error for invalid JSON string", async () => {
|
|
expect(() =>
|
|
setupClaudeCodeSettings("{ invalid json", false, testHomeDir),
|
|
).toThrow();
|
|
});
|
|
|
|
test("should throw error for non-existent file path", async () => {
|
|
expect(() =>
|
|
setupClaudeCodeSettings("/non/existent/file.json", false, testHomeDir),
|
|
).toThrow();
|
|
});
|
|
|
|
test("should handle empty string input", async () => {
|
|
await setupClaudeCodeSettings("", false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
});
|
|
|
|
test("should handle whitespace-only input", async () => {
|
|
await setupClaudeCodeSettings(" \n\t ", false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
});
|
|
|
|
test("should merge with existing settings", async () => {
|
|
// First, create some existing settings
|
|
await setupClaudeCodeSettings(
|
|
JSON.stringify({ existingKey: "existingValue" }),
|
|
false,
|
|
testHomeDir,
|
|
);
|
|
|
|
// Then, add new settings
|
|
const newSettings = JSON.stringify({
|
|
newKey: "newValue",
|
|
model: "claude-opus-4-1-20250805",
|
|
});
|
|
|
|
await setupClaudeCodeSettings(newSettings, false, testHomeDir);
|
|
|
|
const settingsContent = await readFile(settingsPath, "utf-8");
|
|
const settings = JSON.parse(settingsContent);
|
|
|
|
expect(settings.enableAllProjectMcpServers).toBe(true);
|
|
expect(settings.existingKey).toBe("existingValue");
|
|
expect(settings.newKey).toBe("newValue");
|
|
expect(settings.model).toBe("claude-opus-4-1-20250805");
|
|
});
|
|
});
|