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

package/dist/chunk-3G6S7LAA.js

@@ -0,0 +1,43 @@
+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 {
+  effectiveRules,
+  exampleOf,
+  kindGlob,
+  orgRulesLacking,
+  readingRulesText,
+  ruleFromPairing,
+  ruleId,
+  ruleIds,
+  ruleMatches,
+  rulesDirOf,
+  rulesLackingAll
+} from "./chunk-GIFMBCTW.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 "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
+import "./chunk-TV45EUGM.js";
+export {
+  effectiveRules,
+  exampleOf,
+  kindGlob,
+  orgRulesLacking,
+  readingRulesText,
+  ruleFromPairing,
+  ruleId,
+  ruleIds,
+  ruleMatches,
+  rulesDirOf,
+  rulesLackingAll
+};

package/dist/{chunk-7TOAS7KI.js → chunk-3J5I7ZOU.js}

@@ -5,20 +5,20 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   excludesOf
-} from "./chunk-AB5E5HCN.js";
+} from "./chunk-Q46QDDMF.js";
 import {
   dirSource,
   houseImportsUntaught,
   readRulesOf
-} from "./chunk-IPSFMTK2.js";
+} from "./chunk-JYMIB5XY.js";
 import {
   globToRegExp
-} from "./chunk-TLDL2ZZI.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   conventionsOf,
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/house-imports.js
 async function houseUntaughtOf(root, repo, o) {

package/dist/{chunk-TAKAEJRD.js → chunk-3LZ6P5EP.js}

@@ -5,7 +5,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   require_dist
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/chunk-3SSTNB4E.js

@@ -0,0 +1,191 @@
+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 {
+  makeRunId
+} from "./chunk-QHJJMZLX.js";
+import {
+  runsDirOf,
+  runsRelOf
+} from "./chunk-PAINMSID.js";
+import {
+  writeFileAtomic
+} from "./chunk-ODMBPDDV.js";
+
+// packages/cli/dist/decide-handoff.js
+import { createHash } from "node:crypto";
+import { mkdir, readdir, readFile, stat } from "node:fs/promises";
+import { join } from "node:path";
+var DECIDE_AGENTS = {
+  questions: "decide-propose",
+  links: "decide-match"
+};
+var PROPOSE_CHANGE = "questions-propose";
+var matchChangeOf = (from) => `match-${from}`;
+var sha256 = (text) => createHash("sha256").update(text).digest("hex");
+var runDir = (root, change, runId) => join(runsDirOf(root), change, runId);
+async function startDecideRun(root, o) {
+  const now = o.now ?? /* @__PURE__ */ new Date();
+  let runId = makeRunId(now);
+  while (await stat(runDir(root, o.change, runId)).catch(() => void 0))
+    runId = makeRunId(now);
+  const dir = runDir(root, o.change, runId);
+  await mkdir(dir, { recursive: true });
+  await writeFileAtomic(join(dir, "prompt.md"), o.prompt.endsWith("\n") ? o.prompt : `${o.prompt}
+`);
+  const run = {
+    runId,
+    request: { change: o.change, agent: DECIDE_AGENTS[o.kind], outputPath: o.outputPath },
+    runtime: "hand-off",
+    state: "waiting",
+    attempt: 1,
+    startedAt: now.toISOString(),
+    errors: [],
+    decide: o.decide
+  };
+  await saveRun(root, run);
+  return { ...run, promptRel: `${runsRelOf(root)}/${o.change}/${runId}/prompt.md` };
+}
+async function saveRun(root, run) {
+  await writeFileAtomic(join(runDir(root, run.request.change, run.runId), "run.json"), JSON.stringify(run, null, 2) + "\n");
+}
+var isDecide = (x) => {
+  const r = x;
+  return r?.runtime === "hand-off" && !!r.decide && (r.request?.agent === DECIDE_AGENTS.questions || r.request?.agent === DECIDE_AGENTS.links);
+};
+async function readRun(file) {
+  const text = await readFile(file, "utf8").catch(() => void 0);
+  if (!text)
+    return void 0;
+  try {
+    const r = JSON.parse(text);
+    return isDecide(r) ? r : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function findDecideRun(root, runId) {
+  if (!/^run-[0-9a-z-]+$/.test(runId))
+    return void 0;
+  for (const change of await readdir(runsDirOf(root)).catch(() => [])) {
+    const r = await readRun(join(runsDirOf(root), change, runId, "run.json"));
+    if (r)
+      return r;
+  }
+  return void 0;
+}
+var open = (r) => r.state === "waiting" || r.state === "prepared" || r.state === "failed";
+async function openDecideRun(root, change, pick = () => true) {
+  const ids = (await readdir(join(runsDirOf(root), change)).catch(() => [])).filter((n) => n.startsWith("run-")).sort().reverse();
+  for (const id of ids) {
+    const r = await readRun(join(runsDirOf(root), change, id, "run.json"));
+    if (r && open(r) && pick(r))
+      return r;
+  }
+  return void 0;
+}
+var openMatchRun = (root, from, to) => openDecideRun(root, matchChangeOf(from), (r) => r.decide.kind === "links" && r.decide.from === from && (r.decide.to.repo ?? "") === (to.repo ?? "") && (r.decide.to.system ?? "") === (to.system ?? ""));
+async function finishDecideRun(root, run, o) {
+  const done = {
+    ...run,
+    state: o.state,
+    finishedAt: (o.now ?? /* @__PURE__ */ new Date()).toISOString(),
+    errors: o.errors ?? []
+  };
+  await saveRun(root, done);
+  return done;
+}
+async function decideRunDone(root, runId, io, o = {}) {
+  const run = await findDecideRun(root, runId);
+  if (!run) {
+    io.err(`There is no hand-off run ${runId} to decide from.`);
+    return 2;
+  }
+  if (!open(run)) {
+    io.err(`Run ${runId} is already ${run.state}.`);
+    return 2;
+  }
+  if (run.decide.kind === "questions")
+    return proposeDone(root, run, io, o);
+  const { candidatesOf } = await import("./chunk-PRZ7KMWL.js");
+  const { view, facts } = await candidatesOf(root, run.decide.from, run.decide.to);
+  const { matchDone, matchLines } = await import("./chunk-JU4QNJSR.js");
+  const m = await matchDone(root, { view, facts, run, ...o.now ? { now: o.now } : {} });
+  if (m.state !== "done") {
+    io.err(m.error ?? `The answer isn't written yet: ${m.answer ?? "the answer file"}.`);
+    return 1;
+  }
+  for (const l of matchLines(m, run.decide.from, view.toName, run.decide.to))
+    io.out(l);
+  return 0;
+}
+async function proposedSince(root, before) {
+  const { proposalsSnapshot } = await import("./chunk-LU4MQVAL.js");
+  const after = await proposalsSnapshot(root);
+  return new Set([...after].filter(([id, text]) => before[id] !== sha256(text)).map(([id]) => id));
+}
+async function proposeDone(root, run, io, o) {
+  if (run.decide.kind !== "questions")
+    return 2;
+  const { inAcpSession } = await import("./chunk-LU4MQVAL.js");
+  if (inAcpSession()) {
+    io.err(`Run ${run.runId} decides as the AI only on a person's Done: press Done in the app, or run atticus handoff done ${run.runId} outside the Copilot session.`);
+    return 1;
+  }
+  const ids = await proposedSince(root, run.decide.before);
+  if (!ids.size) {
+    const why = "No proposal was written or changed since this hand-off: run /atticus-propose in a new Copilot Chat (agent mode) or Claude Code session, then Done again.";
+    await finishDecideRun(root, run, {
+      state: "failed",
+      errors: [why],
+      ...o.now ? { now: o.now } : {}
+    });
+    io.err(why);
+    return 1;
+  }
+  const { decideAnswers } = await import("./chunk-LU4MQVAL.js");
+  const d = await decideAnswers(root, {
+    run: run.runId,
+    runtime: "hand-off",
+    ids,
+    ...o.now ? { now: o.now } : {}
+  });
+  await finishDecideRun(root, run, { state: "validated", ...o.now ? { now: o.now } : {} });
+  io.out(`Read ${ids.size} proposal${ids.size === 1 ? "" : "s"} from hand-off run ${run.runId}.`);
+  for (const l of decidedAnswerLines(d, run.runId))
+    io.out(l);
+  return 0;
+}
+function decidedAnswerLines(d, runId) {
+  const out = [];
+  if (!d)
+    out.push("runtime.yaml's decide.questions is propose: each proposal waits on its question for a person to accept or answer otherwise.");
+  if (d?.paused)
+    out.push(`Deciding is paused: ${d.paused}`);
+  if (d?.applied.length) {
+    out.push(`Detected by AI: ${d.applied.length} answer${d.applied.length === 1 ? "" : "s"} applied in batch ${d.batch} (by AI, run ${runId}):`);
+    for (const a of d.applied)
+      out.push(`  ${a.id}: option ${a.option} (${a.bar})`);
+    out.push(`Correct one with atticus questions correct <id> --option <n> | --none; undo them all with atticus questions undo ${d.batch}.`);
+  }
+  for (const k of d?.kept ?? [])
+    out.push(`  kept as a proposal: ${k.id} (${k.why})`);
+  return out;
+}
+
+export {
+  DECIDE_AGENTS,
+  PROPOSE_CHANGE,
+  matchChangeOf,
+  sha256,
+  startDecideRun,
+  findDecideRun,
+  openDecideRun,
+  openMatchRun,
+  finishDecideRun,
+  decideRunDone,
+  proposedSince,
+  decidedAnswerLines
+};

package/dist/chunk-3TD6S4TC.js

@@ -0,0 +1,49 @@
+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 {
+  AUDIT_WORDS,
+  answerAudit,
+  auditCommand,
+  auditLines,
+  defaultAuditSeed,
+  precisionOf,
+  prepareAudit,
+  tallyWords,
+  writeAudit
+} from "./chunk-7FUIVIBG.js";
+import "./chunk-LN77DXBM.js";
+import "./chunk-L4CESDPB.js";
+import "./chunk-U3NBK4EU.js";
+import "./chunk-455SYIIE.js";
+import "./chunk-GIFMBCTW.js";
+import "./chunk-MD7KUEJ3.js";
+import "./chunk-Q46QDDMF.js";
+import "./chunk-TGVVUKTG.js";
+import "./chunk-3AQ2R5NL.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-API5TOUB.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
+import "./chunk-TV45EUGM.js";
+export {
+  AUDIT_WORDS,
+  answerAudit,
+  auditCommand,
+  auditLines,
+  defaultAuditSeed,
+  precisionOf,
+  prepareAudit,
+  tallyWords,
+  writeAudit
+};

package/dist/{chunk-UUL6ZGMU.js → chunk-3UTYPHN3.js}

@@ -10,7 +10,7 @@ function draftCheckTool(root, request) {
   if (!request.selfCheck || !/^(feature|architecture|stories|small)-answer\.yaml$/.test(request.outputPath))
     return void 0;
   let box;
-  const planner = () => box ??= import("./chunk-NRPMPZWJ.js").then((p) => p.draftCheckBox(root, request));
+  const planner = () => box ??= import("./chunk-NTAVOWYD.js").then((p) => p.draftCheckBox(root, request));
   return {
     definitions: [
       {

package/dist/{chunk-6AP2ZUUM.js → chunk-3WON4G3M.js}

@@ -8,11 +8,11 @@ import {
   changesDirOf,
   orgPackDirOf,
   require_dist
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   ensureLocalIgnore,
   redactText
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-AXY6LBW4.js → chunk-42EPP7OB.js}

@@ -6,18 +6,18 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   aliasCommand,
   reconcileCommand
-} from "./chunk-OXOSJXOI.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-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-YZDZOEV4.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 "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
   aliasCommand,

package/dist/{chunk-QKMDT7VU.js → chunk-455SYIIE.js}

@@ -9,12 +9,12 @@ import {
   planBatches,
   reachableModels,
   readingRank
-} from "./chunk-IPSFMTK2.js";
+} from "./chunk-JYMIB5XY.js";
 import {
   estimateTokens,
   neutralise,
   wrapData
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
 
 // packages/cli/dist/map-reach.js
 var CLIENT_ONLY_WHY = "reached only from an outbound client; --models reachable reads them";

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

@@ -7,19 +7,19 @@ import {
   ATTICUS_FOLDER_IGNORE,
   CHECKLISTS_README,
   STARTER_CHECKLISTS_README
-} from "./chunk-RTUUX7PX.js";
+} from "./chunk-2HTEMYTB.js";
 import {
   openspecRootOf,
   rewriteStories
-} from "./chunk-XO5RQKNM.js";
+} from "./chunk-BEPCKDCP.js";
 import {
   STARTER_REVIEW_PATH,
   readPackFiles,
   starterReviewText
-} from "./chunk-VEJYZEPC.js";
+} from "./chunk-K332XW7K.js";
 import {
   metarepoOrigin
-} from "./chunk-IOW6BF3U.js";
+} from "./chunk-HSZMPH5T.js";
 import {
   ORG_FLOW_VERSION,
   STORE_MARKER,
@@ -28,16 +28,15 @@ import {
   storeIdOf,
   writeOrgFlowSchema,
   writeStoreMarker
-} from "./chunk-43E6XX67.js";
+} from "./chunk-D2WSW4GU.js";
 import {
-  VERSION,
-  versionAtLeast
-} from "./chunk-S5PSGAQ2.js";
+  VERSION
+} from "./chunk-VUVGX5L2.js";
 import {
   IGNORED,
   ensureGitignore,
   gitUser
-} from "./chunk-ZQC7MNQB.js";
+} from "./chunk-XOL3GFW2.js";
 import {
   MetarepoStamp,
   WORKSPACE_SCHEMA_VERSION,
@@ -49,23 +48,25 @@ import {
   loadOrgPack,
   migrateCatalog,
   migrateChangeTypesText,
+  migrateCorrections,
   migrateGatesText,
   migrateManifests,
   migrateQuestions,
   migrateRolesText,
   migrateRuntimeText,
   migrateRuntimeV3Text,
+  migrateRuntimeV4Text,
   migrateSourcesText,
   orgPackDirOf,
   require_dist,
   specsDirOf,
   specsRelOf
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   LOCAL_ONLY,
   ensureLocalIgnore,
   writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -73,7 +74,7 @@ import {
 // packages/cli/dist/upgrade.js
 var import_yaml = __toESM(require_dist(), 1);
 import { cp, mkdir, readdir, readFile, stat } from "node:fs/promises";
-import { join } from "node:path";
+import { join, relative, sep } from "node:path";
 var STAMP_FILE = join(".atticus", "metarepo.yaml");
 var rel = (prefix, files) => files.map((f) => `${prefix}/${f}`);
 var MIGRATIONS = [
@@ -162,7 +163,7 @@ var MIGRATIONS = [
   {
     // The id is kept as it was first shipped (stamps record it); the step writes the current version.
     id: "questions-v3",
-    summary: "Questions at schema version 4: 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), and a question the code later disagreed with keeps why it reopened and the answer it had (ADR 0162)",
+    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)
   },
@@ -296,14 +297,20 @@ var MIGRATIONS = [
     // call: short story files, task prompts in tasks/, tasks numbered per story, OpenSpec specs.
     id: "stories-b-short",
     summary: "Each change's stories in the short form, with OpenSpec spec deltas and a proposal, from the kept stories answer (no model call; ADR 0124 addendum B-short)",
+    // The whole change folder: writing the stories again also writes stories.md, tasks.md,
+    // requests.md, the proposal, specs/, the task prompts and the needs files, all backed up.
     async pending(root) {
-      return (await longStories(root)).map((c) => `${changesRelOf(root)}/${c}/stories`);
+      return (await longStories(root)).map((c) => `${changesRelOf(root)}/${c}`);
     },
     async apply(root) {
       const out = [];
-      for (const c of await longStories(root))
-        for (const f of await rewriteStories(root, c).catch(() => []))
+      for (const c of await longStories(root)) {
+        const files = await rewriteStories(root, c).catch((e) => {
+          throw new Error(`The stories of ${c} couldn't be written again (${e instanceof Error ? e.message : String(e)}).`, { cause: e });
+        });
+        for (const f of files)
           out.push(`${changesRelOf(root)}/${c}/${f}`);
+      }
       return out;
     }
   },
@@ -318,6 +325,39 @@ var MIGRATIONS = [
     summary: "repos.manifest.yaml at version 3: a repo can give the base path it answers under on a shared host (ADR 0134)",
     pending: (root) => migrateManifests(root, { dryRun: true, to: 3 }),
     apply: (root) => migrateManifests(root, { to: 3 })
+  },
+  // ADR 0181: the version-4 files: only the number changes; version 5 adds the evidence source
+  // `ai` with its run (a link the AI decided, flagged joined-by-ai).
+  catalogStep("catalog-schema-v5", "Catalog records at schema version 5: a link can be the AI's, with the run that decided it (ADR 0181)", [4]),
+  {
+    // ADR 0181: a runtime.yaml that sets `decide` needs version 4; any other file means the same
+    // at 1 to 3 and is left as it is.
+    id: "runtime-v4",
+    summary: "runtime.yaml at version 4 where it sets decide: whether the AI decides pairings and option questions itself (ADR 0181); the number only",
+    async pending(root) {
+      const rel2 = packRel(root, "runtime.yaml");
+      const text = await readFile(join(root, rel2), "utf8").catch(() => void 0);
+      return text !== void 0 && migrateRuntimeV4Text(text).changed ? [rel2] : [];
+    },
+    async apply(root) {
+      const rel2 = packRel(root, "runtime.yaml");
+      const text = await readFile(join(root, rel2), "utf8").catch(() => void 0);
+      if (text === void 0)
+        return [];
+      const r = migrateRuntimeV4Text(text);
+      if (!r.changed)
+        return [];
+      await writeFileAtomic(join(root, rel2), r.text);
+      return [rel2];
+    }
+  },
+  {
+    // ADR 0181: a corrections line that uses version 2's fields (ai, batch, rule, match, unlink)
+    // but says version 1 (written by hand) says 2; every other line means the same at 1.
+    id: "corrections-v2",
+    summary: "Corrections lines at version 2 where they use its fields: an AI pairing, a batch, a rule, an unlink (ADR 0181); the number only",
+    pending: (root) => migrateCorrections(root, { dryRun: true }),
+    apply: (root) => migrateCorrections(root)
   }
 ];
 var orgFlowRel = (root) => `${layoutOf(root).openspec.replace(/\/+$/, "")}/schemas/org-flow/schema.yaml`;
@@ -413,7 +453,45 @@ async function readStamp(root) {
     return void 0;
   }
 }
-var newerThan = (a, b) => !versionAtLeast(b, a.replace(/-.*$/, ""));
+function newerThan(a, b) {
+  const split = (v) => {
+    const [core, pre] = v.trim().replace(/^v/, "").split(/-(.*)/s, 2);
+    return { core: (core ?? "").split(".").map((n) => Number(n) || 0), pre: pre ?? "" };
+  };
+  const x = split(a);
+  const y = split(b);
+  for (let i = 0; i < Math.max(x.core.length, y.core.length); i++) {
+    const d = (x.core[i] ?? 0) - (y.core[i] ?? 0);
+    if (d)
+      return d > 0;
+  }
+  if (x.pre === y.pre)
+    return false;
+  if (!x.pre)
+    return true;
+  if (!y.pre)
+    return false;
+  const xp = x.pre.split(".");
+  const yp = y.pre.split(".");
+  for (let i = 0; i < Math.max(xp.length, yp.length); i++) {
+    const p = xp[i];
+    const q = yp[i];
+    if (p === void 0)
+      return false;
+    if (q === void 0)
+      return true;
+    if (p === q)
+      continue;
+    const pn = /^\d+$/.test(p);
+    const qn = /^\d+$/.test(q);
+    if (pn && qn)
+      return Number(p) > Number(q);
+    if (pn !== qn)
+      return !pn;
+    return p > q;
+  }
+  return false;
+}
 async function upgradeCheck(root, version = VERSION) {
   const [stamp, found] = await Promise.all([
     readStamp(root),
@@ -423,7 +501,7 @@ async function upgradeCheck(root, version = VERSION) {
   return {
     atticus: version,
     ...stamp ? { stamp } : {},
-    newer: !!stamp && newerThan(stamp.atticus.replace(/-.*$/, ""), version.replace(/-.*$/, "")),
+    newer: !!stamp && newerThan(stamp.atticus, version),
     pending
   };
 }
@@ -498,10 +576,21 @@ async function upgradeCommand(root, o, io, version = VERSION) {
     await ensureLocalIgnore(root);
     for (const p of c.pending)
       for (const f of p.files)
-        await cp(join(root, ...f.split("/")), join(backup, ...f.split("/"))).catch(() => void 0);
+        await cp(join(root, ...f.split("/")), join(backup, ...f.split("/")), {
+          recursive: true
+        }).catch((e) => {
+          if (e.code === "ENOENT")
+            return;
+          throw new Error(`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);
-      changed.push(...await m.apply(root));
+      try {
+        changed.push(...await m.apply(root));
+      } catch (e) {
+        const done = c.pending.slice(0, c.pending.indexOf(p)).map((x) => x.id);
+        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 });
+      }
     }
   }
   const stamp = MetarepoStamp.parse({
@@ -544,6 +633,7 @@ export {
   STAMP_FILE,
   MIGRATIONS,
   readStamp,
+  newerThan,
   upgradeCheck,
   upgradeCommand
 };

package/dist/{chunk-75MYLZSB.js → chunk-4CLK2RJO.js}

@@ -3,9 +3,6 @@ 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 {
-  table
-} from "./chunk-VOGCSYOI.js";
 import {
   QueryError,
   askLookup,
@@ -13,10 +10,13 @@ import {
   openIndex,
   runContextTool,
   translate
-} from "./chunk-YXUIUOQZ.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-5WERBKLE.js";
+import {
+  table
+} from "./chunk-VOGCSYOI.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/index-commands.js