atris 3.74.29 → 3.76.0

package/lib/gm-season.js

@@ -11,7 +11,7 @@
 const fs = require('fs');
 const path = require('path');
 const { atrisRating } = require('./atris-rating');
-const { isProofNotSaved } = require('./release-kind');
+const { isProofNotSaved, isCouldNotStart } = require('./release-kind');
 
 const HOUR_MS = 60 * 60 * 1000;
 const DAY_MS = 24 * HOUR_MS;
@@ -22,13 +22,14 @@ const ACTIVE_MISSION_STATUSES = new Set(['running', 'ready']);
 const KEPT_ACTIONS = new Set(['accepted', 'merged']);
 const FINISHED = new Set(['landed', 'dropped', 'sent_back', 'abandoned']);
 const FORM_LETTER = { landed: 'k', dropped: 'd', sent_back: 'x', abandoned: 'a' };
-const PLAY_WORD = { took: 'took', landed: 'landed', dropped: 'dropped', sent_back: 'sent back', abandoned: 'abandoned', not_needed: 'not needed', held: 'held' };
+const PLAY_WORD = { took: 'took', landed: 'landed', dropped: 'dropped', sent_back: 'sent back', abandoned: 'abandoned', not_needed: 'not needed', held: 'held', could_not_start: 'unstarted' };
 // A person has this long after a drop to say the job did not need doing.
 const NOT_NEEDED_WINDOW_MS = 7 * DAY_MS;
 
 // An outcome is one play:
 // { event_id, task_id, member, title, kind, at, claimed_at, landed_by }
-// kind is took | landed | dropped | sent_back | abandoned | not_needed | held.
+// kind is took | landed | dropped | sent_back | abandoned | not_needed | held |
+// could_not_start.
 // abandoned is a claim that ended archived without landing; a job still in
 // review is pending and not counted. not_needed is a drop or abandon that
 // someone other than the member later confirmed the job never needed; it is
@@ -36,8 +37,14 @@ const NOT_NEEDED_WINDOW_MS = 7 * DAY_MS;
 // because the work is done and its pull request waits for a person, but the
 // proof that says so could not be saved; the release says so in a field
 // (lib/release-kind.js), never in its words. It is not finished either, so it
