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

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

@@ -10,7 +10,12 @@ var ALL_PATHS_SENTINEL = "**";
 var planContextHintCommand = defineCommand({
   meta: {
     name: "plan-context-hint",
-    description: "Emit versioned knowledge hint JSON to stdout. Used by rc.6 hooks and the fabric-import skill."
+    description: "Emit versioned knowledge hint JSON to stdout. Used by rc.6 hooks and the fabric-import skill.",
+    // rc.15 TASK-004 (C8): hidden from `fab --help` listing. The command stays
+    // callable so hook scripts and the fabric-import skill can still invoke
+    // it via `fab plan-context-hint ...`; it just no longer appears in the
+    // top-level usage banner alongside install/doctor/serve/uninstall/config.
+    hidden: true
   },
   args: {
     paths: {

package/dist/{serve-NGLXHDYC.js → serve-L3X5UHG2.js}

@@ -1,15 +1,17 @@
 #!/usr/bin/env node
 import {
+  hasActionHint,
   paint,
+  renderFabricError,
   symbol
-} from "./chunk-WWNXR34K.js";
+} from "./chunk-G2CIOLD4.js";
+import {
+  t
+} from "./chunk-6ICJICVU.js";
 import {
   createDebugLogger,
   resolveDevMode
 } from "./chunk-OBQU6NHO.js";
-import {
-  t
-} from "./chunk-6ICJICVU.js";
 
 // src/commands/serve.ts
 import { defineCommand } from "citty";
@@ -39,11 +41,6 @@ var serveCommand = defineCommand({
       type: "boolean",
       description: t("cli.serve.args.debug.description"),
       default: false
-    },
-    force: {
-      type: "boolean",
-      description: t("cli.serve.args.force.description"),
-      default: false
     }
   },
   async run({ args }) {
@@ -55,7 +52,15 @@ var serveCommand = defineCommand({
     const authToken = readAuthTokenFromEnv();
     const host = validateHost(requestedHost, authToken);
     const projectRoot = resolution.target;
-    acquireLock(projectRoot, { force: args.force });
+    try {
+      acquireLock(projectRoot);
+    } catch (err) {
+      if (hasActionHint(err)) {
+        renderFabricError(err);
+        process.exit(1);
+      }
+      throw err;
+    }
     process.on("exit", () => {
       releaseLock(projectRoot);
     });

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

@@ -1,8 +1,4 @@
 #!/usr/bin/env node
-import {
-  detectClientSupports,
-  resolveClients
-} from "./chunk-OHWQNSLH.js";
 import {
   FABRIC_HOOK_COMMAND_PATHS,
   FABRIC_SECTION_REGEX,
@@ -11,21 +7,27 @@ import {
   HOOK_SCRIPT_DESTINATIONS,
   SECTION_TARGETS,
   SKILL_DESTINATIONS
-} from "./chunk-X7QPY5KH.js";
+} from "./chunk-UTF4YBDN.js";
 import {
-  paint
-} from "./chunk-WWNXR34K.js";
+  detectClientSupports,
+  resolveClients
+} from "./chunk-SKSYUHKK.js";
 import {
-  createDebugLogger,
-  resolveDevMode
-} from "./chunk-OBQU6NHO.js";
+  hasActionHint,
+  paint,
+  renderFabricError
+} from "./chunk-G2CIOLD4.js";
 import {
   t
 } from "./chunk-6ICJICVU.js";
+import {
+  createDebugLogger,
+  resolveDevMode
+} from "./chunk-OBQU6NHO.js";
 
 // src/commands/uninstall.ts
 import { existsSync as existsSync2, statSync } from "fs";
-import { readdir as readdir2, rm as rm2 } from "fs/promises";
+import { rm as rm2 } from "fs/promises";
 import { homedir } from "os";
 import { isAbsolute, join as join2, relative, resolve, sep } from "path";
 import { cancel, confirm, group, intro, isCancel, log, note, outro } from "@clack/prompts";
@@ -80,37 +82,34 @@ async function removeHookScripts(step, rels, projectRoot) {
   }
   return results;
 }
-async function unmergeClaudeCodeHookConfig(projectRoot, opts = {}) {
+async function unmergeClaudeCodeHookConfig(projectRoot) {
   return unmergeHookConfig({
     step: "claude-hook-config",
     projectRoot,
     configRel: HOOK_CONFIG_TARGETS.claudeCode,
     arrayPaths: [...HOOK_CONFIG_ARRAY_PATHS.claudeCode],
     fabricCommands: Object.values(FABRIC_HOOK_COMMAND_PATHS.claudeCode),
-    extractCommands: extractClaudeCommands,
-    cleanEmpties: opts.cleanEmpties === true
+    extractCommands: extractClaudeCommands
   });
 }
-async function unmergeCodexHookConfig(projectRoot, opts = {}) {
+async function unmergeCodexHookConfig(projectRoot) {
   return unmergeHookConfig({
     step: "codex-hook-config",
     projectRoot,
     configRel: HOOK_CONFIG_TARGETS.codex,
     arrayPaths: [...HOOK_CONFIG_ARRAY_PATHS.codex],
     fabricCommands: Object.values(FABRIC_HOOK_COMMAND_PATHS.codex),
-    extractCommands: extractFlatCommands,
-    cleanEmpties: opts.cleanEmpties === true
+    extractCommands: extractFlatCommands
   });
 }
-async function unmergeCursorHookConfig(projectRoot, opts = {}) {
+async function unmergeCursorHookConfig(projectRoot) {
   return unmergeHookConfig({
     step: "cursor-hook-config",
     projectRoot,
     configRel: HOOK_CONFIG_TARGETS.cursor,
     arrayPaths: [...HOOK_CONFIG_ARRAY_PATHS.cursor],
     fabricCommands: Object.values(FABRIC_HOOK_COMMAND_PATHS.cursor),
-    extractCommands: extractFlatCommands,
-    cleanEmpties: opts.cleanEmpties === true
+    extractCommands: extractFlatCommands
   });
 }
 async function stripFabricKnowledgeBaseSection(projectRoot) {
@@ -169,7 +168,7 @@ async function stripFabricKnowledgeBaseSection(projectRoot) {
   }
   return results;
 }
-async function uninstallBootstrapStage(projectRoot, opts = {}) {
+async function uninstallBootstrapStage(projectRoot, _opts = {}) {
   const results = [];
   await runAndCollect(
     results,
@@ -181,19 +180,19 @@ async function uninstallBootstrapStage(projectRoot, opts = {}) {
     results,
     "cursor-hook-config",
     projectRoot,
-    () => unmergeCursorHookConfig(projectRoot, opts)
+    () => unmergeCursorHookConfig(projectRoot)
   );
   await runAndCollectOne(
     results,
     "codex-hook-config",
     projectRoot,
-    () => unmergeCodexHookConfig(projectRoot, opts)
+    () => unmergeCodexHookConfig(projectRoot)
   );
   await runAndCollectOne(
     results,
     "claude-hook-config",
     projectRoot,
-    () => unmergeClaudeCodeHookConfig(projectRoot, opts)
+    () => unmergeClaudeCodeHookConfig(projectRoot)
   );
   await runAndCollect(
     results,
@@ -339,7 +338,7 @@ async function unmergeHookConfig(args) {
   }
   const next = JSON.parse(JSON.stringify(parsed));
   for (const dotted of args.arrayPaths) {
-    pruneArrayAtPath(next, dotted, args.fabricCommands, args.extractCommands, args.cleanEmpties);
+    pruneArrayAtPath(next, dotted, args.fabricCommands, args.extractCommands);
   }
   if (jsonEqual(parsed, next)) {
     return { step: args.step, path: target, status: "skipped", message: "no-fabric-entries" };
@@ -356,7 +355,7 @@ async function unmergeHookConfig(args) {
     };
   }
 }
-function pruneArrayAtPath(root, path, fabricCommands, extractCommands, cleanEmpties) {
+function pruneArrayAtPath(root, path, fabricCommands, extractCommands) {
   const keys = path.split(".");
   const chain = [];
   let cursor = root;
@@ -384,7 +383,7 @@ function pruneArrayAtPath(root, path, fabricCommands, extractCommands, cleanEmpt
   });
   const leaf = chain[chain.length - 1];
   leaf.parent[leaf.key] = filtered;
-  if (!cleanEmpties || filtered.length > 0) {
+  if (filtered.length > 0) {
     return;
   }
   for (let i = chain.length - 1; i >= 0; i--) {
@@ -446,59 +445,24 @@ var uninstallCommand = defineCommand({
     description: t("cli.uninstall.description")
   },
   args: {
-    target: {
-      type: "string",
-      description: t("cli.uninstall.args.target.description")
-    },
     debug: {
       type: "boolean",
       description: t("cli.uninstall.args.debug.description"),
       default: false
     },
-    force: {
+    "dry-run": {
       type: "boolean",
-      description: t("cli.uninstall.args.force.description"),
+      description: t("cli.uninstall.args.dry-run.description"),
       default: false
     },
+    target: {
+      type: "string",
+      description: t("cli.uninstall.args.target.description")
+    },
     yes: {
       type: "boolean",
       description: t("cli.uninstall.args.yes.description"),
       default: false
-    },
-    plan: {
-      type: "boolean",
-      description: t("cli.uninstall.args.plan.description"),
-      default: false
-    },
-    bootstrap: {
-      type: "boolean",
-      default: true,
-      negativeDescription: t("cli.uninstall.flags.no-bootstrap")
-    },
-    mcp: {
-      type: "boolean",
-      default: true,
-      negativeDescription: t("cli.uninstall.flags.no-mcp")
-    },
-    scaffold: {
-      type: "boolean",
-      default: true,
-      negativeDescription: t("cli.uninstall.flags.no-scaffold")
-    },
-    interactive: {
-      type: "boolean",
-      description: t("cli.uninstall.flags.interactive"),
-      default: true
-    },
-    purge: {
-      type: "boolean",
-      description: t("cli.uninstall.flags.purge"),
-      default: false
-    },
-    "clean-empties": {
-      type: "boolean",
-      description: t("cli.uninstall.flags.clean-empties"),
-      default: false
     }
   },
   async run({ args }) {
@@ -514,7 +478,15 @@ async function runUninstallCommand(args) {
   for (const step of resolution.chain) {
     logger(step);
   }
-  checkLockOrThrow(intent.target, { force: args.force });
+  try {
+    checkLockOrThrow(intent.target);
+  } catch (err) {
+    if (hasActionHint(err)) {
+      renderFabricError(err);
+      process.exit(1);
+    }
+    throw err;
+  }
   const supports = detectClientSupports(intent.target);
   const basePlan = await buildUninstallExecutionPlan(intent.target, {
     ...intent.options
@@ -525,7 +497,7 @@ async function runUninstallCommand(args) {
     interactive: intent.interactiveSummary && !intent.wizardEnabled,
     supports
   };
-  const finalPlan = intent.wizardEnabled ? await resolveUninstallExecutionPlanWithWizard(planWithSupports, args, createDefaultUninstallWizardAdapter()) : planWithSupports;
+  const finalPlan = intent.wizardEnabled ? await resolveUninstallExecutionPlanWithWizard(planWithSupports, createDefaultUninstallWizardAdapter()) : planWithSupports;
   if (finalPlan === null) {
     process.exitCode = 130;
     return;
@@ -541,7 +513,7 @@ async function runUninstallCommand(args) {
       }))
     };
   }
-  if (intent.interactiveSummary && !intent.wizardEnabled && args.yes !== true && args.force !== true) {
+  if (intent.interactiveSummary && !intent.wizardEnabled && args.yes !== true) {
     const proceed = await confirmDestructive(finalPlan);
     if (!proceed) {
       process.exitCode = 130;
@@ -555,25 +527,19 @@ async function runUninstallCommand(args) {
 function resolveUninstallCliIntent(args, targetInput) {
   const target = normalizeTarget(targetInput);
   const terminalInteractive = isInteractiveUninstall();
-  const planOnly = args.plan === true;
+  const planOnly = args["dry-run"] === true;
   const options = {
-    force: args.force,
-    skipBootstrap: args.bootstrap === false,
-    skipMcp: args.mcp === false,
-    skipScaffold: args.scaffold === false,
-    planOnly,
-    purge: args.purge === true,
-    cleanEmpties: args["clean-empties"] === true
+    planOnly
   };
   return {
     target,
     options,
-    interactiveSummary: args.interactive !== false && terminalInteractive,
+    interactiveSummary: terminalInteractive,
     wizardEnabled: shouldUseUninstallWizard(args, terminalInteractive) && !planOnly
   };
 }
 function shouldUseUninstallWizard(args, terminalInteractive = isInteractiveUninstall()) {
-  return terminalInteractive && args.interactive !== false && args.yes !== true;
+  return terminalInteractive && args.yes !== true;
 }
 async function buildUninstallExecutionPlan(target, options = {}) {
   const scaffold = buildUninstallFabricPlan(target, options);
@@ -605,13 +571,6 @@ function buildUninstallFabricPlan(target, options = {}) {
     const gk = join2(fabricDir, "knowledge", sub, ".gitkeep");
     entries.push({ path: gk, kind: "gitkeep", absent: !existsSync2(gk) });
   }
-  if (options.purge === true) {
-    for (const sub of KNOWLEDGE_SUBDIRS) {
-      const subdir = join2(fabricDir, "knowledge", sub);
-      entries.push({ path: subdir, kind: "knowledge-subdir", absent: !existsSync2(subdir) });
-    }
-    entries.push({ path: fabricDir, kind: "fabric-dir", absent: !existsSync2(fabricDir) });
-  }
   const safeEntries = entries.filter((entry) => !isInsidePersonalRoot(entry.path, personalKnowledgeDir));
   return {
     target: absTarget,
@@ -623,9 +582,7 @@ function buildUninstallFabricPlan(target, options = {}) {
 }
 async function executeUninstallFabricPlan(plan) {
   const results = [];
-  const fabricDirEntry = plan.entries.find((entry) => entry.kind === "fabric-dir");
-  const otherEntries = plan.entries.filter((entry) => entry.kind !== "fabric-dir");
-  for (const entry of otherEntries) {
+  for (const entry of plan.entries) {
     if (entry.absent) {
       results.push({
         step: scaffoldStepLabel(entry.kind),
@@ -636,7 +593,7 @@ async function executeUninstallFabricPlan(plan) {
       continue;
     }
     try {
-      await rm2(entry.path, { recursive: entry.kind === "knowledge-subdir", force: true });
+      await rm2(entry.path, { force: true });
       results.push({ step: scaffoldStepLabel(entry.kind), path: entry.path, status: "removed" });
     } catch (error) {
       results.push({
@@ -647,39 +604,6 @@ async function executeUninstallFabricPlan(plan) {
       });
     }
   }
-  if (fabricDirEntry !== void 0) {
-    const path = fabricDirEntry.path;
-    if (!existsSync2(path)) {
-      results.push({
-        step: "fabric-dir",
-        path,
-        status: "skipped",
-        message: "absent"
-      });
-    } else {
-      try {
-        const entries = await readdir2(path);
-        if (entries.length > 0) {
-          results.push({
-            step: "fabric-dir",
-            path,
-            status: "skipped",
-            message: "not-empty"
-          });
-        } else {
-          await rm2(path, { recursive: true, force: true });
-          results.push({ step: "fabric-dir", path, status: "removed" });
-        }
-      } catch (error) {
-        results.push({
-          step: "fabric-dir",
-          path,
-          status: "error",
-          message: error instanceof Error ? error.message : String(error)
-        });
-      }
-    }
-  }
   return results;
 }
 function scaffoldStepLabel(kind) {
@@ -688,10 +612,6 @@ function scaffoldStepLabel(kind) {
       return "scaffold-state";
     case "gitkeep":
       return "scaffold-gitkeep";
-    case "knowledge-subdir":
-      return "scaffold-knowledge";
-    case "fabric-dir":
-      return "fabric-dir";
   }
 }
 async function uninstallMcpClients(target, options = {}) {
@@ -799,7 +719,7 @@ async function executeUninstallStage(plan, stageName) {
     case "scaffold":
       return executeUninstallFabricPlan(plan.scaffold);
     case "bootstrap": {
-      const opts = { cleanEmpties: plan.options.cleanEmpties === true };
+      const opts = {};
       return uninstallBootstrapStage(plan.target, opts);
     }
     case "mcp": {
@@ -812,12 +732,12 @@ async function uninstallFabric(target, options = {}) {
   const plan = await buildUninstallExecutionPlan(target, options);
   return executeUninstallExecutionPlan(plan);
 }
-async function resolveUninstallExecutionPlanWithWizard(basePlan, args, wizardAdapter) {
+async function resolveUninstallExecutionPlanWithWizard(basePlan, wizardAdapter) {
   const selection = await wizardAdapter.run({
     target: basePlan.target,
     options: basePlan.options,
     supports: basePlan.supports,
-    lockedStages: collectLockedWizardStages(args)
+    lockedStages: []
   });
   if (selection === null) {
     return null;
@@ -826,9 +746,7 @@ async function resolveUninstallExecutionPlanWithWizard(basePlan, args, wizardAda
     ...basePlan.options,
     skipScaffold: !selection.scaffold,
     skipBootstrap: !selection.bootstrap,
-    skipMcp: !selection.mcp,
-    purge: selection.purge,
-    cleanEmpties: selection.cleanEmpties
+    skipMcp: !selection.mcp
   };
   const rebuilt = await buildUninstallExecutionPlan(basePlan.target, nextOptions);
   return {
@@ -879,18 +797,6 @@ function createDefaultUninstallWizardAdapter() {
                 defaultValue: formatPromptDefault(!context.options.skipMcp)
               }),
               initialValue: !context.options.skipMcp
-            }),
-            purge: async () => confirmInGroup({
-              message: t("cli.uninstall.wizard.purge", {
-                defaultValue: formatPromptDefault(context.options.purge === true)
-              }),
-              initialValue: context.options.purge === true
-            }),
-            cleanEmpties: async () => confirmInGroup({
-              message: t("cli.uninstall.wizard.clean-empties", {
-                defaultValue: formatPromptDefault(context.options.cleanEmpties === true)
-              }),
-              initialValue: context.options.cleanEmpties === true
             })
           },
           {
@@ -910,9 +816,7 @@ function createDefaultUninstallWizardAdapter() {
         ...context.options,
         skipScaffold: !groupedSelection.scaffold,
         skipBootstrap: !groupedSelection.bootstrap,
-        skipMcp: !groupedSelection.mcp,
-        purge: groupedSelection.purge,
-        cleanEmpties: groupedSelection.cleanEmpties
+        skipMcp: !groupedSelection.mcp
       };
       log.step(t("cli.uninstall.wizard.step.review"));
       printUninstallPlanSummary(context.target, previewOptions, context.supports);
@@ -939,13 +843,6 @@ async function confirmInGroup(options) {
   }
   return result;
 }
-function collectLockedWizardStages(args) {
-  const locked = [];
-  if (args.scaffold === false) locked.push("scaffold");
-  if (args.bootstrap === false) locked.push("bootstrap");
-  if (args.mcp === false) locked.push("mcp");
-  return locked;
-}
 async function confirmDestructive(plan) {
   printUninstallPlanSummary(plan.target, plan.options, plan.supports);
   const answer = await confirm({
@@ -964,9 +861,7 @@ function printUninstallPlanPreview(plan) {
     t("cli.uninstall.plan.preview-result", {
       scaffold: yesNoLabel(!plan.options.skipScaffold),
       bootstrap: yesNoLabel(!plan.options.skipBootstrap),
-      mcp: yesNoLabel(!plan.options.skipMcp),
-      purge: yesNoLabel(plan.options.purge === true),
-      cleanEmpties: yesNoLabel(plan.options.cleanEmpties === true)
+      mcp: yesNoLabel(!plan.options.skipMcp)
     })
   );
   if (!plan.options.skipScaffold && plan.scaffold.entries.length > 0) {
@@ -984,9 +879,7 @@ function printUninstallPlanSummary(target, options, supports) {
     t("cli.uninstall.plan.actions", {
       scaffold: yesNoLabel(!options.skipScaffold),
       bootstrap: yesNoLabel(!options.skipBootstrap),
-      mcp: yesNoLabel(!options.skipMcp),
-      purge: yesNoLabel(options.purge === true),
-      cleanEmpties: yesNoLabel(options.cleanEmpties === true)
+      mcp: yesNoLabel(!options.skipMcp)
     })
   );
   const detected = supports.filter((support) => support.detected);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenglimg/fabric-cli",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "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-shared": "2.0.0-rc.13",
-    "@fenglimg/fabric-server": "2.0.0-rc.13"
+    "@fenglimg/fabric-server": "2.0.0-rc.15",
+    "@fenglimg/fabric-shared": "2.0.0-rc.15"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",

package/templates/hooks/configs/README.md

@@ -27,11 +27,15 @@ config (`~/.codex/config.toml`) is TOML.
 
 ## cursor-hooks.json
 
-Written to (or merged into) the user repo's `.cursor/hooks.json`. Mirrors the
-Codex `events.Stop[]` envelope shape — Cursor's hook event vocabulary is
-not stable across releases, so the canonical Stop-on-tool-finish lifecycle hook
-is the only entry we register today. SessionStart / PreToolUse slots are left
-unfilled for rc.6 to add when their semantics stabilise.
+Written to (or merged into) the user repo's `.cursor/hooks.json`. Schema
+authoritative source: https://cursor.com/cn/docs/hooks. Top-level requires
+`version: 1` (number literal, NOT string) and a `hooks` object (NOT `events`)
+keyed by camelCase event names: `stop`, `sessionStart`, `preToolUse`. Per-entry
+shape stays flat (Codex-style): `{command, matcher?, type?, timeout?,
+loop_limit?, failClosed?}`. rc.14 TASK-001 corrected rc.13's wrong top-level
+envelope (was `{events: {Stop, SessionStart, PreToolUse}}` PascalCase, which
+Cursor rejects with "Config version must be a number; Config hooks must be an
+object").
 
 ## fabric-hint.cjs script paths
 

package/templates/hooks/configs/cursor-hooks.json

@@ -1,16 +1,13 @@
 {
-  "events": {
-    "Stop": [
-      {
-        "command": ".cursor/hooks/fabric-hint.cjs"
-      }
+  "version": 1,
+  "hooks": {
+    "stop": [
+      { "command": ".cursor/hooks/fabric-hint.cjs" }
     ],
-    "SessionStart": [
-      {
-        "command": ".cursor/hooks/knowledge-hint-broad.cjs"
-      }
+    "sessionStart": [
+      { "command": ".cursor/hooks/knowledge-hint-broad.cjs" }
     ],
-    "PreToolUse": [
+    "preToolUse": [
       {
         "matcher": "Edit|Write|MultiEdit",
         "command": ".cursor/hooks/knowledge-hint-narrow.cjs"