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

package/dist/{chunk-Y6K3CJBU.js → chunk-PNSSE7JM.js}

@@ -3,10 +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 {
-  slug,
-  writeGateRound
-} from "./chunk-EZIN5E5B.js";
 import {
   catchUpChangeBranch,
   changeWorktree,
@@ -14,11 +10,16 @@ import {
   loadTask,
   openTaskWorktree,
   readChangeTasks,
-  setTaskDone
-} from "./chunk-YWAKDNMH.js";
+  setTaskDone,
+  taskBranchOwnCommits
+} from "./chunk-S5GSQPIN.js";
 import {
   buildEngineFor
-} from "./chunk-3AQ2R5NL.js";
+} from "./chunk-J4CPHJUL.js";
+import {
+  slug,
+  writeGateRound
+} from "./chunk-EMVZIOOD.js";
 import {
   conform,
   readConformDeltas,
@@ -26,38 +27,39 @@ import {
   renderTaskContext,
   taskContext,
   withBuildLine
-} from "./chunk-BEPCKDCP.js";
+} from "./chunk-MLGWSBF4.js";
 import {
   readChangeFiles,
   readRound,
   readStoryIndex,
   roundsOf,
   writeQuarantineItems
-} from "./chunk-K332XW7K.js";
+} from "./chunk-D6BVLTDV.js";
 import {
   changeFolder,
   changeStore
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-WZYM5M4U.js";
 import {
+  AdapterError,
   createAdapters,
   fileStepStore,
   requireApproval
-} from "./chunk-4KNOJC6J.js";
+} from "./chunk-FL344WQD.js";
 import {
   scanEstate
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-IKAW2KJU.js";
 import {
   baseClonePath,
   createGit,
   toRepoRelative
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-3EWKO457.js";
 import {
   HandoffRuntime,
   buildContextPack,
   createRuntime,
   quarantineItems,
   toRunSummary
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-3424TLIJ.js";
 import {
   AgentDefinition,
   ChecklistPack,
@@ -71,18 +73,20 @@ import {
   changesRelOf,
   external_exports,
   readRepoSpec,
-  require_dist,
   runsDirOf,
   runsRelOf,
   stateDirOf,
   taskBranch,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
 import {
   LockHeldError,
   acquireLock,
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -564,7 +568,9 @@ ${s.body.trim()}`,
       id: "task-context",
       kind: "artifact",
       origin: `atticus task context ${t.change.id} ${t.task.id}`,
-      text: renderTaskContext(context).replace(/\r\n/g, "\n"),
+      // The pack wraps and screens the whole file as one source, so its parts aren't fenced
+      // again inside it (review round 47).
+      text: renderTaskContext(context, { fence: false }).replace(/\r\n/g, "\n"),
       classification: "internal",
       priority: 35
     });
@@ -1112,6 +1118,12 @@ async function commit(c, runId) {
   await c.git(["add", "-A", "--", "."], c.worktree);
   const staged = (await c.git(["diff", "--cached", "--name-only"], c.worktree)).stdout.trim();
   if (!staged) {
+    const own = await ownTaskCommit(c);
+    if (own) {
+      c.record.commit = own;
+      c.record.notes.push(`Nothing new to commit: ${c.record.branch} already has this task's commit ${own.slice(0, 12)}, ahead of ${changeBranch(c.t.change.id)}, so it is the one built and raised.`);
+      return true;
+    }
     c.record.state = "needs-person";
     c.record.notes.push(`The AI's answer changed nothing in ${c.record.branch}, so there is nothing to commit: run the task again, or do it by hand in ${c.record.worktree}.`);
     return false;
@@ -1130,9 +1142,20 @@ Requested-By: ${c.record.by}`
   c.record.commit = (await c.git(["rev-parse", "HEAD"], c.worktree)).stdout.trim();
   return true;
 }
+async function ownTaskCommit(c) {
+  const base = changeBranch(c.t.change.id);
+  const log = await c.git(["log", "--format=%B%x00", `refs/heads/${base}..HEAD`], c.worktree).catch(() => ({ stdout: "" }));
+  const mine = log.stdout.split("\0").some((m) => {
+    const lines = m.split("\n").map((l) => l.trim());
+    return lines.includes(`Atticus-Change: ${c.t.change.id}`) && lines.includes(`Atticus-Task: ${c.t.task.id}`);
+  });
+  if (!mine)
+    return void 0;
+  return (await c.git(["rev-parse", "HEAD"], c.worktree)).stdout.trim() || void 0;
+}
 async function openPr(c) {
   if (c.record.state !== "built") {
-    c.record.notes.push(c.record.state === "unverified" ? "No PR: a pull request needs a passing build, and this repo has no build command." : "No PR: the build doesn't pass.");
+    c.record.notes.push(c.record.state === "unverified" ? `No PR: a pull request needs a passing build, and ${c.t.repo.id} has no build command: set a build command for ${c.t.repo.id} (build: under its entry in repos.manifest.yaml), then run task ${c.t.task.id} again.` : "No PR: the build doesn't pass.");
     if (c.record.state === "unverified")
       c.record.state = "needs-person";
     return;
@@ -1182,6 +1205,15 @@ async function openPr(c) {
   } catch (e) {
     if (e instanceof TaskRunError)
       throw e;
+    if (e instanceof AdapterError && e.code === "conflict") {
+      const open = (await c.gitHost.listPullRequests(c.t.repo.id, { head: c.record.branch }).catch(() => [])).filter((p) => p.base === base && (p.state === "open" || p.state === "draft")).at(0);
+      if (open) {
+        c.record.pr = { number: open.number, url: open.url };
+        c.record.state = "pr-open";
+        c.record.notes.push(`PR #${open.number} from ${c.record.branch} into ${base} was already open on the Git host; recorded it (${open.url}).`);
+        return;
+      }
+    }
     c.record.notes.push(`${PR_NOT_RAISED} ${(e instanceof Error ? e.message : String(e)).replace(/\.?$/, ".")} The build still passes: fix that and raise the task's PR again (Raise the task's PR on the Task board), or push ${c.record.branch} and open its PR into ${base} yourself.`);
   }
 }
@@ -1251,7 +1283,7 @@ async function ownTaskPr(host, r, held) {
     return own;
   throw new TaskRunError("refused", `PR #${held.number} on the Git host is from ${pr.head}, not ${r.branch}, and no PR from ${r.branch} was found`);
 }
-async function refuseIfHeld(root, t, host) {
+async function refuseIfHeld(root, t, host, git) {
   const before = await readTaskRun(root, t.change.id, t.task.id);
   if (before?.state === "pr-open") {
     let state;
@@ -1265,14 +1297,23 @@ async function refuseIfHeld(root, t, host) {
     } catch (e) {
       why = e instanceof Error ? e.message : String(e);
     }
-    if (before.pr && (state === "merged" || state === "closed"))
-      return [`Its earlier PR ${before.pr.url} is ${state}.`];
+    if (before.pr && (state === "merged" || state === "closed")) {
+      const own = await taskBranchOwnCommits(root, t.change.id, t.task.id, t.repo.id, git);
+      if (own > 0) {
+        const branch = taskBranch(t.change.id, t.task.id);
+        const from = changeBranch(t.change.id);
+        const clone = baseClonePath(root, t.repo.id);
+        const carried = state === "closed" ? "the commits that PR carried" : "commits the change branch hasn't (a squash or rebase merge took them in another form)";
+        throw new TaskRunError("refused", `Task ${t.task.id}'s earlier PR ${before.pr.url} is ${state}, and its branch ${branch} still has ${carried} (${own} not in ${from}): running the task again would raise them again. Atticus doesn't delete or rewrite them. To start the task afresh, remove its worktree and branch here (git -C ${clone} worktree remove ${join5(root, before.worktree)}, then git -C ${clone} branch -D ${branch}) and delete ${branch} on the Git host, then run the task again; or ask whoever looks after the workspace for a fresh start.`);
+      }
+      return { notes: [`Its earlier PR ${before.pr.url} is ${state}.`], settled: true };
+    }
     throw new TaskRunError("refused", `Task ${t.task.id}'s PR is open (${before.pr?.url ?? "see its run"}): running the task again would start over beside it. Merge or close the PR first, then run the task again.${why ? ` (Atticus couldn't ask the Git host whether it still is: ${why}.)` : ""}`);
   }
   const open = ["prepared", "waiting", "produced", "failed"];
   if (before?.state === "waiting" && before.waiting && open.includes(await handoffRunState(root, t.change.id, before.waiting) ?? ""))
     throw new TaskRunError("refused", `Task ${t.task.id} already waits on your assistant (run ${before.waiting}, in ${before.worktree}): finish it with Done on its run page (Model runs) or atticus handoff done ${before.waiting}, or Cancel it there and run the task again.`);
-  return [];
+  return { notes: [] };
 }
 async function taskPrState(root, changeId, taskId, o = {}) {
   const r = await readTaskRun(root, changeId, taskId).catch(() => void 0);
@@ -1347,7 +1388,7 @@ function gitHostConnected(root, t, given) {
 async function previewTaskRun(root, changeId, taskId, o = {}) {
   const t = await loadTask(root, changeId, taskId);
   const level = levelOf(t, o.level);
-  await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t));
+  await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t), createGit());
   return {
     change: t.change.id,
     task: t.task.id,
@@ -1413,7 +1454,7 @@ async function runTaskHeld(root, changeId, taskId, o) {
   let t = await loadTask(root, changeId, taskId);
   const rt = t.ctx.orgPack.runtime;
   const level = levelOf(t, o.level);
-  const earlier = await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t));
+  const earlier = await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t), git);
   if (level === "pr") {
     try {
       requireApproval("git-host", o.approval);
@@ -1424,9 +1465,9 @@ async function runTaskHeld(root, changeId, taskId, o) {
   const engine = buildEngineFor(t.ctx.orgPack, t.repo.id);
   const changeDir = await changeWorktree(root, t.change.id, t.repo.id);
   const handed = engine === "speckit" ? `specs/${t.task.id}/plan.md` : `.atticus/tasks/${t.task.id}.md`;
-  const notes = [...earlier];
+  const notes = [...earlier.notes];
   try {
-    const caught = await catchUpChangeBranch(root, t.change.id, t.task.id, t.repo.id, changeDir, git);
+    const caught = await catchUpChangeBranch(root, t.change.id, t.task.id, t.repo.id, changeDir, git, earlier.settled ? { settled: true } : {});
     if (caught)
       notes.push(caught);
   } catch (e) {
@@ -1439,7 +1480,14 @@ async function runTaskHeld(root, changeId, taskId, o) {
     notes.push(`Handed the task down first (${h.feature} in ${h.repo}${h.commit ? `, commit ${h.commit.slice(0, 12)}` : ""}).`);
     t = await loadTask(root, changeId, taskId);
   }
-  const wt = await openTaskWorktree(root, t.change.id, t.task.id, t.repo.id, git);
+  let wt;
+  try {
+    wt = await openTaskWorktree(root, t.change.id, t.task.id, t.repo.id, git, earlier.settled ? { fresh: true } : {});
+  } catch (e) {
+    if (e instanceof Error && e.name === "SpecKitError")
+      throw new TaskRunError("refused", e.message);
+    throw e;
+  }
   const runtime = o.runtime ?? await createRuntime(t.ctx.orgPack, {
     root,
     ...o.mode ? { mode: o.mode } : {},
@@ -1659,6 +1707,79 @@ async function raiseTaskPr(root, changeId, taskId, o) {
     await lock.release();
   }
 }
+async function buildTask(root, changeId, taskId, o = {}) {
+  if (o.approval)
+    requireApproval("git-host", o.approval);
+  const lock = await holdTask(root, changeId, taskId);
+  try {
+    const record = await readTaskRun(root, changeId, taskId);
+    if (!record || !["unverified", "needs-person"].includes(record.state))
+      throw new TaskRunError("refused", !record ? `Task ${taskId} hasn't been drafted yet: run it with AI first.` : record.state === "built" ? `Task ${taskId} is built already: raise its PR (Raise the task's PR).` : `Task ${taskId} is ${record.state}: Build and raise PR is for a task drafted but not built (UNVERIFIED) or one a person took over; run it again instead.`);
+    const t = await loadTask(root, changeId, taskId);
+    const command = t.repo.build;
+    if (!command)
+      throw new TaskRunError("refused", `${record.repo} has no build command yet: set it on Set up \u203A Repos (build: under its entry in repos.manifest.yaml), then Build and raise PR again.`);
+    const now = o.now ?? (() => /* @__PURE__ */ new Date());
+    const git = o.git ?? createGit();
+    const worktree = join5(root, record.worktree);
+    if (!existsSync2(worktree))
+      throw new TaskRunError("refused", `Task ${taskId}'s worktree ${record.worktree} isn't here any more: run the task again.`);
+    const c = {
+      root,
+      t,
+      record,
+      worktree,
+      runtime: void 0,
+      commands: o.commands ?? shellCommandRunner(),
+      git,
+      ...o.gitHost ? { gitHost: o.gitHost } : {},
+      ...o.approval ? { approval: o.approval } : {},
+      now,
+      maxFix: t.ctx.orgPack.runtime.autonomy.maxFixRounds
+    };
+    if ((await changedFiles(c)).length)
+      throw new TaskRunError("refused", `Task ${taskId}'s worktree ${record.worktree} has edits that aren't committed: commit them on ${record.branch} (or put them aside), then Build and raise PR again.`);
+    const own = await ownTaskCommit(c);
+    const head = (await git(["rev-parse", "--verify", "-q", `refs/heads/${record.branch}`], worktree).catch(() => ({ stdout: "" }))).stdout.trim();
+    const ahead = await git(["rev-list", "--count", `refs/heads/${changeBranch(changeId)}..refs/heads/${record.branch}`], worktree).then((x) => Number(x.stdout.trim()) || 0, () => 0);
+    if (!head || !own && ahead === 0)
+      throw new TaskRunError("refused", `Task ${taskId}'s branch ${record.branch} has nothing beyond ${changeBranch(changeId)} to build: run the task again.`);
+    record.commit = head;
+    const runId = record.runs[0] ?? `build-${stamp2(now()).replace(/[:]/g, "")}`;
+    const a = await build(c, runId);
+    if (c.stopped || stopRequested()) {
+      record.state = "needs-person";
+      record.notes.push(`Atticus was stopped while the build ran; Build and raise PR again.`);
+      return await done(c);
+    }
+    if (!a.passed) {
+      record.state = "needs-person";
+      record.notes.push(`The build fails (${command}, exit ${a.exitCode ?? "none"}): fix it in ${record.worktree} and commit, then Build and raise PR again. See ${a.log}.`);
+      return await done(c);
+    }
+    record.state = "built";
+    record.notes.push(`Built with ${command}: it passes at ${head.slice(0, 12)}.`);
+    await conformAfterBuild(c);
+    if (o.approval && record.state === "built") {
+      const host = o.gitHost ?? gitHostOf(root, t);
+      if (host)
+        c.gitHost = host;
+      try {
+        if (host)
+          await openPr(c);
+        else
+          record.notes.push(`No Git host is connected (runtime.yaml adapters.gitHost): push ${record.branch} and open its PR into ${changeBranch(changeId)} yourself.`);
+      } catch (e) {
+        record.notes.push(`${PR_NOT_RAISED} ${e.message}`);
+      }
+      if (record.state === "pr-open")
+        record.notes.push(`PR raised by ${o.approval.by} after the build (${o.approval.ref}).`);
+    }
+    return await done(c);
+  } finally {
+    await lock.release();
+  }
+}
 async function isTaskRun(root, runId) {
   return await findWaitingTaskRun(root, runId) !== void 0;
 }
@@ -1667,7 +1788,8 @@ async function isTaskRun(root, runId) {
 var PAST = {
   waiting: "it is with your assistant: Done on its run carries on",
   built: "it is drafted: its PR is the next step",
-  unverified: "it is drafted but not built: its repo has no build command",
+  // App-only audit: Build and raise PR builds it (once its repo has a build command), or Run again.
+  unverified: "it is drafted but not built yet: Build and raise PR on its card builds it with its repo's build command, or Run again drafts it afresh",
   "pr-open": "its PR is open on the Git host",
   "needs-person": "it needs a person: carry on in its worktree, or Run with AI on it"
 };
@@ -1847,6 +1969,7 @@ export {
   runTask,
   completeTaskHandoff,
   raiseTaskPr,
+  buildTask,
   isTaskRun,
   planReadyTasks,
   readyTasksOf,

package/dist/{chunk-3UTYPHN3.js → chunk-POEMZECG.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-NTAVOWYD.js").then((p) => p.draftCheckBox(root, request));
+  const planner = () => box ??= import("./chunk-APDN6UOR.js").then((p) => p.draftCheckBox(root, request));
   return {
     definitions: [
       {

package/dist/{chunk-GSGIZ2OO.js → chunk-POSDBRKV.js}

@@ -3,40 +3,41 @@ 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 "./chunk-K6JB6XTX.js";
+import "./chunk-PRMUQUWN.js";
 import {
   loadCatalog
-} from "./chunk-5QUOPNLN.js";
+} from "./chunk-XGO74QWR.js";
 import {
   repoFor
-} from "./chunk-TGVVUKTG.js";
+} from "./chunk-XOMEQVLK.js";
 import {
   recordFact,
   verifyScan
-} from "./chunk-P2VBXX7N.js";
-import "./chunk-ZOSD4FXV.js";
+} from "./chunk-4ETO2FXE.js";
+import "./chunk-FQVSLBTV.js";
 import {
   stepJudges
-} from "./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";
+} from "./chunk-MLGWSBF4.js";
+import "./chunk-CA3DKO4D.js";
+import "./chunk-D6BVLTDV.js";
+import "./chunk-RCG5IAAT.js";
+import "./chunk-WZYM5M4U.js";
+import "./chunk-NC755EKE.js";
+import "./chunk-FL344WQD.js";
 import {
   checkScanSettings
-} from "./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";
+} from "./chunk-IKAW2KJU.js";
+import "./chunk-CZ2ZS7AT.js";
+import "./chunk-4GAB5ZOZ.js";
+import "./chunk-A4JXVO5O.js";
+import "./chunk-TDSCKP3V.js";
+import "./chunk-G6EFXTUO.js";
 import {
   fsRepo
-} from "./chunk-7AB6OWTV.js";
+} from "./chunk-PQQKZPBU.js";
+import "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
 import {
   SCAN_VERIFY_SCHEMA_VERSION,
   ScanSettings,
@@ -48,10 +49,12 @@ import {
   proposalsRelOf,
   questionsRelOf,
   raiseQuestions,
-  require_dist,
   reusedLine
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-YZDZOEV4.js → chunk-POSZFDSQ.js}

@@ -5,18 +5,18 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readCatalog
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-IKAW2KJU.js";
 import {
   readDiagram,
   reconcile
-} from "./chunk-YO2PKTXT.js";
+} from "./chunk-TDSCKP3V.js";
 import {
   loadOrgPack,
   orgPackDirOf,
   parseRecord,
   recordPath,
   serializeRecord
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
 
 // packages/cli/dist/reconcile-commands.js
 import { mkdir, readdir, readFile, writeFile } from "node:fs/promises";

package/dist/{chunk-7AB6OWTV.js → chunk-PQQKZPBU.js}

@@ -4,8 +4,10 @@ var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
-  parseRecord
-} from "./chunk-PAINMSID.js";
+  decodeText,
+  parseRecord,
+  walkRepo
+} from "./chunk-FPBUTZI5.js";
 
 // packages/sdk/dist/parse-cache.js
 import { createHash } from "node:crypto";
@@ -332,8 +334,20 @@ function globToRegExp(glob) {
 }
 
 // packages/sdk/dist/fs-repo.js
-import { lstat, readdir, readFile, realpath, stat } from "node:fs/promises";
-import { join, relative, resolve, sep } from "node:path";
+import { lstat, readFile, realpath, stat } from "node:fs/promises";
+import { join, resolve, sep } from "node:path";
+
+// packages/sdk/dist/listing.js
+var LISTING = /* @__PURE__ */ Symbol.for("@maycombhq/sdk.listing");
+function listingOf(repo) {
+  const v = repo[LISTING];
+  return typeof v === "string" ? v : "";
+}
+function setListing(repo, listing) {
+  Object.defineProperty(repo, LISTING, { value: listing, enumerable: false, configurable: true });
+}
+
+// packages/sdk/dist/fs-repo.js
 var DEFAULT_IGNORES = [
   ".git",
   "node_modules",
@@ -366,24 +380,12 @@ function fsRepo(name, dir, commit, options = {}) {
   let cache;
   const sizes = /* @__PURE__ */ new Map();
   const skipped = /* @__PURE__ */ new Map();
-  async function walk(abs, out) {
-    const entries = await readdir(abs, { withFileTypes: true });
-    for (const e of entries) {
-      if (e.isSymbolicLink())
-        continue;
-      const full = join(abs, e.name);
-      if (e.isDirectory()) {
-        if (!ignore.has(e.name))
-          await walk(full, out);
-      } else if (e.isFile()) {
-        out.push(relative(root, full).split(sep).join("/"));
-      }
-    }
-  }
   async function allFiles() {
     if (!cache) {
       const out = [];
-      await walk(root, out);
+      await walkRepo(root, async (p) => void out.push(p), {
+        skipFolder: (_above, name2) => ignore.has(name2)
+      });
       cache = out.sort();
     }
     return cache;
@@ -407,7 +409,7 @@ function fsRepo(name, dir, commit, options = {}) {
       throw new RepoReadError(`file is larger than ${maxBytes} bytes: ${path}`, path);
     return abs;
   }
-  return {
+  const handle = {
     name,
     commit,
     async *listFiles(globs) {
@@ -430,15 +432,16 @@ function fsRepo(name, dir, commit, options = {}) {
       return [...skipped].sort(([a], [b]) => a < b ? -1 : 1).map(([path, bytes]) => ({ path, bytes }));
     },
     async readText(path) {
-      const text = await readFile(await safePath(path), "utf8");
-      return text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+      return decodeText(await readFile(await safePath(path)));
     }
   };
+  setListing(handle, JSON.stringify({ ignore: [...ignore].sort(), maxFileBytes: maxBytes, gitignore: true }));
+  return handle;
 }
 
 // packages/sdk/dist/cache.js
 import { createHash as createHash2 } from "node:crypto";
-import { mkdir, readdir as readdir2, readFile as readFile2, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readdir, readFile as readFile2, rename, rm, writeFile } from "node:fs/promises";
 import { join as join2 } from "node:path";
 var sha256 = (s) => createHash2("sha256").update(s).digest("hex");
 function cacheKeyHash(key) {
@@ -524,7 +527,7 @@ function fsScanCache(dir) {
       let removed = 0;
       let commits;
       try {
-        commits = await readdir2(join2(dir, repo));
+        commits = await readdir(join2(dir, repo));
       } catch {
         return 0;
       }
@@ -635,7 +638,10 @@ async function scanWith(options) {
         options.configFor?.(extractor) ?? "",
         JSON.stringify(options.repoInfo ?? {}),
         // A changed framework model means a different reading of the same code.
-        options.frameworks?.length ? JSON.stringify(options.frameworks) : ""
+        options.frameworks?.length ? JSON.stringify(options.frameworks) : "",
+        // Review round 49: the same commit listed another way (scan-settings exclusions, the
+        // folders left out, the size limit) gives the extractor other files.
+        listingOf(repo)
       ].join("|")
     };
     try {

package/dist/{chunk-K6JB6XTX.js → chunk-PRMUQUWN.js}

@@ -5,10 +5,10 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   loadCatalog
-} from "./chunk-5QUOPNLN.js";
+} from "./chunk-XGO74QWR.js";
 import {
   repoFor
-} from "./chunk-TGVVUKTG.js";
+} from "./chunk-XOMEQVLK.js";
 import {
   checkDraft,
   checkFrameworkDraft,
@@ -22,25 +22,25 @@ import {
   proposalYaml,
   reviewRepo,
   surveyRepo
-} from "./chunk-P2VBXX7N.js";
+} from "./chunk-4ETO2FXE.js";
 import {
   offerCodeDir
-} from "./chunk-ZOSD4FXV.js";
+} from "./chunk-FQVSLBTV.js";
 import {
   matchRepoType
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-IKAW2KJU.js";
 import {
   modelCovers,
   repoImports,
   runDialectTests,
   runFrameworkTests
-} from "./chunk-TWQRPM76.js";
-import {
-  baseClonePath
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-G6EFXTUO.js";
 import {
   fsRepo
-} from "./chunk-7AB6OWTV.js";
+} from "./chunk-PQQKZPBU.js";
+import {
+  baseClonePath
+} from "./chunk-3EWKO457.js";
 import {
   Dialect,
   FrameworkModel,
@@ -50,16 +50,21 @@ import {
   orgPackDirOf,
   questionsRelOf,
   raiseQuestions,
-  require_dist,
   reusedLine
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
+import {
+  renameRetrying
+} from "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/onboard-commands.js
 var import_yaml = __toESM(require_dist(), 1);
-import { mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 var plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
 var proposalPath = (root, name) => join(root, "proposals", "dialects", `${name}.yaml`);
@@ -157,7 +162,7 @@ async function onboardAccept(root, name, o, io) {
     return 1;
   }
   await mkdir(join(orgPackDirOf(root), "dialects"), { recursive: true });
-  await rename(from, to);
+  await renameRetrying(from, to);
   const types = parsed.data.appliesTo.repoTypes;
   io.out(`Accepted: org-pack/dialects/${name}.yaml. ${types.length ? `It applies to repos of type ${types.join(", ")}.` : `Add it to the repos it reads in repos.manifest.yaml: dialects: [${name}].`} Commit the org pack for review, as with any change to it.`);
   return 0;
@@ -392,7 +397,7 @@ async function onboardFrameworkAccept(root, name, o, io) {
     return 1;
   }
   await mkdir(join(orgPackDirOf(root), "frameworks"), { recursive: true });
-  await rename(from, to);
+  await renameRetrying(from, to);
   io.out(`Accepted: org-pack/frameworks/${name}.yaml. Scans read every repo that imports ${model.packages.join(", ")} through it. Commit the org pack for review, as with any change to it.`);
   return 0;
 }