coder-config 0.45.14 → 0.46.0-beta.10

package/config-loader.js

@@ -22,7 +22,7 @@ const { VERSION, TOOL_PATHS } = require('./lib/constants');
 const { loadJson, saveJson, loadEnvFile, interpolate, resolveEnvVars, copyDirRecursive } = require('./lib/utils');
 const { findProjectRoot, findAllConfigs, mergeConfigs, getConfigPath, collectFilesFromHierarchy, findAllConfigsForTool } = require('./lib/config');
 const { apply, applyForAntigravity, applyForGemini, detectInstalledTools, applyForTools } = require('./lib/apply');
-const { list, add, remove } = require('./lib/mcps');
+const { list, add, remove, listGlobal, addGlobal, removeGlobal } = require('./lib/mcps');
 const { registryList, registryAdd, registryRemove } = require('./lib/registry');
 const { init, show } = require('./lib/init');
 const { memoryList, memoryInit, memoryAdd, memorySearch } = require('./lib/memory');
@@ -138,11 +138,16 @@ class ClaudeConfigManager {
   getToolPaths() { return TOOL_PATHS; }
   applyForTools(projectDir, tools) { return applyForTools(this.registryPath, projectDir, tools); }
 
-  // MCPs
+  // MCPs (project)
   list() { return list(this.registryPath); }
   add(mcpNames) { return add(this.registryPath, this.installDir, mcpNames); }
   remove(mcpNames) { return remove(this.installDir, mcpNames); }
 
+  // MCPs (global - ~/.claude.json)
+  globalList() { return listGlobal(); }
+  globalAdd(mcpNames) { return addGlobal(this.registryPath, mcpNames); }
+  globalRemove(mcpNames) { return removeGlobal(mcpNames); }
+
   // Registry
   registryList() { return registryList(this.registryPath); }
   registryAdd(name, configJson) { return registryAdd(this.registryPath, name, configJson); }

package/lib/apply.js

@@ -29,16 +29,37 @@ function apply(registryPath, projectDir = null) {
     return false;
   }
 
-  const loadedConfigs = configLocations.map(loc => ({
-    ...loc,
-    config: loadJson(loc.configPath)
-  }));
+  const loadedConfigs = configLocations.map(loc => {
+    const rawConfig = loadJson(loc.configPath);
+
+    // Handle ~/.claude.json format (global MCPs under mcpServers key)
+    if (loc.isGlobalClaudeJson && rawConfig) {
+      return {
+        ...loc,
+        config: {
+          include: [],
+          mcpServers: rawConfig.mcpServers || {}
+        }
+      };
+    }
 
-  if (loadedConfigs.length > 1) {
+    return {
+      ...loc,
+      config: rawConfig
+    };
+  });
+
+  // Filter out empty configs and show hierarchy
+  const activeConfigs = loadedConfigs.filter(c => c.config);
+  if (activeConfigs.length > 1) {
     console.log('📚 Config hierarchy (merged):');
-    for (const { dir: d, configPath } of loadedConfigs) {
+    for (const { dir: d, configPath, isGlobalClaudeJson } of activeConfigs) {
       const relPath = d === process.env.HOME ? '~' : path.relative(process.cwd(), d) || '.';
-      console.log(`  • ${relPath}/.claude/mcps.json`);
+      if (isGlobalClaudeJson) {
+        console.log(`  • ~/.claude.json (global MCPs)`);
+      } else {
+        console.log(`  • ${relPath}/.claude/mcps.json`);
+      }
     }
     console.log('');
   }

package/lib/cli.js

@@ -63,6 +63,17 @@ function runCli(manager) {
       manager.remove(args.slice(1));
       break;
 
+    // Global MCPs (~/.claude.json)
+    case 'global':
+      if (args[1] === 'add') {
+        manager.globalAdd(args.slice(2));
+      } else if (args[1] === 'remove' || args[1] === 'rm') {
+        manager.globalRemove(args.slice(2));
+      } else {
+        manager.globalList();
+      }
+      break;
+
     // Registry management
     case 'registry':
       if (args[1] === 'add') {
@@ -371,6 +382,14 @@ ${chalk.dim('Configuration manager for AI coding tools (Claude Code, Gemini CLI,
   ]));
   console.log();
 
+  // Global MCPs (~/.claude.json)
+  console.log(box('Global MCPs', [
+    cmd('global', 'List global MCPs (~/.claude.json)'),
+    cmd('global add <mcp> [mcp...]', 'Add MCP(s) to global config'),
+    cmd('global remove <mcp>', 'Remove MCP from global config'),
+  ]));
+  console.log();
+
   // Memory Commands
   console.log(box('Memory', [
     cmd('memory', 'Show memory status'),

package/lib/config.js

@@ -23,8 +23,11 @@ function findProjectRoot(startDir = process.cwd()) {
 }
 
 /**
- * Find ALL .claude/mcps.json configs from cwd up to root (and ~/.claude)
+ * Find ALL .claude/mcps.json configs from cwd up to root (and ~/.claude.json for global)
  * Returns array from root to leaf (so child overrides parent when merged)
+ *
+ * Global MCPs: Read from ~/.claude.json under mcpServers key (Claude Code's native format)
+ * Project MCPs: Read from .claude/mcps.json files in hierarchy
  */
 function findAllConfigs(startDir = process.cwd()) {
   const configs = [];
@@ -32,6 +35,7 @@ function findAllConfigs(startDir = process.cwd()) {
   const root = path.parse(dir).root;
   const homeDir = process.env.HOME || '';
 
+  // Find project configs in hierarchy
   while (dir !== root) {
     const configPath = path.join(dir, '.claude', 'mcps.json');
     if (fs.existsSync(configPath)) {
@@ -40,10 +44,21 @@ function findAllConfigs(startDir = process.cwd()) {
     dir = path.dirname(dir);
   }
 
-  const homeConfig = path.join(homeDir, '.claude', 'mcps.json');
-  if (fs.existsSync(homeConfig)) {
-    if (!configs.some(c => c.configPath === homeConfig)) {
-      configs.unshift({ dir: homeDir, configPath: homeConfig });
+  // Read global MCPs from ~/.claude.json (Claude Code's native config)
+  const claudeJsonPath = path.join(homeDir, '.claude.json');
+  if (fs.existsSync(claudeJsonPath)) {
+    configs.unshift({
+      dir: homeDir,
+      configPath: claudeJsonPath,
+      isGlobalClaudeJson: true  // Flag to handle different format
+    });
+  }
+
+  // Legacy: Also check ~/.claude/mcps.json for backwards compatibility
+  const legacyHomeConfig = path.join(homeDir, '.claude', 'mcps.json');
+  if (fs.existsSync(legacyHomeConfig)) {
+    if (!configs.some(c => c.configPath === legacyHomeConfig)) {
+      configs.unshift({ dir: homeDir, configPath: legacyHomeConfig, isLegacy: true });
     }
   }
 

package/lib/constants.js

@@ -2,7 +2,7 @@
  * Constants and tool path configurations
  */
 
-const VERSION = '0.45.14';
+const VERSION = '0.46.0-beta.10';
 
 // Tool-specific path configurations
 const TOOL_PATHS = {
@@ -10,14 +10,16 @@ const TOOL_PATHS = {
     name: 'Claude Code',
     icon: 'sparkles',
     color: 'orange',
-    globalConfig: '~/.claude/mcps.json',
+    // Global MCPs are embedded in ~/.claude.json under mcpServers key (no separate file)
+    globalConfig: '~/.claude.json',
     globalSettings: '~/.claude/settings.json',
+    globalMcpKey: 'mcpServers', // MCPs are under this key in globalConfig
     projectFolder: '.claude',
     projectRules: '.claude/rules',
     projectCommands: '.claude/commands',
     projectWorkflows: '.claude/workflows',
     projectInstructions: 'CLAUDE.md',
-    outputFile: '.mcp.json',
+    outputFile: '.mcp.json', // Per-project MCPs go here (shared via git)
     supportsEnvInterpolation: true,
   },
   gemini: {

package/lib/mcps.js

@@ -2,10 +2,19 @@
  * MCP add/remove commands
  */
 
+const fs = require('fs');
 const path = require('path');
 const { loadJson, saveJson } = require('./utils');
 const { findProjectRoot } = require('./config');
 
+/**
+ * Get path to Claude's global config (~/.claude.json)
+ */
+function getGlobalConfigPath() {
+  const homeDir = process.env.HOME || '';
+  return path.join(homeDir, '.claude.json');
+}
+
 /**
  * List available MCPs
  */
@@ -132,8 +141,122 @@ function remove(installDir, mcpNames) {
   return removed.length > 0;
 }
 
+/**
+ * List global MCPs from ~/.claude.json
+ */
+function listGlobal() {
+  const configPath = getGlobalConfigPath();
+  const config = loadJson(configPath);
+
+  if (!config || !config.mcpServers) {
+    console.log('\n📚 Global MCPs (~/.claude.json): None configured\n');
+    return;
+  }
+
+  const mcps = Object.keys(config.mcpServers);
+  console.log('\n📚 Global MCPs (~/.claude.json):\n');
+  for (const name of mcps) {
+    const server = config.mcpServers[name];
+    const type = server.type || 'stdio';
+    console.log(`  • ${name} (${type})`);
+  }
+  console.log(`\n  Total: ${mcps.length} global MCP(s)\n`);
+}
+
+/**
+ * Add MCP(s) to global config (~/.claude.json)
+ */
+function addGlobal(registryPath, mcpNames) {
+  if (!mcpNames || mcpNames.length === 0) {
+    console.error('Usage: coder-config global add <mcp-name> [mcp-name...]');
+    return false;
+  }
+
+  const configPath = getGlobalConfigPath();
+  let config = loadJson(configPath) || {};
+
+  if (!config.mcpServers) {
+    config.mcpServers = {};
+  }
+
+  const registry = loadJson(registryPath);
+  const added = [];
+  const notFound = [];
+  const alreadyExists = [];
+
+  for (const name of mcpNames) {
+    if (config.mcpServers[name]) {
+      alreadyExists.push(name);
+    } else if (registry?.mcpServers?.[name]) {
+      config.mcpServers[name] = registry.mcpServers[name];
+      added.push(name);
+    } else {
+      notFound.push(name);
+    }
+  }
+
+  if (added.length) {
+    saveJson(configPath, config);
+    console.log(`✓ Added to ~/.claude.json: ${added.join(', ')}`);
+    console.log('  (Global MCPs apply to all projects)');
+  }
+  if (alreadyExists.length) {
+    console.log(`Already in global config: ${alreadyExists.join(', ')}`);
+  }
+  if (notFound.length) {
+    console.log(`Not in registry: ${notFound.join(', ')}`);
+    console.log('  (Use "coder-config list" to see available MCPs)');
+  }
+
+  return added.length > 0;
+}
+
+/**
+ * Remove MCP(s) from global config (~/.claude.json)
+ */
+function removeGlobal(mcpNames) {
+  if (!mcpNames || mcpNames.length === 0) {
+    console.error('Usage: coder-config global remove <mcp-name> [mcp-name...]');
+    return false;
+  }
+
+  const configPath = getGlobalConfigPath();
+  let config = loadJson(configPath);
+
+  if (!config || !config.mcpServers) {
+    console.error('No global MCPs configured in ~/.claude.json');
+    return false;
+  }
+
+  const removed = [];
+  const notFound = [];
+
+  for (const name of mcpNames) {
+    if (config.mcpServers[name]) {
+      delete config.mcpServers[name];
+      removed.push(name);
+    } else {
+      notFound.push(name);
+    }
+  }
+
+  if (removed.length) {
+    saveJson(configPath, config);
+    console.log(`✓ Removed from ~/.claude.json: ${removed.join(', ')}`);
+  }
+  if (notFound.length) {
+    console.log(`Not in global config: ${notFound.join(', ')}`);
+  }
+
+  return removed.length > 0;
+}
+
 module.exports = {
   list,
   add,
   remove,
+  listGlobal,
+  addGlobal,
+  removeGlobal,
+  getGlobalConfigPath,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coder-config",
-  "version": "0.45.14",
+  "version": "0.46.0-beta.10",
   "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",

package/scripts/release.sh

@@ -1,45 +1,78 @@
 #!/bin/bash
-# Auto-release script: bumps patch version, commits, tags, and pushes
-# Usage: ./scripts/release.sh "commit message"
-#        ./scripts/release.sh "commit message" --minor
-#        ./scripts/release.sh "commit message" --major
+# Stable release script
+# Usage: npm run release              # Interactive, prompts for version
+#        npm run release -- 0.46.0    # Specific version
+#        npm run release -- --minor   # Bump minor version
+#        npm run release -- --major   # Bump major version
 
 set -e
 
-if [ -z "$1" ]; then
-  echo "Usage: $0 \"commit message\" [--minor|--major]"
-  exit 1
-fi
-
-MESSAGE="$1"
-BUMP_TYPE="${2:---patch}"
-
 # Get current version
-CURRENT_VERSION=$(node -p "require('./package.json').version")
+CURRENT_VERSION=$(node -p "require('./package.json').version.split('-')[0]")
 
-# Parse version
+# Parse current version
 IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
 
-# Bump based on type
-case "$BUMP_TYPE" in
-  --major)
-    MAJOR=$((MAJOR + 1))
-    MINOR=0
-    PATCH=0
-    ;;
-  --minor)
-    MINOR=$((MINOR + 1))
-    PATCH=0
-    ;;
-  --patch|*)
+# Determine new version
+if [ -n "$1" ]; then
+  case "$1" in
+    --major)
+      MAJOR=$((MAJOR + 1))
+      MINOR=0
+      PATCH=0
+      NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+      ;;
+    --minor)
+      MINOR=$((MINOR + 1))
+      PATCH=0
+      NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+      ;;
+    --patch)
+      PATCH=$((PATCH + 1))
+      NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+      ;;
+    *)
+      # Assume it's a version number
+      NEW_VERSION="$1"
+      ;;
+  esac
+else
+  # Interactive mode
+  echo ""
+  echo "Current version: $CURRENT_VERSION"
+  echo ""
+  echo "Enter new version (or press Enter for patch bump):"
+  read -r INPUT_VERSION
+
+  if [ -z "$INPUT_VERSION" ]; then
     PATCH=$((PATCH + 1))
-    ;;
-esac
+    NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+  else
+    NEW_VERSION="$INPUT_VERSION"
+  fi
+fi
+
+# Validate version format
+if ! [[ "$NEW_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Invalid version format: $NEW_VERSION"
+  echo "Expected format: X.Y.Z (e.g., 0.46.0)"
+  exit 1
+fi
 
-NEW_VERSION="$MAJOR.$MINOR.$PATCH"
 TAG="v$NEW_VERSION"
 
-echo "Releasing $CURRENT_VERSION -> $NEW_VERSION"
+echo ""
+echo "📦 Releasing: $CURRENT_VERSION -> $NEW_VERSION"
+echo ""
+
+# Check for uncommitted changes
+if [ -n "$(git status --porcelain)" ]; then
+  echo "⚠️  You have uncommitted changes:"
+  git status --short
+  echo ""
+  echo "Commit them first, or press Enter to continue anyway:"
+  read -r
+fi
 
 # Update version in package.json
 node -e "
@@ -52,20 +85,22 @@ fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
 # Sync version to other files
 npm run version:sync
 
-# Stage all changes
-git add -A
+# Stage version files
+git add package.json lib/constants.js ui/package.json
 
-# Commit
-git commit -m "$MESSAGE
+# Commit (skip hooks)
+SKIP_AUTO_PUSH=1 git commit -m "release: v$NEW_VERSION"
 
-Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>"
-
-# Tag
+# Create tag
 git tag "$TAG"
 
-# Push with tags
+# Push commit and tag
+echo ""
+echo "🚀 Pushing $TAG..."
 git push && git push --tags
 
 echo ""
 echo "✅ Released $TAG"
-echo "   CI will publish to npm automatically"
+echo ""
+echo "CI will publish to npm with 'latest' tag."
+echo "Users will get this version with: npm install -g coder-config"