@maycombhq/atticus 2.0.0-beta.25 → 2.0.0-beta.27

package/dist/{chunk-IMTAHDME.js → chunk-IX2EOYOU.js}

@@ -9,10 +9,7 @@ import {
   matrixMarkdown,
   traceMatrix,
   writeTraceFindings
-} from "./chunk-SEBBJQWK.js";
-import {
-  table
-} from "./chunk-VOGCSYOI.js";
+} from "./chunk-YAPMGK7E.js";
 import {
   DriftError,
   SNIPPET_KINDS,
@@ -23,7 +20,10 @@ import {
   driftMarkdown,
   pipelineSnippet,
   repoDrift
-} from "./chunk-JWLABUXL.js";
+} from "./chunk-62LD7CSY.js";
+import {
+  table
+} from "./chunk-VOGCSYOI.js";
 import {
   GlossaryError,
   aliasDecision,
@@ -34,13 +34,13 @@ import {
   resolveTermId,
   scanGlossary,
   writeDecisions
-} from "./chunk-YRKAJ42V.js";
-import {
-  runtimeForCli
-} from "./chunk-QQD25YNF.js";
+} from "./chunk-QC6GSNIK.js";
 import {
   createGit
-} from "./chunk-WS7KBKP4.js";
+} from "./chunk-X5B7KYPD.js";
+import {
+  runtimeForCli
+} from "./chunk-2MRYL45Z.js";
 
 // packages/cli/dist/quality-commands.js
 import { appendFile, mkdir, writeFile } from "node:fs/promises";
@@ -262,13 +262,42 @@ async function glossaryList(root, o, io) {
   io.out(`${plural(g.terms.length, "term")}, ${plural(g.build.conflicts.filter((c) => !c.resolved).length, "conflict")}.`);
   return 0;
 }
