@maycombhq/atticus 2.0.0-beta.11 → 2.0.0-beta.12

package/dist/{chunk-XPJR74MA.js → chunk-4RDW2X43.js}

@@ -5,30 +5,30 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   termNoteOffer
-} from "./chunk-IRW64JFF.js";
-import "./chunk-NIYB5K5B.js";
+} from "./chunk-LDUJ6NIT.js";
+import "./chunk-X64BFQ3R.js";
 import {
   routeQuestions
-} from "./chunk-5RUMHLIS.js";
-import "./chunk-BUWSOQLU.js";
-import "./chunk-LDIARP6F.js";
-import "./chunk-XKJRPVJO.js";
+} from "./chunk-E73QLYK7.js";
+import "./chunk-ZPT4QX3J.js";
+import "./chunk-7VNEDDCC.js";
+import "./chunk-INCECZ2E.js";
 import {
   waitingQuestions
-} from "./chunk-6N2GUZMZ.js";
-import "./chunk-IILZ7J3L.js";
-import "./chunk-TEBBD4XH.js";
-import "./chunk-XPWSNKF3.js";
-import "./chunk-WIMOJMAK.js";
-import "./chunk-5V5BJACL.js";
-import "./chunk-GVFUEGGM.js";
-import "./chunk-YVCOQ5TZ.js";
-import "./chunk-XNRPCI23.js";
+} from "./chunk-ISXNWUG7.js";
+import "./chunk-22GLUHGE.js";
+import "./chunk-QR65C3DV.js";
+import "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
+import "./chunk-TEHH47TG.js";
+import "./chunk-77UOXZVM.js";
 import {
   gitUser
-} from "./chunk-XZJE6WIT.js";
-import "./chunk-FMRMTI7W.js";
-import "./chunk-BKFGGJKA.js";
+} from "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
+import "./chunk-CQD26SMZ.js";
 import {
   HOSTS_STEP,
   QuestionError,
@@ -49,7 +49,7 @@ import {
   readQuestion,
   require_dist,
   topicOfQuestion
-} from "./chunk-JMOLB347.js";
+} from "./chunk-U25OX22K.js";
 import {
   writeFileAtomic
 } from "./chunk-MMB2OHUY.js";
@@ -247,13 +247,18 @@ function ruleLine(q, change = false) {
   const what = a.match.startsWith("/") ? `whose path is under ${a.match}` : `on a host matching ${a.match}`;
   return `It answers by rule: every call ${what}, in ${where}, reads this answer, the calls found later too.`;
 }
