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

package/dist/{chunk-X7QPY5KH.js → chunk-UTF4YBDN.js}

@@ -1,245 +1,14 @@
 #!/usr/bin/env node
+import {
+  deepMerge
+} from "./chunk-SKSYUHKK.js";
 
 // src/install/skills-and-hooks.ts
-import { chmodSync, existsSync as existsSync2, readFileSync } from "fs";
-import { mkdir as mkdir2, readFile as readFile2 } from "fs/promises";
-import { dirname as dirname2, join as join2, parse, resolve as resolve2 } from "path";
-import { fileURLToPath } from "url";
-import { atomicWriteJson as atomicWriteJson2, atomicWriteText } from "@fenglimg/fabric-shared/node/atomic-write";
-
-// src/config/json.ts
-import { existsSync } from "fs";
+import { chmodSync, existsSync, readFileSync } from "fs";
 import { mkdir, readFile } from "fs/promises";
-import { dirname, join, resolve } from "path";
-import { homedir } from "os";
-import { atomicWriteJson } from "@fenglimg/fabric-shared/node/atomic-write";
-
-// src/config/writer.ts
-function createServerEntry(serverPath) {
-  return {
-    command: process.execPath,
-    args: [serverPath]
-  };
-}
-
-// src/config/json.ts
-function deepMerge(target, source, options = {}) {
-  return deepMergeAtPath(target, source, "", options);
-}
-function deepMergeAtPath(target, source, path, options) {
-  if (options.arrayAppendPaths && options.arrayAppendPaths.includes(path) && Array.isArray(target) && Array.isArray(source)) {
-    return appendArrayWithDedupe(target, source);
-  }
-  if (target === null || typeof target !== "object" || Array.isArray(target) || source === null || typeof source !== "object" || Array.isArray(source)) {
-    return source;
-  }
-  const out = { ...target };
-  for (const key of Object.keys(source)) {
-    const childPath = path === "" ? key : `${path}.${key}`;
-    out[key] = deepMergeAtPath(
-      target[key],
-      source[key],
-      childPath,
-      options
-    );
-  }
-  return out;
-}
-function appendArrayWithDedupe(target, source) {
-  const out = [...target];
-  for (const candidate of source) {
-    if (out.some((existing) => isSameHookEntry(existing, candidate))) {
-      continue;
-    }
-    out.push(candidate);
-  }
-  return out;
-}
-function isSameHookEntry(a, b) {
-  const cmdA = extractHookCommand(a);
-  const cmdB = extractHookCommand(b);
-  if (cmdA !== null && cmdB !== null) {
-    return cmdA === cmdB;
-  }
-  return deepEqual(a, b);
-}
-function extractHookCommand(item) {
-  if (item === null || typeof item !== "object") {
-    return null;
-  }
-  const obj = item;
-  if (typeof obj.command === "string") {
-    return obj.command;
-  }
-  if (Array.isArray(obj.hooks)) {
-    for (const inner of obj.hooks) {
-      if (inner !== null && typeof inner === "object") {
-        const innerObj = inner;
-        if (typeof innerObj.command === "string") {
-          return innerObj.command;
-        }
-      }
-    }
-  }
-  return null;
-}
-function deepEqual(a, b) {
-  if (a === b) {
-    return true;
-  }
-  if (a === null || b === null || typeof a !== "object" || typeof b !== "object") {
-    return false;
-  }
-  if (Array.isArray(a) !== Array.isArray(b)) {
-    return false;
-  }
-  if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length) {
-      return false;
-    }
-    return a.every((value, index) => deepEqual(value, b[index]));
-  }
-  const aObj = a;
-  const bObj = b;
-  const aKeys = Object.keys(aObj);
-  const bKeys = Object.keys(bObj);
-  if (aKeys.length !== bKeys.length) {
-    return false;
-  }
-  return aKeys.every((key) => deepEqual(aObj[key], bObj[key]));
-}
-function expandHome(filePath) {
-  if (filePath === "~") {
-    return homedir();
-  }
-  if (filePath.startsWith("~/")) {
-    return join(homedir(), filePath.slice(2));
-  }
-  return filePath;
-}
-function normalizeConfigPath(filePath) {
-  return resolve(expandHome(filePath));
-}
-async function readJsonConfig(configPath) {
-  try {
-    const raw = await readFile(configPath, "utf8");
-    if (raw.trim().length === 0) {
-      return {};
-    }
-    const parsed = JSON.parse(raw);
-    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-      throw new Error(`Expected JSON object in ${configPath}`);
-    }
-    return parsed;
-  } catch (error) {
-    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-      return {};
-    }
-    throw error;
-  }
-}
-async function writeJsonClientConfig(configPath, serverEntry) {
-  const existing = await readJsonConfig(configPath);
-  const merged = deepMerge(existing, { mcpServers: { fabric: serverEntry } });
-  await mkdir(dirname(configPath), { recursive: true });
-  await atomicWriteJson(configPath, merged, { indent: 2 });
-}
-async function removeJsonClientConfigEntry(configPath, serverName) {
-  if (!existsSync(configPath)) {
-    return { status: "skipped", path: configPath, message: "no-config-file" };
-  }
-  let existing;
-  try {
-    existing = await readJsonConfig(configPath);
-  } catch (error) {
-    return {
-      status: "error",
-      path: configPath,
-      message: error instanceof Error ? error.message : String(error)
-    };
-  }
-  const mcpServers = existing.mcpServers;
-  if (mcpServers === void 0 || mcpServers === null || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
-    return { status: "skipped", path: configPath, message: "no-mcp-servers-object" };
-  }
-  const servers = mcpServers;
-  if (!Object.prototype.hasOwnProperty.call(servers, serverName)) {
-    return { status: "skipped", path: configPath, message: "not-present" };
-  }
-  const nextServers = { ...servers };
-  delete nextServers[serverName];
-  const next = { ...existing, mcpServers: nextServers };
-  try {
-    await mkdir(dirname(configPath), { recursive: true });
-    await atomicWriteJson(configPath, next, { indent: 2 });
-    return { status: "removed", path: configPath };
-  } catch (error) {
-    return {
-      status: "error",
-      path: configPath,
-      message: error instanceof Error ? error.message : String(error)
-    };
-  }
-}
-var JsonClientConfigWriter = class {
-  configuredPath;
-  constructor(configuredPath) {
-    this.configuredPath = configuredPath;
-  }
-  async detect(workspaceRoot, overridePath) {
-    const explicitPath = overridePath ?? this.configuredPath;
-    if (explicitPath !== void 0) {
-      return normalizeConfigPath(explicitPath);
-    }
-    const configPath = this.defaultPath(workspaceRoot);
-    return configPath === null ? null : normalizeConfigPath(configPath);
-  }
-  async write(serverPath, workspaceRoot, overridePath) {
-    const configPath = await this.detect(workspaceRoot, overridePath);
-    if (configPath === null) {
-      return;
-    }
-    await writeJsonClientConfig(configPath, createServerEntry(serverPath));
-  }
-  async remove(serverName, workspaceRoot, overridePath) {
-    const configPath = await this.detect(workspaceRoot, overridePath);
-    if (configPath === null) {
-      return { status: "skipped", message: "no-config-path" };
-    }
-    return removeJsonClientConfigEntry(configPath, serverName);
-  }
-};
-var ClaudeCodeCLIWriter = class extends JsonClientConfigWriter {
-  clientKind = "ClaudeCodeCLI";
-  scope;
-  constructor(configuredPath, scope = "project") {
-    super(configuredPath);
-    this.scope = scope;
-  }
-  // Writes to project-level .mcp.json (per Claude Code MCP spec) by default,
-  // or ~/.claude.json for user scope.
-  // Detection still checks ~/.claude to confirm Claude Code is installed.
-  defaultPath(workspaceRoot) {
-    const globalClaudeDir = join(homedir(), ".claude");
-    const projectClaudeDir = join(workspaceRoot, ".claude");
-    if (!existsSync(globalClaudeDir) && !existsSync(projectClaudeDir)) {
-      return null;
-    }
-    return this.scope === "user" ? join(homedir(), ".claude.json") : join(workspaceRoot, ".mcp.json");
-  }
-};
-var CursorWriter = class extends JsonClientConfigWriter {
-  clientKind = "Cursor";
-  constructor(configuredPath) {
-    super(configuredPath);
-  }
-  defaultPath(workspaceRoot) {
-    const cursorDir = join(workspaceRoot, ".cursor");
-    return existsSync(cursorDir) ? join(cursorDir, "mcp.json") : null;
-  }
-};
-
-// src/install/skills-and-hooks.ts
+import { dirname, join, parse, resolve } from "path";
+import { fileURLToPath } from "url";
+import { atomicWriteJson, atomicWriteText } from "@fenglimg/fabric-shared/node/atomic-write";
 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";
