@intellectronica/ruler 0.3.22 → 0.3.24

package/README.md

@@ -570,11 +570,16 @@ Skills are specialized knowledge packages that extend AI agent capabilities with
 - **Agents with native skills support**: Skills are copied directly to each agent's native skills directory:
   - **Claude Code**: `.claude/skills/`
   - **GitHub Copilot**: `.claude/skills/` (shared with Claude Code)
+  - **Kilo Code**: `.claude/skills/` (shared with Claude Code)
   - **OpenAI Codex CLI**: `.codex/skills/`
   - **OpenCode**: `.opencode/skill/`
   - **Pi Coding Agent**: `.pi/skills/`
   - **Goose**: `.agents/skills/`
+  - **Amp**: `.agents/skills/` (shared with Goose)
   - **Mistral Vibe**: `.vibe/skills/`
+  - **Roo Code**: `.roo/skills/`
+  - **Gemini CLI**: `.gemini/skills/`
+  - **Cursor**: `.cursor/skills/`
 - **Other MCP-compatible agents**: Skills are copied to `.skillz/` and a Skillz MCP server is automatically configured via `uvx`
 
 ### Skills Directory Structure
@@ -630,7 +635,7 @@ For agents that support MCP but don't have native skills support, Ruler automati
 2. Configures a Skillz MCP server in the agent's configuration
 3. Uses `uvx` to launch the server with the absolute path to `.skillz`
 
-Agents using native skills support (Claude Code, GitHub Copilot, OpenAI Codex CLI, OpenCode, Pi Coding Agent, Goose, and Mistral Vibe) **do not** use the Skillz MCP server and instead use their own native skills directories.
+Agents using native skills support (Claude Code, GitHub Copilot, Kilo Code, OpenAI Codex CLI, OpenCode, Pi Coding Agent, Goose, Amp, Mistral Vibe, Roo Code, Gemini CLI, and Cursor) **do not** use the Skillz MCP server and instead use their own native skills directories.
 
 Example auto-generated MCP server configuration:
 
@@ -644,19 +649,22 @@ args = ["skillz@latest", "/absolute/path/to/project/.skillz"]
 
 When skills support is enabled and gitignore integration is active, Ruler automatically adds:
 
-- `.claude/skills/` (for Claude Code and GitHub Copilot)
+- `.claude/skills/` (for Claude Code, GitHub Copilot, and Kilo Code)
 - `.codex/skills/` (for OpenAI Codex CLI)
 - `.opencode/skill/` (for OpenCode)
 - `.pi/skills/` (for Pi Coding Agent)
-- `.agents/skills/` (for Goose)
+- `.agents/skills/` (for Goose and Amp)
 - `.vibe/skills/` (for Mistral Vibe)
+- `.roo/skills/` (for Roo Code)
+- `.gemini/skills/` (for Gemini CLI)
+- `.cursor/skills/` (for Cursor)
 - `.skillz/` (for other MCP-based agents)
 
 to your `.gitignore` file within the managed Ruler block.
 
 ### Requirements
 
-- **For agents with native skills support** (Claude Code, GitHub Copilot, OpenAI Codex CLI, OpenCode, Pi Coding Agent, Goose, Mistral Vibe): No additional requirements
+- **For agents with native skills support** (Claude Code, GitHub Copilot, Kilo Code, OpenAI Codex CLI, OpenCode, Pi Coding Agent, Goose, Amp, Mistral Vibe, Roo Code, Gemini CLI, Cursor): No additional requirements
 - **For other MCP agents**: `uv` must be installed and available in your PATH
   ```bash
   # Install uv if needed
@@ -704,12 +712,15 @@ EOF
 ruler apply
 
 # 3. Skills are now available to compatible agents:
-#    - Claude Code & GitHub Copilot: .claude/skills/my-skill/
+#    - Claude Code, GitHub Copilot & Kilo Code: .claude/skills/my-skill/
 #    - OpenAI Codex CLI: .codex/skills/my-skill/
 #    - OpenCode: .opencode/skill/my-skill/
 #    - Pi Coding Agent: .pi/skills/my-skill/
-#    - Goose: .agents/skills/my-skill/
+#    - Goose & Amp: .agents/skills/my-skill/
 #    - Mistral Vibe: .vibe/skills/my-skill/
+#    - Roo Code: .roo/skills/my-skill/
+#    - Gemini CLI: .gemini/skills/my-skill/
+#    - Cursor: .cursor/skills/my-skill/
 #    - Other MCP agents: .skillz/my-skill/ + Skillz MCP server configured
 ```
 

