@einja/dev-cli 0.1.9 → 0.1.11

package/dist/commands/task-loop/lib/branch-manager.test.js

@@ -0,0 +1,539 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+// conflict-handler モジュールをモック
+vi.mock("./conflict-handler.js", () => ({
+    resolveConflictWithClaude: vi.fn(),
+}));
+// child_process モジュールをモック
+vi.mock("node:child_process");
+import { execSync } from "node:child_process";
+import { branchExists, ensureIssueBranchWithoutCheckout, ensurePhaseBranchWithoutCheckout, fetchRemote, getDefaultBranch, getPhaseBranchName, getPhaseBranchNameNew, mergePhaseBranchIntoIssue, syncPhaseBranch, } from "./branch-manager.js";
+import { resolveConflictWithClaude } from "./conflict-handler.js";
+describe("branch-manager", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe("fetchRemote", () => {
+        it("git fetch origin を実行する", () => {
+            // Given: fetchRemote が呼び出される
+            vi.mocked(execSync).mockReturnValueOnce(Buffer.from(""));
+            // When: fetchRemote を実行
+            fetchRemote();
+            // Then: git fetch origin が実行される
+            expect(execSync).toHaveBeenCalledWith("git fetch origin", { stdio: "inherit" });
+        });
+    });
+    describe("getDefaultBranch", () => {
+        it("リモートのデフォルトブランチ名を返す", () => {
+            // Given: リモートのデフォルトブランチが main
+            vi.mocked(execSync).mockReturnValueOnce("main\n");
+            // When: getDefaultBranch を呼び出す
+            const result = getDefaultBranch();
+            // Then: main が返る
+            expect(result).toBe("main");
+        });
+        it("コマンド失敗時は main をデフォルトとして返す", () => {
+            // Given: git コマンドが失敗する
+            vi.mocked(execSync).mockImplementationOnce(() => {
+                throw new Error("command failed");
+            });
+            // When: getDefaultBranch を呼び出す
+            const result = getDefaultBranch();
+            // Then: デフォルト値 main が返る
+            expect(result).toBe("main");
+        });
+    });
+    describe("branchExists", () => {
+        it("ローカルブランチが存在する場合、true を返す", () => {
+            // Given: ローカルブランチが存在する
+            vi.mocked(execSync).mockReturnValueOnce(Buffer.from("commit-hash"));
+            // When: branchExists を呼び出す
+            const result = branchExists("feature/test");
+            // Then: true が返る
+            expect(result).toBe(true);
+            expect(execSync).toHaveBeenCalledWith("git rev-parse --verify feature/test", {
+                stdio: "ignore",
+            });
+        });
+        it("ローカルにはないがリモートブランチが存在する場合、true を返す", () => {
+            // Given: ローカルブランチは存在しないが、リモートブランチは存在する
+            vi.mocked(execSync)
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            })
+                .mockReturnValueOnce(Buffer.from("commit-hash"));
+            // When: branchExists を呼び出す
+            const result = branchExists("feature/test");
+            // Then: true が返る
+            expect(result).toBe(true);
+            expect(execSync).toHaveBeenCalledWith("git rev-parse --verify origin/feature/test", {
+                stdio: "ignore",
+            });
+        });
+        it("ローカルにもリモートにもブランチが存在しない場合、false を返す", () => {
+            // Given: ローカルにもリモートにもブランチが存在しない
+            vi.mocked(execSync).mockImplementation(() => {
+                throw new Error("branch not found");
+            });
+            // When: branchExists を呼び出す
+            const result = branchExists("non-existent");
+            // Then: false が返る
+            expect(result).toBe(false);
+        });
+    });
+    describe("getPhaseBranchNameNew", () => {
+        it("Phaseブランチ名を返す", () => {
+            // When: getPhaseBranchNameNew を呼び出す
+            const result = getPhaseBranchNameNew(123, 3);
+            // Then: issue/123-phase3 が返る
+            expect(result).toBe("issue/123-phase3");
+        });
+    });
+    describe("getPhaseBranchName", () => {
+        it("Phaseブランチ名を返す", () => {
+            // When: getPhaseBranchName を呼び出す
+            const result = getPhaseBranchName(123, 4);
+            // Then: issue/123-phase4 が返る
+            expect(result).toBe("issue/123-phase4");
+        });
+    });
+    describe("ensureIssueBranchWithoutCheckout", () => {
+        it("既存のIssueブランチの場合、チェックアウトせずに確認する", () => {
+            // Given: Issueブランチが既に存在する
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")); // branchExists (local)
+            // When: ensureIssueBranchWithoutCheckout を呼び出す
+            const result = ensureIssueBranchWithoutCheckout(123, "main");
+            // Then: issue/123 が返り、チェックアウトコマンドは実行されない
+            expect(result).toBe("issue/123");
+            const commands = vi.mocked(execSync).mock.calls.map((call) => call[0]);
+            expect(commands.some((cmd) => String(cmd).includes("checkout"))).toBe(false);
+        });
+        it("Issueブランチが未存在の場合、チェックアウトせずに作成してプッシュする", () => {
+            // Given: Issueブランチが存在しない
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockImplementationOnce(() => {
+                throw new Error("branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create)
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: ensureIssueBranchWithoutCheckout を呼び出す
+            const result = ensureIssueBranchWithoutCheckout(456, "develop");
+            // Then: issue/456 が作成され、プッシュされる
+            expect(result).toBe("issue/456");
+            expect(execSync).toHaveBeenCalledWith("git branch issue/456 origin/develop", {
+                stdio: "inherit",
+            });
+            expect(execSync).toHaveBeenCalledWith("git push -u origin issue/456", { stdio: "inherit" });
+            // チェックアウトコマンドは実行されない
+            const commands = vi.mocked(execSync).mock.calls.map((call) => call[0]);
+            expect(commands.some((cmd) => String(cmd).includes("checkout"))).toBe(false);
+        });
+    });
+    describe("ensurePhaseBranchWithoutCheckout", () => {
+        it("既存のPhaseブランチの場合、確認のみ行う", () => {
+            // Given: Phaseブランチが既に存在する
+            vi.mocked(execSync).mockReturnValueOnce(Buffer.from("commit-hash")); // branchExists
+            // When: ensurePhaseBranchWithoutCheckout を呼び出す
+            const result = ensurePhaseBranchWithoutCheckout(123, 1, "issue/123");
+            // Then: issue/123-phase1 が返る
+            expect(result).toBe("issue/123-phase1");
+        });
+        it("Phaseブランチが未存在の場合、作成してプッシュする", () => {
+            // Given: Phaseブランチが存在しない
+            vi.mocked(execSync)
+                .mockImplementationOnce(() => {
+                throw new Error("branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: ensurePhaseBranchWithoutCheckout を呼び出す
+            const result = ensurePhaseBranchWithoutCheckout(456, 2, "issue/456");
+            // Then: issue/456-phase2 が作成され、プッシュされる
+            expect(result).toBe("issue/456-phase2");
+            expect(execSync).toHaveBeenCalledWith("git branch issue/456-phase2 issue/456", {
+                stdio: "inherit",
+            });
+            expect(execSync).toHaveBeenCalledWith("git push -u origin issue/456-phase2", {
+                stdio: "inherit",
+            });
+        });
+    });
+    describe("syncPhaseBranch", () => {
+        it("Phaseブランチがリモートに未存在の場合、Issueブランチから新規作成する", async () => {
+            // Given: Phaseブランチがリモートとローカルのどちらにも存在しない
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockImplementationOnce(() => {
+                throw new Error("remote issue branch not found");
+            }) // issue branch remote check fails (syncIssueBranch内)
+                .mockImplementationOnce(() => {
+                throw new Error("remote phase branch not found");
+            }) // phase branch remote check fails
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create)
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: syncPhaseBranch を呼び出す
+            const result = await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: issue/123-phase1 が作成され、プッシュされる
+            expect(result).toBe("issue/123-phase1");
+            expect(execSync).toHaveBeenCalledWith("git branch issue/123-phase1 issue/123", {
+                stdio: "inherit",
+            });
+            expect(execSync).toHaveBeenCalledWith("git push -u origin issue/123-phase1", {
+                stdio: "inherit",
+            });
+        });
+        it("リモートにPhaseブランチが存在する場合、fetchして同期する", async () => {
+            // Given: Phaseブランチがリモートに存在する
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockImplementationOnce(() => {
+                throw new Error("remote issue branch not found");
+            }) // issue branch remote check fails (syncIssueBranch内)
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin phase-branch
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            }) // local phase branch check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create from remote)
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base (for mergeIssueBranchIntoPhase)
+                .mockReturnValueOnce("merge-base-commit\n"); // issue head (同じ = マージ済み)
+            // When: syncPhaseBranch を呼び出す
+            const result = await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: issue/123-phase1 が返り、リモートからフェッチされる
+            expect(result).toBe("issue/123-phase1");
+            expect(execSync).toHaveBeenCalledWith("git fetch origin issue/123-phase1", {
+                stdio: "inherit",
+            });
+            expect(execSync).toHaveBeenCalledWith("git branch issue/123-phase1 origin/issue/123-phase1", {
+                stdio: "inherit",
+            });
+        });
+        it("ローカルのみの変更がある場合、マージする", async () => {
+            // Given: Phaseブランチがリモートに存在し、ローカルにも存在する
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockImplementationOnce(() => {
+                throw new Error("remote issue branch not found");
+            }) // issue branch remote check fails (syncIssueBranch内)
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin phase-branch
+                .mockReturnValueOnce(Buffer.from("local-commit")) // local phase branch exists
+                // mergeRemoteIntoLocal の内部処理
+                .mockReturnValueOnce("local-commit\n") // git rev-parse local
+                .mockReturnValueOnce("remote-commit\n") // git rev-parse remote
+                .mockReturnValueOnce("main-branch\n") // getCurrentBranch
+                .mockReturnValueOnce(Buffer.from("")) // git merge-base --is-ancestor (fast-forward可能)
+                .mockReturnValueOnce(Buffer.from("")) // git branch -f
+                // mergeIssueBranchIntoPhase の内部処理
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("merge-base-commit\n"); // issue head (同じ = マージ済み)
+            // When: syncPhaseBranch を呼び出す
+            const result = await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: issue/123-phase1 が返り、マージされる
+            expect(result).toBe("issue/123-phase1");
+        });
+    });
+    describe("mergePhaseBranchIntoIssue", () => {
+        it("Phaseブランチがリモートに未存在の場合、スキップする", async () => {
+            // Given: Phaseブランチがリモートに存在しない
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }); // rev-parse fails
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: マージがスキップされる（エラーなし）
+            expect(execSync).toHaveBeenCalledTimes(2); // fetchRemote + rev-parse check
+        });
+        it("Phaseブランチが既にマージ済みの場合、スキップする", async () => {
+            // Given: PhaseブランチがIssueブランチに既にマージ済み
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("phase-commit\n") // merge-base
+                .mockReturnValueOnce("phase-commit\n"); // phase head (同じ = マージ済み)
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: マージがスキップされる
+            expect(execSync).toHaveBeenCalledTimes(4);
+        });
+        it("GitHub APIでマージ成功する", async () => {
+            // Given: GitHub APIでマージが成功する
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("phase-head-commit\n") // phase head
+                .mockReturnValueOnce(Buffer.from("")) // gh auth status
+                .mockReturnValueOnce(Buffer.from("")) // gh api repos/.../merges
+                .mockReturnValueOnce(Buffer.from("")) // git fetch issue branch
+                .mockReturnValueOnce(Buffer.from("")); // git branch -f
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: GitHub APIでマージが実行される
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining('gh api repos/:owner/:repo/merges -f base="issue/123"'), expect.anything());
+        });
+        it("GitHub APIで409 Conflictの場合、worktreeで再試行する", async () => {
+            // Given: GitHub APIが409を返し、worktreeでマージ成功
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("phase-head-commit\n") // phase head
+                .mockReturnValueOnce(Buffer.from("")) // gh auth status
+                .mockImplementationOnce(() => {
+                throw new Error("409 Conflict");
+            }) // gh api で 409 エラー
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockReturnValueOnce(Buffer.from("")) // git merge
+                .mockReturnValueOnce(Buffer.from("")) // git push
+                .mockReturnValueOnce(Buffer.from("")) // git worktree remove
+                .mockReturnValueOnce(Buffer.from("")) // git fetch issue branch
+                .mockReturnValueOnce(Buffer.from("")); // git branch -f
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: worktreeでマージが実行される
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git worktree add"), expect.anything());
+        });
+        it("worktreeでコンフリクト発生時、resolveConflictWithClaudeを呼び出す", async () => {
+            // Given: worktreeでコンフリクトが発生
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("phase-head-commit\n") // phase head
+                .mockReturnValueOnce(Buffer.from("")) // gh auth status
+                .mockImplementationOnce(() => {
+                throw new Error("409 Conflict");
+            }) // gh api で 409 エラー
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockImplementationOnce(() => {
+                throw new Error("CONFLICT");
+            }); // git merge でコンフリクト
+            vi.mocked(resolveConflictWithClaude).mockResolvedValueOnce(true);
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // git push after resolve
+                .mockReturnValueOnce(Buffer.from("")) // git worktree remove
+                .mockReturnValueOnce(Buffer.from("")) // git fetch issue branch
+                .mockReturnValueOnce(Buffer.from("")); // git branch -f
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: resolveConflictWithClaude が呼び出される
+            expect(resolveConflictWithClaude).toHaveBeenCalledWith({
+                targetBranch: "issue/123",
+                sourceBranch: "issue/123-phase1",
+                operationType: "phase",
+            }, expect.stringContaining("merge-work-"));
+        });
+        it("resolveConflictWithClaudeが失敗した場合、エラーをスローする", async () => {
+            // Given: コンフリクト解消が失敗
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("phase-head-commit\n") // phase head
+                .mockReturnValueOnce(Buffer.from("")) // gh auth status
+                .mockImplementationOnce(() => {
+                throw new Error("409 Conflict");
+            })
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockImplementationOnce(() => {
+                throw new Error("CONFLICT");
+            });
+            vi.mocked(resolveConflictWithClaude).mockResolvedValueOnce(false);
+            vi.mocked(execSync).mockReturnValueOnce(Buffer.from("")); // git worktree remove
+            // When/Then: エラーがスローされる
+            await expect(mergePhaseBranchIntoIssue(123, 1, "issue/123")).rejects.toThrow("Issue ブランチ issue/123 への Phase ブランチ issue/123-phase1 のマージでコンフリクトを解消できませんでした。");
+            // Then: worktree がクリーンアップされる
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git worktree remove"), expect.objectContaining({ stdio: "ignore" }));
+        });
+    });
+    describe("mergeRemoteIntoLocal - fast-forward vs merge", () => {
+        it("fast-forward可能な場合、fast-forwardマージする", async () => {
+            // Given: Issueブランチがリモートに存在し、fast-forward可能
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote issue branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin issue/123
+                .mockReturnValueOnce(Buffer.from("local-commit")) // local issue branch exists
+                .mockReturnValueOnce("local-commit\n") // git rev-parse local
+                .mockReturnValueOnce("remote-commit\n") // git rev-parse remote
+                .mockReturnValueOnce("main\n") // getCurrentBranch
+                .mockReturnValueOnce(Buffer.from("")) // git merge-base --is-ancestor (fast-forward可能)
+                .mockReturnValueOnce(Buffer.from("")) // git branch -f
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base (for mergeBaseBranchIntoIssue)
+                .mockReturnValueOnce("merge-base-commit\n") // base head (同じ = マージ済み)
+                .mockImplementationOnce(() => {
+                throw new Error("remote phase branch not found");
+            }) // phase branch remote check fails
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create)
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: syncIssueBranch を呼び出す（内部で mergeRemoteIntoLocal が呼ばれる）
+            await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: fast-forwardマージが実行される（git branch -f）
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git branch -f issue/123 origin/issue/123"), expect.anything());
+        });
+        it("fast-forward不可の場合、通常マージする（worktree使用）", async () => {
+            // Given: Issueブランチがリモートに存在し、fast-forward不可
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote issue branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin issue/123
+                .mockReturnValueOnce(Buffer.from("local-commit")) // local issue branch exists
+                .mockReturnValueOnce("local-commit\n") // git rev-parse local
+                .mockReturnValueOnce("remote-commit\n") // git rev-parse remote
+                .mockReturnValueOnce("main\n") // getCurrentBranch
+                .mockImplementationOnce(() => {
+                throw new Error("not ancestor");
+            }) // git merge-base --is-ancestor (fast-forward不可)
+                .mockImplementationOnce(() => {
+                throw new Error("not ancestor");
+            }) // git merge-base --is-ancestor (プッシュも不可)
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockReturnValueOnce(Buffer.from("")) // git merge
+                .mockReturnValueOnce(Buffer.from("")) // git push
+                .mockReturnValueOnce(Buffer.from("")) // git worktree remove
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base (for mergeBaseBranchIntoIssue)
+                .mockReturnValueOnce("merge-base-commit\n") // base head (同じ = マージ済み)
+                .mockImplementationOnce(() => {
+                throw new Error("remote phase branch not found");
+            }) // phase branch remote check fails
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create)
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: syncIssueBranch を呼び出す
+            await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: worktreeでマージが実行される
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git worktree add"), expect.anything());
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git -C"), expect.anything());
+        });
+    });
+    describe("gh-auth 失敗時の処理", () => {
+        it("gh auth statusが失敗した場合、worktreeでマージする", async () => {
+            // Given: gh auth status が失敗する
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote phase branch exists
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base
+                .mockReturnValueOnce("phase-head-commit\n") // phase head
+                .mockImplementationOnce(() => {
+                throw new Error("not logged in");
+            }) // gh auth status fails
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockReturnValueOnce(Buffer.from("")) // git merge
+                .mockReturnValueOnce(Buffer.from("")) // git push
+                .mockReturnValueOnce(Buffer.from("")) // git worktree remove
+                .mockReturnValueOnce(Buffer.from("")) // git fetch issue branch
+                .mockReturnValueOnce(Buffer.from("")); // git branch -f
+            // When: mergePhaseBranchIntoIssue を呼び出す
+            await mergePhaseBranchIntoIssue(123, 1, "issue/123");
+            // Then: worktreeでマージが実行される
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git worktree add"), expect.anything());
+        });
+    });
+    describe("コンフリクトエスカレーション", () => {
+        it("ベースブランチマージでコンフリクト時、Claude解決に委譲する", async () => {
+            // Given: ベースブランチのマージでコンフリクトが発生
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote issue branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin issue/123
+                .mockReturnValueOnce(Buffer.from("local-commit")) // local issue branch exists
+                .mockReturnValueOnce("local-commit\n") // git rev-parse local
+                .mockReturnValueOnce("remote-commit\n") // git rev-parse remote (同じでない)
+                .mockReturnValueOnce("main\n") // getCurrentBranch
+                .mockReturnValueOnce(Buffer.from("")) // git merge-base --is-ancestor
+                .mockReturnValueOnce(Buffer.from("")) // git branch -f
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base (for mergeBaseBranchIntoIssue)
+                .mockReturnValueOnce("base-head-commit\n") // base head (異なる = マージが必要)
+                .mockImplementationOnce(() => {
+                throw new Error("not logged in");
+            }) // gh auth status fails
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockImplementationOnce(() => {
+                throw new Error("CONFLICT");
+            }); // git merge でコンフリクト
+            vi.mocked(resolveConflictWithClaude).mockResolvedValueOnce(true);
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // git push after resolve
+                .mockReturnValueOnce(Buffer.from("")) // git worktree remove
+                .mockReturnValueOnce(Buffer.from("")) // git fetch issue branch
+                .mockReturnValueOnce(Buffer.from("")) // git branch -f
+                .mockImplementationOnce(() => {
+                throw new Error("remote phase branch not found");
+            }) // phase branch remote check fails
+                .mockImplementationOnce(() => {
+                throw new Error("local branch not found");
+            }) // branchExists local check fails
+                .mockImplementationOnce(() => {
+                throw new Error("remote branch not found");
+            }) // branchExists remote check fails
+                .mockReturnValueOnce(Buffer.from("")) // git branch (create)
+                .mockReturnValueOnce(Buffer.from("")); // git push
+            // When: syncPhaseBranch を呼び出す
+            const result = await syncPhaseBranch(123, 1, "issue/123", "main");
+            // Then: resolveConflictWithClaude が呼び出される
+            expect(resolveConflictWithClaude).toHaveBeenCalledWith({
+                targetBranch: "issue/123",
+                sourceBranch: "main",
+                operationType: "base",
+            }, expect.stringContaining("merge-work-"));
+            expect(result).toBe("issue/123-phase1");
+        });
+        it("Claude解決が失敗した場合、エラーをスローする", async () => {
+            // Given: Claude解決が失敗
+            vi.mocked(execSync)
+                .mockReturnValueOnce(Buffer.from("")) // fetchRemote
+                .mockReturnValueOnce(Buffer.from("commit-hash")) // remote issue branch exists
+                .mockReturnValueOnce(Buffer.from("")) // git fetch origin issue/123
+                .mockReturnValueOnce(Buffer.from("local-commit")) // local issue branch exists
+                .mockReturnValueOnce("local-commit\n") // git rev-parse local
+                .mockReturnValueOnce("remote-commit\n") // git rev-parse remote
+                .mockReturnValueOnce("main\n") // getCurrentBranch
+                .mockReturnValueOnce(Buffer.from("")) // git merge-base --is-ancestor
+                .mockReturnValueOnce(Buffer.from("")) // git branch -f
+                .mockReturnValueOnce("merge-base-commit\n") // merge-base (for mergeBaseBranchIntoIssue)
+                .mockReturnValueOnce("base-head-commit\n") // base head (異なる = マージが必要)
+                .mockImplementationOnce(() => {
+                throw new Error("not logged in");
+            }) // gh auth status fails
+                .mockReturnValueOnce(Buffer.from("")) // git worktree add
+                .mockImplementationOnce(() => {
+                throw new Error("CONFLICT");
+            }); // git merge でコンフリクト
+            vi.mocked(resolveConflictWithClaude).mockResolvedValueOnce(false);
+            vi.mocked(execSync).mockReturnValueOnce(Buffer.from("")); // git worktree remove
+            // When/Then: エラーがスローされる
+            await expect(syncPhaseBranch(123, 1, "issue/123", "main")).rejects.toThrow("Issue ブランチ issue/123 へのベースブランチ main のマージでコンフリクトを解消できませんでした。");
+            // Then: worktree がクリーンアップされる
+            expect(execSync).toHaveBeenCalledWith(expect.stringContaining("git worktree remove"), expect.objectContaining({ stdio: "ignore" }));
+        });
+    });
+});
+//# sourceMappingURL=branch-manager.test.js.map

