@fenglimg/fabric-cli 2.2.0-rc.3 → 2.2.0-rc.8

package/dist/{uninstall-F75MPKQC.js → uninstall-62F4LNKI.js}

@@ -7,28 +7,28 @@ import {
   HOOK_SCRIPT_DESTINATIONS,
   SKILL_DESTINATIONS,
   fabricAgentsSnapshotPath
-} from "./chunk-XHHCRDIR.js";
-import {
-  paint
-} from "./chunk-BO4XIZWZ.js";
+} from "./chunk-CMDW3PYK.js";
 import {
   createDebugLogger,
   resolveDevMode
-} from "./chunk-COI5VDFU.js";
+} from "./chunk-WA3DYGSY.js";
 import {
   detectClientSupports,
   resolveClients
-} from "./chunk-XC5RUHLK.js";
+} from "./chunk-3IOLS5EK.js";
+import {
+  paint
+} from "./chunk-NLNH64A3.js";
 import {
   t
-} from "./chunk-2CY4BMTH.js";
+} from "./chunk-HORSMSZL.js";
 
 // src/commands/uninstall.ts
 import { existsSync as existsSync2, statSync } from "fs";
 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";
+import { cancel, confirm, intro, isCancel, multiselect, note, outro } from "@clack/prompts";
 import { defineCommand } from "citty";
 
 // src/install/uninstall-skills-and-hooks.ts
@@ -158,25 +158,10 @@ async function unmergeCodexHookConfig(projectRoot) {
     extractCommands: extractFlatCommands
   });
 }
-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
-  });
-}
 async function stripFabricBootstrapBlocks(projectRoot) {
   const results = [];
   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
-    })
-  );
+  results.push(await stripManagedBlock(projectRoot, "AGENTS.md"));
   return results;
 }
 async function stripClaudeBootstrapImports(projectRoot) {
@@ -221,8 +206,8 @@ async function stripClaudeBootstrapImports(projectRoot) {
     };
   }
 }
-async function stripManagedBlock(projectRoot, relPath, options) {
-  const step = relPath.endsWith(".mdc") ? "bootstrap-cursor" : "bootstrap-codex";
+async function stripManagedBlock(projectRoot, relPath) {
+  const step = "bootstrap-codex";
   const target = join(projectRoot, relPath);
   if (!existsSync(target)) {
     return { step, path: target, status: "skipped", message: "absent" };
@@ -245,19 +230,6 @@ async function stripManagedBlock(projectRoot, relPath, options) {
   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 rm(target, { force: true });
-      return { step, path: target, status: "removed", message: "front-matter-only" };
-    } catch (error) {
-      return {
-        step,
-        path: target,
-        status: "error",
-        message: error instanceof Error ? error.message : String(error)
-      };
-    }
-  }
   try {
     await atomicWriteText(target, filtered);
     return { step, path: target, status: "removed" };
@@ -270,12 +242,6 @@ async function stripManagedBlock(projectRoot, relPath, options) {
     };
   }
 }
-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);
@@ -294,12 +260,6 @@ async function uninstallBootstrapStage(projectRoot, _opts = {}) {
     projectRoot,
     () => deleteFabricAgentsSnapshot(projectRoot)
   );
