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

package/dist/{chunk-XO5RQKNM.js → chunk-BEPCKDCP.js}

@@ -10,13 +10,25 @@ import {
   FlowDelta,
   STAGE_PHASE,
   STAGE_SCHEMA_VERSION,
+  Stage,
   StageLoop,
   fieldNames,
   parseAt,
   parseNewFile,
   rerunOf,
   usesOf
-} from "./chunk-L3T33FA7.js";
+} from "./chunk-HWD4JPU7.js";
+import {
+  GAP_STEP,
+  candidateRef,
+  contextToolBox,
+  defaultCodeDir,
+  gapNameOf,
+  gapQuestion,
+  namesInCode,
+  nodesById,
+  openIndex
+} from "./chunk-5WERBKLE.js";
 import {
   CriticError,
   MERGED_FLOWS,
@@ -42,12 +54,13 @@ import {
   readRoundMeta,
   readSnowDrafts,
   readTasks,
+  roundsOf,
   runCritic,
   sectionLines,
   triggerReason,
   waitingLenses,
   writeQuarantineItems
-} from "./chunk-VEJYZEPC.js";
+} from "./chunk-K332XW7K.js";
 import {
   changeFolder,
   changeFootprint,
@@ -63,20 +76,20 @@ import {
   scoreRisk,
   stageCommand,
   testPlanFor
-} from "./chunk-IOW6BF3U.js";
+} from "./chunk-HSZMPH5T.js";
 import {
   ARTIFACT_STAGE,
   artifactsOfStage,
   createOpenSpec
-} from "./chunk-43E6XX67.js";
+} from "./chunk-D2WSW4GU.js";
 import {
   AdapterError,
   createAdapters,
   fileStepStore
-} from "./chunk-V3UEPUHT.js";
+} from "./chunk-4KNOJC6J.js";
 import {
   readCatalog
-} from "./chunk-EZBAS5BL.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   CONFLICT_STEP,
   checkQuote,
