@basou/cli 0.25.0 → 0.26.0

package/dist/program.js

@@ -3364,9 +3364,13 @@ async function assertWorkspaceInitialized7(basouRoot) {
 
 // src/commands/project.ts
 import {
+  closeSync,
   existsSync,
+  constants as fsConstants,
+  ftruncateSync,
   lstatSync,
   mkdirSync,
+  openSync,
   readdirSync,
   readFileSync,
   readlinkSync,
@@ -3374,11 +3378,15 @@ import {
   statSync,
   symlinkSync,
   unlinkSync,
-  writeFileSync
+  writeFileSync,
+  writeSync
 } from "fs";
 import { basename as basename4, dirname as dirname2, isAbsolute as isAbsolute3, join as join7, relative as relative2, resolve as resolve7 } from "path";
 import {
+  appendBasouGitignore as appendBasouGitignore2,
   basouPaths as basouPaths10,
+  createManifest as createManifest2,
+  ensureBasouDirectory as ensureBasouDirectory2,
   GENERATED_END,
   GENERATED_START,
   isGitNotFound,
@@ -3392,7 +3400,9 @@ import {
   readManifest as readManifest6,
   readMarkdownFile as readMarkdownFile4,
   reconcileSourceRoots,
+  removeMarkerSection,
   renderWithMarkers as renderWithMarkers4,
+  resolveRepositoryRoot as resolveRepositoryRoot8,
   safeSimpleGit,
   summarizePresetPlan,
   summarizeRosterDrift,
@@ -3474,6 +3484,27 @@ function registerProjectCommand(program) {
   ).option("--json", "Output the result as JSON").option("-v, --verbose", "Show error causes").action(async (oldPath, newPath, opts) => {
     await runProjectRename(oldPath, newPath, opts);
   });
+  project.command("teardown").argument("<repo>", "The repo path whose basou-generated wiring to tear down (e.g. ../takuhon)").description(
+    "Remove the basou-generated wiring for one repo: its instruction symlinks (AGENTS.md / CLAUDE.md / copilot), its `.gitignore` patterns, its workspace view symlink, and the generated block in the anchor's canonical. Dry-run by default (a classified plan: removable / foreign / blocked); pass --apply to remove ONLY the verified-basou artifacts, re-checking each just before it acts \u2014 a real file, a foreign symlink, or hand-authored canonical prose is never touched. This is the destructive counterpart to `archive` (which only drops the manifest declaration): archive first, then teardown to clean the on-disk wiring. The anchor (`.`) is refused. Not reversible \u2014 the manifest is git-tracked but the removed symlinks/lines are not"
+  ).option("--apply", "Remove the verified-basou artifacts (default: dry-run classified preview)").option("--json", "Output the result as JSON").option("-v, --verbose", "Show error causes").action(async (repo, opts) => {
+    await runProjectTeardown(repo, opts);
+  });
+  project.command("new").argument("[repos...]", "Extra repo paths (besides the anchor) to seed into the roster").description(
+    "Scaffold a new project from scratch at the current Git repository (the anchor): create `.basou/` and seed the manifest with a candidate `repos` roster (the anchor plus any given repos, which must already be git repositories) and a `workspace.view` placeholder. Dry-run by default; pass --apply to write. Pass --no-view for a solo project. The greenfield entry point \u2014 declare visibility/language per repo afterward, then run `basou project derive --apply` to materialize the wiring"
+  ).option("--apply", "Create `.basou/` and write the seeded manifest (default: dry-run preview)").option(
+    "--view <path>",
+    "Override the workspace view path (default: a <name>-workspace sibling)"
+  ).option("--no-view", "Solo project: declare no workspace view").option(
+    "--local-only",
+    "Write a .basou/ full-exclude .gitignore block (keep the trail out of version control) instead of the default ignore+commit block"
+  ).option("-f, --force", "Overwrite an existing manifest").option("--json", "Output the result as JSON").option("-v, --verbose", "Show error causes").action(async (repos, opts) => {
+    await runProjectNew(repos, opts);
+  });
+  project.command("derive").description(
+    "Materialize a project's full wiring from the declared manifest: sync `source_roots` to the roster, generate each repo's canonical preset block, its instruction-file symlinks, the workspace view, and each public repo's .gitignore \u2014 in dependency order. Dry-run by default; pass --apply to write. The greenfield counterpart to `new` (run after declaring visibility/language) and a one-shot maintenance pass. Re-runnable: each step is idempotent, so a partial apply recovers on a second run"
+  ).option("--apply", "Run every step in apply mode (default: dry-run preview)").option("-v, --verbose", "Show error causes").action(async (opts) => {
+    await runProjectDerive(opts);
+  });
 }
 async function runProjectCheck(options, ctx = {}) {
   try {
@@ -3489,7 +3520,7 @@ function effectiveSourceRoots(manifest) {
 function preservedUnknownLines(fields) {
   if (fields.length === 0) return [];
   return [
-    `\u2139\uFE0F basou \u304C\u8A8D\u8B58\u3057\u306A\u3044 manifest \u306E\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u30D5\u30A3\u30FC\u30EB\u30C9\u3092 ${fields.length} \u4EF6\u4FDD\u6301\u3057\u3066\u3044\u307E\u3059(write \u6642\u3082\u524A\u9664\u3057\u307E\u305B\u3093): ${fields.join(", ")}`,
+    `\u2139\uFE0F Preserving ${fields.length} unrecognized top-level manifest field${fields.length === 1 ? "" : "s"} (kept on write, never dropped): ${fields.join(", ")}`,
     ""
   ];
 }
@@ -3511,39 +3542,41 @@ async function doRunProjectCheck(options, ctx) {
 }
 function renderProjectCheck(summary) {
   const lines = [];
-  lines.push("# \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u69CB\u6210\u30C1\u30A7\u30C3\u30AF(\u5BA3\u8A00 vs \u6355\u6349)");
+  lines.push("# Project composition check (declared vs captured)");
   lines.push("");
   if (summary.declaredCount === 0) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002`source_roots` \u306E\u307F\u3067\u904B\u7528\u4E2D\u306E\u305F\u3081\u3001\u5BA3\u8A00\u3068\u306E\u7167\u5408\u306F\u3067\u304D\u307E\u305B\u3093\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). Running on `source_roots` alone, so there is nothing to compare the declaration against."
     );
     if (summary.extra.length > 0) {
       lines.push("");
-      lines.push(`\u6355\u6349\u4E2D\u306E source_roots (${summary.extra.length}):`);
+      lines.push(`Captured source_roots (${summary.extra.length}):`);
       for (const p of summary.extra) lines.push(`- ${p}`);
     }
     return lines.join("\n");
   }
   if (summary.gaps.length === 0) {
     lines.push(
-      `\u2705 \u5BA3\u8A00\u3055\u308C\u305F ${summary.declaredCount} repo \u306F\u3059\u3079\u3066\u6355\u6349\u5BFE\u8C61(source_roots)\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002`
+      `\u2705 All ${summary.declaredCount} declared repo${summary.declaredCount === 1 ? " is" : "s are"} covered by the capture config (source_roots).`
     );
   } else {
-    lines.push(`\u26A0\uFE0F \u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u306E\u306B\u6355\u6349\u5BFE\u8C61\u306B\u7121\u3044 repo: ${summary.gaps.length}(\u53D6\u308A\u3053\u307C\u3057)`);
+    lines.push(
+      `\u26A0\uFE0F Declared but not captured: ${summary.gaps.length} repo${summary.gaps.length === 1 ? "" : "s"}`
+    );
     for (const g of summary.gaps) {
-      lines.push(`- ${g.path}${g.visibility ? ` [${g.visibility}]` : ""} \u2014 source_roots \u306B\u672A\u767B\u9332`);
+      lines.push(`- ${g.path}${g.visibility ? ` [${g.visibility}]` : ""} \u2014 not in source_roots`);
     }
   }
   lines.push("");
   if (summary.extra.length > 0) {
     lines.push(
-      `## \u5BA3\u8A00\u5916\u306E\u6355\u6349\u5BFE\u8C61 (${summary.extra.length}) \u2014 workspace view \u304B\u3001\u5BA3\u8A00\u6F0F\u308C\u306E\u53EF\u80FD\u6027`
+      `## Captured but undeclared (${summary.extra.length}) \u2014 the workspace view, or a missing declaration`
     );
     for (const p of summary.extra) lines.push(`- ${p}`);
     lines.push("");
   }
   lines.push(
-    "\u6CE8: read-only \u306E advisory \u3067\u3059\u3002\u5BA3\u8A00(repos)\u3068\u6355\u6349\u8A2D\u5B9A(source_roots)\u306E\u5DEE\u5206\u306E\u307F\u3092\u8868\u793A\u3057\u3001enforce \u306F\u3057\u307E\u305B\u3093\u3002"
+    "Note: read-only advisory. It only shows the difference between the declaration (repos) and the capture config (source_roots); it does not enforce."
   );
   return lines.join("\n");
 }
@@ -3593,29 +3626,33 @@ async function doRunProjectSync(options, ctx) {
 }
 function renderProjectSync(result) {
   const lines = [];
-  lines.push("# source_roots \u540C\u671F(\u5BA3\u8A00\u30ED\u30FC\u30B9\u30BF\u30FC \u2192 \u6355\u6349\u8A2D\u5B9A)");
+  lines.push("# source_roots sync (declared roster \u2192 capture config)");
   lines.push("");
   lines.push(...preservedUnknownLines(result.preservedUnknownFields));
   if (!result.hasRoster) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002\u540C\u671F\u306E\u5143\u306B\u306A\u308B\u5BA3\u8A00\u304C\u7121\u3044\u305F\u3081\u3001\u5909\u66F4\u306F\u3042\u308A\u307E\u305B\u3093\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). There is no declaration to sync from, so nothing changes."
     );
     return lines.join("\n");
   }
   if (result.unchanged) {
-    lines.push("\u2705 source_roots \u306F\u5BA3\u8A00\u30ED\u30FC\u30B9\u30BF\u30FC\u3092\u3059\u3079\u3066\u8986\u3063\u3066\u3044\u307E\u3059(\u540C\u671F\u4E0D\u8981)\u3002");
+    lines.push("\u2705 source_roots already covers the entire declared roster (nothing to sync).");
     return lines.join("\n");
   }
   if (result.applied) {
-    lines.push(`\u2705 source_roots \u306B ${result.added.length} \u4EF6\u8FFD\u52A0\u3057\u307E\u3057\u305F:`);
+    lines.push(
+      `\u2705 Added ${result.added.length} entr${result.added.length === 1 ? "y" : "ies"} to source_roots:`
+    );
     for (const p of result.added) lines.push(`- ${p}`);
   } else {
     lines.push(
-      `${result.added.length} \u4EF6\u306E repo \u304C source_roots \u306B\u672A\u767B\u9332\u3067\u3059\u3002\u8FFD\u52A0\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+      `${result.added.length} repo${result.added.length === 1 ? " is" : "s are"} not in source_roots. To add (dry-run; pass --apply to write):`
     );
     for (const p of result.added) lines.push(`- ${p}`);
     lines.push("");
-    lines.push("\u6CE8: \u65E2\u5B58\u306E source_roots \u306F\u4FDD\u6301\u3057\u3001\u4E0D\u8DB3\u5206\u306E\u8FFD\u8A18\u306E\u307F\u884C\u3044\u307E\u3059(\u524A\u9664\u306F\u3057\u307E\u305B\u3093)\u3002");
+    lines.push(
+      "Note: existing source_roots are kept; only the missing entries are appended (nothing is removed)."
+    );
   }
   return lines.join("\n");
 }
@@ -3675,37 +3712,41 @@ async function doRunProjectAdopt(options, ctx) {
 }
 function renderProjectAdopt(result) {
   const lines = [];
-  lines.push("# repo \u30ED\u30FC\u30B9\u30BF\u30FC\u306E bootstrap(source_roots \u2192 repos)");
+  lines.push("# Bootstrap repo roster (source_roots \u2192 repos)");
   lines.push("");
   lines.push(...preservedUnknownLines(result.preservedUnknownFields));
   if (result.alreadyDeclared) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC(manifest \u306E `repos`)\u306F\u65E2\u306B\u5BA3\u8A00\u6E08\u307F\u3067\u3059\u3002adopt \u306F\u4E00\u5EA6\u304D\u308A\u306E bootstrap \u306E\u305F\u3081\u4F55\u3082\u66F8\u304D\u8FBC\u307F\u307E\u305B\u3093\u3002\u4EE5\u5F8C\u306E\u4FDD\u5B88\u306F `project check` / `project sync` \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F A repo roster (manifest `repos`) is already declared. adopt is a one-time bootstrap, so it writes nothing. Use `project check` / `project sync` for ongoing maintenance."
     );
     return lines.join("\n");
   }
   if (result.repos.length === 0) {
-    lines.push("\u2139\uFE0F source_roots \u306B git repo \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F(bootstrap \u5BFE\u8C61\u306A\u3057)\u3002");
+    lines.push("\u2139\uFE0F No git repo found in source_roots (nothing to bootstrap).");
   } else if (result.applied) {
-    lines.push(`\u2705 ${result.repos.length} repo \u3092 repos \u30ED\u30FC\u30B9\u30BF\u30FC\u306B\u66F8\u304D\u8FBC\u307F\u307E\u3057\u305F:`);
+    lines.push(
+      `\u2705 Wrote ${result.repos.length} repo${result.repos.length === 1 ? "" : "s"} to the repos roster:`
+    );
     for (const r of result.repos) lines.push(`- ${r.path}`);
     lines.push("");
     lines.push(
-      "\u6CE8: visibility \u306F\u672A\u8A2D\u5B9A\u3067\u3059\u3002\u5404 repo \u306B public / private / future-public \u3092\u624B\u52D5\u3067\u4ED8\u4E0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "Note: visibility is unset. Assign public / private / future-public to each repo manually."
     );
   } else {
     lines.push(
-      `${result.repos.length} repo \u3092 repos \u30ED\u30FC\u30B9\u30BF\u30FC\u306B\u5BA3\u8A00\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+      `${result.repos.length} repo${result.repos.length === 1 ? "" : "s"} to declare in the repos roster (dry-run; pass --apply to write):`
     );
     for (const r of result.repos) lines.push(`- ${r.path}`);
     lines.push("");
-    lines.push("\u6CE8: visibility \u306F\u672A\u8A2D\u5B9A\u3067\u63D0\u6848\u3057\u307E\u3059\u3002\u53CD\u6620\u5F8C\u306B\u624B\u52D5\u3067\u4ED8\u4E0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+    lines.push("Note: visibility is proposed unset; assign it manually after applying.");
   }
   if (result.excluded.length > 0) {
     lines.push("");
-    lines.push(`## \u9664\u5916 (${result.excluded.length}) \u2014 git repo \u3067\u306F\u306A\u3044\u305F\u3081 repos \u306B\u542B\u3081\u307E\u305B\u3093`);
+    lines.push(
+      `## Excluded (${result.excluded.length}) \u2014 not a git repo, so not included in repos`
+    );
     for (const e of result.excluded) {
-      const reason = e.kind === "non-repo" ? "\u975E repo(workspace view / tmp \u7B49)" : "\u89E3\u6C7A\u4E0D\u80FD(\u30D1\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044)";
+      const reason = e.kind === "non-repo" ? "not a repo (workspace view / tmp, etc.)" : "unresolvable (path does not exist)";
       lines.push(`- ${e.path} \u2014 ${reason}`);
     }
   }
@@ -3773,50 +3814,56 @@ async function doRunProjectWiring(options, ctx) {
 }
 function renderProjectWiring(result) {
   const lines = [];
-  lines.push("# \u6307\u793A\u66F8 wiring \u30C1\u30A7\u30C3\u30AF(\u5BA3\u8A00\u30ED\u30FC\u30B9\u30BF\u30FC \xD7 \u6307\u793A\u66F8\u306E\u5B58\u5728/git \u8FFD\u8DE1)");
+  lines.push(
+    "# Instruction-file wiring check (declared roster \xD7 instruction-file presence / git tracking)"
+  );
   lines.push("");
   if (!result.hasRoster) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002`basou project adopt` \u3067\u5BA3\u8A00\u3057\u3066\u304B\u3089\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). Declare one with `basou project adopt`, then re-run."
     );
     return lines.join("\n");
   }
   if (result.risks.length > 0) {
     lines.push(
-      `\u26A0\uFE0F \u516C\u958B\u7CFB repo \u3067\u6307\u793A\u66F8\u304C git \u8FFD\u8DE1\u3055\u308C\u3066\u3044\u307E\u3059: ${result.risks.length}(canonical \u306E\u6F0F\u6D29\u30EA\u30B9\u30AF)`
+      `\u26A0\uFE0F Instruction files tracked by git in public-facing repos: ${result.risks.length} (canonical leak risk)`
     );
     for (const r of result.risks) {
       lines.push(
-        `- ${r.repo} [${r.visibility}] \u2014 ${r.file} \u304C tracked(gitignore \u3055\u308C\u305F symlink \u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059)`
+        `- ${r.repo} [${r.visibility}] \u2014 ${r.file} is tracked (it should be a gitignored symlink)`
       );
     }
   } else if (result.ok) {
-    lines.push("\u2705 \u516C\u958B\u7CFB repo \u3067 git \u8FFD\u8DE1\u3055\u308C\u3066\u3044\u308B\u6307\u793A\u66F8\u306F\u3042\u308A\u307E\u305B\u3093(privacy \u30EA\u30B9\u30AF\u306A\u3057)\u3002");
+    lines.push(
+      "\u2705 No instruction file is tracked by git in a public-facing repo (no privacy risk)."
+    );
   } else {
     lines.push(
-      "\u2139\uFE0F \u78BA\u5B9A\u3057\u305F privacy \u30EA\u30B9\u30AF\u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u5224\u5B9A\u3067\u304D\u306A\u3044/\u5230\u9054\u3067\u304D\u306A\u3044 repo \u304C\u3042\u308A\u307E\u3059(\u4E0B\u8A18\u53C2\u7167)\u3002"
+      "\u2139\uFE0F No confirmed privacy risk, but some repos are unjudgeable / unreachable (see below)."
     );
   }
   lines.push("");
   if (result.unknown.length > 0) {
     lines.push(
-      `## visibility \u672A\u8A2D\u5B9A (${result.unknown.length}) \u2014 privacy \u5224\u5B9A\u4E0D\u53EF\u3002manifest \u306E repos \u306B visibility \u3092\u4ED8\u4E0E\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## Visibility unset (${result.unknown.length}) \u2014 privacy cannot be judged. Assign visibility in the manifest repos`
     );
     for (const p of result.unknown) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.incomplete.length > 0) {
-    lines.push(`## \u6307\u793A\u66F8\u306E\u6B20\u843D (${result.incomplete.length}) \u2014 \u5F8C\u7D9A\u306E\u751F\u6210\u30B9\u30E9\u30A4\u30B9\u3067\u88DC\u5B8C\u4E88\u5B9A`);
+    lines.push(
+      `## Missing instruction files (${result.incomplete.length}) \u2014 to be filled by a later generation slice`
+    );
     for (const i of result.incomplete) lines.push(`- ${i.repo} \u2014 ${i.missing.join(", ")}`);
     lines.push("");
   }
   if (result.unreachable.length > 0) {
-    lines.push(`## \u5230\u9054\u4E0D\u80FD (${result.unreachable.length}) \u2014 \u30D1\u30B9\u672A\u89E3\u6C7A / git repo \u3067\u306A\u3044`);
+    lines.push(`## Unreachable (${result.unreachable.length}) \u2014 path unresolved / not a git repo`);
     for (const p of result.unreachable) lines.push(`- ${p}`);
     lines.push("");
   }
   lines.push(
-    "\u6CE8: read-only \u306E advisory \u3067\u3059\u3002\u6307\u793A\u66F8\u306E\u5B58\u5728\u3068 git \u8FFD\u8DE1\u72B6\u6CC1\u306E\u307F\u3092\u8868\u793A\u3057\u3001\u751F\u6210\u30FBenforce \u306F\u3057\u307E\u305B\u3093(.basou \u306E\u30D5\u30C3\u30C8\u30D7\u30EA\u30F3\u30C8\u306F `basou view --check`)\u3002"
+    "Note: read-only advisory. It only shows instruction-file presence and git-tracking status; it neither generates nor enforces (for the .basou footprint, use `basou view --check`)."
   );
   return lines.join("\n");
 }
