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

package/dist/{chunk-QHJJMZLX.js → chunk-3424TLIJ.js}

@@ -3,6 +3,9 @@ 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 {
+  commandWords
+} from "./chunk-QA4O2GGC.js";
 import {
   ANSWERED_BY,
   AgentDefinition,
@@ -16,6 +19,7 @@ import {
   copilotAcpOf,
   currentSignal,
   differentThings,
+  estimateTokens,
   identifierWords,
   judgmentKey,
   loadOrgPack,
@@ -23,21 +27,25 @@ import {
   namedBeyondAnswer,
   orgPackDirOf,
   quotedIn,
-  require_dist,
   runsDirOf,
   runsRelOf,
   stateDirOf,
-  stepModelsOf
-} from "./chunk-PAINMSID.js";
+  stepModelsOf,
+  tokenUnits
+} from "./chunk-FPBUTZI5.js";
 import {
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
 
 // packages/ai/dist/person-only.js
 var flag = (a, ...names) => a.some((x) => names.some((n) => x === n || x.startsWith(`${n}=`)));
+var switchOn = (a, name) => a.some((x) => x === name || x.startsWith(`${name}=`) && /^(true)?$/i.test(x.slice(name.length + 1)));
 var RULES = [
   {
     test: (w, a) => w[0] === "change" && w[1] === "release-prs" && flag(a, "--approve"),
@@ -89,7 +97,7 @@ var RULES = [
   },
   { test: (_w, a) => flag(a, "--as"), why: "--as names a person; a session acts as no one" },
   {
-    test: (w, a) => w[0] === "rules" && (w[1] === "activate" || w[1] === "off" || w[1] === "add" && !flag(a, "--draft")),
+    test: (w, a) => w[0] === "rules" && (w[1] === "activate" || w[1] === "off" || w[1] === "add" && !switchOn(a, "--draft")),
     why: "a person sets a reading rule active or off (a session drafts)"
   },
   {
@@ -124,13 +132,12 @@ var RULES = [
     why: "a person says who looks after the org pack"
   }
 ];
+function withoutLegacy(argv) {
+  return argv[0] === "legacy" && argv[1] !== void 0 && !argv[1].startsWith("-") ? argv.slice(1) : argv;
+}
 function personOnlyWhy(argv) {
-  const words2 = [];
-  for (const x of argv) {
-    if (x.startsWith("-"))
-      break;
-    words2.push(x);
-  }
+  argv = withoutLegacy(argv);
+  const words2 = commandWords(argv);
   return RULES.find((r) => r.test(words2, argv))?.why;
 }
 var isPersonsFactsFile = (name) => /\.audit\.yaml$|\.corrections\.jsonl$/i.test(windowsName(name));
@@ -956,9 +963,16 @@ var PromptTooLong = class extends Error {
 
 // packages/ai/dist/context.js
 var sha2562 = (s) => createHash2("sha256").update(s, "utf8").digest("hex");
-function estimateTokens(text) {
-  return Math.ceil(text.length / 4);
-}
+var RequiredSourceLeftOut = class extends Error {
+  step;
+  left;
+  constructor(step, left) {
+    super(`atticus ${step} can't go without ${left.map((l) => `${l.origin}: ${l.reason}`).join("; ")}.`);
+    this.step = step;
+    this.left = left;
+    this.name = "RequiredSourceLeftOut";
+  }
+};
 function wrapData(source, text) {
   const safe = escapeDelimiters(text).text;
   return `<atticus-data id="${attr(source.id)}" kind="${attr(source.kind)}" origin="${attr(source.origin)}">
@@ -971,10 +985,10 @@ function buildContextPack(given) {
   const maxTokens = given.maxTokens ?? currentPromptLimit();
   const o = { ...given, budget: fitBudget(given.budget, maxTokens) };
   if (maxTokens !== void 0) {
-    const required = new Set(o.required ?? []);
-    const needed = o.sources.filter((s) => s.trusted || required.has(s.id)).reduce((n, s) => n + estimateTokens(s.trusted ? s.text : wrapData(s, s.text)), estimateTokens(DATA_RULE));
+    const required2 = new Set(o.required ?? []);
+    const needed = o.sources.filter((s) => s.trusted || required2.has(s.id)).reduce((n, s) => n + estimateTokens(s.trusted ? s.text : wrapData(s, s.text)), estimateTokens(DATA_RULE));
     if (needed > o.budget)
-      throw new PromptTooLong(o.step ?? o.agent, needed, o.budget, maxTokens, o.sources.filter((s) => !s.trusted && required.has(s.id)).map((s) => s.id), o.smaller);
+      throw new PromptTooLong(o.step ?? o.agent, needed, o.budget, maxTokens, o.sources.filter((s) => !s.trusted && required2.has(s.id)).map((s) => s.id), o.smaller);
   }
   const maxLevel = o.levels.indexOf(o.maxClassification);
   if (maxLevel === -1)
@@ -1030,6 +1044,14 @@ function buildContextPack(given) {
   }
   if (total > o.budget)
     throw new Error(`instructions alone (${total} tokens) exceed the ${o.budget}-token budget`);
+  const required = new Set(o.required ?? []);
+  const left = dropped.filter((d) => required.has(d.id));
+  if (left.length)
+    throw new RequiredSourceLeftOut(o.step ?? o.agent, left.map((d) => ({
+      id: d.id,
+      origin: o.sources.find((s) => s.id === d.id)?.origin ?? d.id,
+      reason: d.reason
+    })));
   const prompt = parts.join("\n\n") + "\n";
   return {
     prompt,
@@ -1048,6 +1070,11 @@ function buildContextPack(given) {
   };
 }
 
+// packages/ai/dist/runtime.js
+import { randomBytes } from "node:crypto";
+import { mkdir } from "node:fs/promises";
+import { join } from "node:path";
+
 // packages/ai/dist/step-class.js
 var STEP_CLASS_BY_AGENT = {
   // read: the repo read into facts (atticus map, and its fix round for the facts rejected).
@@ -1212,9 +1239,22 @@ function checkAllowed(kind, agent) {
 }
 function makeRunId(now, seq) {
   const stamp = now.toISOString().replace(/[-:TZ.]/g, "").slice(0, 14);
-  const tail2 = seq !== void 0 ? String(seq).padStart(4, "0") : Math.random().toString(36).slice(2, 8);
+  const tail2 = seq !== void 0 ? String(seq).padStart(4, "0") : randomBytes(3).toString("hex");
   return `run-${stamp}-${tail2}`;
 }
+async function claimRunDir(dir, next) {
+  await mkdir(dir, { recursive: true });
+  for (let i = 0; ; i++) {
+    const runId = next();
+    try {
+      await mkdir(join(dir, runId));
+      return runId;
+    } catch (e) {
+      if (e.code !== "EEXIST" || i >= 9999)
+        throw e;
+    }
+  }
+}
 function toRunSummary(run) {
   return {
     schemaVersion: RUN_SCHEMA_VERSION,
@@ -1260,6 +1300,17 @@ var OneShotRuntime = class {
   /** Keep a finished run where Model runs reads it (the model runtime, given a root). */
   async keep(_run) {
   }
+  /**
+   * The next run id: counted from 1 on a test's clock (deterministic), with a random tail on the
+   * real one, so two commands' runtimes in one second don't share an id (round 46).
+   */
+  nextRunId(now) {
+    return makeRunId(now, this.opts.now ? ++this.seq : void 0);
+  }
+  /** A new run's id; a runtime that keeps its runs in folders claims the folder (`claimRunDir`). */
+  async newRunId(_request, now) {
+    return this.nextRunId(now);
+  }
   async prepare(request) {
     checkAllowed(this.allowedAs(request.agent), request.agent);
     if (request.pack.manifest.totalTokens > request.agent.tokenBudget) {
@@ -1267,7 +1318,7 @@ var OneShotRuntime = class {
     }
     const now = this.now();
     const run = {
-      runId: makeRunId(now, ++this.seq),
+      runId: await this.newRunId(request, now),
       request,
       runtime: this.kind,
       state: "prepared",
@@ -1322,12 +1373,12 @@ var OneShotRuntime = class {
 };
 
 // packages/ai/dist/runtimes.js
-import { mkdir as mkdir2, readdir as readdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join2 } from "node:path";
+import { mkdir as mkdir3, readdir as readdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
+import { join as join3 } from "node:path";
 
 // packages/ai/dist/tools.js
-import { mkdir, readdir, readFile, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { mkdir as mkdir2, readdir, readFile, writeFile } from "node:fs/promises";
+import { join as join2 } from "node:path";
 var ToolError = class extends Error {
   constructor(message) {
     super(message);
@@ -1409,8 +1460,18 @@ function guardToolText(name, raw, room) {
   if (estimateTokens(wrap(text)) > room) {
     const note = `
 \u2026 cut at ${room} tokens; ask for less (a smaller limit, fewer hops, one id).`;
-    const chars = Math.max(0, room * 4 - wrap("").length - note.length);
-    text = text.slice(0, chars) + note;
+    const units = Math.max(0, room * 4 - tokenUnits(wrap("")) - tokenUnits(note));
+    let end = 0;
+    for (let used = 0; end < text.length; end++) {
+      const c = text.charCodeAt(end);
+      used += c < 128 ? 1 : c >= 56320 && c <= 57343 ? 0 : 4;
+      if (used > units)
+        break;
+    }
+    const last = text.charCodeAt(end - 1);
+    if (end > 0 && last >= 55296 && last <= 56319)
+      end--;
+    text = text.slice(0, end) + note;
   }
   return wrap(text);
 }
@@ -1457,7 +1518,7 @@ async function recordToolCalls(root, runId, update) {
   if (!found)
     return void 0;
   const tools = update(found.run.tools);
-  await mkdir(join(found.file, ".."), { recursive: true });
+  await mkdir2(join2(found.file, ".."), { recursive: true });
   await writeFile(found.file, JSON.stringify({ ...found.run, tools }, null, 2) + "\n", "utf8");
   return tools;
 }
@@ -1472,7 +1533,7 @@ async function runFile(root, runId) {
   for (const change of await readdir(runs).catch(() => [])) {
     if (change.includes(".."))
       continue;
-    const file = join(runs, change, runId, "run.json");
+    const file = join2(runs, change, runId, "run.json");
     const text = await readFile(file, "utf8").catch(() => void 0);
     if (text)
       return { file, run: JSON.parse(text) };
@@ -1516,8 +1577,8 @@ var ReplayRuntime = class _ReplayRuntime extends OneShotRuntime {
     } catch {
     }
     for (const a of agents.sort()) {
-      for (const f of (await readdir2(join2(dir, a)).catch(() => [])).filter((x) => x.endsWith(".json")).sort()) {
-        out.push(Recording.parse(JSON.parse(await readFile2(join2(dir, a, f), "utf8"))));
+      for (const f of (await readdir2(join3(dir, a)).catch(() => [])).filter((x) => x.endsWith(".json")).sort()) {
+        out.push(Recording.parse(JSON.parse(await readFile2(join3(dir, a, f), "utf8"))));
       }
     }
     return new _ReplayRuntime(out, opts);
@@ -1545,8 +1606,8 @@ async function recordRun(live, request, dir, model, now = /* @__PURE__ */ new Da
     model,
     recordedAt: now.toISOString()
   };
-  await mkdir2(join2(dir, rec.agent), { recursive: true });
-  await writeFile2(join2(dir, rec.agent, `${rec.promptSha256}.json`), JSON.stringify(rec, null, 2) + "\n", "utf8");
+  await mkdir3(join3(dir, rec.agent), { recursive: true });
+  await writeFile2(join3(dir, rec.agent, `${rec.promptSha256}.json`), JSON.stringify(rec, null, 2) + "\n", "utf8");
   return rec;
 }
 var MockModelProvider = class {
@@ -1645,17 +1706,26 @@ ${DATA_RULE}`;
   async keep(run) {
     if (!this.mo.root)
       return;
-    const dir = join2(runsDirOf(this.mo.root), run.request.change, run.runId);
-    await mkdir2(dir, { recursive: true });
-    await writeFile2(join2(dir, "prompt.md"), run.request.pack.prompt, "utf8");
-    await writeFile2(join2(dir, "context-manifest.json"), JSON.stringify(run.request.pack.manifest, null, 2) + "\n", "utf8");
-    await writeFile2(join2(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
+    const dir = join3(runsDirOf(this.mo.root), run.request.change, run.runId);
+    await mkdir3(dir, { recursive: true });
+    await writeFile2(join3(dir, "prompt.md"), run.request.pack.prompt, "utf8");
+    await writeFile2(join3(dir, "context-manifest.json"), JSON.stringify(run.request.pack.manifest, null, 2) + "\n", "utf8");
+    await writeFile2(join3(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
+  }
+  /**
+   * Round 46: given a root, the run's folder is claimed with its id, so another command's run in
+   * the same second (its runtime counts from 1 too) never gets this id and overwrites it.
+   */
+  async newRunId(request, now) {
+    if (!this.mo.root)
+      return super.newRunId(request, now);
+    return claimRunDir(join3(runsDirOf(this.mo.root), request.change), () => this.nextRunId(now));
   }
 };
 
 // packages/ai/dist/handoff.js
-import { mkdir as mkdir3, readdir as readdir3, readFile as readFile3, rm, stat, writeFile as writeFile3 } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { mkdir as mkdir4, readdir as readdir3, readFile as readFile3, rm, stat, writeFile as writeFile3 } from "node:fs/promises";
+import { join as join4 } from "node:path";
 var BATCH_OUTPUT = "answers.md";
 var DEFAULT_BATCH_MAX_TOKENS = 6e4;
 var SECTION = /^===[ \t]*([a-z][a-z0-9-]*)[ \t]*$/;
@@ -1694,12 +1764,12 @@ var HandoffRuntime = class _HandoffRuntime {
     this.o = o;
   }
   now = () => this.o.now?.() ?? /* @__PURE__ */ new Date();
-  runDir = (change, runId) => join3(runsDirOf(this.o.root), change, runId);
-  outputFile = (r) => r.request.outputIn === "run" ? join3(this.runDir(r.request.change, r.runId), r.request.outputPath) : join3(changesDirOf(this.o.root), r.request.change, r.request.outputPath);
+  runDir = (change, runId) => join4(runsDirOf(this.o.root), change, runId);
+  outputFile = (r) => r.request.outputIn === "run" ? join4(this.runDir(r.request.change, r.runId), r.request.outputPath) : join4(changesDirOf(this.o.root), r.request.change, r.request.outputPath);
   // Atomic: a step reading run.json while `handoff done` writes it never sees half a file.
   async save(run) {
     const dir = this.runDir(run.request.change, run.runId);
-    await writeFileAtomic(join3(dir, "run.json"), JSON.stringify(run, null, 2) + "\n");
+    await writeFileAtomic(join4(dir, "run.json"), JSON.stringify(run, null, 2) + "\n");
     return run;
   }
   /** Where a run's prompt is, relative to the root (`atticus <step> --handoff` prints it). */
@@ -1740,14 +1810,33 @@ var HandoffRuntime = class _HandoffRuntime {
       ]),
       "---",
       "",
-      `When the file is complete, run: atticus handoff done ${run.runId}`,
+      _HandoffRuntime.finishLine(where),
       ""
     ].join("\n");
   }
+  /**
+   * ADR 0189: the prompt's last line asks the assistant to write the file, and nothing else. The
+   * app notices the file once it is complete and checks it, as Done did (Done stays for a person
+   * who wants to check it at once); no line asks the person, or the assistant, to run a command.
+   */
+  static finishLine(where) {
+    return `When ${where} is complete, stop there: Atticus notices the file and checks it. There is nothing to run.`;
+  }
   /** The prompt the person's assistant gets. It ends with the completion command. */
-  static promptFor(run, changesRel = "openspec/changes", runsRel = ".runs") {
+  static promptFor(run, changesRel = "openspec/changes", runsRel = ".runs", ending = true) {
     const { agent, pack, outputPath, change } = run.request;
     const where = _HandoffRuntime.outputRel(run, changesRel, runsRel);
+    if (!ending)
+      return [
+        `# ${agent.id}: write ${outputPath} for change ${change}`,
+        "",
+        agent.description,
+        "",
+        `Write the result to ${where}. Change no other files.`,
+        "",
+        pack.prompt.trimEnd(),
+        ""
+      ].join("\n");
     return [
       `# ${agent.id}: write ${outputPath} for change ${change}`,
       "",
@@ -1757,16 +1846,19 @@ var HandoffRuntime = class _HandoffRuntime {
       "",
       pack.prompt.trimEnd(),
       "",
-      run.request.selfCheck ? `When the file is complete, run: atticus handoff done ${run.runId}. It checks the file as the stage does: fix each problem it lists in the file and run it again, until it says the file is clean. After ${run.request.selfCheck.limit} checks the file is handed in as it is.` : `When the file is complete, run: atticus handoff done ${run.runId}`,
+      // ADR 0189: an assistant that can run commands may check its file first, as the stage
+      // does; the check only reads the file, so the app's own check is still the one that counts.
+      ...run.request.selfCheck ? [
+        `Before you finish, you may check the file: ${run.request.selfCheck.command} ${where} checks it as the stage does. Fix each problem it lists and check again, until it says the file is clean (at most ${run.request.selfCheck.limit} times).`,
+        ""
+      ] : [],
+      _HandoffRuntime.finishLine(where),
       ""
     ].join("\n");
   }
-  /** A run id no run folder of the change has yet. */
+  /** A run id no run folder of the change has yet, its folder made (claimed) with it. */
   async freshId(change, now) {
-    let runId = makeRunId(now, ++this.seq);
-    while (await stat(this.runDir(change, runId)).catch(() => void 0))
-      runId = makeRunId(now, ++this.seq);
-    return runId;
+    return claimRunDir(join4(runsDirOf(this.o.root), change), () => makeRunId(now, ++this.seq));
   }
   /**
    * Whether `parts` runs that wait together, `tokens` in all, are asked in one prompt (ADR 0185):
@@ -1836,9 +1928,9 @@ var HandoffRuntime = class _HandoffRuntime {
     };
     run.request.pack = { prompt, manifest };
     const dir = this.runDir(o.change, runId);
-    await mkdir3(dir, { recursive: true });
-    await writeFile3(join3(dir, "prompt.md"), prompt, "utf8");
-    await writeFile3(join3(dir, "context-manifest.json"), JSON.stringify(manifest, null, 2) + "\n", "utf8");
+    await mkdir4(dir, { recursive: true });
+    await writeFile3(join4(dir, "prompt.md"), prompt, "utf8");
+    await writeFile3(join4(dir, "context-manifest.json"), JSON.stringify(manifest, null, 2) + "\n", "utf8");
     await this.save(run);
     for (const p of parts)
       await this.save({ ...p.run, batch: runId });
@@ -1863,9 +1955,9 @@ var HandoffRuntime = class _HandoffRuntime {
       stepClass: stepClassOf(request)
     };
     const dir = this.runDir(request.change, run.runId);
-    await mkdir3(dir, { recursive: true });
-    await writeFile3(join3(dir, "prompt.md"), _HandoffRuntime.promptFor(run, changesRelOf(this.o.root), runsRelOf(this.o.root)), "utf8");
-    await writeFile3(join3(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
+    await mkdir4(dir, { recursive: true });
+    await writeFile3(join4(dir, "prompt.md"), _HandoffRuntime.promptFor(run, changesRelOf(this.o.root), runsRelOf(this.o.root)), "utf8");
+    await writeFile3(join4(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
     return this.save(run);
   }
   /** Hand the prompt to the assistant; Atticus now waits. */
@@ -1984,7 +2076,7 @@ var HandoffRuntime = class _HandoffRuntime {
       throw new RuntimeError(`not a run id: ${runId}`);
     const runs = runsDirOf(this.o.root);
     for (const change of await readdir3(runs).catch(() => [])) {
-      const f = join3(runs, change, runId, "run.json");
+      const f = join4(runs, change, runId, "run.json");
       const text = await readFile3(f, "utf8").catch(() => void 0);
       if (text)
         return JSON.parse(text);
@@ -1998,12 +2090,12 @@ async function pruneRuns(root, days, now = /* @__PURE__ */ new Date(), only) {
   const cutoff = now.getTime() - days * 864e5;
   const changes = only ? [only] : await readdir3(runs).catch(() => []);
   for (const change of changes) {
-    for (const runId of await readdir3(join3(runs, change)).catch(() => [])) {
-      const f = join3(runs, change, runId, "run.json");
+    for (const runId of await readdir3(join4(runs, change)).catch(() => [])) {
+      const f = join4(runs, change, runId, "run.json");
       const text = await readFile3(f, "utf8").catch(() => void 0);
       const started = text ? Date.parse(JSON.parse(text).startedAt) : NaN;
       if (!Number.isNaN(started) && started < cutoff) {
-        await rm(join3(runs, change, runId), { recursive: true, force: true });
+        await rm(join4(runs, change, runId), { recursive: true, force: true });
         removed.push(`${change}/${runId}`);
       }
     }
@@ -2014,15 +2106,15 @@ async function pruneRuns(root, days, now = /* @__PURE__ */ new Date(), only) {
 // packages/ai/dist/factory.js
 import { existsSync as existsSync2 } from "node:fs";
 import { spawn as spawn2 } from "node:child_process";
-import { mkdir as mkdir5, mkdtemp, readFile as readFile5, rm as rm2, stat as stat3, writeFile as writeFile5 } from "node:fs/promises";
+import { mkdir as mkdir6, mkdtemp, readFile as readFile5, rm as rm2, stat as stat3, writeFile as writeFile5 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname as dirname2, join as join5 } from "node:path";
+import { dirname as dirname2, join as join6 } from "node:path";
 
 // packages/ai/dist/copilot-acp.js
 import { spawn } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
-import { mkdir as mkdir4, readFile as readFile4, stat as stat2, writeFile as writeFile4 } from "node:fs/promises";
-import { basename, dirname, isAbsolute, join as join4, relative, resolve, sep } from "node:path";
+import { mkdir as mkdir5, readFile as readFile4, stat as stat2, writeFile as writeFile4 } from "node:fs/promises";
+import { basename, dirname, isAbsolute, join as join5, relative, resolve, sep } from "node:path";
 import { createInterface } from "node:readline";
 
 // packages/ai/dist/acp.js
@@ -2301,10 +2393,12 @@ function atticusArgvOf(command, args = []) {
   const argv = all.slice(1);
   if (!argv.length)
     return { refused: "atticus needs a command (atticus next, atticus verify <repo>, ...)" };
+  const named = [...withoutLegacy(argv)];
   for (const p of PERSONS)
-    if (p.test(argv))
+    if (p.test(named))
       return { refused: `Refused: ${p.why}.` };
-  if (argv[0].startsWith("-") && !["--help", "--version", "-h"].includes(argv[0]))
+  const hidden = argv[0] === "legacy" && argv[1]?.startsWith("-") && argv.slice(2).some((x) => !x.startsWith("-"));
+  if (hidden || argv[0].startsWith("-") && !["--help", "--version", "-h"].includes(argv[0]))
     return {
       refused: `Put the command first: atticus <command> [arguments] (got ${short(argv.join(" "))})`
     };
@@ -2319,7 +2413,7 @@ function real(p) {
   const rest = [];
   for (; ; ) {
     try {
-      return join4(realpathSync.native(cur), ...rest.reverse());
+      return join5(realpathSync.native(cur), ...rest.reverse());
     } catch {
       const up = dirname(cur);
       if (up === cur)
@@ -2383,7 +2477,7 @@ var factsOnly = (root, factsDir) => ({
 });
 function readRootsOf(root) {
   const out = [root];
-  const state = join4(stateDirOf(root), "workspace");
+  const state = join5(stateDirOf(root), "workspace");
   if (!sameOrUnder(resolve(root), resolve(state)))
     out.push(state);
   return out;
@@ -2634,7 +2728,7 @@ async function runAcpSession(o) {
       const why = paths.writable(p.path);
       if (why)
         return refuse("fs/write_text_file", { path: p.path }, why);
-      await mkdir4(dirname(p.path), { recursive: true });
+      await mkdir5(dirname(p.path), { recursive: true });
       await writeFile4(p.path, p.content, "utf8");
       record("fs/write_text_file", { path: p.path }, `${p.content.length} characters written`);
       return null;
@@ -2829,7 +2923,7 @@ async function runAcpSession(o) {
       t.kill.abort();
     await server.close().catch(() => void 0);
     if (o.transcript) {
-      await mkdir4(dirname(o.transcript), { recursive: true });
+      await mkdir5(dirname(o.transcript), { recursive: true });
       await writeFile4(o.transcript, transcript.join("\n") + (transcript.length ? "\n" : ""), "utf8");
     }
   }
@@ -2968,20 +3062,24 @@ var CopilotAcpRuntime = class extends OneShotRuntime {
   modelFor() {
     return this.c.model;
   }
+  /** Review round 48: the run's folder is claimed, as a model run's is (claimRunDir). */
+  async newRunId(request, now) {
+    return claimRunDir(join5(runsDirOf(this.c.root), request.change), () => this.nextRunId(now));
+  }
   async produce(run, signal) {
     const { request } = run;
     const root = this.c.root;
-    const dir = join4(runsDirOf(root), request.change, run.runId);
-    await mkdir4(dir, { recursive: true });
+    const dir = join5(runsDirOf(root), request.change, run.runId);
+    await mkdir5(dir, { recursive: true });
     const outRel = HandoffRuntime.outputRel(run, changesRelOf(root), runsRelOf(root));
     const prompt = HandoffRuntime.promptFor(run, changesRelOf(root), runsRelOf(root)).replace(/\nWhen the file is complete.*\n$/s, "\n") + (request.selfCheck ? `
 Before you finish, check the file: run ${request.selfCheck.command} ${outRel}. Fix each problem it lists and run it again, until it says the file is clean (at most ${request.selfCheck.limit} times).
 ` : "") + `
 ${DATA_RULE}
 `;
-    await writeFile4(join4(dir, "prompt.md"), prompt, "utf8");
-    await writeFile4(join4(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
-    const outputFile = request.outputIn === "run" ? join4(dir, request.outputPath) : join4(changesDirOf(root), request.change, request.outputPath);
+    await writeFile4(join5(dir, "prompt.md"), prompt, "utf8");
+    await writeFile4(join5(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
+    const outputFile = request.outputIn === "run" ? join5(dir, request.outputPath) : join5(changesDirOf(root), request.change, request.outputPath);
     const before = (await stat2(outputFile).catch(() => void 0))?.mtimeMs;
     const r = await runAcpSession({
       command: this.c.command,
@@ -2997,7 +3095,7 @@ ${DATA_RULE}
       ...this.c.env ? { env: this.c.env } : {},
       ...this.c.spawn ? { spawn: this.c.spawn } : {},
       ...this.c.clientVersion ? { clientVersion: this.c.clientVersion } : {},
-      transcript: join4(dir, "transcript.jsonl")
+      transcript: join5(dir, "transcript.jsonl")
     });
     const after = (await stat2(outputFile).catch(() => void 0))?.mtimeMs;
     const written = after !== void 0 && after !== before ? await readFile4(outputFile, "utf8") : void 0;
@@ -3021,9 +3119,9 @@ ${DATA_RULE}
   }
   /** Kept as a hand-off run is: run.json beside the prompt, so Model runs shows it. */
   async keep(run) {
-    const dir = join4(runsDirOf(this.c.root), run.request.change, run.runId);
-    await mkdir4(dir, { recursive: true });
-    await writeFile4(join4(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
+    const dir = join5(runsDirOf(this.c.root), run.request.change, run.runId);
+    await mkdir5(dir, { recursive: true });
+    await writeFile4(join5(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
   }
 };
 var noExec = async (argv) => ({
@@ -3032,10 +3130,10 @@ var noExec = async (argv) => ({
 `
 });
 async function keepAcpRun(o) {
-  const dir = join4(runsDirOf(o.root), o.change, o.runId);
-  await mkdir4(dir, { recursive: true });
-  if (!existsSync(join4(dir, "prompt.md")))
-    await writeFile4(join4(dir, "prompt.md"), o.prompt, "utf8");
+  const dir = join5(runsDirOf(o.root), o.change, o.runId);
+  await mkdir5(dir, { recursive: true });
+  if (!existsSync(join5(dir, "prompt.md")))
+    await writeFile4(join5(dir, "prompt.md"), o.prompt, "utf8");
   const r = o.result;
   const run = {
     runId: o.runId,
@@ -3058,7 +3156,7 @@ async function keepAcpRun(o) {
     ...r?.model ? { model: r.model } : {},
     ...r ? { assistant: r.assistant } : {}
   };
-  await writeFile4(join4(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
+  await writeFile4(join5(dir, "run.json"), JSON.stringify(run, null, 2) + "\n", "utf8");
   return dir;
 }
 
@@ -3161,7 +3259,7 @@ function collectChild(start, prompt, timeoutMs, cwd, platform = process.platform
     child.stdin.end(prompt, "utf8");
   });
 }
-var cloneDirs = (root) => [join5(root, "workspace"), join5(stateDirOf(root), "workspace")];
+var cloneDirs = (root) => [join6(root, "workspace"), join6(stateDirOf(root), "workspace")];
 async function existingDirs(dirs) {
   const out = [];
   for (const d of [...new Set(dirs)])
@@ -3202,9 +3300,9 @@ var HeadlessClaudeCodeRuntime = class _HeadlessClaudeCodeRuntime extends OneShot
   }
   async produce(run, signal) {
     const { request } = run;
-    const dir = join5(runsDirOf(this.h.root), request.change, run.runId);
+    const dir = join6(runsDirOf(this.h.root), request.change, run.runId);
     const reviewer = request.agent.outputArtifact === "findings" && request.outputIn === "run";
-    const work = reviewer ? await mkdtemp(join5(tmpdir(), "atticus-review-")) : void 0;
+    const work = reviewer ? await mkdtemp(join6(tmpdir(), "atticus-review-")) : void 0;
     const clones = work ? await existingDirs(cloneDirs(this.h.root)) : [];
     const base = work ? {
       cwd: work,
@@ -3218,27 +3316,27 @@ var HeadlessClaudeCodeRuntime = class _HeadlessClaudeCodeRuntime extends OneShot
         `Bash(${request.selfCheck.command}:*)`
       ]
     } : base;
-    await mkdir5(dir, { recursive: true });
-    const promptFile = join5(dir, "prompt.md");
+    await mkdir6(dir, { recursive: true });
+    const promptFile = join6(dir, "prompt.md");
     const self = reviewer ? void 0 : request.selfCheck;
-    const handoff = HandoffRuntime.promptFor(run, changesRelOf(this.h.root), runsRelOf(this.h.root)).replace(/\nWhen the file is complete.*\n$/s, "\n") + // W3a: the drafter checks its own file with the stage's checks before it finishes.
+    const handoff = HandoffRuntime.promptFor(run, changesRelOf(this.h.root), runsRelOf(this.h.root), false) + // W3a: the drafter checks its own file with the stage's checks before it finishes.
     (self ? `
 Before you finish, check the file: run ${self.command} ${HandoffRuntime.outputRel(run, changesRelOf(this.h.root), runsRelOf(this.h.root))}. Fix each problem it lists and run it again, until it says the file is clean (at most ${self.limit} times).
 ` : "");
     const prompt = reviewer ? handoff.replace(`Write the result to ${HandoffRuntime.outputRel(run, changesRelOf(this.h.root), runsRelOf(this.h.root))}.`, `Write the result to ${request.outputPath}.${clones.length ? ` The metarepo is at ${this.h.root}: a folder named relative to the metarepo (the repos' clones under workspace/) is there, to read, never to edit.` : ""}`) : handoff;
     await writeFile5(promptFile, prompt, "utf8");
-    await writeFile5(join5(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
+    await writeFile5(join6(dir, "context-manifest.json"), JSON.stringify(request.pack.manifest, null, 2) + "\n", "utf8");
     if (!await stat3(inv.cwd).catch(() => void 0))
       throw new RuntimeError(`the worktree ${inv.cwd} doesn't exist`);
-    const outputFile = work ? join5(work, request.outputPath) : request.outputIn === "run" ? join5(dir, request.outputPath) : join5(changesDirOf(this.h.root), request.change, request.outputPath);
+    const outputFile = work ? join6(work, request.outputPath) : request.outputIn === "run" ? join6(dir, request.outputPath) : join6(changesDirOf(this.h.root), request.change, request.outputPath);
     try {
       return await this.runIn(run, dir, inv, prompt, promptFile, outputFile, signal);
     } finally {
       if (work) {
         const kept = await readFile5(outputFile, "utf8").catch(() => void 0);
         if (kept !== void 0) {
-          await mkdir5(dirname2(join5(dir, request.outputPath)), { recursive: true });
-          await writeFile5(join5(dir, request.outputPath), kept, "utf8");
+          await mkdir6(dirname2(join6(dir, request.outputPath)), { recursive: true });
+          await writeFile5(join6(dir, request.outputPath), kept, "utf8");
         }
         await rm2(work, { recursive: true, force: true, maxRetries: 5 }).catch(() => void 0);
       }
@@ -3262,7 +3360,7 @@ Before you finish, check the file: run ${self.command} ${HandoffRuntime.outputRe
       timeoutMs: this.h.timeoutMs ?? 30 * 6e4,
       ...signal ? { signal } : {}
     });
-    await writeFile5(join5(dir, "claude-output.json"), res.stdout, "utf8");
+    await writeFile5(join6(dir, "claude-output.json"), res.stdout, "utf8");
     let parsed;
     try {
       parsed = JSON.parse(res.stdout);
@@ -3318,6 +3416,10 @@ var toolSource;
 function registerToolSource(source) {
   toolSource = source;
 }
+var modelGuard;
+function registerModelGuard(g) {
+  modelGuard = g;
+}
 var acpRunner;
 function registerCopilotAcp(o) {
   acpRunner = o;
@@ -3371,6 +3473,8 @@ async function createRuntime(orgPack, o) {
       const cfg = rt.adapters.model;
       if (!cfg)
         throw new RuntimeConfigError("Model mode needs a model adapter in runtime.yaml (adapters.model with its type and settings). Until one is configured, use hand-off mode.");
+      if (modelGuard && cfg.type !== "mock")
+        await modelGuard({ root: o.root, type: cfg.type, settings: { ...cfg.settings } });
       const make = o.providers?.[cfg.type] ?? await providerFactoryFor(orgPack, cfg.type) ?? (cfg.type === "mock" ? (s) => new MockModelProvider(typeof s.model === "string" ? s.model : "mock-model", o.modelAnswer ?? (() => ""), o.modelScript) : void 0);
       if (!make)
         throw new RuntimeConfigError(`No ${cfg.type} model provider is installed. Add its plugin, or use hand-off mode.`);
@@ -3437,7 +3541,7 @@ var sayOnce = (line) => process.stderr.write(`${line}
 `);
 async function runtimeForCli(root, o = {}) {
   const env = o.env ?? process.env;
-  const op = await loadOrgPack(join5(orgPackDirOf(root)));
+  const op = await loadOrgPack(join6(orgPackDirOf(root)));
   const bad = op.problems.filter((p) => p.file === "runtime.yaml");
   if (bad.length)
     throw new RuntimeConfigError(`org-pack/runtime.yaml has problems: ${bad.map((p) => `${p.path ? `${p.path}: ` : ""}${p.message}`).join("; ")}`);
@@ -3457,7 +3561,7 @@ async function runtimeForCli(root, o = {}) {
     env,
     onNote: o.onNote ?? sayOnce
   });
-  const describe = runtime.kind === "hand-off" ? "AI steps are handed to your assistant: Atticus writes the prompt and waits for atticus handoff done." : mode === "model" ? `AI steps call the ${op.runtime.adapters.model?.type ?? "configured"} model directly.` : mode === "headless-claude-code" ? "AI steps run in headless Claude Code." : mode === "copilot-acp" ? "AI steps run in GitHub Copilot, unattended, one new session each (copilot-acp)." : "AI steps replay recorded answers.";
+  const describe = runtime.kind === "hand-off" ? "AI steps are handed to your assistant: Atticus writes the prompt and checks the answer once your assistant has written it." : mode === "model" ? `AI steps call the ${op.runtime.adapters.model?.type ?? "configured"} model directly.` : mode === "headless-claude-code" ? "AI steps run in headless Claude Code." : mode === "copilot-acp" ? "AI steps run in GitHub Copilot, unattended, one new session each (copilot-acp)." : "AI steps replay recorded answers.";
   return { runtime, mode: runtime.kind === "hand-off" ? "hand-off" : mode, describe };
 }
 
@@ -4045,6 +4149,7 @@ function recordedJudge(byTexts, o = {}) {
 }
 
 export {
+  withoutLegacy,
   personOnlyWhy,
   isPersonsFactsFile,
   windowsName,
@@ -4081,7 +4186,7 @@ export {
   BIGGER_MODEL,
   PromptTooLong,
   sha2562 as sha256,
-  estimateTokens,
+  RequiredSourceLeftOut,
   wrapData,
   DATA_RULE,
   buildContextPack,
@@ -4097,6 +4202,7 @@ export {
   RuntimeError,
   checkAllowed,
   makeRunId,
+  claimRunDir,
   toRunSummary,
   OneShotRuntime,
   ToolError,
@@ -4162,6 +4268,7 @@ export {
   registeredModelProviders,
   clearModelProviders,
   registerToolSource,
+  registerModelGuard,
   registerCopilotAcp,
   createRuntime,
   runtimeForCli,