@tablation/crew 0.49.1 → 0.49.3

package/dist/cli.js

@@ -4125,7 +4125,17 @@ 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)) return { exists: true };
+  if (!isAncestor(cwd, local, remoteTip2)) {
+    const diverged = !isAncestor(cwd, remoteTip2, local);
+    const holder2 = diverged ? worktrees(cwd).find((w) => w.branch === branch && !w.prunable) : void 0;
+    if (holder2) {
+      return {
+        exists: true,
+        problem: `local ${branch} at ${local.slice(0, 8)} has commits not on ${remote}/${branch} at ${remoteTip2.slice(0, 8)}; worktree ${holder2.path}`
+      };
+    }
+    return { exists: true };
+  }
   const holder = worktrees(cwd).find((w) => w.branch === branch && !w.prunable);
   if (holder) {
     if (gitOk(holder.path, ["status", "--porcelain"])) {
@@ -9253,10 +9263,10 @@ function movedPast(r, t, branch, pushedAs) {
   const head = resolve2(r.cwd, branch);
   const remoteHead = resolve2(r.cwd, `${r.repo.branch.remote}/${pushedAs}`);
   if (remoteHead && !isAncestor(r.cwd, remoteHead, verified) && remoteHead !== head) {
-    return { ticket: t, verified, head: remoteHead };
+    return { ticket: t, verified, head: remoteHead, branch: pushedAs };
   }
   if (head && head !== verified && !isAncestor(r.cwd, head, verified)) {
-    return { ticket: t, verified, head };
+    return { ticket: t, verified, head, branch: pushedAs };
   }
   return null;
 }
@@ -9345,6 +9355,12 @@ ${h.prFailure.tail}
     try {
       await tracker.updateTicket(t.id, { [contract.columns.status]: contract.statuses.handoff }, t.updated_at);
       await tracker.postEvent(t.id, body, seat, "requeued");
+      await tracker.postEvent(
+        t.id,
+        pushedEventBody(q.head, remote, q.branch),
+        seat,
+        "pushed"
+      );
       emit.emit(`returned to ${contract.statuses.handoff} \u2014 branch moved past ${q.verified.slice(0, 8)}`, { ticket: t.issue_id });
     } catch (e) {
       emit.warn(`could not return to ${contract.statuses.handoff}: ${e.message}`, { ticket: t.issue_id });
@@ -9778,7 +9794,15 @@ async function runReleaseCycle(o, movedPast2) {
       const moved = branch ? movedPastVerified(o.cwd, branch, verified) : null;
       if (!moved) continue;
       drop.add(t.id);
-      movedPast2.push({ ticket: t, verified: moved.verified, head: moved.tip });
+      const remoteTip2 = branch ? gitOk(o.cwd, ["rev-parse", "-q", "--verify", `refs/remotes/${o.repo.branch.remote}/${branch}^{commit}`]) : null;
+      if (remoteTip2 && remoteTip2 !== moved.tip) {
+        o.emit.error(
+          `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 }
+        );
+        continue;
+      }
+      movedPast2.push({ ticket: t, verified: moved.verified, head: moved.tip, branch: pushedBranchForTicket(o.repo, t) });
       o.emit.error(
         `not releasing ${t.issue_id}: ${branch} is at ${moved.tip.slice(0, 8)}, past the ${moved.verified.slice(0, 8)} QA verified`,
         { ticket: t.issue_id }

package/package.json

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