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

package/dist/chunk-JU4QNJSR.js

@@ -0,0 +1,62 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+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 {
+  MatchAnswer,
+  checkMatchAnswer,
+  connectMatchCommand,
+  matchBrief,
+  matchDone,
+  matchFilesOf,
+  matchLines,
+  quotesOf,
+  readMatch,
+  runMatch
+} from "./chunk-QJCJOMW3.js";
+import "./chunk-3SSTNB4E.js";
+import "./chunk-JRVNXLZP.js";
+import "./chunk-LIJJCBQI.js";
+import "./chunk-26Z7OGQW.js";
+import "./chunk-OKUB6RJA.js";
+import "./chunk-HK3VOHIE.js";
+import "./chunk-THN26IEF.js";
+import "./chunk-L4CESDPB.js";
+import "./chunk-455SYIIE.js";
+import "./chunk-3J5I7ZOU.js";
+import "./chunk-GIFMBCTW.js";
+import "./chunk-MD7KUEJ3.js";
+import "./chunk-Q46QDDMF.js";
+import "./chunk-TGVVUKTG.js";
+import "./chunk-3AQ2R5NL.js";
+import "./chunk-5WERBKLE.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-VUVGX5L2.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 {
+  MatchAnswer,
+  checkMatchAnswer,
+  connectMatchCommand,
+  matchBrief,
+  matchDone,
+  matchFilesOf,
+  matchLines,
+  quotesOf,
+  readMatch,
+  runMatch
+};

package/dist/{chunk-IPSFMTK2.js → chunk-JYMIB5XY.js}

@@ -5,15 +5,17 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readOpenApiDocument
-} from "./chunk-RBXDHCN7.js";
+} from "./chunk-TWQRPM76.js";
 import {
   globToRegExp
-} from "./chunk-TLDL2ZZI.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   DECLARED_TOPIC,
   DEFAULT_CONVENTIONS,
   Fact,
   FactId,
+  JOINED_BY_AI,
+  JOINED_BY_PERSON,
   JOINED_TO_SHARED_MAP,
   JOIN_HOW_FLAGS,
   LINK_EVIDENCE_NOT_GAPS,
@@ -29,6 +31,7 @@ import {
   isPatternPath,
   isSecretPath,
   lineNamesClaim,
+  linksFor,
   normalizePath,
   noteProblem,
   partsBuildWord,
@@ -40,7 +43,7 @@ import {
   staleCite,
   toCanonicalYaml,
   underFolders
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/verify/dist/source.js
 import { readdirSync, readFileSync, statSync } from "node:fs";
@@ -55,6 +58,13 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   ".vscode",
   ".gradle",
   ".mvn",
+  "__pycache__",
+  ".venv",
+  "venv",
+  ".next",
+  ".nuxt"
+]);
+var BUILD_OUTPUT = /* @__PURE__ */ new Set([
   "target",
   "build",
   "dist",
@@ -62,13 +72,32 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   "bin",
   "obj",
   "vendor",
-  "__pycache__",
-  ".venv",
-  "venv",
-  ".next",
-  ".nuxt",
   "coverage"
 ]);
