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

package/dist/chunk-OTLDSZDV.js

@@ -0,0 +1,69 @@
+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 {
+  assistantFiles,
+  describeRun,
+  driftCommand,
+  runDone,
+  specHandDown,
+  specHandUp,
+  taskHandoff,
+  taskRun,
+  taskRunNotWaiting
+} from "./chunk-VTZMAJ3W.js";
+import {
+  isTaskRun
+} from "./chunk-6MUGR4LS.js";
+import "./chunk-DOBQKHIF.js";
+import "./chunk-JENSEMXF.js";
+import "./chunk-O7FDLW7L.js";
+import "./chunk-HNM2YQT2.js";
+import "./chunk-PAQ2AS5E.js";
+import "./chunk-RUGXBPWI.js";
+import "./chunk-BTGPE6CR.js";
+import "./chunk-MUWDB4R4.js";
+import "./chunk-ZQ7SKESZ.js";
+import "./chunk-UGUP3ZM6.js";
+import "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-UF4AZOZB.js";
+import "./chunk-YHCMZC2J.js";
+import "./chunk-VOGCSYOI.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./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-PKBHS4AA.js";
+import {
+  runtimeForCli
+} from "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  assistantFiles,
+  describeRun,
+  driftCommand,
+  isTaskRun,
+  runDone,
+  runtimeForCli,
+  specHandDown,
+  specHandUp,
+  taskHandoff,
+  taskRun,
+  taskRunNotWaiting
+};

package/dist/{chunk-L4CESDPB.js → chunk-OUBGGKDU.js}