package/dist/agents/AbstractAgent.js

@@ -79,6 +79,13 @@ class AbstractAgent {
     supportsMcpRemote() {
         return false;
     }
+    /**
+     * Returns whether this agent supports MCP server timeout configuration.
+     * Defaults to false if not overridden.
+     */
+    supportsMcpTimeout() {
+        return false;
+    }
     /**
      * Returns whether this agent has native skills support.
      * Defaults to false if not overridden.

package/dist/agents/AmpAgent.js

@@ -9,5 +9,8 @@ class AmpAgent extends AgentsMdAgent_1.AgentsMdAgent {
     getName() {
         return 'Amp';
     }
+    supportsNativeSkills() {
+        return true;
+    }
 }
 exports.AmpAgent = AmpAgent;

package/dist/agents/CursorAgent.js

@@ -30,5 +30,8 @@ class CursorAgent extends AgentsMdAgent_1.AgentsMdAgent {
     supportsMcpRemote() {
         return true;
     }
+    supportsNativeSkills() {
+        return true;
+    }
 }
 exports.CursorAgent = CursorAgent;

package/dist/agents/GeminiCliAgent.js

@@ -113,5 +113,8 @@ class GeminiCliAgent extends AgentsMdAgent_1.AgentsMdAgent {
     supportsMcpRemote() {
         return true;
     }
+    supportsNativeSkills() {
+        return true;
+    }
 }
 exports.GeminiCliAgent = GeminiCliAgent;

package/dist/agents/KiloCodeAgent.js

@@ -59,5 +59,8 @@ class KiloCodeAgent extends AbstractAgent_1.AbstractAgent {
     supportsMcpRemote() {
         return true;
     }
+    supportsNativeSkills() {
+        return true;
+    }
 }
 exports.KiloCodeAgent = KiloCodeAgent;

package/dist/agents/OpenCodeAgent.js

@@ -95,6 +95,9 @@ class OpenCodeAgent {
     supportsMcpRemote() {
         return true;
     }
+    supportsMcpTimeout() {
+        return true;
+    }
     supportsNativeSkills() {
         return true;
     }

package/dist/agents/RooCodeAgent.js

@@ -135,5 +135,8 @@ class RooCodeAgent {
     getMcpServerKey() {
         return 'mcpServers';
     }
+    supportsNativeSkills() {
+        return true;
+    }
 }
 exports.RooCodeAgent = RooCodeAgent;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SKILLZ_MCP_SERVER_NAME = exports.SKILL_MD_FILENAME = exports.SKILLZ_DIR = exports.VIBE_SKILLS_PATH = exports.GOOSE_SKILLS_PATH = exports.PI_SKILLS_PATH = exports.OPENCODE_SKILLS_PATH = exports.CODEX_SKILLS_PATH = exports.CLAUDE_SKILLS_PATH = exports.RULER_SKILLS_PATH = exports.SKILLS_DIR = exports.DEFAULT_RULES_FILENAME = exports.ERROR_PREFIX = void 0;
+exports.SKILLZ_MCP_SERVER_NAME = exports.SKILL_MD_FILENAME = exports.SKILLZ_DIR = exports.CURSOR_SKILLS_PATH = exports.GEMINI_SKILLS_PATH = exports.ROO_SKILLS_PATH = exports.VIBE_SKILLS_PATH = exports.GOOSE_SKILLS_PATH = exports.PI_SKILLS_PATH = exports.OPENCODE_SKILLS_PATH = exports.CODEX_SKILLS_PATH = exports.CLAUDE_SKILLS_PATH = exports.RULER_SKILLS_PATH = exports.SKILLS_DIR = exports.DEFAULT_RULES_FILENAME = exports.ERROR_PREFIX = void 0;
 exports.actionPrefix = actionPrefix;
 exports.createRulerError = createRulerError;
 exports.logVerbose = logVerbose;
@@ -58,6 +58,9 @@ exports.OPENCODE_SKILLS_PATH = '.opencode/skill';
 exports.PI_SKILLS_PATH = '.pi/skills';
 exports.GOOSE_SKILLS_PATH = '.agents/skills';
 exports.VIBE_SKILLS_PATH = '.vibe/skills';
+exports.ROO_SKILLS_PATH = '.roo/skills';
+exports.GEMINI_SKILLS_PATH = '.gemini/skills';
+exports.CURSOR_SKILLS_PATH = '.cursor/skills';
 exports.SKILLZ_DIR = '.skillz';
 exports.SKILL_MD_FILENAME = 'SKILL.md';
 exports.SKILLZ_MCP_SERVER_NAME = 'skillz';

package/dist/core/SkillsProcessor.js

@@ -42,6 +42,9 @@ exports.propagateSkillsForOpenCode = propagateSkillsForOpenCode;
 exports.propagateSkillsForPi = propagateSkillsForPi;
 exports.propagateSkillsForGoose = propagateSkillsForGoose;
 exports.propagateSkillsForVibe = propagateSkillsForVibe;
+exports.propagateSkillsForRoo = propagateSkillsForRoo;
+exports.propagateSkillsForGemini = propagateSkillsForGemini;
+exports.propagateSkillsForCursor = propagateSkillsForCursor;
 exports.propagateSkillsForSkillz = propagateSkillsForSkillz;
 exports.buildSkillzMcpConfig = buildSkillzMcpConfig;
 const path = __importStar(require("path"));
@@ -79,7 +82,7 @@ async function getSkillsGitignorePaths(projectRoot) {
         return [];
     }
     // Import here to avoid circular dependency
-    const { CLAUDE_SKILLS_PATH, CODEX_SKILLS_PATH, OPENCODE_SKILLS_PATH, PI_SKILLS_PATH, GOOSE_SKILLS_PATH, VIBE_SKILLS_PATH, SKILLZ_DIR, } = await Promise.resolve().then(() => __importStar(require('../constants')));
+    const { CLAUDE_SKILLS_PATH, CODEX_SKILLS_PATH, OPENCODE_SKILLS_PATH, PI_SKILLS_PATH, GOOSE_SKILLS_PATH, VIBE_SKILLS_PATH, ROO_SKILLS_PATH, GEMINI_SKILLS_PATH, CURSOR_SKILLS_PATH, SKILLZ_DIR, } = await Promise.resolve().then(() => __importStar(require('../constants')));
     return [
         path.join(projectRoot, CLAUDE_SKILLS_PATH),
         path.join(projectRoot, CODEX_SKILLS_PATH),
@@ -87,6 +90,9 @@ async function getSkillsGitignorePaths(projectRoot) {
         path.join(projectRoot, PI_SKILLS_PATH),
         path.join(projectRoot, GOOSE_SKILLS_PATH),
         path.join(projectRoot, VIBE_SKILLS_PATH),
+        path.join(projectRoot, ROO_SKILLS_PATH),
+        path.join(projectRoot, GEMINI_SKILLS_PATH),
+        path.join(projectRoot, CURSOR_SKILLS_PATH),
         path.join(projectRoot, SKILLZ_DIR),
     ];
 }
@@ -120,6 +126,9 @@ async function cleanupSkillsDirectories(projectRoot, dryRun, verbose) {
     const piSkillsPath = path.join(projectRoot, constants_1.PI_SKILLS_PATH);
     const gooseSkillsPath = path.join(projectRoot, constants_1.GOOSE_SKILLS_PATH);
     const vibeSkillsPath = path.join(projectRoot, constants_1.VIBE_SKILLS_PATH);
+    const rooSkillsPath = path.join(projectRoot, constants_1.ROO_SKILLS_PATH);
+    const geminiSkillsPath = path.join(projectRoot, constants_1.GEMINI_SKILLS_PATH);
+    const cursorSkillsPath = path.join(projectRoot, constants_1.CURSOR_SKILLS_PATH);
     const skillzPath = path.join(projectRoot, constants_1.SKILLZ_DIR);
     // Clean up .claude/skills
     try {
@@ -205,6 +214,48 @@ async function cleanupSkillsDirectories(projectRoot, dryRun, verbose) {
     catch {
         // Directory doesn't exist, nothing to clean
     }
+    // Clean up .roo/skills
+    try {
+        await fs.access(rooSkillsPath);
+        if (dryRun) {
+            (0, constants_1.logVerboseInfo)(`DRY RUN: Would remove ${constants_1.ROO_SKILLS_PATH}`, verbose, dryRun);
+        }
+        else {
+            await fs.rm(rooSkillsPath, { recursive: true, force: true });
+            (0, constants_1.logVerboseInfo)(`Removed ${constants_1.ROO_SKILLS_PATH} (skills disabled)`, verbose, dryRun);
+        }
+    }
+    catch {
+        // Directory doesn't exist, nothing to clean
+    }
+    // Clean up .gemini/skills
+    try {
+        await fs.access(geminiSkillsPath);
+        if (dryRun) {
+            (0, constants_1.logVerboseInfo)(`DRY RUN: Would remove ${constants_1.GEMINI_SKILLS_PATH}`, verbose, dryRun);
+        }
+        else {
+            await fs.rm(geminiSkillsPath, { recursive: true, force: true });
+            (0, constants_1.logVerboseInfo)(`Removed ${constants_1.GEMINI_SKILLS_PATH} (skills disabled)`, verbose, dryRun);
+        }
+    }
+    catch {
+        // Directory doesn't exist, nothing to clean
+    }
+    // Clean up .cursor/skills
+    try {
+        await fs.access(cursorSkillsPath);
+        if (dryRun) {
+            (0, constants_1.logVerboseInfo)(`DRY RUN: Would remove ${constants_1.CURSOR_SKILLS_PATH}`, verbose, dryRun);
+        }
+        else {
+            await fs.rm(cursorSkillsPath, { recursive: true, force: true });
+            (0, constants_1.logVerboseInfo)(`Removed ${constants_1.CURSOR_SKILLS_PATH} (skills disabled)`, verbose, dryRun);
+        }
+    }
+    catch {
+        // Directory doesn't exist, nothing to clean
+    }
     // Clean up .skillz
     try {
         await fs.access(skillzPath);
@@ -263,7 +314,7 @@ async function propagateSkills(projectRoot, agents, skillsEnabled, verbose, dryR
     }
     // Copy to Claude skills directory if needed
     if (hasNativeSkillsAgent) {
-        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.CLAUDE_SKILLS_PATH} for Claude Code and GitHub Copilot`, verbose, dryRun);
+        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.CLAUDE_SKILLS_PATH} for Claude Code, GitHub Copilot, and Kilo Code`, verbose, dryRun);
         await propagateSkillsForClaude(projectRoot, { dryRun });
         (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.CODEX_SKILLS_PATH} for OpenAI Codex CLI`, verbose, dryRun);
         await propagateSkillsForCodex(projectRoot, { dryRun });
@@ -271,10 +322,16 @@ async function propagateSkills(projectRoot, agents, skillsEnabled, verbose, dryR
         await propagateSkillsForOpenCode(projectRoot, { dryRun });
         (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.PI_SKILLS_PATH} for Pi Coding Agent`, verbose, dryRun);
         await propagateSkillsForPi(projectRoot, { dryRun });
-        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.GOOSE_SKILLS_PATH} for Goose`, verbose, dryRun);
+        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.GOOSE_SKILLS_PATH} for Goose and Amp`, verbose, dryRun);
         await propagateSkillsForGoose(projectRoot, { dryRun });
         (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.VIBE_SKILLS_PATH} for Mistral Vibe`, verbose, dryRun);
         await propagateSkillsForVibe(projectRoot, { dryRun });
+        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.ROO_SKILLS_PATH} for Roo Code`, verbose, dryRun);
+        await propagateSkillsForRoo(projectRoot, { dryRun });
+        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.GEMINI_SKILLS_PATH} for Gemini CLI`, verbose, dryRun);
+        await propagateSkillsForGemini(projectRoot, { dryRun });
+        (0, constants_1.logVerboseInfo)(`Copying skills to ${constants_1.CURSOR_SKILLS_PATH} for Cursor`, verbose, dryRun);
+        await propagateSkillsForCursor(projectRoot, { dryRun });
     }
     // Copy to .skillz directory if needed
     if (hasMcpAgent) {
@@ -582,6 +639,156 @@ async function propagateSkillsForVibe(projectRoot, options) {
     }
     return [];
 }
+/**
+ * Propagates skills for Roo Code by copying .ruler/skills to .roo/skills.
+ * Uses atomic replace to ensure safe overwriting of existing skills.
+ * Returns dry-run steps if dryRun is true, otherwise returns empty array.
+ */
+async function propagateSkillsForRoo(projectRoot, options) {
+    const skillsDir = path.join(projectRoot, constants_1.RULER_SKILLS_PATH);
+    const rooSkillsPath = path.join(projectRoot, constants_1.ROO_SKILLS_PATH);
+    const rooDir = path.dirname(rooSkillsPath);
+    // Check if source skills directory exists
+    try {
+        await fs.access(skillsDir);
+    }
+    catch {
+        // No skills directory - return empty
+        return [];
+    }
+    if (options.dryRun) {
+        return [`Copy skills from ${constants_1.RULER_SKILLS_PATH} to ${constants_1.ROO_SKILLS_PATH}`];
+    }
+    // Ensure .roo directory exists
+    await fs.mkdir(rooDir, { recursive: true });
+    // Use atomic replace: copy to temp, then rename
+    const tempDir = path.join(rooDir, `skills.tmp-${Date.now()}`);
+    try {
+        // Copy to temp directory
+        await (0, SkillsUtils_1.copySkillsDirectory)(skillsDir, tempDir);
+        // Atomically replace the target
+        // First, remove existing target if it exists
+        try {
+            await fs.rm(rooSkillsPath, { recursive: true, force: true });
+        }
+        catch {
+            // Target didn't exist, that's fine
+        }
+        // Rename temp to target
+        await fs.rename(tempDir, rooSkillsPath);
+    }
+    catch (error) {
+        // Clean up temp directory on error
+        try {
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+    return [];
+}
+/**
+ * Propagates skills for Gemini CLI by copying .ruler/skills to .gemini/skills.
+ * Uses atomic replace to ensure safe overwriting of existing skills.
+ * Returns dry-run steps if dryRun is true, otherwise returns empty array.
+ */
+async function propagateSkillsForGemini(projectRoot, options) {
+    const skillsDir = path.join(projectRoot, constants_1.RULER_SKILLS_PATH);
+    const geminiSkillsPath = path.join(projectRoot, constants_1.GEMINI_SKILLS_PATH);
+    const geminiDir = path.dirname(geminiSkillsPath);
+    // Check if source skills directory exists
+    try {
+        await fs.access(skillsDir);
+    }
+    catch {
+        // No skills directory - return empty
+        return [];
+    }
+    if (options.dryRun) {
+        return [`Copy skills from ${constants_1.RULER_SKILLS_PATH} to ${constants_1.GEMINI_SKILLS_PATH}`];
+    }
+    // Ensure .gemini directory exists
+    await fs.mkdir(geminiDir, { recursive: true });
+    // Use atomic replace: copy to temp, then rename
+    const tempDir = path.join(geminiDir, `skills.tmp-${Date.now()}`);
+    try {
+        // Copy to temp directory
+        await (0, SkillsUtils_1.copySkillsDirectory)(skillsDir, tempDir);
+        // Atomically replace the target
+        // First, remove existing target if it exists
+        try {
+            await fs.rm(geminiSkillsPath, { recursive: true, force: true });
+        }
+        catch {
+            // Target didn't exist, that's fine
+        }
+        // Rename temp to target
+        await fs.rename(tempDir, geminiSkillsPath);
+    }
+    catch (error) {
+        // Clean up temp directory on error
+        try {
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+    return [];
+}
+/**
+ * Propagates skills for Cursor by copying .ruler/skills to .cursor/skills.
+ * Uses atomic replace to ensure safe overwriting of existing skills.
+ * Returns dry-run steps if dryRun is true, otherwise returns empty array.
+ */
+async function propagateSkillsForCursor(projectRoot, options) {
+    const skillsDir = path.join(projectRoot, constants_1.RULER_SKILLS_PATH);
+    const cursorSkillsPath = path.join(projectRoot, constants_1.CURSOR_SKILLS_PATH);
+    const cursorDir = path.dirname(cursorSkillsPath);
+    // Check if source skills directory exists
+    try {
+        await fs.access(skillsDir);
+    }
+    catch {
+        // No skills directory - return empty
+        return [];
+    }
+    if (options.dryRun) {
+        return [`Copy skills from ${constants_1.RULER_SKILLS_PATH} to ${constants_1.CURSOR_SKILLS_PATH}`];
+    }
+    // Ensure .cursor directory exists
+    await fs.mkdir(cursorDir, { recursive: true });
+    // Use atomic replace: copy to temp, then rename
+    const tempDir = path.join(cursorDir, `skills.tmp-${Date.now()}`);
+    try {
+        // Copy to temp directory
+        await (0, SkillsUtils_1.copySkillsDirectory)(skillsDir, tempDir);
+        // Atomically replace the target
+        // First, remove existing target if it exists
+        try {
+            await fs.rm(cursorSkillsPath, { recursive: true, force: true });
+        }
+        catch {
+            // Target didn't exist, that's fine
+        }
+        // Rename temp to target
+        await fs.rename(tempDir, cursorSkillsPath);
+    }
+    catch (error) {
+        // Clean up temp directory on error
+        try {
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+    return [];
+}
 /**
  * Propagates skills for MCP agents by copying .ruler/skills to .skillz.
  * Uses atomic replace to ensure safe overwriting of existing skills.

package/dist/core/UnifiedConfigLoader.js

@@ -182,6 +182,9 @@ async function loadUnifiedConfig(options) {
                 if (serverDef.headers && typeof serverDef.headers === 'object') {
                     server.headers = Object.fromEntries(Object.entries(serverDef.headers).filter(([, v]) => typeof v === 'string'));
                 }
+                if (typeof serverDef.timeout === 'number') {
+                    server.timeout = serverDef.timeout;
+                }
                 // Validate server configuration
                 const hasCommand = !!server.command;
                 const hasUrl = !!server.url;
@@ -301,6 +304,9 @@ async function loadUnifiedConfig(options) {
                     if (def.headers && typeof def.headers === 'object') {
                         server.headers = Object.fromEntries(Object.entries(def.headers).filter(([, v]) => typeof v === 'string'));
                     }
+                    if (typeof def.timeout === 'number') {
+                        server.timeout = def.timeout;
+                    }
                     // Derive type
                     if (server.url)
                         server.type = 'remote';

package/dist/core/apply-engine.js

@@ -427,17 +427,49 @@ async function updateGitignoreForMcpFile(dest, projectRoot, generatedPaths, back
         }
     }
 }
+function sanitizeMcpTimeoutsForAgent(agent, mcpJson, dryRun) {
+    if (agent.supportsMcpTimeout?.()) {
+        return mcpJson;
+    }
+    if (!mcpJson.mcpServers || typeof mcpJson.mcpServers !== 'object') {
+        return mcpJson;
+    }
+    const servers = mcpJson.mcpServers;
+    const sanitizedServers = {};
+    const strippedTimeouts = [];
+    for (const [name, serverDef] of Object.entries(servers)) {
+        if (serverDef && typeof serverDef === 'object') {
+            const copy = { ...serverDef };
+            if ('timeout' in copy) {
+                delete copy.timeout;
+                strippedTimeouts.push(name);
+            }
+            sanitizedServers[name] = copy;
+        }
+        else {
+            sanitizedServers[name] = serverDef;
+        }
+    }
+    if (strippedTimeouts.length > 0) {
+        (0, constants_1.logWarn)(`${agent.getName()} does not support MCP server timeout configuration; ignoring timeout for: ${strippedTimeouts.join(', ')}`, dryRun);
+    }
+    return {
+        ...mcpJson,
+        mcpServers: sanitizedServers,
+    };
+}
 async function applyMcpConfiguration(agent, filteredMcpJson, dest, agentConfig, config, projectRoot, cliMcpStrategy, dryRun, verbose, backup = true) {
     // Prevent writing MCP configs outside the project root (e.g., legacy home-directory targets)
     if (!dest.startsWith(projectRoot)) {
         (0, constants_1.logVerbose)(`Skipping MCP config for ${agent.getName()} because target path is outside project: ${dest}`, verbose);
         return;
     }
+    const agentMcpJson = sanitizeMcpTimeoutsForAgent(agent, filteredMcpJson, dryRun);
     if (agent.getIdentifier() === 'openhands') {
-        return await applyOpenHandsMcpConfiguration(filteredMcpJson, dest, dryRun, verbose, backup);
+        return await applyOpenHandsMcpConfiguration(agentMcpJson, dest, dryRun, verbose, backup);
     }
     if (agent.getIdentifier() === 'opencode') {
-        return await applyOpenCodeMcpConfiguration(filteredMcpJson, dest, dryRun, verbose, backup);
+        return await applyOpenCodeMcpConfiguration(agentMcpJson, dest, dryRun, verbose, backup);
     }
     // Agents that handle MCP configuration internally should not have external MCP handling
     if (agent.getIdentifier() === 'zed' ||
@@ -447,7 +479,7 @@ async function applyMcpConfiguration(agent, filteredMcpJson, dest, agentConfig,
         (0, constants_1.logVerbose)(`Skipping external MCP config for ${agent.getName()} - handled internally by agent`, verbose);
         return;
     }
-    return await applyStandardMcpConfiguration(agent, filteredMcpJson, dest, agentConfig, config, cliMcpStrategy, dryRun, verbose, backup);
+    return await applyStandardMcpConfiguration(agent, agentMcpJson, dest, agentConfig, config, cliMcpStrategy, dryRun, verbose, backup);
 }
 async function applyOpenHandsMcpConfiguration(filteredMcpJson, dest, dryRun, verbose, backup = true) {
     if (dryRun) {

package/dist/mcp/propagateOpenCodeMcp.js

@@ -63,6 +63,9 @@ function transformToOpenCodeFormat(rulerMcp) {
             if (serverDef.headers) {
                 openCodeServer.headers = serverDef.headers;
             }
+            if (typeof serverDef.timeout === 'number') {
+                openCodeServer.timeout = serverDef.timeout;
+            }
         }
         else if (isLocalServer(serverDef)) {
             openCodeServer.type = 'local';
@@ -74,6 +77,9 @@ function transformToOpenCodeFormat(rulerMcp) {
             if (serverDef.env) {
                 openCodeServer.environment = serverDef.env;
             }
+            if (typeof serverDef.timeout === 'number') {
+                openCodeServer.timeout = serverDef.timeout;
+            }
         }
         else {
             continue;

package/package.json

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