@@ -3895,45 +3942,47 @@ async function doRunProjectGitignore(options, ctx) {
 }
 function renderProjectGitignore(result) {
   const lines = [];
-  lines.push("# .gitignore \u751F\u6210(\u516C\u958B\u7CFB repo \u306E\u6307\u793A\u66F8\u3092\u9664\u5916)");
+  lines.push("# .gitignore generation (exclude instruction files in public-facing repos)");
   lines.push("");
   if (!result.hasRoster) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002`basou project adopt` \u3067\u5BA3\u8A00\u3057\u3066\u304B\u3089\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). Declare one with `basou project adopt`, then re-run."
     );
     return lines.join("\n");
   }
   if (result.plans.length > 0) {
-    const verb = result.applied ? "\u8FFD\u52A0\u3057\u307E\u3057\u305F" : "\u8FFD\u52A0\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply)";
+    const verb = result.applied ? "Added to" : "To add to (dry-run; pass --apply to write)";
     lines.push(
-      `${result.applied ? "\u2705 " : ""}${result.plans.length} repo \u306E .gitignore \u306B${verb}:`
+      `${result.applied ? "\u2705 " : ""}${verb} the .gitignore of ${result.plans.length} repo${result.plans.length === 1 ? "" : "s"}:`
     );
     for (const p of result.plans) lines.push(`- ${p.path} \u2014 ${p.toAdd.join(", ")}`);
   } else if (result.ok) {
-    lines.push("\u2705 \u516C\u958B\u7CFB repo \u306E .gitignore \u306F\u6307\u793A\u66F8\u3092\u3059\u3079\u3066\u9664\u5916\u6E08\u307F\u3067\u3059(\u8FFD\u52A0\u4E0D\u8981)\u3002");
+    lines.push(
+      "\u2705 Public-facing repos already exclude every instruction file in .gitignore (nothing to add)."
+    );
   } else {
     lines.push(
-      "\u2139\uFE0F \u8FFD\u52A0\u304C\u5FC5\u8981\u306A\u516C\u958B\u7CFB repo \u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u5224\u5B9A\u3067\u304D\u306A\u3044/\u5230\u9054\u3067\u304D\u306A\u3044 repo \u304C\u3042\u308A\u307E\u3059(\u4E0B\u8A18\u53C2\u7167)\u3002"
+      "\u2139\uFE0F No public-facing repo needs an addition, but some repos are unjudgeable / unreachable (see below)."
     );
   }
   lines.push("");
   if (result.unknown.length > 0) {
     lines.push(
-      `## visibility \u672A\u8A2D\u5B9A (${result.unknown.length}) \u2014 \u5BFE\u8C61\u5916\u3002manifest \u306E repos \u306B visibility \u3092\u4ED8\u4E0E\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## Visibility unset (${result.unknown.length}) \u2014 skipped. Assign visibility in the manifest repos`
     );
     for (const p of result.unknown) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.unreachable.length > 0) {
-    lines.push(`## \u5230\u9054\u4E0D\u80FD (${result.unreachable.length}) \u2014 \u30D1\u30B9\u672A\u89E3\u6C7A / git repo \u3067\u306A\u3044`);
+    lines.push(`## Unreachable (${result.unreachable.length}) \u2014 path unresolved / not a git repo`);
     for (const p of result.unreachable) lines.push(`- ${p}`);
     lines.push("");
   }
   lines.push(
-    "\u6CE8: \u65E2\u5B58\u306E .gitignore \u884C\u306F\u4FDD\u6301\u3057\u3001\u4E0D\u8DB3\u30D1\u30BF\u30FC\u30F3\u306E\u8FFD\u8A18\u306E\u307F\u884C\u3044\u307E\u3059(\u524A\u9664\u306F\u3057\u307E\u305B\u3093)\u3002private / visibility \u672A\u8A2D\u5B9A\u306E repo \u306F\u5BFE\u8C61\u5916\u3067\u3059\u3002"
+    "Note: existing .gitignore lines are kept; only the missing patterns are appended (nothing is removed). private / visibility-unset repos are skipped."
   );
   lines.push(
-    "\u6CE8: .gitignore \u3078\u306E\u8FFD\u8A18\u306F\u3001\u65E2\u306B git \u8FFD\u8DE1\u6E08\u307F\u306E\u30D5\u30A1\u30A4\u30EB\u3092 untrack \u3057\u307E\u305B\u3093\u3002\u8FFD\u8DE1\u6E08\u307F\u306E\u6307\u793A\u66F8\u306F `basou project wiring` \u3067\u691C\u51FA\u3057\u3001`git rm --cached <file>` \u3067\u5916\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    "Note: appending to .gitignore does not untrack files already tracked by git. Detect tracked instruction files with `basou project wiring` and remove them with `git rm --cached <file>`."
   );
   return lines.join("\n");
 }
@@ -4061,11 +4110,11 @@ async function doRunProjectSymlinks(options, ctx) {
 }
 function renderProjectSymlinks(result) {
   const lines = [];
-  lines.push("# \u6307\u793A\u66F8 symlink \u751F\u6210(\u5404 repo \u2192 anchor \u306E canonical)");
+  lines.push("# Instruction-file symlink generation (each repo \u2192 the anchor's canonical)");
   lines.push("");
   if (!result.hasRoster) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002`basou project adopt` \u3067\u5BA3\u8A00\u3057\u3066\u304B\u3089\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). Declare one with `basou project adopt`, then re-run."
     );
     return lines.join("\n");
   }
