dev-loops 0.2.7 → 0.4.0

package/scripts/projects/move-queue-item.mjs

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
 import { runChild as _runChild } from "../_cli-primitives.mjs";
+import { parseArgs } from "node:util";
 
-const USAGE = `Usage: dev-loops project move --repo <owner/name> --project <number|id> --item <number|node-id> --to-column <name>
+const USAGE = `Usage: dev-loops queue move --repo <owner/name> --project <number|id> --item <number|node-id> --to-column <name>
+       (dev-loops project move … is a back-compat alias)
 
 Move a GitHub Projects V2 item between Status columns.
 
@@ -23,47 +25,63 @@ Exit codes:
   3 — project, field, column, or item not found
 `.trim();
 
-const VALID_ARGS = new Set(["--repo", "--project", "--item", "--to-column", "--help", "-h"]);
+function parseCliArgs(argv) {
+  const parseError = (message) => Object.assign(new Error(message), { usage: USAGE });
+  const requireValue = (token, message) => {
+    const v = token.value;
+    if (typeof v !== "string" || v.length === 0 || v.startsWith("-")) {
+      throw parseError(message);
+    }
+    return v;
+  };
 
-function parseArgs(argv) {
   const args = {};
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (!VALID_ARGS.has(arg) && arg.startsWith("-")) {
-      throw Object.assign(
-        new Error(`Unknown flag: ${arg}`),
-        { code: "INVALID_ARGS", usage: USAGE },
-      );
+  const { tokens } = parseArgs({
+    args: [...argv],
+    options: {
+      repo: { type: "string" },
+      project: { type: "string" },
+      item: { type: "string" },
+      "to-column": { type: "string" },
+      help: { type: "boolean", short: "h" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
+
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      throw parseError(`Unexpected argument: ${token.value}`);
     }
-    if (arg === "--repo") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--repo requires a value (owner/name)"), { code: "INVALID_REPO" });
-      }
-      args.repo = argv[++i];
-    } else if (arg === "--project") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--project requires a value (number or node ID)"), { code: "INVALID_PROJECT" });
-      }
-      args.project = argv[++i];
-    } else if (arg === "--item") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--item requires a value (number or node ID)"), { code: "INVALID_ITEM" });
-      }
-      args.item = argv[++i];
-    } else if (arg === "--to-column") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--to-column requires a value"), { code: "INVALID_COLUMN" });
-      }
-      args.toColumn = argv[++i];
-    } else if (arg === "--help" || arg === "-h") {
-      args.help = true;
-    } else {
-      throw Object.assign(new Error(`Unexpected argument: ${arg}`), { code: "INVALID_ARGS", usage: USAGE });
+    if (token.kind !== "option") {
+      continue;
+    }
+    switch (token.name) {
+      case "help":
+        if (token.value !== undefined) {
+          throw parseError(`Unknown flag: ${token.rawName}=${token.value}`);
+        }
+        args.help = true;
+        break;
+      case "repo":
+        args.repo = requireValue(token, "--repo requires a value (owner/name)");
+        break;
+      case "project":
+        args.project = requireValue(token, "--project requires a value (number or node ID)");
+        break;
+      case "item":
+        args.item = requireValue(token, "--item requires a value (number or node ID)");
+        break;
+      case "to-column":
+        args.toColumn = requireValue(token, "--to-column requires a value");
+        break;
+      default:
+        throw parseError(`Unknown flag: ${token.rawName}`);
     }
   }
   return args;
 }
-
 // ── Validation ───────────────────────────────────────────────────────────
 
 const OWNER_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
@@ -210,7 +228,7 @@ const GET_PROJECT_ITEMS_BY_CONTENT = [
   "query($projectId:ID!, $after:String) {",
   "  node(id:$projectId) {",
   "    ... on ProjectV2 {",
-  "      items(first:10, after:$after, orderBy:{field:POSITION, direction:ASC}) {",
+  "      items(first:100, after:$after, orderBy:{field:POSITION, direction:ASC}) {",
   "        pageInfo { hasNextPage endCursor }",
   "        nodes {",
   "          id",
@@ -223,8 +241,8 @@ const GET_PROJECT_ITEMS_BY_CONTENT = [
   "            }",
   "          }",
   "          content {",
-  "            ... on Issue { number repository { nameWithOwner } }",
-  "            ... on PullRequest { number repository { nameWithOwner } }",
+  "            ... on Issue { __typename number repository { nameWithOwner } }",
+  "            ... on PullRequest { __typename number repository { nameWithOwner } }",
   "          }",
   "        }",
   "      }",
@@ -233,30 +251,6 @@ const GET_PROJECT_ITEMS_BY_CONTENT = [
   "}"
 ].join("\n");
 
-const GET_PROJECT_ITEM = [
-  "query($projectId:ID!, $itemId:ID!) {",
-  "  node(id:$projectId) {",
-  "    ... on ProjectV2 {",
-  "      item: item(id:$itemId) {",
-  "        id",
-  "        fieldValues(first:20) {",
-  "          nodes {",
-  "            ... on ProjectV2ItemFieldSingleSelectValue {",
-  "              field { ... on ProjectV2SingleSelectField { id name } }",
-  "              name",
-  "            }",
-  "          }",
-  "        }",
-  "        content {",
-  "          ... on Issue { number title url }",
-  "          ... on PullRequest { number title url }",
-  "        }",
-  "      }",
-  "    }",
-  "  }",
-  "}"
-].join("\n");
-
 const UPDATE_ITEM_FIELD = [
   "mutation($projectId:ID!, $itemId:ID!, $fieldId:ID!, $optionId:String!) {",
   "  updateProjectV2ItemFieldValue(input:{projectId:$projectId, itemId:$itemId, fieldId:$fieldId, value:{singleSelectOptionId:$optionId}}) {",
@@ -337,6 +331,39 @@ async function listAllFields(projectId, env, runChild) {
   return fields;
 }
 
+// ── Paginated item listing (position order) ──────────────────────────────
+
+async function fetchAllItems(projectId, env, runChild) {
+  const items = [];
+  let after = null;
+  while (true) {
+    const vars = { projectId };
+    if (after) vars.after = after;
+    const payload = await ghGraphql(GET_PROJECT_ITEMS_BY_CONTENT, vars, env, runChild);
+    const connection = payload?.data?.node?.items;
+    const nodes = connection?.nodes ?? [];
+    items.push(...nodes);
+    const pageInfo = connection?.pageInfo ?? {};
+    if (!pageInfo.hasNextPage) break;
+    if (!pageInfo.endCursor) {
+      throw Object.assign(
+        new Error("Invalid items payload: hasNextPage is true but endCursor is missing"),
+        { code: "GH_API_ERROR" },
+      );
+    }
+    after = pageInfo.endCursor;
+  }
+  return items;
+}
+
+function statusOf(node) {
+  const fvs = node?.fieldValues?.nodes ?? [];
+  for (const fv of fvs) {
+    if (fv && fv.field && fv.field.name === "Status") return fv.name;
+  }
+  return null;
+}
+
 // ── Exit code classification ────────────────────────────────────────────
 
 function classifyExitCode(err) {
@@ -397,80 +424,53 @@ async function main(args, { env = process.env, runChild } = {}) {
     );
   }
 
-  // 4. Find the item
-  let itemId;
-  let previousColumn = null;
-  let issueNumber = null;
-  let prNumber = null;
-
+  // 4. Find the item.
+  //
+  // Fetch the full board item list ONCE (paginated, position order) and resolve
+  // BOTH ref kinds against it. This reuses the proven pattern from
+  // reorder-queue-item / list-queue-items: a node-id ref matches by item.id, a
+  // number ref matches by content.number. Both are scoped to the requested repo
+  // so a cross-project ref fails closed with ITEM_NOT_FOUND. (The previous code
+  // used `ProjectV2.item` — a field that does not exist — for the node-id path,
+  // and a single non-paginated `items(first:10)` page for the number path, so it
+  // could not find items beyond the first page.)
+  const allItems = await fetchAllItems(project.id, env, child);
+
+  let match;
   if (itemRef.kind === "id") {
-    // Direct item node ID lookup
-    const itemPayload = await ghGraphql(GET_PROJECT_ITEM, {
-      projectId: project.id,
-      itemId: itemRef.value,
-    }, env, child);
-    const item = itemPayload?.data?.node?.item;
-    if (!item) {
+    match = allItems.find(
+      (it) => it.id === itemRef.value && it.content?.repository?.nameWithOwner === repo,
+    );
+    if (!match) {
       throw Object.assign(
-        new Error(`Item "${itemRef.value}" not found in project "${project.title}"`),
+        new Error(`Item "${itemRef.value}" not found in project "${project.title}" for repo "${repo}"`),
         { code: "ITEM_NOT_FOUND" },
       );
     }
-    itemId = item.id;
-    const fvs = item.fieldValues?.nodes ?? [];
-    for (const fv of fvs) {
-      if (fv && fv.field && fv.field.name === "Status") {
-        previousColumn = fv.name;
-        break;
-      }
-    }
-    if (item.content) {
-      if (item.content.__typename === "Issue") {
-        issueNumber = item.content.number;
-      } else {
-        prNumber = item.content.number;
-      }
-    }
   } else {
-    // Look up by issue/PR number in the project
-    const itemsPayload = await ghGraphql(GET_PROJECT_ITEMS_BY_CONTENT, {
-      projectId: project.id,
-    }, env, child);
-    const items = itemsPayload?.data?.node?.items?.nodes ?? [];
-
-    // Filter by matching repo exactly and item number (when known)
-    const matchingItems = items.filter((it) => {
-      if (!it.content) return false;
-      const repoMatch = it.content.repository?.nameWithOwner === repo;
-      if (itemRef.kind === "number") {
-        return repoMatch && it.content.number === itemRef.value;
-      }
-      return repoMatch;
-    });
-
-    if (matchingItems.length === 0) {
+    match = allItems.find(
+      (it) =>
+        it.content &&
+        it.content.repository?.nameWithOwner === repo &&
+        it.content.number === itemRef.value,
+    );
+    if (!match) {
       throw Object.assign(
         new Error(`Item #${itemRef.value} not found in project "${project.title}" for repo "${repo}"`),
         { code: "ITEM_NOT_FOUND" },
       );
     }
