@davidvornholt/standards 0.15.1 → 0.17.0

package/src/poller-status.ts

@@ -0,0 +1,133 @@
+import { hasLabel } from './github-label-identity';
+import {
+  type ApprovalBinding,
+  issueRevision,
+  prRevision,
+  readApprovalBinding,
+} from './poller-approval';
+import { hiddenCommentMetadata } from './poller-comment-metadata';
+import { getIssue } from './poller-github';
+import { getPullRequest } from './poller-github-pulls';
+import { createComment, deleteComment } from './poller-github-write';
+import type { JobDeps } from './poller-job-shared';
+import { NEEDS_CLARIFICATION, QUEUE_METADATA_MARKER } from './poller-protocol';
+import {
+  approvalLabelFor,
+  inProgressLabelFor,
+  matchingTrustedQueueCommentIds,
+  type PollerJobKind,
+  queueMarkerFor,
+} from './poller-queue-marker';
+import { reviewEligibility } from './poller-review-eligibility';
+
+const queuedMessage = (kind: PollerJobKind) =>
+  kind === 'fix'
+    ? '**Fix queued**\n\nThe poller has picked this up and will start work as soon as a run is available. You don’t need to do anything else.'
+    : '**Review queued**\n\nThe poller has picked this up and will start the review as soon as a run is available. You don’t need to do anything else.';
+
+const isStillQueueable = async (
+  deps: JobDeps,
+  issueNumber: number,
+  approval: ApprovalBinding,
+  kind: PollerJobKind,
+): Promise<boolean> => {
+  const expectedApprovalLabel = approvalLabelFor(kind);
+  if (
+    approval.repo !== deps.repo ||
+    approval.issueNumber !== issueNumber ||
+    approval.label !== expectedApprovalLabel
+  ) {
+    return false;
+  }
+  const issue = await getIssue(deps.token, deps.repo, issueNumber);
+  if (
+    !hasLabel(issue.labels, expectedApprovalLabel) ||
+    hasLabel(issue.labels, inProgressLabelFor(kind)) ||
+    hasLabel(issue.labels, NEEDS_CLARIFICATION)
+  ) {
+    return false;
+  }
+  let target = issueRevision(issue);
+  if (kind === 'review') {
+    const pr = await getPullRequest(deps.token, deps.repo, issueNumber);
+    if (
+      reviewEligibility({
+        repo: deps.repo,
+        pr,
+        hasPlan: false,
+      }).kind !== 'eligible'
+    ) {
+      return false;
+    }
+    target = prRevision(pr.baseRef, pr.baseSha, pr.headSha);
+  }
+  if (target !== approval.target) {
+    return false;
+  }
+  const currentApproval = await readApprovalBinding(
+    {
+      token: deps.token,
+      repo: deps.repo,
+      issueNumber,
+    },
+    expectedApprovalLabel,
+    target,
+  );
+  return (
+    typeof currentApproval !== 'string' && currentApproval.id === approval.id
+  );
+};
+
+export const acknowledgeQueuedJob = async (
+  deps: JobDeps,
+  issueNumber: number,
+  approval: ApprovalBinding,
+  kind: PollerJobKind,
+): Promise<boolean> => {
+  const expected = queueMarkerFor(approval, kind);
+  const current = await getIssue(deps.token, deps.repo, issueNumber);
+  if (
+    hasLabel(current.labels, inProgressLabelFor(kind)) ||
+    hasLabel(current.labels, NEEDS_CLARIFICATION)
+  ) {
+    return false;
+  }
+  if (
+    (
+      await matchingTrustedQueueCommentIds(
+        deps,
+        issueNumber,
+        expected.approvalId,
+        kind,
+      )
+    ).length > 0
+  ) {
+    return false;
+  }
+  const markerId = await createComment(
+    deps.token,
+    deps.repo,
+    issueNumber,
+    `${queuedMessage(kind)}\n\n${hiddenCommentMetadata(
+      QUEUE_METADATA_MARKER,
+      expected,
+    )}`,
+  );
+  const [winner] = [
+    ...(await matchingTrustedQueueCommentIds(
+      deps,
+      issueNumber,
+      expected.approvalId,
+      kind,
+    )),
+  ].sort((left, right) => left - right);
+  if (winner !== markerId) {
+    await deleteComment(deps.token, deps.repo, markerId);
+    return false;
+  }
+  if (!(await isStillQueueable(deps, issueNumber, approval, kind))) {
+    await deleteComment(deps.token, deps.repo, markerId);
+    return false;
+  }
+  return true;
+};

package/src/poller-trust.ts

@@ -19,7 +19,7 @@ export type TrustContext = {
   readonly roleCache: RoleCache;
 };
 
