@maycombhq/atticus 2.0.0-beta.18 → 2.0.0-beta.21

package/dist/{chunk-CQCAJI6G.js → chunk-YAH5IQAL.js}

@@ -9,12 +9,12 @@ import {
   todoList,
   todoRun,
   todoShow
-} from "./chunk-EDURU5DF.js";
-import "./chunk-FF4IGX4Z.js";
+} from "./chunk-ZFQMMU5Y.js";
+import "./chunk-DDJPM5YX.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-V3UEPUHT.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+import "./chunk-4KNOJC6J.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
   executorsCheck,

package/dist/{chunk-U6TD7UOH.js → chunk-YBOVNMHC.js}

@@ -6,12 +6,12 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   diffCatalogs,
   readCatalog
-} from "./chunk-EZBAS5BL.js";
-import "./chunk-KCQS52TH.js";
-import "./chunk-IPSFMTK2.js";
-import "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
+} from "./chunk-4SLBCEPD.js";
+import "./chunk-64AADMTW.js";
+import "./chunk-JYMIB5XY.js";
+import "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
 import {
   baseClonePath,
   branchSlug,
@@ -19,22 +19,24 @@ import {
   gitUser,
   loadRepos,
   remoteDefaultBranch
-} from "./chunk-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
+} from "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
 import {
   ManifestEditError,
   REPO_DESCRIPTION_MAX,
   RepoDescription,
   RepoManifest,
   catalogDirOf,
+  eolOf,
+  inEol,
   orgPackDirOf,
   require_dist,
   setManifestDescription
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
-  writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+  writeFileIfUnchanged
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -78,6 +80,8 @@ async function repoBranches(root) {
       ...remoteDefault ? { remoteDefault } : {},
       branches: r.branches,
       ...commit ? { commit } : {},
+      // Seventh UX walk: the build command a task's PR waits on, shown and set on Repos.
+      ...r.build ? { build: r.build } : {},
       scans: scans.flatMap((s) => s.repos.filter((x) => x.id === r.id).map((x) => ({ branch: s.branch, scannedAt: s.scannedAt, commit: x.commit })))
     });
   }
