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

package/dist/{chunk-7FBGJFEE.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-FITWGOJ2.js";
-import "./chunk-27NKUS3X.js";
+} from "./chunk-OHNCWBKF.js";
+import "./chunk-J2JAKCIW.js";
 import {
   domainProfile
-} from "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.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-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.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-4NDAAFQT.js → chunk-WJF2CS6M.js}

@@ -8,6 +8,7 @@ import {
   IMAGE_EXTENSIONS,
   NEEDS_READING_FLAG,
   ReadError,
+  TRAFFIC_SOURCES,
   documentFormat,
   documentId,
   docxIngestor,
@@ -44,22 +45,24 @@ import {
   utf8,
   visioIngestor,
   xlsxIngestor
-} from "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-GQ4N4WKF.js";
+} from "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
 import {
   ZIP_LIMITS,
   ZipError,
   peekZip,
   readZip
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   DEFAULT_LEGEND,
   IMAGE_EXTENSIONS,
   NEEDS_READING_FLAG,
   ReadError,
+  TRAFFIC_SOURCES,
   ZIP_LIMITS,
   ZipError,
   documentFormat,

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

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

package/dist/chunk-WMTRHUI5.js

@@ -0,0 +1,103 @@
+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 {
+  AUDIENCES,
+  MEASURABLE,
+  OUTCOMES_FILE,
+  REQUESTS_FILE,
+  ReleaseError,
+  breakingItem,
+  buildModel,
+  changeFiles,
+  classOf,
+  deploymentPlan,
+  estimateChange,
+  evidencePack,
+  findMeasure,
+  hasWord,
+  judgedFor,
+  loadRelease,
+  measureId,
+  measuresOf,
+  opOf,
+  orderSteps,
+  outcomesView,
+  pathKey,
+  readOutcomes,
+  readServiceRequests,
+  recordOutcome,
+  releaseForecast,
+  releaseNotes,
+  secretItem,
+  sectionOf,
+  sectionsOf,
+  securityReview,
+  sentences,
+  sortStrings,
+  undoesItem,
+  writeEvidencePack
+} 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,
+  MEASURABLE,
+  OUTCOMES_FILE,
+  REQUESTS_FILE,
+  ReleaseError,
+  breakingItem,
+  buildModel,
+  changeFiles,
+  classOf,
+  deploymentPlan,
+  estimateChange,
+  evidencePack,
+  findMeasure,
+  hasWord,
+  judgedFor,
+  loadRelease,
+  measureId,
+  measuresOf,
+  opOf,
+  orderSteps,
+  outcomesView,
+  pathKey,
+  readOutcomes,
+  readServiceRequests,
+  recordOutcome,
+  releaseForecast,
+  releaseNotes,
+  secretItem,
+  sectionOf,
+  sectionsOf,
+  securityReview,
+  sentences,
+  sortStrings,
+  undoesItem,
+  writeEvidencePack
+};

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-WXFLMQSR.js