-const cachedRole = async (
+export const cachedCollaboratorRole = async (
   context: TrustContext,
   username: string,
 ): Promise<string> => {
@@ -53,7 +53,7 @@ const lastTrustedQuestionIndex = async (
     const comment = comments[index];
     if (comment !== undefined && hasQuestionMarker(comment)) {
       // biome-ignore lint/performance/noAwaitInLoops: role lookups go through the shared per-tick cache; parallel lookups would race it and duplicate API reads.
-      const role = await cachedRole(context, comment.authorLogin);
+      const role = await cachedCollaboratorRole(context, comment.authorLogin);
       if (isTrustedRole(role)) {
         return index;
       }
@@ -87,7 +87,7 @@ export const answerState = async (
     );
   for (const comment of candidates) {
     // biome-ignore lint/performance/noAwaitInLoops: role lookups go through the shared per-tick cache; parallel lookups would race it and duplicate API reads.
-    const role = await cachedRole(context, comment.authorLogin);
+    const role = await cachedCollaboratorRole(context, comment.authorLogin);
     if (isTrustedRole(role)) {
       answers.push(comment.body);
     }

package/src/poller-units.ts

@@ -8,11 +8,11 @@ import { fileURLToPath } from 'node:url';
 import type { PollerConfig } from './poller-config';
 
 const SERVICE_NAME = 'standards-poller';
-// Bounds idle pickup latency while preserving a full cooldown after each tick:
-// OnUnitInactiveSec starts counting when the oneshot service finishes.
-// AccuracySec matters at this scale: systemd's default 1min accuracy would
-// stretch a 1min interval into a 1-2min window.
-const TICK_INTERVAL_MINUTES = 1;
+// OnUnitInactiveSec starts counting when each oneshot service finishes.
+// Keep worker pickup prompt while giving the acknowledgement observer enough
+// API headroom for mixed queues, recovery plans, pagination, and worker calls.
+const WORKER_INTERVAL_MINUTES = 1;
+export const ACKNOWLEDGEMENT_INTERVAL_MINUTES = 5;
 // Non-agent tick work: stale sweeps, clone/fetch, GitHub reads and writes.
 const TICK_OVERHEAD_MINUTES = 30;
 const MAX_ASCII_CONTROL_CODE = 31;
@@ -50,7 +50,12 @@ const tickBudgetMinutes = (config: PollerConfig): number =>
 export const renderUnits = (
   configPath: string,
   config: PollerConfig,
-): { readonly service: string; readonly timer: string } => ({
+): {
+  readonly service: string;
+  readonly timer: string;
+  readonly acknowledgementService: string;
+  readonly acknowledgementTimer: string;
+} => ({
   service: `[Unit]
 Description=Standards fix poller tick
 After=network-online.target
@@ -66,7 +71,29 @@ Description=Run the standards fix poller on an interval
 
 [Timer]
 OnBootSec=2min
-OnUnitInactiveSec=${TICK_INTERVAL_MINUTES}min
+OnUnitInactiveSec=${WORKER_INTERVAL_MINUTES}min
+AccuracySec=15s
+Persistent=true
+
+[Install]
+WantedBy=timers.target
+`,
+  acknowledgementService: `[Unit]
+Description=Acknowledge queued standards poller requests
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=${quoteSystemdExecArg(process.execPath)} ${quoteSystemdExecArg(cliEntryPath())} poller --acknowledge-only --config ${quoteSystemdExecArg(configPath)}
+TimeoutStartSec=${TICK_OVERHEAD_MINUTES}min
+`,
+  acknowledgementTimer: `[Unit]
+Description=Check for newly queued standards poller requests
+
+[Timer]
+OnBootSec=1min
+OnUnitInactiveSec=${ACKNOWLEDGEMENT_INTERVAL_MINUTES}min
 AccuracySec=15s
 Persistent=true
 
@@ -84,4 +111,8 @@ export const runPollerPrintUnits = (
   console.log(units.service);
   console.log(`# ${SERVICE_NAME}.timer`);
   console.log(units.timer);
+  console.log(`# ${SERVICE_NAME}-acknowledgements.service`);
+  console.log(units.acknowledgementService);
+  console.log(`# ${SERVICE_NAME}-acknowledgements.timer`);
+  console.log(units.acknowledgementTimer);
 };

package/src/poller-github-publication.ts

@@ -1,23 +0,0 @@
-import { listAllPages } from './github-paginate';
-import { isRecord } from './github-settings-parse';
-
-export const repositoryIssueMarkerAuthors = async (
-  token: string | null,
-  repo: string,
-  marker: string,
-): Promise<ReadonlyArray<string>> => {
-  const items = await listAllPages(
-    token,
-    `/repos/${repo}/issues?state=all`,
-    `list ${repo} issues for publication marker`,
-  );
-  return items.flatMap((item) =>
-    isRecord(item) &&
-    typeof item.body === 'string' &&
-    item.body.includes(marker) &&
-    isRecord(item.user) &&
-    typeof item.user.login === 'string'
-      ? [item.user.login]
-      : [],
-  );
-};