@@ -116,9 +120,12 @@ async function editRepoBranches(root, repoId, set) {
   const repo = (await loadRepos(root)).find((r) => r.id === repoId);
   if (!repo)
     throw new RepoEditError("not-found", `There is no repo ${repoId} in any manifest.`);
+  if (set.was && (set.was.defaultBranch !== repo.defaultBranch || set.was.branches.join("\n") !== repo.branches.join("\n")))
+    throw new RepoEditError("conflict", `${repoId}'s branches changed in the manifest since you opened the form (now ${repo.defaultBranch}, ${repo.branches.join(", ") || "no others"}): open Edit again to see them, then save.`);
   const rel = `org-pack/profiles/${repo.platform}/repos.manifest.yaml`;
   const file = join(orgPackDirOf(root), "profiles", repo.platform, "repos.manifest.yaml");
-  const doc = (0, import_yaml.parseDocument)(await readFile(file, "utf8"));
+  const was = await readFile(file, "utf8");
+  const doc = (0, import_yaml.parseDocument)(was);
   const list = doc.get("repos");
   const item = (0, import_yaml.isSeq)(list) ? list.items.find((x) => (0, import_yaml.isMap)(x) && x.get("id") === repoId) : void 0;
   if (!(0, import_yaml.isMap)(item))
@@ -138,13 +145,42 @@ async function editRepoBranches(root, repoId, set) {
   const check = RepoManifest.safeParse(doc.toJS());
   if (!check.success)
     throw new RepoEditError("invalid", check.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; "));
-  await writeFileAtomic(file, doc.toString({ flowCollectionPadding: true }));
+  await writeFileIfUnchanged(file, was, inEol(doc.toString({ flowCollectionPadding: true }), eolOf(was)));
   return rel;
 }
+async function editRepoBuild(root, repoId, set) {
+  const repo = (await loadRepos(root)).find((r) => r.id === repoId);
+  if (!repo)
+    throw new RepoEditError("not-found", `There is no repo ${repoId} in any manifest.`);
+  if (set.was !== void 0 && set.was !== (repo.build ?? ""))
+    throw new RepoEditError("conflict", `${repoId}'s build command changed in the manifest since you opened the form (now ${repo.build ? `\`${repo.build}\`` : "none"}): open it again to see it, then save.`);
+  const build = set.build.trim();
+  if (/[\r\n]/.test(build))
+    throw new RepoEditError("invalid", "A build command is one line: join the steps with && (for example npm ci && npm test).");
+  const rel = `org-pack/profiles/${repo.platform}/repos.manifest.yaml`;
+  const file = join(orgPackDirOf(root), "profiles", repo.platform, "repos.manifest.yaml");
+  const was = await readFile(file, "utf8");
+  const doc = (0, import_yaml.parseDocument)(was);
+  const list = doc.get("repos");
+  const item = (0, import_yaml.isSeq)(list) ? list.items.find((x) => (0, import_yaml.isMap)(x) && x.get("id") === repoId) : void 0;
+  if (!(0, import_yaml.isMap)(item))
+    throw new RepoEditError("not-found", `${rel} doesn't list ${repoId}.`);
+  if (build)
+    item.set("build", build);
+  else
+    item.delete("build");
+  const check = RepoManifest.safeParse(doc.toJS());
+  if (!check.success)
+    throw new RepoEditError("invalid", check.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; "));
+  await writeFileIfUnchanged(file, was, inEol(doc.toString({ flowCollectionPadding: true }), eolOf(was)));
+  return { file: rel, ...build ? { build } : {} };
+}
 async function editRepoDescription(root, repoId, set, o = {}) {
   const repo = (await loadRepos(root)).find((r) => r.id === repoId);
   if (!repo)
     throw new RepoEditError("not-found", `There is no repo ${repoId} in any manifest.`);
+  if (set.was !== void 0 && set.was !== (repo.description?.text ?? ""))
+    throw new RepoEditError("conflict", `What ${repoId} is changed in the manifest since you opened the form: open Edit again to see it, then save.`);
   const now = o.now ?? /* @__PURE__ */ new Date();
   let next;
   if (!set.reject) {
@@ -175,6 +211,7 @@ export {
   RepoEditError,
   compareBranch,
   editRepoBranches,
+  editRepoBuild,
   editRepoDescription,
   repoBranches
 };

package/dist/{chunk-OJICVOZH.js → chunk-YF5DZCPN.js}

@@ -7,44 +7,49 @@ import {
   copilotAcpAllowed,
   copilotAcpByDefault,
   readWrites
-} from "./chunk-US3QZU23.js";
+} from "./chunk-LIJJCBQI.js";
 import {
   mapCommand,
   mapStateOf
-} from "./chunk-6H5JG5GL.js";
+} from "./chunk-26Z7OGQW.js";
 import {
   factsRepos,
   verifyCommand
-} from "./chunk-BAT4CBB7.js";
+} from "./chunk-LN77DXBM.js";
+import "./chunk-L4CESDPB.js";
 import {
   plannedTopUp,
   recordRulesNow,
   ruleSetsOfFiles
-} from "./chunk-5NLJH6R4.js";
-import "./chunk-QKMDT7VU.js";
-import "./chunk-4W7FOGAB.js";
+} from "./chunk-U3NBK4EU.js";
+import "./chunk-455SYIIE.js";
 import {
   estateFreshness
-} from "./chunk-HW4RRIJA.js";
+} from "./chunk-LWDNKE4X.js";
 import {
   onboardingQueue
-} from "./chunk-YY7VP7KW.js";
-import "./chunk-7TOAS7KI.js";
-import "./chunk-2QMZOCWN.js";
-import "./chunk-AZYBHPV4.js";
+} from "./chunk-HE3HRDNZ.js";
+import "./chunk-3J5I7ZOU.js";
+import "./chunk-4FOAYLI4.js";
+import "./chunk-GX74YWR7.js";
+import "./chunk-G6IQYM25.js";
+import "./chunk-LPV6T362.js";
+import {
+  rulesLackingAll
+} from "./chunk-GIFMBCTW.js";
 import {
-  checkoutOf,
-  conventionsAt,
-  excludesOf,
-  headOf,
   loadReadPlan,
   partUnaccounted,
   readPlanProgress
-} from "./chunk-AB5E5HCN.js";
-import "./chunk-LGDW4G73.js";
-import "./chunk-NGT5LLSE.js";
-import "./chunk-U6EPS5PF.js";
-import "./chunk-RUOGHYSK.js";
+} from "./chunk-MD7KUEJ3.js";
+import {
+  checkoutOf,
+  conventionsAt,
+  excludesOf,
+  headOf
+} from "./chunk-Q46QDDMF.js";
+import "./chunk-TGVVUKTG.js";
+import "./chunk-TQ4TG57V.js";
 import {
   isMetarepo,
   notMetarepo
@@ -52,32 +57,31 @@ import {
 import {
   ASSISTANT_FORMATS,
   assistantTier,
-  readProbes,
-  rulesLacking
-} from "./chunk-BAXM3JFQ.js";
+  readProbes
+} from "./chunk-3AQ2R5NL.js";
 import "./chunk-VOGCSYOI.js";
 import {
   estateRepos,
   productionRepos
-} from "./chunk-EZBAS5BL.js";
-import "./chunk-KCQS52TH.js";
+} from "./chunk-4SLBCEPD.js";
+import "./chunk-64AADMTW.js";
 import {
   dirSource,
   sameCommit,
   sessionTokensFor
-} from "./chunk-IPSFMTK2.js";
-import "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-S5PSGAQ2.js";
-import "./chunk-CYX36GKZ.js";
-import "./chunk-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
+} from "./chunk-JYMIB5XY.js";
+import "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-VUVGX5L2.js";
+import "./chunk-API5TOUB.js";
+import "./chunk-XOL3GFW2.js";
 import {
   AcpSetupError,
   AcpSignInError,
   currentPromptLimit
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
 import {
   factsDirOf,
   factsRelOf,
@@ -87,11 +91,11 @@ import {
   orgPackDirOf,
   parseFacts,
   require_dist
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   ensureLocalIgnore,
   writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -243,7 +247,7 @@ async function rulesPartsOf(root, repo, commit, limit, o = {}) {
     tokens: x.tokens,
     done: !!x.done
   })).filter((x) => !x.done).map(({ done: _d, ...x }) => x);
-  return { parts, total: sessions.length, sets: ruleSetsOfFiles(sessions) };
+  return { parts, total: sessions.length, sets: ruleSetsOfFiles(sessions), given: p.lacking };
 }
 async function planEstate(root, op, o, c, state) {
   const all = estateRepos(op).map((r) => r.id);
@@ -377,6 +381,7 @@ async function planEstate(root, op, o, c, state) {
         ...base,
         why: p2.sets.length ? `read before these reading rules: ${p2.sets.join(", ")}` : "read before the reading rules there are now, but no file of it is one they apply to: recorded as read under them",
         sets: p2.sets,
+        given: p2.given,
         parts: p2.parts,
         total: p2.total,
         tokens: p2.parts.reduce((n, x) => n + x.tokens, 0)
@@ -509,7 +514,7 @@ async function covered(root, item, part, first, now, unknown, wrote) {
   if (item.kind === "rules") {
     const plan = await loadReadPlan(root, item.repo);
     if (!plan?.topUp)
-      return rulesLacking(plan?.rules).length === 0;
+      return (await rulesLackingAll(root, item.repo, plan?.rules)).length === 0;
     return !!plan.topUp.sessions[part.part - 1]?.done;
   }
   if (item.total > 1) {
@@ -615,6 +620,16 @@ async function mapAllCommand(root, o, io, deps = {}) {
   }
   for (const l of planLines(plan))
     io.out(l);
+  const emit = (e) => {
+    try {
+      deps.onEvent?.(e);
+    } catch {
+    }
+  };
+  emit({
+    type: "plan",
+    repos: plan.items.map((i) => ({ repo: i.repo, kind: i.kind, parts: i.parts.length }))
+  });
   const st = state ?? {
     schemaVersion: 1,
     updatedAt: "",
@@ -667,6 +682,14 @@ async function mapAllCommand(root, o, io, deps = {}) {
       totals.added += links.added.length;
       totals.removed += links.removed.length;
     }
+    emit({
+      type: "verify",
+      repo: item.repo,
+      kept: v.accepted,
+      rejected: v.rejected,
+      coverage: v.coverage.ratio,
+      open: v.questions?.open ?? 0
+    });
     io.out(`${item.repo}: ${plural(v.accepted, "fact")} kept, ${v.rejected} rejected; coverage ${Math.round(v.coverage.ratio * 100)}% (${v.coverage.unknown.length} files no fact cites yet)${links ? `; links +${links.added.length} -${links.removed.length}` : ""}; ${plural(v.questions?.open ?? 0, "question")} open. ${v.rejected ? `Nothing written to the catalog until the rejected facts are fixed (${factsRelOf(root)}/${item.repo}.rejected.jsonl).` : v.written ? "Written to the catalog." : ""}`.trimEnd());
     return v;
   };
@@ -679,10 +702,11 @@ async function mapAllCommand(root, o, io, deps = {}) {
     if (quit || stopped())
       break;
     const where = `repo ${n + 1} of ${items.length}`;
+    emit({ type: "repo", repo: item.repo, index: n + 1, total: items.length, why: item.why });
     if (item.kind === "rules" && !item.parts.length) {
       io.out("");
       io.out(`===== ${item.repo} (${where}): ${item.why} =====`);
-      await recordRulesNow(root, item.repo, item.commit);
+      await recordRulesNow(root, item.repo, item.commit, item.given ?? []);
       repoState(item).done = true;
       totals.repos.add(item.repo);
       await save();
@@ -1012,6 +1036,13 @@ 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" : label} (${where})${attempt ? ", given again in a new session" : ""} =====`);
       io.out(`In a NEW Copilot session (copilot-acp): ${line}`);
+      emit({
+        type: "session",
+        repo: item.repo,
+        label: item.kind === "gaps" ? "the gaps pass" : item.kind === "rules" ? "the rules top-up" : label,
+        line,
+        attempt
+      });
       const base = item.force ? await writtenOf(root, item.repo) : "";
       const first = await snapOf(root, item.repo);
       totals.spent.prompts++;
@@ -1026,16 +1057,24 @@ async function mapAllCommand(root, o, io, deps = {}) {
         });
         totals.spent.tokens += r.usage ? r.usage.inputTokens + r.usage.outputTokens : part.tokens;
         io.out(`The session ended (${r.stopped ?? r.stopReason}).`);
+        emit({
+          type: "session.end",
+          repo: item.repo,
+          ended: r.stopped ?? r.stopReason,
+          ...r.usage ? { tokens: r.usage.inputTokens + r.usage.outputTokens } : {}
+        });
         cut = !!r.stopped;
       } catch (e) {
         if (e instanceof AcpSetupError) {
           io.err(`${e.message} The run stops here; ${resumeAs} carries on once it is put right.`);
+          emit({ type: "session.end", repo: item.repo, ended: "failed", failed: e.message });
           ps.state = "incomplete";
           await save();
           return "quit";
         }
         if (e instanceof AcpSignInError) {
           io.err(e.message);
+          emit({ type: "session.end", repo: item.repo, ended: "failed", failed: e.message });
           signIn = true;
           ps.state = "incomplete";
           await save();
@@ -1043,6 +1082,7 @@ async function mapAllCommand(root, o, io, deps = {}) {
         }
         totals.spent.tokens += part.tokens;
         io.out(`${item.repo} ${label}: the Copilot session failed: ${firstLine(e)}`);
+        emit({ type: "session.end", repo: item.repo, ended: "failed", failed: firstLine(e) });
       }
       if (stopped())
         break;

package/dist/chunk-YIGBJNH4.js

@@ -0,0 +1,37 @@
+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 {
+  REF,
+  claudeBlock,
+  factsWithoutSource,
+  inside,
+  outputsOf,
+  planWrite,
+  skillsImportCommand,
+  skillsListCommand,
+  skillsWriteCommand,
+  sourcesOf,
+  splitFm,
+  teamFrontmatter
+} from "./chunk-OKUB6RJA.js";
+import "./chunk-THN26IEF.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
+import "./chunk-TV45EUGM.js";
+export {
+  REF,
+  claudeBlock,
+  factsWithoutSource,
+  inside,
+  outputsOf,
+  planWrite,
+  skillsImportCommand,
+  skillsListCommand,
+  skillsWriteCommand,
+  sourcesOf,
+  splitFm,
+  teamFrontmatter
+};

package/dist/{chunk-7C7OZARH.js → chunk-YJ3TBOTK.js}

@@ -5,7 +5,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   benchFactsCommand
-} from "./chunk-WQSDKX7M.js";
+} from "./chunk-ICHDSWEY.js";
 import {
   BenchStory,
   benchKnownFields,
@@ -15,36 +15,36 @@ import {
   parseReference,
   parseReferenceStory,
   scoreStory
-} from "./chunk-B3SWPNJF.js";
-import "./chunk-YSEZQ6D3.js";
-import "./chunk-ILDGIXNH.js";
-import "./chunk-G5BYKJIM.js";
-import "./chunk-YC2K3FJG.js";
-import "./chunk-TAKAEJRD.js";
+} from "./chunk-FYBF5MB2.js";
+import "./chunk-36RY7ZXM.js";
+import "./chunk-2V2ZPQQU.js";
+import "./chunk-P2VBXX7N.js";
+import "./chunk-EZIN5E5B.js";
+import "./chunk-3LZ6P5EP.js";
 import {
   draftedStories
-} from "./chunk-XO5RQKNM.js";
-import "./chunk-L3T33FA7.js";
-import "./chunk-VEJYZEPC.js";
-import "./chunk-IOW6BF3U.js";
-import "./chunk-43E6XX67.js";
-import "./chunk-V3UEPUHT.js";
-import "./chunk-EZBAS5BL.js";
-import "./chunk-KCQS52TH.js";
-import "./chunk-IPSFMTK2.js";
-import "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-YXUIUOQZ.js";
-import "./chunk-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
+} from "./chunk-BEPCKDCP.js";
+import "./chunk-HWD4JPU7.js";
+import "./chunk-5WERBKLE.js";
+import "./chunk-K332XW7K.js";
+import "./chunk-HSZMPH5T.js";
+import "./chunk-D2WSW4GU.js";
+import "./chunk-4KNOJC6J.js";
+import "./chunk-4SLBCEPD.js";
+import "./chunk-64AADMTW.js";
+import "./chunk-JYMIB5XY.js";
+import "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
 import {
   changesDirOf,
   parseFacts,
   require_dist
-} from "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-HXFSM4LG.js → chunk-YKTE2RU3.js}

@@ -15,8 +15,8 @@ import {
   rulesJsonSchemas,
   serializeRecord,
   workspaceJsonSchemas
-} from "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/commands.js