mcpick 0.0.11 → 0.0.13

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # mcpick
 
+## 0.0.13
+
+### Patch Changes
+
+- c985c28: Headers lost on disable/enable: pass -H flags in CLI, sync
+  config→registry before disable
+
+## 0.0.12
+
+### Patch Changes
+
+- b4f38d5: fix: discover externally-added servers and use atomic JSON
+  writes
+
 ## 0.0.11
 
 ### Patch Changes

package/dist/cli/commands/disable.js

@@ -1,4 +1,5 @@
 import { defineCommand } from 'citty';
+import { get_all_available_servers } from '../../core/registry.js';
 import { remove_mcp_via_cli } from '../../utils/claude-cli.js';
 import { error } from '../output.js';
 export default defineCommand({
@@ -23,6 +24,8 @@ export default defineCommand({
         if (!['local', 'project', 'user'].includes(scope)) {
             error(`Invalid scope: ${scope}. Use local, project, or user.`);
         }
+        // Sync config→registry before removing so headers/env are preserved
+        await get_all_available_servers();
         const result = await remove_mcp_via_cli(args.server);
         if (!result.success) {
             error(result.error || 'Failed to disable server');

package/dist/cli/commands/remove.js

@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty';
-import { read_server_registry, write_server_registry, } from '../../core/registry.js';
+import { get_all_available_servers, read_server_registry, write_server_registry, } from '../../core/registry.js';
 import { remove_mcp_via_cli } from '../../utils/claude-cli.js';
 import { error } from '../output.js';
 export default defineCommand({
@@ -15,17 +15,21 @@ export default defineCommand({
         },
     },
     async run({ args }) {
+        const all_servers = await get_all_available_servers();
+        const found = all_servers.find((s) => s.name === args.server);
+        if (!found) {
+            error(`Server '${args.server}' not found. Run 'mcpick list' to see available servers.`);
+        }
+        // Remove from registry if present
         const registry = await read_server_registry();
         const index = registry.servers.findIndex((s) => s.name === args.server);
-        if (index < 0) {
-            error(`Server '${args.server}' not found in registry. Run 'mcpick list' to see available servers.`);
+        if (index >= 0) {
+            registry.servers.splice(index, 1);
+            await write_server_registry(registry);
         }
-        // Remove from registry
-        registry.servers.splice(index, 1);
-        await write_server_registry(registry);
-        // Also disable via CLI (best effort)
+        // Remove via CLI
         await remove_mcp_via_cli(args.server);
-        console.log(`Removed '${args.server}' from registry`);
+        console.log(`Removed '${args.server}'`);
     },
 });
 //# sourceMappingURL=remove.js.map

package/dist/core/config.js

@@ -1,4 +1,5 @@
-import { access, readFile, writeFile } from 'node:fs/promises';
+import { access, readFile } from 'node:fs/promises';
+import { atomic_json_write } from '../utils/atomic-write.js';
 import { get_claude_config_path, get_current_project_path, get_project_mcp_json_path, } from '../utils/paths.js';
 import { validate_claude_config } from './validation.js';
 export async function read_claude_config() {
@@ -19,20 +20,10 @@ export async function read_claude_config() {
     }
 }
 export async function write_claude_config(config) {
-    const config_path = get_claude_config_path();
-    // Read the entire existing file to preserve all other sections
-    let existing_config = {};
-    try {
-        const existing_content = await readFile(config_path, 'utf-8');
-        existing_config = JSON.parse(existing_content);
-    }
-    catch (error) {
-        // If file doesn't exist or is invalid, start with empty object
-    }
-    // Only update the mcpServers section, preserve everything else
-    existing_config.mcpServers = config.mcpServers;
-    const config_content = JSON.stringify(existing_config, null, 2);
-    await writeFile(config_path, config_content, 'utf-8');
+    await atomic_json_write(get_claude_config_path(), (existing) => {
+        existing.mcpServers = config.mcpServers;
+        return existing;
+    });
 }
 export function get_enabled_servers(config) {
     if (!config.mcpServers) {

package/dist/core/plugin-cache.js

@@ -1,7 +1,8 @@
 import { exec } from 'node:child_process';
-import { readdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { readdir, readFile, rm } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { promisify } from 'node:util';
+import { atomic_json_write } from '../utils/atomic-write.js';
 import { get_installed_plugins_path, get_known_marketplaces_path, get_marketplace_manifest_path, get_plugin_cache_dir, } from '../utils/paths.js';
 const execAsync = promisify(exec);
 const EMPTY_INSTALLED = {
@@ -19,7 +20,7 @@ export async function read_installed_plugins() {
     }
 }
 export async function write_installed_plugins(data) {
-    await writeFile(get_installed_plugins_path(), JSON.stringify(data, null, 2), 'utf-8');
+    await atomic_json_write(get_installed_plugins_path(), () => data);
 }
 export async function read_known_marketplaces() {
     try {

package/dist/core/registry.js

@@ -40,7 +40,33 @@ export async function add_server_to_registry(server) {
     await write_server_registry(registry);
 }
 export async function get_all_available_servers() {
+    const { get_enabled_servers, read_claude_config } = await import('./config.js');
     const registry = await read_server_registry();
+    const config = await read_claude_config();
+    const config_servers = get_enabled_servers(config);
+    // Merge: config is the live truth, so update registry entries with config data
+    const config_by_name = new Map(config_servers.map((s) => [s.name, s]));
+    const known_names = new Set();
+    let registry_updated = false;
+    for (let i = 0; i < registry.servers.length; i++) {
+        const name = registry.servers[i].name;
+        known_names.add(name);
+        const config_server = config_by_name.get(name);
+        if (config_server) {
+            registry.servers[i] = config_server;
+            registry_updated = true;
+        }
+    }
+    for (const server of config_servers) {
+        if (!known_names.has(server.name)) {
+            registry.servers.push(server);
+            registry_updated = true;
+        }
+    }
+    // Persist updated data back to registry so it survives disable/enable cycles
+    if (registry_updated) {
+        await write_server_registry(registry);
+    }
     return registry.servers;
 }
 export async function sync_servers_to_registry(servers) {

package/dist/core/settings.js

@@ -1,4 +1,5 @@
-import { access, readFile, writeFile } from 'node:fs/promises';
+import { access, readFile } from 'node:fs/promises';
+import { atomic_json_write } from '../utils/atomic-write.js';
 import { get_claude_settings_path } from '../utils/paths.js';
 export async function read_claude_settings() {
     const settings_path = get_claude_settings_path();
@@ -17,20 +18,12 @@ export async function read_claude_settings() {
     }
 }
 export async function write_claude_settings(updates) {
-    const settings_path = get_claude_settings_path();
-    let existing = {};
-    try {
-        const content = await readFile(settings_path, 'utf-8');
-        existing = JSON.parse(content);
-    }
-    catch {
-        // Start with empty if file doesn't exist
-    }
-    // Merge only the keys we're updating
-    for (const [key, value] of Object.entries(updates)) {
-        existing[key] = value;
-    }
-    await writeFile(settings_path, JSON.stringify(existing, null, 2), 'utf-8');
+    await atomic_json_write(get_claude_settings_path(), (existing) => {
+        for (const [key, value] of Object.entries(updates)) {
+            existing[key] = value;
+        }
+        return existing;
+    });
 }
 /**
  * Parse enabledPlugins into structured list.

package/dist/utils/atomic-write.js

@@ -0,0 +1,27 @@
+import { readFile, rename, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+/**
+ * Atomically write a JSON file with fresh-read merging.
+ *
+ * 1. Re-reads the file right before writing to pick up concurrent changes
+ * 2. Applies the merge function to the freshest data
+ * 3. Writes to a temp file, then renames (atomic on same filesystem)
+ */
+export async function atomic_json_write(file_path, merge) {
+    // Read the freshest version right before writing
+    let existing = {};
+    try {
+        const content = await readFile(file_path, 'utf-8');
+        existing = JSON.parse(content);
+    }
+    catch {
+        // File doesn't exist or invalid — start fresh
+    }
+    const merged = merge(existing);
+    const content = JSON.stringify(merged, null, 2);
+    // Write to temp file then rename for atomicity
+    const tmp_path = join(dirname(file_path), `.${Date.now()}.tmp`);
+    await writeFile(tmp_path, content, 'utf-8');
+    await rename(tmp_path, file_path);
+}
+//# sourceMappingURL=atomic-write.js.map

package/dist/utils/claude-cli.js

@@ -59,10 +59,15 @@ function build_add_command(server, scope) {
         }
     }
     else {
-        // HTTP or SSE transport
+        // HTTP or SSE transport — URL must come before header flags
         if ('url' in server && server.url) {
             parts.push(shell_escape(server.url));
         }
+        if ('headers' in server && server.headers) {
+            for (const [key, value] of Object.entries(server.headers)) {
+                parts.push('-H', shell_escape(`${key}: ${value}`));
+            }
+        }
     }
     return parts.join(' ');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcpick",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Dynamic MCP server and plugin configuration manager for Claude Code",
   "type": "module",
   "main": "./dist/index.js",