@tablation/crew 0.49.2 → 0.49.4

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"])) {
@@ -4961,6 +4971,19 @@ var Tracker = class {
       limit: 500
     });
   }
+  /**
+   * Tickets at the hand-off status whose row changed at or after `since`,
+   * other than `exceptId` (CREW-1759: a run's stray hand-offs).
+   */
+  async handedOffSince(since2, exceptId) {
+    const c = this.contract;
+    const rows = await this.client.records.list(this.models.issues, {
+      filters: encodeFilters([{ columnName: c.columns.status, operator: "EQ", value: c.statuses.handoff }]),
+      limit: 100
+    });
+    const from = Date.parse(since2);
+    return rows.filter((t) => t.id !== exceptId && Date.parse(t.updated_at) >= from);
+  }
   /**
    * The tickets behind a set of ticket numbers — the cleanup sweeps' input
    * (CREW-1593).
@@ -8728,21 +8751,15 @@ async function enforceHandoff(i) {
     return { kind: "failed", why: e.message };
   }
 }
-async function guardRunHandoff(route, ship, tracker, role, workingId, log) {
+async function guardRunHandoff(route, ship, tracker, role, workingId, log, since2) {
   if (!workingId || role !== "dev" && role !== "design" && role !== "qa") return null;
   const seatId = route.resolved?.seats[role];
   if (!seatId) return null;
   try {
     const t = await tracker.ticket(workingId);
-    const target = repoTargetFor(route, t.repo_id);
-    if (!target) return null;
-    const o = route.repoOverrides[target.name];
-    const cfg = resolveRepoConfig(loadRepoConfig(target.dir), {
-      hooks: { ...route.hooks, ...o?.hooks },
-      labels: { ...route.labels, ...o?.labels },
-      branch: { ...route.branch, ...o?.branch },
-      worktrees: { nameOverride: o?.worktreeName }
-    }, target.dir);
+    const resolved = repoConfigFor(route, t);
+    if (!resolved) return null;
+    const { target, cfg } = resolved;
     if (role === "qa") {
       await retireRunWorktree(tracker, target.dir, cfg, t, role, seatId, ship.name, log);
       return null;
@@ -8761,6 +8778,7 @@ async function guardRunHandoff(route, ship, tracker, role, workingId, log) {
       log
     });
     if (outcome.kind === "pushed") await retireRunWorktree(tracker, target.dir, cfg, t, role, seatId, ship.name, log);
+    if (since2) await guardRunStrays(route, ship, tracker, role, workingId, since2, log);
     return outcome;
   } catch (e) {
     log.warn(`could not check the hand-off: ${e.message}`, { step: "handoff" });
@@ -8783,6 +8801,88 @@ async function retireRunWorktree(tracker, dir, cfg, t, role, seatId, shipName2,
     log.warn(`could not retire the run's worktree: ${e.message}`, { step: "handoff" });
   }
 }
+function repoConfigFor(route, t) {
+  const target = repoTargetFor(route, t.repo_id);
+  if (!target) return null;
+  const o = route.repoOverrides[target.name];
+  const cfg = resolveRepoConfig(loadRepoConfig(target.dir), {
+    hooks: { ...route.hooks, ...o?.hooks },
+    labels: { ...route.labels, ...o?.labels },
+    branch: { ...route.branch, ...o?.branch },
+    worktrees: { nameOverride: o?.worktreeName }
+  }, target.dir);
+  return { target, cfg };
+}
+var STRAY_HANDOFF_MARKER = "<!-- crew:stray-handoff -->";
+async function guardStrayHandoffs(i) {
+  const st = i.contract.statuses;
+  if (i.role === "qa") return;
+  for (const t of i.candidates) {
+    const at = { ticket: t.issue_id, step: "handoff" };
+    try {
+      const holder = i.myShipId ? ticketHolderShipId(t, i.contract) : null;
+      if (holder && holder !== i.myShipId) {
+        await i.writer.updateTicket(t.id, { status: st.building });
+        await i.writer.postEvent(
+          t.id,
+          `${STRAY_HANDOFF_MARKER}
+**Hand-off bounced: this ticket is held by another ship.**
+
+${i.shipName ? `${i.shipName}'s ` : "A "}${i.role} run set it to \`${st.handoff}\` without having claimed it. Set back to \`${st.building}\`; the holding ship's own hand-off is the one that counts.`,
+          i.seatId,
+          "bounced"
+        ).catch(() => i.log.warn("bounced, but the note failed to post", at));
+        i.log.warn(`${t.issue_id} was handed off by a run that did not claim it, while held by another ship \u2014 bounced to ${st.building}`, at);
+        continue;
+      }
+      const co = i.checkout(t);
+      if (!co || !existingBranchForTicket(co.dir, co.cfg, t, i.role)) {
+        i.log.warn(`${t.issue_id} moved to ${st.handoff} during a run that did not claim it; no local branch to verify, left alone`, at);
+        continue;
+      }
+      const v = inspectHandoff(co.dir, co.cfg, t, i.role);
+      i.log.warn(`${t.issue_id} was handed off by a run that did not claim it`, at);
+      if (v.kind === "pushed") {
+        await i.writer.postEvent(t.id, pushedEventBody(v.sha, v.remote, v.branch), i.seatId, "pushed");
+      } else if (v.kind === "bounce") {
+        if (v.origin && v.local && !isAncestor(co.dir, v.origin, v.local)) {
+          i.log.warn(`${t.issue_id}: \`${v.remote}/${v.branch}\` is at ${v.origin.slice(0, 7)}, not a tip this checkout built \u2014 left alone`, at);
+          continue;
+        }
+        await i.writer.updateTicket(t.id, { status: st.building, ...t.assignee_id ? {} : { assignee_id: i.seatId } });
+        await i.writer.postEvent(t.id, bounceComment(v, i.shipName), i.seatId, "bounced").catch(() => {
+        });
+      }
+    } catch (e) {
+      i.log.warn(`could not check the stray hand-off: ${e.message}`, at);
+    }
+  }
+}
+async function guardRunStrays(route, ship, tracker, role, workingId, since2, log) {
+  const seatId = route.resolved?.seats[role];
+  if (!seatId) return;
+  try {
+    const affinity = await tracker.claimAffinity();
+    const candidates = await tracker.handedOffSince(since2, workingId);
+    if (candidates.length === 0) return;
+    await guardStrayHandoffs({
+      writer: tracker,
+      contract: tracker.contract,
+      candidates,
+      seatId,
+      role,
+      myShipId: affinity?.shipId ?? null,
+      shipName: ship.name,
+      checkout: (t) => {
+        const r = repoConfigFor(route, t);
+        return r ? { dir: r.target.dir, cfg: r.cfg } : null;
+      },
+      log
+    });
+  } catch (e) {
+    log.warn(`could not check for stray hand-offs: ${e.message}`, { step: "handoff" });
+  }
+}
 
 // src/connect-wizard.ts
 import { delimiter, dirname as dirname8, join as join17 } from "path";
@@ -9784,6 +9884,14 @@ async function runReleaseCycle(o, movedPast2) {
       const moved = branch ? movedPastVerified(o.cwd, branch, verified) : null;
       if (!moved) continue;
       drop.add(t.id);
+      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`,
@@ -12725,8 +12833,9 @@ async function runRoleAgent(role, decision, ctx) {
     emit.warn(`could not beat ship engaged: ${e.message}`, { step: "agent" });
   }
   try {
+    const runStart = (/* @__PURE__ */ new Date()).toISOString();
     await spawnAgent(plan, emit);
