@tablation/crew 0.73.0 → 0.73.2

package/dist/cli.js

@@ -3563,7 +3563,7 @@ function remoteBranchForIssue(cwd, remote, issueKey, templates = { name: "issue-
   }
   return null;
 }
-function levelRemoteBranch(cwd, remote, branch) {
+function levelRemoteBranch(cwd, remote, branch, baseRef) {
   const local = gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${branch}`]);
   if (!remoteBranchExists(cwd, remote, branch)) return { exists: local !== null };
   if (local === null) {
@@ -3572,6 +3572,20 @@ function levelRemoteBranch(cwd, remote, branch) {
   const remoteTip2 = gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/remotes/${remote}/${branch}`]);
   if (!remoteTip2 || remoteTip2 === local) return { exists: true };
   if (!isAncestor(cwd, local, remoteTip2)) {
+    if (baseRef && isAncestor(cwd, local, baseRef)) {
+      const holder3 = worktrees(cwd).find((w) => w.branch === branch && !w.prunable);
+      if (holder3) {
+        if (gitOk(holder3.path, ["status", "--porcelain"])) {
+          return { exists: true, problem: `${branch} holds only commits already on ${baseRef}, but the worktree ${holder3.path} that holds it has uncommitted changes` };
+        }
+        if (gitOk(holder3.path, ["reset", "--hard", "--quiet", remoteTip2]) === null) {
+          return { exists: true, problem: `could not reset ${branch} to ${remote}/${branch} in ${holder3.path}` };
+        }
+      } else if (gitOk(cwd, ["branch", "-f", branch, remoteTip2]) === null) {
+        return { exists: true, problem: `could not reset ${branch} to ${remote}/${branch}` };
+      }
+      return { exists: true, reset: `${branch} held only commits already on ${baseRef}; reset ${local.slice(0, 8)} -> ${remote}/${branch} at ${remoteTip2.slice(0, 8)}` };
+    }
     const diverged = !isAncestor(cwd, remoteTip2, local);
     const holder2 = diverged ? worktrees(cwd).find((w) => w.branch === branch && !w.prunable) : void 0;
     if (holder2) {
@@ -6483,11 +6497,12 @@ function locateBranchForTicket(dir, cfg, t, role, fetchedDirs) {
   const found = remoteBranchForIssue(dir, remote, t.issue_id, branchTemplates(cfg, t), branchRenderer(t, role, cfg.branch.lowercase));
   return found ? { branch: found, where: "remote" } : null;
 }
-function materializeBranchForTicket(dir, cfg, t, role, onProblem) {
+function materializeBranchForTicket(dir, cfg, t, role, onProblem, onReset) {
   const loc = locateBranchForTicket(dir, cfg, t, role);
   if (!loc) return null;
-  const r = levelRemoteBranch(dir, cfg.branch.remote, loc.branch);
+  const r = levelRemoteBranch(dir, cfg.branch.remote, loc.branch, `${cfg.branch.remote}/${cfg.branch.base}`);
   if (r.problem) onProblem?.(r.problem);
+  if (r.reset) onReset?.(r.reset);
   return loc.branch;
 }
 
@@ -6774,10 +6789,10 @@ function applyRunWorktree(dir, cfg, plan) {
     case "recut":
       git(dir, ["worktree", "remove", "--force", plan.path]);
       gitOk(dir, ["branch", "-D", plan.branch]);
-      git(dir, ["worktree", "add", "-b", plan.branch, plan.path, plan.base]);
+      git(dir, ["worktree", "add", "--no-track", "-b", plan.branch, plan.path, plan.base]);
       return plan.path;
     case "cut-fresh":
-      git(dir, ["worktree", "add", "-b", plan.branch, plan.path, plan.base]);
+      git(dir, ["worktree", "add", "--no-track", "-b", plan.branch, plan.path, plan.base]);
       return plan.path;
   }
 }
@@ -6785,6 +6800,19 @@ function worktreeHoldsUnpushed(path, remote) {
   const out = gitOk(path, ["for-each-ref", "--contains", "HEAD", "--count=1", "--format=%(refname)", `refs/remotes/${remote}/`]);
   return out === null || out.trim() === "";
 }
+function dropEmptyRunBranch(dir, cfg, branch) {
+  const { remote, base } = cfg.branch;
+  const baseRef = remoteConfigured(dir, remote) ? `${remote}/${base}` : base;
+  if (gitOk(dir, ["rev-parse", "-q", "--verify", `refs/heads/${branch}`]) === null) return false;
+  if (remoteConfigured(dir, remote) && remoteBranchExists(dir, remote, branch)) return false;
+  if (countCommits(dir, `${baseRef}..${branch}`) !== 0) return false;
+  const wt = worktrees(dir).find((w) => w.branch === branch && !w.prunable && w.path !== dir);
+  if (wt && existsSync14(wt.path)) {
+    if (status(wt.path).length > 0) return false;
+    if (gitOk(dir, ["worktree", "remove", wt.path]) === null) return false;
+  }
+  return gitOk(dir, ["branch", "-D", branch]) !== null;
+}
 async function finishRunWorktree(dir, cfg, branch) {
   const wt = worktrees(dir).find((w) => w.branch === branch && !w.prunable && w.path !== dir);
   if (!wt || !existsSync14(wt.path)) return { kind: "none" };
@@ -6953,6 +6981,12 @@ async function guardRunHandoff(route, ship, tracker, role, workingId, log, since
       log
     });
     if (outcome.kind === "pushed") await retireRunWorktree(tracker, target.dir, cfg, t, role, seatId, ship.name, log);
+    else {
+      const branch = existingBranchForTicket(target.dir, cfg, t, role);
+      if (branch && dropEmptyRunBranch(target.dir, cfg, branch)) {
+        log.emit(`${t.issue_id}: dropped ${branch} \u2014 the run made no commits beyond ${cfg.branch.base}`, { ticket: t.issue_id, step: "handoff" });
+      }
+    }
     if (since2) await guardRunStrays(route, ship, tracker, role, workingId, since2, log);
     return outcome;
   } catch (e) {
@@ -10584,6 +10618,19 @@ async function applyStrandedVerified(writer, s, contract, operatorId, memberId,
   }
 }
 
+// src/local-ref-skip.ts
+var LOCAL_REF_SKIP_MARKER = calloutHeader("WARNING", "Release Skipped");
+function localRefSkipComment(shipName2, problem) {
+  return `${LOCAL_REF_SKIP_MARKER}
+> ${problem}
+
+**This ticket is verified but was not released: the release ship's local branch disagrees with the remote.**
+
+Ship ${shipName2} found: ${problem}. The release refuses to squash a ref nobody verified and retries every cycle. If the local branch holds only commits already on the base, run \`git branch -f <branch> <remote>/<branch>\` in the release checkout (the crew now does this itself when it can); otherwise a person needs to reconcile the branch.
+`;
+}
+var localRefSkipReported = (ticket, problem, events) => events.some((e) => e.record_id === ticket.id && e.event_type === "local_ref_skip" && (e.message ?? "").includes(problem));
+
 // src/connect-wizard.ts
 import { delimiter, dirname as dirname10, join as join23 } from "path";
 import { accessSync as accessSync2, constants as constants2, existsSync as existsSync21, mkdirSync as mkdirSync13, writeFileSync as writeFileSync15 } from "fs";
@@ -11641,7 +11688,7 @@ function openReleaseCheckout(o) {
   o.emit.emit(`release checkout: ${dir}`, { step: "release" });
   const close = () => closeReleaseCheckout(o.cwd, root, dir, branch);
   try {
-    git(o.cwd, ["worktree", "add", "-q", "-b", branch, dir, `${remote}/${base}`]);
+    git(o.cwd, ["worktree", "add", "-q", "--no-track", "-b", branch, dir, `${remote}/${base}`]);
   } catch (e) {
     close();
     throw e;
@@ -11667,10 +11714,15 @@ function reportHeld(o, held) {
 }
 async function runRelease(o) {
   const movedPast2 = [];
-  const out = await runReleaseCycle(o, movedPast2);
-  return movedPast2.length ? { ...out, movedPast: movedPast2 } : out;
+  const localRefSkips = [];
+  const out = await runReleaseCycle(o, movedPast2, localRefSkips);
+  return {
+    ...out,
+    ...movedPast2.length ? { movedPast: movedPast2 } : {},
+    ...localRefSkips.length ? { localRefSkips } : {}
+  };
 }
-async function runReleaseCycle(o, movedPast2) {
+async function runReleaseCycle(o, movedPast2, localRefSkips) {
   const scoped = (msg) => o.scope ? `${o.scope}: ${msg}` : msg;
   const tagPattern = o.repo.release.tagPattern ?? "v*";
   o.emit.enter("release");
@@ -11682,8 +11734,9 @@ async function runReleaseCycle(o, movedPast2) {
       if (t.status !== o.contract.statuses.verified) continue;
       materializeBranchForTicket(o.cwd, o.repo, t, void 0, (problem) => {
         skipped.add(t.id);
+        localRefSkips.push({ ticket: t, problem });
         o.emit.error(`not releasing ${t.issue_id} this cycle: ${problem}`, { ticket: t.issue_id });
-      });
+      }, (note) => o.emit.emit(`${t.issue_id}: ${note}`, { ticket: t.issue_id }));
     }
     if (skipped.size) releasable = o.tickets.filter((t) => !skipped.has(t.id));
   }
@@ -11702,6 +11755,10 @@ async function runReleaseCycle(o, movedPast2) {
           `not releasing ${t.issue_id}: local ${branch} at ${moved.tip.slice(0, 8)} is not on ${o.repo.branch.remote}/${branch} (${remoteTip2.slice(0, 8)}); not requeuing it`,
           { ticket: t.issue_id }
         );
+        localRefSkips.push({
+          ticket: t,
+          problem: `local ${branch} at ${moved.tip.slice(0, 8)} is not on ${o.repo.branch.remote}/${branch} (${remoteTip2.slice(0, 8)})`
+        });
         continue;
       }
       movedPast2.push({ ticket: t, verified: moved.verified, head: moved.tip, branch: pushedBranchForTicket(o.repo, t) });
@@ -17401,6 +17458,18 @@ ${changed2.map((c) => `  - ${c}
           remit.warn(`could not note the red test gate on the board: ${e.message}`, { step: "merge" });
         }
       }
+      if (outcome.localRefSkips?.length && !dryRun) {
+        try {
+          const reported = await tracker.events("local_ref_skip");
+          const seat = releaseSeat(c);
+          for (const s of outcome.localRefSkips) {
+            if (localRefSkipReported(s.ticket, s.problem, reported)) continue;
+            await tracker.postEvent(s.ticket.id, localRefSkipComment(cfg.ship.name, s.problem), seat, "local_ref_skip");
+          }
+        } catch (e) {
+          remit.warn(`could not note the skipped release on the board: ${e.message}`, { step: "merge" });
+        }
+      }
       if (outcome.externalClosures?.length) {
         await applyExternalClosures(tracker, outcome.externalClosures, tracker.contract, remit, dryRun, target.dir);
       }
@@ -19835,6 +19904,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             continue;
           }
           if (!s2.upstream) continue;
+          if (w.branch !== r.config.branch.base && s2.upstream === `${r.config.branch.remote}/${r.config.branch.base}`) continue;
           tracked++;
           if (s2.canFastForward) {
             acted++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.73.0",
+  "version": "0.73.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",