@mycelish/cli 0.1.0 → 0.2.0

package/dist/core/config-merger.js

@@ -2,36 +2,26 @@
  * Config Merger Module
  *
  * Merges configurations from three levels:
- * - Global (~/.mycelium/) - base configuration
+ * - Global (~/.mycelium/global/) - base configuration
  * - Machine (~/.mycelium/machines/{hostname}/) - hardware-specific overrides
  * - Project (.mycelium/ in project root) - project-specific overrides
  *
  * Priority: Project > Machine > Global
  */
-import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
+import { parse as yamlParse } from "yaml";
+import { MYCELIUM_HOME, readFileIfExists } from "./fs-helpers.js";
+import { loadItemsFromDir } from "./item-loader.js";
 /**
  * Default empty memory config
  */
 function getDefaultMemoryConfig() {
     return {
         scopes: {
-            shared: {
-                syncTo: [],
-                path: "",
-                files: [],
-            },
-            coding: {
-                syncTo: [],
-                path: "",
-                files: [],
-            },
-            personal: {
-                syncTo: [],
-                path: "",
-                files: [],
-            },
+            shared: { syncTo: [], path: "", files: [] },
+            coding: { syncTo: [], path: "", files: [] },
+            personal: { syncTo: [], path: "", files: [] },
         },
     };
 }
