@feigi/fleet-ctl 3.99.1 → 3.99.3

package/package.json

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

package/scripts/pull-attribution.mjs

@@ -18,12 +18,20 @@
 //     the Pull whose implementer rows carry that PR in `pr`.
 //   - A nested member books with its nearest booked ancestor.
 //
-// RULING. A Pull's candidate Ruling is `rulingFor` of its ticket and date. One
-// PR's merge counts once: among the Pulls whose candidate names it, the Pull
-// whose implementer rows carry the PR takes it, with the verdict of the latest
-// such ruling row in file order. When none carries it, the last of them in
-// file order takes it and is unpriced, since its PR's review and fix spend
-// cannot be booked. The other candidates stay unruled.
+// RULING. One PR's merge counts once, to one Pull. First, carrier binding: a
+// Pull takes the Ruling of a PR it is the carrier of (the last Pull in file
+// order whose implementer rows carry the PR) when a ruling row names that PR,
+// the latest such row in file order, whatever its ticket or date. A Pull that
+// carries several ruled PRs takes the one whose ruling row is latest in file
+// order and leaves the others to the date floor. Every ruling row of the bound
+// row's tickets is checked as `rulingFor` checks the Pull's own ticket's, so a
+// Pull can be refused for a bad row of a ticket that is not its own.
+// Then the date-floor fallback: each other Pull's candidate Ruling is
+// `rulingFor` of its ticket and date, unless a carrier took that PR. Among the
+// Pulls whose candidate names a PR, the last in file order takes it, with the
+// verdict of the latest such ruling row in file order, and is unpriced, since
+// its PR's review and fix spend cannot be booked. The other candidates stay
+// unruled.
 //
 // MERGED: the Pull holds a Ruling and, when PR states are given, its PR is
 // MERGED. With PR states, a ruled PR that is OPEN or not in the list, or an
@@ -305,20 +313,34 @@ export function attribute({ features, members, tiers, prs = null, windowStart =
     }
   }
 
-  // Rulings: each PR's merge to one Pull.
+  // Rulings: each PR's merge to one Pull, carriers first, then the date floor.
   const inWindow = pulls.filter((p) => windowStart === null || p.run_date >= windowStart);
   const rulings = rulingsByTicket(tiers);
   const fileOrder = new Map(tiers.map((t, i) => [t, i]));
-  const candidates = new Map(); // pr -> [{ pull, ruling }]
+  // Each PR to its latest ruling row in file order, whatever its ticket or date.
+  const ruleRows = new Set([...rulings.values()].flat());
+  const rulingOfPr = new Map(tiers.filter((t) => ruleRows.has(t)).map((t) => [t.pr, t]));
+  const ruled = new Map(); // pull -> { pr, ruling, carried }
+  const candidates = new Map(); // pr -> [{ pull, ruling }], the Pulls no carrier binding ruled
   for (const p of inWindow) {
-    const ruling = rulingFor(rulings, p.ticket, p.run_date);
-    if (ruling) (candidates.get(ruling.pr) ?? candidates.set(ruling.pr, []).get(ruling.pr)).push({ pull: p, ruling });
+    // Called for every Pull, bound or not, so a bad ruling row of its ticket is refused either way.
+    const candidate = rulingFor(rulings, p.ticket, p.run_date);
+    let bound = null;
+    for (const r of impls.get(p)) {
+      const row = carrier.get(r.pr) === p ? rulingOfPr.get(r.pr) : undefined;
+      if (row && (bound === null || fileOrder.get(row) > fileOrder.get(bound))) bound = row;
+    }
+    if (bound) {
+      // A bound row of another ticket is refused on the same terms as one of the Pull's own.
+      for (const t of String(bound.ticket).split("+")) rulingFor(rulings, t, "");
+      ruled.set(p, { pr: bound.pr, ruling: bound, carried: true });
+    } else if (candidate) (candidates.get(candidate.pr) ?? candidates.set(candidate.pr, []).get(candidate.pr)).push({ pull: p, ruling: candidate });
   }
-  const ruled = new Map(); // pull -> { pr, ruling, carried }
+  const taken = new Set([...ruled.values()].map((r) => r.pr));
   for (const [pr, cands] of candidates) {
+    if (taken.has(pr)) continue;
     const ruling = cands.reduce((a, c) => (fileOrder.get(c.ruling) > fileOrder.get(a) ? c.ruling : a), cands[0].ruling);
-    const held = cands.find((c) => c.pull === carrier.get(pr));
-    ruled.set(held?.pull ?? cands.at(-1).pull, { pr, ruling, carried: !!held });
+    ruled.set(cands.at(-1).pull, { pr, ruling, carried: false });
   }
 
   const state = prs && new Map(prs.map((p) => [String(p.number), p.state]));