@maycombhq/atticus 2.0.0-beta.2 → 2.0.0-beta.22

package/dist/{chunk-6M5NK3K3.js → chunk-UF4AZOZB.js}

@@ -10,6 +10,7 @@ import {
   CriticError,
   act,
   checkRoundRule,
+  completeLensBatch,
   completeLensRun,
   gateStatus,
   lensAnswerProblem,
@@ -21,7 +22,7 @@ import {
   roundsUsed,
   runCritic,
   waitingLenses
-} from "./chunk-3HI6Z55Y.js";
+} from "./chunk-S4PMJU6H.js";
 import {
   changeFolder,
   changeStore,
@@ -29,21 +30,23 @@ import {
   phaseStage,
   stageCommand,
   statePhase
-} from "./chunk-XY3P7JW7.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   AiOffError,
   HandoffRuntime,
   RuntimeConfigError,
   runtimeForCli
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-P32RUW3B.js";
 import {
   CriticQuestion,
   LEGACY_LENSES,
   Lens,
-  require_dist,
   runsDirOf,
   runsRelOf
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-Q2TECDIT.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -107,7 +110,7 @@ function statusLine(s, change = "<change>") {
     return owner;
   if (s.humanDecides)
     return `The ${s.gate} gate is closed (${counts}) and ${roundsUsed(s)}: a person decides now. Once a person acts on round ${s.round}'s findings, ${checkRoundRule(s.round)}.`;
-  return `The ${s.gate} gate is closed: ${counts}. Act on each with atticus finding <id> <action>.`;
+  return `The ${s.gate} gate is closed: ${counts}. Act on each with atticus finding ${change} <id> <action>.`;
 }
 async function runtimeOf(root, mode, deps) {
   if (deps.runtime)
@@ -228,7 +231,7 @@ async function critic(root, changeId, o, io, deps = {}) {
     io.out(`${l.lens} lens ${l.state}: ${l.reason ?? ""}`.trimEnd());
   if (r.discarded.length)
     io.out(`Discarded ${r.discarded.length} AI finding${r.discarded.length > 1 ? "s" : ""} without valid evidence.`);
-  io.out(statusLine(s));
+  io.out(statusLine(s, r.change));
   return s.mayProceed ? 0 : 1;
 }
 function printCompleted(c, io) {
@@ -241,7 +244,7 @@ function printCompleted(c, io) {
   if (c.waiting.length)
     io.out(`${plural(c.waiting.length, "AI lens", "AI lenses")} ${c.waiting.length === 1 ? "is" : "are"} still with your assistant: ${c.waiting.map((w) => `${w.lens} (atticus handoff done ${w.runId})`).join(", ")}.`);
   else
-    io.out(statusLine(c.status));
+    io.out(statusLine(c.status, c.change));
   return c.waiting.length === 0;
 }
 async function completeCriticLens(root, run, io, o = {}) {
@@ -253,6 +256,35 @@ async function completeCriticLens(root, run, io, o = {}) {
     return fail(io, e);
   }
 }
+async function completeCriticBatch(root, batch, result, io, o = {}) {
+  let read;
+  try {
+    read = await completeLensBatch(root, batch, result, o.now ? { now: o.now } : {});
+  } catch (e) {
+    return fail(io, e);
+  }
+  for (const c of read) {
+    const where2 = `The ${c.lens.lens} lens of round ${c.round} at the ${c.gate} gate`;
+    io.out(c.lens.state === "ran" ? `${where2} raised ${plural(c.findings.length, "finding", "findings")}.` : `${where2} ${c.lens.state}: ${c.lens.reason ?? ""}`.trimEnd());
+    for (const d of c.discarded)
+      io.err(`Discarded: ${d.reason}`);
+    if (c.lens.state === "ran" && c.lens.reason)
+      io.out(`  ${c.lens.reason}`);
+  }
+  if (batch.state !== "validated") {
+    for (const e of batch.errors)
+      io.err(e);
+    io.err(`Fix what is listed in ${runsRelOf(root)}/${batch.request.change}/${batch.runId}/${batch.request.outputPath} and run atticus handoff done ${batch.runId} again: only the lenses still out are checked. Or answer a lens alone with its own run.`);
+  }
+  const last = read.at(-1);
+  if (last) {
+    if (last.waiting.length)
+      io.out(`${plural(last.waiting.length, "AI lens", "AI lenses")} ${last.waiting.length === 1 ? "is" : "are"} still with your assistant: ${last.waiting.map((w) => w.lens).join(", ")}.`);
+    else
+      io.out(statusLine(last.status, last.change));
+  }
+  return batch.state === "validated" && read.every((c) => c.lens.state === "ran") ? 0 : 1;
+}
 async function resumeLenses(root, changeId, o, io, deps) {
   try {
     await changeStore(root).read(changeId).catch((e) => {
@@ -285,7 +317,7 @@ async function resumeLenses(root, changeId, o, io, deps) {
     for (const gate of gates) {
       const s = await gateStatus(root, changeId, gate);
       if (!statusPrinted && (any || s.round !== void 0))
-        io.out(statusLine(s));
+        io.out(statusLine(s, changeId));
       mayProceed = s.mayProceed && s.round !== void 0;
     }
     return mayProceed ? 0 : 1;
@@ -342,7 +374,7 @@ async function findings(root, changeId, o, io) {
       f.finding.summary
     ])))
       io.out(`  ${line}`);
-    io.out(statusLine(s));
+    io.out(statusLine(s, changeId));
   }
   return 0;
 }
@@ -370,6 +402,13 @@ async function findingAction(root, changeId, findingId, action, o, io, deps = {}
       ...deps.now ? { now: deps.now } : {}
     });
     io.out(r.message);
+    if (r.finding.state !== "open") {
+      const { retireChangeEscalations } = await import("./chunk-NY2XSR5K.js");
+      const at = deps.now ?? (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
+      const stages = await retireChangeEscalations(root, changeId, at).catch(() => []);
+      if (stages.length)
+        io.out(`Retired the ${stages.join(" and ")} stage's question about it: the finding is settled.`);
+    }
     return 0;
   } catch (e) {
     return fail(io, e);
@@ -409,6 +448,7 @@ export {
   statusLine,
   critic,
   completeCriticLens,
+  completeCriticBatch,
   findings,
   findingAction,
   criticStats

package/dist/chunk-UF4GLFBX.js

@@ -0,0 +1,345 @@
+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 {
+  FRESH_STATES,
+  estateFreshness
+} from "./chunk-SQV37XO2.js";
+import "./chunk-OWNCM4ZN.js";
+import "./chunk-T6DQR5TV.js";
+import "./chunk-WXFLMQSR.js";
+import {
+  loadReadPlan,
+  readCostOf
+} from "./chunk-TYQBFTBR.js";
+import "./chunk-2F4CYZKJ.js";
+import "./chunk-LO6P2VYG.js";
+import "./chunk-SFUP7TTO.js";
+import "./chunk-7FTTA3HD.js";
+import "./chunk-ZQ3ON2VQ.js";
+import "./chunk-3G4YI4ZU.js";
+import "./chunk-VOGCSYOI.js";
+import {
+  componentRenames,
+  estateFacts,
+  isPrototypeRepo,
+  joinReposOf,
+  outsideSystems
+} from "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-F3P7N7SF.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import {
+  HOSTS_STEP,
+  LINK_QUESTION_STEPS,
+  TARGETS_STEP_ID,
+  TERM_STEP,
+  TOPICS_STEP_ID,
+  factsDirOf,
+  factsFileOf,
+  helperOn,
+  isGuessedJoin,
+  joinConventions,
+  joinFacts,
+  joinGuessesOf,
+  listQuestions,
+  loadOrgPack,
+  orgPackDirOf,
+  parseFacts
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
+import {
+  __toESM
+} from "./chunk-TV45EUGM.js";
+
+// packages/cli/dist/doctor-counts.js
+var import_yaml = __toESM(require_dist(), 1);
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+var QUESTION_STEPS = /* @__PURE__ */ new Set([
+  "map",
+  "scan-survey",
+  "scan-verify",
+  "spec-draft",
+  "spec-check",
+  HOSTS_STEP,
+  TARGETS_STEP_ID,
+  TOPICS_STEP_ID,
+  TERM_STEP,
+  ...LINK_QUESTION_STEPS,
+  // The planner's, a change's stages (planner/src/stages) and its gaps; the knowledge conflicts.
+  "change-feature",
+  "change-architecture",
+  "change-stories",
+  "change-small",
+  "context-gap",
+  "knowledge-conflict"
+]);
+var OTHER_STEP = "other";
+var bump = (m, k, n = 1) => {
+  m[k] = (m[k] ?? 0) + n;
+};
+var sorted = (m) => Object.fromEntries(Object.entries(m).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0));
+var LISTENS = /^(subscribe|consume|listen)$/i;
+async function doctorCounts(root, o = {}) {
+  let problems = 0;
+  const qs = await listQuestions(root, { state: "open" }).catch(() => {
+    problems++;
+    return { questions: [], problems: [] };
+  });
+  problems += qs.problems.length;
+  const byKind = {};
+  for (const q of qs.questions)
+    bump(byKind, QUESTION_STEPS.has(q.askedBy.step) ? q.askedBy.step : OTHER_STEP);
+  const targets = {
+    open: 0,
+    calls: 0,
+    alone: 0,
+    groups: 0,
+    inGroups: 0,
+    bySize: {}
+  };
+  for (const q of qs.questions) {
+    if (q.askedBy.step !== TARGETS_STEP_ID)
+      continue;
+    const n = Math.max(1, new Set(q.evidence).size);
+    targets.open++;
+    targets.calls += n;
+    if (n === 1)
+      targets.alone++;
+    else {
+      targets.groups++;
+      targets.inGroups += n;
+    }
+    bump(targets.bySize, n === 1 ? "1" : n <= 4 ? "2-4" : n <= 9 ? "5-9" : "10+");
+  }
+  const fresh = await estateFreshness(root, o.git ? { git: o.git } : {}).catch(() => {
+    problems++;
+    return { repos: [], problems: [] };
+  });
+  problems += fresh.problems.length;
+  const byState = Object.fromEntries(FRESH_STATES.map((s) => [s, 0]));
+  for (const r of fresh.repos)
+    byState[r.state]++;
+  const total = fresh.repos.length;
+  const facts = { accepted: 0, rejected: 0, notVerified: 0, filesNotRead: 0 };
+  const dir = factsDirOf(root);
+  const names = (await readdir(dir).catch(() => [])).sort();
+  const read = async (n) => readFile(join(dir, n), "utf8").catch(() => void 0);
+  for (const n of names) {
+    const of = factsFileOf(n);
+    if (!of)
+      continue;
+    const text = await read(n);
+    if (text === void 0) {
+      problems++;
+      continue;
+    }
+    if (of.facts) {
+      const p = parseFacts(text);
+      if (!p.ok) {
+        problems++;
+        continue;
+      }
+      for (const f of p.facts)
+        if (f.verified === "none")
+          facts.notVerified++;
+        else
+          facts.accepted++;
+    } else if (n.endsWith(".rejected.jsonl"))
+      facts.rejected += text.split("\n").filter((l) => l.trim()).length;
+    else if (n.endsWith(".verify.yaml"))
+      try {
+        const v = (0, import_yaml.parse)(text);
+        const u = v?.coverage?.unknown;
+        facts.filesNotRead += Array.isArray(u) ? u.length : typeof u === "number" ? u : 0;
+      } catch {
+        problems++;
+      }
+  }
+  const tokens = { reported: 0, reports: 0, repos: 0 };
+  for (const r of fresh.repos) {
+    const plan = await Promise.resolve().then(() => loadReadPlan(root, r.repo)).catch(() => {
+      problems++;
+      return void 0;
+    });
+    const cost = plan ? readCostOf(plan).reported : void 0;
+    if (!cost)
+      continue;
+    tokens.repos++;
+    tokens.reports += cost.reports;
+    tokens.reported += cost.tokens ?? 0;
+  }
+  const links = {
+    verified: 0,
+    inferred: 0,
+    inferredBy: {},
+    asked: 0,
+    askedBy: {},
+    outside: 0,
+    unresolved: 0,
+    unresolvedBy: {}
+  };
+  let op;
+  try {
+    op = await loadOrgPack(orgPackDirOf(root));
+  } catch {
+    if (total)
+      problems++;
+  }
+  if (op)
+    try {
+      Object.assign(links, await linkCounts(root, op));
+    } catch {
+      problems++;
+    }
+  return {
+    questions: {
+      open: qs.questions.length,
+      byKind: sorted(byKind),
+      targets: { ...targets, bySize: bySizeOrder(targets.bySize) }
+    },
+    links,
+    repos: {
+      total,
+      read: total - byState["not-read"],
+      unread: byState["not-read"],
+      stale: byState.stale,
+      byState
+    },
+    facts,
+    tokens,
+    problems
+  };
+}
+async function linkCounts(root, op) {
+  const estate = await estateFacts(root, op, "");
+  const repos = estate.repos.filter((x) => !isPrototypeRepo(op, x.repo));
+  const join2 = joinFacts({
+    repos: joinReposOf(op, repos, componentRenames(repos, op)),
+    ...Object.keys(estate.targets).length ? { targets: estate.targets } : {},
+    ...Object.keys(estate.pairs).length ? { pairs: estate.pairs } : {},
+    ...Object.keys(estate.aiTargets).length ? { aiTargets: estate.aiTargets } : {},
+    outside: outsideSystems(op),
+    ...joinConventions(op),
+    walkGateways: helperOn("gateway-walk"),
+    // Why each call was left, in the join's own words, for unresolvedBy.
+    explain: true
+  });
+  const factOf = /* @__PURE__ */ new Map();
+  for (const r of repos)
+    for (const f of r.facts)
+      factOf.set(`${r.repo}\0${f.id}`, f);
+  const key = (e) => `${e.repo}\0${e.fact}`;
+  const declared = (e) => factOf.get(key(e))?.conf === "declared";
+  const out = {
+    verified: 0,
+    inferred: 0,
+    inferredBy: {},
+    asked: 0,
+    askedBy: {},
+    outside: 0,
+    unresolved: 0,
+    unresolvedBy: {}
+  };
+  const answered = /* @__PURE__ */ new Set();
+  const why = new Map((join2.left ?? []).map((l) => [key(l.call), l.reason]));
+  for (const j of join2.joins) {
+    answered.add(key(j.call));
+    if (!isGuessedJoin(j) && declared(j.call) && declared(j.entry))
+      out.verified++;
+    else {
+      out.inferred++;
+      const flags = joinGuessesOf(j);
+      if (flags.length)
+        for (const f of flags)
+          bump(out.inferredBy, f);
+      else
+        bump(out.inferredBy, "one-end-inferred");
+    }
+  }
+  for (const a of join2.asks) {
+    if (answered.has(key(a.call)))
+      continue;
+    answered.add(key(a.call));
+    out.asked++;
+    bump(out.askedBy, a.reason);
+  }
+  for (const x of join2.outside ?? []) {
+    if (answered.has(key(x.call)))
+      continue;
+    answered.add(key(x.call));
+    out.outside++;
+  }
+  for (const r of repos)
+    for (const f of r.facts) {
+      if (f.kind !== "call" || LISTENS.test(f.method ?? ""))
+        continue;
+      const k = `${r.repo}\0${f.id}`;
+      if (answered.has(k))
+        continue;
+      out.unresolved++;
+      bump(out.unresolvedBy, why.get(k) ?? "other");
+    }
+  out.inferredBy = sorted(out.inferredBy);
+  out.askedBy = sorted(out.askedBy);
+  out.unresolvedBy = sorted(out.unresolvedBy);
+  return out;
+}
+var kv = (m) => Object.entries(m).filter(([, n]) => n > 0).map(([k, n]) => `${k} ${n}`).join(", ");
+var SIZES = ["1", "2-4", "5-9", "10+"];
+var bySizeOrder = (m) => Object.fromEntries(SIZES.filter((k) => m[k]).map((k) => [k, m[k]]));
+function countsLines(c) {
+  const by = kv(c.questions.byKind);
+  const inferred = kv(c.links.inferredBy);
+  const states = kv(c.repos.byState);
+  const askedBy = kv(c.links.askedBy);
+  const unresolvedBy = kv(c.links.unresolvedBy);
+  const t = c.questions.targets;
+  const sizes = kv(t.bySize);
+  return [
+    `Questions: ${c.questions.open} open${by ? ` (${by})` : ""}`,
+    ...t.open ? [
+      `Target questions: ${t.open} open, covering ${t.calls} calls: ${t.alone} asked alone, ${t.groups} groups holding ${t.inGroups}${sizes ? ` (by calls each: ${sizes})` : ""}`
+    ] : [],
+    `Links: ${c.links.verified} verified, ${c.links.inferred} inferred${inferred ? ` (${inferred})` : ""}, ${c.links.asked} asked, ${c.links.outside} to outside systems, ${c.links.unresolved} unresolved calls`,
+    ...askedBy || unresolvedBy ? [
+      `Calls ${[askedBy ? `asked by why: ${askedBy}` : "", unresolvedBy ? `unresolved by why: ${unresolvedBy}` : ""].filter(Boolean).join("; ")}`
+    ] : [],
+    `Repos: ${c.repos.total} in all, ${c.repos.read} read, ${c.repos.unread} unread, ${c.repos.stale} stale${states ? ` (${states})` : ""}`,
+    `Facts: ${c.facts.accepted} accepted, ${c.facts.rejected} rejected, ${c.facts.notVerified} not verified; ${c.facts.filesNotRead} source files not read`,
+    `Tokens reported: ${c.tokens.reported} tokens over ${c.tokens.reports} reports for ${c.tokens.repos} repos`,
+    "Counts and flags only: nothing here names a repo, system, host or file, so it is safe to paste."
+  ];
+}
+async function doctorCountsCommand(root, o, io, deps = {}) {
+  const { problems, ...c } = await doctorCounts(root, deps);
+  if (o.json)
+    io.out(JSON.stringify({ ...c, problems }, null, 2));
+  else {
+    for (const l of countsLines(c))
+      io.out(l);
+    if (problems)
+      io.out(`${problems} file${problems === 1 ? "" : "s"} didn't read; atticus doctor and atticus estate fresh say which.`);
+  }
+  return 0;
+}
+export {
+  OTHER_STEP,
+  QUESTION_STEPS,
+  countsLines,
+  doctorCounts,
+  doctorCountsCommand
+};