+function ruleOfferLine(id, r) {
+  const others = r.ids.length - 1;
+  return `  Answer once for all ${r.ids.length}: atticus questions answer ${id} --option <n> --match '${r.match}' covers the ${plural(r.calls, "call")} of these ${r.ids.length} questions, and the other ${others === 1 ? "one retires" : `${others} retire`} on the next verify --write (${r.ids.filter((x) => x !== id).join(", ")}).`;
+}
 function questionLines(q, o = {}) {
   const lines = [
     `${q.id}  ${q.state}  ${q.repo}  (asked by ${q.askedBy.command} on ${q.askedBy.at.slice(0, 10)})`,
     `  ${q.question}`,
     ...aboutLines(o.about),
     ...q.options.map((o2, i) => `  ${i + 1}. ${o2.label}: ${sentence2(o2.means)} It would change: ${sentence2(o2.changes)}`),
-    `  Evidence: ${q.evidence.join(", ")}`
+    `  Evidence: ${q.evidence.join(", ")}`,
+    ...q.state === "open" && o.about?.rule ? [ruleOfferLine(q.id, o.about.rule)] : []
   ];
   if (q.answer)
     lines.push(`  Answered by ${q.answer.by} on ${q.answer.at.slice(0, 10)}: ${answerWords(q)} (${scopeWords(q.answer.scope, true, o.change)})${q.answer.match ? `, by rule: ${q.answer.match}` : ""}`, ...q.answer.proposal ? [
@@ -342,8 +347,14 @@ async function questionsFiles(root, argv, io, deps = {}) {
     const p = q.state === "open" ? await proposalOf(root, q.id) : void 0;
     const proposal = p?.ok && p.proposal ? { ...p.proposal, file: p.file } : void 0;
     if (values.json === true) {
-      const picks = q.state === "open" && (q.askedBy.step === TARGETS_STEP_ID || q.askedBy.step === TOPICS_STEP_ID) ? await (await import("./chunk-GPLFYLGH.js")).pickerOf(root) : void 0;
-      io.out(JSON.stringify({ ...q, ...proposal ? { proposal } : {}, ...picks ? { picks } : {} }, null, 2));
+      const picks = q.state === "open" && (q.askedBy.step === TARGETS_STEP_ID || q.askedBy.step === TOPICS_STEP_ID) ? await (await import("./chunk-JXXQHETS.js")).pickerOf(root) : void 0;
+      const rule = q.state === "open" && q.askedBy.step === TARGETS_STEP_ID ? (await routeQuestions(root, [q])).about[q.id]?.rule : void 0;
+      io.out(JSON.stringify({
+        ...q,
+        ...proposal ? { proposal } : {},
+        ...picks ? { picks } : {},
+        ...rule ? { rule } : {}
+      }, null, 2));
     } else {
       const routed = await routeQuestions(root, [q]);
       const about = routed.about[q.id];
@@ -448,8 +459,8 @@ async function questionsFiles(root, argv, io, deps = {}) {
         io.err("--target names the answer: give it alone, not with --option, --text or --accept-proposal.");
         return 2;
       }
-      const { readQuestion: readQuestion2 } = await import("./chunk-IVHN2VYG.js");
-      const { targetAnswerOf, pickerOf, pickerText, offerLine } = await import("./chunk-GPLFYLGH.js");
+      const { readQuestion: readQuestion2 } = await import("./chunk-OJAJXU65.js");
+      const { targetAnswerOf, pickerOf, pickerText, offerLine } = await import("./chunk-JXXQHETS.js");
       const q0 = await readQuestion2(root, id).catch(() => void 0);
       if (!q0) {
         io.err(`There is no question ${id}.`);
@@ -541,7 +552,7 @@ async function questionsFiles(root, argv, io, deps = {}) {
         throw e;
       io.err(e.message);
       if (/opens the list of every repo/.test(e.message)) {
-        const { pickerOf, pickerText } = await import("./chunk-GPLFYLGH.js");
+        const { pickerOf, pickerText } = await import("./chunk-JXXQHETS.js");
         for (const l of pickerText(await pickerOf(root)))
           io.err(`  ${l}`);
       }
@@ -558,5 +569,6 @@ export {
   questionLines,
   questionsFiles,
   ruleLine,
+  ruleOfferLine,
   scopeWords
 };

package/dist/{chunk-7LCQ7JAM.js → chunk-4VOG5H2K.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-VOGCSYOI.js";
 import {
   openspecStores
-} from "./chunk-3LU6YCSQ.js";
+} from "./chunk-U5T4A2QV.js";
 
 // packages/cli/dist/openspec-stores-commands.js
 var plural = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;

package/dist/chunk-5CSZTVXH.js

@@ -0,0 +1,34 @@
+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 {
+  catalogDiff,
+  diffLines,
+  scanCommand
+} from "./chunk-CW5SEPUT.js";
+import "./chunk-GKPOCUQR.js";
+import "./chunk-7TH6I6TL.js";
+import "./chunk-GHSVJNVL.js";
+import "./chunk-GMDOXWIS.js";
+import "./chunk-U5T4A2QV.js";
+import "./chunk-JQG4VO47.js";
+import "./chunk-DW4BM73R.js";
+import "./chunk-22GLUHGE.js";
+import "./chunk-QR65C3DV.js";
+import "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
+import "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
+import "./chunk-CQD26SMZ.js";
+import "./chunk-U25OX22K.js";
+import "./chunk-MMB2OHUY.js";
+import "./chunk-TV45EUGM.js";
+export {
+  catalogDiff,
+  diffLines,
+  scanCommand
+};

package/dist/{chunk-KU4T2CXJ.js → chunk-5FFMJMVH.js}

@@ -5,37 +5,37 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   diffLines
-} from "./chunk-4URR24DD.js";
-import "./chunk-XR5DD5DQ.js";
-import "./chunk-EI4KQYJ3.js";
-import "./chunk-6RGIM2ZH.js";
-import "./chunk-T6ESD5KM.js";
-import "./chunk-3LU6YCSQ.js";
-import "./chunk-L7I5PKGD.js";
-import "./chunk-CAN3EBE5.js";
+} from "./chunk-CW5SEPUT.js";
+import "./chunk-GKPOCUQR.js";
+import "./chunk-7TH6I6TL.js";
+import "./chunk-GHSVJNVL.js";
+import "./chunk-GMDOXWIS.js";
+import "./chunk-U5T4A2QV.js";
+import "./chunk-JQG4VO47.js";
+import "./chunk-DW4BM73R.js";
 import {
   diffCatalogs,
   readCatalog,
   scanEstate,
   writeCatalog
-} from "./chunk-IILZ7J3L.js";
-import "./chunk-TEBBD4XH.js";
-import "./chunk-XPWSNKF3.js";
-import "./chunk-WIMOJMAK.js";
-import "./chunk-5V5BJACL.js";
-import "./chunk-GVFUEGGM.js";
+} from "./chunk-22GLUHGE.js";
+import "./chunk-QR65C3DV.js";
+import "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
 import {
   branchSlug,
   createWorkspace,
   isInPlace,
   loadRepos
-} from "./chunk-XZJE6WIT.js";
-import "./chunk-FMRMTI7W.js";
-import "./chunk-BKFGGJKA.js";
+} from "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
+import "./chunk-CQD26SMZ.js";
 import {
   catalogDirOf,
   require_dist
-} from "./chunk-JMOLB347.js";
+} from "./chunk-U25OX22K.js";
 import {
   writeFileAtomic
 } from "./chunk-MMB2OHUY.js";

package/dist/{chunk-XOVLGBKI.js → chunk-5GGGAI5C.js}

@@ -11,36 +11,36 @@ import {
   findNeeds,
   markNeed,
   readNeeds
-} from "./chunk-EV4TEFOD.js";
-import "./chunk-6N2GUZMZ.js";
+} from "./chunk-DWYPYVPJ.js";
+import "./chunk-ISXNWUG7.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
-import "./chunk-T6ESD5KM.js";
-import "./chunk-3LU6YCSQ.js";
-import "./chunk-L7I5PKGD.js";
-import "./chunk-CAN3EBE5.js";
-import "./chunk-IILZ7J3L.js";
+import "./chunk-GMDOXWIS.js";
+import "./chunk-U5T4A2QV.js";
+import "./chunk-JQG4VO47.js";
+import "./chunk-DW4BM73R.js";
+import "./chunk-22GLUHGE.js";
 import {
   readKnowledge
-} from "./chunk-TEBBD4XH.js";
-import "./chunk-XPWSNKF3.js";
-import "./chunk-WIMOJMAK.js";
-import "./chunk-5V5BJACL.js";
-import "./chunk-GVFUEGGM.js";
-import "./chunk-XNRPCI23.js";
-import "./chunk-XZJE6WIT.js";
-import "./chunk-FMRMTI7W.js";
+} from "./chunk-QR65C3DV.js";
+import "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
+import "./chunk-77UOXZVM.js";
+import "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
 import {
   RuntimeConfigError,
   runtimeForCli
-} from "./chunk-BKFGGJKA.js";
+} from "./chunk-CQD26SMZ.js";
 import {
   changesDirOf,
   changesRelOf,
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-JMOLB347.js";
+} from "./chunk-U25OX22K.js";
 import "./chunk-MMB2OHUY.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-7S3XFWOU.js → chunk-5H46QFSL.js}

