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

package/dist/{chunk-PWLW3B57.js → chunk-2CY4BMTH.js}

@@ -8,11 +8,15 @@ import {
 } from "@fenglimg/fabric-shared";
 var locale = detectNodeLocale();
 var t = createTranslator(locale);
-function getDoctorTranslator(projectRoot) {
+function getProjectTranslator(projectRoot = process.cwd()) {
   return createTranslator(resolveFabricLocale(projectRoot));
 }
+function getDoctorTranslator(projectRoot) {
+  return getProjectTranslator(projectRoot);
+}
 
 export {
   t,
+  getProjectTranslator,
   getDoctorTranslator
 };

package/dist/{chunk-F46ORPOA.js → chunk-2R55HNVD.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   deepMerge
-} from "./chunk-MF3OTILQ.js";
+} from "./chunk-XC5RUHLK.js";
 
 // src/install/write-bootstrap-snapshot.ts
 import { existsSync, readFileSync } from "fs";
@@ -55,6 +55,9 @@ 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";
@@ -81,6 +84,23 @@ 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 DEPRECATED_SKILL_DIRS = [
@@ -128,7 +148,11 @@ var HOOK_CONFIG_TARGETS = {
   cursor: ".cursor/hooks.json"
 };
 var HOOK_CONFIG_ARRAY_PATHS = {
-  claudeCode: ["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.
+  claudeCode: ["hooks.Stop", "hooks.SessionStart", "hooks.PreToolUse", "hooks.UserPromptSubmit"],
   codex: ["events.Stop", "events.SessionStart", "events.PreToolUse"],
   cursor: ["hooks.stop", "hooks.sessionStart", "hooks.preToolUse"]
 };
@@ -136,17 +160,22 @@ 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"
   },
   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"'
+    knowledgeHintNarrow: '"$(git rev-parse --show-toplevel)/.codex/hooks/knowledge-hint-narrow.cjs"',
+    citePolicyEvict: '"$(git rev-parse --show-toplevel)/.codex/hooks/cite-policy-evict.cjs"'
   },
   cursor: {
     fabricHint: ".cursor/hooks/fabric-hint.cjs",
     knowledgeHintBroad: ".cursor/hooks/knowledge-hint-broad.cjs",
-    knowledgeHintNarrow: ".cursor/hooks/knowledge-hint-narrow.cjs"
+    knowledgeHintNarrow: ".cursor/hooks/knowledge-hint-narrow.cjs",
+    citePolicyEvict: ".cursor/hooks/cite-policy-evict.cjs"
   }
 };
 function readFabricLanguagePreference(projectRoot) {
@@ -257,6 +286,51 @@ async function installFabricSyncSkill(projectRoot, _options = {}) {
   }
   return results;
 }
