@maycombhq/atticus 2.0.0-beta.24 → 2.0.0-beta.26

package/dist/{chunk-HXFZX2BI.js → chunk-DXLWZ3BJ.js}

@@ -6,20 +6,20 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   modelsData,
   reachPlanOf
-} from "./chunk-5Z7L2TSR.js";
+} from "./chunk-MY3LDBMR.js";
 import {
   effectiveRules,
   orgRulesLacking,
   readingRulesText,
   ruleIds,
   ruleMatches
-} from "./chunk-DCRZ3OQ7.js";
+} from "./chunk-V5FT3MZG.js";
 import {
   loadReadPlan,
   modelsModeOf,
   recordNotReached,
   saveReadPlan
-} from "./chunk-LKUTBQ2Y.js";
+} from "./chunk-P6DM2EFI.js";
 import {
   FACT_RULES_HASH,
   MODELS_RULE,
@@ -30,7 +30,7 @@ import {
   rulesLacking,
   rulesNow,
   topUpWords
-} from "./chunk-J4K4C4T5.js";
+} from "./chunk-IBIIKUC7.js";
 import {
   fileKinds,
   isBuildFile,
@@ -39,21 +39,21 @@ import {
   planBatches,
   readingRank,
   sameCommit
-} from "./chunk-HNPKCRCE.js";
+} from "./chunk-RK5P2DWD.js";
 import {
   DATA_RULE,
   neutralise,
   wrapData
-} from "./chunk-MOWUP33K.js";
+} from "./chunk-ZDA72732.js";
 import {
   citedFiles,
   factsDirOf,
   factsRelOf,
   parseFacts
-} from "./chunk-GJVCBTSO.js";
+} from "./chunk-6ZDAEUKB.js";
 import {
   writeFileAtomic
-} from "./chunk-G3ZFEHCX.js";
+} from "./chunk-MEMEO7YO.js";
 
 // packages/cli/dist/map-rules.js
 import { createHash } from "node:crypto";
@@ -383,7 +383,7 @@ function rulesPrompt(repo, commit, c) {
     "",
     factsReference(),
     "",
-    factRulesFor(kindsOf(files), void 0, sets),
+    factRulesFor(kindsOf(files), void 0, sets, files.some(isBuildFile)),
     "",
     ...orgIds.size && c.orgRules ? [readingRulesText({ rules: c.orgRules.rules, builtinOff: [] }, orgIds), ""] : [],
     "## Read",

package/dist/{chunk-EUMXLSW5.js → chunk-E5NHFHGC.js}

@@ -7,14 +7,14 @@ import {
   gatewayHostFix,
   hostQuestionDrafts,
   unknownHosts
-} from "./chunk-25CUJJTP.js";
+} from "./chunk-2HDNOUJU.js";
 import {
   fsRepo
-} from "./chunk-IJQHBK76.js";
+} from "./chunk-UFIQ5FWY.js";
 import {
   baseClonePath,
   loadRepos
-} from "./chunk-OSZTENIA.js";
+} from "./chunk-XIJBQM45.js";
 import {
   HOSTS_NONE,
   HOSTS_OUTSIDE_INTERNAL,
@@ -25,10 +25,10 @@ import {
   raiseQuestions,
   retireQuestion,
   writeQuestion
-} from "./chunk-GJVCBTSO.js";
+} from "./chunk-6ZDAEUKB.js";
 import {
   hostMatches
-} from "./chunk-QFDPX6C4.js";
+} from "./chunk-LZFKJ2BR.js";
 
 // packages/cli/dist/host-questions.js
 import { stat } from "node:fs/promises";

package/dist/{chunk-U37ZOYJJ.js → chunk-EECFUQP3.js}

