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

package/dist/{chunk-HITVBIJS.js → chunk-ZX7235KR.js}

@@ -9,7 +9,7 @@ import {
   matrixMarkdown,
   traceMatrix,
   writeTraceFindings
-} from "./chunk-2ANOROX3.js";
+} from "./chunk-EZIN5E5B.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
@@ -18,14 +18,15 @@ import {
   readDataChanges,
   readHops,
   reviewedGates
-} from "./chunk-3HI6Z55Y.js";
+} from "./chunk-K332XW7K.js";
 import {
   assess,
   changeFolder,
   changeStore,
   checkFindings,
-  loadChangeContext
-} from "./chunk-XY3P7JW7.js";
+  loadChangeContext,
+  nothingToRelease
+} from "./chunk-HSZMPH5T.js";
 import {
   GlossaryError,
   aliasDecision,
@@ -37,37 +38,40 @@ import {
   resolveTermId,
   scanGlossary,
   writeDecisions
-} from "./chunk-27NKUS3X.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   BUILT_IN_EXTRACTORS,
   SHIPPED_DIALECTS_DIR,
   dialectExtractor,
   loadShippedDialects,
   runDialectTests
-} from "./chunk-MC3H7736.js";
+} from "./chunk-TWQRPM76.js";
 import {
   baseClonePath,
   checkoutState,
   createGit,
   readChangeRepos
-} from "./chunk-EFHQ3TWP.js";
+} from "./chunk-XOL3GFW2.js";
+import {
+  runtimeForCli
+} from "./chunk-QHJJMZLX.js";
 import {
   DEFAULT_IGNORES,
   fsRepo,
   scanRepo
-} from "./chunk-GQ4N4WKF.js";
-import {
-  runtimeForCli
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   catalogDirOf,
+  effectiveComponentTypes,
   external_exports,
+  factsDirOf,
   loadOrgPack,
   mergeCatalog,
   normalizePath,
   orgPackDirOf,
+  parseFacts,
   require_dist
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-PAINMSID.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -501,6 +505,8 @@ async function repoDrift(o) {
   const merged = mergeCatalog({
     // A fetched copy of the catalog has no manifest, so no declared hosts: route by basepath.
     ...orgPackDir ? {} : { gatewayByBasepath: true },
+    // ADR 0180: the organisation's component types, as the scan merges with them (no false drift).
+    componentTypes: new Set(effectiveComponentTypes(op.componentTypes).map((t) => t.id)),
     records: [...context, ...otherEnds(catalog.records, repoId, components), ...scan.records],
     repos: manifest.map((r) => ({
       id: r.id,
@@ -812,6 +818,34 @@ function pipelineSnippet(kind) {
 import { existsSync as existsSync2 } from "node:fs";
 import { readFile as readFile2 } from "node:fs/promises";
 import { join as join3 } from "node:path";
+var short = (c) => c.slice(0, 12);
+var sameCommit = (a, b) => a.startsWith(b) || b.startsWith(a);
+var plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
+async function factsAtMerge(root, r, merged, catalog) {
+  const where2 = `${short(merged)}, the commit its release merged into ${r.base}`;
+  const readAgain = `read it again (Map \u203A Trust \u203A Freshness: Read again, or atticus map ${r.id}), then atticus verify ${r.id} --write, so the catalog says what shipped.`;
+  const text = await readFile2(join3(factsDirOf(root), `${r.id}.jsonl`), "utf8").catch(() => "");
+  const parsed = text.trim() ? parseFacts(text) : void 0;
+  const facts = parsed?.ok ? parsed.facts : [];
+  if (!facts.length)
+    return {
+      code: "needs-reading",
+      message: `${r.id}: no facts were read at ${where2}: ${readAgain}`
+    };
+  const other = [...new Set(facts.map((f) => f.commit))].filter((c) => !sameCommit(c, merged));
+  if (other.length)
+    return {
+      code: "needs-reading",
+      message: `${r.id}: its facts were read at ${other.map(short).join(", ")}, not at ${where2}: ${readAgain}`
+    };
+  const stale = (await catalog()).filter((x) => x.evidence.some((e) => e.repo === r.id && e.commit && !sameCommit(e.commit, merged))).length;
+  if (stale)
+    return {
+      code: "catalog-stale",
+      message: `${r.id}: its facts are of the merged commit ${short(merged)}, but ${plural(stale, "catalog record")} still ${stale === 1 ? "cites" : "cite"} another commit: write them into the catalog (atticus verify ${r.id} --write, or Apply on the Map).`
+    };
+  return void 0;
+}
 async function archiveGate(root, changeId, o = {}) {
   const change = await changeStore(root).read(changeId);
   const blockers = [];
@@ -832,11 +866,20 @@ async function archiveGate(root, changeId, o = {}) {
   for (const r of await checkFindings(root, change, gates))
     blockers.push({ code: "finding", message: r.message });
   const repos = (await readChangeRepos(root, change.id))?.repos ?? [];
+  const mustMerge = config.archive.requireMergedPrs;
+  const nothing = await nothingToRelease(root, change.id, o.git ? { git: o.git } : {});
   for (const r of repos) {
-    if (r.pr && config.archive.requireMergedPrs && r.pr.state !== "merged" && r.pr.state !== "closed")
+    if (!r.pr && nothing.has(r.id))
+      continue;
+    if (mustMerge && (!r.pr || r.pr.state === "closed"))
+      blockers.push({
+        code: "pr-missing",
+        message: `${r.id}: ${r.pr ? `release PR #${r.pr.number} was closed without merging` : `no release PR from ${r.branch} into ${r.base} was raised`}, so the code never reached ${r.base}: raise the release PRs (Release \u203A Raise the release PRs, or atticus change release-prs ${change.id} --approve), and merge them on the Git host.`
+      });
+    else if (mustMerge && r.pr && r.pr.state !== "merged")
       blockers.push({
         code: "pr-open",
-        message: `${r.id}: PR #${r.pr.number} is ${r.pr.state}; merge it before archiving.`
+        message: `${r.id}: release PR #${r.pr.number} is ${r.pr.state}; a person merges it on the Git host before archiving.`
       });
     if (r.build.status === "failed")
       blockers.push({
@@ -845,6 +888,8 @@ async function archiveGate(root, changeId, o = {}) {
       });
     else if (r.build.status === "running")
       blockers.push({ code: "build-running", message: `${r.id}: the build is still running.` });
+    else if (r.build.status === "not-run" && r.pr?.state === "merged")
+      notes.push(`${r.id}: the Git host reported no checks on release PR #${r.pr.number}, so no build is recorded for what merged.`);
     else if (r.build.status === "not-run" && r.pr)
       blockers.push({
         code: "build-not-run",
@@ -852,48 +897,77 @@ async function archiveGate(root, changeId, o = {}) {
       });
   }
   const drift = [];
-  if (o.driftReports?.length) {
-    for (const f of o.driftReports) {
-      try {
-        drift.push(JSON.parse(await readFile2(f, "utf8")));
-      } catch (e) {
-        blockers.push({
-          code: "drift-error",
-          message: `Can't read the drift report ${f}: ${e.message.split("\n")[0]}.`
-        });
-      }
+  for (const f of o.driftReports ?? []) {
+    try {
+      drift.push(JSON.parse(await readFile2(f, "utf8")));
+    } catch (e) {
+      blockers.push({
+        code: "drift-error",
+        message: `Can't read the drift report ${f}: ${e.message.split("\n")[0]}.`
+      });
     }
-  } else {
-    for (const r of repos) {
-      const dir = o.repoDir?.(r.id) ?? [join3(root, r.worktree), baseClonePath(root, r.id)].find((d) => existsSync2(d));
-      if (!dir || !existsSync2(dir)) {
-        notes.push(`No checkout of ${r.id} here, so its drift wasn't checked; pass its pipeline's drift report.`);
-        continue;
-      }
+  }
+  const git = o.git ?? createGit();
+  const readersDecide = /* @__PURE__ */ new Set();
+  let records;
+  const catalog = async () => records ??= (await readCatalog(join3(catalogDirOf(root), "generated"))).records;
+  for (const r of repos) {
+    if (!r.pr && nothing.has(r.id))
+      continue;
+    if (mustMerge && r.pr?.state !== "merged")
+      continue;
+    const report = drift.find((d) => d.repo === r.id);
+    const dir = o.repoDir?.(r.id) ?? baseClonePath(root, r.id);
+    const there = !!dir && existsSync2(dir);
+    const merged = o.commit ?? (report && !/^0+$/.test(report.scanned.commit) ? report.scanned.commit : void 0) ?? (there ? await git(["rev-parse", "HEAD"], dir).then((x) => x.stdout.trim() || void 0).catch(() => void 0) : void 0);
+    if (!merged) {
+      notes.push(`No clone of ${r.id} here to say which commit merged, so its facts weren't compared: sync the workspace (atticus workspace sync), or pass its pipeline's drift report.`);
+      continue;
+    }
+    if (r.pr?.state === "merged" && r.baseSha && sameCommit(merged, r.baseSha)) {
+      blockers.push({
+        code: "not-synced",
+        message: `${r.id}: the clone here is still at ${short(merged)}, where the change started, though release PR #${r.pr.number} merged: sync the workspace (atticus workspace sync), then read the repo again.`
+      });
+      continue;
+    }
+    const readByAssistant = existsSync2(join3(factsDirOf(root), `${r.id}.jsonl`)) || (await catalog()).some((x) => x.evidence.some((e) => e.repo === r.id && e.by === "assistant"));
+    if (readByAssistant) {
+      const b = await factsAtMerge(root, r, merged, catalog);
+      if (b)
+        blockers.push(b);
+    } else if (report)
+      readersDecide.add(r.id);
+    if (!report && there) {
       try {
-        drift.push(await repoDrift({
-          repoDir: dir,
-          catalog: root,
-          repo: r.id,
-          ...o.commit ? { commit: o.commit } : {}
-        }));
+        drift.push(await repoDrift({ repoDir: dir, catalog: root, repo: r.id, commit: merged }));
+        if (!readByAssistant)
+          readersDecide.add(r.id);
       } catch (e) {
         if (!(e instanceof DriftError))
           throw e;
-        blockers.push({ code: "drift-error", message: `${r.id}: ${e.message}` });
+        if (readByAssistant)
+          notes.push(`Cross-check only: the built-in readers couldn't read ${r.id}: ${e.message}`);
+        else
+          blockers.push({ code: "drift-error", message: `${r.id}: ${e.message}` });
       }
-    }
-    if (!repos.length)
-      notes.push("The change has no repos (repos.yaml), so there was no code to check for drift.");
+    } else if (!report && !readByAssistant)
+      notes.push(`No clone of ${r.id} here, so its drift wasn't checked; sync the workspace, or pass its pipeline's drift report.`);
   }
+  if (!repos.length)
+    notes.push("The change has no repos (repos.yaml), so there was no code to check for drift.");
   for (const d of drift) {
     const items = d.items.filter((i) => i.kind !== "planned");
     if (!items.length)
       continue;
-    blockers.push({
-      code: "drift",
-      message: `${d.repo}: ${items.length} catalog drift ${items.length === 1 ? "finding" : "findings"} (${items.slice(0, 3).map((i) => i.summary.replace(/\.$/, "")).join("; ")}${items.length > 3 ? "; ..." : ""}).`
-    });
+    if (readersDecide.has(d.repo)) {
+      blockers.push({
+        code: "drift",
+        message: `${d.repo}: ${items.length} catalog drift ${items.length === 1 ? "finding" : "findings"} (${items.slice(0, 3).map((i) => i.summary.replace(/\.$/, "")).join("; ")}${items.length > 3 ? "; ..." : ""}).`
+      });
+      continue;
+    }
+    notes.push(`Cross-check only, not blocking: the built-in readers see ${plural(items.length, "difference")} in ${d.repo} (${items.slice(0, 3).map((i) => i.summary.replace(/\.$/, "")).join("; ")}${items.length > 3 ? "; ..." : ""}). The facts read and verified at the merged commit decide (ADR 0074).`);
   }
   const unique = [...new Map(blockers.map((b) => [b.message, b])).values()];
   return {
@@ -927,7 +1001,7 @@ var lines = (io, text) => {
   for (const l of text.trimEnd().split("\n"))
     io.out(l);
 };
-var plural = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
+var plural2 = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
 async function runtimeOf(root, mode, deps) {
   if (deps.runtime)
     return deps.runtime;
@@ -968,7 +1042,7 @@ async function testsGenerate(root, changeId, storyId, o, io, deps = {}) {
     }
     const count = (a) => r.files.filter((f) => f.action === a).length;
     const cases = r.model.repos.reduce((n, x) => n + x.cases.length, 0);
-    io.out(`${o.check ? "Would write" : "Generated"} ${plural(cases, "test case")} for ${r.story} in ${plural(r.files.length, "file")}: ${count("created")} new, ${count("updated")} updated, ${count("unchanged")} unchanged${kept.length ? `, ${kept.length} kept` : ""}.`);
+    io.out(`${o.check ? "Would write" : "Generated"} ${plural2(cases, "test case")} for ${r.story} in ${plural2(r.files.length, "file")}: ${count("created")} new, ${count("updated")} updated, ${count("unchanged")} unchanged${kept.length ? `, ${kept.length} kept` : ""}.`);
     for (const l of table(["ACTION", "REPO", "FRAMEWORK", "FILE"], r.files.map((f) => [f.action, f.repo || "-", f.generator, f.path])))
       io.out(l);
     for (const k of r.model.kinds.filter((x) => !x.generated))
@@ -1003,7 +1077,7 @@ async function traceCommand(root, changeId, o, io, deps = {}) {
     else {
       lines(io, matrixMarkdown(m));
       if (w)
-        io.out(w.unchanged ? `Findings on the trace gate are unchanged (round ${w.round ?? "none"}).` : `Wrote ${plural(w.findings.length, "finding")} to review/trace/${w.round}/.`);
+        io.out(w.unchanged ? `Findings on the trace gate are unchanged (round ${w.round ?? "none"}).` : `Wrote ${plural2(w.findings.length, "finding")} to review/trace/${w.round}/.`);
     }
     return m.gaps.some((g) => g.kind !== "test-without-requirement") ? 1 : 0;
   } catch (e) {
@@ -1086,7 +1160,7 @@ async function ciArchiveGate(root, changeId, o, io, deps = {}) {
   if (o.json)
     io.out(JSON.stringify(r, null, 2));
   else {
-    io.out(r.pass ? `${changeId} may be archived: no blockers, builds passed and the catalog matches its repos.` : `${changeId} can't be archived yet (${plural(r.blockers.length, "blocker")}):`);
+    io.out(r.pass ? `${changeId} may be archived: no blockers, its release PRs merged and built, and the catalog says what shipped.` : `${changeId} can't be archived yet (${plural2(r.blockers.length, "blocker")}):`);
     for (const b of r.blockers)
       io.out(`- ${b.message}`);
     for (const n of r.notes)
@@ -1094,7 +1168,7 @@ async function ciArchiveGate(root, changeId, o, io, deps = {}) {
   }
   return r.pass ? 0 : 1;
 }
-var short = (s, n = 70) => s.length <= n ? s : `${s.slice(0, n - 3)}...`;
+var short2 = (s, n = 70) => s.length <= n ? s : `${s.slice(0, n - 3)}...`;
 var sourceOf = (flags, confidence) => confidence === "asserted" ? "person" : flags?.includes("ai-proposed") ? "ai" : flags?.includes("undefined") ? "code" : "wiki";
 async function glossaryList(root, o, io) {
   const g = await loadGlossary(root);
@@ -1118,10 +1192,10 @@ async function glossaryList(root, o, io) {
     t.id,
     sourceOf(t.flags, t.confidence),
     (t.flags ?? []).join(","),
-    short(t.definition)
+    short2(t.definition)
   ])))
     io.out(l);
-  io.out(`${plural(g.terms.length, "term")}, ${plural(g.build.conflicts.filter((c) => !c.resolved).length, "conflict")}.`);
+  io.out(`${plural2(g.terms.length, "term")}, ${plural2(g.build.conflicts.filter((c) => !c.resolved).length, "conflict")}.`);
   return 0;
 }
 async function glossaryScan(root, o, io, deps = {}) {
@@ -1154,9 +1228,9 @@ function printGlossaryScan(r, io) {
   for (const p of r.problems)
     io.err(p);
   const open = r.build.conflicts.filter((c) => !c.resolved);
-  io.out(`The glossary has ${plural(r.terms.length, "term")}; ${plural(r.written.length, "file")} written and ${plural(r.removed.length, "file")} removed in catalog/generated.`);
+  io.out(`The glossary has ${plural2(r.terms.length, "term")}; ${plural2(r.written.length, "file")} written and ${plural2(r.removed.length, "file")} removed in catalog/generated.`);
   if (r.propose)
-    io.out(r.propose.waiting ? `The glossary definer is with your assistant (run ${r.propose.waiting}). When it is done, run: atticus handoff done ${r.propose.waiting}` : `The glossary definer proposed ${plural(r.propose.proposals.length, "definition")} (kept inferred until a person defines the term).`);
+    io.out(r.propose.waiting ? `The glossary definer is with your assistant (run ${r.propose.waiting}). When it is done, run: atticus handoff done ${r.propose.waiting}` : `The glossary definer proposed ${plural2(r.propose.proposals.length, "definition")} (kept inferred until a person defines the term).`);
   for (const d of r.propose?.discarded ?? [])
     if (d.term && !r.propose?.waiting)
       io.err(`Discarded ${d.term}: ${d.reason}`);

package/dist/{chunk-GT4I4ZWM.js → chunk-ZZFHLRQW.js}

@@ -4,31 +4,33 @@ var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
+  completeCriticBatch,
   completeCriticLens,
   critic,
   criticStats,
   findingAction,
   findings,
   statusLine
-} from "./chunk-6M5NK3K3.js";
+} from "./chunk-PTQ3ZALZ.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-3HI6Z55Y.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
-import "./chunk-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
-import "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+import "./chunk-K332XW7K.js";
+import "./chunk-HSZMPH5T.js";
+import "./chunk-D2WSW4GU.js";
+import "./chunk-4KNOJC6J.js";
+import "./chunk-4SLBCEPD.js";
+import "./chunk-64AADMTW.js";
+import "./chunk-JYMIB5XY.js";
+import "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
+  completeCriticBatch,
   completeCriticLens,
   critic,
   criticStats,