dev-loops 0.2.5 → 0.2.7

package/scripts/loop/run-conductor-cycle.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-import { runChild, requireOptionValue } from "../_cli-primitives.mjs";
+import { requireTokenValue } from "../_cli-primitives.mjs";
 import {
   buildParseError,
   formatCliError,
   isDirectCliRun,
-  parseJsonText,
 } from "../_core-helpers.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 import { detectPrGateCoordinationState } from "./detect-pr-gate-coordination-state.mjs";
@@ -14,9 +13,11 @@ import {
   SUBAGENT_ACTIONS as SHARED_SUBAGENT_ACTIONS,
   buildHandoffContractForConductorAction,
 } from "./_handoff-contract.mjs";
+import { listOpenPrs } from "./_loop-pr-aggregation.mjs";
+import { parseArgs } from "node:util";
+export { listOpenPrs };
 const USAGE = `Usage: run-conductor-cycle.mjs --repo <owner/name>
 Poll all open PRs, detect state, and output an ordered action queue.`.trim();
-const OPEN_PR_LIST_LIMIT = 1000;
 export const CHECKPOINT_ACTION_TO_CONDUCTOR_ACTION = Object.freeze({
   [PR_CHECKPOINT_ACTION.ADDRESS_REVIEW_FEEDBACK]: "fix_threads",
   [PR_CHECKPOINT_ACTION.REPLY_RESOLVE_REVIEW_THREADS]: "fix_threads",
@@ -63,22 +64,36 @@ export function actionRequiresApproval(action, autonomyStopAt = ["merge"]) {
 }
 const parseError = buildParseError(USAGE);
 export function parseCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     repo: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      repo: { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  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;
     }
-    throw parseError(`Unknown argument: ${token}`);
+    throw parseError(`Unknown argument: ${token.rawName}`);
   }
   if (options.repo === undefined) {
     throw parseError("run-conductor-cycle requires --repo <owner/name>");
@@ -90,43 +105,6 @@ export function parseCliArgs(argv) {
   }
   return options;
 }
-export async function listOpenPrs({ repo }, { env, ghCommand }) {
-  const result = await runChild(
-    ghCommand,
-    [
-      "pr",
-      "list",
-      "--repo",
-      repo,
-      "--state",
-      "open",
-      "--limit",
-      String(OPEN_PR_LIST_LIMIT),
-      "--json",
-      "number,title,url,isDraft,headRefName,author",
-    ],
-    env,
-  );
-  if (result.code !== 0) {
-    const detail = result.stderr.trim() || `exit code ${result.code}`;
-    throw new Error(`gh command failed: ${detail}`);
-  }
-  const payload = parseJsonText(result.stdout);
-  if (!Array.isArray(payload)) {
-    throw new Error("Invalid gh pr list payload: expected an array");
-  }
-  return payload
-    .map((pr) => ({
-      number: Number.isInteger(pr?.number) ? pr.number : null,
-      title: typeof pr?.title === "string" ? pr.title : "",
-      url: typeof pr?.url === "string" ? pr.url : null,
-      isDraft: Boolean(pr?.isDraft),
-      headRefName: typeof pr?.headRefName === "string" ? pr.headRefName : null,
-      authorLogin: typeof pr?.author?.login === "string" ? pr.author.login : null,
-    }))
-    .filter((pr) => pr.number !== null)
-    .sort((left, right) => left.number - right.number);
-}
 export async function detectPrState(
   pr,
   {

package/scripts/loop/run-refinement-audit.mjs

@@ -2,7 +2,8 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { buildParseError, formatCliError, isDirectCliRun } from "../_core-helpers.mjs";
-import { parsePositiveInteger, requireOptionValue, runCommand } from "../_cli-primitives.mjs";
+import { parsePositiveInteger, requireTokenValue, runCommand } from "../_cli-primitives.mjs";
+import { parseArgs } from "node:util";
 const DEFAULT_MAX_LINES = 1000;
 const DEFAULT_DUPLICATE_WINDOW_LINES = 4;
 const DEFAULT_BRANCH_THRESHOLD = 25;
@@ -43,7 +44,6 @@ const PRIORITY_ORDER = new Map([
   ["low", 2],
 ]);
 export function parseRefinementAuditCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     paths: undefined,
@@ -55,57 +55,79 @@ export function parseRefinementAuditCliArgs(argv) {
     thinWrapperMaxLines: DEFAULT_THIN_WRAPPER_MAX_LINES,
     output: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      paths: { type: "string" },
+      "paths-file": { type: "string" },
+      root: { type: "string" },
+      "max-lines": { type: "string" },
+      "duplicate-window-lines": { type: "string" },
+      "branch-threshold": { type: "string" },
+      "thin-wrapper-max-lines": { type: "string" },
+      output: { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  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 === "--paths") {
-      options.paths = requireOptionValue(args, "--paths", parseError, { flagPattern: /^-/u });
+    if (token.name === "paths") {
+      options.paths = requireTokenValue(token, parseError, { flagPattern: /^-/u });
       continue;
     }
-    if (token === "--paths-file") {
-      options.pathsFile = requireOptionValue(args, "--paths-file", parseError, { flagPattern: /^-/u });
+    if (token.name === "paths-file") {
+      options.pathsFile = requireTokenValue(token, parseError, { flagPattern: /^-/u });
       continue;
     }
-    if (token === "--root") {
-      options.root = requireOptionValue(args, "--root", parseError, { flagPattern: /^-/u });
+    if (token.name === "root") {
+      options.root = requireTokenValue(token, parseError, { flagPattern: /^-/u });
       continue;
     }
-    if (token === "--max-lines") {
-      options.maxLines = parsePositiveInteger(requireOptionValue(args, "--max-lines", parseError), "--max-lines", parseError);
+    if (token.name === "max-lines") {
+      options.maxLines = parsePositiveInteger(requireTokenValue(token, parseError), "--max-lines", parseError);
       continue;
     }
-    if (token === "--duplicate-window-lines") {
+    if (token.name === "duplicate-window-lines") {
       options.duplicateWindowLines = parsePositiveInteger(
-        requireOptionValue(args, "--duplicate-window-lines", parseError),
+        requireTokenValue(token, parseError),
         "--duplicate-window-lines",
         parseError,
       );
       continue;
     }
-    if (token === "--branch-threshold") {
+    if (token.name === "branch-threshold") {
       options.branchThreshold = parsePositiveInteger(
-        requireOptionValue(args, "--branch-threshold", parseError),
+        requireTokenValue(token, parseError),
         "--branch-threshold",
         parseError,
       );
       continue;
     }
-    if (token === "--thin-wrapper-max-lines") {
+    if (token.name === "thin-wrapper-max-lines") {
       options.thinWrapperMaxLines = parsePositiveInteger(
-        requireOptionValue(args, "--thin-wrapper-max-lines", parseError),
+        requireTokenValue(token, parseError),
         "--thin-wrapper-max-lines",
         parseError,
       );
       continue;
     }
-    if (token === "--output") {
-      options.output = requireOptionValue(args, "--output", parseError, { flagPattern: /^-/u });
+    if (token.name === "output") {
+      options.output = requireTokenValue(token, parseError, { flagPattern: /^-/u });
       continue;
     }
-    throw parseError(`Unknown argument: ${token}`);
+    throw parseError(`Unknown argument: ${token.rawName}`);
   }
   if (options.paths !== undefined && options.pathsFile !== undefined) {
     throw parseError("Specify exactly one of --paths or --paths-file");

package/scripts/loop/run-watch-cycle.mjs

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
-import { parsePrNumber, requireOptionValue, runChild } from "../_cli-primitives.mjs";
+import { parsePrNumber, requireTokenValue, runChild } from "../_cli-primitives.mjs";
 import { buildParseError, formatCliError, isDirectCliRun } from "../_core-helpers.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 import { DEV_LOOP_CONTRACT_TRACE_CLASSIFICATION } from "@dev-loops/core/loop/public-dev-loop-routing";
 import { watchCopilotReview } from "../github/probe-copilot-review.mjs";
 import { runHandoff } from "./copilot-pr-handoff.mjs";
 import { detectCopilotSessionActivity } from "./detect-copilot-session-activity.mjs";
+import { parseArgs } from "node:util";
 import {
   EXTERNAL_HEALTHY_WAIT_TIMEOUT_POLICY,
   enforceExternalHealthyWaitTimeout,
@@ -178,30 +179,45 @@ function buildWatchCycleContractTrace({
   };
 }
 export function parseWatchCycleCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     repo: undefined,
     pr: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  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 (REMOVED_FLAGS.has(token)) {
-      rejectRemovedFlag(token);
+    if (REMOVED_FLAGS.has(token.rawName)) {
+      rejectRemovedFlag(token.rawName);
     }
-    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("run-watch-cycle requires both --repo <owner/name> and --pr <number>");

package/scripts/loop/steer-loop.mjs

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 import process from "node:process";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { parseArgs } from "node:util";
 import {
   STEERING_KIND,
   STEERING_RESULT,
@@ -31,7 +32,7 @@ import {
   withStateFileLock,
 } from "./_steering-state-file.mjs";
 import { formatCliError } from "../_core-helpers.mjs";
-import { requireOptionValue as readSharedOptionValue } from "../_cli-primitives.mjs";
+import { requireTokenValue as readSharedTokenValue } from "../_cli-primitives.mjs";
 import { parseRepoSlug } from "@dev-loops/core/github/repo-slug";
 const SUBMIT_USAGE = `Usage:
   steer-loop.mjs submit --repo <owner/name> --pr <number>
@@ -112,10 +113,9 @@ function runIdMismatchError(persistedRunId, requestedRunId) {
     `run-id mismatch: --state-file contains run ${JSON.stringify(persistedRunId)} but --run-id is ${JSON.stringify(requestedRunId)}. Use the correct --run-id or point --state-file at the right file.`
   );
 }
-function readRequiredOptionValue(args, flag, usage, { allowFlagLike = false } = {}) {
-  return readSharedOptionValue(
-    args,
-    flag,
+function readRequiredOptionValue(token, usage, { allowFlagLike = false } = {}) {
+  return readSharedTokenValue(
+    token,
     (message) => usageError(message, usage),
     { flagPattern: allowFlagLike ? /$^/u : /^--/u },
   );
@@ -139,7 +139,6 @@ function parsePositiveIntegerOption(raw, flag, usage) {
   return Number(raw);
 }
 export function parseSubmitCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     repo: undefined,
@@ -156,48 +155,74 @@ export function parseSubmitCliArgs(argv) {
     copilotInputPath: undefined,
     reviewerInputPath: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      "run-id": { type: "string" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+      kind: { type: "string" },
+      directive: { type: "string" },
+      seq: { type: "string" },
+      "state-file": { type: "string" },
+      "loop-state": { type: "string" },
+      "apply-mode": { type: "string" },
+      "event-id": { type: "string" },
+      "copilot-input": { type: "string" },
+      "reviewer-input": { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw usageError(`Unknown argument: ${token.value}`, SUBMIT_USAGE);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--run-id") {
-      options.runId = readRequiredOptionValue(args, "--run-id", SUBMIT_USAGE).trim();
+    if (token.name === "run-id") {
+      options.runId = readRequiredOptionValue(token, SUBMIT_USAGE).trim();
       validateSafeRunId(options.runId, SUBMIT_USAGE);
       continue;
     }
-    if (token === "--repo") {
-      options.repo = readRequiredOptionValue(args, "--repo", SUBMIT_USAGE).trim();
+    if (token.name === "repo") {
+      options.repo = readRequiredOptionValue(token, SUBMIT_USAGE).trim();
       parseRepoSlugOption(options.repo, SUBMIT_USAGE);
       continue;
     }
-    if (token === "--pr") {
-      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(args, "--pr", SUBMIT_USAGE), "--pr", SUBMIT_USAGE);
+    if (token.name === "pr") {
+      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(token, SUBMIT_USAGE), "--pr", SUBMIT_USAGE);
       continue;
     }
-    if (token === "--kind") {
-      const val = readRequiredOptionValue(args, "--kind", SUBMIT_USAGE);
+    if (token.name === "kind") {
+      const val = readRequiredOptionValue(token, SUBMIT_USAGE);
       if (!VALID_KINDS.has(val)) {
         throw usageError(`--kind must be one of: ${[...VALID_KINDS].join(", ")}`, SUBMIT_USAGE);
       }
       options.kind = val;
       continue;
     }
-    if (token === "--directive") {
-      options.directive = readRequiredOptionValue(args, "--directive", SUBMIT_USAGE, { allowFlagLike: true }).trim();
+    if (token.name === "directive") {
+      options.directive = readRequiredOptionValue(token, SUBMIT_USAGE, { allowFlagLike: true }).trim();
       continue;
     }
-    if (token === "--seq") {
-      options.seq = parsePositiveIntegerOption(readRequiredOptionValue(args, "--seq", SUBMIT_USAGE), "--seq", SUBMIT_USAGE);
+    if (token.name === "seq") {
+      options.seq = parsePositiveIntegerOption(readRequiredOptionValue(token, SUBMIT_USAGE), "--seq", SUBMIT_USAGE);
       continue;
     }
-    if (token === "--state-file") {
-      options.stateFile = readRequiredOptionValue(args, "--state-file", SUBMIT_USAGE);
+    if (token.name === "state-file") {
+      options.stateFile = readRequiredOptionValue(token, SUBMIT_USAGE);
       continue;
     }
-    if (token === "--loop-state") {
-      const val = readRequiredOptionValue(args, "--loop-state", SUBMIT_USAGE);
+    if (token.name === "loop-state") {
+      const val = readRequiredOptionValue(token, SUBMIT_USAGE);
       if (!VALID_LOOP_STATES.has(val)) {
         throw usageError(`--loop-state must be one of: ${[...VALID_LOOP_STATES].join(", ")}`, SUBMIT_USAGE);
       }
@@ -205,27 +230,27 @@ export function parseSubmitCliArgs(argv) {
       options.loopStateExplicit = true;
       continue;
     }
-    if (token === "--apply-mode") {
-      const val = readRequiredOptionValue(args, "--apply-mode", SUBMIT_USAGE);
+    if (token.name === "apply-mode") {
+      const val = readRequiredOptionValue(token, SUBMIT_USAGE);
       if (!VALID_APPLY_MODES.has(val)) {
         throw usageError(`--apply-mode must be one of: ${[...VALID_APPLY_MODES].join(", ")}`, SUBMIT_USAGE);
       }
       options.applyMode = val;
       continue;
     }
-    if (token === "--event-id") {
-      options.eventId = readRequiredOptionValue(args, "--event-id", SUBMIT_USAGE);
+    if (token.name === "event-id") {
+      options.eventId = readRequiredOptionValue(token, SUBMIT_USAGE);
       continue;
     }
-    if (token === "--copilot-input") {
-      options.copilotInputPath = readRequiredOptionValue(args, "--copilot-input", SUBMIT_USAGE);
+    if (token.name === "copilot-input") {
+      options.copilotInputPath = readRequiredOptionValue(token, SUBMIT_USAGE);
       continue;
     }
-    if (token === "--reviewer-input") {
-      options.reviewerInputPath = readRequiredOptionValue(args, "--reviewer-input", SUBMIT_USAGE);
+    if (token.name === "reviewer-input") {
+      options.reviewerInputPath = readRequiredOptionValue(token, SUBMIT_USAGE);
       continue;
     }
-    throw usageError(`Unknown argument: ${token}`, SUBMIT_USAGE);
+    throw usageError(`Unknown argument: ${token.rawName}`, SUBMIT_USAGE);
   }
   if (!options.help) {
     if ((options.repo === undefined) !== (options.pr === undefined)) {
@@ -250,7 +275,6 @@ export function parseSubmitCliArgs(argv) {
   return options;
 }
 export function parseStatusCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     repo: undefined,
@@ -258,31 +282,49 @@ export function parseStatusCliArgs(argv) {
     runId: undefined,
     stateFile: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      "run-id": { type: "string" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+      "state-file": { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw usageError(`Unknown argument: ${token.value}`, STATUS_USAGE);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--run-id") {
-      options.runId = readRequiredOptionValue(args, "--run-id", STATUS_USAGE).trim();
+    if (token.name === "run-id") {
+      options.runId = readRequiredOptionValue(token, STATUS_USAGE).trim();
       validateSafeRunId(options.runId, STATUS_USAGE);
       continue;
     }
-    if (token === "--repo") {
-      options.repo = readRequiredOptionValue(args, "--repo", STATUS_USAGE).trim();
+    if (token.name === "repo") {
+      options.repo = readRequiredOptionValue(token, STATUS_USAGE).trim();
       parseRepoSlugOption(options.repo, STATUS_USAGE);
       continue;
     }
-    if (token === "--pr") {
-      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(args, "--pr", STATUS_USAGE), "--pr", STATUS_USAGE);
+    if (token.name === "pr") {
+      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(token, STATUS_USAGE), "--pr", STATUS_USAGE);
       continue;
     }
-    if (token === "--state-file") {
-      options.stateFile = readRequiredOptionValue(args, "--state-file", STATUS_USAGE);
+    if (token.name === "state-file") {
+      options.stateFile = readRequiredOptionValue(token, STATUS_USAGE);
       continue;
     }
-    throw usageError(`Unknown argument: ${token}`, STATUS_USAGE);
+    throw usageError(`Unknown argument: ${token.rawName}`, STATUS_USAGE);
   }
   if (!options.help) {
     if ((options.repo === undefined) !== (options.pr === undefined)) {
@@ -298,7 +340,6 @@ export function parseStatusCliArgs(argv) {
   return options;
 }
 export function parsePromoteCliArgs(argv) {
-  const args = [...argv];
   const options = {
     help: false,
     repo: undefined,
@@ -307,39 +348,58 @@ export function parsePromoteCliArgs(argv) {
     stateFile: undefined,
     loopState: undefined,
   };
-  while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--help" || token === "-h") {
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      help: { type: "boolean", short: "h" },
+      "run-id": { type: "string" },
+      repo: { type: "string" },
+      pr: { type: "string" },
+      "state-file": { type: "string" },
+      "loop-state": { type: "string" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw usageError(`Unknown argument: ${token.value}`, PROMOTE_USAGE);
+    }
+    if (token.kind !== "option") {
+      continue;
+    }
+    if (token.name === "help") {
       options.help = true;
       return options;
     }
-    if (token === "--run-id") {
-      options.runId = readRequiredOptionValue(args, "--run-id", PROMOTE_USAGE).trim();
+    if (token.name === "run-id") {
+      options.runId = readRequiredOptionValue(token, PROMOTE_USAGE).trim();
       validateSafeRunId(options.runId, PROMOTE_USAGE);
       continue;
     }
-    if (token === "--repo") {
-      options.repo = readRequiredOptionValue(args, "--repo", PROMOTE_USAGE).trim();
+    if (token.name === "repo") {
+      options.repo = readRequiredOptionValue(token, PROMOTE_USAGE).trim();
       parseRepoSlugOption(options.repo, PROMOTE_USAGE);
       continue;
     }
-    if (token === "--pr") {
-      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(args, "--pr", PROMOTE_USAGE), "--pr", PROMOTE_USAGE);
+    if (token.name === "pr") {
+      options.pr = parsePositiveIntegerOption(readRequiredOptionValue(token, PROMOTE_USAGE), "--pr", PROMOTE_USAGE);
       continue;
     }
-    if (token === "--state-file") {
-      options.stateFile = readRequiredOptionValue(args, "--state-file", PROMOTE_USAGE);
+    if (token.name === "state-file") {
+      options.stateFile = readRequiredOptionValue(token, PROMOTE_USAGE);
       continue;
     }
-    if (token === "--loop-state") {
-      const val = readRequiredOptionValue(args, "--loop-state", PROMOTE_USAGE);
+    if (token.name === "loop-state") {
+      const val = readRequiredOptionValue(token, PROMOTE_USAGE);
       if (!VALID_LOOP_STATES.has(val)) {
         throw usageError(`--loop-state must be one of: ${[...VALID_LOOP_STATES].join(", ")}`, PROMOTE_USAGE);
       }
       options.loopState = val;
       continue;
     }
-    throw usageError(`Unknown argument: ${token}`, PROMOTE_USAGE);
+    throw usageError(`Unknown argument: ${token.rawName}`, PROMOTE_USAGE);
   }
   if (!options.help) {
     if ((options.repo === undefined) !== (options.pr === undefined)) {