dev-loops 0.2.6 → 0.3.0

package/scripts/github/request-copilot-review.mjs

@@ -1,13 +1,16 @@
 #!/usr/bin/env node
+import { parseArgs } from "node:util";
 import {
   buildParseError,
   formatCliError,
   isCopilotLogin,
   isDirectCliRun,
   parseReviewThreads,
+  resolveDraftGateRoundResetMs,
   summarizeCopilotReviews,
+  summarizeGateReviewComments,
 } from "../_core-helpers.mjs";
-import { parsePrNumber, requireOptionValue, runChild } from "../_cli-primitives.mjs";
+import { parsePrNumber, requireTokenValue, runChild } from "../_cli-primitives.mjs";
 import { fetchGithubReviewThreadsPayload } from "./capture-review-threads.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 import { buildSnapshotFromPrFacts, interpretLoopState } from "@dev-loops/core/loop/copilot-loop-state";
@@ -52,32 +55,48 @@ Exit codes:
   1  Argument error or gh failure`.trim();
 const parseError = buildParseError(USAGE);
 export function parseRequestCliArgs(argv) {
-  const args = [...argv];
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      "force-rerequest-review": { type: "boolean" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
   const options = {
     help: false,
     repo: undefined,
     pr: undefined,
     forceRerequestReview: false,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw parseError(`Unknown argument: ${token.value}`);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--force-rerequest-review") {
+    if (token.name === "force-rerequest-review") {
       options.forceRerequestReview = true;
       continue;
     }
-    if (token === "--repo") {
-      options.repo = requireOptionValue(args, "--repo", parseError).trim();
+    if (token.name === "repo") {
+      options.repo = requireTokenValue(token, parseError).trim();
       continue;
     }
-    if (token === "--pr") {
-      options.pr = parsePrNumber(requireOptionValue(args, "--pr", parseError), parseError);
+    if (token.name === "pr") {
+      options.pr = parsePrNumber(requireTokenValue(token, parseError), parseError);
       continue;
     }
-    throw parseError(`Unknown argument: ${token}`);
+    throw parseError(`Unknown argument: ${token.rawName}`);
   }
   if (options.repo === undefined || options.pr === undefined) {
     throw parseError("Requesting Copilot review requires both --repo <owner/name> and --pr <number>");
@@ -104,7 +123,7 @@ function parseRequestedReviewersPayload(text) {
     requested: users.some((user) => isCopilotLogin(user?.login)),
   };
 }
-function parseReviewsPayload(text) {
+function parseReviewsPayload(text, { draftGateResetAtMs = null } = {}) {
   let payload;
   try {
     payload = JSON.parse(text);
@@ -114,7 +133,10 @@ function parseReviewsPayload(text) {
   const headSha = typeof payload?.headRefOid === "string" && payload.headRefOid.trim().length > 0
     ? payload.headRefOid.trim()
     : null;
-  const reviewSummary = summarizeCopilotReviews(payload?.reviews, { headSha });
+  // Apply the draft-gate round reset so the completed round count matches what
+  // detect-pr-gate-coordination-state computes (#896): when the draft gate has
+  // re-passed clean on an earlier head, only reviews after that re-pass count.
+  const reviewSummary = summarizeCopilotReviews(payload?.reviews, { headSha, draftGateResetAtMs });
   return {
     prData: payload,
     headSha,
@@ -149,6 +171,51 @@ async function fetchCopilotReviewIds({ repo, pr }, { env = process.env, ghComman
   }
   return parseReviewsPayload(result.stdout);
 }
+
+// Re-derive the completed Copilot round count with the draft-gate round reset
+// applied, mirroring detect-pr-gate-coordination-state so both scripts agree on the
+// completed count and therefore on round-cap-reached (#896). A clean draft_gate
+// re-pass on an earlier head resets the count, so post-reset reviews must not be
+// counted toward the cap.
+//
+// Queried lazily — only when the raw (un-reset) count has already hit the cap — so
+// the common (under-cap) request path keeps its existing gh-call contract and adds
+// no API round-trip. Uses a single issue-comments fetch (the same source the gate
+// detector uses for the latest clean draft_gate marker), not the full checkpoint-
+// evidence pipeline, to keep the added surface minimal. Best-effort: a fetch failure
+// falls back to the raw count, so the cap is never silently disabled.
+async function resolveDraftGateAdjustedRounds(options, { env = process.env, ghCommand = "gh" } = {}, before) {
+  try {
+    const currentHeadSha = typeof before?.prData?.headRefOid === "string" && before.prData.headRefOid.trim().length > 0
+      ? before.prData.headRefOid.trim()
+      : null;
+    const result = await runChild(
+      ghCommand,
+      ["api", "--paginate", "--slurp", `repos/${options.repo}/issues/${options.pr}/comments?per_page=100`],
+      env,
+    );
+    if (result.code !== 0) {
+      return before.completedCopilotReviewRounds ?? 0;
+    }
+    let comments;
+    try {
+      const payload = JSON.parse(result.stdout);
+      comments = Array.isArray(payload) ? payload.flat() : [];
+    } catch {
+      return before.completedCopilotReviewRounds ?? 0;
+    }
+    const gateSummary = summarizeGateReviewComments(comments);
+    const draftGateResetAtMs = resolveDraftGateRoundResetMs({ draftGate: gateSummary?.draft_gate, currentHeadSha });
+    if (draftGateResetAtMs == null) {
+      return before.completedCopilotReviewRounds ?? 0;
+    }
+    const adjusted = parseReviewsPayload(JSON.stringify(before.prData ?? {}), { draftGateResetAtMs });
+    return adjusted.completedCopilotReviewRounds ?? 0;
+  } catch {
+    return before.completedCopilotReviewRounds ?? 0;
+  }
+}
+
 async function fetchCopilotReviewState(options, runtime) {
   const requestedReviewers = await fetchRequestedReviewers(options, runtime);
   const reviews = await fetchCopilotReviewIds(options, runtime);
@@ -417,7 +484,18 @@ export async function performCopilotReviewRequest(options, { env = process.env,
     }
   } catch {
   }
-  if ((before.completedCopilotReviewRounds ?? 0) >= maxRounds
+  // Reconcile the completed-round count with detect-pr-gate-coordination-state (#896):
+  // when the raw count has reached the cap, re-derive it with the draft-gate round
+  // reset applied. A clean draft_gate re-pass on an earlier head resets the count, so
+  // a post-reset PR that detect reports as under-cap must NOT be refused here as
+  // cap-reached. Only query checkpoint evidence on this (at/over-cap) path.
+  let completedRounds = before.completedCopilotReviewRounds ?? 0;
+  if (completedRounds >= maxRounds
+      && !before.requested
+      && !before.hasPendingReviewOnCurrentHead) {
+    completedRounds = await resolveDraftGateAdjustedRounds(options, { env, ghCommand }, before);
+  }
+  if (completedRounds >= maxRounds
       && !before.requested
       && !before.hasPendingReviewOnCurrentHead) {
     if (!options.forceRerequestReview) {
@@ -434,9 +512,9 @@ export async function performCopilotReviewRequest(options, { env = process.env,
           repo: options.repo,
           pr: options.pr,
           reviewer: "Copilot",
-          completedRounds: before.completedCopilotReviewRounds,
+          completedRounds,
           maxRounds,
-          detail: `Round cap of ${maxRounds} reached with ${before.completedCopilotReviewRounds} completed rounds. No further re-requests will be made.`,
+          detail: `Round cap of ${maxRounds} reached with ${completedRounds} completed rounds. No further re-requests will be made.`,
         };
       }
     }
@@ -454,8 +532,8 @@ export async function performCopilotReviewRequest(options, { env = process.env,
         repo: options.repo,
         pr: options.pr,
         reviewer: "Copilot",
-        detail: `Round cap of ${maxRounds} reached with ${before.completedCopilotReviewRounds} completed rounds. --force-rerequest-review was supplied but commit SHA data is unavailable, so change-since-last-review could not be evaluated.`,
-        completedRounds: before.completedCopilotReviewRounds,
+        detail: `Round cap of ${maxRounds} reached with ${completedRounds} completed rounds. --force-rerequest-review was supplied but commit SHA data is unavailable, so change-since-last-review could not be evaluated.`,
+        completedRounds,
         maxRounds,
       };
     }
@@ -467,7 +545,7 @@ export async function performCopilotReviewRequest(options, { env = process.env,
         pr: options.pr,
         reviewer: "Copilot",
         detail: "No changes since last Copilot review. --force-rerequest-review requires new commits on the PR head.",
-        completedRounds: before.completedCopilotReviewRounds,
+        completedRounds,
         maxRounds,
       };
     }

package/scripts/github/resolve-tracker-local-spec.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
+import { parseArgs } from "node:util";
 import { buildParseError, formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
-import { parseIssueNumber, requireOptionValue, runChild } from "../_cli-primitives.mjs";
+import { parseIssueNumber, requireTokenValue, runChild } from "../_cli-primitives.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 const ISSUE_JSON_FIELDS = "number,title,body,url,state";
 const USAGE = `Usage: resolve-tracker-local-spec.mjs (--repo <owner/name> --issue <number> | --issue-url <github-issue-url>)
