@fenglimg/fabric-cli 2.0.0-rc.15 → 2.0.0-rc.22

package/dist/{config-7YD365I3.js → config-AYP5F72E.js}

@@ -3,8 +3,8 @@ import {
   configCmd,
   config_default,
   installMcpClients
-} from "./chunk-AIB54QRT.js";
-import "./chunk-SKSYUHKK.js";
+} from "./chunk-KZ2YITOS.js";
+import "./chunk-MF3OTILQ.js";
 import "./chunk-6ICJICVU.js";
 export {
   configCmd,

package/dist/{doctor-6XHLQJXB.js → doctor-HIX2FFEP.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runInitScan
-} from "./chunk-AXIFEVAS.js";
+} from "./chunk-PSVKSMRO.js";
 import {
   hasActionHint,
   paint,
@@ -13,7 +13,7 @@ import {
 } from "./chunk-6ICJICVU.js";
 import {
   resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+} from "./chunk-ZSESMG6L.js";
 
 // src/commands/doctor.ts
 import { confirm, isCancel } from "@clack/prompts";
@@ -22,6 +22,7 @@ import {
   appendEventLedgerEvent,
   checkLockOrThrow,
   runDoctorApplyLint as runDoctorFixKnowledge,
+  runDoctorCiteCoverage,
   runDoctorFix,
   runDoctorReport
 } from "@fenglimg/fabric-server";
@@ -75,6 +76,25 @@ var doctorCommand = defineCommand({
       type: "boolean",
       description: t("cli.doctor.args.yes.description"),
       default: false
+    },
+    // rc.20 TASK-05: cite policy adherence report (read-only). Skips standard
+    // inspections entirely — different output surface. Mutually exclusive
+    // with --fix / --fix-knowledge (enforced in run()).
+    "cite-coverage": {
+      type: "boolean",
+      description: t("cli.doctor.args.cite-coverage.description"),
+      default: false
+    },
+    since: {
+      type: "string",
+      description: t("cli.doctor.args.since.description"),
+      default: "7d"
+    },
+    client: {
+      type: "string",
+      description: t("cli.doctor.args.client.description"),
+      default: "all",
+      valueHint: "cc|codex|cursor|all"
     }
   },
   async run({ args }) {
@@ -92,6 +112,34 @@ var doctorCommand = defineCommand({
     const fixKnowledge = args["fix-knowledge"] === true;
     const fix = args.fix === true;
     const rescan = args.rescan === true;
+    const citeCoverage = args["cite-coverage"] === true;
+    if (citeCoverage) {
+      if (fix || fixKnowledge) {
+        writeStderr(t("cli.doctor.errors.cite-coverage-mutex"));
+        process.exitCode = 1;
+        return;
+      }
+      let sinceMs;
+      try {
+        sinceMs = parseSinceDuration(args.since ?? "7d");
+      } catch {
+        writeStderr(t("cli.doctor.errors.invalid-since", { input: args.since ?? "7d" }));
+        process.exitCode = 1;
+        return;
+      }
+      const clientFilter = args.client ?? "all";
+      if (!isValidClientFilter(clientFilter)) {
+        writeStderr(t("cli.doctor.errors.invalid-client", { input: clientFilter }));
+        process.exitCode = 1;
+        return;
+      }
+      const report2 = await runDoctorCiteCoverage(resolution.target, {
+        since: sinceMs,
+        client: clientFilter
+      });
+      renderCiteCoverageReport(report2, args.json === true);
+      return;
+    }
     if (fixKnowledge && fix) {
       writeStderr(t("cli.doctor.errors.fix-knowledge-fix-mutually-exclusive"));
       process.exitCode = 1;
@@ -293,7 +341,85 @@ async function resolveFixKnowledgeConsent(options) {
   }
   return "proceed";
 }
+var CITE_COVERAGE_CLIENT_FILTERS = /* @__PURE__ */ new Set([
+  "cc",
+  "codex",
+  "cursor",
+  "all"
+]);
+function isValidClientFilter(input) {
+  return CITE_COVERAGE_CLIENT_FILTERS.has(input);
+}
+function renderCiteCoverageReport(report, jsonMode) {
+  if (jsonMode) {
+    writeStdout(JSON.stringify(report, null, 2));
+    return;
+  }
+  if (report.status === "skipped") {
+    writeStdout(t("doctor.cite.status.skipped"));
+    return;
+  }
+  const lines = [];
+  lines.push(t("doctor.section.cite-coverage"));
+  lines.push(
+    t("doctor.cite.header", {
+      since: new Date(report.since_ts).toISOString(),
+      marker: new Date(report.marker_ts).toISOString()
+    })
+  );
+  if (report.marker_emitted_now) {
+    lines.push(t("doctor.cite.warning.justActivated"));
+  }
+  lines.push("");
+  lines.push(`  ${t("doctor.cite.metric.editsTouched")}: ${report.metrics.edits_touched}`);
+  lines.push(`  ${t("doctor.cite.metric.qualifyingCites")}: ${report.metrics.qualifying_cites}`);
+  lines.push(`  ${t("doctor.cite.metric.recalledUnverified")}: ${report.metrics.recalled_unverified}`);
+  lines.push(`  ${t("doctor.cite.metric.expectedButMissed")}: ${report.metrics.expected_but_missed}`);
+  lines.push(`  ${t("doctor.cite.metric.totalTurns")}: ${report.metrics.total_turns}`);
+  if (report.per_client !== void 0 && Object.keys(report.per_client).length > 1) {
+    lines.push("");
+    lines.push(`### ${t("doctor.cite.section.perClient")}`);
+    for (const [client, metrics] of Object.entries(report.per_client)) {
+      const summary = Object.entries(metrics).map(([k, v]) => `${k}=${v}`).join(" / ");
+      lines.push(`  ${client}: ${summary}`);
+    }
+  }
+  if (report.dismissed_reason_histogram !== void 0 && Object.keys(report.dismissed_reason_histogram).length > 0) {
+    lines.push("");
+    lines.push(`### ${t("doctor.cite.section.dismissedReasons")}`);
+    for (const [reason, count] of Object.entries(report.dismissed_reason_histogram)) {
+      const label = t(`doctor.cite.dismissed.${reason}`);
+      lines.push(`  ${label}: ${count}`);
+    }
+  }
+  writeStdout(lines.join("\n"));
+}
+function parseSinceDuration(input) {
+  const trimmed = input.trim();
+  if (trimmed.length === 0) {
+    throw new Error(`invalid --since value: ${input}`);
+  }
+  const durationMatch = /^(\d+)([dhm])$/.exec(trimmed);
+  if (durationMatch !== null) {
+    const value = Number.parseInt(durationMatch[1], 10);
+    const unit = durationMatch[2];
+    if (!Number.isFinite(value) || value <= 0) {
+      throw new Error(`invalid --since value: ${input}`);
+    }
+    const unitMs = unit === "d" ? 864e5 : unit === "h" ? 36e5 : 6e4;
+    return Date.now() - value * unitMs;
+  }
+  if (/^\d+$/.test(trimmed)) {
+    const value = Number.parseInt(trimmed, 10);
+    if (!Number.isFinite(value) || value < 0) {
+      throw new Error(`invalid --since value: ${input}`);
+    }
+    return value;
+  }
+  throw new Error(`invalid --since value: ${input}`);
+}
 export {
   doctor_default as default,
-  doctorCommand
+  doctorCommand,
+  parseSinceDuration
 };

package/dist/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  t
+} from "./chunk-6ICJICVU.js";
 
 // src/index.ts
 import { realpathSync } from "fs";
@@ -8,20 +11,20 @@ import { defineCommand, runMain } from "citty";
 
 // src/commands/index.ts
 var allCommands = {
-  install: () => import("./install-JLDCHAXV.js").then((module) => module.default),
-  doctor: () => import("./doctor-6XHLQJXB.js").then((module) => module.default),
-  serve: () => import("./serve-L3X5UHG2.js").then((module) => module.default),
-  uninstall: () => import("./uninstall-DD6FIFCI.js").then((module) => module.default),
-  config: () => import("./config-7YD365I3.js").then((module) => module.default),
-  "plan-context-hint": () => import("./plan-context-hint-73U4FGKO.js").then((module) => module.default)
+  install: () => import("./install-WJZQZM7D.js").then((module) => module.default),
+  doctor: () => import("./doctor-HIX2FFEP.js").then((module) => module.default),
+  serve: () => import("./serve-6PPQX7AW.js").then((module) => module.default),
+  uninstall: () => import("./uninstall-L2HEEOU3.js").then((module) => module.default),
+  config: () => import("./config-AYP5F72E.js").then((module) => module.default),
+  "plan-context-hint": () => import("./plan-context-hint-RYVSMULL.js").then((module) => module.default)
 };
 
 // src/index.ts
 var main = defineCommand({
   meta: {
     name: "fabric",
-    version: "2.0.0-rc.15",
-    description: 'Initialize and manage Fabric projects. Use "fabric install" for one-shot setup.'
+    version: "2.0.0-rc.22",
+    description: t("cli.main.description")
   },
   subCommands: allCommands
 });

package/dist/{install-JLDCHAXV.js → install-WJZQZM7D.js}

@@ -1,27 +1,31 @@
 #!/usr/bin/env node
 import {
   installMcpClients
-} from "./chunk-AIB54QRT.js";
+} from "./chunk-KZ2YITOS.js";
 import {
   detectExistingLanguage,
   runInitScan
-} from "./chunk-AXIFEVAS.js";
+} from "./chunk-PSVKSMRO.js";
 import {
-  addFabricKnowledgeBaseSection,
   installArchiveHintHook,
   installFabricArchiveSkill,
   installFabricImportSkill,
   installFabricReviewSkill,
+  installHookLibs,
   installKnowledgeHintBroadHook,
   installKnowledgeHintNarrowHook,
   mergeClaudeCodeHookConfig,
   mergeCodexHookConfig,
   mergeCursorHookConfig,
-  readFabricLanguagePreference
-} from "./chunk-UTF4YBDN.js";
+  readFabricLanguagePreference,
+  writeClaudeBootstrapThinShell,
+  writeCodexBootstrapManagedBlock,
+  writeCursorBootstrapManagedBlock,
+  writeFabricAgentsSnapshot
+} from "./chunk-4HC5ZK7H.js";
 import {
   detectClientSupports
-} from "./chunk-SKSYUHKK.js";
+} from "./chunk-MF3OTILQ.js";
 import {
   displayWidth,
   hasActionHint,
@@ -35,7 +39,7 @@ import {
 import {
   createDebugLogger,
   resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+} from "./chunk-ZSESMG6L.js";
 
 // src/commands/install.ts
 import { randomUUID } from "crypto";
@@ -45,7 +49,7 @@ import { appendFileSync, existsSync as existsSync3, mkdirSync, readFileSync as r
 import { dirname, isAbsolute as isAbsolute3, join as join3, resolve as resolve3 } from "path";
 import { cancel, confirm, group, intro, isCancel, log, note, outro, select } from "@clack/prompts";
 import { defaultAgentsMetaCounters } from "@fenglimg/fabric-shared";
-import { atomicWriteJson, atomicWriteText } from "@fenglimg/fabric-shared/node/atomic-write";
+import { atomicWriteJson } from "@fenglimg/fabric-shared/node/atomic-write";
 import { defineCommand } from "citty";
 import { checkLockOrThrow } from "@fenglimg/fabric-server";
 
@@ -62,11 +66,14 @@ async function installHooks(target, _options = {}) {
   results.push(...await runStep(() => installArchiveHintHook(normalizedTarget)));
   results.push(...await runStep(() => installKnowledgeHintBroadHook(normalizedTarget)));
   results.push(...await runStep(() => installKnowledgeHintNarrowHook(normalizedTarget)));
+  results.push(...await runStep(() => installHookLibs(normalizedTarget)));
   results.push(await runSingleStep("claude-hook-config", () => mergeClaudeCodeHookConfig(normalizedTarget)));
   results.push(await runSingleStep("codex-hook-config", () => mergeCodexHookConfig(normalizedTarget)));
   results.push(await runSingleStep("cursor-hook-config", () => mergeCursorHookConfig(normalizedTarget)));
-  const fabricLanguage = readFabricLanguagePreference(normalizedTarget);
-  results.push(...await runStep(() => addFabricKnowledgeBaseSection(normalizedTarget, fabricLanguage)));
+  results.push(await runSingleStep("bootstrap-snapshot", () => writeFabricAgentsSnapshot(normalizedTarget)));
+  results.push(await runSingleStep("bootstrap-claude", () => writeClaudeBootstrapThinShell(normalizedTarget)));
+  results.push(await runSingleStep("bootstrap-codex", () => writeCodexBootstrapManagedBlock(normalizedTarget)));
+  results.push(await runSingleStep("bootstrap-cursor", () => writeCursorBootstrapManagedBlock(normalizedTarget)));
   results.push(...validateHookPaths(normalizedTarget));
   return summarizeResults(results);
 }
@@ -1292,7 +1299,7 @@ function readProjectName(target) {
   return basename(target);
 }
 function getCliVersion() {
-  return true ? "2.0.0-rc.15" : "unknown";
+  return true ? "2.0.0-rc.22" : "unknown";
 }
 function sortRecord(record) {
   return Object.fromEntries(Object.entries(record).sort(([left], [right]) => left.localeCompare(right)));
@@ -1302,15 +1309,6 @@ function toPosixPath(path) {
 }
 
 // src/commands/install.ts
-var AGENTS_MD_DEFAULT_CONTENT = `# Project Knowledge
-
-This project uses [Fabric](https://github.com/fenglimg/fabric) for cross-client AI knowledge management.
-
-Knowledge entries live in \`.fabric/knowledge/\` (team) and \`~/.fabric/knowledge/\` (personal).
-Run \`fabric doctor\` to verify state.
-
-See \`.fabric/knowledge/\` for project decisions, pitfalls, guidelines, models, and processes.
-`;
 var LOCAL_FABRIC_SERVER_PATH = join3("node_modules", "@fenglimg", "fabric-server", "dist", "index.js");
 var FABRIC_SERVER_PACKAGE = "@fenglimg/fabric-server";
 var INIT_WIZARD_GROUP_CANCELLED = /* @__PURE__ */ Symbol("init-wizard-group-cancelled");
@@ -1626,9 +1624,6 @@ async function executeInitFabricPlan(plan) {
   }
   mkdirSync(plan.fabricDir, { recursive: true });
   writeDefaultFabricConfig(plan.fabricDir, plan.target);
-  if (plan.agentsMdAction === "created" && !existsSync3(plan.agentsMdPath)) {
-    await atomicWriteText(plan.agentsMdPath, AGENTS_MD_DEFAULT_CONTENT);
-  }
   mkdirSync(plan.knowledgeDir, { recursive: true });
   for (const sub of KNOWLEDGE_SUBDIRS) {
     const teamSubDir = join3(plan.knowledgeDir, sub);
@@ -1820,11 +1815,14 @@ async function executeInitStagePlan(plan, stageName) {
         installResults.push(...await runBestEffort("hook-script", () => installArchiveHintHook(plan.target)));
         installResults.push(...await runBestEffort("hook-broad-script", () => installKnowledgeHintBroadHook(plan.target)));
         installResults.push(...await runBestEffort("hook-narrow-script", () => installKnowledgeHintNarrowHook(plan.target)));
+        installResults.push(...await runBestEffort("hook-lib", () => installHookLibs(plan.target)));
         installResults.push(await runBestEffortSingle("claude-hook-config", () => mergeClaudeCodeHookConfig(plan.target)));
         installResults.push(await runBestEffortSingle("codex-hook-config", () => mergeCodexHookConfig(plan.target)));
         installResults.push(await runBestEffortSingle("cursor-hook-config", () => mergeCursorHookConfig(plan.target)));
-        const fabricLanguage = readFabricLanguagePreference(plan.target);
-        installResults.push(...await runBestEffort("section", () => addFabricKnowledgeBaseSection(plan.target, fabricLanguage)));
+        installResults.push(await runBestEffortSingle("bootstrap-snapshot", () => writeFabricAgentsSnapshot(plan.target)));
+        installResults.push(await runBestEffortSingle("bootstrap-claude", () => writeClaudeBootstrapThinShell(plan.target)));
+        installResults.push(await runBestEffortSingle("bootstrap-codex", () => writeCodexBootstrapManagedBlock(plan.target)));
+        installResults.push(await runBestEffortSingle("bootstrap-cursor", () => writeCursorBootstrapManagedBlock(plan.target)));
         const installedCount = installResults.filter((r) => r.status === "written").length;
         const skippedCount = installResults.filter((r) => r.status === "skipped").length;
         const errorCount = installResults.filter((r) => r.status === "error").length;

package/dist/{plan-context-hint-73U4FGKO.js → plan-context-hint-RYVSMULL.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+} from "./chunk-ZSESMG6L.js";
 
 // src/commands/plan-context-hint.ts
 import { defineCommand } from "citty";
@@ -66,19 +66,26 @@ async function runPlanContextHint(opts) {
     // scope_glob matches the requested path.
     dedupeByStableId(result.entries.flatMap((entry) => entry.description_index))
   );
-  const narrow = narrowSource.map((item) => ({
+  const entries = narrowSource.map((item) => ({
     id: item.stable_id,
     type: item.type ?? item.description.knowledge_type ?? "",
     maturity: item.maturity ?? item.description.maturity ?? "",
     summary: item.description.summary
   }));
-  return {
-    version: 1,
+  const output = {
+    version: 2,
     revision_hash: result.revision_hash,
     target_paths: targetPaths,
-    narrow,
+    entries,
     broad_count: sharedIndex.length
   };
+  if (result.auto_healed === true) {
+    output.auto_healed = true;
+    if (typeof result.previous_revision_hash === "string") {
+      output.previous_revision_hash = result.previous_revision_hash;
+    }
+  }
+  return output;
 }
 function parsePathsArg(raw) {
   if (raw === void 0 || raw.length === 0) {

package/dist/{serve-L3X5UHG2.js → serve-6PPQX7AW.js}

@@ -11,7 +11,7 @@ import {
 import {
   createDebugLogger,
   resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+} from "./chunk-ZSESMG6L.js";
 
 // src/commands/serve.ts
 import { defineCommand } from "citty";

package/dist/{uninstall-DD6FIFCI.js → uninstall-L2HEEOU3.js}

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 import {
   FABRIC_HOOK_COMMAND_PATHS,
-  FABRIC_SECTION_REGEX,
   HOOK_CONFIG_ARRAY_PATHS,
   HOOK_CONFIG_TARGETS,
+  HOOK_LIB_DESTINATIONS,
   HOOK_SCRIPT_DESTINATIONS,
-  SECTION_TARGETS,
-  SKILL_DESTINATIONS
-} from "./chunk-UTF4YBDN.js";
+  SKILL_DESTINATIONS,
+  fabricAgentsSnapshotPath
+} from "./chunk-4HC5ZK7H.js";
 import {
   detectClientSupports,
   resolveClients
-} from "./chunk-SKSYUHKK.js";
+} from "./chunk-MF3OTILQ.js";
 import {
   hasActionHint,
   paint,
@@ -23,7 +23,7 @@ import {
 import {
   createDebugLogger,
   resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+} from "./chunk-ZSESMG6L.js";
 
 // src/commands/uninstall.ts
 import { existsSync as existsSync2, statSync } from "fs";
@@ -39,6 +39,7 @@ import { existsSync } from "fs";
 import { readdir, readFile, rm, rmdir } from "fs/promises";
 import { dirname, join } from "path";
 import { atomicWriteJson, atomicWriteText } from "@fenglimg/fabric-shared/node/atomic-write";
+import { BOOTSTRAP_REGEX } from "@fenglimg/fabric-shared/templates/bootstrap-canonical";
 async function uninstallFabricArchiveSkill(projectRoot) {
   return removeSkill("skill", SKILL_DESTINATIONS.fabricArchive, projectRoot);
 }
@@ -82,6 +83,34 @@ async function removeHookScripts(step, rels, projectRoot) {
   }
   return results;
 }
+async function removeHookLibs(projectRoot) {
+  const results = [];
+  for (const dirRel of HOOK_LIB_DESTINATIONS) {
+    const dirAbs = join(projectRoot, dirRel);
+    if (!existsSync(dirAbs)) {
+      results.push({ step: "hook-lib", path: dirAbs, status: "skipped", message: "absent" });
+      continue;
+    }
+    let entries;
+    try {
+      entries = await readdir(dirAbs);
+    } catch (error) {
+      results.push({
+        step: "hook-lib",
+        path: dirAbs,
+        status: "error",
+        message: error instanceof Error ? error.message : String(error)
+      });
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".cjs")) continue;
+      results.push(await rmIfExists("hook-lib", join(dirAbs, entry)));
+    }
+    results.push(await rmDirIfEmpty("hook-lib-dir", dirAbs));
+  }
+  return results;
+}
 async function unmergeClaudeCodeHookConfig(projectRoot) {
   return unmergeHookConfig({
     step: "claude-hook-config",
@@ -112,69 +141,131 @@ async function unmergeCursorHookConfig(projectRoot) {
     extractCommands: extractFlatCommands
   });
 }
-async function stripFabricKnowledgeBaseSection(projectRoot) {
+async function stripFabricBootstrapBlocks(projectRoot) {
   const results = [];
-  for (const rel of SECTION_TARGETS) {
-    const target = join(projectRoot, rel);
-    if (!existsSync(target)) {
-      results.push({ step: "section", path: target, status: "skipped", message: "absent" });
-      continue;
-    }
-    let existing;
-    try {
-      existing = await readFile(target, "utf8");
-    } catch (error) {
-      results.push({
-        step: "section",
-        path: target,
-        status: "error",
-        message: error instanceof Error ? error.message : String(error)
-      });
-      continue;
-    }
-    const match = existing.match(FABRIC_SECTION_REGEX);
-    if (match === null) {
-      results.push({
-        step: "section",
-        path: target,
-        status: "skipped",
-        message: "no-fabric-section"
-      });
-      continue;
-    }
-    const before = existing.slice(0, match.index ?? 0);
-    const after = existing.slice((match.index ?? 0) + match[0].length);
-    const filtered = `${before}${after.replace(/^\r?\n/, "")}`;
-    if (filtered === existing) {
-      results.push({
-        step: "section",
-        path: target,
-        status: "skipped",
-        message: "no-fabric-section"
-      });
-      continue;
-    }
+  results.push(await stripClaudeBootstrapImports(projectRoot));
+  results.push(await stripManagedBlock(projectRoot, "AGENTS.md", { deleteWhenEmpty: false }));
+  results.push(
+    await stripManagedBlock(projectRoot, join(".cursor", "rules", "fabric-bootstrap.mdc"), {
+      deleteWhenEmpty: true
+    })
+  );
+  return results;
+}
+async function stripClaudeBootstrapImports(projectRoot) {
+  const step = "bootstrap-claude";
+  const target = join(projectRoot, "CLAUDE.md");
+  if (!existsSync(target)) {
+    return { step, path: target, status: "skipped", message: "absent" };
+  }
+  let existing;
+  try {
+    existing = await readFile(target, "utf8");
+  } catch (error) {
+    return {
+      step,
+      path: target,
+      status: "error",
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+  const managedLines = /* @__PURE__ */ new Set(["@.fabric/AGENTS.md", "@.fabric/project-rules.md"]);
+  const lines = existing.split(/\r?\n/);
+  const filtered = lines.filter((l) => !managedLines.has(l.replace(/\s+$/, "")));
+  if (filtered.length === lines.length) {
+    return { step, path: target, status: "skipped", message: "no-fabric-section" };
+  }
+  while (filtered.length > 1 && filtered[filtered.length - 1] === "" && filtered[filtered.length - 2] === "") {
+    filtered.pop();
+  }
+  const next = filtered.join("\n");
+  if (next === existing) {
+    return { step, path: target, status: "skipped", message: "no-fabric-section" };
+  }
+  try {
+    await atomicWriteText(target, next);
+    return { step, path: target, status: "removed" };
+  } catch (error) {
+    return {
+      step,
+      path: target,
+      status: "error",
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+async function stripManagedBlock(projectRoot, relPath, options) {
+  const step = relPath.endsWith(".mdc") ? "bootstrap-cursor" : "bootstrap-codex";
+  const target = join(projectRoot, relPath);
+  if (!existsSync(target)) {
+    return { step, path: target, status: "skipped", message: "absent" };
+  }
+  let existing;
+  try {
+    existing = await readFile(target, "utf8");
+  } catch (error) {
+    return {
+      step,
+      path: target,
+      status: "error",
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+  const match = existing.match(BOOTSTRAP_REGEX);
+  if (match === null) {
+    return { step, path: target, status: "skipped", message: "no-fabric-section" };
+  }
+  const before = existing.slice(0, match.index ?? 0);
+  const after = existing.slice((match.index ?? 0) + match[0].length);
+  const filtered = `${before}${after.replace(/^\r?\n/, "")}`;
+  if (options.deleteWhenEmpty && isFrontMatterOnly(filtered)) {
     try {
-      await atomicWriteText(target, filtered);
-      results.push({ step: "section", path: target, status: "removed" });
+      await rm(target, { force: true });
+      return { step, path: target, status: "removed", message: "front-matter-only" };
     } catch (error) {
-      results.push({
-        step: "section",
+      return {
+        step,
         path: target,
         status: "error",
         message: error instanceof Error ? error.message : String(error)
-      });
+      };
     }
   }
-  return results;
+  try {
+    await atomicWriteText(target, filtered);
+    return { step, path: target, status: "removed" };
+  } catch (error) {
+    return {
+      step,
+      path: target,
+      status: "error",
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+function isFrontMatterOnly(content) {
+  const trimmed = content.replace(/^\s+/, "");
+  const match = trimmed.match(/^---\n[\s\S]*?\n---\s*$/);
+  if (match === null) return trimmed.length === 0;
+  return true;
+}
+async function deleteFabricAgentsSnapshot(projectRoot) {
+  const target = fabricAgentsSnapshotPath(projectRoot);
+  return rmIfExists("bootstrap-snapshot", target);
 }
 async function uninstallBootstrapStage(projectRoot, _opts = {}) {
   const results = [];
   await runAndCollect(
     results,
-    "section",
+    "bootstrap-blocks",
+    projectRoot,
+    () => stripFabricBootstrapBlocks(projectRoot)
+  );
+  await runAndCollectOne(
+    results,
+    "bootstrap-snapshot",
     projectRoot,
-    () => stripFabricKnowledgeBaseSection(projectRoot)
+    () => deleteFabricAgentsSnapshot(projectRoot)
   );
   await runAndCollectOne(
     results,
@@ -194,6 +285,7 @@ async function uninstallBootstrapStage(projectRoot, _opts = {}) {
     projectRoot,
     () => unmergeClaudeCodeHookConfig(projectRoot)
   );
+  await runAndCollect(results, "hook-lib", projectRoot, () => removeHookLibs(projectRoot));
   await runAndCollect(
     results,
     "hook-narrow-script",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenglimg/fabric-cli",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.22",
   "type": "module",
   "bin": {
     "fab": "dist/index.js",
@@ -20,8 +20,8 @@
     "tree-sitter-javascript": "^0.25.0",
     "tree-sitter-typescript": "^0.23.2",
     "web-tree-sitter": "^0.26.8",
-    "@fenglimg/fabric-server": "2.0.0-rc.15",
-    "@fenglimg/fabric-shared": "2.0.0-rc.15"
+    "@fenglimg/fabric-server": "2.0.0-rc.22",
+    "@fenglimg/fabric-shared": "2.0.0-rc.22"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",