@feigi/fleet-ctl 3.96.0 → 3.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feigi/fleet-ctl",
-  "version": "3.96.0",
+  "version": "3.97.0",
   "description": "Agent fleet: run-team controller, merge bot, PR reviewer, and the ticket pipeline they share",
   "license": "Apache-2.0",
   "repository": {

package/scripts/member-outcomes.mjs

@@ -252,6 +252,19 @@ export function endingOf({ member, pr, signals = null, earlierPrs = new Set(), v
 
 // The member's last report, when the last one it wrote is a valid impl report
 // naming this member; null when it wrote none, or the last one is malformed.
+// "Valid" is `reportViolation("impl", …)` as it stands now, so a last report
+// that fails an impl rule is no report and the member reads the stop its
+// transcript actually had (`provider`, `budget`, `abort`, `crash`, `hollow`).
+// That includes a `bailed` report that names a `pr` or a `head`, and a
+// `blocked` one that does: a bail is the pre-code outcome and a block reports
+// no PR, so neither reads `bail:<cause>` or `blocked`. A `covered` bail names
+// its PR in `bailDetail` with `pr: null`, and stays a bail.
+// A transcript written before that rule existed is read under the current
+// rule, so a re-scrape can turn a recorded `bail:<cause>` into a non-bail
+// ending. When this was written the one recorded case was `impl-3655`,
+// `bail:hands` with `pr: null` and a `head`, which reads `hollow` once
+// re-scraped. That flip is accepted: it matches the glossary's "valid bail",
+// and `mergeRows()` keeps no earlier `bail:*` row against it.
 function lastReport(reportWrites, leaf) {
   const last = reportWrites.filter((r) => r.file === `${leaf}.json`).at(-1);
   if (!last) return null;

package/scripts/pr-cost.mjs

@@ -31,13 +31,14 @@
 // their nested members, and its merge through its Ruling — merged when that
 // PR's state is MERGED. A Pull is counted, or excluded (no Admissible row),
 // pending (its PR still open, or not in the list), left out (never merged, no
-// `fixed` bail, and every ending the ticket's or neither's) or unpriced (a
+// `fixed` bail, and every ending the ticket's or neither's), unpriced (a
 // booked row with a blank `cost`, or a Ruling whose PR none of its
-// implementers carries); only counted Pulls enter a cell's figures. A `cost`
-// that is neither blank nor a number is an input error (exit 2), as is a
-// ticket-features `run_date` that is neither blank nor YYYY-MM-DD, or a ruling
-// of a windowed Pull's ticket whose run_date is not YYYY-MM-DD or whose verdict
-// is not yes or no.
+// implementers carries) or untimed (a booked row whose `agent` names no
+// parent with a blank `work_s`); only counted Pulls enter a cell's figures. A
+// `cost` or `work_s` that is neither blank nor a number is an input error
+// (exit 2), as is a ticket-features `run_date` that is neither blank nor
+// YYYY-MM-DD, or a ruling of a windowed Pull's ticket whose run_date is not
+// YYYY-MM-DD or whose verdict is not yes or no.
 //
 // PER CELL GENERATION (pull-attribution.mjs's GENERATION), over its counted
 // Pulls: `generation`, the dispatch model; `n_pulls`; `n_merged`; `n_claims`
@@ -49,12 +50,12 @@
 // merged Pulls alone, descriptive; `router_usd`, the Pulls' own routing cost,
 // summed and never in their spend. `usd_diff_ci95` is a bootstrap 95% interval
 // on `mean_usd` minus the baseline's — printed to be read, never judged on.
-// Then the `left_out` and `unpriced` Pull counts, and the cell's `excluded`
-// count, which no generation owns. The baseline, the guard file's cells and
-// every trip are each cell's newest generation alone, so a cell whose model
-// changed is judged afresh once its new generation reaches MIN_N merged PRs.
-// Each older generation prints on its own line beside the newest, with no
-// verdict and no interval.
+// Then the `left_out`, `unpriced` and `untimed` Pull counts, and the cell's
+// `excluded` count, which no generation owns. The baseline, the guard file's
+// cells and every trip are each cell's newest generation alone, so a cell
+// whose model changed is judged afresh once its new generation reaches MIN_N
+// merged PRs. Each older generation prints on its own line beside the newest,
+// with no verdict and no interval.
 
 import { execFileSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -120,6 +121,7 @@ export function computeReport({ members, tiers, features, prs, routerTable = nul
     usd_diff_ci95: !newest || cell === BASELINE_CELL || !base ? null : bootstrapDiffCI(bootUnits(g), bootUnits(base)),
     left_out: g.left_out,
     unpriced: g.unpriced,
+    untimed: g.untimed,
   });
   const figures = [...tallies.values()].map((t) => ({
     ...figuresOf(t.cell, t, true),
@@ -212,7 +214,7 @@ export function crossCheck(rows, pricing) {
 
 const TSV_COLUMNS = [
   "cell", "generation", "n_pulls", "n_merged", "n_claims", "n_failed", "fail_rate", "mean_usd", "median_usd", "router_usd", "usd_diff_ci95",
-  "excluded", "left_out", "unpriced", "guard",
+  "excluded", "left_out", "unpriced", "untimed", "guard",
 ];
 
 // One line per cell's newest generation, carrying the guard's verdict on it,
@@ -247,7 +249,7 @@ export function guardFile(report, computedAt) {
     computed_at: computedAt,
     window_start: report.window_start,
     baseline: report.baseline,
-    cells: report.cells.map((f) => ({ cell: f.cell, generation: f.generation, n: f.n_merged, mean_usd: f.mean_usd, fail_rate: f.fail_rate })),
+    cells: report.cells.map((f) => ({ cell: f.cell, generation: f.generation, n: f.n_merged, mean_usd: f.mean_usd, fail_rate: f.fail_rate, untimed: f.untimed })),
     tripped: report.tripped,
     verdict: report.verdict,
     retire: report.retire,

package/scripts/pull-attribution.mjs

@@ -36,6 +36,7 @@
 //             implementer ending is the ticket's or neither's;
 //   unpriced  a booked row's `cost` is blank, or the Pull took its Ruling
 //             without carrying its PR;
+//   untimed   a booked row whose `agent` names no parent has a blank `work_s`;
 //   counted   every other Pull: the only ones in a cell's figures.
 //
 // ENDINGS come from member-outcomes' `ending` column. The cell's: `hollow`,
@@ -50,6 +51,12 @@
 // SPEND is the recorded `cost` of every row booked to the Pull. A `cost` that
 // is neither blank nor a number is refused, naming the row.
 //
+// WORK TIME is the summed `work_s` of the rows booked to the Pull whose
+// `agent` names no parent: every implementer, rescues included, and the PR's
+// review, fix and finisher members. A nested member adds nothing, since its
+// time lies inside its parent's. A `work_s` that is neither blank nor a number
+// is refused, naming the row.
+//
 // GENERATION. A cell's figures are per Cell generation: the cell on one
 // dispatch model, member-outcomes' `dispatch_model`. A Pull's generation is
 // the dispatch model of its first Admissible implementer row in dispatch
@@ -242,23 +249,26 @@ export function pullGenerations(pulls, members) {
   return new Map(pulls.map((p) => [p, generationOf(impls.get(p), p.chosen_cell)]));
 }
 
-function costOf(row) {
-  const c = String(row.cost ?? "");
+// A booked row's recorded number in `column` (`field` on the parsed row; `column` defaults to `field` where the two names agree): null when blank; refused, naming the row, when neither blank nor a number.
+function numberOf(row, field, column = field) {
+  const c = String(row[field] ?? "");
   if (c === "") return null;
   const n = Number(c);
-  if (c.trim() === "" || !Number.isFinite(n)) throw new AttributionError(`member-outcomes row session ${row.session} agent ${row.agent}: cost '${c}' is not a number`);
+  if (c.trim() === "" || !Number.isFinite(n)) throw new AttributionError(`member-outcomes row session ${row.session} agent ${row.agent}: ${column} '${c}' is not a number`);
   return n;
 }
 
 /**
  * One unit per ticket-features row dated on or after `windowStart` (every dated
  * row when null), in file order: `{ pull, cell, stratum, generation, status,
- * merged, pr, ruling, pendingPr, claims, falseClaims, rows, spend }`,
- * `generation` null exactly when the Pull is excluded. `prs` is `gh pr list`'s
+ * merged, pr, ruling, pendingPr, claims, falseClaims, rows, spend, workS }`,
+ * `generation` null exactly when the Pull is excluded. `spend` is null when a
+ * booked `cost` is blank, and `workS`, its work time in seconds, when a booked
+ * `work_s` of a row naming no parent is. `prs` is `gh pr list`'s
  * `{ number, state }` rows, or null when PR state is unknown (the fit). `stratum`
  * maps a features row to its stratum. Throws `AttributionError` on a features
- * row it cannot date or a booked `cost` it cannot read, and `RulingError` as
- * `rulingFor` does.
+ * row it cannot date or a booked `cost` or `work_s` it cannot read, and
+ * `RulingError` as `rulingFor` does.
  */
 export function attribute({ features, members, tiers, prs = null, windowStart = null, stratum = () => null }) {
   const pulls = datedRows(features);
@@ -326,11 +336,15 @@ export function attribute({ features, members, tiers, prs = null, windowStart =
       if (m.ending === "bail:fixed" || m.ending === "bail:fixed-refuted") claims++;
       if (m.ending === "bail:fixed-refuted") falseClaims++;
     }
-    let spend = 0, blank = false;
+    let spend = 0, blank = false, workS = 0, untimed = false;
     for (const m of booked) {
-      const c = costOf(m);
+      const c = numberOf(m, "cost");
       if (c === null) blank = true;
       else spend += c;
+      const w = numberOf(m, "workS", "work_s");
+      if (String(m.agent).includes("/")) continue;
+      if (w === null) untimed = true;
+      else workS += w;
     }
     const generation = generationOf(own, pull.chosen_cell);
     let status = "counted";
@@ -338,9 +352,10 @@ export function attribute({ features, members, tiers, prs = null, windowStart =
     else if (pendingPr !== null) status = "pending";
     else if (claims === 0 && own.every((m) => ticketsEnding(m.ending) || NEITHER_ENDINGS.has(m.ending))) status = "left-out";
     else if (blank || (r && !r.carried)) status = "unpriced";
+    else if (untimed) status = "untimed";
     return {
       pull, cell: pull.chosen_cell, stratum: stratum(pull), generation, status, merged, pr: r?.pr ?? null, ruling: r?.ruling ?? null,
-      pendingPr, claims, falseClaims, rows: booked, spend: blank ? null : spend,
+      pendingPr, claims, falseClaims, rows: booked, spend: blank ? null : spend, workS: untimed ? null : workS,
     };
   });
 }
@@ -365,11 +380,12 @@ export function generations(units) {
 
 /**
  * Per cell, in cell-name order: `{ cell, generation, n, merged, claims, failed,
- * spend, pulls, excluded, left_out, unpriced, pending, older }`. `generation`
- * is the cell's newest (null when no Pull of it has one), and the figures
- * beside it are that generation's alone: `n`, `merged`, `claims`, `failed` and
- * `spend` over its counted Pulls, `pulls` those counted units themselves in
- * the order of `units`, then its left-out, unpriced and pending Pull counts.
+ * spend, workS, pulls, excluded, left_out, unpriced, untimed, pending, older }`.
+ * `generation` is the cell's newest (null when no Pull of it has one), and the
+ * figures beside it are that generation's alone: `n`, `merged`, `claims`,
+ * `failed`, `spend` and `workS` (work time, in seconds) over its counted
+ * Pulls, `pulls` those counted units themselves in the order of `units`, then
+ * its left-out, unpriced, untimed and pending Pull counts.
  * `excluded` counts the cell's excluded Pulls, which have no generation.
  * `older` is an array, newest first, of every other generation's figures in
  * the same shape, each carrying its `generation`. `order` is `generations()`
@@ -380,7 +396,8 @@ export function generations(units) {
 export function tally(units, order = generations(units)) {
   // `n` is read off `pulls`, so the count and the list cannot drift apart.
   const figures = (generation) => ({
-    generation, get n() { return this.pulls.length; }, merged: 0, claims: 0, failed: 0, spend: 0, pulls: [], left_out: 0, unpriced: 0, pending: 0,
+    generation, get n() { return this.pulls.length; }, merged: 0, claims: 0, failed: 0, spend: 0, workS: 0, pulls: [],
+    left_out: 0, unpriced: 0, untimed: 0, pending: 0,
   });
   const cells = new Map();
   for (const u of units) {
@@ -396,6 +413,7 @@ export function tally(units, order = generations(units)) {
       f.claims += u.claims;
       f.failed += u.falseClaims;
       f.spend += u.spend;
+      f.workS += u.workS;
       f.pulls.push(u);
     } else f[u.status.replace("-", "_")]++;
   }

package/scripts/ticket-router.mjs

@@ -347,8 +347,10 @@ function fitPulls({ features, members, verdicts, window }) {
 }
 
 // Per stratum and `*`, per cell, its newest generation's figures: `n` counted
-// Pulls, `merged`, $ per merged PR, false claims over claims, fix rounds per
-// merged PR, and its left-out and unpriced Pull counts. Beside them the cell's
+// Pulls, `merged`, $ per merged PR, minutes of work time per merged PR, false
+// claims over claims, fix rounds per merged PR, and its left-out, unpriced and
+// untimed Pull counts. Both per merged PR figures take every counted Pull,
+// merged or not, over the merged ones. Beside them the cell's
 // excluded Pull count, `generation` naming the newest generation's model, and
 // `older`, each older generation's model to its figures, newest first. Beside
 // `estimates`, `pulls`: per stratum and `*`, per cell, the newest generation's
@@ -370,11 +372,13 @@ function estimate(units, order) {
           claims: g.claims,
           failed: g.failed,
           usd_per_merged: g.merged ? round4(g.spend / g.merged) : null,
+          minutes_per_merged: g.merged ? round4(g.workS / 60 / g.merged) : null,
           fail_rate: g.claims ? round4(g.failed / g.claims) : null,
           fix_rounds: g.merged ? round4(fix / g.merged) : null,
           review_findings: null,
           left_out: g.left_out,
           unpriced: g.unpriced,
+          untimed: g.untimed,
         };
       };
       estimates[s][t.cell] = {
@@ -532,11 +536,11 @@ export function mergedSince({ table, features, members, verdicts, fitted }) {
 // Each cell's Pull counts over every stratum, as the fit prints them: its
 // newest generation, then each older one.
 function cellCounts(estimates) {
-  const usd = (x) => (x === null ? "-" : x.toFixed(2));
-  const counts = (e) => `n=${e.n} merged=${e.merged} failed=${e.failed} usd_per_merged=${usd(e.usd_per_merged)}`;
+  const two = (x) => (x === null ? "-" : x.toFixed(2));
+  const counts = (e) => `n=${e.n} merged=${e.merged} failed=${e.failed} usd_per_merged=${two(e.usd_per_merged)} minutes_per_merged=${two(e.minutes_per_merged)}`;
   return Object.entries(estimates["*"] ?? {})
     .map(([c, e]) => [
-      `${c} ${e.generation ?? "-"} ${counts(e)} excluded=${e.excluded} left_out=${e.left_out} unpriced=${e.unpriced}`,
+      `${c} ${e.generation ?? "-"} ${counts(e)} excluded=${e.excluded} left_out=${e.left_out} unpriced=${e.unpriced} untimed=${e.untimed}`,
       ...Object.entries(e.older).map(([g, o]) => `${c} ${g} (older) ${counts(o)}`),
     ].join(", "))
     .join(", ") || "none";
@@ -684,7 +688,7 @@ function main() {
     }
     return sha;
   };
-  // The join throws on a features row it cannot date, a booked member row whose `cost` is not a number, and a
+  // The join throws on a features row it cannot date, a booked member row whose `cost` or `work_s` is not a number, and a
   // ruling of a windowed Pull's ticket it cannot place — for `fit` and `--check` too on a Pull the fit then skips
   // as a live B classifier's, since every windowed Pull is booked before that skip. Anything else it throws is a
   // bug, never bad input, so it surfaces with its stack.