@arii/boomtick-mcp 0.7.0 → 0.7.1

package/dist/lib/git.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
-import { getChangedFiles, getMergeConflictFiles } from "./git.js";
+import { getChangedFiles, getMergeConflictFiles, resolveRepoPath, createWorktree } from "./git.js";
 import * as shell from "./shell.js";
 vi.mock("./shell.js", () => ({
     runCommand: vi.fn(),
@@ -79,4 +79,37 @@ describe("Git Helpers", () => {
             await expect(getMergeConflictFiles("invalid", "feature")).rejects.toThrow("Git merge-tree failed: fatal: not a valid object name");
         });
     });
+    describe("resolveRepoPath", () => {
+        it("should return explicit path when path is provided", () => {
+            const resolved = resolveRepoPath({ path: "/tmp/custom-repo" });
+            expect(resolved).toBe("/tmp/custom-repo");
+        });
+        it("should return explicit repoPath when repoPath is provided", () => {
+            const resolved = resolveRepoPath({ repoPath: "/tmp/another-repo" });
+            expect(resolved).toBe("/tmp/another-repo");
+        });
+        it("should resolve repo path via ecosystem_repos when repo is given", () => {
+            const resolved = resolveRepoPath({ repo: "arii/tech-dancer" });
+            expect(resolved).toContain("tech-dancer");
+        });
+        it("should fall back to current working directory when empty", () => {
+            const resolved = resolveRepoPath({});
+            expect(typeof resolved).toBe("string");
+            expect(resolved.length).toBeGreaterThan(0);
+        });
+    });
+    describe("createWorktree", () => {
+        it("should pass baseRepoPath cwd to runCommand when provided", async () => {
+            vi.mocked(shell.runCommand).mockResolvedValue({
+                exitCode: 0,
+                stdout: "",
+                stderr: "",
+                durationMs: 5,
+                command: "git",
+            });
+            const worktree = await createWorktree("origin/feature", 123, "/home/ari/tech-dancer");
+            expect(worktree).toContain("boomtick-mcp-rescue-123");
+            expect(shell.runCommand).toHaveBeenCalledWith("git", expect.arrayContaining(["worktree", "add"]), { cwd: "/home/ari/tech-dancer" });
+        });
+    });
 });

package/dist/tools/contract.js

@@ -1390,7 +1390,7 @@ export const CommitPatchResponseJsonSchema = {
     "title": "CommitPatchResponse",
     "type": "object"
 };