-  await runAndCollectOne(
-    results,
-    "cursor-hook-config",
-    projectRoot,
-    () => unmergeCursorHookConfig(projectRoot)
-  );
   await runAndCollectOne(
     results,
     "codex-hook-config",
@@ -584,15 +544,6 @@ function jsonEqual(a, b) {
 }
 
 // src/commands/uninstall.ts
-var UNINSTALL_WIZARD_GROUP_CANCELLED = /* @__PURE__ */ Symbol("uninstall-wizard-group-cancelled");
-var KNOWLEDGE_SUBDIRS = [
-  "decisions",
-  "pitfalls",
-  "guidelines",
-  "models",
-  "processes",
-  "pending"
-];
 var FABRIC_STATE_FILES = ["agents.meta.json", "events.jsonl", "forensic.json"];
 var uninstallCommand = defineCommand({
   meta: {
@@ -707,21 +658,17 @@ async function buildUninstallExecutionPlan(target, options = {}) {
 function buildUninstallFabricPlan(target, options = {}) {
   const absTarget = normalizeTarget(target);
   const fabricDir = join2(absTarget, ".fabric");
-  const personalKnowledgeDir = resolve(resolvePersonalFabricRoot(), ".fabric", "knowledge");
+  const globalStoresDir = join2(resolvePersonalFabricRoot(), ".fabric", "stores");
   const entries = [];
   for (const name of FABRIC_STATE_FILES) {
     const p = join2(fabricDir, name);
     entries.push({ path: p, kind: "state-file", absent: !existsSync2(p) });
   }
-  for (const sub of KNOWLEDGE_SUBDIRS) {
-    const gk = join2(fabricDir, "knowledge", sub, ".gitkeep");
-    entries.push({ path: gk, kind: "gitkeep", absent: !existsSync2(gk) });
-  }
-  const safeEntries = entries.filter((entry) => !isInsidePersonalRoot(entry.path, personalKnowledgeDir));
+  const safeEntries = entries.filter((entry) => !isInsideGlobalStoresRoot(entry.path, globalStoresDir));
   return {
     target: absTarget,
     fabricDir,
-    personalKnowledgeDir,
+    globalStoresDir,
     options,
     entries: safeEntries
   };
@@ -756,8 +703,6 @@ function scaffoldStepLabel(kind) {
   switch (kind) {
     case "state-file":
       return "scaffold-state";
-    case "gitkeep":
-      return "scaffold-gitkeep";
   }
 }
 async function uninstallMcpClients(target, options = {}) {
@@ -831,12 +776,17 @@ async function uninstallMcpClients(target, options = {}) {
 }
 async function executeUninstallExecutionPlan(plan) {
   const stageResults = [];
+  const totalStages = plan.stages.length;
+  console.log(t("cli.uninstall.plan.phase-banner", { total: String(totalStages) }));
+  let stepNum = 0;
   for (const stage of plan.stages) {
+    stepNum += 1;
     if (stage.skipped) {
+      console.log(formatUninstallStageHeader(stage.name, stepNum, totalStages, true));
       stageResults.push({ name: stage.name, disposition: "skipped", steps: [] });
       continue;
     }
-    console.log(formatUninstallStageHeader(stage.name));
+    console.log(formatUninstallStageHeader(stage.name, stepNum, totalStages));
     try {
       const steps = await executeUninstallStage(plan, stage.name);
       const disposition = steps.some((s) => s.status === "error") ? "failed" : "ran";
@@ -905,66 +855,36 @@ function createDefaultUninstallWizardAdapter() {
   return {
     async run(context) {
       intro(t("cli.uninstall.wizard.intro"));
-      note(
-        t("cli.uninstall.wizard.overview.body", {
-          target: context.target
-        }),
-        t("cli.uninstall.wizard.overview.title")
+      const available = UNINSTALL_STAGE_KEYS.filter(
+        (key) => !context.lockedStages.includes(key)
       );
-      printUninstallPlanSummary(context.target, context.options, context.supports);
-      log.step(t("cli.uninstall.wizard.step.target"));
-      const continueWithTarget = await confirm({
-        message: t("cli.uninstall.wizard.target.confirm", { target: context.target }),
-        initialValue: true
+      const initialValues = available.filter((key) => !isStageSkipped(context.options, key));
+      const picked = await multiselect({
+        message: t("cli.uninstall.wizard.select.prompt", { target: context.target }),
+        options: available.map((key) => ({
+          value: key,
+          label: t(`cli.uninstall.wizard.select.${key}.label`),
+          hint: t(`cli.uninstall.wizard.select.${key}.hint`)
+        })),
+        initialValues,
+        required: false
       });
-      if (isCancel(continueWithTarget) || !continueWithTarget) {
+      if (isCancel(picked)) {
         emitUninstallWizardCancellation();
         return null;
       }
-      log.step(t("cli.uninstall.wizard.step.plan"));
-      let groupedSelection;
-      try {
-        groupedSelection = await group(
-          {
-            scaffold: async () => context.lockedStages.includes("scaffold") ? false : confirmInGroup({
-              message: t("cli.uninstall.wizard.stage.scaffold", {
-                defaultValue: formatPromptDefault(!context.options.skipScaffold)
-              }),
-              initialValue: !context.options.skipScaffold
-            }),
-            bootstrap: async () => context.lockedStages.includes("bootstrap") ? false : confirmInGroup({
-              message: t("cli.uninstall.wizard.stage.bootstrap", {
-                defaultValue: formatPromptDefault(!context.options.skipBootstrap)
-              }),
-              initialValue: !context.options.skipBootstrap
-            }),
-            mcp: async () => context.lockedStages.includes("mcp") ? false : confirmInGroup({
-              message: t("cli.uninstall.wizard.stage.mcp", {
-                defaultValue: formatPromptDefault(!context.options.skipMcp)
-              }),
-              initialValue: !context.options.skipMcp
-            })
-          },
-          {
-            onCancel() {
-              throw UNINSTALL_WIZARD_GROUP_CANCELLED;
-            }
-          }
-        );
-      } catch (error) {
-        if (error === UNINSTALL_WIZARD_GROUP_CANCELLED) {
-          emitUninstallWizardCancellation();
-          return null;
-        }
-        throw error;
-      }
+      const selected = new Set(picked);
+      const selection = {
+        scaffold: selected.has("scaffold"),
+        bootstrap: selected.has("bootstrap"),
+        mcp: selected.has("mcp")
+      };
       const previewOptions = {
         ...context.options,
-        skipScaffold: !groupedSelection.scaffold,
-        skipBootstrap: !groupedSelection.bootstrap,
-        skipMcp: !groupedSelection.mcp
+        skipScaffold: !selection.scaffold,
+        skipBootstrap: !selection.bootstrap,
+        skipMcp: !selection.mcp
       };
-      log.step(t("cli.uninstall.wizard.step.review"));
       printUninstallPlanSummary(context.target, previewOptions, context.supports);
       const confirmed = await confirm({
         message: t("cli.uninstall.wizard.execute.confirm"),
@@ -975,20 +895,24 @@ function createDefaultUninstallWizardAdapter() {
         return null;
       }
       outro(t("cli.uninstall.wizard.outro"));
-      return groupedSelection;
+      return selection;
     }
   };
 }
+var UNINSTALL_STAGE_KEYS = ["scaffold", "bootstrap", "mcp"];
+function isStageSkipped(options, key) {
+  switch (key) {
+    case "scaffold":
+      return Boolean(options.skipScaffold);
+    case "bootstrap":
+      return Boolean(options.skipBootstrap);
+    case "mcp":
+      return Boolean(options.skipMcp);
+  }
+}
 function emitUninstallWizardCancellation() {
   cancel(t("cli.uninstall.wizard.cancelled"));
 }
-async function confirmInGroup(options) {
-  const result = await confirm(options);
-  if (isCancel(result)) {
-    throw UNINSTALL_WIZARD_GROUP_CANCELLED;
-  }
-  return result;
-}
 async function confirmDestructive(plan) {
   printUninstallPlanSummary(plan.target, plan.options, plan.supports);
   const answer = await confirm({
@@ -1035,8 +959,7 @@ function printUninstallPlanSummary(target, options, supports) {
     })
   );
   console.log(t("cli.uninstall.plan.preserves"));
-  console.log(`  - ${target}/.fabric/knowledge/  ${paint.muted(t("cli.uninstall.plan.preserves.knowledge"))}`);
-  console.log(`  - ~/.fabric/knowledge/  ${paint.muted(t("cli.uninstall.plan.preserves.personal"))}`);
+  console.log(`  - ~/.fabric/stores/  ${paint.muted(t("cli.uninstall.plan.preserves.stores"))}`);
 }
 function printUninstallSummary(result) {
   const removed = result.stageResults.flatMap(
@@ -1064,8 +987,10 @@ function printUninstallSummary(result) {
     }
   }
 }
-function formatUninstallStageHeader(stageName) {
-  return `${paint.ai(t("cli.shared.next"))} ${paint.muted(t(`cli.uninstall.stages.${stageName}`))}`;
+function formatUninstallStageHeader(stageName, stepNum, total, skipped = false) {
+  const label = t(`cli.uninstall.stages.${stageName}`);
+  const head = `[${stepNum}/${total}] ${label}`;
+  return skipped ? paint.muted(`${head} (${t("cli.shared.skipped")})`) : head;
 }
 function formatUninstallStageResult(stageName, steps) {
   const removedCount = steps.filter((s) => s.status === "removed").length;
@@ -1082,9 +1007,9 @@ function formatUninstallStageFailure(stage, error) {
 function resolvePersonalFabricRoot() {
   return process.env.FABRIC_HOME ?? homedir();
 }
-function isInsidePersonalRoot(candidate, personalKnowledgeDir) {
+function isInsideGlobalStoresRoot(candidate, globalStoresDir) {
   const candidateAbs = resolve(candidate);
-  const rootAbs = resolve(personalKnowledgeDir);
+  const rootAbs = resolve(globalStoresDir);
   if (candidateAbs === rootAbs) {
     return true;
   }
@@ -1102,9 +1027,6 @@ function assertExistingDirectory(target) {
 function isInteractiveUninstall() {
   return Boolean(process.stdin.isTTY) && Boolean(process.stdout.isTTY) && Boolean(process.stderr.isTTY);
 }
-function formatPromptDefault(value) {
-  return value ? "Y/n" : "y/N";
-}
 function yesNoLabel(value) {
   return value ? t("cli.shared.yes") : t("cli.shared.no");
 }
@@ -1120,7 +1042,7 @@ export {
   uninstall_default as default,
   executeUninstallExecutionPlan,
   executeUninstallFabricPlan,
-  isInsidePersonalRoot,
+  isInsideGlobalStoresRoot,
   resolveUninstallExecutionPlanWithWizard,
   runUninstallCommand,
   shouldUseUninstallWizard,

package/dist/{whoami-66YKY5DZ.js → whoami-ITGEFWH4.js}

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
-import {
-  getProjectTranslator
-} from "./chunk-2CY4BMTH.js";
 import {
   warnUnknownFlags,
   whoami
-} from "./chunk-5LQIHYFC.js";
-import "./chunk-5ZUMLCD5.js";
-import "./chunk-XCBVSGCS.js";
+} from "./chunk-27HK6H5Y.js";
+import "./chunk-QPAW6IYT.js";
+import "./chunk-QFIVFZRH.js";
+import "./chunk-FNHDQTPC.js";
+import {
+  getProjectTranslator
+} from "./chunk-HORSMSZL.js";
 
 // src/commands/whoami.ts
 import { defineCommand } from "citty";
 var whoami_default = defineCommand({
-  meta: { name: "whoami", description: "Show this machine's Fabric uid and mounted stores" },
+  meta: { name: "whoami", description: "[DEPRECATED] Use 'fabric info --global' instead" },
   args: {
     // F27: `--json` machine-readable output (was silently ignored — the command
     // declared no args, so citty swallowed the flag and still printed text).
@@ -20,6 +21,7 @@ var whoami_default = defineCommand({
   },
   run({ args }) {
     warnUnknownFlags(["json"]);
+    console.error("\u26A0\uFE0F  DEPRECATED: 'fabric whoami' is deprecated. Use 'fabric info --global' instead.");
     const info = whoami();
     if (args.json === true) {
       console.log(JSON.stringify(info, null, 2));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fenglimg/fabric-cli",
-  "version": "2.2.0-rc.3",
-  "description": "Fabric CLI — installs the MCP server + skills + hooks for Claude Code, Cursor, and Codex CLI; runs doctor / knowledge maintenance.",
+  "version": "2.2.0-rc.8",
+  "description": "Fabric CLI — installs the MCP server + skills + hooks for Claude Code and Codex CLI; runs doctor / knowledge maintenance.",
   "license": "MIT",
   "author": "wangzhichao <fenglimg90@gmail.com>",
   "homepage": "https://github.com/fenglimg/fabric-v2#readme",
@@ -18,7 +18,6 @@
     "mcp",
     "cli",
     "claude-code",
-    "cursor",
     "codex-cli",
     "ai-knowledge-management"
   ],
@@ -40,16 +39,19 @@
   "dependencies": {
     "@clack/prompts": "^1.2.0",
     "citty": "^0.2.2",
+    "ink": "^4.4.1",
     "picocolors": "^1.1.1",
+    "react": "^18.3.1",
     "string-width": "^7.2.0",
     "tree-sitter-javascript": "^0.25.0",
     "tree-sitter-typescript": "^0.23.2",
     "web-tree-sitter": "^0.26.8",
-    "@fenglimg/fabric-server": "2.2.0-rc.3",
-    "@fenglimg/fabric-shared": "2.2.0-rc.3"
+    "@fenglimg/fabric-shared": "2.2.0-rc.8",
+    "@fenglimg/fabric-server": "2.2.0-rc.8"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",
+    "@types/react": "^18.3.12",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3"
   },

package/templates/hooks/cite-policy-evict.cjs

@@ -27,7 +27,7 @@
  *     The legacy hand-written cite path is still honored (back-compat).
  *   - otherwise → soft nudge: "改前先 fab_recall(paths)". NUDGE, never a gate
  *     (KT-DEC-0007): Claude Code receives it as a PreToolUse additionalContext
- *     envelope on stdout; Codex/Cursor as stderr. The edit always proceeds.
+ *     envelope on stdout; Codex as stderr. The edit always proceeds.
  *
  * Config (.fabric/fabric-config.json):
  *   - `cite_recall_nudge` (boolean, default true) — master switch. Set false to
@@ -48,16 +48,16 @@
  * its own malfunction.
  *
  * Cross-client: PreToolUse(Edit|Write|MultiEdit) is registered on all three
- * clients (Claude Code / Codex CLI / Cursor) — see hooks/configs/*.json. This
+ * clients (Claude Code / Codex CLI) — see hooks/configs/*.json. This
  * is strictly better parity than the rc.34 hook, which was Claude-Code-only
- * for the per-turn window and SessionStart-only for Codex/Cursor.
+ * for the per-turn window and SessionStart-only for Codex.
  */
 
 const { readFileSync } = require("node:fs");
 const { isAbsolute, join, relative } = require("node:path");
 
 // Shared config read + client-aware emit (Claude Code stdout envelope vs
-// Codex/Cursor stderr). The installer copies every lib/*.cjs alongside the hook.
+// Codex stderr). The installer copies every lib/*.cjs alongside the hook.
 const { readConfigNumber } = require("./lib/config-cache.cjs");
 const { isClaudeCode, readStdinJson, emitContext } = require("./lib/client-adapter.cjs");
 
@@ -445,7 +445,7 @@ async function main(env, stdio) {
     }
 
     // No recall, no manual cite → soft nudge. Claude Code: PreToolUse stdout
-    // additionalContext envelope. Codex/Cursor: stderr. Never a gate.
+    // additionalContext envelope. Codex: stderr. Never a gate.
     const streams = (env && env.stdio) || stdio || {};
     const onClaudeCode = isClaudeCode() || (env && env.forceClaudeCode === true);
     emitContext(renderNudge(nudgePaths), {

package/templates/hooks/configs/README.md

@@ -4,7 +4,7 @@ These JSON files are **fragment templates** consumed by `fabric install` and
 `fabric hooks install`. They are not standalone client config files.
 
 The supported clients are pinned by `packages/shared/src/schemas/fabric-config.ts`
-to Claude Code, Cursor, and Codex CLI. Adding a new client requires extending
+to Claude Code and Codex CLI. Adding a new client requires extending
 that schema first.
 
 ## claude-code.json
@@ -25,45 +25,32 @@ Written to (or merged into) the user repo's `.codex/hooks.json`. NOTE: Codex
 project-level hooks file is JSON, **not** TOML — only the user-level Codex MCP
 config (`~/.codex/config.toml`) is TOML.
 
-## cursor-hooks.json
-
-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").
-
 ## Per-client schema comparison (v2.0.0-rc.37 NEW-29)
 
 Each host program enforces its own wire format — `fabric install` cannot
-serialize one shared shape across all three. Differences are pinned here
-side-by-side so anyone editing one config knows what the others require.
-
-| Axis                 | Claude Code                              | Codex CLI                                          | Cursor                                          |
-| -------------------- | ---------------------------------------- | -------------------------------------------------- | ----------------------------------------------- |
-| Settings file        | `.claude/settings.json`                  | `.codex/hooks.json`                                | `.cursor/hooks.json`                            |
-| Top-level envelope   | `hooks: { ... }` (no version)            | `events: { ... }` (no version)                     | `{ version: 1, hooks: { ... } }` (number, not string) |
-| Event-name case      | PascalCase: `Stop`, `SessionStart`, `PreToolUse`, `UserPromptSubmit` | PascalCase: `Stop`, `SessionStart`, `PreToolUse`     | camelCase: `stop`, `sessionStart`, `preToolUse` |
-| Per-entry shape      | Nested matcher: `[{matcher, hooks:[{type:"command", command}]}]` | Flat: `[{command, matcher?}]`                      | Flat: `[{command, matcher?, type?, timeout?, loop_limit?, failClosed?}]` |
-| Path interpolation   | `${CLAUDE_PROJECT_DIR}` (env var)        | `"$(git rev-parse --show-toplevel)"` (shell expansion) | project-relative (resolved by Cursor)           |
-| Cite-policy event    | `UserPromptSubmit` (per-prompt)          | `SessionStart` 2nd entry (rc.37 NEW-21 parity)     | `sessionStart` 2nd entry (rc.37 NEW-21 parity)  |
+serialize one shared shape across both. Differences are pinned here
+side-by-side so anyone editing one config knows what the other requires.
+
+| Axis                 | Claude Code                              | Codex CLI                                          |
+| -------------------- | ---------------------------------------- | -------------------------------------------------- |
+| Settings file        | `.claude/settings.json`                  | `.codex/hooks.json`                                |
+| Top-level envelope   | `hooks: { ... }` (no version)            | `events: { ... }` (no version)                     |
+| Event-name case      | PascalCase: `Stop`, `SessionStart`, `PreToolUse`, `UserPromptSubmit` | PascalCase: `Stop`, `SessionStart`, `PreToolUse`     |
+| Per-entry shape      | Nested matcher: `[{matcher, hooks:[{type:"command", command}]}]` | Flat: `[{command, matcher?}]`                      |
+| Path interpolation   | `${CLAUDE_PROJECT_DIR}` (env var)        | `"$(git rev-parse --show-toplevel)"` (shell expansion) |
+| Cite-policy event    | `UserPromptSubmit` (per-prompt)          | `SessionStart` 2nd entry (rc.37 NEW-21 parity)     |
 
 Whenever a hook is added to one config, walk this table and add the equivalent
-entry to the other two — `fabric install` merges each into its respective
+entry to the other — `fabric install` merges each into its respective
 target verbatim, so missing entries silently degrade the cross-client surface.
 
 ## fabric-hint.cjs script paths
 
 - Claude: `.claude/hooks/fabric-hint.cjs` (project-relative)
 - Codex:  `.codex/hooks/fabric-hint.cjs`  (project-relative)
-- Cursor: `.cursor/hooks/fabric-hint.cjs` (project-relative)
 
 The single shared script lives at `packages/cli/templates/hooks/fabric-hint.cjs`
-in this repo and is copied into all three `<client>/hooks/` destinations by the
+in this repo and is copied into both `<client>/hooks/` destinations by the
 install wiring. The script emits stdout JSON
 `{decision:"block", reason, signal, recommended_skill}` with exit 0 when one of
 three signals trips:

package/templates/hooks/configs/claude-code.json

@@ -39,7 +39,7 @@
     ],
     "PostToolUse": [
       {
-        "matcher": "Edit|Write|MultiEdit",
+        "matcher": "Edit|Write|MultiEdit|Read",
         "hooks": [
           {
             "type": "command",

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

@@ -12,17 +12,17 @@
     ],
     "PreToolUse": [
       {
-        "matcher": "Edit|Write|MultiEdit",
+        "matcher": "Edit|Write|MultiEdit|apply_patch",
         "command": "\"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-hint-narrow.cjs\""
       },
       {
-        "matcher": "Edit|Write|MultiEdit",
+        "matcher": "Edit|Write|MultiEdit|apply_patch",
         "command": "\"$(git rev-parse --show-toplevel)/.codex/hooks/cite-policy-evict.cjs\""
       }
     ],
     "PostToolUse": [
       {
-        "matcher": "Edit|Write|MultiEdit",
+        "matcher": "Edit|Write|MultiEdit|apply_patch|Read",
         "command": "\"$(git rev-parse --show-toplevel)/.codex/hooks/post-tooluse-mutation.cjs\""
       }
     ],