@@ -7,7 +7,7 @@ import {
   effectiveComponentTypes,
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/component-types.js
 async function componentTypesAt(root, given) {

package/dist/{chunk-4FOAYLI4.js → chunk-OWNCM4ZN.js}

@@ -5,18 +5,18 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   contractCheckOf
-} from "./chunk-GX74YWR7.js";
+} from "./chunk-T6DQR5TV.js";
 import {
   readCatalog
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   frameworkFacts,
   frameworkGaps
-} from "./chunk-JYMIB5XY.js";
+} from "./chunk-CXJ6FUKN.js";
 import {
   baseClonePath,
   loadRepos
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-PKBHS4AA.js";
 import {
   auditItemHolds,
   auditPrecision,
@@ -28,9 +28,11 @@ import {
   isAdopted,
   listQuestions,
   parseAuditFile,
-  parseFacts,
+  parseFacts
+} from "./chunk-Q2TECDIT.js";
+import {
   require_dist
-} from "./chunk-PAINMSID.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -307,7 +309,7 @@ async function trustView(root) {
 }
 function uiTrustRoutes(r, ctx) {
   return r.add("GET", "/api/trust", async () => ({ status: 200, body: await trustView(ctx.root) })).add("GET", "/api/trust/fresh", async () => {
-    const { estateFreshness } = await import("./chunk-D5KV5PSK.js");
+    const { estateFreshness } = await import("./chunk-AFZ3QA6W.js");
     const v = await estateFreshness(ctx.root);
     const body = {
       ...v,

package/dist/{chunk-4B6BT75O.js → chunk-P2V7QW4D.js}

@@ -7,19 +7,19 @@ import {
   ATTICUS_FOLDER_IGNORE,
   CHECKLISTS_README,
   STARTER_CHECKLISTS_README
-} from "./chunk-2HTEMYTB.js";
+} from "./chunk-Z5IA3WDR.js";
 import {
   openspecRootOf,
   rewriteStories
-} from "./chunk-BEPCKDCP.js";
+} from "./chunk-R7NYHMUU.js";
 import {
   STARTER_REVIEW_PATH,
   readPackFiles,
   starterReviewText
-} from "./chunk-K332XW7K.js";
+} from "./chunk-S4PMJU6H.js";
 import {
   metarepoOrigin
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   ORG_FLOW_VERSION,
   STORE_MARKER,
@@ -28,15 +28,15 @@ import {
   storeIdOf,
   writeOrgFlowSchema,
   writeStoreMarker
-} from "./chunk-D2WSW4GU.js";
+} from "./chunk-UUU4CLJG.js";
 import {
   VERSION
-} from "./chunk-VUVGX5L2.js";
+} from "./chunk-F3P7N7SF.js";
 import {
   IGNORED,
   ensureGitignore,
   gitUser
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-PKBHS4AA.js";
 import {
   MetarepoStamp,
   WORKSPACE_SCHEMA_VERSION,
@@ -58,15 +58,17 @@ import {
   migrateRuntimeV4Text,
   migrateSourcesText,
   orgPackDirOf,
-  require_dist,
   specsDirOf,
   specsRelOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 import {
   LOCAL_ONLY,
   ensureLocalIgnore,
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -83,6 +85,7 @@ var MIGRATIONS = [
   {
     id: "local-files-ignored",
     summary: "This machine's files kept out of Git (.atticus/.gitignore, ADR 0050)",
+    creates: true,
     async pending(root) {
       const text = await readFile(join(root, ".atticus", ".gitignore"), "utf8").catch(() => "");
       const have = new Set(text.split(/\r?\n/).map((l) => l.trim()));
@@ -96,6 +99,7 @@ var MIGRATIONS = [
   {
     id: "state-folders-ignored",
     summary: "Base clones, the index and run folders kept out of Git (metarepo .gitignore)",
+    creates: true,
     async pending(root) {
       if (isAdopted(root))
         return [];
@@ -165,11 +169,17 @@ var MIGRATIONS = [
     id: "questions-v3",
     summary: "Questions at schema version 5: a question can name the earlier one it may be the same as (ADR 0117), an answer can carry its rule and the proposal it accepted (ADR 0153), a question the code later disagreed with keeps why it reopened and the answer it had (ADR 0162), and a change's question carries the role that owns it, derived from the stage that asked when the file doesn't say (ADR 0181)",
     pending: (root) => migrateQuestions(root, { dryRun: true }),
-    apply: (root) => migrateQuestions(root)
+    apply: (root) => migrateQuestions(root),
+    async problems(root) {
+      const out = [];
+      await migrateQuestions(root, { dryRun: true, problems: out });
+      return out.map((p) => `${p.file}: ${p.message}`);
+    }
   },
   {
     id: "starter-review",
     summary: "The starter review: AI rules for the critic's lenses in checklists/review.yaml, for an org pack with no AI review of its own (ADR 0120)",
+    creates: true,
     async pending(root) {
       return (await starterReviewPlan(root)).map((f) => f.rel);
     },
@@ -410,7 +420,7 @@ function catalogStep(id, summary, versions) {
         versions,
         pendingOnly: dryRun
       });
-      out.push(...rel(`catalog/${sub}`, r.migrated));
+      out.push(...rel(`${layoutOf(root).catalog.replace(/\/+$/, "")}/${sub}`, r.migrated));
     }
     return out;
   };
@@ -446,12 +456,43 @@ function gatesRel(root) {
   return packRel(root, "gates.yaml");
 }
 async function readStamp(root) {
+  return (await readStampFile(root)).stamp;
+}
+async function readStampFile(root) {
+  let text;
   try {
-    const r = MetarepoStamp.safeParse((0, import_yaml.parse)(await readFile(join(root, STAMP_FILE), "utf8")));
-    return r.success ? r.data : void 0;
+    text = await readFile(join(root, STAMP_FILE), "utf8");
   } catch {
-    return void 0;
+    return {};
   }
+  let data;
+  try {
+    data = (0, import_yaml.parse)(text);
+  } catch (e) {
+    return { unread: { why: `not YAML: ${e.message.split("\n")[0]}` } };
+  }
+  const r = MetarepoStamp.safeParse(data);
+  if (r.success)
+    return { stamp: r.data };
+  const atticus = data?.atticus;
+  const why = r.error.issues.map((i) => `${i.path.join(".") || "(top)"}: ${i.message}`).join("; ");
+  return {
+    unread: {
+      ...typeof atticus === "string" && atticus.trim() ? { atticus: atticus.trim() } : {},
+      why
+    }
+  };
+}
+function newerAtticusOf(c) {
+  const u = c.unreadStamp?.atticus;
+  return c.stamp?.atticus ?? (u && newerThan(u, c.atticus) ? u : void 0);
+}
+function newerWords(c) {
+  const u = c.unreadStamp;
+  const v = newerAtticusOf(c);
+  if (v)
+    return `This metarepo was upgraded by Atticus ${v}; this is ${c.atticus}. Install ${v} or later before working in it, so nothing it wrote is lost.`;
+  return `This metarepo was upgraded by a newer or unknown Atticus${u?.atticus ? ` (${u.atticus})` : ""}: .atticus/metarepo.yaml isn't a stamp Atticus ${c.atticus} reads (${u?.why ?? "unreadable"}). Install it${u?.atticus ? ` (Atticus ${u.atticus} or later)` : ""} before working in this metarepo, so nothing it wrote is lost; or, if the file was edited by hand, put it back as it was committed. Nothing was changed.`;
 }
 function newerThan(a, b) {
   const split = (v) => {
@@ -493,16 +534,26 @@ function newerThan(a, b) {
   return false;
 }
 async function upgradeCheck(root, version = VERSION) {
-  const [stamp, found] = await Promise.all([
-    readStamp(root),
-    Promise.all(MIGRATIONS.map(async (m) => ({ m, files: await m.pending(root) })))
+  const [read, found] = await Promise.all([
+    readStampFile(root),
+    Promise.all(MIGRATIONS.map(async (m) => ({
+      m,
+      files: await m.pending(root),
+      problems: m.problems ? await m.problems(root) : []
+    })))
   ]);
+  const { stamp, unread } = read;
   const pending = found.filter((x) => x.files.length).map(({ m, files }) => ({ id: m.id, summary: m.summary, files }));
+  const problems = found.flatMap((x) => x.problems);
   return {
     atticus: version,
     ...stamp ? { stamp } : {},
-    newer: !!stamp && newerThan(stamp.atticus, version),
-    pending
+    // Round 49: a stamp that is there but isn't read is a newer or unknown Atticus's: never
+    // taken as no stamp, so this one never writes over it.
+    newer: stamp ? newerThan(stamp.atticus, version) : !!unread,
+    ...unread ? { unreadStamp: unread } : {},
+    pending,
+    ...problems.length ? { problems } : {}
   };
 }
 async function openspecStorePlan(root) {
@@ -535,11 +586,13 @@ function storeLine(s) {
 async function upgradeCommand(root, o, io, version = VERSION) {
   const c = await upgradeCheck(root, version);
   if (c.newer) {
-    io.err(`This metarepo was upgraded by Atticus ${c.stamp.atticus}; this is ${version}. Install ${c.stamp.atticus} or later before working in it, so nothing it wrote is lost.`);
+    io.err(newerWords(c));
     if (o.json)
       io.out(JSON.stringify(c, null, 2));
     return 1;
   }
+  for (const p of c.problems ?? [])
+    io.err(`Left as it is: ${p}`);
   const store = o.openspecStore ? await openspecStorePlan(root) : void 0;
   if (store?.action === "refused") {
     io.err(store.why);
@@ -574,15 +627,17 @@ async function upgradeCommand(root, o, io, version = VERSION) {
   if (c.pending.length) {
     await mkdir(backup, { recursive: true });
     await ensureLocalIgnore(root);
-    for (const p of c.pending)
+    for (const p of c.pending) {
+      const creates = MIGRATIONS.find((x) => x.id === p.id)?.creates === true;
       for (const f of p.files)
         await cp(join(root, ...f.split("/")), join(backup, ...f.split("/")), {
           recursive: true
         }).catch((e) => {
-          if (e.code === "ENOENT")
+          if (e.code === "ENOENT" && creates)
             return;
-          throw new Error(`Couldn't back up ${f} before upgrading (${e.message}); nothing was changed.`);
+          throw new Error(e.code === "ENOENT" ? `Couldn't back up ${f} before upgrading: the step ${p.id} would change it, but it isn't there; nothing was changed.` : `Couldn't back up ${f} before upgrading (${e.message}); nothing was changed.`);
         });
+    }
     for (const p of c.pending) {
       const m = MIGRATIONS.find((x) => x.id === p.id);
       try {
@@ -633,6 +688,8 @@ export {
   STAMP_FILE,
   MIGRATIONS,
   readStamp,
+  newerAtticusOf,
+  newerWords,
   newerThan,
   upgradeCheck,
   upgradeCommand