@tablation/crew 0.40.1 → 0.42.0

package/dist/cli.js

@@ -3103,7 +3103,8 @@ var DEFAULT_CONTRACT = {
     ship: "ship_id",
     heldBy: "held_by_ship_id",
     verifiedSha: "verified_sha",
-    prRef: "pr_ref"
+    prRef: "pr_ref",
+    position: "position"
   },
   comments: {
     parent: "ticket_id",
@@ -5232,7 +5233,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 +5249,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 +5329,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.`;
 }
@@ -5380,20 +5392,25 @@ function issueNumber(t) {
 function epicRank(t) {
   return t.epicInProgress ? 0 : 1;
 }
+function positionRank(t) {
+  const p = t.position;
+  return typeof p === "number" && Number.isFinite(p) ? p : Number.POSITIVE_INFINITY;
+}
 function rank(t, c = DEFAULT_CONTRACT) {
-  return [effectivePriority(t, c), severityRank(t, c), epicRank(t), issueNumber(t)];
+  return [effectivePriority(t, c), positionRank(t), severityRank(t, c), epicRank(t), issueNumber(t)];
 }
 function compareRank(a, b, c = DEFAULT_CONTRACT) {
   const ra = rank(a, c);
   const rb = rank(b, c);
   for (let i = 0; i < ra.length; i++) {
-    const d = ra[i] - rb[i];
-    if (d !== 0) return d;
+    const x = ra[i];
+    const y = rb[i];
+    if (x !== y) return x < y ? -1 : 1;
   }
   return 0;
 }
 function rankScalar(t, c = DEFAULT_CONTRACT) {
-  const [p, s, e, n] = rank(t, c);
+  const [p, , s, e, n] = rank(t, c);
   return p * 1e9 + s * 1e7 + e * 1e6 + n;
 }
 var NOTHING_ACTIONABLE = 999999999999;
@@ -5600,7 +5617,7 @@ function claimStatuses(role, c) {
 }
 function rankedCandidates(role, i) {
   const c = i.contract ?? DEFAULT_CONTRACT;
-  return [...roleCandidates(role, i)].sort((a, b) => rankScalar(a, c) - rankScalar(b, c));
+  return [...roleCandidates(role, i)].sort((a, b) => compareRank(a, b, c));
 }
 function roleTopRank(role, i) {
   if (role !== "qa" && role !== "triage" && !i.seats[role]) return NOTHING_ACTIONABLE;
@@ -5613,7 +5630,7 @@ function actionableSummary(i, pending) {
   const c = i.contract ?? DEFAULT_CONTRACT;
   const all = pending.flatMap((role) => roleCandidates(role, i));
   if (all.length === 0) return { count: 0 };
-  const top = all.reduce((best, t) => rankScalar(t, c) < rankScalar(best, c) ? t : best);
+  const top = all.reduce((best, t) => compareRank(t, best, c) < 0 ? t : best);
   return { count: all.length, top };
 }
 var FIXED_RANK = { qa: -2, triage: -1 };
@@ -5839,6 +5856,7 @@ function blockers(t, i) {
 function modeCell(t, i) {
   return i.workModes && i.workModes.modes.size > 0 ? modeOf(t, i.workModes) : "\u2014";
 }
+var effCell = (t) => `p${effectivePriority(t)}${positionRank(t) === Number.POSITIVE_INFINITY ? "" : ` #${positionRank(t)}`}`;
 var sorted = (ts) => [...ts].sort(compareRank);
 var stream = (segments) => `${segments.join("\n")}
 `;
@@ -5857,7 +5875,7 @@ function buildingDigest(i) {
     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"} | p${effectivePriority(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)} | ${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" : `
@@ -5897,7 +5915,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] : []
   ]);
@@ -5918,7 +5936,7 @@ function qaDigest(i) {
     const n = newFromOthers(i, t.id);
     const dir = i.dirFor ? i.dirFor(t) : null;
     const repo = i.dirFor ? dir ?? "**NO CHECKOUT**" : "";
-    return `| ${displayKey2(t)} | ${repo} | ${modeCell(t, i)} | ${t.status} | ${builtBy(t)} | ${who(t, i)} | ${filedBy(t, i)} | ${t.severity ?? "\u2014"} | ${t.priority ?? "\u2014"} | p${effectivePriority(t)} | ${branchCell(t)} | ${worktreeCell(t)} | ${t.updated_at.slice(0, 16)}Z | ${lastComment(i, t.id)} | ${n > 0 ? `**${n} new**` : "\u2014"} |`;
+    return `| ${displayKey2(t)} | ${repo} | ${modeCell(t, i)} | ${t.status} | ${builtBy(t)} | ${who(t, i)} | ${filedBy(t, i)} | ${t.severity ?? "\u2014"} | ${t.priority ?? "\u2014"} | ${effCell(t)} | ${branchCell(t)} | ${worktreeCell(t)} | ${t.updated_at.slice(0, 16)}Z | ${lastComment(i, t.id)} | ${n > 0 ? `**${n} new**` : "\u2014"} |`;
   };
   const waiting = i.tickets.filter((t) => (t.status === "qa" || t.status === "fixed") && i.blocked.has(t.id));
   const takeable = (status2) => i.tickets.filter((t) => t.status === status2 && !i.blocked.has(t.id));