package/dist/commands/task-loop/lib/branch-manager.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-manager.test.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/branch-manager.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/task-loop/lib/conflict-handler.js

@@ -1,4 +1,4 @@
-import { spawn, execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 function hasConflicts(cwd) {
     try {
         const options = cwd ? { cwd, encoding: "utf-8" } : { encoding: "utf-8" };

package/dist/commands/task-loop/lib/conflict-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-handler.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/conflict-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQrD,SAAS,YAAY,CAAC,GAAY;IAChC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAgB,EAAE,CAAC;QAC3F,MAAM,MAAM,GAAG,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAkB,EAClB,YAAoB;IAEpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,MAAM,IAAI,CAAC,YAAY;;YAEhD,YAAY;;;;;;;;;;;;;;;;uBAgBD,CAAC;IAEtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE;YACtC,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,YAAY;SAClB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,IAAI,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBACjC,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;gBACvE,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;gBACvE,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACxD,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"conflict-handler.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/conflict-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAQrD,SAAS,YAAY,CAAC,GAAY;IAChC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAgB,EAAE,CAAC;QAC3F,MAAM,MAAM,GAAG,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAkB,EAClB,YAAoB;IAEpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,MAAM,IAAI,CAAC,YAAY;;YAEhD,YAAY;;;;;;;;;;;;;;;;uBAgBD,CAAC;IAEtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE;YACtC,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,YAAY;SAClB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,IAAI,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBACjC,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;gBACvE,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;gBACvE,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACxD,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/commands/task-loop/lib/dependency-resolver.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dependency-resolver.test.d.ts.map

package/dist/commands/task-loop/lib/dependency-resolver.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependency-resolver.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/dependency-resolver.test.ts"],"names":[],"mappings":""}