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

package/dist/{chunk-36RY7ZXM.js → chunk-WF7B67YE.js}

@@ -12,13 +12,13 @@ import {
   readPlan,
   readView,
   workingDays
-} from "./chunk-2V2ZPQQU.js";
+} from "./chunk-6PPOWY5E.js";
 import {
   traceMatrix
-} from "./chunk-EZIN5E5B.js";
+} from "./chunk-BTGPE6CR.js";
 import {
   SYNC_FILE
-} from "./chunk-BEPCKDCP.js";
+} from "./chunk-R7NYHMUU.js";
 import {
   contentLines,
   docOf,
@@ -38,7 +38,7 @@ import {
   sectionLines,
   sectionMatching,
   tableWith
-} from "./chunk-K332XW7K.js";
+} from "./chunk-S4PMJU6H.js";
 import {
   changeFolder,
   changeReport,
@@ -47,17 +47,17 @@ import {
   outsideKindOf,
   outsideSystemsOf,
   outsideWords
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   fileStepStore,
   stepOfProvisional
-} from "./chunk-4KNOJC6J.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   readServiceRequestExports
-} from "./chunk-CPK7QSBG.js";
+} from "./chunk-QKUJMING.js";
 import {
   readChangeRepos
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-PKBHS4AA.js";
 import {
   BREAKING_SPEC,
   NAMES_SECRET_SPEC,
@@ -67,7 +67,7 @@ import {
   settle,
   tokenFormatIn,
   verdictOf
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-P32RUW3B.js";
 import {
   ChangeOutcomes,
   WORKSPACE_SCHEMA_VERSION,
@@ -75,9 +75,11 @@ import {
   fileJudgments,
   inputsDirOf,
   readRunSummary,
-  require_dist,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -442,6 +444,77 @@ async function judgedFor(ctx, spec, items) {
 // packages/release/dist/plan.js
 var RANK = { migration: 0, topic: 1, "gateway-route": 2, code: 3 };
 var cmp2 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+function orderSteps(keys, preds, byPrio, repoOf) {
+  const order = [];
+  const gaps = [];
+  const left = new Set(keys);
+  while (left.size) {
+    const ready = [...left].filter((k) => (preds.get(k) ?? []).every((e) => !left.has(e.from))).sort(byPrio);
+    if (ready.length) {
+      order.push(ready[0]);
+      left.delete(ready[0]);
+      continue;
+    }
+    const cycle = sourceCycle(left, preds, byPrio);
+    const next = cycle[0];
+    const stuck = [...new Set(cycle.filter((k) => k !== next).map(repoOf))];
+    gaps.push(`${repoOf(next)} and ${sortStrings(stuck).join(", ")} depend on each other, so no order satisfies both; agree one and write it in design.md.`);
+    order.push(next);
+    left.delete(next);
+  }
+  return { order, gaps };
+}
+function sourceCycle(left, preds, byPrio) {
+  const nodes = [...left].sort(byPrio);
+  const succ = new Map(nodes.map((k) => [k, []]));
+  for (const k of nodes)
+    for (const e of preds.get(k) ?? [])
+      if (left.has(e.from))
+        succ.get(e.from).push(k);
+  for (const list of succ.values())
+    list.sort(byPrio);
+  const index = /* @__PURE__ */ new Map();
+  const low = /* @__PURE__ */ new Map();
+  const onStack = /* @__PURE__ */ new Set();
+  const stack = [];
+  const comps = [];
+  let n = 0;
+  const strong = (v) => {
+    index.set(v, n);
+    low.set(v, n);
+    n++;
+    stack.push(v);
+    onStack.add(v);
+    for (const w of succ.get(v)) {
+      if (!index.has(w)) {
+        strong(w);
+        low.set(v, Math.min(low.get(v), low.get(w)));
+      } else if (onStack.has(w))
+        low.set(v, Math.min(low.get(v), index.get(w)));
+    }
+    if (low.get(v) === index.get(v)) {
+      const comp = [];
+      let w;
+      do {
+        w = stack.pop();
+        onStack.delete(w);
+        comp.push(w);
+      } while (w !== v);
+      comps.push(comp.sort(byPrio));
+    }
+  };
+  for (const v of nodes)
+    if (!index.has(v))
+      strong(v);
+  const sources = comps.filter((c) => {
+    if (c.length < 2)
+      return false;
+    const inside = new Set(c);
+    return c.every((k) => (preds.get(k) ?? []).every((e) => !left.has(e.from) || inside.has(e.from)));
+  });
+  const pick = (sources.length ? sources : comps.filter((c) => c.length > 1)).sort((a, b) => byPrio(a[0], b[0]))[0];
+  return pick ?? nodes.slice(0, 1);
+}
 function requestWait(ctx, r, why) {
   const base = {
     heading: r.heading,
@@ -688,21 +761,9 @@ async function deploymentPlan(ctx) {
     const [rb, pb, kb] = prio(b);
     return ra !== rb ? ra - rb : pa !== pb ? cmp2(pa, pb) : cmp2(ka, kb);
   };
-  const order = [];
-  const left = new Set(keys);
-  while (left.size) {
-    const ready = [...left].filter((k) => preds.get(k).every((e) => !left.has(e.from))).sort(byPrio);
-    if (ready.length) {
-      order.push(ready[0]);
-      left.delete(ready[0]);
-      continue;
-    }
-    const next = [...left].sort(byPrio)[0];
-    const stuck = preds.get(next).filter((e) => left.has(e.from)).map((e) => units.get(e.from).repo);
-    gaps.push(`${units.get(next).repo} and ${sortStrings(stuck).join(", ")} depend on each other, so no order satisfies both; agree one and write it in design.md.`);
-    order.push(next);
-    left.delete(next);
-  }
+  const ordered = orderSteps(keys, preds, byPrio, (k) => units.get(k).repo);
+  const order = ordered.order;
+  gaps.push(...ordered.gaps);
   const numOf = new Map(order.map((k, i) => [k, i + 1]));
   const rollbackLines = [
     ...sectionsOf(ctx, "design.md", /roll|release|deploy|back-?out/i).flatMap((s) => sentences(s.lines).map((x) => ({ ...x, file: "design.md" }))),
@@ -2029,6 +2090,7 @@ export {
   undoesItem,
   secretItem,
   judgedFor,
+  orderSteps,
   deploymentPlan,
   releaseForecast,
   OUTCOMES_FILE,

package/dist/{chunk-TQTRWENN.js → chunk-WG5U3F5V.js}

@@ -5,22 +5,24 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   loadCatalog
-} from "./chunk-5QUOPNLN.js";
-import "./chunk-4SLBCEPD.js";
+} from "./chunk-OHNCWBKF.js";
+import "./chunk-J2JAKCIW.js";
 import {
   domainProfile
-} from "./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";
+} from "./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 "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
 import {
   orgPackDirOf
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/domain-commands.js

package/dist/{chunk-NRQ65LTQ.js → chunk-WJF2CS6M.js}

@@ -45,16 +45,17 @@ import {
   utf8,
   visioIngestor,
   xlsxIngestor
-} from "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-7AB6OWTV.js";
+} from "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
 import {
   ZIP_LIMITS,
   ZipError,
   peekZip,
   readZip
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   DEFAULT_LEGEND,

package/dist/{chunk-FVMPFCDS.js → chunk-WKUJ3KPV.js}

@@ -12,13 +12,13 @@ import {
   runEvals,
   saveReport,
   writeQuality
-} from "./chunk-FYBF5MB2.js";
+} from "./chunk-RXPJMEOW.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
 import {
   readDocument
-} from "./chunk-YO2PKTXT.js";
+} from "./chunk-6ZGLAACW.js";
 import {
   combine,
   createRuntime,
@@ -27,13 +27,13 @@ import {
   screenDiagramXml,
   screenOfficeXml,
   screenText
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-P32RUW3B.js";
 import {
   loadOrgPack,
   orgPackDirOf,
   readZip,
   stateDirOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/eval-commands.js
 import { readdir, readFile, stat } from "node:fs/promises";

package/dist/{chunk-BA3U7ALS.js → chunk-WMTRHUI5.js}

@@ -23,6 +23,7 @@ import {
   measureId,
   measuresOf,
   opOf,
+  orderSteps,
   outcomesView,
   pathKey,
   readOutcomes,
@@ -38,28 +39,30 @@ import {
   sortStrings,
   undoesItem,
   writeEvidencePack
-} from "./chunk-36RY7ZXM.js";
-import "./chunk-2V2ZPQQU.js";
-import "./chunk-EZIN5E5B.js";
-import "./chunk-3LZ6P5EP.js";
-import "./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 "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-WF7B67YE.js";
+import "./chunk-6PPOWY5E.js";
+import "./chunk-BTGPE6CR.js";
+import "./chunk-MUWDB4R4.js";
+import "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.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 "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   AUDIENCES,
@@ -81,6 +84,7 @@ export {
   measureId,
   measuresOf,
   opOf,
+  orderSteps,
   outcomesView,
   pathKey,
   readOutcomes,

package/dist/chunk-WNKPRSGI.js

@@ -0,0 +1,36 @@
+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 {
+  catalogDiff,
+  diffLines,
+  scanCommand
+} from "./chunk-TNR75OXT.js";
+import "./chunk-MFR5OPBD.js";
+import "./chunk-UGUP3ZM6.js";
+import "./chunk-BEVTIBRH.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 "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  catalogDiff,
+  diffLines,
+  scanCommand
+};

package/dist/{chunk-GIFMBCTW.js → chunk-WXFLMQSR.js}

@@ -6,22 +6,24 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   estateRepos,
   matchRepoType
-} from "./chunk-4SLBCEPD.js";
-import {
-  baseClonePath
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   fsRepo,
   globToRegExp
-} from "./chunk-7AB6OWTV.js";
+} from "./chunk-3NFFJL5D.js";
+import {
+  baseClonePath
+} from "./chunk-PKBHS4AA.js";
 import {
   ReadingRulesFile,
   isAdopted,
   loadOrgPack,
   notesFor,
-  orgPackDirOf,
+  orgPackDirOf
+} from "./chunk-Q2TECDIT.js";
+import {
   require_dist
-} from "./chunk-PAINMSID.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -175,7 +177,7 @@ var exampleOf = (e) => {
   return ok ? ` For example \`${e}\`.` : "";
 };
 async function rulesLackingAll(root, repo, rec, o = {}) {
-  const { rulesLacking } = await import("./chunk-G6X4YL4D.js");
+  const { rulesLacking } = await import("./chunk-REWWDVQB.js");
   return [
     ...rulesLacking(rec),
     ...orgRulesLacking(rec, await effectiveRules(root, repo, o).catch(() => void 0) ?? {

package/dist/{chunk-JYTIHTIK.js → chunk-X3WY6MN3.js}

@@ -8,16 +8,16 @@ import {
 } from "./chunk-4Q3NN7VF.js";
 import {
   CONTEXT_TOOLS
-} from "./chunk-5WERBKLE.js";
+} from "./chunk-ISUAAMGS.js";
 import {
   lensRunOf
-} from "./chunk-K332XW7K.js";
+} from "./chunk-S4PMJU6H.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-P32RUW3B.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";

package/dist/{chunk-S2RY3BOD.js → chunk-X4CXA2IL.js}

@@ -3,42 +3,49 @@ 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 {
+  branchCatalogFolder
+} from "./chunk-SLXZOMA6.js";
 import {
   diffLines
-} from "./chunk-NCB6656Z.js";
-import "./chunk-TYD6I4CZ.js";
-import "./chunk-YWAKDNMH.js";
-import "./chunk-3AQ2R5NL.js";
-import "./chunk-K332XW7K.js";
-import "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
+} from "./chunk-TNR75OXT.js";
+import "./chunk-MFR5OPBD.js";
+import "./chunk-UGUP3ZM6.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
 import {
   diffCatalogs,
   readCatalog,
   scanEstate,
   writeCatalog
-} from "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
+} 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 {
   branchSlug,
   createWorkspace,
   isInPlace,
   loadRepos
-} from "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
+} from "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
 import {
-  catalogDirOf,
-  require_dist
-} from "./chunk-PAINMSID.js";
+  catalogDirOf
+} from "./chunk-Q2TECDIT.js";
 import {
+  renameRetrying,
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -91,6 +98,9 @@ async function scanBranch(root, branch, o, io) {
   });
   const rel = branchCatalogRel(branch);
   const dir = join(catalogDirOf(root), ...rel.split("/"));
+  const at = await branchCatalogFolder(root, branch);
+  if (at.legacy)
+    await renameRetrying(join(catalogDirOf(root), "branches", at.legacy), dir);
   const ofRepos = new Set(ids);
   const kept = await readCatalog(join(dir, "generated"), { cacheRoot: root }).catch(() => ({
     records: []