@@ -8,16 +8,16 @@ import {
 } from "./chunk-4Q3NN7VF.js";
 import {
   lensRunOf
-} from "./chunk-T6ESD5KM.js";
+} from "./chunk-GMDOXWIS.js";
 import {
   CONTEXT_TOOLS
-} from "./chunk-XNRPCI23.js";
+} from "./chunk-77UOXZVM.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-BKFGGJKA.js";
+} from "./chunk-CQD26SMZ.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-JMOLB347.js";
+} from "./chunk-U25OX22K.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";

package/dist/{chunk-XJAJQGXJ.js → chunk-5ION6STH.js}

@@ -7,8 +7,8 @@ import {
   ME_FILE,
   readMe,
   writeMe
-} from "./chunk-ORZSD2KD.js";
-import "./chunk-JMOLB347.js";
+} from "./chunk-DQKNOHUZ.js";
+import "./chunk-U25OX22K.js";
 import "./chunk-MMB2OHUY.js";
 import "./chunk-TV45EUGM.js";
 export {

package/dist/{chunk-HZYFLEWO.js → chunk-5M3CLAOV.js}

@@ -10,23 +10,23 @@ import {
   repoTypeNote,
   repoTypeRules,
   termNoteOffer
-} from "./chunk-IRW64JFF.js";
-import "./chunk-NIYB5K5B.js";
-import "./chunk-BUWSOQLU.js";
-import "./chunk-LDIARP6F.js";
-import "./chunk-XKJRPVJO.js";
-import "./chunk-IILZ7J3L.js";
-import "./chunk-TEBBD4XH.js";
-import "./chunk-XPWSNKF3.js";
-import "./chunk-WIMOJMAK.js";
-import "./chunk-5V5BJACL.js";
-import "./chunk-GVFUEGGM.js";
-import "./chunk-YVCOQ5TZ.js";
-import "./chunk-XNRPCI23.js";
-import "./chunk-XZJE6WIT.js";
-import "./chunk-FMRMTI7W.js";
-import "./chunk-BKFGGJKA.js";
-import "./chunk-JMOLB347.js";
+} from "./chunk-LDUJ6NIT.js";
+import "./chunk-X64BFQ3R.js";
+import "./chunk-ZPT4QX3J.js";
+import "./chunk-7VNEDDCC.js";
+import "./chunk-INCECZ2E.js";
+import "./chunk-22GLUHGE.js";
+import "./chunk-QR65C3DV.js";
+import "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
+import "./chunk-TEHH47TG.js";
+import "./chunk-77UOXZVM.js";
+import "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
+import "./chunk-CQD26SMZ.js";
+import "./chunk-U25OX22K.js";
 import "./chunk-MMB2OHUY.js";
 import "./chunk-TV45EUGM.js";
 export {

package/dist/{chunk-WUE6HKIU.js → chunk-5OACMWWI.js}

@@ -6,58 +6,68 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   mapCommand,
   mapStateOf
-} from "./chunk-LS3WR2RF.js";
+} from "./chunk-7TEQF64E.js";
 import {
   factsRepos,
   verifyCommand
-} from "./chunk-Y5AYBGLB.js";
-import "./chunk-52WCHTVZ.js";
+} from "./chunk-BTOGAUWX.js";
+import {
+  plannedTopUp,
+  recordRulesNow,
+  ruleSetsOfFiles
+} from "./chunk-QY7RGTUP.js";
+import "./chunk-ZS47PQ3O.js";
 import {
   estateFreshness
-} from "./chunk-G3PBLW4K.js";
+} from "./chunk-I2PNEG3M.js";
 import {
   onboardingQueue
-} from "./chunk-ATNG5VOZ.js";
-import "./chunk-B3QOYE74.js";
-import {
-  readPlanProgress
-} from "./chunk-LVBPY2M6.js";
-import "./chunk-EW7MRMD5.js";
-import "./chunk-IA2RKC6I.js";
+} from "./chunk-SK5OYWIY.js";
+import "./chunk-3CFBU2O6.js";
+import "./chunk-HJUEQERG.js";
+import "./chunk-B6X5PJSA.js";
 import {
   checkoutOf,
-  headOf
-} from "./chunk-ASKDCMW5.js";
-import "./chunk-LDIARP6F.js";
-import "./chunk-MYKQVS5W.js";
-import "./chunk-EBWIOODZ.js";
-import "./chunk-BA5DTXHQ.js";
+  conventionsAt,
+  excludesOf,
+  headOf,
+  loadReadPlan,
+  readPlanProgress
+} from "./chunk-P76AW3PA.js";
+import "./chunk-7VNEDDCC.js";
+import "./chunk-6S27MUQQ.js";
+import "./chunk-EU7VTBAI.js";
+import "./chunk-NCONDPHH.js";
 import {
   isMetarepo,
   notMetarepo
 } from "./chunk-3G4YI4ZU.js";
 import {
   assistantTier,
-  readProbes
-} from "./chunk-6RGIM2ZH.js";
+  readProbes,
+  rulesLacking
+} from "./chunk-GHSVJNVL.js";
 import "./chunk-VOGCSYOI.js";
 import {
   estateRepos,
   productionRepos
-} from "./chunk-IILZ7J3L.js";
-import "./chunk-TEBBD4XH.js";
+} from "./chunk-22GLUHGE.js";
+import "./chunk-QR65C3DV.js";
 import {
-  sameCommit
-} from "./chunk-XPWSNKF3.js";
-import "./chunk-WIMOJMAK.js";
-import "./chunk-5V5BJACL.js";
-import "./chunk-GVFUEGGM.js";
-import "./chunk-RJDP642F.js";
-import "./chunk-XZJE6WIT.js";
-import "./chunk-FMRMTI7W.js";
+  dirSource,
+  sameCommit,
+  sessionTokensFor
+} from "./chunk-MLAACAES.js";
+import "./chunk-HY2VVVFZ.js";
+import "./chunk-PJRMMWU4.js";
+import "./chunk-34NWVIBC.js";
+import "./chunk-TWHZU36X.js";
+import "./chunk-ARLH2ZMD.js";
+import "./chunk-RA64IK43.js";
+import "./chunk-MRLCNXXR.js";
 import {
   currentPromptLimit
-} from "./chunk-BKFGGJKA.js";
+} from "./chunk-CQD26SMZ.js";
 import {
   factsDirOf,
   factsRelOf,
@@ -67,7 +77,7 @@ import {
   orgPackDirOf,
   parseFacts,
   require_dist
-} from "./chunk-JMOLB347.js";
+} from "./chunk-U25OX22K.js";
 import {
   ensureLocalIgnore,
   writeFileAtomic
@@ -177,6 +187,31 @@ async function partsOf(root, repo, commit, limit, git) {
     ...batches !== void 0 ? { batches } : {}
   };
 }