@@ -4073,14 +4122,14 @@ function renderProjectSymlinks(result) {
     const attempted = result.applied || result.failures.length > 0;
     if (!attempted) {
       lines.push(
-        `${result.plans.length} repo \u306B\u6307\u793A\u66F8 symlink \u3092\u4F5C\u6210\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+        `Instruction-file symlinks to create in ${result.plans.length} repo${result.plans.length === 1 ? "" : "s"} (dry-run; pass --apply to write):`
       );
       for (const p of result.plans) {
         lines.push(`- ${p.path}`);
         for (const c of p.toCreate) lines.push(`    ${c.name} -> ${c.target}`);
       }
     } else {
-      const header = result.failures.length === 0 ? "\u2705 \u6307\u793A\u66F8 symlink \u3092\u4F5C\u6210\u3057\u307E\u3057\u305F:" : result.applied ? "\u6307\u793A\u66F8 symlink \u3092\u4F5C\u6210\u3057\u307E\u3057\u305F(\u4E00\u90E8\u5931\u6557\u3001\u4E0B\u8A18\u53C2\u7167):" : "\u6307\u793A\u66F8 symlink \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(\u4E0B\u8A18\u53C2\u7167):";
+      const header = result.failures.length === 0 ? "\u2705 Created instruction-file symlinks:" : result.applied ? "Created instruction-file symlinks (some failed, see below):" : "Could not create instruction-file symlinks (see below):";
       lines.push(header);
       for (const p of result.plans) {
         const failedFiles = new Set(
@@ -4093,31 +4142,35 @@ function renderProjectSymlinks(result) {
       }
     }
   } else if (result.ok) {
-    lines.push("\u2705 \u5BA3\u8A00\u3055\u308C\u305F\u5168 repo \u306E\u6307\u793A\u66F8 symlink \u306F\u6B63\u3057\u304F\u5F35\u3089\u308C\u3066\u3044\u307E\u3059(\u751F\u6210\u4E0D\u8981)\u3002");
+    lines.push(
+      "\u2705 Every declared repo's instruction-file symlinks are correctly wired (nothing to generate)."
+    );
   } else {
     lines.push(
-      "\u2139\uFE0F \u751F\u6210\u304C\u5FC5\u8981\u306A symlink \u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u7AF6\u5408 / \u885D\u7A81 / canonical \u4E0D\u5728 / \u5230\u9054\u3067\u304D\u306A\u3044 repo \u304C\u3042\u308A\u307E\u3059(\u4E0B\u8A18\u53C2\u7167)\u3002"
+      "\u2139\uFE0F No symlink needs generating, but there are conflicts / collisions / a missing canonical / unreachable repos (see below)."
     );
   }
   lines.push("");
   if (result.failures.length > 0) {
-    lines.push(`## \u4F5C\u6210\u306B\u5931\u6557 (${result.failures.length}) \u2014 \u4E00\u90E8\u306E symlink \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F`);
+    lines.push(
+      `## Creation failed (${result.failures.length}) \u2014 some symlinks could not be created`
+    );
     for (const f of result.failures) lines.push(`- ${f.repo} \u2014 ${f.file}: ${f.message}`);
     lines.push("");
   }
   if (result.conflicts.length > 0) {
     lines.push(
-      `## \u7AF6\u5408 (${result.conflicts.length}) \u2014 \u65E2\u5B58\u3092\u4E0A\u66F8\u304D\u3057\u307E\u305B\u3093\u3002\u624B\u52D5\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## Conflicts (${result.conflicts.length}) \u2014 existing entries are not overwritten. Check them manually`
     );
     for (const c of result.conflicts) {
-      const detail = c.reason === "mismatch" ? `\u5225\u306E\u5834\u6240\u3092\u6307\u3059 symlink(\u73FE\u5728: ${c.actualTarget ?? "?"})` : c.reason === "occupied" ? "symlink \u3067\u306A\u3044\u5B9F\u30D5\u30A1\u30A4\u30EB/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA" : "\u691C\u67FB\u3067\u304D\u306A\u3044\u30D1\u30B9(\u89AA\u304C\u975E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u7B49)";
+      const detail = c.reason === "mismatch" ? `a symlink pointing elsewhere (currently: ${c.actualTarget ?? "?"})` : c.reason === "occupied" ? "a real file/directory, not a symlink" : "an uninspectable path (a parent component is not a directory, etc.)";
       lines.push(`- ${c.repo} \u2014 ${c.file}: ${detail}`);
     }
     lines.push("");
   }
   if (result.collisions.length > 0) {
     lines.push(
-      `## canonical \u885D\u7A81 (${result.collisions.length}) \u2014 \u5225 repo \u304C\u540C\u540D canonical \u3092\u5171\u6709(\u81EA\u52D5\u914D\u7DDA\u3057\u307E\u305B\u3093)`
+      `## Canonical collisions (${result.collisions.length}) \u2014 another repo shares the same-named canonical (not auto-wired)`
     );
     for (const c of result.collisions) {
       lines.push(`- agents/${c.canonicalName}/AGENTS.md \u2190 ${c.repos.join(", ")}`);
@@ -4126,18 +4179,18 @@ function renderProjectSymlinks(result) {
   }
   if (result.missingCanonical.length > 0) {
     lines.push(
-      `## canonical \u4E0D\u5728 (${result.missingCanonical.length}) \u2014 anchor \u306B agents/<repo>/AGENTS.md \u304C\u7121\u3044\u305F\u3081\u751F\u6210\u3067\u304D\u307E\u305B\u3093`
+      `## Canonical missing (${result.missingCanonical.length}) \u2014 the anchor has no agents/<repo>/AGENTS.md, so nothing can be generated`
     );
     for (const p of result.missingCanonical) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.unreachable.length > 0) {
-    lines.push(`## \u5230\u9054\u4E0D\u80FD (${result.unreachable.length}) \u2014 \u30D1\u30B9\u672A\u89E3\u6C7A / git repo \u3067\u306A\u3044`);
+    lines.push(`## Unreachable (${result.unreachable.length}) \u2014 path unresolved / not a git repo`);
     for (const p of result.unreachable) lines.push(`- ${p}`);
     lines.push("");
   }
   lines.push(
-    "\u6CE8: \u65E2\u5B58\u30D5\u30A1\u30A4\u30EB\u30FB\u5225\u306E\u5834\u6240\u3092\u6307\u3059 symlink \u306F\u4E0A\u66F8\u304D\u305B\u305A\u3001\u4E0D\u8DB3\u5206\u306E\u4F5C\u6210\u306E\u307F\u884C\u3044\u307E\u3059(GEMINI.md \u306F\u5EC3\u6B62\u306E\u305F\u3081\u751F\u6210\u3057\u307E\u305B\u3093)\u3002"
+    "Note: an existing file or a symlink pointing elsewhere is never overwritten; only the missing links are created (GEMINI.md is discontinued and not generated)."
   );
   return lines.join("\n");
 }
@@ -4239,7 +4292,7 @@ function gatherExistingViewLinks(viewDir, rosterRealpaths) {
     names = readdirSync(viewDir);
   } catch (error) {
     if (hasErrorCode(error) && error.code === "ENOENT") return [];
-    throw new Error("workspace view \u3092\u8D70\u67FB\u3067\u304D\u307E\u305B\u3093(\u30D1\u30B9/\u7A2E\u5225\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044)", {
+    throw new Error("Cannot scan the workspace view (check the path / its type)", {
       cause: error
     });
   }
@@ -4261,7 +4314,7 @@ function pruneViewLinks(viewDir, toPrune, rosterRealpaths) {
     if (c === null || c.kind !== "repo") {
       failed.push({
         name,
-        message: "\u64A4\u53BB\u5BFE\u8C61\u304C scan \u6642\u3068\u5909\u308F\u308A\u307E\u3057\u305F(basou \u751F\u6210\u306E stray repo link \u3067\u306F\u306A\u304F\u306A\u3063\u305F/\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044)"
+        message: "the target changed since the scan (no longer a basou-generated stray repo link; re-run)"
       });
       continue;
     }
@@ -4350,11 +4403,11 @@ async function doRunProjectWorkspace(options, ctx) {
 }
 function renderProjectWorkspace(result) {
   const lines = [];
-  lines.push("# workspace view \u751F\u6210(roster repo \u3092\u96C6\u7D04)");
+  lines.push("# workspace view generation (aggregate the roster repos)");
   lines.push("");
   if (!result.hasView) {
     lines.push(
-      "\u2139\uFE0F view \u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `workspace.view`)\u3002\u96C6\u7D04\u5148\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u5BA3\u8A00\u3057\u3066\u304B\u3089\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F No view declared (manifest `workspace.view`). Declare the aggregation directory, then re-run."
     );
     return lines.join("\n");
   }
@@ -4362,12 +4415,12 @@ function renderProjectWorkspace(result) {
     const attempted = result.applied || result.failures.length > 0;
     if (!attempted) {
       lines.push(
-        `${result.toCreate.length} \u4EF6\u306E repo symlink \u3092 view \u306B\u4F5C\u6210\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+        `Repo symlinks to create in the view: ${result.toCreate.length} (dry-run; pass --apply to write):`
       );
       for (const c of result.toCreate) lines.push(`    ${c.name} -> ${c.target}`);
     } else {
       const failed = new Set(result.failures.map((f) => f.name));
-      const header = result.failures.length === 0 ? "\u2705 view \u306B repo symlink \u3092\u4F5C\u6210\u3057\u307E\u3057\u305F:" : result.applied ? "view \u306B repo symlink \u3092\u4F5C\u6210\u3057\u307E\u3057\u305F(\u4E00\u90E8\u5931\u6557\u3001\u4E0B\u8A18\u53C2\u7167):" : "view \u306B repo symlink \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(\u4E0B\u8A18\u53C2\u7167):";
+      const header = result.failures.length === 0 ? "\u2705 Created repo symlinks in the view:" : result.applied ? "Created repo symlinks in the view (some failed, see below):" : "Could not create repo symlinks in the view (see below):";
       lines.push(header);
       for (const c of result.toCreate) {
         if (failed.has(c.name)) continue;
@@ -4376,16 +4429,18 @@ function renderProjectWorkspace(result) {
     }
   } else if (result.ok) {
     lines.push(
-      `\u2705 view \u306F\u5BA3\u8A00\u3055\u308C\u305F roster \u3092\u3059\u3079\u3066\u96C6\u7D04\u3057\u3066\u3044\u307E\u3059(${result.correctCount} links\u3001\u751F\u6210\u4E0D\u8981)\u3002`
+      `\u2705 The view aggregates the entire declared roster (${result.correctCount} links; nothing to generate).`
     );
   } else {
     lines.push(
-      "\u2139\uFE0F \u4F5C\u6210\u304C\u5FC5\u8981\u306A symlink \u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u5BFE\u5FDC\u306E\u5FC5\u8981\u306A\u9805\u76EE\u304C\u3042\u308A\u307E\u3059(stray / \u7AF6\u5408 / \u885D\u7A81 / \u5230\u9054\u3067\u304D\u306A\u3044 repo\u3001\u4E0B\u8A18\u53C2\u7167)\u3002"
+      "\u2139\uFE0F No symlink needs creating, but there are items needing attention (stray / conflict / collision / unreachable repo, see below)."
     );
   }
   lines.push("");
   if (result.failures.length > 0) {
-    lines.push(`## \u4F5C\u6210\u306B\u5931\u6557 (${result.failures.length}) \u2014 \u4E00\u90E8\u306E symlink \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F`);
+    lines.push(
+      `## Creation failed (${result.failures.length}) \u2014 some symlinks could not be created`
+    );
     for (const f of result.failures) lines.push(`- ${f.name}: ${f.message}`);
     lines.push("");
   }
@@ -4393,17 +4448,17 @@ function renderProjectWorkspace(result) {
     const attempted = result.pruned || result.pruneFailures.length > 0;
     if (result.pruneWithheld) {
       lines.push(
-        `${result.toPrune.length} \u4EF6\u306E stray repo symlink \u3092\u64A4\u53BB\u4E88\u5B9A\u3067\u3057\u305F\u304C\u3001\u5230\u9054\u3067\u304D\u306A\u3044 repo \u304C\u3042\u308B\u305F\u3081\u64A4\u53BB\u3092\u4FDD\u7559\u3057\u307E\u3057\u305F(\u5230\u9054\u3067\u304D\u306A\u3044 repo \u306E link \u3068 stray \u3092\u533A\u5225\u3067\u304D\u306A\u3044\u305F\u3081\u3002\u4E0B\u8A18\u306E repo \u3092\u89E3\u6C7A\u3059\u308B\u304B archive \u3057\u3066\u304B\u3089\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044):`
+        `${result.toPrune.length} stray repo symlink${result.toPrune.length === 1 ? "" : "s"} were due to be pruned, but pruning was withheld because some repos are unreachable (an unreachable repo's link cannot be told apart from a stray; resolve or archive the repos below, then re-run):`
       );
       for (const p of result.toPrune) lines.push(`    ${p.name} -> ${p.target}`);
     } else if (!attempted) {
       lines.push(
-        `${result.toPrune.length} \u4EF6\u306E stray repo symlink \u3092\u64A4\u53BB\u4E88\u5B9A(dry-run\u3001\u64A4\u53BB\u3059\u308B\u306B\u306F --prune):`
+        `Stray repo symlinks to prune: ${result.toPrune.length} (dry-run; pass --prune to remove):`
       );
       for (const p of result.toPrune) lines.push(`    ${p.name} -> ${p.target}`);
     } else {
       const failed = new Set(result.pruneFailures.map((f) => f.name));
-      const header = result.pruneFailures.length === 0 ? "\u{1F9F9} stray repo symlink \u3092\u64A4\u53BB\u3057\u307E\u3057\u305F:" : result.pruned ? "stray repo symlink \u3092\u64A4\u53BB\u3057\u307E\u3057\u305F(\u4E00\u90E8\u5931\u6557\u3001\u4E0B\u8A18\u53C2\u7167):" : "stray repo symlink \u3092\u64A4\u53BB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(\u4E0B\u8A18\u53C2\u7167):";
+      const header = result.pruneFailures.length === 0 ? "\u{1F9F9} Pruned stray repo symlinks:" : result.pruned ? "Pruned stray repo symlinks (some failed, see below):" : "Could not prune stray repo symlinks (see below):";
       lines.push(header);
       for (const p of result.toPrune) {
         if (failed.has(p.name)) continue;
@@ -4414,47 +4469,47 @@ function renderProjectWorkspace(result) {
   }
   if (result.pruneFailures.length > 0) {
     lines.push(
-      `## \u64A4\u53BB\u306B\u5931\u6557 (${result.pruneFailures.length}) \u2014 \u4E00\u90E8\u306E stray symlink \u3092\u64A4\u53BB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F`
+      `## Pruning failed (${result.pruneFailures.length}) \u2014 some stray symlinks could not be pruned`
     );
     for (const f of result.pruneFailures) lines.push(`- ${f.name}: ${f.message}`);
     lines.push("");
   }
   if (result.conflicts.length > 0) {
     lines.push(
-      `## \u7AF6\u5408 (${result.conflicts.length}) \u2014 \u65E2\u5B58\u3092\u4E0A\u66F8\u304D\u3057\u307E\u305B\u3093\u3002\u624B\u52D5\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## Conflicts (${result.conflicts.length}) \u2014 existing entries are not overwritten. Check them manually`
     );
     for (const c of result.conflicts) {
-      const detail = c.reason === "mismatch" ? `\u5225\u306E\u5834\u6240\u3092\u6307\u3059 symlink(\u73FE\u5728: ${c.actualTarget ?? "?"})` : c.reason === "occupied" ? "symlink \u3067\u306A\u3044\u5B9F\u30D5\u30A1\u30A4\u30EB/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA" : "\u691C\u67FB\u3067\u304D\u306A\u3044\u30D1\u30B9(\u89AA\u304C\u975E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u7B49)";
+      const detail = c.reason === "mismatch" ? `a symlink pointing elsewhere (currently: ${c.actualTarget ?? "?"})` : c.reason === "occupied" ? "a real file/directory, not a symlink" : "an uninspectable path (a parent component is not a directory, etc.)";
       lines.push(`- ${c.name}: ${detail}`);
     }
     lines.push("");
   }
   if (result.collisions.length > 0) {
     lines.push(
-      `## basename \u885D\u7A81 (${result.collisions.length}) \u2014 \u5225 repo \u304C\u540C\u3058 view \u540D\u3092\u53D6\u308A\u5408\u3044(\u81EA\u52D5\u914D\u7DDA\u3057\u307E\u305B\u3093)`
+      `## Basename collisions (${result.collisions.length}) \u2014 another repo claims the same view name (not auto-wired)`
     );
     for (const c of result.collisions) lines.push(`- ${c.linkName} \u2190 ${c.repos.join(", ")}`);
     lines.push("");
   }
   if (result.unreachable.length > 0) {
     lines.push(
-      `## \u5230\u9054\u4E0D\u80FD (${result.unreachable.length}) \u2014 \u30D1\u30B9\u672A\u89E3\u6C7A\u3001\u307E\u305F\u306F view \u81EA\u8EAB\u306B\u89E3\u6C7A\u3059\u308B\u305F\u3081\u96C6\u7D04\u3067\u304D\u307E\u305B\u3093`
+      `## Unreachable (${result.unreachable.length}) \u2014 path unresolved, or it resolves to the view itself, so it cannot be aggregated`
     );
     for (const p of result.unreachable) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.strayUnknown.length > 0) {
     lines.push(
-      `## \u672A\u64A4\u53BB\u306E stray (${result.strayUnknown.length}) \u2014 basou \u751F\u6210\u306E repo link \u3068\u78BA\u8A8D\u3067\u304D\u306A\u3044\u305F\u3081\u64A4\u53BB\u3057\u307E\u305B\u3093\u3002\u624B\u52D5\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## Strays left in place (${result.strayUnknown.length}) \u2014 not confirmed to be a basou-generated repo link, so not pruned. Check them manually`
     );
     for (const s of result.strayUnknown) {
-      const detail = s.reason === "broken" ? "\u30EA\u30F3\u30AF\u5207\u308C(\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093)" : s.reason === "non-repo" ? "git repo \u3067\u306A\u3044\u30BF\u30FC\u30B2\u30C3\u30C8(\u30D5\u30A1\u30A4\u30EB\u3001\u307E\u305F\u306F .git \u306E\u7121\u3044\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA)" : "\u7D76\u5BFE\u30D1\u30B9\u306E\u30BF\u30FC\u30B2\u30C3\u30C8(basou \u306F\u76F8\u5BFE\u30EA\u30F3\u30AF\u306E\u307F\u751F\u6210\u3057\u307E\u3059)";
+      const detail = s.reason === "broken" ? "broken link (target does not resolve)" : s.reason === "non-repo" ? "non-git-repo target (a file, or a directory without .git)" : "absolute-path target (basou generates relative links only)";
       lines.push(`- ${s.name} -> ${s.target}: ${detail}`);
     }
     lines.push("");
   }
   lines.push(
-    "\u6CE8: \u4F5C\u6210(--apply)\u306F\u65E2\u5B58\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u66F8\u304D\u3057\u307E\u305B\u3093\u3002stray repo link \u306E\u64A4\u53BB\u306F --prune \u3067\u884C\u3044\u307E\u3059(symlink \u306E\u307F\u524A\u9664\u3057\u3001\u53C2\u7167\u5148 repo \u306F\u524A\u9664\u3057\u307E\u305B\u3093)\u3002basou \u751F\u6210\u3068\u78BA\u8A8D\u3067\u304D\u306A\u3044 stray(\u30EA\u30F3\u30AF\u5207\u308C / \u975E repo / \u7D76\u5BFE\u30D1\u30B9)\u306F\u64A4\u53BB\u3057\u307E\u305B\u3093\u3002"
+    "Note: creation (--apply) never overwrites an existing entry. Stray repo links are pruned with --prune (only the symlink is removed, never the referenced repo). A stray not confirmed to be basou-generated (broken / non-repo / absolute path) is left in place."
   );
   return lines.join("\n");
 }
@@ -4585,15 +4640,17 @@ async function doRunProjectPreset(options, ctx) {
   return result;
 }
 function presetActionLabel(action) {
-  return action === "create" ? "\u65B0\u898F\u4F5C\u6210" : "\u66F4\u65B0";
+  return action === "create" ? "create" : "update";
 }
 function renderProjectPreset(result) {
   const lines = [];
-  lines.push("# \u6307\u793A\u66F8 A \u30D7\u30EA\u30BB\u30C3\u30C8\u751F\u6210(\u5BA3\u8A00 \u2192 canonical \u306E\u751F\u6210\u9818\u57DF)");
+  lines.push(
+    "# Instruction-file preset generation (declaration \u2192 the canonical's generated region)"
+  );
   lines.push("");
   if (!result.hasRoster) {
     lines.push(
-      "\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002`basou project adopt` \u3067\u5BA3\u8A00\u3057\u3066\u304B\u3089\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "\u2139\uFE0F No repo roster declared (manifest `repos`). Declare one with `basou project adopt`, then re-run."
     );
     return lines.join("\n");
   }
@@ -4601,7 +4658,7 @@ function renderProjectPreset(result) {
     const attempted = result.applied || result.failures.length > 0;
     if (!attempted) {
       lines.push(
-        `${result.plans.length} repo \u306E canonical \u306B A \u30D7\u30EA\u30BB\u30C3\u30C8\u3092\u751F\u6210\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+        `Preset blocks to generate in the canonical of ${result.plans.length} repo${result.plans.length === 1 ? "" : "s"} (dry-run; pass --apply to write):`
       );
       for (const p of result.plans) {
         lines.push(
@@ -4611,7 +4668,7 @@ function renderProjectPreset(result) {
       }
     } else {
       const failed = new Set(result.failures.map((f) => f.repo));
-      const header = result.failures.length === 0 ? "\u2705 canonical \u306B A \u30D7\u30EA\u30BB\u30C3\u30C8\u3092\u751F\u6210\u3057\u307E\u3057\u305F:" : result.applied ? "A \u30D7\u30EA\u30BB\u30C3\u30C8\u3092\u751F\u6210\u3057\u307E\u3057\u305F(\u4E00\u90E8\u5931\u6557\u3001\u4E0B\u8A18\u53C2\u7167):" : "A \u30D7\u30EA\u30BB\u30C3\u30C8\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(\u4E0B\u8A18\u53C2\u7167):";
+      const header = result.failures.length === 0 ? "\u2705 Generated preset blocks in the canonical:" : result.applied ? "Generated preset blocks (some failed, see below):" : "Could not generate preset blocks (see below):";
       lines.push(header);
       for (const p of result.plans) {
         if (failed.has(p.path)) continue;
@@ -4621,47 +4678,49 @@ function renderProjectPreset(result) {
       }
     }
   } else if (result.ok) {
-    lines.push("\u2705 \u5BA3\u8A00\u3055\u308C\u305F\u5168 repo \u306E A \u30D7\u30EA\u30BB\u30C3\u30C8\u306F canonical \u3068\u540C\u671F\u6E08\u307F\u3067\u3059(\u751F\u6210\u4E0D\u8981)\u3002");
+    lines.push(
+      "\u2705 Every declared repo's preset block is in sync with its canonical (nothing to generate)."
+    );
   } else {
     lines.push(
-      "\u2139\uFE0F \u751F\u6210\u304C\u5FC5\u8981\u306A repo \u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30DE\u30FC\u30AB\u30FC\u7AF6\u5408 / \u885D\u7A81 / \u672A\u5BA3\u8A00 / \u5230\u9054\u3067\u304D\u306A\u3044 repo \u304C\u3042\u308A\u307E\u3059(\u4E0B\u8A18\u53C2\u7167)\u3002"
+      "\u2139\uFE0F No repo needs generating, but there are marker conflicts / collisions / undeclared / unreachable repos (see below)."
     );
   }
   lines.push("");
   if (result.inSync.length > 0) {
-    lines.push(`\u540C\u671F\u6E08\u307F (${result.inSync.length}): ${result.inSync.join(", ")}`);
+    lines.push(`In sync (${result.inSync.length}): ${result.inSync.join(", ")}`);
     lines.push("");
   }
   if (result.failures.length > 0) {
     lines.push(
-      `## \u66F8\u304D\u8FBC\u307F\u306B\u5931\u6557 (${result.failures.length}) \u2014 \u4E00\u90E8\u306E canonical \u3092\u66F8\u3051\u307E\u305B\u3093\u3067\u3057\u305F`
+      `## Write failed (${result.failures.length}) \u2014 some canonicals could not be written`
     );
     for (const f of result.failures) lines.push(`- ${f.repo}: ${f.message}`);
     lines.push("");
   }
   if (result.markerConflicts.length > 0) {
     lines.push(
-      `## \u30DE\u30FC\u30AB\u30FC\u7AF6\u5408 (${result.markerConflicts.length}) \u2014 canonical \u306E\u30DE\u30FC\u30AB\u30FC\u304C\u7121\u3044/\u58CA\u308C\u3066\u3044\u308B\u305F\u3081\u4E0A\u66F8\u304D\u3057\u307E\u305B\u3093`
+      `## Marker conflicts (${result.markerConflicts.length}) \u2014 the canonical's markers are missing/malformed, so it is not overwritten`
     );
     for (const c of result.markerConflicts) {
-      const detail = c.reason === "no_markers" ? "\u30DE\u30FC\u30AB\u30FC\u9818\u57DF\u304C\u7121\u3044" : `\u30DE\u30FC\u30AB\u30FC\u4E0D\u6574\u5408(${c.reason})`;
+      const detail = c.reason === "no_markers" ? "no marker region" : `malformed markers (${c.reason})`;
       lines.push(`- ${c.repo}: ${detail}`);
     }
     lines.push(
-      `  \u5BFE\u51E6: A \u30D7\u30EA\u30BB\u30C3\u30C8\u3092\u5165\u308C\u305F\u3044\u4F4D\u7F6E\u306B\u6B21\u306E2\u884C\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044 \u2014 \`${GENERATED_START}\` \u3068 \`${GENERATED_END}\`(\u7121\u3051\u308C\u3070 basou \u304C\u65B0\u898F canonical \u3092\u4F5C\u308A\u307E\u3059)\u3002`
+      `  Fix: add these two lines where you want the preset block \u2014 \`${GENERATED_START}\` and \`${GENERATED_END}\` (absent, basou creates a fresh canonical).`
     );
     lines.push("");
   }
   if (result.unreadable.length > 0) {
     lines.push(
-      `## canonical \u8AAD\u307F\u53D6\u308A\u4E0D\u80FD (${result.unreadable.length}) \u2014 \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA/\u6A29\u9650\u7B49\u3067\u8AAD\u3081\u307E\u305B\u3093`
+      `## Canonical unreadable (${result.unreadable.length}) \u2014 could not be read (a directory, permissions, etc.)`
     );
     for (const p of result.unreadable) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.collisions.length > 0) {
     lines.push(
-      `## canonical \u885D\u7A81 (${result.collisions.length}) \u2014 \u5225 repo \u304C\u540C\u540D canonical \u3092\u5171\u6709(\u81EA\u52D5\u751F\u6210\u3057\u307E\u305B\u3093)`
+      `## Canonical collisions (${result.collisions.length}) \u2014 another repo shares the same-named canonical (not auto-generated)`
     );
     for (const c of result.collisions) {
       lines.push(`- agents/${c.canonicalName}/AGENTS.md \u2190 ${c.repos.join(", ")}`);
@@ -4670,25 +4729,25 @@ function renderProjectPreset(result) {
   }
   if (result.undeclared.length > 0) {
     lines.push(
-      `## \u5BA3\u8A00\u306A\u3057 (${result.undeclared.length}) \u2014 visibility / language / publishes \u304C\u672A\u8A2D\u5B9A\u306E\u305F\u3081\u751F\u6210\u3057\u307E\u305B\u3093`
+      `## Undeclared (${result.undeclared.length}) \u2014 visibility / language / publishes unset, so nothing is generated`
     );
     for (const p of result.undeclared) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.anchors.length > 0) {
     lines.push(
-      `## anchor (${result.anchors.length}) \u2014 \u81EA\u8EAB\u306E AGENTS.md \u306F\u624B\u3067\u7DAD\u6301\u3059\u308B\u305F\u3081\u30B9\u30AD\u30C3\u30D7`
+      `## Anchor (${result.anchors.length}) \u2014 its own AGENTS.md is hand-maintained, so it is skipped`
     );
     for (const p of result.anchors) lines.push(`- ${p}`);
     lines.push("");
   }
   if (result.unreachable.length > 0) {
-    lines.push(`## \u5230\u9054\u4E0D\u80FD (${result.unreachable.length}) \u2014 \u30D1\u30B9\u672A\u89E3\u6C7A / git repo \u3067\u306A\u3044`);
+    lines.push(`## Unreachable (${result.unreachable.length}) \u2014 path unresolved / not a git repo`);
     for (const p of result.unreachable) lines.push(`- ${p}`);
     lines.push("");
   }
   lines.push(
-    "\u6CE8: \u30DE\u30FC\u30AB\u30FC\u9818\u57DF\u306E\u307F\u3092\u751F\u6210\u3057\u3001canonical \u306E\u624B\u66F8\u304D\u90E8\u5206(\u30DE\u30FC\u30AB\u30FC\u5916)\u306F\u4FDD\u6301\u3057\u307E\u3059\u3002\u751F\u6210\u5185\u5BB9\u306F manifest \u306E\u5BA3\u8A00\u304B\u3089\u5C0E\u51FA\u3055\u308C\u307E\u3059\u3002"
+    "Note: only the marker region is generated; the canonical's hand-authored content (outside the markers) is preserved. The generated content is derived from the manifest declaration."
   );
   return lines.join("\n");
 }
@@ -4749,6 +4808,403 @@ function gatherArchiveTeardown(repositoryRoot, manifest, target) {
     canonical: canonical2
   };
 }
+function teardownExpectedTargets(repoReal, anchorReal, canonicalName) {
+  const canonicalFile = join7(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+  return expectedSymlinkTargets(repoReal, canonicalFile);
+}
+function viewLinkPointsAt(viewDir, name, repoReal) {
+  const filePath = join7(viewDir, name);
+  try {
+    if (!lstatSync(filePath).isSymbolicLink()) return false;
+    const target = readlinkSync(filePath);
+    if (isAbsolute3(target)) return false;
+    return realpathSync(resolve7(viewDir, target)) === repoReal;
+  } catch {
+    return false;
+  }
+}
+function viewLinkPointsAtPath(viewDir, name, expectedRepoPath) {
+  const filePath = join7(viewDir, name);
+  try {
+    if (!lstatSync(filePath).isSymbolicLink()) return false;
+    const target = readlinkSync(filePath);
+    if (isAbsolute3(target)) return false;
+    return resolve7(viewDir, target) === expectedRepoPath;
+  } catch {
+    return false;
+  }
+}
+function gatherRepoTeardown(repositoryRoot, manifest, target) {
+  const anchorReal = realpathSync(repositoryRoot);
+  let repoReal;
+  try {
+    repoReal = realpathSync(resolve7(repositoryRoot, target));
+  } catch {
+    repoReal = void 0;
+  }
+  const isAnchor = repoReal !== void 0 && repoReal === anchorReal;
+  const targetAbs = resolve7(repositoryRoot, target);
+  const canonicalName = basename4(repoReal ?? targetAbs);
+  const roster = manifest.repos ?? [];
+  const inRoster = roster.some((r) => {
+    try {
+      return realpathSync(resolve7(repositoryRoot, r.path)) === (repoReal ?? "\0");
+    } catch {
+      return resolve7(repositoryRoot, r.path) === targetAbs;
+    }
+  });
+  const cnFold = canonicalName.toLowerCase();
+  const canonicalShared = roster.some((r) => {
+    let rReal = null;
+    try {
+      rReal = realpathSync(resolve7(repositoryRoot, r.path));
+    } catch {
+      rReal = null;
+    }
+    if (rReal !== null) {
+      if (repoReal !== void 0 && rReal === repoReal) return false;
+      return basename4(rReal).toLowerCase() === cnFold;
+    }
+    if (resolve7(repositoryRoot, r.path) === targetAbs) return false;
+    return basename4(resolve7(repositoryRoot, r.path)).toLowerCase() === cnFold;
+  });
+  const collisionNote = "shared with another repo of the same basename, so it cannot be removed (check manually)";
+  const items = [];
+  if (!isAnchor) {
+    if (repoReal !== void 0) {
+      for (const spec of teardownExpectedTargets(repoReal, anchorReal, canonicalName)) {
+        const { state, actualTarget } = inspectSymlink(join7(repoReal, spec.name), spec.target);
+        if (state === "correct")
+          items.push({ kind: "instruction-symlink", label: spec.name, state: "removable" });
+        else if (state === "mismatch")
+          items.push({
+            kind: "instruction-symlink",
+            label: spec.name,
+            state: "foreign",
+            note: `points at a different target (${actualTarget ?? "?"})`
+          });
+        else if (state === "occupied")
+          items.push({
+            kind: "instruction-symlink",
+            label: spec.name,
+            state: "foreign",
+            note: "a real file, not a symlink"
+          });
+        else if (state === "blocked")
+          items.push({
+            kind: "instruction-symlink",
+            label: spec.name,
+            state: "blocked",
+            note: "could not be inspected"
+          });
+      }
+      let ignored;
+      try {
+        ignored = new Set(readGitignoreLines(join7(repoReal, ".gitignore")).map((l) => l.trim()));
+        for (const p of INSTRUCTION_FILES) {
+          if (ignored.has(p) || ignored.has(`/${p}`)) {
+            items.push({
+              kind: "gitignore",
+              label: p,
+              state: "manual",
+              note: "cannot tell a basou-appended line from a hand-added one (no marker) \u2014 remove manually"
+            });
+          }
+        }
+      } catch {
+        items.push({
+          kind: "gitignore",
+          label: ".gitignore",
+          state: "blocked",
+          note: "could not be read"
+        });
+      }
+    }
+    const viewPath = manifest.workspace.view;
+    if (viewPath !== void 0) {
+      const viewDir = resolveViewDir(repositoryRoot, viewPath);
+      const linkPath = join7(viewDir, canonicalName);
+      let isLink = false;
+      try {
+        isLink = lstatSync(linkPath).isSymbolicLink();
+      } catch {
+        isLink = false;
+      }
+      if (isLink) {
+        const owned = repoReal !== void 0 ? viewLinkPointsAt(viewDir, canonicalName, repoReal) : viewLinkPointsAtPath(viewDir, canonicalName, targetAbs);
+        if (!owned)
+          items.push({
+            kind: "view-symlink",
+            label: canonicalName,
+            state: "foreign",
+            note: "a view link that does not point at this repo"
+          });
+        else if (canonicalShared)
+          items.push({
+            kind: "view-symlink",
+            label: canonicalName,
+            state: "blocked",
+            note: collisionNote
+          });
+        else items.push({ kind: "view-symlink", label: canonicalName, state: "removable" });
+      }
+    }
+    const canonicalFile = join7(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+    const canonicalLabel = join7("agents", canonicalName, CANONICAL_FILE);
+    let canonicalIsLink = false;
+    try {
+      canonicalIsLink = lstatSync(canonicalFile).isSymbolicLink();
+    } catch {
+      canonicalIsLink = false;
+    }
+    if (canonicalIsLink) {
+      items.push({
+        kind: "canonical-block",
+        label: canonicalLabel,
+        state: "foreign",
+        note: "the canonical is a symlink (not generated)"
+      });
+    } else if (existsSync(canonicalFile)) {
+      let content;
+      try {
+        content = readFileSync(canonicalFile, "utf8");
+      } catch {
+        items.push({
+          kind: "canonical-block",
+          label: canonicalLabel,
+          state: "blocked",
+          note: "could not be read"
+        });
+      }
+      if (content !== void 0 && content !== "") {
+        const section = parseMarkers(content);
+        if (section.kind === "ok" && canonicalShared) {
+          items.push({
+            kind: "canonical-block",
+            label: canonicalLabel,
+            state: "blocked",
+            note: collisionNote
+          });
+        } else if (section.kind === "ok" && repoReal === void 0) {
+          items.push({
+            kind: "canonical-block",
+            label: canonicalLabel,
+            state: "manual",
+            note: "repo could not be resolved, so ownership cannot be verified (check manually)"
+          });
+        } else if (section.kind === "ok") {
+          const emptyAfter = removeMarkerSection(content, canonicalLabel).trim().length === 0;
+          items.push({
+            kind: "canonical-block",
+            label: canonicalLabel,
+            state: "removable",
+            ...emptyAfter ? {
+              note: "the file becomes empty after the generated block is removed (a manual-delete candidate)"
+            } : {}
+          });
+        } else if (section.kind === "no_markers") {
+          items.push({
+            kind: "canonical-block",
+            label: canonicalLabel,
+            state: "foreign",
+            note: "no generated block (hand-authored only \u2014 left untouched)"
+          });
+        } else {
+          items.push({
+            kind: "canonical-block",
+            label: canonicalLabel,
+            state: "blocked",
+            note: "malformed markers (fix manually)"
+          });
+        }
+      }
+    }
+  }
+  return {
+    target,
+    resolved: repoReal !== void 0,
+    repoReal: repoReal ?? null,
+    canonicalName,
+    isAnchor,
+    inRoster,
+    items,
+    removableCount: items.filter((i) => i.state === "removable").length
+  };
+}
+function applyRepoTeardown(repositoryRoot, manifest, plan) {
+  const removed = [];
+  const failed = [];
+  const changed = (label) => failed.push({ label, message: "the state changed since the scan (re-run)" });
+  let currentRepoReal = null;
+  try {
+    currentRepoReal = realpathSync(resolve7(repositoryRoot, plan.target));
+  } catch {
+    currentRepoReal = null;
+  }
+  const identityOk = plan.repoReal === null ? true : currentRepoReal === plan.repoReal;
+  const removable = plan.items.filter((i) => i.state === "removable");
+  if (!identityOk) {
+    for (const item of removable) changed(item.label);
+    return { removed, failed };
+  }
+  const anchorReal = realpathSync(repositoryRoot);
+  const { canonicalName, repoReal } = plan;
+  const expectedByName = new Map(
+    repoReal !== null ? teardownExpectedTargets(repoReal, anchorReal, canonicalName).map((s) => [s.name, s.target]) : []
+  );
+  for (const item of removable.filter((i) => i.kind === "instruction-symlink")) {
+    const expected = expectedByName.get(item.label);
+    if (repoReal === null || expected === void 0 || inspectSymlink(join7(repoReal, item.label), expected).state !== "correct") {
+      changed(item.label);
+      continue;
+    }
+    try {
+      unlinkSync(join7(repoReal, item.label));
+      removed.push(item.label);
+    } catch (error) {
+      failed.push({ label: item.label, message: failureReason(error) });
+    }
+  }
+  const viewPath = manifest.workspace.view;
+  for (const item of removable.filter((i) => i.kind === "view-symlink")) {
+    if (viewPath === void 0) {
+      changed(item.label);
+      continue;
+    }
+    const viewDir = resolveViewDir(repositoryRoot, viewPath);
+    const owned = repoReal !== null ? viewLinkPointsAt(viewDir, item.label, repoReal) : viewLinkPointsAtPath(viewDir, item.label, resolve7(repositoryRoot, plan.target));
+    if (!owned) {
+      changed(item.label);
+      continue;
+    }
+    try {
+      unlinkSync(join7(viewDir, item.label));
+      removed.push(`view/${item.label}`);
+    } catch (error) {
+      failed.push({ label: `view/${item.label}`, message: failureReason(error) });
+    }
+  }
+  const NOFOLLOW = fsConstants.O_NOFOLLOW ?? 0;
+  for (const item of removable.filter((i) => i.kind === "canonical-block")) {
+    const canonicalFile = join7(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+    try {
+      if (lstatSync(canonicalFile).isSymbolicLink()) {
+        changed(item.label);
+        continue;
+      }
+    } catch (error) {
+      failed.push({ label: item.label, message: failureReason(error) });
+      continue;
+    }
+    let fd;
+    try {
+      fd = openSync(canonicalFile, fsConstants.O_RDWR | NOFOLLOW);
+    } catch (error) {
+      changed(item.label);
+      void error;
+      continue;
+    }
+    try {
+      const content = readFileSync(fd, "utf8");
+      if (parseMarkers(content).kind !== "ok") {
+        changed(item.label);
+        continue;
+      }
+      const next = Buffer.from(removeMarkerSection(content, item.label), "utf8");
+      ftruncateSync(fd, 0);
+      writeSync(fd, next, 0, next.length, 0);
+      removed.push(item.label);
+    } catch (error) {
+      failed.push({ label: item.label, message: failureReason(error) });
+    } finally {
+      closeSync(fd);
+    }
+  }
+  return { removed, failed };
+}
+function renderProjectTeardown(result) {
+  const lines = [];
+  lines.push(`# teardown: ${result.target}`);
+  lines.push("");
+  if (result.isAnchor) {
+    lines.push("The anchor (`.`) cannot be torn down (it is the project's home).");
+    return lines.join("\n");
+  }
+  if (!result.resolved) {
+    lines.push(
+      "Note: the repo path could not be resolved (already deleted?). The in-repo wiring cannot be inspected, so only the view link / canonical are in scope."
+    );
+    lines.push("");
+  }
+  lines.push(
+    result.inRoster ? "Status: still a roster member (the declaration remains in the manifest)." : "Status: not a roster member (already archived)."
+  );
+  lines.push("");
+  const removable = result.items.filter((i) => i.state === "removable");
+  const manual = result.items.filter((i) => i.state === "manual");
+  const foreign = result.items.filter((i) => i.state === "foreign");
+  const blocked = result.items.filter((i) => i.state === "blocked");
+  if (removable.length === 0) {
+    lines.push("No basou-generated artifact to remove.");
+  } else {
+    lines.push(`To remove (${removable.length}):`);
+    for (const i of removable)
+      lines.push(`  - [${i.kind}] ${i.label}${i.note !== void 0 ? ` \u2014 ${i.note}` : ""}`);
+  }
+  if (manual.length > 0) {
+    lines.push("");
+    lines.push("Check manually (not auto-removed):");
+    for (const i of manual)
+      lines.push(`  - [${i.kind}] ${i.label}${i.note !== void 0 ? ` \u2014 ${i.note}` : ""}`);
+  }
+  if (foreign.length > 0) {
+    lines.push("");
+    lines.push("Left untouched (not basou-generated):");
+    for (const i of foreign)
+      lines.push(`  - [${i.kind}] ${i.label}${i.note !== void 0 ? ` \u2014 ${i.note}` : ""}`);
+  }
+  if (blocked.length > 0) {
+    lines.push("");
+    lines.push("Could not be inspected:");
+    for (const i of blocked)
+      lines.push(`  - [${i.kind}] ${i.label}${i.note !== void 0 ? ` \u2014 ${i.note}` : ""}`);
+  }
+  lines.push("");
+  if (result.applied) {
+    lines.push(`--apply: removed ${result.removed.length}.`);
+    for (const r of result.removed) lines.push(`  \u2713 ${r}`);
+    if (result.failed.length > 0) {
+      lines.push("Failed:");
+      for (const f of result.failed) lines.push(`  \u2717 ${f.label} \u2014 ${f.message}`);
+    }
+  } else if (removable.length > 0) {
+    lines.push(
+      "This is a dry-run. Pass --apply to remove (this is a destructive, irreversible operation)."
+    );
+  }
+  return lines.join("\n");
+}
+async function doRunProjectTeardown(target, options, ctx = {}) {
+  const cwd = ctx.cwd ?? process.cwd();
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "project teardown");
+  const paths = basouPaths10(repositoryRoot);
+  const manifest = await readManifest6(paths);
+  const plan = gatherRepoTeardown(repositoryRoot, manifest, target);
+  const willApply = options.apply === true && !plan.isAnchor && plan.removableCount > 0;
+  const { removed, failed } = willApply ? applyRepoTeardown(repositoryRoot, manifest, plan) : { removed: [], failed: [] };
+  const result = { ...plan, applied: willApply, removed, failed };
+  if (options.json === true) console.log(JSON.stringify(result));
+  else console.log(renderProjectTeardown(result));
+  return result;
+}
+async function runProjectTeardown(target, options, ctx = {}) {
+  try {
+    await doRunProjectTeardown(target, options, ctx);
+  } catch (error) {
+    renderCliError(error, { verbose: isVerbose(options) });
+    process.exitCode = 1;
+  }
+}
 function omitKey(obj, key) {
   const clone = { ...obj };
   delete clone[key];
@@ -4818,68 +5274,74 @@ async function doRunProjectArchive(target, options, ctx) {
 }
 function renderProjectArchive(result) {
   const lines = [];
-  lines.push("# repo \u306E archive(roster \u304B\u3089\u7573\u3080)");
+  lines.push("# Archive a repo (fold it out of the roster)");
   lines.push("");
   lines.push(...preservedUnknownLines(result.preservedUnknownFields));
   if (!result.hasRoster) {
-    lines.push("\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002archive \u5BFE\u8C61\u304C\u3042\u308A\u307E\u305B\u3093\u3002");
+    lines.push("\u2139\uFE0F No repo roster declared (manifest `repos`). There is nothing to archive.");
     return lines.join("\n");
   }
   if (result.isAnchor) {
     lines.push(
-      `\u26A0\uFE0F \`${result.target}\` \u306F anchor(\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E root)\u3067\u3059\u3002anchor \u306F archive \u3067\u304D\u307E\u305B\u3093(manifest \u306E\u5BB6\u306E\u305F\u3081)\u3002`
+      `\u26A0\uFE0F \`${result.target}\` is the anchor (the project root). The anchor cannot be archived (it is the manifest's home).`
     );
     return lines.join("\n");
   }
   if (!result.found) {
-    lines.push(`\u2139\uFE0F \`${result.target}\` \u306F roster \u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093(archive \u5BFE\u8C61\u306A\u3057)\u3002`);
+    lines.push(`\u2139\uFE0F \`${result.target}\` is not declared in the roster (nothing to archive).`);
     return lines.join("\n");
   }
   if (result.applied) {
-    lines.push(`\u2705 \`${result.target}\` \u3092 roster \u304B\u3089\u524A\u9664\u3057\u307E\u3057\u305F\u3002`);
+    lines.push(`\u2705 Removed \`${result.target}\` from the roster.`);
   } else {
-    lines.push(`\`${result.target}\` \u3092 roster \u304B\u3089\u524A\u9664\u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`);
+    lines.push(`To remove \`${result.target}\` from the roster (dry-run; pass --apply to write):`);
   }
   if (result.sourceRootRemoval !== void 0) {
     lines.push(
-      `- source_roots \u304B\u3089 ${result.sourceRootRemoval} \u3092 prune${result.applied ? "\u3057\u307E\u3057\u305F" : "\u3057\u307E\u3059"}(\u4EE5\u5F8C refresh \u306E\u5BFE\u8C61\u5916)\u3002`
+      `- ${result.applied ? "Pruned" : "Will prune"} ${result.sourceRootRemoval} from source_roots (no longer captured by refresh).`
     );
   } else {
-    lines.push("- source_roots \u306B\u8A72\u5F53\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093(prune \u4E0D\u8981)\u3002");
+    lines.push("- No matching entry in source_roots (nothing to prune).");
   }
   if (result.reposEmptied) {
     lines.push(
-      "- \u3053\u308C\u304C\u6700\u5F8C\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u3059 \u2192 roster \u306F\u7A7A\u306B\u306A\u308A `repos` \u5BA3\u8A00\u306F\u9664\u53BB\u3055\u308C\u307E\u3059(\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u7573\u3080)\u3002"
+      "- This was the last member \u2192 the roster empties and the `repos` declaration is removed (the project is folded up)."
     );
   } else if (result.becomesSolo) {
     lines.push(
-      "- \u6B8B\u308A 1 repo(solo)\u306B\u306A\u308A\u307E\u3059 \u2192 workspace view \u306F\u4E0D\u8981\u3067\u3059(view \u5BA3\u8A00/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u64A4\u53BB\u3092\u691C\u8A0E)\u3002"
+      "- This leaves 1 repo (solo) \u2192 the workspace view is unnecessary (consider removing the view declaration / directory)."
     );
   }
   lines.push("");
   const t = result.teardown;
   const items = [];
-  if (t.viewLink) items.push("workspace view \u306E symlink \u30A8\u30F3\u30C8\u30EA");
-  if (t.instructionFiles.length > 0) items.push(`\u6307\u793A\u66F8(${t.instructionFiles.join(", ")})`);
+  if (t.viewLink) items.push("the workspace view's symlink entry");
+  if (t.instructionFiles.length > 0)
+    items.push(`instruction files (${t.instructionFiles.join(", ")})`);
   if (t.gitignorePatterns.length > 0)
-    items.push(`.gitignore \u306E\u6307\u793A\u66F8\u30D1\u30BF\u30FC\u30F3(${t.gitignorePatterns.join(", ")})`);
-  if (t.canonical) items.push(`anchor \u306E canonical(agents/${basename4(result.target)}/AGENTS.md)`);
+    items.push(`.gitignore instruction patterns (${t.gitignorePatterns.join(", ")})`);
+  if (t.canonical)
+    items.push(`the anchor's canonical (agents/${basename4(result.target)}/AGENTS.md)`);
   if (!t.inspected) {
-    lines.push("## \u624B\u52D5 teardown(repo \u304C\u30C7\u30A3\u30B9\u30AF\u4E0A\u306B\u89E3\u6C7A\u3067\u304D\u306A\u3044\u305F\u3081\u672A\u691C\u67FB)");
     lines.push(
-      "- repo \u306F\u65E2\u306B\u524A\u9664\u6E08\u307F\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002view symlink / \u6307\u793A\u66F8 symlink / .gitignore / canonical \u304C\u6B8B\u3063\u3066\u3044\u306A\u3044\u304B\u624B\u52D5\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "## Manual teardown (the repo could not be resolved on disk, so it was not inspected)"
+    );
+    lines.push(
+      "- The repo may already be deleted. Check manually for a leftover view symlink / instruction symlinks / .gitignore / canonical."
     );
     lines.push("");
   } else if (items.length > 0) {
-    lines.push("## \u624B\u52D5 teardown(--apply \u306F\u89E6\u308C\u307E\u305B\u3093\u3002\u6B8B\u3063\u3066\u3044\u308B wiring \u3092\u624B\u3067\u64A4\u53BB\u3057\u3066\u304F\u3060\u3055\u3044)");
+    lines.push(
+      "## Manual teardown (--apply does not touch these; remove the leftover wiring by hand)"
+    );
     for (const i of items) lines.push(`- ${i}`);
     lines.push("");
   } else {
-    lines.push("repo \u5074\u306E wiring(view/\u6307\u793A\u66F8/.gitignore/canonical)\u306F\u6B8B\u3063\u3066\u3044\u307E\u305B\u3093\u3002");
+    lines.push("No repo-side wiring (view / instruction files / .gitignore / canonical) remains.");
     lines.push("");
   }
   lines.push(
-    "\u6CE8: archive \u306F manifest(.basou\u3001git \u8FFD\u8DE1=\u53EF\u9006)\u306E\u307F\u3092\u5909\u66F4\u3057\u307E\u3059\u3002repo\u30FB\u6355\u6349\u5C65\u6B74\u30FBon-disk \u306E wiring \u306F\u524A\u9664\u3057\u307E\u305B\u3093\u3002"
+    "Note: archive only changes the manifest (.basou, git-tracked, reversible). The repo, its captured history, and its on-disk wiring are not removed."
   );
   return lines.join("\n");
 }
@@ -4965,46 +5427,46 @@ async function doRunProjectRename(oldPath, newPath, options, ctx) {
 }
 function renderProjectRename(result) {
   const lines = [];
-  lines.push("# repo \u306E rename(roster \u306E\u30D1\u30B9\u66F4\u65B0)");
+  lines.push("# Rename a repo (update its roster path)");
   lines.push("");
   lines.push(...preservedUnknownLines(result.preservedUnknownFields));
   if (!result.hasRoster) {
-    lines.push("\u2139\uFE0F repo \u30ED\u30FC\u30B9\u30BF\u30FC\u304C\u672A\u5BA3\u8A00\u3067\u3059(manifest \u306E `repos`)\u3002rename \u5BFE\u8C61\u304C\u3042\u308A\u307E\u305B\u3093\u3002");
+    lines.push("\u2139\uFE0F No repo roster declared (manifest `repos`). There is nothing to rename.");
     return lines.join("\n");
   }
   if (result.noop) {
-    lines.push(`\u2139\uFE0F \`${result.oldTarget}\` \u3068 \`${result.newTarget}\` \u306F\u540C\u4E00\u3067\u3059(\u5909\u66F4\u306A\u3057)\u3002`);
+    lines.push(`\u2139\uFE0F \`${result.oldTarget}\` and \`${result.newTarget}\` are identical (no change).`);
     return lines.join("\n");
   }
   if (result.isAnchor) {
     lines.push(
-      `\u26A0\uFE0F \`${result.oldTarget}\` \u306F anchor(\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E root)\u3067\u3059\u3002anchor \u306F rename \u3067\u304D\u307E\u305B\u3093\u3002`
+      `\u26A0\uFE0F \`${result.oldTarget}\` is the anchor (the project root). The anchor cannot be renamed.`
     );
     return lines.join("\n");
   }
   if (!result.found) {
-    lines.push(`\u2139\uFE0F \`${result.oldTarget}\` \u306F roster \u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093(rename \u5BFE\u8C61\u306A\u3057)\u3002`);
+    lines.push(`\u2139\uFE0F \`${result.oldTarget}\` is not declared in the roster (nothing to rename).`);
     return lines.join("\n");
   }
   if (result.collision) {
     lines.push(
-      `\u26A0\uFE0F \`${result.newTarget}\` \u306F\u65E2\u306B roster \u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u91CD\u8907\u3092\u907F\u3051\u308B\u305F\u3081 rename \u3057\u307E\u305B\u3093\u3002`
+      `\u26A0\uFE0F \`${result.newTarget}\` is already declared in the roster. Not renaming, to avoid a duplicate.`
     );
     return lines.join("\n");
   }
   if (result.applied) {
-    lines.push(`\u2705 \`${result.oldTarget}\` \u3092 \`${result.newTarget}\` \u306B rename \u3057\u307E\u3057\u305F\u3002`);
+    lines.push(`\u2705 Renamed \`${result.oldTarget}\` to \`${result.newTarget}\`.`);
   } else {
     lines.push(
-      `\`${result.oldTarget}\` \u3092 \`${result.newTarget}\` \u306B rename \u4E88\u5B9A(dry-run\u3001\u53CD\u6620\u3059\u308B\u306B\u306F --apply):`
+      `To rename \`${result.oldTarget}\` to \`${result.newTarget}\` (dry-run; pass --apply to write):`
     );
   }
   if (result.sourceRootRenamed !== void 0) {
     lines.push(
-      `- source_roots \u306E ${result.sourceRootRenamed} \u3092 ${result.newTarget} \u306B\u66F4\u65B0${result.applied ? "\u3057\u307E\u3057\u305F" : "\u3057\u307E\u3059"}\u3002`
+      `- ${result.applied ? "Updated" : "Will update"} ${result.sourceRootRenamed} to ${result.newTarget} in source_roots.`
     );
   } else {
-    lines.push("- source_roots \u306B\u8A72\u5F53\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093(\u66F4\u65B0\u4E0D\u8981)\u3002");
+    lines.push("- No matching entry in source_roots (nothing to update).");
   }
   lines.push("");
   if (result.basenameChanged) {
@@ -5013,31 +5475,214 @@ function renderProjectRename(result) {
     const items = [];
     if (result.wiring.canonicalDirOld)
       items.push(`anchor canonical: agents/${oldName}/ \u2192 agents/${newName}/`);
-    if (result.wiring.viewLinkOld) items.push(`workspace view \u306E symlink: ${oldName} \u2192 ${newName}`);
+    if (result.wiring.viewLinkOld) items.push(`workspace view symlink: ${oldName} \u2192 ${newName}`);
     if (items.length > 0) {
       lines.push(
-        "## \u624B\u52D5\u30EA\u30CD\u30FC\u30E0(--apply \u306F\u89E6\u308C\u307E\u305B\u3093\u3002basename \u304C\u5909\u308F\u308B\u305F\u3081\u624B\u3067\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044)"
+        "## Manual rename (--apply does not touch these; the basename changed, so update them by hand)"
       );
       for (const i of items) lines.push(`- ${i}`);
     } else {
       lines.push(
-        `basename \u304C ${oldName} \u2192 ${newName} \u306B\u5909\u308F\u308A\u307E\u3059\u304C\u3001anchor canonical / view symlink \u306F\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002`
+        `The basename changes ${oldName} \u2192 ${newName}, but no anchor canonical / view symlink was found.`
       );
     }
     lines.push(
-      "  \u53CD\u6620\u5F8C\u306F `basou project symlinks` / `basou project workspace` \u3067\u6307\u793A\u66F8 symlink \u3068 view \u3092\u518D\u751F\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "  After applying, regenerate the instruction symlinks and the view with `basou project symlinks` / `basou project workspace`."
     );
   } else {
     lines.push(
-      "\u6CE8: basename \u306F\u4E0D\u5909\u3067\u3059\u3002repo \u3092\u5225\u306E\u5834\u6240\u3078\u79FB\u52D5\u3057\u305F\u5834\u5408\u306F `basou project symlinks` / `basou project workspace` \u3067\u76F8\u5BFE\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u518D\u751F\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      "Note: the basename is unchanged. If you moved the repo elsewhere, regenerate the relative targets with `basou project symlinks` / `basou project workspace`."
     );
   }
   lines.push("");
   lines.push(
-    "\u6CE8: rename \u306F manifest(.basou\u3001git \u8FFD\u8DE1=\u53EF\u9006)\u306E\u307F\u3092\u5909\u66F4\u3057\u307E\u3059\u3002repo \u306E\u79FB\u52D5\u30FBon-disk \u306E wiring \u66F4\u65B0\u306F\u884C\u3044\u307E\u305B\u3093\u3002"
+    "Note: rename only changes the manifest (.basou, git-tracked, reversible). It does not move the repo or update the on-disk wiring."
   );
   return lines.join("\n");
 }
+async function runProjectNew(repos, options, ctx = {}) {
+  try {
+    await doRunProjectNew(repos, options, ctx);
+  } catch (error) {
+    renderCliError(error, { verbose: isVerbose(options) });
+    process.exitCode = 1;
+  }
+}
+async function resolveRepositoryRootForNew(cwd) {
+  try {
+    return await resolveRepositoryRoot8(cwd);
+  } catch (error) {
+    if (error instanceof Error && error.message === "Not a git repository") {
+      throw new Error(
+        "Not a git repository. Run 'git init' first, then re-run 'basou project new'.",
+        { cause: error }
+      );
+    }
+    throw error;
+  }
+}
+async function doRunProjectNew(repos, options, ctx) {
+  const cwd = ctx.cwd ?? process.cwd();
+  const repositoryRoot = await resolveRepositoryRootForNew(cwd);
+  const workspaceName = basename4(repositoryRoot);
+  const declared = repos.map((p) => {
+    const abs = resolve7(cwd, p);
+    let real;
+    try {
+      real = realpathSync(abs);
+    } catch {
+      real = abs;
+    }
+    const rel = relative2(repositoryRoot, real);
+    return rel === "" ? "." : rel;
+  });
+  const invalidRepos = declared.filter(
+    (rel) => classifySourceRoot(repositoryRoot, rel).kind !== "repo"
+  );
+  if (invalidRepos.length > 0) {
+    throw new Error(
+      `These declared repos are not git repositories (create them with 'git init' first): ${invalidRepos.join(", ")}`
+    );
+  }
+  const rosterPaths = ["."];
+  for (const rel of declared) {
+    if (rel !== "." && !rosterPaths.includes(rel)) rosterPaths.push(rel);
+  }
+  const roster = rosterPaths.map((path) => ({ path }));
+  const viewPath = options.view === false ? null : options.view ?? `../${workspaceName}-workspace`;
+  const sourceRoots = [...rosterPaths, ...viewPath !== null ? [viewPath] : []];
+  const paths = basouPaths10(repositoryRoot);
+  const existed = existsSync(paths.files.manifest);
+  const manifest = createManifest2({ workspaceName, sourceRoots });
+  manifest.repos = roster;
+  if (viewPath !== null) manifest.workspace.view = viewPath;
+  let applied = false;
+  if (options.apply === true) {
+    await ensureBasouDirectory2(repositoryRoot);
+    await writeManifest2(paths, manifest, { force: options.force === true });
+    applied = true;
+    try {
+      await appendBasouGitignore2(repositoryRoot, { localOnly: options.localOnly === true });
+    } catch (error) {
+      renderGitignoreWarningForNew(error, isVerbose(options));
+    }
+  }
+  const result = {
+    workspaceName,
+    repos: roster,
+    view: viewPath,
+    sourceRoots,
+    invalidRepos: [],
+    existed,
+    applied
+  };
+  if (options.json === true) {
+    console.log(JSON.stringify(result));
+  } else {
+    console.log(renderProjectNew(result));
+  }
+  return result;
+}
+function renderGitignoreWarningForNew(error, verbose) {
+  const baseMessage = error instanceof Error ? error.message : String(error);
+  console.error(
+    `Warning: Could not update .gitignore (${baseMessage}). Add Basou's default .gitignore block manually.`
+  );
+  if (verbose && error instanceof Error) {
+    const label = extractCauseLabel(error);
+    if (label !== void 0) console.error(`Caused by: ${label}`);
+  }
+}
+function renderProjectNew(result) {
+  const lines = [];
+  lines.push("# Scaffold a new project (build from a declaration)");
+  lines.push("");
+  if (result.existed && !result.applied) {
+    lines.push(
+      "\u26A0\uFE0F This anchor already has a `.basou/manifest.yaml`. Overwriting it requires --force (nothing is written by default, so an existing declaration is not lost)."
+    );
+    lines.push("");
+  }
+  if (result.applied) {
+    lines.push(`\u2705 Created \`.basou/\` for \`${result.workspaceName}\` and seeded the manifest:`);
+  } else {
+    lines.push(
+      `Will create \`.basou/\` for \`${result.workspaceName}\` and seed the manifest (dry-run; pass --apply to write):`
+    );
+  }
+  lines.push("");
+  lines.push(`repos roster (${result.repos.length}):`);
+  for (const r of result.repos) {
+    lines.push(`- ${r.path}${r.path === "." ? " (anchor)" : ""}`);
+  }
+  lines.push("");
+  lines.push(
+    result.view !== null ? `workspace view: ${result.view}` : "workspace view: none (solo project)"
+  );
+  lines.push("");
+  lines.push(`source_roots (${result.sourceRoots.length}):`);
+  for (const s of result.sourceRoots) lines.push(`- ${s}`);
+  lines.push("");
+  lines.push(
+    "Note: visibility / language are unset. Assign them to each repo manually. Basou does not create git repos; a declared repo must already be `git init`-ed."
+  );
+  if (result.applied) {
+    lines.push(
+      "Next: fill in visibility / language for each repo in `.basou/manifest.yaml`, then run `basou project derive --apply` to generate the wiring in one pass."
+    );
+  } else {
+    lines.push(
+      "After applying, fill in visibility / language in the manifest, then run `basou project derive`."
+    );
+  }
+  return lines.join("\n");
+}
+async function runProjectDerive(options, ctx = {}) {
+  try {
+    await doRunProjectDerive(options, ctx);
+  } catch (error) {
+    renderCliError(error, { verbose: isVerbose(options) });
+    process.exitCode = 1;
+  }
+}
+async function doRunProjectDerive(options, ctx) {
+  const cwd = ctx.cwd ?? process.cwd();
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "project derive");
+  const paths = basouPaths10(repositoryRoot);
+  const manifest = await readManifest6(paths);
+  if (manifest.repos === void 0 || manifest.repos.length === 0) {
+    console.log(
+      "# Generate project wiring in one pass (declaration \u2192 wiring)\n\n\u2139\uFE0F No repo roster declared (manifest `repos`). Declare one first with `basou project new` (new project) or `basou project adopt` (bootstrap from existing source_roots)."
+    );
+    return;
+  }
+  const apply = options.apply === true;
+  const stepCtx = {
+    cwd: repositoryRoot,
+    ...ctx.now !== void 0 ? { now: ctx.now } : {}
+  };
+  const stepOpts = { apply };
+  console.log("# Generate project wiring in one pass (declaration \u2192 wiring)");
+  console.log("");
+  console.log("## 1/5 sync source_roots (roster \u2192 capture config)");
+  await doRunProjectSync(stepOpts, stepCtx);
+  console.log("");
+  console.log("## 2/5 generate instruction-file A preset (declaration \u2192 canonical)");
+  await doRunProjectPreset(stepOpts, stepCtx);
+  console.log("");
+  console.log("## 3/5 generate instruction-file symlinks (each repo \u2192 canonical)");
+  await doRunProjectSymlinks(stepOpts, stepCtx);
+  console.log("");
+  console.log("## 4/5 generate workspace view (aggregate the roster repos)");
+  await doRunProjectWorkspace(stepOpts, stepCtx);
+  console.log("");
+  console.log("## 5/5 generate .gitignore (exclude public repos' instruction files)");
+  await doRunProjectGitignore(stepOpts, stepCtx);
+  console.log("");
+  console.log(
+    apply ? "\u2705 Ran every step (each is idempotent, so a partial apply recovers on re-run)." : "\u2139\uFE0F Dry-run preview. Pass --apply to write the changes, then re-run."
+  );
+}
 
 // src/commands/protocol.ts
 import { readFile as readFile4 } from "fs/promises";
@@ -5046,7 +5691,7 @@ import {
   PROTOCOL_START,
   parseMarkers as parseMarkers2,
   readMarkdownFile as readMarkdownFile5,
-  removeMarkerSection
+  removeMarkerSection as removeMarkerSection2
 } from "@basou/core";
 
 // src/lib/durable-write.ts
@@ -5338,7 +5983,7 @@ async function doRunProtocolUnsync(options) {
     console.log("No target file; nothing to remove.");
     return;
   }
-  const newBody = removeMarkerSection(existing, "CLAUDE.md", PROTOCOL_MARKERS);
+  const newBody = removeMarkerSection2(existing, "CLAUDE.md", PROTOCOL_MARKERS);
   if (newBody === existing) {
     console.log("No basou:protocols block found; nothing removed.");
     return;
@@ -5711,7 +6356,7 @@ import {
   basouPaths as basouPaths12,
   findErrorCode as findErrorCode10,
   renderReport,
-  resolveRepositoryRoot as resolveRepositoryRoot8,
+  resolveRepositoryRoot as resolveRepositoryRoot9,
   writeMarkdownFile as writeMarkdownFile6
 } from "@basou/core";
 function registerReportCommand(program) {
@@ -5760,7 +6405,7 @@ async function doRunReportGenerate(options, ctx) {
 }
 async function resolveRepositoryRootForReport(cwd) {
   try {
-    return await resolveRepositoryRoot8(cwd);
+    return await resolveRepositoryRoot9(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error(
@@ -5843,45 +6488,45 @@ async function doRunReviewGaps(options, ctx) {
   return summary;
 }
 function relAge(iso, now) {
-  if (iso === null) return "(\u4E0D\u660E)";
+  if (iso === null) return "(unknown)";
   const ms = now.getTime() - Date.parse(iso);
-  if (!Number.isFinite(ms) || ms < 0) return "\u305F\u3063\u305F\u4ECA";
+  if (!Number.isFinite(ms) || ms < 0) return "just now";
   const days = Math.floor(ms / 864e5);
-  if (days >= 1) return `${days}\u65E5\u524D`;
+  if (days >= 1) return `${days}d ago`;
   const hours = Math.floor(ms / 36e5);
-  if (hours >= 1) return `${hours}\u6642\u9593\u524D`;
-  return `${Math.max(1, Math.floor(ms / 6e4))}\u5206\u524D`;
+  if (hours >= 1) return `${hours}h ago`;
+  return `${Math.max(1, Math.floor(ms / 6e4))}m ago`;
 }
 function unitLine(u, now) {
   const when = relAge(u.lastCommitAt, now);
   const head = `- ${u.repo} ${when} (${u.commitCount} commit${u.commitCount === 1 ? "" : "s"})`;
   if (u.verdict === "near_unbound") {
     const ids = u.reviews.map((r) => r.sessionId.slice(0, 14)).join(", ");
-    return `${head} \u2014 \u8FD1\u63A5\u30EC\u30D3\u30E5\u30FC\u306F\u3042\u308B\u304C diff/\u5909\u66F4\u30D5\u30A1\u30A4\u30EB\u3092\u78BA\u8A8D\u3057\u3066\u3044\u306A\u3044 [${ids}]`;
+    return `${head} \u2014 a nearby review exists, but the diff / changed files were not examined [${ids}]`;
   }
-  return `${head} \u2014 \u7D10\u3065\u304F\u30AF\u30ED\u30B9\u30E2\u30C7\u30EB\u30EC\u30D3\u30E5\u30FC\u306A\u3057`;
+  return `${head} \u2014 no bound cross-model review`;
 }
 function candidateLine(u, now) {
   const when = relAge(u.lastCommitAt, now);
   const cite = u.reviews.map((r) => `${r.sessionId.slice(0, 14)}${r.examinedDiff ? "(diff)" : ""}`).join(", ");
-  return `- ${u.repo} ${when} (${u.commitCount} commit${u.commitCount === 1 ? "" : "s"}) \u2014 \u30EC\u30D3\u30E5\u30FC\u5F62\u8DE1: ${cite}`;
+  return `- ${u.repo} ${when} (${u.commitCount} commit${u.commitCount === 1 ? "" : "s"}) \u2014 review trace: ${cite}`;
 }
 function renderReviewGaps(summary) {
   const now = new Date(summary.generatedAt);
   const lines = [];
-  const scope = summary.scope ? summary.scope.join(", ") : "\u5168\u30EA\u30DD\u30B8\u30C8\u30EA";
-  lines.push(`# \u30EC\u30D3\u30E5\u30FC\u8A3C\u8DE1\u306E\u30AE\u30E3\u30C3\u30D7 (${scope})`);
+  const scope = summary.scope ? summary.scope.join(", ") : "all repositories";
+  lines.push(`# Review-trail gaps (${scope})`);
   lines.push("");
   if (summary.gaps.length === 0) {
-    lines.push("\u2705 \u53D6\u308A\u8FBC\u307F\u6E08\u307F\u306E\u7BC4\u56F2\u3067\u306F\u3001\u30EC\u30D3\u30E5\u30FC\u8A3C\u8DE1\u306A\u3057\u3067\u7740\u5730\u3057\u305F\u4F5C\u696D\u5358\u4F4D\u306F\u3042\u308A\u307E\u305B\u3093\u3002");
+    lines.push("\u2705 Within the captured range, no unit of work landed without a review trail.");
   } else {
-    lines.push(`\u26A0\uFE0F \u30EC\u30D3\u30E5\u30FC\u8A3C\u8DE1\u306A\u3057\u3067\u7740\u5730\u3057\u305F\u4F5C\u696D\u5358\u4F4D: ${summary.gaps.length}`);
+    lines.push(`\u26A0\uFE0F Units of work that landed without a review trail: ${summary.gaps.length}`);
     for (const u of summary.gaps) lines.push(unitLine(u, now));
   }
   lines.push("");
   if (summary.candidates.length > 0) {
     lines.push(
-      `## \u78BA\u8A8D\u5F85\u3061 (${summary.candidates.length}) \u2014 \u30AF\u30ED\u30B9\u30E2\u30C7\u30EB\u304C\u30EC\u30D3\u30E5\u30FC\u3057\u305F\u5F62\u8DE1\u3042\u308A\u3002\u3053\u306E\u5909\u66F4\u3092\u672C\u5F53\u306B\u898B\u305F\u304B\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044`
+      `## To confirm (${summary.candidates.length}) \u2014 a cross-model review trace exists; confirm it actually examined this change`
     );
     for (const u of summary.candidates) lines.push(candidateLine(u, now));
     lines.push("");
@@ -5889,19 +6534,19 @@ function renderReviewGaps(summary) {
   if (summary.unknowns.length > 0) {
     const n = summary.unknowns.reduce((sum, u) => sum + u.commitCount, 0);
     lines.push(
-      `## \u5C0E\u51FA\u4E0D\u53EF (${summary.unknowns.length} \u5358\u4F4D / ${n} commit) \u2014 repo \u304B\u6642\u523B\u3092\u6355\u6349\u304B\u3089\u5C0E\u3051\u305A\u3001\u5224\u5B9A\u3092\u4FDD\u7559(clear \u3067\u306F\u3042\u308A\u307E\u305B\u3093)`
+      `## Undeterminable (${summary.unknowns.length} unit${summary.unknowns.length === 1 ? "" : "s"} / ${n} commit${n === 1 ? "" : "s"}) \u2014 repo or timestamp could not be derived from capture; verdict withheld (not a clear)`
     );
     lines.push("");
   }
-  lines.push("## \u30EA\u30DD\u30B8\u30C8\u30EA\u5225");
+  lines.push("## By repository");
   for (const r of summary.repos) {
     lines.push(
-      `- ${r.repo}: ${r.units} \u5358\u4F4D (\u8A3C\u8DE1\u306A\u3057 ${r.omissionUnits} / \u8FD1\u63A5\u306E\u307F ${r.nearUnboundUnits} / \u78BA\u8A8D\u5F85\u3061 ${r.candidateUnits}${r.unknownUnits > 0 ? ` / \u4E0D\u660E ${r.unknownUnits}` : ""})`
+      `- ${r.repo}: ${r.units} unit${r.units === 1 ? "" : "s"} (no trail ${r.omissionUnits} / nearby only ${r.nearUnboundUnits} / to confirm ${r.candidateUnits}${r.unknownUnits > 0 ? ` / unknown ${r.unknownUnits}` : ""})`
     );
   }
   lines.push("");
   lines.push(
-    `\u6CE8: read-only \u306E advisory \u3067\u3059\u3002\u53D6\u308A\u8FBC\u307F\u6E08\u307F\u306E commit \u306E\u307F\u304C\u5BFE\u8C61\uFF08\u6700\u65B0\u53D6\u8FBC commit: ${summary.newestCommitAt === null ? "\u306A\u3057" : relAge(summary.newestCommitAt, now)}\uFF09\u3002\u30EC\u30D3\u30E5\u30FC\u306E\u300C\u5B9F\u65BD\u300D\u306F\u81EA\u52D5\u5224\u5B9A\u305B\u305A\u3001\u6642\u9593\u7684\u8FD1\u63A5\u3060\u3051\u3067\u306F\u5408\u683C\u306B\u3057\u307E\u305B\u3093\u3002enforce \u306F\u3057\u307E\u305B\u3093\u3002`
+    `Note: read-only advisory. Only captured commits are in scope (newest captured commit: ${summary.newestCommitAt === null ? "none" : relAge(summary.newestCommitAt, now)}). It never auto-judges that a review "happened", and temporal proximity alone is not a pass. It does not enforce.`
   );
   return lines.join("\n");
 }
@@ -5925,7 +6570,7 @@ import {
   readManifest as readManifest7,
   readYamlFile as readYamlFile6,
   resolveClaudeCodeCommand,
-  resolveRepositoryRoot as resolveRepositoryRoot9,
+  resolveRepositoryRoot as resolveRepositoryRoot10,
   SessionSchema as SessionSchema2,
   sanitizeRelatedFiles,
   sanitizeWorkingDirectory as sanitizeWorkingDirectory2,
@@ -6298,7 +6943,7 @@ async function finalizeSessionAsFailed2(paths, sessionDir, sessionId, appendEven
 }
 async function resolveRepositoryRootForRun(cwd) {
   try {
-    return await resolveRepositoryRoot9(cwd);
+    return await resolveRepositoryRoot10(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou run'.", {
@@ -6980,7 +7625,7 @@ import {
   basouPaths as basouPaths16,
   computeWorkStats,
   findErrorCode as findErrorCode12,
-  resolveRepositoryRoot as resolveRepositoryRoot10
+  resolveRepositoryRoot as resolveRepositoryRoot11
 } from "@basou/core";
 function registerStatsCommand(program) {
   program.command("stats").description("Report how much the AI worked (output volume + time proxies) across sessions").option("--by-source", "Break the totals down by session source kind").option("--by-day", "Break billable time and volume down by calendar day").option("--json", "Output the full stats as JSON").option("-v, --verbose", "Show error causes").action(async (options) => {
@@ -7083,7 +7728,7 @@ function formatInt(n) {
 }
 async function resolveRepositoryRootForStats(cwd) {
   try {
-    return await resolveRepositoryRoot10(cwd);
+    return await resolveRepositoryRoot11(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou stats'.", {
@@ -7111,7 +7756,7 @@ import {
   buildStatusSnapshot,
   findErrorCode as findErrorCode13,
   readManifest as readManifest9,
-  resolveRepositoryRoot as resolveRepositoryRoot11,
+  resolveRepositoryRoot as resolveRepositoryRoot12,
   writeStatus
 } from "@basou/core";
 function registerStatusCommand(program) {
@@ -7167,7 +7812,7 @@ function renderTextStatus(s) {
 }
 async function resolveRepositoryRootForStatus(cwd) {
   try {
-    return await resolveRepositoryRoot11(cwd);
+    return await resolveRepositoryRoot12(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou status'.", {
@@ -8304,7 +8949,7 @@ import {
   basouPaths as basouPaths19,
   enumerateSessionDirs as enumerateSessionDirs3,
   findErrorCode as findErrorCode15,
-  resolveRepositoryRoot as resolveRepositoryRoot12,
+  resolveRepositoryRoot as resolveRepositoryRoot13,
   resolveSessionId as resolveSessionId5,
   verifyEventsChain
 } from "@basou/core";
@@ -8375,7 +9020,7 @@ function renderVerdict(row) {
 }
 async function resolveRepositoryRootForVerify(cwd) {
   try {
-    return await resolveRepositoryRoot12(cwd);
+    return await resolveRepositoryRoot13(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou verify'.", {
@@ -8405,7 +9050,7 @@ import {
   basouPaths as basouPaths20,
   findErrorCode as findErrorCode17,
   readManifest as readManifest13,
-  resolveRepositoryRoot as resolveRepositoryRoot13
+  resolveRepositoryRoot as resolveRepositoryRoot14
 } from "@basou/core";
 import { InvalidArgumentError as InvalidArgumentError7 } from "commander";
 
@@ -9821,7 +10466,7 @@ function waitForShutdown(signal) {
 }
 async function resolveRepositoryRootForView(cwd) {
   try {
-    return await resolveRepositoryRoot13(cwd);
+    return await resolveRepositoryRoot14(cwd);
   } catch (error) {
     if (error instanceof Error && error.message === "Not a git repository") {
       throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou view'.", {