baro-ai 0.128.0 → 0.130.0

package/dist/cli.mjs

@@ -71597,6 +71597,7 @@ var IntegrationWorktree = class {
             return false;
           }
         );
+        if (branchExists) await this.releaseStaleHolders(goalBranch);
         await git(
           branchExists ? ["worktree", "add", integrationRoot, goalBranch] : ["worktree", "add", "-b", goalBranch, integrationRoot, startPoint],
           repoRoot
@@ -71717,6 +71718,28 @@ var IntegrationWorktree = class {
       release?.();
     }
   }
+  /**
+   * A run that was stopped (baro_plan stops Baro once it has the plan) leaves
+   * its integration worktree holding the goal branch, and git refuses to
+   * check one branch out twice, so resuming that goal died. Only another
+   * run's `__run` worktree is removed; anything else holding the branch is
+   * the user's and stays, with git's own error.
+   */
+  async releaseStaleHolders(goalBranch) {
+    const listing = await git(["worktree", "list", "--porcelain"], this.repoRoot);
+    const own = canonicalPath(this.integrationRoot);
+    for (const entry of listing.split(/\n\s*\n/u)) {
+      const lines = entry.split("\n");
+      const path7 = lines.find((line) => line.startsWith("worktree "))?.slice("worktree ".length);
+      const branch = lines.find((line) => line.startsWith("branch "))?.slice("branch ".length);
+      if (!path7 || branch !== `refs/heads/${goalBranch}`) continue;
+      if (canonicalPath(path7) === own || !isIntegrationWorktreeRoot(path7)) continue;
+      this.log(`[integration] releasing ${goalBranch} from a stopped run's worktree ${path7}`);
+      await gitQuiet(["worktree", "remove", "--force", path7], this.repoRoot);
+      if (existsSync3(path7)) rmSync(path7, { recursive: true, force: true });
+    }
+    await git(["worktree", "prune"], this.repoRoot);
+  }
   async isRegistered() {
     const listing = await git(["worktree", "list", "--porcelain"], this.repoRoot);
     const target = canonicalPath(this.integrationRoot);