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

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.21",
   "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.21",
+    "@fenglimg/fabric-shared": "2.0.0-rc.21"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",