+async function installFabricStoreSkill(projectRoot, _options = {}) {
+  const source = await readTemplate(SKILL_STORE_TEMPLATE_REL);
+  validateSkillCanonicalSize(source, "fabric-store");
+  const targets = SKILL_DESTINATIONS.fabricStore.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const staleMsg = inspectStaleInstall(target, source);
+    const result = await copyTextIdempotent("skill-store", source, target);
+    if (staleMsg && result.status === "written") {
+      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
+    }
+    results.push(result);
+  }
+  return results;
+}
+async function installFabricAuditSkill(projectRoot, _options = {}) {
+  const source = await readTemplate(SKILL_AUDIT_TEMPLATE_REL);
+  validateSkillCanonicalSize(source, "fabric-audit");
+  const targets = SKILL_DESTINATIONS.fabricAudit.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const staleMsg = inspectStaleInstall(target, source);
+    const result = await copyTextIdempotent("skill-audit", source, target);
+    if (staleMsg && result.status === "written") {
+      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
+    }
+    results.push(result);
+  }
+  return results;
+}
+async function installFabricConnectSkill(projectRoot, _options = {}) {
+  const source = await readTemplate(SKILL_CONNECT_TEMPLATE_REL);
+  validateSkillCanonicalSize(source, "fabric-connect");
+  const targets = SKILL_DESTINATIONS.fabricConnect.map((rel) => join2(projectRoot, rel));
+  const results = [];
+  for (const target of targets) {
+    const staleMsg = inspectStaleInstall(target, source);
+    const result = await copyTextIdempotent("skill-connect", 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) {
@@ -887,6 +961,9 @@ export {
   installFabricReviewSkill,
   installFabricImportSkill,
   installFabricSyncSkill,
+  installFabricStoreSkill,
+  installFabricAuditSkill,
+  installFabricConnectSkill,
   cleanupDeprecatedSkills,
   installSharedSkillLib,
   installArchiveHintHook,

package/dist/{chunk-HFQVXY6P.js → chunk-4R2CYEA4.js}

@@ -10,11 +10,16 @@ import {
 } from "./chunk-RYAFBNES.js";
 
 // src/store/store-ops.ts
+import { randomUUID } from "crypto";
+import { existsSync } from "fs";
+import { join } from "path";
 import {
   addMountedStore,
   bindRequiredStore,
   detachMountedStore,
-  explainStore
+  explainStore,
+  initStore,
+  storeRelativePath
 } from "@fenglimg/fabric-shared";
 var NO_GLOBAL_CONFIG = "no global Fabric config found \u2014 run `fabric install --global <url>` first";
 function requireConfig(globalRoot) {
@@ -32,6 +37,29 @@ function storeAdd(store, globalRoot = resolveGlobalRoot()) {
   saveGlobalConfig(next, globalRoot);
   return next;
 }
+function storeCreate(alias, now, options = {}) {
+  const globalRoot = options.globalRoot ?? resolveGlobalRoot();
+  const config = requireConfig(globalRoot);
+  const uuid = options.uuid ?? randomUUID();
+  const storeDir = join(globalRoot, storeRelativePath(uuid));
+  initStore(
+    storeDir,
+    { store_uuid: uuid, created_at: now, canonical_alias: alias },
+    { git: options.git }
+  );
+  const mounted = options.remote === void 0 ? { store_uuid: uuid, alias } : { store_uuid: uuid, alias, remote: options.remote };
+  const next = addMountedStore(config, mounted);
+  saveGlobalConfig(next, globalRoot);
+  return { config: next, store_uuid: uuid, storeDir };
+}
+function assertStoreMountable(uuid, globalRoot = resolveGlobalRoot()) {
+  const storeDir = join(globalRoot, storeRelativePath(uuid));
+  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.`
+    );
+  }
+}
 function storeRemove(alias, globalRoot = resolveGlobalRoot()) {
   const result = detachMountedStore(requireConfig(globalRoot), alias);
   saveGlobalConfig(result.config, globalRoot);
@@ -78,6 +106,8 @@ function missingRequiredStores(projectRoot, globalRoot = resolveGlobalRoot()) {
 export {
   storeList,
   storeAdd,
+  storeCreate,
+  assertStoreMountable,
   storeRemove,
   storeExplain,
   storeBind,

package/dist/{chunk-BATF4PEJ.js → chunk-AOE6AYI7.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   resolveClients
-} from "./chunk-MF3OTILQ.js";
+} from "./chunk-XC5RUHLK.js";
 import {
   t
-} from "./chunk-PWLW3B57.js";
+} from "./chunk-2CY4BMTH.js";
 
 // src/commands/config.ts
 import { existsSync, statSync } from "fs";

package/dist/{chunk-WWNXR34K.js → chunk-BO4XIZWZ.js}

@@ -4,7 +4,14 @@
 import pc from "picocolors";
 import stringWidth from "string-width";
 function isColorEnabled() {
-  return !process.env.NO_COLOR && Boolean(process.stdout.isTTY) && Boolean(process.stderr.isTTY);
+  if (process.env.NO_COLOR) {
+    return false;
+  }
+  const force = process.env.FORCE_COLOR;
+  if (force !== void 0) {
+    return force !== "0" && force.toLowerCase() !== "false";
+  }
+  return Boolean(process.stdout.isTTY) && Boolean(process.stderr.isTTY);
 }
 function colorize(painter) {
   return (value) => isColorEnabled() ? painter(value) : value;

package/dist/{chunk-MF3OTILQ.js → chunk-XC5RUHLK.js}

@@ -307,7 +307,7 @@ function serializeTomlInlineTable(values) {
   const entries = Object.entries(values).sort(([left], [right]) => left.localeCompare(right)).map(([key, value]) => `${key} = ${escapeTomlString(value)}`);
   return `{ ${entries.join(", ")} }`;
 }
-function serializeCodexServerBlock(serverName, serverEntry) {
+function serializeCodexServerBlock(serverName, serverEntry, preservedUserLines = []) {
   const lines = [
     `[mcp_servers.${serverName}]`,
     `command = ${escapeTomlString(serverEntry.command)}`,
@@ -316,9 +316,26 @@ function serializeCodexServerBlock(serverName, serverEntry) {
   if (serverEntry.env !== void 0 && Object.keys(serverEntry.env).length > 0) {
     lines.push(`env = ${serializeTomlInlineTable(serverEntry.env)}`);
   }
+  lines.push(...preservedUserLines);
   return `${lines.join("\n")}
 `;
 }
+var CODEX_MANAGED_BLOCK_KEYS = /* @__PURE__ */ new Set(["command", "args", "env"]);
+function extractCodexBlockUserLines(blockText) {
+  const out = [];
+  const lines = blockText.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed.length === 0) continue;
+    if (/^\[/.test(trimmed)) continue;
+    const keyMatch = /^([A-Za-z0-9_-]+)\s*=/.exec(trimmed);
+    if (keyMatch !== null && CODEX_MANAGED_BLOCK_KEYS.has(keyMatch[1])) {
+      continue;
+    }
+    out.push(trimmed);
+  }
+  return out;
+}
 function trimTrailingBlankLines(value) {
   return value.replace(/\s+$/u, "");
 }
@@ -341,13 +358,16 @@ function removeCodexServerBlock(rawConfig, serverName) {
   return { text, changed };
 }
 function upsertCodexServerBlock(rawConfig, serverName, serverEntry) {
-  const block = serializeCodexServerBlock(serverName, serverEntry);
   const normalized = rawConfig.replace(/\r\n/g, "\n");
-  const legacyPattern = new RegExp(String.raw`\n?\[mcp\.servers\.${serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\]\n[\s\S]*?(?=\n\[[^\n]+\]\n|$)`, "g");
+  const escaped = serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const legacyPattern = new RegExp(String.raw`\n?\[mcp\.servers\.${escaped}\]\n[\s\S]*?(?=\n\[[^\n]+\]\n|$)`, "g");
   const currentPattern = new RegExp(
-    String.raw`\n?\[mcp_servers\.${serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\]\n[\s\S]*?(?=\n\[[^\n]+\]\n|$)`,
+    String.raw`\n?\[mcp_servers\.${escaped}\]\n[\s\S]*?(?=\n\[[^\n]+\]\n|$)`,
     "g"
   );
+  const existingMatch = normalized.match(currentPattern);
+  const preservedUserLines = existingMatch !== null && existingMatch.length > 0 ? extractCodexBlockUserLines(existingMatch[0]) : [];
+  const block = serializeCodexServerBlock(serverName, serverEntry, preservedUserLines);
   const withoutLegacy = normalized.replace(legacyPattern, "");
   const withoutExisting = withoutLegacy.replace(currentPattern, "");
   const trimmed = trimTrailingBlankLines(withoutExisting);
@@ -528,10 +548,11 @@ function detectClientSupports(workspaceRoot, fabricConfig = {}) {
       },
       installedCapabilities: {
         hook: existsSync4(join4(workspaceRoot, ".codex", "hooks.json")),
-        // v2/rc.2: v1 client-side init skill removed; skill-installation probes
-        // will return once rc.2/3/4 introduce the v2 skills (fabric-archive,
-        // fabric-review, fabric-import). Until then there is nothing to probe.
-        skill: false
+        // F6: the v2 skills (fabric-archive/review/import/…) DO install to
+        // `.codex/skills/` now, so probe that directory instead of the stale
+        // hardcoded `false` (which made `fabric install` always re-report Codex
+        // skills as uninstalled even right after installing them).
+        skill: existsSync4(join4(workspaceRoot, ".codex", "skills"))
       }
     }
   ];

package/dist/{config-XJIPZNUP.js → config-XYRBZJDU.js}

@@ -3,9 +3,9 @@ import {
   configCmd,
   config_default,
   installMcpClients
-} from "./chunk-BATF4PEJ.js";
-import "./chunk-MF3OTILQ.js";
-import "./chunk-PWLW3B57.js";
+} from "./chunk-AOE6AYI7.js";
+import "./chunk-XC5RUHLK.js";
+import "./chunk-2CY4BMTH.js";
 export {
   configCmd,
   config_default as default,

package/dist/{doctor-QVNPHLJK.js → doctor-YONYXDX6.js}

@@ -2,17 +2,17 @@
 import {
   paint,
   symbol
-} from "./chunk-WWNXR34K.js";
+} from "./chunk-BO4XIZWZ.js";
 import {
   resolveDevMode
 } from "./chunk-COI5VDFU.js";
+import {
+  missingRequiredStores
+} from "./chunk-4R2CYEA4.js";
 import {
   getDoctorTranslator,
   t
-} from "./chunk-PWLW3B57.js";
-import {
-  missingRequiredStores
-} from "./chunk-HFQVXY6P.js";
+} from "./chunk-2CY4BMTH.js";
 import {
   loadProjectConfig
 } from "./chunk-LFIKMVY7.js";
@@ -373,23 +373,30 @@ var doctorCommand = defineCommand({
     if (fixKnowledge) {
       const preReport = await runDoctorReport(resolution.target);
       const plan = computeFixKnowledgePlan(preReport);
-      const yesFlag = args.yes === true;
-      const envBypass = process.env.FABRIC_NONINTERACTIVE === "1";
-      if (plan.totalCount === 0) {
+      if (args["dry-run"] === true) {
+        if (plan.totalCount > 0) {
+          renderFixKnowledgePlan(plan);
+        }
+        report = preReport;
       } else {
-        renderFixKnowledgePlan(plan);
-        const decision = await resolveFixKnowledgeConsent({
-          yesFlag,
-          envBypass,
-          plan
-        });
-        if (decision === "abort") {
-          process.exitCode = 1;
-          return;
+        const yesFlag = args.yes === true;
+        const envBypass = process.env.FABRIC_NONINTERACTIVE === "1";
+        if (plan.totalCount === 0) {
+        } else {
+          renderFixKnowledgePlan(plan);
+          const decision = await resolveFixKnowledgeConsent({
+            yesFlag,
+            envBypass,
+            plan
+          });
+          if (decision === "abort") {
+            process.exitCode = 1;
+            return;
+          }
         }
+        fixKnowledgeReport = await runDoctorFixKnowledge(resolution.target);
+        report = fixKnowledgeReport.report;
       }
-      fixKnowledgeReport = await runDoctorFixKnowledge(resolution.target);
-      report = fixKnowledgeReport.report;
     } else if (fix) {
       if (args["dry-run"] === true) {
         report = await runDoctorReport(resolution.target);
@@ -418,7 +425,7 @@ var doctorCommand = defineCommand({
         renderFixKnowledgeMutations(fixKnowledgeReport, dt);
       } else if (fixReport !== null) {
         writeStdout(fixReport.message);
-      } else if (fix && args["dry-run"] === true) {
+      } else if ((fix || fixKnowledge) && args["dry-run"] === true) {
         writeStdout(dt("cli.doctor.fix-dry-run-banner"));
       }
       renderHumanReport(report, dt, args.verbose === true);
@@ -447,7 +454,7 @@ var doctorCommand = defineCommand({
 var doctor_default = doctorCommand;
 function renderHumanReport(report, dt, verbose) {
   writeStdout(`${renderStatus(report.status)} ${paint.ai("fabric doctor")} ${paint.human(report.summary.target)}`);
-  renderTldrHeader(report);
+  renderTldrHeader(report, dt, verbose);
   for (const check of report.checks) {
     writeStdout(`${renderStatus(check.status)} ${check.name}: ${check.message}`);
   }
@@ -520,16 +527,16 @@ function writeIssueSection(title, issues, options) {
     }
   }
 }
-function renderTldrHeader(report) {
+function renderTldrHeader(report, dt, verbose) {
   const ranked = [];
   for (const issue of report.fixable_errors) {
-    ranked.push({ severity: "fixable", code: issue.code, message: issue.message });
+    ranked.push({ severity: "fixable", code: issue.code, message: issue.message, actionHint: issue.actionHint, audience: issue.audience });
   }
   for (const issue of report.manual_errors) {
-    ranked.push({ severity: "manual", code: issue.code, message: issue.message });
+    ranked.push({ severity: "manual", code: issue.code, message: issue.message, actionHint: issue.actionHint, audience: issue.audience });
   }
   for (const issue of report.warnings) {
-    ranked.push({ severity: "warn", code: issue.code, message: issue.message });
+    ranked.push({ severity: "warn", code: issue.code, message: issue.message, actionHint: issue.actionHint, audience: issue.audience });
   }
   if (ranked.length === 0) {
     writeStdout(`${symbol.ok} TL;DR: all 48 checks green \u2014 nothing to fix.`);
@@ -543,6 +550,11 @@ function renderTldrHeader(report) {
     const marker = item.severity === "fixable" ? symbol.error : item.severity === "manual" ? symbol.error : symbol.warn;
     const truncated = item.message.length > 140 ? `${item.message.slice(0, 137)}...` : item.message;
     writeStdout(`  ${marker} ${item.code}: ${truncated}`);
+    if (item.actionHint !== void 0 && item.actionHint.length > 0) {
+      writeStdout(
+        item.audience === "maintainer" && !verbose ? `    \u2192 ${dt("doctor.maintainer-hint-folded")}` : `    \u2192 ${item.actionHint}`
+      );
+    }
   }
 }
 function renderStatus(status) {
@@ -916,5 +928,6 @@ function formatTimestampForTable(iso) {
 export {
   doctor_default as default,
   doctorCommand,
-  parseSinceDuration
+  parseSinceDuration,
+  renderTldrHeader
 };

package/dist/index.js

@@ -1,47 +1,87 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-PWLW3B57.js";
+} from "./chunk-2CY4BMTH.js";
 
 // src/index.ts
 import { realpathSync } from "fs";
 import { resolve } from "path";
 import { fileURLToPath } from "url";
-import { defineCommand, runMain } from "citty";
+import { defineCommand, runCommand, runMain } from "citty";
 
 // src/commands/index.ts
 var allCommands = {
-  install: () => import("./install-2HDO5FTQ.js").then((module) => module.default),
+  install: () => import("./install-74ANPCCP.js").then((module) => module.default),
   // v2.1.0-rc.1 P3: multi-store lifecycle command group (list/add/remove/explain).
-  store: () => import("./store-XTSE5TY6.js").then((module) => module.default),
+  store: () => import("./store-XB3ADT65.js").then((module) => module.default),
   // v2.1.0-rc.1 P3 (S9/S17/S37): multi-store pull --rebase + push, conflict resume.
-  sync: () => import("./sync-BJCWDPNC.js").then((module) => module.default),
+  sync: () => import("./sync-UJ4BBCZJ.js").then((module) => module.default),
   // v2.1.0-rc.1 P3 (F5): read-only identity/status info commands.
-  whoami: () => import("./whoami-B6AEMSEV.js").then((module) => module.default),
+  whoami: () => import("./whoami-2MLO4Y37.js").then((module) => module.default),
   status: () => import("./status-GLQWLWH6.js").then((module) => module.default),
-  "scope-explain": () => import("./scope-explain-2F2R5URO.js").then((module) => module.default),
-  doctor: () => import("./doctor-QVNPHLJK.js").then((module) => module.default),
-  uninstall: () => import("./uninstall-TAXSUSKH.js").then((module) => module.default),
-  config: () => import("./config-XJIPZNUP.js").then((module) => module.default),
+  "scope-explain": () => import("./scope-explain-CDIZESP5.js").then((module) => module.default),
+  doctor: () => import("./doctor-YONYXDX6.js").then((module) => module.default),
+  uninstall: () => import("./uninstall-C3QXKOO6.js").then((module) => module.default),
+  config: () => import("./config-XYRBZJDU.js").then((module) => module.default),
   "plan-context-hint": () => import("./plan-context-hint-FC6P3WFE.js").then((module) => module.default),
   // v2.0.0-rc.23 TASK-014 (F8c): S5 onboard-slot coverage. Used by the
   // fabric-archive Skill's first-run phase to detect unclaimed slots.
-  "onboard-coverage": () => import("./onboard-coverage-MFCAEBDO.js").then((module) => module.default),
+  "onboard-coverage": () => import("./onboard-coverage-JWQWDZW7.js").then((module) => module.default),
   // v2.0.0-rc.37 NEW-34: text dashboard over .fabric/metrics.jsonl.
-  metrics: () => import("./metrics-ACEQFPDU.js").then((module) => module.default)
+  metrics: () => import("./metrics-RER6NLFC.js").then((module) => module.default)
 };
 
+// src/lib/error-render.ts
+function hasActionHint(err) {
+  if (err === null || typeof err !== "object") return false;
+  const candidate = err;
+  return typeof candidate.message === "string" && candidate.message.length > 0 && typeof candidate.actionHint === "string" && candidate.actionHint.length > 0;
+}
+function renderFabricError(err, stream = process.stderr) {
+  stream.write(`${err.message}
+`);
+  stream.write(`  -> ${err.actionHint}
+`);
+}
+function renderTopLevelError(err, stream = process.stderr) {
+  if (hasActionHint(err)) {
+    renderFabricError(err, stream);
+    return "fabric-error";
+  }
+  return "other";
+}
+
 // src/index.ts
 var main = defineCommand({
   meta: {
     name: "fabric",
-    version: "2.1.0-rc.2",
+    version: "2.2.0-rc.1",
     description: t("cli.main.description")
   },
   subCommands: allCommands
 });
 async function run() {
-  await runMain(main);
+  const rawArgs = process.argv.slice(2);
+  const wantsHelp = rawArgs.some((arg) => arg === "--help" || arg === "-h");
+  const wantsVersion = rawArgs.length === 1 && (rawArgs[0] === "--version" || rawArgs[0] === "-v");
+  if (wantsHelp || wantsVersion) {
+    await runMain(main, { rawArgs });
+    return;
+  }
+  try {
+    await runCommand(main, { rawArgs });
+  } catch (err) {
+    if (renderTopLevelError(err) === "fabric-error") {
+      process.exit(1);
+    }
+    const code = err !== null && typeof err === "object" ? err.code : void 0;
+    if (typeof code === "string" && code.startsWith("E_")) {
+      await runMain(main, { rawArgs });
+      return;
+    }
+    console.error(err, "\n");
+    process.exit(1);
+  }
 }
 var entrypoint = process.argv[1];
 var currentFilePath = fileURLToPath(import.meta.url);