dev-loops 0.6.0 → 0.7.2

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

@@ -1,20 +1,29 @@
 #!/usr/bin/env node
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
 import { runChild as _runChild } from "../_cli-primitives.mjs";
+import { resolveProjectSelector, findProject, applyDevloopsBoard } from "./_resolve-project.mjs";
 import { parseArgs } from "node:util";
-import { JQ_OUTPUT_PARSE_OPTIONS, JQ_OUTPUT_USAGE, emitResult } from "../lib/jq-output.mjs";
+import { JQ_OUTPUT_PARSE_OPTIONS, JQ_OUTPUT_USAGE, emitResult, matchJqOutputToken } from "../lib/jq-output.mjs";
+import { loadStateColumnMap, LOGICAL_COLUMN } from "@dev-loops/core/loop/queue-board-sync";
 
-const USAGE = `Usage: dev-loops queue add --repo <owner/name> --project <number|id> --item <number>
+const USAGE = `Usage: dev-loops queue add --repo <owner/name> [--project <number|id>] --item <number>
        dev-loops project add … (back-compat alias for "queue add")
 
 Add an existing issue or PR to a GitHub Projects V2 board.
 
 Options:
   --repo <owner/name>         Required. Repository containing the issue/PR.
-  --project <number|id>       Required. Project number (integer) or node ID.
+  --project <number|id>       Project number (integer) or node ID. When omitted,
+                              resolved from .devloops queue.projectNumber /
+                              queue.boardTitle.
   --item <number>             Required. Issue or PR number to add.
   --column <name>             Initial Status column (default: "Backlog").
   --status <name>             Back-compat alias for --column.
+  --next-up                   Land the item directly in the configured next_up
+                              column (the normative pickup queue; "Next Up" by
+                              default, honors queue.statusColumns.next_up). Sugar
+                              for --column <that column>; cannot be combined with
+                              a conflicting --column/--status.
   --help, -h                  Show this help.
 
 Output (stdout):
@@ -48,6 +57,7 @@ function parseCliArgs(argv) {
       item: { type: "string" },
       column: { type: "string" },
       status: { type: "string" },
+      "next-up": { type: "boolean" },
       help: { type: "boolean", short: "h" },
       ...JQ_OUTPUT_PARSE_OPTIONS,
     },
@@ -97,14 +107,16 @@ function parseCliArgs(argv) {
         // resolved by argv order.
         args.status = requireValue(token, "--status requires a value");
         break;
-      case "jq":
-        args.jq = requireValue(token, "--jq requires a filter");
-        break;
-      case "silent":
-        args.silent = true;
+      case "next-up":
+        if (token.value !== undefined) {
+          throw Object.assign(new Error(`Unknown flag: ${token.rawName}=${token.value}`), { code: "INVALID_ARGS", usage: USAGE });
+        }
+        args.nextUp = true;
         break;
-      default:
+      default: {
+        if (matchJqOutputToken(token, args, (t) => requireValue(t, "--jq requires a filter"))) break;
         throw Object.assign(new Error(`Unknown flag: ${token.rawName}`), { code: "INVALID_ARGS", usage: USAGE });
+      }
     }
   }
   return args;
@@ -114,7 +126,6 @@ function parseCliArgs(argv) {
 
 const OWNER_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
 const REPO_NAME_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9_.-]*[a-zA-Z0-9])?$/;
