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

package/dist/{chunk-EZBAS5BL.js → chunk-4SLBCEPD.js}

@@ -7,18 +7,19 @@ import {
   featuresForScan,
   namingHint,
   syncSources
-} from "./chunk-KCQS52TH.js";
+} from "./chunk-64AADMTW.js";
 import {
   dirSource,
+  rereadPlan,
   sameCommit,
   verifyFacts
-} from "./chunk-IPSFMTK2.js";
+} from "./chunk-JYMIB5XY.js";
 import {
   scanInputs
-} from "./chunk-TNCROWPQ.js";
+} from "./chunk-CPK7QSBG.js";
 import {
   listIngestors
-} from "./chunk-7IM4BVVH.js";
+} from "./chunk-YO2PKTXT.js";
 import {
   BUILT_IN_EXTRACTORS,
   MODEL_READERS,
@@ -33,12 +34,17 @@ import {
   runDialectTests,
   runFrameworkTests,
   unmodelledFrameworks
-} from "./chunk-RBXDHCN7.js";
+} from "./chunk-TWQRPM76.js";
 import {
   baseClonePath,
   changesSince,
-  checkoutState
-} from "./chunk-ZQC7MNQB.js";
+  checkoutState,
+  inPlaceDir
+} from "./chunk-XOL3GFW2.js";
+import {
+  buildContextPack,
+  toRunSummary
+} from "./chunk-QHJJMZLX.js";
 import {
   DEFAULT_IGNORES,
   configHash,
@@ -50,11 +56,7 @@ import {
   sandboxedExtractor,
   scanRepo,
   withParseCache
-} from "./chunk-TLDL2ZZI.js";
-import {
-  buildContextPack,
-  toRunSummary
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   AgentDefinition,
   DECLARED_CALLER,
@@ -84,6 +86,7 @@ import {
   conventionsOf,
   declaredCallsOf,
   deserializeRecord,
+  effectiveComponentTypes,
   external_exports,
   factIdPart,
   factsDirOf,
@@ -94,6 +97,7 @@ import {
   hostMatches,
   hostQuestionText,
   identifierWords,
+  isAiBy,
   isGuessedJoin,
   isPathMatch,
   isPrototypeType,
@@ -115,6 +119,8 @@ import {
   normalizePath,
   orgPackDirOf,
   outsideSystemOf,
+  pairsFromCorrections,
+  parseCorrections,
   parseFacts,
   parseRecord,
   projectFacts,
@@ -124,6 +130,7 @@ import {
   require_dist,
   serializeRecord,
   sharedJoinAbout,
+  singularNoun,
   slugify,
   specFileHash,
   specFindingFingerprint,
@@ -135,11 +142,11 @@ import {
   toCanonicalYaml,
   topicQuestionText,
   urlHostPort
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   SCHEMA_VERSION,
   writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -193,21 +200,7 @@ var QUALIFIERS = /* @__PURE__ */ new Set([
   "previous"
 ]);
 var splitWords = (s) => identifierWords(s);
-function singular(w) {
-  if (w.length <= 3)
-    return w;
-  if (/ies$/.test(w))
-    return `${w.slice(0, -3)}y`;
-  if (/(ss|us|is)$/.test(w))
-    return w;
-  if (/(sses|shes|ches|xes|zes)$/.test(w))
-    return w.slice(0, -2);
-  if (/ses$/.test(w))
-    return w.slice(0, -1);
-  if (/s$/.test(w))
-    return w.slice(0, -1);
-  return w;
-}
+var singular = (w) => singularNoun(w);
 var isNoise = (w) => STOP_TOKENS.has(w) || /^v\d+$/.test(w) || /^\d+$/.test(w);
 function businessWords(s) {
   return splitWords(s).filter((w) => !isNoise(w)).map(singular);
@@ -1367,7 +1360,7 @@ async function writeCatalog(dir, records) {
   for (const [rel, text2] of wanted) {
     const full = join4(dir, ...rel.split("/"));
     const current = await readFile3(full, "utf8").catch(() => void 0);
-    if (current === text2) {
+    if (current?.replace(/\r\n?/g, "\n") === text2) {
       unchanged++;
       continue;
     }
@@ -1452,16 +1445,19 @@ function prototypeScanNotes(op, only) {
 function isPrototypeRepo(op, repo) {
   return estateRepos(op).some((r) => r.id === repo && isPrototypeType(r.type));
 }
-function estateMergeInput(op, repos, records, modulesOf = (id) => repos.find((r) => r.id === id)?.modules ?? []) {
+function estateMergeInput(op, repos, records, modulesOf = (id) => repos.find((r) => r.id === id)?.modules ?? [], read) {
   return {
     records,
+    // ADR 0180: the organisation's component types, so a cited type is never demoted in a merge.
+    componentTypes: new Set(effectiveComponentTypes(op.componentTypes).map((t) => t.id)),
     repos: repos.flatMap((r) => [
       {
         id: r.id,
         type: r.type,
         ...r.component ? { component: r.component } : {},
         ...r.system ? { system: r.system } : {},
-        hosts: r.hosts
+        hosts: r.hosts,
+        ...read?.has(r.id) ? { read: true } : {}
       },
       // A module's hosts join calls to its own component (ADR 0057).
       ...modulesOf(r.id).filter((m) => m.hosts.length > 0).map((m) => ({
@@ -1477,8 +1473,8 @@ function estateMergeInput(op, repos, records, modulesOf = (id) => repos.find((r)
     profilePath: op.profiles[0] ? `org-pack/profiles/${op.profiles[0].platform}/profile.yaml` : void 0
   };
 }
-function mergeEstate(op, repos, records, modulesOf) {
-  return mergeCatalog(estateMergeInput(op, repos, records, modulesOf));
+function mergeEstate(op, repos, records, modulesOf, read) {
+  return mergeCatalog(estateMergeInput(op, repos, records, modulesOf, read));
 }
 function curatedDirOf(root, op) {
   return join5(root, ...op.sources.layout.catalog.split("/"), "curated");
@@ -2196,10 +2192,15 @@ function targetsFromAnswers(repo, facts, questions, o = {}) {
       asked = g && (needsTarget(f, facts) || g.evidence.includes(q.evidence[0])) ? g : void 0;
     }
     let label2 = asked && asked.state === "answered" && asked.answer ? answerLabel2(asked) : void 0;
-    if (!label2 || label2 === TARGETS_SPLIT || label2 === TARGETS_ANOTHER)
+    let byAi = label2 && asked?.answer && isAiBy(asked.answer.by) ? asked.answer.by : void 0;
+    if (!label2 || label2 === TARGETS_SPLIT || label2 === TARGETS_ANOTHER) {
       label2 = ruled.get(f.id)?.label;
+      byAi = void 0;
+    }
     if (!label2 || label2 === TARGETS_SPLIT || label2 === TARGETS_ANOTHER)
       continue;
+    if (byAi && o.ai)
+      o.ai[f.id] = { runtime: byAi.runtime, run: byAi.run };
     if (label2 === TARGETS_NONE) {
       out[f.id] = NO_TARGET;
       continue;
@@ -2541,6 +2542,8 @@ function catalogWithFacts(given) {
     const whole = joinFacts({
       repos,
       targets: { ...input.estateTargets, [repo]: input.targets ?? {} },
+      pairs: { ...input.estatePairs, [repo]: input.pairs ?? {} },
+      aiTargets: { ...input.estateAiTargets, [repo]: input.aiTargets ?? {} },
       outside: outsideSystems(op),
       ...joinConventions(op),
       // G4: the walk through gateways is a stack helper (ATTICUS_HELPERS_OFF=gateway-walk).
@@ -2578,7 +2581,10 @@ function catalogWithFacts(given) {
       stepTo.set(id, { component: j.entry.component, entry: entryText(j) });
     }
   }
-  const merged0 = mergeEstate(op, estateRepos(op), records0.sort(byKindId));
+  const merged0 = mergeEstate(op, estateRepos(op), records0.sort(byKindId), void 0, /* @__PURE__ */ new Set([
+    repo,
+    ...input.estate ? others.filter((r) => r.facts.length > 0).map((r) => r.repo) : []
+  ]));
   const heard = new Set((join10?.joins ?? []).filter((j) => j.how === "topic").map((j) => `${j.entry.repo}|${j.entry.at}|${j.entry.component}`));
   const merged = {
     ...merged0,
@@ -2772,7 +2778,7 @@ function answerRuleOffers(input) {
     const pick = n >= 0 ? `--option ${n + 1}` : `--text "${label2}"`;
     if (!match || !type)
       continue;
-    const command = `atticus questions answer ${first.id} ${pick} --match ${match} --scope repo-type --type ${type}`;
+    const command = `atticus questions answer ${first.id} ${pick} --match "${match}" --scope repo-type --type ${type}`;
     out.push({
       via,
       label: label2,
@@ -2806,6 +2812,7 @@ async function factsForScan(root, op, repo, commit, readerRecords, at3 = {}) {
     };
   const older = commit ? facts.filter((f) => !sameCommit(f.commit, commit)) : [];
   let carriedSaid = "";
+  let unread = [];
   if (older.length) {
     const diff = at3.dir ? await changesSince(at3.dir, older.map((f) => f.commit), commit, at3.git) : void 0;
     if (!diff || diff.missing.length)
@@ -2820,13 +2827,22 @@ async function factsForScan(root, op, repo, commit, readerRecords, at3 = {}) {
       ...off.has("readers") ? { readers: false } : {},
       commit,
       carry: diff.changes,
-      conventions: conventionsOf(op)
+      conventions: conventionsOf(op),
+      // ADR 0180: a type taken out of the organisation's set after a read is flagged here too.
+      componentTypes: new Set(effectiveComponentTypes(op.componentTypes).map((t) => t.id))
     });
     const from = [...new Set(older.map((f) => f.commit.slice(0, 7)))].join(", ");
     if (!report.accepted.length)
       return {
         note: `${repo}: every one of its facts (of commit ${from}) cites a file changed since, or names a fact that does; its readers' records are used until it is read again (/atticus-map ${repo}, then atticus verify ${repo} --write).`
       };
+    unread = rereadPlan({
+      facts,
+      commit,
+      carry: diff.changes,
+      source: dirSource(at3.dir),
+      conventions: conventionsOf(op)
+    }).files.map((f) => f.path);
     facts = report.accepted;
     const left = report.rejected.length;
     carriedSaid = `; ${report.carried.length} carried from commit ${from} to ${commit.slice(0, 7)} (the files they cite are unchanged, their lines checked again)${left ? `, ${left} left out until read again (they cite a file changed since, or name a fact that does: /atticus-map ${repo}, then atticus verify ${repo} --write)` : ""}`;
@@ -2865,13 +2881,23 @@ async function factsForScan(root, op, repo, commit, readerRecords, at3 = {}) {
     records: newRecords,
     facts: used,
     targets,
+    basis: { from: "facts", unread },
     note: `${repo}: read from its facts (${facts.length}, ${rel}${carriedSaid})${said ? `; its readers found ${said} the facts don't have (a cross-check: read those lines again, or a reader misreads them)` : "; its readers agree"}.`
   };
 }
+async function pairsOfRepo(root, repo, facts) {
+  const text2 = await readFile4(join6(factsDirOf(root), `${repo}.corrections.jsonl`), "utf8").catch(() => void 0);
+  if (!text2 || !text2.includes('"link"'))
+    return {};
+  return pairsFromCorrections(facts, parseCorrections(text2).corrections);
+}
 async function estateFacts(root, op, except) {
   const repos = [];
   const targets = {};
+  const aiTargets = {};
+  const pairs = {};
   const notes = [];
+  const unverified = [];
   const questions = (await listQuestions(root, { step: TARGETS_STEP }).catch(() => ({ questions: [] }))).questions;
   for (const r of productionRepos(op)) {
     if (r.id === except)
@@ -2885,15 +2911,22 @@ async function estateFacts(root, op, except) {
       continue;
     }
     if (parsed.facts.some((f) => f.verified === "none")) {
+      unverified.push(r.id);
       notes.push(`${r.id}: some of its facts aren't verified yet, so the estate join leaves them out (atticus verify ${r.id}).`);
       continue;
     }
     repos.push({ repo: r.id, facts: parsed.facts });
-    const named2 = targetsFromAnswers(r.id, parsed.facts, questions, { repoType: r.type });
+    const ai = {};
+    const named2 = targetsFromAnswers(r.id, parsed.facts, questions, { repoType: r.type, ai });
     if (Object.keys(named2).length)
       targets[r.id] = named2;
+    if (Object.keys(ai).length)
+      aiTargets[r.id] = ai;
+    const paired = await pairsOfRepo(root, r.id, parsed.facts);
+    if (Object.keys(paired).length)
+      pairs[r.id] = paired;
   }
-  return { repos, targets, notes };
+  return { repos, targets, pairs, notes, unverified, aiTargets };
 }
 
 // packages/scanner/dist/scan-settings.js
@@ -3272,13 +3305,6 @@ async function orgPackDirFor(root) {
     return { dir: join9(root, ".atticus", "org-pack"), adopted: true };
   return { dir: join9(root, "org-pack"), adopted: false };
 }
-function inPlace(root, url) {
-  if (url === "." || url === "./")
-    return root;
-  if (url.startsWith("./") && !url.split("/").includes(".."))
-    return join9(root, url.slice(2));
-  return void 0;
-}
 async function federate(local, sources, problems, root) {
   const have = new Set(local.map((r) => `${r.kind}/${r.id}`));
   const records = [];
@@ -3418,6 +3444,7 @@ async function scanEstate(o) {
   const repos = productionRepos(op, o.repos);
   const results = [];
   const factNotes = prototypeScanNotes(op, o.repos);
+  const basis = {};
   const factRepos = [];
   const structuredOf = /* @__PURE__ */ new Map();
   const modulesOf = /* @__PURE__ */ new Map();
@@ -3425,7 +3452,7 @@ async function scanEstate(o) {
   let done = 0;
   for (const r of repos) {
     throwIfCancelled();
-    const dir = o.repoDir?.(r.id) ?? inPlace(o.root, r.url) ?? baseClonePath(o.root, r.id);
+    const dir = o.repoDir?.(r.id) ?? inPlaceDir(o.root, r.url) ?? baseClonePath(o.root, r.id);
     let state;
     if (!o.repoState && !await stat(dir).catch(() => void 0)) {
       problems.push({
@@ -3525,6 +3552,7 @@ async function scanEstate(o) {
     });
     if (fromFacts.note)
       factNotes.push(fromFacts.note);
+    basis[r.id] = fromFacts.records && fromFacts.basis ? fromFacts.basis : { from: "readers" };
     if (fromFacts.facts)
       factRepos.push({ repo: r.id, facts: fromFacts.facts, targets: fromFacts.targets ?? {} });
     results.push({ ...scan, records: fromFacts.records ?? readerRecords });
@@ -3662,7 +3690,8 @@ async function scanEstate(o) {
     ...inputs ? { inputs } : {},
     curated: { applied: applied.applied, suppressed: applied.suppressed },
     notes,
-    ...federated ? { federated } : {}
+    ...federated ? { federated } : {},
+    basis
   };
 }
 
@@ -5500,12 +5529,14 @@ function measureLinks(input) {
 }
 
 // packages/scanner/dist/audit-links.js
-function estateJoinOf(op, list, targets) {
+function estateJoinOf(op, list, targets, pairs, aiTargets) {
   const repos = list.filter((x) => !isPrototypeRepo(op, x.repo));
   const renames = componentRenames(repos, op);
   return joinFacts({
     repos: joinReposOf(op, repos, renames),
     ...targets ? { targets } : {},
+    ...aiTargets && Object.keys(aiTargets).length ? { aiTargets } : {},
+    ...pairs && Object.keys(pairs).length ? { pairs } : {},
     outside: outsideSystems(op),
     // The org pack's facing words and gateway bundle folders (ADR 0147), as the catalog joins.
     ...joinConventions(op),
@@ -5625,6 +5656,7 @@ export {
   estateFromFacts,
   answerRuleOffers,
   factsForScan,
+  pairsOfRepo,
   estateFacts,
   NO_SETTINGS,
   citedLine,

package/dist/{chunk-VIRTPODJ.js → chunk-4TKVU2I2.js}

@@ -7,15 +7,7 @@ import {
   estateRepos,
   pickerLines,
   targetPicker
-} from "./chunk-EZBAS5BL.js";
-import "./chunk-KCQS52TH.js";
-import "./chunk-IPSFMTK2.js";
-import "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   TARGETS_STEP_ID,
   TOPICS_STEP_ID,
@@ -26,9 +18,7 @@ import {
   orgPackDirOf,
   slugify,
   topicOfQuestion
-} from "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
-import "./chunk-TV45EUGM.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/target-answer.js
 import { readdir } from "node:fs/promises";
@@ -122,9 +112,11 @@ function offerLine(qid, target, offer) {
   const what = offer.boundary === "vendor" ? `a vendor, ${offer.name} (id ${offer.id})` : `another team's system, ${offer.name} (id ${offer.id}${offer.owner ? `, owner ${offer.owner}` : ""})`;
   return `To add it as ${what} in the profile, written as a file change for review in the pull request: atticus questions answer ${qid} --target ${target} ${offer.flag}${offer.boundary === "vendor" ? ` (--name "..." to name it; --add-system internal if it is another team's)` : ' (--name "..." to name it)'}.`;
 }
+
 export {
-  offerLine,
+  readRepos,
   pickerOf,
   pickerText,
-  targetAnswerOf
+  targetAnswerOf,
+  offerLine
 };