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

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

@@ -2,18 +2,16 @@
 import {
   detectClientSupports,
   resolveClients
-} from "./chunk-HQLEHH4O.js";
+} from "./chunk-OHWQNSLH.js";
 import {
   FABRIC_HOOK_COMMAND_PATHS,
+  FABRIC_SECTION_REGEX,
   HOOK_CONFIG_ARRAY_PATHS,
   HOOK_CONFIG_TARGETS,
   HOOK_SCRIPT_DESTINATIONS,
-  IMPORT_POINTER_LINE,
-  POINTER_LINE,
-  POINTER_TARGETS,
-  REVIEW_POINTER_LINE,
+  SECTION_TARGETS,
   SKILL_DESTINATIONS
-} from "./chunk-AW3G7ZH5.js";
+} from "./chunk-X7QPY5KH.js";
 import {
   paint
 } from "./chunk-WWNXR34K.js";
@@ -115,12 +113,12 @@ async function unmergeCursorHookConfig(projectRoot, opts = {}) {
     cleanEmpties: opts.cleanEmpties === true
   });
 }
-async function stripArchiveSkillPointers(projectRoot) {
+async function stripFabricKnowledgeBaseSection(projectRoot) {
   const results = [];
-  for (const rel of POINTER_TARGETS) {
+  for (const rel of SECTION_TARGETS) {
     const target = join(projectRoot, rel);
     if (!existsSync(target)) {
-      results.push({ step: "pointer", path: target, status: "skipped", message: "absent" });
+      results.push({ step: "section", path: target, status: "skipped", message: "absent" });
       continue;
     }
     let existing;
@@ -128,30 +126,41 @@ async function stripArchiveSkillPointers(projectRoot) {
       existing = await readFile(target, "utf8");
     } catch (error) {
       results.push({
-        step: "pointer",
+        step: "section",
         path: target,
         status: "error",
         message: error instanceof Error ? error.message : String(error)
       });
       continue;
     }
-    const pointerLiterals = [POINTER_LINE, REVIEW_POINTER_LINE, IMPORT_POINTER_LINE];
-    const filtered = existing.split("\n").filter((line) => !pointerLiterals.some((literal) => line.includes(literal))).join("\n");
+    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: "pointer",
+        step: "section",
         path: target,
         status: "skipped",
-        message: "no-fabric-pointers"
+        message: "no-fabric-section"
       });
       continue;
     }
     try {
       await atomicWriteText(target, filtered);
-      results.push({ step: "pointer", path: target, status: "removed" });
+      results.push({ step: "section", path: target, status: "removed" });
     } catch (error) {
       results.push({
-        step: "pointer",
+        step: "section",
         path: target,
         status: "error",
         message: error instanceof Error ? error.message : String(error)
@@ -164,9 +173,9 @@ async function uninstallBootstrapStage(projectRoot, opts = {}) {
   const results = [];
   await runAndCollect(
     results,
-    "pointer",
+    "section",
     projectRoot,
-    () => stripArchiveSkillPointers(projectRoot)
+    () => stripFabricKnowledgeBaseSection(projectRoot)
   );
   await runAndCollectOne(
     results,

package/package.json

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

package/templates/hooks/configs/README.md

@@ -1,6 +1,6 @@
 # Client hook config templates
 
-These JSON files are **fragment templates** consumed by `fabric init` and
+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`

package/templates/hooks/knowledge-hint-broad.cjs

@@ -49,41 +49,22 @@
 const { spawnSync } = require("node:child_process");
 const {
   existsSync,
-  mkdirSync,
   readdirSync,
   readFileSync,
-  writeFileSync,
 } = require("node:fs");
-const { dirname, join } = require("node:path");
+const { join } = require("node:path");
 
 // -----------------------------------------------------------------------------
-// rc.7 T8: SessionStart revision_hash gating.
-//
-// Q-14 problem: every SessionStart re-dumped the full broad knowledge list,
-// causing banner blindness. Solution: hash-of-canonical-graph gating — record
-// the last-emitted `payload.revision_hash` to a sidecar; on subsequent
-// SessionStart fires, compare. Match → silent exit 0 (no re-dump). Mismatch
-// (canonical/ corpus changed → planContext bumps revision_hash) → emit AND
-// update sidecar.
-//
-// The revision_hash is supplied by `fabric plan-context-hint --all`'s JSON
-// payload (carried in payload.revision_hash since rc.5). Reusing the existing
-// hash primitive keeps the gating predicate exactly aligned with the "is the
-// knowledge graph different from last time?" question — no second hashing
-// scheme to maintain. computeRevisionHash() is not needed at this layer; we
-// compare the strings the CLI hands us.
-//
-// rc.8 underseed self-check: the retired `.fabric/.import-requested` sentinel
-// mechanism is replaced by a deterministic three-condition probe in
-// shouldRecommendImport(). When the probe says "recommend", a one-line
-// `/fabric-import` banner is appended to the broad-injection output and
-// the revision_hash gate is bypassed FOR THE BANNER ONLY (the broad-summary
-// body itself remains hash-gated). See shouldRecommendImport() below for
-// the full truth table.
+// rc.12: SessionStart broad-menu is now unconditionally emitted on every
+// SessionStart fire (matching Skill-style progressive disclosure). Prior
+// versions (rc.5-rc.11) wrote `.fabric/.cache/sessionstart-last-hash` as a
+// revision_hash cooldown sidecar to suppress re-emission on unchanged
+// knowledge graphs; that gate was removed in rc.12. Orphaned sidecar files
+// on existing dogfood repos are harmless dead state and are intentionally
+// NOT cleaned up (zero-user clean-slate — no migration logic needed).
 // -----------------------------------------------------------------------------
 
 const FABRIC_DIR_REL = ".fabric";
-const SESSIONSTART_HASH_CACHE_FILE = join(".fabric", ".cache", "sessionstart-last-hash");
 
 // rc.8 underseed self-check constants (mirror fabric-hint.cjs ~line 76 / 83).
 // Intentionally duplicated inline — hooks are independent .cjs files and
@@ -102,41 +83,6 @@ const KNOWLEDGE_CANONICAL_TYPES = [
 ];
 const DEFAULT_UNDERSEED_NODE_THRESHOLD = 10;
 
-/**
- * Read the previously-emitted revision_hash from
- * `.fabric/.cache/sessionstart-last-hash`. Missing file / read failure /
- * empty file → null (treat as "no prior emit", forces re-emit).
- *
- * NEVER throws — best-effort read.
- */
-function readSessionStartLastHash(projectRoot) {
-  try {
-    const p = join(projectRoot, SESSIONSTART_HASH_CACHE_FILE);
-    if (!existsSync(p)) return null;
-    const raw = readFileSync(p, "utf8").trim();
-    return raw.length > 0 ? raw : null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Write `hash` to `.fabric/.cache/sessionstart-last-hash` so subsequent
- * SessionStart fires can compare. Creates the directory if missing.
- * Best-effort: any write failure is swallowed so a read-only .fabric/
- * never blocks session start.
- */
-function writeSessionStartLastHash(projectRoot, hash) {
-  try {
-    if (typeof hash !== "string" || hash.length === 0) return;
-    const p = join(projectRoot, SESSIONSTART_HASH_CACHE_FILE);
-    mkdirSync(dirname(p), { recursive: true });
-    writeFileSync(p, hash, "utf8");
-  } catch {
-    // Silent — sidecar failure must never block session start.
-  }
-}
-
 // -----------------------------------------------------------------------------
 // rc.8 underseed self-check helpers.
 //
@@ -488,15 +434,21 @@ function renderTruncated(narrow) {
  * (empty narrow set) so callers know to stay silent.
  */
 function renderSummary(payload) {
-  const narrow = Array.isArray(payload && payload.narrow) ? payload.narrow : [];
-  if (narrow.length === 0) return [];
-
-  const truncated = narrow.length > TRUNCATION_THRESHOLD;
+  // Local rebind: `payload.narrow` in `--all` mode degenerates to the full
+  // shared index (every broad-scoped entry), so the field name `narrow` is
+  // misleading at this rendering layer. We rename the local variable to
+  // `entries` to avoid name confusion when reading renderSummary in isolation.
+  // The CLI protocol field name (`payload.narrow`) is unchanged — a wire-shape
+  // rename is a deferred independent task.
+  const entries = Array.isArray(payload && payload.narrow) ? payload.narrow : [];
+  if (entries.length === 0) return [];
+
+  const truncated = entries.length > TRUNCATION_THRESHOLD;
   const banner = truncated
-    ? `[fabric] Session start — ${narrow.length} broad-scoped knowledge entries available (truncated):`
-    : `[fabric] Session start — ${narrow.length} broad-scoped knowledge entries available:`;
+    ? `[fabric] Session start — ${entries.length} broad-scoped knowledge entries available (truncated):`
+    : `[fabric] Session start — ${entries.length} broad-scoped knowledge entries available:`;
 
-  const body = truncated ? renderTruncated(narrow) : renderFull(narrow);
+  const body = truncated ? renderTruncated(entries) : renderFull(entries);
 
   const lines = [banner, ...body];
   const revHash = typeof payload.revision_hash === "string" ? payload.revision_hash : null;
@@ -524,32 +476,15 @@ function main(env, stdio) {
     if (payload === null || payload === undefined) return; // silent
 
     // rc.8 underseed self-check: decide whether to surface the one-line
-    // `/fabric-import` recommendation. The decision is taken BEFORE the
-    // revision_hash gate so the banner can bypass it (an unchanged
-    // knowledge graph would otherwise hide the recommendation forever).
-    // The broad-summary BODY itself remains hash-gated below — only the
-    // banner line is unconditionally emitted when the probe says so.
+    // `/fabric-import` recommendation banner alongside the broad summary.
     const recommendImport = shouldRecommendImport(cwd);
 
-    // rc.7 T8: revision_hash gate. If the CLI payload carries a stable
-    // revision_hash and it matches the previously-emitted hash recorded in
-    // the sidecar, the knowledge graph is unchanged since last session →
-    // suppress the broad-summary body. The import-recommendation banner
-    // (when applicable) is still emitted below regardless of this gate.
-    const currentHash =
-      typeof payload.revision_hash === "string" ? payload.revision_hash : "";
-    let bodySuppressed = false;
-    if (currentHash.length > 0) {
-      const lastHash = readSessionStartLastHash(cwd);
-      if (lastHash !== null && lastHash === currentHash) {
-        bodySuppressed = true;
-      }
-    }
-
-    // Build emitted lines. When the body is hash-suppressed we skip the
-    // broad summary entirely; only the import banner (if applicable) goes
-    // to stderr in that case.
-    const lines = bodySuppressed ? [] : renderSummary(payload);
+    // rc.12: broad-summary body is unconditionally rendered on every
+    // SessionStart fire (Skill-style progressive disclosure). The prior
+    // revision_hash cooldown gate (rc.7 T8 — rc.11) was removed because
+    // compact/clear-triggered SessionStart re-fires must re-inject the menu
+    // for the agent's working memory.
+    const lines = renderSummary(payload);
 
     if (recommendImport) {
       lines.push(IMPORT_RECOMMENDATION_BANNER);
@@ -560,16 +495,6 @@ function main(env, stdio) {
     for (const line of lines) {
       err.write(`${line}\n`);
     }
-
-    // Update sidecar AFTER successful emit. We only persist the hash when
-    // the broad-summary body actually went out (i.e. the gate let the body
-    // through). If the body was suppressed but the banner emitted on its
-    // own, we deliberately do NOT bump the sidecar — the next session
-    // should still get to compare against the prior canonical-graph hash
-    // and re-emit the body when the graph actually changes.
-    if (!bodySuppressed && currentHash.length > 0) {
-      writeSessionStartLastHash(cwd, currentHash);
-    }
   } catch {
     // Silent — never block session start on hook failure.
   }
@@ -583,9 +508,6 @@ module.exports = {
   renderTruncated,
   renderSummary,
   truncateSummary,
-  // rc.7 T8: revision_hash gating sidecar helpers (exported for unit testing).
-  readSessionStartLastHash,
-  writeSessionStartLastHash,
   // rc.8 underseed self-check helpers (exported for unit testing).
   countCanonicalNodes,
   readUnderseedThreshold,
@@ -599,7 +521,6 @@ module.exports = {
     MATURITY_PROVEN,
     MATURITY_VERIFIED,
     MATURITY_DRAFT,
-    SESSIONSTART_HASH_CACHE_FILE,
     DEFAULT_UNDERSEED_NODE_THRESHOLD,
     KNOWLEDGE_CANONICAL_TYPES,
     IMPORT_RECOMMENDATION_BANNER,

package/templates/skills/fabric-archive/SKILL.md

@@ -19,7 +19,7 @@ If none of the above hold, stop the skill immediately and tell the user (UX i18n
 - zh-CN: `没有触发归档信号；如需手动归档请显式调用 fabric-archive`
 - en: `No archive signal detected; to manually archive, explicitly invoke fabric-archive`
 
-(Render per `knowledge_language` resolved in Phase 0.6 Config Load below.)
+(Render per `fabric_language` resolved in Phase 0.6 Config Load below.)
 
 This skill is `Check-not-Ask`, not a preference interview:
 
@@ -47,9 +47,10 @@ If `.fabric/fabric-config.json` is missing or unreadable, use defaults silently.
 
 ### UX i18n Policy (5-class bilingualization)
 
-The skill consults `knowledge_language` from `.fabric/fabric-config.json`
+The skill consults `fabric_language` from `.fabric/fabric-config.json`
 (固化于 init 时，via `scan.ts:detectExistingLanguage`; default `"en"` when no
-CJK signal is detected in README + docs/). All user-facing text in the
+CJK signal is detected in README + docs/; may resolve to `"match-existing"`,
+`"zh-CN"`, `"en"`, or `"zh-CN-hybrid"`). All user-facing text in the
 following 5 categories MUST be rendered in the resolved language:
 
 1. **Roll-up templates** — the `# Archive Review — N candidates` batch
@@ -73,11 +74,10 @@ following 5 categories MUST be rendered in the resolved language:
 
 Rendering rule:
 
-- `knowledge_language === "zh-CN"` → emit the zh-CN variant.
-- `knowledge_language === "en"` (or any other value) → emit the en variant.
-- The Skill MUST NOT mix languages inside a single user-facing block
-  (no "Chinglish" partial translation); each block is either fully zh-CN
-  or fully en.
+- `fabric_language === "zh-CN"` → emit the zh-CN variant; pure monolingual, no language mixing inside a single user-facing block.
+- `fabric_language === "en"` → emit the en variant; pure monolingual, no language mixing inside a single user-facing block.
+- `fabric_language === "zh-CN-hybrid"` → emit Chinese narrative prose with English technical terms preserved. Protected tokens (always EN): MCP tool names (e.g. `fab_get_knowledge_sections`), CLI command names (e.g. `fab install`), file paths, technical concepts (`Skill`, `SessionStart`, `hook`, `MCP`, `revision_hash`, `pending`, `proven`, `verified`, `draft`).
+- `fabric_language === "match-existing"` or any other value → emit the en variant; pure monolingual.
 
 Protected tokens (`fab_extract_knowledge`, `relevance_scope`,
 `relevance_paths`, `narrow`, `broad`, `source_sessions`, `proposed_reason`,
@@ -91,21 +91,21 @@ bilingualization scope is prose ONLY.
 
 When a skill (this one or any sibling skill the user is composing with)
 issues an `AskUserQuestion`, the `header` and `question` strings are
-user-facing prose → translated per `knowledge_language`. The `options[]`
+user-facing prose → translated per `fabric_language`. The `options[]`
 array entries (e.g. `["approve", "reject", "modify", "defer", "skip"]` in
 fabric-review, or `["team", "personal"]` for a layer-flip target) are
 **routing keys** consumed by the skill state machine — they MUST remain
-English regardless of `knowledge_language`.
+English regardless of `fabric_language`.
 
 ```ts
-// EN (knowledge_language === "en")
+// EN (fabric_language === "en")
 AskUserQuestion({
   header: "Layer-flip target",
   question: "Move '{title}' to which layer? (current: {current_layer})",
   options: ["team", "personal"]
 })
 
-// zh-CN (knowledge_language === "zh-CN")
+// zh-CN (fabric_language === "zh-CN")
 AskUserQuestion({
   header: "Layer 切换目标",
   question: "将 '{title}' 切换到哪一层？(当前: {current_layer})",
@@ -214,7 +214,7 @@ ELSE:
 
 #### On gate FAIL
 
-Stop the skill with the gate-FAIL message (UX i18n Policy class 2 — errors/preconditions; render per `knowledge_language`):
+Stop the skill with the gate-FAIL message (UX i18n Policy class 2 — errors/preconditions; render per `fabric_language`):
 
 zh-CN variant:
 
@@ -317,7 +317,7 @@ Recent session contains an observation worth keeping?
 
 Present all candidates in a single screen. UX i18n Policy classes 1 + 3 — the roll-up structure AND the per-candidate `Confirm?` prompt are bilingualized; protected tokens (`relevance_scope`, `relevance_paths`, `narrow`, `broad`, `layer`, `team`, `personal`, `pending_path`, etc.) appear verbatim in BOTH variants. Field VALUES (slugs, file paths, type/layer enum strings like `decision` / `team`) are data and are NOT translated.
 
-en variant (`knowledge_language === "en"`):
+en variant (`fabric_language === "en"`):
 
 ```md
 # Archive Review — N candidates
@@ -337,7 +337,7 @@ relevance_paths: []
 Confirm? ...
 ```
 
-zh-CN variant (`knowledge_language === "zh-CN"`):
+zh-CN variant (`fabric_language === "zh-CN"`):
 
 ```md
 # 归档 Review — N 条候选

package/templates/skills/fabric-import/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fabric-import
-description: Use this skill for cold-start enrichment of `.fabric/knowledge/` from existing project artifacts — mines `git log` and `docs/*.md` for candidate observations, proposes pending entries via `fab_extract_knowledge`, then deduplicates against canonical entries via `fab_review action: search` (rejecting obvious duplicates, modifying-to-merge marginal duplicates). Triggered by user prompts like "import knowledge from git history" / "bootstrap fabric for this repo" or by an explicit fabric-import skill mention. Default layer: team (project artifacts are team-shared). The 3-phase pipeline is resumable via `.fabric/.import-state.json`.
+description: Use this skill for cold-start enrichment of `.fabric/knowledge/` from existing project artifacts — mines `git log` and `docs/*.md` for candidate observations, proposes pending entries via `fab_extract_knowledge`, then deduplicates against canonical entries via `fab_review action=search` (rejecting obvious duplicates, modifying-to-merge marginal duplicates). Triggered by user prompts like "import knowledge from git history" / "bootstrap fabric for this repo" or by an explicit fabric-import skill mention. Default layer is `team` (project artifacts are team-shared). The 3-phase pipeline is resumable via `.fabric/.import-state.json`.
 allowed-tools: Read, Glob, Grep, Bash, mcp__fabric__fab_extract_knowledge, mcp__fabric__fab_review
 ---
 
@@ -8,7 +8,7 @@ allowed-tools: Read, Glob, Grep, Bash, mcp__fabric__fab_extract_knowledge, mcp__
 
 ## Purpose
 
-`fabric-import` is a one-time (per project) cold-start skill that lifts existing project artifacts — git commit history and Markdown documentation — into the knowledge layer as pending entries. It is the bridge between a brand-new Fabric installation (which only has the 4–7 baseline entries produced by `fabric init`'s deterministic scan) and a useful corpus that reflects accumulated team thinking. Run it once when adopting Fabric on an existing repo, or after a major refactor that invalidates large chunks of canonical knowledge. Default layer is `team`: project artifacts in git/docs are team-shared by definition; the user can later layer-flip individual entries to `personal` via `fabric-review` modify.
+`fabric-import` is a one-time (per project) cold-start skill that lifts existing project artifacts — git commit history and Markdown documentation — into the knowledge layer as pending entries. It is the bridge between a brand-new Fabric installation (which only has the 4–7 baseline entries produced by `fabric install`'s deterministic scan) and a useful corpus that reflects accumulated team thinking. Run it once when adopting Fabric on an existing repo, or after a major refactor that invalidates large chunks of canonical knowledge. Default layer is `team`: project artifacts in git/docs are team-shared by definition; the user can later layer-flip individual entries to `personal` via `fabric-review` modify.
 
 ## Precondition
 
@@ -23,13 +23,13 @@ If none of the above hold, stop the skill immediately and tell the user:
 - zh-CN: `没有触发 import 信号；如需手动 import 请显式调用 fabric-import`
 - en: `No import signal detected; to manually import, explicitly invoke fabric-import`
 
-(Render per `knowledge_language` resolved in Phase 0.5 Config Load below — class 2 of the UX i18n Policy.)
+(Render per `fabric_language` resolved in Phase 0.5 Config Load below — class 2 of the UX i18n Policy.)
 
 > **Recommendation source (rc.8+)**: 过去版本的 `.fabric/.import-requested` sentinel 机制已下线；推荐由 SessionStart hook 的 underseed 自检触发（`templates/hooks/knowledge-hint-broad.cjs` 的 `shouldRecommendImport()`：`agents.meta.json` 存在 + canonical 节点数 < `underseed_node_threshold` + `.import-state.json` 缺失三条件齐备时一次性提示）。本 skill 不再读写 sentinel 文件，也不需要在 Phase 3 完成时手动清理它。
 
 This skill SHOULD be skipped (warn the user, do not proceed) when:
 
-- `.fabric/` does not exist — direct the user to run `fabric init` first; `fabric-import` is NOT a substitute for the deterministic init-scan
+- `.fabric/` does not exist — direct the user to run `fabric install` first; `fabric-import` is NOT a substitute for the deterministic install-scan
 - `.fabric/knowledge/` already holds **>`import_skip_canonical_threshold` canonical entries (config-resolved, default 50)** across all types — the project is mature; use `fabric-archive` (per-session capture) and `fabric-review` (lifecycle review) instead; bulk import would just create dup churn
 - `.fabric/.import-state.json` exists with `phase: "complete"` and `last_checkpoint_at` is **<24h ago** — the user just ran import; surface the prior result rather than re-running
 
@@ -114,15 +114,16 @@ and `final_summary.proposed == 0`) → first-run window; otherwise re-run window
 
 ### UX i18n Policy (5-class bilingualization)
 
-The skill consults `knowledge_language` from `.fabric/fabric-config.json`
-(固化于 init 时，via `scan.ts:detectExistingLanguage`; default `"en"` when no
-CJK signal is detected in README + docs/). All user-facing text in the
+The skill consults `fabric_language` from `.fabric/fabric-config.json`
+(固化于 install 时，via `scan.ts:detectExistingLanguage`; default `"en"` when no
+CJK signal is detected in README + docs/; may resolve to `"match-existing"`,
+`"zh-CN"`, `"en"`, or `"zh-CN-hybrid"`). All user-facing text in the
 following 5 categories MUST be rendered in the resolved language:
 
 1. **Roll-up templates** — final summary blocks (`# Import Summary — phase=...`,
    `## Phase 2 — Mining`, `## Phase 3 — Dedup`, etc.). zh-CN ↔ en mirror.
 2. **Errors / Preconditions warnings** — abort + gate-fail messages (e.g.
-   "请先运行 fabric init 完成基线扫描…" / "Please run fabric init first…").
+   "请先运行 fabric install 完成基线扫描…" / "Please run fabric install first…").
    zh-CN ↔ en mirror.
 3. **Confirmation prompts** — re-run-within-24h prompt, reset prompts, etc.
    zh-CN ↔ en mirror.
@@ -136,11 +137,10 @@ following 5 categories MUST be rendered in the resolved language:
 
 Rendering rule:
 
-- `knowledge_language === "zh-CN"` → emit the zh-CN variant.
-- `knowledge_language === "en"` (or any other value) → emit the en variant.
-- The Skill MUST NOT mix languages inside a single user-facing block
-  (no "Chinglish" partial translation); each block is either fully zh-CN
-  or fully en.
+- `fabric_language === "zh-CN"` → emit the zh-CN variant; pure monolingual, no language mixing inside a single user-facing block.
+- `fabric_language === "en"` → emit the en variant; pure monolingual, no language mixing inside a single user-facing block.
+- `fabric_language === "zh-CN-hybrid"` → emit Chinese narrative prose with English technical terms preserved. Protected tokens (always EN): MCP tool names (e.g. `fab_get_knowledge_sections`), CLI command names (e.g. `fab install`), file paths, technical concepts (`Skill`, `SessionStart`, `hook`, `MCP`, `revision_hash`, `pending`, `proven`, `verified`, `draft`).
+- `fabric_language === "match-existing"` or any other value → emit the en variant; pure monolingual.
 
 Protected tokens (`fab_extract_knowledge`, `fab_review`, `relevance_scope`,
 `relevance_paths`, `broad`, `narrow`, `source_sessions`, `proposed_reason`,
@@ -153,20 +153,20 @@ The bilingualization scope is prose ONLY.
 
 When a skill (this one or any sibling skill the user is composing with)
 issues an `AskUserQuestion`, the `header` and `question` strings are
-user-facing prose → translated per `knowledge_language`. The `options[]`
+user-facing prose → translated per `fabric_language`. The `options[]`
 array entries (e.g. `["approve", "reject", "modify", "defer", "skip"]` in
 fabric-review) are **routing keys** consumed by the skill state machine —
-they MUST remain English regardless of `knowledge_language`.
+they MUST remain English regardless of `fabric_language`.
 
 ```ts
-// EN (knowledge_language === "en")
+// EN (fabric_language === "en")
 AskUserQuestion({
   header: "Review pending entry",
   question: "What action for '{title}'?",
   options: ["approve", "reject", "modify", "defer", "skip"]
 })
 
-// zh-CN (knowledge_language === "zh-CN")
+// zh-CN (fabric_language === "zh-CN")
 AskUserQuestion({
   header: "审核 pending 条目",
   question: "对 '{title}' 执行什么操作？",
@@ -186,7 +186,7 @@ The pipeline runs strictly in order. Each phase reads the prior phase's outputs
 
 ### Phase 1 — Init-Scan Reference (NO RE-IMPLEMENTATION)
 
-> Verbatim boundary: `fabric init` (rc.1, deterministic CLI) already produces the baseline scan. Phase 1 of this skill **REFERENCES** that output. It does NOT redo the scan.
+> Verbatim boundary: `fabric install` (v2.0+, deterministic CLI) already produces the baseline scan. Phase 1 of this skill **REFERENCES** that output. It does NOT redo the scan.
 
 The deterministic init-scan has already populated `.fabric/knowledge/team/` with 4–7 baseline entries derived from:
 
@@ -203,8 +203,8 @@ Phase 1 actions performed by THIS skill:
 2. Glob `.fabric/knowledge/team/**/*.md` to enumerate baseline entry titles. Capture the list — Phase 2 uses these titles as a **negative filter** (signals already covered by init-scan should be skipped, not re-proposed).
 3. If `.fabric/agents.meta.json` is missing OR `.fabric/knowledge/team/` is empty: STOP. Tell the user (UX i18n Policy class 2 — errors/preconditions):
 
-   - zh-CN: `请先运行 fabric init 完成基线扫描，再调用 fabric-import`
-   - en: `Please run fabric init first to complete the baseline scan, then invoke fabric-import`
+   - zh-CN: `请先运行 fabric install 完成基线扫描，再调用 fabric-import`
+   - en: `Please run fabric install first to complete the baseline scan, then invoke fabric-import`
 
    …and exit.
 4. Update `.fabric/.import-state.json`: `phase = "P1-done"`, `p1_baseline_titles = [<list>]`, `last_checkpoint_at = <ISO8601 now>`.
@@ -288,7 +288,7 @@ For each commit:
    - `refactor(...)` with body → likely **decision** (architectural choice was made)
    - `docs(...)` → usually a **guideline** if the body announces a convention; skip if it's just typo/reformat
    - `chore(...)`, `test(...)`, `ci(...)` → almost always skip (mechanical; no reusable insight)
-2. Read the commit body. Extract the LLM-judged "core observation" — what would a future engineer want to know about this commit beyond the diff? Aim for 1–2 sentences in zh-CN (project knowledge_language; mirror fabric-archive M3 style).
+2. Read the commit body. Extract the LLM-judged "core observation" — what would a future engineer want to know about this commit beyond the diff? Aim for 1–2 sentences in zh-CN (project fabric_language; mirror fabric-archive M3 style).
 3. Apply the **Skip Decision Tree** below. If the commit is skip-worthy, record it in `p2_processed_commits[]` with `skipped: true` and move on.
 4. For non-skipped commits, classify type / propose slug / draft summary. Then call `fab_extract_knowledge` with the **mandatory broad + [] scope** (see "Mandatory Scope Rule" above):
 
@@ -394,7 +394,7 @@ After Step 2.2 completes (or hits the cap), update `.fabric/.import-state.json`:
 
 When the user invocation includes `dry-run` / `预览` / `--dry-run` keywords, Phase 2 runs WITHOUT calling `fab_extract_knowledge`. Instead it prints a table. UX i18n Policy class 4 — dry-run table headers; the header + column titles are bilingualized; row content (slug / commit sha / doc path) is data and is NOT translated. The protected tokens `broad`, `relevance_scope`, `relevance_paths` appear verbatim in both variants:
 
-zh-CN variant (`knowledge_language === "zh-CN"`):
+zh-CN variant (`fabric_language === "zh-CN"`):
 
 ```md
 # Import 预览 — 将提议 N 条 pending 条目（全部 relevance_scope=broad, relevance_paths=[]）
@@ -406,7 +406,7 @@ zh-CN variant (`knowledge_language === "zh-CN"`):
 | 3 | git 50367b5           | pitfalls  | thundering-herd-no-backoff    | broad+[] | 重试无指数回退导致雪崩；必须 jittered exponential backoff。|
 ```
 
-en variant (`knowledge_language === "en"`):
+en variant (`fabric_language === "en"`):
 
 ```md
 # Import Dry Run — would propose N pending entries (all relevance_scope=broad, relevance_paths=[])
@@ -648,9 +648,9 @@ The contract: re-invoking fabric-import after ANY interruption (Ctrl-C, crash, n
 
 ## Output Contract
 
-After Phase 3 completes (or on any phase exit due to cap / error / interrupt), the skill MUST produce a roll-up. UX i18n Policy class 1 — render either the en variant or the zh-CN variant per `knowledge_language`; the protected tokens (`relevance_scope`, `relevance_paths`, `broad`, `pending_path`, `layer`, `team`, `personal`, `fab_review`, `.fabric/.import-state.json`, etc.) appear verbatim in BOTH variants.
+After Phase 3 completes (or on any phase exit due to cap / error / interrupt), the skill MUST produce a roll-up. UX i18n Policy class 1 — render either the en variant or the zh-CN variant per `fabric_language`; the protected tokens (`relevance_scope`, `relevance_paths`, `broad`, `pending_path`, `layer`, `team`, `personal`, `fab_review`, `.fabric/.import-state.json`, etc.) appear verbatim in BOTH variants.
 
-en variant (`knowledge_language === "en"`):
+en variant (`fabric_language === "en"`):
 
 ```md
 # Import Summary — phase=<P1-done | P2-done | complete>
@@ -678,7 +678,7 @@ en variant (`knowledge_language === "en"`):
 - If any kept entry is actually narrow-scoped, narrow it via `fab_review action="modify"` with `changes.relevance_scope="narrow"` + `changes.relevance_paths=[...]` (this skill cannot narrow — see Mandatory Scope Rule in Phase 2).
 ```
 
-zh-CN variant (`knowledge_language === "zh-CN"`):
+zh-CN variant (`fabric_language === "zh-CN"`):
 
 ```md
 # Import 汇总 — phase=<P1-done | P2-done | complete>