@tablation/crew 0.49.3 → 0.49.5

package/dist/cli.js

@@ -4971,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).
@@ -6099,6 +6112,7 @@ function operatorTodo(tickets, contract, operatorId) {
 }
 
 // src/digest.ts
+var DIRECTION_EVENT_TYPES = ["conflict_handed_back", "requeued", "bounced", "conflict_escalated"];
 function displayKey2(t) {
   return t.issue_tag ?? t.issue_id ?? "?";
 }
@@ -6133,10 +6147,24 @@ function lastComment(i, ticketId) {
   if (!last) return "\u2014";
   return `${last.created_at.slice(0, 16)}Z ${author(last, i)}`;
 }
+var eventAt = (e) => e.occurred_at ?? e.created_at ?? "";
+function pendingDirection(i, ticketId) {
+  const mine = (i.events ?? []).filter((e) => e.record_id === ticketId);
+  const pushed = mine.filter((e) => e.event_type === "pushed").map(eventAt).sort().pop() ?? "";
+  return mine.filter((e) => DIRECTION_EVENT_TYPES.includes(e.event_type) && eventAt(e) > pushed).sort((a, b) => eventAt(a) < eventAt(b) ? 1 : -1)[0];
+}
+function directionCell(i, ticketId) {
+  const d = pendingDirection(i, ticketId);
+  if (!d) return "\u2014";
+  const msg = (d.message ?? "").replace(/\s+/g, " ").trim().slice(0, 160);
+  return `${d.event_type} ${eventAt(d).slice(0, 16)}Z${msg ? ` \u2014 ${msg}` : ""}`.replace(/\|/g, "/");
+}
 function newFromOthers(i, ticketId) {
-  return i.comments.filter(
+  const comments = i.comments.filter(
     (c) => c.ticket_id === ticketId && c.team_member_id !== i.me && c.created_at > i.watermark
   ).length;
+  const d = pendingDirection(i, ticketId);
+  return comments + (d && eventAt(d) > i.watermark ? 1 : 0);
 }
 function who(t, i) {
   return whoAssigned(t, i) + heldBySuffix(t, i);
@@ -6175,14 +6203,14 @@ ${sorted(ts).map(row).join("\n")}
 `;
 }
 function buildingDigest(i) {
-  const header = "| ticket | repo | branch | worktree | mode | status | assignee | filed by | sev | pri | eff | updated | last comment | new since last poll |\n|---|---|---|---|---|---|---|---|---|---|---|---|---|---|";
+  const header = "| ticket | repo | branch | worktree | mode | status | assignee | filed by | sev | pri | eff | updated | last comment | runner direction | new since last poll |\n|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|";
   const row = (t) => {
     const n = newFromOthers(i, t.id);
     const branch = i.branchFor ? i.branchFor(t) : "";
     const worktree = i.worktreeFor ? i.worktreeFor(t) : "";
     const dir = i.dirFor ? i.dirFor(t) : null;
     const repo = i.dirFor ? dir ?? "**NO CHECKOUT**" : "";
-    return `| ${displayKey2(t)} | ${repo} | ${branch} | ${worktree} | ${modeCell(t, i)} | ${t.status} | ${who(t, i)} | ${filedBy(t, i)} | ${t.severity ?? "\u2014"} | ${t.priority ?? "\u2014"} | ${effCell(t)} | ${t.updated_at.slice(0, 16)}Z | ${lastComment(i, t.id)} | ${n > 0 ? `**${n} new**` : "\u2014"} |`;
+    return `| ${displayKey2(t)} | ${repo} | ${branch} | ${worktree} | ${modeCell(t, i)} | ${t.status} | ${who(t, i)} | ${filedBy(t, i)} | ${t.severity ?? "\u2014"} | ${t.priority ?? "\u2014"} | ${effCell(t)} | ${t.updated_at.slice(0, 16)}Z | ${lastComment(i, t.id)} | ${directionCell(i, t.id)} | ${n > 0 ? `**${n} new**` : "\u2014"} |`;
   };
   const blockedRow = (t) => `| ${displayKey2(t)} | ${t.status} | ${who(t, i)} | p${effectivePriority(t)} | ${blockers(t, i)} |`;
   const blockedTable = (ts) => ts.length === 0 ? "\n_None._\n" : `
@@ -6213,6 +6241,7 @@ ${sorted(held).map((t) => `| ${displayKey2(t)} | ${stopOf(t)} |`).join("\n")}
     "## Current queue \u2014 built for you by the poll\n",
     "\nAlready filtered to your lane, and already ordered by the Step 2 rule.\nTicket bodies are deliberately omitted: fetch the full record of only the\nticket you actually pick up. **Do not re-fetch the whole tracker.** This\ndigest comes from the same API call the poll just made, moments ago.\n",
     '\n"new since last poll" counts comments from someone other than you since\nthe poll watermark \u2014 the same signal that woke this run.\n',
+    '\n"runner direction" is the newest instruction the crew itself posted to the\nevent log (not Comments) that no push has answered yet: `conflict_handed_back`\n(merge the base into the branch and resolve), `requeued`, `bounced`,\n`conflict_escalated`. It is direction, same as a comment from a hold: act on it.\n',
     "\n**`repo` is the checkout a ticket's work happens in** \u2014 an area spans\nseveral repositories, so cut the worktree beside THAT directory, not beside\nwhichever one you started in. A ticket marked **NO CHECKOUT** is not yours:\nthis ship has no clone of its repository, and another ship may serve it.\n\n**Use the `branch` and `worktree` columns verbatim.** They are that\nrepository's own naming convention, rendered for THIS ticket \u2014 cut the\nworktree at `<repo>/../<worktree>`, on branch `<branch>`. Do not derive\neither yourself, and prefer these over the Environment section's own worked\nexample if the two ever disagree \u2014 that example is illustrative only,\nrendered before any ticket is picked.\n",
     ...i.workModes && [...i.workModes.modes.values()].some((m) => m !== "automatic") ? ["\n**Manual / hybrid projects.** Some projects on this board are not fully automatic. In a `manual` project no lane touches any ticket, and a ticket with no project is treated the same way, so none appear below. In a `hybrid` project a ticket appears below only when it is assigned to an agent. An `accepted` ticket that is absent for either reason is not yours to claim \u2014 do not go looking for it.\n"] : [],
     "\n### Step 1 \u2014 open tickets that may be yours to act on\n",
@@ -6436,6 +6465,7 @@ async function decideCycle(o) {
     tracker.projectWorkModes(),
     tracker.events("stalled")
   ]);
+  const directionEvents = (await Promise.all([...DIRECTION_EVENT_TYPES, "pushed"].map((t) => tracker.events(t)))).flat();
   emit.emit(`${tickets.length} open ticket(s), ${comments.length} comment(s)`, {
     data: { tickets: tickets.length, comments: comments.length }
   });
@@ -6581,6 +6611,7 @@ async function decideCycle(o) {
     selection,
     actionable,
     watermark,
+    directionEvents,
     selectionInput,
     attention: attentionCurrent
   };
@@ -6660,6 +6691,7 @@ function writeDigest(o, d, role, stateDir) {
       ships: d.ships,
       myShipId: d.ships.find((s) => (s.name ?? "").trim() === o.ship.name.trim())?.id ?? null,
       watermark: d.watermark,
+      events: d.directionEvents,
       blocked: d.blocked,
       blockerInfo: d.info
     };
@@ -6764,7 +6796,14 @@ function worktreeForBranch(cwd, branch) {
   }
   return null;
 }
