@tablation/crew 0.20.2 → 0.21.0

package/dist/cli.js

@@ -1842,6 +1842,7 @@ var DEFAULT_CONTRACT = {
   unknownPriorityRank: 2,
   coordinatingValue: "coordinating",
   manualWorkMode: "manual",
+  hybridWorkMode: "hybrid",
   repoExemptReportTypes: ["coordinating", "question", "investigation"]
 };
 function closedStatuses(c) {
@@ -1863,6 +1864,7 @@ function resolveContract(override) {
     unknownPriorityRank: override.unknownPriorityRank ?? DEFAULT_CONTRACT.unknownPriorityRank,
     coordinatingValue: override.coordinatingValue ?? DEFAULT_CONTRACT.coordinatingValue,
     manualWorkMode: override.manualWorkMode ?? DEFAULT_CONTRACT.manualWorkMode,
+    hybridWorkMode: override.hybridWorkMode ?? DEFAULT_CONTRACT.hybridWorkMode,
     // A workspace overriding `coordinatingValue` alone (renaming the rollup
     // marker) still gets that renamed value exempted here by default,
     // without also having to repeat it — only an explicit
@@ -3243,14 +3245,33 @@ var SHELL_WORDS = /* @__PURE__ */ new Set([
 ]);
 
 // src/work-mode.ts
-function manualProjectIds(rows, contract) {
-  const out = /* @__PURE__ */ new Set();
-  for (const r of rows) if (r[contract.columns.workMode] === contract.manualWorkMode) out.add(r.id);
+function projectWorkModes(rows, contract) {
+  const out = /* @__PURE__ */ new Map();
+  for (const r of rows) {
+    const v = r[contract.columns.workMode];
+    out.set(r.id, v === contract.manualWorkMode ? "manual" : v === contract.hybridWorkMode ? "hybrid" : "automatic");
+  }
   return out;
 }
-function withinWorkMode(tickets, me, manual) {
-  if (!manual || manual.size === 0) return tickets;
-  return tickets.filter((t) => !t.project_id || !manual.has(t.project_id) || !!me && t.assignee_id === me);
+function agentAssigneeIds(crewRows, isHoldRow) {
+  return new Set(crewRows.filter((r) => !!r.agent_id && !isHoldRow(r.id)).map((r) => r.id));
+}
+function modeOf(t, wm) {
+  if (!t.project_id) return "manual";
+  return wm.modes.get(t.project_id) ?? "automatic";
+}
+function withinWorkMode(tickets, wm) {
+  if (!wm || wm.modes.size === 0) return tickets;
+  return tickets.filter((t) => {
+    const mode = modeOf(t, wm);
+    if (mode === "automatic") return true;
+    if (mode === "manual") return false;
+    return !!t.assignee_id && wm.agentAssignees.has(t.assignee_id);
+  });
+}
+function isAutomatic(t, wm) {
+  if (!wm || wm.modes.size === 0) return true;
+  return modeOf(t, wm) === "automatic";
 }
 
 // src/board-lock.ts
@@ -3475,19 +3496,19 @@ var Tracker = class {
     }
   }
   /**
-   * Ids of the Projects (area) rows in `manual` work mode (CREW-1445). One
-   * extra read per cycle. A workspace with no Projects table, no `work_mode`
-   * column, a null value or an unreadable table yields the empty set: every
-   * project stays automatic, exactly as before the column existed.
+   * Every Projects (area) row's work mode (CREW-1445, CREW-1493). One extra
+   * read per cycle. A workspace with no Projects table, no `work_mode` column
+   * or an unreadable table yields the empty map, which the selection reads as
+   * "no filtering"; a null value is `automatic`.
    */
-  async manualProjectIds() {
+  async projectWorkModes() {
     const model = this.route.resolved?.areaModelId;
-    if (!model) return /* @__PURE__ */ new Set();
+    if (!model) return /* @__PURE__ */ new Map();
     try {
       const rows = await this.client.records.list(model, { limit: 200 });
-      return manualProjectIds(rows, this.contract);
+      return projectWorkModes(rows, this.contract);
     } catch {
-      return /* @__PURE__ */ new Set();
+      return /* @__PURE__ */ new Map();
     }
   }
   /** Every `Projects` (area) row — what `crew repos add` offers when a new Repos row needs one. */
@@ -4156,7 +4177,7 @@ function holdWarnings(tickets, ships, contract, humanHolds, now = Date.now()) {
 // src/select.ts
 var qaSlice = (tickets) => tickets.filter((t) => t.status === "fixed" || t.status === "qa");
 var buildingSlice = (tickets, role) => tickets.filter((t) => role === "design" ? t.needs_design === true : t.needs_design !== true);
-var triageSlice = (tickets, triageSeat) => triageSeat ? tickets.filter((t) => t.assignee_id === triageSeat) : [];
+var triageSlice = (tickets, triageSeat, wm) => triageSeat ? tickets.filter((t) => t.assignee_id === triageSeat && isAutomatic(t, wm)) : [];
 function sliceFor(tickets, role) {
   if (role === "qa") return qaSlice(tickets);
   if (role === "triage") return triageSlice(tickets);
@@ -4184,7 +4205,7 @@ function notHeldByOtherShip(slice, i) {
 function buildingRoleHasWork(role, i) {
   const me = i.seats[role];
   if (!me) return { hasWork: false, reason: "this ship does not crew that role" };
-  const mine = withinWorkMode(notInStoppedRepo(notHeldByOtherShip(sliceFor(i.tickets, role), i), i), me, i.manualProjects);
+  const mine = withinWorkMode(notInStoppedRepo(notHeldByOtherShip(sliceFor(i.tickets, role), i), i), i.workModes);
   const startable = mine.filter(
     (t) => (t.status === "accepted" || t.status === "blocked") && !i.blocked.has(t.id) && !isHeld(t, i.holds)
   );
@@ -4213,12 +4234,12 @@ function buildingRoleHasWork(role, i) {
 }
 function qaRoleHasWork(i) {
   if (!i.seats.qa) return { hasWork: false, reason: "this ship does not crew that role" };
-  const n = notHeldByOtherShip(qaSlice(i.tickets), i).filter((t) => !isHeld(t, i.holds)).length;
+  const n = withinWorkMode(notHeldByOtherShip(qaSlice(i.tickets), i), i.workModes).filter((t) => !isHeld(t, i.holds)).length;
   return n > 0 ? { hasWork: true, reason: `${n} ticket(s) awaiting or in verification` } : { hasWork: false, reason: "nothing awaiting verification" };
 }
 function triageRoleHasWork(i) {
   if (!i.seats.triage) return { hasWork: false, reason: "this ship does not crew that role" };
-  const n = triageSlice(i.tickets, i.seats.triage).length;
+  const n = triageSlice(i.tickets, i.seats.triage, i.workModes).length;
   return n > 0 ? { hasWork: true, reason: `${n} report(s) assigned to triage` } : { hasWork: false, reason: "nothing assigned to triage" };
 }
 function roleHasWork(role, i) {
@@ -4229,12 +4250,12 @@ function roleHasWork(role, i) {
   return buildingRoleHasWork(role, i);
 }
 function roleCandidates(role, i) {
-  if (role === "qa") return notHeldByOtherShip(qaSlice(i.tickets), i).filter((t) => !isHeld(t, i.holds));
-  if (role === "triage") return triageSlice(i.tickets, i.seats.triage).filter((t) => !isHeld(t, i.holds));
+  if (role === "qa") return withinWorkMode(notHeldByOtherShip(qaSlice(i.tickets), i), i.workModes).filter((t) => !isHeld(t, i.holds));
+  if (role === "triage") return triageSlice(i.tickets, i.seats.triage, i.workModes).filter((t) => !isHeld(t, i.holds));
   if (role === "pair") return [];
   const me = i.seats[role];
   if (!me) return [];
-  return withinWorkMode(notInStoppedRepo(notHeldByOtherShip(sliceFor(i.tickets, role), i), i), me, i.manualProjects).filter(
+  return withinWorkMode(notInStoppedRepo(notHeldByOtherShip(sliceFor(i.tickets, role), i), i), i.workModes).filter(
     (t) => ((t.status === "accepted" || t.status === "blocked") && !i.blocked.has(t.id) || t.status === "in_progress" && (t.assignee_id === me || !t.assignee_id)) && !isHeld(t, i.holds)
   );
 }
@@ -4529,7 +4550,7 @@ ${sorted(held).map((t) => `| ${displayKey2(t)} | ${stopOf(t)} |`).join("\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**`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.manualProjects && i.manualProjects.size > 0 ? ["\n**Manual projects.** Some projects on this board are in manual work mode: their tickets appear below only when a person has assigned them to YOU. An unassigned `accepted` ticket in such a project is not yours to claim and is deliberately absent \u2014 do not go looking for it.\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",
     "\n`fixed` tickets are deliberately absent: they belong to the QA lane.\n",
     table(step1, i, header, row),
@@ -4717,13 +4738,13 @@ async function decideCycle(o) {
   const { route, ship, state, emit } = o;
   const tracker = new Tracker(route, ship);
   emit.enter("poll");
-  const [tickets, comments, crewRows, epicRows, ships, manualProjects] = await Promise.all([
+  const [tickets, comments, crewRows, epicRows, ships, projectModes] = await Promise.all([
     tracker.openTickets(),
     tracker.comments(200),
     tracker.crewRows(),
     tracker.epicRows(),
     tracker.shipRows(),
-    tracker.manualProjectIds()
+    tracker.projectWorkModes()
   ]);
   emit.emit(`${tickets.length} open ticket(s), ${comments.length} comment(s)`, {
     data: { tickets: tickets.length, comments: comments.length }
@@ -4755,6 +4776,7 @@ async function decideCycle(o) {
   emit.enter("sweep");
   const roster = buildRoster(configuredMembers(route), crewRows);
   const holds2 = new Set(holdIds(roster));
+  const workModes = { modes: projectModes, agentAssignees: agentAssigneeIds(crewRows, (id) => holds2.has(id)) };
   const diag = sweepDiagnostics(tickets, info);
   for (const d of diag.dangling) emit.warn(`dangling blocked_by reference, ignored: ${d}`);
   if (diag.selfBlocked.length) {
@@ -4831,7 +4853,7 @@ async function decideCycle(o) {
   await checkRepoDisks({ state, emit, route, ship });
   const selectionInput = {
     repoStop: repoStopFor(openShipAttention(state), route),
-    manualProjects,
+    workModes,
     tickets,
     comments,
     watermark,
@@ -4926,8 +4948,8 @@ function writeDigest(o, d, role, stateDir) {
         }
         return existingBranchForTicket(dir, repoFor(dir), t, role);
       },
-      tickets: role === "triage" ? d.tickets.filter((t) => t.assignee_id === o.route.resolved?.seats.triage) : role === "dev" || role === "design" ? withinWorkMode(sliceFor(d.tickets, role), me, d.selectionInput.manualProjects) : sliceFor(d.tickets, role),
-      manualProjects: d.selectionInput.manualProjects,
+      tickets: role === "triage" ? triageSlice(d.tickets, o.route.resolved?.seats.triage, d.selectionInput.workModes) : withinWorkMode(sliceFor(d.tickets, role), d.selectionInput.workModes),
+      workModes: d.selectionInput.workModes,
       comments: d.comments,
       me,
       roster: d.roster,

package/package.json

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