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

package/dist/{chunk-RBXDHCN7.js → chunk-TWQRPM76.js}

@@ -10,7 +10,7 @@ import {
   globToRegExp,
   memoryRepo,
   scanRepo
-} from "./chunk-TLDL2ZZI.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   Dialect,
   FrameworkModel,
@@ -26,7 +26,7 @@ import {
   renderExpr,
   renderTemplate,
   require_dist
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   __commonJS,
   __require,

package/dist/{chunk-IO6DQCZX.js → chunk-TYD6I4CZ.js}

@@ -7,14 +7,14 @@ import {
   gatewayHostFix,
   hostQuestionDrafts,
   unknownHosts
-} from "./chunk-EZBAS5BL.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   baseClonePath,
   loadRepos
-} from "./chunk-ZQC7MNQB.js";
+} from "./chunk-XOL3GFW2.js";
 import {
   fsRepo
-} from "./chunk-TLDL2ZZI.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   HOSTS_NONE,
   HOSTS_OUTSIDE_INTERNAL,
@@ -26,7 +26,7 @@ import {
   raiseQuestions,
   retireQuestion,
   writeQuestion
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/host-questions.js
 import { stat } from "node:fs/promises";

package/dist/{chunk-5NLJH6R4.js → chunk-U3NBK4EU.js}

@@ -6,13 +6,20 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   modelsData,
   reachPlanOf
-} from "./chunk-QKMDT7VU.js";
+} from "./chunk-455SYIIE.js";
+import {
+  effectiveRules,
+  orgRulesLacking,
+  readingRulesText,
+  ruleIds,
+  ruleMatches
+} from "./chunk-GIFMBCTW.js";
 import {
   loadReadPlan,
   modelsModeOf,
   recordNotReached,
   saveReadPlan
-} from "./chunk-AB5E5HCN.js";
+} from "./chunk-MD7KUEJ3.js";
 import {
   FACT_RULES_HASH,
   MODELS_RULE,
@@ -23,7 +30,7 @@ import {
   rulesLacking,
   rulesNow,
   topUpWords
-} from "./chunk-BAXM3JFQ.js";
+} from "./chunk-3AQ2R5NL.js";
 import {
   fileKinds,
   kindsOf,
@@ -31,21 +38,21 @@ import {
   planBatches,
   readingRank,
   sameCommit
-} from "./chunk-IPSFMTK2.js";
+} from "./chunk-JYMIB5XY.js";
 import {
   DATA_RULE,
   neutralise,
   wrapData
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
 import {
   citedFiles,
   factsDirOf,
   factsRelOf,
   parseFacts
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 
 // packages/cli/dist/map-rules.js
 import { createHash } from "node:crypto";
@@ -100,7 +107,10 @@ function topUpFiles(o) {
 }
 function ruleSetsOfFiles(files) {
   const all = new Set(files.flatMap((f) => f.sets));
-  return RULE_SETS.filter((x) => all.has(x));
+  return [
+    ...RULE_SETS.filter((x) => all.has(x)),
+    ...[...all].filter((x) => x.startsWith("org:")).sort()
+  ];
 }
 function topUpSessions(files, room) {
   const reads = [];
@@ -146,7 +156,9 @@ async function factsOf(root, repo) {
 }
 async function topUpOf(root, repo, o) {
   const plan = await loadReadPlan(root, repo);
-  const lacking = rulesLacking(plan?.rules);
+  const builtin = rulesLacking(plan?.rules);
+  const org = orgRulesLacking(plan?.rules, await effectiveRules(root, repo)).filter((r) => r.files?.length);
+  const lacking = [...builtin, ...org.map((r) => r.id)];
   if (!lacking.length)
     return { lacking, files: [], ...plan ? { plan } : {} };
   const facts = o.facts?.length ? [...o.facts] : await factsOf(root, repo);
@@ -173,19 +185,39 @@ async function topUpOf(root, repo, o) {
     facts,
     source: o.source,
     exclude: o.exclude,
-    sets: lacking,
+    sets: builtin,
     ...o.conventions ? { conventions: o.conventions } : {},
     reach
   });
+  if (org.length) {
+    const byPath = new Map(files.map((f) => [f.path, f]));
+    for (const slice of all.batches.flat()) {
+      if (readingRank(slice.path) === 5)
+        continue;
+      const ids = org.filter((r) => r.files?.length && ruleMatches(r, slice.path)).map((r) => r.id);
+      if (!ids.length)
+        continue;
+      const f = byPath.get(slice.path);
+      if (f)
+        f.sets.push(...ids);
+      else {
+        const add = { path: slice.path, tokens: slice.tokens, lines: slice.of, sets: ids };
+        byPath.set(slice.path, add);
+        files.push(add);
+      }
+    }
+  }
   return { lacking, files, reach, ...plan ? { plan } : {} };
 }
 var planOr = (plan, repo, commit, session) => plan ?? { schemaVersion: 2, repo, commit, session, plannedAt: stamp(), parts: [] };
-async function recordRulesNow(root, repo, commit) {
+async function recordRulesNow(root, repo, commit, given) {
   const plan = await loadReadPlan(root, repo);
   const { topUp: _t, ...rest } = planOr(plan, repo, commit, 15e4);
-  if (plan?.rules?.hash === FACT_RULES_HASH && !plan.topUp)
+  const org = given ? [...plan?.rules?.sets ?? [], ...given] : ruleIds(await effectiveRules(root, repo));
+  const rules = withOrgIds(rulesNow(), org);
+  if (plan?.rules?.hash === FACT_RULES_HASH && !plan.topUp && rules.sets.every((x) => plan.rules.sets.includes(x)))
     return;
-  await saveReadPlan(root, { ...rest, rules: rulesNow() });
+  await saveReadPlan(root, { ...rest, rules });
 }
 async function writtenHash(root, repo) {
   const h = createHash("sha256");
@@ -209,12 +241,16 @@ async function recordTopUpVerified(root, repo, o) {
     const sets = [.../* @__PURE__ */ new Set([...plan.rules?.sets ?? [], ...t.sets])];
     await saveReadPlan(root, {
       ...rest,
-      rules: t.hash === FACT_RULES_HASH ? rulesNow() : { hash: t.hash, sets }
+      rules: t.hash === FACT_RULES_HASH ? withOrgIds(rulesNow(), sets) : { hash: t.hash, sets }
     });
     return;
   }
   await saveReadPlan(root, { ...plan, topUp: { ...t, sessions } });
 }
+var withOrgIds = (r, had) => ({
+  hash: r.hash,
+  sets: [...r.sets, ...[...new Set(had.filter((x) => x.startsWith("org:")))].sort()]
+});
 var rulesRelOf = (root, repo) => `${factsRelOf(root)}/${repo}.rules.md`;
 var sameSets = (a, b) => a.length === b.length && a.every((x) => b.includes(x));
 async function plannedTopUp(root, repo, o) {
@@ -274,7 +310,7 @@ async function mapRules(root, repo, o, io) {
   }
   const t = p.topUp;
   if (!t.sessions.length) {
-    await recordRulesNow(root, repo, o.commit);
+    await recordRulesNow(root, repo, o.commit, t.sets);
     if (o.json)
       io.out(JSON.stringify({ repo, commit: o.commit, sets: t.sets, sessions: 0 }, null, 2));
     else
@@ -289,6 +325,7 @@ async function mapRules(root, repo, o, io) {
   await saveReadPlan(root, { ...plan, topUp: { ...t, sessions } });
   const rel = rulesRelOf(root, repo);
   await writeFileAtomic(join(factsDirOf(root), `${repo}.rules.md`), rulesPrompt(repo, o.commit, {
+    orgRules: await effectiveRules(root, repo),
     rel: factsRelOf(root),
     session: next,
     n: n + 1,
@@ -321,7 +358,8 @@ async function mapRules(root, repo, o, io) {
 var factLine = (f) => `- ${f.id} (${f.kind}, ${f.cite.file}:${f.cite.line})`;
 function rulesPrompt(repo, commit, c) {
   const s = c.session;
-  const sets = s.sets;
+  const sets = s.sets.filter((x) => RULE_SETS.includes(x));
+  const orgIds = new Set(s.sets.filter((x) => x.startsWith("org:")));
   const files = s.paths.map((x) => lineRangeOf(x)?.file ?? x);
   const list = s.paths.map((x) => `- \`${x}\``).join("\n");
   const kept = c.facts.filter((f) => citedFiles(f).some((p) => files.includes(p)));
@@ -329,7 +367,7 @@ function rulesPrompt(repo, commit, c) {
   return [
     `# Top-up of ${repo} at ${commit}`,
     "",
-    `Session ${c.n} of ${c.of}, about ${s.tokens.toLocaleString("en-US")} tokens of source. ${topUpWords(sets)} Open each path below and nothing else: a path ending \`#L<from>-L<to>\` by those lines only, never the whole file.${c.checkout ? ` The paths are in the repo's checkout, \`${c.checkout}\` in this metarepo: open \`${c.checkout}/<path>\` with your file tools; there is no need to look for it or to run a command.` : ""}`,
+    `Session ${c.n} of ${c.of}, about ${s.tokens.toLocaleString("en-US")} tokens of source. ${topUpWords(s.sets.map((x) => x.startsWith("org:") ? x.slice(4).split("@")[0] : x))} Open each path below and nothing else: a path ending \`#L<from>-L<to>\` by those lines only, never the whole file.${c.checkout ? ` The paths are in the repo's checkout, \`${c.checkout}\` in this metarepo: open \`${c.checkout}/<path>\` with your file tools; there is no need to look for it or to run a command.` : ""}`,
     "",
     `- Write each fact to \`${c.rel}/${repo}.jsonl\`, appended, with \`commit\` ${commit}. A kept fact you add to is written again whole, under its id.`,
     `- A path that has nothing to add under these rules: a line in \`${c.rel}/${repo}.reviewed.jsonl\`, \`{"path": "<the path>", "why": "..."}\`. Every path below ends with a fact written or a line there.`,
@@ -343,6 +381,7 @@ function rulesPrompt(repo, commit, c) {
     "",
     factRulesFor(kindsOf(files), void 0, sets),
     "",
+    ...orgIds.size && c.orgRules ? [readingRulesText({ rules: c.orgRules.rules, builtinOff: [] }, orgIds), ""] : [],
     "## Read",
     "",
     `The paths to open are in the data block below. ${DATA_RULE}`,

package/dist/{chunk-U542BJME.js → chunk-UDXWIPCB.js}

@@ -62,13 +62,13 @@ import {
   specEndpointIds,
   specFormatOf,
   vendorImpact
-} from "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
   CHANGE_INPUTS_SCHEMA_VERSION,

package/dist/{chunk-OSB6AKF2.js → chunk-UEVZZZU2.js}

@@ -134,10 +134,10 @@ import {
   webhooksExtractor,
   wrapperCalls,
   yamlKeyLine
-} from "./chunk-RBXDHCN7.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-TWQRPM76.js";
+import "./chunk-7AB6OWTV.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
   BACKEND_EXTRACTORS,

package/dist/{chunk-5ZV7BK22.js → chunk-UF4UHCIG.js}

@@ -6,10 +6,10 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   external_exports,
   require_dist
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   ensureLocalIgnore
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-PHJOOL6U.js → chunk-UFE36WJH.js}

@@ -5,10 +5,10 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   defaultCodeDir
-} from "./chunk-YXUIUOQZ.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-5WERBKLE.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/question-evidence.js

package/dist/{chunk-IHRP4OYV.js → chunk-URIKUID7.js}

@@ -5,31 +5,31 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   INPUTS_SOURCE_ID
-} from "./chunk-SHEUEHKC.js";
+} from "./chunk-D57MFJPP.js";
 import {
   readCatalog
-} from "./chunk-EZBAS5BL.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   readKnowledge,
   readSnapshot
-} from "./chunk-KCQS52TH.js";
-import "./chunk-IPSFMTK2.js";
+} from "./chunk-64AADMTW.js";
+import "./chunk-JYMIB5XY.js";
 import {
   scanInputs
-} from "./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-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
 import {
   catalogDirOf,
   inputsDirOf,
   knowledgeRelOf,
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/documents.js