@@ -288,7 +57,7 @@ var HOOK_CONFIG_TARGETS = {
 var HOOK_CONFIG_ARRAY_PATHS = {
   claudeCode: ["hooks.Stop", "hooks.SessionStart", "hooks.PreToolUse"],
   codex: ["events.Stop", "events.SessionStart", "events.PreToolUse"],
-  cursor: ["events.Stop", "events.SessionStart", "events.PreToolUse"]
+  cursor: ["hooks.stop", "hooks.sessionStart", "hooks.preToolUse"]
 };
 var FABRIC_HOOK_COMMAND_PATHS = {
   claudeCode: {
@@ -307,13 +76,13 @@ var FABRIC_HOOK_COMMAND_PATHS = {
     knowledgeHintNarrow: ".cursor/hooks/knowledge-hint-narrow.cjs"
   }
 };
-var SECTION_TARGETS = ["CLAUDE.md", "AGENTS.md", join2(".cursor", "rules")];
+var SECTION_TARGETS = ["CLAUDE.md", "AGENTS.md", join(".cursor", "rules")];
 var FABRIC_SECTION_BEGIN_MARKER = "<!-- fabric:knowledge-base:begin -->";
 var FABRIC_SECTION_END_MARKER = "<!-- fabric:knowledge-base:end -->";
 var FABRIC_SECTION_REGEX = /(?:\r?\n){0,2}<!-- fabric:knowledge-base:begin -->[\s\S]*?<!-- fabric:knowledge-base:end -->/;
 function readFabricLanguagePreference(projectRoot) {
-  const configPath = join2(projectRoot, ".fabric", "fabric-config.json");
-  if (!existsSync2(configPath)) {
+  const configPath = join(projectRoot, ".fabric", "fabric-config.json");
+  if (!existsSync(configPath)) {
     return "match-existing";
   }
   try {
@@ -344,7 +113,7 @@ ${FABRIC_SECTION_END_MARKER}`;
 }
 async function installFabricArchiveSkill(projectRoot, _options = {}) {
   const source = await readTemplate(SKILL_TEMPLATE_REL);
-  const targets = SKILL_DESTINATIONS.fabricArchive.map((rel) => join2(projectRoot, rel));
+  const targets = SKILL_DESTINATIONS.fabricArchive.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     results.push(await copyTextIdempotent("skill", source, target));
@@ -353,7 +122,7 @@ async function installFabricArchiveSkill(projectRoot, _options = {}) {
 }
 async function installFabricReviewSkill(projectRoot, _options = {}) {
   const source = await readTemplate(SKILL_REVIEW_TEMPLATE_REL);
-  const targets = SKILL_DESTINATIONS.fabricReview.map((rel) => join2(projectRoot, rel));
+  const targets = SKILL_DESTINATIONS.fabricReview.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     results.push(await copyTextIdempotent("skill-review", source, target));
@@ -362,7 +131,7 @@ async function installFabricReviewSkill(projectRoot, _options = {}) {
 }
 async function installFabricImportSkill(projectRoot, _options = {}) {
   const source = await readTemplate(SKILL_IMPORT_TEMPLATE_REL);
-  const targets = SKILL_DESTINATIONS.fabricImport.map((rel) => join2(projectRoot, rel));
+  const targets = SKILL_DESTINATIONS.fabricImport.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     results.push(await copyTextIdempotent("skill-import", source, target));
@@ -371,7 +140,7 @@ async function installFabricImportSkill(projectRoot, _options = {}) {
 }
 async function installArchiveHintHook(projectRoot, _options = {}) {
   const source = await readTemplate(HOOK_SCRIPT_TEMPLATE_REL);
-  const targets = HOOK_SCRIPT_DESTINATIONS.fabricHint.map((rel) => join2(projectRoot, rel));
+  const targets = HOOK_SCRIPT_DESTINATIONS.fabricHint.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     const result = await copyTextIdempotent("hook-script", source, target);
@@ -387,7 +156,7 @@ async function installArchiveHintHook(projectRoot, _options = {}) {
 }
 async function installKnowledgeHintBroadHook(projectRoot, _options = {}) {
   const source = await readTemplate(HOOK_BROAD_SCRIPT_TEMPLATE_REL);
-  const targets = HOOK_SCRIPT_DESTINATIONS.knowledgeHintBroad.map((rel) => join2(projectRoot, rel));
+  const targets = HOOK_SCRIPT_DESTINATIONS.knowledgeHintBroad.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     const result = await copyTextIdempotent("hook-broad-script", source, target);
@@ -403,7 +172,7 @@ async function installKnowledgeHintBroadHook(projectRoot, _options = {}) {
 }
 async function installKnowledgeHintNarrowHook(projectRoot, _options = {}) {
   const source = await readTemplate(HOOK_NARROW_SCRIPT_TEMPLATE_REL);
-  const targets = HOOK_SCRIPT_DESTINATIONS.knowledgeHintNarrow.map((rel) => join2(projectRoot, rel));
+  const targets = HOOK_SCRIPT_DESTINATIONS.knowledgeHintNarrow.map((rel) => join(projectRoot, rel));
   const results = [];
   for (const target of targets) {
     const result = await copyTextIdempotent("hook-narrow-script", source, target);
@@ -419,7 +188,7 @@ async function installKnowledgeHintNarrowHook(projectRoot, _options = {}) {
 }
 async function mergeClaudeCodeHookConfig(projectRoot, _options = {}) {
   const fragment = await readJsonTemplate(CLAUDE_HOOK_CONFIG_TEMPLATE_REL);
-  const targetPath = join2(projectRoot, HOOK_CONFIG_TARGETS.claudeCode);
+  const targetPath = join(projectRoot, HOOK_CONFIG_TARGETS.claudeCode);
   return mergeJsonIdempotent(
     "claude-hook-config",
     targetPath,
@@ -429,7 +198,7 @@ async function mergeClaudeCodeHookConfig(projectRoot, _options = {}) {
 }
 async function mergeCodexHookConfig(projectRoot, _options = {}) {
   const fragment = await readJsonTemplate(CODEX_HOOK_CONFIG_TEMPLATE_REL);
-  const targetPath = join2(projectRoot, HOOK_CONFIG_TARGETS.codex);
+  const targetPath = join(projectRoot, HOOK_CONFIG_TARGETS.codex);
   return mergeJsonIdempotent(
     "codex-hook-config",
     targetPath,
@@ -439,7 +208,7 @@ async function mergeCodexHookConfig(projectRoot, _options = {}) {
 }
 async function mergeCursorHookConfig(projectRoot, _options = {}) {
   const fragment = await readJsonTemplate(CURSOR_HOOK_CONFIG_TEMPLATE_REL);
-  const targetPath = join2(projectRoot, HOOK_CONFIG_TARGETS.cursor);
+  const targetPath = join(projectRoot, HOOK_CONFIG_TARGETS.cursor);
   return mergeJsonIdempotent(
     "cursor-hook-config",
     targetPath,
@@ -451,14 +220,14 @@ async function addFabricKnowledgeBaseSection(projectRoot, fabricLanguage, _optio
   const sectionBody = buildFabricKnowledgeBaseSection(fabricLanguage);
   const results = [];
   for (const rel of SECTION_TARGETS) {
-    const target = join2(projectRoot, rel);
-    if (!existsSync2(target)) {
+    const target = join(projectRoot, rel);
+    if (!existsSync(target)) {
       results.push({ step: "section", path: target, status: "skipped", message: "absent" });
       continue;
     }
     let existing;
     try {
-      existing = await readFile2(target, "utf8");
+      existing = await readFile(target, "utf8");
     } catch (error) {
       results.push({
         step: "section",
@@ -503,7 +272,7 @@ ${sectionBody}
   return results;
 }
 async function copyTextIdempotent(step, source, target) {
-  if (existsSync2(target)) {
+  if (existsSync(target)) {
     try {
       const existing = readFileSync(target, "utf8");
       if (existing === source) {
@@ -512,7 +281,7 @@ async function copyTextIdempotent(step, source, target) {
     } catch {
     }
   }
-  await mkdir2(dirname2(target), { recursive: true });
+  await mkdir(dirname(target), { recursive: true });
   await atomicWriteText(target, source);
   return { step, path: target, status: "written" };
 }
@@ -522,13 +291,13 @@ async function mergeJsonIdempotent(step, target, fragment, arrayAppendPaths) {
   if (jsonEqual(existing, merged)) {
     return { step, path: target, status: "skipped", message: "up-to-date" };
   }
-  await mkdir2(dirname2(target), { recursive: true });
-  await atomicWriteJson2(target, merged, { indent: 2 });
+  await mkdir(dirname(target), { recursive: true });
+  await atomicWriteJson(target, merged, { indent: 2 });
   return { step, path: target, status: "written" };
 }
 async function readJsonObjectOrEmpty(path) {
   try {
-    const raw = await readFile2(path, "utf8");
+    const raw = await readFile(path, "utf8");
     if (raw.trim().length === 0) {
       return {};
     }
@@ -549,7 +318,7 @@ function jsonEqual(a, b) {
 }
 async function readTemplate(relativePath) {
   const path = findTemplatePath(relativePath);
-  return readFile2(path, "utf8");
+  return readFile(path, "utf8");
 }
 async function readJsonTemplate(relativePath) {
   const raw = await readTemplate(relativePath);
@@ -560,14 +329,14 @@ async function readJsonTemplate(relativePath) {
   return parsed;
 }
 function findTemplatePath(relativePath) {
-  const startDir = dirname2(fileURLToPath(import.meta.url));
-  let current = resolve2(startDir);
+  const startDir = dirname(fileURLToPath(import.meta.url));
+  let current = resolve(startDir);
   while (true) {
-    const candidate = join2(current, "templates", relativePath);
-    if (existsSync2(candidate)) {
+    const candidate = join(current, "templates", relativePath);
+    if (existsSync(candidate)) {
       return candidate;
     }
-    const parent = dirname2(current);
+    const parent = dirname(current);
     if (parent === current || parse(current).root === current) {
       throw new Error(`Template not found: templates/${relativePath} (searched up from ${startDir})`);
     }
@@ -576,12 +345,6 @@ function findTemplatePath(relativePath) {
 }
 
 export {
-  createServerEntry,
-  normalizeConfigPath,
-  writeJsonClientConfig,
-  removeJsonClientConfigEntry,
-  ClaudeCodeCLIWriter,
-  CursorWriter,
   SKILL_DESTINATIONS,
   HOOK_SCRIPT_DESTINATIONS,
   HOOK_CONFIG_TARGETS,

package/dist/config-7YD365I3.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+import {
+  configCmd,
+  config_default,
+  installMcpClients
+} from "./chunk-AIB54QRT.js";
+import "./chunk-SKSYUHKK.js";
+import "./chunk-6ICJICVU.js";
+export {
+  configCmd,
+  config_default as default,
+  installMcpClients
+};