-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 const CreateBranchInputJsonSchema = {
     "properties": {
         "branchName": {
@@ -1403,6 +1403,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": [
@@ -1411,7 +1450,7 @@ export const CreateBranchInputJsonSchema = {
     "title": "CreateBranchInput",
     "type": "object"
 };
-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 const CreateBranchResponseJsonSchema = {
     "properties": {
         "success": {
@@ -1434,6 +1473,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": [
@@ -1699,7 +1762,7 @@ export const CreatePullRequestResponseJsonSchema = {
     "title": "CreatePullRequestResponse",
     "type": "object"
 };
-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 const CreateRepairBranchInputJsonSchema = {
     "properties": {
         "prNumber": {
@@ -1724,6 +1787,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": [
@@ -1733,7 +1835,7 @@ export const CreateRepairBranchInputJsonSchema = {
     "title": "CreateRepairBranchInput",
     "type": "object"
 };
-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 const CreateRepairBranchResponseJsonSchema = {
     "properties": {
         "prNumber": {
@@ -1755,6 +1857,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": [
@@ -1767,7 +1893,7 @@ export const CreateRepairBranchResponseJsonSchema = {
     "title": "CreateRepairBranchResponse",
     "type": "object"
 };
-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 const GetChangedFilesInputJsonSchema = {
     "properties": {
         "base": {
@@ -1781,6 +1907,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",
@@ -1847,24 +2012,74 @@ export const GetCommandSchemaResponseJsonSchema = {
     "title": "GetCommandSchemaResponse",
     "type": "object"
 };
-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 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"
 };

package/dist/tools/github.get_merge_conflict_files.js

@@ -1,14 +1,22 @@
 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) {
     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;
     return {
         hasConflicts,

package/dist/tools/repo.create_branch.js

@@ -1,21 +1,35 @@
 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 async function createBranchHandler(args) {
     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: true,
         branchName: params.branchName,
-        baseBranch: params.baseBranch
+        baseBranch: params.baseBranch,
+        path: targetCwd,
     };
+    if (params.repo) {
+        response.repo = params.repo;
+    }
+    return response;
 }

package/dist/tools/repo.create_branch.test.js

@@ -15,13 +15,14 @@ describe("repo.create_branch", () => {
         };
         shell.runCommand.mockResolvedValue({ exitCode: 0, stdout: "", stderr: "" });
         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 () => {
         const args = {
@@ -29,8 +30,43 @@ describe("repo.create_branch", () => {
         };
         shell.runCommand.mockResolvedValue({ exitCode: 0, stdout: "", stderr: "" });
         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 = {
+            branchName: "custom-path-feature",
+            baseBranch: "main",
+            path: "/home/ari/tech-dancer",
+        };
+        shell.runCommand.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 = {
+            branchName: "repo-feature",
+            baseBranch: "main",
+            repo: "arii/tech-dancer",
+            path: "/home/ari/tech-dancer",
+        };
+        shell.runCommand.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 () => {
         const args = {

package/dist/tools/repo.create_repair_branch.js

@@ -1,38 +1,55 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
-import { createWorktree } from "../lib/git.js";
+import { createWorktree, resolveRepoPath } from "../lib/git.js";
 export const CreateRepairBranchInputSchema = z.object({
     prNumber: z.number(),
     repairBranchName: z.string().optional(),
     writeMode: z.boolean().optional().default(false),
+    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 async function createRepairBranchHandler(args) {
     if (!args.writeMode) {
         throw new Error("writeMode must be true to create a repair branch.");
     }
-    const prResult = await runCommand("gh", [
+    const targetCwd = resolveRepoPath({
+        path: args.path,
+        repoPath: args.repoPath,
+        repo: args.repo,
+    });
+    const ghArgs = [
         "pr",
         "view",
         args.prNumber.toString(),
         "--json", "headRefName,baseRefName,title"
-    ]);
+    ];
+    if (args.repo) {
+        ghArgs.push("--repo", args.repo);
+    }
+    const prResult = await runCommand("gh", ghArgs, { cwd: targetCwd });
     if (prResult.exitCode !== 0) {
         throw new Error(`Failed to get PR info: ${prResult.stderr}`);
     }
     const { headRefName, baseRefName, title } = JSON.parse(prResult.stdout);
     const sanitizedTitle = title.toLowerCase().replace(/[^a-z0-9]/g, "-").substring(0, 30);
     const repairBranch = args.repairBranchName || `agent/repair-pr-${args.prNumber}-${sanitizedTitle}`;
-    // Ensure latest
-    await runCommand("git", ["fetch", "origin", headRefName]);
-    await runCommand("git", ["fetch", "origin", baseRefName]);
-    const worktreePath = await createWorktree(`origin/${headRefName}`, args.prNumber);
+    // Ensure latest in target repo
+    await runCommand("git", ["fetch", "origin", headRefName], { cwd: targetCwd });
+    await runCommand("git", ["fetch", "origin", baseRefName], { cwd: targetCwd });
+    const worktreePath = await createWorktree(`origin/${headRefName}`, args.prNumber, targetCwd);
     // Create the actual repair branch in the worktree
     await runCommand("git", ["checkout", "-b", repairBranch], { cwd: worktreePath });
-    return {
+    const response = {
         prNumber: args.prNumber,
         originalBranch: headRefName,
         repairBranch,
         baseBranch: baseRefName,
-        worktreePath
+        worktreePath,
+        path: targetCwd,
     };
+    if (args.repo) {
+        response.repo = args.repo;
+    }
+    return response;
 }

package/dist/tools/repo.get_changed_files.js

@@ -1,10 +1,18 @@
 import { z } from "zod";
-import { getChangedFiles } from "../lib/git.js";
+import { getChangedFiles, resolveRepoPath } from "../lib/git.js";
 export const GetChangedFilesInputSchema = z.object({
     base: z.string().optional().default("main"),
     head: 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 getChangedFilesHandler(args) {
-    const files = await getChangedFiles(args.base || "main", args.head || "HEAD");
+    const targetCwd = resolveRepoPath({
+        path: args.path,
+        repoPath: args.repoPath,
+        repo: args.repo,
+    });
+    const files = await getChangedFiles(args.base || "main", args.head || "HEAD", targetCwd);
     return { files };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arii/boomtick-mcp",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Boomtick MCP Guide: PR Rescue + Merge Conflict Agent",
   "repository": {
     "type": "git",

package/src/lib/git.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
-import { getChangedFiles, getMergeConflictFiles } from "./git.js";
+import { getChangedFiles, getMergeConflictFiles, resolveRepoPath, createWorktree } from "./git.js";
 import * as shell from "./shell.js";
 
 vi.mock("./shell.js", () => ({
@@ -107,4 +107,48 @@ describe("Git Helpers", () => {
       );
     });
   });
+
+  describe("resolveRepoPath", () => {
+    it("should return explicit path when path is provided", () => {
+      const resolved = resolveRepoPath({ path: "/tmp/custom-repo" });
+      expect(resolved).toBe("/tmp/custom-repo");
+    });
+
+    it("should return explicit repoPath when repoPath is provided", () => {
+      const resolved = resolveRepoPath({ repoPath: "/tmp/another-repo" });
+      expect(resolved).toBe("/tmp/another-repo");
+    });
+
+    it("should resolve repo path via ecosystem_repos when repo is given", () => {
+      const resolved = resolveRepoPath({ repo: "arii/tech-dancer" });
+      expect(resolved).toContain("tech-dancer");
+    });
+
+    it("should fall back to current working directory when empty", () => {
+      const resolved = resolveRepoPath({});
+      expect(typeof resolved).toBe("string");
+      expect(resolved.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe("createWorktree", () => {
+    it("should pass baseRepoPath cwd to runCommand when provided", async () => {
+      vi.mocked(shell.runCommand).mockResolvedValue({
+        exitCode: 0,
+        stdout: "",
+        stderr: "",
+        durationMs: 5,
+        command: "git",
+      });
+
+      const worktree = await createWorktree("origin/feature", 123, "/home/ari/tech-dancer");
+
+      expect(worktree).toContain("boomtick-mcp-rescue-123");
+      expect(shell.runCommand).toHaveBeenCalledWith(
+        "git",
+        expect.arrayContaining(["worktree", "add"]),
+        { cwd: "/home/ari/tech-dancer" }
+      );
+    });
+  });
 });