@maycombhq/atticus 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/{chunk-7FUIVIBG.js → chunk-HUGQZQ2K.js}

@@ -5,10 +5,10 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   factsRepos
-} from "./chunk-LN77DXBM.js";
+} from "./chunk-T6MX7WXM.js";
 import {
   checkoutOf
-} from "./chunk-Q46QDDMF.js";
+} from "./chunk-73GFVW2L.js";
 import {
   AUDIT_ANSWERS,
   AUDIT_DEFAULT_SIZE,
@@ -23,17 +23,22 @@ import {
   orgPackDirOf,
   parseAuditFile,
   parseFacts,
-  require_dist,
   serializeAuditFile,
   sumAuditPrecision
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
+import {
+  writeFileAtomic
+} from "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/audit-commands.js
 var import_yaml = __toESM(require_dist(), 1);
-import { readFile, writeFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import { isAbsolute, join, resolve } from "node:path";
 var AUDIT_WORDS = {
   usage: "Usage: atticus verify audit <repo> [--size n] [--seed s] [--answers file | --right ids --wrong ids --unsure ids] [--json], atticus verify audit <repo> --report, or atticus verify audit --report for the estate",
@@ -107,7 +112,7 @@ async function readFactsOf(root, repo) {
   return r.ok ? { facts: r.facts } : { bad: true };
 }
 async function linksOf(root, repo) {
-  const { estateFacts, estateJoinOf, auditLinkCandidates } = await import("./chunk-BXZ4PKIT.js");
+  const { estateFacts, estateJoinOf, auditLinkCandidates } = await import("./chunk-BUUJ7N4O.js");
   const op = await loadOrgPack(orgPackDirOf(root));
   const estate = await estateFacts(root, op, "");
   const join2 = estateJoinOf(op, estate.repos, estate.targets, estate.pairs, estate.aiTargets);
@@ -192,7 +197,7 @@ async function prepareAudit(root, repo, o = {}) {
   const size = o.size && o.size > 0 ? Math.floor(o.size) : AUDIT_DEFAULT_SIZE;
   const seed = o.seed ?? defaultAuditSeed(repo, commit);
   const links = await linksOf(root, repo);
-  const { aiAuditCandidates } = await import("./chunk-LU4MQVAL.js");
+  const { aiAuditCandidates } = await import("./chunk-3ZA3AK2D.js");
   const ai = await aiAuditCandidates(root, repo);
   const drawn = drawAudit({ facts: auditCandidates(facts), links, ai, size, seed });
   const now = (o.now ?? (() => /* @__PURE__ */ new Date()))().toISOString();
@@ -228,7 +233,7 @@ function answerAudit(audit, answers, by, now) {
   return unknown;
 }
 async function writeAudit(root, repo, audit) {
-  await writeFile(auditPath(root, repo), serializeAuditFile(audit), "utf8");
+  await writeFileAtomic(auditPath(root, repo), serializeAuditFile(audit));
 }
 async function auditLines(root, repo, items, dir) {
   const lineOf = lineReader(root, dir ? { dir } : {}, repo);

package/dist/{chunk-QOOEYDNJ.js → chunk-ICBGVVRI.js}

@@ -3,24 +3,24 @@ import { fileURLToPath as __atticusFileURLToPath } from "node:url";
 var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
-import {
-  HttpError,
-  badRequest,
-  notFound
-} from "./chunk-HK3VOHIE.js";
 import {
   appendLines
-} from "./chunk-THN26IEF.js";
+} from "./chunk-PXW2RZGQ.js";
 import {
   readCorrections
-} from "./chunk-Q46QDDMF.js";
+} from "./chunk-73GFVW2L.js";
+import {
+  HttpError,
+  badRequest,
+  notFound
+} from "./chunk-HRS5O7VV.js";
 import {
   applyCorrections,
   correctedFact,
   correctionFor,
   outsidePairingFor,
   repairFormSlips
-} from "./chunk-JYMIB5XY.js";
+} from "./chunk-CZ2ZS7AT.js";
 import {
   FACT_FIXED_FIELDS,
   FactCorrection,
@@ -34,7 +34,7 @@ import {
   parseFactsLines,
   questionsDirOf,
   sampleConfirmed
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
 
 // packages/cli/dist/ui-api-facts.js
 import { mkdir, readFile } from "node:fs/promises";
@@ -245,7 +245,7 @@ function uiFactsRoutes(r, ctx, deps = {}) {
     const fact = query.get("fact") || void 0;
     if (fact && !FactId.safeParse(fact).success)
       throw badRequest(`${JSON.stringify(fact)} isn't a fact id.`);
-    const { verifyWritePreview } = await import("./chunk-KDAHXQIE.js");
+    const { verifyWritePreview } = await import("./chunk-MWF4PXQR.js");
     const v = await verifyWritePreview(ctx.root, repo, fact ? { fact } : {});
     if (!v)
       throw notFound(`There are no facts for ${repo} at ${factsRelOf(ctx.root)}/${repo}.jsonl.`);

package/dist/{chunk-XG4WJHLQ.js → chunk-IGOE6KPG.js}

@@ -6,10 +6,13 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   aliasArgv,
   isLegacy
-} from "./chunk-BXBCMGIQ.js";
+} from "./chunk-24OXGB3P.js";
 import {
   isHandoffStep
 } from "./chunk-4Q3NN7VF.js";
+import {
+  optionsFor
+} from "./chunk-QA4O2GGC.js";
 
 // packages/cli/dist/command-catalog.js
 var AREAS = [
@@ -189,24 +192,45 @@ function parseArgs(id, usage) {
   }
   return out;
 }
-function parseFlags(text, summaries) {
+function requiredFlags(usage) {
+  let masked = "";
+  let depth = 0;
+  let quoted = false;
+  for (const ch of usage) {
+    if (ch === '"')
+      quoted = !quoted;
+    else if (!quoted && (ch === "[" || ch === "<"))
+      depth++;
+    else if (!quoted && (ch === "]" || ch === ">"))
+      depth = Math.max(0, depth - 1);
+    masked += depth || quoted || ch === '"' || ch === "]" || ch === ">" ? "_" : ch;
+  }
+  const tokens = masked.split(/\s+/).filter(Boolean);
+  const flagOf = (t) => /^--[a-z]/.test(t) ? t.split("=")[0] : void 0;
+  const bar = tokens.indexOf("|");
+  if (bar < 0)
+    return new Set(tokens.map(flagOf).filter((f) => !!f));
+  const first = tokens.slice(0, bar).map(flagOf).filter((f) => !!f);
+  return new Set(first.slice(0, -1));
+}
+function parseFlags(text, summaries, required, options) {
   const out = /* @__PURE__ */ new Map();
   const re = /(--[a-z][a-z-]*)(?:[ =]("[^"]*"|<[^>]+>|[A-Za-z0-9][\w.,=-]*(?:\|[\w.-]+)*))?/g;
   for (const m of text.matchAll(re)) {
     const name = m[1];
     if (out.has(name))
       continue;
-    const before = text.slice(0, m.index);
-    const opened = (before.match(/\[/g) ?? []).length - (before.match(/\]/g) ?? []).length;
+    const type = options[name.slice(2)]?.type;
     let value = m[2]?.replace(/^<|>$/g, "");
-    if (value?.startsWith("--") || value && /^[a-z]+$/.test(value) && !m[2].startsWith("<"))
-      value = /^(m|n|t|s|k|f|c|d|o|p|file|dir|id)$/.test(value) ? value : void 0;
+    if (value?.startsWith("--") || type === "boolean")
+      value = void 0;
+    else if (type === "string")
+      value ??= "value";
     const summary = summaries.get(name);
     out.set(name, {
       name,
       ...value ? { value } : {},
-      // `<folder> | --org <org>`: the option is given instead of the argument, not as well.
-      required: opened <= 0 && !/(<[^>]+>|"[^"]*")\s*\|\s*$/.test(before),
+      required: required.has(name),
       ...summary ? { summary } : {}
     });
   }
@@ -235,13 +259,14 @@ function parseHelp(help) {
     const written = cut > 0 ? b.line.slice(cut).trim() : b.below ?? "";
     const summary = written.replace(/(\s*\[[^\]]*--[^\]]*\](\.\.\.)?)+\s*$/, "");
     const tokens = usage.split(" ").slice(1);
-    const words = [];
+    const named = [];
     for (const t of tokens) {
       if (!isWord(t))
         break;
-      words.push(t);
+      named.push(t);
     }
-    const id = words.join(" ");
+    const after = tokens[named.length];
+    const ways = after && /^[a-z][a-z-]*(\|[a-z][a-z-]*)+$/.test(after) ? after.split("|") : [];
     const summaries = /* @__PURE__ */ new Map();
     for (const m of b.more) {
       const c = m.search(/ {2,}/);
@@ -253,21 +278,24 @@ function parseHelp(help) {
     }
     const optionText = [
       `${usage} `,
-      written,
+      written.slice(summary.length),
       // Each option line's option part only: its description may hold brackets of its own.
       ...b.more.map((m) => {
         const c = m.search(/ {2,}/);
         return `[${(c > 0 ? m.slice(0, c) : m).replace(/^\[|\]$/g, "")}]`;
       })
     ].join(" ");
-    out.push({
-      id,
-      words,
-      usage,
-      summary,
-      args: parseArgs(id, usage.slice(`atticus ${id}`.length)),
-      flags: parseFlags(optionText, summaries)
-    });
+    const required = requiredFlags(usage);
+    const approves = APPROVE_FLAGS.filter((f) => new RegExp(`${f}(?![a-z-])`).test(written));
+    const rest = usage.slice(`atticus ${[...named, ...ways.length ? [after] : []].join(" ")}`.length);
+    for (const words of ways.length ? ways.map((w) => [...named, w]) : [named]) {
+      const id = words.join(" ");
+      const flags = parseFlags(optionText, summaries, required, optionsFor(words));
+      for (const name of approves)
+        if (!flags.some((f) => f.name === name))
+          flags.push({ name, required: false });
+      out.push({ id, words, usage, summary, args: parseArgs(id, rest), flags });
+    }
   }
   return out;
 }
@@ -298,6 +326,7 @@ function commandCatalog(help) {
 
 export {
   AREAS,
+  requiredFlags,
   parseHelp,
   commandCatalog
 };