coder-config 0.51.0 → 0.51.2-beta

package/lib/apply.js

@@ -318,12 +318,20 @@ function applyForGemini(registryPath, projectDir = null) {
 
 /**
  * Generate MCP config for Codex CLI
+ * Codex reads MCPs from [mcp_servers.<name>] tables in ~/.codex/config.toml
  */
 function applyForCodex(registryPath, projectDir = null) {
   const dir = projectDir || findProjectRoot() || process.cwd();
-  const paths = TOOL_PATHS.codex;
   const homeDir = process.env.HOME || '';
 
+  let TOML;
+  try {
+    TOML = require('@iarna/toml');
+  } catch (e) {
+    console.error('Error: @iarna/toml not available - cannot generate Codex config');
+    return false;
+  }
+
   const registry = loadJson(registryPath);
   if (!registry) {
     console.error('Error: Could not load MCP registry');
@@ -355,12 +363,12 @@ function applyForCodex(registryPath, projectDir = null) {
     }
   }
 
-  const output = { mcpServers: {} };
+  const mcpServers = {};
 
   if (mergedConfig.include && Array.isArray(mergedConfig.include)) {
     for (const name of mergedConfig.include) {
       if (registry.mcpServers && registry.mcpServers[name]) {
-        output.mcpServers[name] = interpolate(registry.mcpServers[name], env);
+        mcpServers[name] = interpolate(registry.mcpServers[name], env);
       }
     }
   }
@@ -368,23 +376,51 @@ function applyForCodex(registryPath, projectDir = null) {
   if (mergedConfig.mcpServers) {
     for (const [name, config] of Object.entries(mergedConfig.mcpServers)) {
       if (name.startsWith('_')) continue;
-      output.mcpServers[name] = interpolate(config, env);
+      mcpServers[name] = interpolate(config, env);
     }
   }
 
-  // Generate per-project config (.codex/mcp.json)
-  const projectOutputDir = path.join(dir, '.codex');
-  const projectOutputPath = path.join(projectOutputDir, 'mcp.json');
+  // Merge MCPs into ~/.codex/config.toml under [mcp_servers]
+  const configPath = path.join(homeDir, '.codex', 'config.toml');
+  const configDir = path.dirname(configPath);
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true });
+  }
 
-  if (!fs.existsSync(projectOutputDir)) {
-    fs.mkdirSync(projectOutputDir, { recursive: true });
+  let existingConfig = {};
+  if (fs.existsSync(configPath)) {
+    try {
+      existingConfig = TOML.parse(fs.readFileSync(configPath, 'utf8'));
+    } catch (e) {
+      console.warn('Warning: Could not parse existing config.toml, preserving as-is');
+      existingConfig = {};
+    }
   }
 
-  saveJson(projectOutputPath, output);
+  // Merge mcp_servers — coder-config managed servers replace, user servers preserved
+  const existingMcpServers = existingConfig.mcp_servers || {};
+  const managedTag = '_managed_by_coder_config';
 
-  const count = Object.keys(output.mcpServers).length;
-  console.log(`✓ Generated ${projectOutputPath} (Codex CLI)`);
-  console.log(`  └─ ${count} MCP(s): ${Object.keys(output.mcpServers).join(', ')}`);
+  // Remove previously managed servers
+  for (const [name, server] of Object.entries(existingMcpServers)) {
+    if (server && server[managedTag]) {
+      delete existingMcpServers[name];
+    }
+  }
+
+  // Add new managed servers (tag them so we can clean up on next apply)
+  for (const [name, config] of Object.entries(mcpServers)) {
+    existingMcpServers[name] = { ...config, [managedTag]: true };
+  }
+
+  existingConfig.mcp_servers = existingMcpServers;
+
+  const tomlContent = TOML.stringify(existingConfig);
+  fs.writeFileSync(configPath, tomlContent, 'utf8');
+
+  const count = Object.keys(mcpServers).length;
+  console.log(`✓ Updated ${configPath} (Codex CLI)`);
+  console.log(`  └─ ${count} managed MCP(s): ${Object.keys(mcpServers).join(', ')}`);
 
   return true;
 }

package/lib/constants.js

@@ -2,7 +2,7 @@
  * Constants and tool path configurations
  */
 
-const VERSION = '0.51.0';
+const VERSION = '0.51.2-beta';
 
 // Tool-specific path configurations
 const TOOL_PATHS = {
@@ -17,10 +17,15 @@ const TOOL_PATHS = {
     projectFolder: '.claude',
     projectRules: '.claude/rules',
     projectCommands: '.claude/commands',
+    projectSkills: '.claude/skills',
+    projectAgents: '.claude/agents',
     projectWorkflows: '.claude/workflows',
     projectInstructions: 'CLAUDE.md',
     outputFile: '.mcp.json', // Per-project MCPs go here (shared via git)
+    settingsSchema: 'https://json.schemastore.org/claude-code-settings.json',
     supportsEnvInterpolation: true,
+    // MCP scope names (CC terminology)
+    mcpScopes: { local: 'Per-project in ~/.claude.json', user: 'Global in ~/.claude.json' },
   },
   gemini: {
     name: 'Gemini CLI',
@@ -56,14 +61,16 @@ const TOOL_PATHS = {
     name: 'Codex CLI',
     icon: 'terminal',
     color: 'green',
-    globalConfig: '~/.codex/config.json',
-    globalMcpConfig: '~/.codex/mcps.json',
+    globalConfig: '~/.codex/config.toml',
+    globalMcpConfig: '~/.codex/mcps.json', // coder-config internal registry
     projectFolder: '.codex',
-    projectConfig: '.codex/mcps.json',
+    projectConfig: '.codex/mcps.json', // coder-config internal registry
     projectRules: '.codex/rules',
-    projectInstructions: 'CODEX.md',
-    outputFile: '.codex/mcp.json',
+    projectInstructions: 'AGENTS.md', // Codex uses AGENTS.md, not CODEX.md
+    projectInstructionsOverride: 'AGENTS.override.md',
+    outputFile: '~/.codex/config.toml', // MCPs go into [mcp_servers] in config.toml
     supportsEnvInterpolation: true,
+    configFormat: 'toml', // TOML, not JSON
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coder-config",
-  "version": "0.51.0",
+  "version": "0.51.2-beta",
   "description": "Configuration manager for AI coding tools - Claude Code, Gemini CLI, Codex CLI, Antigravity. Manage MCPs, rules, permissions, memory, and workstreams.",
   "author": "regression.io",
   "main": "config-loader.js",