@fenglimg/fabric-cli 2.0.1 → 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-D25XJ4BC.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";
@@ -54,6 +54,10 @@ import {
 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";
@@ -74,6 +78,29 @@ var SKILL_DESTINATIONS = {
   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: [
+    ".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 = [
@@ -121,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"]
 };
@@ -129,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) {
@@ -235,6 +271,66 @@ async function installFabricImportSkill(projectRoot, _options = {}) {
   results.push(...await installSkillRefFiles(projectRoot, "fabric-import"));
   return results;
 }
+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));
+  const results = [];
+  for (const target of targets) {
+    const staleMsg = inspectStaleInstall(target, source);
+    const result = await copyTextIdempotent("skill-sync", source, target);
+    if (staleMsg && result.status === "written") {
+      result.message = result.message ? `${staleMsg}; ${result.message}` : staleMsg;
+    }
+    results.push(result);
+  }
+  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) {
@@ -864,6 +960,10 @@ export {
   installFabricArchiveSkill,
   installFabricReviewSkill,
   installFabricImportSkill,
+  installFabricSyncSkill,
+  installFabricStoreSkill,
+  installFabricAuditSkill,
+  installFabricConnectSkill,
   cleanupDeprecatedSkills,
   installSharedSkillLib,
   installArchiveHintHook,

package/dist/chunk-4R2CYEA4.js

@@ -0,0 +1,116 @@
+#!/usr/bin/env node
+import {
+  loadProjectConfig,
+  saveProjectConfig
+} from "./chunk-LFIKMVY7.js";
+import {
+  loadGlobalConfig,
+  resolveGlobalRoot,
+  saveGlobalConfig
+} 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,
+  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) {
+  const config = loadGlobalConfig(globalRoot);
+  if (config === null) {
+    throw new Error(NO_GLOBAL_CONFIG);
+  }
+  return config;
+}
+function storeList(globalRoot = resolveGlobalRoot()) {
+  return requireConfig(globalRoot).stores;
+}
+function storeAdd(store, globalRoot = resolveGlobalRoot()) {
+  const next = addMountedStore(requireConfig(globalRoot), store);
+  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);
+  return result;
+}
+function storeExplain(alias, globalRoot = resolveGlobalRoot()) {
+  return explainStore(requireConfig(globalRoot), alias);
+}
+var NO_PROJECT_CONFIG = "no project Fabric config \u2014 run `fabric install` in this repo first";
+function requireProjectConfig(projectRoot) {
+  const config = loadProjectConfig(projectRoot);
+  if (config === null) {
+    throw new Error(NO_PROJECT_CONFIG);
+  }
+  return config;
+}
+function storeBind(projectRoot, entry) {
+  const config = requireProjectConfig(projectRoot);
+  const next = {
+    ...config,
+    required_stores: bindRequiredStore(config.required_stores ?? [], entry)
+  };
+  saveProjectConfig(next, projectRoot);
+  return next;
+}
+function storeSwitchWrite(projectRoot, alias) {
+  const config = requireProjectConfig(projectRoot);
+  const next = { ...config, active_write_store: alias };
+  saveProjectConfig(next, projectRoot);
+  return next;
+}
+function missingRequiredStores(projectRoot, globalRoot = resolveGlobalRoot()) {
+  const project = loadProjectConfig(projectRoot);
+  if (project === null || project.required_stores === void 0) {
+    return [];
+  }
+  const global = loadGlobalConfig(globalRoot);
+  const mounted = new Set(
+    (global?.stores ?? []).flatMap((s) => [s.alias, s.store_uuid])
+  );
+  return project.required_stores.filter((r) => !mounted.has(r.id));
+}
+
+export {
+  storeList,
+  storeAdd,
+  storeCreate,
+  assertStoreMountable,
+  storeRemove,
+  storeExplain,
+  storeBind,
+  storeSwitchWrite,
+  missingRequiredStores
+};

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-L4Q55UC4.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+import {
+  loadProjectConfig
+} from "./chunk-LFIKMVY7.js";
+import {
+  loadGlobalConfig,
+  resolveGlobalRoot
+} from "./chunk-RYAFBNES.js";
+
+// src/store/scope-explain.ts
+import {
+  createStoreResolver
+} from "@fenglimg/fabric-shared";
+function buildResolveInput(projectRoot, globalRoot = resolveGlobalRoot()) {
+  const global = loadGlobalConfig(globalRoot);
+  if (global === null) {
+    return null;
+  }
+  const project = loadProjectConfig(projectRoot);
+  return {
+    uid: global.uid,
+    mountedStores: global.stores.map((s) => ({
+      store_uuid: s.store_uuid,
+      alias: s.alias,
+      ...s.remote === void 0 ? {} : { remote: s.remote },
+      writable: s.writable ?? true,
+      personal: s.personal ?? false
+    })),
+    requiredStores: (project?.required_stores ?? []).map((r) => ({
+      id: r.id,
+      ...r.suggested_remote === void 0 ? {} : { suggested_remote: r.suggested_remote }
+    })),
+    ...project?.active_write_store === void 0 ? {} : { activeWriteAlias: project.active_write_store }
+  };
+}
+function scopeExplain(projectRoot, scope, globalRoot = resolveGlobalRoot()) {
+  const input = buildResolveInput(projectRoot, globalRoot);
+  if (input === null) {
+    return null;
+  }
+  const resolver = createStoreResolver();
+  return {
+    scope,
+    readSet: resolver.resolveReadSet(input),
+    writeTarget: resolver.resolveWriteTarget(input, scope).target
+  };
+}
+
+export {
+  buildResolveInput,
+  scopeExplain
+};

