@intellectronica/ruler 0.2.3 → 0.2.5

package/README.md

@@ -40,12 +40,13 @@ Ruler solves this by providing a **single source of truth** for all your AI agen
 | GitHub Copilot   | `.github/copilot-instructions.md`                             |
 | Claude Code      | `CLAUDE.md`                                                   |
 | OpenAI Codex CLI | `AGENTS.md`                                                   |
-| Cursor           | `.cursor/rules/ruler_cursor_instructions.md`                  |
+| Cursor           | `.cursor/rules/ruler_cursor_instructions.mdc`                 |
 | Windsurf         | `.windsurf/rules/ruler_windsurf_instructions.md`              |
 | Cline            | `.clinerules`                                                 |
 | Aider            | `ruler_aider_instructions.md` and `.aider.conf.yml`           |
 | Firebase Studio  | `.idx/airules.md`                                             |
 | Open Hands       | `.openhands/microagents/repo.md` and `.openhands/config.toml` |
+| Gemini CLI       | `GEMINI.md` and `.gemini/settings.json`                       |
 
 ## Getting Started
 
@@ -222,6 +223,9 @@ output_path_config = ".aider.conf.yml"
 enabled = true
 output_path = ".idx/airules.md"
 
+[agents.gemini-cli]
+enabled = true
+
 # Agent-specific MCP configuration
 [agents.cursor.mcp]
 enabled = true
@@ -288,7 +292,7 @@ node_modules/
 # START Ruler Generated Files
 .aider.conf.yml
 .clinerules
-.cursor/rules/ruler_cursor_instructions.md
+.cursor/rules/ruler_cursor_instructions.mdc
 .github/copilot-instructions.md
 .windsurf/rules/ruler_windsurf_instructions.md
 AGENTS.md

package/dist/agents/AiderAgent.js

