@tablation/crew 0.40.1 → 0.41.0

package/dist/cli.js

@@ -5232,7 +5232,14 @@ function missingBlockerIds(tickets) {
 function blockerInfoMap(tickets, extra = []) {
   const info = {};
   for (const t of [...tickets, ...extra]) {
-    info[t.id] = { issue_id: t.issue_id, issue_tag: t.issue_tag, status: t.status };
+    info[t.id] = {
+      issue_id: t.issue_id,
+      issue_tag: t.issue_tag,
+      status: t.status,
+      repo_id: t.repo_id,
+      merged_at: t.merged_at,
+      commit_sha: t.commit_sha
+    };
   }
   return info;
 }
@@ -5241,14 +5248,18 @@ function computeBlockedIds(tickets, info) {
   for (const t of tickets) if (unresolvedBlockers(t, info).length > 0) blocked.add(t.id);
   return blocked;
 }
-function unresolvedBlockers(t, info) {
+function unresolvedBlockers(t, info, opts = {}) {
+  const mergeGated = opts.mergeGated ?? true;
   return (t.blocked_by ?? []).filter((id) => {
-    const status2 = info[id]?.status;
-    return status2 !== void 0 && !RESOLVED_STATUSES.has(status2);
+    const b = info[id];
+    const status2 = b?.status;
+    if (!b || status2 === void 0) return false;
+    if (!RESOLVED_STATUSES.has(status2)) return true;
+    return mergeGated && status2 === "verified" && !!t.repo_id && b.repo_id === t.repo_id && !b.merged_at && !b.commit_sha;
   });
 }
-function describeUnresolved(t, info) {
-  return unresolvedBlockers(t, info).map((id) => `${info[id]?.issue_tag ?? info[id]?.issue_id ?? "?"} (${info[id]?.status ?? "unknown"})`).join(", ");
+function describeUnresolved(t, info, opts = {}) {
+  return unresolvedBlockers(t, info, opts).map((id) => `${info[id]?.issue_tag ?? info[id]?.issue_id ?? "?"} (${info[id]?.status ?? "unknown"})`).join(", ");
 }
 function sweepDiagnostics(tickets, info) {
   const dangling = [];
@@ -5317,7 +5328,7 @@ function filingErrors(tickets, opts = {}) {
 function sweepComment(step) {
   return step.action === "park" ? `Parked as **Blocked** by the crew \u2014 waiting on: ${step.blockers}.
 
-This is automatic and reversible: an approved ticket whose \`Blocked by\` entries are not all resolved is parked out of the queue, and restored on the first poll after the last one resolves. Nothing else about the ticket changes. A blocker counts as resolved at \`verified\`, \`closed_deployed\`, \`closed_wont_fix\` or \`closed_duplicate\` \u2014 not at \`fixed\`, which is still an unmerged branch awaiting QA.` : `Restored to **Approved** by the crew \u2014 every blocker has resolved${step.blockers && step.blockers !== "\u2014" ? ` (${step.blockers})` : ""}.
+This is automatic and reversible: an approved ticket whose \`Blocked by\` entries are not all resolved is parked out of the queue, and restored on the first poll after the last one resolves. Nothing else about the ticket changes. A blocker counts as resolved at \`closed_deployed\`, \`closed_wont_fix\` or \`closed_duplicate\`, or at \`verified\` when it is in a different repository or already merged (\`merged_at\` set) \u2014 not at \`fixed\`, which is still an unmerged branch awaiting QA, and not at \`verified\` for a blocker in this ticket's own repository until the release has merged it, so nothing gets built stacked on an unmerged branch.` : `Restored to **Approved** by the crew \u2014 every blocker has resolved${step.blockers && step.blockers !== "\u2014" ? ` (${step.blockers})` : ""}.
 
 This restores the status it was approved at before being parked; it is back in the queue and a role may pick it up. If a blocker resolved as \`closed_wont_fix\` or \`closed_duplicate\` this ticket may still not be buildable as written \u2014 that is a call for a human, not the crew.`;
 }
@@ -5897,7 +5908,7 @@ ${sorted(held).map((t) => `| ${displayKey2(t)} | ${stopOf(t)} |`).join("\n")}
     "\nWork the first one you are not required to skip. Tickets waiting on an\nunresolved dependency are already out of this table \u2014 see Blocked below.\n",
     table(step2, i, header, row),
     "\n### Blocked \u2014 waiting on a dependency, not yours to start\n",
-    '\nListed rather than hidden so "nothing to do" stays distinguishable from\n"everything is parked". The loop parks and restores these itself, on every\npoll: an approved ticket whose `Blocked by` entries are unresolved moves to\n`blocked`, and back to `accepted` once the last one resolves. **Do not pick\none up, do not set or clear `blocked` by hand, and do not "unblock" one by\nediting its `Blocked by` field** \u2014 if a blocker looks wrong, say so in your\nrun summary. A blocker counts as resolved at `verified`, `closed_deployed`,\n`closed_wont_fix` or `closed_duplicate`; `fixed` is still an unmerged branch\nawaiting QA, so it does not count.\n',
+    '\nListed rather than hidden so "nothing to do" stays distinguishable from\n"everything is parked". The loop parks and restores these itself, on every\npoll: an approved ticket whose `Blocked by` entries are unresolved moves to\n`blocked`, and back to `accepted` once the last one resolves. **Do not pick\none up, do not set or clear `blocked` by hand, and do not "unblock" one by\nediting its `Blocked by` field** \u2014 if a blocker looks wrong, say so in your\nrun summary. A blocker counts as resolved at `closed_deployed`,\n`closed_wont_fix` or `closed_duplicate`, or at `verified` when it is in another\nrepository or already merged; `fixed` is still an unmerged branch awaiting QA,\nand a `verified` blocker in the same repository as the blocked ticket is unmerged until the\nrelease merges it, so neither counts.\n',
     blockedTable(i.tickets.filter(isBlocked)),
     ...heldTable ? [heldTable] : []
   ]);
@@ -5926,7 +5937,7 @@ function qaDigest(i) {
 ### Waiting on blockers \u2014 not yours to verify yet
 
 A \`fixed\` or \`qa\` ticket whose \`Blocked by\` names something not yet resolved
-(\`verified\`, \`closed_deployed\`, \`closed_wont_fix\` or \`closed_duplicate\`) is held out of
+(\`closed_deployed\`, \`closed_wont_fix\` or \`closed_duplicate\`, or \`verified\` once merged or in another repository) is held out of
 verification: its change needs the blocker released first. It becomes yours on
 the first poll after the last blocker resolves. No one needs to change the ticket.
 
@@ -8421,7 +8432,7 @@ function checkGuards(cwd, base = "main") {
 }
 function heldByBlockers(tickets, verifiedStatus, info) {
   if (!info) return [];
-  return tickets.filter((t) => t.status === verifiedStatus && unresolvedBlockers(t, info).length > 0).map((ticket) => ({ ticket, blockers: describeUnresolved(ticket, info) }));
+  return tickets.filter((t) => t.status === verifiedStatus && unresolvedBlockers(t, info, { mergeGated: false }).length > 0).map((ticket) => ({ ticket, blockers: describeUnresolved(ticket, info, { mergeGated: false }) }));
 }
 var describeHeld = (held) => held.map((h) => `${h.ticket.issue_tag ?? h.ticket.issue_id} held: blocked by ${h.blockers}`);
 var CHANGELOG_LINE = /^Changelog:[ \t]*(.*)$/gm;

package/package.json

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