@maycombhq/atticus 2.0.0-beta.12.1 → 2.0.0-beta.13

package/dist/{chunk-P7SONIEO.js → chunk-CFIDOXSH.js}

@@ -3,72 +3,80 @@ 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 {
+  copilotAcpAllowed,
+  copilotAcpByDefault,
+  readWrites
+} from "./chunk-F7EHN4CC.js";
 import {
   mapCommand,
   mapStateOf
-} from "./chunk-7C7PTJM2.js";
+} from "./chunk-EJJONXPS.js";
 import {
   factsRepos,
   verifyCommand
-} from "./chunk-6IKYFARG.js";
+} from "./chunk-5WBRQSLJ.js";
 import {
   plannedTopUp,
   recordRulesNow,
   ruleSetsOfFiles
-} from "./chunk-QOF7U6BI.js";
-import "./chunk-XDTD55UU.js";
-import "./chunk-CGF4LKXR.js";
+} from "./chunk-OKXRQPQF.js";
+import "./chunk-L2EHYZCH.js";
+import "./chunk-GAK5KDYV.js";
 import {
   estateFreshness
-} from "./chunk-ZDZCUZ4N.js";
+} from "./chunk-3JOHZDKD.js";
 import {
   onboardingQueue
-} from "./chunk-N6YELFHL.js";
-import "./chunk-PAQDPB6T.js";
-import "./chunk-DIAYQLEY.js";
-import "./chunk-WFJMKUTR.js";
+} from "./chunk-IF6UROTX.js";
+import "./chunk-FMGMRFEH.js";
+import "./chunk-ZQHFZ6WO.js";
+import "./chunk-YECVNCO4.js";
 import {
   checkoutOf,
   conventionsAt,
   excludesOf,
   headOf,
   loadReadPlan,
+  partUnaccounted,
   readPlanProgress
-} from "./chunk-6AYUBYK6.js";
-import "./chunk-7VNEDDCC.js";
-import "./chunk-BHHIHENP.js";
-import "./chunk-42L2WHP6.js";
-import "./chunk-MIOY6EXD.js";
+} from "./chunk-6TY7S6Y6.js";
+import "./chunk-QQIZGLRA.js";
+import "./chunk-5GQHLNZB.js";
+import "./chunk-3ODHCYOG.js";
+import "./chunk-KEOTTRK2.js";
 import {
   isMetarepo,
   notMetarepo
 } from "./chunk-3G4YI4ZU.js";
 import {
+  ASSISTANT_FORMATS,
   assistantTier,
   readProbes,
   rulesLacking
-} from "./chunk-J22RSFKY.js";
+} from "./chunk-S32NYQZZ.js";
 import "./chunk-VOGCSYOI.js";
 import {
   estateRepos,
   productionRepos
-} from "./chunk-DBZNQAMN.js";
-import "./chunk-QR65C3DV.js";
+} from "./chunk-THOVQFPT.js";
+import "./chunk-J422SCUS.js";
 import {
   dirSource,
   sameCommit,
   sessionTokensFor
-} from "./chunk-7VAMO66T.js";
-import "./chunk-HY2VVVFZ.js";
-import "./chunk-PJRMMWU4.js";
-import "./chunk-34NWVIBC.js";
-import "./chunk-M4D3VKAS.js";
-import "./chunk-ARLH2ZMD.js";
-import "./chunk-RA64IK43.js";
-import "./chunk-MRLCNXXR.js";
+} from "./chunk-N35OSYIU.js";
+import "./chunk-WPHKKINR.js";
+import "./chunk-S56NJ5LE.js";
+import "./chunk-4HAYYEFB.js";
+import "./chunk-RAFD4MYO.js";
+import "./chunk-HGNJNPMB.js";
+import "./chunk-LRO3Y2XQ.js";
+import "./chunk-WJK5WJLA.js";
 import {
+  AcpSignInError,
   currentPromptLimit
-} from "./chunk-CQD26SMZ.js";
+} from "./chunk-K4J4Z37A.js";
 import {
   factsDirOf,
   factsRelOf,
@@ -78,7 +86,7 @@ import {
   orgPackDirOf,
   parseFacts,
   require_dist
-} from "./chunk-U25OX22K.js";
+} from "./chunk-BH5DMXG5.js";
 import {
   ensureLocalIgnore,
   writeFileAtomic
@@ -95,7 +103,7 @@ import { join } from "node:path";
 var MAP_ALL_STATE_REL = ".atticus/map-all/state.json";
 var statePath = (root) => join(root, ".atticus", "map-all", "state.json");
 var REMIND_MS = 10 * 6e4;
-var IDLE_MINUTES = 15;
+var IDLE_MINUTES = 30;
 var POLL_MS = 3e3;
 var RETRIES = 3;
 var plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
@@ -122,6 +130,13 @@ function modelModeAllowed(op) {
   const rt = op.runtime;
   return rt.ai !== "off" && rt.modes.allowed.includes("model") && !!rt.adapters.model && rt.adapters.model.type !== "mock";
 }
+async function mapReader(root) {
+  const op = await loadOrgPack(orgPackDirOf(root));
+  const tier = assistantTier(op.runtime, { probes: (await readProbes(root)).results });
+  const name = tier.assistant ? ASSISTANT_FORMATS[tier.assistant].name : "no assistant";
+  const paste = tier.tier !== "off" && (tier.assistant === "copilot" || tier.tier !== 1);
+  return { name, loop: paste && isMetarepo(root) };
+}
 async function limitFor(root, op, given) {
   const flag = given ?? currentPromptLimit();
   if (flag !== void 0)
@@ -164,7 +179,7 @@ async function commitOf(root, repo, f) {
     return void 0;
   return await headFromFiles(dir) ?? await headOf(dir);
 }
-async function partsOf(root, repo, commit, limit, git, models) {
+async function partsOf(root, repo, commit, limit, git, models, force) {
   const io = captured();
   const code = await mapCommand(root, repo, { estimate: true, json: true, commit, maxTokens: limit, ...models ? { models } : {} }, io, git ? { git } : {});
   const r = code === 0 ? jsonOf(io.lines) : void 0;
@@ -188,7 +203,7 @@ async function partsOf(root, repo, commit, limit, git, models) {
       ...batches !== void 0 ? { batches } : {}
     };
   const states = r.parts.plan?.parts ?? [];
-  const parts = planned.map((p, i) => ({ part: i + 1, total: planned.length, ...p })).filter((p) => states.find((s) => s.part === p.part)?.state !== "done");
+  const parts = planned.map((p, i) => ({ part: i + 1, total: planned.length, ...p })).filter((p) => force ? !force.done.has(p.part) : states.find((s) => s.part === p.part)?.state !== "done");
   return {
     parts,
     total: planned.length,
@@ -243,6 +258,17 @@ async function planEstate(root, op, o, c, state) {
       continue;
     }
     const state2 = f?.state ?? "not-read";
+    if (o.force) {
+      todo.push({
+        repo,
+        kind: "read",
+        commit,
+        why: state2 === "not-read" ? "--force: read whole" : "--force: read whole again, the facts on file kept as already kept",
+        ...state2 === "not-read" ? {} : { started: true },
+        force: true
+      });
+      continue;
+    }
     if (o.gaps) {
       if (state2 === "not-read")
         skipped.push({ repo, why: "not read yet: the gaps pass follows a read" });
@@ -324,7 +350,8 @@ async function planEstate(root, op, o, c, state) {
       kind: t.kind,
       commit: t.commit,
       why: t.why,
-      ...production.has(t.repo) ? {} : { prototype: true }
+      ...production.has(t.repo) ? {} : { prototype: true },
+      ...t.force ? { force: true } : {}
     };
     if (t.kind === "carry") {
       items.push({ ...base, parts: [], total: 0, tokens: 0 });
@@ -357,7 +384,7 @@ async function planEstate(root, op, o, c, state) {
       });
       continue;
     }
-    const p = await partsOf(root, t.repo, t.commit, c.limit, c.git, o.models);
+    const p = await partsOf(root, t.repo, t.commit, c.limit, c.git, o.models, t.force ? { done: forcedDone(t.repo, t.commit) } : void 0);
     if (typeof p === "string") {
       skipped.push({ repo: t.repo, why: p });
       continue;
@@ -376,6 +403,12 @@ async function planEstate(root, op, o, c, state) {
     items.push({ ...base, ...p });
   }
   return { limit: c.limit, limitFrom: c.limitFrom, mode: c.mode, items, skipped };
+  function forcedDone(repo, commit) {
+    const r = state?.repos[repo];
+    if (!r?.force || !sameCommit(r.commit, commit))
+      return /* @__PURE__ */ new Set();
+    return new Set(Object.entries(r.parts).filter(([, p]) => p.state === "done").map(([n]) => Number(n)));
+  }
   function isDone(repo, commit) {
     const r = state?.repos[repo];
     return !!r?.done && r.kind === "gaps" && sameCommit(r.commit, commit);
@@ -387,7 +420,7 @@ function planLines(plan) {
   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"}:`);
+  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" : plan.mode === "copilot-acp" ? "read by GitHub Copilot through its Agent Client Protocol, unattended: one new session per part" : "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" || i.kind === "rules" && !i.parts.length)
@@ -427,6 +460,17 @@ async function snapOf(root, repo) {
   };
 }
 var sameSnap = (a, b) => a.facts === b.facts && a.reviewed === b.reviewed && a.verify === b.verify;
+async function writtenOf(root, repo) {
+  const dir = factsDirOf(root);
+  const facts = await readFile(join(dir, `${repo}.jsonl`), "utf8").catch(() => "");
+  const p = facts.trim() ? parseFacts(facts) : void 0;
+  const ids = (p?.ok ? p.facts : []).map((f) => {
+    const c = f.cite;
+    return `${f.id}|${c?.file ?? ""}:${c?.line ?? ""}`;
+  });
+  const reviewed = (await readFile(join(dir, `${repo}.reviewed.jsonl`), "utf8").catch(() => "")).split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+  return JSON.stringify([[...new Set(ids)].sort(), reviewed]);
+}
 async function factsAt(root, repo, commit) {
   const text = await readFile(join(factsDirOf(root), `${repo}.jsonl`), "utf8").catch(() => "");
   if (!text.trim())
@@ -447,7 +491,13 @@ async function settled(root, repo, commit, s, since) {
     return false;
   }
 }
-async function covered(root, item, part, first, now) {
+async function covered(root, item, part, first, now, unknown, wrote) {
+  const moved = now.facts !== first.facts || now.reviewed !== first.reviewed;
+  if (item.force) {
+    if (!(wrote ?? moved))
+      return false;
+    return item.total <= 1 || !!unknown && !leftOf(part, unknown).length;
+  }
   if (item.kind === "rules") {
     const plan = await loadReadPlan(root, item.repo);
     if (!plan?.topUp)
@@ -456,13 +506,26 @@ async function covered(root, item, part, first, now) {
   }
   if (item.total > 1) {
     const p = await readPlanProgress(root, item.repo);
-    return p?.parts.find((x) => x.part === part.part)?.state === "done";
+    const s = p?.parts.find((x) => x.part === part.part);
+    if (s?.state === "done")
+      return true;
+    return !!s && !!unknown && !partUnaccounted(s, unknown).length;
   }
-  const moved = now.facts !== first.facts || now.reviewed !== first.reviewed;
   if (item.kind === "read")
     return moved || now.reviewed !== void 0 || await factsAt(root, item.repo, item.commit) > 0;
   return moved;
 }
+var leftOf = (part, unknown) => partUnaccounted({ paths: part.paths, left: [] }, unknown);
+function unaccountedWords(left, shown = 5) {
+  return left.map((u) => {
+    if (!u.files.length)
+      return `${u.glob} (no fact cites a line of it yet)`;
+    const dir = u.glob.replace(/\/?\*\*?$/, "");
+    const rel = u.files.map((f) => u.glob.includes("*") && dir && f.startsWith(`${dir}/`) ? f.slice(dir.length + 1) : f);
+    const more = rel.length > shown ? `, and ${rel.length - shown} more` : "";
+    return `${u.glob} (${plural(u.files.length, "file")}: ${rel.slice(0, shown).join(", ")}${more})`;
+  }).join("; ");
+}
 var CapReached = class extends Error {
 };
 function capped(inner, o, spent) {
@@ -508,17 +571,26 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   const limit = lim.limit;
   const allowed = modelModeAllowed(op);
-  const mode = o.mode ?? (allowed ? "model" : "copilot");
+  const mode = o.mode ?? (copilotAcpByDefault(op) ? "copilot-acp" : allowed ? "model" : "copilot");
+  if (mode === "copilot-acp" && !copilotAcpAllowed(op) && !deps.acp) {
+    io.err("runtime.yaml doesn't allow copilot-acp here (schemaVersion 3, copilot-acp in modes.allowed and copilot in assistants.allowed): map the estate through Copilot Chat (atticus map --all without --mode copilot-acp), or ask for it in a pull request (ADR 0171).");
+    return 2;
+  }
+  const stateMode = mode === "model" ? "model" : "copilot";
   if (mode === "model" && !allowed && !deps.runtime) {
     io.err("runtime.yaml doesn't allow model mode with a provider here: map the estate through Copilot (atticus map --all without --mode model).");
     return 2;
   }
+  if (o.force && (o.gaps || o.stale)) {
+    io.err("--force reads the repos whole again; it doesn't go with --stale or --gaps.");
+    return 2;
+  }
   if (mode === "model" && o.gaps) {
     io.err("The gaps pass is a session for an assistant that opens files: run atticus map --all --gaps --mode hand-off and paste each line into Copilot Chat.");
     return 2;
   }
   let state = await readMapAllState(root);
-  if (state && (state.gaps !== !!o.gaps || state.mode !== mode))
+  if (state && (state.gaps !== !!o.gaps || state.mode !== stateMode))
     state = void 0;
   const plan = await planEstate(root, op, o, { limit: lim.limit, limitFrom: lim.from, mode, ...deps.git ? { git: deps.git } : {} }, state);
   if (typeof plan === "string") {
@@ -538,7 +610,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
   const st = state ?? {
     schemaVersion: 1,
     updatedAt: "",
-    mode,
+    mode: stateMode,
     gaps: !!o.gaps,
     repos: {}
   };
@@ -556,10 +628,17 @@ async function mapAllCommand(root, o, io, deps = {}) {
   const stopped = () => deps.signal?.aborted === true;
   const repoState = (item) => {
     const r = st.repos[item.repo];
-    if (r && sameCommit(r.commit, item.commit) && r.kind === item.kind)
+    if (r && sameCommit(r.commit, item.commit) && r.kind === item.kind && !!r.force === !!item.force)
       return r;
-    return st.repos[item.repo] = { commit: item.commit, kind: item.kind, parts: {} };
+    return st.repos[item.repo] = {
+      commit: item.commit,
+      kind: item.kind,
+      parts: {},
+      ...item.force ? { force: true } : {}
+    };
   };
+  const resumeAs = o.resumeAs ?? `atticus map --all${o.repos ? ` --repos ${o.repos.join(",")}` : ""}${o.stale ? " --stale" : ""}${o.gaps ? " --gaps" : ""}${o.force ? " --force" : ""}${o.models ? ` --models ${o.models}` : ""}${lim.from === "flag" ? ` --max-tokens ${limit}` : ""}${o.idleMinutes ? ` --idle ${o.idleMinutes}` : ""}`;
+  let idleStop = false;
   const partState = (item, part) => repoState(item).parts[String(part)] ??= { retries: 0 };
   const verifyStep = async (item) => {
     const c = captured();
@@ -580,6 +659,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
   };
   let quit = false;
   let capHit = false;
+  let signIn = false;
   let runtime;
   const items = plan.items;
   for (const [n, item] of items.entries()) {
@@ -619,6 +699,18 @@ async function mapAllCommand(root, o, io, deps = {}) {
       }
       continue;
     }
+    if (mode === "copilot-acp") {
+      for (const part of item.parts) {
+        if (quit || stopped() || capHit)
+          break;
+        const end = await acpPart(item, part, where);
+        if (end === "quit")
+          quit = true;
+        if (end === "cap")
+          capHit = true;
+      }
+      continue;
+    }
     for (const part of item.parts) {
       if (quit || stopped())
         break;
@@ -631,8 +723,10 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   const interrupted = quit || stopped() || capHit;
   if (interrupted) {
-    io.out("");
-    io.out(capHit ? `Stopped at the cap (${o.maxParts !== void 0 ? `--max-parts ${o.maxParts}` : ""}${o.maxParts !== void 0 && o.budgetTokens !== void 0 ? ", " : ""}${o.budgetTokens !== void 0 ? `--budget-tokens ${o.budgetTokens}` : ""}): ${plural(totals.spent.prompts, "prompt")} run. atticus map --all carries on from here.` : "Stopped. Where the estate stands is saved: atticus map --all carries on from here.");
+    if (!idleStop) {
+      io.out("");
+      io.out(capHit ? `Stopped at the cap (${o.maxParts !== void 0 ? `--max-parts ${o.maxParts}` : ""}${o.maxParts !== void 0 && o.budgetTokens !== void 0 ? ", " : ""}${o.budgetTokens !== void 0 ? `--budget-tokens ${o.budgetTokens}` : ""}): ${plural(totals.spent.prompts, mode === "copilot-acp" ? "session" : "prompt")} run. atticus map --all carries on from here.` : "Stopped. Where the estate stands is saved: atticus map --all carries on from here.");
+    }
   } else if (totals.parts || totals.repos.size) {
     io.out("");
     io.out("Joining the estate: atticus verify --all --write.");
@@ -655,13 +749,14 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   await save();
   await summary(interrupted);
-  return 0;
+  return signIn ? 1 : 0;
   async function copilotPart(item, part, where) {
     const ps = partState(item, part.part);
     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 named = item.total > 1 ? `part ${part.part} of ${item.total}` : "one session";
     const progress = item.total > 1 ? await readPlanProgress(root, item.repo) : void 0;
-    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}`;
+    const first0 = item.kind === "rules" ? await rulesLine(item) : item.kind === "gaps" ? await gapsLine(item) : item.force ? forceLine(item, part) : 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);
@@ -670,14 +765,14 @@ async function mapAllCommand(root, o, io, deps = {}) {
       return finishPart(item, part, ps);
     let line = first0;
     await block(item, part, label, where, line, ps.retries);
+    let base = item.force ? await writtenOf(root, item.repo) : "";
     let first = await snapOf(root, item.repo);
     let since = first;
     let prev = first;
     let lastChange = clock.now();
     let lastRemind = clock.now();
     const started = clock.now();
-    let stuckSaid = false;
-    const idleMs = (o.idleMinutes ?? IDLE_MINUTES) * 6e4;
+    const idleMinutes = o.idleMinutes ?? IDLE_MINUTES;
     for (; ; ) {
       if (stopped()) {
         ps.state = "incomplete";
@@ -701,30 +796,42 @@ async function mapAllCommand(root, o, io, deps = {}) {
         const again = await retry(item, part, label, where);
         if (again === "done")
           return finishPart(item, part, ps);
+        if (item.force)
+          base = await writtenOf(root, item.repo);
         first = await snapOf(root, item.repo);
         since = first;
         prev = first;
         lastChange = clock.now();
-        stuckSaid = false;
         continue;
       }
       const now = await snapOf(root, item.repo);
       if (!sameSnap(now, prev)) {
         lastChange = clock.now();
-        stuckSaid = false;
         prev = now;
       }
-      if (await settled(root, item.repo, item.commit, now, since) && await covered(root, item, part, first, now)) {
+      if (await settled(root, item.repo, item.commit, now, since)) {
+        const wrote = item.force ? await writtenOf(root, item.repo) !== base : void 0;
         const v = await verifyStep(item);
-        if (v && !v.rejected && await covered(root, item, part, first, await snapOf(root, item.repo)))
+        const after = await snapOf(root, item.repo);
+        if (v && !v.rejected && await covered(root, item, part, first, after, v.coverage.unknown, wrote))
           return finishPart(item, part, ps);
-        io.out(`Not done yet: ${v?.rejected ? `${plural(v.rejected, "fact")} rejected for the reader to fix` : "the part isn't accounted for in the facts yet"}. Still waiting (s + Enter skips, r + Enter gives the prompt again for what's left).`);
-        since = await snapOf(root, item.repo);
-        prev = since;
+        if (v?.rejected)
+          io.out(`Not done yet: ${plural(v.rejected, "fact")} rejected for the reader to fix. Still waiting (s + Enter skips, r + Enter gives the prompt again for what's left).`);
+        else if (v && item.total > 1 && item.kind !== "rules") {
+          const left = await leftNow(item, part, v.coverage.unknown);
+          io.out(left.length ? `Still not covered in ${item.repo} ${named}: ${unaccountedWords(left)}. ${item.force ? `r + Enter gives the line again (${line}); ` : `r + Enter gives a NEW chat only what is left of the part: these files, and any line verify lists as skipped under it (/atticus-map ${item.repo} --part ${part.part} --gaps); `}s + Enter skips the part; q + Enter stops.` : `Not done yet: nothing was written for ${item.repo} ${named} since its line was given. r + Enter gives the line again; s + Enter skips the part; q + Enter stops.`);
+        } else
+          io.out("Not done yet: the part isn't accounted for in the facts yet. Still waiting (s + Enter skips, r + Enter gives the prompt again for what's left).");
+        since = after;
+        prev = after;
+        lastRemind = clock.now();
       }
-      if (!stuckSaid && clock.now() - lastChange >= idleMs) {
-        io.out(`Copilot seems to have stopped on ${item.repo} ${item.total > 1 ? `part ${part.part}` : "(its one session)"}. r + Enter: verify what it wrote and give the prompt again for what's left, in a NEW chat; s: skip; q: stop.`);
-        stuckSaid = true;
+      if (clock.now() - lastChange >= idleMinutes * 6e4) {
+        io.out(`Stopped waiting on ${item.repo} ${label}: nothing was written for ${plural(idleMinutes, "minute")} (--idle ${idleMinutes}). Where the estate stands is saved: ${resumeAs} carries on from here (it verifies what was written and gives the line again for what's left).`);
+        ps.state = "incomplete";
+        idleStop = true;
+        await save();
+        return "quit";
       }
       if (clock.now() - lastRemind >= (deps.remindMs ?? REMIND_MS)) {
         io.out(`Still waiting on ${item.repo} ${label} (${Math.round((clock.now() - started) / 6e4)} minutes). The line to paste: ${line}  (s + Enter skips, r + Enter retries what's left, q + Enter stops)`);
@@ -735,7 +842,13 @@ async function mapAllCommand(root, o, io, deps = {}) {
     async function retry(item2, part2, label2, where2) {
       ps.retries++;
       await save();
-      const rest = item2.kind === "rules" ? await rulesLine(item2) : item2.kind === "gaps" ? await gapsLine(item2) : await restLine(item2, part2);
+      if (item2.force) {
+        const wrote = await writtenOf(root, item2.repo) !== base;
+        const v = existsSync(join(factsDirOf(root), `${item2.repo}.jsonl`)) ? await verifyStep(item2) : void 0;
+        if (v && !v.rejected && await covered(root, item2, part2, first, await snapOf(root, item2.repo), v.coverage.unknown, wrote))
+          return "done";
+      }
+      const rest = item2.kind === "rules" ? await rulesLine(item2) : item2.kind === "gaps" ? await gapsLine(item2) : item2.force ? forceLine(item2, part2) : await restLine(item2, part2);
       if (rest === "done" || rest === void 0 && item2.kind === "gaps")
         return "done";
       line = rest ?? `/atticus-map ${item2.repo}`;
@@ -747,10 +860,21 @@ async function mapAllCommand(root, o, io, deps = {}) {
       return "again";
     }
   }
+  async function leftNow(item, part, unknown) {
+    if (item.force)
+      return leftOf(part, unknown);
+    const s = (await readPlanProgress(root, item.repo))?.parts.find((x) => x.part === part.part);
+    return s ? partUnaccounted(s, unknown) : leftOf(part, unknown);
+  }
+  function forceLine(item, part) {
+    return `/atticus-map ${item.repo}${item.total > 1 ? ` --part ${part.part}` : ""}`;
+  }
   async function finishPart(item, part, ps) {
     ps.state = "done";
     if (item.kind === "gaps" || part.part === item.total)
       repoState(item).done = true;
+    if (item.force && Object.keys(repoState(item).parts).length >= item.total && Object.values(repoState(item).parts).every((p) => p.state === "done"))
+      await recordRulesNow(root, item.repo, item.commit);
     totals.parts++;
     totals.repos.add(item.repo);
     await save();
@@ -810,7 +934,9 @@ async function mapAllCommand(root, o, io, deps = {}) {
     io.out("");
     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.kind === "rules")
+    if (item.force)
+      io.out(`${item.total > 1 ? `That chat reads part ${part.part} whole again: ${part.paths.join(", ")} (about ${tokensText(part.tokens)} tokens). ` : ""}The facts on file stay, as already kept: the chat names one by its id and doesn't write it again (one whose line changed it rewrites under the same id).`);
+    else 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.`);
@@ -820,6 +946,83 @@ async function mapAllCommand(root, o, io, deps = {}) {
     io.out(copied ? "The line is on your clipboard." : "Copy the line above (no clipboard tool here).");
     io.out("Waiting for the facts it writes. s + Enter skips this part, r + Enter verifies what is there and gives the line again for what's left, q + Enter (or Ctrl+C) stops; atticus map --all carries on.");
   }
+  function overCap() {
+    return o.maxParts !== void 0 && totals.spent.prompts >= o.maxParts || o.budgetTokens !== void 0 && totals.spent.tokens >= o.budgetTokens;
+  }
+  async function acpPart(item, part, where) {
+    const ps = partState(item, part.part);
+    const label = item.total > 1 ? `part ${part.part} of ${item.total}` : "one session";
+    const progress = item.total > 1 ? await readPlanProgress(root, item.repo) : void 0;
+    const first0 = item.kind === "rules" ? await rulesLine(item) : item.kind === "gaps" ? await gapsLine(item) : item.force ? forceLine(item, part) : 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);
+    }
+    if (first0 === "done")
+      return finishPart(item, part, ps);
+    let line = first0;
+    const runner = deps.acp ?? await deps.makeAcp?.();
+    if (!runner) {
+      io.err("No Copilot session runner: copilot-acp needs runtime.yaml's copilotAcp.");
+      return "quit";
+    }
+    for (let attempt = 0; attempt < 2; attempt++) {
+      if (stopped())
+        break;
+      if (overCap())
+        return "cap";
+      io.out("");
+      io.out(`===== ${item.repo}, ${item.kind === "gaps" ? "the gaps pass" : item.kind === "rules" ? "the rules top-up" : label} (${where})${attempt ? ", given again in a new session" : ""} =====`);
+      io.out(`In a NEW Copilot session (copilot-acp): ${line}`);
+      const base = item.force ? await writtenOf(root, item.repo) : "";
+      const first = await snapOf(root, item.repo);
+      totals.spent.prompts++;
+      try {
+        const r = await runner({
+          line,
+          change: `map-${item.repo}`,
+          writeRoots: readWrites(root),
+          ...deps.signal ? { signal: deps.signal } : {},
+          onProgress: io.out
+        });
+        totals.spent.tokens += r.usage ? r.usage.inputTokens + r.usage.outputTokens : part.tokens;
+        io.out(`The session ended (${r.stopped ?? r.stopReason}).`);
+      } catch (e) {
+        if (e instanceof AcpSignInError) {
+          io.err(e.message);
+          signIn = true;
+          ps.state = "incomplete";
+          await save();
+          return "quit";
+        }
+        totals.spent.tokens += part.tokens;
+        io.out(`${item.repo} ${label}: the Copilot session failed: ${firstLine(e)}`);
+      }
+      if (stopped())
+        break;
+      const wrote = item.force ? await writtenOf(root, item.repo) !== base : void 0;
+      const v = existsSync(join(factsDirOf(root), `${item.repo}.jsonl`)) ? await verifyStep(item) : void 0;
+      const after = await snapOf(root, item.repo);
+      if (v && !v.rejected && await covered(root, item, part, first, after, v.coverage.unknown, wrote))
+        return finishPart(item, part, ps);
+      if (attempt > 0)
+        break;
+      ps.retries++;
+      await save();
+      const rest = item.kind === "rules" ? await rulesLine(item) : item.kind === "gaps" ? await gapsLine(item) : item.force ? forceLine(item, part) : await restLine(item, part);
+      if (rest === "done" || rest === void 0 && item.kind === "gaps")
+        return finishPart(item, part, ps);
+      line = rest ?? `/atticus-map ${item.repo}`;
+      io.out(`${item.repo} ${label} isn't accounted for yet${v?.rejected ? ` (${plural(v.rejected, "fact")} rejected)` : ""}: one more try in a NEW session with only what is left (${line}).`);
+    }
+    ps.state = "incomplete";
+    await save();
+    if (stopped())
+      return "quit";
+    io.out(`${item.repo} ${label}: still not accounted for after a second session; moving on. atticus map --all carries on from here.`);
+    totals.ends.push(endOf(item, part, "incomplete"));
+    return "incomplete";
+  }
   async function modelRead(item, where, rt) {
     io.out("");
     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")} =====`);
@@ -835,7 +1038,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
           maxTokens: limit,
           ...o.models ? { models: o.models } : {},
           ...item.kind === "rules" ? { rules: true } : {},
-          ...resume ? { next: true } : before && !before.done ? { force: true } : {}
+          ...resume && !(item.force && attempt === 1) ? { next: true } : item.force && attempt === 1 || before && !before.done ? { force: true } : {}
         }, io, { runtime: rt, ...deps.git ? { git: deps.git } : {} });
       } catch (e) {
         if (e instanceof CapReached) {
@@ -873,7 +1076,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
       repo: item.repo,
       ...item.total > 1 ? { part: part.part, total: item.total } : {},
       end,
-      command: `atticus map --all --repos ${item.repo}${o.gaps ? " --gaps" : ""} (or /atticus-map ${item.repo}${o.gaps ? " --gaps" : ""} in a new chat)`
+      command: `atticus map --all --repos ${item.repo}${o.gaps ? " --gaps" : ""}${item.force ? " --force" : ""} (or /atticus-map ${item.repo}${o.gaps ? " --gaps" : item.force && item.total > 1 ? ` --part ${part.part}` : ""} in a new chat)`
     };
   }
   async function summary(interrupted2) {
@@ -889,7 +1092,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
     const open = (await listQuestions(root, { state: "open" }).catch(() => ({ questions: [] }))).questions.length;
     const rejected = [...totals.rejected.values()].reduce((n, x) => n + x, 0);
     io.out("");
-    io.out(`${interrupted2 ? "So far" : "Done"}: ${plural(totals.repos.size, "repo")} read, ${plural(totals.parts, "part")}${mode === "model" ? ` (${plural(totals.spent.prompts, "prompt")})` : ""}; ${plural(rejected, "fact")} rejected; links +${totals.added} -${totals.removed}; ${plural(open, "question")} open.`);
+    io.out(`${interrupted2 ? "So far" : "Done"}: ${plural(totals.repos.size, "repo")} read, ${plural(totals.parts, "part")}${mode === "model" ? ` (${plural(totals.spent.prompts, "prompt")})` : mode === "copilot-acp" ? ` (${plural(totals.spent.prompts, "session")})` : ""}; ${plural(rejected, "fact")} rejected; links +${totals.added} -${totals.removed}; ${plural(open, "question")} open.`);
     const left = totals.ends.filter((e) => e.end !== "done");
     if (left.length) {
       io.out("Not finished:");
@@ -903,7 +1106,9 @@ export {
   MAP_ALL_STATE_REL,
   limitFor,
   mapAllCommand,
+  mapReader,
   modelModeAllowed,
   planEstate,
-  readMapAllState
+  readMapAllState,
+  unaccountedWords
 };

package/dist/{chunk-J3DTLYER.js → chunk-CFYAQTDM.js}

@@ -6,21 +6,21 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   buildDigest,
   digestCommand
-} from "./chunk-N7HG4UP7.js";
-import "./chunk-KPHPVOME.js";
-import "./chunk-G5SKNMPC.js";
-import "./chunk-JQG4VO47.js";
-import "./chunk-DW4BM73R.js";
-import "./chunk-DBZNQAMN.js";
-import "./chunk-QR65C3DV.js";
-import "./chunk-7VAMO66T.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";
+} from "./chunk-VCN6THJZ.js";
+import "./chunk-OE3ECGHN.js";
+import "./chunk-NRJC7XTD.js";
+import "./chunk-7HX7LQ66.js";
+import "./chunk-UQRUMRB2.js";
+import "./chunk-THOVQFPT.js";
+import "./chunk-J422SCUS.js";
+import "./chunk-N35OSYIU.js";
+import "./chunk-WPHKKINR.js";
+import "./chunk-S56NJ5LE.js";
+import "./chunk-4HAYYEFB.js";
+import "./chunk-LRO3Y2XQ.js";
+import "./chunk-WJK5WJLA.js";
+import "./chunk-K4J4Z37A.js";
+import "./chunk-BH5DMXG5.js";
 import "./chunk-MMB2OHUY.js";
 import "./chunk-TV45EUGM.js";
 export {