-// is neither a landing nor a miss. at and claimed_at are epoch ms; claimed_at
-// may be null. landed_by is autoland | you, only on landed.
+// is neither a landing nor a miss. could_not_start is a claim a flight let go
+// before the engine ran, because the build machine could not start the job; the
+// release says so in a field the same way. The member never touched the work, so
+// it is not finished and not a miss either. The field checks itself: a claim the
+// flight marked started (a build_started event after its claim, see
+// markBuildStarted in task-db.js) had its engine asked, so a release that says
+// could_not_start on it is a drop like any other. at and claimed_at are epoch
+// ms; claimed_at may be null. landed_by is autoland | you, only on landed.
 
 function byTimeAsc(a, b) {
   return Number(a.at || 0) - Number(b.at || 0);
@@ -50,7 +57,7 @@ function isFinished(outcome) {
 // jobs = landed + dropped + sent back + abandoned in the window, the same
 // count the rating divides by. Jobs still in review are pending.
 function tally(outcomes) {
-  const out = { took: 0, landed: 0, dropped: 0, sent_back: 0, abandoned: 0, not_needed: 0, held: 0 };
+  const out = { took: 0, landed: 0, dropped: 0, sent_back: 0, abandoned: 0, not_needed: 0, held: 0, could_not_start: 0 };
   for (const o of outcomes || []) {
     if (Object.prototype.hasOwnProperty.call(out, o.kind)) out[o.kind] += 1;
   }
@@ -309,6 +316,18 @@ function parseJson(text) {
   }
 }
 
+// When a landing happened. A merge a person made on GitHub is written down later, when the sweep
+// notices it, and its event says when the merge was (landed_at). The rating dates the landing by
+// that, so a merge swept in weeks late does not count as news. It is never later than the event
+// itself, so a time in the future cannot hold a landing inside the window; a time that cannot be
+// read leaves the landing dated when it was written down.
+function landedAt(row, payload) {
+  const written = Number(row.created_at);
+  const text = payload && typeof payload.landed_at === 'string' ? payload.landed_at.trim() : '';
+  const merged = text ? Date.parse(text) : NaN;
+  return Number.isFinite(merged) && Number.isFinite(written) ? Math.min(merged, written) : written;
+}
+
 function landedBy(row, payload) {
   if (payload && (payload.auto_accepted === true || payload.self_landed === true)) return 'autoland';
   return /auto/i.test(String(row.actor || '')) ? 'autoland' : 'you';
@@ -330,8 +349,13 @@ function outcomeFromEvent(row) {
     member = row.actor || payload.claimed_by;
   } else if (row.event_type === 'claim_released') {
     // A release that carries the proof-not-saved fields is work waiting on a person,
-    // not a drop. Only the fields say so: the same words with no fields stay a drop.
-    kind = isProofNotSaved(payload) ? 'held' : 'dropped';
+    // not a drop. One that carries the could-not-start kind was let go before the
+    // engine ran, so it is not a drop either, unless its claim was marked started
+    // (engine_started): then the kind is false and it is a drop. Only the fields say
+    // so: the same words with no fields stay a drop.
+    kind = isProofNotSaved(payload) ? 'held'
+      : isCouldNotStart(payload) && Number(row.engine_started) !== 1 ? 'could_not_start'
+        : 'dropped';
     member = payload.previous_claimed_by || payload.released_by || row.actor;
   } else if (row.event_type === 'claim_expired') {
     kind = 'dropped';
@@ -365,7 +389,7 @@ function outcomeFromEvent(row) {
     member: String(member),
     title: row.title || '',
     kind,
-    at: row.event_type === 'claim_expired' && Number.isFinite(leaseUntil) ? leaseUntil : Number(row.created_at),
+    at: row.event_type === 'claim_expired' && Number.isFinite(leaseUntil) ? leaseUntil : kind === 'landed' ? landedAt(row, payload) : Number(row.created_at),
     reason: kind !== 'took' && kind !== 'landed' ? (typeof payload.reason === 'string' && payload.reason.trim() || typeof payload.note === 'string' && payload.note.trim() || null) : null,
     claimed_at: claimedAt,
     landed_by: kind === 'landed' ? landedBy(row, payload) : null,
@@ -420,7 +444,11 @@ function outcomesFromEvents(rows, since = -Infinity) {
     const ended = ['claim_released', 'claim_expired', 'completed', 'reopened', 'archived'].includes(row.event_type);
     if (!play) { if (ended) closed.add(key); continue; }
     if (play.kind === 'took') { plays.push(play); continue; }
-    if (row.event_type === 'claim_released') {
+    // A release that another member's claim follows within two minutes reads as a hand-over, and is left out. That
+    // is a rule about old history, whose releases carry no mark, and it holds for them as it always did. A release
+    // on a claim the engine started (engine_started) is a real miss whoever claims next, and one that could not
+    // start has its own line: neither is a hand-over, so neither is erased.
+    if (row.event_type === 'claim_released' && Number(row.engine_started) !== 1 && play.kind !== 'could_not_start') {
       let next = null;
       for (let j = i + 1; j < ordered.length && ordered[j].task_id === row.task_id; j++) {
         if (ordered[j].event_type === 'claimed') { next = ordered[j]; break; }
@@ -555,6 +583,12 @@ function playEventsSql(extraWhere = '') {
     SELECT e.event_id, e.task_id, e.workspace_root, e.event_type, e.actor, e.payload, e.created_at, e.version,
            t.title, t.claimed_by, t.claimed_at,
            c.event_id AS claim_event_id, c.created_at AS claim_event_at, c.actor AS claim_actor,
+           CASE WHEN e.event_type = 'claim_released' AND c.event_id IS NOT NULL AND EXISTS (
+             SELECT 1 FROM task_events b
+              WHERE b.task_id = e.task_id AND b.version > c.version AND b.version < e.version
+                -- the flight marks a claim started right before it asks the assigned engine
+                AND b.event_type = 'build_started'
+           ) THEN 1 ELSE 0 END AS engine_started,
            CASE WHEN e.event_type = 'archived' AND c.event_id IS NOT NULL AND NOT EXISTS (
              SELECT 1 FROM task_events x
               WHERE x.task_id = e.task_id AND x.version > c.version AND x.version < e.version
@@ -643,6 +677,9 @@ function loadSeason(workspaceRoot, { now = Date.now(), days = SEASON_DAYS, dbPat
         title: t.title,
         member: String(t.claimed_by),
         since: Number(t.proof_at || t.last_event_at || t.updated_at || 0),
+        // Done, and its pull request still open for a person to land. The rating never asks
+        // GitHub; `atris task sweep --held` does, and credits the builder when it was merged.
+        ...(taskDb.heldPullRequestOf(t) ? { waiting_on_pull_request: true } : {}),
       }));
     season.claims = live
       .filter(t => t.status === 'claimed' && t.claimed_by)