mcpick 0.0.23 → 0.0.25

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { _ as get_profiles_dir, a as get_claude_settings_path, c as get_disabled_hooks_path, f as get_marketplaces_dir, g as get_profile_path, i as get_claude_config_path, m as get_plugin_backup_filename, n as get_backup_filename, p as get_mcpick_dir, r as get_backups_dir, t as ensure_directory_exists, y as get_server_registry_path } from "./paths-BPISiJi4.js";
-import { r as validate_server_registry, t as validate_claude_config } from "./validation-xMlbgGCF.js";
-import { a as get_enabled_servers, c as write_claude_config, n as create_config_from_servers, o as get_enabled_servers_for_scope, s as read_claude_config } from "./config-DzMmTJYL.js";
+import { n as validate_mcp_server, r as validate_server_registry, t as validate_claude_config } from "./validation-CfPAjPJ5.js";
+import { i as get_enabled_servers, o as read_claude_config, s as write_claude_config } from "./config-Bzh374VP.js";
 import { a as redact_url, i as redact_text } from "./redact-wBMtzbno.js";
-import { d as refresh_all_marketplaces, l as read_known_marketplaces, n as clear_plugin_caches, r as get_cached_plugins_info, t as clean_orphaned_versions, u as read_marketplace_manifest } from "./plugin-cache-BSgB42wa.js";
+import { d as refresh_all_marketplaces, l as read_known_marketplaces, n as clear_plugin_caches, r as get_cached_plugins_info, t as clean_orphaned_versions, u as read_marketplace_manifest } from "./plugin-cache-Dw1I2YuO.js";
 import { cancel, confirm, intro, isCancel, log, multiselect, note, outro, select, text } from "@clack/prompts";
 import { access, mkdir, readFile, readdir, rename, rm, unlink, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
@@ -215,7 +215,7 @@ async function get_all_hooks() {
 * Checks both cache and marketplace source paths since Claude Code reads from both.
 */
 async function get_all_plugin_hooks() {
-	const { read_installed_plugins } = await import("./plugin-cache-BSgB42wa.js").then((n) => n.s);
+	const { read_installed_plugins } = await import("./plugin-cache-Dw1I2YuO.js").then((n) => n.s);
 	const { get_marketplaces_dir } = await import("./paths-BPISiJi4.js").then((n) => n.b);
 	const installed = await read_installed_plugins();
 	const entries = [];
@@ -377,7 +377,7 @@ async function read_json_file(path) {
 	}
 }
 async function write_json_file(path, data) {
-	await safe_json_write(path, data, 2);
+	return safe_json_write(path, data, 2);
 }
 function parse_json_or_jsonc(content) {
 	try {
@@ -466,13 +466,13 @@ function remove_trailing_commas(content) {
 	}
 	return result;
 }
-function string_record(value) {
+function string_record$1(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	const result = {};
 	for (const [key, item] of Object.entries(value)) if (typeof item === "string") result[key] = item;
 	return Object.keys(result).length > 0 ? result : void 0;
 }
-function string_array(value) {
+function string_array$1(value) {
 	if (!Array.isArray(value)) return void 0;
 	const values = value.filter((item) => typeof item === "string");
 	return values.length > 0 ? values : void 0;
@@ -488,10 +488,10 @@ function normalize_mcp_server(name, config) {
 	const url = typeof config.httpUrl === "string" ? config.httpUrl : typeof config.serverUrl === "string" ? config.serverUrl : typeof config.url === "string" ? config.url : void 0;
 	const client_options = {};
 	for (const [key, value] of Object.entries(config)) if (!client_options_to_skip.has(key)) client_options[key] = value;
-	const command_array = string_array(config.command);
+	const command_array = string_array$1(config.command);
 	const command = typeof config.command === "string" ? config.command : command_array?.[0];
-	const args = string_array(config.args) ?? command_array?.slice(1);
-	const env = string_record(config.env) ?? string_record(config.environment);
+	const args = string_array$1(config.args) ?? command_array?.slice(1);
+	const env = string_record$1(config.env) ?? string_record$1(config.environment);
 	const disabled = typeof config.disabled === "boolean" ? config.disabled : typeof config.enabled === "boolean" ? !config.enabled : void 0;
 	return {
 		name,
@@ -500,7 +500,7 @@ function normalize_mcp_server(name, config) {
 		...args && args.length > 0 ? { args } : {},
 		...url ? { url } : {},
 		...env ? { env } : {},
-		...string_record(config.headers) ? { headers: string_record(config.headers) } : {},
+		...string_record$1(config.headers) ? { headers: string_record$1(config.headers) } : {},
 		...typeof config.description === "string" ? { description: config.description } : {},
 		...typeof disabled === "boolean" ? { disabled } : {},
 		...Object.keys(client_options).length > 0 ? { client_options } : {}
@@ -537,6 +537,9 @@ function portable_to_json(server, mode) {
 	if (typeof server.disabled === "boolean") set_server_enabled(result, !server.disabled, mode);
 	return result;
 }
+function portable_server_map(servers, mode) {
+	return Object.fromEntries(servers.map((server) => [server.name, portable_to_json(server, mode)]));
+}
 function create_json_adapter(options) {
 	return {
 		id: options.id,
@@ -557,28 +560,33 @@ function create_json_adapter(options) {
 			const enabled = new Set(enabled_names);
 			for (const [name, config] of Object.entries(servers)) set_server_enabled(config, enabled.has(name), options.disabledMode ?? "disabled");
 			data[options.serverKey] = servers;
-			await write_json_file(location.path, data);
+			return write_json_file(location.path, data);
 		},
 		async write_server(location, server) {
 			const data = await read_json_file(location.path) ?? {};
 			const servers = get_server_record(data, options.serverKey);
 			servers[server.name] = portable_to_json(server, options.disabledMode ?? "disabled");
 			data[options.serverKey] = servers;
-			await write_json_file(location.path, data);
+			return write_json_file(location.path, data);
 		},
 		async write_server_config(location, name, config) {
 			const data = await read_json_file(location.path) ?? {};
 			const servers = get_server_record(data, options.serverKey);
 			servers[name] = config;
 			data[options.serverKey] = servers;
-			await write_json_file(location.path, data);
+			return write_json_file(location.path, data);
 		},
 		async remove_server(location, name) {
 			const data = await read_json_file(location.path) ?? {};
 			const servers = get_server_record(data, options.serverKey);
 			delete servers[name];
 			data[options.serverKey] = servers;
-			await write_json_file(location.path, data);
+			return write_json_file(location.path, data);
+		},
+		async write_servers(location, servers) {
+			const data = await read_json_file(location.path) ?? {};
+			data[options.serverKey] = portable_server_map(servers, options.disabledMode ?? "disabled");
+			return write_json_file(location.path, data);
 		}
 	};
 }
@@ -621,6 +629,24 @@ const client_adapters = [
 			const project_config = projects[process.cwd()];
 			if (!project_config || typeof project_config !== "object" || Array.isArray(project_config)) return [];
 			return read_server_map(project_config, "mcpServers");
+		},
+		async write_servers(location, servers) {
+			const data = await read_json_file(location.path) ?? (location.scope === "project" ? {} : { projects: {} });
+			const mcp_servers = portable_server_map(servers, "disabled");
+			if (location.scope === "project") {
+				data.mcpServers = mcp_servers;
+				return write_json_file(location.path, data);
+			}
+			if (location.scope === "user") {
+				data.mcpServers = mcp_servers;
+				return write_json_file(get_claude_config_path(), data);
+			}
+			const projects = data.projects && typeof data.projects === "object" && !Array.isArray(data.projects) ? data.projects : {};
+			const project_config = projects[process.cwd()] && typeof projects[process.cwd()] === "object" && !Array.isArray(projects[process.cwd()]) ? projects[process.cwd()] : {};
+			project_config.mcpServers = mcp_servers;
+			projects[process.cwd()] = project_config;
+			data.projects = projects;
+			return write_json_file(get_claude_config_path(), data);
 		}
 	},
 	create_json_adapter({
@@ -717,6 +743,17 @@ const client_adapters = [
 function get_client_adapter(id) {
 	return client_adapters.find((adapter) => adapter.id === id) ?? null;
 }
+function mutation_result(adapter, location, operation, servers, write_result, enabledCount) {
+	return {
+		operation,
+		client: adapter.id,
+		scope: location.scope,
+		location: write_result.path,
+		servers,
+		...enabledCount !== void 0 ? { enabledCount } : {},
+		...write_result.backup_path ? { backup_path: write_result.backup_path } : {}
+	};
+}
 function resolve_client_location(adapter, scope, path) {
 	let locations = adapter.locations();
 	if (path) locations = locations.filter((location) => location.path === path);
@@ -727,26 +764,44 @@ function resolve_client_location(adapter, scope, path) {
 }
 async function add_client_server(adapter, location, server) {
 	if (!adapter.write_server) throw new Error(`${adapter.label} support cannot add servers yet.`);
-	await adapter.write_server(location, server);
+	const write_result = await adapter.write_server(location, server);
+	return mutation_result(adapter, location, "add", [server.name], write_result);
 }
 async function add_client_server_config(adapter, location, name, config) {
 	if (!adapter.write_server_config) throw new Error(`${adapter.label} support cannot add servers yet.`);
-	await adapter.write_server_config(location, name, config);
+	const write_result = await adapter.write_server_config(location, name, config);
+	return mutation_result(adapter, location, "add", [name], write_result);
 }
 async function remove_client_server(adapter, location, server_name) {
 	if (!adapter.remove_server) throw new Error(`${adapter.label} support cannot remove servers yet.`);
-	await adapter.remove_server(location, server_name);
+	const write_result = await adapter.remove_server(location, server_name);
+	return mutation_result(adapter, location, "remove", [server_name], write_result);
 }
-async function set_client_server_enabled(adapter, location, server_name, enabled) {
+async function set_client_enabled_servers(adapter, location, enabled_names) {
 	if (!adapter.writeEnabled) throw new Error(`${adapter.label} support is read-only.`);
+	const servers = await adapter.readLocation(location);
+	const known_names = new Set(servers.map((server) => server.name));
+	const unknown_names = enabled_names.filter((name) => !known_names.has(name));
+	if (unknown_names.length > 0) throw new Error(`Server '${unknown_names[0]}' not found at ${location.path}.`);
+	return mutation_result(adapter, location, "set-enabled", enabled_names, await adapter.writeEnabled(location, enabled_names), enabled_names.length);
+}
+async function replace_client_servers(adapter, location, servers) {
+	if (!adapter.write_servers) throw new Error(`${adapter.label} support cannot replace server profiles yet.`);
+	const write_result = await adapter.write_servers(location, servers);
+	return mutation_result(adapter, location, "replace", servers.map((server) => server.name), write_result, servers.filter((server) => server.disabled !== true).length);
+}
+async function set_client_server_enabled(adapter, location, server_name, enabled) {
 	const servers = await adapter.readLocation(location);
 	const server = servers.find((candidate) => candidate.name === server_name);
 	if (!server) throw new Error(`Server '${server_name}' not found at ${location.path}.`);
 	const enabled_names = new Set(servers.filter((candidate) => candidate.disabled !== true).map((candidate) => candidate.name));
 	if (enabled) enabled_names.add(server.name);
 	else enabled_names.delete(server.name);
-	await adapter.writeEnabled(location, [...enabled_names]);
-	return enabled_names.size;
+	return {
+		...await set_client_enabled_servers(adapter, location, [...enabled_names]),
+		operation: enabled ? "enable" : "disable",
+		servers: [server_name]
+	};
 }
 async function list_client_locations() {
 	return await Promise.all(client_adapters.flatMap((adapter) => adapter.locations().map(async (location) => ({
@@ -758,16 +813,56 @@ async function list_client_locations() {
 }
 //#endregion
 //#region src/core/registry.ts
+function is_object$1(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function portable_to_mcp_server(server) {
+	return validate_mcp_server({
+		name: server.name,
+		...server.transport !== "stdio" ? { type: server.transport } : {},
+		...server.command ? { command: server.command } : {},
+		...server.args ? { args: server.args } : {},
+		...server.url ? { url: server.url } : {},
+		...server.env ? { env: server.env } : {},
+		...server.headers ? { headers: server.headers } : {},
+		...server.description ? { description: server.description } : {}
+	});
+}
+function mcp_server_to_portable(server) {
+	const { name, ...config } = server;
+	return normalize_mcp_server(name, config);
+}
+function parse_portable_registry(data) {
+	if (!is_object$1(data) || !Array.isArray(data.servers)) throw new Error("Invalid server registry: expected servers array");
+	if (data.version === 3) return validate_server_registry(data);
+	return validate_server_registry({
+		version: 3,
+		servers: data.servers.map((server) => {
+			if (!is_object$1(server)) throw new Error("Invalid server registry entry");
+			if (typeof server.transport === "string") {
+				if (typeof server.name !== "string") throw new Error("Invalid server registry entry");
+				return normalize_mcp_server(server.name, server);
+			}
+			return mcp_server_to_portable(validate_mcp_server(server));
+		})
+	});
+}
 async function read_server_registry() {
 	const registry_path = get_server_registry_path();
 	try {
 		await access(registry_path);
 		const registry_content = await readFile(registry_path, "utf-8");
-		return validate_server_registry(JSON.parse(registry_content));
+		const parsed_registry = JSON.parse(registry_content);
+		const registry = parse_portable_registry(parsed_registry);
+		if (parsed_registry.version !== 3) await write_server_registry(registry);
+		return registry;
 	} catch (error) {
 		if (error instanceof Error && "code" in error && error.code === "ENOENT") {
 			await ensure_directory_exists(get_mcpick_dir());
-			const default_registry = { servers: [] };
+			const default_registry = {
+				version: 3,
+				servers: []
+			};
 			await write_server_registry(default_registry);
 			return default_registry;
 		}
@@ -781,13 +876,14 @@ async function write_server_registry(registry) {
 }
 async function add_server_to_registry(server) {
 	const registry = await read_server_registry();
+	const portable = mcp_server_to_portable(server);
 	const existing_index = registry.servers.findIndex((s) => s.name === server.name);
-	if (existing_index >= 0) registry.servers[existing_index] = server;
-	else registry.servers.push(server);
+	if (existing_index >= 0) registry.servers[existing_index] = portable;
+	else registry.servers.push(portable);
 	await write_server_registry(registry);
 }
 async function get_all_available_servers() {
-	const { get_enabled_servers, read_claude_config } = await import("./config-DzMmTJYL.js").then((n) => n.t);
+	const { get_enabled_servers, read_claude_config } = await import("./config-Bzh374VP.js").then((n) => n.t);
 	const registry = await read_server_registry();
 	const config_servers = get_enabled_servers(await read_claude_config());
 	const config_by_name = new Map(config_servers.map((s) => [s.name, s]));
@@ -798,25 +894,16 @@ async function get_all_available_servers() {
 		known_names.add(name);
 		const config_server = config_by_name.get(name);
 		if (config_server) {
-			registry.servers[i] = config_server;
+			registry.servers[i] = mcp_server_to_portable(config_server);
 			registry_updated = true;
 		}
 	}
 	for (const server of config_servers) if (!known_names.has(server.name)) {
-		registry.servers.push(server);
+		registry.servers.push(mcp_server_to_portable(server));
 		registry_updated = true;
 	}
 	if (registry_updated) await write_server_registry(registry);
-	return registry.servers;
-}
-async function sync_servers_to_registry(servers) {
-	const registry = await read_server_registry();
-	servers.forEach((server) => {
-		const existing_index = registry.servers.findIndex((s) => s.name === server.name);
-		if (existing_index >= 0) registry.servers[existing_index] = server;
-		else registry.servers.push(server);
-	});
-	await write_server_registry(registry);
+	return registry.servers.map(portable_to_mcp_server);
 }
 function parse_backups(prefix, pattern) {
 	return async () => {
@@ -842,6 +929,110 @@ function parse_backups(prefix, pattern) {
 const list_backups = parse_backups("mcp-servers-", /mcp-servers-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})(\d{2})\.json/);
 const list_plugin_backups = parse_backups("plugins-", /plugins-(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})(\d{2})\.json/);
 //#endregion
+//#region src/commands/edit-config.ts
+async function edit_config() {
+	try {
+		const sorted_adapters = [...client_adapters].sort((a, b) => b.label.localeCompare(a.label));
+		const client_id = await select({
+			message: "Which MCP client do you want to edit?",
+			options: sorted_adapters.map((adapter) => ({
+				value: adapter.id,
+				label: adapter.label
+			})),
+			initialValue: sorted_adapters[0]?.id
+		});
+		if (typeof client_id === "symbol") return;
+		const adapter = client_adapters.find((candidate) => candidate.id === client_id);
+		if (!adapter) return;
+		if (adapter.id === "claude-code") {
+			await edit_claude_config(adapter);
+			return;
+		}
+		await edit_client_config(adapter);
+	} catch (error) {
+		throw new Error(`Failed to edit configuration: ${error instanceof Error ? error.message : "Unknown error"}`);
+	}
+}
+async function edit_client_config(adapter) {
+	if (!adapter.writeEnabled) {
+		note(`${adapter.label} support is read-only for now.`);
+		return;
+	}
+	const location = await select_config_location(adapter);
+	if (!location) return;
+	const servers = await adapter.readLocation(location);
+	if (servers.length === 0) {
+		note(`No MCP servers found at ${location.path}.`);
+		return;
+	}
+	const selected_names = await multiselect({
+		message: `Toggle MCP servers for ${adapter.label}:`,
+		options: servers.map((server) => ({
+			value: server.name,
+			label: server.name,
+			hint: server_hint(server)
+		})),
+		initialValues: servers.filter((server) => server.disabled !== true).map((server) => server.name),
+		required: false
+	});
+	if (typeof selected_names === "symbol") return;
+	const mutation = await set_client_enabled_servers(adapter, location, selected_names);
+	note(`Configuration updated!\nClient: ${adapter.label}\nConfig: ${mutation.location}\n` + (mutation.backup_path ? `Backup: ${mutation.backup_path}\n` : "") + `Enabled servers: ${selected_names.length}`);
+}
+async function select_config_location(adapter) {
+	const locations = adapter.locations();
+	if (locations.length === 1) return locations[0];
+	const location_path = await select({
+		message: `Which ${adapter.label} configuration do you want to edit?`,
+		options: locations.map((location) => ({
+			value: location.path,
+			label: `${location.scope} — ${location.description}`,
+			hint: location.path
+		}))
+	});
+	if (typeof location_path === "symbol") return null;
+	return locations.find((location) => location.path === location_path) ?? null;
+}
+function server_hint(server) {
+	return [
+		server.disabled === true ? "off" : "on",
+		server.command ? [server.command, ...server.args ?? []].join(" ") : server.url ? redact_url(server.url) : server.transport,
+		server.description
+	].filter(Boolean).join(" · ");
+}
+async function edit_claude_config(adapter) {
+	const location = await select_config_location(adapter);
+	if (!location) return;
+	const registry_servers = (await get_all_available_servers()).map((server) => {
+		const { name, ...config } = server;
+		return normalize_mcp_server(name, config);
+	});
+	const current_servers = await adapter.readLocation(location);
+	const servers_by_name = /* @__PURE__ */ new Map();
+	for (const server of registry_servers) servers_by_name.set(server.name, server);
+	for (const server of current_servers) if (!servers_by_name.has(server.name)) servers_by_name.set(server.name, server);
+	const all_servers = [...servers_by_name.values()];
+	if (all_servers.length === 0) {
+		note("No MCP servers found in this Claude Code config or registry. Add servers with the CLI first.");
+		return;
+	}
+	const currently_enabled = current_servers.filter((server) => server.disabled !== true).map((server) => server.name);
+	const selected_server_names = await multiselect({
+		message: `Select MCP servers for ${location.description}:`,
+		options: all_servers.map((server) => ({
+			value: server.name,
+			label: server.name,
+			hint: server_hint(server)
+		})),
+		initialValues: currently_enabled,
+		required: false
+	});
+	if (typeof selected_server_names === "symbol") return;
+	const selected_servers = all_servers.filter((server) => selected_server_names.includes(server.name));
+	const mutation = await replace_client_servers(adapter, location, selected_servers);
+	note(`Configuration updated!\nClient: ${adapter.label}\nConfig: ${mutation.location}\n` + (mutation.backup_path ? `Backup: ${mutation.backup_path}\n` : "") + `Enabled servers: ${selected_servers.length}`);
+}
+//#endregion
 //#region src/utils/claude-cli.ts
 const exec_file_async$1 = promisify(execFile);
 /**
@@ -1272,16 +1463,6 @@ async function marketplace_list_via_cli() {
 	}
 }
 /**
-* Get the scope description for display
-*/
-function get_scope_description(scope) {
-	switch (scope) {
-		case "local": return "This project only (default)";
-		case "project": return "Shared via .mcp.json (version controlled)";
-		case "user": return "Global - all projects";
-	}
-}
-/**
 * Validate a plugin or marketplace manifest via Claude CLI
 */
 async function validate_plugin_via_cli(path) {
@@ -1374,165 +1555,6 @@ async function mcp_reset_project_choices_via_cli() {
 		};
 	}
 }
-/**
-* Get scope options for select prompt
-*/
-function get_scope_options() {
-	return [
-		{
-			value: "local",
-			label: "Local",
-			hint: "This project only (default)"
-		},
-		{
-			value: "project",
-			label: "Project",
-			hint: "Shared via .mcp.json (git)"
-		},
-		{
-			value: "user",
-			label: "User (Global)",
-			hint: "Available in all projects"
-		}
-	];
-}
-//#endregion
-//#region src/commands/edit-config.ts
-async function edit_config() {
-	try {
-		const client_id = await select({
-			message: "Which MCP client do you want to edit?",
-			options: client_adapters.map((adapter) => ({
-				value: adapter.id,
-				label: adapter.label
-			})),
-			initialValue: "claude-code"
-		});
-		if (typeof client_id === "symbol") return;
-		const adapter = client_adapters.find((candidate) => candidate.id === client_id);
-		if (!adapter) return;
-		if (adapter.id === "claude-code") {
-			await edit_claude_config();
-			return;
-		}
-		await edit_client_config(adapter);
-	} catch (error) {
-		throw new Error(`Failed to edit configuration: ${error instanceof Error ? error.message : "Unknown error"}`);
-	}
-}
-async function edit_client_config(adapter) {
-	if (!adapter.writeEnabled) {
-		note(`${adapter.label} support is read-only for now.`);
-		return;
-	}
-	const location = await select_config_location(adapter);
-	if (!location) return;
-	const servers = await adapter.readLocation(location);
-	if (servers.length === 0) {
-		note(`No MCP servers found at ${location.path}.`);
-		return;
-	}
-	const selected_names = await multiselect({
-		message: `Toggle MCP servers for ${adapter.label}:`,
-		options: servers.map((server) => ({
-			value: server.name,
-			label: server.name,
-			hint: server_hint(server)
-		})),
-		initialValues: servers.filter((server) => server.disabled !== true).map((server) => server.name),
-		required: false
-	});
-	if (typeof selected_names === "symbol") return;
-	await adapter.writeEnabled(location, selected_names);
-	note(`Configuration updated!\nClient: ${adapter.label}\nConfig: ${location.path}\nEnabled servers: ${selected_names.length}`);
-}
-async function select_config_location(adapter) {
-	const locations = adapter.locations();
-	if (locations.length === 1) return locations[0];
-	const location_path = await select({
-		message: `Which ${adapter.label} configuration do you want to edit?`,
-		options: locations.map((location) => ({
-			value: location.path,
-			label: `${location.scope} — ${location.description}`,
-			hint: location.path
-		}))
-	});
-	if (typeof location_path === "symbol") return null;
-	return locations.find((location) => location.path === location_path) ?? null;
-}
-function server_hint(server) {
-	return [
-		server.disabled === true ? "off" : "on",
-		server.command ? [server.command, ...server.args ?? []].join(" ") : server.url ? redact_url(server.url) : server.transport,
-		server.description
-	].filter(Boolean).join(" · ");
-}
-async function edit_claude_config() {
-	const cli_available = await check_claude_cli();
-	const scope = await select({
-		message: "Which Claude Code configuration do you want to edit?",
-		options: get_scope_options(),
-		initialValue: "local"
-	});
-	if (typeof scope === "symbol") return;
-	const current_config = await read_claude_config();
-	let all_servers = await get_all_available_servers();
-	if (all_servers.length === 0 && current_config.mcpServers) {
-		const current_servers = get_enabled_servers(current_config);
-		if (current_servers.length > 0) {
-			await sync_servers_to_registry(current_servers);
-			all_servers = current_servers;
-			note(`Imported ${current_servers.length} servers from your .claude.json file into registry.`);
-		}
-	}
-	if (all_servers.length === 0) {
-		note("No MCP servers found in .claude.json or registry. Add servers with the CLI first.");
-		return;
-	}
-	const currently_enabled = await get_enabled_servers_for_scope(scope);
-	const selected_server_names = await multiselect({
-		message: `Select MCP servers for ${get_scope_description(scope)}:`,
-		options: all_servers.map((server) => ({
-			value: server.name,
-			label: server.name,
-			hint: server.description || ""
-		})),
-		initialValues: currently_enabled,
-		required: false
-	});
-	if (typeof selected_server_names === "symbol") return;
-	const selected_servers = all_servers.filter((server) => selected_server_names.includes(server.name));
-	const servers_to_add = selected_server_names.filter((name) => !currently_enabled.includes(name));
-	const servers_to_remove = currently_enabled.filter((name) => !selected_server_names.includes(name));
-	if (cli_available && (scope === "local" || scope === "project")) {
-		let error_count = 0;
-		for (const name of servers_to_add) {
-			const server = all_servers.find((s) => s.name === name);
-			if (server) {
-				const result = await add_mcp_via_cli(server, scope);
-				if (!result.success) {
-					error_count++;
-					log.warn(`Failed to add ${name}: ${result.error}`);
-				}
-			}
-		}
-		for (const name of servers_to_remove) {
-			const result = await remove_mcp_via_cli(name, scope);
-			if (!result.success) {
-				error_count++;
-				log.warn(`Failed to remove ${name}: ${result.error}`);
-			}
-		}
-		await sync_servers_to_registry(selected_servers);
-		if (error_count > 0) note(`Configuration updated with ${error_count} errors.\nScope: ${get_scope_description(scope)}\nAdded: ${servers_to_add.length}, Removed: ${servers_to_remove.length}`);
-		else note(`Configuration updated!\nScope: ${get_scope_description(scope)}\nEnabled servers: ${selected_servers.length}`);
-	} else {
-		await write_claude_config(create_config_from_servers(selected_servers));
-		await sync_servers_to_registry(selected_servers);
-		if (!cli_available && scope !== "user") log.warn(`Claude CLI not available. Changes written to ~/.claude.json (user scope) instead of ${scope} scope.`);
-		note(`Configuration updated!\nEnabled servers: ${selected_servers.length}`);
-	}
-}
 //#endregion
 //#region src/commands/edit-plugins.ts
 async function handle_toggle() {
@@ -1697,127 +1719,13 @@ async function edit_plugins() {
 	}
 }
 //#endregion
-//#region src/commands/manage-cache.ts
-function format_status_line(p) {
-	const markers = [];
-	if (p.isVersionStale) markers.push(`version: ${p.installedVersion} → ${p.latestVersion}`);
-	if (p.isShaStale) markers.push("commits behind");
-	if (p.orphanedVersions.length > 0) markers.push(`${p.orphanedVersions.length} orphaned`);
-	const status = markers.length > 0 ? `[stale: ${markers.join(", ")}]` : "[up to date]";
-	return `${p.name}@${p.marketplace}  v${p.installedVersion}  ${status}`;
-}
-async function handle_status() {
-	const plugins = await get_cached_plugins_info();
-	if (plugins.length === 0) {
-		log.info("No cached plugins found.");
-		return;
-	}
-	note(plugins.map(format_status_line).join("\n"), "Plugin Cache Status");
-}
-async function handle_clear() {
-	const plugins = await get_cached_plugins_info();
-	if (plugins.length === 0) {
-		log.info("No cached plugins to clear.");
-		return;
-	}
-	const selected = await multiselect({
-		message: "Select plugins to clear cache for:",
-		options: plugins.map((p) => {
-			const stale = p.isVersionStale || p.isShaStale;
-			return {
-				value: p.key,
-				label: `${p.name}@${p.marketplace}`,
-				hint: stale ? `v${p.installedVersion} → ${p.latestVersion ?? "unknown"} (stale)` : `v${p.installedVersion}`
-			};
-		}),
-		initialValues: plugins.filter((p) => p.isVersionStale || p.isShaStale).map((p) => p.key)
-	});
-	if (isCancel(selected) || selected.length === 0) return;
-	const should_clear = await confirm({ message: `Clear cache for ${selected.length} plugin(s)? This will also refresh the marketplace.` });
-	if (isCancel(should_clear) || !should_clear) return;
-	const result = await clear_plugin_caches(selected);
-	for (const key of result.cleared) log.success(`Cleared: ${key}`);
-	for (const err of result.errors) log.error(`Error: ${err}`);
-	if (result.cleared.length > 0) note("Run /reload-plugins in Claude Code or restart your session to apply changes.", "Next Steps");
-}
-async function handle_clean_orphaned() {
-	const should_clean = await confirm({ message: "Remove all orphaned plugin version directories?" });
-	if (isCancel(should_clean) || !should_clean) return;
-	const result = await clean_orphaned_versions();
-	if (result.cleaned === 0) log.info("No orphaned versions found.");
-	else {
-		for (const p of result.paths) log.success(`Removed: ${p}`);
-		log.info(`Cleaned ${result.cleaned} orphaned version(s).`);
-	}
-}
-async function handle_refresh() {
-	const should_refresh = await confirm({ message: "Refresh all marketplace clones (git pull)?" });
-	if (isCancel(should_refresh) || !should_refresh) return;
-	const results = await refresh_all_marketplaces();
-	if (results.size === 0) {
-		log.info("No marketplaces configured.");
-		return;
-	}
-	for (const [name, result] of results) if (result.success) log.success(`${name}: refreshed`);
-	else log.error(`${name}: ${result.error}`);
-}
-async function manage_cache() {
-	while (true) {
-		const action = await select({
-			message: "Plugin cache management:",
-			options: [
-				{
-					value: "status",
-					label: "View cache status",
-					hint: "Show plugins with staleness info"
-				},
-				{
-					value: "clear",
-					label: "Clear plugin caches",
-					hint: "Refresh marketplace + clear selected caches"
-				},
-				{
-					value: "clean-orphaned",
-					label: "Clean orphaned versions",
-					hint: "Remove old version directories"
-				},
-				{
-					value: "refresh",
-					label: "Refresh marketplaces",
-					hint: "Git pull all marketplace clones"
-				},
-				{
-					value: "back",
-					label: "Back",
-					hint: "Return to main menu"
-				}
-			]
-		});
-		if (isCancel(action) || action === "back") return;
-		switch (action) {
-			case "status":
-				await handle_status();
-				break;
-			case "clear":
-				await handle_clear();
-				break;
-			case "clean-orphaned":
-				await handle_clean_orphaned();
-				break;
-			case "refresh":
-				await handle_refresh();
-				break;
-		}
-	}
-}
-//#endregion
-//#region src/core/hook-state.ts
-async function read_disabled_hooks() {
-	try {
-		const content = await readFile(get_disabled_hooks_path(), "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return [];
+//#region src/core/hook-state.ts
+async function read_disabled_hooks() {
+	try {
+		const content = await readFile(get_disabled_hooks_path(), "utf-8");
+		return JSON.parse(content);
+	} catch {
+		return [];
 	}
 }
 async function write_disabled_hooks(entries) {
@@ -1976,6 +1884,121 @@ async function redisable_restored_hooks(restored) {
 	};
 }
 //#endregion
+//#region src/commands/manage-cache.ts
+function format_status_line(p) {
+	const markers = [];
+	if (p.isVersionStale) markers.push(`version: ${p.installedVersion} → ${p.latestVersion}`);
+	if (p.isShaStale) markers.push("commits behind");
+	if (p.orphanedVersions.length > 0) markers.push(`${p.orphanedVersions.length} orphaned`);
+	const status = markers.length > 0 ? `[stale: ${markers.join(", ")}]` : "[up to date]";
+	return `${p.name}@${p.marketplace}  v${p.installedVersion}  ${status}`;
+}
+async function handle_status() {
+	const plugins = await get_cached_plugins_info();
+	if (plugins.length === 0) {
+		log.info("No cached plugins found.");
+		return;
+	}
+	note(plugins.map(format_status_line).join("\n"), "Plugin Cache Status");
+}
+async function handle_clear() {
+	const plugins = await get_cached_plugins_info();
+	if (plugins.length === 0) {
+		log.info("No cached plugins to clear.");
+		return;
+	}
+	const selected = await multiselect({
+		message: "Select plugins to clear cache for:",
+		options: plugins.map((p) => {
+			const stale = p.isVersionStale || p.isShaStale;
+			return {
+				value: p.key,
+				label: `${p.name}@${p.marketplace}`,
+				hint: stale ? `v${p.installedVersion} → ${p.latestVersion ?? "unknown"} (stale)` : `v${p.installedVersion}`
+			};
+		}),
+		initialValues: plugins.filter((p) => p.isVersionStale || p.isShaStale).map((p) => p.key)
+	});
+	if (isCancel(selected) || selected.length === 0) return;
+	const should_clear = await confirm({ message: `Clear cache for ${selected.length} plugin(s)? This will also refresh the marketplace.` });
+	if (isCancel(should_clear) || !should_clear) return;
+	const result = await clear_plugin_caches(selected);
+	for (const key of result.cleared) log.success(`Cleared: ${key}`);
+	if (result.redisabledHooks?.success) log.success(`Re-disabled restored hooks: ${result.redisabledHooks.success}`);
+	for (const err of result.errors) log.error(`Error: ${err}`);
+	if (result.cleared.length > 0) note("Run /reload-plugins in Claude Code or restart your session to apply changes.", "Next Steps");
+}
+async function handle_clean_orphaned() {
+	const should_clean = await confirm({ message: "Remove all orphaned plugin version directories?" });
+	if (isCancel(should_clean) || !should_clean) return;
+	const result = await clean_orphaned_versions();
+	if (result.cleaned === 0) log.info("No orphaned versions found.");
+	else {
+		for (const p of result.paths) log.success(`Removed: ${p}`);
+		log.info(`Cleaned ${result.cleaned} orphaned version(s).`);
+	}
+}
+async function handle_refresh() {
+	const should_refresh = await confirm({ message: "Refresh all marketplace clones (git pull)?" });
+	if (isCancel(should_refresh) || !should_refresh) return;
+	const results = await refresh_all_marketplaces();
+	if (results.size === 0) {
+		log.info("No marketplaces configured.");
+		return;
+	}
+	for (const [name, result] of results) if (result.success) log.success(`${name}: refreshed`);
+	else log.error(`${name}: ${result.error}`);
+}
+async function manage_cache() {
+	while (true) {
+		const action = await select({
+			message: "Plugin cache management:",
+			options: [
+				{
+					value: "status",
+					label: "View cache status",
+					hint: "Show plugins with staleness info"
+				},
+				{
+					value: "clear",
+					label: "Clear plugin caches",
+					hint: "Refresh marketplace + clear selected caches"
+				},
+				{
+					value: "clean-orphaned",
+					label: "Clean orphaned versions",
+					hint: "Remove old version directories"
+				},
+				{
+					value: "refresh",
+					label: "Refresh marketplaces",
+					hint: "Git pull all marketplace clones"
+				},
+				{
+					value: "back",
+					label: "Back",
+					hint: "Return to main menu"
+				}
+			]
+		});
+		if (isCancel(action) || action === "back") return;
+		switch (action) {
+			case "status":
+				await handle_status();
+				break;
+			case "clear":
+				await handle_clear();
+				break;
+			case "clean-orphaned":
+				await handle_clean_orphaned();
+				break;
+			case "refresh":
+				await handle_refresh();
+				break;
+		}
+	}
+}
+//#endregion
 //#region src/commands/manage-hooks.ts
 function format_hook(entry) {
 	const detail = entry.handler.command || entry.handler.url || entry.handler.prompt || "(unknown)";
@@ -2517,41 +2540,144 @@ function format_time_ago(date) {
 }
 //#endregion
 //#region src/core/profile.ts
-async function load_profile(name) {
+function is_object(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function string_record(value) {
+	if (!is_object(value)) return void 0;
+	const result = {};
+	for (const [key, item] of Object.entries(value)) if (typeof item === "string") result[key] = item;
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+function boolean_record(value) {
+	if (!is_object(value)) return void 0;
+	const result = {};
+	for (const [key, item] of Object.entries(value)) if (typeof item === "boolean") result[key] = item;
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+function string_array(value) {
+	if (!Array.isArray(value)) return void 0;
+	const result = value.filter((item) => typeof item === "string");
+	return result.length > 0 ? result : void 0;
+}
+function parse_portable_server(value) {
+	if (!is_object(value) || typeof value.name !== "string") return null;
+	const transport = value.transport === "http" || value.transport === "sse" || value.transport === "stdio" ? value.transport : "stdio";
+	const client_options = is_object(value.client_options) ? value.client_options : void 0;
+	return {
+		name: value.name,
+		transport,
+		...typeof value.command === "string" ? { command: value.command } : {},
+		...string_array(value.args) ? { args: string_array(value.args) } : {},
+		...typeof value.url === "string" ? { url: value.url } : {},
+		...string_record(value.env) ? { env: string_record(value.env) } : {},
+		...string_record(value.headers) ? { headers: string_record(value.headers) } : {},
+		...typeof value.description === "string" ? { description: value.description } : {},
+		...typeof value.disabled === "boolean" ? { disabled: value.disabled } : {},
+		...client_options ? { client_options } : {}
+	};
+}
+async function read_profile_json(name) {
 	const profile_path = get_profile_path(name);
 	try {
 		await access(profile_path);
-		const content = await readFile(profile_path, "utf-8");
-		const parsed = JSON.parse(content);
-		let config;
-		if (parsed.mcpServers) config = validate_claude_config(parsed);
-		else if (!parsed.enabledPlugins) config = validate_claude_config({ mcpServers: parsed });
-		else config = validate_claude_config({ mcpServers: parsed.mcpServers || {} });
-		return {
-			config,
-			enabledPlugins: parsed.enabledPlugins
-		};
+		return JSON.parse(await readFile(profile_path, "utf-8"));
 	} catch (error) {
 		if (error instanceof Error && "code" in error && error.code === "ENOENT") throw new Error(`Profile '${name}' not found at ${profile_path}`);
 		throw error;
 	}
 }
+function legacy_profile_to_claude_config(parsed) {
+	if (parsed.mcpServers) return validate_claude_config(parsed);
+	if (!parsed.enabledPlugins && !parsed.plugins) return validate_claude_config({ mcpServers: parsed });
+	return validate_claude_config({ mcpServers: parsed.mcpServers || {} });
+}
+function claude_config_to_portable(config) {
+	return Object.entries(config.mcpServers || {}).map(([name, server]) => normalize_mcp_server(name, server));
+}
+function portable_to_claude_config(servers) {
+	const mcpServers = {};
+	for (const server of servers) {
+		const config = {};
+		if (server.transport !== "stdio") config.type = server.transport;
+		if (server.command) config.command = server.command;
+		if (server.args) config.args = server.args;
+		if (server.url) config.url = server.url;
+		if (server.env) config.env = server.env;
+		if (server.headers) config.headers = server.headers;
+		if (server.description) config.description = server.description;
+		mcpServers[server.name] = config;
+	}
+	return validate_claude_config({ mcpServers });
+}
+async function load_portable_profile(name) {
+	const parsed = await read_profile_json(name);
+	const plugins = boolean_record(parsed.plugins) ?? boolean_record(parsed.enabledPlugins);
+	if (Array.isArray(parsed.servers)) return {
+		version: 2,
+		servers: parsed.servers.map(parse_portable_server).filter((server) => !!server),
+		...plugins ? { plugins } : {},
+		...is_object(parsed.client_overrides) ? { client_overrides: parsed.client_overrides } : {}
+	};
+	return {
+		version: 2,
+		servers: claude_config_to_portable(legacy_profile_to_claude_config(parsed)),
+		...plugins ? { plugins } : {}
+	};
+}
+async function apply_profile_to_claude(name) {
+	const profile = await load_portable_profile(name);
+	await write_claude_config(portable_to_claude_config(profile.servers));
+	let pluginCount = 0;
+	if (profile.plugins) {
+		await write_claude_settings({ enabledPlugins: profile.plugins });
+		pluginCount = Object.keys(profile.plugins).length;
+	}
+	return {
+		profile: name,
+		serverCount: profile.servers.length,
+		pluginCount,
+		client: "claude-code",
+		scope: "user"
+	};
+}
+async function apply_profile_to_client(input) {
+	const adapter = get_client_adapter(input.client);
+	if (!adapter) throw new Error(`Invalid client: ${input.client}`);
+	const location = resolve_client_location(adapter, input.scope, input.location);
+	const profile = await load_portable_profile(input.name);
+	const mutation = await replace_client_servers(adapter, location, profile.servers);
+	let pluginCount = 0;
+	if (adapter.id === "claude-code" && profile.plugins) {
+		await write_claude_settings({ enabledPlugins: profile.plugins });
+		pluginCount = Object.keys(profile.plugins).length;
+	}
+	return {
+		profile: input.name,
+		serverCount: profile.servers.length,
+		pluginCount,
+		client: adapter.id,
+		scope: location.scope,
+		location: mutation.location,
+		...mutation.backup_path ? { backup_path: mutation.backup_path } : {}
+	};
+}
 async function list_profiles() {
 	const profiles_dir = get_profiles_dir();
 	try {
 		await access(profiles_dir);
-		const json_files = (await readdir(profiles_dir)).filter((f) => f.endsWith(".json"));
+		const files = (await readdir(profiles_dir)).filter((file) => file.endsWith(".json"));
 		const profiles = [];
-		for (const file of json_files) try {
+		for (const file of files) try {
+			const name = file.replace(/\.json$/, "");
 			const path = get_profile_path(file);
-			const content = await readFile(path, "utf-8");
-			const parsed = JSON.parse(content);
-			const servers = parsed.mcpServers || parsed;
-			const plugins = parsed.enabledPlugins || {};
+			const parsed = JSON.parse(await readFile(path, "utf-8"));
+			const servers = Array.isArray(parsed.servers) ? parsed.servers : parsed.mcpServers || parsed;
+			const plugins = parsed.plugins || parsed.enabledPlugins || {};
 			profiles.push({
-				name: file.replace(".json", ""),
+				name,
 				path,
-				serverCount: Object.keys(servers).length,
+				serverCount: Array.isArray(servers) ? servers.length : Object.keys(servers).length,
 				pluginCount: Object.keys(plugins).length
 			});
 		} catch {}
@@ -2560,21 +2686,53 @@ async function list_profiles() {
 		return [];
 	}
 }
+async function save_portable_profile(name, servers, plugins) {
+	await ensure_directory_exists(get_profiles_dir());
+	const profile_data = {
+		version: 2,
+		servers,
+		...plugins && Object.keys(plugins).length > 0 ? { plugins } : {}
+	};
+	await safe_json_write(get_profile_path(name), profile_data, 2);
+}
 async function save_profile(name) {
 	const config = await read_claude_config();
 	const settings = await read_claude_settings();
-	const servers = config.mcpServers || {};
+	const servers = get_enabled_servers(config).map((server) => normalize_mcp_server(server.name, server));
 	const plugins = settings.enabledPlugins || {};
-	const server_count = Object.keys(servers).length;
-	const plugin_count = Object.keys(plugins).length;
-	if (server_count === 0 && plugin_count === 0) throw new Error("No MCP servers or plugins configured to save");
-	await ensure_directory_exists(get_profiles_dir());
-	const profile_data = { mcpServers: servers };
-	if (plugin_count > 0) profile_data.enabledPlugins = plugins;
-	await safe_json_write(get_profile_path(name), profile_data, 2);
+	if (servers.length === 0 && Object.keys(plugins).length === 0) throw new Error("No MCP servers or plugins configured to save");
+	await save_portable_profile(name, servers, plugins);
+	return {
+		serverCount: servers.length,
+		pluginCount: Object.keys(plugins).length
+	};
+}
+async function save_profile_for_client(input) {
+	const adapter = get_client_adapter(input.client);
+	if (!adapter) throw new Error(`Invalid client: ${input.client}`);
+	const location = resolve_client_location(adapter, input.scope, input.location);
+	const servers = await adapter.readLocation(location);
+	let plugins;
+	if (adapter.id === "claude-code") plugins = (await read_claude_settings()).enabledPlugins;
+	if (servers.length === 0 && !plugins) throw new Error("No MCP servers or plugins configured to save");
+	await save_portable_profile(input.name, servers, plugins);
 	return {
-		serverCount: server_count,
-		pluginCount: plugin_count
+		profile: input.name,
+		serverCount: servers.length,
+		pluginCount: Object.keys(plugins || {}).length,
+		client: adapter.id,
+		scope: location.scope,
+		location: location.path
+	};
+}
+async function save_current_claude_profile(name) {
+	const counts = await save_profile(name);
+	return {
+		profile: name,
+		serverCount: counts.serverCount,
+		pluginCount: counts.pluginCount,
+		client: "claude-code",
+		scope: "user"
 	};
 }
 //#endregion
@@ -2591,17 +2749,13 @@ function parse_args() {
 	} else if (args[i] === "--list-profiles" || args[i] === "-l") result.listProfiles = true;
 	return result;
 }
-async function apply_profile(name) {
-	intro(`MCPick - Loading profile: ${name}`);
+async function apply_claude_profile(name) {
+	intro(`MCPick - Loading Claude Code profile: ${name}`);
 	try {
-		const profile = await load_profile(name);
-		await write_claude_config(profile.config);
-		const parts = [`${Object.keys(profile.config.mcpServers || {}).length} servers`];
-		if (profile.enabledPlugins) {
-			await write_claude_settings({ enabledPlugins: profile.enabledPlugins });
-			parts.push(`${Object.keys(profile.enabledPlugins).length} plugins`);
-		}
-		log.success(`Profile '${name}' applied (${parts.join(", ")})`);
+		const result = await apply_profile_to_claude(name);
+		const parts = [`${result.serverCount} servers`];
+		if (result.pluginCount > 0) parts.push(`${result.pluginCount} plugins`);
+		log.success(`Profile '${result.profile}' applied (${parts.join(", ")})`);
 		outro("Done!");
 	} catch (error) {
 		if (error instanceof Error) cancel(error.message);
@@ -2618,13 +2772,13 @@ async function show_profiles() {
 	} else for (const p of profiles) log.info(`${p.name} (${p.serverCount} servers)`);
 	outro("");
 }
-async function create_profile(name) {
-	intro(`MCPick - Saving profile: ${name}`);
+async function create_claude_profile(name) {
+	intro(`MCPick - Saving Claude Code profile: ${name}`);
 	try {
-		const counts = await save_profile(name);
-		const parts = [`${counts.serverCount} servers`];
-		if (counts.pluginCount > 0) parts.push(`${counts.pluginCount} plugins`);
-		log.success(`Profile '${name}' saved (${parts.join(", ")})`);
+		const result = await save_current_claude_profile(name);
+		const parts = [`${result.serverCount} servers`];
+		if (result.pluginCount > 0) parts.push(`${result.pluginCount} plugins`);
+		log.success(`Profile '${result.profile}' saved (${parts.join(", ")})`);
 		outro("Done!");
 	} catch (error) {
 		if (error instanceof Error) cancel(error.message);
@@ -2632,6 +2786,36 @@ async function create_profile(name) {
 		process.exit(1);
 	}
 }
+function sorted_client_adapters() {
+	return [...client_adapters].sort((a, b) => b.label.localeCompare(a.label));
+}
+async function select_client_adapter() {
+	const adapters = sorted_client_adapters();
+	const client_id = await select({
+		message: "Which MCP client?",
+		options: adapters.map((adapter) => ({
+			value: adapter.id,
+			label: adapter.label
+		})),
+		initialValue: adapters[0]?.id
+	});
+	if (isCancel(client_id)) return null;
+	return client_adapters.find((adapter) => adapter.id === client_id) ?? null;
+}
+async function select_client_location(adapter) {
+	const locations = adapter.locations();
+	if (locations.length === 1) return locations[0];
+	const location_path = await select({
+		message: `Which ${adapter.label} configuration?`,
+		options: locations.map((location) => ({
+			value: location.path,
+			label: `${location.scope} — ${location.description}`,
+			hint: location.path
+		}))
+	});
+	if (isCancel(location_path)) return null;
+	return locations.find((location) => location.path === location_path) ?? null;
+}
 async function handle_load_profile() {
 	const profiles = await list_profiles();
 	if (profiles.length === 0) {
@@ -2652,14 +2836,21 @@ async function handle_load_profile() {
 		})
 	});
 	if (isCancel(profile_name)) return;
-	const profile = await load_profile(profile_name);
-	await write_claude_config(profile.config);
-	const parts = [`${Object.keys(profile.config.mcpServers || {}).length} servers`];
-	if (profile.enabledPlugins) {
-		await write_claude_settings({ enabledPlugins: profile.enabledPlugins });
-		parts.push(`${Object.keys(profile.enabledPlugins).length} plugins`);
-	}
-	log.success(`Profile '${profile_name}' applied (${parts.join(", ")})`);
+	const adapter = await select_client_adapter();
+	if (!adapter) return;
+	const location = await select_client_location(adapter);
+	if (!location) return;
+	const result = await apply_profile_to_client({
+		name: profile_name,
+		client: adapter.id,
+		scope: location.scope,
+		location: location.path
+	});
+	const parts = [`${result.serverCount} servers`];
+	if (result.pluginCount > 0) parts.push(`${result.pluginCount} Claude plugins`);
+	log.success(`Profile '${result.profile}' applied to ${adapter.label}:${location.scope} (${parts.join(", ")})`);
+	if (result.location) log.info(`Config: ${result.location}`);
+	if (result.backup_path) log.info(`Backup: ${result.backup_path}`);
 }
 async function handle_save_profile() {
 	const name = await text({
@@ -2671,19 +2862,30 @@ async function handle_save_profile() {
 		}
 	});
 	if (isCancel(name)) return;
-	const counts = await save_profile(name);
-	const parts = [`${counts.serverCount} servers`];
-	if (counts.pluginCount > 0) parts.push(`${counts.pluginCount} plugins`);
-	log.success(`Profile '${name}' saved (${parts.join(", ")})`);
+	const adapter = await select_client_adapter();
+	if (!adapter) return;
+	const location = await select_client_location(adapter);
+	if (!location) return;
+	const result = await save_profile_for_client({
+		name,
+		client: adapter.id,
+		scope: location.scope,
+		location: location.path
+	});
+	const parts = [`${result.serverCount} servers`];
+	if (result.pluginCount > 0) parts.push(`${result.pluginCount} Claude plugins`);
+	log.success(`Profile '${result.profile}' saved from ${adapter.label}:${location.scope} (${parts.join(", ")})`);
+	if (result.location) log.info(`Config: ${result.location}`);
 }
 async function handle_client_tools() {
+	const adapters = sorted_client_adapters();
 	const client_id = await select({
 		message: "Which client?",
-		options: client_adapters.map((adapter) => ({
+		options: adapters.map((adapter) => ({
 			value: adapter.id,
 			label: adapter.label
 		})),
-		initialValue: "claude-code"
+		initialValue: adapters[0]?.id
 	});
 	if (isCancel(client_id)) return;
 	if (client_id !== "claude-code") {
@@ -2742,11 +2944,11 @@ async function main() {
 		return;
 	}
 	if (args.saveProfile) {
-		await create_profile(args.saveProfile);
+		await create_claude_profile(args.saveProfile);
 		return;
 	}
 	if (args.profile) {
-		await apply_profile(args.profile);
+		await apply_claude_profile(args.profile);
 		return;
 	}
 	intro("MCPick - MCP Configuration Manager");
@@ -2773,12 +2975,12 @@ async function main() {
 				{
 					value: "load-profile",
 					label: "Load profile",
-					hint: "Apply a saved profile"
+					hint: "Apply a saved profile to a selected client"
 				},
 				{
 					value: "save-profile",
 					label: "Save profile",
-					hint: "Save current config as profile"
+					hint: "Save selected client config as a portable profile"
 				},
 				{
 					value: "backup",
@@ -2872,12 +3074,12 @@ const SUBCOMMANDS = new Set([
 const arg = process.argv[2];
 if (arg && SUBCOMMANDS.has(arg) || arg === "--help" || arg === "-h" || !process.stdout.isTTY) {
 	if (!arg && !process.stdout.isTTY) process.argv.push("--help");
-	import("./cli-By-0nYNQ.js").then((m) => m.run());
+	import("./cli-sOeHH4CK.js").then((m) => m.run());
 } else main().catch((error) => {
 	console.error("Fatal error:", error);
 	process.exit(1);
 });
 //#endregion
-export { add_client_server as A, get_all_plugins as B, validate_plugin_via_cli as C, list_plugin_backups as D, list_backups as E, resolve_client_location as F, list_config_backups as G, remove_hook as H, set_client_server_enabled as I, restore_config_backup as K, add_hook as L, get_client_adapter as M, list_client_locations as N, read_server_registry as O, remove_client_server as P, build_enabled_plugins as R, update_plugin_via_cli as S, get_all_available_servers as T, write_claude_settings as U, read_claude_settings as V, atomic_json_write as W, mcp_add_json_via_cli as _, split_cli_list as a, remove_mcp_via_cli as b, enable_plugin_hook as c, add_mcp_via_cli as d, install_plugin_via_cli as f, marketplace_update_via_cli as g, marketplace_remove_via_cli as h, run_skills_cli as i, add_client_server_config as j, write_server_registry as k, read_disabled_hooks as l, marketplace_list_via_cli as m, load_profile as n, check_restored_hooks as o, marketplace_add_via_cli as p, save_profile as r, disable_plugin_hook as s, list_profiles as t, redisable_restored_hooks as u, mcp_get_via_cli as v, add_server_to_registry as w, uninstall_plugin_via_cli as x, mcp_reset_project_choices_via_cli as y, get_all_hooks as z };
+export { read_server_registry as A, build_enabled_plugins as B, uninstall_plugin_via_cli as C, get_all_available_servers as D, add_server_to_registry as E, list_client_locations as F, write_claude_settings as G, get_all_plugins as H, remove_client_server as I, restore_config_backup as J, atomic_json_write as K, resolve_client_location as L, add_client_server as M, add_client_server_config as N, list_backups as O, get_client_adapter as P, set_client_server_enabled as R, remove_mcp_via_cli as S, validate_plugin_via_cli as T, read_claude_settings as U, get_all_hooks as V, remove_hook as W, marketplace_remove_via_cli as _, save_profile_for_client as a, mcp_get_via_cli as b, check_restored_hooks as c, read_disabled_hooks as d, redisable_restored_hooks as f, marketplace_list_via_cli as g, marketplace_add_via_cli as h, save_current_claude_profile as i, write_server_registry as j, list_plugin_backups as k, disable_plugin_hook as l, install_plugin_via_cli as m, apply_profile_to_client as n, run_skills_cli as o, add_mcp_via_cli as p, list_config_backups as q, list_profiles as r, split_cli_list as s, apply_profile_to_claude as t, enable_plugin_hook as u, marketplace_update_via_cli as v, update_plugin_via_cli as w, mcp_reset_project_choices_via_cli as x, mcp_add_json_via_cli as y, add_hook as z };
 
 //# sourceMappingURL=index.js.map