ftown 0.19.65 → 0.19.67

package/dist/mail-store.js

@@ -1,7 +1,7 @@
 import { appendFile, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { randomBytes } from 'node:crypto';
+import { createHash, randomBytes, randomUUID } from 'node:crypto';
 /** Rewrites cap the inbox file at the newest N messages. */
 const MAX_STORED_MESSAGES = 500;
 export function createMailMessage(input) {
@@ -11,6 +11,11 @@ export function createMailMessage(input) {
         ...input,
     };
 }
+function checkpoint(value) {
+    if (value.version !== 1 || typeof value.linkId !== 'string' || !value.linkId || !['in_progress', 'failed', 'passed', 'merged'].includes(String(value.state)) || !Number.isSafeInteger(value.ordinal) || Number(value.ordinal) < 0 || (value.state !== 'merged' && (typeof value.headOid !== 'string' || !value.headOid)) || (value.headOid !== undefined && typeof value.headOid !== 'string'))
+        throw new Error('Invalid PR event checkpoint');
+    return value;
+}
 /**
  * Per-session append-only inbox (inbox.jsonl in the session's data dir).
  * Delivery marking rewrites the file atomically (tmp+rename); files are small.
@@ -31,33 +36,84 @@ export class MailStore {
         this.locks.set(sessionId, next.catch(() => undefined));
         return next;
     }
-    /** All messages, oldest first. Missing file and corrupt lines are tolerated. */
-    async readAll(sessionId) {
+    /** Old malformed message lines remain ignored; recognized checkpoints fail closed. */
+    async readInbox(sessionId) {
         const filePath = this.inboxPath(sessionId);
-        if (!existsSync(filePath)) {
-            return [];
-        }
+        if (!existsSync(filePath))
+            return { messages: [] };
         const raw = await readFile(filePath, 'utf-8');
         const messages = [];
+        let state;
         for (const line of raw.split('\n')) {
             if (!line.trim())
                 continue;
+            let value;
             try {
-                const msg = JSON.parse(line);
-                if (msg && typeof msg.id === 'string' && typeof msg.body === 'string') {
-                    messages.push(msg);
-                }
+                value = JSON.parse(line);
             }
             catch {
-                // Skip corrupt lines (e.g. partial write from a crashed bridge).
+                // A broken recognizable metadata record must not silently reset deduplication.
+                if (line.includes('pr-event-checkpoint'))
+                    throw new Error('Invalid PR event checkpoint');
+                continue;
             }
+            if (!value || typeof value !== 'object' || Array.isArray(value))
+                continue;
+            const item = value;
+            if (item._ftown === 'pr-event-checkpoint') {
+                if (state)
+                    throw new Error('Duplicate PR event checkpoint');
+                state = checkpoint(item);
+            }
+            else if (typeof item.id === 'string' && typeof item.body === 'string')
+                messages.push(item);
+        }
+        return { messages, checkpoint: state };
+    }
+    async readAll(sessionId) {
+        return (await this.readInbox(sessionId)).messages;
+    }
+    async replaceInbox(sessionId, inbox) {
+        const filePath = this.inboxPath(sessionId);
+        const tmp = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
+        const lines = [...(inbox.checkpoint ? [JSON.stringify(inbox.checkpoint)] : []), ...inbox.messages.map(message => JSON.stringify(message))];
+        try {
+            await writeFile(tmp, lines.join('\n') + '\n', { encoding: 'utf-8', mode: 0o600, flag: 'wx' });
+            await rename(tmp, filePath);
         }
-        return messages;
+        catch (error) {
+            await import('node:fs/promises').then(fs => fs.rm(tmp, { force: true })).catch(() => { });
+            throw error;
+        }
+    }
+    /** Caller fences the link under the session mutation lock; never creates its directory. */
+    async commitPullRequestObservation(sessionId, linkId, observation) {
+        if (observation.stale || !observation.checkedAt || observation.reason || !['in_progress', 'failed', 'passed', 'merged'].includes(observation.state) || (observation.state !== 'merged' && !observation.headOid))
+            return { enqueued: false };
+        return this.withLock(sessionId, async () => {
+            const inbox = await this.readInbox(sessionId);
+            const old = inbox.checkpoint?.linkId === linkId ? inbox.checkpoint : undefined;
+            if (old?.state === 'merged' || (old && old.state === observation.state && old.headOid === observation.headOid))
+                return { enqueued: false };
+            const ordinal = (old?.ordinal ?? 0) + 1;
+            const state = observation.state;
+            inbox.checkpoint = { _ftown: 'pr-event-checkpoint', version: 1, linkId, state, ordinal, ...(observation.headOid ? { headOid: observation.headOid } : {}) };
+            let messageId;
+            if (state !== 'in_progress') {
+                messageId = `pr-${createHash('sha256').update(JSON.stringify([linkId, ordinal, state, observation.headOid ?? 'merged'])).digest('hex')}`;
+                const heading = state === 'merged' ? 'Pull request merged.' : state === 'failed' ? 'GitHub rollup checks failed.' : 'GitHub rollup checks passed.';
+                const advice = state === 'failed' ? 'Inspect the checks and reproduce failures before fixing them within your existing task authorization.' : 'Follow your existing task and user instructions; this notification does not authorize merging or other actions.';
+                inbox.messages.push({ id: messageId, ts: new Date().toISOString(), from: 'external', fromName: 'FTown PR updates', to: sessionId, type: 'message', body: `${heading}\nPR: ${observation.url}\nChecks: ${observation.url}/checks\n${observation.headOid ? `Observed head: ${observation.headOid}\n` : ''}Observed at: ${observation.checkedAt}\n${advice}` });
+            }
+            await this.replaceInbox(sessionId, inbox);
+            return { enqueued: !!messageId, ...(messageId ? { messageId } : {}) };
+        });
     }
     async append(msg) {
         await this.withLock(msg.to, async () => {
             const dir = this.resolveDir(msg.to);
             await mkdir(dir, { recursive: true });
+            await this.readInbox(msg.to);
             // Mail can carry task details; owner-only like the session registry.
             await appendFile(this.inboxPath(msg.to), `${JSON.stringify(msg)}\n`, {
                 encoding: 'utf-8',
@@ -80,7 +136,8 @@ export class MailStore {
             if (ids.length === 0) {
                 return [];
             }
-            const all = await this.readAll(sessionId);
+            const inbox = await this.readInbox(sessionId);
+            const all = inbox.messages;
             const wanted = new Set(ids);
             const now = new Date().toISOString();
             const marked = [];
@@ -104,11 +161,7 @@ export class MailStore {
                 }
                 return true;
             });
-            const filePath = this.inboxPath(sessionId);
-            const tmp = `${filePath}.tmp`;
-            const payload = kept.map((m) => JSON.stringify(m)).join('\n') + '\n';
-            await writeFile(tmp, payload, { encoding: 'utf-8', mode: 0o600 });
-            await rename(tmp, filePath);
+            await this.replaceInbox(sessionId, { ...inbox, messages: kept });
             return marked;
         });
     }

package/dist/mail-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"mail-store.js","sourceRoot":"","sources":["../src/mail-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mail-store.js","sourceRoot":"","sources":["../src/mail-store.ts"],"names":[],"mappings":"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"}

package/dist/pull-request-events.d.ts

@@ -0,0 +1,40 @@
+import type { SessionStore } from './session-store.js';
+import type { Session } from './types.js';
+import type { PullRequestStatusService } from './pull-request-status.js';
+import type { MailStore } from './mail-store.js';
+type Timer = ReturnType<typeof setTimeout>;
+interface Options {
+    bridgeId: string;
+    store: Pick<SessionStore, 'listSessions' | 'loadSession' | 'saveSession'>;
+    withSessionMutation: (id: string, task: () => Promise<void>) => Promise<void>;
+    statusService: Pick<PullRequestStatusService, 'getObservations' | 'setBackgroundUrls'>;
+    mailStore: Pick<MailStore, 'commitPullRequestObservation'>;
+    notifyCommitted: (session: Session, sender: string) => Promise<void>;
+    now?: () => number;
+    setTimeout?: (fn: () => void, ms: number) => Timer;
+    clearTimeout?: (timer: Timer) => void;
+}
+/** Polls only observed changes using the same cache and quota as dashboard reads. */
+export declare class PullRequestEventWatcher {
+    private readonly options;
+    private stopped;
+    private started;
+    private epoch;
+    private flight?;
+    private timer?;
+    private group;
+    private baseline;
+    private cursor;
+    private pendingWake;
+    private nextDelay;
+    private readonly now;
+    private readonly setTimer;
+    private readonly clearTimer;
+    constructor(options: Options);
+    start(): void;
+    private schedule;
+    stop(): Promise<void>;
+    runOnce(): Promise<void>;
+    private scan;
+}
+export {};

package/dist/pull-request-events.js

@@ -0,0 +1,205 @@
+import { randomUUID } from 'node:crypto';
+import { normalizePullRequestUrl } from './pull-request-url.js';
+function canonical(value) {
+    if (!value)
+        return undefined;
+    try {
+        const url = normalizePullRequestUrl(value);
+        return Number(url.slice(url.lastIndexOf('/') + 1)) <= 2_147_483_647 ? url : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function eligible(session, bridgeId) {
+    return !!session && session.bridgeId === bridgeId && session.shellType !== 'shell' && !!canonical(session.pullRequestUrl);
+}
+/** Polls only observed changes using the same cache and quota as dashboard reads. */
+export class PullRequestEventWatcher {
+    options;
+    stopped = false;
+    started = false;
+    epoch = 0;
+    flight;
+    timer;
+    group = [];
+    baseline = new Map();
+    cursor = '';
+    pendingWake = new Map();
+    nextDelay = 60_000;
+    now;
+    setTimer;
+    clearTimer;
+    constructor(options) {
+        this.options = options;
+        this.now = options.now ?? Date.now;
+        this.setTimer = options.setTimeout ?? ((fn, ms) => setTimeout(fn, ms));
+        this.clearTimer = options.clearTimeout ?? (timer => clearTimeout(timer));
+    }
+    start() {
+        if (this.started || this.stopped)
+            return;
+        this.started = true;
+        void this.runOnce().catch(error => console.error('[PR events] Scan failed:', error)).finally(() => this.schedule());
+    }
+    schedule() {
+        if (!this.started || this.stopped || this.timer)
+            return;
+        this.timer = this.setTimer(() => { this.timer = undefined; void this.runOnce().catch(error => console.error('[PR events] Scan failed:', error)).finally(() => this.schedule()); }, Math.max(60_000, this.nextDelay));
+        this.timer.unref?.();
+    }
+    async stop() {
+        this.stopped = true;
+        this.epoch++;
+        if (this.timer) {
+            this.clearTimer(this.timer);
+            this.timer = undefined;
+        }
+        await this.flight?.catch(() => { });
+        this.options.statusService.setBackgroundUrls([]);
+    }
+    runOnce() {
+        if (this.stopped)
+            return Promise.resolve();
+        if (this.flight)
+            return this.flight;
+        const epoch = this.epoch;
+        this.flight = this.scan(epoch).finally(() => { this.flight = undefined; });
+        return this.flight;
+    }
+    async scan(epoch) {
+        const { store, bridgeId, withSessionMutation, statusService, mailStore, notifyCommitted } = this.options;
+        const active = () => !this.stopped && this.epoch === epoch;
+        const links = [];
+        for (const candidate of await store.listSessions()) {
+            if (!active())
+                return;
+            if (!eligible(candidate, bridgeId))
+                continue;
+            try {
+                await withSessionMutation(candidate.id, async () => {
+                    if (!active())
+                        return;
+                    const session = await store.loadSession(candidate.id);
+                    if (!eligible(session, bridgeId))
+                        return;
+                    const url = canonical(session.pullRequestUrl);
+                    const linkId = session.pullRequestLinkId ?? randomUUID();
+                    if (!session.pullRequestLinkId)
+                        await store.saveSession({ ...session, pullRequestLinkId: linkId });
+                    links.push({ id: session.id, url, key: url.toLowerCase(), linkId });
+                });
+            }
+            catch {
+                // One damaged session must not prevent unrelated links from being scanned.
+                console.error(`[PR events] Could not inspect session ${candidate.id}`);
+            }
+        }
+        if (!active())
+            return;
+        // A committed message survives a failed wake; retry without depending on a fresh gh result.
+        for (const [id, pending] of this.pendingWake) {
+            let sessionForWake;
+            try {
+                await withSessionMutation(id, async () => {
+                    if (!active())
+                        return;
+                    const session = await store.loadSession(id);
+                    if (eligible(session, bridgeId) && canonical(session.pullRequestUrl)?.toLowerCase() === pending.key && session.pullRequestLinkId === pending.linkId)
+                        sessionForWake = session;
+                });
+            }
+            catch {
+                // Keep the retry pending; other sessions and status groups can still progress.
+                console.error(`[PR events] Could not inspect session ${id}`);
+                continue;
+            }
+            if (!active())
+                return;
+            if (!sessionForWake) {
+                this.pendingWake.delete(id);
+                continue;
+            }
+            try {
+                await notifyCommitted(sessionForWake, 'FTown PR updates');
+                this.pendingWake.delete(id);
+            }
+            catch { /* Retry on the next scan. */ }
+        }
+        const urls = [...new Map(links.map(link => [link.key, link.url])).entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
+        const keys = new Set(urls.map(([key]) => key));
+        if (this.group.some(key => !keys.has(key))) {
+            this.group = [];
+            this.baseline.clear();
+        }
+        if (!this.group.length && urls.length) {
+            let start = urls.findIndex(([key]) => key > this.cursor);
+            if (start < 0)
+                start = 0;
+            const selected = [...urls.slice(start), ...urls.slice(0, start)].slice(0, 20);
+            this.group = selected.map(([key]) => key);
+            // Capture attempt ordinals before pinning: a quota-blocked read must not advance the group.
+            const before = await statusService.getObservations(selected.map(([, url]) => url));
+            if (!active())
+                return;
+            this.baseline = new Map(before.observations.map(item => [item.url.toLowerCase(), item.attempt]));
+            statusService.setBackgroundUrls(selected.map(([, url]) => url));
+        }
+        if (!this.group.length) {
+            statusService.setBackgroundUrls([]);
+            this.nextDelay = 60_000;
+            return;
+        }
+        const selectedUrls = this.group.map(key => urls.find(([entry]) => entry === key)?.[1]).filter((url) => !!url);
+        const result = await statusService.getObservations(selectedUrls);
+        if (!active())
+            return;
+        this.nextDelay = Math.max(60_000, Date.parse(result.nextRefreshAt) - this.now() || 60_000);
+        const observed = new Map(result.observations.map(item => [item.url.toLowerCase(), item]));
+        for (const link of links) {
+            const observation = observed.get(link.key);
+            if (!observation || observation.stale || observation.reason || !observation.checkedAt || !['in_progress', 'failed', 'passed', 'merged'].includes(observation.state))
+                continue;
+            let sessionForWake;
+            let attemptingCommit = false;
+            try {
+                await withSessionMutation(link.id, async () => {
+                    if (!active())
+                        return;
+                    const session = await store.loadSession(link.id);
+                    if (!eligible(session, bridgeId) || canonical(session.pullRequestUrl)?.toLowerCase() !== link.key || session.pullRequestLinkId !== link.linkId)
+                        return;
+                    attemptingCommit = true;
+                    await mailStore.commitPullRequestObservation(session.id, link.linkId, observation);
+                    if (active())
+                        sessionForWake = session;
+                });
+            }
+            catch {
+                // A failed atomic commit may have renamed successfully before reporting an error.
+                if (active() && attemptingCommit)
+                    this.pendingWake.set(link.id, { key: link.key, linkId: link.linkId });
+                console.error(`[PR events] Could not commit observation for session ${link.id}`);
+                continue;
+            }
+            if (active() && sessionForWake) {
+                try {
+                    await notifyCommitted(sessionForWake, 'FTown PR updates');
+                    this.pendingWake.delete(link.id);
+                }
+                catch {
+                    this.pendingWake.set(link.id, { key: link.key, linkId: link.linkId });
+                }
+            }
+        }
+        if (this.group.every(key => { const observation = observed.get(key); return !!observation && ((!observation.stale && !!observation.checkedAt && !observation.reason) || observation.attempt !== (this.baseline.get(key) ?? 0)); })) {
+            this.cursor = this.group.at(-1);
+            this.group = [];
+            this.baseline.clear();
+            statusService.setBackgroundUrls([]);
+            // Keep discovering new links and rotating other groups at the shared quota cadence.
+            this.nextDelay = 60_000;
+        }
+    }
+}
+//# sourceMappingURL=pull-request-events.js.map

package/dist/pull-request-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull-request-events.js","sourceRoot":"","sources":["../src/pull-request-events.ts"],"names":[],"mappings":"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"}

package/dist/pull-request-status.d.ts

@@ -1,10 +1,14 @@
-import type { PullRequestStatusesResponse } from './pull-request-status-protocol.js';
+import type { PullRequestStatus, PullRequestStatusesResponse } from './pull-request-status-protocol.js';
 type RunnerResult = {
     stdout: string;
     stderr: string;
     exitCode: number;
 };
 type Runner = (input: string) => Promise<RunnerResult>;
+export interface PullRequestObservation extends PullRequestStatus {
+    headOid?: string;
+    attempt: number;
+}
 /** Run a single bounded gh process; credentials stay in gh's environment. */
 export declare function runGh(input: string): Promise<RunnerResult>;
 /** Process-wide, demand-driven PR status cache and quota gate. */
@@ -16,8 +20,19 @@ export declare class PullRequestStatusService {
     private cooldown;
     private flight;
     private sequence;
+    private attemptSequence;
+    private background;
+    private inFlight;
     constructor(now?: () => number, runner?: Runner);
+    private entry;
+    private evict;
+    setBackgroundUrls(urls: readonly string[]): void;
     get(urls: readonly string[]): Promise<Pick<PullRequestStatusesResponse, 'statuses' | 'nextRefreshAt'>>;
+    getObservations(urls: readonly string[]): Promise<{
+        observations: PullRequestObservation[];
+        nextRefreshAt: string;
+    }>;
+    private read;
     private refresh;
 }
 export {};

package/dist/pull-request-status.js

@@ -55,7 +55,9 @@ function stateOf(value) {
     if (!pr)
         return { state: 'unknown', reason: 'unavailable' };
     if (pr.merged === true || pr.state === 'MERGED')
-        return { state: 'merged' };
+        return pr.merged === true && pr.state === 'MERGED' ? { state: 'merged' } : { state: 'unknown', reason: 'unavailable' };
+    if (pr.merged !== false)
+        return { state: 'unknown', reason: 'unavailable' };
     if (pr.state === 'CLOSED')
         return { state: 'closed' };
     if (pr.state !== 'OPEN' || typeof pr.headRefOid !== 'string' || !pr.headRefOid)
@@ -74,10 +76,10 @@ function stateOf(value) {
         return { state: 'unknown', reason: 'no_checks' };
     switch (rollup.state) {
         case 'FAILURE':
-        case 'ERROR': return { state: 'failed' };
+        case 'ERROR': return { state: 'failed', headOid: pr.headRefOid };
         case 'PENDING':
-        case 'EXPECTED': return { state: 'in_progress' };
-        case 'SUCCESS': return { state: 'passed' };
+        case 'EXPECTED': return { state: 'in_progress', headOid: pr.headRefOid };
+        case 'SUCCESS': return { state: 'passed', headOid: pr.headRefOid };
         default: return { state: 'unknown', reason: 'unavailable' };
     }
 }
@@ -123,59 +125,102 @@ export class PullRequestStatusService {
     cooldown = 0;
     flight;
     sequence = 0;
+    attemptSequence = 0;
+    background = new Set();
+    inFlight = new Set();
     constructor(now = Date.now, runner = runGh) {
         this.now = now;
         this.runner = runner;
     }
-    async get(urls) {
-        const keys = [];
-        for (const value of urls) {
-            let url;
-            try {
-                url = normalizePullRequestUrl(value);
-            }
-            catch {
-                continue;
-            }
-            if (Number(url.slice(url.lastIndexOf('/') + 1)) > 2_147_483_647)
-                continue;
-            const key = url.toLowerCase();
-            if (keys.includes(key))
-                continue;
-            keys.push(key);
-            let entry = this.cache.get(key);
-            if (!entry) {
-                entry = { url, state: 'unknown', checkedAt: null, lastAttempt: 0, nextAttempt: 0, used: 0 };
-                this.cache.set(key, entry);
-            }
-            entry.used = ++this.sequence;
+    entry(value) {
+        let url;
+        try {
+            url = normalizePullRequestUrl(value);
+        }
+        catch {
+            return undefined;
+        }
+        if (Number(url.slice(url.lastIndexOf('/') + 1)) > 2_147_483_647)
+            return undefined;
+        const key = url.toLowerCase();
+        let entry = this.cache.get(key);
+        if (!entry) {
+            entry = { url, state: 'unknown', checkedAt: null, attempt: 0, lastAttempt: 0, nextAttempt: 0, used: 0 };
+            this.cache.set(key, entry);
         }
+        entry.used = ++this.sequence;
+        return key;
+    }
+    evict() {
         while (this.cache.size > 500) {
-            const oldest = [...this.cache.entries()].sort((a, b) => a[1].used - b[1].used)[0];
+            const oldest = [...this.cache.entries()].filter(([key]) => !this.background.has(key) && !this.inFlight.has(key)).sort((a, b) => a[1].used - b[1].used)[0];
+            if (!oldest)
+                break;
             this.cache.delete(oldest[0]);
         }
+    }
+    setBackgroundUrls(urls) {
+        this.background.clear();
+        for (const url of urls) {
+            if (this.background.size >= 20)
+                break;
+            const key = this.entry(url);
+            if (key)
+                this.background.add(key);
+        }
+        this.evict();
+    }
+    async get(urls) {
+        const { observations, nextRefreshAt } = await this.read(urls, true);
+        return { statuses: observations.map(({ headOid: _headOid, attempt: _attempt, ...status }) => status), nextRefreshAt };
+    }
+    async getObservations(urls) {
+        return this.read(urls, false);
+    }
+    async read(urls, foreground) {
+        const keys = [];
+        for (const value of urls) {
+            const key = this.entry(value);
+            if (key && !keys.includes(key))
+                keys.push(key);
+        }
+        this.evict();
         if (this.flight)
             await this.flight;
         else {
             const now = this.now();
             this.launches = this.launches.filter(time => time > now - HOUR);
             const allowed = Math.max(this.cooldown, (this.launches.at(-1) ?? -Infinity) + MINUTE, this.launches.length >= 60 ? this.launches[0] + HOUR : 0);
-            const due = keys.map(key => this.cache.get(key)).filter((entry) => !!entry && entry.state !== 'merged' && now >= entry.nextAttempt && (entry.checkedAt === null || now >= entry.checkedAt + ttl(entry.state)))
-                .sort((a, b) => a.lastAttempt - b.lastAttempt || a.used - b.used).slice(0, 20);
-            if (due.length && now >= allowed) {
+            const due = (key) => { const e = this.cache.get(key); return !!e && e.state !== 'merged' && now >= e.nextAttempt && (e.checkedAt === null || now >= e.checkedAt + ttl(e.state)); };
+            const sort = (a, b) => a.lastAttempt - b.lastAttempt || a.used - b.used;
+            const foregroundDue = (foreground ? keys : []).filter(due).map(key => this.cache.get(key)).sort(sort);
+            const backgroundDue = [...this.background].filter(due).map(key => this.cache.get(key)).sort(sort);
+            const selected = [];
+            const add = (entry) => { if (entry && !selected.includes(entry) && selected.length < 20)
+                selected.push(entry); };
+            if (foregroundDue.length && backgroundDue.length) {
+                add(foregroundDue[0]);
+                add(backgroundDue[0]);
+            }
+            for (const entry of [...new Set([...foregroundDue, ...backgroundDue])].sort(sort))
+                add(entry);
+            if (selected.length && now >= allowed) {
                 this.launches.push(now);
-                for (const entry of due)
+                for (const entry of selected) {
                     entry.lastAttempt = now || 1;
-                this.flight = this.refresh(due, now).finally(() => { this.flight = undefined; });
+                    entry.attempt = ++this.attemptSequence;
+                    this.inFlight.add(entry.url.toLowerCase());
+                }
+                this.flight = this.refresh(selected, now).finally(() => { this.inFlight.clear(); this.flight = undefined; this.evict(); });
                 await this.flight;
             }
         }
         const now = this.now();
         const entries = keys.map(key => this.cache.get(key)).filter((entry) => !!entry);
-        const statuses = entries.map(entry => ({ url: entry.url, state: entry.state, checkedAt: entry.checkedAt === null ? null : new Date(entry.checkedAt).toISOString(), stale: entry.checkedAt === null || now >= entry.checkedAt + ttl(entry.state) || (entry.reason !== undefined && entry.reason !== 'no_checks'), ...(entry.reason ? { reason: entry.reason } : {}) }));
+        const observations = entries.map(entry => ({ url: entry.url, state: entry.state, checkedAt: entry.checkedAt === null ? null : new Date(entry.checkedAt).toISOString(), stale: entry.checkedAt === null || now >= entry.checkedAt + ttl(entry.state) || (entry.reason !== undefined && entry.reason !== 'no_checks'), ...(entry.reason ? { reason: entry.reason } : {}), ...(entry.headOid ? { headOid: entry.headOid } : {}), attempt: entry.attempt }));
         const nextDue = entries.filter(entry => entry.state !== 'merged').map(entry => Math.max(entry.nextAttempt, entry.checkedAt === null ? 0 : entry.checkedAt + ttl(entry.state)));
         const next = nextDue.length ? Math.max(now + MINUTE, this.cooldown, (this.launches.at(-1) ?? -Infinity) + MINUTE, Math.min(...nextDue), this.launches.length >= 60 ? this.launches[0] + HOUR : 0) : now + HOUR;
-        return { statuses, nextRefreshAt: new Date(next).toISOString() };
+        return { observations, nextRefreshAt: new Date(next).toISOString() };
     }
     async refresh(entries, now) {
         const fail = (reason, until) => {
@@ -238,6 +283,7 @@ export class PullRequestStatusService {
                 else {
                     entry.state = mapped.state;
                     entry.reason = mapped.reason;
+                    entry.headOid = mapped.headOid;
                     entry.checkedAt = now;
                     entry.nextAttempt = now + ttl(mapped.state);
                 }