-const GLOBAL_NODE_ID_RE = /^[A-Za-z0-9_]+$/;
 
 function validateRepo(repo) {
   if (!repo || typeof repo !== "string") {
@@ -139,30 +150,6 @@ function validateRepo(repo) {
   return repo;
 }
 
-function parseProjectRef(raw) {
-  if (!raw || typeof raw !== "string" || raw.trim().length === 0) {
-    throw Object.assign(new Error("--project is required"), { code: "INVALID_PROJECT" });
-  }
-  const trimmed = raw.trim();
-  const asNum = Number(trimmed);
-  if (Number.isInteger(asNum) && asNum > 0 && String(asNum) === trimmed) {
-    return { kind: "number", value: asNum };
-  }
-  if (trimmed === "0") {
-    throw Object.assign(
-      new Error(`--project must be a positive integer or a node ID, got "${raw}"`),
-      { code: "INVALID_PROJECT" },
-    );
-  }
-  if (GLOBAL_NODE_ID_RE.test(trimmed)) {
-    return { kind: "id", value: trimmed };
-  }
-  throw Object.assign(
-    new Error(`--project must be a positive integer or a node ID, got "${raw}"`),
-    { code: "INVALID_PROJECT" },
-  );
-}
-
 // ── API helpers ──────────────────────────────────────────────────────────
 
 async function ghGraphql(query, vars, env, runChild = _runChild, { allowErrors = false } = {}) {
@@ -385,11 +372,11 @@ function classifyExitCode(err) {
 
 // ── Main logic ──────────────────────────────────────────────────────────
 
-async function main(args, { env = process.env, runChild } = {}) {
+async function main(args, { env = process.env, runChild, cwd = process.cwd() } = {}) {
   const child = runChild ?? _runChild;
   const repo = validateRepo(args.repo);
   const [owner, repoName] = repo.split("/");
-  const projectRef = parseProjectRef(args.project);
+  const selector = resolveProjectSelector(args);
   const itemNumber = args.item;
   if (!Number.isInteger(itemNumber) || itemNumber < 1) {
     throw Object.assign(new Error("--item is required and must be a positive integer"), { code: "INVALID_ITEM" });
@@ -400,28 +387,43 @@ async function main(args, { env = process.env, runChild } = {}) {
       { code: "INVALID_ARGS", usage: USAGE },
     );
   }
-  const targetStatus = (args.column ?? args.status ?? "Backlog").trim();
+  // --next-up is sugar for --column <resolved next_up display name> (the
+  // normative pickup queue, #1091), resolved through the SAME statusColumns
+  // mapping board-sync uses (#1098) so a renamed Next Up column agrees with
+  // an explicit --column of the same configured name.
+  const { columnNames, error: configError } = loadStateColumnMap(cwd);
+  // Fail CLOSED on a malformed `.devloops` when --next-up drives the target:
+  // silently using the literal "Next Up" could land in the wrong column (#1098).
+  // A plain `--column X` add never consults statusColumns, so it is unaffected.
+  if (args.nextUp && configError) {
+    throw Object.assign(
+      new Error(`could not resolve next_up column (config read/parse error: ${configError})`),
+      { code: "CONFIG_ERROR" },
+    );
+  }
+  const nextUpColumn = columnNames[LOGICAL_COLUMN.NEXT_UP];
+  const explicitColumn = args.column ?? args.status ?? null;
+  if (args.nextUp && explicitColumn != null && explicitColumn.trim() !== nextUpColumn) {
+    throw Object.assign(
+      new Error(`Conflicting --next-up and --column/--status ("${explicitColumn}") — pass only one.`),
+      { code: "INVALID_ARGS", usage: USAGE },
+    );
+  }
+  const targetStatus = (args.nextUp ? nextUpColumn : (explicitColumn ?? "Backlog")).trim();
   if (!targetStatus) {
     throw Object.assign(new Error("--column must not be empty"), { code: "INVALID_STATUS" });
   }
 
   // 1. Resolve owner
-  const { id: ownerId, kind: ownerKind } = await resolveOwner(owner, env, child);
+  // URI refs encode owner+kind directly; skip the API round-trip for owner resolution.
+  const projectOwner = selector.projectRef?.kind === "uri" ? selector.projectRef.owner : owner;
+  const ownerKind = selector.projectRef?.kind === "uri"
+    ? selector.projectRef.ownerKind
+    : (await resolveOwner(owner, env, child)).kind;
 
   // 2. Resolve project
-  const projects = await listAllProjects(owner, ownerKind, env, child);
-  let project;
-  if (projectRef.kind === "id") {
-    project = projects.find((p) => p.id === projectRef.value);
-  } else {
-    project = projects.find((p) => p.number === projectRef.value);
-  }
-  if (!project) {
-    throw Object.assign(
-      new Error(`Project ${projectRef.kind === "id" ? `"${projectRef.value}"` : `number ${projectRef.value}`} not found under owner "${owner}"`),
-      { code: "PROJECT_NOT_FOUND" },
-    );
-  }
+  const projects = await listAllProjects(projectOwner, ownerKind, env, child);
+  const project = findProject(projects, selector, projectOwner);
 
   // 3. Resolve Status field and target column
   const fieldNodes = await listAllFields(project.id, env, child);
@@ -538,7 +540,7 @@ async function main(args, { env = process.env, runChild } = {}) {
 
 // ── CLI entrypoint ──────────────────────────────────────────────────────
 
-async function runCli(argv, { stdout = process.stdout, stderr = process.stderr, env = process.env } = {}) {
+async function runCli(argv, { stdout = process.stdout, stderr = process.stderr, env = process.env, cwd = process.cwd(), runChild } = {}) {
   let args;
   try {
     args = parseCliArgs(argv);
@@ -551,8 +553,12 @@ async function runCli(argv, { stdout = process.stdout, stderr = process.stderr,
     stdout.write(USAGE);
     return;
   }
+
+  // Resolve the board from .devloops when --project is absent.
+  applyDevloopsBoard(args, cwd);
+
   try {
-    const result = await main(args, { env });
+    const result = await main(args, { env, runChild, cwd });
     process.exitCode = emitResult(result, { jq: args.jq, silent: args.silent, stdout, stderr });
   } catch (err) {
     stderr.write(JSON.stringify({ ok: false, error: err.message, code: err.code ?? "UNKNOWN" }) + "\n");
@@ -567,4 +573,4 @@ if (isDirectCliRun(import.meta.url)) {
   });
 }
 
-export { main, parseCliArgs };
+export { main, parseCliArgs, runCli };

package/scripts/projects/archive-done-items.mjs

@@ -1,37 +1,40 @@
 #!/usr/bin/env node
-import { readFileSync } from "node:fs";
-import path from "node:path";
-import { parse as parseYaml } from "yaml";
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
 import { runChild as _runChild } from "../_cli-primitives.mjs";
+import { resolveSettings, parseProjectRef, findProject } from "./_resolve-project.mjs";
 import { parseArgs } from "node:util";
+import { JQ_OUTPUT_PARSE_OPTIONS, JQ_OUTPUT_USAGE, emitResult, matchJqOutputToken } from "../lib/jq-output.mjs";
+import { loadStateColumnMap, LOGICAL_COLUMN } from "@dev-loops/core/loop/queue-board-sync";
 
-const USAGE = `Usage: dev-loops queue archive-done --repo <owner/name> [--project <number|id>] [--older-than <duration>] [--dry-run]
+const USAGE = `Usage: dev-loops queue archive-done --repo <owner/name> [--project <number|id|board-uri>] [--older-than <duration>] [--dry-run]
        (dev-loops project archive-done … is a back-compat alias)
 
 Archive GitHub Projects V2 items whose issue/PR has been closed for at least the
 given duration. Operator-triggered (no webhooks). Uses archiveProjectV2Item.
 
 Options:
-  --repo <owner/name>     Required. Repository to scope the project search.
-  --project <number|id>   Project number (integer) or node ID. When omitted,
-                          resolved from .devloops queue.projectNumber /
-                          queue.boardTitle.
-  --older-than <duration> Closed-for threshold. Format: <n><unit> where unit is
-                          h (hours), d (days), or w (weeks). Default resolves
-                          from .devloops queue.archiveOlderThanDays, else 7d.
-  --dry-run               Print the intended archive mutation(s) without executing.
-  --help, -h              Show this help.
+  --repo <owner/name>                 Required. Repository to scope the project search.
+  --project <number|id|board-uri>     Project number, node ID, or board URI
+                                      (e.g. https://github.com/users/me/projects/3).
+                                      When omitted, resolved from .devloops
+                                      queue.projectNumber / queue.boardTitle.
+  --older-than <duration>             Closed-for threshold. Format: <n><unit> where unit is
+                                      h (hours), d (days), or w (weeks). Default resolves
+                                      from .devloops queue.archiveOlderThanDays, else 7d.
+  --dry-run                           Print the intended archive mutation(s) without executing.
+  --help, -h                          Show this help.
 
 Output (stdout):
   JSON: { ok: true, olderThan, scanned, archivable, archived: [{ itemId, issueNumber, prNumber, closedAt }] }
   dry-run: { ok: true, dryRun: true, olderThan, scanned, archivable, mutations: [{ query, variables }] }
   (scanned = all repo board items; archivable = items selected for archival)
 
+${JQ_OUTPUT_USAGE}
+
 Exit codes:
   0 — success
   1 — usage or argument error
-  2 — GitHub API error
+  2 — GitHub API error / invalid --jq filter
   3 — project not found
 `.trim();
 
@@ -53,6 +56,7 @@ function parseCliArgs(argv) {
       "older-than": { type: "string" },
       "dry-run": { type: "boolean" },
       help: { type: "boolean", short: "h" },
+      ...JQ_OUTPUT_PARSE_OPTIONS,
     },
     allowPositionals: true,
     strict: false,
@@ -88,8 +92,10 @@ function parseCliArgs(argv) {
         }
         args.dryRun = true;
         break;
-      default:
+      default: {
+        if (matchJqOutputToken(token, args, (t) => requireValue(t, "--jq requires a filter", "INVALID_ARGS"))) break;
         throw Object.assign(new Error(`Unknown flag: ${token.rawName}`), { code: "INVALID_ARGS", usage: USAGE });
+      }
     }
   }
   return args;
@@ -99,7 +105,6 @@ function parseCliArgs(argv) {
 
 const OWNER_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
 const REPO_NAME_RE = /^[a-zA-Z0-9](?:[a-zA-Z0-9_.-]*[a-zA-Z0-9])?$/;
-const GLOBAL_NODE_ID_RE = /^[A-Za-z0-9_]+$/;
 
 function validateRepo(repo) {
   if (!repo || typeof repo !== "string") {
@@ -117,21 +122,6 @@ function validateRepo(repo) {
   return repo;
 }
 
-function parseProjectRef(raw) {
-  if (!raw || typeof raw !== "string" || raw.trim().length === 0) {
-    throw Object.assign(new Error("--project is required"), { code: "INVALID_PROJECT" });
-  }
-  const trimmed = raw.trim();
-  const asNum = Number(trimmed);
-  if (Number.isInteger(asNum) && asNum > 0 && String(asNum) === trimmed) {
-    return { kind: "number", value: asNum };
-  }
-  if (GLOBAL_NODE_ID_RE.test(trimmed) && trimmed !== "0") {
-    return { kind: "id", value: trimmed };
-  }
-  throw Object.assign(new Error(`--project must be a positive integer or a node ID, got "${raw}"`), { code: "INVALID_PROJECT" });
-}
-
 const DURATION_RE = /^(\d+)(h|d|w)$/;
 const UNIT_MS = {
   h: 60 * 60 * 1000,
@@ -154,37 +144,6 @@ function parseDuration(raw) {
   return n * UNIT_MS[m[2]];
 }
 
-// ── Settings fallback ──────────────────────────────────────────────────────
-
-// Read .devloops (and extension variants) queue settings, mirroring the
-// resolution used by ensure-queue-board.mjs. Returns { project }, { title },
-// and/or { olderThanDays } when configured; never throws on a missing/bad file.
-function resolveSettings(cwd) {
-  const basePath = path.join(cwd, ".devloops");
-  const extensions = ["", ".yaml", ".yml", ".json"];
-  for (const ext of extensions) {
-    try {
-      const raw = readFileSync(basePath + ext, "utf-8");
-      const settings = ext === ".json" ? JSON.parse(raw) : parseYaml(raw);
-      const queue = settings?.queue;
-      if (!queue) return null;
-      const out = {};
-      if (typeof queue.projectNumber === "number" && Number.isInteger(queue.projectNumber) && queue.projectNumber > 0) {
-        out.project = queue.projectNumber;
-      } else if (typeof queue.boardTitle === "string" && queue.boardTitle.trim().length > 0) {
-        out.title = queue.boardTitle.trim();
-      }
-      if (typeof queue.archiveOlderThanDays === "number" && Number.isInteger(queue.archiveOlderThanDays) && queue.archiveOlderThanDays > 0) {
-        out.olderThanDays = queue.archiveOlderThanDays;
-      }
-      return out;
-    } catch {
-      // extension not present or unparseable — try next
-    }
-  }
-  return null;
-}
-
 // ── API helpers ──────────────────────────────────────────────────────────
 
 async function ghGraphql(query, vars, env, runChild = _runChild) {
@@ -350,12 +309,14 @@ function normalizeItem(node) {
 // ── Selection logic (pure) ────────────────────────────────────────────────
 
 // Select items whose issue/PR is closed and has been closed for >= olderThanMs.
-function selectArchivable(items, { now, olderThanMs }) {
+// `doneColumn` defaults to the literal "Done" for direct/pure-unit callers;
+// main() always passes the configured column name (#1098, #1143).
+function selectArchivable(items, { now, olderThanMs, doneColumn = "Done" }) {
   return items.filter((it) => {
     if (it.isArchived) return false;
     // Only archive items in the Done column — a closed issue/PR parked in
     // another column (Backlog/Next Up/In Progress) must be left untouched.
-    if (it.status !== "Done") return false;
+    if (it.status !== doneColumn) return false;
     const c = it.content;
     if (!c || !c.closed || !c.closedAt) return false;
     const closedAtMs = Date.parse(c.closedAt);
@@ -375,9 +336,22 @@ function classifyExitCode(err) {
 
 // ── Main logic ──────────────────────────────────────────────────────────
 
-async function main(args, { env = process.env, runChild } = {}) {
+async function main(args, { env = process.env, runChild, cwd = process.cwd() } = {}) {
   const child = runChild ?? _runChild;
   const repo = validateRepo(args.repo);
+  // Resolve the done column name through the SAME statusColumns mapping
+  // board-sync uses (#1098, #1143): a repo that renamed Done gets its
+  // configured column matched here, not the literal default. Fail CLOSED on a
+  // malformed `.devloops` — never silently archive against the literal "Done"
+  // and risk archiving nothing on a renamed/stale column.
+  const { columnNames, error: configError } = loadStateColumnMap(cwd);
+  if (configError) {
+    throw Object.assign(
+      new Error(`could not resolve done column (config read/parse error: ${configError})`),
+      { code: "CONFIG_ERROR" },
+    );
+  }
+  const doneColumn = columnNames[LOGICAL_COLUMN.DONE];
   const [owner] = repo.split("/");
   // Board: explicit --project ref wins; otherwise resolve by board title from
   // .devloops (passed in as args.projectTitle by runCli). Fail closed if neither.
@@ -396,22 +370,13 @@ async function main(args, { env = process.env, runChild } = {}) {
   const olderThanMs = parseDuration(olderThanRaw);
   const now = args.now ?? Date.now();
 
-  const { kind: ownerKind } = await resolveOwner(owner, env, child);
-  const projects = await listAllProjects(owner, ownerKind, env, child);
-  const project = projectRef
-    ? (projectRef.kind === "id"
-        ? projects.find((p) => p.id === projectRef.value)
-        : projects.find((p) => p.number === projectRef.value))
-    : projects.find((p) => p.title === projectTitle);
-  if (!project) {
-    const desc = projectRef
-      ? (projectRef.kind === "id" ? `"${projectRef.value}"` : `number ${projectRef.value}`)
-      : `title "${projectTitle}"`;
-    throw Object.assign(
-      new Error(`Project ${desc} not found under owner "${owner}"`),
-      { code: "PROJECT_NOT_FOUND" },
-    );
-  }
+  // URI refs encode owner+kind directly; skip the API round-trip for owner resolution.
+  const projectOwner = projectRef?.kind === "uri" ? projectRef.owner : owner;
+  const ownerKind = projectRef?.kind === "uri"
+    ? projectRef.ownerKind
+    : (await resolveOwner(owner, env, child)).kind;
+  const projects = await listAllProjects(projectOwner, ownerKind, env, child);
+  const project = findProject(projects, { projectRef, projectTitle }, projectOwner);
 
   const rawItems = await fetchAllItems(project.id, env, child);
   // Only consider items whose content belongs to the target repo (single-repo scope).
@@ -419,7 +384,7 @@ async function main(args, { env = process.env, runChild } = {}) {
     .filter((n) => n.content && n.content.repository?.nameWithOwner === repo)
     .map(normalizeItem);
 
-  const archivable = selectArchivable(repoItems, { now, olderThanMs });
+  const archivable = selectArchivable(repoItems, { now, olderThanMs, doneColumn });
 
   const mutations = archivable.map((it) => ({
     query: ARCHIVE_ITEM,
@@ -489,8 +454,8 @@ async function runCli(argv, { stdout = process.stdout, stderr = process.stderr,
   }
 
   try {
-    const result = await main(args, { env });
-    stdout.write(JSON.stringify(result) + "\n");
+    const result = await main(args, { env, cwd });
+    process.exitCode = emitResult(result, { jq: args.jq, silent: args.silent, stdout, stderr });
   } catch (err) {
     stderr.write(JSON.stringify({ ok: false, error: err.message, code: err.code ?? "UNKNOWN" }) + "\n");
     process.exitCode = classifyExitCode(err);

package/scripts/projects/ensure-queue-board.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-import { readFileSync } from "node:fs";
-import path from "node:path";
 import { parseArgs } from "node:util";
-import { parse as parseYaml } from "yaml";
 import { formatCliError, isDirectCliRun, parseJsonText } from "../_core-helpers.mjs";
 import { runChild as _runChild } from "../_cli-primitives.mjs";
+import { resolveSettings } from "./_resolve-project.mjs";
+import { JQ_OUTPUT_PARSE_OPTIONS, JQ_OUTPUT_USAGE, emitResult, matchJqOutputToken } from "../lib/jq-output.mjs";
 
 const USAGE = `Usage: dev-loops queue ensure --repo <owner/name> [--project <number>] [--title <title>] [--link-repo <owner/name>] [--repair-rename]
        (dev-loops project ensure … is a back-compat alias)
@@ -27,10 +26,12 @@ queue.projectNumber or queue.boardTitle.
 Output (stdout):
   JSON: { ok: true, project: { id, number, title, url, statusFieldId, linkedRepo } }
 
+${JQ_OUTPUT_USAGE}
+
 Exit codes:
   0 — board exists or was created successfully (idempotent)
   1 — usage or argument error
-  2 — GitHub API error
+  2 — GitHub API error / invalid --jq filter
   3 — board schema/config mismatch (manual reconciliation needed)
 `;
 
@@ -54,6 +55,7 @@ function parseCliArgs(argv) {
       "link-repo": { type: "string" },
       "repair-rename": { type: "boolean" },
       help: { type: "boolean", short: "h" },
+      ...JQ_OUTPUT_PARSE_OPTIONS,
     },
     allowPositionals: true,
     strict: false,
@@ -98,8 +100,10 @@ function parseCliArgs(argv) {
         }
         args.repairRename = true;
         break;
-      default:
+      default: {
+        if (matchJqOutputToken(token, args, (t) => requireValue(t, "--jq requires a filter"))) break;
         throw parseError(`Unknown flag: ${token.rawName}`);
+      }
     }
   }
   return args;
@@ -146,36 +150,6 @@ function validateRepo(repo) {
   return repo;
 }
 
-// ── Settings fallback ────────────────────────────────────────────────────
-
-function resolveSettings(cwd) {
-  // Try bare .devloops and extension variants (.yaml, .yml, .json)
-  // to match the config loader's consumer override detection.
-  // .json uses strict JSON.parse; all others use the YAML parser.
-  const basePath = path.join(cwd, ".devloops");
-  const extensions = ["", ".yaml", ".yml", ".json"];
-  for (const ext of extensions) {
-    try {
-      const settingsPath = basePath + ext;
-      const raw = readFileSync(settingsPath, "utf-8");
-      const settings = ext === ".json" ? JSON.parse(raw) : parseYaml(raw);
-      const queue = settings?.queue;
-      if (queue) {
-        if (typeof queue.projectNumber === "number" && Number.isInteger(queue.projectNumber) && queue.projectNumber > 0) {
-          return { project: queue.projectNumber };
-        }
-        if (typeof queue.boardTitle === "string" && queue.boardTitle.trim().length > 0) {
-          return { title: queue.boardTitle.trim() };
-        }
-      }
-      return null;
-    } catch {
-      // extension not present or unparseable — try next
-    }
-  }
-  return null;
-}
-
 // ── API helpers ──────────────────────────────────────────────────────────
 
 async function ghGraphql(query, vars, env, runChild = _runChild) {
@@ -822,7 +796,7 @@ async function runCli(argv, { stdout = process.stdout, stderr = process.stderr,
 
   try {
     const result = await main(args, { env });
-    stdout.write(JSON.stringify(result) + "\n");
+    process.exitCode = emitResult(result, { jq: args.jq, silent: args.silent, stdout, stderr });
   } catch (err) {
     stderr.write(`${formatCliError(err)}\n`);
     process.exitCode = classifyExitCode(err);