@fenglimg/fabric-cli 2.1.0-rc.2 → 2.2.0-rc.10

package/dist/{chunk-F46ORPOA.js → chunk-7ZDXBOOU.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   deepMerge
-} from "./chunk-MF3OTILQ.js";
+} from "./chunk-3IOLS5EK.js";
 
 // src/install/write-bootstrap-snapshot.ts
 import { existsSync, readFileSync } from "fs";
 import { mkdir } from "fs/promises";
 import { dirname, join } from "path";
 import { atomicWriteText } from "@fenglimg/fabric-shared/node/atomic-write";
-import { BOOTSTRAP_CANONICAL } from "@fenglimg/fabric-shared/templates/bootstrap-canonical";
+import { resolveBootstrapCanonical } from "@fenglimg/fabric-shared/templates/bootstrap-canonical";
 var FABRIC_AGENTS_RELPATH = join(".fabric", "AGENTS.md");
 var PROJECT_RULES_RELPATH = join(".fabric", "project-rules.md");
 function fabricAgentsSnapshotPath(targetRoot) {
@@ -25,45 +25,61 @@ function readProjectRulesIfPresent(targetRoot) {
 async function writeFabricAgentsSnapshot(targetRoot) {
   const step = "bootstrap-snapshot";
   const target = fabricAgentsSnapshotPath(targetRoot);
+  const canonical = resolveBootstrapCanonical();
   if (existsSync(target)) {
     try {
       const existing = readFileSync(target, "utf8");
-      if (existing === BOOTSTRAP_CANONICAL) {
+      if (existing === canonical) {
         return { step, path: target, status: "skipped", message: "up-to-date" };
       }
     } catch {
     }
   }
   await mkdir(dirname(target), { recursive: true });
-  await atomicWriteText(target, BOOTSTRAP_CANONICAL);
+  await atomicWriteText(target, canonical);
   return { step, path: target, status: "written" };
 }
 
 // src/install/skills-and-hooks.ts
-import { chmodSync, existsSync as existsSync2, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
+import { chmodSync, existsSync as existsSync2, readdirSync, readFileSync as readFileSync2 } from "fs";
 import { mkdir as mkdir2, readFile, rm } from "fs/promises";
 import { dirname as dirname2, join as join2, parse, resolve } from "path";
 import { fileURLToPath } from "url";
+import { resolveGlobalLocale } from "@fenglimg/fabric-shared";
 import { atomicWriteJson, atomicWriteText as atomicWriteText2 } from "@fenglimg/fabric-shared/node/atomic-write";
 import {
   BOOTSTRAP_MARKER_BEGIN,
   BOOTSTRAP_MARKER_END,
-  BOOTSTRAP_REGEX,
-  LEGACY_KB_REGEX
+  BOOTSTRAP_REGEX
 } from "@fenglimg/fabric-shared/templates/bootstrap-canonical";
+var SKILL_ROUTER_TEMPLATE_REL = "skills/fabric/SKILL.md";
+var ROUTER_INTENT_MARKER_BEGIN = "<!-- fabric:router-intent:begin -->";
+var ROUTER_INTENT_MARKER_END = "<!-- fabric:router-intent:end -->";
+var ROUTER_INTENT_GENERATED_NOTE = "<!-- \u672C\u5757\u7531 `fabric install` \u4ECE 7 \u4E2A leaf skill \u7684 description Triggers \u5B50\u53E5\u751F\u6210\u3002\u4E25\u7981\u624B\u7F16;\u6539 leaf description \u540E\u91CD\u8DD1 `fabric install`\u3002 -->";
+var ROUTER_INTENT_REGEX = /<!-- fabric:router-intent:begin -->[\s\S]*?<!-- fabric:router-intent:end -->/u;
 var SKILL_TEMPLATE_REL = "skills/fabric-archive/SKILL.md";
 var SKILL_REVIEW_TEMPLATE_REL = "skills/fabric-review/SKILL.md";
 var SKILL_IMPORT_TEMPLATE_REL = "skills/fabric-import/SKILL.md";
 var SKILL_SYNC_TEMPLATE_REL = "skills/fabric-sync/SKILL.md";
+var SKILL_STORE_TEMPLATE_REL = "skills/fabric-store/SKILL.md";
+var SKILL_AUDIT_TEMPLATE_REL = "skills/fabric-audit/SKILL.md";
+var SKILL_CONNECT_TEMPLATE_REL = "skills/fabric-connect/SKILL.md";
 var HOOK_SCRIPT_TEMPLATE_REL = "hooks/fabric-hint.cjs";
 var HOOK_BROAD_SCRIPT_TEMPLATE_REL = "hooks/knowledge-hint-broad.cjs";
 var HOOK_NARROW_SCRIPT_TEMPLATE_REL = "hooks/knowledge-hint-narrow.cjs";
 var HOOK_CITE_EVICT_SCRIPT_TEMPLATE_REL = "hooks/cite-policy-evict.cjs";
+var HOOK_SESSION_END_SCRIPT_TEMPLATE_REL = "hooks/session-end-marker.cjs";
+var HOOK_POST_TOOLUSE_SCRIPT_TEMPLATE_REL = "hooks/post-tooluse-mutation.cjs";
 var HOOK_LIB_TEMPLATE_DIR_REL = "hooks/lib";
 var CLAUDE_HOOK_CONFIG_TEMPLATE_REL = "hooks/configs/claude-code.json";
 var CODEX_HOOK_CONFIG_TEMPLATE_REL = "hooks/configs/codex-hooks.json";
-var CURSOR_HOOK_CONFIG_TEMPLATE_REL = "hooks/configs/cursor-hooks.json";
 var SKILL_DESTINATIONS = {
+  // B2 skill-router: the fabric/ router skill — single-file (no ref/), installed
+  // alongside the 7 leaf skills as the human-facing dispatch entry point.
+  fabricRouter: [
+    ".claude/skills/fabric/SKILL.md",
+    ".codex/skills/fabric/SKILL.md"
+  ],
   fabricArchive: [
     ".claude/skills/fabric-archive/SKILL.md",
     ".codex/skills/fabric-archive/SKILL.md"
@@ -81,8 +97,78 @@ var SKILL_DESTINATIONS = {
   fabricSync: [
     ".claude/skills/fabric-sync/SKILL.md",
     ".codex/skills/fabric-sync/SKILL.md"
+  ],
+  // v2.1 ADJ-NEWN-1/#4: fabric-store knowledge-store ops skill, same 2-client
+  // coverage as the sibling skills.
+  fabricStore: [
+    ".claude/skills/fabric-store/SKILL.md",
+    ".codex/skills/fabric-store/SKILL.md"
+  ],
+  // v2.2 SK1-audit (W2-T5): fabric-audit semantic-deprecation skill, same
+  // 2-client coverage as the sibling skills.
+  fabricAudit: [
+    ".claude/skills/fabric-audit/SKILL.md",
+    ".codex/skills/fabric-audit/SKILL.md"
+  ],
+  // v2.2 SK2-connect (W3-T2): fabric-connect knowledge-graph relation skill.
+  fabricConnect: [
+    ".claude/skills/fabric-connect/SKILL.md",
+    ".codex/skills/fabric-connect/SKILL.md"
   ]
 };
+var FABRIC_SKILL_INSTALL_SPECS = {
+  fabricRouter: {
+    slug: "fabric",
+    templateRel: SKILL_ROUTER_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricRouter,
+    step: "skill-router"
+  },
+  fabricArchive: {
+    slug: "fabric-archive",
+    templateRel: SKILL_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricArchive,
+    step: "skill",
+    includeRefFiles: true
+  },
+  fabricReview: {
+    slug: "fabric-review",
+    templateRel: SKILL_REVIEW_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricReview,
+    step: "skill-review",
+    includeRefFiles: true
+  },
+  fabricImport: {
+    slug: "fabric-import",
+    templateRel: SKILL_IMPORT_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricImport,
+    step: "skill-import",
+    includeRefFiles: true
+  },
+  fabricSync: {
+    slug: "fabric-sync",
+    templateRel: SKILL_SYNC_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricSync,
+    step: "skill-sync"
+  },
+  fabricStore: {
+    slug: "fabric-store",
+    templateRel: SKILL_STORE_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricStore,
+    step: "skill-store"
+  },
+  fabricAudit: {
+    slug: "fabric-audit",
+    templateRel: SKILL_AUDIT_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricAudit,
+    step: "skill-audit"
+  },
+  fabricConnect: {
+    slug: "fabric-connect",
+    templateRel: SKILL_CONNECT_TEMPLATE_REL,
+    destinations: SKILL_DESTINATIONS.fabricConnect,
+    step: "skill-connect"
+  }
+};
 var DEPRECATED_SKILL_DIRS = [
   ".claude/skills/fabric-init",
   ".codex/skills/fabric-init"
@@ -90,82 +176,86 @@ var DEPRECATED_SKILL_DIRS = [
 var HOOK_SCRIPT_DESTINATIONS = {
   fabricHint: [
     ".claude/hooks/fabric-hint.cjs",
-    ".codex/hooks/fabric-hint.cjs",
-    ".cursor/hooks/fabric-hint.cjs"
+    ".codex/hooks/fabric-hint.cjs"
   ],
   knowledgeHintBroad: [
     ".claude/hooks/knowledge-hint-broad.cjs",
-    ".codex/hooks/knowledge-hint-broad.cjs",
-    ".cursor/hooks/knowledge-hint-broad.cjs"
+    ".codex/hooks/knowledge-hint-broad.cjs"
   ],
   knowledgeHintNarrow: [
     ".claude/hooks/knowledge-hint-narrow.cjs",
-    ".codex/hooks/knowledge-hint-narrow.cjs",
-    ".cursor/hooks/knowledge-hint-narrow.cjs"
+    ".codex/hooks/knowledge-hint-narrow.cjs"
   ],
   // v2.0.0-rc.34 TASK-06: Claude Code — UserPromptSubmit cite-policy long-
   // session evict sidecar.
-  // v2.0.0-rc.37 NEW-21: extended to Codex / Cursor SessionStart slots.
-  // Those clients don't have an equivalent per-prompt event, so cite-policy-
+  // v2.0.0-rc.37 NEW-21: extended to Codex SessionStart slot.
+  // Codex doesn't have an equivalent per-prompt event, so cite-policy-
   // evict.cjs runs in "SessionStart mode" (one-shot stderr emit per session
   // boot, no turn-counter). Cadence is lower than Claude Code's per-prompt
-  // window but strictly better than 0 (rc.32 baseline measured Codex/Cursor
+  // window but strictly better than 0 (rc.32 baseline measured Codex
   // at 3.1% cite coverage when no cite-reminder surface existed).
   citePolicyEvict: [
     ".claude/hooks/cite-policy-evict.cjs",
-    ".codex/hooks/cite-policy-evict.cjs",
-    ".cursor/hooks/cite-policy-evict.cjs"
+    ".codex/hooks/cite-policy-evict.cjs"
+  ],
+  // lifecycle-refactor W2-T2: SessionEnd marker hook — both clients.
+  sessionEndMarker: [
+    ".claude/hooks/session-end-marker.cjs",
+    ".codex/hooks/session-end-marker.cjs"
+  ],
+  // lifecycle-refactor W2-T3: PostToolUse mutation marker hook — both.
+  postTooluseMutation: [
+    ".claude/hooks/post-tooluse-mutation.cjs",
+    ".codex/hooks/post-tooluse-mutation.cjs"
   ]
 };
 var HOOK_LIB_DESTINATIONS = [
   ".claude/hooks/lib",
-  ".codex/hooks/lib",
-  ".cursor/hooks/lib"
+  ".codex/hooks/lib"
 ];
 var HOOK_CONFIG_TARGETS = {
   claudeCode: ".claude/settings.json",
-  codex: ".codex/hooks.json",
-  cursor: ".cursor/hooks.json"
+  codex: ".codex/hooks.json"
 };
 var HOOK_CONFIG_ARRAY_PATHS = {
-  claudeCode: ["hooks.Stop", "hooks.SessionStart", "hooks.PreToolUse"],
-  codex: ["events.Stop", "events.SessionStart", "events.PreToolUse"],
-  cursor: ["hooks.stop", "hooks.sessionStart", "hooks.preToolUse"]
+  // F2: "hooks.UserPromptSubmit" MUST be listed — the Claude Code template
+  // ships a UserPromptSubmit cite-policy hook, so without this path deepMerge
+  // array-REPLACEs (instead of append-with-dedupe) on re-install, silently
+  // clobbering any user-defined UserPromptSubmit hook.
+  // lifecycle-refactor W2-T2/T3: PostToolUse + SessionEnd arrays added so
+  // deepMerge append-with-dedupes them on re-install (omitting them would
+  // array-REPLACE, clobbering any user-defined entries in those slots).
+  claudeCode: [
+    "hooks.Stop",
+    "hooks.SessionStart",
+    "hooks.PreToolUse",
+    "hooks.UserPromptSubmit",
+    "hooks.PostToolUse",
+    "hooks.SessionEnd"
+  ],
+  codex: ["events.Stop", "events.SessionStart", "events.PreToolUse", "events.PostToolUse", "events.SessionEnd"]
 };
 var FABRIC_HOOK_COMMAND_PATHS = {
   claudeCode: {
     fabricHint: "${CLAUDE_PROJECT_DIR}/.claude/hooks/fabric-hint.cjs",
     knowledgeHintBroad: "${CLAUDE_PROJECT_DIR}/.claude/hooks/knowledge-hint-broad.cjs",
-    knowledgeHintNarrow: "${CLAUDE_PROJECT_DIR}/.claude/hooks/knowledge-hint-narrow.cjs"
+    knowledgeHintNarrow: "${CLAUDE_PROJECT_DIR}/.claude/hooks/knowledge-hint-narrow.cjs",
+    // F3: the UserPromptSubmit cite-policy-evict hook must be a known fabric
+    // command so uninstall prunes it (matches the literal in claude-code.json).
+    citePolicyEvict: "${CLAUDE_PROJECT_DIR}/.claude/hooks/cite-policy-evict.cjs",
+    // lifecycle-refactor W2-T2/T3: SessionEnd + PostToolUse marker hooks.
+    sessionEndMarker: "${CLAUDE_PROJECT_DIR}/.claude/hooks/session-end-marker.cjs",
+    postTooluseMutation: "${CLAUDE_PROJECT_DIR}/.claude/hooks/post-tooluse-mutation.cjs"
   },
   codex: {
     fabricHint: '"$(git rev-parse --show-toplevel)/.codex/hooks/fabric-hint.cjs"',
     knowledgeHintBroad: '"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-hint-broad.cjs"',
-    knowledgeHintNarrow: '"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-hint-narrow.cjs"'
-  },
-  cursor: {
-    fabricHint: ".cursor/hooks/fabric-hint.cjs",
-    knowledgeHintBroad: ".cursor/hooks/knowledge-hint-broad.cjs",
-    knowledgeHintNarrow: ".cursor/hooks/knowledge-hint-narrow.cjs"
+    knowledgeHintNarrow: '"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-hint-narrow.cjs"',
+    citePolicyEvict: '"$(git rev-parse --show-toplevel)/.codex/hooks/cite-policy-evict.cjs"',
+    sessionEndMarker: '"$(git rev-parse --show-toplevel)/.codex/hooks/session-end-marker.cjs"',
+    postTooluseMutation: '"$(git rev-parse --show-toplevel)/.codex/hooks/post-tooluse-mutation.cjs"'
   }
 };
-function readFabricLanguagePreference(projectRoot) {
-  const configPath = join2(projectRoot, ".fabric", "fabric-config.json");
-  if (!existsSync2(configPath)) {
-    return "match-existing";
-  }
-  try {
-    const raw = readFileSync2(configPath, "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-      return "match-existing";
-    }
-    const value = parsed["fabric_language"];
-    return typeof value === "string" && value.length > 0 ? value : "match-existing";
-  } catch {
-    return "match-existing";
-  }
-}
 var SKILL_TOKEN_ERROR_TOKENS = 1e4;
 var STALE_INSTALL_RATIO = 1.5;
 function estimateSkillTokens(text) {
@@ -194,62 +284,98 @@ function inspectStaleInstall(target, source) {
   }
   return null;
 }
-async function installFabricArchiveSkill(projectRoot, _options = {}) {
-  const source = await readTemplate(SKILL_TEMPLATE_REL);
-  validateSkillCanonicalSize(source, "fabric-archive");
-  const targets = SKILL_DESTINATIONS.fabricArchive.map((rel) => join2(projectRoot, rel));
+async function installFabricSkill(projectRoot, spec) {
+  const source = await readTemplate(spec.templateRel);
+  validateSkillCanonicalSize(source, spec.slug);
+  const targets = spec.destinations.map((rel) => join2(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     const staleMsg = inspectStaleInstall(target, source);
-    const result = await copyTextIdempotent("skill", source, target);
+    const result = await copyTextIdempotent(spec.step, source, target);
     if (staleMsg && result.status === "written") {
       result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
     }
     results.push(result);
   }
-  results.push(...await installSkillRefFiles(projectRoot, "fabric-archive"));
+  if (spec.includeRefFiles) {
+    results.push(...await installSkillRefFiles(projectRoot, spec.slug));
+  }
   return results;
 }
+async function installFabricArchiveSkill(projectRoot, _options = {}) {
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricArchive);
+}
 async function installFabricReviewSkill(projectRoot, _options = {}) {
-  const source = await readTemplate(SKILL_REVIEW_TEMPLATE_REL);
-  validateSkillCanonicalSize(source, "fabric-review");
-  const targets = SKILL_DESTINATIONS.fabricReview.map((rel) => join2(projectRoot, rel));
-  const results = [];
-  for (const target of targets) {
-    const staleMsg = inspectStaleInstall(target, source);
-    const result = await copyTextIdempotent("skill-review", source, target);
-    if (staleMsg && result.status === "written") {
-      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
-    }
-    results.push(result);
-  }
-  results.push(...await installSkillRefFiles(projectRoot, "fabric-review"));
-  return results;
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricReview);
 }
 async function installFabricImportSkill(projectRoot, _options = {}) {
-  const source = await readTemplate(SKILL_IMPORT_TEMPLATE_REL);
-  validateSkillCanonicalSize(source, "fabric-import");
-  const targets = SKILL_DESTINATIONS.fabricImport.map((rel) => join2(projectRoot, rel));
-  const results = [];
-  for (const target of targets) {
-    const staleMsg = inspectStaleInstall(target, source);
-    const result = await copyTextIdempotent("skill-import", source, target);
-    if (staleMsg && result.status === "written") {
-      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
-    }
-    results.push(result);
-  }
-  results.push(...await installSkillRefFiles(projectRoot, "fabric-import"));
-  return results;
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricImport);
 }
 async function installFabricSyncSkill(projectRoot, _options = {}) {
-  const source = await readTemplate(SKILL_SYNC_TEMPLATE_REL);
-  validateSkillCanonicalSize(source, "fabric-sync");
-  const targets = SKILL_DESTINATIONS.fabricSync.map((rel) => join2(projectRoot, rel));
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricSync);
+}
+async function installFabricStoreSkill(projectRoot, _options = {}) {
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricStore);
+}
+async function installFabricAuditSkill(projectRoot, _options = {}) {
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricAudit);
+}
+async function installFabricConnectSkill(projectRoot, _options = {}) {
+  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricConnect);
+}
+function extractSkillMdDescription(skillMd) {
+  const fm = skillMd.match(/^---\n([\s\S]*?)\n---/u);
+  if (!fm) return "";
+  const desc = fm[1].match(/^description:\s*(.+?)\s*$/mu);
+  if (!desc) return "";
+  return desc[1].replace(/^["'](.+)["']$/u, "$1").trim();
+}
+function extractTriggersClause(description) {
+  const m = description.match(/Triggers?\s+([\s\S]+)$/u);
+  if (!m) return "";
+  return m[1].trim().replace(/[.。]\s*$/u, "").replace(/\|/gu, "\\|");
+}
+function renderRouterIntentBlock(leaves) {
+  const rows = leaves.map((l) => `| ${l.triggers} | \`${l.slug}\` |`).join("\n");
+  const enumVals = leaves.map((l) => l.slug.replace(/^fabric-/u, "")).join(" | ");
+  return [
+    ROUTER_INTENT_MARKER_BEGIN,
+    ROUTER_INTENT_GENERATED_NOTE,
+    "",
+    "| \u7528\u6237\u610F\u56FE(leaf description Triggers) | \u4E0B\u6E38 skill |",
+    "| --- | --- |",
+    rows,
+    "",
+    `\`S_CLASSIFY\` \u7684 \`task_type\` \u679A\u4E3E:\`${enumVals}\``,
+    ROUTER_INTENT_MARKER_END
+  ].join("\n");
+}
+async function buildRouterSkillSource() {
+  const template = await readTemplate(SKILL_ROUTER_TEMPLATE_REL);
+  if (!ROUTER_INTENT_REGEX.test(template)) {
+    throw new Error(
+      `fabric/SKILL.md is missing the ${ROUTER_INTENT_MARKER_BEGIN} \u2026 ${ROUTER_INTENT_MARKER_END} marker pair \u2014 cannot regenerate the Intent Map. This is a Fabric release bug (router template was hand-edited away from the managed-block contract).`
+    );
+  }
+  const leafSpecs = Object.values(FABRIC_SKILL_INSTALL_SPECS).filter(
+    (spec) => spec.slug !== "fabric"
+  );
+  const leaves = [];
+  for (const spec of leafSpecs) {
+    const leafMd = await readTemplate(spec.templateRel);
+    leaves.push({ slug: spec.slug, triggers: extractTriggersClause(extractSkillMdDescription(leafMd)) });
+  }
+  return template.replace(ROUTER_INTENT_REGEX, renderRouterIntentBlock(leaves));
+}
+async function installFabricRouterSkill(projectRoot, _options = {}) {
+  const source = await buildRouterSkillSource();
+  validateSkillCanonicalSize(source, "fabric");
+  const spec = FABRIC_SKILL_INSTALL_SPECS.fabricRouter;
+  const targets = spec.destinations.map((rel) => join2(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     const staleMsg = inspectStaleInstall(target, source);
-    const result = await copyTextIdempotent("skill-sync", source, target);
+    const result = await copyTextIdempotent(spec.step, source, target);
     if (staleMsg && result.status === "written") {
       result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
     }
@@ -443,6 +569,38 @@ async function installCitePolicyEvictHook(projectRoot, _options = {}) {
   }
   return results;
 }
+async function installSessionEndMarkerHook(projectRoot, _options = {}) {
+  const source = await readTemplate(HOOK_SESSION_END_SCRIPT_TEMPLATE_REL);
+  const targets = HOOK_SCRIPT_DESTINATIONS.sessionEndMarker.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const result = await copyTextIdempotent("hook-session-end-script", source, target);
+    if (result.status === "written" && process.platform !== "win32") {
+      try {
+        chmodSync(target, 493);
+      } catch {
+      }
+    }
+    results.push(result);
+  }
+  return results;
+}
+async function installPostTooluseMutationHook(projectRoot, _options = {}) {
+  const source = await readTemplate(HOOK_POST_TOOLUSE_SCRIPT_TEMPLATE_REL);
+  const targets = HOOK_SCRIPT_DESTINATIONS.postTooluseMutation.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const result = await copyTextIdempotent("hook-post-tooluse-script", source, target);
+    if (result.status === "written" && process.platform !== "win32") {
+      try {
+        chmodSync(target, 493);
+      } catch {
+      }
+    }
+    results.push(result);
+  }
+  return results;
+}
 async function installHookLibs(projectRoot, _options = {}) {
   const libTemplateDir = findTemplatePath(HOOK_LIB_TEMPLATE_DIR_REL);
   let libFiles;
@@ -510,16 +668,6 @@ async function mergeCodexHookConfig(projectRoot, _options = {}) {
     [...HOOK_CONFIG_ARRAY_PATHS.codex]
   );
 }
-async function mergeCursorHookConfig(projectRoot, _options = {}) {
-  const fragment = await readJsonTemplate(CURSOR_HOOK_CONFIG_TEMPLATE_REL);
-  const targetPath = join2(projectRoot, HOOK_CONFIG_TARGETS.cursor);
-  return mergeJsonIdempotent(
-    "cursor-hook-config",
-    targetPath,
-    fragment,
-    [...HOOK_CONFIG_ARRAY_PATHS.cursor]
-  );
-}
 function buildManagedBlockBody(targetRoot) {
   const snapshotPath = fabricAgentsSnapshotPath(targetRoot);
   const snapshot = readFileSync2(snapshotPath, "utf8");
@@ -536,13 +684,6 @@ function wrapInBootstrapMarkers(body) {
 ${body}
 ${BOOTSTRAP_MARKER_END}`;
 }
-function stripLegacyKnowledgeBaseSection(existing) {
-  const match = existing.match(LEGACY_KB_REGEX);
-  if (match === null) return existing;
-  const before = existing.slice(0, match.index ?? 0);
-  const after = existing.slice((match.index ?? 0) + match[0].length);
-  return `${before}${after.replace(/^\r?\n/, "")}`;
-}
 var CLAUDE_BOOTSTRAP_HEADER = "# Project Knowledge";
 var CLAUDE_AGENTS_IMPORT_LINE = "@.fabric/AGENTS.md";
 var CLAUDE_PROJECT_RULES_IMPORT_LINE = "@.fabric/project-rules.md";
@@ -565,7 +706,7 @@ async function writeClaudeBootstrapThinShell(targetRoot, _options = {}) {
       };
     }
   }
-  let next = stripLegacyKnowledgeBaseSection(existing);
+  let next = existing;
   if (!projectRulesPresent) {
     next = removeImportLine(next, CLAUDE_PROJECT_RULES_IMPORT_LINE);
   }
@@ -640,23 +781,22 @@ async function writeCodexBootstrapManagedBlock(targetRoot, _options = {}) {
   }
   const body = buildManagedBlockBody(targetRoot);
   const managedBlock = wrapInBootstrapMarkers(body);
-  const stripped = stripLegacyKnowledgeBaseSection(existing);
   let next;
-  const match = stripped.match(BOOTSTRAP_REGEX);
+  const match = existing.match(BOOTSTRAP_REGEX);
   if (match !== null) {
-    const before = stripped.slice(0, match.index ?? 0);
-    const after = stripped.slice((match.index ?? 0) + match[0].length);
+    const before = existing.slice(0, match.index ?? 0);
+    const after = existing.slice((match.index ?? 0) + match[0].length);
     const cleaned = `${before}${after.replace(/^\r?\n/, "")}`;
     const trailingNewline = cleaned.length === 0 || cleaned.endsWith("\n") ? "" : "\n";
     next = `${cleaned}${trailingNewline}${cleaned.length === 0 ? "" : "\n"}${managedBlock}
 `;
   } else {
-    if (stripped.length === 0) {
+    if (existing.length === 0) {
       next = `${managedBlock}
 `;
     } else {
-      const trailingNewline = stripped.endsWith("\n") ? "" : "\n";
-      next = `${stripped}${trailingNewline}
+      const trailingNewline = existing.endsWith("\n") ? "" : "\n";
+      next = `${existing}${trailingNewline}
 ${managedBlock}
 `;
     }
@@ -677,55 +817,6 @@ ${managedBlock}
     };
   }
 }
-var CURSOR_RULE_FRONT_MATTER = "---\nalwaysApply: true\ndescription: Fabric Protocol bootstrap rules\n---\n\n";
-var CURSOR_LEGACY_FLAT_FILE_REL = join2(".cursor", "rules");
-var CURSOR_BOOTSTRAP_MDC_REL = join2(".cursor", "rules", "fabric-bootstrap.mdc");
-async function writeCursorBootstrapManagedBlock(targetRoot, _options = {}) {
-  const step = "bootstrap-cursor";
-  const target = join2(targetRoot, CURSOR_BOOTSTRAP_MDC_REL);
-  const legacyFlatFile = join2(targetRoot, CURSOR_LEGACY_FLAT_FILE_REL);
-  try {
-    if (existsSync2(legacyFlatFile)) {
-      const stat = statSync(legacyFlatFile);
-      if (stat.isFile()) {
-        await rm(legacyFlatFile, { force: true });
-      }
-    }
-  } catch {
-  }
-  const body = buildManagedBlockBody(targetRoot);
-  const managedBlock = wrapInBootstrapMarkers(body);
-  const expected = `${CURSOR_RULE_FRONT_MATTER}${managedBlock}
-`;
-  let existing = "";
-  if (existsSync2(target)) {
-    try {
-      existing = await readFile(target, "utf8");
-    } catch (error) {
-      return {
-        step,
-        path: target,
-        status: "error",
-        message: error instanceof Error ? error.message : String(error)
-      };
-    }
-  }
-  if (existing === expected) {
-    return { step, path: target, status: "skipped", message: "up-to-date" };
-  }
-  try {
-    await mkdir2(dirname2(target), { recursive: true });
-    await atomicWriteText2(target, expected);
-    return { step, path: target, status: "written" };
-  } catch (error) {
-    return {
-      step,
-      path: target,
-      status: "error",
-      message: error instanceof Error ? error.message : String(error)
-    };
-  }
-}
 async function copyTextIdempotent(step, source, target) {
   if (existsSync2(target)) {
     try {
@@ -744,6 +835,17 @@ var FABRIC_HOOK_SCRIPT_BASENAMES = /* @__PURE__ */ new Set([
   "fabric-hint.cjs",
   "knowledge-hint-broad.cjs",
   "knowledge-hint-narrow.cjs",
+  // dual-sink W5-1: the strip set must enumerate the COMPLETE fabric-owned hook
+  // surface — same set as FABRIC_HOOK_COMMAND_PATHS. Otherwise a matcher change
+  // in the template (e.g. adding `apply_patch` to the Codex PreToolUse/PostToolUse
+  // matchers) silently fails to propagate on upgrade: stripStaleHookEntries
+  // leaves the un-listed entry in place, and the subsequent append-with-dedupe
+  // matches it by `command` and SKIPS the new-matcher fragment, preserving the
+  // stale matcher. Listing these three makes the canonical template entry the
+  // sole survivor on every re-install, so matcher edits actually sync.
+  "cite-policy-evict.cjs",
+  "post-tooluse-mutation.cjs",
+  "session-end-marker.cjs",
   // rc.5 TASK-010 rename — old hook scripts that pre-upgrade workspaces
   // may still have registered. Sweeping them prevents the double-fire
   // documented in audit §2.6.
@@ -882,22 +984,25 @@ export {
   HOOK_CONFIG_TARGETS,
   HOOK_CONFIG_ARRAY_PATHS,
   FABRIC_HOOK_COMMAND_PATHS,
-  readFabricLanguagePreference,
   installFabricArchiveSkill,
   installFabricReviewSkill,
   installFabricImportSkill,
   installFabricSyncSkill,
+  installFabricStoreSkill,
+  installFabricAuditSkill,
+  installFabricConnectSkill,
+  installFabricRouterSkill,
   cleanupDeprecatedSkills,
   installSharedSkillLib,
   installArchiveHintHook,
   installKnowledgeHintBroadHook,
   installKnowledgeHintNarrowHook,
   installCitePolicyEvictHook,
+  installSessionEndMarkerHook,
+  installPostTooluseMutationHook,
   installHookLibs,
   mergeClaudeCodeHookConfig,
   mergeCodexHookConfig,
-  mergeCursorHookConfig,
   writeClaudeBootstrapThinShell,
-  writeCodexBootstrapManagedBlock,
-  writeCursorBootstrapManagedBlock
+  writeCodexBootstrapManagedBlock
 };