+async function rulesPartsOf(root, repo, commit, limit, o = {}) {
+  const dir = await checkoutOf(root, repo).catch(() => void 0);
+  if (!dir)
+    return "no clone to read: atticus workspace sync clones it";
+  const p = await plannedTopUp(root, repo, {
+    commit,
+    source: dirSource(dir),
+    exclude: await excludesOf(root, repo),
+    conventions: await conventionsAt(root),
+    session: sessionTokensFor(limit),
+    ...o.save ? {} : { dryRun: true }
+  });
+  if ("error" in p)
+    return p.error;
+  const sessions = p.topUp?.sessions ?? [];
+  const parts = sessions.map((x, i) => ({
+    part: i + 1,
+    total: sessions.length,
+    paths: x.paths,
+    files: x.files,
+    tokens: x.tokens,
+    done: !!x.done
+  })).filter((x) => !x.done).map(({ done: _d, ...x }) => x);
+  return { parts, total: sessions.length, sets: ruleSetsOfFiles(sessions) };
+}
 async function planEstate(root, op, o, c, state) {
   const all = estateRepos(op).map((r) => r.id);
   const production = new Set(productionRepos(op).map((r) => r.id));
@@ -222,6 +257,17 @@ async function planEstate(root, op, o, c, state) {
       });
       continue;
     }