-var priorBounces = (ticket, events) => events.filter((e) => e.record_id === ticket.id && e.event_type === "conflict_handed_back").length;
+var stampOf = (e) => e.occurred_at ?? e.created_at ?? "";
+var priorBounces = (ticket, events) => {
+  const mine = events.filter((e) => e.record_id === ticket.id);
+  const pushes = mine.filter((e) => e.event_type === "pushed").map(stampOf);
+  return mine.filter(
+    (e) => e.event_type === "conflict_handed_back" && pushes.some((p) => p > stampOf(e))
+  ).length;
+};
 function planConflictBounce(cwd, ticket, branch, base, paths, events) {
   return {
     ticket,
@@ -8738,21 +8777,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;
@@ -8771,6 +8804,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" });
@@ -8793,6 +8827,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";
@@ -12743,8 +12859,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 {
@@ -13731,7 +13848,7 @@ ${changed2.map((c) => `  - ${c}
         }
       }
       if (outcome.conflicts?.length || outcome.unbuildable?.length) {
-        const handedBack = await tracker.events("conflict_handed_back");
+        const handedBack = [...await tracker.events("conflict_handed_back"), ...await tracker.events("pushed")];
         const flagged = await tracker.events("stranded_flagged");
         const seat = releaseSeat(c);
         for (const f of outcome.conflicts ?? []) {
@@ -14019,8 +14136,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) {
@@ -14234,8 +14352,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.3",
+  "version": "0.49.5",
   "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

@@ -141,6 +141,12 @@ Then:
   the ticket again because the status was left alone.
 - A hold gave new direction on an `in_progress` ticket → adjust the branch
   and comment on what changed.
+- A ticket whose `runner direction` cell is not `—` has been handed back by
+  the crew itself (a conflict with the base, a requeue, a bounce). That is
+  direction exactly as a comment from a hold is, and "no new comment" does not
+  cancel it: for `conflict_handed_back`, merge `<remote>/<base>` into the
+  branch, resolve, run the suite, push as a fast-forward and set `fixed`
+  (Step 4.4). Never answer it with "nothing to build".
 - An `in_progress` ticket with no assignee and no new comment → still "up
   for grabs, more work to do": a hold clearing the assignee *is* the signal.
 - **An `in_progress` ticket assigned to you with no new comment is your own
@@ -397,8 +403,10 @@ worktree, runs the test gate and deploys. Three consequences:
    lines from Step 3.5 are the only input the release phase has; nobody
    reads the diff later to fill them in.
 3. **A branch that no longer squash-merges cleanly comes back to you** at
-   `in_progress`, reassigned to your lane, with a comment naming the
-   conflict. Fix it in the same worktree and take it to `fixed` again. "Never
+   `in_progress`, reassigned to your lane, with the hand-back
+   posted to the event log, which the digest's `runner direction` column
+   shows (a ticket there reads as new direction even with no new comment).
+   Fix it in the same worktree and take it to `fixed` again. "Never
    merge" above means never merge INTO the base; merging the base INTO your
    own ticket branch is the expected fix (rule 4), and it is not "by hand to
    help".
@@ -478,6 +486,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

@@ -142,6 +142,12 @@ Then:
   the ticket again because the status was left alone.
 - A hold gave new direction on an `in_progress` ticket → adjust the branch
   and comment on what changed.
+- A ticket whose `runner direction` cell is not `—` has been handed back by
+  the crew itself (a conflict with the base, a requeue, a bounce). That is
+  direction exactly as a comment from a hold is, and "no new comment" does not
+  cancel it: for `conflict_handed_back`, merge `<remote>/<base>` into the
+  branch, resolve, run the suite, push as a fast-forward and set `fixed`
+  (Step 4.4). Never answer it with "nothing to build".
 - An `in_progress` ticket with no assignee and no new comment → still "up
   for grabs, more work to do": a hold clearing the assignee *is* the signal.
 - **An `in_progress` ticket assigned to you with no new comment is your own
@@ -397,8 +403,10 @@ worktree, runs the test gate and deploys. Three consequences:
    lines from Step 3.5 are the only input the release phase has; nobody
    reads the diff later to fill them in.
 3. **A branch that no longer squash-merges cleanly comes back to you** at
-   `in_progress`, reassigned to your lane, with a comment naming the
-   conflict. Fix it in the same worktree and take it to `fixed` again. "Never
+   `in_progress`, reassigned to your lane, with the hand-back
+   posted to the event log, which the digest's `runner direction` column
+   shows (a ticket there reads as new direction even with no new comment).
+   Fix it in the same worktree and take it to `fixed` again. "Never
    merge" above means never merge INTO the base; merging the base INTO your
    own ticket branch is the expected fix (rule 4), and it is not "by hand to
    help".
@@ -478,6 +486,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.