@@ -5,27 +5,27 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   askHosts
-} from "./chunk-EUMXLSW5.js";
+} from "./chunk-E5NHFHGC.js";
 import {
   driftAfterScan
-} from "./chunk-BWYW533C.js";
+} from "./chunk-DPH4BS3F.js";
 import {
   diffCatalogs,
   diffIsEmpty,
   readCatalog,
   scanEstate,
   writeCatalog
-} from "./chunk-25CUJJTP.js";
+} from "./chunk-2HDNOUJU.js";
 import {
   loadRepos
-} from "./chunk-OSZTENIA.js";
+} from "./chunk-XIJBQM45.js";
 import {
   catalogDirOf
-} from "./chunk-GJVCBTSO.js";
+} from "./chunk-6ZDAEUKB.js";
 import {
   LockHeldError,
   acquireLock
-} from "./chunk-G3ZFEHCX.js";
+} from "./chunk-MEMEO7YO.js";
 
 // packages/cli/dist/scan-commands.js
 import { join } from "node:path";
@@ -40,6 +40,92 @@ function diffLines(d) {
   ];
   return lines;
 }
+var FACTS_PATH = "Scan every repo (atticus scan, after atticus workspace sync), or put one repo's read in the catalog from its facts: atticus verify <repo> --write.";
+function unreadMessage(u) {
+  switch (u.why) {
+    case "not-cloned":
+      return "not cloned here; clone it with atticus workspace sync";
+    case "unreadable":
+      return `its clone can't be read (${u.detail ?? "git couldn't read it"}); clone it again with atticus workspace sync`;
+    case "run-failed":
+      return `${(u.runs ?? []).map((r) => `the run of ${r.extractor} failed (${r.error})`).join("; ")}, so its read is short of what that run reads; fix it, then scan again`;
+    case "not-asked":
+      return "left out by --repos";
+  }
+}
+var fromCode = (r) => r.evidence.some((e) => !!e.repo);
+function scanRefusal(scan, before) {
+  const unread = scan.unread;
+  if (unread.length) {
+    const asked = unread.filter((u) => u.why === "not-asked");
+    const lines = unread.filter((u) => u.why !== "not-asked").map((u) => `${u.repo}: ${unreadMessage(u)}`);
+    if (asked.length)
+      lines.push(`${asked.map((u) => u.repo).join(", ")}: left out by --repos; a scan of only some repos would replace the catalog with them alone, so it isn't written`);
+    return {
+      repos: unread.map((u) => ({
+        repo: u.repo,
+        why: u.why,
+        message: unreadMessage(u),
+        ...u.runs ? { runs: u.runs } : {}
+      })),
+      message: [
+        `Nothing written: catalog/generated is as it was. A scan replaces the whole catalog, so it writes only when it has read every repo in full, and it didn't read ${unread.length === 1 ? "this one" : `these ${unread.length}`}:`,
+        ...lines.map((l) => `  ${l}`),
+        FACTS_PATH
+      ].join("\n")
+    };
+  }
+  const had = before.filter(fromCode).length;
+  if (had > 0 && !scan.records.some(fromCode))
+    return {
+      repos: [],
+      empty: { before: had },
+      message: `Nothing written: the scan found no records in any repo's code, and catalog/generated has ${had}, so it is left as it was. Check that the manifests list the repos to read (an archived repo or a prototype isn't read), then scan again.`
+    };
+  return void 0;
+}
+function saidByRefusal(p, refused) {
+  const r = refused?.repos.find((x) => x.repo === p.repo);
+  if (!r)
+    return false;
+  return p.source === "workspace" || (r.runs ?? []).some((x) => x.extractor === String(p.source ?? ""));
+}
+function scanSummaryLines(report) {
+  const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  const n = (x, one) => `${x} ${one}${x === 1 ? "" : "s"}`;
+  const refusal = report.refused;
+  const problemLines = () => (Array.isArray(report.problems) ? report.problems : []).filter((p) => !saidByRefusal(p ?? {}, refusal)).map((p) => {
+    const x = p ?? {};
+    return `${x.repo ? `${String(x.repo)}: ` : ""}${x.source ? `${String(x.source)}: ` : ""}${String(x.message ?? "")}`;
+  });
+  if (typeof report.branch === "string") {
+    const repos = (Array.isArray(report.repos) ? report.repos : []).map((r) => String(r.id ?? ""));
+    const d = report.diff;
+    return [
+      `Scanned ${report.branch} of ${repos.join(", ")} into ${String(report.folder ?? "")}/generated.`,
+      ...d ? [`${report.branch} against the baseline: ${diffLines(d)[0]}`] : [],
+      ...problemLines()
+    ];
+  }
+  if (!report.stats)
+    return [];
+  const s = report.stats;
+  const out = [
+    `Scanned ${n(num(s.repos), "repo")}: ${n(num(s.records), "record")}, ${n(num(s.interfaces), "interface")} (${num(s.verified)} verified), ${n(num(s.unresolved), "loose end")}.`
+  ];
+  const f = report.files;
+  if (f)
+    out.push(`catalog/generated: ${num(f.written)} written, ${num(f.unchanged)} unchanged, ${num(f.removed)} removed`);
+  for (const note of Array.isArray(report.notes) ? report.notes : [])
+    out.push(`note: ${String(note)}`);
+  out.push(...problemLines());
+  const w = Array.isArray(report.warnings) ? report.warnings.length : 0;
+  if (w)
+    out.push(`${n(w, "warning")}: atticus scan --warnings lists ${w === 1 ? "it" : "them"}`);
+  if (typeof refusal?.message === "string")
+    out.push(...refusal.message.split("\n"));
+  return out;
+}
 function driftLine(d) {
   const head = `Drift check for ${d.change} (${d.state})`;
   if (d.error)
@@ -74,7 +160,7 @@ async function scanCommand(root, o, io) {
   }
   try {
     if (o.ref) {
-      const { scanBranch } = await import("./chunk-JMH6TCZJ.js");
+      const { scanBranch } = await import("./chunk-7IWMRZRI.js");
       return await scanBranch(root, o.ref, {
         ...o.repos ? { repos: o.repos } : {},
         ...o.full ? { full: true } : {},
@@ -95,8 +181,9 @@ async function scanLocked(root, o, io) {
     ...o.repos ? { repos: o.repos } : {},
     ...o.full ? { cache: null } : {}
   });
-  const diff = diffCatalogs(before.records, scan.records);
-  const write = o.dryRun ? void 0 : await writeCatalog(out, scan.records);
+  const refused = scanRefusal(scan, before.records);
+  const diff = refused ? { added: [], removed: [], changed: [], evidenceOnly: [] } : diffCatalogs(before.records, scan.records);
+  const write = o.dryRun || refused ? void 0 : await writeCatalog(out, scan.records);
   const drift = write && !o.noDrift ? await driftAfterScan(root) : [];
   const hosts = write ? await askHosts(root, scan.records, {
     command: "atticus scan",
@@ -126,7 +213,8 @@ async function scanLocked(root, o, io) {
       written: write !== void 0,
       files: write ?? null,
       drift,
-      questions: [...hosts.raised, ...hosts.open].map((q) => q.id)
+      questions: [...hosts.raised, ...hosts.open].map((q) => q.id),
+      ...refused ? { refused } : {}
     }, null, 2));
   } else {
     const s = scan.stats;
@@ -150,11 +238,12 @@ async function scanLocked(root, o, io) {
         idle.set(r.framework, [...idle.get(r.framework) ?? [], c.repo]);
     for (const [framework, repos] of idle)
       io.out(`Framework model ${framework} read nothing in ${repos.join(", ")}, which import${repos.length === 1 ? "s" : ""} it; the framework may have changed. Have your assistant re-draft it: atticus onboard framework ${framework} --from <its source, JAR or package> --users ${repos.join(",")} (then onboard accept framework ${framework} --replace)`);
-    for (const l of diffLines(diff))
-      io.out(l);
+    if (!refused)
+      for (const l of diffLines(diff))
+        io.out(l);
     if (write)
       io.out(`catalog/generated: ${write.written} written, ${write.unchanged} unchanged, ${write.removed} removed`);
-    else
+    else if (!refused)
       io.out("Dry run: nothing written.");
     for (const d of drift)
       io.out(driftLine(d));
@@ -167,10 +256,13 @@ async function scanLocked(root, o, io) {
         io.out(`warning: ${w.repo}: ${w.path ? `${w.path}: ` : ""}${w.message}`);
     else if (warnings.length)
       io.out(`${warnings.length} warning${warnings.length === 1 ? "" : "s"}: atticus scan --warnings lists ${warnings.length === 1 ? "it" : "them"}`);
-    for (const p of problems)
+    for (const p of problems.filter((x) => !saidByRefusal(x, refused)))
       io.err(`${"repo" in p && p.repo ? `${p.repo}: ` : ""}${p.source}: ${p.message}`);
+    if (refused)
+      for (const l of refused.message.split("\n"))
+        io.err(l);
   }
-  return problems.length > 0 ? 1 : 0;
+  return problems.length > 0 || refused ? 1 : 0;
 }
 async function catalogDiff(a, b, json, io) {
   const [x, y] = await Promise.all([readCatalog(a), readCatalog(b)]);
@@ -187,6 +279,8 @@ async function catalogDiff(a, b, json, io) {
 
 export {
   diffLines,
+  scanRefusal,
+  scanSummaryLines,
   scanCommand,
   catalogDiff
 };

package/dist/{chunk-66DWUSNY.js → chunk-EEVSFGIU.js}

@@ -12,29 +12,29 @@ import {
   snowSubmit,
   storyBarCommand,
   templatesDraft
-} from "./chunk-775FMPUB.js";
-import "./chunk-YF6N45QN.js";
+} from "./chunk-IZIGZ7KY.js";
+import "./chunk-RQM5Y3HJ.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-WECCLSYY.js";
-import "./chunk-5FUFVNXB.js";
-import "./chunk-A6ZG3UOS.js";
-import "./chunk-U2JTTRKS.js";
-import "./chunk-5MKV4TV6.js";
-import "./chunk-ESJALLOK.js";
-import "./chunk-MCE74XMF.js";
-import "./chunk-25CUJJTP.js";
-import "./chunk-HNPKCRCE.js";
-import "./chunk-CZ75S2EZ.js";
-import "./chunk-GFYVVTKH.js";
-import "./chunk-DIYNRYXW.js";
-import "./chunk-5FPAKAGE.js";
-import "./chunk-IJQHBK76.js";
-import "./chunk-MOWUP33K.js";
+import "./chunk-CSHJZFOE.js";
+import "./chunk-5A4RHEEL.js";
+import "./chunk-VIQHZA53.js";
+import "./chunk-WH3ZFLXT.js";
+import "./chunk-UTZMF5CV.js";
+import "./chunk-6U65YB54.js";
+import "./chunk-SZDOBIWE.js";
+import "./chunk-2HDNOUJU.js";
+import "./chunk-RK5P2DWD.js";
+import "./chunk-K3QKOVZN.js";
+import "./chunk-QAFQLILX.js";
+import "./chunk-HQMLY2R6.js";
+import "./chunk-I2EWY3MG.js";
+import "./chunk-UFIQ5FWY.js";
+import "./chunk-ZDA72732.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-OSZTENIA.js";
-import "./chunk-GJVCBTSO.js";
-import "./chunk-G3ZFEHCX.js";
-import "./chunk-QFDPX6C4.js";
+import "./chunk-XIJBQM45.js";
+import "./chunk-6ZDAEUKB.js";
+import "./chunk-MEMEO7YO.js";
+import "./chunk-LZFKJ2BR.js";
 import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";