@maycombhq/atticus 2.0.0-beta.26 → 2.0.0-beta.27.1

package/dist/{chunk-VUSYN4R4.js → chunk-DNDIT3LD.js}

@@ -3,33 +3,33 @@ import { fileURLToPath as __atticusFileURLToPath } from "node:url";
 var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
-import {
-  doctorChecks
-} from "./chunk-XIGVTH24.js";
 import {
   buildSite,
   catalogRecords,
   openChanges
-} from "./chunk-FOOU5OJE.js";
+} from "./chunk-RDFRB26Z.js";
+import {
+  doctorChecks
+} from "./chunk-RZEYZOLW.js";
 import {
   readProbes,
   whatRunsWhere
-} from "./chunk-IBIIKUC7.js";
+} from "./chunk-G33UIUG3.js";
 import {
   baseClonePath,
   loadRepos
-} from "./chunk-XIJBQM45.js";
+} from "./chunk-X5B7KYPD.js";
 import {
   catalogDirOf,
   inputsDirOf,
   orgPackDirOf
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   CatalogBaseline,
   DEFAULT_RUNTIME,
   WORKSPACE_SCHEMA_VERSION,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-IERXBWQU.js → chunk-DNKYWTVZ.js}

@@ -6,32 +6,33 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readMe,
   writeMe
-} from "./chunk-VJO7M34N.js";
+} from "./chunk-MZDHFWTN.js";
 import {
   changeStore
-} from "./chunk-WH3ZFLXT.js";
-import "./chunk-UTZMF5CV.js";
-import "./chunk-6U65YB54.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-XIJBQM45.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-YBAJ5SAR.js";
+import "./chunk-23TTURB2.js";
+import "./chunk-6H62UHY5.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-4NPWOUI2.js";
+import "./chunk-I57IH5X6.js";
+import "./chunk-X5B7KYPD.js";
+import "./chunk-IPSZDVLI.js";
+import "./chunk-2MRYL45Z.js";
+import "./chunk-ELJ5Q4J2.js";
+import "./chunk-XZY4GTCX.js";
+import "./chunk-3M3MDBOG.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
 import "./chunk-BQGDB6ZL.js";