@@ -95,28 +108,17 @@ import {
   snapshotPages,
   syncSources,
   workingDays
-} from "./chunk-KCQS52TH.js";
+} from "./chunk-64AADMTW.js";
 import {
   changeInputSources,
   citedParts,
   heldOutInputs,
   readServiceRequestExports,
   readWorkItemExports
-} from "./chunk-TNCROWPQ.js";
+} from "./chunk-CPK7QSBG.js";
 import {
   readDocument
-} from "./chunk-7IM4BVVH.js";
-import {
-  GAP_STEP,
-  candidateRef,
-  contextToolBox,
-  defaultCodeDir,
-  gapNameOf,
-  gapQuestion,
-  namesInCode,
-  nodesById,
-  openIndex
-} from "./chunk-YXUIUOQZ.js";
+} from "./chunk-YO2PKTXT.js";
 import {
   APPLIES_SPEC,
   ASKS_CHECK_SPEC,
@@ -137,9 +139,10 @@ import {
   toRunSummary,
   verdictOf,
   wrapData
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
 import {
   AgentDefinition,
+  JOINED_BY_AI,
   JOIN_GUESS_FLAGS,
   KNOWLEDGE_KINDS,
   Procedure,
@@ -149,18 +152,22 @@ import {
   RecordId,
   RuntimeKind,
   ServiceRequestTemplate,
+  answerByWords,
   answerText,
   answerWords,
   authorityRank,
   catalogDirOf,
   changesDirOf,
   changesRelOf,
+  componentTypeRulesText,
+  effectiveComponentTypes,
   external_exports,
   factsDirOf,
   fileJudgments,
   gateRoundLimit,
   identifierWords,
   inputsDirOf,
+  isAiBy,
   isSecretPath,
   judgmentKey,
   knowledgeKindOf,
@@ -170,6 +177,7 @@ import {
   normalizePath,
   openspecDirOf,
   orgPackDirOf,
+  orgPackRelOf,
   overrideJudgment,
   ownerOfQuestion,
   proposalsDirOf,
@@ -194,10 +202,10 @@ import {
   taskBranch,
   toCanonicalYaml,
   writeQuestion
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   writeFileAtomic
-} from "./chunk-MMB2OHUY.js";
+} from "./chunk-ODMBPDDV.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -236,10 +244,10 @@ function stem(word) {
     w = w.slice(0, -1);
   return w;
 }
-function contentWords(text2) {
+function contentWords(text4) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const raw of text2.replace(/([a-z])([A-Z])/g, "$1 $2").toLowerCase().split(/[^a-z0-9']+/)) {
+  for (const raw of text4.replace(/([a-z])([A-Z])/g, "$1 $2").toLowerCase().split(/[^a-z0-9']+/)) {
     const w = raw.replace(/^'+|'+$/g, "");
     if (!w || STOP.has(w) || /^\d+$/.test(w))
       continue;
@@ -298,12 +306,12 @@ function readRequirements(files) {
           then
         });
       }
-      const text2 = doc.lines.slice(req.line - 1, req.end).map((l) => strip(l.replace(/^#+\s*/, ""))).filter(Boolean).join("\n");
+      const text4 = doc.lines.slice(req.line - 1, req.end).map((l) => strip(l.replace(/^#+\s*/, ""))).filter(Boolean).join("\n");
       out.push({
         file: doc.path,
         name: req.heading.replace(/^requirement:\s*/i, "").trim(),
         line: req.line,
-        text: text2,
+        text: text4,
         scenarios
       });
     }
@@ -363,7 +371,7 @@ async function loadPlanContext(root, changeId, o = {}) {
       return systemOf2(t.dataStore);
     return void 0;
   };
-  const repoOf = (component) => get("Component", component)?.repo ?? manifestRepos.find((r) => r.component === component)?.id;
+  const repoOf2 = (component) => get("Component", component)?.repo ?? manifestRepos.find((r) => r.component === component)?.id;
   const runtime = lifecycle.orgPack.runtime;
   const intro = docOf(files, "proposal.md");
   const questions = [];
@@ -396,7 +404,7 @@ async function loadPlanContext(root, changeId, o = {}) {
     boundaryOf: (s) => get("System", s)?.boundary ?? profileSystems.get(s)?.boundary,
     systemName: (s) => get("System", s)?.name ?? profileSystems.get(s)?.name ?? s,
     isKnown: (id) => get("Component", id) !== void 0 || get("System", id) !== void 0 || profileSystems.has(id) || endpointOwners.has(id),
-    repoOf,
+    repoOf: repoOf2,
     componentOfRepo: (repo) => records.find((r) => r.kind === "Component" && r.repo === repo)?.id ?? manifestRepos.find((r) => r.id === repo)?.component,
     knownRepos: /* @__PURE__ */ new Set([
       ...manifestRepos.map((r) => r.id),
@@ -440,9 +448,9 @@ function requirementIsAboutHop(ctx, r, h) {
 }
 function requirementMentionsData(r, d) {
   const flat = (s) => ` ${words(s).replace(/[^a-z0-9]+/g, " ").trim()} `;
-  const text2 = flat(r.text);
+  const text4 = flat(r.text);
   const names = d.newTable ? [d.table] : d.newColumns.map((c) => c.name);
-  return names.some((n) => text2.includes(flat(n)));
+  return names.some((n) => text4.includes(flat(n)));
 }
 var escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function hopKey(ctx, h) {
@@ -451,10 +459,10 @@ function hopKey(ctx, h) {
   const last = seg ? slug(seg) : slug(h.operation);
   return last.startsWith(slug(sys)) ? last : `${slug(sys)}-${last}`;
 }
-function traceToProposal(ctx, text2) {
+function traceToProposal(ctx, text4) {
   let best;
   for (const b of ctx.changes) {
-    const n = overlap(text2, b.text);
+    const n = overlap(text4, b.text);
     if (n >= 2 && (!best || n > best.n))
       best = { ...b, n };
   }
@@ -518,7 +526,7 @@ function buildSkeleton(ctx) {
     material: []
   });
   const known = (h) => ctx.isKnown(h.callee) && ctx.isKnown(h.caller);
-  const named = new Set(hops.filter((h) => known(h) && ctx.requirements.some((r) => requirementMentionsHop(ctx, r, h))));
+  const named2 = new Set(hops.filter((h) => known(h) && ctx.requirements.some((r) => requirementMentionsHop(ctx, r, h))));
   for (const r of ctx.requirements) {
     const s = blank(slug(r.name), "requirement");
     s.requirement = r;
@@ -531,7 +539,7 @@ function buildSkeleton(ctx) {
       }
     if (s.hops.length === 0) {
       for (const h of hops)
-        if (known(h) && !named.has(h) && requirementIsAboutHop(ctx, r, h)) {
+        if (known(h) && !named2.has(h) && requirementIsAboutHop(ctx, r, h)) {
           s.hops.push(h);
           used.add(h);
         }
@@ -663,12 +671,12 @@ ${m}`);
         uiRepos.add(repo);
     }
   for (const s of stories) {
-    const text2 = s.hops.map((h) => ctx.mapping(h)).join("\n").toLowerCase();
+    const text4 = s.hops.map((h) => ctx.mapping(h)).join("\n").toLowerCase();
     for (const o of stories) {
       if (o === s)
         continue;
       const adds = o.data.flatMap((d) => d.newColumns.map((c) => `${d.table.toLowerCase()}.${c.name.toLowerCase()}`));
-      if (adds.some((a) => text2.includes(a)))
+      if (adds.some((a) => text4.includes(a)))
         s.dependsOn.push(o.id);
     }
   }
@@ -879,13 +887,13 @@ function storyPack(ctx, skeleton, agent, now) {
     }
   ];
   const add = (rel, priority) => {
-    const text2 = doc(rel);
-    if (text2)
+    const text4 = doc(rel);
+    if (text4)
       sources.push({
         id: rel,
         kind: "artifact",
         origin: `${changesRelOf(ctx.root)}/${ctx.change.id}/${rel}`,
-        text: text2,
+        text: text4,
         classification: "internal",
         priority
       });
@@ -1280,6 +1288,98 @@ function readDrafts(ctx) {
     return [{ template: t, record, fields: fields2, heading: d.heading }];
   });
 }
+var SnowFillError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SnowFillError";
+  }
+};
+var rowCells = (line) => {
+  let s = line.trim();
+  if (s.startsWith("|"))
+    s = s.slice(1);
+  if (s.endsWith("|"))
+    s = s.slice(0, -1);
+  return s.split("|").map((c) => c.trim());
+};
+function fillSnowFields(text4, heading, values) {
+  const given = Object.entries(values).map(([name, v]) => [name.trim(), v.trim()]);
+  if (!given.length)
+    throw new SnowFillError("Give at least one field to fill.");
+  for (const [name, v] of given)
+    if (!name || /[|\r\n]/.test(v) || /[|\r\n]/.test(name))
+      throw new SnowFillError(`${name || "A field"}: a value can't hold | or a line break (snow.md keeps it in a table cell).`);
+  const eol = text4.includes("\r\n") ? "\r\n" : "\n";
+  const doc = parseDoc("snow.md", text4);
+  const raw = doc.rawLines;
+  const s = doc.sections.find((x) => x.level === 2 && x.heading === heading);
+  if (!s)
+    throw new SnowFillError(`snow.md has no request "${heading}". Reload the page to see its requests.`);
+  const table = doc.tables.find((t) => t.line >= s.line && t.line <= s.end && t.headers.includes("field"));
+  if (!table || !table.headers.includes("value"))
+    throw new SnowFillError(`"${heading}" in snow.md has no Field | Value table to fill.`);
+  const fieldAt = table.headers.indexOf("field");
+  const valueAt2 = table.headers.indexOf("value");
+  const edited = /* @__PURE__ */ new Map();
+  const added = [];
+  const row = (cells) => `| ${cells.join(" | ")} |`;
+  for (const [name, v] of given) {
+    const r = table.rows.find((x) => (x.cells.field ?? "").toLowerCase() === name.toLowerCase());
+    if (!r) {
+      const cells2 = table.headers.map(() => "");
+      cells2[fieldAt] = name;
+      cells2[valueAt2] = v;
+      added.push(row(cells2));
+      continue;
+    }
+    const at2 = r.line - 1;
+    if (raw[at2].includes("<!--"))
+      throw new SnowFillError(`${name}'s row in snow.md holds a comment: edit that row there.`);
+    const cells = rowCells(raw[at2]);
+    while (cells.length < table.headers.length)
+      cells.push("");
+    cells[valueAt2] = v;
+    edited.set(at2, row(cells));
+  }
+  const filled = given.filter(([, v]) => v).map(([n]) => n.toLowerCase());
+  const drop = /* @__PURE__ */ new Set();
+  const lines = doc.lines;
+  for (let i = s.line; i < s.end; i++) {
+    if (lines[i].trim() !== "To fill:")
+      continue;
+    let j = i + 1;
+    const bullets2 = [];
+    for (; j < s.end; j++) {
+      const l = lines[j].trim();
+      if (!l)
+        continue;
+      if (!l.startsWith("- "))
+        break;
+      bullets2.push(j);
+    }
+    for (const b of bullets2) {
+      const l = lines[b].trim().slice(2).toLowerCase();
+      if (filled.some((n) => l.startsWith(`${n}:`)))
+        drop.add(b);
+    }
+    if (bullets2.length && bullets2.every((b) => drop.has(b))) {
+      const last = bullets2[bullets2.length - 1];
+      for (let k = i; k <= last; k++)
+        drop.add(k);
+      if (last + 1 < raw.length && !raw[last + 1].trim() && last + 1 < s.end)
+        drop.add(last + 1);
+    }
+  }
+  const lastRow = table.rows.length ? table.rows[table.rows.length - 1].line - 1 : table.line;
+  const out = [];
+  raw.forEach((l, i) => {
+    if (!drop.has(i))
+      out.push(edited.get(i) ?? l);
+    if (i === lastRow)
+      out.push(...added);
+  });
+  return out.join(eol);
+}
 
 // packages/planner/dist/plan.js
 import { readdir, readFile, rm } from "node:fs/promises";
@@ -1295,8 +1395,8 @@ async function guard(ctx, rels, force) {
     const p = join(ctx.dir, rel);
     if (!await exists(p))
       continue;
-    const text2 = await readFile(p, "utf8");
-    if (!text2.startsWith(GENERATED_MARK))
+    const text4 = await readFile(p, "utf8");
+    if (!text4.startsWith(GENERATED_MARK))
       own.push(rel);
   }
   if (own.length)
@@ -1430,15 +1530,19 @@ var body = (doc, re) => {
 };
 var bullets = (lines = []) => lines.map((l) => /^\s*[-*]\s+(.*)$/.exec(l)?.[1]?.trim()).filter((x) => !!x);
 var list = (s) => s.split(/[,;]/).map((x) => x.trim()).filter((x) => x && !/^(none|nothing)\.?$/i.test(x));
-function parseStory(path, text2) {
-  const doc = parseDoc(path, text2);
+function parseStory(path, text4) {
+  const doc = parseDoc(path, text4);
   const id = path.replace(/^stories\//, "").replace(/\.md$/, "");
   const h1 = doc.sections.find((s) => s.level === 1);
   const firstH2 = doc.sections.find((s) => s.level === 2);
   const intro = h1 ? doc.lines.slice(h1.line, firstH2 ? firstH2.line - 1 : doc.lines.length).join(" ") : "";
   const w = /\bas an?\s+(.+?)\s*,?\s+i want\s+(.+?)\s*,?\s+so that\s+(.+?)\s*$/i.exec(intro.replace(/\s+/g, " ").trim());
-  const sysLine = (body(doc, /^systems and repos$/i) ?? []).join(" ");
+  const sysSection = section(doc, /^systems and repos$/i);
+  const sysLines = sysSection ? sectionLines(doc, sysSection) : [];
+  const sysEnd = sysLines.findIndex((l, i) => i > 0 && l.n !== sysLines[i - 1].n + 1);
+  const sysLine = sysLines.slice(0, sysEnd < 0 ? void 0 : sysEnd).map((l) => l.text).join(" ").trim();
   const m = /^(.*?)(?:\((.*)\))?\s*$/.exec(sysLine);
+  const parens = !!m?.[2];
   const links2 = bullets(body(doc, /^links$/i));
   const interfaces = links2.flatMap((l) => {
     const x = /^Interface\s+(\S+):\s*(\S+)\s*→\s*(\S+)\s+([A-Z]+\s+\S+)/.exec(l);
@@ -1459,6 +1563,7 @@ function parseStory(path, text2) {
     ...body(doc, /^traces to$/i)?.[0] ? { traces: body(doc, /^traces to$/i)[0].trim() } : {},
     systems: list(m?.[1] ?? ""),
     repos: list(m?.[2] ?? ""),
+    ...sysLine && !parens ? { bare: true } : {},
     tests: list((body(doc, /^tests$/i) ?? []).join(" ")),
     ...dep ? { dependsOn: list(dep.join(" ")) } : {},
     interfaces,
@@ -1529,6 +1634,8 @@ function knownNames(ctx, storyIds) {
   const names = /* @__PURE__ */ new Set([
     ...ctx.records.map((r) => r.id),
     ...storyIds,
+    // The change's own id: the stage names it in each task's prompt line.
+    ctx.change.id,
     ...systems,
     ...ctx.knownRepos
   ]);
@@ -1559,6 +1666,18 @@ function knownNames(ctx, storyIds) {
       for (const g of n.text.matchAll(/\bgw-[a-z0-9-]+\b/g))
         names.add(g[0]);
   }
+  const design = [
+    ...(ctx.files.flows ?? []).map((d) => d.raw),
+    ctx.files.docs.get("design.md")?.raw ?? ""
+  ];
+  for (const text4 of design) {
+    for (const m of text4.matchAll(COMPONENT_LIKE))
+      names.add(m[0]);
+    for (const m of text4.matchAll(/\bcomponent:\s*([a-z0-9][a-z0-9._-]*)/g))
+      names.add(m[1]);
+    for (const m of text4.matchAll(OPERATION))
+      operations.add(op(m[1], m[2].replace(/[.:'"]+$/, "")));
+  }
   const records = /* @__PURE__ */ new Set([
     ...ctx.records.filter((r) => r.kind === "Table" || r.kind === "Column").map((r) => r.id),
     ...ctx.data.map((d) => d.tableId)
@@ -1579,12 +1698,39 @@ function knownNames(ctx, storyIds) {
 }
 var COMPONENT_LIKE = /(?<![\w-])[a-z][a-z0-9]*(?:-[a-z0-9]+)*-(?:api|svc|service|bff|ui|db|job|engine|gateway|app|worker)(?![\w-])/g;
 var OPERATION = /\b(GET|POST|PUT|PATCH|DELETE|HEAD)\s+(\/[^\s,;)]*)/g;
+function named(s, known) {
+  if (!s.bare)
+    return { systems: s.systems, repos: s.repos };
+  return {
+    systems: s.systems.filter((x) => !known.repos.has(x)),
+    repos: s.systems.filter((x) => known.repos.has(x))
+  };
+}
+function knownOperation(method, path, known) {
+  const key3 = `${method} ${normalizePath2(path)}`;
+  if (known.has(key3))
+    return true;
+  const want = normalizePath2(path).split("/");
+  const wild = (x) => x === "{}" || x === "*" || x === "**";
+  for (const k of known) {
+    const sp = k.indexOf(" ");
+    if (k.slice(0, sp) !== method)
+      continue;
+    const have = k.slice(sp + 1).split("/");
+    if (have.length !== want.length)
+      continue;
+    if (have.every((h, i) => h === want[i] || wild(h) || wild(want[i])))
+      return true;
+  }
+  return false;
+}
 function invented(s, known) {
   const out = /* @__PURE__ */ new Set();
-  for (const x of s.systems)
+  const n = named(s, known);
+  for (const x of n.systems)
     if (!known.systems.has(x))
       out.add(`system ${x}`);
-  for (const x of s.repos)
+  for (const x of n.repos)
     if (!known.repos.has(x))
       out.add(`repo ${x}`);
   for (const r of s.records)
@@ -1604,11 +1750,9 @@ function invented(s, known) {
   for (const m of prose.matchAll(COMPONENT_LIKE))
     if (!known.names.has(m[0]))
       out.add(m[0]);
-  for (const m of prose.matchAll(OPERATION)) {
-    const key3 = `${m[1]} ${normalizePath2(m[2].replace(/[.:]+$/, ""))}`;
-    if (!known.operations.has(key3))
+  for (const m of prose.matchAll(OPERATION))
+    if (!knownOperation(m[1], m[2].replace(/[.:'"]+$/, ""), known.operations))
       out.add(`${m[1]} ${m[2]}`);
-  }
   return [...out].sort();
 }
 function checkStory(ctx, s, checks, known) {
@@ -1619,10 +1763,18 @@ function checkStory(ctx, s, checks, known) {
   if (checks.has("traced")) {
     const m = s.traces ? /^(\S+?):(\d+)/.exec(s.traces) : null;
     const doc = m ? ctx.files.docs.get(m[1]) : void 0;
-    if (!m)
+    const paths = m ? [] : (s.traces ?? "").split(";").map((p) => /^\s*((?:target-flows|specs)\/\S+\.(?:ya?ml|md))\b/.exec(p)?.[1]).filter((p) => !!p);
+    const inChange = (p) => ctx.files.docs.has(p) || (ctx.files.flows ?? []).some((f) => f.path === p);
+    if (m) {
+      if (!doc || Number(m[2]) > doc.lines.length)
+        problems.push(`traces to ${s.traces}, which isn't in the change`);
+    } else if (paths.length === 0)
       problems.push("doesn't trace to the brief, proposal or a spec");
-    else if (!doc || Number(m[2]) > doc.lines.length)
-      problems.push(`traces to ${s.traces}, which isn't in the change`);
+    else {
+      const missing = paths.filter((p) => !inChange(p));
+      if (missing.length)
+        problems.push(`traces to ${missing.join(", ")}, which isn't in the change`);
+    }
   }
   if (checks.has("criteria")) {
     const gwt = s.criteria.filter((c) => GWT.test(c));
@@ -1632,9 +1784,10 @@ function checkStory(ctx, s, checks, known) {
       wording.push(`criterion not in Given/When/Then form: ${c.slice(0, 60)}`);
   }
   if (checks.has("systems")) {
-    if (s.systems.length === 0)
+    const n = named(s, known);
+    if (n.systems.length === 0 && n.repos.length === 0)
       problems.push("names no system");
-    if (s.repos.length === 0)
+    if (n.repos.length === 0)
       problems.push("names no repo");
   }
   if (checks.has("depends") && !s.dependsOn)
@@ -2104,8 +2257,8 @@ import { join as join4, relative, sep } from "node:path";
 var PROPOSALS_DIR = "proposals/templates";
 var HOW_TO_TITLE = /^how to\s+(?:request|raise|ask for|get|open|submit|create|file)\s+(?:an?\s+|the\s+)?(.+?)\s*$/i;
 var ref = (h, n) => h.lineRefs ? `${h.path}:${n}` : h.path;
-function linesOf(text2) {
-  return text2.split(/\r?\n/).map((t, i) => ({ n: i + 1, text: t }));
+function linesOf(text4) {
+  return text4.split(/\r?\n/).map((t, i) => ({ n: i + 1, text: t }));
 }
 function isHowTo(h) {
   return HOW_TO_TITLE.test(h.title) || h.lines.some((l) => /\bfields?\s*:/i.test(l.text));
@@ -2601,11 +2754,11 @@ async function uploads(root, inputsDir, skip) {
           const bytes = new Uint8Array(await readFile4(full));
           const doc = readDocument(e.name, bytes);
           const plain2 = /\.(md|markdown|txt)$/i.test(e.name);
-          const text2 = plain2 ? new TextDecoder().decode(bytes) : doc.text.sections.map((s) => [s.heading ? `# ${s.heading}` : "", s.text].filter(Boolean).join("\n")).join("\n");
+          const text4 = plain2 ? new TextDecoder().decode(bytes) : doc.text.sections.map((s) => [s.heading ? `# ${s.heading}` : "", s.text].filter(Boolean).join("\n")).join("\n");
           out.push({
             path: relative(root, full).split(sep).join("/"),
             title: doc.text.title,
-            lines: linesOf(text2),
+            lines: linesOf(text4),
             kind: "upload",
             lineRefs: plain2
           });
@@ -2635,13 +2788,13 @@ async function draftTemplates(root, o = {}) {
     if (s.type === "markdown-folder")
       wikiDirs.push(join4(orgPackDir, s.location));
   for (const p of wiki.pages) {
-    const text2 = await readFile4(join4(root, p.path), "utf8").catch(() => void 0);
-    if (text2 === void 0)
+    const text4 = await readFile4(join4(root, p.path), "utf8").catch(() => void 0);
+    if (text4 === void 0)
       continue;
     wikiHowTos.push({
       path: p.path,
       title: p.title,
-      lines: linesOf(text2),
+      lines: linesOf(text4),
       kind: "wiki",
       lineRefs: true
     });
@@ -2734,8 +2887,8 @@ async function draftTemplates(root, o = {}) {
     });
   }
   const files = [];
-  const write3 = async (rel, text2) => {
-    await writeFileAtomic(join4(proposalsDirOf(root), "templates", rel), text2);
+  const write3 = async (rel, text4) => {
+    await writeFileAtomic(join4(proposalsDirOf(root), "templates", rel), text4);
     files.push(`${proposalsRelOf(root)}/templates/${rel}`);
   };
   for (const d of drafts)
@@ -2831,9 +2984,9 @@ function stem2(w) {
     s = s.slice(0, -1);
   return s;
 }
-function words2(text2) {
+function words2(text4) {
   const out = /* @__PURE__ */ new Set();
-  for (const w of text2.split(/[^A-Za-z0-9]+/)) {
+  for (const w of text4.split(/[^A-Za-z0-9]+/)) {
     if (w.length < 3 || /^\d+$/.test(w))
       continue;
     for (const p of w.split(/(?<=[a-z])(?=[A-Z])/)) {
@@ -2860,9 +3013,9 @@ function relevantMap(records, brief, max = 60) {
     want.set(w, 3);
   const all2 = records;
   const byId = new Map(all2.map((r) => [r.id, r]));
-  const named = new Set(all2.filter((r) => new RegExp(`\\b${r.id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`).test(brief)).map((r) => r.id));
-  const top = (kind, text2, n) => {
-    const pool = all2.filter((r) => r.kind === kind).map((r) => ({ r, w: words2(text2(r)) }));
+  const named2 = new Set(all2.filter((r) => new RegExp(`\\b${r.id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`).test(brief)).map((r) => r.id));
+  const top = (kind, text4, n) => {
+    const pool = all2.filter((r) => r.kind === kind).map((r) => ({ r, w: words2(text4(r)) }));
     const df = /* @__PURE__ */ new Map();
     for (const p of pool)
       for (const w of p.w)
@@ -2873,7 +3026,7 @@ function relevantMap(records, brief, max = 60) {
     };
     const scored = pool.map((p) => ({
       r: p.r,
-      s: [...p.w].filter((w) => want.has(w)).reduce((a, w) => a + weight(w) * want.get(w), 0) + (named.has(p.r.id) ? 10 : 0)
+      s: [...p.w].filter((w) => want.has(w)).reduce((a, w) => a + weight(w) * want.get(w), 0) + (named2.has(p.r.id) ? 10 : 0)
     })).filter((x) => x.s > 0);
     const best = Math.max(0, ...scored.map((x) => x.s));
     return scored.filter((x) => x.s >= best * 0.5).sort((a, b) => b.s - a.s || a.r.id.localeCompare(b.r.id)).slice(0, n).map((x) => x.r);
@@ -2895,7 +3048,7 @@ function relevantMap(records, brief, max = 60) {
   for (const e of endpoints.values())
     if (str(e.component))
       components.add(str(e.component));
-  for (const id of named)
+  for (const id of named2)
     if (byId.get(id)?.kind === "Component")
       components.add(id);
   const calls = all2.filter((r) => r.kind === "Interface" && (str(r.endpoint) && endpoints.has(str(r.endpoint)) || [...endpoints.values()].some((e) => str(e.component) === str(r.to) && str(e.method) === str(r.method) && (str(e.pathOrTopic) ?? "").replace(/\{[^}]*\}/g, "{}") === (str(r.normalizedPath) ?? "").replace(/\{[^}]*\}/g, "{}"))));
@@ -2913,7 +3066,7 @@ function relevantMap(records, brief, max = 60) {
     if (s)
       systems.add(s);
   }
-  for (const id of named)
+  for (const id of named2)
     if (byId.get(id)?.kind === "System")
       systems.add(id);
   const lines = [
@@ -2949,7 +3102,7 @@ function relevantMap(records, brief, max = 60) {
     lines.push("Nothing in the catalog shares a word with the brief: name systems or components by their catalog id in the brief's Systems section.");
   return { text: lines.join("\n"), ids };
 }
-function parseDraft(text2) {
+function parseDraft(text4) {
   const files = /* @__PURE__ */ new Map();
   let path;
   let body2 = [];
@@ -2958,7 +3111,7 @@ function parseDraft(text2) {
       files.set(path, `${body2.join("\n").trim()}
 `);
   };
-  for (const line of text2.replace(/\r\n/g, "\n").split("\n")) {
+  for (const line of text4.replace(/\r\n/g, "\n").split("\n")) {
     const m = /^===\s*(?:file:\s*)?(\S+)\s*(?:===)?\s*$/.exec(line);
     if (m) {
       flush();
@@ -3149,8 +3302,8 @@ async function draftChange(root, changeId, o) {
   };
   const own = [];
   const isOwn = async (rel) => {
-    const text2 = await readFile5(join6(dir, rel), "utf8").catch(() => void 0);
-    return text2 !== void 0 && !text2.startsWith(DRAFT_MARK);
+    const text4 = await readFile5(join6(dir, rel), "utf8").catch(() => void 0);
+    return text4 !== void 0 && !text4.startsWith(DRAFT_MARK);
   };
   for (const rel of ["proposal.md", "interfaces.md"])
     if (!o.force && await isOwn(rel))
@@ -3205,10 +3358,10 @@ async function draftChange(root, changeId, o) {
 
 `;
     const files = [];
-    for (const [rel, text2] of [...answer].sort(([a], [b]) => a.localeCompare(b))) {
+    for (const [rel, text4] of [...answer].sort(([a], [b]) => a.localeCompare(b))) {
       const path = join6(dir, rel);
       await mkdir(dirname(path), { recursive: true });
-      await writeFileAtomic(path, stamp2 + text2);
+      await writeFileAtomic(path, stamp2 + text4);
       files.push(rel);
     }
     return { ...base, state: "written", files, discarded, problems: [] };
@@ -3400,7 +3553,7 @@ var ESTATE_KINDS = ["System", "Component", "Capability", "Flow", "Endpoint", "Ta
 var ESTATE_HEADING = "The estate, from the repos' specs and the scanned catalog. Ids are exact: name only these, or say something is new.";
 function scopeRepos(e, touched) {
   const recs = e.records;
-  const repoOf = (id) => str2(e.byId.get(str2(id) ?? "")?.repo);
+  const repoOf2 = (id) => str2(e.byId.get(str2(id) ?? "")?.repo);
   const out = new Set(touched);
   const systems = new Set(recs.filter((r) => r.kind === "Component" && out.has(str2(r.repo) ?? "")).flatMap((r) => str2(r.system) ? [str2(r.system)] : []));
   for (const r of recs)
@@ -3410,8 +3563,8 @@ function scopeRepos(e, touched) {
   for (const r of recs) {
     if (r.kind !== "Interface")
       continue;
-    const callee = repoOf(r.to) ?? repoOf(e.byId.get(str2(r.endpoint) ?? "")?.component);
-    const caller = repoOf(r.from);
+    const callee = repoOf2(r.to) ?? repoOf2(e.byId.get(str2(r.endpoint) ?? "")?.component);
+    const caller = repoOf2(r.from);
     if (caller && seed.has(caller) && callee)
       out.add(callee);
     if (callee && seed.has(callee) && caller)
@@ -3539,9 +3692,9 @@ function systemOf(e, id) {
 }
 
 // packages/planner/dist/stages/brief-endpoints.js
-function endpointsIn(text2) {
+function endpointsIn(text4) {
   const out = [];
-  for (const m of text2.matchAll(/\b(GET|POST|PUT|PATCH|DELETE)\s+(\/[^\s`'",;)\]]*)/g)) {
+  for (const m of text4.matchAll(/\b(GET|POST|PUT|PATCH|DELETE)\s+(\/[^\s`'",;)\]]*)/g)) {
     const e = `${m[1]} ${m[2].replace(/[.:]+$/, "")}`;
     if (!out.some((x) => endpointKey(x) === endpointKey(e)))
       out.push(e);
@@ -3642,8 +3795,8 @@ function readFigma(json) {
         screen.fields.push(f);
         ids.add(f.figmaId);
       };
-      const message = (figmaId, text2) => {
-        screen.messages.push({ figmaId, text: text2 });
+      const message = (figmaId, text4) => {
+        screen.messages.push({ figmaId, text: text4 });
         ids.add(figmaId);
       };
       const visit = (n) => {
@@ -3812,10 +3965,10 @@ function designGaps(d) {
 }
 
 // packages/planner/dist/stages/loop.js
-var import_yaml9 = __toESM(require_dist(), 1);
-import { createHash as createHash3 } from "node:crypto";
-import { copyFile, mkdir as mkdir3, readdir as readdir7, readFile as readFile8, rm as rm3, stat } from "node:fs/promises";
-import { join as join10 } from "node:path";
+var import_yaml10 = __toESM(require_dist(), 1);
+import { createHash as createHash4 } from "node:crypto";
+import { copyFile, mkdir as mkdir3, readdir as readdir7, readFile as readFile9, rm as rm3, stat } from "node:fs/promises";
+import { join as join11 } from "node:path";
 
 // packages/planner/dist/stages/cite.js
 var escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -3901,9 +4054,9 @@ function issueWords(issue, value) {
   }
   return `${where2}: ${issue.message}.`;
 }
-function schemaProblems(file, text2, issues) {
+function schemaProblems(file, text4, issues) {
   const lc = new import_yaml5.LineCounter();
-  const doc = (0, import_yaml5.parseDocument)(text2, { lineCounter: lc, keepSourceTokens: false });
+  const doc = (0, import_yaml5.parseDocument)(text4, { lineCounter: lc, keepSourceTokens: false });
   const data = doc.toJS();
   return issues.map((i) => {
     let line = 1;
@@ -3926,12 +4079,12 @@ function schemaProblems(file, text2, issues) {
 }
 
 // packages/planner/dist/stages/answer.js
-var unfence = (text2) => text2.replace(/\r\n/g, "\n").replace(/^\s*```(?:ya?ml)?\s*\n/, "").replace(/\n```\s*$/, "");
+var unfence = (text4) => text4.replace(/\r\n/g, "\n").replace(/^\s*```(?:ya?ml)?\s*\n/, "").replace(/\n```\s*$/, "");
 var YAML_QUOTE_RULE = "quote any value containing { } [ ] : or # in double quotes";
 var capitalQuote = `${YAML_QUOTE_RULE.charAt(0).toUpperCase()}${YAML_QUOTE_RULE.slice(1)}.`;
-function parseYamlAs(text2, schema, fill, target) {
+function parseYamlAs(text4, schema, fill, target) {
   let data;
-  const body2 = unfence(text2);
+  const body2 = unfence(text4);
   try {
     data = (0, import_yaml6.parse)(body2);
   } catch (e) {
@@ -4016,7 +4169,9 @@ async function questionsOnFile(root, repo) {
         `- ${q2.id} (${q2.state}): ${q2.question.trim()} [${q2.evidence.join(", ")}]`,
         ...q2.state === "answered" ? (
           // B-run2-fixes 8: the option's meaning, or the person's own words, not the label alone.
-          [`  Answer (${q2.answer?.by ?? "a person"}): ${answerText(q2) ?? ""}`]
+          [
+            `  Answer (${q2.answer ? answerByWords(q2.answer.by) : "a person"}): ${answerText(q2) ?? ""}`
+          ]
         ) : []
       ].join("\n")).join("\n"),
       classification: "internal",
@@ -4036,22 +4191,378 @@ function stepJudges(root, runtime, change, now) {
   return { judge: questionJudge(o), answerJudge: answerJudge(o) };
 }
 
+// packages/planner/dist/stages/drafts.js
+var import_yaml7 = __toESM(require_dist(), 1);
+import { createHash as createHash2 } from "node:crypto";
+import { readFile as readFile6 } from "node:fs/promises";
+import { join as join7 } from "node:path";
+var DRAFTS_SCHEMA_VERSION = 1;
+var DRAFTED_FILE = "stage/drafted.yaml";
+var CORRECTIONS_FILE = "stage/corrections.yaml";
+var V = external_exports.literal(DRAFTS_SCHEMA_VERSION);
+var text = () => external_exports.string().trim().min(1);
+var Id = external_exports.string().regex(/^[a-z0-9][a-z0-9._-]*$/);
+var DraftedRecord = external_exports.discriminatedUnion("by", [
+  external_exports.strictObject({
+    by: external_exports.literal("ai"),
+    stage: Stage,
+    /** The run that drafted it (a hand-off, a model run or a replay). */
+    run: external_exports.string().optional(),
+    /** The stage's draft number. */
+    iteration: external_exports.number().int().min(0),
+    at: external_exports.string(),
+    sha256: external_exports.string().regex(/^[0-9a-f]{64}$/)
+  }),
+  external_exports.strictObject({
+    by: external_exports.literal("person"),
+    who: text(),
+    at: external_exports.string(),
+    sha256: external_exports.string().regex(/^[0-9a-f]{64}$/)
+  })
+]);
+var DraftedFile = external_exports.strictObject({
+  schemaVersion: V,
+  change: Id,
+  /** By change-folder path: who wrote the file last. */
+  files: external_exports.record(external_exports.string(), DraftedRecord).default({})
+});
+var CorrectionScope = external_exports.enum(["one", "similar"]);
+var CorrectionState = external_exports.enum(["waiting", "read", "applied"]);
+var Correction = external_exports.strictObject({
+  id: external_exports.string().regex(/^c-[0-9a-f]{10}$/),
+  /** The stage whose next run reads it: the one that drafted the file. */
+  stage: Stage,
+  /** The file, change-folder relative. */
+  file: text(),
+  /** The item in it (draftItems' id); left out, the whole file. */
+  item: external_exports.string().optional(),
+  /** What the person saw: the item's label. */
+  label: text(),
+  /** What the person says, in their words. */
+  text: text().max(4e3),
+  /** one: this item; similar: this item and every item like it. */
+  scope: CorrectionScope,
+  /** similar: the name the similar items share (a component, an entry, a table, a term). */
+  like: external_exports.string().trim().min(1).optional(),
+  by: text(),
+  at: external_exports.string(),
+  /**
+   * waiting: no draft has read it yet; read: a draft had it and didn't change the item;
+   * applied: a draft had it and changed the item. Kept on file either way.
+   */
+  state: CorrectionState,
+  /** The run of the draft that first read it, and that draft's number. */
+  run: external_exports.string().optional(),
+  iteration: external_exports.number().int().min(0).optional(),
+  /** When the draft changed the item. */
+  appliedAt: external_exports.string().optional(),
+  /** similar: the other items a draft with it changed, as `<file>#<item>`. */
+  touched: external_exports.array(external_exports.string()).optional()
+});
+var CorrectionsFile = external_exports.strictObject({
+  schemaVersion: V,
+  change: Id,
+  corrections: external_exports.array(Correction).default([])
+});
+var sha2 = (s) => createHash2("sha256").update(s).digest("hex");
+var draftSha = (s) => sha2(s.replace(/\r\n?/g, "\n"));
+async function readYaml(file, schema, empty) {
+  const t = await readFile6(file, "utf8").catch(() => void 0);
+  if (t === void 0)
+    return { data: empty, present: false };
+  let raw;
+  try {
+    raw = (0, import_yaml7.parse)(t);
+  } catch (e) {
+    throw new PlannerError("invalid", `${file} doesn't read as YAML: ${e.message}`);
+  }
+  const r = schema.safeParse(raw);
+  if (!r.success)
+    throw new PlannerError("invalid", `${file} doesn't read: ${r.error.issues.map((i) => `${i.path.join(".") || "(top)"}: ${i.message}`).join("; ")}`);
+  return { data: r.data, present: true };
+}
+async function readDrafted(dir, change) {
+  return (await readYaml(join7(dir, DRAFTED_FILE), DraftedFile, {
+    schemaVersion: DRAFTS_SCHEMA_VERSION,
+    change,
+    files: {}
+  })).data;
+}
+async function writeDrafted(dir, d) {
+  const files = Object.fromEntries(Object.entries(d.files).sort(([a], [b]) => a.localeCompare(b)));
+  await writeFileAtomic(join7(dir, DRAFTED_FILE), `# Who wrote each stage draft last (ADR 0181): the AI, with its stage and run, or a person who saved it in the app. Atticus writes this file.
+${toCanonicalYaml(DraftedFile.parse({ ...d, files }), ["schemaVersion", "change", "files"])}`);
+}
+async function recordAiDraft(dir, change, o) {
+  const d = await readDrafted(dir, change).catch(() => void 0);
+  const out = d ?? { schemaVersion: DRAFTS_SCHEMA_VERSION, change, files: {} };
+  let any = false;
+  for (const f of o.files) {
+    const t = await readFile6(join7(dir, ...f.split("/")), "utf8").catch(() => void 0);
+    if (t === void 0)
+      continue;
+    const h = draftSha(t);
+    const was = out.files[f];
+    if (was?.by === "person" && was.sha256 === h)
+      continue;
+    if (was?.by === "ai" && was.sha256 === h && was.stage === o.stage)
+      continue;
+    out.files[f] = {
+      by: "ai",
+      stage: o.stage,
+      ...o.run ? { run: o.run } : {},
+      iteration: o.iteration,
+      at: o.at,
+      sha256: h
+    };
+    any = true;
+  }
+  if (any)
+    await writeDrafted(dir, out);
+}
+async function recordPersonSave(dir, change, o) {
+  const d = await readDrafted(dir, change).catch(() => void 0) ?? {
+    schemaVersion: DRAFTS_SCHEMA_VERSION,
+    change,
+    files: {}
+  };
+  d.files[o.file] = { by: "person", who: o.who, at: o.at, sha256: draftSha(o.content) };
+  await writeDrafted(dir, d);
+}
+async function draftProvenance(dir, change, files, written = []) {
+  const d = await readDrafted(dir, change).catch(() => void 0);
+  const out = {};
+  for (const f of files) {
+    const t = await readFile6(join7(dir, ...f.split("/")), "utf8").catch(() => void 0);
+    if (t === void 0)
+      continue;
+    const h = draftSha(t);
+    const r = d?.files[f];
+    if (r) {
+      if (r.sha256 !== h)
+        out[f] = { by: "person" };
+      else if (r.by === "ai")
+        out[f] = { by: "ai", stage: r.stage, ...r.run ? { run: r.run } : {}, at: r.at };
+      else
+        out[f] = { by: "person", who: r.who, at: r.at };
+      continue;
+    }
+    const w = written.find((x) => x.hashes[f] !== void 0);
+    if (w)
+      out[f] = w.hashes[f] === h ? { by: "ai", stage: w.stage } : { by: "person" };
+  }
+  return out;
+}
+var DRAFT_ITEMS_MAX = 80;
+var slug2 = (s) => s.toLowerCase().replace(/[`*_]/g, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60) || "section";
+function markdownSpans(t) {
+  const lines = t.replace(/\r\n?/g, "\n").split("\n");
+  const heads = [];
+  let fence = false;
+  lines.forEach((l, i) => {
+    if (/^\s*(```|~~~)/.test(l))
+      fence = !fence;
+    const m = !fence && /^(#{2,4})\s+(.+?)\s*#*\s*$/.exec(l);
+    if (m)
+      heads.push({ at: i, level: m[1].length, title: m[2] });
+  });
+  const seen = /* @__PURE__ */ new Map();
+  return heads.map((h, k) => {
+    const end = heads.slice(k + 1).find((x) => x.level <= h.level)?.at ?? lines.length;
+    const base = slug2(h.title);
+    const n = (seen.get(base) ?? 0) + 1;
+    seen.set(base, n);
+    return {
+      item: { id: n === 1 ? base : `${base}-${n}`, label: h.title.replace(/`/g, "") },
+      text: lines.slice(h.at, end).join("\n").trim()
+    };
+  });
+}
+function taskSpans(t) {
+  const out = [];
+  for (const l of t.replace(/\r\n?/g, "\n").split("\n")) {
+    const m = /^\s*- \[[ xX]\]\s+(\d+(?:\.\d+)*)\s+(.*)$/.exec(l);
+    if (m)
+      out.push({ item: { id: `task-${m[1]}`, label: `${m[1]} ${m[2]}` }, text: l.trim() });
+  }
+  return out;
+}
+function flowSpans(t) {
+  let raw;
+  try {
+    raw = (0, import_yaml7.parse)(t);
+  } catch {
+    return [];
+  }
+  const steps = raw?.steps;
+  if (!Array.isArray(steps))
+    return [];
+  return steps.map((s, i) => {
+    const st = s ?? {};
+    const like = [st.to?.component, st.to?.entry, st.store?.table].filter((x) => typeof x === "string" && x.trim() !== "");
+    const head = [st.op, st.kind].filter(Boolean).join(" ");
+    return {
+      item: {
+        id: `step-${i + 1}`,
+        label: `Step ${i + 1}${head ? ` (${head})` : ""}${st.what ? `: ${st.what}` : ""}`,
+        ...like.length ? { like } : {}
+      },
+      text: JSON.stringify(s)
+    };
+  });
+}
+function spansOf(file, t) {
+  if (/^target-flows\/[^/]+\.ya?ml$/.test(file))
+    return flowSpans(t);
+  if (file === "tasks.md")
+    return taskSpans(t);
+  if (file.endsWith(".md"))
+    return markdownSpans(t);
+  return [];
+}
+function draftItems(file, t) {
+  return spansOf(file, t).slice(0, DRAFT_ITEMS_MAX).map((s) => s.item);
+}
+function draftItemText(file, t, item) {
+  if (!item)
+    return t;
+  return spansOf(file, t).find((s) => s.item.id === item)?.text;
+}
+async function readCorrections(dir, change) {
+  return (await readYaml(join7(dir, CORRECTIONS_FILE), CorrectionsFile, {
+    schemaVersion: DRAFTS_SCHEMA_VERSION,
+    change,
+    corrections: []
+  })).data.corrections;
+}
+async function writeCorrections(dir, change, cs) {
+  await writeFileAtomic(join7(dir, CORRECTIONS_FILE), `# A person's corrections of AI-drafted items (ADR 0181): each stage's next run reads them as the person's word; Atticus marks what a draft applied. Atticus writes this file.
+${toCanonicalYaml(CorrectionsFile.parse({ schemaVersion: DRAFTS_SCHEMA_VERSION, change, corrections: cs }), ["schemaVersion", "change", "corrections"])}`);
+}
+async function addCorrection(dir, change, o) {
+  const words5 = o.text.trim();
+  if (!words5)
+    throw new PlannerError("invalid", "Write the correction first.");
+  if (words5.length > 4e3)
+    throw new PlannerError("invalid", "A correction is at most 4000 characters.");
+  const cs = await readCorrections(dir, change);
+  const id = `c-${sha2([o.stage, o.file, o.item ?? "", words5, o.by, o.at].join("\n")).slice(0, 10)}`;
+  if (cs.some((c2) => c2.id === id))
+    return cs.find((c2) => c2.id === id);
+  const like = o.like?.trim();
+  const c = Correction.parse({
+    id,
+    stage: o.stage,
+    file: o.file,
+    ...o.item ? { item: o.item } : {},
+    label: o.label.trim() || o.file,
+    text: words5,
+    scope: o.similar ? "similar" : "one",
+    ...o.similar && like ? { like } : {},
+    by: o.by,
+    at: o.at,
+    state: "waiting"
+  });
+  await writeCorrections(dir, change, [...cs, c]);
+  return c;
+}
+async function removeCorrection(dir, change, id) {
+  const cs = await readCorrections(dir, change);
+  const c = cs.find((x) => x.id === id);
+  if (!c)
+    return false;
+  if (c.state !== "waiting")
+    throw new PlannerError("refused", `Correction ${id} was read by run ${c.run ?? "of the stage"}; it stays on file. Write a new correction to change it: a later correction wins.`);
+  await writeCorrections(dir, change, cs.filter((x) => x.id !== id));
+  return true;
+}
+var CORRECTIONS_RULE = `A person corrected items of the stage's drafts; the "hand-backs" data block lists each correction under "Corrections a person made", with the item and the person's words. Each one is the person's instruction, like an answer: follow it in this draft, and where it says to apply it to similar items, make the same correction to every other item that names the same thing. A later correction of an item wins over an earlier one. A correction never overrides a fact verified from code: where one contradicts a cited line, keep what the code says and ask a question naming the correction.`;
+function correctionsText(cs) {
+  if (!cs.length)
+    return void 0;
+  return [
+    "Corrections a person made (the person's instruction; follow each one):",
+    ...cs.map((c) => {
+      const where2 = `${c.file}${c.item ? `, ${c.label}` : ""}`;
+      const similar = c.scope === "similar" ? ` Apply the same correction to every similar item${c.like ? ` (every other step, story, section or task naming ${c.like})` : " (every other item like it)"}.` : "";
+      return `- ${where2}: "${c.text}" (${c.by}, ${c.at.slice(0, 10)}).${similar}`;
+    })
+  ].join("\n");
+}
+async function stageCorrections(dir, change, stage) {
+  const all2 = (await readCorrections(dir, change).catch(() => [])).filter((c) => c.stage === stage).sort((a, b) => a.at < b.at ? -1 : a.at > b.at ? 1 : 0);
+  return { all: all2, waiting: all2.filter((c) => c.state === "waiting") };
+}
+async function snapshotFiles(dir, files) {
+  const out = /* @__PURE__ */ new Map();
+  for (const f of [...new Set(files)]) {
+    const t = await readFile6(join7(dir, ...f.split("/")), "utf8").catch(() => void 0);
+    if (t !== void 0)
+      out.set(f, t);
+  }
+  return out;
+}
+async function settleCorrections(dir, change, o) {
+  const cs = await readCorrections(dir, change).catch(() => void 0);
+  if (!cs?.length)
+    return [];
+  const after2 = await snapshotFiles(dir, [...o.files, ...o.before.keys()]);
+  const settled = [];
+  const changedItems = (likeOf) => {
+    const out = [];
+    for (const f of [.../* @__PURE__ */ new Set([...o.before.keys(), ...after2.keys()])].sort()) {
+      const was = new Map(spansOf(f, o.before.get(f) ?? "").map((s) => [s.item.id, s.text]));
+      for (const s of spansOf(f, after2.get(f) ?? ""))
+        if (was.get(s.item.id) !== s.text && likeOf(s))
+          out.push(`${f}#${s.item.id}`);
+    }
+    return out;
+  };
+  for (const c of cs) {
+    if (c.stage !== o.stage || c.state === "applied")
+      continue;
+    const before = o.before.has(c.file) ? draftItemText(c.file, o.before.get(c.file), c.item) : void 0;
+    const now = after2.has(c.file) ? draftItemText(c.file, after2.get(c.file), c.item) : void 0;
+    if (c.state === "waiting") {
+      if (o.run)
+        c.run = o.run;
+      c.iteration = o.iteration;
+    }
+    if (before !== now) {
+      c.state = "applied";
+      c.appliedAt = o.at;
+    } else
+      c.state = "read";
+    if (c.scope === "similar") {
+      const like = c.like?.toLowerCase();
+      const mine = `${c.file}#${c.item ?? ""}`;
+      const touched = changedItems((s) => !like || s.text.toLowerCase().includes(like) || s.item.label.toLowerCase().includes(like) || (s.item.like ?? []).some((x) => x.toLowerCase() === like)).filter((x) => x !== mine);
+      if (touched.length)
+        c.touched = [.../* @__PURE__ */ new Set([...c.touched ?? [], ...touched])].sort();
+    }
+    settled.push(c);
+  }
+  if (settled.length)
+    await writeCorrections(dir, change, cs);
+  return settled;
+}
+
 // packages/planner/dist/gaps.js
-import { readdir as readdir5, readFile as readFile7 } from "node:fs/promises";
-import { join as join8 } from "node:path";
-var import_yaml8 = __toESM(require_dist(), 1);
+import { readdir as readdir5, readFile as readFile8 } from "node:fs/promises";
+import { join as join9 } from "node:path";
+var import_yaml9 = __toESM(require_dist(), 1);
 
 // packages/planner/dist/stages/expand.js
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // packages/planner/dist/stages/judged.js
-var import_yaml7 = __toESM(require_dist(), 1);
-import { mkdir as mkdir2, readFile as readFile6, rm as rm2, writeFile } from "node:fs/promises";
-import { dirname as dirname2, join as join7 } from "node:path";
+var import_yaml8 = __toESM(require_dist(), 1);
+import { mkdir as mkdir2, readFile as readFile7, rm as rm2, writeFile } from "node:fs/promises";
+import { dirname as dirname2, join as join8 } from "node:path";
 function filePending(root) {
-  const file = (kind, key3) => join7(stateDirOf(root), ".index", "pending-judgments", kind, `${key3}.txt`);
+  const file = (kind, key3) => join8(stateDirOf(root), ".index", "pending-judgments", kind, `${key3}.txt`);
   return {
-    get: async (kind, key3) => (await readFile6(file(kind, key3), "utf8").catch(() => void 0))?.trim() || void 0,
+    get: async (kind, key3) => (await readFile7(file(kind, key3), "utf8").catch(() => void 0))?.trim() || void 0,
     set: async (kind, key3, runId) => {
       const f = file(kind, key3);
       if (runId === void 0)
@@ -4138,10 +4649,10 @@ async function judged(o) {
   });
   return finish(await o.runtime.run(prepared.runId), false);
 }
-function yamlOf(text2) {
-  const fenced = /```(?:ya?ml)?\s*\n([\s\S]*?)```/.exec(text2);
+function yamlOf(text4) {
+  const fenced = /```(?:ya?ml)?\s*\n([\s\S]*?)```/.exec(text4);
   try {
-    return (0, import_yaml7.parse)(fenced ? fenced[1] : text2);
+    return (0, import_yaml8.parse)(fenced ? fenced[1] : text4);
   } catch {
     return void 0;
   }
@@ -4172,8 +4683,17 @@ var Answer = external_exports.object({
   })).default([])
 });
 var fold = (s) => s.replace(/\s+/g, " ").trim().toLowerCase();
-function checkExpansion(text2, input, ix) {
-  const r = Answer.safeParse(yamlOf(text2));
+function titledText(title, text4) {
+  if (!title)
+    return text4;
+  const first = text4.replace(/^\uFEFF/, "").trimStart().split(/\r?\n/, 1)[0].trim();
+  const heading = /^#\s+(.*?)\s*#*$/.exec(first)?.[1]?.trim();
+  return heading === title.trim() ? text4 : `# ${title}
+
+${text4}`;
+}
+function checkExpansion(text4, input, ix) {
+  const r = Answer.safeParse(yamlOf(text4));
   if (!r.success)
     return { problem: "the expansion isn't YAML with terms and names" };
   const all2 = fold(`${input.title ?? ""}
@@ -4255,7 +4775,7 @@ async function expandFor(root, change, input, o) {
   }
   try {
     const digest = digestSources(ix);
-    const names = createHash2("sha256").update(digest.map((d) => d.text).join("\n\n")).digest("hex");
+    const names = createHash3("sha256").update(digest.map((d) => d.text).join("\n\n")).digest("hex");
     const r = await judged({
       kind: "expansion",
       inputs: { input, names, runtime: o.runtime.kind, v: 2 },
@@ -4277,9 +4797,7 @@ async function expandFor(root, change, input, o) {
           id: "input",
           kind: "document",
           origin: "the step's input",
-          text: `${input.title ? `# ${input.title}
-
-` : ""}${input.text}`,
+          text: titledText(input.title, input.text),
           classification: "internal",
           priority: 50
         },
@@ -4292,7 +4810,7 @@ async function expandFor(root, change, input, o) {
       store: o.store,
       pending: filePending(root),
       step: `${o.step} (expansion)`,
-      read: (text2) => checkExpansion(text2, input, ix)
+      read: (text4) => checkExpansion(text4, input, ix)
     });
     if ("waiting" in r)
       return r;
@@ -4329,8 +4847,8 @@ List only candidates from the list, each once.`;
 function candidatesOf(s) {
   return [...s.picked.map((p) => ({ kind: p.kind, id: p.id })), ...s.leftOut];
 }
-function checkRerank(text2, shown) {
-  const r = Answer2.safeParse(yamlOf(text2));
+function checkRerank(text4, shown) {
+  const r = Answer2.safeParse(yamlOf(text4));
   if (!r.success)
     return { problem: "the rerank isn't YAML with keep" };
   const set = new Set(shown);
@@ -4371,9 +4889,7 @@ async function rerankFor(root, change, input, selection, o) {
         id: "input",
         kind: "document",
         origin: "the step's input",
-        text: `${input.title ? `# ${input.title}
-
-` : ""}${input.text}`,
+        text: titledText(input.title, input.text),
         classification: "internal",
         priority: 50
       },
@@ -4394,7 +4910,7 @@ ${lines.join("\n")}`,
     store: o.store,
     pending: filePending(root),
     step: `${o.step} (rerank)`,
-    read: (text2) => checkRerank(text2, shown)
+    read: (text4) => checkRerank(text4, shown)
   });
   if ("waiting" in r)
     return r;
@@ -4489,11 +5005,11 @@ var wholeLists = () => ({
   leftOut: [],
   unknown: []
 });
-var instructionSource = (text2) => ({
+var instructionSource = (text4) => ({
   id: "instructions",
   kind: "instruction",
   origin: "atticus",
-  text: text2,
+  text: text4,
   classification: "public",
   trusted: true
 });
@@ -4564,7 +5080,7 @@ function oneSource(s, o) {
     }
   }
   const left = s.leftOut.filter((l) => keep(l.kind)).map((l) => l.id);
-  const text2 = [
+  const text4 = [
     ...o.heading ? [o.heading, ""] : [],
     ...parts.length ? parts : [o.empty ?? "Nothing in the index matches."],
     ...left.length ? [
@@ -4576,7 +5092,7 @@ function oneSource(s, o) {
     id: o.id,
     kind: o.kind,
     origin: o.origin,
-    text: text2,
+    text: text4,
     classification: "internal",
     priority: o.priority
   };
@@ -4595,18 +5111,18 @@ function asSources(s, kind) {
 // packages/planner/dist/gaps.js
 var TARGET_DIR = "target-flows";
 async function changeTexts(root, change) {
-  const dir = join8(changesDirOf(root), change);
+  const dir = join9(changesDirOf(root), change);
   const out = [];
   const top = (await readdir5(dir).catch(() => [])).filter((f) => /\.md$/.test(f)).sort();
   for (const f of ["brief.md", ...top.filter((x) => x !== "brief.md")]) {
-    const t = await readFile7(join8(dir, f), "utf8").catch(() => void 0);
+    const t = await readFile8(join9(dir, f), "utf8").catch(() => void 0);
     if (t !== void 0)
       out.push([f, t]);
   }
   for (const sub of ["stories", "target-flows"])
-    for (const f of (await readdir5(join8(dir, sub)).catch(() => [])).sort())
+    for (const f of (await readdir5(join9(dir, sub)).catch(() => [])).sort())
       if (/\.(md|ya?ml)$/.test(f)) {
-        const t = await readFile7(join8(dir, sub, f), "utf8").catch(() => void 0);
+        const t = await readFile8(join9(dir, sub, f), "utf8").catch(() => void 0);
         if (t !== void 0)
           out.push([`${sub}/${f}`, t]);
       }
@@ -4637,9 +5153,9 @@ async function gapsOf(root, change, unknown) {
   return out;
 }
 async function codeReaders() {
-  const x = await import("./chunk-OSB6AKF2.js");
+  const x = await import("./chunk-UEVZZZU2.js");
   return {
-    outline: (path, text2) => x.declarationOutline(path, text2),
+    outline: (path, text4) => x.declarationOutline(path, text4),
     outlines: (path) => x.syntaxLanguageOf(path) !== void 0
   };
 }
@@ -4658,24 +5174,24 @@ var sameName = (a, b) => {
 };
 async function ownNames(root, change) {
   const rel = `${changesRelOf(root)}/${change}/${TARGET_DIR}`;
-  const dir = join8(changesDirOf(root), change, TARGET_DIR);
+  const dir = join9(changesDirOf(root), change, TARGET_DIR);
   const out = [];
   for (const f of (await readdir5(dir).catch(() => [])).sort()) {
     if (!/\.ya?ml$/.test(f))
       continue;
-    const text2 = await readFile7(join8(dir, f), "utf8").catch(() => void 0);
-    if (text2 === void 0)
+    const text4 = await readFile8(join9(dir, f), "utf8").catch(() => void 0);
+    if (text4 === void 0)
       continue;
     let d;
     try {
-      const r = FlowDelta.safeParse((0, import_yaml8.parse)(text2));
+      const r = FlowDelta.safeParse((0, import_yaml9.parse)(text4));
       if (!r.success)
         continue;
       d = r.data;
     } catch {
       continue;
     }
-    const lines = text2.split(/\r?\n/);
+    const lines = text4.split(/\r?\n/);
     const add = (name, key3) => {
       if (!name?.trim())
         return;
@@ -4853,7 +5369,7 @@ async function gapAnswers(root, change) {
       origin: "questions/ (answered gaps)",
       text: [
         "People said what these names are; their answers are asserted knowledge (who and when), not read from code:",
-        ...answered.map((q2) => `- ${gapNameOf(q2)}: ${answerText(q2) ?? ""} (${q2.answer.by}, ${q2.answer.at}, question ${q2.id})`)
+        ...answered.map((q2) => `- ${gapNameOf(q2)}: ${answerText(q2) ?? ""} (${answerByWords(q2.answer.by)}, ${q2.answer.at}, question ${q2.id})`)
       ].join("\n"),
       classification: "internal",
       priority: 96
@@ -4863,12 +5379,12 @@ async function gapAnswers(root, change) {
 function reliedOn(gaps, answer) {
   let data;
   try {
-    data = (0, import_yaml8.parse)(unfence(answer));
+    data = (0, import_yaml9.parse)(unfence(answer));
   } catch {
     return { relied: [], unknown: [] };
   }
-  const listed = data?.relies_on_gaps;
-  const names = Array.isArray(listed) ? listed.filter((x) => typeof x === "string" && x.trim() !== "") : [];
+  const listed2 = data?.relies_on_gaps;
+  const names = Array.isArray(listed2) ? listed2.filter((x) => typeof x === "string" && x.trim() !== "") : [];
   const relied = [];
   const unknown = [];
   for (const n of names) {
@@ -4903,7 +5419,7 @@ async function askGaps(root, change, gaps, answer, by) {
 }
 
 // packages/planner/dist/stages/finding-kind.js
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 import { readdir as readdir6 } from "node:fs/promises";
 var DRAFTING_CHECKS = /* @__PURE__ */ new Set([
   "story-has-acceptance-criteria",
@@ -4979,17 +5495,17 @@ async function criticRuleChecks(root) {
   };
   add((await loadConstitution()).rules);
   const org = orgPackDirOf(root);
-  for (const p of (await readPackFiles(root, join9(org, "checklists"))).packs)
+  for (const p of (await readPackFiles(root, join10(org, "checklists"))).packs)
     add(p.pack.rules);
-  const teams = await readdir6(join9(org, "teams"), { withFileTypes: true }).catch(() => []);
+  const teams = await readdir6(join10(org, "teams"), { withFileTypes: true }).catch(() => []);
   for (const t of teams.filter((x) => x.isDirectory()).sort((a, b) => a.name.localeCompare(b.name)))
-    for (const p of (await readPackFiles(root, join9(org, "teams", t.name, "checklists"))).packs)
+    for (const p of (await readPackFiles(root, join10(org, "teams", t.name, "checklists"))).packs)
       add(p.pack.rules);
   return out;
 }
 
 // packages/planner/dist/stages/loop.js
-var issueFingerprint = (rule, target, evidence = "") => createHash3("sha256").update([rule, target, evidence].join("\n")).digest("hex").slice(0, 12);
+var issueFingerprint = (rule, target, evidence = "") => createHash4("sha256").update([rule, target, evidence].join("\n")).digest("hex").slice(0, 12);
 var loopRel = (stage) => `stage/${stage}.yaml`;
 var STAGE_WORDS = {
   feature: "feature placement",
@@ -4998,9 +5514,9 @@ var STAGE_WORDS = {
   small: "small change's plan"
 };
 async function readLoop(dir, change, stage) {
-  const text2 = await readFile8(join10(dir, loopRel(stage)), "utf8").catch(() => void 0);
-  if (text2 !== void 0) {
-    const r = StageLoop.safeParse((0, import_yaml9.parse)(text2));
+  const text4 = await readFile9(join11(dir, loopRel(stage)), "utf8").catch(() => void 0);
+  if (text4 !== void 0) {
+    const r = StageLoop.safeParse((0, import_yaml10.parse)(text4));
     if (r.success)
       return r.data;
   }
@@ -5014,12 +5530,12 @@ async function readLoop(dir, change, stage) {
   });
 }
 async function readStageLoop(dir, change, stage) {
-  const present = await stat(join10(dir, loopRel(stage))).then((s) => s.isFile(), () => false);
+  const present = await stat(join11(dir, loopRel(stage))).then((s) => s.isFile(), () => false);
   return { loop: await readLoop(dir, change, stage), present, file: loopRel(stage) };
 }
 var writeStageLoop = (dir, l) => writeLoop(dir, l);
 async function writeLoop(dir, l) {
-  await writeFileAtomic(join10(dir, loopRel(l.stage)), `# The ${l.stage} stage's loop (ADR 0087): drafts, the findings each one had, and the questions it raised. Atticus writes this file.
+  await writeFileAtomic(join11(dir, loopRel(l.stage)), `# The ${l.stage} stage's loop (ADR 0087): drafts, the findings each one had, and the questions it raised. Atticus writes this file.
 ${toCanonicalYaml(StageLoop.parse(l), ["schemaVersion", "change", "stage", "iteration", "state", "updatedAt", "run"])}`);
 }
 function stageBudget(ctx, agent) {
@@ -5058,7 +5574,7 @@ async function refuseWhileEarlierStuck(root, ctx, change, stage) {
   for (const earlier of path.slice(0, at2)) {
     if (change.handoffs.some((h) => h.phase === earlier.phase && h.state === "merged"))
       continue;
-    const ran = await readFile8(join10(dir, ...earlier.loop.split("/"))).then(() => true, () => false);
+    const ran = await readFile9(join11(dir, ...earlier.loop.split("/"))).then(() => true, () => false);
     if (!ran)
       continue;
     const gate = phaseGates(ctx, earlier.phase)[0];
@@ -5162,8 +5678,10 @@ async function runStageLoop(root, changeId, spec, o) {
     loop.run = w.runId;
     loop.updatedAt = at2;
     await writeLoop(dir, loop);
-    return result("waiting", { ...extra, waiting: { runId: w.runId, lens: w.lens } });
+    return result("waiting", { ...extra, waiting: waitingOf(w) });
   };
+  if (await retireSettledEscalations(root, change.id, loop, at2))
+    await writeLoop(dir, loop);
   if (!o.resume && loop.state === "questions") {
     const open = (await questionsOf(loop.questions)).filter((q2) => q2.state === "open");
     if (open.length)
@@ -5191,11 +5709,36 @@ async function runStageLoop(root, changeId, spec, o) {
     ...spec.sources,
     ...a !== void 0 && spec.reviewSources ? spec.reviewSources(a) : []
   ];
-  const write3 = async (a) => {
+  const corrections = await stageCorrections(dir, change.id, spec.stage).catch(() => ({
+    all: [],
+    waiting: []
+  }));
+  const write3 = async (a, drafted) => {
     const before = await hashFiles(dir, [
       .../* @__PURE__ */ new Set([...Object.keys(loop.written ?? {}), ...await sourceFiles(dir, spec.source)])
     ]);
+    const texts2 = drafted && corrections.all.length ? await snapshotFiles(dir, [...Object.keys(before), ...corrections.all.map((c) => c.file)]) : void 0;
     const files = await spec.write(a);
+    if (drafted) {
+      const draft = {
+        stage: spec.stage,
+        ...drafted.run ? { run: drafted.run } : {},
+        iteration: loop.iteration,
+        at: at2
+      };
+      await recordAiDraft(dir, change.id, { ...draft, files }).catch(() => void 0);
+      if (texts2) {
+        const settled = await settleCorrections(dir, change.id, {
+          ...draft,
+          before: texts2,
+          files
+        }).catch(() => []);
+        const n = settled.length;
+        const applied = settled.filter((c) => c.state === "applied").length;
+        if (n)
+          notes.push(`The draft had ${n === 1 ? "a person's correction" : `${n} corrections people made`} (stage/corrections.yaml); ${n === 1 ? applied ? "it changed the item" : "it didn't change the item" : `it changed the items of ${applied} of them`}.`);
+      }
+    }
     loop.source = spec.source;
     loop.written = await hashFiles(dir, [
       .../* @__PURE__ */ new Set([...files, ...await sourceFiles(dir, spec.source)])
@@ -5205,7 +5748,7 @@ async function runStageLoop(root, changeId, spec, o) {
         changed.add(f);
     if (loop.failedAnswer) {
       if (loop.failedAnswer !== spec.source)
-        await rm3(join10(dir, ...loop.failedAnswer.split("/")), { force: true });
+        await rm3(join11(dir, ...loop.failedAnswer.split("/")), { force: true });
       delete loop.failedAnswer;
     }
     return files;
@@ -5225,18 +5768,22 @@ async function runStageLoop(root, changeId, spec, o) {
   let carried;
   let reviewAgain = false;
   if (!o.resume && loop.state === "waiting" && loop.run) {
-    const run = await readFile8(join10(runsDirOf(root), change.id, loop.run, "run.json"), "utf8").then((t) => {
+    const run = await readFile9(join11(runsDirOf(root), change.id, loop.run, "run.json"), "utf8").then((t) => {
       try {
         return JSON.parse(t).state ?? "unreadable";
       } catch {
         return "unreadable";
       }
     }, (e) => e.code === "ENOENT" ? void 0 : "unreadable").catch(() => void 0);
-    const lens = loop.review ? (await readRoundMeta(root, change.id, loop.review.gate, loop.review.round))?.lenses.find((l) => l.runId === loop.run)?.lens ?? "AI" : void 0;
+    const metaLenses = loop.review ? (await readRoundMeta(root, change.id, loop.review.gate, loop.review.round))?.lenses ?? [] : [];
+    const batched = metaLenses.filter((l) => l.batch === loop.run && l.state === "waiting").map((l) => l.lens);
+    const lens = loop.review ? metaLenses.find((l) => l.runId === loop.run)?.lens ?? (batched.length ? listed(batched) : "AI") : void 0;
     const out = ["waiting", "prepared", "produced", "unreadable", "failed"];
     if (run !== void 0 && out.includes(run)) {
-      notes.push(lens ? `The ${lens} lens's review of the draft is still with your assistant (run ${loop.run}).` : `The draft is still with your assistant (run ${loop.run}).`);
-      return result("waiting", { waiting: { runId: loop.run, ...lens ? { lens } : {} } });
+      notes.push(batched.length ? `The critic's ${lens} ${batched.length === 1 ? "lens's" : "lenses'"} review of the draft is still with your assistant (run ${loop.run}).` : lens ? `The ${lens} lens's review of the draft is still with your assistant (run ${loop.run}).` : `The draft is still with your assistant (run ${loop.run}).`);
+      return result("waiting", {
+        waiting: batched.length ? { runId: loop.run, lenses: batched } : { runId: loop.run, ...lens ? { lens } : {} }
+      });
     }
     if (lens) {
       reviewAgain = true;
@@ -5253,7 +5800,7 @@ async function runStageLoop(root, changeId, spec, o) {
   const edited = !o.resume && !carried && loop.state !== "waiting" && loop.iteration > 0 ? await editedFiles(dir, loop, spec.source) : [];
   if (edited.length) {
     const kept = await keepFiles(dir, rel, spec.stage, loop.iteration + 1, edited);
-    if (o.force || unreadAnswers.length) {
+    if (o.force || unreadAnswers.length || corrections.waiting.length) {
       personDraft = await draftText(dir, edited);
       (loop.byPerson ??= []).push({
         iteration: loop.iteration + 1,
@@ -5262,7 +5809,7 @@ async function runStageLoop(root, changeId, spec, o) {
         kept,
         how: "redrafted"
       });
-      notes.push(`A person edited ${edited.join(", ")}; a copy is in ${kept}, and your assistant drafts again from those files${o.force ? " (--force)" : ", with the answers"}.`);
+      notes.push(`A person edited ${edited.join(", ")}; a copy is in ${kept}, and your assistant drafts again from those files${o.force ? " (--force)" : unreadAnswers.length ? ", with the answers" : ", with the corrections"}.`);
     } else {
       loop.iteration++;
       (loop.byPerson ??= []).push({
@@ -5276,9 +5823,9 @@ async function runStageLoop(root, changeId, spec, o) {
       let problems = await spec.currentProblems?.() ?? [];
       const answerFile = loop.failedAnswer && edited.includes(loop.failedAnswer) ? loop.failedAnswer : cur === void 0 && !spec.source.endsWith("/") && edited.includes(spec.source) ? spec.source : void 0;
       if (answerFile) {
-        const text2 = await readFile8(join10(dir, ...answerFile.split("/")), "utf8").catch(() => void 0);
-        if (text2 !== void 0) {
-          const p = spec.parse(text2);
+        const text4 = await readFile9(join11(dir, ...answerFile.split("/")), "utf8").catch(() => void 0);
+        if (text4 !== void 0) {
+          const p = spec.parse(text4);
           const bad = p.issues.filter((i) => i.blocking);
           if (p.answer !== void 0 && !bad.length) {
             cur = p.answer;
@@ -5323,7 +5870,7 @@ async function runStageLoop(root, changeId, spec, o) {
   })) : [];
   const answers = await questionsOf(loop.questions);
   const unread = answers.filter((q2) => q2.state === "answered" && !loop.read.includes(q2.id));
-  if (!o.resume && !o.force && loop.state === "done" && unread.length === 0) {
+  if (!o.resume && !o.force && loop.state === "done" && unread.length === 0 && corrections.waiting.length === 0) {
     const cur = await spec.current();
     if (cur !== void 0) {
       issues = (await spec.check(cur, { onFile: true })).filter((i) => i.blocking);
@@ -5430,15 +5977,15 @@ async function runStageLoop(root, changeId, spec, o) {
       const risks = issues.filter((i) => !i.blocking && i.risk);
       if (risks.length)
         loop.handedBack = [.../* @__PURE__ */ new Set([...loop.handedBack ?? [], ...risks.map(riskKey)])].sort();
-      const back = handBacks(fix, answered, risks);
-      const last = (fix.length || risks.length) && !personDraft && (await sourceFiles(dir, spec.source)).length ? `${rel}/${spec.source}` : void 0;
+      const back = handBacks(fix, answered, risks, corrections.all);
+      const last = (fix.length || risks.length || corrections.all.length) && !personDraft && (await sourceFiles(dir, spec.source)).length ? `${rel}/${spec.source}` : void 0;
       const sources = [
         {
           id: "instructions",
           kind: "instruction",
           origin: "atticus",
           text: [
-            instructionsWith(spec.instructions, fix, answered, risks, last),
+            instructionsWith(spec.instructions, fix, answered, risks, last, corrections.all),
             // The last answer is in the new run's folder already (2026-10-26): an edit, not a
             // rewrite. A person's own draft replaces it, so it isn't carried then.
             ...carriesAnswer && lastAnswerText !== void 0 && !personDraft ? ["", CARRIED_ANSWER_RULE] : [],
@@ -5506,7 +6053,7 @@ async function runStageLoop(root, changeId, spec, o) {
         await writeQuarantineItems(root, change.id, prepared.runId, quarantineItems(pack.defences ?? []));
         if (carriesAnswer && lastAnswerText !== void 0 && !personDraft) {
           const where2 = `${runsRelOf(root)}/${change.id}/${prepared.runId}/${spec.output}`;
-          await writeFileAtomic(join10(runsDirOf(root), change.id, prepared.runId, spec.output), lastAnswerText);
+          await writeFileAtomic(join11(runsDirOf(root), change.id, prepared.runId, spec.output), lastAnswerText);
           notes.push(`Your last answer was copied to ${where2}: fix it there.`);
         }
         draftRun = await o.runtime.run(prepared.runId);
@@ -5598,7 +6145,7 @@ ${unfence(run.output)}`,
           failedOutput = unfence(run.output);
         if (answer !== void 0) {
           found.push(...await spec.check(answer));
-          files = await write3(answer);
+          files = await write3(answer, { run: run.runId });
         }
       }
       if (answer !== void 0 && !found.some((i) => i.blocking)) {
@@ -5670,6 +6217,12 @@ ${unfence(run.output)}`,
     loop.findings = [...byFp.values()].sort((a, b) => a.fingerprint.localeCompare(b.fingerprint));
     loop.updatedAt = at2;
     loop.state = "drafting";
+    if (answer !== void 0) {
+      for (const f of loop.findings)
+        if (f.question && f.source === "stage" && f.seenIn.at(-1) !== n)
+          await retireOpen(root, f.question, `Draft ${n} no longer has it: ${f.message}`, at2);
+    }
+    await retireSettledEscalations(root, change.id, loop, at2);
     await writeLoop(dir, loop);
     await stopOnProposed(found, n);
     const drafted = [];
@@ -5733,7 +6286,7 @@ ${unfence(run.output)}`,
         }, { ...judges, hold: (q2) => !handedBack.has(q2.id) });
         held.push(...raised.held);
         for (const [i, a] of raised.decidedBy)
-          notes.push(`Your assistant asked again what ${a.id} answered ("${mine[i].q.question.trim()}"); the stage reads ${a.answer?.by ?? "the person"}'s answer instead of asking again.`);
+          notes.push(`Your assistant asked again what ${a.id} answered ("${mine[i].q.question.trim()}"); the stage reads ${a.answer ? answerByWords(a.answer.by) : "the person"}'s answer instead of asking again.`);
         qs.push(...raised.raised, ...raised.known);
         mine.forEach((x, i) => {
           if (x.f && raised.of[i])
@@ -5786,15 +6339,15 @@ ${unfence(run.output)}`,
       const to = failedAnswerRel(spec);
       let kept;
       if (to === spec.source) {
-        const valid = await readFile8(join10(dir, ...to.split("/")), "utf8").catch(() => void 0);
+        const valid = await readFile9(join11(dir, ...to.split("/")), "utf8").catch(() => void 0);
         if (valid !== void 0 && valid !== failedOutput) {
-          await writeFileAtomic(join10(dir, ...lastValidRel(spec).split("/")), valid);
+          await writeFileAtomic(join11(dir, ...lastValidRel(spec).split("/")), valid);
           kept = `${rel}/${lastValidRel(spec)}`;
         }
       }
-      await writeFileAtomic(join10(dir, ...to.split("/")), failedOutput);
+      await writeFileAtomic(join11(dir, ...to.split("/")), failedOutput);
       loop.failedAnswer = to;
-      loop.written = { ...loop.written ?? {}, [to]: sha2(failedOutput) };
+      loop.written = { ...loop.written ?? {}, [to]: sha3(failedOutput) };
       const lines = new Map(found.filter((i) => i.line).map((i) => [issueFingerprint(i.rule, i.target, i.evidence ?? ""), i.line]));
       return { file: `${rel}/${to}`, ...kept ? { lastValid: kept } : {}, lines };
     };
@@ -5955,19 +6508,20 @@ var SELF_CHECK_RULE = "Check your answer with the stage's own checks before you
 var failedAnswerRel = (spec) => `stage/${spec.output}`;
 var lastValidRel = (spec) => `stage/${spec.stage}-answer.last-valid.yaml`;
 var PERSON_DRAFT = "current-draft";
-var sha2 = (b) => createHash3("sha256").update(b).digest("hex");
+var sha3 = (b) => createHash4("sha256").update(b).digest("hex");
 async function sourceFiles(dir, source) {
   if (!source.endsWith("/"))
-    return await stat(join10(dir, source)).then((s) => s.isFile(), () => false) ? [source] : [];
+    return await stat(join11(dir, source)).then((s) => s.isFile(), () => false) ? [source] : [];
   const sub = source.replace(/\/$/, "");
-  return (await readdir7(join10(dir, sub)).catch(() => [])).filter((f) => !f.startsWith(".")).sort().map((f) => `${sub}/${f}`);
+  return (await readdir7(join11(dir, sub)).catch(() => [])).filter((f) => !f.startsWith(".")).sort().map((f) => `${sub}/${f}`);
 }
+var lf = (b) => b.includes(13) ? Buffer.from(b.toString("utf8").replace(/\r\n?/g, "\n"), "utf8") : b;
 async function hashFiles(dir, files) {
   const out = {};
   for (const f of [...files].sort()) {
-    const b = await readFile8(join10(dir, ...f.split("/"))).catch(() => void 0);
+    const b = await readFile9(join11(dir, ...f.split("/"))).catch(() => void 0);
     if (b)
-      out[f] = sha2(b);
+      out[f] = sha3(lf(b));
   }
   return out;
 }
@@ -5984,12 +6538,12 @@ async function editedFiles(dir, loop, source) {
         out2.add(f);
     return [...out2].sort();
   }
-  const since = await stat(join10(dir, loopRel(loop.stage))).then((s) => s.mtimeMs, () => void 0);
+  const since = await stat(join11(dir, loopRel(loop.stage))).then((s) => s.mtimeMs, () => void 0);
   if (since === void 0)
     return [];
   const out = [];
   for (const f of on) {
-    const m = await stat(join10(dir, ...f.split("/"))).then((s) => s.mtimeMs, () => 0);
+    const m = await stat(join11(dir, ...f.split("/"))).then((s) => s.mtimeMs, () => 0);
     if (m > since + 1e3)
       out.push(f);
   }
@@ -5998,9 +6552,9 @@ async function editedFiles(dir, loop, source) {
 async function keepFiles(dir, rel, stage, n, files) {
   const to = `stage/${stage}-by-person/${n}`;
   for (const f of files) {
-    const from = join10(dir, ...f.split("/"));
-    const dest = join10(dir, ...to.split("/"), ...f.split("/"));
-    await mkdir3(join10(dest, ".."), { recursive: true });
+    const from = join11(dir, ...f.split("/"));
+    const dest = join11(dir, ...to.split("/"), ...f.split("/"));
+    await mkdir3(join11(dest, ".."), { recursive: true });
     await copyFile(from, dest).catch(() => void 0);
   }
   return `${rel}/${to}/`;
@@ -6008,13 +6562,13 @@ async function keepFiles(dir, rel, stage, n, files) {
 async function draftText(dir, files) {
   const out = [];
   for (const f of files) {
-    const t = await readFile8(join10(dir, ...f.split("/")), "utf8").catch(() => void 0);
+    const t = await readFile9(join11(dir, ...f.split("/")), "utf8").catch(() => void 0);
     out.push(`# ${f}${t === void 0 ? " (deleted by the person)" : ""}`, ...t === void 0 ? [] : [t.replace(/\r\n/g, "\n")]);
   }
   return out.join("\n");
 }
 var HAND_BACKS = "hand-backs";
-function instructionsWith(base, fix, answered, risks = [], last) {
+function instructionsWith(base, fix, answered, risks = [], last, corrections = []) {
   const out = [base];
   if (last)
     out.push("", `Your last draft is in ${last}, as Atticus wrote it from your answer. Start from it: keep what the hand-backs don't ask you to change, and answer in full again.`);
@@ -6024,9 +6578,11 @@ function instructionsWith(base, fix, answered, risks = [], last) {
     out.push("", `The critic also saw risks in your last draft; the "${HAND_BACKS}" data block lists them with what to fix. Fix each one the brief and the answers allow. A risk doesn't block: this draft is the one that may fix it.`);
   if (answered.length)
     out.push("", `People answered questions; the "${HAND_BACKS}" data block lists each question with its answer. Their answers are part of the brief: follow them, and never ask any of those questions again, in any words, or ask what an answer already says.`);
+  if (corrections.length)
+    out.push("", CORRECTIONS_RULE);
   return out.join("\n");
 }
-function handBacks(fix, answered, risks = []) {
+function handBacks(fix, answered, risks = [], corrections = []) {
   const out = [];
   if (fix.length)
     out.push("Problems in the last draft:", ...fix.map((i) => `- ${i.message}${i.evidence ? ` (${i.evidence})` : ""}`));
@@ -6034,6 +6590,9 @@ function handBacks(fix, answered, risks = []) {
     out.push(...out.length ? [""] : [], "Risks the critic saw in the last draft:", ...risks.map((i) => `- ${i.message}${i.evidence ? ` (${i.evidence})` : ""}`));
   if (answered.length)
     out.push(...out.length ? [""] : [], "Questions people answered:", ...answered.map((q2) => `- ${q2.question} Answer: ${answerWords(q2) ?? ""}`));
+  const said2 = correctionsText(corrections);
+  if (said2)
+    out.push(...out.length ? [""] : [], said2);
   return out.length ? out.join("\n") : void 0;
 }
 function askedAnswered(h) {
@@ -6054,14 +6613,16 @@ async function lineExists(root, at2) {
   const n = Number(at2.slice(cut + 1));
   if (!Number.isInteger(n) || n < 1 || path.includes(".."))
     return false;
-  const text2 = await readFile8(join10(root, ...path.split("/")), "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const text4 = await readFile9(join11(root, ...path.split("/")), "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return false;
-  return n <= text2.replace(/\n$/, "").split(/\r?\n/).length;
+  return n <= text4.replace(/\n$/, "").split(/\r?\n/).length;
 }
+var waitingOf = (w) => w.lenses ? { runId: w.runId, lenses: w.lenses } : { runId: w.runId, lens: w.lens };
+var listed = (names) => names.length < 2 ? names[0] ?? "" : `${names.slice(0, -1).join(", ")} and ${names.at(-1)}`;
 async function isLensOf(root, change, review, runId) {
   const meta = await readRoundMeta(root, change, review.gate, review.round);
-  return !!meta?.lenses.some((l) => l.runId === runId);
+  return !!meta?.lenses.some((l) => l.runId === runId || l.batch === runId);
 }
 async function failedLenses(root, change, gate, round2) {
   const meta = await readRoundMeta(root, change, gate, round2);
@@ -6072,6 +6633,64 @@ function lensRuntimeOf(ctx, o) {
     return void 0;
   return o.criticRuntime ?? o.runtime;
 }
+async function retireOpen(root, id, why, at2) {
+  const q2 = await readQuestion(root, id).catch(() => void 0);
+  if (q2?.state !== "open")
+    return false;
+  await retireQuestion(root, id, { why, at: at2 });
+  return true;
+}
+function settledWords(f) {
+  const r = f.resolution;
+  if (f.state === "open" || !r)
+    return void 0;
+  const reason = r.reason ? `: ${r.reason.trim().replace(/[.!?]+$/, "")}` : "";
+  if (f.state === "dismissed")
+    return `dismissed as not relevant by ${r.by}${reason}`;
+  if (f.state === "waived")
+    return `waived by ${r.by}${reason}`;
+  if (f.state === "applied")
+    return `fixed by ${r.by}${reason}`;
+  if (f.state === "asked")
+    return `asked of ${r.askedOf ?? "its owner"} by ${r.by}`;
+  return void 0;
+}
+async function retireSettledEscalations(root, change, loop, at2) {
+  const asked = loop.findings.filter((f) => f.question && f.source === "critic");
+  if (!asked.length || !loop.critic.length)
+    return false;
+  const gate = loop.critic.at(-1).gate;
+  const round2 = (await roundsOf(root, change, gate).catch(() => [])).at(-1);
+  if (round2 === void 0)
+    return false;
+  const meta = await readRoundMeta(root, change, gate, round2).catch(() => void 0);
+  const complete = !(meta?.lenses ?? []).some((l) => l.state === "waiting" || l.state === "failed");
+  const { findings } = await readRound(root, change, gate, round2);
+  let any = false;
+  for (const f of asked) {
+    const hit = findings.find((x) => fingerprint(x.finding) === f.target);
+    let why;
+    if (hit) {
+      const words5 = assistantClosed(hit.finding) ? void 0 : settledWords(hit.finding);
+      if (words5)
+        why = `Its critic finding ${hit.finding.id} was ${words5}.`;
+    } else if (complete)
+      why = `Round ${round2} at the ${gate} gate no longer raises it: ${f.message}`;
+    if (why && await retireOpen(root, f.question, why, at2))
+      any = true;
+  }
+  return any;
+}
+async function retireChangeEscalations(root, change, at2) {
+  const dir = changeFolder(root, change);
+  const touched = [];
+  for (const stage of Stage.options) {
+    const { loop, present } = await readStageLoop(dir, change, stage);
+    if (present && await retireSettledEscalations(root, change, loop, at2))
+      touched.push(stage);
+  }
+  return touched;
+}
 async function criticIssues(root, change, findings, kindOf2) {
   const rel = `${changesRelOf(root)}/${change}`;
   const out = [];
@@ -6102,6 +6721,7 @@ async function criticIssues(root, change, findings, kindOf2) {
 }
 async function lensesIn(root, change, review, o, at2, kindOf2) {
   const rt = o.criticRuntime ?? o.runtime;
+  const out = [];
   for (const w of await waitingLenses(root, change, review.gate, review.round)) {
     const run = await rt.result(w.runId).catch(() => void 0);
     if (run?.state === "validated") {
@@ -6112,7 +6732,29 @@ async function lensesIn(root, change, review, o, at2, kindOf2) {
       await failLens(root, change, review.gate, review.round, w.runId, run ? `its run ${w.runId} was cancelled` : `its run ${w.runId} is no longer there`);
       continue;
     }
-    return { waiting: { ...w, gate: review.gate }, issues: [], failed: [], discarded: [] };
+    out.push({ ...w, run });
+  }
+  if (out.length) {
+    const first = out[0];
+    const batch = first.run.batch ? await rt.result(first.run.batch).catch(() => void 0) : void 0;
+    if (batch && batch.state !== "validated" && batch.state !== "cancelled")
+      return {
+        waiting: {
+          runId: batch.runId,
+          lenses: out.filter((x) => x.run.batch === batch.runId).map((x) => x.lens),
+          gate: review.gate,
+          round: review.round
+        },
+        issues: [],
+        failed: [],
+        discarded: []
+      };
+    return {
+      waiting: { runId: first.runId, lens: first.lens, gate: review.gate, round: review.round },
+      issues: [],
+      failed: [],
+      discarded: []
+    };
   }
   const { findings } = await readRound(root, change, review.gate, review.round);
   return {
@@ -6138,6 +6780,8 @@ async function criticRound(root, ctx, change, spec, o, loop, notes, kindOf2, dra
       gate,
       ...lensRuntime ? { runtime: lensRuntime } : {},
       review: { stage: spec.stage, files: draft.files, sources: draft.sources },
+      // ADR 0185: the lenses on the draft go to the person's assistant in one prompt.
+      batchLenses: true,
       now: (o.now ?? /* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z")
     });
   } catch (e) {
@@ -6155,6 +6799,16 @@ async function criticRound(root, ctx, change, spec, o, loop, notes, kindOf2, dra
     return { issues: [] };
   }
   loop.critic = [...loop.critic, { gate, round: r.round }];
+  if (r.batch)
+    return {
+      issues: [],
+      waiting: {
+        runId: r.batch,
+        lenses: r.lenses.filter((l) => l.batch === r.batch).map((l) => l.lens),
+        gate,
+        round: r.round
+      }
+    };
   const first = r.lenses.find((l) => l.state === "waiting" && l.runId);
   if (first)
     return {
@@ -6228,14 +6882,14 @@ var withoutResume = (o) => {
 };
 
 // packages/planner/dist/stages/feature.js
-var import_yaml12 = __toESM(require_dist(), 1);
-import { copyFile as copyFile2, mkdir as mkdir6, readdir as readdir9, readFile as readFile12 } from "node:fs/promises";
-import { basename as basename2, join as join14 } from "node:path";
+var import_yaml13 = __toESM(require_dist(), 1);
+import { copyFile as copyFile2, mkdir as mkdir6, readdir as readdir9, readFile as readFile13 } from "node:fs/promises";
+import { basename as basename2, join as join15 } from "node:path";
 
 // packages/planner/dist/stages/knowledge-applies.js
-var import_yaml10 = __toESM(require_dist(), 1);
-import { mkdir as mkdir4, readFile as readFile9, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join11 } from "node:path";
+var import_yaml11 = __toESM(require_dist(), 1);
+import { mkdir as mkdir4, readFile as readFile10, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
+import { join as join12 } from "node:path";
 var KNOWLEDGE_INDEX_KINDS = [
   "Pattern",
   "Decision",
@@ -6282,12 +6936,12 @@ var KnowledgeApplies = external_exports.strictObject({
   })).default([])
 });
 var FILE = "knowledge.yaml";
-var pathOf = (root, change) => join11(changeFolder(root, change), FILE);
+var pathOf = (root, change) => join12(changeFolder(root, change), FILE);
 async function readKnowledgeApplies(root, change) {
-  const text2 = await readFile9(pathOf(root, change), "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const text4 = await readFile10(pathOf(root, change), "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return void 0;
-  const r = KnowledgeApplies.safeParse((0, import_yaml10.parse)(text2));
+  const r = KnowledgeApplies.safeParse((0, import_yaml11.parse)(text4));
   return r.success ? r.data : void 0;
 }
 async function write(root, doc) {
@@ -6513,8 +7167,8 @@ function knowledgeAppliesMarkdown(doc) {
 }
 
 // packages/planner/dist/stages/estate-context.js
-import { readFile as readFile10 } from "node:fs/promises";
-import { join as join12 } from "node:path";
+import { readFile as readFile11 } from "node:fs/promises";
+import { join as join13 } from "node:path";
 var SECTION_KINDS = ["WikiSection", "DocumentSection", "Party", "GlossaryTerm"];
 var SECTION_TOKENS = 1500;
 var SECTION_SHARE = 0.15;
@@ -6604,7 +7258,7 @@ async function estateContext(root, step, input, o) {
       priority: o.sections.priority
     }));
   if (e && o.change) {
-    const brief = await readFile10(join12(changeFolder(root, o.change), "brief.md"), "utf8").catch(() => "");
+    const brief = await readFile11(join13(changeFolder(root, o.change), "brief.md"), "utf8").catch(() => "");
     sources.push(...briefEndpointsSource(brief, e));
   }
   const report = reportOf(s, room);
@@ -6639,16 +7293,16 @@ function sectionLine(n) {
     return void 0;
   const x = n.json ?? {};
   const cite3 = /\[[^\]]*\]$/.exec(n.line)?.[0];
-  const text2 = (v) => typeof v === "string" && v.trim() ? v.trim() : void 0;
+  const text4 = (v) => typeof v === "string" && v.trim() ? v.trim() : void 0;
   const list2 = (v) => Array.isArray(v) ? v.filter((s) => typeof s === "string") : [];
-  const about = n.kind === "GlossaryTerm" ? text2(x.definition) : [
-    text2(x.owner) && `owner ${text2(x.owner)}`,
+  const about = n.kind === "GlossaryTerm" ? text4(x.definition) : [
+    text4(x.owner) && `owner ${text4(x.owner)}`,
     list2(x.owns).length && `owns ${list2(x.owns).join(", ")}`,
     list2(x.responsibilities)[0],
-    text2(x.quote && x.quote.text)
+    text4(x.quote && x.quote.text)
   ].filter(Boolean).join("; ");
   const word = n.kind === "GlossaryTerm" ? "term" : x.partyKind === "vendor" ? "vendor" : "team";
-  const name = text2(x.term) ?? text2(x.name) ?? n.name;
+  const name = text4(x.term) ?? text4(x.name) ?? n.name;
   return `${word} ${n.id} "${name}"${about ? `: ${about}` : ""}${cite3 ? ` ${cite3}` : ""}`;
 }
 async function sectionsFor(root, input, o) {
@@ -6731,18 +7385,18 @@ function dropUncitedQuestions(d) {
 }
 
 // packages/planner/dist/stages/openspec-files.js
-var import_yaml11 = __toESM(require_dist(), 1);
+var import_yaml12 = __toESM(require_dist(), 1);
 import { existsSync } from "node:fs";
-import { cp, mkdir as mkdir5, mkdtemp, readdir as readdir8, readFile as readFile11, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
+import { cp, mkdir as mkdir5, mkdtemp, readdir as readdir8, readFile as readFile12, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename, dirname as dirname3, join as join13 } from "node:path";
+import { basename, dirname as dirname3, join as join14 } from "node:path";
 var SPEC_MARK = "<!-- Generated by atticus plan stories from the stories' acceptance criteria. Edit the stories and run the stage again. -->";
 var PROPOSAL_MARK = "<!-- Generated by atticus change feature from brief.md and feature.yaml. Edit feature.yaml and run the stage again. -->";
 var MAX_REQUIREMENT = 480;
 var sentence3 = (s) => /[.!?]$/.test(s.trim()) ? s.trim() : `${s.trim()}.`;
 var bare = (s) => s.trim().replace(/[.\s]+$/, "");
 var cap = (s) => s ? `${s[0].toUpperCase()}${s.slice(1)}` : s;
-var slug2 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+var slug3 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 var clip = (s, n) => {
   if (s.length <= n)
     return s;
@@ -6754,7 +7408,7 @@ function openspecRootOf(root) {
   const dir = openspecDirOf(root);
   if (basename(dir) !== "openspec")
     return void 0;
-  return existsSync(join13(dir, "config.yaml")) ? dirname3(dir) : void 0;
+  return existsSync(join14(dir, "config.yaml")) ? dirname3(dir) : void 0;
 }
 function metarepoOpenSpec(root) {
   const r = openspecRootOf(root);
@@ -6781,13 +7435,13 @@ function capabilityOf(flow, repo, o) {
   const had = o.existing?.find((s) => s.flow === flow);
   if (had)
     return had.id;
-  const part = slug2(flow.split(".").slice(1).join("-") || flow);
-  const r = slug2(repo);
+  const part = slug3(flow.split(".").slice(1).join("-") || flow);
+  const r = slug3(repo);
   const name = o.multiRepo && !part.startsWith(r) ? `${r}-${part}` : part;
   return name.slice(0, 80).replace(/-+$/, "") || r;
 }
-function scenarioOf(text2) {
-  const t = bare(text2);
+function scenarioOf(text4) {
+  const t = bare(text4);
   const m = /^\s*given\s+(.+?),?\s+when\s+(.+?),?\s+then\s+(.+)$/is.exec(t) ?? /^\s*()when\s+(.+?),?\s+then\s+(.+)$/is.exec(t);
   const given = m?.[1]?.trim();
   const when = m?.[2]?.trim();
@@ -6843,15 +7497,15 @@ function specDeltas(change, stories, answer, o) {
     } else {
       const fresh = uniqueNames(criteriaOf(s, w).map((c) => scenarioOf(c.text)));
       if (fresh.length) {
-        const text2 = requirementText(change, s, w);
+        const text4 = requirementText(change, s, w);
         if (prior) {
           const byName2 = new Map(fresh.map((x) => [x.name.toLowerCase(), x]));
           const kept = prior.scenarios.map((x) => byName2.get(x.name.toLowerCase()) ?? { name: x.name, body: x.rawText.trim() });
           const had2 = new Set(prior.scenarios.map((x) => x.name.toLowerCase()));
           const added = fresh.filter((x) => !had2.has(x.name.toLowerCase()));
-          d.modified.push({ name: prior.name, text: text2, scenarios: [...kept, ...added] });
+          d.modified.push({ name: prior.name, text: text4, scenarios: [...kept, ...added] });
         } else
-          d.added.push({ name: bare(s.name), text: text2, scenarios: fresh });
+          d.added.push({ name: bare(s.name), text: text4, scenarios: fresh });
       }
     }
     if (d.added.length + d.modified.length + d.removed.length)
@@ -6891,34 +7545,34 @@ function renderSpecDelta(d, mark = SPEC_MARK) {
 }
 var specFiles = (deltas) => Object.fromEntries(deltas.map((d) => [`specs/${d.capability}/spec.md`, renderSpecDelta(d)]));
 async function writeSpecFiles(dir, files, mark = SPEC_MARK) {
-  const specs = join13(dir, "specs");
+  const specs = join14(dir, "specs");
   for (const c of await readdir8(specs).catch(() => [])) {
-    const f = join13(specs, c, "spec.md");
+    const f = join14(specs, c, "spec.md");
     if (files[`specs/${c}/spec.md`] !== void 0)
       continue;
-    const t = await readFile11(f, "utf8").catch(() => void 0);
+    const t = await readFile12(f, "utf8").catch(() => void 0);
     if (t?.startsWith(mark))
-      await rm4(join13(specs, c), { recursive: true, force: true });
+      await rm4(join14(specs, c), { recursive: true, force: true });
   }
   const written = [];
-  for (const [rel, text2] of Object.entries(files)) {
-    const f = join13(dir, ...rel.split("/"));
-    const had = await readFile11(f, "utf8").catch(() => void 0);
+  for (const [rel, text4] of Object.entries(files)) {
+    const f = join14(dir, ...rel.split("/"));
+    const had = await readFile12(f, "utf8").catch(() => void 0);
     if (had !== void 0 && !had.startsWith(mark))
       continue;
     await mkdir5(dirname3(f), { recursive: true });
-    await writeFileAtomic(f, text2);
+    await writeFileAtomic(f, text4);
     written.push(rel);
   }
   await setSkipSpecs(dir, Object.keys(files).length === 0);
   return written;
 }
 async function setSkipSpecs(dir, skip) {
-  const f = join13(dir, ".openspec.yaml");
-  const text2 = await readFile11(f, "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const f = join14(dir, ".openspec.yaml");
+  const text4 = await readFile12(f, "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return;
-  const doc = (0, import_yaml11.parseDocument)(text2);
+  const doc = (0, import_yaml12.parseDocument)(text4);
   if (Boolean(doc.get("skip_specs")) === skip)
     return;
   if (skip)
@@ -6928,9 +7582,9 @@ async function setSkipSpecs(dir, skip) {
   await writeFile3(f, doc.toString({ lineWidth: 0 }), "utf8");
 }
 function briefWhy(brief) {
-  const text2 = brief.replace(/\r\n/g, "\n").replace(/<!--[\s\S]*?-->/g, "");
-  const under = /^#{1,3}\s*(?:problem|why|the problem|background)\b[^\n]*\n+([\s\S]*?)(?=\n#{1,3}\s|$)/im.exec(text2)?.[1];
-  const paras = (under ?? text2.replace(/^#[^\n]*\n/gm, "")).split(/\n\s*\n/).map((p) => p.replace(/\s+/g, " ").trim()).filter((p) => p && !p.startsWith("|"));
+  const text4 = brief.replace(/\r\n/g, "\n").replace(/<!--[\s\S]*?-->/g, "");
+  const under = /^#{1,3}\s*(?:problem|why|the problem|background)\b[^\n]*\n+([\s\S]*?)(?=\n#{1,3}\s|$)/im.exec(text4)?.[1];
+  const paras = (under ?? text4.replace(/^#[^\n]*\n/gm, "")).split(/\n\s*\n/).map((p) => p.replace(/\s+/g, " ").trim()).filter((p) => p && !p.startsWith("|"));
   return paras[0] ?? "";
 }
 function renderProposal(title, p, brief, o = {}) {
@@ -6975,12 +7629,12 @@ function renderProposal(title, p, brief, o = {}) {
   lines.push("## Impact", "", repos.length ? `- Repos: ${repos.join(", ")}.` : "- Repos: not placed yet.", ...p.flows.filter((f) => f.how === "read").map((f) => `- Reads flow \`${f.id}\`, unchanged.`), "", "## Open questions", "", ...p.gaps.length ? p.gaps.map((g) => `- ${sentence3(g.what.replace(/\s+/g, " "))}`) : ["- None found by the feature stage; see needs.md for what the change waits on."], "");
   return lines.join("\n");
 }
-async function writeProposal(dir, text2) {
-  const f = join13(dir, "proposal.md");
-  const had = await readFile11(f, "utf8").catch(() => void 0);
+async function writeProposal(dir, text4) {
+  const f = join14(dir, "proposal.md");
+  const had = await readFile12(f, "utf8").catch(() => void 0);
   if (had !== void 0 && !had.startsWith(PROPOSAL_MARK))
     return false;
-  await writeFileAtomic(f, text2);
+  await writeFileAtomic(f, text4);
   return true;
 }
 async function openspecFiles(root, change, stories, answer, estate) {
@@ -6994,11 +7648,11 @@ async function openspecFiles(root, change, stories, answer, estate) {
   const deltas = specDeltas(change, stories, answer, o);
   const capabilityOfFlow = new Map(stories.map((s) => [s.flow, capabilityOf(s.flow, s.repo, o)]).filter(([, c]) => deltas.some((d) => d.capability === c)));
   const dir = changeFolder(root, change);
-  const placed = await readFile11(join13(dir, "feature.yaml"), "utf8").then((t) => FeaturePlacement.safeParse((0, import_yaml11.parse)(t))).catch(() => void 0);
+  const placed = await readFile12(join14(dir, "feature.yaml"), "utf8").then((t) => FeaturePlacement.safeParse((0, import_yaml12.parse)(t))).catch(() => void 0);
   let proposal;
   if (placed?.success) {
     const title = await changeStore(root).read(change).then((c) => c.title).catch(() => change);
-    const brief = await readFile11(join13(dir, "brief.md"), "utf8").catch(() => "");
+    const brief = await readFile12(join14(dir, "brief.md"), "utf8").catch(() => "");
     proposal = renderProposal(title, placed.data, brief, {
       repoOf: (f) => estate?.flowById.get(f)?.repo,
       capabilities: deltas.map((d) => {
@@ -7064,21 +7718,21 @@ async function validateDraft(root, change, dir, files, o = {}) {
   const osRoot = openspecRootOf(root);
   if (!osRoot)
     return [];
-  const tmp = await mkdtemp(join13(tmpdir(), "atticus-validate-"));
+  const tmp = await mkdtemp(join14(tmpdir(), "atticus-validate-"));
   try {
-    const os = join13(osRoot, "openspec");
-    await mkdir5(join13(tmp, "openspec", "changes", change), { recursive: true });
+    const os = join14(osRoot, "openspec");
+    await mkdir5(join14(tmp, "openspec", "changes", change), { recursive: true });
     for (const f of ["config.yaml", "schemas", "specs"])
-      if (existsSync(join13(os, f)))
-        await cp(join13(os, f), join13(tmp, "openspec", f), { recursive: true });
-    const target = join13(tmp, "openspec", "changes", change);
+      if (existsSync(join14(os, f)))
+        await cp(join14(os, f), join14(tmp, "openspec", f), { recursive: true });
+    const target = join14(tmp, "openspec", "changes", change);
     for (const f of [".openspec.yaml", "proposal.md", "design.md", "stories.md", "tasks.md"])
-      if (existsSync(join13(dir, f)))
-        await cp(join13(dir, f), join13(target, f));
-    for (const [rel, text2] of Object.entries(files)) {
-      const f = join13(target, ...rel.split("/"));
+      if (existsSync(join14(dir, f)))
+        await cp(join14(dir, f), join14(target, f));
+    for (const [rel, text4] of Object.entries(files)) {
+      const f = join14(target, ...rel.split("/"));
       await mkdir5(dirname3(f), { recursive: true });
-      await writeFile3(f, text2, "utf8");
+      await writeFile3(f, text4, "utf8");
     }
     await setSkipSpecs(target, !Object.keys(files).some((f) => f.startsWith("specs/")));
     const r = await createOpenSpec({ root: tmp, ...o.bin ? { bin: o.bin } : {} }).validate({
@@ -7157,15 +7811,15 @@ async function pastCorrectionsSource(root, q2) {
   }).catch(() => []);
   if (!past.length)
     return void 0;
-  const text2 = pastCorrectionsText(past, Math.floor(q2.budget * PAST_CORRECTIONS_SHARE));
-  if (!text2)
+  const text4 = pastCorrectionsText(past, Math.floor(q2.budget * PAST_CORRECTIONS_SHARE));
+  if (!text4)
     return void 0;
   return {
     source: {
       id: "past-corrections",
       kind: "artifact",
       origin: past.map((p) => `${p.folder}/stage/${p.stage}.drafted/ and .merged/`).join("; "),
-      text: text2,
+      text: text4,
       classification: "internal",
       priority: 60
     },
@@ -7238,20 +7892,20 @@ Rules:
 var isTemplate = (brief) => brief.replace(/<!--[\s\S]*?-->/g, "").split("\n").filter((l) => l.trim() && !/^#/.test(l.trim())).length === 0;
 async function personStories(dir) {
   const out = [];
-  for (const f of (await readdir9(join14(dir, "stories")).catch(() => [])).sort()) {
+  for (const f of (await readdir9(join15(dir, "stories")).catch(() => [])).sort()) {
     if (!f.endsWith(".md"))
       continue;
-    const text2 = await readFile12(join14(dir, "stories", f), "utf8");
-    if (!text2.startsWith(GENERATED_MARK))
-      out.push({ file: `stories/${f}`, text: text2 });
+    const text4 = await readFile13(join15(dir, "stories", f), "utf8");
+    if (!text4.startsWith(GENERATED_MARK))
+      out.push({ file: `stories/${f}`, text: text4 });
   }
   return out;
 }
 async function readPlacement(dir) {
-  const text2 = await readFile12(join14(dir, FEATURE_FILE), "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const text4 = await readFile13(join15(dir, FEATURE_FILE), "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return void 0;
-  const r = FeaturePlacement.safeParse((0, import_yaml12.parse)(text2));
+  const r = FeaturePlacement.safeParse((0, import_yaml13.parse)(text4));
   return r.success ? r.data : void 0;
 }
 async function conflictsOf(root, change, p, e) {
@@ -7269,7 +7923,7 @@ async function conflictsOf(root, change, p, e) {
       continue;
     const dir = changeFolder(root, other.id);
     const theirs = new Set((await readPlacement(dir))?.flows.map((f) => f.id) ?? []);
-    for (const f of await readdir9(join14(dir, "target-flows")).catch(() => []))
+    for (const f of await readdir9(join15(dir, "target-flows")).catch(() => []))
       if (f.endsWith(".yaml"))
         theirs.add(f.slice(0, -5));
     const flows = [...mine].filter((x) => theirs.has(x)).sort();
@@ -7294,10 +7948,10 @@ async function writePlacement(root, change, p, estate, by = "atticus change feat
         gaps.push(g);
   }
   const full = FeaturePlacement.parse({ ...p, gaps, conflicts, questions: [] });
-  await writeFileAtomic(join14(dir, FEATURE_FILE), `# The feature placed against the estate (ADR 0087). Drafted by ${by}; review it in the feature PR.
-${(0, import_yaml12.stringify)(full, { lineWidth: 0 })}`);
-  await writeFileAtomic(join14(dir, "feature.md"), renderFeature(full));
-  const brief = await readFile12(join14(dir, "brief.md"), "utf8").catch(() => "");
+  await writeFileAtomic(join15(dir, FEATURE_FILE), `# The feature placed against the estate (ADR 0087). Drafted by ${by}; review it in the feature PR.
+${(0, import_yaml13.stringify)(full, { lineWidth: 0 })}`);
+  await writeFileAtomic(join15(dir, "feature.md"), renderFeature(full));
+  const brief = await readFile13(join15(dir, "brief.md"), "utf8").catch(() => "");
   const proposal = renderProposal(change.title, full, brief, {
     repoOf: (f) => estate.flowById.get(f)?.repo
   });
@@ -7376,21 +8030,21 @@ async function featureStage(root, changeId, o) {
   let designRel = (await readPlacement(dir))?.design?.file;
   if (o.fromFigma) {
     designRel = `design/${basename2(o.fromFigma).replace(/[^\w.-]+/g, "-")}`;
-    await mkdir6(join14(dir, "design"), { recursive: true });
-    await copyFile2(o.fromFigma, join14(dir, ...designRel.split("/")));
+    await mkdir6(join15(dir, "design"), { recursive: true });
+    await copyFile2(o.fromFigma, join15(dir, ...designRel.split("/")));
   }
   let design;
   if (designRel) {
-    const text2 = await readFile12(join14(dir, ...designRel.split("/")), "utf8").catch(() => void 0);
-    if (text2 === void 0)
+    const text4 = await readFile13(join15(dir, ...designRel.split("/")), "utf8").catch(() => void 0);
+    if (text4 === void 0)
       throw new PlannerError("refused", `The design file ${rel}/${designRel} isn't there; run with --from-figma <file.json>.`);
     try {
-      design = readFigma(text2);
+      design = readFigma(text4);
     } catch (e) {
       throw new PlannerError("refused", e.message);
     }
   }
-  const brief = await readFile12(join14(dir, "brief.md"), "utf8").catch(() => "");
+  const brief = await readFile13(join15(dir, "brief.md"), "utf8").catch(() => "");
   const stories = await personStories(dir);
   const attached = await changeInputSources(dir, rel);
   const hasBrief = !!brief.trim() && !isTemplate(brief);
@@ -7530,9 +8184,9 @@ async function featureStage(root, changeId, o) {
     instructions: instructions3,
     ...context.gaps?.length ? { gaps: context.gaps } : {},
     sources,
-    parse: (text2) => {
+    parse: (text4) => {
       let repairs = [];
-      const r = parseYamlAs(text2, FeaturePlacement, (d) => {
+      const r = parseYamlAs(text4, FeaturePlacement, (d) => {
         repairs = dropUncitedQuestions(d);
         return fill(d);
       }, "feature.yaml");
@@ -7555,12 +8209,12 @@ async function featureStage(root, changeId, o) {
 }
 
 // packages/planner/dist/stages/architecture.js
-var import_yaml13 = __toESM(require_dist(), 1);
-import { readdir as readdir10, readFile as readFile14, rm as rm5 } from "node:fs/promises";
-import { join as join15 } from "node:path";
+var import_yaml14 = __toESM(require_dist(), 1);
+import { readdir as readdir10, readFile as readFile15, rm as rm5 } from "node:fs/promises";
+import { join as join16 } from "node:path";
 
 // packages/planner/dist/stages/merge.js
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 function flowBase(flow) {
   const steps = flow.steps.map((s) => ({
     kind: s.kind,
@@ -7568,7 +8222,7 @@ function flowBase(flow) {
     to: s.to ? { component: s.to.component, entry: s.to.entry } : null,
     store: s.store ? { table: s.store.table, columns: s.store.columns } : null
   }));
-  return createHash4("sha256").update(JSON.stringify(steps)).digest("hex");
+  return createHash5("sha256").update(JSON.stringify(steps)).digest("hex");
 }
 function deltaBase(d, today) {
   if (d.change === "new" || !today)
@@ -7657,14 +8311,14 @@ function mergeDelta(d, today) {
     steps.push(...addsAfter(0));
     today.steps.forEach((s, i) => {
       const n = i + 1;
-      const rm7 = removes.get(n);
+      const rm8 = removes.get(n);
       const ch = changes.get(n);
-      if (rm7)
+      if (rm8)
         steps.push({
           mark: "removed",
           today: n,
           ...fromToday(s),
-          ...rm7.why ? { why: rm7.why } : {}
+          ...rm8.why ? { why: rm8.why } : {}
         });
       else {
         const m = ch ? {
@@ -7711,7 +8365,7 @@ function mergeDelta(d, today) {
 }
 
 // packages/planner/dist/stages/story-code.js
-import { readFile as readFile13, realpath, stat as stat3 } from "node:fs/promises";
+import { readFile as readFile14, realpath, stat as stat3 } from "node:fs/promises";
 import { isAbsolute, relative as relative2, resolve, sep as sep2 } from "node:path";
 var STORY_CODE_AROUND = 3;
 var STORY_CODE_SHARE = 0.2;
@@ -7745,7 +8399,7 @@ async function readCheckoutFile(root, repo, path) {
     return void 0;
   const base = defaultCodeDir(root, repo);
   const file = base ? await inside(base, path) : void 0;
-  return file ? await readFile13(file, "utf8").catch(() => void 0) : void 0;
+  return file ? await readFile14(file, "utf8").catch(() => void 0) : void 0;
 }
 async function checkoutHas(root, repo, path) {
   const base = defaultCodeDir(root, repo);
@@ -7796,12 +8450,12 @@ async function storyCodeSource(root, stories, budget, o = {}) {
       continue;
     const base = defaultCodeDir(root, f.repo);
     const file = base ? await inside(base, f.path) : void 0;
-    const text2 = file ? await readFile13(file, "utf8").catch(() => void 0) : void 0;
-    if (text2 === void 0) {
+    const text4 = file ? await readFile14(file, "utf8").catch(() => void 0) : void 0;
+    if (text4 === void 0) {
       missing.push(key3);
       continue;
     }
-    const all2 = text2.replace(/\r\n?/g, "\n").split("\n");
+    const all2 = text4.replace(/\r\n?/g, "\n").split("\n");
     if (all2.length > 1 && all2.at(-1) === "")
       all2.pop();
     const lines = f.lines.filter((l) => l >= 1 && l <= all2.length).sort((a, b) => a - b);
@@ -8244,7 +8898,7 @@ function deployNeeds(deltas, e) {
         if (d.steps.some((s) => s.op !== "remove" && s.store?.table === table))
           add({ first: u.key, then: codeKey(d.repo), why: { kind: "migration", table } });
   }
-  const repoOf = (id) => {
+  const repoOf2 = (id) => {
     const r = e.byId.get(id);
     return r?.kind === "Component" && typeof r.repo === "string" ? r.repo : void 0;
   };
@@ -8260,7 +8914,7 @@ function deployNeeds(deltas, e) {
       const to = s.to ?? (was?.to ? { ...was.to, new: false } : void 0);
       if (!to)
         continue;
-      const callee = repoOf(to.component);
+      const callee = repoOf2(to.component);
       if (!callee || callee === d.repo || !units.has(codeKey(callee)))
         continue;
       const key3 = entryKey2(to.entry);
@@ -8413,7 +9067,7 @@ flows:
     trigger: <new flows only> { kind: endpoint | action | page | listener | job, what: <plain words>, entry: <the HTTP method and the path, such as "GET /orders/{id}", or a topic> }
     why: <one sentence: why this flow changes>
     consumers: [<when the change breaks the flow's entry: every component that calls it today>]
-    runsOn: <a new flow of a component that doesn't exist yet: where it runs> { component: <its id>, system: <the system it belongs to>, platform: <the platform it runs on>, cloud: <the cloud, or on-prem>, framework: <what it is built on> }
+    runsOn: <a new flow of a component that doesn't exist yet: where it runs> { component: <its id>, system: <the system it belongs to>, platform: <the platform it runs on>, cloud: <the cloud, or on-prem>, framework: <what it is built on>, type: <what it is: one of the organisation's component types, by id> }
     steps:
       - op: add | change | remove
         step: <change and remove: the step's number in today's flow, as listed>
@@ -8477,19 +9131,20 @@ function splitAnswer(a) {
       reads.push({ flow: d.flow, why: d.why });
   return { deltas: a.flows.filter((d) => !isEmptyDelta(d)), reads };
 }
+var SKETCH_RULE = "A person drew some of this change on the canvas: the sketch block holds their steps (their kind, the flow they are on, where each call or publish goes, which table a step reads or writes). Keep every one of those as drawn, on its flow, and fill in what a sketch can't say: its fields, errors, place in the code (at, new, uses), and the steps around it the change needs. Add new flows or steps only where the feature asks for them; never remove or move a drawn step.";
 async function readDeltas(dir) {
   const deltas = [];
   const problems = [];
-  for (const f of (await readdir10(join15(dir, TARGET_DIR2)).catch(() => [])).sort()) {
+  for (const f of (await readdir10(join16(dir, TARGET_DIR2)).catch(() => [])).sort()) {
     if (!f.endsWith(".yaml"))
       continue;
     try {
-      const text2 = await readFile14(join15(dir, TARGET_DIR2, f), "utf8");
-      const r = FlowDelta.safeParse((0, import_yaml13.parse)(text2));
+      const text4 = await readFile15(join16(dir, TARGET_DIR2, f), "utf8");
+      const r = FlowDelta.safeParse((0, import_yaml14.parse)(text4));
       if (r.success)
         deltas.push(r.data);
       else
-        problems.push(...schemaProblems(`${TARGET_DIR2}/${f}`, text2, r.error.issues));
+        problems.push(...schemaProblems(`${TARGET_DIR2}/${f}`, text4, r.error.issues));
     } catch (e) {
       problems.push(`${TARGET_DIR2}/${f}: ${e.message.split("\n")[0]}`);
     }
@@ -8760,6 +9415,24 @@ function storeOfTable(e, table) {
   return prefix && e.byId.get(prefix)?.kind === "DataStore" ? prefix : void 0;
 }
 var NUMBERED = /^([A-Za-z]*)(\d+)([^A-Za-z0-9]+)([A-Za-z0-9].*?)(\.[A-Za-z0-9]+)$/;
+var VERSIONED = /^([A-Za-z]*)(\d+(?:[._]\d+)*)(__)([A-Za-z0-9].*?)(\.[A-Za-z0-9]+)$/;
+var versionOf = (v) => v.split(/[._]/).map(Number);
+var cmpVersion = (a, b) => {
+  for (let i = 0; i < Math.max(a.length, b.length); i++) {
+    const d = (a[i] ?? 0) - (b[i] ?? 0);
+    if (d)
+      return d;
+  }
+  return 0;
+};
+function versionIn(name, p) {
+  if (p.vsep) {
+    const v = VERSIONED.exec(name);
+    return v && v[1] === p.prefix && v[5] === p.ext ? versionOf(v[2]) : void 0;
+  }
+  const x = NUMBERED.exec(name);
+  return x && x[1] === p.prefix && x[3] === p.sep && x[5] === p.ext ? [Number(x[2])] : void 0;
+}
 function migrationsOf(e, store) {
   const recs = e.records.filter((r) => r.kind === "Migration" && r.dataStore === store && r.file);
   const nested = recs.length > 0 && recs.every((r) => r.file.split(/[\\/]/).length > 2 && fileOf2(r.file) === "migration.sql");
@@ -8769,7 +9442,22 @@ function migrationsOf(e, store) {
   const all2 = parts.every((p) => p) && parts.length > 0;
   const same = (k) => all2 && new Set(parts.map((p) => p[k])).size === 1;
   let pattern;
-  if (same(1) && same(3) && same(5)) {
+  const vparts = names.map((n) => VERSIONED.exec(n));
+  const dotted = vparts.map((v) => v?.[2]?.match(/[._]/)?.[0]).find((x) => x);
+  if (dotted && vparts.every((v) => v) && new Set(vparts.map((v) => v[1])).size === 1 && new Set(vparts.map((v) => v[5])).size === 1) {
+    const at2 = vparts.reduce((a, b) => cmpVersion(versionOf(a[2]), versionOf(b[2])) >= 0 ? a : b);
+    const newest = versionOf(at2[2]);
+    pattern = {
+      prefix: vparts[0][1],
+      sep: "__",
+      ext: vparts[0][5],
+      width: 0,
+      newest: newest[0],
+      version: newest,
+      vtext: at2[2].split(/[._]/),
+      vsep: dotted
+    };
+  } else if (same(1) && same(3) && same(5)) {
     const nums = parts.map((p) => p[2]);
     const padded = nums.some((x) => x.startsWith("0")) && new Set(nums.map((x) => x.length)).size === 1;
     pattern = {
@@ -8780,8 +9468,11 @@ function migrationsOf(e, store) {
       newest: Math.max(...nums.map(Number))
     };
   }
-  const num = (n) => Number(NUMBERED.exec(n)?.[2] ?? -1);
-  const files = [...names].sort((a, b) => pattern ? num(b) - num(a) || b.localeCompare(a) : b.localeCompare(a));
+  const files = [...names].sort((a, b) => {
+    if (!pattern)
+      return b.localeCompare(a);
+    return cmpVersion(versionIn(b, pattern) ?? [-1], versionIn(a, pattern) ?? [-1]) || b.localeCompare(a);
+  });
   const folders = [
     ...new Set(recs.map((r) => unit(r.file).split(/[\\/]/).slice(0, -1).join("/")))
   ];
@@ -8804,6 +9495,12 @@ function nextMigration(m, words5) {
   const p = m.pattern;
   if (!p)
     return void 0;
+  if (p.version && p.vsep) {
+    const next = [...p.vtext ?? p.version.map(String)];
+    const last = next.at(-1);
+    next[next.length - 1] = String(Number(last) + 1).padStart(last.length, "0");
+    return `${p.prefix}${next.join(p.vsep)}__${words5}${p.ext}`;
+  }
   return `${p.prefix}${String(p.newest + 1).padStart(p.width, "0")}${p.sep}${words5}${p.ext}`;
 }
 function columnTypesOf(e, store) {
@@ -8833,17 +9530,17 @@ function migrationProblem(name, table, e, example, onFile = false) {
     return void 0;
   if (m?.files.includes(file)) {
     const where2 = m.folder ? `, in ${m.folder}` : "";
-    const stem4 = file.replace(/^[A-Za-z]*\d+[^A-Za-z0-9]+/, "").replace(/\.[A-Za-z0-9]+$/, "");
+    const stem4 = file.replace(/^[A-Za-z]*\d+(?:[._]\d+)*(?:__|[^A-Za-z0-9]+)/, "").replace(/\.[A-Za-z0-9]+$/, "");
     const next = nextMigration(m, stem4);
     return `names the migration ${name}, which ${store} already has: a change to its tables is a new migration beside it${where2}: name the file ${next ?? `as its migrations are named (${m.files.slice(0, 3).join(", ")})`}.`;
   }
   const p = m?.pattern;
   if (m && p) {
-    const x = NUMBERED.exec(file);
-    const fits = x && x[1] === p.prefix && x[3] === p.sep && x[5] === p.ext && Number(x[2]) > p.newest;
+    const v = versionIn(file, p);
+    const fits = !!v && cmpVersion(v, p.version ?? [p.newest]) > 0;
     if (fits)
       return void 0;
-    const what = m.tool === "flyway" ? `Flyway, the newest ${p.prefix}${p.newest}` : `the newest ${m.files[0]}`;
+    const what = m.tool === "flyway" ? `Flyway, the newest ${p.prefix}${p.vtext && p.vsep ? p.vtext.join(p.vsep) : p.newest}` : `the newest ${m.files[0]}`;
     const where2 = m.folder ? `, in ${m.folder}` : "";
     const wordy = /^[A-Za-z0-9][\w.-]*$/.test(name.trim());
     const stem4 = file.replace(/^[A-Za-z]*\d+[^A-Za-z0-9]+/, "").replace(/\.[A-Za-z0-9]+$/, "");
@@ -8892,15 +9589,15 @@ var PLACES_HOW = "at: path:line of the line it goes after, for code that changes
 async function placeIssues(deltas, e, root) {
   const out = [];
   const read = async (repo, path) => root ? await readCheckoutFile(root, repo, path) : void 0;
-  const linesOf2 = (text2) => text2.replace(/\r\n?/g, "\n").replace(/\n$/, "").split("\n");
+  const linesOf2 = (text4) => text4.replace(/\r\n?/g, "\n").replace(/\n$/, "").split("\n");
   for (const d of deltas)
     for (const [i, s] of d.steps.entries()) {
       const change = `Change ${i + 1} to ${d.flow}`;
       const issue = (key3, rule, message, blocking = true) => out.push({ rule, target: `${d.flow}#${i + 1}:${key3}`, message, blocking, repo: d.repo });
       for (const u of usesOf(s)) {
         const p = parseAt(u);
-        const text2 = p ? await read(d.repo, p.path) : void 0;
-        if (!p || text2 === void 0 && !citesFile(e, d.repo, p.path)) {
+        const text4 = p ? await read(d.repo, p.path) : void 0;
+        if (!p || text4 === void 0 && !citesFile(e, d.repo, p.path)) {
           issue("uses", "delta.uses-unknown", `${change} uses ${u}, but ${d.repo} has no such file in its checkout or the catalog: give path:line of the code it calls as the repo has it.`);
           continue;
         }
@@ -8908,7 +9605,7 @@ async function placeIssues(deltas, e, root) {
           issue("uses", "delta.uses-no-line", `${change} uses ${u}, with no line: give path:line of the code it calls (the method's first line).`);
           continue;
         }
-        const n = text2 === void 0 ? void 0 : linesOf2(text2).length;
+        const n = text4 === void 0 ? void 0 : linesOf2(text4).length;
         if (n !== void 0 && (p.line < 1 || p.line > n))
           issue("uses", "delta.uses-line", `${change} uses line ${p.line} of ${p.path}, which has ${n} lines in ${d.repo}'s checkout: give the line of the code it calls.`);
       }
@@ -8927,8 +9624,8 @@ async function placeIssues(deltas, e, root) {
       }
       if (s.at) {
         const p = parseAt(s.at);
-        const text2 = p ? await read(d.repo, p.path) : void 0;
-        if (!p || text2 === void 0 && !citesFile(e, d.repo, p.path)) {
+        const text4 = p ? await read(d.repo, p.path) : void 0;
+        if (!p || text4 === void 0 && !citesFile(e, d.repo, p.path)) {
           issue("at", "delta.at-unknown", `${change} puts the new step at ${s.at}, but ${d.repo} has no such file in its checkout or the catalog: give the path as the repo has it, path:line of the line the step goes after. For code in a file the change creates, write new: <path> instead.`);
           continue;
         }
@@ -8936,7 +9633,7 @@ async function placeIssues(deltas, e, root) {
           issue("at", "delta.at-no-line", `${change} puts the new step at ${s.at}, with no line. Say where its code goes: ${PLACES_HOW}.`);
           continue;
         }
-        const lines = text2 === void 0 ? void 0 : linesOf2(text2);
+        const lines = text4 === void 0 ? void 0 : linesOf2(text4);
         if (lines && (p.line < 1 || p.line > lines.length)) {
           issue("at", "delta.at-line", `${change} puts the new step after line ${p.line} of ${p.path}, which has ${lines.length} lines in ${d.repo}'s checkout: give the line it goes after.`);
           continue;
@@ -9103,13 +9800,13 @@ function prototypeNewCallsSource(inputs) {
   ];
 }
 function storeFactsSource(e, p) {
-  const text2 = storeFacts(e, storesFor(e, p), touchedTables(e, p));
-  return text2 ? [
+  const text4 = storeFacts(e, storesFor(e, p), touchedTables(e, p));
+  return text4 ? [
     {
       id: "store-facts",
       kind: "catalog",
       origin: "the catalog's data stores, tables, columns and migrations (deterministic)",
-      text: text2,
+      text: text4,
       classification: "internal",
       priority: 90
     }
@@ -9375,8 +10072,8 @@ function checkDeltas(deltas, e, p, reads = [], o = {}) {
             g.migration = true;
         }
       }
-      const named = fieldNames(s.fields).length + (s.store?.columns.length ?? 0);
-      if (kind && MOVES_DATA.has(kind) && named === 0)
+      const named2 = fieldNames(s.fields).length + (s.store?.columns.length ?? 0);
+      if (kind && MOVES_DATA.has(kind) && named2 === 0)
         issue("delta.no-fields", at2, `Change ${i + 1} to ${t} (${kind}) names no fields: say what it sends, returns, reads or stores.`, d.repo);
     });
     if (today && d.change === "modify")
@@ -9477,10 +10174,10 @@ var GRPC_CODES = [
   "UNAUTHENTICATED"
 ];
 var pascal = (c) => c.toLowerCase().split("_").map((w) => w[0].toUpperCase() + w.slice(1)).join("");
-function grpcCodesIn(text2) {
+function grpcCodesIn(text4) {
   return GRPC_CODES.filter((c) => {
     const name = c.includes("_") ? pascal(c) : `(?:StatusCode|Status|codes|Code)\\.${pascal(c)}`;
-    return new RegExp(`(^|[^A-Za-z_])(${c}|${name})([^A-Za-z_]|$)`).test(text2);
+    return new RegExp(`(^|[^A-Za-z_])(${c}|${name})([^A-Za-z_]|$)`).test(text4);
   });
 }
 function newRpcStatuses(d, e) {
@@ -9738,7 +10435,12 @@ function renderRollback(deltas, e) {
       rows.set(s.store.table, `| ${s.store.table} | writes ${s.store.columns.join(", ") || "rows"} (flow ${d.flow}) | A redeploy of the old code stops the new writes; no schema to undo | The rows the new code wrote stay; a person decides whether to keep them |`);
     }
   if (!rows.size)
-    return [];
+    return [
+      "## Rollout and rollback",
+      "",
+      "The change writes and alters no table, so it has nothing to migrate back: roll back by redeploying the previous version of each repo, in the reverse of the deploy order. Atticus wrote this from the target flows; a person confirms it in the architecture PR.",
+      ""
+    ];
   return [
     "## Rollout and rollback",
     "",
@@ -9751,14 +10453,14 @@ function renderRollback(deltas, e) {
   ];
 }
 async function writeTargetFlows(dir, answer, estate, by = "atticus change architecture") {
-  const readsFile = join15(dir, ...READS_FILE.split("/"));
-  const deployFile = join15(dir, ...DEPLOY_FILE.split("/"));
+  const readsFile = join16(dir, ...READS_FILE.split("/"));
+  const deployFile = join16(dir, ...DEPLOY_FILE.split("/"));
   const deploy = answer.deploy?.length ? answer.deploy : void 0;
   const a = splitAnswer(answer);
   const keep = new Set(a.deltas.map((d) => `${d.flow}.yaml`));
-  for (const f of await readdir10(join15(dir, TARGET_DIR2)).catch(() => []))
+  for (const f of await readdir10(join16(dir, TARGET_DIR2)).catch(() => []))
     if (f.endsWith(".yaml") && !keep.has(f))
-      await rm5(join15(dir, TARGET_DIR2, f), { force: true });
+      await rm5(join16(dir, TARGET_DIR2, f), { force: true });
   const files = [];
   for (const d of a.deltas) {
     const today = d.change === "new" ? void 0 : estate.flowById.get(d.flow)?.flow;
@@ -9767,48 +10469,48 @@ async function writeTargetFlows(dir, answer, estate, by = "atticus change archit
       schemaVersion: FLOW_DELTA_SCHEMA_VERSION,
       ...today ? { base: { steps: flowBase(today) } } : {}
     };
-    await writeFileAtomic(join15(dir, TARGET_DIR2, `${d.flow}.yaml`), `# The target of flow ${d.flow} (ADR 0087): the steps this change adds, changes or removes. Drafted by ${by}; base pins the version of today's flow it was written against (ADR 0111).
-${(0, import_yaml13.stringify)(FlowDelta.parse(pinned), { lineWidth: 0 })}`);
+    await writeFileAtomic(join16(dir, TARGET_DIR2, `${d.flow}.yaml`), `# The target of flow ${d.flow} (ADR 0087): the steps this change adds, changes or removes. Drafted by ${by}; base pins the version of today's flow it was written against (ADR 0111).
+${(0, import_yaml14.stringify)(FlowDelta.parse(pinned), { lineWidth: 0 })}`);
     files.push(`${TARGET_DIR2}/${d.flow}.yaml`);
   }
-  const own = await readFile14(join15(dir, "design.md"), "utf8").catch(() => void 0);
+  const own = await readFile15(join16(dir, "design.md"), "utf8").catch(() => void 0);
   if (own === void 0 || own.startsWith(MARK)) {
-    await writeFileAtomic(join15(dir, "design.md"), renderArchitecture(a.deltas, estate, a.reads, deploy));
+    await writeFileAtomic(join16(dir, "design.md"), renderArchitecture(a.deltas, estate, a.reads, deploy));
     files.push("design.md");
   }
   if (deploy)
     await writeFileAtomic(deployFile, `# The order the change deploys in across its repos (ADR 0124 addendum B-arch), as the architecture stage drafted it and its checks passed. Atticus writes this file.
-${(0, import_yaml13.stringify)({ deploy }, { lineWidth: 0 })}`);
+${(0, import_yaml14.stringify)({ deploy }, { lineWidth: 0 })}`);
   else
     await rm5(deployFile, { force: true });
   if (a.reads.length)
     await writeFileAtomic(readsFile, `# The flows the change reads without changing a step (ADR 0087): context, not target flows. Atticus writes this file.
-${(0, import_yaml13.stringify)({ reads: a.reads }, { lineWidth: 0 })}`);
+${(0, import_yaml14.stringify)({ reads: a.reads }, { lineWidth: 0 })}`);
   else
     await rm5(readsFile, { force: true });
   const data = renderData(a.deltas, estate);
-  const ownData = await readFile14(join15(dir, "data.md"), "utf8").catch(() => void 0);
+  const ownData = await readFile15(join16(dir, "data.md"), "utf8").catch(() => void 0);
   if (data && (ownData === void 0 || ownData.startsWith(MARK))) {
-    await writeFileAtomic(join15(dir, "data.md"), data);
+    await writeFileAtomic(join16(dir, "data.md"), data);
     files.push("data.md");
   } else if (!data && ownData?.startsWith(MARK))
-    await rm5(join15(dir, "data.md"), { force: true });
+    await rm5(join16(dir, "data.md"), { force: true });
   return files;
 }
 async function locateInTargetFlows(dir, rel, target) {
-  const files = (await readdir10(join15(dir, TARGET_DIR2)).catch(() => [])).filter((f) => f.endsWith(".yaml")).sort();
+  const files = (await readdir10(join16(dir, TARGET_DIR2)).catch(() => [])).filter((f) => f.endsWith(".yaml")).sort();
   const docs = [];
   for (const f of files) {
-    const text2 = await readFile14(join15(dir, TARGET_DIR2, f), "utf8").catch(() => void 0);
-    if (text2 === void 0)
+    const text4 = await readFile15(join16(dir, TARGET_DIR2, f), "utf8").catch(() => void 0);
+    if (text4 === void 0)
       continue;
-    const lc = new import_yaml13.LineCounter();
-    docs.push({ file: f, text: text2, doc: (0, import_yaml13.parseDocument)(text2, { lineCounter: lc }), lc });
+    const lc = new import_yaml14.LineCounter();
+    docs.push({ file: f, text: text4, doc: (0, import_yaml14.parseDocument)(text4, { lineCounter: lc }), lc });
   }
   const at2 = (d, offset) => `${rel}/${TARGET_DIR2}/${d.file}:${d.lc.linePos(offset).line}`;
   const steps = (d) => {
     const s = d.doc.get("steps");
-    return (0, import_yaml13.isSeq)(s) ? s.items : [];
+    return (0, import_yaml14.isSeq)(s) ? s.items : [];
   };
   const m = /^(.+?)#(\d+)(?::.*)?$/.exec(target);
   const flow = m ? m[1] : target;
@@ -9823,8 +10525,8 @@ async function locateInTargetFlows(dir, rel, target) {
   let first;
   for (const d of docs)
     for (const item of steps(d)) {
-      const store = (0, import_yaml13.isMap)(item) ? item.get("store") : void 0;
-      if (!(0, import_yaml13.isMap)(store) || store.get("table") !== table)
+      const store = (0, import_yaml14.isMap)(item) ? item.get("store") : void 0;
+      if (!(0, import_yaml14.isMap)(store) || store.get("table") !== table)
         continue;
       const where2 = item.range;
       const here = where2 ? at2(d, where2[0]) : void 0;
@@ -9838,10 +10540,10 @@ async function readTargetFlows(dir) {
   const r = await readDeltas(dir);
   if (!r.deltas.length)
     return void 0;
-  const t = await readFile14(join15(dir, ...READS_FILE.split("/")), "utf8").catch(() => void 0);
-  const reads = t === void 0 ? void 0 : external_exports.array(ReadFlow).safeParse((0, import_yaml13.parse)(t)?.reads);
-  const dt = await readFile14(join15(dir, ...DEPLOY_FILE.split("/")), "utf8").catch(() => void 0);
-  const deploy = dt === void 0 ? void 0 : external_exports.array(DeployStep).safeParse((0, import_yaml13.parse)(dt)?.deploy);
+  const t = await readFile15(join16(dir, ...READS_FILE.split("/")), "utf8").catch(() => void 0);
+  const reads = t === void 0 ? void 0 : external_exports.array(ReadFlow).safeParse((0, import_yaml14.parse)(t)?.reads);
+  const dt = await readFile15(join16(dir, ...DEPLOY_FILE.split("/")), "utf8").catch(() => void 0);
+  const deploy = dt === void 0 ? void 0 : external_exports.array(DeployStep).safeParse((0, import_yaml14.parse)(dt)?.deploy);
   return {
     flows: r.deltas,
     reads: reads?.success ? reads.data : [],
@@ -9866,6 +10568,13 @@ async function architectureStage(root, changeId, o) {
   const flowsText = touched.map((f) => `# ${f.flow.id} (repo ${f.repo}). Steps are numbered from 1 in the order listed.
 ${serializeRecord(f.flow)}`).join("\n---\n");
   const osInstructions = await openspecInstructionSource(root, change.id, "architecture");
+  const drawn = /drawn on the canvas by .+?, stroke [a-z0-9]+/i;
+  const sketched = (await readDeltas(dir)).deltas.map((d) => ({ ...d, steps: d.steps.filter((s) => drawn.test(s.why ?? "")) })).filter((d) => d.steps.length);
+  const componentTypes = effectiveComponentTypes((await loadOrgPack(orgPackDirOf(root)).catch(() => void 0))?.componentTypes ?? []);
+  const typeRules = [
+    `Component types (runsOn.type of a new flow): ${componentTypes.map((t) => t.id).join(", ")}.`,
+    componentTypeRulesText(componentTypes, orgPackRelOf(root))
+  ].filter(Boolean).join("\n");
   const attached = await changeInputSources(dir, rel);
   const newCalls = prototypeNewCallsSource(attached);
   const sources = [
@@ -9875,7 +10584,7 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
       id: "feature.yaml",
       kind: "artifact",
       origin: `${rel}/feature.yaml`,
-      text: (await readFile14(join15(dir, "feature.yaml"), "utf8")).replace(/\r\n/g, "\n"),
+      text: (await readFile15(join16(dir, "feature.yaml"), "utf8")).replace(/\r\n/g, "\n"),
       classification: "internal",
       priority: 100
     },
@@ -9887,6 +10596,30 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
       classification: "internal",
       priority: 95
     },
+    // ADR 0180: what the organisation's component types must and must not do, for a new
+    // component the stage drafts (data, never instructions); nothing when no type says anything.
+    ...typeRules ? [
+      {
+        id: "component-types",
+        kind: "artifact",
+        origin: `${orgPackRelOf(root)}/component-types/`,
+        text: typeRules,
+        classification: "internal",
+        priority: 90
+      }
+    ] : [],
+    // ADR 0179: what a person drew on the canvas is the frame the stage fills in, never redrawn.
+    ...sketched.length ? [
+      {
+        id: "sketch",
+        kind: "artifact",
+        origin: `${rel}/${TARGET_DIR2}/ (drawn on the canvas)`,
+        text: sketched.map((d) => `# ${d.flow}
+${(0, import_yaml14.stringify)(d, { lineWidth: 0 })}`).join("\n---\n"),
+        classification: "internal",
+        priority: 98
+      }
+    ] : [],
     // ADR 0111 addendum: how the stores the change may write name their migrations and types.
     ...storeFactsSource(estate, placement),
     // S2: the values the code allows in the columns of the tables the change may store into.
@@ -9957,12 +10690,13 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
     formatFor(classificationLevels(ctx)),
     "",
     SELF_CHECK_RULE,
+    ...sketched.length ? ["", SKETCH_RULE] : [],
     ...newCalls.length ? ["", PROTOTYPE_NEW_RULE] : [],
     ...past ? ["", past.rule] : []
   ].join("\n");
   const patternById = new Map(patterns.map((i) => [i.id, i]));
   const selected = await estateContext(root, "architecture", {
-    text: [(0, import_yaml13.stringify)(placement, { lineWidth: 0 }), flowsText].join("\n\n"),
+    text: [(0, import_yaml14.stringify)(placement, { lineWidth: 0 }), flowsText].join("\n\n"),
     title: change.title,
     ids: [...placement.flows.map((f) => f.id), ...placement.features.map((f) => f.id)]
   }, {
@@ -10008,8 +10742,8 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
     instructions: instructions3,
     ...context.gaps?.length ? { gaps: context.gaps } : {},
     sources,
-    parse: (text2) => {
-      const r = parseYamlAs(text2, Answer3, (d) => ({
+    parse: (text4) => {
+      const r = parseYamlAs(text4, Answer3, (d) => ({
         // The version and the pin are Atticus's (ADR 0111), never the assistant's.
         flows: (Array.isArray(d.flows) ? d.flows : []).map((f) => {
           const { base: _base, schemaVersion: _v, ...rest } = f ?? {};
@@ -10038,7 +10772,7 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
       // B-places: an added step's place is a file of its repo, a line it has, a function in it.
       ...await placeIssues(a.flows, estate, root),
       // W5: an endpoint the brief names whose flow the design leaves alone (a note, not blocking).
-      ...briefEndpointNotes(await readFile14(join15(dir, "brief.md"), "utf8").catch(() => ""), estate, a.flows)
+      ...briefEndpointNotes(await readFile15(join16(dir, "brief.md"), "utf8").catch(() => ""), estate, a.flows)
     ],
     write: (answer) => writeTargetFlows(dir, answer, estate),
     reviewSources: (a) => [mergedFlowsSource(a.flows, estate, rel)],
@@ -10059,14 +10793,14 @@ ${serializeRecord(f.flow)}`).join("\n---\n");
 var classificationLevels = (ctx) => ctx.orgPack.pack?.classification ?? ["public", "internal", "confidential", "restricted"];
 
 // packages/planner/dist/stages/stories.js
-var import_yaml17 = __toESM(require_dist(), 1);
-import { mkdir as mkdir7, readdir as readdir14, readFile as readFile19, rm as rm6 } from "node:fs/promises";
-import { join as join21 } from "node:path";
+var import_yaml18 = __toESM(require_dist(), 1);
+import { mkdir as mkdir7, readdir as readdir14, readFile as readFile20, rm as rm6 } from "node:fs/promises";
+import { join as join22 } from "node:path";
 
 // packages/planner/dist/needs.js
-var import_yaml14 = __toESM(require_dist(), 1);
-import { readdir as readdir11, readFile as readFile15 } from "node:fs/promises";
-import { join as join16 } from "node:path";
+var import_yaml15 = __toESM(require_dist(), 1);
+import { readdir as readdir11, readFile as readFile16 } from "node:fs/promises";
+import { join as join17 } from "node:path";
 var NEEDS_FILE = "needs.yaml";
 var NEEDS_MD = "needs.md";
 var NEEDS_OUTPUT = "change-needs.yaml";
@@ -10147,11 +10881,34 @@ var daysOf = (root, r) => {
 var stamp = (d) => d.toISOString().replace(/\.\d{3}Z$/, "Z");
 var key = (n) => `${n.item}|${n.for}`;
 var fold4 = (s) => s.replace(/[‘’]/g, "'").replace(/[“”]/g, '"').replace(/\s+/g, " ").trim().toLowerCase();
+function lineAtFolded(text4, at2) {
+  let count = 0;
+  let pending = false;
+  let line = 1;
+  for (const ch of text4) {
+    if (ch === "\n") {
+      if (count < at2)
+        line++;
+      else
+        break;
+    }
+    if (/\s/.test(ch)) {
+      if (count > 0)
+        pending = true;
+    } else {
+      if (pending)
+        count++;
+      pending = false;
+      count += ch.toLowerCase().length;
+    }
+  }
+  return line;
+}
 async function readNeeds(root, change) {
-  const text2 = await readFile15(join16(changeFolder(root, change), NEEDS_FILE), "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const text4 = await readFile16(join17(changeFolder(root, change), NEEDS_FILE), "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return void 0;
-  const r = NeedsFile.safeParse((0, import_yaml14.parse)(text2));
+  const r = NeedsFile.safeParse((0, import_yaml15.parse)(text4));
   return r.success ? r.data : void 0;
 }
 async function changeFiles(dir) {
@@ -10164,14 +10921,14 @@ async function changeFiles(dir) {
     "interfaces.md",
     "tasks.md"
   ]) {
-    const t = await readFile15(join16(dir, f), "utf8").catch(() => void 0);
+    const t = await readFile16(join17(dir, f), "utf8").catch(() => void 0);
     if (t !== void 0)
       out.set(f, t.replace(/\r\n/g, "\n"));
   }
   for (const sub of ["stories", "target-flows"])
-    for (const f of (await readdir11(join16(dir, sub)).catch(() => [])).sort())
+    for (const f of (await readdir11(join17(dir, sub)).catch(() => [])).sort())
       if (/\.(md|ya?ml)$/.test(f))
-        out.set(`${sub}/${f}`, (await readFile15(join16(dir, sub, f), "utf8")).replace(/\r\n/g, "\n"));
+        out.set(`${sub}/${f}`, (await readFile16(join17(dir, sub, f), "utf8")).replace(/\r\n/g, "\n"));
   return out;
 }
 function changeFile(files, cited, change) {
@@ -10185,10 +10942,10 @@ function changeFile(files, cited, change) {
 }
 async function targetsOf(dir, files) {
   const out = /* @__PURE__ */ new Set(["change"]);
-  const feature = await readFile15(join16(dir, "feature.yaml"), "utf8").catch(() => void 0);
+  const feature = await readFile16(join17(dir, "feature.yaml"), "utf8").catch(() => void 0);
   if (feature)
     try {
-      const f = (0, import_yaml14.parse)(feature);
+      const f = (0, import_yaml15.parse)(feature);
       for (const x of f.features ?? [])
         if (x.id)
           out.add(`feature:${x.id}`);
@@ -10333,10 +11090,10 @@ function renderNeeds(f, reviews = {}) {
 }
 async function write2(root, f) {
   const dir = changeFolder(root, f.change);
-  await writeFileAtomic(join16(dir, NEEDS_FILE), `# What this change needs from the organisation (ADR 0101). atticus change needs writes it; status, note, by and at are a person's.
-${(0, import_yaml14.stringify)(NeedsFile.parse(f), { lineWidth: 0 })}`);
+  await writeFileAtomic(join17(dir, NEEDS_FILE), `# What this change needs from the organisation (ADR 0101). atticus change needs writes it; status, note, by and at are a person's.
+${(0, import_yaml15.stringify)(NeedsFile.parse(f), { lineWidth: 0 })}`);
   const k = await readKnowledge(root, { cacheRoot: root });
-  await writeFileAtomic(join16(dir, NEEDS_MD), renderNeeds(f, k.reviews));
+  await writeFileAtomic(join17(dir, NEEDS_MD), renderNeeds(f, k.reviews));
 }
 var INSTRUCTIONS3 = (targets) => `# Task: what this change needs from the organisation
 
@@ -10409,11 +11166,11 @@ async function findNeeds(root, change, o) {
       classification: "public",
       trusted: true
     },
-    ...[...files].map(([f, text2], i) => ({
+    ...[...files].map(([f, text4], i) => ({
       id: `change-${String(i + 1).padStart(3, "0")}`,
       kind: "document",
       origin: `${change}/${f}`,
-      text: text2,
+      text: text4,
       classification: "internal",
       priority: 20
     }))
@@ -10551,7 +11308,7 @@ async function findNeeds(root, change, o) {
       problems.push(...run.errors.length ? run.errors : [`the run ended ${run.state}`]);
     else
       try {
-        const a = AnswerIn.safeParse((0, import_yaml14.parse)(unfence2(run.output)));
+        const a = AnswerIn.safeParse((0, import_yaml15.parse)(unfence2(run.output)));
         if (a.success)
           answer = a.data;
         else
@@ -10577,23 +11334,17 @@ async function findNeeds(root, change, o) {
         continue;
       }
       const file = changeFile(files, n.because.file, change);
-      const text2 = file !== void 0 ? files.get(file) : void 0;
+      const text4 = file !== void 0 ? files.get(file) : void 0;
       const words5 = fold4(n.because.quote).replace(/[\s.,;:!?]+$/, "");
-      const at2 = text2 && words5 ? fold4(text2).indexOf(words5) : -1;
-      if (!text2 || at2 < 0) {
-        problems.push(text2 ? `${n.item} quotes ${n.because.file}, but "${n.because.quote}" isn't in it` : `${n.item} quotes ${n.because.file}, which isn't one of the change's files`);
+      const at2 = text4 && words5 ? fold4(text4).indexOf(words5) : -1;
+      if (!text4 || at2 < 0) {
+        problems.push(text4 ? `${n.item} quotes ${n.because.file}, but "${n.because.quote}" isn't in it` : `${n.item} quotes ${n.because.file}, which isn't one of the change's files`);
         continue;
       }
       if (seen.has(key(n)))
         continue;
       seen.add(key(n));
-      const lines = text2.split("\n");
-      let line = 1;
-      for (let j = 1; j < lines.length; j++)
-        if (fold4(lines.slice(0, j).join("\n")).length < at2)
-          line = j + 1;
-        else
-          break;
+      const line = lineAtFolded(text4, at2);
       fresh.push(needFrom(r, {
         item: n.item,
         for: n.for,
@@ -10693,15 +11444,15 @@ async function mergeStoryRequests(root, change, requests, now) {
 }
 
 // packages/planner/dist/task-knowledge.js
-var import_yaml15 = __toESM(require_dist(), 1);
-import { readdir as readdir12, readFile as readFile16 } from "node:fs/promises";
-import { join as join18 } from "node:path";
+var import_yaml16 = __toESM(require_dist(), 1);
+import { readdir as readdir12, readFile as readFile17 } from "node:fs/promises";
+import { join as join19 } from "node:path";
 
 // packages/planner/dist/knowledge-conflicts.js
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 var pageFile = (page) => /\.(md|markdown)$/i.test(page) ? page : `${page}.md`;
 async function codeFactRecords(root) {
-  return (await readCatalog(join17(catalogDirOf(root), "generated"), { cacheRoot: root }).catch(() => void 0))?.records ?? [];
+  return (await readCatalog(join18(catalogDirOf(root), "generated"), { cacheRoot: root }).catch(() => void 0))?.records ?? [];
 }
 function conflictTouches(v, used) {
   if (v.conflict.about.some((id) => used.has(id)))
@@ -10808,9 +11559,9 @@ function sectionParts(id) {
   const slash = path.indexOf("/");
   return slash < 0 ? { source: "", page: path, heading } : { source: path.slice(0, slash), page: path.slice(slash + 1), heading };
 }
-function listSteps(text2) {
+function listSteps(text4) {
   const out = [];
-  for (const l of text2.split("\n")) {
+  for (const l of text4.split("\n")) {
     const m = /^\s*(?:\d+[.)]|[-*])\s+(.*)$/.exec(l);
     if (m && m[1].trim())
       out.push(m[1].trim());
@@ -10932,8 +11683,8 @@ function disagree(v, id, other) {
   const pages = itemPages(other);
   return v.conflict.pages.some((p) => pages.includes(`${p.source}/${pageFile2(p.page)}`));
 }
-function placesNamed(text2, input) {
-  const t = text2.toLowerCase();
+function placesNamed(text4, input) {
+  const t = text4.toLowerCase();
   const out = [];
   for (const id of [...input.targets ?? [], ...input.ids])
     if (id.length > 3 && t.includes(id.toLowerCase()) && !out.includes(id))
@@ -10978,13 +11729,13 @@ async function placesContext(root, records) {
     }
   }
   const repos = /* @__PURE__ */ new Map();
-  const profiles = join18(orgPackDirOf(root), "profiles");
+  const profiles = join19(orgPackDirOf(root), "profiles");
   for (const d of await readdir12(profiles).catch(() => [])) {
-    const text2 = await readFile16(join18(profiles, d, "repos.manifest.yaml"), "utf8").catch(() => void 0);
-    if (text2 === void 0)
+    const text4 = await readFile17(join19(profiles, d, "repos.manifest.yaml"), "utf8").catch(() => void 0);
+    if (text4 === void 0)
       continue;
     try {
-      for (const r of (0, import_yaml15.parse)(text2)?.repos ?? []) {
+      for (const r of (0, import_yaml16.parse)(text4)?.repos ?? []) {
         const id = str4(r.id);
         if (!id)
           continue;
@@ -11003,7 +11754,7 @@ async function placesContext(root, records) {
   const fw = /* @__PURE__ */ new Map();
   const frameworks = (repo) => {
     if (!fw.has(repo))
-      fw.set(repo, readFile16(join18(factsDirOf(root), `${repo}.jsonl`), "utf8").then((t) => {
+      fw.set(repo, readFile17(join19(factsDirOf(root), `${repo}.jsonl`), "utf8").then((t) => {
         const out = /* @__PURE__ */ new Set();
         for (const l of t.split("\n")) {
           if (!l.includes('"framework"'))
@@ -11173,7 +11924,7 @@ async function selectTaskKnowledge(root, change, inputs, o = {}) {
       const said2 = wordsOf(input.changes);
       const changes = new Map([...said2].filter(([s]) => !context.has(s)));
       const all2 = new Map([...context, ...wordsOf([input.title]), ...said2]);
-      const named = namesOf(input.changes);
+      const named2 = namesOf(input.changes);
       const kept = /* @__PURE__ */ new Map();
       const cands = candidatesOf2(sel);
       const near = o.keep === "words" ? void 0 : await ix.closeness([input.changes.join("; ")], cands.flatMap((c) => nodeKeys(c, items, itemOfPage)));
@@ -11233,7 +11984,7 @@ async function selectTaskKnowledge(root, change, inputs, o = {}) {
         const cos = cosOf(c, item);
         const always = c.named || target || isConfirmed && shared.length > 0;
         const close = cos === void 0 ? false : matched.length === 1 ? cos >= KEEP_ONE_WORD_CLOSE : matched.length === 0 && cos >= KEEP_BY_MEANING;
-        const byWords = cos === void 0 ? matched.length > 0 : matched.length >= KEEP_WORDS || matched.some((w) => named.has(w));
+        const byWords = cos === void 0 ? matched.length > 0 : matched.length >= KEEP_WORDS || matched.some((w) => named2.has(w));
         const terms = (matched.length ? matched : shared).map((w) => all2.get(w) ?? w);
         const words5 = terms.slice(0, 4).map((w) => `"${w}"`);
         const where2 = places2.length ? ` It names ${and2(places2)}, where this task works.` : "";
@@ -11549,11 +12300,11 @@ function groupNearDuplicates(ks) {
 
 // packages/planner/dist/stages/openspec-seed.js
 import { existsSync as existsSync2 } from "node:fs";
-import { readdir as readdir13, readFile as readFile17 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { readdir as readdir13, readFile as readFile18 } from "node:fs/promises";
+import { join as join20 } from "node:path";
 var SEED_MARK = "<!-- Generated by atticus spec seed from the repo's verified flows. Run it again to refresh it; delete this line to keep your edits. A person accepts the seed with atticus spec accept <repo>. -->";
 var MAX_REQUIREMENT2 = 480;
-var slug3 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+var slug4 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 var bare3 = (s) => s.trim().replace(/\s+/g, " ").replace(/[.\s]+$/, "");
 var lowerFirst = (s) => /^[A-Z][a-z]*(\s|$)/.test(s) ? `${s[0].toLowerCase()}${s.slice(1)}` : s;
 var clip2 = (s, n) => {
@@ -11562,7 +12313,7 @@ var clip2 = (s, n) => {
   const cut = s.slice(0, n - 1);
   return `${cut.slice(0, Math.max(cut.lastIndexOf(" "), n / 2)).trimEnd()}\u2026`;
 };
-var seedChangeId = (repo) => `seed-${slug3(repo)}`.slice(0, 80).replace(/-+$/, "");
+var seedChangeId = (repo) => `seed-${slug4(repo)}`.slice(0, 80).replace(/-+$/, "");
 function citeOf2(evidence, repo) {
   const seen = /* @__PURE__ */ new Set();
   for (const e of evidence) {
@@ -11692,8 +12443,8 @@ function renderSeedProposal(repo, deltas, skipped, flows) {
     ""
   ].join("\n");
 }
-function addedFlowsOf(text2) {
-  const sections = text2.replace(/\r\n/g, "\n").split(/^## /m);
+function addedFlowsOf(text4) {
+  const sections = text4.replace(/\r\n/g, "\n").split(/^## /m);
   const added = sections.find((x) => /^ADDED Requirements\b/.test(x));
   if (added === void 0)
     return [];
@@ -11707,12 +12458,12 @@ function addedFlowsOf(text2) {
 }
 async function addedIn(dir) {
   const out = [];
-  const caps = (await readdir13(join19(dir, "specs")).catch(() => [])).sort();
+  const caps = (await readdir13(join20(dir, "specs")).catch(() => [])).sort();
   for (const c of caps) {
-    const text2 = await readFile17(join19(dir, "specs", c, "spec.md"), "utf8").catch(() => void 0);
-    if (text2 === void 0 || !/^## ADDED Requirements\b/m.test(text2))
+    const text4 = await readFile18(join20(dir, "specs", c, "spec.md"), "utf8").catch(() => void 0);
+    if (text4 === void 0 || !/^## ADDED Requirements\b/m.test(text4))
       continue;
-    out.push({ capability: c, flows: addedFlowsOf(text2) });
+    out.push({ capability: c, flows: addedFlowsOf(text4) });
   }
   return out;
 }
@@ -11721,10 +12472,10 @@ async function openSeeds(root) {
   const out = [];
   const ids = (await readdir13(base, { withFileTypes: true }).catch(() => [])).filter((d) => d.isDirectory() && d.name.startsWith("seed-")).map((d) => d.name).sort();
   for (const id of ids) {
-    const dir = join19(base, id);
-    if (!existsSync2(join19(dir, ".openspec.yaml")))
+    const dir = join20(base, id);
+    if (!existsSync2(join20(dir, ".openspec.yaml")))
       continue;
-    const proposal = await readFile17(join19(dir, "proposal.md"), "utf8").catch(() => "");
+    const proposal = await readFile18(join20(dir, "proposal.md"), "utf8").catch(() => "");
     const repo = /^# Proposal: Starting spec for (\S+)\s*$/m.exec(proposal)?.[1] ?? id.slice(5);
     out.push({ change: id, repo, adds: await addedIn(dir) });
   }
@@ -11740,7 +12491,7 @@ async function seedCollisions(root, change) {
   for (const id of ids) {
     if (id.startsWith("seed-"))
       continue;
-    for (const a of await addedIn(join19(base, id)))
+    for (const a of await addedIn(join20(base, id)))
       for (const s of seeds)
         for (const b of s.adds) {
           const flow = a.flows.find((f) => b.flows.includes(f)) ?? (a.capability === b.capability ? a.flows[0] ?? b.flows[0] : void 0);
@@ -11800,11 +12551,11 @@ function storyWords2(stories) {
   }
   return out;
 }
-function trimmed(id, text2, budget, about) {
-  if (estimateTokens(text2) <= budget)
-    return { text: text2 };
-  const lines = text2.split("\n");
-  const parts = citedParts(text2);
+function trimmed(id, text4, budget, about) {
+  if (estimateTokens(text4) <= budget)
+    return { text: text4 };
+  const lines = text4.split("\n");
+  const parts = citedParts(text4);
   const isPart = new Set(parts.map((p) => p.readLine));
   const score = (t) => words4(t).filter((w) => about.has(w)).length;
   const keep = new Set(lines.map((_, i) => i + 1).filter((n) => !isPart.has(n)));
@@ -12038,14 +12789,14 @@ function noteConflictLines(conflicts) {
 var fromLine = (c) => c.from && c.quote ? [`  From ${c.from}, quoting: "${c.quote}"`] : [];
 
 // packages/planner/dist/task-context.js
-var import_yaml16 = __toESM(require_dist(), 1);
-import { readFile as readFile18 } from "node:fs/promises";
-import { join as join20 } from "node:path";
+var import_yaml17 = __toESM(require_dist(), 1);
+import { readFile as readFile19 } from "node:fs/promises";
+import { join as join21 } from "node:path";
 var TASK_LINE = /^\s*[-*]\s+\[([ xX]?)\]\s+(\S+)\s+(.*)$/;
-function readTasks2(text2) {
+function readTasks2(text4) {
   const out = [];
   let repo = "";
-  for (const l of text2.replace(/\r\n/g, "\n").split("\n")) {
+  for (const l of text4.replace(/\r\n/g, "\n").split("\n")) {
     const h = /^##\s+(.+?)\s*$/.exec(l);
     if (h) {
       repo = h[1].replace(/[`*]/g, "").trim().split(/\s+/)[0].toLowerCase();
@@ -12065,8 +12816,8 @@ function readTasks2(text2) {
   }
   return out;
 }
-function readStoryFile(text2) {
-  const lines = text2.replace(/\r\n/g, "\n").split("\n");
+function readStoryFile(text4) {
+  const lines = text4.replace(/\r\n/g, "\n").split("\n");
   const title = lines.find((l) => /^#\s/.test(l))?.replace(/^#\s+/, "") ?? "";
   const start = lines.findIndex((l) => /^#\s/.test(l)) + 1;
   const end = lines.findIndex((l, i) => i >= start && /^##\s/.test(l));
@@ -12085,19 +12836,19 @@ function readStoryFile(text2) {
 }
 var cite2 = (repo, e) => e.filter((x) => x.path).map((x) => `${repo}:${x.path}${x.line ? `:${x.line}` : ""}`);
 async function worktreeOf(dir, repo) {
-  const t = await readFile18(join20(dir, "repos.yaml"), "utf8").catch(() => void 0);
+  const t = await readFile19(join21(dir, "repos.yaml"), "utf8").catch(() => void 0);
   if (!t)
     return void 0;
   try {
-    const d = (0, import_yaml16.parse)(t);
+    const d = (0, import_yaml17.parse)(t);
     return d.repos?.find((r) => r.id === repo)?.worktree;
   } catch {
     return void 0;
   }
 }
-function migrationPath(named, table, estate) {
-  if (named.includes("/"))
-    return named;
+function migrationPath(named2, table, estate) {
+  if (named2.includes("/"))
+    return named2;
   const store = estate.byId.get(table)?.dataStore;
   const files = estate.records.filter((r) => r.kind === "Migration" && r.dataStore === store && r.file).map((r) => r.file);
   const nested = files.length > 0 && files.every((f) => f.split("/").length > 2 && f.endsWith("/migration.sql"));
@@ -12105,8 +12856,8 @@ function migrationPath(named, table, estate) {
     ...new Set(files.map((f) => f.split("/").slice(0, nested ? -2 : -1).join("/")))
   ];
   if (!(folders.length === 1 && folders[0]))
-    return named;
-  return nested && !/\.sql$/i.test(named) ? `${folders[0]}/${named}/migration.sql` : `${folders[0]}/${named}`;
+    return named2;
+  return nested && !/\.sql$/i.test(named2) ? `${folders[0]}/${named2}/migration.sql` : `${folders[0]}/${named2}`;
 }
 async function taskContext(root, changeId, taskId, o = {}) {
   const change = await changeStore(root).read(changeId).catch((e) => {
@@ -12115,18 +12866,18 @@ async function taskContext(root, changeId, taskId, o = {}) {
   const dir = changeFolder(root, change.id);
   const rel = `${changesRelOf(root)}/${change.id}`;
   const notes = [];
-  const tasks = readTasks2(await readFile18(join20(dir, "tasks.md"), "utf8").catch(() => ""));
+  const tasks = readTasks2(await readFile19(join21(dir, "tasks.md"), "utf8").catch(() => ""));
   const ctx = await loadChangeContext(root);
   const estate = await loadEstate(root, ctx.records);
   const deltas = (await readDeltas(dir)).deltas.filter((d) => !isEmptyDelta(d));
   const stories = deltas.length ? storiesFromDeltas(deltas, estate) : [];
   const asked = taskId.toLowerCase();
-  const named = tasks.some((t) => t.id === asked) ? void 0 : findTask(stories, asked);
-  const line = tasks.find((t) => t.id === (named ? taskLabel(named.s, named.t) : asked) && (!named || !t.story || t.story === named.s.id));
+  const named2 = tasks.some((t) => t.id === asked) ? void 0 : findTask(stories, asked);
+  const line = tasks.find((t) => t.id === (named2 ? taskLabel(named2.s, named2.t) : asked) && (!named2 || !t.story || t.story === named2.s.id));
   if (!line)
     throw new PlannerError("not-found", tasks.length ? `There is no task ${taskId} in ${change.id}'s tasks.md. Tasks: ${tasks.map((t) => t.id).join(", ")}.` : `${change.id} has no tasks yet: plan its stories first (atticus next says how).`);
   const id = line.id;
-  const found0 = named ?? findTask(stories, id, line.story);
+  const found0 = named2 ?? findTask(stories, id, line.story);
   const dt = found0?.t;
   const ds = found0?.s;
   const key3 = dt?.id ?? id;
@@ -12137,7 +12888,7 @@ async function taskContext(root, changeId, taskId, o = {}) {
   if (!dt)
     notes.push(`Task ${id} isn't one the target flows give, so it has no step or cited code here; read its story.`);
   const storyId = line.story ?? dt?.story;
-  const storyText = storyId ? await readFile18(join20(dir, "stories", `${storyId}.md`), "utf8").catch(() => void 0) : void 0;
+  const storyText = storyId ? await readFile19(join21(dir, "stories", `${storyId}.md`), "utf8").catch(() => void 0) : void 0;
   const sf = storyText ? readStoryFile(storyText) : void 0;
   const answer = await readStoriesAnswer(dir);
   const found = answer?.stories.find((s) => s.id === storyId) ?? answer?.stories.find((s) => s.tasks.some((t) => t.id === key3));
@@ -12264,7 +13015,7 @@ async function taskContext(root, changeId, taskId, o = {}) {
     name: s.input.name,
     kind: s.input.kind
   }));
-  const worktree = await worktreeOf(dir, line.repo);
+  const worktree = o.at?.worktree ?? await worktreeOf(dir, line.repo);
   if (!worktree)
     notes.push(`${line.repo} has no worktree for ${change.id} yet: open one with atticus workspace open ${change.id} --repos ${line.repo}.`);
   const apply = await metarepoOpenSpec(root)?.applyInstructions(change.id).catch(() => void 0);
@@ -12279,7 +13030,7 @@ async function taskContext(root, changeId, taskId, o = {}) {
       repo: line.repo,
       done: line.done,
       ...storyId ? { story: storyId } : {},
-      branch: taskBranch(change.id, id),
+      branch: o.at?.branch ?? taskBranch(change.id, id),
       ...worktree ? { worktree } : {}
     },
     ...storyId && sf ? {
@@ -12337,7 +13088,7 @@ async function taskContext(root, changeId, taskId, o = {}) {
     inputs,
     files,
     uses,
-    prompt: dt && ds ? taskPrompt(change.id, ds, dt, own?.length ? ownCriteria : criteria.map((text2) => ({ text: text2, checks: [], outcome: "success" }))) : [
+    prompt: dt && ds ? taskPrompt(change.id, ds, dt, own?.length ? ownCriteria : criteria.map((text4) => ({ text: text4, checks: [], outcome: "success" }))) : [
       `Implement task ${id} of the change ${change.id} in the repo ${line.repo}: ${line.title}.`,
       "Acceptance criteria:",
       ...criteria.map((c) => `- ${c}`),
@@ -12907,7 +13658,7 @@ function taskFiles(d, s, old, entry, evidence, e) {
     });
   }
   const takes = kind === "entry" || kind === "validate";
-  const listed = (k) => (s.fields?.[k] ?? []).some((f) => changed.has(foldField(f.split(".").at(-1))));
+  const listed2 = (k) => (s.fields?.[k] ?? []).some((f) => changed.has(foldField(f.split(".").at(-1))));
   const hasCall = owners.some((o) => o.call);
   const today = e.flowById.get(d.flow)?.flow;
   const flowFiles = /* @__PURE__ */ new Set([
@@ -12926,7 +13677,7 @@ function taskFiles(d, s, old, entry, evidence, e) {
       const has = new Set(fields2.map((f) => foldField(f.name)));
       const fresh = [...changed].filter((f) => !has.has(f));
       const held = fields2.filter((f) => required.has(foldField(f.name)) && f.required !== true).map((f) => f.name).filter((x, i, xs) => xs.indexOf(x) === i);
-      const own = o.call ? (side2 === "request" || side2 === "message") && listed("sends") || side2 === "response" && listed("returns") : !hasCall && !calls && (takes && side2 !== "response" || kind === "respond" && (side2 === "response" || side2 === "screen"));
+      const own = o.call ? (side2 === "request" || side2 === "message") && listed2("sends") || side2 === "response" && listed2("returns") : !hasCall && !calls && (takes && side2 !== "response" || kind === "respond" && (side2 === "response" || side2 === "screen"));
       if (!held.length && !(own && fresh.length))
         continue;
       const whose = o.label.endsWith("s") ? `${o.label}'` : `${o.label}'s`;
@@ -13252,7 +14003,7 @@ var CriterionObject = external_exports.strictObject({
   quote: Words.optional()
 });
 var StoryCriterion = external_exports.union([
-  Words.transform((text2) => CriterionObject.parse({ text: text2 })),
+  Words.transform((text4) => CriterionObject.parse({ text: text4 })),
   CriterionObject
 ]);
 var NEEDS_ERROR_CASE = ["validate", "write", "call-out", "publish"];
@@ -13500,11 +14251,11 @@ function knownFieldNames(e, deltas) {
     }
   return new Set(names.map(foldName).filter(Boolean));
 }
-function fieldLikeNames(text2) {
+function fieldLikeNames(text4) {
   const out = /* @__PURE__ */ new Set();
-  for (const m of text2.matchAll(/(?<![\w.$/{-])[a-z][a-z0-9]*(?:_[a-z0-9]+)+(?![\w(-])/g))
+  for (const m of text4.matchAll(/(?<![\w.$/{-])[a-z][a-z0-9]*(?:_[a-z0-9]+)+(?![\w(-])/g))
     out.add(m[0]);
-  for (const m of text2.matchAll(/(?<![\w.$/{-])[a-z]+[A-Z][A-Za-z0-9]*(?![\w(-])/g))
+  for (const m of text4.matchAll(/(?<![\w.$/{-])[a-z]+[A-Z][A-Za-z0-9]*(?![\w(-])/g))
     out.add(m[0]);
   return [...out];
 }
@@ -13549,7 +14300,7 @@ function checkSections(answer, stories, deltas, o = {}) {
     if (!w)
       continue;
     const fields2 = new Set(s.tasks.flatMap((t) => t.fields.map(foldName)));
-    const named = [...new Set(s.tasks.flatMap((t) => t.fields))];
+    const named2 = [...new Set(s.tasks.flatMap((t) => t.fields))];
     const criteria = s.tasks.flatMap((t) => (w.tasks.find((x) => x.id === t.id)?.criteria ?? []).map((c) => ({
       t,
       c,
@@ -13576,11 +14327,11 @@ function checkSections(answer, stories, deltas, o = {}) {
       ...stepTasks(s).flatMap((t) => t.to?.new && t.op !== "remove" ? [t.to.entry] : [])
     ];
     if (w.interfaces !== void 0) {
-      const listed = Array.isArray(w.interfaces) ? w.interfaces : [];
+      const listed2 = Array.isArray(w.interfaces) ? w.interfaces : [];
       for (const x of [...new Set(added)])
-        if (!listed.some((i) => endpointKey(i.entry) === endpointKey(x)))
+        if (!listed2.some((i) => endpointKey(i.entry) === endpointKey(x)))
           push("stories.interface-missing", `${s.id}:${x}`, `Story ${s.id}: the target flow adds ${x}, but ${Array.isArray(w.interfaces) ? "the interface changes don't list it" : `the interface changes say none ("${w.interfaces.none}")`}: list it with its fields (side, type, required, default), whether it is breaking, and its consumers.`, true, s.repo);
-      for (const i of listed) {
+      for (const i of listed2) {
         if (!entries.has(endpointKey(i.entry)))
           push("stories.unknown-entry", `${s.id}:${i.entry}`, `Story ${s.id}: the interface change names ${i.entry}, which neither the target flows nor the catalog have. Name an entry of the flow, or add it in the target flows (atticus change architecture).`, true, s.repo);
         if (e)
@@ -13591,7 +14342,7 @@ function checkSections(answer, stories, deltas, o = {}) {
           const target = `${s.id}:${i.entry}:${f.name}`;
           const isNew = f.change !== "removed";
           if (!(isNew ? fields2 : known).has(foldName(f.name)))
-            push("stories.invented-field", target, isNew ? `Story ${s.id}: ${i.entry} lists ${f.name} as ${f.change}, but no step of the target flow carries it (the story's fields: ${named.join(", ") || "none"}). Name the field as the target flow does, or add it to the step in the target flows (atticus change architecture).` : `Story ${s.id}: ${i.entry} lists ${f.name} as removed, but neither the target flows nor the catalog know a field of that name.`, true, s.repo);
+            push("stories.invented-field", target, isNew ? `Story ${s.id}: ${i.entry} lists ${f.name} as ${f.change}, but no step of the target flow carries it (the story's fields: ${named2.join(", ") || "none"}). Name the field as the target flow does, or add it to the step in the target flows (atticus change architecture).` : `Story ${s.id}: ${i.entry} lists ${f.name} as removed, but neither the target flows nor the catalog know a field of that name.`, true, s.repo);
           if (!inbound || !isNew || f.side === "response" || !fields2.has(foldName(f.name)))
             continue;
           if (!f.validation)
@@ -13820,11 +14571,11 @@ var oldForm = (question2) => /^Does the criterion ".*" of task \S+ check \S+\? A
 async function settleCoversAnswers(root, change, dir, j) {
   const notes = [];
   const decided = /* @__PURE__ */ new Map();
-  const file = join21(dir, "stage", "stories.yaml");
-  const text2 = await readFile19(file, "utf8").catch(() => void 0);
-  if (text2 === void 0)
+  const file = join22(dir, "stage", "stories.yaml");
+  const text4 = await readFile20(file, "utf8").catch(() => void 0);
+  if (text4 === void 0)
     return { notes, decided };
-  const parsed = StageLoop.safeParse((0, import_yaml17.parse)(text2));
+  const parsed = StageLoop.safeParse((0, import_yaml18.parse)(text4));
   if (!parsed.success)
     return { notes, decided };
   const loop = parsed.data;
@@ -13880,7 +14631,7 @@ async function settleCoversAnswers(root, change, dir, j) {
           });
     });
   }
-  for (const { c, q: q2, v } of verdicts)
+  for (const { c, q: q2, v } of verdicts.filter((x) => !isAiBy(x.q.answer.by)))
     for (const field of c.fields)
       await personVerdict(j.store, coversInputs(field, c.criterion), {
         verdict: v,
@@ -13959,7 +14710,7 @@ ${s.c.criterion}`;
       loop.questions = loop.questions.filter((id) => !retiredIds.has(id));
       loop.findings.sort((a, b) => a.fingerprint.localeCompare(b.fingerprint));
       await writeFileAtomic(file, `# The stories stage's loop (ADR 0087): drafts, the findings each one had, and the questions it raised. Atticus writes this file.
-${(0, import_yaml17.stringify)(StageLoop.parse(loop), { lineWidth: 0 })}`);
+${(0, import_yaml18.stringify)(StageLoop.parse(loop), { lineWidth: 0 })}`);
     }
   }
   return { notes, decided };
@@ -14354,9 +15105,17 @@ function renderStoryFile(change, s, words5, unjudged = [], x = {}) {
     ...waits.length ? [`A person has raised ${andList2(waits.map((r) => `${r.id} ${r.title}`))} (requests.md)`] : []
   ].map((d) => `- ${sentence5(d)}`), "");
   lines.push("## Traces to", "", `target-flows/${s.flow}.yaml (${s.change} flow ${s.flow}: ${s.name})${x.capability ? `; specs/${x.capability}/spec.md` : ""}`, "");
-  lines.push("## Systems and repos", "", s.repo, "", command ? `Build and test with \`${command}\`.` : `repos.manifest.yaml names no build command for ${s.repo}: use the repo's own build and tests.`, "");
+  lines.push("## Systems and repos", "", s.repo, "", buildLine(s.repo, command), "");
   return lines.join("\n");
 }
+function buildLine(repo, command) {
+  return command ? `Build and test with \`${command}\`.` : `repos.manifest.yaml names no build command for ${repo}: use the repo's own build and tests.`;
+}
+function withBuildLine(story, repo, command) {
+  const esc = repo.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const line = new RegExp(`^(?:Build and test with \`.*\`\\.|repos\\.manifest\\.yaml names no build command for ${esc}: use the repo's own build and tests\\.)$`, "gm");
+  return story.replace(line, () => buildLine(repo, command));
+}
 function renderIndex2(stories, a) {
   return [
     `${GENERATED_MARK} stories from the target flows. -->`,
@@ -14377,9 +15136,9 @@ function renderIndex2(stories, a) {
     ""
   ].join("\n");
 }
-function tickedTasks(text2) {
+function tickedTasks(text4) {
   const out = /* @__PURE__ */ new Set();
-  for (const m of text2.matchAll(/^\s*[-*]\s+\[[xX]\]\s+(.+?)\s*$/gm))
+  for (const m of text4.matchAll(/^\s*[-*]\s+\[[xX]\]\s+(.+?)\s*$/gm))
     out.add(m[1]);
   return out;
 }
@@ -14437,11 +15196,11 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
   const a = foldAnswer(answer, stories);
   const dir = changeFolder(root, change);
   const keep = new Set(stories.map((s) => `${s.id}.md`));
-  for (const f of await readdir14(join21(dir, "stories")).catch(() => [])) {
+  for (const f of await readdir14(join22(dir, "stories")).catch(() => [])) {
     if (keep.has(f) || !f.endsWith(".md"))
       continue;
-    if ((await readFile19(join21(dir, "stories", f), "utf8")).startsWith(GENERATED_MARK))
-      await rm6(join21(dir, "stories", f));
+    if ((await readFile20(join22(dir, "stories", f), "utf8")).startsWith(GENERATED_MARK))
+      await rm6(join22(dir, "stories", f));
   }
   const { byTask: knowledge } = await storiesKnowledge(root, change, stories, {
     ...extras.estate ? { estate: extras.estate } : {},
@@ -14449,9 +15208,9 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
     ...extras.asker ? { asker: extras.asker } : {},
     ...extras.knowledge ? { selected: extras.knowledge } : {}
   });
-  for (const p of await readdir14(join21(dir, "tasks")).catch(() => []))
-    if (p.endsWith(".prompt.md") && (await readFile19(join21(dir, "tasks", p), "utf8")).startsWith(GENERATED_MARK))
-      await rm6(join21(dir, "tasks", p));
+  for (const p of await readdir14(join22(dir, "tasks")).catch(() => []))
+    if (p.endsWith(".prompt.md") && (await readFile20(join22(dir, "tasks", p), "utf8")).startsWith(GENERATED_MARK))
+      await rm6(join22(dir, "tasks", p));
   const spec = await openspecFiles(root, change, stories, a, extras.estate);
   const files = [];
   for (const s of stories) {
@@ -14470,24 +15229,24 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
       knowledge,
       ...spec.capabilityOf.get(s.flow) ? { capability: spec.capabilityOf.get(s.flow) } : {}
     };
-    await writeFileAtomic(join21(dir, "stories", `${s.id}.md`), renderStoryFile(change, s, w, unjudged, x));
+    await writeFileAtomic(join22(dir, "stories", `${s.id}.md`), renderStoryFile(change, s, w, unjudged, x));
     files.push(`stories/${s.id}.md`);
-    for (const [rel, text2] of Object.entries(taskPromptFiles(change, s, w, x))) {
-      await mkdir7(join21(dir, ...rel.split("/").slice(0, -1)), { recursive: true });
-      await writeFileAtomic(join21(dir, ...rel.split("/")), text2);
+    for (const [rel, text4] of Object.entries(taskPromptFiles(change, s, w, x))) {
+      await mkdir7(join22(dir, ...rel.split("/").slice(0, -1)), { recursive: true });
+      await writeFileAtomic(join22(dir, ...rel.split("/")), text4);
       files.push(rel);
     }
   }
-  await writeFileAtomic(join21(dir, "stories.md"), renderIndex2(stories, a));
-  const ticked = tickedTasks(await readFile19(join21(dir, "tasks.md"), "utf8").catch(() => ""));
-  await writeFileAtomic(join21(dir, "tasks.md"), renderTasks2(stories, requests, ticked));
+  await writeFileAtomic(join22(dir, "stories.md"), renderIndex2(stories, a));
+  const ticked = tickedTasks(await readFile20(join22(dir, "tasks.md"), "utf8").catch(() => ""));
+  await writeFileAtomic(join22(dir, "tasks.md"), renderTasks2(stories, requests, ticked));
   files.push(...await writeSpecFiles(dir, spec.files));
   if (spec.proposal && await writeProposal(dir, spec.proposal))
     files.push("proposal.md");
-  await writeFileAtomic(join21(dir, "requests.md"), renderRequests(requests));
+  await writeFileAtomic(join22(dir, "requests.md"), renderRequests(requests));
   await mergeStoryRequests(root, change, requests, now);
-  await writeFileAtomic(join21(dir, ...ANSWER_FILE.split("/")), `# The story writer's last answer (ADR 0087).
-${(0, import_yaml17.stringify)(a, { lineWidth: 0 })}`);
+  await writeFileAtomic(join22(dir, ...ANSWER_FILE.split("/")), `# The story writer's last answer (ADR 0087).
+${(0, import_yaml18.stringify)(a, { lineWidth: 0 })}`);
   return [...files, "stories.md", "tasks.md", "requests.md", "needs.yaml", "needs.md"];
 }
 async function selectStoriesKnowledge(root, change, stories, estate) {
@@ -14535,16 +15294,16 @@ async function storiesKnowledge(root, change, stories, o) {
   return r;
 }
 async function readStoriesAnswer(dir) {
-  const t = await readFile19(join21(dir, ...ANSWER_FILE.split("/")), "utf8").catch(() => void 0);
+  const t = await readFile20(join22(dir, ...ANSWER_FILE.split("/")), "utf8").catch(() => void 0);
   if (t === void 0)
     return void 0;
   return parseYamlAs(t, Answer4, (d) => d, "stories").value;
 }
 async function locateInStories(dir, rel, words5) {
-  for (const f of (await readdir14(join21(dir, "stories")).catch(() => [])).sort()) {
+  for (const f of (await readdir14(join22(dir, "stories")).catch(() => [])).sort()) {
     if (!f.endsWith(".md"))
       continue;
-    const lines = (await readFile19(join21(dir, "stories", f), "utf8")).split(/\r?\n/);
+    const lines = (await readFile20(join22(dir, "stories", f), "utf8")).split(/\r?\n/);
     const n = lines.findIndex((l) => l.includes(words5));
     if (n >= 0)
       return `${rel}/stories/${f}:${n + 1}`;
@@ -14644,7 +15403,7 @@ async function storiesStage(root, changeId, o) {
   if (!o.force) {
     const own = [];
     for (const f of ["stories.md", "tasks.md", "requests.md"]) {
-      const t = await readFile19(join21(dir, f), "utf8").catch(() => void 0);
+      const t = await readFile20(join22(dir, f), "utf8").catch(() => void 0);
       if (t !== void 0 && !t.startsWith(GENERATED_MARK))
         own.push(f);
     }
@@ -14690,7 +15449,7 @@ async function storiesStage(root, changeId, o) {
       id: "deltas",
       kind: "artifact",
       origin: `${rel}/target-flows/`,
-      text: (0, import_yaml17.stringify)(deltas, { lineWidth: 0 }),
+      text: (0, import_yaml18.stringify)(deltas, { lineWidth: 0 }),
       classification: "internal",
       priority: 90
     },
@@ -14814,11 +15573,11 @@ Rules:
     classification: "internal",
     priority: 80
   };
-  const brief = await readFile19(join21(dir, "brief.md"), "utf8").catch(() => "");
-  const design = await readFile19(join21(dir, "design.md"), "utf8").catch(() => "");
+  const brief = await readFile20(join22(dir, "brief.md"), "utf8").catch(() => "");
+  const design = await readFile20(join22(dir, "design.md"), "utf8").catch(() => "");
   const scope = scopeRepos(estate, deltas.map((d) => d.repo));
   const selected = await estateContext(root, "stories", {
-    text: [brief, skeletonText, (0, import_yaml17.stringify)(deltas, { lineWidth: 0 }), design].filter((x) => x.trim()).join("\n\n"),
+    text: [brief, skeletonText, (0, import_yaml18.stringify)(deltas, { lineWidth: 0 }), design].filter((x) => x.trim()).join("\n\n"),
     title: change.title,
     ids: [...new Set(deltas.map((d) => d.flow))]
   }, {
@@ -14895,8 +15654,8 @@ Rules:
     instructions: instructions3,
     ...context.gaps?.length ? { gaps: context.gaps } : {},
     sources,
-    parse: (text2) => {
-      const r = parseYamlAs(text2, Answer4, (d) => d, "stories");
+    parse: (text4) => {
+      const r = parseYamlAs(text4, Answer4, (d) => d, "stories");
       const value = r.value && noted ? notesCitedInFolder(r.value, rel) : r.value;
       return { ...value ? { answer: foldAnswer(value, stories) } : {}, issues: r.issues };
     },
@@ -14952,33 +15711,33 @@ Rules:
 }
 
 // packages/planner/dist/stages/small.js
-var import_yaml18 = __toESM(require_dist(), 1);
-import { readFile as readFile20 } from "node:fs/promises";
-import { join as join22 } from "node:path";
+var import_yaml19 = __toESM(require_dist(), 1);
+import { readFile as readFile21 } from "node:fs/promises";
+import { join as join23 } from "node:path";
 var SMALL_AGENT = "small-change-planner";
 var SMALL_ANSWER_FILE = "stage/small-answer.yaml";
 var MARK2 = "<!-- Generated by atticus change small";
-var text = () => external_exports.string().trim().min(1);
-var Id = external_exports.string().regex(/^[a-z0-9][a-z0-9._-]*$/, "an id is lower case: letters, digits, . _ -");
+var text2 = () => external_exports.string().trim().min(1);
+var Id2 = external_exports.string().regex(/^[a-z0-9][a-z0-9._-]*$/, "an id is lower case: letters, digits, . _ -");
 var SmallAnswer = external_exports.strictObject({
-  summary: text(),
-  features: external_exports.array(external_exports.strictObject({ id: Id, why: text() })).default([]),
+  summary: text2(),
+  features: external_exports.array(external_exports.strictObject({ id: Id2, why: text2() })).default([]),
   flows: external_exports.array(external_exports.strictObject({
-    id: Id,
-    why: text(),
+    id: Id2,
+    why: text2(),
     how: external_exports.enum(["changed", "read"]).default("changed")
   })).default([]),
-  newFlows: external_exports.array(external_exports.strictObject({ name: text(), repo: Id, why: text() })).default([]),
-  gaps: external_exports.array(external_exports.strictObject({ what: text(), why: text(), from: external_exports.string().optional() })).default([]),
+  newFlows: external_exports.array(external_exports.strictObject({ name: text2(), repo: Id2, why: text2() })).default([]),
+  gaps: external_exports.array(external_exports.strictObject({ what: text2(), why: text2(), from: external_exports.string().optional() })).default([]),
   targetFlows: external_exports.array(FlowDelta).default([]),
   reads: external_exports.array(ReadFlow).default([]),
   stories: external_exports.array(external_exports.strictObject({
     /** The target flow the story is for. */
-    flow: Id,
-    title: text(),
-    asA: text(),
-    iWant: text(),
-    soThat: text(),
+    flow: Id2,
+    title: text2(),
+    asA: text2(),
+    iWant: text2(),
+    soThat: text2(),
     tasks: external_exports.array(external_exports.strictObject({
       /** The step's item number in the flow's target steps, from 1. */
       step: external_exports.number().int().positive(),
@@ -15123,7 +15882,7 @@ async function smallStage(root, changeId, o) {
     throw new PlannerError("refused", `${size.words} Run atticus change feature ${change.id} (or /atticus-feature ${change.id}).`);
   const dir = changeFolder(root, change.id);
   const rel = `${changesRelOf(root)}/${change.id}`;
-  const brief = await readFile20(join22(dir, "brief.md"), "utf8").catch(() => "");
+  const brief = await readFile21(join23(dir, "brief.md"), "utf8").catch(() => "");
   if (!isFilled(brief))
     throw new PlannerError("refused", `${change.id} has no brief yet: write brief.md (what changes, where, and when it is done), then run atticus change small ${change.id} again.`);
   const estate = await loadEstate(root, ctx.records);
@@ -15327,20 +16086,20 @@ ${storeRules(classificationLevels(ctx)).join("\n")}
           }
         )
       ];
-      const own = await readFile20(join22(dir, "proposal.md"), "utf8").catch(() => void 0);
+      const own = await readFile21(join23(dir, "proposal.md"), "utf8").catch(() => void 0);
       if (own === void 0 || !isFilled(own) || own.startsWith(MARK2)) {
-        await writeFileAtomic(join22(dir, "proposal.md"), renderProposal2(change.title, a, d2.deltas));
+        await writeFileAtomic(join23(dir, "proposal.md"), renderProposal2(change.title, a, d2.deltas));
         files.push("proposal.md");
       }
-      await writeFileAtomic(join22(dir, ...SMALL_ANSWER_FILE.split("/")), `# The fast path's last answer (ADR 0113). Atticus writes this file.
-${(0, import_yaml18.stringify)(a, { lineWidth: 0 })}`);
+      await writeFileAtomic(join23(dir, ...SMALL_ANSWER_FILE.split("/")), `# The fast path's last answer (ADR 0113). Atticus writes this file.
+${(0, import_yaml19.stringify)(a, { lineWidth: 0 })}`);
       return files;
     },
     current: async () => {
-      const t = await readFile20(join22(dir, ...SMALL_ANSWER_FILE.split("/")), "utf8").catch(() => void 0);
+      const t = await readFile21(join23(dir, ...SMALL_ANSWER_FILE.split("/")), "utf8").catch(() => void 0);
       if (t === void 0)
         return void 0;
-      const r = SmallAnswer.safeParse((0, import_yaml18.parse)(t));
+      const r = SmallAnswer.safeParse((0, import_yaml19.parse)(t));
       return r.success ? r.data : void 0;
     },
     questions: (a) => a.questions
@@ -15359,10 +16118,10 @@ function stageOfOutput(output) {
   const m = /^(feature|architecture|stories|small)-answer\.yaml$/.exec(output);
   return m ? m[1] : void 0;
 }
-async function checkStageDraft(root, change, stage, text2) {
+async function checkStageDraft(root, change, stage, text4) {
   const o = {
     runtime: new HandoffRuntime({ root, validate: async () => [] }),
-    checkDraft: text2,
+    checkDraft: text4,
     context: { engine: false }
   };
   const r = stage === "feature" ? await featureStage(root, change, o) : stage === "architecture" ? await architectureStage(root, change, o) : stage === "stories" ? await storiesStage(root, change, o) : await smallStage(root, change, o);
@@ -15400,13 +16159,13 @@ function draftCheckBox(root, request) {
     async call(name, input) {
       if (name !== CHECK_DRAFT_TOOL)
         throw new ToolError(`There is no tool ${name}.`);
-      const text2 = typeof input.draft === "string" ? input.draft : "";
-      if (!text2.trim())
+      const text4 = typeof input.draft === "string" ? input.draft : "";
+      if (!text4.trim())
         throw new ToolError("Give your whole answer under draft.");
       if (used >= limit)
         return `You have used the ${limit} checks a draft may have: hand your answer in as it is.`;
       used++;
-      return formatDraftProblems(await checkStageDraft(root, request.change, stage, text2));
+      return formatDraftProblems(await checkStageDraft(root, request.change, stage, text4));
     }
   };
 }
@@ -15423,12 +16182,12 @@ function withTools(a, b) {
 }
 
 // packages/planner/dist/stages/comments.js
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 var COMMENT_COMMAND = "atticus ui: a comment on a critic finding";
 var isComment = (q2, stage) => q2.askedBy.step === `change-${stage}` && q2.askedBy.command === COMMENT_COMMAND;
 var aboutOf = (q2) => q2.evidence[0].replace(/:\d+$/, "");
 async function stageComments(root, change, stage) {
-  const dir = join23(changesDirOf(root), change);
+  const dir = join24(changesDirOf(root), change);
   const { loop, present } = await readStageLoop(dir, change, stage);
   const comments = [];
   const others = [];
@@ -15440,7 +16199,7 @@ async function stageComments(root, change, stage) {
       comments.push({
         question: q2.id,
         text: q2.answer.text,
-        by: q2.answer.by,
+        by: answerByWords(q2.answer.by),
         at: q2.answer.at,
         read: loop.read.includes(q2.id),
         about: aboutOf(q2)
@@ -15452,10 +16211,10 @@ async function stageComments(root, change, stage) {
   return { comments, others, present };
 }
 async function commentOnFinding(root, o) {
-  const text2 = o.text.trim();
-  if (!text2)
+  const text4 = o.text.trim();
+  if (!text4)
     throw new PlannerError("invalid", "Write the comment first.");
-  const dir = join23(changesDirOf(root), o.change);
+  const dir = join24(changesDirOf(root), o.change);
   const { loop, present, file } = await readStageLoop(dir, o.change, o.stage);
   if (!present)
     throw new PlannerError("refused", `The ${o.stage} stage of ${o.change} hasn't run yet, so nothing would read a comment: run ${rerunOf(o.stage, o.change)} first.`);
@@ -15476,7 +16235,7 @@ async function commentOnFinding(root, o) {
     scope: { level: "repo", id: o.change },
     state: "answered",
     rerun: rerunOf(o.stage, o.change),
-    answer: { text: text2, by: o.by, at: o.at, scope: { level: "repo", id: o.change } }
+    answer: { text: text4, by: o.by, at: o.at, scope: { level: "repo", id: o.change } }
   });
   await writeQuestion(root, q2);
   loop.questions = [.../* @__PURE__ */ new Set([...loop.questions, q2.id])].sort();
@@ -15517,7 +16276,7 @@ function callersOfComponent(e, x, entries) {
     out.set(id, l);
     return l;
   };
-  const repoOf = (c) => str5(e.byId.get(c)?.repo);
+  const repoOf2 = (c) => str5(e.byId.get(c)?.repo);
   const componentOfEndpoint = (id) => str5(e.byId.get(id)?.component);
   for (const r of e.records) {
     if (r.kind !== "Interface" || typeof r.from !== "string" || r.from === x)
@@ -15532,7 +16291,7 @@ function callersOfComponent(e, x, entries) {
     if (typeof r.route === "string")
       l.routes.add(r.route);
     for (const ev2 of r.evidence)
-      if (ev2.side === "caller" || !ev2.side && ev2.repo === repoOf(r.from)) {
+      if (ev2.side === "caller" || !ev2.side && ev2.repo === repoOf2(r.from)) {
         const w = at(ev2);
         if (w)
           l.at.add(w);
@@ -15553,15 +16312,15 @@ function callersOfComponent(e, x, entries) {
     for (const s of f.flow.steps) {
       if (s.kind !== "call-out" && s.kind !== "publish")
         continue;
-      const named = [...s.refs, ...s.to?.entry ? [s.to.entry] : []].filter((id) => componentOfEndpoint(id) === x && (!entries || entries.has(id)));
-      const hit = named.length > 0 || !entries && s.to?.component === x;
+      const named2 = [...s.refs, ...s.to?.entry ? [s.to.entry] : []].filter((id) => componentOfEndpoint(id) === x && (!entries || entries.has(id)));
+      const hit = named2.length > 0 || !entries && s.to?.component === x;
       if (!hit)
         continue;
       const l = got(f.flow.component);
       l.flows.add(f.flow.id);
-      for (const n of named)
+      for (const n of named2)
         l.entries.add(n);
-      if (!named.length && s.to?.entry)
+      if (!named2.length && s.to?.entry)
         l.entries.add(s.to.entry);
     }
   }
@@ -15576,7 +16335,7 @@ function entriesLeadingTo(e, flows) {
 }
 function changeImpact(change, deltas, e, o) {
   const ownerOf = (repo, who) => repo ? ownerOfQuestion({ repo }, { owners: o.owners, teams: o.teams }) : { none: `the catalog names no repo for ${who}, so no team owns it` };
-  const repoOf = (component) => str5(e.byId.get(component)?.repo);
+  const repoOf2 = (component) => str5(e.byId.get(component)?.repo);
   const items = breakingChanges(deltas, e).map((c) => {
     const own = e.flowById.get(c.flow)?.flow.component;
     const callers2 = /* @__PURE__ */ new Map();
@@ -15608,7 +16367,7 @@ function changeImpact(change, deltas, e, o) {
         if (typeof r.route === "string")
           got.routes.add(r.route);
         for (const ev2 of r.evidence)
-          if (ev2.side === "caller" || !ev2.side && ev2.repo === repoOf(r.from)) {
+          if (ev2.side === "caller" || !ev2.side && ev2.repo === repoOf2(r.from)) {
             const w = at(ev2);
             if (w)
               got.at.add(w);
@@ -15637,12 +16396,14 @@ function changeImpact(change, deltas, e, o) {
       const got = callers2.get(id);
       const guesses = got.ifaces.map((r) => r.confidence === "inferred" ? GUESSES.find((g) => (r.flags ?? []).includes(g)) : void 0);
       const guessed = got.ifaces.length > 0 && got.flows.size === 0 && guesses.every((g) => g !== void 0) ? guesses[0] : void 0;
-      const repo = repoOf(id);
+      const repo = repoOf2(id);
+      const byAi = !guessed && got.ifaces.length > 0 && got.flows.size === 0 && got.ifaces.every((r) => (r.flags ?? []).includes(JOINED_BY_AI));
       return {
         component: id,
         ...repo ? { repo } : {},
         verdict: guessed ? "may-break" : "breaks",
         ...guessed ? { guessed } : {},
+        ...byAi ? { decidedByAi: true } : {},
         interfaces: sorted2(got.ifaces.map((r) => r.id)),
         flows: sorted2(got.flows),
         routes: sorted2(got.routes),
@@ -15703,7 +16464,7 @@ function changeImpact(change, deltas, e, o) {
         const ownGuess = guessedLinks(first.l);
         const guessed = sure ? void 0 : ownGuess ?? first.down.guessed;
         const restsOn = sure || ownGuess ? void 0 : first.down.restsOn;
-        const repo = repoOf(id);
+        const repo = repoOf2(id);
         const flows = sorted2(xs.flatMap((x) => [...x.l.flows]));
         const hop = {
           component: id,
@@ -15775,6 +16536,7 @@ function changeImpact(change, deltas, e, o) {
     change,
     breaks: callers.filter((c) => c.verdict === "breaks").length,
     mayBreak: callers.filter((c) => c.verdict === "may-break").length,
+    byAi: callers.filter((c) => c.decidedByAi).length,
     routes: new Set(items.flatMap((i) => i.routes.map((r) => r.id))).size,
     upstream: {
       breaks: hops.filter((h) => h.verdict === "breaks").length,
@@ -15786,6 +16548,394 @@ function changeImpact(change, deltas, e, o) {
   };
 }
 
+// packages/planner/dist/stages/sketch.js
+var import_yaml20 = __toESM(require_dist(), 1);
+import { createHash as createHash6, randomBytes } from "node:crypto";
+import { readdir as readdir15, readFile as readFile22, rm as rm7 } from "node:fs/promises";
+import { join as join25 } from "node:path";
+var import_yaml21 = __toESM(require_dist(), 1);
+var Id3 = external_exports.string().regex(/^[a-z0-9][a-z0-9._-]*$/, "an id is lower case: letters, digits, . _ -");
+var text3 = () => external_exports.string().trim().min(1).max(500);
+var From = external_exports.object({
+  component: Id3,
+  /** The flow the step goes on; left out when the component has one flow, or a new one is named. */
+  flow: Id3.optional(),
+  /** A new flow (the component has none fitting, or is new): what a person calls it, and what starts it. */
+  newFlow: external_exports.object({
+    id: Id3,
+    name: text3(),
+    trigger: external_exports.object({
+      kind: external_exports.enum(["endpoint", "action", "page", "listener", "job"]),
+      what: text3(),
+      entry: external_exports.string().trim().min(1).optional()
+    }),
+    /** A component the catalog doesn't have yet: where it runs (ADR 0132), drawn as a new box. */
+    runsOn: external_exports.object({
+      system: Id3.optional(),
+      platform: external_exports.string().trim().min(1).optional(),
+      cloud: external_exports.string().trim().min(1).optional(),
+      framework: external_exports.string().trim().min(1).optional(),
+      /** What the new box is (ADR 0180): one of the organisation's component types. */
+      type: Id3.optional()
+    }).optional()
+  }).optional()
+});
+var Stroke = external_exports.discriminatedUnion("kind", [
+  /** A line from a component to another's API: a call-out step. */
+  external_exports.object({
+    kind: external_exports.literal("call"),
+    from: From,
+    to: external_exports.object({
+      component: Id3,
+      /** An Endpoint id, "METHOD /path" or a topic; `new` when the API doesn't exist yet. */
+      entry: text3(),
+      new: external_exports.boolean().optional()
+    }),
+    what: text3().optional(),
+    /** The step it goes after (0: first); left out, the end of the flow. */
+    after: external_exports.number().int().min(0).optional()
+  }),
+  /** A topic a component publishes, and (optionally) a component that listens. */
+  external_exports.object({
+    kind: external_exports.literal("topic"),
+    from: From,
+    topic: text3(),
+    listener: From.optional(),
+    what: text3().optional()
+  }),
+  /** A table a step reads or writes. */
+  external_exports.object({
+    kind: external_exports.literal("table"),
+    from: From,
+    op: external_exports.enum(["read", "write", "lookup"]),
+    table: Id3,
+    columns: external_exports.array(external_exports.string().trim().min(1)).default([]),
+    new: external_exports.boolean().optional(),
+    what: text3().optional()
+  }),
+  /** A step of today's flow taken out (a line deleted). */
+  external_exports.object({ kind: external_exports.literal("remove"), flow: Id3, step: external_exports.number().int().positive(), why: text3() }),
+  /** A step of today's flow sent elsewhere (a line's end dragged): removed, and added to the new target. */
+  external_exports.object({
+    kind: external_exports.literal("retarget"),
+    flow: Id3,
+    step: external_exports.number().int().positive(),
+    to: external_exports.object({ component: Id3, entry: text3(), new: external_exports.boolean().optional() }),
+    why: text3()
+  }),
+  /** A stroke taken back: a drawn step, by flow and the step's index in the delta (its whole stroke goes). */
+  external_exports.object({ kind: external_exports.literal("undo"), flow: Id3, index: external_exports.number().int().min(0) })
+]);
+var slug5 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
+var DRAWN = "drawn on the canvas";
+var MARK_RE = /drawn on the canvas by (.+?), stroke ([a-z0-9]+)\)?$/i;
+var deltaWhy = (by) => `Drawn on the canvas by ${by}.`;
+var stepWhy = (by, id, reason) => `${reason ? `${reason} (` : ""}${DRAWN} by ${by}, stroke ${id}${reason ? ")" : ""}`;
+var isDrawnDelta = (d) => d.why.toLowerCase().startsWith(DRAWN);
+var strokeIdOf = (s) => MARK_RE.exec(s.why ?? "")?.[2];
+var isDrawnStep = (s) => strokeIdOf(s) !== void 0;
+var drawnBy = (s) => MARK_RE.exec(s.why ?? "")?.[1];
+var newStrokeId = () => randomBytes(4).toString("hex");
+function flowsOf(deltas, component, estate) {
+  const out = /* @__PURE__ */ new Map();
+  for (const f of estate.flows)
+    if (f.flow.component === component)
+      out.set(f.flow.id, f.flow.name);
+  for (const d of deltas)
+    if (!out.has(d.flow) && d.change !== "remove" && (d.runsOn?.component === component || d.change === "new" && d.flow.startsWith(`${component}.`)))
+      out.set(d.flow, d.name ?? d.flow);
+  return [...out].map(([id, name]) => ({ id, name }));
+}
+function deltaFor(deltas, from, estate, by) {
+  const own = flowsOf(deltas, from.component, estate);
+  if (from.newFlow) {
+    const id = from.newFlow.id;
+    const had2 = deltas.find((d3) => d3.flow === id);
+    if (had2?.change === "remove")
+      return {
+        problem: `${id} is removed in this change: take the removal back, or draw on another flow.`
+      };
+    if (had2)
+      return { delta: had2, deltas };
+    if (estate.flows.some((f) => f.flow.id === id))
+      return { problem: `${id} is a flow of today's map already: draw on it, not a new one.` };
+    const d2 = {
+      schemaVersion: FLOW_DELTA_SCHEMA_VERSION,
+      flow: id,
+      repo: repoOf(estate, from.component) ?? from.component,
+      change: "new",
+      name: from.newFlow.name,
+      trigger: from.newFlow.trigger,
+      why: deltaWhy(by),
+      ...from.newFlow.runsOn || !estate.ids.has(from.component) ? { runsOn: { component: from.component, ...from.newFlow.runsOn ?? {} } } : {},
+      steps: []
+    };
+    return { delta: d2, deltas: [...deltas, d2] };
+  }
+  const flowId = from.flow ?? (own.length === 1 ? own[0].id : void 0);
+  if (!flowId) {
+    if (!own.length)
+      return {
+        problem: `${from.component} has no flow on the map yet: name a new one for the stroke to start.`
+      };
+    return {
+      problem: `${from.component} has ${own.length} flows: say which the stroke is on.`,
+      pick: { flows: own }
+    };
+  }
+  if (from.flow && !own.some((f) => f.id === from.flow))
+    return { problem: `${from.flow} isn't a flow of ${from.component}.` };
+  const had = deltas.find((d2) => d2.flow === flowId);
+  if (had?.change === "remove")
+    return {
+      problem: `${flowId} is removed in this change: take the removal back, or draw on another flow.`
+    };
+  if (had)
+    return { delta: had, deltas };
+  const today = estate.flows.find((f) => f.flow.id === flowId);
+  if (!today)
+    return { problem: `No flow of today's map is ${flowId}.` };
+  const d = {
+    schemaVersion: FLOW_DELTA_SCHEMA_VERSION,
+    flow: flowId,
+    repo: today.repo,
+    change: "modify",
+    why: deltaWhy(by),
+    steps: []
+  };
+  return { delta: d, deltas: [...deltas, d] };
+}
+var repoOf = (estate, component) => {
+  const fromFlows = estate.flows.find((f) => f.flow.component === component)?.repo;
+  if (fromFlows)
+    return fromFlows;
+  const r = estate.byId?.get(component);
+  return r?.kind === "Component" && typeof r.repo === "string" && r.repo ? r.repo : void 0;
+};
+function noTodayFlow(estate, flow) {
+  const component = flow.split(".")[0] ?? flow;
+  const repo = repoOf(estate, component);
+  if (repo && !estate.flows.some((f) => f.repo === repo))
+    return `No flow of today's map is ${flow}: ${repo}'s spec has no flows yet, so there is no step to take out. Its spec step writes them: atticus spec draft ${repo}`;
+  return `No flow of today's map is ${flow}.`;
+}
+function applyStroke(deltas, stroke, estate, by, strokeId = newStrokeId()) {
+  const before = deltas.map((d) => ({ ...d, steps: [...d.steps] }));
+  const replace = (all2, d, step) => all2.map((x) => x.flow === d.flow ? { ...x, steps: [...x.steps, step] } : x);
+  const stepWhat = (what, fallback) => what ?? fallback;
+  const why = (reason) => stepWhy(by, strokeId, reason);
+  switch (stroke.kind) {
+    case "call": {
+      const r = deltaFor(before, stroke.from, estate, by);
+      if ("problem" in r)
+        return { deltas: before, changed: [], ...r };
+      const step = {
+        op: "add",
+        ...stroke.after !== void 0 ? { after: stroke.after } : {},
+        kind: "call-out",
+        what: stepWhat(stroke.what, `Calls ${stroke.to.component}'s ${stroke.to.entry}.`),
+        to: { component: stroke.to.component, entry: stroke.to.entry, new: !!stroke.to.new },
+        why: why()
+      };
+      return { deltas: replace(r.deltas, r.delta, step), changed: [r.delta.flow] };
+    }
+    case "topic": {
+      const r = deltaFor(before, stroke.from, estate, by);
+      if ("problem" in r)
+        return { deltas: before, changed: [], ...r };
+      const pub = {
+        op: "add",
+        kind: "publish",
+        what: stepWhat(stroke.what, `Publishes ${stroke.topic}.`),
+        ...stroke.listener && stroke.listener.component !== stroke.from.component ? { to: { component: stroke.listener.component, entry: stroke.topic, new: false } } : {},
+        why: why()
+      };
+      let all2 = replace(r.deltas, r.delta, pub);
+      const changed = [r.delta.flow];
+      if (stroke.listener) {
+        const l = deltaFor(all2, stroke.listener, estate, by);
+        if ("problem" in l)
+          return { deltas: before, changed: [], ...l };
+        const listen = {
+          op: "add",
+          kind: "entry",
+          what: `Listens on ${stroke.topic}.`,
+          why: why()
+        };
+        all2 = replace(l.deltas, l.delta, listen);
+        changed.push(l.delta.flow);
+      }
+      return { deltas: all2, changed };
+    }
+    case "table": {
+      const r = deltaFor(before, stroke.from, estate, by);
+      if ("problem" in r)
+        return { deltas: before, changed: [], ...r };
+      const step = {
+        op: "add",
+        kind: stroke.op,
+        what: stepWhat(stroke.what, `${stroke.op === "write" ? "Writes" : "Reads"} ${stroke.table}${stroke.columns.length ? ` (${stroke.columns.join(", ")})` : ""}.`),
+        store: { table: stroke.table, columns: stroke.columns, new: !!stroke.new },
+        why: why()
+      };
+      return { deltas: replace(r.deltas, r.delta, step), changed: [r.delta.flow] };
+    }
+    case "remove":
+    case "retarget": {
+      const today = estate.flows.find((f) => f.flow.id === stroke.flow);
+      if (!today)
+        return {
+          deltas: before,
+          changed: [],
+          problem: noTodayFlow(estate, stroke.flow)
+        };
+      const was = today.flow.steps[stroke.step - 1];
+      if (!was)
+        return {
+          deltas: before,
+          changed: [],
+          problem: `${stroke.flow} has no step ${stroke.step}.`
+        };
+      let all2 = before;
+      let d = all2.find((x) => x.flow === stroke.flow);
+      if (d?.change === "remove")
+        return {
+          deltas: before,
+          changed: [],
+          problem: `${stroke.flow} is removed in this change: take the removal back, or draw on another flow.`
+        };
+      if (!d) {
+        d = {
+          schemaVersion: FLOW_DELTA_SCHEMA_VERSION,
+          flow: stroke.flow,
+          repo: today.repo,
+          change: "modify",
+          why: deltaWhy(by),
+          steps: []
+        };
+        all2 = [...all2, d];
+      }
+      if (d.steps.some((s) => s.op !== "add" && s.step === stroke.step))
+        return {
+          deltas: before,
+          changed: [],
+          problem: `Step ${stroke.step} of ${stroke.flow} is changed already in this change.`
+        };
+      all2 = replace(all2, d, { op: "remove", step: stroke.step, why: why(stroke.why) });
+      if (stroke.kind === "retarget")
+        all2 = replace(all2, d, {
+          op: "add",
+          after: stroke.step,
+          kind: was.kind,
+          what: was.what,
+          to: { component: stroke.to.component, entry: stroke.to.entry, new: !!stroke.to.new },
+          why: why(stroke.why)
+        });
+      return { deltas: all2, changed: [stroke.flow] };
+    }
+    case "undo": {
+      const d = before.find((x) => x.flow === stroke.flow);
+      const s = d?.steps[stroke.index];
+      const id = s ? strokeIdOf(s) : void 0;
+      if (!d || !s || !id)
+        return {
+          deltas: before,
+          changed: [],
+          problem: s ? `Step ${stroke.index} of ${stroke.flow} wasn't drawn on the canvas: the stage wrote it, so edit the file or run the stage again.` : `${stroke.flow} has no step ${stroke.index} to take back.`
+        };
+      const all2 = before.map((x) => ({ ...x, steps: x.steps.filter((y) => strokeIdOf(y) !== id) })).filter((x) => !(x.steps.length === 0 && isDrawnDelta(x)));
+      const changed = before.filter((x) => x.steps.some((y) => strokeIdOf(y) === id)).map((x) => x.flow);
+      return { deltas: all2, changed };
+    }
+  }
+}
+function drawnStrokes(deltas) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const d of deltas)
+    d.steps.forEach((s, index) => {
+      const id = strokeIdOf(s);
+      if (!id || seen.has(id))
+        return;
+      seen.add(id);
+      const pair = d.steps.find((y, j) => j !== index && strokeIdOf(y) === id);
+      const what = s.op === "remove" ? pair?.to ? `step ${s.step} sent to ${pair.to.component} ${pair.to.entry}` : `step ${s.step} removed` : `${s.kind ?? s.op}${s.to ? ` \u2192 ${s.to.component} ${s.to.entry}` : ""}${s.store ? ` ${s.store.table}` : ""}`;
+      const by = drawnBy(s);
+      out.push({ flow: d.flow, index, what, ...by ? { by } : {} });
+    });
+  return out;
+}
+function sketchOf(deltas) {
+  return deltas.map((d) => ({ ...d, steps: d.steps.filter(isDrawnStep) })).filter((d) => d.steps.length || isDrawnDelta(d));
+}
+function renderSketchDelta(d, estate, by) {
+  const today = d.change === "new" ? void 0 : estate.flowById.get(d.flow)?.flow;
+  const pinned = {
+    ...d,
+    schemaVersion: FLOW_DELTA_SCHEMA_VERSION,
+    ...today ? { base: { steps: flowBase(today) } } : {}
+  };
+  return `# The target of flow ${d.flow} (ADR 0087): the steps this change adds, changes or removes. Drafted by ${by}; base pins the version of today's flow it was written against (ADR 0111).
+${(0, import_yaml20.stringify)(FlowDelta.parse(pinned), { lineWidth: 0 })}`;
+}
+var MARK3 = "<!-- Generated by atticus change architecture";
+async function planSketchWrite(dir, deltas, changed, estate, by) {
+  const out = [];
+  for (const flow of [...new Set(changed)]) {
+    const d = deltas.find((x) => x.flow === flow);
+    out.push({
+      file: `${TARGET_DIR2}/${flow}.yaml`,
+      ...d ? { now: renderSketchDelta(d, estate, by) } : {}
+    });
+  }
+  const read = async (f) => readFile22(join25(dir, f), "utf8").catch(() => void 0);
+  const design = await read("design.md");
+  if (design === void 0 || design.startsWith(MARK3)) {
+    const t = await read(READS_FILE);
+    const reads = t === void 0 ? void 0 : external_exports.array(ReadFlow).safeParse((0, import_yaml21.parse)(t)?.reads);
+    const dt = await read(DEPLOY_FILE);
+    const deploy = dt === void 0 ? void 0 : external_exports.array(DeployStep).safeParse((0, import_yaml21.parse)(dt)?.deploy);
+    const all2 = deltas.filter((d) => d.steps.length || d.change !== "modify");
+    const now = renderArchitecture(all2, estate, reads?.success ? reads.data : [], deploy?.success && deploy.data.length ? deploy.data : void 0);
+    if (now !== design)
+      out.push({ file: "design.md", now });
+  }
+  const data = await read("data.md");
+  if (data === void 0 || data.startsWith(MARK3)) {
+    const now = renderData([...deltas], estate);
+    if (now && now !== data)
+      out.push({ file: "data.md", now });
+    else if (!now && data?.startsWith(MARK3))
+      out.push({ file: "data.md" });
+  }
+  return out;
+}
+async function writeSketch(dir, files) {
+  for (const f of files) {
+    const path = join25(dir, ...f.file.split("/"));
+    if (f.now === void 0)
+      await rm7(path, { force: true });
+    else
+      await writeFileAtomic(path, f.now);
+  }
+}
+async function sketchFingerprint(dir) {
+  const h = createHash6("sha256");
+  const take = async (rel) => {
+    h.update(rel);
+    h.update("\0");
+    h.update(await readFile22(join25(dir, ...rel.split("/")), "utf8").catch(() => ""));
+    h.update("\0");
+  };
+  for (const f of (await readdir15(join25(dir, TARGET_DIR2)).catch(() => [])).sort())
+    if (f.endsWith(".yaml"))
+      await take(`${TARGET_DIR2}/${f}`);
+  for (const f of [READS_FILE, DEPLOY_FILE, "design.md", "data.md"])
+    await take(f);
+  return h.digest("hex").slice(0, 16);
+}
+var sketchSlug = slug5;
+
 // packages/planner/dist/export-work-items.js
 var sentence6 = (s) => /[.!?]$/.test(s.trim()) ? s.trim() : `${s.trim()}.`;
 var VERB = { add: "Add", change: "Change", remove: "Remove" };
@@ -15824,9 +16974,9 @@ function workItemsOf(d) {
 }
 
 // packages/planner/dist/conform.js
-var import_yaml19 = __toESM(require_dist(), 1);
-import { readdir as readdir15, readFile as readFile21 } from "node:fs/promises";
-import { join as join24, posix as posix2 } from "node:path";
+var import_yaml22 = __toESM(require_dist(), 1);
+import { readdir as readdir16, readFile as readFile23 } from "node:fs/promises";
+import { join as join26, posix as posix2 } from "node:path";
 var str6 = (v) => typeof v === "string" ? v : void 0;
 function httpEntry(entry) {
   const m = /^([A-Za-z]+)\s+(\S+)$/.exec(entry.trim());
@@ -15878,6 +17028,17 @@ function conform(input) {
       out.push(...records.filter((r) => r.kind === "Unresolved" && r.unresolvedKind === "event-publish" && r.owner === from && r.raw === to.entry.trim()));
     return out;
   };
+  const unsettledCall = (records, from, entry) => {
+    const http = httpEntry(entry);
+    if (!http)
+      return void 0;
+    return records.find((r) => {
+      if (r.kind !== "Unresolved" || r.unresolvedKind !== "call" || r.owner !== from)
+        return false;
+      const m = /^(\S+)\s+\S+\s+(\S+)$/.exec(str6(r.raw) ?? "");
+      return !!m && m[1].toUpperCase() === http.method && normalizePath(m[2]) === http.path;
+    });
+  };
   const endpointsFor2 = (records, component, entry) => {
     const http = httpEntry(entry);
     return records.filter((r) => {
@@ -15894,29 +17055,29 @@ function conform(input) {
   };
   const columnOf = (records, table, name) => records.find((r) => r.kind === "Column" && r.table === table && r.name === name);
   const tableOf = (records, table) => records.find((r) => r.kind === "Table" && r.id === table);
-  const named = /* @__PURE__ */ new Set();
+  const named2 = /* @__PURE__ */ new Set();
   for (const d of input.deltas) {
     const from = componentOf(d);
     if (d.delta.change === "new" && d.delta.trigger) {
       const entry = d.delta.trigger.entry ?? d.delta.trigger.what;
       for (const r of endpointsFor2(after2, from, entry))
-        named.add(key2(r));
+        named2.add(key2(r));
     }
     for (const s of d.delta.steps) {
       if (s.op === "remove")
         continue;
       if (s.to) {
         for (const r of callsTo(after2, from, s.to))
-          named.add(key2(r));
+          named2.add(key2(r));
         for (const r of endpointsFor2(after2, s.to.component, s.to.entry))
-          named.add(key2(r));
+          named2.add(key2(r));
       }
       if (s.store) {
-        named.add(`Table/${s.store.table}`);
+        named2.add(`Table/${s.store.table}`);
         for (const c of s.store.columns) {
           const col = columnOf(after2, s.store.table, c);
           if (col)
-            named.add(key2(col));
+            named2.add(key2(col));
         }
       }
     }
@@ -15928,12 +17089,32 @@ function conform(input) {
   const designed = (d, line) => [
     { source: "artifact", path: d.file, line }
   ];
+  const basis = input.basis;
+  const decisive = !basis || basis.from === "facts" && basis.unread.length === 0;
+  const readAgain = `/atticus-map ${repo}, then atticus verify ${repo} --write`;
+  const unconfirmed = (claim) => {
+    if (basis?.from === "facts") {
+      const shown = basis.unread.slice(0, 3).join(", ");
+      const more = basis.unread.length > 3 ? ` and ${basis.unread.length - 3} more` : "";
+      return `No fact covers what changed in ${shown}${more} since ${repo} was read, so Atticus couldn't confirm ${claim} from the code; check it by hand, or read those files again (${readAgain}) and check the code again.`;
+    }
+    return `${repo} hasn't been read into facts at this commit, and the built-in readers alone are only a cross-check, so Atticus couldn't confirm ${claim} from the code; check it by hand, or read the repo (${readAgain}) and check the code again.`;
+  };
   for (const d of input.deltas) {
     let stillThere2 = function(d2, item, to, line, verb) {
       const kept = input.deltas.some((o) => o.delta.steps.some((x) => x.op !== "remove" && componentOf(o) === from && x.to?.component === to.component && x.to.entry === to.entry));
       if (kept)
         return;
       const left = callsTo(after2, from, to)[0];
+      if (!left && !decisive) {
+        unchecked.push({
+          flow: d2.delta.flow,
+          item,
+          kind: "call",
+          why: unconfirmed(`that ${from} no longer calls ${to.component} ${to.entry}`)
+        });
+        return;
+      }
       push(left ? {
         status: "still-there",
         check: "call",
@@ -15986,7 +17167,18 @@ function conform(input) {
           why: `The scans read no column of ${st.table} (its columns are kept where the reader doesn't look), so ${st.columns.join(", ")} can't be checked here.`
         });
       } else if (st.new || table) {
-        if (st.new)
+        const absent = [
+          ...st.new && !table ? [`the table ${st.table}`] : [],
+          ...st.columns.filter((c) => !columnOf(after2, st.table, c)).map((c) => `${st.table}.${c}`)
+        ];
+        if (absent.length && !decisive)
+          unchecked.push({
+            flow: d2.delta.flow,
+            item,
+            kind: s.kind ?? "step",
+            why: unconfirmed(`that the code has ${absent.join(", ")}`)
+          });
+        if (st.new && (table || decisive))
           push(table ? {
             status: "found",
             check: "table",
@@ -16003,6 +17195,8 @@ function conform(input) {
           });
         for (const c of st.columns) {
           const col = columnOf(after2, st.table, c);
+          if (!col && !decisive)
+            continue;
           push(col ? {
             status: "found",
             check: "column",
@@ -16043,18 +17237,25 @@ function conform(input) {
       const entry = t?.entry ?? t?.what ?? "";
       if (t && (t.kind === "endpoint" || t.kind === "listener") && (httpEntry(entry) || t.entry)) {
         const found = endpointsFor2(after2, from, entry)[0];
-        push(found ? {
-          status: "found",
-          check: "trigger",
-          what: `${from} serves ${entry}, the trigger of ${flow}.`,
-          record: found.id,
-          at: citesIn(found, repo)
-        } : {
-          status: "missing",
-          check: "trigger",
-          what: `${from} serves no ${entry}, the trigger of new flow ${flow} (${d.file}).`,
-          at: designed(d, d.triggerLine)
-        });
+        if (!found && !decisive)
+          unchecked.push({
+            flow,
+            kind: t.kind,
+            why: unconfirmed(`that ${from} serves ${entry}, the trigger of ${flow}`)
+          });
+        else
+          push(found ? {
+            status: "found",
+            check: "trigger",
+            what: `${from} serves ${entry}, the trigger of ${flow}.`,
+            record: found.id,
+            at: citesIn(found, repo)
+          } : {
+            status: "missing",
+            check: "trigger",
+            what: `${from} serves no ${entry}, the trigger of new flow ${flow} (${d.file}).`,
+            at: designed(d, d.triggerLine)
+          });
       } else
         unchecked.push({
           flow,
@@ -16097,20 +17298,36 @@ function conform(input) {
           const found = callsTo(after2, from, s.to)[0];
           const publish = kind === "publish";
           const verb = publish ? "publishes to" : "calls";
-          push(found ? {
-            status: "found",
-            check: publish ? "publish" : "call",
-            item,
-            what: `${from} ${verb} ${s.to.component} ${s.to.entry}.`,
-            record: found.id,
-            at: citesIn(found, repo)
-          } : {
-            status: "missing",
-            check: publish ? "publish" : "call",
-            item,
-            what: `${from} makes no ${publish ? "publish to" : "call to"} ${s.to.component} ${s.to.entry} (${where2(item)}).`,
-            at: designed(d, line)
-          });
+          const unsettled = found ? void 0 : unsettledCall(after2, from, s.to.entry);
+          if (!found && !decisive)
+            unchecked.push({
+              flow,
+              item,
+              kind,
+              why: unconfirmed(`that ${from} ${verb} ${s.to.component} ${s.to.entry}`)
+            });
+          else if (unsettled)
+            unchecked.push({
+              flow,
+              item,
+              kind,
+              why: `${from} calls ${unsettled.raw}, but where it goes isn't settled yet, so Atticus couldn't confirm it reaches ${s.to.component}; answer its map question on Questions, then check the code again.`
+            });
+          else
+            push(found ? {
+              status: "found",
+              check: publish ? "publish" : "call",
+              item,
+              what: `${from} ${verb} ${s.to.component} ${s.to.entry}.`,
+              record: found.id,
+              at: citesIn(found, repo)
+            } : {
+              status: "missing",
+              check: publish ? "publish" : "call",
+              item,
+              what: `${from} makes no ${publish ? "publish to" : "call to"} ${s.to.component} ${s.to.entry} (${where2(item)}).`,
+              at: designed(d, line)
+            });
           if (s.op === "change" && old?.to && (old.to.component !== s.to.component || old.to.entry !== s.to.entry))
             stillThere2(d, item, old.to, line, "sends elsewhere");
         }
@@ -16128,7 +17345,7 @@ function conform(input) {
         });
     });
   }
-  const added = (r) => !beforeKeys.has(key2(r)) && !named.has(key2(r));
+  const added = (r) => !beforeKeys.has(key2(r)) && !named2.has(key2(r));
   const scope = [];
   const unexpectedTables = /* @__PURE__ */ new Set();
   for (const r of mine(after2)) {
@@ -16193,13 +17410,13 @@ function componentOf(d) {
 async function readConformDeltas(changeDir) {
   const deltas = [];
   const problems = [];
-  const names = (await readdir15(join24(changeDir, TARGET_DIR2)).catch(() => [])).filter((f) => f.endsWith(".yaml")).sort();
+  const names = (await readdir16(join26(changeDir, TARGET_DIR2)).catch(() => [])).filter((f) => f.endsWith(".yaml")).sort();
   for (const f of names) {
     const file = `${TARGET_DIR2}/${f}`;
     try {
-      const text2 = await readFile21(join24(changeDir, TARGET_DIR2, f), "utf8");
-      const lines = new import_yaml19.LineCounter();
-      const doc = (0, import_yaml19.parseDocument)(text2, { lineCounter: lines });
+      const text4 = await readFile23(join26(changeDir, TARGET_DIR2, f), "utf8");
+      const lines = new import_yaml22.LineCounter();
+      const doc = (0, import_yaml22.parseDocument)(text4, { lineCounter: lines });
       const r = FlowDelta.safeParse(doc.toJS());
       if (!r.success) {
         problems.push(`${file}: ${r.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ")}`);
@@ -16210,10 +17427,10 @@ async function readConformDeltas(changeDir) {
         return range ? lines.linePos(range[0]).line : 1;
       };
       const steps = doc.get("steps", true);
-      const stepLines = (0, import_yaml19.isSeq)(steps) ? steps.items.map(lineOf2) : [];
+      const stepLines = (0, import_yaml22.isSeq)(steps) ? steps.items.map(lineOf2) : [];
       const root = doc.contents;
-      const trigger = (0, import_yaml19.isMap)(root) ? root.items.find((p) => String(p.key) === "trigger") : void 0;
-      const flowKey = (0, import_yaml19.isMap)(root) ? root.items.find((p) => String(p.key) === "flow") : void 0;
+      const trigger = (0, import_yaml22.isMap)(root) ? root.items.find((p) => String(p.key) === "trigger") : void 0;
+      const flowKey = (0, import_yaml22.isMap)(root) ? root.items.find((p) => String(p.key) === "flow") : void 0;
       deltas.push({
         file,
         delta: r.data,
@@ -16228,13 +17445,13 @@ async function readConformDeltas(changeDir) {
 }
 async function readTaskSteps(changeDir) {
   const out = /* @__PURE__ */ new Map();
-  const dir = join24(changeDir, "stories");
-  for (const f of (await readdir15(dir).catch(() => [])).sort()) {
+  const dir = join26(changeDir, "stories");
+  for (const f of (await readdir16(dir).catch(() => [])).sort()) {
     if (!f.endsWith(".md"))
       continue;
-    const text2 = await readFile21(join24(dir, f), "utf8").catch(() => "");
+    const text4 = await readFile23(join26(dir, f), "utf8").catch(() => "");
     let task;
-    for (const line of text2.split(/\r?\n/)) {
+    for (const line of text4.split(/\r?\n/)) {
       const t = /^###\s+Task\s+(\S+?):/.exec(line);
       if (t) {
         task = t[1].toLowerCase();
@@ -16276,6 +17493,8 @@ export {
   draftFor,
   renderSnow,
   readDrafts,
+  SnowFillError,
+  fillSnowFields,
   planStories,
   snowDraft,
   StoryEval,
@@ -16348,12 +17567,38 @@ export {
   questionsOnFile,
   stepQuestionJudge,
   stepJudges,
-  import_yaml7 as import_yaml,
+  DRAFTS_SCHEMA_VERSION,
+  DRAFTED_FILE,
+  CORRECTIONS_FILE,
+  DraftedRecord,
+  DraftedFile,
+  CorrectionScope,
+  CorrectionState,
+  Correction,
+  CorrectionsFile,
+  draftSha,
+  readDrafted,
+  recordAiDraft,
+  recordPersonSave,
+  draftProvenance,
+  DRAFT_ITEMS_MAX,
+  draftItems,
+  draftItemText,
+  readCorrections,
+  addCorrection,
+  removeCorrection,
+  CORRECTIONS_RULE,
+  correctionsText,
+  stageCorrections,
+  snapshotFiles,
+  settleCorrections,
+  import_yaml8 as import_yaml,
   filePending,
   judged,
   yamlOf,
   EXPAND_AGENT,
   DIGEST_KINDS,
+  titledText,
   checkExpansion,
   expansionInput,
   expandFor,
@@ -16411,6 +17656,8 @@ export {
   PERSON_DRAFT,
   HAND_BACKS,
   lineExists,
+  retireSettledEscalations,
+  retireChangeEscalations,
   stageRetrievalAi,
   retrievalWaiting,
   withoutResume,
@@ -16497,6 +17744,7 @@ export {
   isEmptyDelta,
   emptyDeltaIssues,
   splitAnswer,
+  SKETCH_RULE,
   readDeltas,
   entriesOf,
   mergedFlowsText,
@@ -16536,6 +17784,7 @@ export {
   NeedsFile,
   needQuoteProblem,
   whenFromLeadTime,
+  lineAtFolded,
   readNeeds,
   renderNeeds,
   findNeeds,
@@ -16633,6 +17882,8 @@ export {
   promptFileOf,
   taskPromptFiles,
   renderStoryFile,
+  buildLine,
+  withBuildLine,
   tickedTasks,
   mergeRequests,
   writeStories,
@@ -16660,6 +17911,21 @@ export {
   MAX_CHAIN_DEPTH,
   GUESSED_LINK_RULE,
   changeImpact,
+  Stroke,
+  DRAWN,
+  isDrawnDelta,
+  strokeIdOf,
+  isDrawnStep,
+  drawnBy,
+  newStrokeId,
+  applyStroke,
+  drawnStrokes,
+  sketchOf,
+  renderSketchDelta,
+  planSketchWrite,
+  writeSketch,
+  sketchFingerprint,
+  sketchSlug,
   workItemsOf,
   conform,
   readConformDeltas,