@@ -5926,7 +5944,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.
 
@@ -6113,6 +6131,7 @@ async function decideCycle(o) {
     data: { tickets: tickets.length, comments: comments.length }
   });
   const epicColumn = tracker.contract.columns.epic;
+  const positionColumn = tracker.contract.columns.position;
   const epicBuilding = tracker.contract.epics.statuses.building;
   const epicStatusColumn = tracker.contract.epics.statusColumn;
   const epicStatusById = new Map(epicRows.map((e) => [e.id, e[epicStatusColumn] ?? null]));
@@ -6132,6 +6151,9 @@ async function decideCycle(o) {
   for (const t of tickets) {
     const epicId = t[epicColumn];
     t.epicInProgress = typeof epicId === "string" && epicStatusById.get(epicId) === epicBuilding;
+    const pos = t[positionColumn];
+    const n = typeof pos === "string" && pos.trim() !== "" ? Number(pos) : pos;
+    t.position = typeof n === "number" && Number.isFinite(n) ? n : null;
   }
   const extra = await tracker.ticketsByIds(missingBlockerIds(tickets));
   const info = blockerInfoMap(tickets, extra);
@@ -8421,7 +8443,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.42.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",

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

@@ -183,13 +183,17 @@ should is Step 1's call, not a filesystem check.
   and then it is a stop for a person (see "Stopping"), never a bare comment.
 - Otherwise pick from the digest's "Step 2" table, which is already
   `accepted`, in your lane and in order. Absent a digest, fetch those tickets
-  and order them by **effective priority, then severity, then `issue_id`**:
+  and order them by **effective priority, then manual position, then severity, then `issue_id`**:
   - **Effective priority** is the stronger of the ticket's own `priority`
     and one derived from `severity` (`s1`→p0, `s2`→p1, `s3`→p2, `s4`→p3;
     neither set → p2). p0 beats p1 beats p2 beats p3, so an explicit
     priority can only move a ticket *forward*. Priority is an escalation
     lever; to rank something down, lower its severity.
-  - Within one tier, more severe first (`s1` … `s4`, then unset).
+  - Within one tier, a ticket with a manual **`position`** (a lower number
+    is earlier) goes before one without; position only orders tickets of the
+    same effective priority and never lets a lower tier jump a higher one. A
+    workspace with no position column skips this clause.
+  - Then more severe first (`s1` … `s4`, then unset).
   - Within one severity, a ticket whose **epic is already in progress** goes
     first (finishing beats starting); a `planned` epic or none ranks the
     same. Only then oldest `issue_id` first.

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

@@ -183,13 +183,17 @@ should is Step 1's call, not a filesystem check.
   and then it is a stop for a person (see "Stopping"), never a bare comment.
 - Otherwise pick from the digest's "Step 2" table, which is already
   `accepted`, in your lane and in order. Absent a digest, fetch those tickets
-  and order them by **effective priority, then severity, then `issue_id`**:
+  and order them by **effective priority, then manual position, then severity, then `issue_id`**:
   - **Effective priority** is the stronger of the ticket's own `priority`
     and one derived from `severity` (`s1`→p0, `s2`→p1, `s3`→p2, `s4`→p3;
     neither set → p2). p0 beats p1 beats p2 beats p3, so an explicit
     priority can only move a ticket *forward*. Priority is an escalation
     lever; to rank something down, lower its severity.
-  - Within one tier, more severe first (`s1` … `s4`, then unset).
+  - Within one tier, a ticket with a manual **`position`** (a lower number
+    is earlier) goes before one without; position only orders tickets of the
+    same effective priority and never lets a lower tier jump a higher one. A
+    workspace with no position column skips this clause.
+  - Then more severe first (`s1` … `s4`, then unset).
   - Within one severity, a ticket whose **epic is already in progress** goes
     first (finishing beats starting); a `planned` epic or none ranks the
     same. Only then oldest `issue_id` first.