@tablation/crew 0.45.0 → 0.45.2

package/dist/cli.js

@@ -11158,6 +11158,13 @@ async function applyWorktreeSweep(cwd, actions, dryRun, log, remote = "origin")
 }
 function planRemoteBranchCleanup(cwd, remote, base, tickets, contract) {
   if (!remoteConfigured(cwd, remote)) return [];
+  const stems = deployedBranchStems(tickets, contract);
+  if (stems.size === 0) return [];
+  const prefix = `refs/remotes/${remote}/`;
+  const refs = (gitOk(cwd, ["for-each-ref", "--format=%(refname)", prefix]) ?? "").split("\n").filter(Boolean);
+  return refs.map((ref) => ref.slice(prefix.length)).filter((name) => isTicketBranch(name, base, stems));
+}
+function deployedBranchStems(tickets, contract) {
   const stems = /* @__PURE__ */ new Set();
   for (const t of tickets) {
     if (t.status !== contract.statuses.deployed) continue;
@@ -11169,17 +11176,40 @@ function planRemoteBranchCleanup(cwd, remote, base, tickets, contract) {
       stems.add(`${p}-${unpadded}`);
     }
   }
+  return stems;
+}
+function isTicketBranch(name, base, stems) {
+  if (name === "HEAD" || name === base) return false;
+  const m = /^(.+?-\d+)(?:-.*)?$/.exec(name);
+  return !!m && stems.has(m[1]);
+}
+function sweepCandidatesExist(cwd, base) {
+  const linked = worktrees(cwd).slice(1);
+  if (linked.some((w) => /(?:^|-)\d+$/.test(basename8(w.path)))) return true;
+  return localBranches(cwd).some((b) => b !== base && /-\d+(?:-.*)?$/.test(b));
+}
+function localBranches(cwd) {
+  return (gitOk(cwd, ["branch", "--list", "--format=%(refname:short)"]) ?? "").split("\n").filter(Boolean);
+}
+function planLocalBranchCleanup(cwd, base, tickets, contract) {
+  const stems = deployedBranchStems(tickets, contract);
   if (stems.size === 0) return [];
-  const prefix = `refs/remotes/${remote}/`;
-  const refs = (gitOk(cwd, ["for-each-ref", "--format=%(refname)", prefix]) ?? "").split("\n").filter(Boolean);
-  const out = [];
-  for (const ref of refs) {
-    const name = ref.slice(prefix.length);
-    if (name === "HEAD" || name === base) continue;
-    const m = /^(.+?-\d+)(?:-.*)?$/.exec(name);
-    if (m && stems.has(m[1])) out.push(name);
+  const checkedOut = new Set(worktrees(cwd).map((w) => w.branch).filter((b) => !!b));
+  return localBranches(cwd).filter((b) => !checkedOut.has(b) && isTicketBranch(b, base, stems));
+}
+function applyLocalBranchCleanup(cwd, branches2, dryRun, log) {
+  let deleted = 0;
+  for (const b of branches2) {
+    if (dryRun) {
+      log.emit(`would delete local branch ${b} \u2014 its ticket is deployed`, { step: "worktree" });
+      continue;
+    }
+    if (gitOk(cwd, ["branch", "-D", b]) !== null) {
+      deleted++;
+      log.emit(`deleted local branch ${b} \u2014 its ticket is deployed`, { step: "worktree" });
+    } else log.warn(`could not delete local branch ${b} \u2014 leaving it for the next sweep`, { step: "worktree" });
   }
-  return out;
+  return deleted;
 }
 function applyRemoteBranchCleanup(cwd, remote, branches2, dryRun, log) {
   let deleted = 0;
@@ -12984,6 +13014,26 @@ ${changed2.map((c) => `  - ${c}
     }
     return `${who2}; ${lock2}`;
   }
+  async function sweepClosedTickets(c, target, branch, tracker, dryRun2, remit, idle = false) {
+    try {
+      if (idle && !sweepCandidatesExist(target.dir, branch.base)) return;
+      const terminal = await tracker.terminalTickets();
+      const verifiedNow = (await tracker.openTickets()).filter((t) => t.status === tracker.contract.statuses.verified);
+      const scoped = ticketsByRepo(c, terminal).byRepo.get(target.name) ?? [];
+      const actions = planWorktreeSweep(target, [...scoped, ...ticketsByRepo(c, verifiedNow).byRepo.get(target.name) ?? []], tracker.contract);
+      if (actions.length) {
+        remit.enter("worktree");
+        const r = await applyWorktreeSweep(target.dir, actions, dryRun2, remit, branch.remote);
+        remit.emit(`swept ${r.removed} worktree(s), kept ${r.keptBranches} branch(es)`, { step: "worktree" });
+      }
+      const orphaned = planLocalBranchCleanup(target.dir, branch.base, scoped, tracker.contract);
+      if (orphaned.length) applyLocalBranchCleanup(target.dir, orphaned, dryRun2, remit);
+      const stale = planRemoteBranchCleanup(target.dir, branch.remote, branch.base, scoped, tracker.contract);
+      if (stale.length) applyRemoteBranchCleanup(target.dir, branch.remote, stale, dryRun2, remit);
+    } catch (e) {
+      remit.warn(`worktree sweep failed: ${e.message}`, { step: "worktree" });
+    }
+  }
   const precheckTickets = /* @__PURE__ */ new Map();
   async function releasePhase(c, target, opts = {}) {
     const scope = releaseLockScope(c.route, target.name);
@@ -13053,6 +13103,7 @@ ${changed2.map((c) => `  - ${c}
           unstamped
         })) {
           remit.emit(`${target.name}: nothing verified \u2014 not locking`, { step: "release" });
+          await sweepClosedTickets(c, target, repo.branch, tracker, dryRun, remit, true);
           return { scope, tests: "skipped", outcome: "skipped", detail: "nothing verified \u2014 not locking" };
         }
       }
@@ -13257,21 +13308,7 @@ ${changed2.map((c) => `  - ${c}
           }
         }
       }
-      try {
-        const terminal = await tracker.terminalTickets();
-        const verifiedNow = (await tracker.openTickets()).filter((t) => t.status === tracker.contract.statuses.verified);
-        const scoped = ticketsByRepo(c, terminal).byRepo.get(target.name) ?? [];
-        const actions = planWorktreeSweep(target, [...scoped, ...ticketsByRepo(c, verifiedNow).byRepo.get(target.name) ?? []], tracker.contract);
-        if (actions.length) {
-          remit.enter("worktree");
-          const r = await applyWorktreeSweep(target.dir, actions, dryRun, remit, repo.branch.remote);
-          remit.emit(`swept ${r.removed} worktree(s), kept ${r.keptBranches} branch(es)`, { step: "worktree" });
-        }
-        const stale = planRemoteBranchCleanup(target.dir, repo.branch.remote, repo.branch.base, scoped, tracker.contract);
-        if (stale.length) applyRemoteBranchCleanup(target.dir, repo.branch.remote, stale, dryRun, remit);
-      } catch (e) {
-        remit.warn(`worktree sweep failed: ${e.message}`, { step: "worktree" });
-      }
+      await sweepClosedTickets(c, target, repo.branch, tracker, dryRun, remit);
       return summary;
     } catch (e) {
       remit.warn(`release phase failed: ${e.message}`, { step: "release" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.45.0",
+  "version": "0.45.2",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",