@@ -0,0 +1,223 @@
+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 {
+  estateRepos,
+  matchRepoType
+} from "./chunk-J2JAKCIW.js";
+import {
+  fsRepo,
+  globToRegExp
+} from "./chunk-3NFFJL5D.js";
+import {
+  baseClonePath
+} from "./chunk-PKBHS4AA.js";
+import {
+  ReadingRulesFile,
+  isAdopted,
+  loadOrgPack,
+  notesFor,
+  orgPackDirOf
+} from "./chunk-Q2TECDIT.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
+import {
+  __toESM
+} from "./chunk-TV45EUGM.js";
+
+// packages/cli/dist/reading-rules.js
+var import_yaml = __toESM(require_dist(), 1);
+import { createHash } from "node:crypto";
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { existsSync } from "node:fs";
+
+// packages/cli/dist/org-notes.js
+async function repoTypeOf(op, repo, dir) {
+  const named = estateRepos(op).find((r2) => r2.id === repo)?.type;
+  const byName = op.repoTypes.find((t) => t.id === named);
+  if (byName)
+    return byName;
+  if (!dir || !op.repoTypes.length)
+    return void 0;
+  const r = await matchRepoType(fsRepo(repo, dir, "0".repeat(40)), op.repoTypes).catch(() => void 0);
+  return r && (r.verdict === "clear" || r.verdict === "partial") ? op.repoTypes.find((t) => t.id === r.best) : void 0;
+}
+async function notesAt(root, repo, dir, given) {
+  const op = given ?? await loadOrgPack(orgPackDirOf(root)).catch(() => void 0);
+  if (!op)
+    return { notes: [] };
+  const type = await repoTypeOf(op, repo, dir);
+  return { ...type ? { type: type.id } : {}, notes: notesFor(type, op.conventions) };
+}
+
+// packages/cli/dist/reading-rules.js
+var rulesDirOf = (root) => join(orgPackDirOf(root), "reading-rules");
+var relDir = (root) => `${isAdopted(root) ? ".atticus/org-pack" : "org-pack"}/reading-rules`;
+var ruleId = (r) => `org:${r.key}@${createHash("sha256").update(JSON.stringify([r.rule, r.files ?? []])).digest("hex").slice(0, 8)}`;
+async function readLayer(root, rel) {
+  const text = await readFile(join(rulesDirOf(root), ...rel.split("/")), "utf8").catch(() => void 0);
+  if (text === void 0)
+    return {};
+  let data;
+  try {
+    data = (0, import_yaml.parse)(text);
+  } catch (e) {
+    return {
+      problem: `${relDir(root)}/${rel} can't be read: ${e.message.split("\n")[0]}`
+    };
+  }
+  const r = ReadingRulesFile.safeParse(data);
+  return r.success ? { file: r.data } : {
+    problem: `${relDir(root)}/${rel} isn't valid: ${r.error.issues.map((i) => `${i.path.join(".") || "(top)"}: ${i.message}`).join("; ")}`
+  };
+}
+async function layerFiles(root, repo, type) {
+  const out = [];
+  if (type) {
+    const teams = await readdir(join(rulesDirOf(root), "imported"), { withFileTypes: true }).catch(() => []);
+    for (const t of teams.filter((x) => x.isDirectory()).map((x) => x.name).sort())
+      out.push({ layer: "imported", rel: `imported/${t}/${type}.yaml` });
+  }
+  out.push({ layer: "org", rel: "org.yaml" });
+  if (type)
+    out.push({ layer: "type", rel: `types/${type}.yaml` });
+  out.push({ layer: "repo", rel: `repos/${repo}.yaml` });
+  return out;
+}
+async function effectiveRules(root, repo, o = {}) {
+  const op = o.op ?? await loadOrgPack(orgPackDirOf(root)).catch(() => void 0);
+  const cloneOf = () => {
+    try {
+      const c = isAdopted(root) ? root : baseClonePath(root, repo);
+      return existsSync(c) ? c : void 0;
+    } catch {
+      return void 0;
+    }
+  };
+  const dir = o.dir ?? (op ? cloneOf() : void 0);
+  const type = op ? (await repoTypeOf(op, repo, dir))?.id ?? estateRepos(op).find((r) => r.id === repo)?.type : void 0;
+  const byKey = /* @__PURE__ */ new Map();
+  const drafts = [];
+  const off = [];
+  const problems = [];
+  const builtinOff = /* @__PURE__ */ new Set();
+  for (const { layer, rel } of await layerFiles(root, repo, type)) {
+    const { file, problem } = await readLayer(root, rel);
+    if (problem)
+      problems.push(problem);
+    if (!file)
+      continue;
+    const at = `${relDir(root)}/${rel}`;
+    for (const x of layer === "imported" ? [] : file.off) {
+      off.push({ ...x, layer, file: at });
+      if (x.key.startsWith("builtin:"))
+        builtinOff.add(x.key.slice("builtin:".length));
+      else
+        byKey.delete(x.key);
+    }
+    for (const r of file.rules) {
+      const e = { ...r, layer, file: at, id: ruleId(r) };
+      if (r.status === "draft")
+        drafts.push(e);
+      else {
+        const had = byKey.get(r.key);
+        if (had && had.layer === "imported" && layer === "imported")
+          problems.push(`${had.file} and ${at} both have an active rule ${r.key}: ${at}'s is given to reads. Rename one, or set one back to draft.`);
+        byKey.set(r.key, e);
+      }
+    }
+  }
+  return {
+    rules: [...byKey.values()],
+    drafts,
+    off,
+    problems,
+    builtinOff: [...builtinOff].sort()
+  };
+}
+var ruleMatches = (r, path) => !r.files?.length || r.files.some((g) => globToRegExp(g).test(path));
+var ruleIds = (e) => e.rules.map((r) => r.id).sort();
+function orgRulesLacking(rec, e) {
+  const had = new Set(rec?.sets ?? []);
+  return e.rules.filter((r) => !had.has(r.id));
+}
+function readingRulesText(e, only) {
+  const rules = only ? e.rules.filter((r) => only.has(r.id)) : e.rules;
+  if (!rules.length && !e.builtinOff.length)
+    return "";
+  return [
+    "## The organisation's reading rules for this repo",
+    "",
+    "These come from the organisation's org pack, reviewed like code. Follow them as you follow the rules above; every fact still cites its line, and a rule never changes a fact's shape.",
+    "",
+    ...rules.map((r) => `- ${r.key} (${r.layer}${r.files?.length ? `; for ${r.files.join(", ")}` : ""}): ${r.rule.replace(/\s+/g, " ").trim()}${exampleOf(r.example)}`),
+    ...e.builtinOff.length ? [
+      "",
+      `Switched off here by the organisation: Atticus's ${e.builtinOff.join(", ")} rules; leave out what only they ask for.`
+    ] : []
+  ].join("\n");
+}
+var exampleOf = (e) => {
+  if (!e || e.length > 300)
+    return "";
+  const m = /^(.+):(\d+)$/.exec(e);
+  if (!m)
+    return "";
+  const rel = m[1].replace(/\\/g, "/");
+  if (/^([A-Za-z]:|\/|~)/.test(rel))
+    return "";
+  const segs = rel.split("/");
+  const last = segs.at(-1);
+  const folders = segs.slice(0, -1);
+  const ok = /^[^\s`/:,]+$/.test(last) && folders.every((x) => x !== ".." && !/[`\n\r:,!?]|\.\s/.test(x) && x.split(/\s+/).length <= 2) && folders.filter((x) => /\s/.test(x)).length <= 1;
+  return ok ? ` For example \`${e}\`.` : "";
+};
+async function rulesLackingAll(root, repo, rec, o = {}) {
+  const { rulesLacking } = await import("./chunk-REWWDVQB.js");
+  return [
+    ...rulesLacking(rec),
+    ...orgRulesLacking(rec, await effectiveRules(root, repo, o).catch(() => void 0) ?? {
+      rules: [],
+      drafts: [],
+      off: [],
+      problems: [],
+      builtinOff: []
+    }).filter((r) => r.files?.length).map((r) => r.id)
+  ];
+}
+function kindGlob(file) {
+  const base = file.split("/").pop() ?? file;
+  const m = /([A-Z][a-z0-9]+)\.([A-Za-z0-9]+)$/.exec(base);
+  return m ? `**/*${m[1]}.${m[2]}` : `**/${base}`;
+}
+function ruleFromPairing(o) {
+  const key = `paths-to-${o.to}`.toLowerCase().replace(/[^a-z0-9-]+/g, "-").slice(0, 60);
+  return {
+    key,
+    status: "draft",
+    rule: `In ${o.type} repos, a call to ${o.to} can name its path through a field, a setting or a helper (here \`${o.value}\`), not the path itself: follow it to the literal path the code or its settings give, and write that as the call's path, with the line that sets it in cite.with. The routes it reaches start like ${[o.method, o.path].filter(Boolean).join(" ")}.`,
+    files: [kindGlob(o.file)],
+    example: `${o.file}:${o.line}`,
+    by: `drafted${o.drafter ? ` by ${o.drafter}` : ""} from ${o.by}'s pairing on the canvas`
+  };
+}
+
+export {
+  repoTypeOf,
+  notesAt,
+  rulesDirOf,
+  ruleId,
+  effectiveRules,
+  ruleMatches,
+  ruleIds,
+  orgRulesLacking,
+  readingRulesText,
+  exampleOf,
+  rulesLackingAll,
+  kindGlob,
+  ruleFromPairing
+};

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

