@arii/boomtick-mcp 0.7.0 → 0.7.1

package/src/lib/git.ts

@@ -2,6 +2,7 @@ import { runCommand } from "./shell.js";
 import { config } from "../config.js";
 import path from "path";
 import fs from "fs/promises";
+import * as syncFs from "fs";
 import { execSync } from "child_process";
 
 const repoCache = new Map<string, string>();
@@ -37,6 +38,87 @@ export function resolveRepo(explicitRepo?: string | null, cwd?: string): string
   return fallback;
 }
 
+export interface RepoPathOptions {
+  path?: string | null;
+  repoPath?: string | null;
+  repo?: string | null;
+  cwd?: string | null;
+}
+
+export function resolveRepoPath(options: RepoPathOptions = {}): string {
+  // 1. Explicit path parameter has highest precedence
+  if (options.path && options.path.trim().length > 0) {
+    return path.resolve(options.path.trim());
+  }
+
+  // 2. repoPath alias parameter
+  if (options.repoPath && options.repoPath.trim().length > 0) {
+    return path.resolve(options.repoPath.trim());
+  }
+
+  // 3. Repository name override (e.g. "arii/tech-dancer" or "tech-dancer")
+  if (options.repo && options.repo.trim().length > 0) {
+    const rawRepo = options.repo.trim();
+    const repoName = rawRepo.includes("/") ? rawRepo.split("/")[1] : rawRepo;
+
+    // First check project_config.json ecosystem_repos if available
+    let rootPath: string = process.cwd();
+    try {
+      if (options.cwd && options.cwd.trim().length > 0) {
+        rootPath = options.cwd.trim();
+      } else if (config.repoPath) {
+        rootPath = config.repoPath;
+      }
+    } catch {
+      rootPath = process.cwd();
+    }
+
+    const projectConfigPath = path.join(rootPath, "project_config.json");
+    if (syncFs.existsSync(projectConfigPath)) {
+      try {
+        const parsed = JSON.parse(syncFs.readFileSync(projectConfigPath, "utf-8"));
+        if (parsed?.ecosystem_repos && typeof parsed.ecosystem_repos === "object") {
+          for (const [key, relPath] of Object.entries(parsed.ecosystem_repos)) {
+            const keyRepoName = key.includes("/") ? key.split("/")[1] : key;
+            if (key === rawRepo || keyRepoName === repoName) {
+              return path.resolve(rootPath, relPath as string);
+            }
+          }
+        }
+      } catch {
+        // Fallback to directory inspection
+      }
+    }
+
+    // Check sibling directory relative to cwd or rootPath
+    const candidateDirs = [
+      path.resolve(process.cwd(), "..", repoName),
+      path.resolve(rootPath, "..", repoName),
+    ];
+    for (const cand of candidateDirs) {
+      if (syncFs.existsSync(cand)) {
+        return cand;
+      }
+    }
+  }
+
+  // 4. Explicit cwd parameter
+  if (options.cwd && options.cwd.trim().length > 0) {
+    return path.resolve(options.cwd.trim());
+  }
+
+  // 5. Configured repoPath or process.cwd()
+  try {
+    if (config.repoPath && syncFs.existsSync(config.repoPath)) {
+      return config.repoPath;
+    }
+  } catch {
+    // Fall back to process.cwd()
+  }
+
+  return process.cwd();
+}
+
 function validatePrNumber(value: unknown): number {
   const prNumber = Number(value);
 
@@ -47,20 +129,25 @@ function validatePrNumber(value: unknown): number {
   return prNumber;
 }
 
-export async function createWorktree(branch: string, prNumber: number): Promise<string> {
+export async function createWorktree(branch: string, prNumber: number, baseRepoPath?: string): Promise<string> {
   const safePrNumber = validatePrNumber(prNumber);
 
   const workspaceRoot = "/tmp/boomtick-worktrees";
   // nosemgrep
   const worktreePath = path.join(workspaceRoot, `boomtick-mcp-rescue-${safePrNumber}`);
+  const cwdOption = baseRepoPath ? { cwd: baseRepoPath } : undefined;
 
   // Clean up if exists
   try {
     await fs.rm(worktreePath, { recursive: true, force: true });
-    await runCommand("git", ["worktree", "prune"]);
+    await runCommand("git", ["worktree", "prune"], cwdOption);
   } catch (e) { /* ignore if no previous worktree */ }
 
-  const result = await runCommand("git", ["worktree", "add", "-b", `repair-pr-${prNumber}-${Date.now()}`, worktreePath, branch]);
+  const result = await runCommand(
+    "git",
+    ["worktree", "add", "-b", `repair-pr-${prNumber}-${Date.now()}`, worktreePath, branch],
+    cwdOption
+  );
 
   if (result.exitCode !== 0) {
     throw new Error(`Failed to create worktree: ${result.stderr}`);
@@ -69,9 +156,10 @@ export async function createWorktree(branch: string, prNumber: number): Promise<
   return worktreePath;
 }
 
-export async function removeWorktree(worktreePath: string): Promise<void> {
-  await runCommand("git", ["worktree", "remove", "--force", worktreePath]);
-  await runCommand("git", ["worktree", "prune"]);
+export async function removeWorktree(worktreePath: string, baseRepoPath?: string): Promise<void> {
+  const cwdOption = baseRepoPath ? { cwd: baseRepoPath } : undefined;
+  await runCommand("git", ["worktree", "remove", "--force", worktreePath], cwdOption);
+  await runCommand("git", ["worktree", "prune"], cwdOption);
 }
 
 export interface ChangedFile {

package/src/tools/contract.ts

@@ -1451,7 +1451,7 @@ export const CommitPatchResponseJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreateBranchInputSchema = z.object({ "branchName": z.string().describe("The name of the new branch"), "baseBranch": z.string().describe("Branch to branch off from").default("main") });
+export const CreateBranchInputSchema = z.object({ "branchName": z.string().describe("The name of the new branch"), "baseBranch": z.string().describe("Branch to branch off from").default("main"), "repo": z.union([z.string(), z.null()]).describe("Target repository override (e.g. org/repo or repo).").default(null), "path": z.union([z.string(), z.null()]).describe("Local filesystem path to target repository root.").default(null), "repoPath": z.union([z.string(), z.null()]).describe("Alias for path to target repository root.").default(null) });
 
 export type CreateBranchInput = z.infer<typeof CreateBranchInputSchema>;
 
@@ -1467,6 +1467,45 @@ export const CreateBranchInputJsonSchema = {
       "description": "Branch to branch off from",
       "title": "Basebranch",
       "type": "string"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Target repository override (e.g. org/repo or repo).",
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Local filesystem path to target repository root.",
+      "title": "Path"
+    },
+    "repoPath": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Alias for path to target repository root.",
+      "title": "Repopath"
     }
   },
   "required": [
@@ -1476,7 +1515,7 @@ export const CreateBranchInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreateBranchResponseSchema = z.object({ "success": z.boolean().default(true), "branchName": z.string(), "baseBranch": z.union([z.string(), z.null()]).default(null) });
+export const CreateBranchResponseSchema = z.object({ "success": z.boolean().default(true), "branchName": z.string(), "baseBranch": z.union([z.string(), z.null()]).default(null), "repo": z.union([z.string(), z.null()]).default(null), "path": z.union([z.string(), z.null()]).default(null) });
 
 export type CreateBranchResponse = z.infer<typeof CreateBranchResponseSchema>;
 
@@ -1502,6 +1541,30 @@ export const CreateBranchResponseJsonSchema = {
       ],
       "default": null,
       "title": "Basebranch"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "title": "Path"
     }
   },
   "required": [
@@ -1788,7 +1851,7 @@ export const CreatePullRequestResponseJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreateRepairBranchInputSchema = z.object({ "prNumber": z.number().int().describe("The original pull request number to repair."), "repairBranchName": z.union([z.string(), z.null()]).describe("Optional custom name for the new repair branch.").default(null), "writeMode": z.boolean().describe("Safety gate: Must be true to perform branch creation and worktree setup.") });
+export const CreateRepairBranchInputSchema = z.object({ "prNumber": z.number().int().describe("The original pull request number to repair."), "repairBranchName": z.union([z.string(), z.null()]).describe("Optional custom name for the new repair branch.").default(null), "writeMode": z.boolean().describe("Safety gate: Must be true to perform branch creation and worktree setup."), "repo": z.union([z.string(), z.null()]).describe("Target repository override (e.g. org/repo or repo).").default(null), "path": z.union([z.string(), z.null()]).describe("Local filesystem path to target repository root.").default(null), "repoPath": z.union([z.string(), z.null()]).describe("Alias for path to target repository root.").default(null) });
 
 export type CreateRepairBranchInput = z.infer<typeof CreateRepairBranchInputSchema>;
 
@@ -1816,6 +1879,45 @@ export const CreateRepairBranchInputJsonSchema = {
       "description": "Safety gate: Must be true to perform branch creation and worktree setup.",
       "title": "Writemode",
       "type": "boolean"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Target repository override (e.g. org/repo or repo).",
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Local filesystem path to target repository root.",
+      "title": "Path"
+    },
+    "repoPath": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Alias for path to target repository root.",
+      "title": "Repopath"
     }
   },
   "required": [
@@ -1826,7 +1928,7 @@ export const CreateRepairBranchInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreateRepairBranchResponseSchema = z.object({ "prNumber": z.number().int(), "originalBranch": z.string(), "repairBranch": z.string(), "baseBranch": z.string(), "worktreePath": z.string() });
+export const CreateRepairBranchResponseSchema = z.object({ "prNumber": z.number().int(), "originalBranch": z.string(), "repairBranch": z.string(), "baseBranch": z.string(), "worktreePath": z.string(), "repo": z.union([z.string(), z.null()]).default(null), "path": z.union([z.string(), z.null()]).default(null) });
 
 export type CreateRepairBranchResponse = z.infer<typeof CreateRepairBranchResponseSchema>;
 
@@ -1851,6 +1953,30 @@ export const CreateRepairBranchResponseJsonSchema = {
     "worktreePath": {
       "title": "Worktreepath",
       "type": "string"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "title": "Path"
     }
   },
   "required": [
@@ -1864,7 +1990,7 @@ export const CreateRepairBranchResponseJsonSchema = {
   "type": "object"
 } as const;
 
-export const GetChangedFilesInputSchema = z.object({ "base": z.string().describe("The base ref to compare from (default: 'main').").default("main"), "head": z.string().describe("The head ref to compare to (default: 'HEAD').").default("HEAD") });
+export const GetChangedFilesInputSchema = z.object({ "base": z.string().describe("The base ref to compare from (default: 'main').").default("main"), "head": z.string().describe("The head ref to compare to (default: 'HEAD').").default("HEAD"), "repo": z.union([z.string(), z.null()]).describe("Target GitHub repository override.").default(null), "path": z.union([z.string(), z.null()]).describe("Local filesystem path to target repository root.").default(null), "repoPath": z.union([z.string(), z.null()]).describe("Alias for path to target repository root.").default(null) });
 
 export type GetChangedFilesInput = z.infer<typeof GetChangedFilesInputSchema>;
 
@@ -1881,6 +2007,45 @@ export const GetChangedFilesInputJsonSchema = {
       "description": "The head ref to compare to (default: 'HEAD').",
       "title": "Head",
       "type": "string"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Target GitHub repository override.",
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Local filesystem path to target repository root.",
+      "title": "Path"
+    },
+    "repoPath": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Alias for path to target repository root.",
+      "title": "Repopath"
     }
   },
   "title": "GetChangedFilesInput",
@@ -1960,27 +2125,77 @@ export const GetCommandSchemaResponseJsonSchema = {
   "type": "object"
 } as const;
 
-export const GetMergeConflictFilesInputSchema = z.object({ "prNumber": z.number().int().describe("The number of the pull request to check for conflicts."), "baseBranch": z.string().describe("The base branch to check against (default: 'main').").default("main") });
+export const GetMergeConflictFilesInputSchema = z.object({ "prNumber": z.union([z.number().int(), z.null()]).describe("The number of the pull request to check for conflicts.").default(null), "baseBranch": z.string().describe("The base branch to check against (default: 'main').").default("main"), "headRef": z.string().describe("The head ref or branch to check.").default("HEAD"), "repo": z.union([z.string(), z.null()]).describe("Target GitHub repository override.").default(null), "path": z.union([z.string(), z.null()]).describe("Local filesystem path to target repository root.").default(null), "repoPath": z.union([z.string(), z.null()]).describe("Alias for path to target repository root.").default(null) });
 
 export type GetMergeConflictFilesInput = z.infer<typeof GetMergeConflictFilesInputSchema>;
 
 export const GetMergeConflictFilesInputJsonSchema = {
   "properties": {
     "prNumber": {
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
       "description": "The number of the pull request to check for conflicts.",
-      "title": "Prnumber",
-      "type": "integer"
+      "title": "Prnumber"
     },
     "baseBranch": {
       "default": "main",
       "description": "The base branch to check against (default: 'main').",
       "title": "Basebranch",
       "type": "string"
+    },
+    "headRef": {
+      "default": "HEAD",
+      "description": "The head ref or branch to check.",
+      "title": "Headref",
+      "type": "string"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Target GitHub repository override.",
+      "title": "Repo"
+    },
+    "path": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Local filesystem path to target repository root.",
+      "title": "Path"
+    },
+    "repoPath": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Alias for path to target repository root.",
+      "title": "Repopath"
     }
   },