+var DOTNET = /\.(csproj|fsproj|vbproj|sln)$/i;
+var NODE = /^package\.json$/;
+var MADE_BESIDE = {
+  bin: DOTNET,
+  obj: DOTNET,
+  vendor: /^(go\.mod|composer\.json|Gemfile)$/,
+  target: /^(pom\.xml|build\.sbt|Cargo\.toml)$/,
+  build: /^(build\.gradle(\.kts)?|settings\.gradle(\.kts)?|package\.json|CMakeLists\.txt)$/,
+  dist: NODE,
+  coverage: NODE,
+  out: /^(tsconfig\.json|package\.json)$|\.iml$/
+};
+var ONLY_BESIDE = /* @__PURE__ */ new Set(["bin", "obj", "vendor"]);
+function skippedFolder(above, name, siblings) {
+  if (SKIP_DIRS.has(name))
+    return true;
+  if (!BUILD_OUTPUT.has(name))
+    return false;
+  if (siblings.some((x) => MADE_BESIDE[name].test(x)))
+    return true;
+  if (above.some((a) => a.toLowerCase() === "src"))
+    return false;
+  return !ONLY_BESIDE.has(name);
+}
 function insideRepo(path) {
   if (path === "" || isAbsolute(path) || /^[A-Za-z]:/.test(path))
     return false;
@@ -77,7 +106,7 @@ function insideRepo(path) {
 }
 function dirSource(root) {
   let cache;
-  const walk = (dir, out) => {
+  const walk = (dir, above, out) => {
     let names;
     try {
       names = readdirSync(dir).sort();
@@ -93,8 +122,8 @@ function dirSource(root) {
         continue;
       }
       if (st.isDirectory()) {
-        if (!SKIP_DIRS.has(name))
-          walk(full, out);
+        if (!skippedFolder(above, name, names))
+          walk(full, [...above, name], out);
       } else if (st.isFile())
         out.push(relative(root, full).split(sep).join("/"));
     }
@@ -103,7 +132,7 @@ function dirSource(root) {
     list() {
       if (!cache) {
         cache = [];
-        walk(root, cache);
+        walk(root, [], cache);
       }
       return cache;
     },
@@ -356,12 +385,26 @@ var isGlob = (path) => /[*?]/.test(path);
 
 // packages/verify/dist/conventions.js
 var SPEC_NAME = /(^|\/)[^/]*(openapi|swagger|asyncapi|api-docs)[^/]*\.(ya?ml|json|xml)$|\.oas\.(ya?ml|json)$/i;
+function notReadTest(folders) {
+  const multi = folders.filter((f) => f.includes("/"));
+  const multiRe = underFolders(multi);
+  const names = new Set(folders.filter((f) => !f.includes("/")).map((f) => f.toLowerCase()));
+  return {
+    test(path) {
+      if (multiRe.test(path))
+        return true;
+      const parts = path.split("/").slice(0, -1).map((x) => x.toLowerCase());
+      const src = parts.indexOf("src");
+      return parts.some((x, j) => names.has(x) && !(src >= 0 && j > src && BUILD_OUTPUT.has(x)));
+    }
+  };
+}
 function rulesOf(c) {
   const folders = underFolders(c.apiSpecFolders, { tail: "(.+/)?[^/]+\\.(ya?ml|json)$" });
   return {
     apiSpec: new RegExp(`${SPEC_NAME.source}|${folders.source}`, "i"),
     notProduct: underFolders(c.notProductFolders),
-    notRead: underFolders(c.notReadFolders),
+    notRead: notReadTest(c.notReadFolders),
     gatewayBundle: gatewayBundleTest(c.gatewayBundleFolders),
     frameworks: c.frameworks
   };
@@ -494,7 +537,8 @@ function lineOfValue(lines, line, value) {
 }
 
 // packages/verify/dist/corrections.js
-function correctionFor(f, corrections) {
+function correctionFor(f, all2) {
+  const corrections = all2.filter((c) => c.action !== "link" && c.action !== "unlink");
   const at = (c) => c.target.kind === f.kind && c.target.file === f.cite.file && c.target.line === f.cite.line;
   const byId = corrections.filter((c) => c.fact === f.id && at(c));
   const byCite = corrections.filter((c) => at(c) && c.target.value === f.cite.value);
@@ -502,6 +546,10 @@ function correctionFor(f, corrections) {
   const moved = edited.filter((c) => (c.line ?? c.target.line) === f.cite.line);
   return [...byId, ...byCite, ...moved].sort((a, b) => a.at < b.at ? 1 : a.at > b.at ? -1 : 0)[0];
 }
+function outsidePairingFor(f, all2) {
+  const newest = linksFor(f, all2)[0];
+  return newest?.link?.system ? newest : void 0;
+}
 function correctedFact(f, c) {
   const raw = JSON.parse(JSON.stringify(f));
   for (const [k, v] of Object.entries(c.set ?? {})) {
@@ -528,33 +576,64 @@ function applyCorrections(facts, corrections) {
   const applied = [];
   const used = /* @__PURE__ */ new Set();
   const stale = [];
-  for (const f of facts) {
-    const c = correctionFor(f, corrections);
-    if (!c) {
-      out.push(f);
+  const met = /* @__PURE__ */ new Set();
+  const withPairing = (f, as, over) => {
+    const p = outsidePairingFor(as, corrections);
+    if (!p)
+      return f;
+    if (over && over.at > p.at && over.set?.to !== void 0)
+      return f;
+    const fixed = correctedFact(f, { ...p, action: "edit", set: { to: p.link.system } });
+    if (typeof fixed === "string") {
+      stale.push({
+        correction: p,
+        why: "invalid",
+        message: `${p.by}'s pairing of ${f.kind} ${f.id} with ${p.link.system} doesn't make a fact (${fixed}); the call is kept as it was`
+      });
+      return f;
+    }
+    applied.push({ fact: f.id, action: "link", by: p.by });
+    return { ...fixed, conf: "inferred" };
+  };
+  for (const f0 of facts) {
+    for (const l of linksFor(f0, corrections))
+      met.add(l);
+    const c = correctionFor(f0, corrections);
+    if (c?.action === "wrong") {
+      used.add(c);
+      applied.push({ fact: f0.id, action: "wrong", by: c.by });
       continue;
     }
-    used.add(c);
-    if (c.action === "wrong") {
-      applied.push({ fact: f.id, action: "wrong", by: c.by });
+    if (!c) {
+      out.push(withPairing(f0, f0));
       continue;
     }
-    const fixed = correctedFact(f, c);
+    used.add(c);
+    const fixed = correctedFact(f0, c);
     if (typeof fixed === "string") {
       stale.push({
         correction: c,
         why: "invalid",
-        message: `${c.by}'s correction of ${f.kind} ${f.id} doesn't make a fact (${fixed}); the fact is kept as it was`
+        message: `${c.by}'s correction of ${f0.kind} ${f0.id} doesn't make a fact (${fixed}); the fact is kept as it was`
       });
-      out.push(f);
+      out.push(withPairing(f0, f0));
       continue;
     }
-    applied.push({ fact: f.id, action: "edit", by: c.by });
-    out.push(fixed);
+    applied.push({ fact: f0.id, action: "edit", by: c.by });
+    out.push(withPairing(fixed, f0, c));
   }
   for (const c of corrections) {
     if (used.has(c))
       continue;
+    if (c.action === "link" || c.action === "unlink") {
+      if (!met.has(c))
+        stale.push({
+          correction: c,
+          why: "none",
+          message: `${c.by}'s pairing of call ${c.fact} (${c.target.file}:${c.target.line}) with ${[c.link?.method, c.link?.path].filter(Boolean).join(" ")} on ${c.link?.repo ?? c.link?.system} meets no call in this read; it is kept in the file and applied when the call is read again`
+        });
+      continue;
+    }
     const replaced = [...used].some((u) => (u.fact === c.fact || u.target.value === c.target.value) && u.target.kind === c.target.kind && u.target.file === c.target.file && u.target.line === c.target.line);
     if (replaced || c.action === "wrong")
       continue;
@@ -1890,16 +1969,24 @@ function reviewedHoldsOf(r, skipped) {
 var FOLLOWED_TYPES = ["event-topic", "mq-queue", "rest", "grpc"];
 function entriesNoFlowFollows(facts, rules = DEFAULT_READ_RULES) {
   const started = new Set(facts.flatMap((f) => f.kind === "flow" ? [f.entry] : []));
-  return facts.flatMap((f) => f.kind === "entry" && FOLLOWED_TYPES.includes(f.entryType) && !started.has(f.id) && // An Apigee route forwards; its forwarding call is its flow (ADR 0124 addendum A-gateway).
-  !rules.gatewayBundle.test(f.cite.file) ? [
-    {
-      id: f.id,
-      entryType: f.entryType,
-      ...f.method ? { method: f.method } : {},
-      path: f.path,
-      cite: `${f.cite.file}:${f.cite.line}`
-    }
-  ] : []).sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
+  const forwarded = new Set(facts.flatMap((f) => f.kind === "call" && f.from ? [f.from] : []));
+  return facts.flatMap((f) => {
+    if (f.kind !== "entry" || !FOLLOWED_TYPES.includes(f.entryType))
+      return [];
+    const route = rules.gatewayBundle.test(f.cite.file);
+    if (route ? forwarded.has(f.id) : started.has(f.id))
+      return [];
+    return [
+      {
+        id: f.id,
+        entryType: f.entryType,
+        ...f.method ? { method: f.method } : {},
+        path: f.path,
+        cite: `${f.cite.file}:${f.cite.line}`,
+        ...route ? { route: true } : {}
+      }
+    ];
+  }).sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
 }
 var LINES_HELD = 64;
 var SOURCE_EXT = /\.(java|kt|kts|scala|groovy|cs|vb|fs|ts|tsx|js|jsx|mjs|cjs|py|rb|go|rs|php|swift|m|mm|c|cc|cpp|h|hpp|sql|graphql|gql|proto|ya?ml|json|xml|properties|toml|ini|conf|tf|tfvars|hcl|bicep|sh|ps1|bat|cmd|gradle|html?|vue|svelte|cshtml|razor|aspx|jsp|ftl|hbs|cob|cbl|cpy|jcl|avsc|wsdl|xsd|csproj|sln|config)$/i;
@@ -1976,6 +2063,9 @@ function claimsOf(f) {
     // ADR 0163: the value as written, on its line.
     case "term":
       return [{ kind: "word", value: f.value }];
+    // ADR 0180: the signal the type rests on, as written on its line.
+    case "component":
+      return [{ kind: "word", value: f.cite.value }];
   }
 }
 var sameCommit = (a, b) => a.startsWith(b) || b.startsWith(a);
@@ -2242,6 +2332,14 @@ async function verifyFacts(o) {
       if (bad)
         problem(f, bad.code, `${label} ${bad.message}`);
     }
+    if (f.kind === "component") {
+      if (o.componentTypes && !o.componentTypes.has(f.type))
+        problem(f, "component-type", `${label} says the component is a ${f.type}, which isn't one of the organisation's component types: add it (org-pack/component-types/${f.type}/type.yaml) or say one of ${[...o.componentTypes].join(", ")}`);
+      const subject = factIdPart(f.component ?? f.repo);
+      const first = facts.find((x) => x.kind === "component" && factIdPart(x.component ?? x.repo) === subject && (x === f || !found.has(x.id)));
+      if (first && first !== f)
+        problem(f, "component-type", `${label} says what ${subject} is a second time (${first.id} already does): one fact says what a component is`);
+    }
     if (f.kind === "framework") {
       const bad = frameworkNameProblem(f, rules.frameworks);
       if (bad)
@@ -2803,10 +2901,10 @@ function buildModules(path, text) {
   return found.filter((m) => !m.startsWith("!")).map(clean).filter(Boolean).map((m) => dir ? `${dir}/${m}` : m);
 }
 var JAVA_LIKE = /\.(java|kt|kts|scala|groovy)$/i;
-var DOTNET = /\.(cs|vb|fs)$/i;
+var DOTNET2 = /\.(cs|vb|fs)$/i;
 var rootOf = (name) => name.split(".").slice(0, 2).join(".").toLowerCase();
 function packageRoot(path, text) {
-  const re = JAVA_LIKE.test(path) ? /^\s*package\s+([A-Za-z_][\w.]*)/m : DOTNET.test(path) ? /^\s*namespace\s+([A-Za-z_][\w.]*)/m : void 0;
+  const re = JAVA_LIKE.test(path) ? /^\s*package\s+([A-Za-z_][\w.]*)/m : DOTNET2.test(path) ? /^\s*namespace\s+([A-Za-z_][\w.]*)/m : void 0;
   const m = re?.exec(text);
   return m ? rootOf(m[1]) : void 0;
 }
@@ -2824,7 +2922,7 @@ function packageRoots(paths, inits, read) {
       }
       if (top)
         roots.add(nameOf(top).toLowerCase());
-    } else if ((JAVA_LIKE.test(p) || DOTNET.test(p)) && readCount < PACKAGE_SAMPLE) {
+    } else if ((JAVA_LIKE.test(p) || DOTNET2.test(p)) && readCount < PACKAGE_SAMPLE) {
       readCount++;
       const r = packageRoot(p, read(p) ?? "");
       if (r)
@@ -3188,7 +3286,7 @@ function planGaps(from, size, room, o = {}) {
   for (const o2 of from.specOpsUncovered ?? [])
     note(o2.cite, `declares ${o2.method} ${quoted2(o2.path)}, which no entry covers: find the code that serves it`);
   for (const e of from.entriesNoFlowFollows ?? [])
-    note(e.cite, `is ${e.id} (${[e.entryType, e.method, quoted2(e.path)].filter(Boolean).join(" ")}), which no flow follows: write its flow`);
+    note(e.cite, e.route ? `is ${e.id} (${[e.method, quoted2(e.path)].filter(Boolean).join(" ")}), a gateway route with no forwarding call: write the call it forwards to its RouteRule's target, \`from\` it, as the gateway rules say` : `is ${e.id} (${[e.entryType, e.method, quoted2(e.path)].filter(Boolean).join(" ")}), which no flow follows: write its flow`);
   const unlisted = Math.max(0, (from.skippedCount ?? 0) - (from.skipped?.length ?? 0)) + Math.max(0, (from.specOpsUncoveredCount ?? 0) - (from.specOpsUncovered?.length ?? 0));
   const gone = [];
   const reads = [];
@@ -4280,7 +4378,7 @@ var STATE = {
 };
 function recordGaps(r) {
   const g = [];
-  if (r.confidence === "inferred")
+  if (r.confidence === "inferred" && !r.flags?.includes(JOINED_BY_PERSON))
     g.push("inferred");
   for (const f of r.flags ?? [])
     if (!JOIN_HOW_FLAGS.has(f) && !LINK_EVIDENCE_NOT_GAPS.has(f))
@@ -4295,6 +4393,10 @@ var HOW_OF_FLAG = {
   "joined-by-folder-name": "folder-name",
   "joined-despite-conflict": "conflict",
   "joined-by-service-name": "service-name",
+  // G1 (ADR 0174): a person paired the call with the entry on the canvas.
+  "joined-by-person": "person",
+  // ADR 0181: the AI paired it, applied by Atticus from its run: the AI's word, not a person's.
+  [JOINED_BY_AI]: "ai",
   "joined-by-answer": "answer",
   "joined-by-name": "named",
   "joined-by-repo": "repo",
@@ -4329,9 +4431,16 @@ function joinOf(i) {
     callee: side("callee"),
     hops: side("gateway"),
     other: evidenceOf(i.evidence.filter((e) => !e.side || !sided.has(e.side))),
-    ...sharedOf(i)
+    ...sharedOf(i),
+    ...aiRunOf(i)
   };
 }
+function aiRunOf(i) {
+  if (!i.flags?.includes(JOINED_BY_AI))
+    return {};
+  const run = i.evidence.find((e) => e.source === "ai" && e.run)?.run;
+  return run ? { run } : {};
+}
 function sharedOf(i) {
   if (!i.flags?.includes(JOINED_TO_SHARED_MAP))
     return {};
@@ -5863,6 +5972,7 @@ export {
   insideRepo,
   dirSource,
   correctionFor,
+  outsidePairingFor,
   correctedFact,
   applyCorrections,
   frameworkFacts,

package/dist/{chunk-L336AJCZ.js → chunk-JYTIHTIK.js}

@@ -6,18 +6,18 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   isCritic
 } from "./chunk-4Q3NN7VF.js";
-import {
-  lensRunOf
-} from "./chunk-VEJYZEPC.js";
 import {
   CONTEXT_TOOLS
-} from "./chunk-YXUIUOQZ.js";
+} from "./chunk-5WERBKLE.js";
+import {
+  lensRunOf
+} from "./chunk-K332XW7K.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";
@@ -173,6 +173,8 @@ async function printJson(root, argv, args, s, io) {
       runId: run.runId,
       // ADR 0115: one of the critic's AI lenses, reviewing what the step wrote.
       ...lens ? { lens } : {},
+      // ADR 0185: a batch asks these lenses together, each in its own section of one answer.
+      ...run.parts?.length ? { lenses: run.parts.map((p) => p.name) } : {},
       stepClass,
       ...orgModel ? { orgModel } : {},
       root,