@akiojin/gwt 2.9.0 → 2.10.0

package/src/worktree.ts

@@ -100,11 +100,9 @@ async function listWorktrees(): Promise<WorktreeInfo[]> {
   try {
     const { getRepositoryRoot } = await import("./git.js");
     const repoRoot = await getRepositoryRoot();
-    const { stdout } = await execa(
-      "git",
-      ["worktree", "list", "--porcelain"],
-      { cwd: repoRoot },
-    );
+    const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], {
+      cwd: repoRoot,
+    });
     const worktrees: WorktreeInfo[] = [];
     const lines = stdout.split("\n");
 
@@ -486,16 +484,14 @@ async function getOrphanedLocalBranches({
           reasons.push("merged-pr");
         }
 
-        if (!hasUnpushed) {
-          const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
-            localBranch.name,
-            baseBranch,
-            repoRoot,
-          );
+        const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
+          localBranch.name,
+          baseBranch,
+          repoRoot,
+        );
 
-          if (!hasUniqueCommits) {
-            reasons.push("no-diff-with-base");
-          }
+        if (!hasUniqueCommits) {
+          reasons.push("no-diff-with-base");
         }
 
         if (process.env.DEBUG_CLEANUP) {
@@ -506,14 +502,18 @@ async function getOrphanedLocalBranches({
           );
         }
 
-        if (reasons.length > 0) {
-          let hasRemoteBranch = false;
-          try {
-            hasRemoteBranch = await checkRemoteBranchExists(localBranch.name);
-          } catch {
-            hasRemoteBranch = false;
-          }
+        let hasRemoteBranch = false;
+        try {
+          hasRemoteBranch = await checkRemoteBranchExists(localBranch.name);
+        } catch {
+          hasRemoteBranch = false;
+        }
+
+        if (!hasUnpushed && hasRemoteBranch && hasUniqueCommits) {
+          reasons.push("remote-synced");
+        }
 
+        if (reasons.length > 0) {
           cleanupTargets.push({
             worktreePath: null, // worktreeは存在しない
             branch: localBranch.name,
@@ -627,13 +627,19 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
 
     const cleanupReasons: CleanupReason[] = [];
 
-    if (mergedPR) {
-      cleanupReasons.push("merged-pr");
-    }
-
     // worktreeパスの存在を確認
     const fs = await import("node:fs");
-    const isAccessible = fs.existsSync(worktree.worktreePath);
+    // Some test environments mock node:fs without existsSync on the module root.
+    const existsSync =
+      typeof fs.existsSync === "function"
+        ? fs.existsSync
+        : typeof (fs as { default?: { existsSync?: unknown } }).default
+              ?.existsSync === "function"
+          ? (fs as { default: { existsSync: (p: string) => boolean } }).default
+              .existsSync
+          : null;
+
+    const isAccessible = existsSync ? existsSync(worktree.worktreePath) : false;
 
     let hasUncommitted = false;
     let hasUnpushed = false;
@@ -657,16 +663,29 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
       }
     }
 
-    if (!hasUnpushed) {
-      const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
-        worktree.branch,
-        baseBranch,
-        repoRoot,
-      );
+    let hasRemoteBranch = false;
+    try {
+      hasRemoteBranch = await checkRemoteBranchExists(worktree.branch);
+    } catch {
+      hasRemoteBranch = false;
+    }
 
-      if (!hasUniqueCommits) {
-        cleanupReasons.push("no-diff-with-base");
-      }
+    if (mergedPR) {
+      cleanupReasons.push("merged-pr");
+    }
+
+    const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
+      worktree.branch,
+      baseBranch,
+      repoRoot,
+    );
+
+    // 差分がない場合はベース同等としてクリーンアップ候補
+    if (!hasUniqueCommits) {
+      cleanupReasons.push("no-diff-with-base");
+    } else if (!hasUncommitted && !hasUnpushed && hasRemoteBranch) {
+      // 未マージでも、ローカルに未コミット/未プッシュがなくリモートが最新ならローカルのみクリーンアップ許可
+      cleanupReasons.push("remote-synced");
     }
 
     if (process.env.DEBUG_CLEANUP) {
@@ -681,8 +700,6 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
       continue;
     }
 
-    const hasRemoteBranch = await checkRemoteBranchExists(worktree.branch);
-
     const target: CleanupTarget = {
       worktreePath: worktree.worktreePath,
       branch: worktree.branch,