@tablation/crew 0.75.6 → 0.76.0

package/dist/cli.js

@@ -3997,6 +3997,9 @@ function sweepStaleReleaseRoots(tmp, now = Date.now(), maxAgeMs = 60 * 60 * 1e3)
 function pushBranch(cwd, remote, branch, dst = branch) {
   git(cwd, ["push", remote, `${branch}:${dst}`]);
 }
+function pushBranchUpstream(cwd, remote, branch, dst = branch) {
+  git(cwd, ["push", "--set-upstream", remote, `${branch}:${dst}`]);
+}
 function worktrees(cwd) {
   const out = gitOk(cwd, ["worktree", "list", "--porcelain"]) ?? "";
   const list = [];
@@ -6989,7 +6992,15 @@ function inspectHandoff(dir, cfg, ticket, role) {
   }
   return { kind: "pushed", branch, sha: origin, remote };
 }
-function bounceComment(v, shipName2) {
+function pushableBounce(dir, v) {
+  if (!v.branch || !v.local) return false;
+  return !v.origin || isAncestor(dir, v.origin, v.local);
+}
+function describeHandoffPush(dir, cfg, ticket, role) {
+  const v = inspectHandoff(dir, cfg, ticket, role);
+  return v.kind === "bounce" && pushableBounce(dir, v) ? `would push ${v.branch} to ${v.remote}` : null;
+}
+function bounceComment(v, shipName2, pushError) {
   return `${HANDOFF_BOUNCED_MARKER}
 
 **Hand-off bounced: the branch is not on \`${v.remote}\` at the tip this ticket was built to.**
@@ -6998,7 +7009,7 @@ ${shipName2 ? `Ship: ${shipName2}
 ` : ""}Local HEAD: ${v.local ? `\`${v.local}\`` : "(no local branch)"}
 \`${v.remote}\`: ${v.origin ? `\`${v.origin}\`` : v.branch ? "(branch missing)" : "(no branch to look for)"}
 
-${v.reason[0].toUpperCase()}${v.reason.slice(1)}. Set back to \`in_progress\`, still held by this ship; push with a plain \`git push --set-upstream ${v.remote} <branch>\` (never \`--force\`) and set \`fixed\` again. Your brief authorizes this push: it is the hand-off, not a release, so do it now rather than asking for permission.`;
+${v.reason[0].toUpperCase()}${v.reason.slice(1)}. ${pushError ? ` The runner tried a plain push and git refused it: \`${pushError}\`.` : ""} Set back to \`in_progress\`, still held by this ship; push with a plain \`git push --set-upstream ${v.remote} <branch>\` (never \`--force\`) and set \`fixed\` again. Your brief authorizes this push: it is the hand-off, not a release, so do it now rather than asking for permission.`;
 }
 async function takenOverSince(i, ticketRow) {
   if (!i.since || !i.writer.events) return false;
@@ -7048,12 +7059,35 @@ async function enforceHandoff(i) {
       i.log.warn(`${t.issue_id} has no local branch on this ship, so it is not this ship's hand-off to bounce: ${v.reason}`, log);
       return { kind: "unverified", why: "no local branch on this ship" };
     }
+    let pushError;
+    if (pushableBounce(i.dir, v)) {
+      const wt = worktrees(i.dir).find((w) => w.branch === v.branch);
+      try {
+        pushBranchUpstream(wt?.path ?? i.dir, v.remote, v.branch);
+        const again = inspectHandoff(i.dir, i.cfg, t, i.role);
+        if (again.kind === "pushed") {
+          await i.writer.postEvent(t.id, pushedEventBody(again.sha, again.remote, again.branch), i.seatId, "pushed");
+          await i.writer.postEvent(
+            t.id,
+            `The runner pushed \`${again.branch}\` to \`${again.remote}\` on ${i.shipName ? `${i.shipName}'s` : "this ship's"} behalf: the ${i.role} seat set \`${i.contract.statuses.handoff}\` without pushing. Plain fast-forward push.${i.cfg.hooks.ci_status ? " The repo's `ci_status` hook was NOT run by the hand-off guard, so CI was not checked by the builder." : ""}`,
+            i.seatId,
+            "pushed_by_runner"
+          ).catch(() => i.log.warn("pushed, but the note failed to post", log));
+          i.log.emit(`${t.issue_id}: pushed ${again.branch} to ${again.remote} on the seat's behalf at ${again.sha.slice(0, 7)} \u2014 handed on to QA`, log);
+          return { kind: "pushed", sha: again.sha };
+        }
+        pushError = `the push succeeded but ${again.kind === "bounce" ? again.reason : again.why}`;
+      } catch (e) {
+        pushError = e.message;
+      }
+      i.log.warn(`${t.issue_id}: the runner's own push failed: ${pushError}`, log);
+    }
     await i.writer.updateTicket(t.id, {
       status: i.contract.statuses.building,
       ...t.assignee_id ? {} : { assignee_id: i.seatId },
       ...i.hold && !heldBy ? { [i.hold.column]: i.hold.shipId } : {}
     });
-    await i.writer.postEvent(t.id, bounceComment(v, i.shipName), i.seatId, "bounced").catch(() => {
+    await i.writer.postEvent(t.id, bounceComment(v, i.shipName, pushError), i.seatId, "bounced").catch(() => {
       i.log.warn("bounced, but the note failed to post", log);
     });
     i.log.warn(`${t.issue_id} bounced back to ${i.contract.statuses.building}: ${v.reason}`, log);
@@ -18250,6 +18284,16 @@ ${changed2.map((c) => `  - ${c}
         if (dryRun) {
           process.stdout.write(`${describePlan(plan)}
 `);
+          if (workingId && (current === "dev" || current === "design")) {
+            try {
+              const t = await tracker2.ticket(workingId);
+              const r = repoConfigFor(route, t);
+              const would = r && describeHandoffPush(r.target.dir, r.cfg, t, current);
+              if (would) process.stdout.write(`${would}
+`);
+            } catch {
+            }
+          }
           break;
         }
         const before = snapshot(await tracker2.openTickets());

package/package.json

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