@maycombhq/atticus 2.0.0-beta.26 → 2.0.0-beta.27.1

package/dist/{chunk-WT6EXYEY.js → chunk-LJEEVZIH.js}

@@ -7,19 +7,22 @@ import {
   ATTICUS_FOLDER_IGNORE,
   CHECKLISTS_README,
   STARTER_CHECKLISTS_README
-} from "./chunk-2IO6XH37.js";
+} from "./chunk-3BQDBTQJ.js";
+import {
+  recordUpgraded
+} from "./chunk-HOEZQRZU.js";
 import {
   openspecRootOf,
   rewriteStories
-} from "./chunk-CSHJZFOE.js";
+} from "./chunk-DTW37FJ6.js";
 import {
   STARTER_REVIEW_PATH,
   readPackFiles,
   starterReviewText
-} from "./chunk-VIQHZA53.js";
+} from "./chunk-LP6BFBE5.js";
 import {
   metarepoOrigin
-} from "./chunk-WH3ZFLXT.js";
+} from "./chunk-YBAJ5SAR.js";
 import {
   ORG_FLOW_VERSION,
   STORE_MARKER,
@@ -28,15 +31,15 @@ import {
   storeIdOf,
   writeOrgFlowSchema,
   writeStoreMarker
-} from "./chunk-UTZMF5CV.js";
-import {
-  VERSION
-} from "./chunk-MTIRNHRJ.js";
+} from "./chunk-23TTURB2.js";
 import {
   IGNORED,
   ensureGitignore,
   gitUser
-} from "./chunk-XIJBQM45.js";
+} from "./chunk-X5B7KYPD.js";
+import {
+  VERSION
+} from "./chunk-QK3UFHFC.js";
 import {
   catalogDirOf,
   changesDirOf,
@@ -57,17 +60,17 @@ import {
   orgPackDirOf,
   specsDirOf,
   specsRelOf
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   LOCAL_ONLY,
   ensureLocalIgnore,
   writeFileAtomic
-} from "./chunk-MEMEO7YO.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   MetarepoStamp,
   WORKSPACE_SCHEMA_VERSION,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -77,7 +80,8 @@ import {
 
 // packages/cli/dist/upgrade.js
 var import_yaml = __toESM(require_dist(), 1);
-import { cp, mkdir, readdir, readFile, stat } from "node:fs/promises";
+import { createHash } from "node:crypto";
+import { cp, lstat, mkdir, readdir, readFile, stat } from "node:fs/promises";
 import { join, relative, sep } from "node:path";
 var STAMP_FILE = join(".atticus", "metarepo.yaml");
 var rel = (prefix, files) => files.map((f) => `${prefix}/${f}`);
@@ -416,7 +420,8 @@ var stampIgnored = (text) => WHOLE_FOLDER.test(text) && !/^!\/?\.atticus\/metare
 function catalogStep(id, summary, versions) {
   const run = async (root, dryRun) => {
     const out = [];
-    for (const sub of ["generated", "curated"]) {
+    const built = await exists(join(catalogDirOf(root), "sources", "build.json"));
+    for (const sub of built ? ["curated"] : ["generated", "curated"]) {
       const r = await migrateCatalog(join(catalogDirOf(root), sub), {
         dryRun,
         versions,
@@ -451,6 +456,28 @@ async function starterReviewPlan(root) {
 async function exists(path) {
   return stat(path).then(() => true, () => false);
 }
+var STAMP_REL = STAMP_FILE.split(sep).join("/");
+async function contentOf(root, paths) {
+  const out = /* @__PURE__ */ new Map();
+  const walk = async (rel2) => {
+    if (out.has(rel2))
+      return;
+    const abs = join(root, ...rel2.split("/"));
+    const s = await lstat(abs).catch(() => void 0);
+    if (!s || s.isSymbolicLink())
+      return;
+    if (s.isDirectory()) {
+      for (const e of (await readdir(abs)).sort())
+        await walk(`${rel2}/${e}`);
+      return;
+    }
+    if (s.isFile())
+      out.set(rel2, createHash("sha256").update(await readFile(abs)).digest("hex"));
+  };
+  for (const p of paths)
+    await walk(p.split("\\").join("/").replace(/\/+$/, ""));
+  return out;
+}
 function packRel(root, file) {
   return `${isAdopted(root) ? ".atticus/org-pack" : "org-pack"}/${file}`;
 }
@@ -587,6 +614,22 @@ function storeLine(s) {
 }
 async function upgradeCommand(root, o, io, version = VERSION) {
   const c = await upgradeCheck(root, version);
+  const { planUpgradeToSlots, applyUpgradeToSlots, upgradeSlotsView } = await import("./chunk-MSNEGKI3.js");
+  let slots = await planUpgradeToSlots(root);
+  let view = await upgradeSlotsView(root, slots);
+  const slotsJson = () => slots.pending ? { slots: view } : {};
+  const slotsLines = () => [
+    `Adopt the catalog into source slots (ADR 0195): ${slots.records} records, nothing lost:`,
+    ...slots.slots.map((x) => `  ${x.path}: ${x.records} record${x.records === 1 ? "" : "s"}${x.repo ? ` (${x.repo}, legacy)` : " (joined and evidence-less records, legacy)"}`),
+    `  catalog/sources/legacy/generated-before-upgrade/: a copy of catalog/generated as it is`,
+    ...slots.differs.length ? [
+      `  The first build would change ${slots.differs.length} record file${slots.differs.length === 1 ? "" : "s"} (the files as they are stay in the copy):`,
+      ...slots.changes.slice(0, 20).map((x) => `    ${x.how}: catalog/generated/${x.path}`),
+      ...slots.changes.length > 20 ? [`    and ${slots.changes.length - 20} more`] : [],
+      `  Accept exactly these with: atticus upgrade --yes --accept-changes ${slots.differs.length}`
+    ] : ["  The first build changes nothing: catalog/generated stays byte for byte."],
+    ...slots.verifiable.map((r) => `  ${r}: its facts passed verify as they are; atticus verify ${r} --write puts them in its facts slot.`)
+  ];
   if (c.newer) {
     io.err(newerWords(c));
     if (o.json)
@@ -603,9 +646,9 @@ async function upgradeCommand(root, o, io, version = VERSION) {
     return 1;
   }
   if (o.check || o.dryRun) {
-    const steps = c.pending.length + (store?.action === "create" ? 1 : 0);
+    const steps = c.pending.length + (store?.action === "create" ? 1 : 0) + (slots.pending ? 1 : 0);
     if (o.json)
-      io.out(JSON.stringify(store ? { ...c, openspecStore: store } : c, null, 2));
+      io.out(JSON.stringify({ ...c, ...store ? { openspecStore: store } : {}, ...slotsJson() }, null, 2));
     else if (!steps) {
       io.out(`Up to date for Atticus ${version}.`);
       if (store)
@@ -618,6 +661,9 @@ async function upgradeCommand(root, o, io, version = VERSION) {
         io.out(`  Make this metarepo the OpenSpec store ${store.id} (beta): ${STORE_MARKER}`);
       else if (store)
         io.out(storeLine(store));
+      if (slots.pending)
+        for (const l of slotsLines())
+          io.out(`  ${l}`);
     }
     return o.check && steps ? 1 : 0;
   }
@@ -626,6 +672,13 @@ async function upgradeCommand(root, o, io, version = VERSION) {
   const stampTime = now.toISOString().replace(/\.\d{3}Z$/, "Z");
   const backup = join(root, ".atticus", "backups", stampTime.replace(/[-:]/g, "").replace("T", "-").replace("Z", ""));
   const changed = [];
+  const named = [".atticus/.gitignore", ...c.pending.flatMap((p) => p.files)];
+  const before = await contentOf(root, named);
+  const keep = async () => {
+    const after = await contentOf(root, named);
+    const touched = [.../* @__PURE__ */ new Set([...before.keys(), ...after.keys()])].filter((f) => before.get(f) !== after.get(f));
+    await recordUpgraded(root, { add: [...changed, ...touched, STAMP_REL] });
+  };
   if (c.pending.length) {
     await mkdir(backup, { recursive: true });
     await ensureLocalIgnore(root);
@@ -646,6 +699,7 @@ async function upgradeCommand(root, o, io, version = VERSION) {
         changed.push(...await m.apply(root));
       } catch (e) {
         const done = c.pending.slice(0, c.pending.indexOf(p)).map((x) => x.id);
+        await keep().catch(() => void 0);
         throw new Error(`${e instanceof Error ? e.message : String(e)} The files as they were before this upgrade are in ${relative(root, backup).split(sep).join("/")}${done.length ? `; these steps had already run: ${done.join(", ")}` : ""}. Run atticus upgrade again once it's fixed.`, { cause: e });
       }
     }
@@ -657,7 +711,11 @@ async function upgradeCommand(root, o, io, version = VERSION) {
     upgradedBy: by,
     migrations: [.../* @__PURE__ */ new Set([...c.stamp?.migrations ?? [], ...MIGRATIONS.map((m) => m.id)])]
   });
-  await writeFileAtomic(join(root, STAMP_FILE), (0, import_yaml.stringify)(stamp));
+  const slotsApply = o.yes === true && (!slots.differs.length || o.acceptChanges === slots.differs.length);
+  const stampCurrent = !!c.stamp && !newerThan(version, c.stamp.atticus);
+  const onlyShown = !c.pending.length && store?.action !== "create" && stampCurrent && slots.pending && !slotsApply;
+  if (!onlyShown)
+    await writeFileAtomic(join(root, STAMP_FILE), (0, import_yaml.stringify)(stamp));
   if (store?.action === "create") {
     await writeStoreMarker(root, {
       id: store.id,
@@ -665,30 +723,88 @@ async function upgradeCommand(root, o, io, version = VERSION) {
     });
     changed.push(STORE_MARKER);
   }
+  if (c.pending.length && slots.pending) {
+    slots = await planUpgradeToSlots(root);
+    view = await upgradeSlotsView(root, slots);
+  }
+  let slotsDone = void 0;
+  if (slots.pending) {
+    const accepted = !slots.differs.length || o.acceptChanges === slots.differs.length;
+    if (!o.yes || !accepted)
+      slotsDone = o.yes ? "refused" : "shown";
+    else {
+      const { acquireLock, LockHeldError } = await import("./chunk-PPKH6ULR.js");
+      await (await import("./chunk-PVJZR4JB.js")).afterListed();
+      let lock;
+      try {
+        lock = await acquireLock(root, "scan", "atticus upgrade --yes");
+      } catch (e) {
+        if (e instanceof LockHeldError) {
+          io.err(e.message);
+          await keep().catch(() => void 0);
+          return 1;
+        }
+        throw e;
+      }
+      try {
+        const { upgradePlanHash } = await import("./chunk-MSNEGKI3.js");
+        const again = await planUpgradeToSlots(root);
+        if (upgradePlanHash(root, again) !== upgradePlanHash(root, slots)) {
+          slotsDone = "changed";
+        } else {
+          slotsDone = await applyUpgradeToSlots(root, slots, slots.differs.length ? { acceptChanges: slots.differs.length } : {}) ?? 0;
+          changed.push(...slots.writes.map((w) => relative(root, w.path).split(sep).join("/")));
+        }
+      } finally {
+        await lock.release();
+      }
+    }
+  }
+  if (!onlyShown)
+    await keep();
   if (o.json)
     io.out(JSON.stringify({
       upgraded: c.pending.map((p) => p.id),
       files: changed,
-      stamp,
-      ...store ? { openspecStore: store } : {}
+      // The stamp written; none when the run wrote nothing (only the slots step shown).
+      ...onlyShown ? {} : { stamp },
+      ...store ? { openspecStore: store } : {},
+      ...slots.pending ? {
+        ...slotsJson(),
+        slotsStep: typeof slotsDone === "number" ? "applied" : slotsDone ?? "none"
+      } : {}
     }, null, 2));
   else {
     if (c.pending.length) {
       for (const p of c.pending)
         io.out(`Done: ${p.summary} (${p.files.length} file${p.files.length === 1 ? "" : "s"})`);
       io.out(`The files as they were are in ${backup}.`);
-    } else if (store?.action !== "create")
+    } else if (store?.action !== "create" && !onlyShown)
       io.out(`Nothing to change for Atticus ${version}.`);
     if (store)
       io.out(storeLine(store));
-    io.out(`Recorded Atticus ${version} in ${STAMP_FILE.split("\\").join("/")}. Commit the changes in a pull request.`);
+    if (!onlyShown)
+      io.out(`Recorded Atticus ${version} in ${STAMP_FILE.split("\\").join("/")}. Commit the changes in a pull request.`);
+    if (slots.pending) {
+      for (const l of slotsLines())
+        (slotsDone === "refused" ? io.err : io.out)(l);
+      if (slotsDone === "shown")
+        io.out("Nothing of it written yet: atticus upgrade --yes applies this step.");
+      else if (slotsDone === "refused")
+        io.err(o.acceptChanges !== void 0 ? `Nothing of it written: --accept-changes ${o.acceptChanges} doesn't name the ${slots.differs.length} listed.` : `Nothing of it written: the first build changes the catalog, so it waits for atticus upgrade --yes --accept-changes ${slots.differs.length}.`);
+      else if (slotsDone === "changed")
+        io.err("Nothing of it written: what the step would write isn't what it listed any more (another command wrote meanwhile). Run atticus upgrade again to list it.");
+      else
+        io.out("Done: the catalog is adopted into catalog/sources/ (atticus catalog undo takes it back).");
+    }
   }
-  return 0;
+  return slotsDone === "refused" || slotsDone === "changed" ? 1 : 0;
 }
 
 export {
   STAMP_FILE,
   MIGRATIONS,
+  contentOf,
   readStamp,
   newerAtticusOf,
   newerWords,

package/dist/{chunk-EVKDWJ5Y.js → chunk-LKLB5IJ7.js}

@@ -5,14 +5,14 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   repoFor
-} from "./chunk-PBDIVTFL.js";
+} from "./chunk-FADIWOA5.js";
 import {
   draftRepoType,
   matchRepoType
-} from "./chunk-2HDNOUJU.js";
+} from "./chunk-6H62UHY5.js";
 import {
   fsRepo
-} from "./chunk-UFIQ5FWY.js";
+} from "./chunk-3M3MDBOG.js";
 import {
   RULE_WORDS,
   TERM_STEP,
@@ -22,7 +22,7 @@ import {
   orgPackDirOf,
   termAnswerNote,
   termOfQuestion
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   CONVENTIONS_SCHEMA_VERSION,
   ChecklistPack,
@@ -33,7 +33,7 @@ import {
   RecordId,
   RepoType,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-VIQHZA53.js → chunk-LP6BFBE5.js}

@@ -17,12 +17,12 @@ import {
   phaseGates,
   statePhase,
   wroteThis
-} from "./chunk-WH3ZFLXT.js";
+} from "./chunk-YBAJ5SAR.js";
 import {
   daysBetween,
   knowledgeGaps,
   newestEvidence
-} from "./chunk-K3QKOVZN.js";
+} from "./chunk-N5DLB74D.js";
 import {
   BREAKING_SPEC,
   INSTRUCTION_RULES,
@@ -33,7 +33,7 @@ import {
   screenText,
   settle,
   toRunSummary
-} from "./chunk-ZDA72732.js";
+} from "./chunk-2MRYL45Z.js";
 import {
   ASKED_GAP_STEP,
   HOSTS_STEP,
@@ -61,10 +61,10 @@ import {
   stateDirOf,
   toCanonicalYaml,
   writeQuestion
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   writeFileAtomic
-} from "./chunk-MEMEO7YO.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   AgentDefinition,
   ChecklistPack,
@@ -87,7 +87,7 @@ import {
   isCriticQuestion,
   lensCovers,
   questionOfLens
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-FIZ5LYL2.js → chunk-LQEMCF43.js}

@@ -11,22 +11,23 @@ import {
   editRepoBuild,
   editRepoDescription,
   repoBranches
-} from "./chunk-H7CSCA73.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-XIJBQM45.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-LAPVW2F6.js";
+import "./chunk-6H62UHY5.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-4NPWOUI2.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 {
   RepoEditError,

package/dist/{chunk-RO6BE7ZS.js → chunk-LTVOQJKT.js}

@@ -6,14 +6,14 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   listRuns,
   runTranscript
-} from "./chunk-R2FUFBHW.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-EFDUC35B.js";
+import "./chunk-2MRYL45Z.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/runs-commands.js

package/dist/{chunk-C3TBDX7Y.js → chunk-M25UUEKC.js}

@@ -7,33 +7,34 @@ import {
   ConformError,
   conformChange,
   conformanceOf
-} from "./chunk-LY7DOYX2.js";
-import "./chunk-DPH4BS3F.js";
-import "./chunk-IBIIKUC7.js";
-import "./chunk-SAPX3PVK.js";
+} from "./chunk-7LOXUBRB.js";
+import "./chunk-L3KSU4QU.js";
+import "./chunk-4BK5EJ2C.js";
 import "./chunk-MUWDB4R4.js";
-import "./chunk-CSHJZFOE.js";
-import "./chunk-5A4RHEEL.js";
-import "./chunk-VIQHZA53.js";
-import "./chunk-WH3ZFLXT.js";
-import "./chunk-UTZMF5CV.js";
-import "./chunk-6U65YB54.js";
-import "./chunk-SZDOBIWE.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-XIJBQM45.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+import "./chunk-DTW37FJ6.js";
+import "./chunk-INCFIDCB.js";
+import "./chunk-G33UIUG3.js";
+import "./chunk-LP6BFBE5.js";
+import "./chunk-YBAJ5SAR.js";
+import "./chunk-23TTURB2.js";
+import "./chunk-6H62UHY5.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-4NPWOUI2.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";
 
 // packages/cli/dist/change-conform.js

package/dist/{chunk-PXMV2LLY.js → chunk-M65AZ4ZE.js}

@@ -8,14 +8,12 @@ import {
 } from "./chunk-5F7GFN2F.js";
 import {
   AREAS,
-  commandCatalog
-} from "./chunk-IGOE6KPG.js";
-import {
+  commandCatalog,
   isLegacy,
   topHelp
-} from "./chunk-24OXGB3P.js";
+} from "./chunk-I34CXV2C.js";
+import "./chunk-R4TUWD4C.js";
 import "./chunk-4Q3NN7VF.js";
-import "./chunk-QA4O2GGC.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/help-commands.js