+async function glossaryBuild(root, command, io) {
+  const { acquireLock, LockHeldError } = await import("./chunk-PPKH6ULR.js");
+  const { buildAndWrite } = await import("./chunk-MPNTEWNY.js");
+  let lock;
+  try {
+    lock = await acquireLock(root, "scan", command);
+  } catch (e) {
+    if (e instanceof LockHeldError) {
+      io.err(e.message);
+      return 1;
+    }
+    throw e;
+  }
+  try {
+    const r = await buildAndWrite(root, { command: "atticus catalog build" });
+    if (r.guard.refused) {
+      for (const l of r.guard.refused.message.split("\n"))
+        io.err(l);
+      return 1;
+    }
+    return 0;
+  } finally {
+    await lock.release();
+  }
+}
 async function glossaryScan(root, o, io, deps = {}) {
   try {
     const runtime = await runtimeOf(root, o.mode, deps);
     const r = await scanGlossary(root, {
       ...runtime ? { runtime } : {},
-      ...deps.now ? { now: deps.now() } : {}
+      ...deps.now ? { now: deps.now() } : {},
+      writeTerms: false
     });
+    const built = await glossaryBuild(root, "atticus glossary scan", io);
+    if (built !== 0)
+      return built;
     if (o.json) {
       for (const p of r.problems)
         io.err(p);
@@ -305,7 +334,13 @@ function printGlossaryScan(r, io) {
 }
 async function completeGlossaryScan(root, run, io, deps = {}) {
   try {
-    const r = await completeGlossaryDefinitions(root, run, deps.now ? { now: deps.now } : {});
+    const r = await completeGlossaryDefinitions(root, run, {
+      ...deps.now ? { now: deps.now } : {},
+      writeTerms: false
+    });
+    const built = await glossaryBuild(root, "atticus glossary scan", io);
+    if (built !== 0)
+      return built;
     printGlossaryScan(r, io);
     return 0;
   } catch (e) {
@@ -317,7 +352,9 @@ async function decide(root, io, make, said) {
     const g = await loadGlossary(root);
     const ds = make(g);
     const files = await writeDecisions(join(g.catalogDir, "curated"), ds);
-    await scanGlossary(root);
+    const built = await glossaryBuild(root, "atticus catalog build", io);
+    if (built !== 0)
+      return built;
     io.out(`Wrote ${files.map((f) => `catalog/curated/${f}`).join(" and ")}: ${said}. Commit it so every scan keeps it.`);
     return 0;
   } catch (e) {

package/dist/{chunk-QE444DZ2.js → chunk-IXNMGPF7.js}

@@ -3,30 +3,30 @@ 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 {
+  houseUntaughtLines,
+  houseUntaughtOf
+} from "./chunk-CLM5Z3R5.js";
 import {
   noCheckoutLine
 } from "./chunk-EHXDB3SA.js";
 import {
   componentTypeIds,
   componentTypesAt
-} from "./chunk-USH4VU5D.js";
+} from "./chunk-OUGTAOGA.js";
 import {
   modelsData,
   modelsLine,
   reachHeadOf,
   reachPlanOf,
   readPathsOf
-} from "./chunk-CNF7D3A7.js";
-import {
-  houseUntaughtLines,
-  houseUntaughtOf
-} from "./chunk-HHZEXF7V.js";
+} from "./chunk-YAPVAYZN.js";
 import {
   effectiveRules,
   notesAt,
   readingRulesText,
   ruleIds
-} from "./chunk-5WZV37WS.js";
+} from "./chunk-FKAUBC4Y.js";
 import {
   loadReadPlan,
   modelsModeOf,
@@ -36,7 +36,7 @@ import {
   recordNotReached,
   saveReadPlan,
   writeReadPlan
-} from "./chunk-DBVQEPZB.js";
+} from "./chunk-VVLWEM2Y.js";
 import {
   carryOf,
   checkoutOf,
@@ -50,7 +50,7 @@ import {
   reviewedProblemsOf,
   slipNoteLines,
   writeVerifyFiles
-} from "./chunk-XP5DF5MC.js";
+} from "./chunk-QPAANKUR.js";
 import {
   ABOUT_RULE,
   MODELS_RULE,
@@ -62,7 +62,7 @@ import {
   taughtFrameworksText,
   tierSource,
   tierWords
-} from "./chunk-H7GAPNGQ.js";
+} from "./chunk-G33UIUG3.js";
 import {
   FILE_KINDS,
   SHOWN_PROPOSALS,
@@ -85,7 +85,10 @@ import {
   sliceText,
   staleMessage,
   verifyFacts
-} from "./chunk-CGVRLQAY.js";
+} from "./chunk-YIGSUTW2.js";
+import {
+  loadRepos
+} from "./chunk-X5B7KYPD.js";
 import {
   DATA_RULE,
   HandoffRuntime,
@@ -97,10 +100,7 @@ import {
   promptBudget,
   quarantineReason,
   wrapData
-} from "./chunk-QQD25YNF.js";
-import {
-  loadRepos
-} from "./chunk-WS7KBKP4.js";
+} from "./chunk-2MRYL45Z.js";
 import {
   Fact,
   citedFiles,
@@ -118,17 +118,17 @@ import {
   runsDirOf,
   saysNotProduct,
   stackHelpersOff
-} from "./chunk-GLISHJ4G.js";
+} from "./chunk-WJWSB65O.js";
 import {
   writeFileAtomic
-} from "./chunk-G3ZFEHCX.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   AgentDefinition,
   REPO_DESCRIPTION_MAX,
   componentTypesText,
   conventionsOf,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 
 // packages/cli/dist/map-commands.js
 import { existsSync } from "node:fs";
@@ -601,11 +601,35 @@ function limitOf(o, op, tier) {
   const given = o.maxTokens ?? currentPromptLimit();
   if (given !== void 0)
     return { limit: given, from: "flag" };
+  return knownLimitOf(op, tier);
+}
+function knownLimitOf(op, tier) {
   if (tier?.maxTokensFrom === "probe" && tier.maxTokens !== void 0)
     return { limit: tier.maxTokens, from: "probe" };
   const maxInput = op.runtime.adapters.model?.settings.maxInput;
   return typeof maxInput === "number" ? { limit: maxInput, from: "runtime.yaml" } : {};
 }
+async function sessionTokensHere(root, repo, commit, o, op, tier) {
+  const lim = limitOf(o, op, tier);
+  const session = sessionTokensFor(lim.limit);
+  if (lim.from === "flag")
+    return { session, fromPlan: false };
+  const plan = await loadReadPlan(root, repo);
+  const planned = plan && sameCommit(plan.commit, commit) && plan.session > 0 && (plan.parts.length > 0 || plan.estimate !== void 0);
+  if (!planned)
+    return { session, fromPlan: false };
+  if (lim.limit === void 0)
+    return { session: plan.session, fromPlan: true };
+  return plan.session === session || !lim.from ? { session, fromPlan: false } : {
+    session,
+    fromPlan: false,
+    replanned: { was: plan.session, limit: lim.limit, from: lim.from }
+  };
+}
+function replannedLine(r, session) {
+  const n = (x) => x.toLocaleString("en-US");
+  return `The read plan on file was planned at ${n(r.was)} tokens a session; ${r.from === "probe" ? "the limit atticus probe measured" : "runtime.yaml's maxInput"} (${n(r.limit)} tokens) gives ${n(session)}, so it is planned again at that size. --max-tokens n plans it at another limit.`;
+}
 async function tierHere(root, op) {
   return assistantTier(op.runtime, { probes: (await readProbes(root)).results });
 }
@@ -645,7 +669,7 @@ async function mapCommand(root, repo, o, io, deps = {}) {
     componentTypesText(await componentTypesAt(root, op))
   ].filter(Boolean).join("\n\n");
   if (o.gaps) {
-    const { mapGaps } = await import("./chunk-ELNIQYLR.js");
+    const { mapGaps } = await import("./chunk-NNURP7VO.js");
     const tier = await tierHere(root, op);
     let part;
     if (o.part !== void 0) {
@@ -662,7 +686,7 @@ async function mapCommand(root, repo, o, io, deps = {}) {
     return mapGaps(root, repo, {
       commit,
       source,
-      session: sessionTokensFor(limitOf(o, op, tier).limit),
+      session: (await sessionTokensHere(root, repo, commit, o, op, tier)).session,
       checkout: relative(root, dir).split(sep).join("/") || ".",
       ...o.json ? { json: true } : {},
       ...part ? { part } : {},
@@ -672,14 +696,14 @@ async function mapCommand(root, repo, o, io, deps = {}) {
     }, io);
   }
   if (o.rules && !deps.runtime) {
-    const { mapRules } = await import("./chunk-GVOQJPKA.js");
+    const { mapRules } = await import("./chunk-U7L3ORPK.js");
     const tier = await tierHere(root, op);
     return mapRules(root, repo, {
       commit,
       source,
       exclude,
       conventions,
-      session: sessionTokensFor(limitOf(o, op, tier).limit),
+      session: (await sessionTokensHere(root, repo, commit, o, op, tier)).session,
       notes: notesPrompt,
       checkout: relative(root, dir).split(sep).join("/") || ".",
       ...o.json ? { json: true } : {},
@@ -759,7 +783,7 @@ async function mapCommand(root, repo, o, io, deps = {}) {
       return tooSmall(0);
     const frameworks = await frameworksFor(root, repo, existing);
     if (o.rules) {
-      const { topUpOf, recordRulesNow, ruleSetsOfFiles } = await import("./chunk-GVOQJPKA.js");
+      const { topUpOf, recordRulesNow, ruleSetsOfFiles } = await import("./chunk-U7L3ORPK.js");
       const t = await topUpOf(root, repo, {
         commit,
         facts: existing,
@@ -1005,7 +1029,7 @@ async function takeAnswer(root, s, run, batch, source, exclude, now, io, at) {
   });
   const summary = await writeVerifyFiles(root, s.repo, report, s.commit, q.problems, [], reviewedProblemsOf(reviewed.bad, report), answer.slips, await newerLinesOf(root, s.repo));
   if (answer.about) {
-    const { keepDraftedDescription } = await import("./chunk-EUCATH2U.js");
+    const { keepDraftedDescription } = await import("./chunk-F74OMLNU.js");
     const d = await keepDraftedDescription(root, s.repo, answer.about, now());
     if (d.kept)
       io.out(`Your assistant says ${s.repo} is: "${answer.about.text}" \u2014 written to the manifest as a draft, unconfirmed. Confirm it (atticus repo describe ${s.repo} --accept), change it (--description "...") or drop it (--reject).`);
@@ -1039,7 +1063,7 @@ async function finish(root, s, io, o) {
   await saveState(root, s);
   const last = s.last;
   if (last && !last.rejected && !s.reread) {
-    const { recordRulesNow } = await import("./chunk-GVOQJPKA.js");
+    const { recordRulesNow } = await import("./chunk-U7L3ORPK.js");
     await recordRulesNow(root, s.repo, s.commit, s.sets);
   }
   const rel = factsRelOf(root);
@@ -1104,7 +1128,8 @@ async function estimate(root, repo, c, io) {
     saysNotProduct: saysNotProduct(about)
   });
   const left = proposed.proposals.map((p) => p.path.slice(0, -2));
-  const session = sessionTokensFor(given);
+  const sized = await sessionTokensHere(root, repo, c.commit, c.o, c.op, tier);
+  const session = sized.session;
   const product = files.filter((f) => !left.some((d) => f.path.startsWith(d))).map((f) => {
     if (f.tokens <= session)
       return f;
@@ -1177,7 +1202,7 @@ async function estimate(root, repo, c, io) {
     exclude: c.exclude
   });
   if (c.o.part !== void 0 && !parts[c.o.part - 1]) {
-    io.err(`${repo} is read in ${parts.length ? `parts 1 to ${parts.length}` : "one session (no parts)"} at this limit: there is no part ${c.o.part}.`);
+    io.err(`${repo} is read in ${parts.length ? `parts 1 to ${parts.length}` : "one session (no parts)"} at this limit (${session} tokens a session${sized.fromPlan ? ", the read plan's" : ""}): there is no part ${c.o.part}.${sized.replanned ? ` ${replannedLine(sized.replanned, session)}` : ""}${sized.fromPlan ? "" : ` A read planned at another limit names its parts at that one: atticus map ${repo} --estimate --max-tokens <n>, with the limit it was planned at.`}`);
     return 2;
   }
   if (c.o.json) {
@@ -1206,6 +1231,10 @@ async function estimate(root, repo, c, io) {
       },
       parts: {
         session,
+        // beta.27: the size came from the read plan on file (no --max-tokens given).
+        ...sized.fromPlan ? { sessionFrom: "read-plan" } : {},
+        // Review of fix/b27-copilot: the plan on file was of another size: planned again.
+        ...sized.replanned ? { replanned: sized.replanned } : {},
         parts,
         // A-ledger: the read plan on file and what the facts say each part has covered.
         ...progress ? {
@@ -1281,6 +1310,8 @@ async function estimate(root, repo, c, io) {
   for (const m of re.missing)
     io.out(`Some facts are of commit ${m.slice(0, 12)}, which this clone can't compare with ${c.commit.slice(0, 12)} (fetch it, or read the repo again whole): the read below is the whole repo.`);
   io.out(`${plural(whole.files, "source file")}${reread ? " to read" : ""}, ${plural(whole.lines, "line")}, about ${whole.tokens} tokens${whole.excluded.length ? `; ${whole.excluded.length} excluded` : ""}${reread ? ` (the repo has ${plural(repoWhole.files, "source file")}, about ${repoWhole.tokens} tokens)` : ""}.`);
+  if (sized.replanned)
+    io.out(replannedLine(sized.replanned, session));
   if (proposed.proposals.length) {
     const scan = relative(root, join(orgPackDirOf(root), "scan", `${repo}.yaml`)).replace(/\\/g, "/");
     io.out(`Folders that look like data, documentation or vendored code, not the product (${proposed.proposals.length}):`);
@@ -1301,7 +1332,7 @@ repo: ${repo}`);
   if (parts.length) {
     if (proposed.proposals.length)
       io.out(`The parts below are planned over what is left with the ${plural(proposed.proposals.length, "proposed folder")} left out (${plural(product.length, "source file")}, about ${proposed.after} tokens); no part reads a proposed folder.`);
-    io.out(`About ${parts.reduce((n, p) => n + p.tokens, 0)} tokens${proposed.proposals.length ? " with those left out" : ""} is more than one session reads (${session} tokens): read it in ${parts.length} parts, one per session or sub-agent, as /atticus-map says:`);
+    io.out(`About ${parts.reduce((n, p) => n + p.tokens, 0)} tokens${proposed.proposals.length ? " with those left out" : ""} is more than one session reads (${session} tokens${sized.fromPlan ? `, as the read plan on file was planned; --max-tokens n plans it again` : ""}): read it in ${parts.length} parts, one per session or sub-agent, as /atticus-map says:`);
     const stateOf = (i) => progress?.parts[i]?.state;
     const words = (s) => s === "done" ? "done" : s === "in-progress" ? "part-read" : "to read";
     parts.forEach((p, i) => io.out(`  part ${i + 1} (${words(stateOf(i))}, about ${p.tokens} tokens, ${plural(p.files, "file")}): ${p.paths.join(", ")}`));
@@ -1354,5 +1385,7 @@ export {
   rulesCovering,
   ruleLineOf,
   taughtIn,
+  knownLimitOf,
+  sessionTokensHere,
   mapCommand
 };

package/dist/{chunk-NL6GIEJU.js → chunk-J6GO3K7G.js}

@@ -11,28 +11,29 @@ import {
   planJourney,
   recordCommitment,
   requestFromTeam
-} from "./chunk-7E3G5NCH.js";
+} from "./chunk-NYT6QGZA.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
-import "./chunk-JQGWP3SC.js";
-import "./chunk-UTZMF5CV.js";
-import "./chunk-U7YZ3IRI.js";
-import "./chunk-YRKAJ42V.js";
-import "./chunk-CGVRLQAY.js";
-import "./chunk-RL7PETU6.js";
-import "./chunk-PGKCRK77.js";
-import "./chunk-M6HI36T3.js";
-import "./chunk-2VN4TLGI.js";
-import "./chunk-4U3JLIRC.js";
-import "./chunk-QQD25YNF.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-WS7KBKP4.js";
-import "./chunk-GLISHJ4G.js";
-import "./chunk-G3ZFEHCX.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+import "./chunk-SVOGRJO6.js";
+import "./chunk-23TTURB2.js";
+import "./chunk-QC6GSNIK.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-UWBODTY7.js";
+import "./chunk-I57IH5X6.js";
+import "./chunk-X5B7KYPD.js";
+import "./chunk-IPSZDVLI.js";
+import "./chunk-2MRYL45Z.js";
+import "./chunk-ELJ5Q4J2.js";
+import "./chunk-XZY4GTCX.js";
+import "./chunk-3M3MDBOG.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
 import "./chunk-BQGDB6ZL.js";
+import "./chunk-R4TUWD4C.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/initiative-commands.js

package/dist/chunk-JBLM6IUA.js

@@ -0,0 +1,42 @@
+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 {
+  changeMapBody,
+  changeMapCommand,
+  changeMapOf,
+  targetFlowsOf
+} from "./chunk-46N5O5H7.js";
+import "./chunk-EYINWNXL.js";
+import "./chunk-JL2VOYSL.js";
+import "./chunk-INCFIDCB.js";
+import "./chunk-U3Z2QZE3.js";
+import "./chunk-SVOGRJO6.js";
+import "./chunk-23TTURB2.js";
+import "./chunk-QC6GSNIK.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-UWBODTY7.js";
+import "./chunk-I57IH5X6.js";
+import "./chunk-LCQIRCOT.js";
+import "./chunk-X5B7KYPD.js";
+import "./chunk-IPSZDVLI.js";
+import "./chunk-2MRYL45Z.js";
+import "./chunk-ELJ5Q4J2.js";
+import "./chunk-XZY4GTCX.js";
+import "./chunk-3M3MDBOG.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-R4TUWD4C.js";
+import "./chunk-TV45EUGM.js";
+export {
+  changeMapBody,
+  changeMapCommand,
+  changeMapOf,
+  targetFlowsOf
+};