+import "./chunk-R4TUWD4C.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/watch-commands.js
 async function watchLine(root, change) {
-  const { cockpit } = await import("./chunk-ZYLGEWTC.js");
+  const { cockpit } = await import("./chunk-FFIHRQ3O.js");
   try {
     const c = await cockpit(root, change);
     const parts = [

package/dist/{chunk-KJD4DLRZ.js → chunk-DS2OZXBN.js}

@@ -7,30 +7,31 @@ import {
   PlannerError,
   draftedStories,
   workItemsOf
-} from "./chunk-CSHJZFOE.js";
-import "./chunk-5A4RHEEL.js";
-import "./chunk-VIQHZA53.js";
-import "./chunk-WH3ZFLXT.js";
-import "./chunk-UTZMF5CV.js";
+} from "./chunk-DTW37FJ6.js";
+import "./chunk-INCFIDCB.js";
+import "./chunk-LP6BFBE5.js";
+import "./chunk-YBAJ5SAR.js";
+import "./chunk-23TTURB2.js";
+import "./chunk-6H62UHY5.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-4NPWOUI2.js";
 import {
   workItemsCsv
-} from "./chunk-6U65YB54.js";
-import "./chunk-SZDOBIWE.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-XIJBQM45.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-I57IH5X6.js";
+import "./chunk-LCQIRCOT.js";
+import "./chunk-X5B7KYPD.js";
+import "./chunk-IPSZDVLI.js";
+import "./chunk-2MRYL45Z.js";
+import "./chunk-ELJ5Q4J2.js";
+import "./chunk-XZY4GTCX.js";
+import "./chunk-3M3MDBOG.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
 import "./chunk-BQGDB6ZL.js";
+import "./chunk-R4TUWD4C.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/export-commands.js

package/dist/{chunk-CSHJZFOE.js → chunk-DTW37FJ6.js}

@@ -17,7 +17,7 @@ import {
   parseNewFile,
   rerunOf,
   usesOf
-} from "./chunk-5A4RHEEL.js";
+} from "./chunk-INCFIDCB.js";
 import {
   CriticError,
   MERGED_FLOWS,
@@ -49,8 +49,9 @@ import {
   triggerReason,
   waitingLenses,
   writeQuarantineItems
-} from "./chunk-VIQHZA53.js";
+} from "./chunk-LP6BFBE5.js";
 import {
+  GENERATED_MARK,
   changeFolder,
   changeFootprint,
   changeSize,
@@ -60,39 +61,27 @@ import {
   checkStage,
   editSha,
   isFilled,
+  isGenerated,
+  keepPersonWritten,
   loadChangeContext,
   pastCorrections,
+  personWritten,
+  personWrittenPlanning,
   phaseGates,
   scoreRisk,
   stageCommand,
   testPlanFor,
   wroteThis
-} from "./chunk-WH3ZFLXT.js";
+} from "./chunk-YBAJ5SAR.js";
 import {
   ARTIFACT_STAGE,
   archiveRefuses,
   artifactsOfStage,
   createOpenSpec
-} from "./chunk-UTZMF5CV.js";
-import {
-  AdapterError,
-  createAdapters,
-  fileStepStore
-} from "./chunk-6U65YB54.js";
-import {
-  GAP_STEP,
-  candidateRef,
-  contextToolBox,
-  defaultCodeDir,
-  gapNameOf,
-  gapQuestion,
-  namesInCode,
-  nodesById,
-  openIndex
-} from "./chunk-SZDOBIWE.js";
+} from "./chunk-23TTURB2.js";
 import {
   readCatalog
-} from "./chunk-2HDNOUJU.js";
+} from "./chunk-6H62UHY5.js";
 import {
   CONFLICT_STEP,
   checkQuote,
@@ -111,17 +100,30 @@ import {
   snapshotPages,
   syncSources,
   workingDays
-} from "./chunk-K3QKOVZN.js";
+} from "./chunk-N5DLB74D.js";
+import {
+  AdapterError,
+  createAdapters,
+  fileStepStore
+} from "./chunk-I57IH5X6.js";
+import {
+  GAP_STEP,
+  candidateRef,
+  contextToolBox,
+  defaultCodeDir,
+  gapNameOf,
+  gapQuestion,
+  namesInCode,
+  nodesById,
+  openIndex
+} from "./chunk-LCQIRCOT.js";
 import {
   changeInputSources,
   citedParts,
   heldOutInputs,
   readServiceRequestExports,
   readWorkItemExports
-} from "./chunk-QAFQLILX.js";
-import {
-  readDocument
-} from "./chunk-HQMLY2R6.js";
+} from "./chunk-IPSZDVLI.js";
 import {
   APPLIES_SPEC,
   ASKS_CHECK_SPEC,
@@ -144,7 +146,10 @@ import {
   toRunSummary,
   verdictOf,
   wrapData
-} from "./chunk-ZDA72732.js";
+} from "./chunk-2MRYL45Z.js";
+import {
+  readDocument
+} from "./chunk-ELJ5Q4J2.js";
 import {
   JOINED_BY_AI,
   JOIN_GUESS_FLAGS,
@@ -158,7 +163,6 @@ import {
   fileJudgments,
   identifierWords,
   inputsDirOf,
-  isSecretPath,
   judgmentKey,
   listQuestions,
   makeJudgment,
@@ -176,7 +180,6 @@ import {
   readPrototypeArchitecture,
   readQuestion,
   readRepoSpec,
-  redactSecrets,
   retireQuestion,
   runsDirOf,
   runsRelOf,
@@ -186,12 +189,14 @@ import {
   taskBranch,
   toCanonicalYaml,
   writeQuestion
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   QUICK_WRITE_LOCK,
+  isSecretPath,
+  redactSecrets,
   withSharedFileLock,
   writeFileAtomic
-} from "./chunk-MEMEO7YO.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   AgentDefinition,
   KNOWLEDGE_KINDS,
@@ -214,7 +219,7 @@ import {
   normalizePath,
   retrievalOf,
   specTemplateFor
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -1059,7 +1064,6 @@ async function writeProse(ctx, skeleton, o) {
 }
 
 // packages/planner/dist/render.js
-var GENERATED_MARK = "<!-- Generated by atticus plan";
 var sentence = (s) => /[.!?]$/.test(s) ? s : `${s}.`;
 var cell = (s) => s.replace(/\|/g, "\\|").replace(/\n/g, " ");
 var ENGINE_LINE = {
@@ -1395,25 +1399,20 @@ function fillSnowFields(text4, heading, values) {
 
 // packages/planner/dist/plan.js
 import { readdir, readFile, rm } from "node:fs/promises";
-import { join } from "node:path";
-async function exists(path) {
-  return readFile(path).then(() => true, () => false);
-}
+import { join, relative, sep } from "node:path";
 async function guard(ctx, rels, force) {
   if (force)
     return;
-  const own = [];
-  for (const rel of rels) {
-    const p = join(ctx.dir, rel);
-    if (!await exists(p))
-      continue;
-    const text4 = await readFile(p, "utf8");
-    if (!text4.startsWith(GENERATED_MARK))
-      own.push(rel);
-  }
+  const own = await personWritten(ctx.dir, rels);
   if (own.length)
     throw new PlannerError("refused", `${ctx.change.id} already has planning files a person wrote: ${own.join(", ")}. Re-run with --force to replace them.`);
 }
+async function keepForced(ctx, rels, force, stage) {
+  if (!force)
+    return void 0;
+  const own = await personWritten(ctx.dir, rels);
+  return keepPersonWritten(ctx.dir, relative(ctx.root, ctx.dir).split(sep).join("/"), stage, own);
+}
 function linkWaits(skeleton, needs) {
   const byNeed = /* @__PURE__ */ new Map();
   for (const n of needs) {
@@ -1473,19 +1472,28 @@ async function planStories(root, changeId, o = {}) {
     }
   }
   linkWaits(skeleton, snowNeeds(ctx));
+  const stale = (await readdir(join(ctx.dir, "stories")).catch(() => [])).filter((f) => f.endsWith(".md")).map((f) => `stories/${f}`);
+  const kept = await keepForced(ctx, [.../* @__PURE__ */ new Set([...rels, ...stale])], o.force, "stories");
   const keep = new Set(skeleton.stories.map((s) => `${s.id}.md`));
   for (const f of await readdir(join(ctx.dir, "stories")).catch(() => [])) {
     if (keep.has(f) || !f.endsWith(".md"))
       continue;
     const p = join(ctx.dir, "stories", f);
-    if ((await readFile(p, "utf8")).startsWith(GENERATED_MARK) || o.force)
+    if (isGenerated(await readFile(p, "utf8")) || o.force)
       await rm(p);
   }
   for (const s of skeleton.stories)
     await writeFileAtomic(join(ctx.dir, "stories", `${s.id}.md`), renderStory(ctx, s, prose.get(s.id)));
   await writeFileAtomic(join(ctx.dir, "stories.md"), renderIndex(skeleton, prose));
   await writeFileAtomic(join(ctx.dir, "tasks.md"), renderTasks(skeleton, skeleton.tasks));
-  return { ...base, state: "written", prose, fallback, files: rels.sort() };
+  return {
+    ...base,
+    state: "written",
+    prose,
+    fallback,
+    files: rels.sort(),
+    ...kept ? { kept } : {}
+  };
 }
 async function snowDraft(root, changeId, o = {}) {
   const ctx = await loadPlanContext(root, changeId);
@@ -1494,8 +1502,9 @@ async function snowDraft(root, changeId, o = {}) {
   const drafts = needs.map((n) => draftFor(ctx, n));
   const skeleton = buildSkeleton(ctx);
   const waits = linkWaits(skeleton, needs);
+  const kept = await keepForced(ctx, ["snow.md"], o.force, "snow");
   await writeFileAtomic(join(ctx.dir, "snow.md"), renderSnow(drafts, waits));
-  return { change: ctx.change.id, drafts, file: "snow.md" };
+  return { change: ctx.change.id, drafts, file: "snow.md", ...kept ? { kept } : {} };
 }
 
 // packages/planner/dist/bar.js
@@ -2287,7 +2296,7 @@ async function submitRequests(root, changeId, o) {
 // packages/planner/dist/templates.js
 var import_yaml4 = __toESM(require_dist(), 1);
 import { readdir as readdir3, readFile as readFile4 } from "node:fs/promises";
-import { join as join4, relative, sep } from "node:path";
+import { join as join4, relative as relative2, sep as sep2 } 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;
@@ -2779,7 +2788,7 @@ async function uploads(root, inputsDir, skip) {
       if (e.name.startsWith("."))
         continue;
       const full = join4(d, e.name);
-      if (skip.some((s) => full === s || full.startsWith(`${s}${sep}`)))
+      if (skip.some((s) => full === s || full.startsWith(`${s}${sep2}`)))
         continue;
       if (e.isDirectory())
         await walk(full);
@@ -2790,7 +2799,7 @@ async function uploads(root, inputsDir, skip) {
           const plain2 = /\.(md|markdown|txt)$/i.test(e.name);
           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("/"),
+            path: relative2(root, full).split(sep2).join("/"),
             title: doc.text.title,
             lines: linesOf(text4),
             kind: "upload",
@@ -3002,7 +3011,7 @@ async function metarepoAdapters(root, o = {}) {
 
 // packages/planner/dist/draft.js
 import { existsSync } from "node:fs";
-import { mkdir as mkdir3, readdir as readdir7, readFile as readFile10 } from "node:fs/promises";
+import { mkdir as mkdir2, readdir as readdir7, readFile as readFile10 } from "node:fs/promises";
 import { dirname as dirname2, join as join12, posix } from "node:path";
 
 // packages/planner/dist/stages/thread.js
@@ -3013,7 +3022,7 @@ import { join as join11 } from "node:path";
 // packages/planner/dist/stages/loop.js
 var import_yaml10 = __toESM(require_dist(), 1);
 import { createHash as createHash4 } from "node:crypto";
-import { copyFile, mkdir as mkdir2, readdir as readdir6, readFile as readFile8, rm as rm3, stat } from "node:fs/promises";
+import { readdir as readdir6, readFile as readFile8, rm as rm3, stat } from "node:fs/promises";
 import { join as join10 } from "node:path";
 
 // packages/planner/dist/stages/cite.js
@@ -4240,7 +4249,7 @@ async function gapsOf(root, change, unknown) {
   return out;
 }
 async function codeReaders() {
-  const x = await import("./chunk-UBEFT3MQ.js");
+  const x = await import("./chunk-TFN2N227.js");
   return {
     outline: (path, text4) => x.declarationOutline(path, text4),
     outlines: (path) => x.syntaxLanguageOf(path) !== void 0
@@ -5720,14 +5729,7 @@ async function editedFiles(dir, loop, source) {
   return out;
 }
 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 mkdir2(join10(dest, ".."), { recursive: true });
-    await copyFile(from, dest).catch(() => void 0);
-  }
-  return `${rel}/${to}/`;
+  return await keepPersonWritten(dir, rel, stage, files, { atLeast: n }) ?? `${rel}/stage/${stage}-by-person/${n}/`;
 }
 async function draftText(dir, files) {
   const out = [];
@@ -6663,7 +6665,7 @@ async function draftChange(root, changeId, o) {
     const files = [];
     for (const [rel2, text4] of [...answer].sort(([a], [b]) => a.localeCompare(b))) {
       const path = join12(dir, rel2);
-      await mkdir3(dirname2(path), { recursive: true });
+      await mkdir2(dirname2(path), { recursive: true });
       await writeFileAtomic(path, stamp2 + text4);
       files.push(rel2);
     }
@@ -7274,12 +7276,12 @@ function designGaps(d) {
 
 // packages/planner/dist/stages/feature.js
 var import_yaml14 = __toESM(require_dist(), 1);
-import { copyFile as copyFile2, mkdir as mkdir6, readdir as readdir10, readFile as readFile14 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir5, readdir as readdir10, readFile as readFile14 } from "node:fs/promises";
 import { basename as basename2, join as join16 } from "node:path";
 
 // packages/planner/dist/stages/knowledge-applies.js
 var import_yaml12 = __toESM(require_dist(), 1);
-import { mkdir as mkdir4, readFile as readFile11, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
+import { mkdir as mkdir3, readFile as readFile11, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join13 } from "node:path";
 var KNOWLEDGE_INDEX_KINDS = [
   "Pattern",
@@ -7339,7 +7341,7 @@ async function write(root, doc) {
   const order2 = { confirmed: 0, suggested: 1, excluded: 2 };
   const items = [...doc.items].sort((a, b) => order2[a.status] - order2[b.status] || b.score - a.score || a.id.localeCompare(b.id));
   const nearMisses = [...doc.nearMisses].sort((a, b) => a.stage.localeCompare(b.stage) || b.score - a.score || a.id.localeCompare(b.id));
-  await mkdir4(changeFolder(root, doc.change), { recursive: true });
+  await mkdir3(changeFolder(root, doc.change), { recursive: true });
   await writeFile2(pathOf(root, doc.change), toCanonicalYaml({ ...doc, items, nearMisses }, ["schemaVersion", "change"]), "utf8");
 }
 async function recordKnowledge(root, change, stage, report) {
@@ -7779,7 +7781,7 @@ function dropUncitedQuestions(d) {
 // packages/planner/dist/stages/openspec-files.js
 var import_yaml13 = __toESM(require_dist(), 1);
 import { existsSync as existsSync2 } from "node:fs";
-import { cp, mkdir as mkdir5, mkdtemp, readdir as readdir9, readFile as readFile13, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
+import { cp, mkdir as mkdir4, mkdtemp, readdir as readdir9, readFile as readFile13, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { basename, dirname as dirname3, join as join15 } from "node:path";
 var SPEC_MARK = "<!-- Generated by atticus plan stories from the stories' acceptance criteria. Edit the stories and run the stage again. -->";
@@ -7962,7 +7964,7 @@ async function writeSpecFiles(dir, files, mark = SPEC_MARK) {
     const had = await readFile13(f, "utf8").catch(() => void 0);
     if (had !== void 0 && !had.startsWith(mark))
       continue;
-    await mkdir5(dirname3(f), { recursive: true });
+    await mkdir4(dirname3(f), { recursive: true });
     await writeFileAtomic(f, text4);
     written.push(rel);
   }
@@ -8142,7 +8144,7 @@ async function validateDraft(root, change, dir, files, o = {}) {
   const tmp = await mkdtemp(join15(tmpdir(), "atticus-validate-"));
   try {
     const os = join15(osRoot, "openspec");
-    await mkdir5(join15(tmp, "openspec", "changes", change), { recursive: true });
+    await mkdir4(join15(tmp, "openspec", "changes", change), { recursive: true });
     for (const f of ["config.yaml", "schemas", "specs"])
       if (existsSync2(join15(os, f)))
         await cp(join15(os, f), join15(tmp, "openspec", f), { recursive: true });
@@ -8152,7 +8154,7 @@ async function validateDraft(root, change, dir, files, o = {}) {
         await cp(join15(dir, f), join15(target, f));
     for (const [rel, text4] of Object.entries(files)) {
       const f = join15(target, ...rel.split("/"));
-      await mkdir5(dirname3(f), { recursive: true });
+      await mkdir4(dirname3(f), { recursive: true });
       await writeFile3(f, text4, "utf8");
     }
     await setSkipSpecs(target, !Object.keys(files).some((f) => f.startsWith("specs/")));
@@ -8319,7 +8321,7 @@ async function personStories(dir) {
     if (!f.endsWith(".md"))
       continue;
     const text4 = await readFile14(join16(dir, "stories", f), "utf8");
-    if (!text4.startsWith(GENERATED_MARK))
+    if (!isGenerated(text4))
       out.push({ file: `stories/${f}`, text: text4 });
   }
   return out;
@@ -8453,8 +8455,8 @@ 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(join16(dir, "design"), { recursive: true });
-    await copyFile2(o.fromFigma, join16(dir, ...designRel.split("/")));
+    await mkdir5(join16(dir, "design"), { recursive: true });
+    await copyFile(o.fromFigma, join16(dir, ...designRel.split("/")));
   }
   let design;
   if (designRel) {
@@ -8789,7 +8791,7 @@ function mergeDelta(d, today) {
 
 // packages/planner/dist/stages/story-code.js
 import { readFile as readFile15, realpath, stat as stat3 } from "node:fs/promises";
-import { isAbsolute, relative as relative2, resolve, sep as sep2 } from "node:path";
+import { isAbsolute, relative as relative3, resolve, sep as sep3 } from "node:path";
 var STORY_CODE_AROUND = 3;
 var STORY_CODE_SHARE = 0.2;
 var MAX_FILE_BYTES = 512 * 1024;
@@ -8802,13 +8804,13 @@ async function inside(base, path) {
   if (!path || path.includes("\0") || isAbsolute(path) || /^[a-zA-Z]:/.test(path))
     return void 0;
   const full = resolve(base, ...path.split(/[\\/]+/));
-  const rel = relative2(base, full);
+  const rel = relative3(base, full);
   if (!rel || rel.startsWith("..") || isAbsolute(rel))
     return void 0;
   try {
     const [real, realBase] = await Promise.all([realpath(full), realpath(base)]);
-    const r = relative2(realBase, real);
-    if (!r || r.startsWith("..") || isAbsolute(r) || r.split(sep2).includes(".."))
+    const r = relative3(realBase, real);
+    if (!r || r.startsWith("..") || isAbsolute(r) || r.split(sep3).includes(".."))
       return void 0;
     if ((await stat3(real)).size > MAX_FILE_BYTES)
       return void 0;
@@ -11250,7 +11252,7 @@ var classificationLevels = (ctx) => ctx.orgPack.pack?.classification ?? ["public
 
 // packages/planner/dist/stages/stories.js
 var import_yaml21 = __toESM(require_dist(), 1);
-import { mkdir as mkdir7, readdir as readdir15, readFile as readFile23, rm as rm6 } from "node:fs/promises";
+import { mkdir as mkdir6, readdir as readdir15, readFile as readFile23, rm as rm6 } from "node:fs/promises";
 import { join as join25 } from "node:path";
 
 // packages/planner/dist/needs.js
@@ -16251,7 +16253,7 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
     if (keep.has(f) || !f.endsWith(".md"))
       continue;
     const text4 = await readFile23(join25(dir, "stories", f), "utf8");
-    if (!text4.startsWith(GENERATED_MARK))
+    if (!isGenerated(text4))
       continue;
     const h = wrote.get(`stories/${f}`);
     if (h && ![...h].some((x) => wroteThis(`stories/${f}`, text4, x))) {
@@ -16267,7 +16269,7 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
     ...extras.knowledge ? { selected: extras.knowledge } : {}
   });
   for (const p of await readdir15(join25(dir, "tasks")).catch(() => []))
-    if (p.endsWith(".prompt.md") && (await readFile23(join25(dir, "tasks", p), "utf8")).startsWith(GENERATED_MARK))
+    if (p.endsWith(".prompt.md") && isGenerated(await readFile23(join25(dir, "tasks", p), "utf8")))
       await rm6(join25(dir, "tasks", p));
   const spec = await openspecFiles(root, change, stories, a, extras.estate);
   const files = [];
@@ -16290,7 +16292,7 @@ async function writeStories(root, change, stories, answer, requests, now, unjudg
     await writeFileAtomic(join25(dir, "stories", `${s.id}.md`), renderStoryFile(change, s, w, unjudged, x));
     files.push(`stories/${s.id}.md`);
     for (const [rel, text4] of Object.entries(taskPromptFiles(change, s, w, x))) {
-      await mkdir7(join25(dir, ...rel.split("/").slice(0, -1)), { recursive: true });
+      await mkdir6(join25(dir, ...rel.split("/").slice(0, -1)), { recursive: true });
       await writeFileAtomic(join25(dir, ...rel.split("/")), text4);
       files.push(rel);
     }
@@ -16519,16 +16521,11 @@ async function storiesStage(root, changeId, o) {
     throw new PlannerError("refused", `${change.id}'s target flows change no step (${empty.map((d) => d.flow).join(", ")} only say modify): run atticus change architecture ${change.id} again.`);
   if (!deltas.length)
     throw new PlannerError("refused", `${change.id} has no target flows yet: run atticus change architecture ${change.id} first.`);
-  if (!o.force) {
-    const own = [];
-    for (const f of ["stories.md", "tasks.md", "requests.md"]) {
-      const t = await readFile23(join25(dir, f), "utf8").catch(() => void 0);
-      if (t !== void 0 && !t.startsWith(GENERATED_MARK))
-        own.push(f);
-    }
-    if (own.length)
-      throw new PlannerError("refused", `${change.id} already has planning files a person wrote: ${own.join(", ")}. Re-run with --force to replace them.`);
-  }
+  const own = await personWrittenPlanning(dir);
+  if (!o.force && own.length)
+    throw new PlannerError("refused", `${change.id} already has planning files a person wrote: ${own.join(", ")}. Re-run with --force to replace them.`);
+  const keptOwn = o.force ? await keepPersonWritten(dir, rel, "stories", own) : void 0;
+  const ownNote = keptOwn ? `${own.join(", ")} ${own.length === 1 ? "was" : "were"} written by a person; a copy is in ${keptOwn}, and the stage writes ${own.length === 1 ? "it" : "them"} again (--force).` : void 0;
   const ctx = await loadChangeContext(root);
   const estate = await loadEstate(root, ctx.records);
   const items = (await readKnowledge(root, { cacheRoot: root })).items.filter((i) => i.kind === "ProcessDefinition");
@@ -16868,6 +16865,8 @@ Rules:
   await recordKnowledge(root, change.id, "stories", context);
   res.notes.unshift(...settled.notes);
   res.notes.push(...attached.notes, ...runNotes, ...writeNotes);
+  if (ownNote)
+    res.notes.unshift(ownNote);
   if (res.answer)
     for (const c of await seedCollisions(root, change.id))
       res.notes.push(seedCollisionWords(c));
@@ -18917,7 +18916,6 @@ export {
   parseProse,
   fallbackProse,
   writeProse,
-  GENERATED_MARK,
   renderStory,
   renderIndex,
   renderTasks,

package/dist/{chunk-KAWWXCPI.js → chunk-DVQCYF3V.js}

@@ -7,18 +7,18 @@ import {
   estateRepos,
   joinReposOf,
   outsideSystems
-} from "./chunk-2HDNOUJU.js";
+} from "./chunk-6H62UHY5.js";
 import {
   factIdPart,
   factsDirOf,
   joinFacts,
   orgPackDirOf,
   parseFacts
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   joinConventions,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 
 // packages/cli/dist/onboarding-queue.js
 import { readFile } from "node:fs/promises";