@@ -48,7 +48,8 @@ class AiderAgent {
     getName() {
         return 'Aider';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const mdPath = agentConfig?.outputPathInstructions ??
             this.getDefaultOutputPath(projectRoot).instructions;
         await (0, FileSystemUtils_1.backupFile)(mdPath);

package/dist/agents/ClaudeAgent.js

@@ -46,7 +46,8 @@ class ClaudeAgent {
     getName() {
         return 'Claude Code';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.backupFile)(output);
         await (0, FileSystemUtils_1.writeGeneratedFile)(output, concatenatedRules);

package/dist/agents/ClineAgent.js

@@ -46,7 +46,8 @@ class ClineAgent {
     getName() {
         return 'Cline';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.backupFile)(output);
         await (0, FileSystemUtils_1.writeGeneratedFile)(output, concatenatedRules);

package/dist/agents/CodexCliAgent.js

@@ -46,7 +46,8 @@ class CodexCliAgent {
     getName() {
         return 'OpenAI Codex CLI';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.backupFile)(output);
         await (0, FileSystemUtils_1.writeGeneratedFile)(output, concatenatedRules);

package/dist/agents/CopilotAgent.js

@@ -46,7 +46,8 @@ class CopilotAgent {
     getName() {
         return 'GitHub Copilot';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.ensureDirExists)(path.dirname(output));
         await (0, FileSystemUtils_1.backupFile)(output);
@@ -55,5 +56,8 @@ class CopilotAgent {
     getDefaultOutputPath(projectRoot) {
         return path.join(projectRoot, '.github', 'copilot-instructions.md');
     }
+    getMcpServerKey() {
+        return 'servers';
+    }
 }
 exports.CopilotAgent = CopilotAgent;

package/dist/agents/CursorAgent.js

@@ -46,14 +46,15 @@ class CursorAgent {
     getName() {
         return 'Cursor';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.ensureDirExists)(path.dirname(output));
         await (0, FileSystemUtils_1.backupFile)(output);
         await (0, FileSystemUtils_1.writeGeneratedFile)(output, concatenatedRules);
     }
     getDefaultOutputPath(projectRoot) {
-        return path.join(projectRoot, '.cursor', 'rules', 'ruler_cursor_instructions.md');
+        return path.join(projectRoot, '.cursor', 'rules', 'ruler_cursor_instructions.mdc');
     }
 }
 exports.CursorAgent = CursorAgent;

package/dist/agents/FirebaseAgent.js

@@ -46,7 +46,8 @@ class FirebaseAgent {
     getName() {
         return 'Firebase Studio';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.backupFile)(output);
         await (0, FileSystemUtils_1.writeGeneratedFile)(output, concatenatedRules);

package/dist/agents/GeminiCliAgent.js

@@ -0,0 +1,74 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeminiCliAgent = void 0;
+const path = __importStar(require("path"));
+const fs_1 = require("fs");
+const merge_1 = require("../mcp/merge");
+class GeminiCliAgent {
+    getIdentifier() {
+        return 'gemini-cli';
+    }
+    getName() {
+        return 'Gemini CLI';
+    }
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, agentConfig) {
+        const outputPath = this.getDefaultOutputPath(projectRoot);
+        await fs_1.promises.writeFile(outputPath, concatenatedRules);
+        if (rulerMcpJson) {
+            const settingsPath = path.join(projectRoot, '.gemini', 'settings.json');
+            let existingSettings = {};
+            try {
+                const existingSettingsRaw = await fs_1.promises.readFile(settingsPath, 'utf8');
+                existingSettings = JSON.parse(existingSettingsRaw);
+            }
+            catch (error) {
+                if (error.code !== 'ENOENT') {
+                    throw error;
+                }
+            }
+            const merged = (0, merge_1.mergeMcp)(existingSettings, rulerMcpJson, agentConfig?.mcp?.strategy ?? 'merge', this.getMcpServerKey());
+            await fs_1.promises.mkdir(path.dirname(settingsPath), { recursive: true });
+            await fs_1.promises.writeFile(settingsPath, JSON.stringify(merged, null, 2));
+        }
+    }
+    getDefaultOutputPath(projectRoot) {
+        return path.join(projectRoot, 'GEMINI.md');
+    }
+    getMcpServerKey() {
+        return 'mcpServers';
+    }
+}
+exports.GeminiCliAgent = GeminiCliAgent;

package/dist/agents/OpenHandsAgent.js

@@ -43,7 +43,8 @@ class OpenHandsAgent {
     getName() {
         return 'Open Hands';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.ensureDirExists)(path.dirname(output));
         await (0, FileSystemUtils_1.backupFile)(output);

package/dist/agents/WindsurfAgent.js

@@ -46,7 +46,8 @@ class WindsurfAgent {
     getName() {
         return 'Windsurf';
     }
-    async applyRulerConfig(concatenatedRules, projectRoot, agentConfig) {
+    async applyRulerConfig(concatenatedRules, projectRoot, rulerMcpJson, // eslint-disable-line @typescript-eslint/no-unused-vars
+    agentConfig) {
         const output = agentConfig?.outputPath ?? this.getDefaultOutputPath(projectRoot);
         await (0, FileSystemUtils_1.ensureDirExists)(path.dirname(output));
         await (0, FileSystemUtils_1.backupFile)(output);

package/dist/cli/commands.js

@@ -58,7 +58,7 @@ function run() {
         });
         y.option('agents', {
             type: 'string',
-            description: 'Comma-separated list of agent identifiers: copilot, claude, codex, cursor, windsurf, cline, aider, firebase',
+            description: 'Comma-separated list of agent identifiers: copilot, claude, codex, cursor, windsurf, cline, aider, firebase, gemini-cli',
         });
         y.option('config', {
             type: 'string',
@@ -175,7 +175,7 @@ and apply them to your configured AI coding agents.
 
 # [agents.cursor]
 # enabled = true
-# output_path = ".cursor/rules/ruler_cursor_instructions.md"
+# output_path = ".cursor/rules/ruler_cursor_instructions.mdc"
 
 # [agents.windsurf]
 # enabled = true
@@ -193,6 +193,9 @@ and apply them to your configured AI coding agents.
 # [agents.firebase]
 # enabled = true
 # output_path = ".idx/airules.md"
+
+# [agents.gemini-cli]
+# enabled = true
 `;
         if (!(await exists(instructionsPath))) {
             await fs_1.promises.writeFile(instructionsPath, DEFAULT_INSTRUCTIONS);

package/dist/lib.js

@@ -45,10 +45,11 @@ const ClaudeAgent_1 = require("./agents/ClaudeAgent");
 const CodexCliAgent_1 = require("./agents/CodexCliAgent");
 const CursorAgent_1 = require("./agents/CursorAgent");
 const WindsurfAgent_1 = require("./agents/WindsurfAgent");
-const ClineAgent_1 = require("./agents/ClineAgent");
+const ClineAgent = __importStar(require("./agents/ClineAgent"));
 const AiderAgent_1 = require("./agents/AiderAgent");
 const FirebaseAgent_1 = require("./agents/FirebaseAgent");
 const OpenHandsAgent_1 = require("./agents/OpenHandsAgent");
+const GeminiCliAgent_1 = require("./agents/GeminiCliAgent");
 const merge_1 = require("./mcp/merge");
 const validate_1 = require("./mcp/validate");
 const mcp_1 = require("./paths/mcp");
@@ -94,10 +95,11 @@ const agents = [
     new CodexCliAgent_1.CodexCliAgent(),
     new CursorAgent_1.CursorAgent(),
     new WindsurfAgent_1.WindsurfAgent(),
-    new ClineAgent_1.ClineAgent(),
+    new ClineAgent.ClineAgent(),
     new AiderAgent_1.AiderAgent(),
     new FirebaseAgent_1.FirebaseAgent(),
     new OpenHandsAgent_1.OpenHandsAgent(),
+    new GeminiCliAgent_1.GeminiCliAgent(),
 ];
 /**
  * Applies ruler configurations for all supported AI agents.
@@ -198,7 +200,7 @@ async function applyAllAgentConfigs(projectRoot, includedAgents, configPath, cli
             (0, constants_1.logVerbose)(`DRY RUN: Would write rules to: ${outputPaths.join(', ')}`, verbose);
         }
         else {
-            await agent.applyRulerConfig(concatenated, projectRoot, agentConfig);
+            await agent.applyRulerConfig(concatenated, projectRoot, rulerMcpJson, agentConfig);
         }
         const dest = await (0, mcp_1.getNativeMcpPath)(agent.getName(), projectRoot);
         const mcpEnabledForAgent = cliMcpEnabled &&
@@ -222,13 +224,15 @@ async function applyAllAgentConfigs(projectRoot, includedAgents, configPath, cli
                         agentConfig?.mcp?.strategy ??
                         config.mcp?.strategy ??
                         'merge';
-                    (0, constants_1.logVerbose)(`Applying MCP config for ${agent.getName()} with strategy: ${strategy}`, verbose);
+                    // Determine the correct server key for the agent
+                    const serverKey = agent.getMcpServerKey?.() ?? 'mcpServers';
+                    (0, constants_1.logVerbose)(`Applying MCP config for ${agent.getName()} with strategy: ${strategy} and key: ${serverKey}`, verbose);
                     if (dryRun) {
                         (0, constants_1.logVerbose)(`DRY RUN: Would apply MCP config to: ${dest}`, true);
                     }
                     else {
                         const existing = await (0, mcp_1.readNativeMcp)(dest);
-                        const merged = (0, merge_1.mergeMcp)(existing, rulerMcpJson, strategy);
+                        const merged = (0, merge_1.mergeMcp)(existing, rulerMcpJson, strategy, serverKey);
                         await (0, mcp_1.writeNativeMcp)(dest, merged);
                     }
                 }

package/dist/mcp/merge.js

@@ -6,16 +6,26 @@ exports.mergeMcp = mergeMcp;
  * @param base Existing native MCP config object.
  * @param incoming Ruler MCP config object.
  * @param strategy Merge strategy: 'merge' to union servers, 'overwrite' to replace.
+ * @param serverKey The key to use for servers in the output (e.g., 'servers' for Copilot, 'mcpServers' for others).
  * @returns Merged MCP config object.
  */
-function mergeMcp(base, incoming, strategy) {
+function mergeMcp(base, incoming, strategy, serverKey) {
     if (strategy === 'overwrite') {
-        return incoming;
+        // Ensure the incoming object uses the correct server key.
+        const incomingServers = incoming.mcpServers || {};
+        return {
+            [serverKey]: incomingServers,
+        };
     }
-    const baseServers = base.mcpServers || {};
+    const baseServers = base[serverKey] ||
+        base.mcpServers ||
+        {}; // Handle legacy key in existing files
     const incomingServers = incoming.mcpServers || {};
+    const mergedServers = { ...baseServers, ...incomingServers };
+    const newBase = { ...base };
+    delete newBase.mcpServers; // Remove old key if present
     return {
-        ...base,
-        mcpServers: { ...baseServers, ...incomingServers },
+        ...newBase,
+        [serverKey]: mergedServers,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellectronica/ruler",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Ruler — apply the same rules to all coding agents",
   "main": "dist/lib.js",
   "scripts": {