@wuyax/mcps 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/{chunk-XW2KL6W3.js → chunk-BUKA3NPJ.js}

@@ -452,9 +452,9 @@ var mcpAgentAliases = {
 var getMcpAgentConfig = (agentType) => mcpAgents[agentType];
 var getMcpAgentTypes = () => Object.values(mcpAgents).map((config) => config.name);
 var isMcpAgentType = (value) => value in mcpAgents;
-var resolveMcpAgentAlias = (input5) => {
-  if (isMcpAgentType(input5)) return input5;
-  return mcpAgentAliases[input5] ?? null;
+var resolveMcpAgentAlias = (input7) => {
+  if (isMcpAgentType(input7)) return input7;
+  return mcpAgentAliases[input7] ?? null;
 };
 var isMcpTransportSupported = (agent, transport) => agent.supportedTransports.includes(transport);
 var detectProjectInstalledMcpAgents = (cwd) => getMcpAgentTypes().filter(
@@ -965,6 +965,74 @@ var agentConfigStore = new AgentConfigStore();
 // src/utils/to-error-message.ts
 var toErrorMessage = (error, fallback = "Unknown error") => error instanceof Error ? error.message : fallback;
 
+// src/resolve-config-clusters.ts
+var getCandidateAgentsForScope = (options = {}) => {
+  return options.global ? getMcpAgentTypes() : getMcpAgentsSupportingProjectScope();
+};
+var getCoHostedAgents = (agentType, options = {}) => {
+  const currentAgent = getMcpAgentConfig(agentType);
+  const currentTarget = resolveMcpConfigTarget(currentAgent, options);
+  const candidates = getCandidateAgentsForScope(options);
+  const coHosted = [];
+  for (const candidateType of candidates) {
+    if (candidateType === agentType) continue;
+    const candidateConfig = getMcpAgentConfig(candidateType);
+    const candidateTarget = resolveMcpConfigTarget(candidateConfig, options);
+    if (candidateTarget.configPath === currentTarget.configPath && candidateTarget.configKey === currentTarget.configKey) {
+      coHosted.push(candidateType);
+    }
+  }
+  return coHosted;
+};
+var resolveConfigClusters = (agentTypes, options = {}) => {
+  const clustersByPath = /* @__PURE__ */ new Map();
+  for (const agentType of agentTypes) {
+    const agentConfig = getMcpAgentConfig(agentType);
+    const target = resolveMcpConfigTarget(agentConfig, options);
+    let keyMap = clustersByPath.get(target.configPath);
+    if (!keyMap) {
+      keyMap = /* @__PURE__ */ new Map();
+      clustersByPath.set(target.configPath, keyMap);
+    }
+    let cluster = keyMap.get(target.configKey);
+    if (!cluster) {
+      const allCoHosted = getCoHostedAgents(agentType, options);
+      cluster = {
+        configPath: target.configPath,
+        configKey: target.configKey,
+        targetAgents: [],
+        coHostedAgents: allCoHosted
+      };
+      keyMap.set(target.configKey, cluster);
+    }
+    if (!cluster.targetAgents.includes(agentType)) {
+      cluster.targetAgents.push(agentType);
+    }
+  }
+  const clusters = [];
+  for (const keyMap of clustersByPath.values()) {
+    for (const cluster of keyMap.values()) {
+      cluster.coHostedAgents = cluster.coHostedAgents.filter(
+        (co) => !cluster.targetAgents.includes(co)
+      );
+      clusters.push(cluster);
+    }
+  }
+  return clusters;
+};
+var sortAgentsWithClusters = (agentTypes, options = {}) => {
+  const clusters = resolveConfigClusters(agentTypes, options);
+  const sorted = [];
+  for (const cluster of clusters) {
+    for (const agent of cluster.targetAgents) {
+      if (!sorted.includes(agent)) {
+        sorted.push(agent);
+      }
+    }
+  }
+  return sorted;
+};
+
 // src/transforms/index.ts
 var DIALECT_PRESETS = {
   vscode: {
@@ -1180,12 +1248,18 @@ var installMcpServerForAgent = (serverName, serverConfig, agentType, options = {
   const agent = getMcpAgentConfig(agentType);
   const isGlobal = options.global ?? false;
   const { target } = agentConfigStore.resolveTarget(agent, options);
+  const coHosted = getCoHostedAgents(agentType, options);
   try {
     const transformed = transformServerConfigForAgent(agent, serverName, serverConfig, {
       global: isGlobal
     });
     agentConfigStore.writeServer(agent, serverName, transformed, options);
-    return { agent: agentType, success: true, path: target.configPath };
+    return {
+      agent: agentType,
+      success: true,
+      path: target.configPath,
+      coConfiguredAgents: coHosted.length > 0 ? coHosted : void 0
+    };
   } catch (error) {
     return {
       agent: agentType,
@@ -1195,16 +1269,69 @@ var installMcpServerForAgent = (serverName, serverConfig, agentType, options = {
     };
   }
 };
-var installMcpServerForAgents = (serverName, serverConfig, agentTypes, options = {}) => agentTypes.map(
-  (agentType) => installMcpServerForAgent(serverName, serverConfig, agentType, options)
-);
+var installMcpServerForAgents = (serverName, serverConfig, agentTypes, options = {}) => {
+  const clusters = resolveConfigClusters(agentTypes, options);
+  const resultsByAgent = /* @__PURE__ */ new Map();
+  const isGlobal = options.global ?? false;
+  for (const cluster of clusters) {
+    const primaryAgentType = cluster.targetAgents[0];
+    const primaryAgent = getMcpAgentConfig(primaryAgentType);
+    try {
+      const transformed = transformServerConfigForAgent(primaryAgent, serverName, serverConfig, {
+        global: isGlobal
+      });
+      agentConfigStore.writeServer(primaryAgent, serverName, transformed, options);
+      for (const agentType of cluster.targetAgents) {
+        resultsByAgent.set(agentType, {
+          agent: agentType,
+          success: true,
+          path: cluster.configPath,
+          coConfiguredAgents: cluster.coHostedAgents.length > 0 ? cluster.coHostedAgents : void 0
+        });
+      }
+    } catch (error) {
+      const errorMsg = toErrorMessage(error);
+      for (const agentType of cluster.targetAgents) {
+        resultsByAgent.set(agentType, {
+          agent: agentType,
+          success: false,
+          path: cluster.configPath,
+          error: errorMsg
+        });
+      }
+    }
+  }
+  return agentTypes.map((agentType) => resultsByAgent.get(agentType));
+};
+var installToCompatibleAgents = (serverName, serverConfig, options) => {
+  const { allAgents, incompatible = [], global: isGlobal, cwd } = options;
+  const incompatibleMap = new Map(incompatible.map((item) => [item.agent, item.reason]));
+  const compatibleAgents = allAgents.filter((a) => !incompatibleMap.has(a));
+  const installedResults = installMcpServerForAgents(serverName, serverConfig, compatibleAgents, {
+    global: isGlobal,
+    cwd
+  });
+  const installedMap = new Map(installedResults.map((r) => [r.agent, r]));
+  return allAgents.map((agentType) => {
+    const incompatibleReason = incompatibleMap.get(agentType);
+    if (incompatibleReason) {
+      return {
+        agent: agentType,
+        success: false,
+        path: "",
+        error: incompatibleReason
+      };
+    }
+    return installedMap.get(agentType);
+  });
+};
 
 // src/utils/parse-mcp-agent-list.ts
-var parseMcpAgentList = (input5) => {
-  if (!input5 || input5.length === 0) return void 0;
-  if (input5.includes("*")) return getMcpAgentTypes();
+var parseMcpAgentList = (input7) => {
+  if (!input7 || input7.length === 0) return void 0;
+  if (input7.includes("*")) return getMcpAgentTypes();
   const resolved = [];
-  for (const value of input5) {
+  for (const value of input7) {
     const agentType = resolveMcpAgentAlias(value);
     if (!agentType) throw new Error(`Unknown MCP agent "${value}"`);
     resolved.push(agentType);
@@ -1213,9 +1340,9 @@ var parseMcpAgentList = (input5) => {
 };
 
 // src/resolve-target-agents.ts
-var normalizeRequestedAgents = (input5) => {
-  if (!input5 || input5.length === 0) return void 0;
-  const rawList = [...input5];
+var normalizeRequestedAgents = (input7) => {
+  if (!input7 || input7.length === 0) return void 0;
+  const rawList = [...input7];
   if (rawList.every((item) => isMcpAgentType(item))) {
     return rawList;
   }
@@ -1275,29 +1402,29 @@ var REMOTE_URL_REGEX = /^https?:\/\//i;
 var HAS_WHITESPACE_REGEX = /\s/;
 var PACKAGE_NAME_REGEX = /^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*(?:@[^\s]+)?$/;
 var PATH_SEPARATOR_REGEX = /[/\\]/;
-var stripVersionSuffix = (input5) => {
-  if (input5.startsWith("@")) {
-    const secondAtIndex = input5.indexOf("@", 1);
-    if (secondAtIndex > 0) return input5.slice(0, secondAtIndex);
-    return input5;
-  }
-  const atIndex = input5.lastIndexOf("@");
-  if (atIndex > 0) return input5.slice(0, atIndex);
-  return input5;
-};
-var stripScopePrefix = (input5) => {
-  if (!input5.startsWith("@") || !input5.includes("/")) return input5;
-  const parts = input5.split("/");
-  return parts[1] || input5;
-};
-var stripPathPrefix = (input5) => {
-  if (!PATH_SEPARATOR_REGEX.test(input5)) return input5;
-  const segments = input5.split(PATH_SEPARATOR_REGEX);
+var stripVersionSuffix = (input7) => {
+  if (input7.startsWith("@")) {
+    const secondAtIndex = input7.indexOf("@", 1);
+    if (secondAtIndex > 0) return input7.slice(0, secondAtIndex);
+    return input7;
+  }
+  const atIndex = input7.lastIndexOf("@");
+  if (atIndex > 0) return input7.slice(0, atIndex);
+  return input7;
+};
+var stripScopePrefix = (input7) => {
+  if (!input7.startsWith("@") || !input7.includes("/")) return input7;
+  const parts = input7.split("/");
+  return parts[1] || input7;
+};
+var stripPathPrefix = (input7) => {
+  if (!PATH_SEPARATOR_REGEX.test(input7)) return input7;
+  const segments = input7.split(PATH_SEPARATOR_REGEX);
   const basename = segments[segments.length - 1];
-  return basename || input5;
+  return basename || input7;
 };
-var extractPackageName = (input5) => {
-  let name = stripVersionSuffix(input5);
+var extractPackageName = (input7) => {
+  let name = stripVersionSuffix(input7);
   name = stripScopePrefix(name);
   name = stripPathPrefix(name);
   name = name.replace(SCRIPT_EXTENSION_REGEX, "");
@@ -1315,9 +1442,9 @@ var extractPackageName = (input5) => {
   }
   return name || MCP_DEFAULT_SERVER_NAME;
 };
-var inferNameFromUrl = (input5) => {
+var inferNameFromUrl = (input7) => {
   try {
-    const url = new URL(input5);
+    const url = new URL(input7);
     const host = url.hostname;
     const labels = host.split(".").filter((segment) => segment.length > 0);
     if (labels.length === 0) return MCP_DEFAULT_SERVER_NAME;
@@ -1346,8 +1473,8 @@ var inferNameFromCommand = (command) => {
   const firstNonFlag = tokens.find((token) => !token.startsWith("-"));
   return firstNonFlag ? extractPackageName(firstNonFlag) : MCP_DEFAULT_SERVER_NAME;
 };
-var parseMcpSource = (input5) => {
-  const trimmed = input5.trim();
+var parseMcpSource = (input7) => {
+  const trimmed = input7.trim();
   if (trimmed.length === 0) {
     throw new Error(
       "Invalid MCP source: input is empty. Expected a remote URL, an npm package, or a command line."
@@ -1401,18 +1528,11 @@ var installMcpServer = (options) => {
     cwd,
     transport: requestedTransport
   });
-  const incompatibleMap = new Map(incompatible.map((item) => [item.agent, item.reason]));
-  const results = allAgents.map((agentType) => {
-    const incompatibleReason = incompatibleMap.get(agentType);
-    if (incompatibleReason) {
-      return {
-        agent: agentType,
-        success: false,
-        path: "",
-        error: incompatibleReason
-      };
-    }
-    return installMcpServerForAgent(serverName, serverConfig, agentType, { global: isGlobal, cwd });
+  const results = installToCompatibleAgents(serverName, serverConfig, {
+    allAgents,
+    incompatible,
+    global: isGlobal,
+    cwd
   });
   return { serverName, config: serverConfig, results };
 };
@@ -1442,9 +1562,15 @@ var listInstalledMcpServers = (options = {}) => {
 var removeMcpServerFromAgent = (serverName, agentType, options = {}) => {
   const agent = getMcpAgentConfig(agentType);
   const { target } = agentConfigStore.resolveTarget(agent, options);
+  const coHosted = getCoHostedAgents(agentType, options);
   try {
     const { removed } = agentConfigStore.removeServer(agent, serverName, options);
-    return { agent: agentType, path: target.configPath, removed };
+    return {
+      agent: agentType,
+      path: target.configPath,
+      removed,
+      coAffectedAgents: removed && coHosted.length > 0 ? coHosted : void 0
+    };
   } catch (error) {
     return {
       agent: agentType,
@@ -1461,24 +1587,153 @@ var removeMcpServer = (options) => {
     global: options.global,
     cwd: options.cwd
   });
+  const clusters = resolveConfigClusters(allAgents, {
+    global: options.global,
+    cwd: options.cwd
+  });
   const results = [];
-  for (const agentType of allAgents) {
-    const result = removeMcpServerFromAgent(options.name, agentType, {
-      global: options.global,
-      cwd: options.cwd
-    });
-    if (result.removed || result.error) results.push(result);
+  for (const cluster of clusters) {
+    const primaryAgentType = cluster.targetAgents[0];
+    const primaryAgent = getMcpAgentConfig(primaryAgentType);
+    try {
+      const { removed } = agentConfigStore.removeServer(primaryAgent, options.name, {
+        global: options.global,
+        cwd: options.cwd
+      });
+      if (removed) {
+        for (const agentType of cluster.targetAgents) {
+          results.push({
+            agent: agentType,
+            path: cluster.configPath,
+            removed: true,
+            coAffectedAgents: cluster.coHostedAgents.length > 0 ? cluster.coHostedAgents : void 0
+          });
+        }
+      }
+    } catch (error) {
+      const errorMsg = toErrorMessage(error);
+      for (const agentType of cluster.targetAgents) {
+        results.push({
+          agent: agentType,
+          path: cluster.configPath,
+          removed: false,
+          error: errorMsg
+        });
+      }
+    }
   }
   return results;
 };
 
+// src/update-mcp-server.ts
+var toRemoteServerConfig = (config, defaultTransport = "http") => {
+  const {
+    command: _droppedCommand,
+    args: _droppedArgs,
+    env: _droppedEnv,
+    ...remoteConfig
+  } = config;
+  return {
+    ...remoteConfig,
+    type: remoteConfig.type ?? defaultTransport
+  };
+};
+var toStdioServerConfig = (config) => {
+  const {
+    url: _droppedUrl,
+    type: _droppedType,
+    headers: _droppedHeaders,
+    ...stdioConfig
+  } = config;
+  return stdioConfig;
+};
+var detectUpdateTransition = (incoming, previous) => {
+  if (!previous) {
+    return incoming.url ? "switch-to-remote" : "switch-to-stdio";
+  }
+  if (incoming.url && !incoming.command) {
+    return "switch-to-remote";
+  }
+  if (incoming.command && !incoming.url) {
+    return "switch-to-stdio";
+  }
+  if (incoming.url || !incoming.command && previous.url) {
+    return "merge-remote";
+  }
+  return "merge-stdio";
+};
+var sanitizeUpdatedServerConfig = (incoming, previous) => {
+  const transition = detectUpdateTransition(incoming, previous);
+  const targetTransport = incoming.type ?? previous?.type ?? "http";
+  switch (transition) {
+    case "switch-to-remote": {
+      const cleanBase = previous ? toRemoteServerConfig(previous, targetTransport) : {};
+      return toRemoteServerConfig({ ...cleanBase, ...incoming }, targetTransport);
+    }
+    case "switch-to-stdio": {
+      const cleanBase = previous ? toStdioServerConfig(previous) : {};
+      return toStdioServerConfig({ ...cleanBase, ...incoming });
+    }
+    case "merge-remote": {
+      return toRemoteServerConfig({ ...previous, ...incoming }, targetTransport);
+    }
+    case "merge-stdio": {
+      return toStdioServerConfig({ ...previous, ...incoming });
+    }
+  }
+};
+var updateMcpServer = (options) => {
+  const isGlobal = options.global ?? false;
+  const cwd = options.cwd ?? process.cwd();
+  let previousConfig = options.previousConfig;
+  if (!previousConfig) {
+    const existing = listInstalledMcpServers({
+      global: isGlobal,
+      cwd,
+      agents: options.agents
+    });
+    const found = existing.find((s) => s.serverName === options.serverName && s.serverConfig);
+    if (found) {
+      previousConfig = found.serverConfig;
+    }
+  }
+  const serverConfig = sanitizeUpdatedServerConfig(options.config, previousConfig);
+  let targetAgents = options.agents;
+  if (!targetAgents || targetAgents.length === 0) {
+    const existing = listInstalledMcpServers({ global: isGlobal, cwd });
+    targetAgents = existing.filter((s) => s.serverName === options.serverName).map((s) => s.agent);
+  }
+  const requestedTransport = serverConfig.url ? serverConfig.type ?? "http" : "stdio";
+  const { allAgents, incompatible } = resolveTargetAgents({
+    requested: targetAgents,
+    global: isGlobal,
+    cwd,
+    transport: requestedTransport
+  });
+  const results = installToCompatibleAgents(options.serverName, serverConfig, {
+    allAgents,
+    incompatible,
+    global: isGlobal,
+    cwd
+  });
+  return {
+    serverName: options.serverName,
+    config: serverConfig,
+    results,
+    incompatible
+  };
+};
+
 // src/interactive/main-menu.ts
 import { select as select8 } from "@inquirer/prompts";
-import pc10 from "picocolors";
+import pc15 from "picocolors";
 
 // src/interactive/wizard-add.ts
-import { confirm as confirm2, input as input4, select as select5 } from "@inquirer/prompts";
-import pc7 from "picocolors";
+import { confirm as confirm5, input as input5, select as select5 } from "@inquirer/prompts";
+import pc11 from "picocolors";
+
+// src/utils/co-hosted-feedback.ts
+import pc2 from "picocolors";
 
 // src/utils/logger.ts
 import pc from "picocolors";
@@ -1497,13 +1752,284 @@ var logger = {
   }
 };
 
+// src/utils/co-hosted-feedback.ts
+var formatCoHostedBadge = (kind, agents) => {
+  if (!agents || agents.length === 0) return "";
+  const label = kind === "configured" ? "co-configured" : "co-affected";
+  return ` ${pc2.yellow(`(${label}: ${agents.join(", ")})`)}`;
+};
+var logCoHostedNotice = (kind, agents) => {
+  if (!agents || agents.length === 0) return;
+  const actionText = kind === "configured" ? "Also configured for" : "Also affects";
+  logger.info(
+    `  ${pc2.dim("Note:")} ${actionText} co-hosted agent(s): ${pc2.yellow(agents.join(", "))}`
+  );
+};
+
 // src/interactive/prompts/agents.ts
-import { checkbox } from "@inquirer/prompts";
+import pc6 from "picocolors";
+
+// src/interactive/utils/build-linked-agent-choices.ts
 import pc3 from "picocolors";
+var buildLinkedAgentChoices = (options) => {
+  const { agents, checkedAgents, detectedAgents = [], scopeOptions = {} } = options;
+  const alignedCheckedSet = new Set(checkedAgents);
+  for (const agent of checkedAgents) {
+    const coHosted = getCoHostedAgents(agent, scopeOptions);
+    for (const co of coHosted) {
+      if (agents.includes(co)) {
+        alignedCheckedSet.add(co);
+      }
+    }
+  }
+  return agents.map((agent) => {
+    const config = getMcpAgentConfig(agent);
+    const displayName = config?.displayName ?? agent;
+    const isDetected = detectedAgents.includes(agent);
+    const coHosted = getCoHostedAgents(agent, scopeOptions).filter(
+      (co) => agents.includes(co)
+    );
+    const detectedBadge = isDetected ? pc3.green(" [detected]") : "";
+    const sharedBadge = coHosted.length > 0 ? pc3.dim(` [shared: ${coHosted.join(", ")}]`) : "";
+    const label = `${displayName} ${pc3.dim(`(${agent})`)}${detectedBadge}${sharedBadge}`;
+    return {
+      name: label,
+      value: agent,
+      checked: alignedCheckedSet.has(agent),
+      linkedValues: coHosted,
+      description: coHosted.length > 0 ? `Linked with ${coHosted.map((a) => getMcpAgentConfig(a).displayName).join(", ")} (shared configuration)` : void 0
+    };
+  });
+};
+
+// src/interactive/prompts/linked-checkbox.ts
+import {
+  Separator,
+  ValidationError,
+  createPrompt,
+  isDownKey,
+  isEnterKey,
+  isNumberKey,
+  isSpaceKey,
+  isUpKey,
+  makeTheme,
+  useKeypress,
+  useMemo,
+  usePagination,
+  usePrefix,
+  useState
+} from "@inquirer/core";
+import pc4 from "picocolors";
+var defaultTheme = {
+  icon: {
+    checked: pc4.green("[x]"),
+    unchecked: pc4.dim("[ ]"),
+    cursor: pc4.cyan(">"),
+    disabledChecked: pc4.dim("[x]"),
+    disabledUnchecked: pc4.dim("[-]")
+  },
+  style: {
+    disabled: (text) => pc4.dim(text),
+    renderSelectedChoices: (selectedChoices) => selectedChoices.map((choice) => choice.short).join(", "),
+    description: (text) => pc4.cyan(text),
+    keysHelpTip: (keys) => keys.map(([key, action]) => `${pc4.bold(key)} ${pc4.dim(action)}`).join(pc4.dim(" | ")),
+    highlight: (text) => pc4.cyan(text)
+  },
+  i18n: {
+    disabledError: "This option is disabled and cannot be toggled."
+  }
+};
+function isSelectable(item) {
+  return !Separator.isSeparator(item) && !item.disabled;
+}
+function isNavigable(item) {
+  return !Separator.isSeparator(item);
+}
+function isChecked(item) {
+  return !Separator.isSeparator(item) && item.checked;
+}
+function normalizeChoices(choices) {
+  return choices.map((choice) => {
+    if (Separator.isSeparator(choice)) {
+      return choice;
+    }
+    if (typeof choice !== "object" || choice === null || !("value" in choice)) {
+      const name2 = String(choice);
+      return {
+        value: choice,
+        name: name2,
+        short: name2,
+        checkedName: name2,
+        disabled: false,
+        checked: false,
+        linkedValues: []
+      };
+    }
+    const name = choice.name ?? String(choice.value);
+    return {
+      value: choice.value,
+      name,
+      short: choice.short ?? name,
+      checkedName: choice.checkedName ?? name,
+      description: choice.description,
+      disabled: choice.disabled ?? false,
+      checked: choice.checked ?? false,
+      linkedValues: choice.linkedValues ?? []
+    };
+  });
+}
+var linkedCheckbox = createPrompt(
+  (config, done) => {
+    const { pageSize = 10, loop = true, required, validate = () => true } = config;
+    const theme = makeTheme(defaultTheme, config.theme);
+    const [status, setStatus] = useState("idle");
+    const prefix = usePrefix({ status, theme });
+    const [items, setItems] = useState(() => normalizeChoices(config.choices));
+    const bounds = useMemo(() => {
+      const first = items.findIndex(isNavigable);
+      let last = -1;
+      for (let i = items.length - 1; i >= 0; i--) {
+        if (isNavigable(items[i])) {
+          last = i;
+          break;
+        }
+      }
+      if (first === -1 || last === -1) {
+        throw new ValidationError("[linkedCheckbox prompt] No selectable choices.");
+      }
+      return { first, last };
+    }, [items]);
+    const [active, setActive] = useState(bounds.first);
+    const [errorMsg, setError] = useState();
+    const toggleWithLinked = (targetIndex) => {
+      const targetItem = items[targetIndex];
+      if (!targetItem || Separator.isSeparator(targetItem) || targetItem.disabled) {
+        return;
+      }
+      const nextChecked = !targetItem.checked;
+      const targetValue = targetItem.value;
+      const linked = new Set(targetItem.linkedValues);
+      setItems(
+        (prevItems) => prevItems.map((item) => {
+          if (Separator.isSeparator(item) || item.disabled) {
+            return item;
+          }
+          const isTargetOrLinked = item.value === targetValue || linked.has(item.value) || item.linkedValues.includes(targetValue);
+          if (isTargetOrLinked) {
+            return { ...item, checked: nextChecked };
+          }
+          return item;
+        })
+      );
+    };
+    useKeypress(async (key) => {
+      if (isEnterKey(key)) {
+        const selection = items.filter(isChecked);
+        const isValid = await validate([...selection]);
+        if (required && selection.length === 0) {
+          setError("At least one choice must be selected");
+        } else if (isValid === true) {
+          setStatus("done");
+          done(selection.map((choice) => choice.value));
+        } else {
+          setError(typeof isValid === "string" ? isValid : "You must select a valid value");
+        }
+      } else if (isUpKey(key) || isDownKey(key)) {
+        if (errorMsg) setError(void 0);
+        if (loop || isUpKey(key) && active !== bounds.first || isDownKey(key) && active !== bounds.last) {
+          const offset = isUpKey(key) ? -1 : 1;
+          let next = active;
+          do {
+            next = (next + offset + items.length) % items.length;
+          } while (!isNavigable(items[next]));
+          setActive(next);
+        }
+      } else if (isSpaceKey(key)) {
+        const activeItem = items[active];
+        if (activeItem && !Separator.isSeparator(activeItem)) {
+          if (activeItem.disabled) {
+            setError(theme.i18n.disabledError);
+          } else {
+            setError(void 0);
+            toggleWithLinked(active);
+          }
+        }
+      } else if (key.name === "a") {
+        const hasUnchecked = items.some((choice) => isSelectable(choice) && !choice.checked);
+        setItems(
+          (prevItems) => prevItems.map((item) => isSelectable(item) ? { ...item, checked: hasUnchecked } : item)
+        );
+      } else if (isNumberKey(key)) {
+        const selectedIndex = Number(key.name) - 1;
+        let selectableIndex = -1;
+        const position = items.findIndex((item) => {
+          if (Separator.isSeparator(item)) return false;
+          selectableIndex++;
+          return selectableIndex === selectedIndex;
+        });
+        const selectedItem = items[position];
+        if (selectedItem && isSelectable(selectedItem)) {
+          setActive(position);
+          setError(void 0);
+          toggleWithLinked(position);
+        }
+      }
+    });
+    const message = theme.style.message(config.message, status);
+    let description;
+    const page = usePagination({
+      items,
+      active,
+      renderItem({ item, isActive }) {
+        if (Separator.isSeparator(item)) {
+          return ` ${item.separator}`;
+        }
+        const cursor = isActive ? theme.icon.cursor : " ";
+        if (item.disabled) {
+          const disabledLabel = typeof item.disabled === "string" ? item.disabled : "(disabled)";
+          const checkbox2 = item.checked ? theme.icon.disabledChecked : theme.icon.disabledUnchecked;
+          return theme.style.disabled(`${cursor} ${checkbox2} ${item.name} ${disabledLabel}`);
+        }
+        if (isActive) {
+          description = item.description;
+        }
+        const checkbox = item.checked ? theme.icon.checked : theme.icon.unchecked;
+        const name = item.checked ? item.checkedName : item.name;
+        const color = isActive ? theme.style.highlight : (x) => x;
+        return color(`${cursor} ${checkbox} ${name}`);
+      },
+      pageSize,
+      loop
+    });
+    if (status === "done") {
+      const selection = items.filter(isChecked);
+      const answer = theme.style.answer(theme.style.renderSelectedChoices(selection, items));
+      return [prefix, message, answer].filter(Boolean).join(" ");
+    }
+    const helpLine = theme.style.keysHelpTip([
+      ["up/down", "navigate"],
+      ["space", "toggle"],
+      ["a", "all"],
+      ["enter", "submit"]
+    ]);
+    const lines = [
+      [prefix, message].filter(Boolean).join(" "),
+      page,
+      helpLine
+    ];
+    if (description) {
+      lines.push(theme.style.description(description));
+    }
+    if (errorMsg) {
+      lines.push(theme.style.error(errorMsg));
+    }
+    return lines.join("\n");
+  }
+);
 
 // src/interactive/prompts/scope.ts
 import { select } from "@inquirer/prompts";
-import pc2 from "picocolors";
+import pc5 from "picocolors";
 var promptScope = async (options = {}) => {
   const initialGlobal = options.defaultGlobal ?? options.global;
   if (initialGlobal !== void 0) {
@@ -1514,11 +2040,11 @@ var promptScope = async (options = {}) => {
     message: options.message ?? "Select MCP scope:",
     choices: [
       {
-        name: `Current Project - ${pc2.dim(cwd)}`,
+        name: `Current Project - ${pc5.dim(cwd)}`,
         value: false
       },
       {
-        name: `Global User Config - ${pc2.dim("applies across all projects")}`,
+        name: `Global User Config - ${pc5.dim("applies across all projects")}`,
         value: true
       }
     ]
@@ -1538,26 +2064,23 @@ var promptScopeAndAgents = async (options = {}) => {
     cwd
   });
   const detected = resolution.detected;
-  const availableAgentTypes = isGlobal ? getMcpAgentTypes() : getMcpAgentsSupportingProjectScope();
+  const rawAvailable = isGlobal ? getMcpAgentTypes() : getMcpAgentsSupportingProjectScope();
+  const availableAgentTypes = sortAgentsWithClusters(rawAvailable, { global: isGlobal, cwd });
   if (detected.length > 0) {
     logger.info(
-      `Detected configured agents: ${pc3.cyan(detected.map((a) => getMcpAgentConfig(a).displayName).join(", "))}`
+      `Detected configured agents: ${pc6.cyan(detected.map((a) => getMcpAgentConfig(a).displayName).join(", "))}`
     );
   } else {
     logger.warn(`No active ${isGlobal ? "global" : "project"} agents detected`);
   }
   const defaultChecked = options.defaultAgents && options.defaultAgents.length > 0 ? options.defaultAgents : detected;
-  const choices = availableAgentTypes.map((agentType) => {
-    const config = getMcpAgentConfig(agentType);
-    const isDetected = detected.includes(agentType);
-    const label = `${config.displayName} ${pc3.dim(`(${agentType})`)}${isDetected ? pc3.green(" [detected]") : ""}`;
-    return {
-      name: label,
-      value: agentType,
-      checked: defaultChecked.includes(agentType)
-    };
+  const choices = buildLinkedAgentChoices({
+    agents: availableAgentTypes,
+    checkedAgents: defaultChecked,
+    detectedAgents: detected,
+    scopeOptions: { global: isGlobal, cwd }
   });
-  const selectedAgents = await checkbox({
+  const selectedAgents = await linkedCheckbox({
     message: "Select target agents (Space to select, Enter to confirm):",
     choices,
     validate: (chosen) => {
@@ -1602,19 +2125,54 @@ var promptArgsConfig = async (initialArgs = []) => {
   });
   return parseArgsString(raw.trim());
 };
+var formatArgsString = (args) => {
+  return args.map((arg) => arg.includes(" ") || arg.includes('"') ? `"${arg.replace(/"/g, '\\"')}"` : arg).join(" ");
+};
+var promptEditArgs = async (currentArgs = []) => {
+  const defaultStr = formatArgsString(currentArgs);
+  const raw = await input({
+    message: "Edit command arguments (space-separated, wrap paths with spaces in quotes, leave empty to clear):",
+    default: defaultStr
+  });
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return [];
+  }
+  return parseArgsString(trimmed);
+};
 
 // src/interactive/prompts/env.ts
-import { input as input2, password, select as select3 } from "@inquirer/prompts";
-import pc5 from "picocolors";
+import { input as input3, password as password2, select as select3 } from "@inquirer/prompts";
+import pc9 from "picocolors";
+
+// src/utils/mask-secret.ts
+var SECRET_KEY_PATTERN = /(token|key|secret|password|passwd|auth|credential)/i;
+var maskSecretValue = (key, value) => {
+  if (!SECRET_KEY_PATTERN.test(key) || value.length <= 4) {
+    return value;
+  }
+  return `${value.slice(0, 2)}***${value.slice(-2)}`;
+};
+var SECRET_HEADER_PATTERN = /(authorization|token|key|secret|auth)/i;
+var maskSecretHeader = (key, value) => {
+  if (!SECRET_HEADER_PATTERN.test(key) || value.length <= 8) {
+    return value;
+  }
+  return `${value.slice(0, 4)}***${value.slice(-3)}`;
+};
+
+// src/interactive/prompts/kv.ts
+import { confirm as confirm2, input as input2, password, select as select2 } from "@inquirer/prompts";
+import pc8 from "picocolors";
 
 // src/interactive/prompts/multiline.ts
 import { createInterface } from "readline";
 import { editor } from "@inquirer/prompts";
-import pc4 from "picocolors";
+import pc7 from "picocolors";
 var readMultilineTextFromTerminal = async (message, endHint = "When done pasting, enter END on a new line or press Enter twice to finish") => {
-  console.log(pc4.cyan(`
+  console.log(pc7.cyan(`
 ${message}`));
-  console.log(pc4.dim(`  (Hint: ${endHint})
+  console.log(pc7.dim(`  (Hint: ${endHint})
 `));
   return new Promise((resolve) => {
     const rl = createInterface({
@@ -1668,8 +2226,157 @@ var promptEditorText = async (options) => {
   }
 };
 
+// src/interactive/prompts/kv.ts
+var promptEditKeyValueConfig = async (currentItems = {}, options) => {
+  let items = { ...currentItems };
+  while (true) {
+    const keys = Object.keys(items);
+    console.log();
+    if (keys.length === 0) {
+      console.log(pc8.dim(`  No ${options.itemsNoun} configured.`));
+    } else {
+      console.log(pc8.cyan(pc8.bold(`  Configured ${options.title} (${keys.length}):`)));
+      for (const [k, v] of Object.entries(items)) {
+        const sep = options.separator === "=" ? "=" : ": ";
+        console.log(`    ${pc8.bold(k)}${sep}${pc8.dim(options.maskValue(k, v))}`);
+      }
+    }
+    console.log();
+    const choice = await select2({
+      message: `Manage ${options.itemsNoun}:`,
+      choices: [
+        {
+          name: "Open in system default editor ($EDITOR)",
+          value: "editor"
+        },
+        {
+          name: `Add or modify a ${options.itemNoun}`,
+          value: "upsert"
+        },
+        ...keys.length > 0 ? [
+          {
+            name: `Delete a ${options.itemNoun}`,
+            value: "delete"
+          }
+        ] : [],
+        {
+          name: `Paste multiline ${options.itemsNoun} into terminal`,
+          value: "paste"
+        },
+        ...keys.length > 0 ? [
+          {
+            name: `Clear all ${options.itemsNoun}`,
+            value: "clear"
+          }
+        ] : [],
+        {
+          name: `Done (finish editing ${options.itemsNoun})`,
+          value: "done"
+        }
+      ]
+    });
+    if (choice === "done") {
+      return items;
+    }
+    if (choice === "editor") {
+      const defaultText = options.formatText(items);
+      const text = await promptEditorText({
+        message: options.editorMessage,
+        postfix: options.editorPostfix,
+        defaultText
+      });
+      const parsed = options.parseText(text);
+      items = parsed;
+      logger.success(`${options.title} updated (${Object.keys(items).length} total)`);
+    } else if (choice === "upsert") {
+      const key = await input2({
+        message: options.keyPromptMessage,
+        validate: (val) => {
+          const trimmed = val.trim();
+          if (!trimmed) return `${options.itemNoun} name cannot be empty`;
+          if (/\s/.test(trimmed)) return `${options.itemNoun} name cannot contain spaces`;
+          return true;
+        }
+      });
+      const trimmedKey = key.trim();
+      const existingVal = items[trimmedKey];
+      const isSecret = options.isSecretKey(trimmedKey);
+      let newVal;
+      if (isSecret) {
+        newVal = await password({
+          message: existingVal !== void 0 ? `New value for (${trimmedKey}) [leave empty to keep current]:` : `${options.valuePromptMessage} for (${trimmedKey}) [sensitive content masked]:`,
+          mask: "*"
+        });
+        if (existingVal !== void 0 && newVal === "") {
+          newVal = existingVal;
+        }
+      } else {
+        newVal = await input2({
+          message: `${options.valuePromptMessage} for (${trimmedKey}):`,
+          default: existingVal
+        });
+      }
+      items[trimmedKey] = newVal;
+      logger.success(`${existingVal !== void 0 ? "Updated" : "Added"}: ${pc8.cyan(trimmedKey)}`);
+    } else if (choice === "delete") {
+      const toDelete = await select2({
+        message: `Select ${options.itemNoun} to delete:`,
+        choices: [
+          ...keys.map((k) => ({ name: k, value: k })),
+          { name: "Cancel", value: "__cancel__" }
+        ]
+      });
+      if (toDelete !== "__cancel__") {
+        delete items[toDelete];
+        logger.success(`Deleted: ${pc8.cyan(toDelete)}`);
+      }
+    } else if (choice === "paste") {
+      const pasted = await readMultilineTextFromTerminal(options.pasteMessage);
+      const parsed = options.parseText(pasted);
+      const count = Object.keys(parsed).length;
+      if (count === 0) {
+        logger.warn(`No valid ${options.itemsNoun} recognized`);
+      } else {
+        if (keys.length > 0) {
+          const pasteMode = await select2({
+            message: `How to apply pasted ${options.itemsNoun}?`,
+            choices: [
+              { name: `Merge with existing ${options.itemsNoun}`, value: "merge" },
+              { name: `Replace all existing ${options.itemsNoun}`, value: "replace" }
+            ]
+          });
+          if (pasteMode === "replace") {
+            items = parsed;
+          } else {
+            Object.assign(items, parsed);
+          }
+        } else {
+          items = parsed;
+        }
+        logger.success(`Successfully applied ${pc8.cyan(String(count))} ${options.itemsNoun}`);
+      }
+    } else if (choice === "clear") {
+      const confirmClear = await confirm2({
+        message: `Are you sure you want to clear all ${options.itemsNoun}?`,
+        default: false
+      });
+      if (confirmClear) {
+        items = {};
+        logger.success(`Cleared all ${options.itemsNoun}`);
+      }
+    }
+  }
+};
+
 // src/interactive/prompts/env.ts
-var SECRET_KEY_PATTERN = /(token|key|secret|password|passwd|auth|credential)/i;
+var formatEnvText = (env) => {
+  return Object.entries(env).map(([key, value]) => {
+    if (/[\s"']/.test(value)) {
+      return `${key}="${value.replace(/"/g, '\\"')}"`;
+    }
+    return `${key}=${value}`;
+  }).join("\n");
+};
 var parseEnvText = (rawText) => {
   const result = {};
   const lines = rawText.split(/\r?\n/);
@@ -1695,7 +2402,7 @@ var promptEnvConfig = async (initialEnv = {}) => {
   const env = { ...initialEnv };
   const initialCount = Object.keys(env).length;
   if (initialCount > 0) {
-    logger.info(`Includes ${pc5.cyan(String(initialCount))} preset environment variables`);
+    logger.info(`Includes ${pc9.cyan(String(initialCount))} preset environment variables`);
   }
   const mode = await select3({
     message: "Configure environment variables?",
@@ -1724,7 +2431,8 @@ var promptEnvConfig = async (initialEnv = {}) => {
   if (mode === "paste" || mode === "editor") {
     const pasted = mode === "editor" ? await promptEditorText({
       message: "Paste or edit environment variables in editor, then save and exit:",
-      postfix: ".env"
+      postfix: ".env",
+      defaultText: formatEnvText(env)
     }) : await readMultilineTextFromTerminal("Paste .env formatted content (multiline supported):");
     const parsed = parseEnvText(pasted);
     const count = Object.keys(parsed).length;
@@ -1732,17 +2440,16 @@ var promptEnvConfig = async (initialEnv = {}) => {
       logger.warn("No valid KEY=VALUE pairs recognized");
     } else {
       Object.assign(env, parsed);
-      logger.success(`Successfully parsed ${pc5.cyan(String(count))} environment variables:`);
+      logger.success(`Successfully parsed ${pc9.cyan(String(count))} environment variables:`);
       for (const [k, v] of Object.entries(parsed)) {
-        const masked = SECRET_KEY_PATTERN.test(k) && v.length > 4 ? `${v.slice(0, 2)}***${v.slice(-2)}` : v;
-        console.log(`  ${pc5.bold(k)}=${pc5.dim(masked)}`);
+        console.log(`  ${pc9.bold(k)}=${pc9.dim(maskSecretValue(k, v))}`);
       }
     }
     return env;
   }
   logger.info("Entering environment variables (leave key empty and press enter to finish):");
   while (true) {
-    const key = await input2({
+    const key = await input3({
       message: "Variable name (Key, leave empty to finish):",
       validate: (val2) => {
         const trimmed = val2.trim();
@@ -1756,25 +2463,42 @@ var promptEnvConfig = async (initialEnv = {}) => {
     const isSecret = SECRET_KEY_PATTERN.test(trimmedKey);
     let val;
     if (isSecret) {
-      val = await password({
+      val = await password2({
         message: `Value for (${trimmedKey}) [secret masked]:`,
         mask: "*"
       });
     } else {
-      val = await input2({
+      val = await input3({
         message: `Value for (${trimmedKey}):`
       });
     }
     env[trimmedKey] = val;
-    logger.success(`Added: ${pc5.cyan(trimmedKey)}`);
+    logger.success(`Added: ${pc9.cyan(trimmedKey)}`);
   }
   return env;
 };
+var promptEditEnvConfig = async (currentEnv = {}) => promptEditKeyValueConfig(currentEnv, {
+  title: "Environment Variables",
+  itemNoun: "variable",
+  itemsNoun: "environment variables",
+  separator: "=",
+  editorPostfix: ".env",
+  editorMessage: "Edit environment variables in editor, then save and exit:",
+  pasteMessage: "Paste .env formatted content (multiline supported):",
+  keyPromptMessage: "Variable name (Key):",
+  valuePromptMessage: "Value",
+  isSecretKey: (k) => SECRET_KEY_PATTERN.test(k),
+  maskValue: maskSecretValue,
+  formatText: formatEnvText,
+  parseText: parseEnvText
+});
 
 // src/interactive/prompts/headers.ts
-import { input as input3, password as password2, select as select4 } from "@inquirer/prompts";
-import pc6 from "picocolors";
-var SECRET_HEADER_PATTERN = /(authorization|token|key|secret|auth)/i;
+import { input as input4, password as password3, select as select4 } from "@inquirer/prompts";
+import pc10 from "picocolors";
+var formatHeadersText = (headers) => {
+  return Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join("\n");
+};
 var parseHeadersText = (rawText) => {
   const result = {};
   const lines = rawText.split(/\r?\n/);
@@ -1830,7 +2554,8 @@ var promptHeadersConfig = async (initialHeaders = {}) => {
   }
   if (mode === "paste" || mode === "editor") {
     const pasted = mode === "editor" ? await promptEditorText({
-      message: "Paste or edit HTTP headers in editor, then save and exit:"
+      message: "Paste or edit HTTP headers in editor, then save and exit:",
+      defaultText: formatHeadersText(headers)
     }) : await readMultilineTextFromTerminal(
       "Paste HTTP headers content (multiline supported, e.g. Authorization: Bearer ...):"
     );
@@ -1840,17 +2565,16 @@ var promptHeadersConfig = async (initialHeaders = {}) => {
       logger.warn("No valid Key: Value pairs recognized");
     } else {
       Object.assign(headers, parsed);
-      logger.success(`Successfully parsed ${pc6.cyan(String(count))} headers:`);
+      logger.success(`Successfully parsed ${pc10.cyan(String(count))} headers:`);
       for (const [k, v] of Object.entries(parsed)) {
-        const masked = SECRET_HEADER_PATTERN.test(k) && v.length > 8 ? `${v.slice(0, 4)}***${v.slice(-3)}` : v;
-        console.log(`  ${pc6.bold(k)}: ${pc6.dim(masked)}`);
+        console.log(`  ${pc10.bold(k)}: ${pc10.dim(maskSecretHeader(k, v))}`);
       }
     }
     return headers;
   }
   logger.info("Entering HTTP headers (leave header name empty and press enter to finish):");
   while (true) {
-    const name = await input3({
+    const name = await input4({
       message: "Header name (e.g. Authorization, leave empty to finish):",
       validate: (val2) => {
         const trimmed = val2.trim();
@@ -1864,25 +2588,39 @@ var promptHeadersConfig = async (initialHeaders = {}) => {
     const isSecret = SECRET_HEADER_PATTERN.test(trimmedName);
     let val;
     if (isSecret) {
-      val = await password2({
+      val = await password3({
         message: `Header value for (${trimmedName}) [sensitive content masked]:`,
         mask: "*"
       });
     } else {
-      val = await input3({
+      val = await input4({
         message: `Header value for (${trimmedName}):`
       });
     }
     headers[trimmedName] = val;
-    logger.success(`Added: ${pc6.cyan(trimmedName)}`);
+    logger.success(`Added: ${pc10.cyan(trimmedName)}`);
   }
   return headers;
 };
+var promptEditHeadersConfig = async (currentHeaders = {}) => promptEditKeyValueConfig(currentHeaders, {
+  title: "HTTP Headers",
+  itemNoun: "header",
+  itemsNoun: "HTTP headers",
+  separator: ":",
+  editorMessage: "Edit HTTP headers in editor, then save and exit:",
+  pasteMessage: "Paste HTTP headers content (multiline supported, e.g. Authorization: Bearer ...):",
+  keyPromptMessage: "Header name (e.g. Authorization):",
+  valuePromptMessage: "Header value",
+  isSecretKey: (k) => SECRET_HEADER_PATTERN.test(k),
+  maskValue: maskSecretHeader,
+  formatText: formatHeadersText,
+  parseText: parseHeadersText
+});
 
 // src/interactive/wizard-add.ts
 var wizardAdd = async (initial = {}) => {
   const cwd = initial.cwd ?? process.cwd();
-  logger.info(pc7.bold("Welcome to the MCP interactive add wizard"));
+  logger.info(pc11.bold("Welcome to the MCP interactive add wizard"));
   let source = initial.source;
   if (!source) {
     const sourceType = await select5({
@@ -1903,12 +2641,12 @@ var wizardAdd = async (initial = {}) => {
       ]
     });
     if (sourceType === "npm") {
-      source = await input4({
-        message: "Enter npm package name (e.g. @modelcontextprotocol/server-postgres or mcp-server-git):",
+      source = await input5({
+        message: "Enter npm package name (e.g. @modelcontextprotocol/server-postgres):",
         validate: (val) => val.trim() ? true : "Package name cannot be empty"
       });
     } else if (sourceType === "remote") {
-      source = await input4({
+      source = await input5({
         message: "Enter remote server URL (e.g. https://mcp.example.com/sse):",
         validate: (val) => {
           const trimmed = val.trim();
@@ -1918,7 +2656,7 @@ var wizardAdd = async (initial = {}) => {
         }
       });
     } else {
-      source = await input4({
+      source = await input5({
         message: "Enter command and arguments (e.g. python -m my_mcp_server or docker run ...):",
         validate: (val) => val.trim() ? true : "Command cannot be empty"
       });
@@ -1928,7 +2666,7 @@ var wizardAdd = async (initial = {}) => {
   const parsed = parseMcpSource(source);
   let serverName = initial.name;
   if (!serverName) {
-    serverName = await input4({
+    serverName = await input5({
       message: "MCP server name:",
       default: parsed.inferredName,
       validate: (val) => val.trim() ? true : "Server name cannot be empty"
@@ -1950,7 +2688,7 @@ var wizardAdd = async (initial = {}) => {
       });
     }
     if (Object.keys(headers).length === 0) {
-      const needHeader = await confirm2({
+      const needHeader = await confirm5({
         message: "Configure HTTP headers (e.g. Authorization Bearer token)?",
         default: false
       });
@@ -1972,28 +2710,28 @@ var wizardAdd = async (initial = {}) => {
   if (parsed.type !== "remote") {
     env = await promptEnvConfig(env);
   }
-  console.log("\n" + pc7.cyan(pc7.bold("Configuration Preview:")));
-  console.log(`  ${pc7.bold("Server Name:")} ${pc7.green(serverName)}`);
-  console.log(`  ${pc7.bold("Server Type:")} ${pc7.magenta(parsed.type)}`);
-  console.log(`  ${pc7.bold("Source/Command:")} ${pc7.dim(source)}`);
-  console.log(`  ${pc7.bold("Scope:")} ${isGlobal ? pc7.yellow("Global") : pc7.blue("Project")}`);
-  console.log(`  ${pc7.bold("Target Agents:")} ${pc7.cyan(selectedAgents.join(", "))}`);
+  console.log("\n" + pc11.cyan(pc11.bold("Configuration Preview:")));
+  console.log(`  ${pc11.bold("Server Name:")} ${pc11.green(serverName)}`);
+  console.log(`  ${pc11.bold("Server Type:")} ${pc11.magenta(parsed.type)}`);
+  console.log(`  ${pc11.bold("Source/Command:")} ${pc11.dim(source)}`);
+  console.log(`  ${pc11.bold("Scope:")} ${isGlobal ? pc11.yellow("Global") : pc11.blue("Project")}`);
+  console.log(`  ${pc11.bold("Target Agents:")} ${pc11.cyan(selectedAgents.join(", "))}`);
   if (args.length > 0) {
-    console.log(`  ${pc7.bold("Arguments:")} ${pc7.dim(args.join(" "))}`);
+    console.log(`  ${pc11.bold("Arguments:")} ${pc11.dim(args.join(" "))}`);
   }
   if (transport) {
-    console.log(`  ${pc7.bold("Transport:")} ${pc7.magenta(transport)}`);
+    console.log(`  ${pc11.bold("Transport:")} ${pc11.magenta(transport)}`);
   }
   const envKeys = Object.keys(env);
   if (envKeys.length > 0) {
-    console.log(`  ${pc7.bold("Environment Variables:")} ${pc7.dim(envKeys.join(", "))} (${envKeys.length})`);
+    console.log(`  ${pc11.bold("Environment Variables:")} ${pc11.dim(envKeys.join(", "))} (${envKeys.length})`);
   }
   const headerKeys = Object.keys(headers);
   if (headerKeys.length > 0) {
-    console.log(`  ${pc7.bold("Headers:")} ${pc7.dim(headerKeys.join(", "))} (${headerKeys.length})`);
+    console.log(`  ${pc11.bold("Headers:")} ${pc11.dim(headerKeys.join(", "))} (${headerKeys.length})`);
   }
   console.log();
-  const proceed = await confirm2({
+  const proceed = await confirm5({
     message: "Confirm installation with this configuration?",
     default: true
   });
@@ -2013,41 +2751,103 @@ var wizardAdd = async (initial = {}) => {
     env
   });
   logger.info(
-    `Writing ${pc7.bold(result.serverName)} to ${pc7.cyan(String(result.results.length))} agent config files...`
+    `Writing ${pc11.bold(result.serverName)} to ${pc11.cyan(String(result.results.length))} agent config files...`
   );
   let allSuccess = true;
   for (const record of result.results) {
     if (record.success) {
-      logger.success(`${pc7.cyan(record.agent)}: Successfully written to ${pc7.dim(record.path)}`);
+      logger.success(
+        `${pc11.cyan(record.agent)}: Successfully written to ${pc11.dim(record.path)}${formatCoHostedBadge("configured", record.coConfiguredAgents)}`
+      );
     } else {
       allSuccess = false;
-      logger.error(`${pc7.cyan(record.agent)}: Failed to write - ${record.error}`);
+      logger.error(`${pc11.cyan(record.agent)}: Failed to write - ${record.error}`);
     }
   }
   if (allSuccess) {
-    logger.success(pc7.bold(`MCP server "${serverName}" configured successfully!`));
+    logger.success(pc11.bold(`MCP server "${serverName}" configured successfully!`));
   }
   return allSuccess;
 };
 
 // src/interactive/wizard-manage.ts
-import { checkbox as checkbox2, confirm as confirm3, select as select6 } from "@inquirer/prompts";
-import pc8 from "picocolors";
+import { confirm as confirm6, input as input6, select as select6 } from "@inquirer/prompts";
+import pc13 from "picocolors";
+
+// src/utils/display-server-details.ts
+import pc12 from "picocolors";
+var displayServerDetails = ({
+  serverName,
+  config,
+  agents,
+  hasDivergence,
+  global: isGlobal,
+  titlePrefix = "MCP Server Details"
+}) => {
+  console.log("\n" + pc12.cyan(pc12.bold(`${titlePrefix}: [${serverName}]`)));
+  if (isGlobal !== void 0) {
+    console.log(`  ${pc12.bold("Scope:")} ${isGlobal ? "Global" : "Project"}`);
+  }
+  if (agents && agents.length > 0) {
+    console.log(
+      `  ${pc12.bold("Configured Agents:")} ${pc12.green(agents.map((a) => getMcpAgentConfig(a).displayName).join(", "))}`
+    );
+  }
+  if (hasDivergence) {
+    console.log(
+      `  ${pc12.yellow(pc12.bold("Notice:"))} ${pc12.yellow("Configurations differ across installed agents. Showing configuration from the first agent.")}`
+    );
+  }
+  const isRemote = Boolean(config.url && config.url.length > 0);
+  if (isRemote) {
+    console.log(`  ${pc12.bold("Transport:")} ${pc12.magenta(config.type ?? "http")}`);
+    console.log(`  ${pc12.bold("URL:")} ${pc12.dim(config.url ?? "")}`);
+    const headerKeys = Object.keys(config.headers ?? {});
+    if (headerKeys.length > 0) {
+      console.log(`  ${pc12.bold("Headers:")} ${pc12.cyan(String(headerKeys.length))}`);
+      for (const [k, v] of Object.entries(config.headers ?? {})) {
+        console.log(`    ${pc12.bold(k)}: ${pc12.dim(maskSecretHeader(k, v))}`);
+      }
+    } else {
+      console.log(`  ${pc12.bold("Headers:")} ${pc12.dim("(none)")}`);
+    }
+  } else {
+    console.log(`  ${pc12.bold("Command:")} ${pc12.magenta(config.command ?? "")}`);
+    const argsStr = config.args && config.args.length > 0 ? config.args.join(" ") : "(none)";
+    console.log(`  ${pc12.bold("Arguments:")} ${pc12.dim(argsStr)}`);
+    const envKeys = Object.keys(config.env ?? {});
+    if (envKeys.length > 0) {
+      console.log(`  ${pc12.bold("Environment Variables:")} ${pc12.cyan(String(envKeys.length))}`);
+      for (const [k, v] of Object.entries(config.env ?? {})) {
+        console.log(`    ${pc12.bold(k)}=${pc12.dim(maskSecretValue(k, v))}`);
+      }
+    } else {
+      console.log(`  ${pc12.bold("Environment Variables:")} ${pc12.dim("(none)")}`);
+    }
+  }
+  console.log();
+};
 
 // src/interactive/utils/group-installed-servers.ts
 var normalizeServerConfig = parseServerConfig;
 var groupInstalledServersByName = (installed) => {
   const grouped = /* @__PURE__ */ new Map();
   for (const item of installed) {
+    const itemConfig = normalizeServerConfig(item.config);
     let entry = grouped.get(item.serverName);
     if (!entry) {
       entry = {
         serverName: item.serverName,
         agents: [],
         paths: [],
-        config: normalizeServerConfig(item.config)
+        config: itemConfig,
+        hasDivergence: false
       };
       grouped.set(item.serverName, entry);
+    } else if (!entry.hasDivergence) {
+      if (JSON.stringify(entry.config) !== JSON.stringify(itemConfig)) {
+        entry.hasDivergence = true;
+      }
     }
     if (!entry.agents.includes(item.agent)) {
       entry.agents.push(item.agent);
@@ -2060,6 +2860,221 @@ var groupInstalledServersByName = (installed) => {
 };
 
 // src/interactive/wizard-manage.ts
+var promptSwitchServerType = async (currentConfig, serverName) => {
+  const isRemote = Boolean(currentConfig.url && currentConfig.url.length > 0);
+  if (isRemote) {
+    const newCmd = await input6({
+      message: "Executable command (e.g. node, npx):",
+      validate: (val) => val.trim() ? true : "Command cannot be empty"
+    });
+    const newArgs = await promptEditArgs([]);
+    const newEnv = await promptEditEnvConfig({});
+    logger.success(`Switched [${serverName}] configuration to stdio mode`);
+    return {
+      command: newCmd.trim(),
+      args: newArgs.length > 0 ? newArgs : void 0,
+      env: Object.keys(newEnv).length > 0 ? newEnv : void 0
+    };
+  }
+  const newUrl = await input6({
+    message: "Remote server URL:",
+    validate: (val) => {
+      const trimmed = val.trim();
+      if (!trimmed) return "URL cannot be empty";
+      if (!/^https?:\/\//i.test(trimmed)) {
+        return "Please enter a valid URL starting with http:// or https://";
+      }
+      return true;
+    }
+  });
+  const transport = await select6({
+    message: "Select remote transport protocol:",
+    choices: [
+      { name: "HTTP", value: "http" },
+      { name: "SSE (Server-Sent Events)", value: "sse" }
+    ],
+    default: "http"
+  });
+  const newHeaders = await promptEditHeadersConfig({});
+  logger.success(`Switched [${serverName}] configuration to remote mode`);
+  return {
+    url: newUrl.trim(),
+    type: transport,
+    headers: Object.keys(newHeaders).length > 0 ? newHeaders : void 0
+  };
+};
+var handleEditServerConfig = async (options) => {
+  const { targetGroup } = options;
+  const isGlobal = options.global ?? false;
+  const cwd = options.cwd ?? process.cwd();
+  const serverName = targetGroup.serverName;
+  let workingConfig = {
+    ...targetGroup.config,
+    args: targetGroup.config.args ? [...targetGroup.config.args] : void 0,
+    env: targetGroup.config.env ? { ...targetGroup.config.env } : void 0,
+    headers: targetGroup.config.headers ? { ...targetGroup.config.headers } : void 0
+  };
+  while (true) {
+    const isRemote = Boolean(workingConfig.url && workingConfig.url.length > 0);
+    displayServerDetails({
+      serverName,
+      config: workingConfig,
+      titlePrefix: "Edit Server Configuration"
+    });
+    const editChoices = isRemote ? [
+      { name: "Edit HTTP Headers (headers)", value: "headers" },
+      { name: "Edit Remote URL (url)", value: "url" },
+      { name: "Edit Transport Protocol (type)", value: "transport" },
+      { name: "Switch to local command (stdio)", value: "switch_type" },
+      { name: "Reset changes to original", value: "reset" },
+      { name: "Save and apply changes", value: "save" },
+      { name: "Cancel (discard changes)", value: "cancel" }
+    ] : [
+      { name: "Edit Environment Variables (env)", value: "env" },
+      { name: "Edit Command Arguments (args)", value: "args" },
+      { name: "Edit Executable Command (command)", value: "command" },
+      { name: "Switch to remote server (HTTP/SSE)", value: "switch_type" },
+      { name: "Reset changes to original", value: "reset" },
+      { name: "Save and apply changes", value: "save" },
+      { name: "Cancel (discard changes)", value: "cancel" }
+    ];
+    const editAction = await select6({
+      message: `What would you like to modify in [${serverName}]?`,
+      choices: editChoices
+    });
+    if (editAction === "cancel") {
+      logger.info("Modification cancelled; changes discarded");
+      return;
+    }
+    if (editAction === "reset") {
+      workingConfig = {
+        ...targetGroup.config,
+        args: targetGroup.config.args ? [...targetGroup.config.args] : void 0,
+        env: targetGroup.config.env ? { ...targetGroup.config.env } : void 0,
+        headers: targetGroup.config.headers ? { ...targetGroup.config.headers } : void 0
+      };
+      logger.info("Configuration reset to original");
+      continue;
+    }
+    if (editAction === "switch_type") {
+      workingConfig = await promptSwitchServerType(workingConfig, serverName);
+      continue;
+    }
+    if (editAction === "env") {
+      workingConfig.env = await promptEditEnvConfig(workingConfig.env ?? {});
+    } else if (editAction === "args") {
+      workingConfig.args = await promptEditArgs(workingConfig.args ?? []);
+    } else if (editAction === "command") {
+      const newCmd = await input6({
+        message: "Executable command:",
+        default: workingConfig.command,
+        validate: (val) => val.trim() ? true : "Command cannot be empty"
+      });
+      workingConfig.command = newCmd.trim();
+    } else if (editAction === "headers") {
+      workingConfig.headers = await promptEditHeadersConfig(workingConfig.headers ?? {});
+    } else if (editAction === "url") {
+      const newUrl = await input6({
+        message: "Remote server URL:",
+        default: workingConfig.url,
+        validate: (val) => {
+          const trimmed = val.trim();
+          if (!trimmed) return "URL cannot be empty";
+          if (!/^https?:\/\//i.test(trimmed)) {
+            return "Please enter a valid URL starting with http:// or https://";
+          }
+          return true;
+        }
+      });
+      workingConfig.url = newUrl.trim();
+    } else if (editAction === "transport") {
+      workingConfig.type = await select6({
+        message: "Select remote transport protocol:",
+        choices: [
+          { name: "HTTP", value: "http" },
+          { name: "SSE (Server-Sent Events)", value: "sse" }
+        ],
+        default: workingConfig.type === "sse" ? "sse" : "http"
+      });
+    } else if (editAction === "save") {
+      let targetAgents = targetGroup.agents;
+      if (targetGroup.agents.length > 1) {
+        const sortedAgents = sortAgentsWithClusters(targetGroup.agents, { global: isGlobal, cwd });
+        const choices = buildLinkedAgentChoices({
+          agents: sortedAgents,
+          checkedAgents: sortedAgents,
+          scopeOptions: { global: isGlobal, cwd }
+        });
+        targetAgents = await linkedCheckbox({
+          message: "Select agents to update configuration (Space to toggle):",
+          choices,
+          loop: false,
+          validate: (ans) => ans.length === 0 ? "Please select at least one agent" : true
+        });
+        if (targetAgents.length < targetGroup.agents.length) {
+          const unselected = targetGroup.agents.filter((a) => !targetAgents.includes(a));
+          const unselectedNames = unselected.map((a) => getMcpAgentConfig(a).displayName).join(", ");
+          logger.info(
+            `Note: Updating only a subset of agents. Server configurations will diverge from: ${unselectedNames}.`
+          );
+        }
+      }
+      const requestedTransport = workingConfig.url ? workingConfig.type ?? "http" : "stdio";
+      const resolution = resolveTargetAgents({
+        requested: targetAgents,
+        global: isGlobal,
+        cwd,
+        transport: requestedTransport
+      });
+      if (resolution.incompatible.length > 0) {
+        for (const item of resolution.incompatible) {
+          logger.warn(`Skipping ${pc13.cyan(item.agent)}: ${item.reason}`);
+        }
+      }
+      if (resolution.compatibleAgents.length === 0) {
+        logger.error(
+          `None of the selected agents support ${requestedTransport} transport. Cannot update.`
+        );
+        continue;
+      }
+      const agentNames = resolution.compatibleAgents.map((a) => getMcpAgentConfig(a).displayName).join(", ");
+      const confirmed = await confirm6({
+        message: `Confirm updating configuration for [${serverName}] across: ${agentNames}?`,
+        default: true
+      });
+      if (!confirmed) {
+        logger.warn("Update cancelled");
+        continue;
+      }
+      const updateResult = updateMcpServer({
+        serverName,
+        config: workingConfig,
+        previousConfig: targetGroup.config,
+        agents: resolution.compatibleAgents,
+        global: isGlobal,
+        cwd
+      });
+      let updatedAny = false;
+      const succeededAgents = [];
+      for (const res of updateResult.results) {
+        if (res.success) {
+          updatedAny = true;
+          succeededAgents.push(res.agent);
+          logger.success(
+            `${pc13.cyan(res.agent)}: Successfully updated configuration in ${pc13.dim(res.path)}${formatCoHostedBadge("configured", res.coConfiguredAgents)}`
+          );
+        } else {
+          logger.error(`${pc13.cyan(res.agent)}: Update failed - ${res.error}`);
+        }
+      }
+      if (updatedAny) {
+        targetGroup.config = updateResult.config;
+        logger.success(`Configuration for [${serverName}] updated successfully!`);
+        return;
+      }
+    }
+  }
+};
 var wizardManage = async (options = {}) => {
   const cwd = options.cwd ?? process.cwd();
   const isGlobal = await promptScope({
@@ -2073,51 +3088,57 @@ var wizardManage = async (options = {}) => {
     return;
   }
   const grouped = groupInstalledServersByName(installed);
+  let pendingServerName = options.serverName;
+  const refreshGroupedServers = () => {
+    const freshInstalled = listInstalledMcpServers({ global: isGlobal, cwd });
+    const freshGrouped = groupInstalledServersByName(freshInstalled);
+    grouped.clear();
+    for (const [name, grp] of freshGrouped) {
+      grouped.set(name, grp);
+    }
+  };
   while (true) {
-    const choices = Array.from(grouped.values()).map((g) => {
-      const agentNames = g.agents.map((a) => getMcpAgentConfig(a).displayName).join(", ");
-      return {
-        name: `${pc8.bold(g.serverName)} ${pc8.dim(`(configured in: ${agentNames})`)}`,
-        value: g.serverName
-      };
-    });
-    choices.push({
-      name: `Back`,
-      value: "__back__"
-    });
-    const chosenServerName = await select6({
-      message: "Select MCP server to manage or sync:",
-      choices
-    });
-    if (chosenServerName === "__back__") {
-      return;
+    let chosenServerName;
+    if (pendingServerName && grouped.has(pendingServerName)) {
+      chosenServerName = pendingServerName;
+      pendingServerName = void 0;
+    } else {
+      pendingServerName = void 0;
+      const choices = Array.from(grouped.values()).map((g) => {
+        const agentNames = g.agents.map((a) => getMcpAgentConfig(a).displayName).join(", ");
+        return {
+          name: `${pc13.bold(g.serverName)} ${pc13.dim(`(configured in: ${agentNames})`)}`,
+          value: g.serverName
+        };
+      });
+      choices.push({
+        name: `Back`,
+        value: "__back__"
+      });
+      chosenServerName = await select6({
+        message: "Select MCP server to manage or sync:",
+        choices
+      });
+      if (chosenServerName === "__back__") {
+        return;
+      }
     }
     const targetGroup = grouped.get(chosenServerName);
     if (!targetGroup) continue;
-    console.log("\n" + pc8.cyan(pc8.bold(`MCP Server Details: [${chosenServerName}]`)));
-    console.log(`  ${pc8.bold("Scope:")} ${isGlobal ? "Global" : "Project"}`);
-    console.log(
-      `  ${pc8.bold("Configured Agents:")} ${pc8.green(targetGroup.agents.map((a) => getMcpAgentConfig(a).displayName).join(", "))}`
-    );
-    const cfg = targetGroup.config;
-    if (isRemoteServerConfig(cfg)) {
-      console.log(`  ${pc8.bold("URL:")} ${pc8.dim(cfg.url)} (${cfg.type})`);
-      if (cfg.headers && Object.keys(cfg.headers).length > 0) {
-        console.log(`  ${pc8.bold("Headers:")} ${Object.keys(cfg.headers).join(", ")}`);
-      }
-    } else if (isStdioServerConfig(cfg)) {
-      console.log(`  ${pc8.bold("Command:")} ${pc8.magenta(cfg.command)}`);
-      if (cfg.args && cfg.args.length > 0) {
-        console.log(`  ${pc8.bold("Arguments:")} ${pc8.dim(cfg.args.join(" "))}`);
-      }
-      if (cfg.env && Object.keys(cfg.env).length > 0) {
-        console.log(`  ${pc8.bold("Environment Variables:")} ${pc8.dim(Object.keys(cfg.env).join(", "))}`);
-      }
-    }
-    console.log();
+    displayServerDetails({
+      serverName: chosenServerName,
+      config: targetGroup.config,
+      agents: targetGroup.agents,
+      global: isGlobal,
+      hasDivergence: targetGroup.hasDivergence
+    });
     const action = await select6({
       message: `What would you like to do with [${chosenServerName}]?`,
       choices: [
+        {
+          name: "Edit server configuration",
+          value: "edit"
+        },
         {
           name: "Sync / clone to other agents",
           value: "sync"
@@ -2129,23 +3150,37 @@ var wizardManage = async (options = {}) => {
       ]
     });
     if (action === "back") continue;
+    if (action === "edit") {
+      await handleEditServerConfig({
+        targetGroup,
+        global: isGlobal,
+        cwd
+      });
+      refreshGroupedServers();
+      continue;
+    }
     if (action === "sync") {
       const allAllowedAgents = isGlobal ? getMcpAgentTypes() : getMcpAgentsSupportingProjectScope();
-      const candidateAgents = allAllowedAgents.filter((a) => !targetGroup.agents.includes(a));
-      if (candidateAgents.length === 0) {
-        logger.info("All supported agents in this scope already have this MCP server configured; no sync needed");
+      const rawCandidateAgents = allAllowedAgents.filter((a) => !targetGroup.agents.includes(a));
+      if (rawCandidateAgents.length === 0) {
+        logger.info(
+          "All supported agents in this scope already have this MCP server configured; no sync needed"
+        );
         continue;
       }
-      const selectedToSync = await checkbox2({
+      const candidateAgents = sortAgentsWithClusters(rawCandidateAgents, { global: isGlobal, cwd });
+      const choices = buildLinkedAgentChoices({
+        agents: candidateAgents,
+        checkedAgents: [],
+        scopeOptions: { global: isGlobal, cwd }
+      });
+      const selectedToSync = await linkedCheckbox({
         message: "Select target agents to sync to (Space to select):",
-        choices: candidateAgents.map((a) => ({
-          name: `${getMcpAgentConfig(a).displayName} (${a})`,
-          value: a,
-          checked: false
-        })),
+        choices,
+        loop: false,
         validate: (ans) => ans.length === 0 ? "Please select at least one agent" : true
       });
-      const confirmed = await confirm3({
+      const confirmed = await confirm6({
         message: `Confirm syncing configuration of [${chosenServerName}] to: ${selectedToSync.join(", ")}?`,
         default: true
       });
@@ -2153,25 +3188,37 @@ var wizardManage = async (options = {}) => {
         logger.warn("Sync cancelled");
         continue;
       }
-      for (const targetAgent of selectedToSync) {
-        const res = installMcpServerForAgent(chosenServerName, targetGroup.config, targetAgent, {
-          global: isGlobal,
-          cwd
-        });
+      const syncResult = updateMcpServer({
+        serverName: chosenServerName,
+        config: targetGroup.config,
+        agents: selectedToSync,
+        global: isGlobal,
+        cwd
+      });
+      for (const item of syncResult.incompatible) {
+        logger.warn(`Skipping ${pc13.cyan(item.agent)}: ${item.reason}`);
+      }
+      for (const res of syncResult.results) {
+        if (syncResult.incompatible.some((i) => i.agent === res.agent)) {
+          continue;
+        }
         if (res.success) {
-          logger.success(`${pc8.cyan(targetAgent)}: Successfully synced to ${pc8.dim(res.path)}`);
-          targetGroup.agents.push(targetAgent);
+          logger.success(
+            `${pc13.cyan(res.agent)}: Successfully synced to ${pc13.dim(res.path)}${formatCoHostedBadge("configured", res.coConfiguredAgents)}`
+          );
+          targetGroup.agents.push(res.agent);
         } else {
-          logger.error(`${pc8.cyan(targetAgent)}: Sync failed - ${res.error}`);
+          logger.error(`${pc13.cyan(res.agent)}: Sync failed - ${res.error}`);
         }
       }
+      refreshGroupedServers();
     }
   }
 };
 
 // src/interactive/wizard-remove.ts
-import { checkbox as checkbox3, confirm as confirm4, select as select7 } from "@inquirer/prompts";
-import pc9 from "picocolors";
+import { confirm as confirm7, select as select7 } from "@inquirer/prompts";
+import pc14 from "picocolors";
 var wizardRemove = async (options = {}) => {
   const cwd = options.cwd ?? process.cwd();
   const isGlobal = await promptScope({
@@ -2188,7 +3235,7 @@ var wizardRemove = async (options = {}) => {
   let serverName = options.name;
   if (!serverName) {
     const choices = Array.from(serverMap.values()).map((g) => ({
-      name: `${pc9.bold(g.serverName)} ${pc9.dim(`(installed in: ${g.agents.map((a) => getMcpAgentConfig(a).displayName).join(", ")})`)}`,
+      name: `${pc14.bold(g.serverName)} ${pc14.dim(`(installed in: ${g.agents.map((a) => getMcpAgentConfig(a).displayName).join(", ")})`)}`,
       value: g.serverName
     }));
     serverName = await select7({
@@ -2196,20 +3243,22 @@ var wizardRemove = async (options = {}) => {
       choices
     });
   }
-  const installedAgents = serverMap.get(serverName)?.agents || [];
-  if (installedAgents.length === 0) {
+  const rawInstalledAgents = serverMap.get(serverName)?.agents || [];
+  if (rawInstalledAgents.length === 0) {
     logger.warn(`No agents found with [${serverName}] installed`);
     return false;
   }
+  const installedAgents = sortAgentsWithClusters(rawInstalledAgents, { global: isGlobal, cwd });
   let targetAgents = options.agents;
   if (!targetAgents || targetAgents.length === 0) {
-    targetAgents = await checkbox3({
+    const choices = buildLinkedAgentChoices({
+      agents: installedAgents,
+      checkedAgents: installedAgents,
+      scopeOptions: { global: isGlobal, cwd }
+    });
+    targetAgents = await linkedCheckbox({
       message: `Select agents to remove [${serverName}] from:`,
-      choices: installedAgents.map((agent) => ({
-        name: `${getMcpAgentConfig(agent)?.displayName ?? agent} (${agent})`,
-        value: agent,
-        checked: true
-      })),
+      choices,
       validate: (ans) => ans.length === 0 ? "Please select at least one agent" : true
     });
   } else {
@@ -2220,7 +3269,7 @@ var wizardRemove = async (options = {}) => {
     }
     targetAgents = validAgents;
   }
-  const confirmed = await confirm4({
+  const confirmed = await confirm7({
     message: `Confirm removing MCP server [${serverName}] from ${targetAgents.join(", ")}?`,
     default: true
   });
@@ -2237,10 +3286,12 @@ var wizardRemove = async (options = {}) => {
   let removedCount = 0;
   for (const res of results) {
     if (res.removed) {
-      logger.success(`${pc9.cyan(res.agent)}: Successfully removed from ${pc9.dim(res.path)}`);
+      logger.success(
+        `${pc14.cyan(res.agent)}: Successfully removed from ${pc14.dim(res.path)}${formatCoHostedBadge("affected", res.coAffectedAgents)}`
+      );
       removedCount++;
     } else if (res.error) {
-      logger.error(`${pc9.cyan(res.agent)}: Failed to remove - ${res.error}`);
+      logger.error(`${pc14.cyan(res.agent)}: Failed to remove - ${res.error}`);
     }
   }
   if (removedCount > 0) {
@@ -2254,8 +3305,8 @@ var wizardRemove = async (options = {}) => {
 // src/interactive/main-menu.ts
 var mainMenu = async () => {
   console.log();
-  console.log(pc10.bold(pc10.cyan("mcps - Cross-Platform MCP Manager for AI Coding Agents")));
-  console.log(pc10.dim("Cross-platform MCP server configuration & synchronization tool"));
+  console.log(pc15.bold(pc15.cyan("mcps - Cross-Platform MCP Manager for AI Coding Agents")));
+  console.log(pc15.dim("Cross-platform MCP server configuration & synchronization tool"));
   console.log();
   while (true) {
     try {
@@ -2281,7 +3332,7 @@ var mainMenu = async () => {
         ]
       });
       if (action === "exit") {
-        console.log(pc10.dim("Goodbye!"));
+        console.log(pc15.dim("Goodbye!"));
         break;
       }
       if (action === "add") {
@@ -2294,7 +3345,7 @@ var mainMenu = async () => {
       console.log();
     } catch (error) {
       if (error?.name === "ExitPromptError") {
-        console.log("\n" + pc10.dim("Exited."));
+        console.log("\n" + pc15.dim("Exited."));
         break;
       }
       throw error;
@@ -2302,6 +3353,211 @@ var mainMenu = async () => {
   }
 };
 
+// src/utils/resolve-transport.ts
+var resolveTransport = (input7) => {
+  if (!input7) return void 0;
+  if (input7 === "http" || input7 === "sse") return input7;
+  throw new Error(`Unsupported transport "${input7}" (expected: http, sse)`);
+};
+
+// src/cli/manage.ts
+import { Command } from "commander";
+import pc16 from "picocolors";
+
+// src/utils/parse-key-value-list.ts
+var parseKeyValueList = (entries, separator) => {
+  if (!entries || entries.length === 0) return {};
+  const result = {};
+  for (const entry of entries) {
+    const splitIndex = entry.indexOf(separator);
+    if (splitIndex === -1) {
+      throw new Error(`Invalid entry "${entry}": expected "${separator}" separator`);
+    }
+    const key = entry.slice(0, splitIndex).trim();
+    const value = entry.slice(splitIndex + separator.length).trim();
+    if (!key) throw new Error(`Invalid entry "${entry}": empty key`);
+    result[key] = value;
+  }
+  return result;
+};
+
+// src/cli/manage.ts
+var requireTargetServerGroup = (serverName, scope) => {
+  const installed = listInstalledMcpServers(scope);
+  const grouped = groupInstalledServersByName(installed);
+  const targetGroup = grouped.get(serverName);
+  if (!targetGroup) {
+    logger.error(
+      `MCP server "${serverName}" is not configured in ${scope.global ? "global" : "project"} scope.`
+    );
+    process.exitCode = 1;
+    return void 0;
+  }
+  return targetGroup;
+};
+var mcpManageCommand = new Command("manage").description("Inspect, modify, and sync installed MCP servers across coding agents").argument("[server-name]", "Optional server name to inspect or manage").option("-a, --agent <agents...>", "Target specific agents for update").option("-g, --global", "Manage global scope servers instead of project").option("-t, --transport <type>", "Transport type for remote servers (http or sse)").option("--header <header...>", "HTTP header (Header: Value), repeatable").option("--clear-headers", "Clear all HTTP headers for remote servers").option("--env <env...>", "Env var for stdio servers (KEY=VALUE), repeatable").option("--clear-env", "Clear all environment variables for stdio servers").option("--args <args...>", "CLI arguments for stdio/package servers").option("--clear-args", "Clear all arguments for stdio/package servers").option("--command <command>", "Executable command for stdio servers").option("--url <url>", "Remote endpoint URL").option("-y, --yes", "Skip interactive prompts").action(async (serverName, options) => {
+  try {
+    const cwd = process.cwd();
+    const isGlobal = Boolean(options.global);
+    const hasModifications = options.command !== void 0 || options.args !== void 0 || Boolean(options.clearArgs) || options.env !== void 0 || Boolean(options.clearEnv) || options.header !== void 0 || Boolean(options.clearHeaders) || options.url !== void 0 || options.transport !== void 0;
+    const isInteractive = Boolean(process.stdin.isTTY && !options.yes);
+    if (hasModifications) {
+      if (options.url !== void 0 && options.command !== void 0) {
+        logger.error('Cannot specify both "--url" (remote) and "--command" (stdio) simultaneously.');
+        process.exitCode = 1;
+        return;
+      }
+      if (!serverName) {
+        logger.error('Missing required argument: "server-name" when passing modification flags.');
+        process.exitCode = 1;
+        return;
+      }
+      const targetGroup = requireTargetServerGroup(serverName, { global: isGlobal, cwd });
+      if (!targetGroup) {
+        return;
+      }
+      const isCurrentRemote = Boolean(targetGroup.config.url && targetGroup.config.url.length > 0);
+      const willBeRemote = options.url !== void 0 ? true : options.command !== void 0 ? false : isCurrentRemote;
+      if (willBeRemote) {
+        const ignoredStdioFlags = [];
+        if (options.env !== void 0) ignoredStdioFlags.push("--env");
+        if (options.clearEnv) ignoredStdioFlags.push("--clear-env");
+        if (options.args !== void 0) ignoredStdioFlags.push("--args");
+        if (options.clearArgs) ignoredStdioFlags.push("--clear-args");
+        if (ignoredStdioFlags.length > 0) {
+          const hint = options.url !== void 0 ? "When configuring a remote server, stdio flags are ignored." : "Use --command to switch to stdio mode.";
+          logger.warn(
+            `Server "${serverName}" is a remote server. The following stdio flags will be ignored: ${ignoredStdioFlags.join(", ")}. ${hint}`
+          );
+        }
+      } else {
+        const ignoredRemoteFlags = [];
+        if (options.header !== void 0) ignoredRemoteFlags.push("--header");
+        if (options.clearHeaders) ignoredRemoteFlags.push("--clear-headers");
+        if (options.transport !== void 0) ignoredRemoteFlags.push("--transport");
+        if (ignoredRemoteFlags.length > 0) {
+          const hint = options.command !== void 0 ? "When configuring a stdio server, remote flags are ignored." : "Use --url to switch to remote mode.";
+          logger.warn(
+            `Server "${serverName}" is a stdio server. The following remote flags will be ignored: ${ignoredRemoteFlags.join(", ")}. ${hint}`
+          );
+        }
+      }
+      const incomingDelta = {};
+      if (options.command !== void 0) {
+        incomingDelta.command = options.command;
+      }
+      if (options.clearArgs) {
+        incomingDelta.args = void 0;
+      }
+      if (options.args !== void 0) {
+        incomingDelta.args = options.args;
+      }
+      if (options.url !== void 0) {
+        incomingDelta.url = options.url;
+      }
+      if (options.transport !== void 0) {
+        incomingDelta.type = resolveTransport(options.transport);
+      }
+      if (options.clearEnv) {
+        incomingDelta.env = void 0;
+      }
+      if (options.env !== void 0) {
+        const parsedEnv = parseKeyValueList(options.env, "=");
+        const baseEnv = options.clearEnv ? {} : targetGroup.config.env ?? {};
+        incomingDelta.env = { ...baseEnv, ...parsedEnv };
+      }
+      if (options.clearHeaders) {
+        incomingDelta.headers = void 0;
+      }
+      if (options.header !== void 0) {
+        const parsedHeaders = parseKeyValueList(options.header, ":");
+        const baseHeaders = options.clearHeaders ? {} : targetGroup.config.headers ?? {};
+        incomingDelta.headers = { ...baseHeaders, ...parsedHeaders };
+      }
+      let targetAgents = targetGroup.agents;
+      if (options.agent !== void 0) {
+        const parsed = parseMcpAgentList(options.agent);
+        if (!parsed || parsed.length === 0) {
+          logger.error(`No valid agents recognized from: "${options.agent.join(", ")}".`);
+          process.exitCode = 1;
+          return;
+        }
+        targetAgents = parsed;
+      }
+      const updateResult = updateMcpServer({
+        serverName,
+        config: incomingDelta,
+        previousConfig: targetGroup.config,
+        agents: targetAgents,
+        global: isGlobal,
+        cwd
+      });
+      for (const item of updateResult.incompatible) {
+        logger.warn(`Skipping ${pc16.cyan(item.agent)}: ${item.reason}`);
+      }
+      const attemptedResults = updateResult.results.filter(
+        (r) => !updateResult.incompatible.some((i) => i.agent === r.agent)
+      );
+      if (attemptedResults.length === 0) {
+        const requestedTransport = updateResult.config.url ? updateResult.config.type ?? "http" : "stdio";
+        logger.error(
+          `None of the target agents support ${requestedTransport} transport. Update aborted.`
+        );
+        process.exitCode = 1;
+        return;
+      }
+      logger.info(
+        `Updating ${pc16.bold(serverName)} across ${pc16.cyan(String(attemptedResults.length))} agent(s)...`
+      );
+      let allSuccess = true;
+      for (const res of attemptedResults) {
+        if (res.success) {
+          logger.success(`${pc16.cyan(res.agent)}: Successfully updated in ${pc16.dim(res.path)}`);
+          logCoHostedNotice("configured", res.coConfiguredAgents);
+        } else {
+          allSuccess = false;
+          logger.error(`${pc16.cyan(res.agent)}: Update failed - ${res.error}`);
+        }
+      }
+      if (!allSuccess) {
+        process.exitCode = 1;
+      }
+      return;
+    }
+    if (!isInteractive) {
+      if (!serverName) {
+        logger.error(
+          'Missing required argument: "server-name" for non-interactive manage command. Specify a server name or use interactive terminal.'
+        );
+        process.exitCode = 1;
+        return;
+      }
+      const targetGroup = requireTargetServerGroup(serverName, { global: isGlobal, cwd });
+      if (!targetGroup) {
+        return;
+      }
+      displayServerDetails({
+        serverName,
+        config: targetGroup.config,
+        agents: targetGroup.agents,
+        global: isGlobal,
+        hasDivergence: targetGroup.hasDivergence
+      });
+      return;
+    }
+    await wizardManage({
+      global: options.global,
+      serverName
+    });
+  } catch (error) {
+    if (error && typeof error === "object" && "name" in error && error.name === "ExitPromptError") {
+      process.exit(0);
+    }
+    logger.error(toErrorMessage(error));
+    process.exitCode = 1;
+  }
+});
+
 export {
   mcpAgents,
   mcpAgentAliases,
@@ -2328,11 +3584,16 @@ export {
   AgentConfigStore,
   agentConfigStore,
   toErrorMessage,
+  getCandidateAgentsForScope,
+  getCoHostedAgents,
+  resolveConfigClusters,
+  sortAgentsWithClusters,
   transformServerConfig,
   createAgentTransform,
   transformServerConfigForAgent,
   installMcpServerForAgent,
   installMcpServerForAgents,
+  installToCompatibleAgents,
   parseMcpAgentList,
   resolveTargetAgents,
   extractPackageName,
@@ -2342,19 +3603,43 @@ export {
   listInstalledMcpServers,
   removeMcpServerFromAgent,
   removeMcpServer,
+  toRemoteServerConfig,
+  toStdioServerConfig,
+  detectUpdateTransition,
+  sanitizeUpdatedServerConfig,
+  updateMcpServer,
   logger,
+  logCoHostedNotice,
+  buildLinkedAgentChoices,
+  linkedCheckbox,
   promptScope,
   promptScopeAndAgents,
   parseArgsString,
   promptArgsConfig,
+  formatArgsString,
+  promptEditArgs,
+  SECRET_KEY_PATTERN,
+  maskSecretValue,
+  SECRET_HEADER_PATTERN,
+  maskSecretHeader,
+  promptEditKeyValueConfig,
+  formatEnvText,
   parseEnvText,
   promptEnvConfig,
+  promptEditEnvConfig,
+  formatHeadersText,
   parseHeadersText,
   promptHeadersConfig,
+  promptEditHeadersConfig,
   wizardAdd,
+  displayServerDetails,
   normalizeServerConfig,
   groupInstalledServersByName,
+  promptSwitchServerType,
   wizardManage,
   wizardRemove,
-  mainMenu
+  mainMenu,
+  resolveTransport,
+  parseKeyValueList,
+  mcpManageCommand
 };