package/dist/chunk-LFIKMVY7.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+// src/store/project-config-io.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { join } from "path";
+import { fabricConfigSchema } from "@fenglimg/fabric-shared";
+function projectConfigPath(projectRoot) {
+  return join(projectRoot, ".fabric", "fabric-config.json");
+}
+function loadProjectConfig(projectRoot) {
+  const path = projectConfigPath(projectRoot);
+  if (!existsSync(path)) {
+    return null;
+  }
+  return fabricConfigSchema.parse(JSON.parse(readFileSync(path, "utf8")));
+}
+function saveProjectConfig(config, projectRoot) {
+  const validated = fabricConfigSchema.parse(config);
+  mkdirSync(join(projectRoot, ".fabric"), { recursive: true });
+  writeFileSync(projectConfigPath(projectRoot), `${JSON.stringify(validated, null, 2)}
+`, "utf8");
+}
+
+export {
+  loadProjectConfig,
+  saveProjectConfig
+};

package/dist/chunk-RYAFBNES.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+// src/store/global-config-io.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+import { globalConfigSchema } from "@fenglimg/fabric-shared";
+function resolveGlobalRoot() {
+  return join(process.env.FABRIC_HOME ?? homedir(), ".fabric");
+}
+function globalConfigPath(globalRoot = resolveGlobalRoot()) {
+  return join(globalRoot, "fabric-global.json");
+}
+function loadGlobalConfig(globalRoot = resolveGlobalRoot()) {
+  const path = globalConfigPath(globalRoot);
+  if (!existsSync(path)) {
+    return null;
+  }
+  return globalConfigSchema.parse(JSON.parse(readFileSync(path, "utf8")));
+}
+function saveGlobalConfig(config, globalRoot = resolveGlobalRoot()) {
+  const validated = globalConfigSchema.parse(config);
+  mkdirSync(globalRoot, { recursive: true });
+  writeFileSync(globalConfigPath(globalRoot), `${JSON.stringify(validated, null, 2)}
+`, "utf8");
+}
+
+export {
+  resolveGlobalRoot,
+  globalConfigPath,
+  loadGlobalConfig,
+  saveGlobalConfig
+};

package/dist/chunk-T5RPGCCM.js

@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+import {
+  loadProjectConfig
+} from "./chunk-LFIKMVY7.js";
+import {
+  loadGlobalConfig,
+  resolveGlobalRoot
+} from "./chunk-RYAFBNES.js";
+
+// src/store/info-ops.ts
+function whoami(globalRoot = resolveGlobalRoot()) {
+  const config = loadGlobalConfig(globalRoot);
+  if (config === null) {
+    return null;
+  }
+  return {
+    uid: config.uid,
+    stores: config.stores.map((s) => ({
+      alias: s.alias,
+      store_uuid: s.store_uuid,
+      local_only: s.remote === void 0
+    }))
+  };
+}
+function projectStatus(projectRoot, globalRoot = resolveGlobalRoot()) {
+  const global = loadGlobalConfig(globalRoot);
+  const project = loadProjectConfig(projectRoot);
+  return {
+    uid: global?.uid ?? null,
+    mounted: (global?.stores ?? []).map((s) => s.alias),
+    project_id: project?.project_id ?? null,
+    required: (project?.required_stores ?? []).map((r) => r.id),
+    active_write_store: project?.active_write_store ?? null
+  };
+}
+
+export {
+  whoami,
+  projectStatus
+};

package/dist/chunk-WU6GAPKH.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+import {
+  buildResolveInput
+} from "./chunk-L4Q55UC4.js";
+import {
+  loadProjectConfig
+} from "./chunk-LFIKMVY7.js";
+import {
+  resolveGlobalRoot
+} from "./chunk-RYAFBNES.js";
+
+// src/store/bindings-io.ts
+import { writeBindingsSnapshot } from "@fenglimg/fabric-shared";
+var DEFAULT_WRITE_SCOPE = "team";
+function regenerateBindingsSnapshot(projectRoot, options) {
+  const globalRoot = options.globalRoot ?? resolveGlobalRoot();
+  const resolveInput = buildResolveInput(projectRoot, globalRoot);
+  if (resolveInput === null) {
+    return null;
+  }
+  const project = loadProjectConfig(projectRoot);
+  if (project?.project_id === void 0) {
+    return null;
+  }
+  return writeBindingsSnapshot({
+    globalRoot,
+    projectId: project.project_id,
+    resolveInput,
+    writeScope: options.writeScope ?? DEFAULT_WRITE_SCOPE,
+    now: options.now
+  });
+}
+
+export {
+  regenerateBindingsSnapshot
+};

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,