@tablation/crew 0.47.2 → 0.47.3

package/dist/cli.js

@@ -4117,15 +4117,36 @@ function remoteBranchForIssue(cwd, remote, issueKey, templates = { name: "issue-
   }
   return null;
 }
-function materializeRemoteBranch(cwd, remote, branch) {
-  if (!remoteBranchExists(cwd, remote, branch)) {
-    return gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${branch}`]) !== null;
+function levelRemoteBranch(cwd, remote, branch) {
+  const local = gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${branch}`]);
+  if (!remoteBranchExists(cwd, remote, branch)) return { exists: local !== null };
+  if (local === null) {
+    return { exists: gitOk(cwd, ["branch", "--track", branch, `${remote}/${branch}`]) !== null };
+  }
+  const remoteTip2 = gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/remotes/${remote}/${branch}`]);
+  if (!remoteTip2 || remoteTip2 === local) return { exists: true };
+  if (!isAncestor(cwd, local, remoteTip2)) return { exists: true };
+  const holder = worktrees(cwd).find((w) => w.branch === branch && !w.prunable);
+  if (holder) {
+    if (gitOk(holder.path, ["status", "--porcelain"])) {
+      return {
+        exists: true,
+        problem: `${branch} is behind ${remote}/${branch} and the worktree ${holder.path} that holds it has uncommitted or mid-merge changes`
+      };
+    }
+    try {
+      git(holder.path, ["merge", "--ff-only", "--quiet", `${remote}/${branch}`]);
+    } catch (e) {
+      return { exists: true, problem: `could not fast-forward ${branch} in ${holder.path}: ${e.message}` };
+    }
+    return { exists: true };
   }
-  if (gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${branch}`]) === null) {
-    return gitOk(cwd, ["branch", "--track", branch, `${remote}/${branch}`]) !== null;
+  try {
+    git(cwd, ["fetch", "--quiet", remote, `${branch}:${branch}`]);
+  } catch (e) {
+    return { exists: true, problem: `could not move ${branch} to ${remote}/${branch}: ${e.message}` };
   }
-  gitOk(cwd, ["fetch", "--quiet", remote, `${branch}:${branch}`]);
-  return true;
+  return { exists: true };
 }
 function deleteRemoteBranch(cwd, remote, branch) {
   if (!remoteBranchExists(cwd, remote, branch)) return true;
@@ -6285,10 +6306,11 @@ function locateBranchForTicket(dir, cfg, t, role, fetchedDirs) {
   const found = remoteBranchForIssue(dir, remote, t.issue_id, branchTemplates(cfg, t), branchRenderer(t, role));
   return found ? { branch: found, where: "remote" } : null;
 }
-function materializeBranchForTicket(dir, cfg, t, role) {
+function materializeBranchForTicket(dir, cfg, t, role, onProblem) {
   const loc = locateBranchForTicket(dir, cfg, t, role);
   if (!loc) return null;
-  materializeRemoteBranch(dir, cfg.branch.remote, loc.branch);
+  const r = levelRemoteBranch(dir, cfg.branch.remote, loc.branch);
+  if (r.problem) onProblem?.(r.problem);
   return loc.branch;
 }
 
@@ -6746,6 +6768,11 @@ function planConflictBounce(cwd, ticket, branch, base, paths, events) {
 function refreshBranch(worktree, base) {
   const dirty = gitOk(worktree, ["status", "--porcelain"]);
   if (dirty) return { clean: false, paths: [], why: "the worktree has uncommitted changes" };
+  const upstream = gitOk(worktree, ["rev-parse", "-q", "--verify", "@{upstream}"]);
+  const head = gitOk(worktree, ["rev-parse", "HEAD"]);
+  if (upstream && head && upstream !== head && isAncestor(worktree, head, upstream)) {
+    return { clean: false, paths: [], behind: true, why: "the branch is behind its remote; fast-forward it before merging the base in" };
+  }
   try {
     git(worktree, ["merge", "--no-edit", base]);
     return { clean: true, paths: [] };
@@ -6813,6 +6840,10 @@ async function applyConflictBounce(writer, b, contract, memberId, log, dryRun) {
       log.emit(`merged ${b.base} into ${b.branch} cleanly \u2014 it was stale, not conflicting`, t);
       return { kind: "refreshed" };
     }
+    if (r.behind) {
+      log.warn(`not handing ${b.ticket.issue_id} back: ${r.why}`, t);
+      return { kind: "failed", why: r.why ?? "branch behind its remote" };
+    }
     merged = r.paths.length > 0;
     if (r.why) log.warn(`could not merge ${b.base} into ${b.branch}: ${r.why}`, t);
     if (r.paths.length) b.paths = r.paths;
@@ -9664,7 +9695,19 @@ async function runRelease(o) {
   const tagPattern = o.repo.release.tagPattern ?? "v*";
   o.emit.enter("release");
   const fresh = refreshBase(o);
-  const decision = decideRelease(o.cwd, o.tickets, o.contract, {
+  let releasable = o.tickets;
+  if (!o.dryRun) {
+    const skipped = /* @__PURE__ */ new Set();
+    for (const t of o.tickets) {
+      if (t.status !== o.contract.statuses.verified) continue;
+      materializeBranchForTicket(o.cwd, o.repo, t, void 0, (problem) => {
+        skipped.add(t.id);
+        o.emit.error(`not releasing ${t.issue_id} this cycle: ${problem}`, { ticket: t.issue_id });
+      });
+    }
+    if (skipped.size) releasable = o.tickets.filter((t) => !skipped.has(t.id));
+  }
+  const decision = decideRelease(o.cwd, releasable, o.contract, {
     tagPattern,
     base: o.repo.branch.base,
     blockerInfo: o.blockerInfo,

package/package.json

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