+    if (state2 === "rules-changed") {
+      const progress = await readPlanProgress(root, repo, { commit });
+      todo.push(progress && !progress.stale && progress.next ? {
+        repo,
+        kind: "read",
+        commit,
+        why: `its read is under way: ${progress.done} of ${progress.total} parts read`,
+        started: true
+      } : { repo, kind: "rules", commit, why: "", started: true });
+      continue;
+    }
     if (state2 === "moved") {
       todo.push({
         repo,
@@ -274,6 +320,22 @@ async function planEstate(root, op, o, c, state) {
       items.push({ ...base, parts: [], total: 0, tokens: 0 });
       continue;
     }
+    if (t.kind === "rules") {
+      const p2 = await rulesPartsOf(root, t.repo, t.commit, c.limit);
+      if (typeof p2 === "string") {
+        skipped.push({ repo: t.repo, why: p2 });
+        continue;
+      }
+      items.push({
+        ...base,
+        why: p2.sets.length ? `read before these reading rules: ${p2.sets.join(", ")}` : "read before the reading rules there are now, but no file of it is one they apply to: recorded as read under them",
+        sets: p2.sets,
+        parts: p2.parts,
+        total: p2.total,
+        tokens: p2.parts.reduce((n, x) => n + x.tokens, 0)
+      });
+      continue;
+    }
     if (t.kind === "gaps") {
       items.push({
         ...base,
@@ -311,12 +373,21 @@ function planLines(plan) {
   const out = [];
   const reading = plan.items.filter((i) => i.kind !== "carry");
   const parts = reading.reduce((n, i) => n + i.parts.length, 0);
+  const planned = reading.reduce((n, i) => n + Math.max(i.total, i.parts.length), 0);
   const tokens = reading.reduce((n, i) => n + i.tokens, 0);
   out.push(`The estate at ${tokensText(plan.limit)} tokens a prompt (${plan.limitFrom === "flag" ? "--max-tokens" : plan.limitFrom === "probe" ? "the limit atticus probe measured" : "runtime.yaml's maxInput"}), ${plan.mode === "model" ? "read by runtime.yaml's model, unattended" : "read by Copilot Chat in agent mode: you paste one line per part"}:`);
   plan.items.forEach((i, n) => {
     const head = `  ${n + 1}. ${i.repo}${i.prototype ? " (prototype: read, never joined)" : ""}`;
-    if (i.kind === "carry")
+    if (i.kind === "carry" || i.kind === "rules" && !i.parts.length)
       return out.push(`${head}: ${i.why}.`);
+    if (i.kind === "rules")
+      out.push(`${head}: top-up for the reading rules added since it was read (${(i.sets ?? []).join(", ")}); ${plural(i.parts.length, "part")}${i.parts.length < i.total ? ` of ${i.total}` : ""}, about ${tokensText(i.tokens)} tokens.`);
+    if (i.kind === "rules") {
+      if (i.total > 1)
+        for (const p of i.parts)
+          out.push(`     part ${p.part} of ${p.total} (about ${tokensText(p.tokens)} tokens, ${plural(p.files, "file")}): ${p.paths.join(", ")}`);
+      return;
+    }
     if (i.kind === "gaps")
       return out.push(`${head}: ${i.why}, planned when it starts.`);
     out.push(`${head}: ${i.kind === "reread" ? "re-read" : "read"}, ${i.why}; ${plural(i.parts.length, "part")}${i.parts.length < i.total ? ` of ${i.total}` : ""}, about ${tokensText(i.tokens)} tokens${plan.mode === "model" && i.batches !== void 0 ? `, ${plural(i.batches, "prompt")}` : ""}.`);
@@ -326,7 +397,7 @@ function planLines(plan) {
   });
   for (const s of plan.skipped)
     out.push(`  - ${s.repo}: skipped, ${s.why}.`);
-  out.push(plan.items.length ? `In all: ${plural(plan.items.length, "repo")}, ${plural(parts, "part")} to read, about ${tokensText(tokens)} tokens (estimated from the source, not metered). Then atticus verify --all --write joins the estate once.` : "Nothing to read: every repo is read and fresh, or skipped as said.");
+  out.push(plan.items.length ? `In all: ${plural(plan.items.length, "repo")}, ${plural(parts, "part")} to read${planned > parts ? ` (of ${planned} planned; ${planned - parts} ${planned - parts === 1 ? "is" : "are"} read already)` : ""}, about ${tokensText(tokens)} tokens (estimated from the source, not metered). Then atticus verify --all --write joins the estate once.` : "Nothing to read: every repo is read and fresh, or skipped as said.");
   return out;
 }
 var mtime = async (p) => (await stat(p).catch(() => void 0))?.mtimeMs;
@@ -365,6 +436,12 @@ async function settled(root, repo, commit, s, since) {
   }
 }
 async function covered(root, item, part, first, now) {
+  if (item.kind === "rules") {
+    const plan = await loadReadPlan(root, item.repo);
+    if (!plan?.topUp)
+      return rulesLacking(plan?.rules).length === 0;
+    return !!plan.topUp.sessions[part.part - 1]?.done;
+  }
   if (item.total > 1) {
     const p = await readPlanProgress(root, item.repo);
     return p?.parts.find((x) => x.part === part.part)?.state === "done";
@@ -497,6 +574,15 @@ async function mapAllCommand(root, o, io, deps = {}) {
     if (quit || stopped())
       break;
     const where = `repo ${n + 1} of ${items.length}`;
+    if (item.kind === "rules" && !item.parts.length) {
+      io.out("");
+      io.out(`===== ${item.repo} (${where}): ${item.why} =====`);
+      await recordRulesNow(root, item.repo, item.commit);
+      repoState(item).done = true;
+      totals.repos.add(item.repo);
+      await save();
+      continue;
+    }
     if (item.kind === "carry") {
       io.out("");
       io.out(`===== ${item.repo} (${where}): ${item.why} =====`);
@@ -560,9 +646,10 @@ async function mapAllCommand(root, o, io, deps = {}) {
   return 0;
   async function copilotPart(item, part, where) {
     const ps = partState(item, part.part);
-    const label = item.total > 1 ? `part ${part.part} of ${item.total}` : "one session";
+    const nth = item.parts.indexOf(part) + 1;
+    const label = item.total > 1 ? `part ${part.part} of ${item.total}${item.parts.length < item.total && nth > 0 ? `, ${nth} of the ${item.parts.length} to read` : ""}` : "one session";
     const progress = item.total > 1 ? await readPlanProgress(root, item.repo) : void 0;
-    const first0 = item.kind === "gaps" ? await gapsLine(item) : ps.retries > 0 || progress?.next && progress.next.part !== part.part ? await restLine(item, part) ?? `/atticus-map ${item.repo}` : `/atticus-map ${item.repo}`;
+    const first0 = item.kind === "rules" ? await rulesLine(item) : item.kind === "gaps" ? await gapsLine(item) : ps.retries > 0 || progress?.next && progress.next.part !== part.part ? await restLine(item, part) ?? `/atticus-map ${item.repo}` : `/atticus-map ${item.repo}`;
     if (first0 === void 0) {
       io.out(`${item.repo}: no gaps left; nothing to read.`);
       return finishPart(item, part, ps);
@@ -636,7 +723,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
     async function retry(item2, part2, label2, where2) {
       ps.retries++;
       await save();
-      const rest = item2.kind === "gaps" ? await gapsLine(item2) : await restLine(item2, part2);
+      const rest = item2.kind === "rules" ? await rulesLine(item2) : item2.kind === "gaps" ? await gapsLine(item2) : await restLine(item2, part2);
       if (rest === "done" || rest === void 0 && item2.kind === "gaps")
         return "done";
       line = rest ?? `/atticus-map ${item2.repo}`;
@@ -679,6 +766,12 @@ async function mapAllCommand(root, o, io, deps = {}) {
       return "done";
     return `/atticus-map ${item.repo}${parted ? ` --part ${part.part}` : ""} --gaps`;
   }
+  async function rulesLine(item) {
+    const p = await rulesPartsOf(root, item.repo, item.commit, limit, { save: true });
+    if (typeof p === "string" || !p.parts.length)
+      return "done";
+    return `/atticus-map ${item.repo} --rules`;
+  }
   async function gapsLine(item) {
     const plain = captured();
     await verifyCommand(root, item.repo, { commit: item.commit, json: true }, plain);
@@ -693,9 +786,11 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   async function block(item, part, label, where, line, retries) {
     io.out("");
-    io.out(`===== ${item.repo}, ${item.kind === "gaps" ? "the gaps pass" : label} (${where})${retries ? `, given again (${retries})` : ""} =====`);
+    io.out(`===== ${item.repo}, ${item.kind === "gaps" ? "the gaps pass" : item.kind === "rules" ? `the rules top-up${item.total > 1 ? `, ${label}` : ""}` : label} (${where})${retries ? `, given again (${retries})` : ""} =====`);
     io.out(`In a NEW Copilot Chat (agent mode), run: ${line}`);
-    if (item.total > 1 && !line.includes("--gaps"))
+    if (item.kind === "rules")
+      io.out(`That chat reads ${plural(part.files, "file")} again for the reading rules added since (${(item.sets ?? []).join(", ")}): ${part.paths.join(", ")} (about ${tokensText(part.tokens)} tokens).`);
+    else if (item.total > 1 && !line.includes("--gaps"))
       io.out(`That chat reads part ${part.part}: ${part.paths.join(", ")} (about ${tokensText(part.tokens)} tokens); the estimate it runs names it.`);
     else if (line.includes("--part"))
       io.out(`That chat reads only what is left of part ${part.part}, as the prompt it writes lists.`);
@@ -705,7 +800,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   async function modelRead(item, where, rt) {
     io.out("");
-    io.out(`===== ${item.repo} (${where}): ${item.kind === "reread" ? "re-reading what changed" : "reading"} on the model, ${plural(item.batches ?? 0, "prompt")} =====`);
+    io.out(item.kind === "rules" ? `===== ${item.repo} (${where}): topping up on the model for the reading rules added since it was read (${(item.sets ?? []).join(", ")}) =====` : `===== ${item.repo} (${where}): ${item.kind === "reread" ? "re-reading what changed" : "reading"} on the model, ${plural(item.batches ?? 0, "prompt")} =====`);
     for (let attempt = 1; attempt <= RETRIES; attempt++) {
       if (stopped())
         return "failed";
@@ -716,6 +811,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
         await mapCommand(root, item.repo, {
           commit: item.commit,
           maxTokens: limit,
+          ...item.kind === "rules" ? { rules: true } : {},
           ...resume ? { next: true } : before && !before.done ? { force: true } : {}
         }, io, { runtime: rt, ...deps.git ? { git: deps.git } : {} });
       } catch (e) {