@@ -42,6 +32,9 @@ function createEmptyMergedConfig() {
     return {
         mcps: {},
         skills: {},
+        agents: {},
+        rules: {},
+        commands: {},
         memory: getDefaultMemoryConfig(),
         sources: {},
     };
@@ -52,69 +45,39 @@ function createEmptyMergedConfig() {
  */
 export function mergeConfigs(globalConfig, machineConfig, projectConfig) {
     const result = createEmptyMergedConfig();
-    // Start with global MCPs
-    if (globalConfig?.mcps) {
-        for (const [name, config] of Object.entries(globalConfig.mcps)) {
-            result.mcps[name] = { ...config };
-            result.sources[name] = "global";
-        }
-    }
-    // Apply machine overrides (higher priority than global)
-    if (machineConfig?.mcps) {
-        for (const [name, config] of Object.entries(machineConfig.mcps)) {
-            if (result.mcps[name]) {
-                // Merge with existing config - machine takes priority
-                result.mcps[name] = mergeMcpServerConfig(result.mcps[name], config);
-                result.sources[name] = "machine";
-            }
-            else {
-                // Add new MCP from machine config
-                result.mcps[name] = { ...config };
-                result.sources[name] = "machine";
+    const levels = [
+        { config: globalConfig, source: "global" },
+        { config: machineConfig, source: "machine" },
+        { config: projectConfig, source: "project" },
+    ];
+    for (const { config, source } of levels) {
+        if (!config)
+            continue;
+        // Merge MCPs — higher priority level overwrites lower
+        if (config.mcps) {
+            for (const [name, mcp] of Object.entries(config.mcps)) {
+                result.mcps[name] = result.mcps[name]
+                    ? mergeMcpServerConfig(result.mcps[name], mcp)
+                    : { ...mcp };
+                result.sources[name] = source;
             }
         }
-    }
-    // Apply project overrides (highest priority)
-    if (projectConfig?.mcps) {
-        for (const [name, config] of Object.entries(projectConfig.mcps)) {
-            if (result.mcps[name]) {
-                // Merge with existing config - project takes priority
-                result.mcps[name] = mergeMcpServerConfig(result.mcps[name], config);
-                result.sources[name] = "project";
-            }
-            else {
-                // Add new MCP from project config
-                result.mcps[name] = { ...config };
-                result.sources[name] = "project";
-            }
-        }
-    }
-    // Merge skills (similar priority logic)
-    if (globalConfig?.skills) {
-        for (const [name, skill] of Object.entries(globalConfig.skills)) {
-            result.skills[name] = { ...skill };
-        }
-    }
-    if (machineConfig?.skills) {
-        for (const [name, skill] of Object.entries(machineConfig.skills)) {
-            result.skills[name] = { ...skill };
+        // Merge skills — simple overwrite by priority
+        if (config.skills) {
+            Object.assign(result.skills, config.skills);
         }
-    }
-    if (projectConfig?.skills) {
-        for (const [name, skill] of Object.entries(projectConfig.skills)) {
-            result.skills[name] = { ...skill };
+        // Merge agents/rules/commands — simple overwrite by priority
+        if (config.agents)
+            Object.assign(result.agents, config.agents);
+        if (config.rules)
+            Object.assign(result.rules, config.rules);
+        if (config.commands)
+            Object.assign(result.commands, config.commands);
+        // Merge memory — scope-level overwrite
+        if (config.memory) {
+            result.memory = mergeMemoryConfig(result.memory, config.memory);
         }
     }
-    // Merge memory config
-    if (globalConfig?.memory) {
-        result.memory = { ...globalConfig.memory };
-    }
-    if (machineConfig?.memory) {
-        result.memory = mergeMemoryConfig(result.memory, machineConfig.memory);
-    }
-    if (projectConfig?.memory) {
-        result.memory = mergeMemoryConfig(result.memory, projectConfig.memory);
-    }
     return result;
 }
 /**
@@ -125,104 +88,124 @@ function mergeMcpServerConfig(target, source) {
         command: source.command ?? target.command,
         args: source.args ?? target.args,
         env: source.env !== undefined ? source.env : target.env,
-        enabled: source.enabled !== undefined ? source.enabled : target.enabled,
+        state: source.state ?? target.state,
+        source: source.source ?? target.source,
         tools: source.tools ?? target.tools,
         excludeTools: source.excludeTools ?? target.excludeTools,
     };
 }
 /**
- * Merge memory configs
+ * Merge memory configs — scopes from source overwrite target at scope level
  */
 function mergeMemoryConfig(target, source) {
-    const result = { ...target };
-    if (source.scopes) {
-        result.scopes = {
-            ...target.scopes,
-            ...source.scopes,
-        };
+    if (!source.scopes)
+        return target;
+    return { ...target, scopes: { ...target.scopes, ...source.scopes } };
+}
+// ============================================================================
+// Item Loading Helpers
+// ============================================================================
+async function loadFileItems(dir) {
+    const items = await loadItemsFromDir(dir);
+    const result = {};
+    for (const item of items) {
+        result[item.name] = item;
     }
     return result;
 }
+// ============================================================================
+// Config File Loading
+// ============================================================================
 /**
- * Check if a file exists
+ * Parse a config string as YAML or JSON.
+ * Returns null on parse error (logs a warning for malformed files).
  */
-async function fileExists(filePath) {
+function parseConfig(content, filePath) {
     try {
-        await fs.access(filePath);
-        return true;
+        // YAML.parse handles both YAML and JSON transparently
+        return yamlParse(content);
     }
-    catch {
-        return false;
+    catch (err) {
+        console.warn(`Mycelium: failed to parse ${filePath}: ${err.message}`);
+        return null;
     }
 }
 /**
- * Load and parse a JSON config file
+ * Load MCPs from a directory — tries mcps.yaml first, falls back to mcps.json.
+ *
+ * Format differences:
+ * - YAML: flat structure  { "mcp-name": { command, args } }
+ * - JSON: nested structure { mcps: { "mcp-name": { command, args } } }
  */
-async function loadJsonConfig(filePath) {
-    try {
-        const content = await fs.readFile(filePath, "utf-8");
-        return JSON.parse(content);
-    }
-    catch {
-        return null;
-    }
+async function loadMcpsFromDir(dir) {
+    // Try YAML first (preferred format)
+    const yamlContent = await readFileIfExists(path.join(dir, "mcps.yaml"));
+    if (yamlContent) {
+        return parseConfig(yamlContent, path.join(dir, "mcps.yaml")) ?? {};
+    }
+    // Fallback to JSON
+    const jsonContent = await readFileIfExists(path.join(dir, "mcps.json"));
+    if (jsonContent) {
+        const data = parseConfig(jsonContent, path.join(dir, "mcps.json"));
+        return data?.mcps ?? {};
+    }
+    return {};
 }
 /**
- * Load global config from ~/.mycelium/
+ * Load global config from ~/.mycelium/global/
  */
 export async function loadGlobalConfig() {
-    const home = os.homedir();
-    const globalPath = path.join(home, ".mycelium");
-    const mcpsPath = path.join(globalPath, "mcps.json");
-    const result = {
-        mcps: {},
+    const globalDir = path.join(MYCELIUM_HOME, "global");
+    return {
+        mcps: await loadMcpsFromDir(globalDir),
         skills: {},
+        agents: await loadFileItems(path.join(globalDir, "agents")),
+        rules: await loadFileItems(path.join(globalDir, "rules")),
+        commands: await loadFileItems(path.join(globalDir, "commands")),
     };
-    if (await fileExists(mcpsPath)) {
-        const mcpsConfig = await loadJsonConfig(mcpsPath);
-        if (mcpsConfig?.mcps) {
-            result.mcps = mcpsConfig.mcps;
-        }
-    }
-    return result;
 }
 /**
  * Load project config from .mycelium/ in project root
  */
 export async function loadProjectConfig(projectRoot) {
-    const projectPath = path.join(projectRoot, ".mycelium");
-    const mcpsPath = path.join(projectPath, "mcps.json");
-    const result = {
-        mcps: {},
+    const root = projectRoot ?? process.cwd();
+    const projDir = path.join(root, ".mycelium");
+    return {
+        mcps: await loadMcpsFromDir(projDir),
         skills: {},
+        agents: await loadFileItems(path.join(projDir, "agents")),
+        rules: await loadFileItems(path.join(projDir, "rules")),
+        commands: await loadFileItems(path.join(projDir, "commands")),
     };
-    if (await fileExists(mcpsPath)) {
-        const mcpsConfig = await loadJsonConfig(mcpsPath);
-        if (mcpsConfig?.mcps) {
-            result.mcps = mcpsConfig.mcps;
-        }
-    }
-    return result;
 }
 /**
- * Load machine-specific config from ~/.mycelium/machines/{hostname}/
+ * Load machine-specific config from ~/.mycelium/machines/{hostname}.*
+ * Tries: hostname.yaml → hostname.json → hostname/ directory
  */
 export async function loadMachineConfig() {
-    const home = os.homedir();
     const hostname = os.hostname();
-    const machinePath = path.join(home, ".mycelium", "machines", hostname);
-    const mcpsPath = path.join(machinePath, "mcps.json");
-    const result = {
-        mcps: {},
-        skills: {},
+    const machinesDir = path.join(MYCELIUM_HOME, "machines");
+    const hostDir = path.join(machinesDir, hostname);
+    // Load agents/rules/commands from hostname/ directory
+    const fileItems = {
+        agents: await loadFileItems(path.join(hostDir, "agents")),
+        rules: await loadFileItems(path.join(hostDir, "rules")),
+        commands: await loadFileItems(path.join(hostDir, "commands")),
     };
-    if (await fileExists(mcpsPath)) {
-        const mcpsConfig = await loadJsonConfig(mcpsPath);
-        if (mcpsConfig?.mcps) {
-            result.mcps = mcpsConfig.mcps;
-        }
-    }
-    return result;
+    // Try hostname.yaml (flat MCP entries)
+    const yamlContent = await readFileIfExists(path.join(machinesDir, `${hostname}.yaml`));
+    if (yamlContent) {
+        const mcps = parseConfig(yamlContent, `machines/${hostname}.yaml`) ?? {};
+        return { mcps, skills: {}, ...fileItems };
+    }
+    // Try hostname.json (nested { mcps: {} })
+    const jsonContent = await readFileIfExists(path.join(machinesDir, `${hostname}.json`));
+    if (jsonContent) {
+        const data = parseConfig(jsonContent, `machines/${hostname}.json`);
+        return { mcps: data?.mcps ?? {}, skills: {}, ...fileItems };
+    }
+    // Try hostname/ directory
+    return { mcps: await loadMcpsFromDir(hostDir), skills: {}, ...fileItems };
 }
 /**
  * Load and merge all config levels for a project

package/dist/core/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-merger.js","sourceRoot":"","sources":["../../src/core/config-merger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AASlC;;GAEG;AACH,SAAS,sBAAsB;IAC7B,OAAO;QACL,MAAM,EAAE;YACN,MAAM,EAAE;gBACN,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,EAAE;aACV;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,EAAE;aACV;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB;IAC9B,OAAO;QACL,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,sBAAsB,EAAE;QAChC,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,YAA+C,EAC/C,aAAgD,EAChD,aAAgD;IAEhD,MAAM,MAAM,GAAG,uBAAuB,EAAE,CAAC;IAEzC,yBAAyB;IACzB,IAAI,YAAY,EAAE,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAClC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAClC,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,IAAI,aAAa,EAAE,IAAI,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,sDAAsD;gBACtD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;gBACpE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,kCAAkC;gBAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;gBAClC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,6CAA6C;IAC7C,IAAI,aAAa,EAAE,IAAI,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,sDAAsD;gBACtD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;gBACpE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,kCAAkC;gBAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;gBAClC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IACD,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IACD,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IAED,sBAAsB;IACtB,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAC7C,CAAC;IACD,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAC3B,MAAuB,EACvB,MAAuB;IAEvB,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACzC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI;QAChC,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;QACvD,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO;QACvE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK;QACnC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;KACzD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACxB,MAAoB,EACpB,MAA6B;IAE7B,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAE7B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,CAAC,MAAM,GAAG;YACd,GAAG,MAAM,CAAC,MAAM;YAChB,GAAG,MAAM,CAAC,MAAM;SACjB,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,UAAU,CAAC,QAAgB;IACxC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,cAAc,CAAI,QAAgB;IAC/C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAEpD,MAAM,MAAM,GAA0B;QACpC,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,IAAI,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,cAAc,CAA4C,QAAQ,CAAC,CAAC;QAC7F,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAErD,MAAM,MAAM,GAA0B;QACpC,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,IAAI,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,cAAc,CAA4C,QAAQ,CAAC,CAAC;QAC7F,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAErD,MAAM,MAAM,GAA0B;QACpC,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,IAAI,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,cAAc,CAA4C,QAAQ,CAAC,CAAC;QAC7F,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmB;IAEnB,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrE,gBAAgB,EAAE;QAClB,iBAAiB,EAAE;QACnB,iBAAiB,CAAC,WAAW,CAAC;KAC/B,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC"}
+{"version":3,"file":"config-merger.js","sourceRoot":"","sources":["../../src/core/config-merger.ts"],"names":[],"mappings":"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"}

package/dist/core/config-merger.test.d.ts

@@ -4,7 +4,7 @@
  * Config merge priority: Project > Machine > Global
  * - Global provides base set of skills/mcps/memory
  * - Machine can add/override for hardware-specific needs
- * - Project can add/override/DISABLE specific items (enabled: false)
+ * - Project can add/override/DISABLE specific items (state: "disabled")
  */
 export {};
 //# sourceMappingURL=config-merger.test.d.ts.map