@fenglimg/fabric-cli 2.2.0 → 2.3.0-rc.1

package/dist/{chunk-QPAW6IYT.js → chunk-7V4XMLQ2.js}

@@ -2,7 +2,7 @@
 import {
   loadProjectConfig,
   saveProjectConfig
-} from "./chunk-QFIVFZRH.js";
+} from "./chunk-I5F5BHWI.js";
 import {
   loadGlobalConfig,
   resolveGlobalRoot,
@@ -233,7 +233,7 @@ function assertStoreMountable(uuid, globalRoot = resolveGlobalRoot(), mountName)
   const storeDir = candidates.find((dir) => existsSync(join(dir, "store.json"))) ?? candidates[0];
   if (!existsSync(join(storeDir, "store.json"))) {
     throw new Error(
-      `cannot mount store ${uuid}: no store tree at ${storeDir} \u2014 clone it first (\`fabric install --global --url <remote>\`) or create it locally, then re-run \`fabric store add\`. Refusing to register a phantom store.`
+      `cannot mount store ${uuid}: no store tree at ${storeDir} \u2014 clone it first (\`fabric install --global --url <remote>\`) or create it locally, then re-run \`fabric store mount\`. Refusing to register a phantom store.`
     );
   }
 }
@@ -296,7 +296,7 @@ async function storeBind(projectRoot, entry, options = {}) {
     const storeDir = resolveStoreDir(entry.id, globalRoot);
     if (storeDir === null) {
       throw new Error(
-        `cannot bind project '${options.project}': store '${entry.id}' is not mounted \u2014 mount it first (\`fabric store add\` / \`fabric install --global --url <remote>\`)`
+        `cannot bind project '${options.project}': store '${entry.id}' is not mounted \u2014 mount it first (\`fabric store mount\` / \`fabric install --global --url <remote>\`)`
       );
     }
     if (!await storeHasProject(storeDir, options.project)) {

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

@@ -52,21 +52,14 @@ import {
   BOOTSTRAP_MARKER_END,
   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_PRETOOLUSE_SCRIPT_TEMPLATE_REL = "hooks/knowledge-pretooluse.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";
@@ -74,12 +67,6 @@ 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 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"
@@ -88,10 +75,6 @@ var SKILL_DESTINATIONS = {
     ".claude/skills/fabric-review/SKILL.md",
     ".codex/skills/fabric-review/SKILL.md"
   ],
-  fabricImport: [
-    ".claude/skills/fabric-import/SKILL.md",
-    ".codex/skills/fabric-import/SKILL.md"
-  ],
   // v2.1.0-rc.1 P4 (S46): fabric-sync mirrors the sibling skills' 2-client
   // coverage (Claude Code + Codex CLI surface a Skills directory).
   fabricSync: [
@@ -103,26 +86,9 @@ var SKILL_DESTINATIONS = {
   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,
@@ -137,13 +103,6 @@ var FABRIC_SKILL_INSTALL_SPECS = {
     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,
@@ -155,23 +114,22 @@ var FABRIC_SKILL_INSTALL_SPECS = {
     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"
+  ".codex/skills/fabric-init",
+  // W3-C (skill collapse): the router + 3 folded leaves are retired. import→
+  // archive source mode, audit→review retire, connect→review relate. Sweep the
+  // residual installed copies on the next `fabric install`.
+  ".claude/skills/fabric",
+  ".codex/skills/fabric",
+  ".claude/skills/fabric-import",
+  ".codex/skills/fabric-import",
+  ".claude/skills/fabric-audit",
+  ".codex/skills/fabric-audit",
+  ".claude/skills/fabric-connect",
+  ".codex/skills/fabric-connect"
 ];
 var HOOK_SCRIPT_DESTINATIONS = {
   fabricHint: [
@@ -186,6 +144,14 @@ var HOOK_SCRIPT_DESTINATIONS = {
     ".claude/hooks/knowledge-hint-narrow.cjs",
     ".codex/hooks/knowledge-hint-narrow.cjs"
   ],
+  // ux-w2-6: the single PreToolUse orchestrator. Requires knowledge-hint-narrow
+  // + cite-policy-evict as libs (both still copied) and merges their output into
+  // one envelope, so the Edit|Write|MultiEdit matcher carries ONE command (was
+  // two = 双弹).
+  knowledgePretoolUse: [
+    ".claude/hooks/knowledge-pretooluse.cjs",
+    ".codex/hooks/knowledge-pretooluse.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 SessionStart slot.
@@ -240,6 +206,8 @@ var FABRIC_HOOK_COMMAND_PATHS = {
     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",
+    // ux-w2-6: the single PreToolUse orchestrator command (wired in claude-code.json).
+    knowledgePretoolUse: "${CLAUDE_PROJECT_DIR}/.claude/hooks/knowledge-pretooluse.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",
@@ -251,6 +219,7 @@ var FABRIC_HOOK_COMMAND_PATHS = {
     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"',
+    knowledgePretoolUse: '"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-pretooluse.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"'
@@ -308,81 +277,12 @@ async function installFabricArchiveSkill(projectRoot, _options = {}) {
 async function installFabricReviewSkill(projectRoot, _options = {}) {
   return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricReview);
 }
-async function installFabricImportSkill(projectRoot, _options = {}) {
-  return installFabricSkill(projectRoot, FABRIC_SKILL_INSTALL_SPECS.fabricImport);
-}
 async function installFabricSyncSkill(projectRoot, _options = {}) {
   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(spec.step, source, target);
-    if (staleMsg && result.status === "written") {
-      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
-    }
-    results.push(result);
-  }
-  return results;
-}
 async function cleanupDeprecatedSkills(projectRoot) {
   const results = [];
   for (const rel of DEPRECATED_SKILL_DIRS) {
@@ -553,6 +453,22 @@ async function installKnowledgeHintNarrowHook(projectRoot, _options = {}) {
   }
   return results;
 }
+async function installKnowledgePretoolUseHook(projectRoot, _options = {}) {
+  const source = await readTemplate(HOOK_PRETOOLUSE_SCRIPT_TEMPLATE_REL);
+  const targets = HOOK_SCRIPT_DESTINATIONS.knowledgePretoolUse.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const result = await copyTextIdempotent("hook-pretooluse-script", source, target);
+    if (result.status === "written" && process.platform !== "win32") {
+      try {
+        chmodSync(target, 493);
+      } catch {
+      }
+    }
+    results.push(result);
+  }
+  return results;
+}
 async function installCitePolicyEvictHook(projectRoot, _options = {}) {
   const source = await readTemplate(HOOK_CITE_EVICT_SCRIPT_TEMPLATE_REL);
   const targets = HOOK_SCRIPT_DESTINATIONS.citePolicyEvict.map((rel) => join2(projectRoot, rel));
@@ -835,6 +751,9 @@ var FABRIC_HOOK_SCRIPT_BASENAMES = /* @__PURE__ */ new Set([
   "fabric-hint.cjs",
   "knowledge-hint-broad.cjs",
   "knowledge-hint-narrow.cjs",
+  // ux-w2-6: the single PreToolUse orchestrator — must be in the strip set so a
+  // template matcher edit re-syncs on re-install (same reason as the others below).
+  "knowledge-pretooluse.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
@@ -986,17 +905,14 @@ export {
   FABRIC_HOOK_COMMAND_PATHS,
   installFabricArchiveSkill,
   installFabricReviewSkill,
-  installFabricImportSkill,
   installFabricSyncSkill,
   installFabricStoreSkill,
-  installFabricAuditSkill,
-  installFabricConnectSkill,
-  installFabricRouterSkill,
   cleanupDeprecatedSkills,
   installSharedSkillLib,
   installArchiveHintHook,
   installKnowledgeHintBroadHook,
   installKnowledgeHintNarrowHook,
+  installKnowledgePretoolUseHook,
   installCitePolicyEvictHook,
   installSessionEndMarkerHook,
   installPostTooluseMutationHook,

package/dist/{chunk-PTGQAZEW.js → chunk-GGDVZCD6.js}

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 import {
-  buildResolveInput
-} from "./chunk-EOT63RDH.js";
-import {
+  buildResolveInput,
   loadProjectConfig
-} from "./chunk-QFIVFZRH.js";
+} from "./chunk-I5F5BHWI.js";
 import {
   resolveGlobalRoot
 } from "./chunk-FNHDQTPC.js";

package/dist/{chunk-EOT63RDH.js → chunk-I5F5BHWI.js}

@@ -1,5 +1,12 @@
 #!/usr/bin/env node
 
+// src/store/project-config-io.ts
+import {
+  projectConfigPath,
+  loadProjectConfig,
+  saveProjectConfig
+} from "@fenglimg/fabric-shared";
+
 // src/store/scope-explain.ts
 import {
   SCOPE_COORDINATE_PATTERN,
@@ -31,6 +38,8 @@ function scopeExplain(projectRoot, scope, globalRoot = resolveGlobalRoot()) {
 }
 
 export {
+  loadProjectConfig,
+  saveProjectConfig,
   buildResolveInput,
   scopeExplain
 };