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

package/dist/{chunk-LZABEKI6.js → chunk-BH5DMXG5.js}

@@ -30511,10 +30511,34 @@ var ASSISTANTS = [
 var AssistantId = external_exports.enum(ASSISTANTS);
 var STEP_CLASSES = ["read", "draft", "critic", "knowledge", "quick"];
 var StepClass = external_exports.enum(STEP_CLASSES);
-var RUNTIME_SCHEMA_VERSION = 2;
+var RUNTIME_SCHEMA_VERSION = 3;
+var ConfiguredMode = external_exports.enum(["hand-off", "model", "headless-claude-code", "copilot-acp"]);
+var CopilotAcpSettings = external_exports.strictObject({
+  command: external_exports.string().trim().min(1).optional(),
+  model: StepModelId().optional(),
+  maxTurns: external_exports.number().int().positive().max(5e3).optional(),
+  timeoutMs: external_exports.number().int().min(1e4).max(24 * 60 * 6e4).optional()
+});
+function StepModelId() {
+  return external_exports.string().min(1).regex(/^\S+$/, "a model id, without spaces");
+}
+var COPILOT_ACP_DEFAULTS = {
+  command: "npx --yes @github/copilot-language-server",
+  maxTurns: 200,
+  timeoutMs: 30 * 6e4
+};
+function copilotAcpOf(runtime) {
+  const c = runtime?.copilotAcp ?? {};
+  return {
+    command: c.command ?? COPILOT_ACP_DEFAULTS.command,
+    ...c.model ? { model: c.model } : {},
+    maxTurns: c.maxTurns ?? COPILOT_ACP_DEFAULTS.maxTurns,
+    timeoutMs: c.timeoutMs ?? COPILOT_ACP_DEFAULTS.timeoutMs
+  };
+}
 var StepModel = external_exports.string().min(1).regex(/^\S+$/, "a model name or vendor/family, without spaces");
 var RuntimeFields = external_exports.strictObject({
-  schemaVersion: external_exports.union([V2, external_exports.literal(RUNTIME_SCHEMA_VERSION)]),
+  schemaVersion: external_exports.union([V2, external_exports.literal(2), external_exports.literal(RUNTIME_SCHEMA_VERSION)]),
   assistants: external_exports.strictObject({
     allowed: external_exports.array(AssistantId).min(1),
     default: AssistantId
@@ -30526,10 +30550,13 @@ var RuntimeFields = external_exports.strictObject({
    * don't hold a gate, AI buttons become guidance, and people write what agents would draft.
    */
   ai: external_exports.enum(["on", "text-only", "off"]).default("on"),
-  /** How AI steps run: hand-off to the assistant, a direct model call, or headless Claude Code. */
+  /**
+   * How AI steps run: hand-off to the assistant, a direct model call, headless Claude Code, or
+   * (version 3, ADR 0171) Copilot driven unattended through its Agent Client Protocol.
+   */
   modes: external_exports.strictObject({
-    allowed: external_exports.array(external_exports.enum(["hand-off", "model", "headless-claude-code"])).min(1),
-    default: external_exports.enum(["hand-off", "model", "headless-claude-code"])
+    allowed: external_exports.array(ConfiguredMode).min(1),
+    default: ConfiguredMode
   }).refine((m) => m.allowed.includes(m.default), "the default mode must be allowed").default({ allowed: ["hand-off"], default: "hand-off" }),
   models: external_exports.strictObject({
     allowed: external_exports.array(external_exports.string().min(1)).default([]),
@@ -30569,6 +30596,8 @@ var RuntimeFields = external_exports.strictObject({
    * the section and one with an empty section get the same defaults.
    */
   retrieval: RetrievalSettings.optional(),
+  /** Version 3 (ADR 0171): how copilot-acp starts the Copilot language server. */
+  copilotAcp: CopilotAcpSettings.optional(),
   /** Atticus sends no telemetry unless an organisation turns it on here. */
   telemetry: external_exports.strictObject({ enabled: external_exports.boolean().default(false) }).default({ enabled: false }),
   adapters: external_exports.strictObject({
@@ -30601,6 +30630,20 @@ var RuntimeFields = external_exports.strictObject({
   }).optional()
 });
 var Runtime = RuntimeFields.superRefine((r, ctx) => {
+  if (r.schemaVersion < 3) {
+    if ([...r.modes.allowed, r.modes.default].includes("copilot-acp"))
+      ctx.addIssue({
+        code: "custom",
+        path: ["modes"],
+        message: "copilot-acp needs schemaVersion 3 (ADR 0171): run atticus upgrade"
+      });
+    if (r.copilotAcp !== void 0)
+      ctx.addIssue({
+        code: "custom",
+        path: ["copilotAcp"],
+        message: "copilotAcp needs schemaVersion 3 (ADR 0171): run atticus upgrade"
+      });
+  }
   if (r.schemaVersion !== 1)
     return;
   for (const c of STEP_CLASSES)
@@ -31793,8 +31836,12 @@ function placeholderIn(s) {
   if (env)
     return { name: env[1], before: "", after: "" };
   const i = t.indexOf("${");
-  if (i < 0)
-    return void 0;
+  if (i < 0) {
+    const at3 = /@([A-Za-z_][A-Za-z0-9_.-]*)@/.exec(t);
+    if (!at3)
+      return void 0;
+    return { name: at3[1], before: t.slice(0, at3.index), after: t.slice(at3.index + at3[0].length) };
+  }
   let depth = 0;
   let j = i + 2;
   for (; j < t.length; j++) {
@@ -37423,7 +37470,14 @@ var EstateJoins = external_exports.strictObject({
 
 // packages/core/dist/schema/ai.js
 var AI_SCHEMA_VERSION = 1;
-var RuntimeKind = external_exports.enum(["hand-off", "model", "headless-claude-code", "mock", "replay"]);
+var RuntimeKind = external_exports.enum([
+  "hand-off",
+  "model",
+  "headless-claude-code",
+  "copilot-acp",
+  "mock",
+  "replay"
+]);
 var AgentInput = external_exports.union([
   ChangeArtifact,
   external_exports.enum([
@@ -37507,7 +37561,12 @@ var RunState = external_exports.enum([
   "failed",
   "cancelled"
 ]);
-var RUN_SCHEMA_VERSION = 4;
+var RUN_SCHEMA_VERSION = 5;
+var RunAssistant = external_exports.strictObject({
+  name: external_exports.string().min(1),
+  version: external_exports.string().min(1).optional(),
+  protocolVersion: external_exports.number().int().min(0).optional()
+});
 var RunRetrieval = external_exports.strictObject({
   expansion: external_exports.strictObject({
     run: external_exports.string().min(1).optional(),
@@ -37586,13 +37645,15 @@ var RunSummary = external_exports.strictObject({
    * Claude Code was given, or the editor's model a hand-off was answered with (`atticus handoff
    * done --model`). Left out when nothing said which.
    */
-  model: external_exports.string().min(1).optional()
+  model: external_exports.string().min(1).optional(),
+  /** The assistant program it talked to (version 5, ADR 0171), when the runtime drives one. */
+  assistant: RunAssistant.optional()
 });
 function migrateRunSummary(raw) {
   if (typeof raw !== "object" || raw === null)
     return raw;
   const r = raw;
-  return r.schemaVersion === 1 || r.schemaVersion === 2 || r.schemaVersion === 3 ? { ...r, schemaVersion: RUN_SCHEMA_VERSION } : raw;
+  return r.schemaVersion === 1 || r.schemaVersion === 2 || r.schemaVersion === 3 || r.schemaVersion === 4 ? { ...r, schemaVersion: RUN_SCHEMA_VERSION } : raw;
 }
 var readRunSummary = (raw) => RunSummary.safeParse(migrateRunSummary(raw));
 var Recording = external_exports.strictObject({
@@ -42712,6 +42773,13 @@ function stripMeta(s) {
 import { createHash as createHash5 } from "node:crypto";
 var DECLARED_TOPIC = "declared-topic";
 var short = (s, n = 6) => createHash5("sha256").update(s).digest("hex").slice(0, n);
+var MAX_RECORD_ID = 120;
+var fitRecordId = (id) => {
+  if (id.length <= MAX_RECORD_ID)
+    return id;
+  const hash2 = createHash5("sha256").update(id, "utf8").digest("hex").slice(0, 16);
+  return `${id.slice(0, MAX_RECORD_ID - hash2.length - 1).replace(/[-._]+$/, "")}.${hash2}`;
+};
 var evKey = (e) => `${e.repo ?? ""}|${e.path ?? ""}|${e.line ?? ""}|${e.side ?? ""}|${e.source}`;
 function unionEvidence(...lists) {
   const seen = /* @__PURE__ */ new Map();
@@ -43264,6 +43332,32 @@ function mergeCatalog(input2) {
       out.push(l);
       inOut.add(l);
     }
+  const long = /* @__PURE__ */ new Map();
+  for (const r of out)
+    if (r.id.length > MAX_RECORD_ID)
+      long.set(r.id, fitRecordId(r.id));
+  if (long.size) {
+    const swap = (v) => {
+      if (typeof v === "string") {
+        const exact = long.get(v);
+        if (exact)
+          return exact;
+        if (v.length > MAX_RECORD_ID) {
+          for (const [from, to] of long)
+            if (v.startsWith(`${from}.`))
+              return fitRecordId(to + v.slice(from.length));
+        }
+        return v;
+      }
+      if (Array.isArray(v))
+        return v.map(swap);
+      if (v && typeof v === "object")
+        return Object.fromEntries(Object.entries(v).map(([k, x]) => [k, swap(x)]));
+      return v;
+    };
+    for (let i = 0; i < out.length; i++)
+      out[i] = swap(out[i]);
+  }
   const invalid = [];
   const records = [];
   const seen = /* @__PURE__ */ new Set();
@@ -43716,10 +43810,31 @@ function migrateRuntimeText(text5) {
   const line = /^schemaVersion:[ \t]*1[ \t]*(#.*)?$/m;
   if (line.test(text5))
     return {
-      text: text5.replace(line, (_m, c) => `schemaVersion: ${RUNTIME_SCHEMA_VERSION}${c ? ` ${c}` : ""}`),
+      text: text5.replace(line, (_m, c) => `schemaVersion: 2${c ? ` ${c}` : ""}`),
+      changed: true
+    };
+  doc.set("schemaVersion", 2);
+  return { text: doc.toString(), changed: true };
+}
+function namesCopilotAcp(doc) {
+  const js = doc.toJS() ?? {};
+  const allowed = Array.isArray(js.modes?.allowed) ? js.modes.allowed : [];
+  return js.copilotAcp !== void 0 || allowed.includes("copilot-acp") || js.modes?.default === "copilot-acp";
+}
+function migrateRuntimeV3Text(text5) {
+  const doc = (0, import_yaml13.parseDocument)(text5);
+  if (doc.errors.length || !(0, import_yaml13.isMap)(doc.contents))
+    return { text: text5, changed: false };
+  const v = doc.get("schemaVersion");
+  if (v !== 1 && v !== 2 || !namesCopilotAcp(doc))
+    return { text: text5, changed: false };
+  const line = /^schemaVersion:[ \t]*[12][ \t]*(#.*)?$/m;
+  if (line.test(text5))
+    return {
+      text: text5.replace(line, (_m, c) => `schemaVersion: 3${c ? ` ${c}` : ""}`),
       changed: true
     };
-  doc.set("schemaVersion", RUNTIME_SCHEMA_VERSION);
+  doc.set("schemaVersion", 3);
   return { text: doc.toString(), changed: true };
 }
 
@@ -45927,6 +46042,9 @@ export {
   STEP_CLASSES,
   StepClass,
   RUNTIME_SCHEMA_VERSION,
+  CopilotAcpSettings,
+  COPILOT_ACP_DEFAULTS,
+  copilotAcpOf,
   Runtime,
   stepModelsOf,
   SkillMeta,
@@ -46280,6 +46398,7 @@ export {
   ContextPackManifest,
   RunState,
   RUN_SCHEMA_VERSION,
+  RunAssistant,
   RunRetrieval,
   ToolDefinition,
   ToolCallRecord,
@@ -46324,6 +46443,7 @@ export {
   openApiDocument,
   api_exports,
   DECLARED_TOPIC,
+  fitRecordId,
   endpointId,
   mergeCatalog,
   MESH_KEY,
@@ -46335,6 +46455,7 @@ export {
   migrateChangeTypesText,
   migrateSourcesText,
   migrateRuntimeText,
+  migrateRuntimeV3Text,
   migrateRolesText,
   mapAtOnce,
   readParsedFiles,

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

@@ -3,30 +3,35 @@ 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-S4EGGQZB.js";
+} from "./chunk-EJJONXPS.js";
 import {
   factsRepos,
   verifyCommand
-} from "./chunk-TDKSKJU3.js";
+} from "./chunk-5WBRQSLJ.js";
 import {
   plannedTopUp,
   recordRulesNow,
   ruleSetsOfFiles
-} from "./chunk-ZJDOYEW4.js";
-import "./chunk-KLROTB6N.js";
-import "./chunk-GGBEM27J.js";
+} from "./chunk-OKXRQPQF.js";
+import "./chunk-L2EHYZCH.js";
+import "./chunk-GAK5KDYV.js";
 import {
   estateFreshness
-} from "./chunk-M2U3IZ54.js";
+} from "./chunk-3JOHZDKD.js";
 import {
   onboardingQueue
-} from "./chunk-UGMJ3Z35.js";
-import "./chunk-IPB6EKUH.js";
-import "./chunk-HFMLZFY4.js";
-import "./chunk-LNPS5GQ3.js";
+} from "./chunk-IF6UROTX.js";
+import "./chunk-FMGMRFEH.js";
+import "./chunk-ZQHFZ6WO.js";
+import "./chunk-YECVNCO4.js";
 import {
   checkoutOf,
   conventionsAt,
@@ -35,11 +40,11 @@ import {
   loadReadPlan,
   partUnaccounted,
   readPlanProgress
-} from "./chunk-WMCKOZFT.js";
-import "./chunk-PPCCFZG7.js";
-import "./chunk-2UPMPTNJ.js";
-import "./chunk-C43X7Y7O.js";
-import "./chunk-PURVXI7L.js";
+} from "./chunk-6TY7S6Y6.js";
+import "./chunk-QQIZGLRA.js";
+import "./chunk-5GQHLNZB.js";
+import "./chunk-3ODHCYOG.js";
+import "./chunk-KEOTTRK2.js";
 import {
   isMetarepo,
   notMetarepo
@@ -49,28 +54,29 @@ import {
   assistantTier,
   readProbes,
   rulesLacking
-} from "./chunk-R2A6DAPC.js";
+} from "./chunk-S32NYQZZ.js";
 import "./chunk-VOGCSYOI.js";
 import {
   estateRepos,
   productionRepos
-} from "./chunk-E53MN24E.js";
-import "./chunk-ZUCJCBS5.js";
+} from "./chunk-THOVQFPT.js";
+import "./chunk-J422SCUS.js";
 import {
   dirSource,
   sameCommit,
   sessionTokensFor
-} from "./chunk-DLSPFAC5.js";
-import "./chunk-ZS2EZYOR.js";
-import "./chunk-KDKLT22F.js";
-import "./chunk-UA4DLNV7.js";
-import "./chunk-OV3WHHRI.js";
-import "./chunk-AQPK22BH.js";
-import "./chunk-5WJCV6ED.js";
-import "./chunk-FT2E2DHW.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-E52MNV5B.js";
+} from "./chunk-K4J4Z37A.js";
 import {
   factsDirOf,
   factsRelOf,
@@ -80,7 +86,7 @@ import {
   orgPackDirOf,
   parseFacts,
   require_dist
-} from "./chunk-LZABEKI6.js";
+} from "./chunk-BH5DMXG5.js";
 import {
   ensureLocalIgnore,
   writeFileAtomic
@@ -414,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)
@@ -565,7 +571,12 @@ 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;
@@ -579,7 +590,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
     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") {
@@ -599,7 +610,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
   const st = state ?? {
     schemaVersion: 1,
     updatedAt: "",
-    mode,
+    mode: stateMode,
     gaps: !!o.gaps,
     repos: {}
   };
@@ -648,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()) {
@@ -687,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;
@@ -701,7 +725,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
   if (interrupted) {
     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, "prompt")} run. atticus map --all carries on from here.` : "Stopped. Where the estate stands is saved: atticus map --all carries on from here.");
+      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("");
@@ -725,7 +749,7 @@ 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;
@@ -922,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")} =====`);
@@ -991,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:");

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

@@ -6,21 +6,21 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   buildDigest,
   digestCommand
-} from "./chunk-VZM535M5.js";
-import "./chunk-JTI3FKGI.js";
-import "./chunk-PI6KNUBW.js";
-import "./chunk-24ARIOB7.js";
-import "./chunk-4Q6HX5GQ.js";
-import "./chunk-E53MN24E.js";
-import "./chunk-ZUCJCBS5.js";
-import "./chunk-DLSPFAC5.js";
-import "./chunk-ZS2EZYOR.js";
-import "./chunk-KDKLT22F.js";
-import "./chunk-UA4DLNV7.js";
-import "./chunk-5WJCV6ED.js";
-import "./chunk-FT2E2DHW.js";
-import "./chunk-E52MNV5B.js";
-import "./chunk-LZABEKI6.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 {

package/dist/{chunk-J6FWM4VI.js → chunk-CK5Z3RIN.js}

@@ -9,7 +9,7 @@ import {
   matrixMarkdown,
   traceMatrix,
   writeTraceFindings
-} from "./chunk-CAH7L2QH.js";
+} from "./chunk-2JQ2SCX7.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
@@ -18,14 +18,14 @@ import {
   readDataChanges,
   readHops,
   reviewedGates
-} from "./chunk-JTI3FKGI.js";
+} from "./chunk-OE3ECGHN.js";
 import {
   assess,
   changeFolder,
   changeStore,
   checkFindings,
   loadChangeContext
-} from "./chunk-PI6KNUBW.js";
+} from "./chunk-NRJC7XTD.js";
 import {
   GlossaryError,
   aliasDecision,
@@ -37,28 +37,28 @@ import {
   resolveTermId,
   scanGlossary,
   writeDecisions
-} from "./chunk-E53MN24E.js";
+} from "./chunk-THOVQFPT.js";
 import {
   BUILT_IN_EXTRACTORS,
   SHIPPED_DIALECTS_DIR,
   dialectExtractor,
   loadShippedDialects,
   runDialectTests
-} from "./chunk-UA4DLNV7.js";
+} from "./chunk-4HAYYEFB.js";
 import {
   baseClonePath,
   checkoutState,
   createGit,
   readChangeRepos
-} from "./chunk-5WJCV6ED.js";
+} from "./chunk-LRO3Y2XQ.js";
 import {
   DEFAULT_IGNORES,
   fsRepo,
   scanRepo
-} from "./chunk-FT2E2DHW.js";
+} from "./chunk-WJK5WJLA.js";
 import {
   runtimeForCli
-} from "./chunk-E52MNV5B.js";
+} from "./chunk-K4J4Z37A.js";
 import {
   catalogDirOf,
   external_exports,
@@ -67,7 +67,7 @@ import {
   normalizePath,
   orgPackDirOf,
   require_dist
-} from "./chunk-LZABEKI6.js";
+} from "./chunk-BH5DMXG5.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";