-  "required": [
-    "prNumber"
-  ],
   "title": "GetMergeConflictFilesInput",
   "type": "object"
 } as const;

package/src/tools/github.get_merge_conflict_files.ts

@@ -1,16 +1,25 @@
 import { z } from "zod";
-import { getMergeConflictFiles } from "../lib/git.js";
+import { getMergeConflictFiles, resolveRepoPath } from "../lib/git.js";
 
 export const GetMergeConflictFilesInputSchema = z.object({
   prNumber: z.number().optional(),
   baseBranch: z.string().optional().default("main"),
   headRef: z.string().optional().default("HEAD"),
+  repo: z.string().optional().describe("Target GitHub repository override."),
+  path: z.string().optional().describe("Local filesystem path to target repository root."),
+  repoPath: z.string().optional().describe("Alias for path to target repository root."),
 });
 
 export async function getMergeConflictFilesHandler(args: z.infer<typeof GetMergeConflictFilesInputSchema>) {
   const baseBranch = args.baseBranch || "main";
   const headRef = args.headRef || "HEAD";
-  const conflictFiles = await getMergeConflictFiles(baseBranch, headRef);
+  const targetCwd = resolveRepoPath({
+    path: args.path,
+    repoPath: args.repoPath,
+    repo: args.repo,
+  });
+
+  const conflictFiles = await getMergeConflictFiles(baseBranch, headRef, targetCwd);
 
   const hasConflicts = conflictFiles.length > 0;
 

package/src/tools/repo.create_branch.test.ts

@@ -21,13 +21,22 @@ describe("repo.create_branch", () => {
 
     const result = await createBranchHandler(args);
 
-    expect(shell.runCommand).toHaveBeenCalledWith("git", ["fetch", "origin", "main"]);
-    expect(shell.runCommand).toHaveBeenCalledWith("git", ["checkout", "-b", "new-feature", "origin/main"]);
-    expect(result).toEqual({
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["fetch", "origin", "main"],
+      { cwd: expect.any(String) }
+    );
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["checkout", "-b", "new-feature", "origin/main"],
+      { cwd: expect.any(String) }
+    );
+    expect(result).toMatchObject({
       success: true,
       branchName: "new-feature",
       baseBranch: "main",
     });
+    expect(result.path).toBeDefined();
   });
 
   it("should use default base branch 'main' if not provided", async () => {
@@ -39,8 +48,67 @@ describe("repo.create_branch", () => {
 
     const result = await createBranchHandler(args);
 
-    expect(shell.runCommand).toHaveBeenCalledWith("git", ["fetch", "origin", "main"]);
-    expect(shell.runCommand).toHaveBeenCalledWith("git", ["checkout", "-b", "another-feature", "origin/main"]);
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["fetch", "origin", "main"],
+      { cwd: expect.any(String) }
+    );
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["checkout", "-b", "another-feature", "origin/main"],
+      { cwd: expect.any(String) }
+    );
+    expect(result.success).toBe(true);
+  });
+
+  it("should create branch in specified target workspace path", async () => {
+    const args: CreateBranchInput = {
+      branchName: "custom-path-feature",
+      baseBranch: "main",
+      path: "/home/ari/tech-dancer",
+    };
+
+    (shell.runCommand as any).mockResolvedValue({ exitCode: 0, stdout: "", stderr: "" });
+
+    const result = await createBranchHandler(args);
+
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["fetch", "origin", "main"],
+      { cwd: "/home/ari/tech-dancer" }
+    );
+    expect(shell.runCommand).toHaveBeenCalledWith(
+      "git",
+      ["checkout", "-b", "custom-path-feature", "origin/main"],
+      { cwd: "/home/ari/tech-dancer" }
+    );
+    expect(result).toEqual({
+      success: true,
+      branchName: "custom-path-feature",
+      baseBranch: "main",
+      path: "/home/ari/tech-dancer",
+    });
+  });
+
+  it("should include repo field when repo override is specified", async () => {
+    const args: CreateBranchInput = {
+      branchName: "repo-feature",
+      baseBranch: "main",
+      repo: "arii/tech-dancer",
+      path: "/home/ari/tech-dancer",
+    };
+
+    (shell.runCommand as any).mockResolvedValue({ exitCode: 0, stdout: "", stderr: "" });
+
+    const result = await createBranchHandler(args);
+
+    expect(result).toEqual({
+      success: true,
+      branchName: "repo-feature",
+      baseBranch: "main",
+      path: "/home/ari/tech-dancer",
+      repo: "arii/tech-dancer",
+    });
   });
 
   it("should throw error if git command fails", async () => {

package/src/tools/repo.create_branch.ts

@@ -1,29 +1,55 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
+import { resolveRepoPath } from "../lib/git.js";
 
 export const CreateBranchInputSchema = z.object({
   branchName: z.string(),
   baseBranch: z.string().optional().default("main"),
+  repo: z.string().optional().describe("Target repository override (e.g. org/repo or repo)."),
+  path: z.string().optional().describe("Local filesystem path to target repository root."),
+  repoPath: z.string().optional().describe("Alias for path to target repository root."),
 });
 
 export type CreateBranchInput = z.input<typeof CreateBranchInputSchema>;
 
 export async function createBranchHandler(args: CreateBranchInput) {
   const params = CreateBranchInputSchema.parse(args);
+  const targetCwd = resolveRepoPath({
+    path: params.path,
+    repoPath: params.repoPath,
+    repo: params.repo,
+  });
 
   // Ensure latest base branch
-  await runCommand("git", ["fetch", "origin", params.baseBranch]);
+  await runCommand("git", ["fetch", "origin", params.baseBranch], { cwd: targetCwd });
 
   // Create branch from origin base branch
-  const result = await runCommand("git", ["checkout", "-b", params.branchName, `origin/${params.baseBranch}`]);
+  const result = await runCommand(
+    "git",
+    ["checkout", "-b", params.branchName, `origin/${params.baseBranch}`],
+    { cwd: targetCwd }
+  );
 
   if (result.exitCode !== 0) {
     throw new Error(`Failed to create branch ${params.branchName}: ${result.stderr}`);
   }
 
-  return {
+  const response: {
+    success: boolean;
+    branchName: string;
+    baseBranch: string;
+    path: string;
+    repo?: string;
+  } = {
     success: true,
     branchName: params.branchName,
-    baseBranch: params.baseBranch
+    baseBranch: params.baseBranch,
+    path: targetCwd,
   };
+
+  if (params.repo) {
+    response.repo = params.repo;
+  }
+
+  return response;
 }