@@ -60,32 +61,48 @@ export function parseGitHubIssueUrl(value) {
   };
 }
 export function parseResolveTrackerLocalSpecCliArgs(argv) {
-  const args = [...argv];
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      repo: { type: "string" },
+      issue: { type: "string" },
+      "issue-url": { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
   const options = {
     help: false,
     repo: undefined,
     issue: undefined,
     issueUrl: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw parseError(`Unknown argument: ${token.value}`);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--repo") {
-      options.repo = requireOptionValue(args, "--repo", parseError).trim();
+    if (token.name === "repo") {
+      options.repo = requireTokenValue(token, parseError).trim();
       continue;
     }
-    if (token === "--issue") {
-      options.issue = parseIssueNumber(requireOptionValue(args, "--issue", parseError), parseError);
+    if (token.name === "issue") {
+      options.issue = parseIssueNumber(requireTokenValue(token, parseError), parseError);
       continue;
     }
-    if (token === "--issue-url") {
-      options.issueUrl = requireOptionValue(args, "--issue-url", parseError).trim();
+    if (token.name === "issue-url") {
+      options.issueUrl = requireTokenValue(token, parseError).trim();
       continue;
     }
-    throw parseError(`Unknown argument: ${token}`);
+    throw parseError(`Unknown argument: ${token.rawName}`);
   }
   const usingIssueUrl = typeof options.issueUrl === "string";
   const usingRepoIssue = options.repo !== undefined || options.issue !== undefined;

package/scripts/github/stage-reviewer-draft.mjs

@@ -3,7 +3,8 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
-import { parsePositiveInteger, requireOptionValue } from "../_cli-primitives.mjs";
+import { parseArgs } from "node:util";
+import { parsePositiveInteger, requireTokenValue } from "../_cli-primitives.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 import { buildDraftReviewPayload } from "@dev-loops/core/loop/reviewer-loop-state";
 const HELP = `Usage: stage-reviewer-draft.mjs --repo <owner/name> --pr <number> --review-file <path> [--local-state-output <path>]
@@ -19,7 +20,19 @@ Exit codes:
   1   Error
 `;
 export function parseStageDraftCliArgs(argv) {
-  const args = [...argv];
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+      "review-file": { type: "string" },
+      "local-state-output": { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
   const options = {
     repo: undefined,
     pr: undefined,
@@ -27,29 +40,34 @@ export function parseStageDraftCliArgs(argv) {
     localStateOutput: undefined,
     help: false,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw new Error(`Unknown argument: ${token.value}`);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--repo") {
-      options.repo = requireOptionValue(args, "--repo").trim();
+    if (token.name === "repo") {
+      options.repo = requireTokenValue(token).trim();
       continue;
     }
-    if (token === "--pr") {
-      options.pr = parsePositiveInteger(requireOptionValue(args, "--pr"), "--pr");
+    if (token.name === "pr") {
+      options.pr = parsePositiveInteger(requireTokenValue(token), "--pr");
       continue;
     }
-    if (token === "--review-file") {
-      options.reviewFile = requireOptionValue(args, "--review-file");
+    if (token.name === "review-file") {
+      options.reviewFile = requireTokenValue(token);
       continue;
     }
-    if (token === "--local-state-output") {
-      options.localStateOutput = requireOptionValue(args, "--local-state-output");
+    if (token.name === "local-state-output") {
+      options.localStateOutput = requireTokenValue(token);
       continue;
     }
-    throw new Error(`Unknown argument: ${token}`);
+    throw new Error(`Unknown argument: ${token.rawName}`);
   }
   if (!options.repo || !options.pr || !options.reviewFile) {
     throw new Error(