@@ -6,18 +6,18 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   isCritic
 } from "./chunk-4Q3NN7VF.js";
-import {
-  lensRunOf
-} from "./chunk-3HI6Z55Y.js";
 import {
   CONTEXT_TOOLS
-} from "./chunk-T6AIP7H5.js";
+} from "./chunk-ISUAAMGS.js";
+import {
+  lensRunOf
+} from "./chunk-S4PMJU6H.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-P32RUW3B.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";
@@ -173,6 +173,8 @@ async function printJson(root, argv, args, s, io) {
       runId: run.runId,
       // ADR 0115: one of the critic's AI lenses, reviewing what the step wrote.
       ...lens ? { lens } : {},
+      // ADR 0185: a batch asks these lenses together, each in its own section of one answer.
+      ...run.parts?.length ? { lenses: run.parts.map((p) => p.name) } : {},
       stepClass,
       ...orgModel ? { orgModel } : {},
       root,

package/dist/{chunk-ZCJDOK2S.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-JGZCG5VM.js";
-import "./chunk-RVH5SUW5.js";
-import "./chunk-OT2O76OS.js";
-import "./chunk-IPKHE5D6.js";
-import "./chunk-3HI6Z55Y.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.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-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.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-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
+} from "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
 import {
-  catalogDirOf,
-  require_dist
-} from "./chunk-S2A7YC3Q.js";
+  catalogDirOf
+} from "./chunk-Q2TECDIT.js";
 import {
+  renameRetrying,
   writeFileAtomic
-} from "./chunk-D3PO4DOZ.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -46,6 +53,7 @@ import {
 // packages/cli/dist/branch-scan-commands.js
 var import_yaml = __toESM(require_dist(), 1);
 import { join } from "node:path";
