rulesync 3.1.1 → 3.3.0

package/dist/index.js

@@ -87,6 +87,15 @@ async function ensureDir(dirPath) {
     await mkdir(dirPath, { recursive: true });
   }
 }
+async function readOrInitializeFileContent(filePath, initialContent = "") {
+  if (await fileExists(filePath)) {
+    return await readFileContent(filePath);
+  } else {
+    await ensureDir(dirname(filePath));
+    await writeFileContent(filePath, initialContent);
+    return initialContent;
+  }
+}
 async function directoryExists(dirPath) {
   try {
     const stats = await stat(dirPath);
@@ -2501,11 +2510,11 @@ var McpServerBaseSchema = z10.object({
   kiroAutoBlock: z10.optional(z10.array(z10.string())),
   headers: z10.optional(z10.record(z10.string(), z10.string()))
 });
-var RulesyncMcpServerSchema = z10.extend(McpServerBaseSchema, {
+var RulesyncMcpServersSchema = z10.extend(McpServerBaseSchema, {
   targets: z10.optional(RulesyncTargetsSchema)
 });
 var RulesyncMcpConfigSchema = z10.object({
-  mcpServers: z10.record(z10.string(), RulesyncMcpServerSchema)
+  mcpServers: z10.record(z10.string(), RulesyncMcpServersSchema)
 });
 var RulesyncMcp = class _RulesyncMcp extends RulesyncFile {
   json;
@@ -2547,14 +2556,12 @@ var RulesyncMcp = class _RulesyncMcp extends RulesyncFile {
 
 // src/mcp/tool-mcp.ts
 var ToolMcp = class extends ToolFile {
-  json;
   constructor({ ...rest }) {
     super({
       ...rest,
       validate: true
       // Skip validation during construction
     });
-    this.json = JSON.parse(this.fileContent);
     if (rest.validate) {
       const result = this.validate();
       if (!result.success) {
@@ -2562,18 +2569,20 @@ var ToolMcp = class extends ToolFile {
       }
     }
   }
-  getJson() {
-    return this.json;
-  }
   static getSettablePaths() {
     throw new Error("Please implement this method in the subclass.");
   }
-  toRulesyncMcpDefault() {
+  static getToolTargetsGlobal() {
+    throw new Error("Please implement this method in the subclass.");
+  }
+  toRulesyncMcpDefault({
+    fileContent = void 0
+  } = {}) {
     return new RulesyncMcp({
       baseDir: this.baseDir,
       relativeDirPath: ".rulesync",
       relativeFilePath: ".mcp.json",
-      fileContent: this.fileContent
+      fileContent: fileContent ?? this.fileContent
     });
   }
   static async fromFile(_params) {
@@ -2586,6 +2595,14 @@ var ToolMcp = class extends ToolFile {
 
 // src/mcp/amazonqcli-mcp.ts
 var AmazonqcliMcp = class _AmazonqcliMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".amazonq",
@@ -2635,46 +2652,71 @@ var AmazonqcliMcp = class _AmazonqcliMcp extends ToolMcp {
 // src/mcp/claudecode-mcp.ts
 import { join as join26 } from "path";
 var ClaudecodeMcp = class _ClaudecodeMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = JSON.parse(this.fileContent || "{}");
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".",
       relativeFilePath: ".mcp.json"
     };
   }
+  static getSettablePathsGlobal() {
+    return {
+      relativeDirPath: ".claude",
+      relativeFilePath: ".claude.json"
+    };
+  }
   static async fromFile({
     baseDir = ".",
-    validate = true
+    validate = true,
+    global = false
   }) {
-    const fileContent = await readFileContent(
-      join26(
-        baseDir,
-        this.getSettablePaths().relativeDirPath,
-        this.getSettablePaths().relativeFilePath
-      )
+    const paths = global ? this.getSettablePathsGlobal() : this.getSettablePaths();
+    const fileContent = await readOrInitializeFileContent(
+      join26(baseDir, paths.relativeDirPath, paths.relativeFilePath),
+      JSON.stringify({ mcpServers: {} }, null, 2)
     );
+    const json = JSON.parse(fileContent);
+    const newJson = { ...json, mcpServers: json.mcpServers ?? {} };
     return new _ClaudecodeMcp({
       baseDir,
-      relativeDirPath: this.getSettablePaths().relativeDirPath,
-      relativeFilePath: this.getSettablePaths().relativeFilePath,
-      fileContent,
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent: JSON.stringify(newJson, null, 2),
       validate
     });
   }
-  static fromRulesyncMcp({
+  static async fromRulesyncMcp({
     baseDir = ".",
     rulesyncMcp,
-    validate = true
+    validate = true,
+    global = false
   }) {
+    const paths = global ? this.getSettablePathsGlobal() : this.getSettablePaths();
+    const fileContent = await readOrInitializeFileContent(
+      join26(baseDir, paths.relativeDirPath, paths.relativeFilePath),
+      JSON.stringify({ mcpServers: {} }, null, 2)
+    );
+    const json = JSON.parse(fileContent);
+    const newJson = { ...json, mcpServers: rulesyncMcp.getJson().mcpServers };
     return new _ClaudecodeMcp({
       baseDir,
-      relativeDirPath: this.getSettablePaths().relativeDirPath,
-      relativeFilePath: this.getSettablePaths().relativeFilePath,
-      fileContent: rulesyncMcp.getFileContent(),
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent: JSON.stringify(newJson, null, 2),
       validate
     });
   }
   toRulesyncMcp() {
-    return this.toRulesyncMcpDefault();
+    return this.toRulesyncMcpDefault({
+      fileContent: JSON.stringify({ mcpServers: this.json.mcpServers }, null, 2)
+    });
   }
   validate() {
     return { success: true, error: null };
@@ -2684,6 +2726,14 @@ var ClaudecodeMcp = class _ClaudecodeMcp extends ToolMcp {
 // src/mcp/cline-mcp.ts
 import { join as join27 } from "path";
 var ClineMcp = class _ClineMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".cline",
@@ -2730,9 +2780,111 @@ var ClineMcp = class _ClineMcp extends ToolMcp {
   }
 };
 
-// src/mcp/copilot-mcp.ts
+// src/mcp/codexcli-mcp.ts
 import { join as join28 } from "path";
+import * as smolToml from "smol-toml";
+var CodexcliMcp = class _CodexcliMcp extends ToolMcp {
+  toml;
+  constructor({ ...rest }) {
+    super({
+      ...rest,
+      validate: false
+    });
+    this.toml = smolToml.parse(this.fileContent);
+    if (rest.validate) {
+      const result = this.validate();
+      if (!result.success) {
+        throw result.error;
+      }
+    }
+  }
+  getToml() {
+    return this.toml;
+  }
+  static getSettablePaths() {
+    throw new Error("getSettablePaths is not supported for CodexcliMcp");
+  }
+  static getSettablePathsGlobal() {
+    return {
+      relativeDirPath: ".codex",
+      relativeFilePath: "config.toml"
+    };
+  }
+  static async fromFile({
+    baseDir = ".",
+    validate = true,
+    global = false
+  }) {
+    const paths = global ? this.getSettablePathsGlobal() : this.getSettablePaths();
+    const fileContent = await readFileContent(
+      join28(baseDir, paths.relativeDirPath, paths.relativeFilePath)
+    );
+    return new _CodexcliMcp({
+      baseDir,
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent,
+      validate
+    });
+  }
+  static async fromRulesyncMcp({
+    baseDir = ".",
+    rulesyncMcp,
+    validate = true,
+    global = false
+  }) {
+    const paths = global ? this.getSettablePathsGlobal() : this.getSettablePaths();
+    const configTomlFilePath = join28(baseDir, paths.relativeDirPath, paths.relativeFilePath);
+    const configTomlFileContent = await readOrInitializeFileContent(
+      configTomlFilePath,
+      smolToml.stringify({})
+    );
+    const configToml = smolToml.parse(configTomlFileContent);
+    const mcpServers = rulesyncMcp.getJson().mcpServers;
+    const filteredMcpServers = this.removeEmptyEntries(mcpServers);
+    configToml["mcp_servers"] = filteredMcpServers;
+    return new _CodexcliMcp({
+      baseDir,
+      relativeDirPath: paths.relativeDirPath,
+      relativeFilePath: paths.relativeFilePath,
+      fileContent: smolToml.stringify(configToml),
+      validate
+    });
+  }
+  toRulesyncMcp() {
+    return new RulesyncMcp({
+      baseDir: this.baseDir,
+      relativeDirPath: ".rulesync",
+      relativeFilePath: ".mcp.json",
+      fileContent: JSON.stringify({ mcpServers: this.toml.mcp_servers ?? {} }, null, 2)
+    });
+  }
+  validate() {
+    return { success: true, error: null };
+  }
+  static removeEmptyEntries(obj) {
+    if (!obj) return {};
+    const filtered = {};
+    for (const [key, value] of Object.entries(obj)) {
+      if (value === null) continue;
+      if (typeof value === "object" && Object.keys(value).length === 0) continue;
+      filtered[key] = value;
+    }
+    return filtered;
+  }
+};
+
+// src/mcp/copilot-mcp.ts
+import { join as join29 } from "path";
 var CopilotMcp = class _CopilotMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".vscode",
@@ -2744,7 +2896,7 @@ var CopilotMcp = class _CopilotMcp extends ToolMcp {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join28(
+      join29(
         baseDir,
         this.getSettablePaths().relativeDirPath,
         this.getSettablePaths().relativeFilePath
@@ -2780,8 +2932,16 @@ var CopilotMcp = class _CopilotMcp extends ToolMcp {
 };
 
 // src/mcp/cursor-mcp.ts
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 var CursorMcp = class _CursorMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".cursor",
@@ -2793,7 +2953,7 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join29(
+      join30(
         baseDir,
         this.getSettablePaths().relativeDirPath,
         this.getSettablePaths().relativeFilePath
@@ -2840,8 +3000,16 @@ var CursorMcp = class _CursorMcp extends ToolMcp {
 };
 
 // src/mcp/roo-mcp.ts
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var RooMcp = class _RooMcp extends ToolMcp {
+  json;
+  constructor(params) {
+    super(params);
+    this.json = this.fileContent !== void 0 ? JSON.parse(this.fileContent) : {};
+  }
+  getJson() {
+    return this.json;
+  }
   static getSettablePaths() {
     return {
       relativeDirPath: ".roo",
@@ -2853,7 +3021,7 @@ var RooMcp = class _RooMcp extends ToolMcp {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join30(
+      join31(
         baseDir,
         this.getSettablePaths().relativeDirPath,
         this.getSettablePaths().relativeFilePath
@@ -2898,15 +3066,22 @@ var mcpProcessorToolTargets = [
   "cursor",
   "roo"
 ];
-var McpProcessorToolTargetSchema = z11.enum(mcpProcessorToolTargets);
+var McpProcessorToolTargetSchema = z11.enum(
+  // codexcli is not in the list of tool targets but we add it here because it is a valid tool target for global mode generation
+  mcpProcessorToolTargets.concat("codexcli")
+);
+var mcpProcessorToolTargetsGlobal = ["claudecode", "codexcli"];
 var McpProcessor = class extends FeatureProcessor {
   toolTarget;
+  global;
   constructor({
     baseDir = ".",
-    toolTarget
+    toolTarget,
+    global = false
   }) {
     super({ baseDir });
     this.toolTarget = McpProcessorToolTargetSchema.parse(toolTarget);
+    this.global = global;
   }
   /**
    * Implementation of abstract method from FeatureProcessor
@@ -2921,6 +3096,11 @@ var McpProcessor = class extends FeatureProcessor {
     }
   }
   async loadToolFilesToDelete() {
+    if (this.global) {
+      return (await this.loadToolFiles()).filter(
+        (toolFile) => !(toolFile instanceof ClaudecodeMcp)
+      );
+    }
     return this.loadToolFiles();
   }
   /**
@@ -2943,7 +3123,8 @@ var McpProcessor = class extends FeatureProcessor {
             return [
               await ClaudecodeMcp.fromFile({
                 baseDir: this.baseDir,
-                validate: true
+                validate: true,
+                global: this.global
               })
             ];
           }
@@ -2955,6 +3136,15 @@ var McpProcessor = class extends FeatureProcessor {
               })
             ];
           }
+          case "codexcli": {
+            return [
+              await CodexcliMcp.fromFile({
+                baseDir: this.baseDir,
+                validate: true,
+                global: this.global
+              })
+            ];
+          }
           case "copilot": {
             return [
               await CopilotMcp.fromFile({
@@ -3001,42 +3191,51 @@ var McpProcessor = class extends FeatureProcessor {
     if (!rulesyncMcp) {
       throw new Error(`No .rulesync/.mcp.json found.`);
     }
-    const toolMcps = [rulesyncMcp].map((rulesyncMcp2) => {
-      switch (this.toolTarget) {
-        case "amazonqcli":
-          return AmazonqcliMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        case "claudecode":
-          return ClaudecodeMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        case "cline":
-          return ClineMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        case "copilot":
-          return CopilotMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        case "cursor":
-          return CursorMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        case "roo":
-          return RooMcp.fromRulesyncMcp({
-            baseDir: this.baseDir,
-            rulesyncMcp: rulesyncMcp2
-          });
-        default:
-          throw new Error(`Unsupported tool target: ${this.toolTarget}`);
-      }
-    });
+    const toolMcps = await Promise.all(
+      [rulesyncMcp].map(async (rulesyncMcp2) => {
+        switch (this.toolTarget) {
+          case "amazonqcli":
+            return AmazonqcliMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2
+            });
+          case "claudecode":
+            return ClaudecodeMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2,
+              global: this.global
+            });
+          case "cline":
+            return ClineMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2
+            });
+          case "copilot":
+            return CopilotMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2
+            });
+          case "cursor":
+            return CursorMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2
+            });
+          case "codexcli":
+            return await CodexcliMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2,
+              global: this.global
+            });
+          case "roo":
+            return RooMcp.fromRulesyncMcp({
+              baseDir: this.baseDir,
+              rulesyncMcp: rulesyncMcp2
+            });
+          default:
+            throw new Error(`Unsupported tool target: ${this.toolTarget}`);
+        }
+      })
+    );
     return toolMcps;
   }
   /**
@@ -3057,15 +3256,18 @@ var McpProcessor = class extends FeatureProcessor {
   static getToolTargets() {
     return mcpProcessorToolTargets;
   }
+  static getToolTargetsGlobal() {
+    return mcpProcessorToolTargetsGlobal;
+  }
 };
 
 // src/rules/rules-processor.ts
-import { basename as basename17, join as join54 } from "path";
+import { basename as basename17, join as join55 } from "path";
 import { XMLBuilder } from "fast-xml-parser";
 import { z as z20 } from "zod/mini";
 
 // src/subagents/simulated-subagent.ts
-import { basename as basename12, join as join31 } from "path";
+import { basename as basename12, join as join32 } from "path";
 import { z as z12 } from "zod/mini";
 
 // src/subagents/tool-subagent.ts
@@ -3167,7 +3369,7 @@ var SimulatedSubagent = class extends ToolSubagent {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join31(baseDir, this.getSettablePaths().relativeDirPath, relativeFilePath);
+    const filePath = join32(baseDir, this.getSettablePaths().relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = SimulatedSubagentFrontmatterSchema.safeParse(frontmatter);
@@ -3324,15 +3526,15 @@ var RooSubagent = class _RooSubagent extends SimulatedSubagent {
 };
 
 // src/subagents/subagents-processor.ts
-import { basename as basename14, join as join34 } from "path";
+import { basename as basename14, join as join35 } from "path";
 import { z as z15 } from "zod/mini";
 
 // src/subagents/claudecode-subagent.ts
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 import { z as z14 } from "zod/mini";
 
 // src/subagents/rulesync-subagent.ts
-import { basename as basename13, join as join32 } from "path";
+import { basename as basename13, join as join33 } from "path";
 import { z as z13 } from "zod/mini";
 var RulesyncSubagentModelSchema = z13.enum(["opus", "sonnet", "haiku", "inherit"]);
 var RulesyncSubagentFrontmatterSchema = z13.object({
@@ -3386,7 +3588,7 @@ var RulesyncSubagent = class _RulesyncSubagent extends RulesyncFile {
   static async fromFile({
     relativeFilePath
   }) {
-    const fileContent = await readFileContent(join32(".rulesync/subagents", relativeFilePath));
+    const fileContent = await readFileContent(join33(".rulesync/subagents", relativeFilePath));
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = RulesyncSubagentFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
@@ -3504,7 +3706,7 @@ var ClaudecodeSubagent = class _ClaudecodeSubagent extends ToolSubagent {
     relativeFilePath,
     validate = true
   }) {
-    const fileContent = await readFileContent(join33(baseDir, ".claude/agents", relativeFilePath));
+    const fileContent = await readFileContent(join34(baseDir, ".claude/agents", relativeFilePath));
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = ClaudecodeSubagentFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
@@ -3646,7 +3848,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
    * Load and parse rulesync subagent files from .rulesync/subagents/ directory
    */
   async loadRulesyncFiles() {
-    const subagentsDir = join34(this.baseDir, RulesyncSubagent.getSettablePaths().relativeDirPath);
+    const subagentsDir = join35(this.baseDir, RulesyncSubagent.getSettablePaths().relativeDirPath);
     const dirExists = await directoryExists(subagentsDir);
     if (!dirExists) {
       logger.debug(`Rulesync subagents directory not found: ${subagentsDir}`);
@@ -3661,7 +3863,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
     logger.info(`Found ${mdFiles.length} subagent files in ${subagentsDir}`);
     const rulesyncSubagents = [];
     for (const mdFile of mdFiles) {
-      const filepath = join34(subagentsDir, mdFile);
+      const filepath = join35(subagentsDir, mdFile);
       try {
         const rulesyncSubagent = await RulesyncSubagent.fromFile({
           relativeFilePath: mdFile,
@@ -3775,7 +3977,7 @@ var SubagentsProcessor = class extends FeatureProcessor {
     relativeDirPath,
     fromFile
   }) {
-    const paths = await findFilesByGlobs(join34(this.baseDir, relativeDirPath, "*.md"));
+    const paths = await findFilesByGlobs(join35(this.baseDir, relativeDirPath, "*.md"));
     const subagents = (await Promise.allSettled(paths.map((path2) => fromFile(basename14(path2))))).filter((r) => r.status === "fulfilled").map((r) => r.value);
     logger.info(`Successfully loaded ${subagents.length} ${relativeDirPath} subagents`);
     return subagents;
@@ -3800,13 +4002,13 @@ var SubagentsProcessor = class extends FeatureProcessor {
 };
 
 // src/rules/agentsmd-rule.ts
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 
 // src/rules/tool-rule.ts
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 
 // src/rules/rulesync-rule.ts
-import { basename as basename15, join as join35 } from "path";
+import { basename as basename15, join as join36 } from "path";
 import { z as z16 } from "zod/mini";
 var RulesyncRuleFrontmatterSchema = z16.object({
   root: z16.optional(z16.optional(z16.boolean())),
@@ -3872,7 +4074,7 @@ var RulesyncRule = class _RulesyncRule extends RulesyncFile {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join35(this.getSettablePaths().legacy.relativeDirPath, relativeFilePath);
+    const filePath = join36(this.getSettablePaths().legacy.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = RulesyncRuleFrontmatterSchema.safeParse(frontmatter);
@@ -3901,7 +4103,7 @@ var RulesyncRule = class _RulesyncRule extends RulesyncFile {
     relativeFilePath,
     validate = true
   }) {
-    const filePath = join35(this.getSettablePaths().recommended.relativeDirPath, relativeFilePath);
+    const filePath = join36(this.getSettablePaths().recommended.relativeDirPath, relativeFilePath);
     const fileContent = await readFileContent(filePath);
     const { frontmatter, body: content } = parseFrontmatter(fileContent);
     const result = RulesyncRuleFrontmatterSchema.safeParse(frontmatter);
@@ -4005,7 +4207,7 @@ var ToolRule = class extends ToolFile {
     });
     const rulesyncFrontmatter = rulesyncRule.getFrontmatter();
     if (!rulesyncFrontmatter.root && rulesyncFrontmatter.agentsmd?.subprojectPath) {
-      params.relativeDirPath = join36(rulesyncFrontmatter.agentsmd.subprojectPath);
+      params.relativeDirPath = join37(rulesyncFrontmatter.agentsmd.subprojectPath);
       params.relativeFilePath = "AGENTS.md";
     }
     return params;
@@ -4081,8 +4283,8 @@ var AgentsMdRule = class _AgentsMdRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "AGENTS.md";
-    const relativePath = isRoot ? "AGENTS.md" : join37(".agents/memories", relativeFilePath);
-    const fileContent = await readFileContent(join37(baseDir, relativePath));
+    const relativePath = isRoot ? "AGENTS.md" : join38(".agents/memories", relativeFilePath);
+    const fileContent = await readFileContent(join38(baseDir, relativePath));
     return new _AgentsMdRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -4122,7 +4324,7 @@ var AgentsMdRule = class _AgentsMdRule extends ToolRule {
 };
 
 // src/rules/amazonqcli-rule.ts
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 var AmazonQCliRule = class _AmazonQCliRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -4137,7 +4339,7 @@ var AmazonQCliRule = class _AmazonQCliRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join38(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join39(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _AmazonQCliRule({
       baseDir,
@@ -4177,7 +4379,7 @@ var AmazonQCliRule = class _AmazonQCliRule extends ToolRule {
 };
 
 // src/rules/augmentcode-legacy-rule.ts
-import { join as join39 } from "path";
+import { join as join40 } from "path";
 var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
   toRulesyncRule() {
     const rulesyncFrontmatter = {
@@ -4238,8 +4440,8 @@ var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
   }) {
     const settablePaths = this.getSettablePaths();
     const isRoot = relativeFilePath === settablePaths.root.relativeFilePath;
-    const relativePath = isRoot ? settablePaths.root.relativeFilePath : join39(settablePaths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join39(baseDir, relativePath));
+    const relativePath = isRoot ? settablePaths.root.relativeFilePath : join40(settablePaths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join40(baseDir, relativePath));
     return new _AugmentcodeLegacyRule({
       baseDir,
       relativeDirPath: isRoot ? settablePaths.root.relativeDirPath : settablePaths.nonRoot.relativeDirPath,
@@ -4252,7 +4454,7 @@ var AugmentcodeLegacyRule = class _AugmentcodeLegacyRule extends ToolRule {
 };
 
 // src/rules/augmentcode-rule.ts
-import { join as join40 } from "path";
+import { join as join41 } from "path";
 var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
   toRulesyncRule() {
     return this.toRulesyncRuleDefault();
@@ -4284,7 +4486,7 @@ var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join40(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join41(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     const { body: content } = parseFrontmatter(fileContent);
     return new _AugmentcodeRule({
@@ -4307,7 +4509,7 @@ var AugmentcodeRule = class _AugmentcodeRule extends ToolRule {
 };
 
 // src/rules/claudecode-rule.ts
-import { join as join41 } from "path";
+import { join as join42 } from "path";
 var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -4316,7 +4518,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
         relativeFilePath: "CLAUDE.md"
       },
       nonRoot: {
-        relativeDirPath: join41(".claude", "memories")
+        relativeDirPath: join42(".claude", "memories")
       }
     };
   }
@@ -4339,7 +4541,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join41(baseDir, paths.root.relativeDirPath, relativePath2)
+        join42(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _ClaudecodeRule({
         baseDir,
@@ -4353,8 +4555,8 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
     if (!paths.nonRoot) {
       throw new Error("nonRoot path is not set");
     }
-    const relativePath = join41(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join41(baseDir, relativePath));
+    const relativePath = join42(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join42(baseDir, relativePath));
     return new _ClaudecodeRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -4396,7 +4598,7 @@ var ClaudecodeRule = class _ClaudecodeRule extends ToolRule {
 };
 
 // src/rules/cline-rule.ts
-import { join as join42 } from "path";
+import { join as join43 } from "path";
 import { z as z17 } from "zod/mini";
 var ClineRuleFrontmatterSchema = z17.object({
   description: z17.string()
@@ -4441,7 +4643,7 @@ var ClineRule = class _ClineRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join42(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join43(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _ClineRule({
       baseDir,
@@ -4454,7 +4656,7 @@ var ClineRule = class _ClineRule extends ToolRule {
 };
 
 // src/rules/codexcli-rule.ts
-import { join as join43 } from "path";
+import { join as join44 } from "path";
 var CodexcliRule = class _CodexcliRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -4486,7 +4688,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join43(baseDir, paths.root.relativeDirPath, relativePath2)
+        join44(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _CodexcliRule({
         baseDir,
@@ -4500,8 +4702,8 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
     if (!paths.nonRoot) {
       throw new Error("nonRoot path is not set");
     }
-    const relativePath = join43(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join43(baseDir, relativePath));
+    const relativePath = join44(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join44(baseDir, relativePath));
     return new _CodexcliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -4543,7 +4745,7 @@ var CodexcliRule = class _CodexcliRule extends ToolRule {
 };
 
 // src/rules/copilot-rule.ts
-import { join as join44 } from "path";
+import { join as join45 } from "path";
 import { z as z18 } from "zod/mini";
 var CopilotRuleFrontmatterSchema = z18.object({
   description: z18.optional(z18.string()),
@@ -4636,11 +4838,11 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "copilot-instructions.md";
-    const relativePath = isRoot ? join44(
+    const relativePath = isRoot ? join45(
       this.getSettablePaths().root.relativeDirPath,
       this.getSettablePaths().root.relativeFilePath
-    ) : join44(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join44(baseDir, relativePath));
+    ) : join45(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join45(baseDir, relativePath));
     if (isRoot) {
       return new _CopilotRule({
         baseDir,
@@ -4659,7 +4861,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
     const result = CopilotRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join44(baseDir, relativeFilePath)}: ${result.error.message}`
+        `Invalid frontmatter in ${join45(baseDir, relativeFilePath)}: ${result.error.message}`
       );
     }
     return new _CopilotRule({
@@ -4698,7 +4900,7 @@ var CopilotRule = class _CopilotRule extends ToolRule {
 };
 
 // src/rules/cursor-rule.ts
-import { basename as basename16, join as join45 } from "path";
+import { basename as basename16, join as join46 } from "path";
 import { z as z19 } from "zod/mini";
 var CursorRuleFrontmatterSchema = z19.object({
   description: z19.optional(z19.string()),
@@ -4825,13 +5027,13 @@ var CursorRule = class _CursorRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join45(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join46(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     const { frontmatter, body: content } = _CursorRule.parseCursorFrontmatter(fileContent);
     const result = CursorRuleFrontmatterSchema.safeParse(frontmatter);
     if (!result.success) {
       throw new Error(
-        `Invalid frontmatter in ${join45(baseDir, relativeFilePath)}: ${result.error.message}`
+        `Invalid frontmatter in ${join46(baseDir, relativeFilePath)}: ${result.error.message}`
       );
     }
     return new _CursorRule({
@@ -4869,7 +5071,7 @@ var CursorRule = class _CursorRule extends ToolRule {
 };
 
 // src/rules/geminicli-rule.ts
-import { join as join46 } from "path";
+import { join as join47 } from "path";
 var GeminiCliRule = class _GeminiCliRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -4901,7 +5103,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
     if (isRoot) {
       const relativePath2 = paths.root.relativeFilePath;
       const fileContent2 = await readFileContent(
-        join46(baseDir, paths.root.relativeDirPath, relativePath2)
+        join47(baseDir, paths.root.relativeDirPath, relativePath2)
       );
       return new _GeminiCliRule({
         baseDir,
@@ -4915,8 +5117,8 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
     if (!paths.nonRoot) {
       throw new Error("nonRoot path is not set");
     }
-    const relativePath = join46(paths.nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join46(baseDir, relativePath));
+    const relativePath = join47(paths.nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join47(baseDir, relativePath));
     return new _GeminiCliRule({
       baseDir,
       relativeDirPath: paths.nonRoot.relativeDirPath,
@@ -4958,7 +5160,7 @@ var GeminiCliRule = class _GeminiCliRule extends ToolRule {
 };
 
 // src/rules/junie-rule.ts
-import { join as join47 } from "path";
+import { join as join48 } from "path";
 var JunieRule = class _JunieRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -4977,8 +5179,8 @@ var JunieRule = class _JunieRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "guidelines.md";
-    const relativePath = isRoot ? "guidelines.md" : join47(".junie/memories", relativeFilePath);
-    const fileContent = await readFileContent(join47(baseDir, relativePath));
+    const relativePath = isRoot ? "guidelines.md" : join48(".junie/memories", relativeFilePath);
+    const fileContent = await readFileContent(join48(baseDir, relativePath));
     return new _JunieRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -5018,7 +5220,7 @@ var JunieRule = class _JunieRule extends ToolRule {
 };
 
 // src/rules/kiro-rule.ts
-import { join as join48 } from "path";
+import { join as join49 } from "path";
 var KiroRule = class _KiroRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -5033,7 +5235,7 @@ var KiroRule = class _KiroRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join48(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join49(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _KiroRule({
       baseDir,
@@ -5073,7 +5275,7 @@ var KiroRule = class _KiroRule extends ToolRule {
 };
 
 // src/rules/opencode-rule.ts
-import { join as join49 } from "path";
+import { join as join50 } from "path";
 var OpenCodeRule = class _OpenCodeRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -5092,8 +5294,8 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "AGENTS.md";
-    const relativePath = isRoot ? "AGENTS.md" : join49(".opencode/memories", relativeFilePath);
-    const fileContent = await readFileContent(join49(baseDir, relativePath));
+    const relativePath = isRoot ? "AGENTS.md" : join50(".opencode/memories", relativeFilePath);
+    const fileContent = await readFileContent(join50(baseDir, relativePath));
     return new _OpenCodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -5133,7 +5335,7 @@ var OpenCodeRule = class _OpenCodeRule extends ToolRule {
 };
 
 // src/rules/qwencode-rule.ts
-import { join as join50 } from "path";
+import { join as join51 } from "path";
 var QwencodeRule = class _QwencodeRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -5152,8 +5354,8 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === "QWEN.md";
-    const relativePath = isRoot ? "QWEN.md" : join50(".qwen/memories", relativeFilePath);
-    const fileContent = await readFileContent(join50(baseDir, relativePath));
+    const relativePath = isRoot ? "QWEN.md" : join51(".qwen/memories", relativeFilePath);
+    const fileContent = await readFileContent(join51(baseDir, relativePath));
     return new _QwencodeRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : this.getSettablePaths().nonRoot.relativeDirPath,
@@ -5190,7 +5392,7 @@ var QwencodeRule = class _QwencodeRule extends ToolRule {
 };
 
 // src/rules/roo-rule.ts
-import { join as join51 } from "path";
+import { join as join52 } from "path";
 var RooRule = class _RooRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -5205,7 +5407,7 @@ var RooRule = class _RooRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join51(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join52(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _RooRule({
       baseDir,
@@ -5260,7 +5462,7 @@ var RooRule = class _RooRule extends ToolRule {
 };
 
 // src/rules/warp-rule.ts
-import { join as join52 } from "path";
+import { join as join53 } from "path";
 var WarpRule = class _WarpRule extends ToolRule {
   constructor({ fileContent, root, ...rest }) {
     super({
@@ -5286,8 +5488,8 @@ var WarpRule = class _WarpRule extends ToolRule {
     validate = true
   }) {
     const isRoot = relativeFilePath === this.getSettablePaths().root.relativeFilePath;
-    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join52(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
-    const fileContent = await readFileContent(join52(baseDir, relativePath));
+    const relativePath = isRoot ? this.getSettablePaths().root.relativeFilePath : join53(this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath);
+    const fileContent = await readFileContent(join53(baseDir, relativePath));
     return new _WarpRule({
       baseDir,
       relativeDirPath: isRoot ? this.getSettablePaths().root.relativeDirPath : ".warp",
@@ -5327,7 +5529,7 @@ var WarpRule = class _WarpRule extends ToolRule {
 };
 
 // src/rules/windsurf-rule.ts
-import { join as join53 } from "path";
+import { join as join54 } from "path";
 var WindsurfRule = class _WindsurfRule extends ToolRule {
   static getSettablePaths() {
     return {
@@ -5342,7 +5544,7 @@ var WindsurfRule = class _WindsurfRule extends ToolRule {
     validate = true
   }) {
     const fileContent = await readFileContent(
-      join53(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
+      join54(baseDir, this.getSettablePaths().nonRoot.relativeDirPath, relativeFilePath)
     );
     return new _WindsurfRule({
       baseDir,
@@ -5736,7 +5938,7 @@ var RulesProcessor = class extends FeatureProcessor {
    * Load and parse rulesync rule files from .rulesync/rules/ directory
    */
   async loadRulesyncFiles() {
-    const files = await findFilesByGlobs(join54(".rulesync/rules", "*.md"));
+    const files = await findFilesByGlobs(join55(".rulesync/rules", "*.md"));
     logger.debug(`Found ${files.length} rulesync files`);
     const rulesyncRules = await Promise.all(
       files.map((file) => RulesyncRule.fromFile({ relativeFilePath: basename17(file) }))
@@ -5757,7 +5959,7 @@ var RulesProcessor = class extends FeatureProcessor {
     return rulesyncRules;
   }
   async loadRulesyncFilesLegacy() {
-    const legacyFiles = await findFilesByGlobs(join54(".rulesync", "*.md"));
+    const legacyFiles = await findFilesByGlobs(join55(".rulesync", "*.md"));
     logger.debug(`Found ${legacyFiles.length} legacy rulesync files`);
     return Promise.all(
       legacyFiles.map((file) => RulesyncRule.fromFileLegacy({ relativeFilePath: basename17(file) }))
@@ -5824,7 +6026,7 @@ var RulesProcessor = class extends FeatureProcessor {
         return [];
       }
       const rootFilePaths = await findFilesByGlobs(
-        join54(this.baseDir, root.relativeDirPath ?? ".", root.relativeFilePath)
+        join55(this.baseDir, root.relativeDirPath ?? ".", root.relativeFilePath)
       );
       return await Promise.all(
         rootFilePaths.map(
@@ -5842,7 +6044,7 @@ var RulesProcessor = class extends FeatureProcessor {
         return [];
       }
       const nonRootFilePaths = await findFilesByGlobs(
-        join54(this.baseDir, nonRoot.relativeDirPath, `*.${nonRoot.extension}`)
+        join55(this.baseDir, nonRoot.relativeDirPath, `*.${nonRoot.extension}`)
       );
       return await Promise.all(
         nonRootFilePaths.map(
@@ -6218,14 +6420,14 @@ s/<command> [arguments]
 This syntax employs a double slash (\`s/\`) to prevent conflicts with built-in slash commands.  
 The \`s\` in \`s/\` stands for *simulate*. Because custom slash commands are not built-in, this syntax provides a pseudo way to invoke them.
 
-When users call a custom slash command, you have to look for the markdown file, \`${join54(commands.relativeDirPath, "{command}.md")}\`, then execute the contents of that file as the block of operations.` : "";
+When users call a custom slash command, you have to look for the markdown file, \`${join55(commands.relativeDirPath, "{command}.md")}\`, then execute the contents of that file as the block of operations.` : "";
     const subagentsSection = subagents ? `## Simulated Subagents
 
 Simulated subagents are specialized AI assistants that can be invoked to handle specific types of tasks. In this case, it can be appear something like custom slash commands simply. Simulated subagents can be called by custom slash commands.
 
-When users call a simulated subagent, it will look for the corresponding markdown file, \`${join54(subagents.relativeDirPath, "{subagent}.md")}\`, and execute its contents as the block of operations.
+When users call a simulated subagent, it will look for the corresponding markdown file, \`${join55(subagents.relativeDirPath, "{subagent}.md")}\`, and execute its contents as the block of operations.
 
-For example, if the user instructs \`Call planner subagent to plan the refactoring\`, you have to look for the markdown file, \`${join54(subagents.relativeDirPath, "planner.md")}\`, and execute its contents as the block of operations.` : "";
+For example, if the user instructs \`Call planner subagent to plan the refactoring\`, you have to look for the markdown file, \`${join55(subagents.relativeDirPath, "planner.md")}\`, and execute its contents as the block of operations.` : "";
     const result = [
       overview,
       ...this.simulateCommands && CommandsProcessor.getToolTargetsSimulated().includes(this.toolTarget) ? [commandsSection] : [],
@@ -6344,28 +6546,15 @@ async function generateMcp(config) {
     logger.debug("Skipping MCP configuration generation (not in --features)");
     return 0;
   }
-  if (config.getExperimentalGlobal()) {
-    logger.debug("Skipping MCP configuration generation (not supported in global mode)");
-    return 0;
-  }
   let totalMcpOutputs = 0;
   logger.info("Generating MCP files...");
-  const supportedMcpTargets = [
-    "amazonqcli",
-    "claudecode",
-    "cline",
-    "copilot",
-    "cursor",
-    "roo"
-  ];
-  const mcpSupportedTargets = config.getTargets().filter((target) => {
-    return supportedMcpTargets.some((supportedTarget) => supportedTarget === target);
-  });
+  const toolTargets = config.getExperimentalGlobal() ? intersection(config.getTargets(), McpProcessor.getToolTargetsGlobal()) : intersection(config.getTargets(), McpProcessor.getToolTargets());
   for (const baseDir of config.getBaseDirs()) {
-    for (const toolTarget of intersection(mcpSupportedTargets, McpProcessor.getToolTargets())) {
+    for (const toolTarget of toolTargets) {
       const processor = new McpProcessor({
         baseDir,
-        toolTarget
+        toolTarget,
+        global: config.getExperimentalGlobal()
       });
       if (config.getDelete()) {
         const oldToolFiles = await processor.loadToolFilesToDelete();
@@ -6450,9 +6639,9 @@ async function generateSubagents(config) {
 }
 
 // src/cli/commands/gitignore.ts
-import { join as join55 } from "path";
+import { join as join56 } from "path";
 var gitignoreCommand = async () => {
-  const gitignorePath = join55(process.cwd(), ".gitignore");
+  const gitignorePath = join56(process.cwd(), ".gitignore");
   const rulesFilesToIgnore = [
     "# Generated by rulesync - AI tool configuration files",
     "**/.amazonq/",
@@ -6553,12 +6742,9 @@ async function importRules(config, tool) {
   if (!config.getFeatures().includes("rules")) {
     return 0;
   }
-  if (!RulesProcessor.getToolTargets().includes(tool)) {
-    return 0;
-  }
   const global = config.getExperimentalGlobal();
-  if (global && !RulesProcessor.getToolTargetsGlobal().includes(tool)) {
-    logger.error(`${tool} is not supported in global mode`);
+  const supportedTargets = global ? RulesProcessor.getToolTargetsGlobal() : RulesProcessor.getToolTargets();
+  if (!supportedTargets.includes(tool)) {
     return 0;
   }
   const rulesProcessor = new RulesProcessor({
@@ -6610,16 +6796,15 @@ async function importMcp(config, tool) {
   if (!config.getFeatures().includes("mcp")) {
     return 0;
   }
-  if (config.getExperimentalGlobal()) {
-    logger.debug("Skipping MCP file import (not supported in global mode)");
-    return 0;
-  }
-  if (!McpProcessor.getToolTargets().includes(tool)) {
+  const global = config.getExperimentalGlobal();
+  const supportedTargets = global ? McpProcessor.getToolTargetsGlobal() : McpProcessor.getToolTargets();
+  if (!supportedTargets.includes(tool)) {
     return 0;
   }
   const mcpProcessor = new McpProcessor({
     baseDir: config.getBaseDirs()[0] ?? ".",
-    toolTarget: tool
+    toolTarget: tool,
+    global
   });
   const toolFiles = await mcpProcessor.loadToolFiles();
   if (toolFiles.length === 0) {
@@ -6639,9 +6824,6 @@ async function importCommands(config, tool) {
   const global = config.getExperimentalGlobal();
   const supportedTargets = global ? CommandsProcessor.getToolTargetsGlobal() : CommandsProcessor.getToolTargets({ includeSimulated: false });
   if (!supportedTargets.includes(tool)) {
-    if (global) {
-      logger.debug(`${tool} is not supported for commands in global mode`);
-    }
     return 0;
   }
   const commandsProcessor = new CommandsProcessor({
@@ -6689,7 +6871,7 @@ async function importSubagents(config, tool) {
 }
 
 // src/cli/commands/init.ts
-import { join as join56 } from "path";
+import { join as join57 } from "path";
 async function initCommand() {
   logger.info("Initializing rulesync...");
   await ensureDir(".rulesync");
@@ -6760,7 +6942,7 @@ globs: ["**/*"]
 - Follow single responsibility principle
 `
   };
-  const filepath = join56(".rulesync/rules", sampleFile.filename);
+  const filepath = join57(".rulesync/rules", sampleFile.filename);
   await ensureDir(".rulesync/rules");
   await ensureDir(RulesyncCommand.getSettablePaths().relativeDirPath);
   await ensureDir(".rulesync/subagents");
@@ -6773,7 +6955,7 @@ globs: ["**/*"]
 }
 
 // src/cli/index.ts
-var getVersion = () => "3.1.1";
+var getVersion = () => "3.3.0";
 var main = async () => {
   const program = new Command();
   const version = getVersion();