+  }
 
-    // Use the first match (by position order)
-    const match = matchingItems[0];
-    itemId = match.id;
-    const fvs = match.fieldValues?.nodes ?? [];
-    for (const fv of fvs) {
-      if (fv && fv.field && fv.field.name === "Status") {
-        previousColumn = fv.name;
-        break;
-      }
-    }
-    if (match.content) {
-      if (match.content.__typename === "Issue") {
-        issueNumber = match.content.number;
-      } else {
-        prNumber = match.content.number;
-      }
+  const itemId = match.id;
+  const previousColumn = statusOf(match);
+  let issueNumber = null;
+  let prNumber = null;
+  if (match.content) {
+    if (match.content.__typename === "PullRequest") {
+      prNumber = match.content.number;
+    } else {
+      issueNumber = match.content.number;
     }
   }
 
@@ -520,7 +520,7 @@ async function main(args, { env = process.env, runChild } = {}) {
 async function runCli(argv, { stdout = process.stdout, stderr = process.stderr, env = process.env } = {}) {
   let args;
   try {
-    args = parseArgs(argv);
+    args = parseCliArgs(argv);
   } catch (err) {
     stderr.write(`${formatCliError(err)}\n`);
     process.exitCode = 1;

package/scripts/projects/reorder-queue-item.mjs

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
 import { runChild as _runChild } from "../_cli-primitives.mjs";
+import { parseArgs } from "node:util";
 
 const USAGE = `Usage:
-  dev-loops project reorder --repo <owner/name> --project <number|id> --item <number|node-id> [--after <number|node-id>]
-  dev-loops project reorder move-to-top <ref> --repo <owner/name> --project <number|id>
-  dev-loops project reorder move-after <ref> <after-ref> --repo <owner/name> --project <number|id>
-  dev-loops project reorder order <ref1> <ref2> ... --repo <owner/name> --project <number|id>
+  dev-loops queue reorder --repo <owner/name> --project <number|id> --item <number|node-id> [--after <number|node-id>]
+  dev-loops queue reorder move-to-top <ref> --repo <owner/name> --project <number|id>
+  dev-loops queue reorder move-after <ref> <after-ref> --repo <owner/name> --project <number|id>
+  dev-loops queue reorder order <ref1> <ref2> ... --repo <owner/name> --project <number|id>
+  (dev-loops project reorder … is a back-compat alias)
 
 Reorder GitHub Projects V2 items by board position via updateProjectV2ItemPosition.
 
@@ -40,62 +42,79 @@ Exit codes:
 `.trim();
 
 const SUBCOMMANDS = new Set(["move-to-top", "move-after", "order"]);
-const VALID_ARGS = new Set(["--repo", "--project", "--item", "--after", "--dry-run", "--help", "-h"]);
 
-function parseArgs(argv) {
+function parseCliArgs(argv) {
+  const parseError = (message) => Object.assign(new Error(message), { usage: USAGE });
+  const requireValue = (token, message) => {
+    const v = token.value;
+    if (typeof v !== "string" || v.length === 0 || v.startsWith("-")) {
+      throw parseError(message);
+    }
+    return v;
+  };
+
   const args = { _positional: [] };
-  let i = 0;
+  let rest = argv;
 
-  // Optional leading positional subcommand.
   if (argv.length > 0 && SUBCOMMANDS.has(argv[0])) {
     args._subcommand = argv[0];
-    i = 1;
-  }
+    rest = argv.slice(1);
+  }
+
+  const { tokens } = parseArgs({
+    args: [...rest],
+    options: {
+      repo: { type: "string" },
+      project: { type: "string" },
+      item: { type: "string" },
+      after: { type: "string" },
+      "dry-run": { type: "boolean" },
+      help: { type: "boolean", short: "h" },
+    },
+    allowPositionals: true,
+    strict: false,
+    tokens: true,
+  });
 
-  for (; i < argv.length; i++) {
-    const arg = argv[i];
-    if (!arg.startsWith("-")) {
-      // Positional ref (only meaningful with a subcommand).
-      args._positional.push(arg);
+  for (const token of tokens) {
+    if (token.kind === "positional") {
+      args._positional.push(token.value);
       continue;
     }
-    if (!VALID_ARGS.has(arg)) {
-      throw Object.assign(
-        new Error(`Unknown flag: ${arg}`),
-        { code: "INVALID_ARGS", usage: USAGE },
-      );
+    if (token.kind !== "option") {
+      continue;
     }
-    if (arg === "--repo") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--repo requires a value (owner/name)"), { code: "INVALID_REPO" });
-      }
-      args.repo = argv[++i];
-    } else if (arg === "--project") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--project requires a value (number or node ID)"), { code: "INVALID_PROJECT" });
-      }
-      args.project = argv[++i];
-    } else if (arg === "--item") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--item requires a value (number or node ID)"), { code: "INVALID_ITEM" });
-      }
-      args.item = argv[++i];
-    } else if (arg === "--after") {
-      if (i + 1 >= argv.length || argv[i + 1].startsWith("-")) {
-        throw Object.assign(new Error("--after requires a value (number or node ID)"), { code: "INVALID_AFTER" });
-      }
-      args.after = argv[++i];
-    } else if (arg === "--dry-run") {
-      args.dryRun = true;
-    } else if (arg === "--help" || arg === "-h") {
-      args.help = true;
-    } else {
-      throw Object.assign(new Error(`Unexpected argument: ${arg}`), { code: "INVALID_ARGS", usage: USAGE });
+    switch (token.name) {
+      case "help":
+        if (token.value !== undefined) {
+          throw parseError(`Unknown flag: ${token.rawName}=${token.value}`);
+        }
+        args.help = true;
+        break;
+      case "repo":
+        args.repo = requireValue(token, "--repo requires a value (owner/name)");
+        break;
+      case "project":
+        args.project = requireValue(token, "--project requires a value (number or node ID)");
+        break;
+      case "item":
+        args.item = requireValue(token, "--item requires a value (number or node ID)");
+        break;
+      case "after":
+        args.after = requireValue(token, "--after requires a value (number or node ID)");
+        break;
+      case "dry-run":
+        if (token.value !== undefined) {
+          throw parseError(`Unknown flag: ${token.rawName}=${token.value}`);
+        }
+        args.dryRun = true;
+        break;
+      default:
+        throw parseError(`Unknown flag: ${token.rawName}`);
     }
   }
   return args;
 }
-
 // ── Validation ───────────────────────────────────────────────────────────
 
 const OWNER_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
@@ -747,7 +766,7 @@ async function main(args, { env = process.env, runChild } = {}) {
 async function runCli(argv, { stdout = process.stdout, stderr = process.stderr, env = process.env } = {}) {
   let args;
   try {
-    args = parseArgs(argv);
+    args = parseCliArgs(argv);
   } catch (err) {
     stderr.write(`${formatCliError(err)}\n`);
     process.exitCode = 1;