-    await guardRunHandoff(route, ship, tracker, role, workingId, emit);
+    await guardRunHandoff(route, ship, tracker, role, workingId, emit, runStart);
   } finally {
     if (memberId) {
       try {
@@ -14001,8 +14110,9 @@ ${changed2.map((c) => `  - ${c}
           wemit.warn(`could not beat ship engaged: ${e.message}`, { step: "agent" });
         }
         try {
+          const runStart = (/* @__PURE__ */ new Date()).toISOString();
           await spawnAgent(fleetPlan, wemit);
-          await guardRunHandoff(w.route, cfg.ship, fleetTracker, w.role, fleetWorkingId, wemit);
+          await guardRunHandoff(w.route, cfg.ship, fleetTracker, w.role, fleetWorkingId, wemit, runStart);
         } finally {
           dropLock();
           if (fleetMemberId) {
@@ -14216,8 +14326,9 @@ ${changed2.map((c) => `  - ${c}
           emit.warn(`could not beat ship engaged: ${e.message}`, { step: "agent" });
         }
         try {
+          const runStart = (/* @__PURE__ */ new Date()).toISOString();
           await spawnAgent(plan, emit);
-          await guardRunHandoff(route, cfg.ship, tracker2, current, workingId, emit);
+          await guardRunHandoff(route, cfg.ship, tracker2, current, workingId, emit, runStart);
         } finally {
           dropLock();
           if (memberId) {

package/package.json

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

package/prompts/default/skills/crew-lane-agent.md

@@ -478,6 +478,12 @@ existing worktree and note that the status change was not needed.
 
 - One ticket at a time. Never mix two tickets' changes in one branch,
   worktree or commit.
+- **A ticket that appears mid-run is not yours this run.** A bounce, a
+  re-accept or a hand-back that lands while you work another ticket is left for
+  a later run, which claims it with `assignee_id` and the ship hold like any
+  other. Finish the ticket you claimed. Before touching any worktree, re-fetch
+  its record and stop if the ship hold names another ship. Setting `fixed` on a
+  ticket you did not claim is bounced by the runner.
 - **Stay in your lane.** Status decides QA's slice; `needs_design` decides
   dev versus design. Both are checked before assignee and before whether a
   worktree exists.

package/prompts/dev-qa/skills/crew-lane-agent.md

@@ -478,6 +478,12 @@ existing worktree and note that the status change was not needed.
 
 - One ticket at a time. Never mix two tickets' changes in one branch,
   worktree or commit.
+- **A ticket that appears mid-run is not yours this run.** A bounce, a
+  re-accept or a hand-back that lands while you work another ticket is left for
+  a later run, which claims it with `assignee_id` and the ship hold like any
+  other. Finish the ticket you claimed. Before touching any worktree, re-fetch
+  its record and stop if the ship hold names another ship. Setting `fixed` on a
+  ticket you did not claim is bounced by the runner.
 - **Stay in your lane.** Status decides QA's slice (`fixed` and `qa`);
   everything else is dev's. Checked before assignee and before whether a
   worktree exists.