@arii/boomtick-mcp 0.4.1 → 0.5.0

package/src/lib/git.test.ts

@@ -0,0 +1,110 @@
+import { describe, expect, it, vi, beforeEach } from "vitest";
+import { getChangedFiles, getMergeConflictFiles } from "./git.js";
+import * as shell from "./shell.js";
+
+vi.mock("./shell.js", () => ({
+  runCommand: vi.fn(),
+}));
+
+describe("Git Helpers", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  describe("getChangedFiles", () => {
+    it("should parse null-delimited git diff output correctly", async () => {
+      // Mock git diff output with null character delimiters:
+      // Status M -> file1.txt
+      // Status A -> file2.txt
+      // Status R100 -> old.txt -> new.txt
+      const mockStdout = "M\0file1.txt\0A\0file2.txt\0R100\0old.txt\0new.txt\0";
+      vi.mocked(shell.runCommand).mockResolvedValueOnce({
+        exitCode: 0,
+        stdout: mockStdout,
+        stderr: "",
+        durationMs: 10,
+        command: "git diff --name-status -z main...HEAD",
+      });
+
+      const result = await getChangedFiles("main", "HEAD");
+
+      expect(shell.runCommand).toHaveBeenCalledWith(
+        "git",
+        ["diff", "--name-status", "-z", "main...HEAD"],
+        { cwd: undefined }
+      );
+      expect(result).toEqual([
+        { status: "M", path: "file1.txt" },
+        { status: "A", path: "file2.txt" },
+        { status: "R100", path: "new.txt", oldPath: "old.txt" },
+      ]);
+    });
+
+    it("should throw error if git diff fails", async () => {
+      vi.mocked(shell.runCommand).mockResolvedValueOnce({
+        exitCode: 1,
+        stdout: "",
+        stderr: "fatal: bad revision",
+        durationMs: 10,
+        command: "git diff --name-status -z invalid...HEAD",
+      });
+
+      await expect(getChangedFiles("invalid", "HEAD")).rejects.toThrow(
+        "Failed to get changed files: fatal: bad revision"
+      );
+    });
+  });
+
+  describe("getMergeConflictFiles", () => {
+    it("should parse git merge-tree output when conflicts exist", async () => {
+      // Output with 40-char tree hash followed by conflicting filenames
+      const mockStdout =
+        "5d71843ed2e051b2be91361db7bea0fc4ee1e5a0\nfile1.txt\nsrc/file2.ts\n";
+      vi.mocked(shell.runCommand).mockResolvedValueOnce({
+        exitCode: 1, // merge-tree exits 1 on conflicts
+        stdout: mockStdout,
+        stderr: "",
+        durationMs: 10,
+        command: "git merge-tree --write-tree --name-only main feature",
+      });
+
+      const conflicts = await getMergeConflictFiles("main", "feature");
+
+      expect(shell.runCommand).toHaveBeenCalledWith(
+        "git",
+        ["merge-tree", "--write-tree", "--name-only", "main", "feature"],
+        { cwd: undefined }
+      );
+      expect(conflicts).toEqual(["file1.txt", "src/file2.ts"]);
+    });
+
+    it("should return empty array when no conflicts exist", async () => {
+      const mockStdout = "5d71843ed2e051b2be91361db7bea0fc4ee1e5a0\n";
+      vi.mocked(shell.runCommand).mockResolvedValueOnce({
+        exitCode: 0,
+        stdout: mockStdout,
+        stderr: "",
+        durationMs: 10,
+        command: "git merge-tree --write-tree --name-only main feature",
+      });
+
+      const conflicts = await getMergeConflictFiles("main", "feature");
+
+      expect(conflicts).toEqual([]);
+    });
+
+    it("should throw error if git merge-tree exits with unexpected exit code", async () => {
+      vi.mocked(shell.runCommand).mockResolvedValueOnce({
+        exitCode: 128,
+        stdout: "",
+        stderr: "fatal: not a valid object name",
+        durationMs: 10,
+        command: "git merge-tree --write-tree --name-only invalid feature",
+      });
+
+      await expect(getMergeConflictFiles("invalid", "feature")).rejects.toThrow(
+        "Git merge-tree failed: fatal: not a valid object name"
+      );
+    });
+  });
+});