+import { readFile } from "node:fs/promises";
 var branchCatalogRel = (branch) => `branches/${branchSlug(branch)}`;
 var fromRepos = (records, repos) => records.filter((r) => r.evidence.some((e) => e.repo && repos.has(e.repo)));
 async function scanBranch(root, branch, o, io) {
@@ -90,9 +98,25 @@ async function scanBranch(root, branch, o, io) {
   });
   const rel = branchCatalogRel(branch);
   const dir = join(catalogDirOf(root), ...rel.split("/"));
-  const write = await writeCatalog(join(dir, "generated"), scan.records);
-  await writeFileAtomic(join(dir, "branch.yaml"), (0, import_yaml.stringify)({ schemaVersion: 1, branch, scannedAt, repos: commits }));
+  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: []
+  }));
+  const listed = new Set(all.map((r) => r.id));
+  const others = kept.records.filter((r) => r.evidence.length > 0 && r.evidence.every((e) => !e.repo || !ofRepos.has(e.repo)) && r.evidence.some((e) => e.repo && listed.has(e.repo)));
+  const ids2 = new Set(scan.records.map((r) => `${r.kind}/${r.id}`));
+  const merged = [...scan.records, ...others.filter((r) => !ids2.has(`${r.kind}/${r.id}`))];
+  const write = await writeCatalog(join(dir, "generated"), merged);
+  const was = (0, import_yaml.parse)(await readFile(join(dir, "branch.yaml"), "utf8").catch(() => ""))?.repos ?? [];
+  await writeFileAtomic(join(dir, "branch.yaml"), (0, import_yaml.stringify)({
+    schemaVersion: 1,
+    branch,
+    scannedAt,
+    repos: [...was.filter((x) => !ofRepos.has(x.id) && listed.has(x.id)), ...commits].sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0)
+  }));
   const before = await readCatalog(join(catalogDirOf(root), "generated"), { cacheRoot: root });
   const diff = diffCatalogs(fromRepos(before.records, ofRepos), fromRepos(scan.records, ofRepos));
   problems += scan.problems.length;