package/src/lib/git.ts

@@ -2,6 +2,40 @@ import { runCommand } from "./shell.js";
 import { config } from "../config.js";
 import path from "path";
 import fs from "fs/promises";
+import { execSync } from "child_process";
+
+const repoCache = new Map<string, string>();
+
+export function resolveRepo(explicitRepo?: string | null, cwd?: string): string {
+  if (explicitRepo && explicitRepo.trim().length > 0) {
+    return explicitRepo.trim();
+  }
+
+  const targetCwd = cwd || process.cwd();
+  if (repoCache.has(targetCwd)) {
+    return repoCache.get(targetCwd)!;
+  }
+
+  try {
+    const url = execSync("git remote get-url origin", {
+      cwd: targetCwd,
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+
+    const match = url.match(/[:/]([^/]+\/[^/.]+)(\.git)?$/);
+    if (match) {
+      repoCache.set(targetCwd, match[1]);
+      return match[1];
+    }
+  } catch (e) {
+    // Ignore error and fall back to static config
+  }
+
+  const fallback = `${config.githubOwner}/${config.githubRepo}`;
+  repoCache.set(targetCwd, fallback);
+  return fallback;
+}
 
 function validatePrNumber(value: unknown): number {
   const prNumber = Number(value);
@@ -39,3 +73,78 @@ export async function removeWorktree(worktreePath: string): Promise<void> {
   await runCommand("git", ["worktree", "remove", "--force", worktreePath]);
   await runCommand("git", ["worktree", "prune"]);
 }
+
+export interface ChangedFile {
+  status: string;
+  path: string;
+  oldPath?: string;
+}
+
+export async function getChangedFiles(
+  base: string = "main",
+  head: string = "HEAD",
+  cwd?: string
+): Promise<ChangedFile[]> {
+  const result = await runCommand(
+    "git",
+    ["diff", "--name-status", "-z", `${base}...${head}`],
+    { cwd }
+  );
+
+  if (result.exitCode !== 0) {
+    throw new Error(`Failed to get changed files: ${result.stderr}`);
+  }
+
+  const tokens = result.stdout.split("\0").filter((t) => t.length > 0);
+  const files: ChangedFile[] = [];
+
+  let i = 0;
+  while (i < tokens.length) {
+    const status = tokens[i];
+    if (status.startsWith("R") || status.startsWith("C")) {
+      const oldPath = tokens[i + 1];
+      const newPath = tokens[i + 2];
+      if (oldPath && newPath) {
+        files.push({ status, path: newPath, oldPath });
+      }
+      i += 3;
+    } else {
+      const filePath = tokens[i + 1];
+      if (filePath) {
+        files.push({ status, path: filePath });
+      }
+      i += 2;
+    }
+  }
+
+  return files;
+}
+
+export async function getMergeConflictFiles(
+  baseBranch: string = "main",
+  headRef: string = "HEAD",
+  cwd?: string
+): Promise<string[]> {
+  const result = await runCommand(
+    "git",
+    ["merge-tree", "--write-tree", "--name-only", baseBranch, headRef],
+    { cwd }
+  );
+
+  // git merge-tree returns exit code 1 if conflicts are present, 0 if clean merge
+  if (result.exitCode !== 0 && result.exitCode !== 1) {
+    throw new Error(`Git merge-tree failed: ${result.stderr}`);
+  }
+
+  const lines = result.stdout
+    .split("\n")
+    .map((l) => l.trim())
+    .filter((l) => l.length > 0);
+
+  // First line is tree hash if successful or conflict output
+  // When conflicts exist, git merge-tree --write-tree --name-only outputs conflicted filenames
+  // Skip tree hash line if present (40 hex chars)
+  const files = lines.filter((line) => !/^[0-9a-f]{40}$/i.test(line));
+
+  return files;
+}

package/src/lib/param_utils.test.ts

@@ -0,0 +1,49 @@
+import { describe, it, expect } from "vitest";
+import { normalizeArguments } from "./param_utils.js";
+
+describe("param_utils.normalizeArguments", () => {
+  it("should convert snake_case keys to camelCase", () => {
+    const input = {
+      pr_number: 123,
+      issue_number: 456,
+      worktree_path: "/tmp/worktree",
+      base_branch: "main",
+    };
+    const output = normalizeArguments(input);
+    expect(output).toEqual({
+      prNumber: 123,
+      issueNumber: 456,
+      worktreePath: "/tmp/worktree",
+      baseBranch: "main",
+    });
+  });
+
+  it("should coerce numeric strings for prNumber and issueNumber", () => {
+    const input = {
+      pr_number: "789",
+      issue_number: "101",
+    };
+    const output = normalizeArguments(input);
+    expect(output).toEqual({
+      prNumber: 789,
+      issueNumber: 101,
+    });
+  });
+
+  it("should synchronize branch and branchName", () => {
+    expect(normalizeArguments({ branch: "feat-x" })).toEqual({
+      branch: "feat-x",
+      branchName: "feat-x",
+    });
+
+    expect(normalizeArguments({ branch_name: "feat-y" })).toEqual({
+      branchName: "feat-y",
+      branch: "feat-y",
+    });
+  });
+
+  it("should handle null or empty arguments safely", () => {
+    expect(normalizeArguments(null)).toEqual({});
+    expect(normalizeArguments(undefined)).toEqual({});
+  });
+});

package/src/lib/param_utils.ts

@@ -0,0 +1,42 @@
+export function normalizeArguments(args: Record<string, unknown> | null | undefined): Record<string, unknown> {
+  if (!args || typeof args !== "object") {
+    return {};
+  }
+
+  const result: Record<string, unknown> = {};
+
+  for (const [key, value] of Object.entries(args)) {
+    // Convert snake_case to camelCase
+    const camelKey = key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+
+    // Normalize value recursively if it's an object/array
+    let normalizedValue = value;
+    if (Array.isArray(value)) {
+      normalizedValue = value.map((item) =>
+        item && typeof item === "object" ? normalizeArguments(item as Record<string, unknown>) : item
+      );
+    } else if (value && typeof value === "object" && !(value instanceof RegExp)) {
+      normalizedValue = normalizeArguments(value as Record<string, unknown>);
+    }
+
+    // Coerce numeric string to integer for prNumber / issueNumber if applicable
+    if ((camelKey === "prNumber" || camelKey === "issueNumber") && typeof normalizedValue === "string") {
+      const parsedNum = parseInt(normalizedValue, 10);
+      if (!isNaN(parsedNum)) {
+        normalizedValue = parsedNum;
+      }
+    }
+
+    result[camelKey] = normalizedValue;
+  }
+
+  // Parameter aliases harmonization
+  // branch vs branchName harmonization
+  if (result.branch !== undefined && result.branchName === undefined) {
+    result.branchName = result.branch;
+  } else if (result.branchName !== undefined && result.branch === undefined) {
+    result.branch = result.branchName;
+  }
+
+  return result;
+}

package/src/mcp/definitions.ts

@@ -7,14 +7,11 @@ import {
   GetMergeConflictFilesInputJsonSchema,
   GetChangedFilesInputJsonSchema,
   GetPackageScriptsInputJsonSchema,
-  GetRouteMapInputJsonSchema,
   ReadCiLogsInputJsonSchema,
   RepoLogsInputJsonSchema,
   CreateBranchInputJsonSchema,
   CreateRepairBranchInputJsonSchema,
   RunTestsInputJsonSchema,
-  RunLighthouseInputJsonSchema,
-  RunPlaywrightInputJsonSchema,
   CommitPatchInputJsonSchema,
   OpenReplacementPrInputJsonSchema,
   CreatePullRequestInputJsonSchema,
@@ -30,7 +27,9 @@ import {
   JulesSessionIdInputJsonSchema,
   JulesSendMessageInputJsonSchema,
   JulesListSessionsInputJsonSchema,
-  SearchDdgsInputJsonSchema,
+  GetPrReviewsInputJsonSchema,
+  GetPrCommitsInputJsonSchema,
+  GetWorkflowRunsInputJsonSchema,
 } from "../tools/contract.js";
 
 export const MCP_PROMPTS: Prompt[] = [
@@ -67,12 +66,6 @@ export const MCP_RESOURCES: Resource[] = [
     mimeType: "application/json",
     description: "The root package.json file of the repository.",
   },
-  {
-    uri: "repo://routes",
-    name: "Route Map",
-    mimeType: "application/json",
-    description: "The mapping of application routes to content files.",
-  },
   {
     uri: "repo://design-tokens",
     name: "Design Tokens",
@@ -85,21 +78,9 @@ export const MCP_RESOURCES: Resource[] = [
     mimeType: "application/json",
     description: "The validation report for a specific repair branch.",
   },
-  {
-    uri: "repo://lighthouse/{branch}",
-    name: "Lighthouse Report",
-    mimeType: "application/json",
-    description: "Lighthouse CI report for a specific branch.",
-  },
-  {
-    uri: "repo://playwright/{branch}",
-    name: "Playwright Report",
-    mimeType: "application/json",
-    description: "Playwright test report for a specific branch.",
-  },
 ];
 
-export const MCP_TOOLS: Tool[] = [
+const BASE_MCP_TOOLS: Tool[] = [
   {
     name: "boomtick.health",
     description: "Check the health and configuration of the MCP server.",
@@ -145,11 +126,6 @@ export const MCP_TOOLS: Tool[] = [
     description: "Get the scripts defined in package.json.",
     inputSchema: GetPackageScriptsInputJsonSchema as any,
   },
-  {
-    name: "repo.get_route_map",
-    description: "Get the mapping of routes to content files.",
-    inputSchema: GetRouteMapInputJsonSchema as any,
-  },
   {
     name: "repo.read_ci_logs",
     description: "Read CI logs for a given pull request.",
@@ -175,16 +151,6 @@ export const MCP_TOOLS: Tool[] = [
     description: "Run repository tests and checks.",
     inputSchema: RunTestsInputJsonSchema as any,
   },
-  {
-    name: "repo.run_lighthouse",
-    description: "Run Lighthouse CI audits.",
-    inputSchema: RunLighthouseInputJsonSchema as any,
-  },
-  {
-    name: "repo.run_playwright",
-    description: "Run Playwright E2E tests.",
-    inputSchema: RunPlaywrightInputJsonSchema as any,
-  },
   {
     name: "repo.commit_patch",
     description: "Commit verified repair changes in a worktree.",
@@ -210,6 +176,21 @@ export const MCP_TOOLS: Tool[] = [
     description: "Get details of a GitHub PR including title, state, and URLs.",
     inputSchema: GetPrInputJsonSchema as any,
   },
+  {
+    name: "github.get_pr_reviews",
+    description: "Get top-level reviews, verdicts, states, and bodies for a GitHub PR.",
+    inputSchema: GetPrReviewsInputJsonSchema as any,
+  },
+  {
+    name: "github.get_pr_commits",
+    description: "List commits and commit metadata (SHAs, authors, messages) for a GitHub PR.",
+    inputSchema: GetPrCommitsInputJsonSchema as any,
+  },
+  {
+    name: "repo.get_workflow_runs",
+    description: "List recent GitHub Actions workflow runs for the repository.",
+    inputSchema: GetWorkflowRunsInputJsonSchema as any,
+  },
   {
     name: "github.issue_view",
     description: "View details of a GitHub issue including title, body, and state.",
@@ -270,9 +251,15 @@ export const MCP_TOOLS: Tool[] = [
     description: "Automatically collect CI status/logs for the PR associated with a Jules session and send them back as feedback.",
     inputSchema: JulesSessionIdInputJsonSchema as any,
   },
-  {
-    name: "agent.search_ddgs",
-    description: "Search the web using DuckDuckGo (via ddgs python library).",
-    inputSchema: SearchDdgsInputJsonSchema as any,
-  },
 ];
+
+export const MCP_TOOLS: Tool[] = BASE_MCP_TOOLS.flatMap((tool) => {
+  const underscoreName = tool.name.replace(/\./g, "_");
+  if (underscoreName !== tool.name) {
+    return [
+      { ...tool, name: underscoreName },
+      tool,
+    ];
+  }
+  return [tool];
+});

package/src/mcp/schemas.test.ts

@@ -0,0 +1,34 @@
+import { describe, it, expect } from "vitest";
+import * as fs from "fs";
+import * as path from "path";
+import { execSync } from "child_process";
+
+describe("MCP tool schemas export", () => {
+  it("should generate valid schema files with non-null parameters object", () => {
+    const schemasDir = path.resolve(process.cwd(), ".mcp/schemas");
+    if (!fs.existsSync(schemasDir)) {
+      execSync("npx tsx scripts/sync-mcp-schemas.ts", { cwd: process.cwd() });
+    }
+    expect(fs.existsSync(schemasDir)).toBe(true);
+
+    const files = fs.readdirSync(schemasDir).filter((f) => f.endsWith(".json"));
+    expect(files.length).toBeGreaterThan(0);
+
+    for (const file of files) {
+      const filePath = path.join(schemasDir, file);
+      const content = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+
+      expect(content).toHaveProperty("name");
+      expect(typeof content.name).toBe("string");
+
+      expect(content).toHaveProperty("description");
+      expect(typeof content.description).toBe("string");
+
+      expect(content).toHaveProperty("parameters");
+      expect(content.parameters).not.toBeNull();
+      expect(typeof content.parameters).toBe("object");
+      expect(content.parameters.type).toBe("object");
+      expect(content.parameters.properties).toBeDefined();
+    }
+  });
+});

package/src/mcp/server.test.ts

@@ -3,11 +3,8 @@ import { BoomtickMCPServer } from "./server.js";
 import { config } from "../config.js";
 import fs from "fs/promises";
 import * as healthModule from "./tools.js";
-import * as routeMapModule from "../tools/repo.get_route_map.js";
 import * as prDiffModule from "../tools/github.get_pr_diff.js";
 import * as ciLogsModule from "../tools/repo.read_ci_logs.js";
-import * as lighthouseModule from "../tools/repo.run_lighthouse.js";
-import * as playwrightModule from "../tools/repo.run_playwright.js";
 
 vi.mock("fs/promises");
 vi.mock("../config.js", () => ({
@@ -124,19 +121,6 @@ describe("BoomtickMCPServer", () => {
       });
     });
 
-    it("should handle repo://routes", async () => {
-      const handler = requestHandlers.get("resources/read");
-      vi.spyOn(routeMapModule, "getRouteMapHandler").mockResolvedValue({ routes: ["/"] } as any);
-
-      const result = await handler!({
-        method: "resources/read",
-        params: { uri: "repo://routes" },
-      });
-
-      expect(result.contents[0].uri).toBe("repo://routes");
-      expect(JSON.parse(result.contents[0].text)).toEqual({ routes: ["/"] });
-    });
-
     it("should handle repo://design-tokens", async () => {
       const handler = requestHandlers.get("resources/read");
       vi.mocked(fs.readFile).mockResolvedValue("export const tokens = {};");
@@ -178,32 +162,6 @@ describe("BoomtickMCPServer", () => {
       expect(JSON.parse(result.contents[0].text)).toEqual({ status: "success" });
     });
 
-    it("should handle repo://lighthouse/:branch", async () => {
-      const handler = requestHandlers.get("resources/read");
-      vi.spyOn(lighthouseModule, "runLighthouseHandler").mockResolvedValue({ score: 100 } as any);
-
-      const result = await handler!({
-        method: "resources/read",
-        params: { uri: "repo://lighthouse/feature-x" },
-      });
-
-      expect(result.contents[0].uri).toBe("repo://lighthouse/feature-x");
-      expect(JSON.parse(result.contents[0].text)).toEqual({ score: 100 });
-    });
-
-    it("should handle repo://playwright/:branch", async () => {
-      const handler = requestHandlers.get("resources/read");
-      vi.spyOn(playwrightModule, "runPlaywrightHandler").mockResolvedValue({ passed: true } as any);
-
-      const result = await handler!({
-        method: "resources/read",
-        params: { uri: "repo://playwright/feature-x" },
-      });
-
-      expect(result.contents[0].uri).toBe("repo://playwright/feature-x");
-      expect(JSON.parse(result.contents[0].text)).toEqual({ passed: true });
-    });
-
     it("should throw when resource is unknown", async () => {
       const handler = requestHandlers.get("resources/read");