@duckmind/dm-darwin-x64 0.66.5 → 0.66.7

package/extensions/dm-mcp-adapter/config.js

@@ -1,4 +1,4 @@
-import { chmodSync, existsSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
+import { chmodSync, existsSync, lstatSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { parse as parseToml } from "smol-toml";
@@ -10,14 +10,15 @@ import { loadClaudePluginBundles } from "./claude-plugin-loader.js";
 import { loadPackageMcpConfigs } from "./package-mcp-loader.js";
 import { validateJevSettings } from "./jev-client.js";
 import { formatServerNamespace, isServerDisabled } from "./types.js";
-import { parseJsonWithComments, toStringRecord } from "./utils.js";
+import { getMissingEnvVars, parseJsonWithComments, providerAuthUrlError, stripUtf8Bom, toStringRecord } from "./utils.js";
 const GENERIC_GLOBAL_CONFIG_PATH = join(homedir(), ".config", "mcp", "mcp.json");
 const AGENTS_GLOBAL_CONFIG_PATHS = [
   join(homedir(), ".agents", "mcp.json"),
   join(homedir(), ".agents", "mcp", "mcp.json")
 ];
 const PROJECT_CONFIG_NAME = ".mcp.json";
-const PROJECT_PI_CONFIG_NAME = "mcp.json";
+const PI_MCP_CONFIG_NAME = "mcp.json";
+const ADAPTER_CONFIG_NAME = "mcp-adapter.json";
 const REPOPROMPT_BINARY_CANDIDATES = [
   join(homedir(), "RepoPrompt", "repoprompt_cli"),
   "/Applications/Repo Prompt.app/Contents/MacOS/repoprompt-mcp"
@@ -41,10 +42,22 @@ export const KNOWN_SERVER_PRESETS = [
     summary: "Search the web and fetch pages without an API key.",
     entry: {
       url: "https://search.parallel.ai/mcp",
+      headers: { "User-Agent": "dm-mcp-adapter" },
       protocolVersion: "auto",
       directTools: true
     }
   },
+  {
+    id: "tavily-search",
+    name: "Tavily Search",
+    summary: "Search the web and extract page content without an API key.",
+    entry: {
+      url: "https://mcp.tavily.com/mcp/",
+      headers: { "X-Tavily-Access-Mode": "keyless" },
+      protocolVersion: "auto",
+      directTools: ["tavily_search", "tavily_extract"]
+    }
+  },
   {
     id: "notion",
     name: "Notion",
@@ -62,6 +75,20 @@ export const KNOWN_SERVER_PRESETS = [
     name: "Chrome DevTools",
     summary: "Inspect and automate a local Chrome browser.",
     entry: { command: "npx", args: ["-y", "chrome-devtools-mcp@1.6.0"] }
+  },
+  {
+    id: "figma",
+    name: "Figma (desktop)",
+    summary: "Read designs through the Figma desktop app. Needs a Dev or Full seat on a paid Figma plan.",
+    entry: { url: "http://127.0.0.1:3845/mcp", protocolVersion: "auto" },
+    desktopApp: {
+      paths: [
+        "/Applications/Figma.app",
+        join(homedir(), "Applications", "Figma.app"),
+        join(homedir(), "AppData", "Local", "Figma", "Figma.exe")
+      ],
+      enableSteps: "To enable it, open a Design file in Figma, switch to Dev Mode (Shift+D), and click 'Enable desktop MCP server' in the inspect panel."
+    }
   }
 ];
 const IMPORT_PATHS = {
@@ -84,7 +111,13 @@ const IMPORT_PATHS = {
   vscode: [".vscode/mcp.json"]
 };
 export function getPiGlobalConfigPath(overridePath) {
-  return overridePath ? resolve(overridePath) : getAgentPath("mcp.json");
+  return overridePath ? resolve(overridePath) : getAgentPath(ADAPTER_CONFIG_NAME);
+}
+export function getPiMcpGlobalConfigPath() {
+  return getAgentPath(PI_MCP_CONFIG_NAME);
+}
+export function getPiMcpAuthPath() {
+  return getAgentPath("mcp-auth.json");
 }
 export function getGenericGlobalConfigPath() {
   return GENERIC_GLOBAL_CONFIG_PATH;
@@ -93,7 +126,86 @@ export function getProjectConfigPath(cwd = process.cwd()) {
   return resolve(cwd, PROJECT_CONFIG_NAME);
 }
 export function getProjectPiConfigPath(cwd = process.cwd()) {
-  return resolve(cwd, getConfigDirName(), PROJECT_PI_CONFIG_NAME);
+  return resolve(cwd, getConfigDirName(), ADAPTER_CONFIG_NAME);
+}
+export function getProjectPiMcpConfigPath(cwd = process.cwd()) {
+  return resolve(cwd, getConfigDirName(), PI_MCP_CONFIG_NAME);
+}
+let piMcpConfigEnabled = false;
+export function setPiMcpConfigEnabled(enabled) {
+  piMcpConfigEnabled = enabled;
+}
+export function isPiMcpConfigEnabled() {
+  return piMcpConfigEnabled;
+}
+function legacyMcpConfigHasContent(filePath) {
+  if (!existsSync(filePath))
+    return false;
+  try {
+    const raw = parseJsonWithComments(readFileSync(filePath, "utf-8"));
+    if (!isRecord(raw))
+      return false;
+    const hasServers = (value) => isRecord(value) && Object.keys(value).length > 0;
+    return hasServers(raw.mcpServers) || hasServers(raw["mcp-servers"]) || raw.settings !== undefined || raw.imports !== undefined || raw.claudePlugins !== undefined;
+  } catch {
+    return false;
+  }
+}
+function migrateLegacyMcpConfig(source, target) {
+  if (!existsSync(source) || existsSync(target))
+    return;
+  try {
+    const sourceStat = lstatSync(source);
+    if (!sourceStat.isFile())
+      return;
+    const raw = readFileSync(source, "utf-8");
+    const parsed = parseJsonWithComments(raw);
+    if (!isRecord(parsed))
+      return;
+    mkdirSync(dirname(target), { recursive: true, mode: 448 });
+    const temporary = `${target}.tmp-${process.pid}-${Date.now()}`;
+    writeFileSync(temporary, raw, { encoding: "utf-8", mode: sourceStat.mode & 511 });
+    renameSync(temporary, target);
+    rmSync(source);
+    return `Migrated ${source} to ${target}.`;
+  } catch {
+    return;
+  }
+}
+export function getLegacyMcpMigrationNotices(cwd = process.cwd(), overridePath) {
+  if (piMcpConfigEnabled) {
+    return getConfigSources(overridePath, cwd).flatMap((source) => {
+      const file = isPiMcpSource(source.id) ? readPiMcpConfig(source.readPath) : null;
+      if (!file)
+        return [];
+      const parts = [];
+      if (file.adapterKeys.length > 0) {
+        const serversHint = file.adapterKeys.includes("mcp-servers") ? `, with "mcp-servers" entries under its "mcpServers" key` : "";
+        parts.push(`dm-mcp-adapter does not read ${file.adapterKeys.join(", ")} in this file; move them into ${source.writePath}${serversHint}.`);
+      }
+      if (file.skipped.length > 0)
+        parts.push(`Skipped ${file.skipped.join("; ")}.`);
+      if (file.ignoredSettings.size > 0) {
+        const ignored = [...file.ignoredSettings].map(([name, settings]) => `"${name}": ${settings.join(", ")}`);
+        parts.push(`Ignored settings (details in /mcp-adapter): ${ignored.join("; ")}.`);
+      }
+      return parts.length > 0 ? [`${source.readPath}: ${parts.join(" ")}`] : [];
+    });
+  }
+  const explicitPath = overridePath ? resolve(overridePath) : undefined;
+  const candidates = [
+    [getPiMcpGlobalConfigPath(), getPiGlobalConfigPath()],
+    [getProjectPiMcpConfigPath(cwd), getProjectPiConfigPath(cwd)]
+  ];
+  return candidates.flatMap(([source, target]) => {
+    if (resolve(source) === explicitPath || !legacyMcpConfigHasContent(source))
+      return [];
+    const migrated = migrateLegacyMcpConfig(source, target);
+    if (migrated)
+      return [migrated];
+    const fix = existsSync(target) ? `Merge ${source} into ${target}, then remove ${source}.` : `Move it with: mv ${JSON.stringify(source)} ${JSON.stringify(target)}`;
+    return [`dm-mcp-adapter no longer reads ${source}. ${fix}`];
+  });
 }
 export function getSharedConfigPath(target, cwd = process.cwd()) {
   return target === "project" ? getProjectConfigPath(cwd) : getGenericGlobalConfigPath();
@@ -119,7 +231,7 @@ export function findAvailableImportConfigs(cwd = process.cwd()) {
 }
 function getConfigSourceSummaries(sourceSpecs) {
   return sourceSpecs.map((source) => {
-    const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+    const loaded = readSourceConfig(source.id, source.readPath);
     return {
       id: source.id,
       label: source.label,
@@ -186,7 +298,8 @@ export function getMcpDiscoverySummary(overridePath, cwd = process.cwd(), option
   return {
     ...summaryWithoutRepoPrompt,
     fingerprint,
-    repoPrompt: detectRepoPrompt(summaryWithoutRepoPrompt, cwd)
+    repoPrompt: detectRepoPrompt(summaryWithoutRepoPrompt, cwd),
+    knownServerPresets: KNOWN_SERVER_PRESETS.filter(({ desktopApp }) => !desktopApp || desktopApp.paths.some((path) => existsSync(path)))
   };
 }
 export function cloneMcpConfig(config) {
@@ -198,23 +311,103 @@ export function cloneMcpConfig(config) {
   }
   return cloned;
 }
+export const MCP_CONFIG_SOURCE_METADATA = Symbol.for("dm-mcp-adapter/config-source-metadata");
 export function loadMcpConfig(overridePath, cwd = process.cwd()) {
+  const loaded = loadMcpConfigWithSources(overridePath, cwd);
+  Object.defineProperty(loaded.config, MCP_CONFIG_SOURCE_METADATA, {
+    value: { projectServers: loaded.projectServers, projectServerPolicy: loaded.projectServerPolicy },
+    enumerable: false
+  });
+  return loaded.config;
+}
+export function loadMcpConfigWithSources(overridePath, cwd = process.cwd()) {
   const sourceSpecs = getConfigSources(overridePath, cwd);
   const hostConfigDiscovery = getConfiguredHostConfigDiscovery(overridePath, cwd);
-  let config = !isExclusiveConfigMode() && hostConfigDiscovery === "on" ? loadDiscoveredHostConfigs(cwd) : { mcpServers: {} };
+  const projectServers = new Map;
+  let projectServerPolicy = "ask";
+  let projectAgentPluginSource;
+  let projectClaudePluginSource;
+  const discoveredHost = !isExclusiveConfigMode() && hostConfigDiscovery === "on" ? loadDiscoveredHostConfigs(cwd) : { config: { mcpServers: {} }, serverSources: new Map };
+  let config = discoveredHost.config;
+  for (const [name, source] of discoveredHost.serverSources) {
+    if (source.scope === "project")
+      projectServers.set(name, { path: source.path });
+  }
+  const piProjectSource = sourceSpecs.find((source) => source.id === "pi-mcp-project");
+  const piProjectNames = Object.keys((piProjectSource && readPiMcpConfig(piProjectSource.readPath))?.mcpServers ?? {});
   for (const source of sourceSpecs) {
-    const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+    const loaded = readSourceConfig(source.id, source.readPath);
     if (!loaded)
       continue;
-    config = mergeConfigs(config, expandImports(loaded, cwd));
+    if (source.id === "pi-mcp-global") {
+      for (const name of piProjectNames)
+        delete loaded.mcpServers[name];
+    }
+    const expandedImport = expandImports(loaded, cwd);
+    const expanded = expandedImport.config;
+    const sourceRef = { path: source.readPath };
+    if (Object.hasOwn(expanded.settings ?? {}, "agentPluginPaths")) {
+      projectAgentPluginSource = source.scope === "project" ? sourceRef : undefined;
+    }
+    if (expanded.claudePlugins !== undefined) {
+      projectClaudePluginSource = source.scope === "project" ? sourceRef : undefined;
+    }
+    if (source.scope === "project") {
+      for (const name of Object.keys(expanded.mcpServers))
+        projectServers.set(name, sourceRef);
+      if (expanded.settings?.projectServers !== undefined) {
+        console.warn(`Ignoring settings.projectServers in project config ${source.readPath}; set it in the user-global MCP config instead`);
+        const { projectServers: _ignored, ...settings } = expanded.settings;
+        expanded.settings = settings;
+      }
+    } else if (expanded.settings?.projectServers === "allow" || expanded.settings?.projectServers === "ask") {
+      projectServerPolicy = expanded.settings.projectServers;
+    }
+    for (const [name, importedSource] of expandedImport.serverSources) {
+      if (importedSource.scope === "project")
+        projectServers.set(name, { path: importedSource.path });
+    }
+    config = mergeConfigs(config, expanded);
+  }
+  if (isExclusiveConfigMode()) {
+    return { config: stripProjectProviderAuth(resolveConfiguredClaudePluginMcp(config, cwd), projectServers), projectServers, projectServerPolicy };
   }
-  if (isExclusiveConfigMode())
-    return resolveConfiguredClaudePluginMcp(config, cwd);
   const packageConfig = loadPackageMcpConfigs(cwd);
   const pluginConfig = loadAgentPluginConfigs(config.settings?.agentPluginPaths, cwd);
+  if (projectAgentPluginSource) {
+    for (const name of Object.keys(pluginConfig.mcpServers))
+      projectServers.set(name, projectAgentPluginSource);
+  }
   const packageServers = Object.fromEntries(Object.entries(packageConfig.mcpServers).filter(([name]) => !Object.hasOwn(pluginConfig.mcpServers, name)));
+  for (const name of Object.keys(packageServers)) {
+    const source = packageConfig.serverSources.get(name);
+    if (source?.scope === "project")
+      projectServers.set(name, { path: source.settingsPath });
+  }
   const higherPrecedenceConfig = mergeConfigs({ mcpServers: packageServers }, mergeConfigs(pluginConfig, config));
-  return mergeClaudePluginMcpDefaults(config.claudePlugins, higherPrecedenceConfig, cwd);
+  const claudePluginServers = new Set;
+  const mergedConfig = mergeClaudePluginMcpDefaults(config.claudePlugins, higherPrecedenceConfig, cwd, claudePluginServers);
+  if (projectClaudePluginSource) {
+    for (const name of claudePluginServers)
+      projectServers.set(name, projectClaudePluginSource);
+  }
+  return {
+    config: stripProjectProviderAuth(mergedConfig, projectServers),
+    projectServers,
+    projectServerPolicy
+  };
+}
+function stripProjectProviderAuth(config, projectServers) {
+  const stripped = [...projectServers.keys()].filter((name) => typeof config.mcpServers[name]?.auth === "object");
+  if (stripped.length === 0)
+    return config;
+  const mcpServers = { ...config.mcpServers };
+  for (const name of stripped) {
+    delete mcpServers[name];
+    projectServers.delete(name);
+  }
+  console.warn(`Ignoring MCP servers ${stripped.map((name) => `"${name}"`).join(", ")}: auth.provider is only allowed in user-global config, and project config defines or overrides them`);
+  return { ...config, mcpServers };
 }
 export function resolveConfiguredClaudePluginMcp(config, cwd = process.cwd()) {
   return mergeClaudePluginMcpDefaults(config.claudePlugins, config, cwd);
@@ -222,7 +415,7 @@ export function resolveConfiguredClaudePluginMcp(config, cwd = process.cwd()) {
 export function discoverConfiguredClaudePluginSkills(config, cwd = process.cwd()) {
   return loadClaudePluginBundles(config.claudePlugins, cwd, validateConfig, { mcp: false, skills: true }).skillPaths;
 }
-function mergeClaudePluginMcpDefaults(plugins, higherPrecedenceConfig, cwd) {
+function mergeClaudePluginMcpDefaults(plugins, higherPrecedenceConfig, cwd, loadedServerNames) {
   const pluginServers = loadClaudePluginBundles(plugins, cwd, validateConfig, { mcp: true, skills: false }).mcpServers;
   const higherNamesByNamespace = new Map(Object.keys(higherPrecedenceConfig.mcpServers).map((name) => [formatServerNamespace(name), name]));
   const defaults = Object.fromEntries(Object.entries(pluginServers).filter(([name]) => {
@@ -232,6 +425,8 @@ function mergeClaudePluginMcpDefaults(plugins, higherPrecedenceConfig, cwd) {
     console.warn(`Claude plugin MCP server "${name}" is shadowed by higher-precedence server "${higherName}" because both normalize to the same namespace`);
     return false;
   }));
+  for (const name of Object.keys(defaults))
+    loadedServerNames?.add(name);
   return applySettingDefaults(mergeConfigs({ mcpServers: defaults }, higherPrecedenceConfig));
 }
 function applySettingDefaults(config) {
@@ -244,7 +439,7 @@ function applySettingDefaults(config) {
 function getMergedSettings(overridePath, cwd = process.cwd()) {
   let settings;
   for (const source of getConfigSources(overridePath, cwd)) {
-    const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+    const loaded = readSourceConfig(source.id, source.readPath);
     if (loaded?.settings)
       settings = { ...settings, ...loaded.settings };
   }
@@ -260,15 +455,22 @@ function getConfiguredHostConfigDiscovery(overridePath, cwd = process.cwd()) {
 }
 function loadDiscoveredHostConfigs(cwd) {
   let config = { mcpServers: {} };
+  const serverSources = new Map;
   for (const importKind of Object.keys(IMPORT_PATHS)) {
     const imported = loadImportedConfig(importKind, cwd, `Failed to discover imported MCP config from ${importKind}:`);
     if (!imported)
       continue;
+    const servers = extractServers(imported.value, importKind);
     config = mergeConfigs(config, {
-      mcpServers: extractServers(imported.value, importKind)
+      mcpServers: servers
     });
+    for (const name of Object.keys(servers)) {
+      const source = imported.serverSources.get(name);
+      if (source?.scope === "project" || !serverSources.has(name))
+        serverSources.set(name, source ?? imported.source);
+    }
   }
-  return config;
+  return { config, serverSources };
 }
 function getConfigConflicts(sourceSpecs, imports, cwd) {
   const seen = new Map;
@@ -287,7 +489,7 @@ function getConfigConflicts(sourceSpecs, imports, cwd) {
     }
   }
   for (const source of sourceSpecs) {
-    const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+    const loaded = readSourceConfig(source.id, source.readPath);
     if (!loaded)
       continue;
     if (loaded.imports?.length) {
@@ -351,24 +553,39 @@ function getConfigSources(overridePath, cwd = process.cwd()) {
       scope: "global"
     });
   }
+  const piMcpGlobalPath = getPiMcpGlobalConfigPath();
+  if (piMcpConfigEnabled && piMcpGlobalPath !== userPath && !sources.some((source) => source.readPath === piMcpGlobalPath)) {
+    sources.push({
+      id: "pi-mcp-global",
+      label: "user-global DM MCP",
+      readPath: piMcpGlobalPath,
+      writePath: userPath,
+      kind: "import",
+      importKind: "DM mcp.json",
+      shared: true,
+      scope: "global"
+    });
+  }
   sources.push({
     id: "pi-global",
-    label: "DM global override",
+    label: "MCP adapter global override",
     readPath: userPath,
     writePath: userPath,
     kind: "user",
     shared: false,
     scope: "global"
   });
+  const projectPiMcpPath = getProjectPiMcpConfigPath(cwd);
   const reservedPaths = new Set([
     ...sources.map((source) => getConfigPathIdentity(source.readPath)),
     getConfigPathIdentity(projectPath),
-    getConfigPathIdentity(projectPiPath)
+    getConfigPathIdentity(projectPiPath),
+    ...piMcpConfigEnabled ? [getConfigPathIdentity(projectPiMcpPath)] : []
   ]);
   const ancestorSources = new Map;
   const descriptors = [
     { id: "shared-project-ancestor", label: "ancestor standard MCP", path: getProjectConfigPath, shared: true },
-    { id: "pi-project-ancestor", label: "ancestor DM override", path: getProjectPiConfigPath, shared: false }
+    { id: "pi-project-ancestor", label: "ancestor MCP adapter override", path: getProjectPiConfigPath, shared: false }
   ];
   const ancestorRoot = getConfiguredAncestorRoot(sources, cwd);
   if (ancestorRoot) {
@@ -403,10 +620,22 @@ function getConfigSources(overridePath, cwd = process.cwd()) {
       scope: "project"
     });
   }
+  if (piMcpConfigEnabled && projectPiMcpPath !== userPath && projectPiMcpPath !== piMcpGlobalPath) {
+    sources.push({
+      id: "pi-mcp-project",
+      label: "project DM MCP",
+      readPath: projectPiMcpPath,
+      writePath: projectPiPath,
+      kind: "import",
+      importKind: "DM project mcp.json",
+      shared: true,
+      scope: "project"
+    });
+  }
   if (projectPiPath !== userPath && projectPiPath !== projectPath) {
     sources.push({
       id: "pi-project",
-      label: "project DM override",
+      label: "project MCP adapter override",
       readPath: projectPiPath,
       writePath: projectPiPath,
       kind: "project",
@@ -430,7 +659,7 @@ function isWithin(base, target) {
 function getConfiguredAncestorRoot(globalSources, cwd) {
   let configured;
   for (const source of globalSources) {
-    const roots = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`)?.settings?.ancestorConfigRoots;
+    const roots = readSourceConfig(source.id, source.readPath)?.settings?.ancestorConfigRoots;
     if (roots !== undefined)
       configured = roots;
   }
@@ -451,11 +680,12 @@ function getConfiguredAncestorRoot(globalSources, cwd) {
     }
     try {
       const root = realpathSync(expanded);
-      if (!statSync(root).isDirectory() || !isWithin(home, root) || !isWithin(root, canonicalCwd))
+      if (!statSync(root).isDirectory() || !isWithin(home, root))
         throw new Error;
-      valid.push(root);
+      if (isWithin(root, canonicalCwd))
+        valid.push(root);
     } catch {
-      console.warn(`Invalid settings.ancestorConfigRoots entry ${JSON.stringify(entry)}: expected an existing directory under HOME containing cwd`);
+      console.warn(`Invalid settings.ancestorConfigRoots entry ${JSON.stringify(entry)}: expected an existing directory under HOME`);
     }
   }
   return valid.sort((left, right) => right.length - left.length)[0];
@@ -556,6 +786,8 @@ function mergeServerMaps(base, next) {
       for (const field of URL_BOUND_AUTH_FIELDS) {
         delete baseEntry[field];
       }
+      if (typeof baseEntry.auth === "object")
+        delete baseEntry.auth;
       if (baseEntry.oauth !== false) {
         delete baseEntry.oauth;
       }
@@ -577,8 +809,9 @@ function mergeImports(left, right) {
 }
 function expandImports(config, cwd = process.cwd()) {
   if (!config.imports?.length)
-    return config;
+    return { config, serverSources: new Map };
   const importedServers = {};
+  const serverSources = new Map;
   for (const importKind of config.imports) {
     const imported = loadImportedConfig(importKind, cwd, `Failed to import MCP config from ${importKind}:`);
     if (!imported)
@@ -587,18 +820,23 @@ function expandImports(config, cwd = process.cwd()) {
     for (const [name, definition] of Object.entries(servers)) {
       if (!importedServers[name]) {
         importedServers[name] = definition;
+        serverSources.set(name, imported.serverSources.get(name) ?? imported.source);
       }
     }
   }
   return {
-    imports: config.imports,
-    ...config.settings !== undefined ? { settings: config.settings } : {},
-    ...config.claudePlugins !== undefined ? { claudePlugins: config.claudePlugins } : {},
-    mcpServers: mergeServerMaps(importedServers, config.mcpServers)
+    config: {
+      imports: config.imports,
+      ...config.settings !== undefined ? { settings: config.settings } : {},
+      ...config.claudePlugins !== undefined ? { claudePlugins: config.claudePlugins } : {},
+      mcpServers: mergeServerMaps(importedServers, config.mcpServers)
+    },
+    serverSources
   };
 }
 function resolveImportCandidates(importKind, cwd) {
   return (IMPORT_PATHS[importKind] ?? []).map((candidate) => {
+    const scope = candidate.startsWith(".") ? "project" : "user";
     if (importKind === "opencode" && candidate === "./opencode.json") {
       const start = resolve(cwd);
       let gitRoot;
@@ -614,27 +852,29 @@ function resolveImportCandidates(importKind, cwd) {
         current = parent;
       }
       if (!gitRoot)
-        return join(start, "opencode.json");
+        return { path: join(start, "opencode.json"), scope };
       current = start;
       while (true) {
         const projectConfig = join(current, "opencode.json");
         if (existsSync(projectConfig) || current === gitRoot)
-          return projectConfig;
+          return { path: projectConfig, scope };
         current = dirname(current);
       }
     }
-    return candidate.startsWith(".") ? resolve(cwd, candidate) : candidate;
+    return { path: candidate.startsWith(".") ? resolve(cwd, candidate) : candidate, scope };
   });
 }
 function readImportedConfig(path) {
   const raw = readFileSync(path, "utf-8");
-  return path.endsWith(".toml") ? parseToml(raw) : parseJsonWithComments(raw);
+  return path.endsWith(".toml") ? parseToml(stripUtf8Bom(raw)) : parseJsonWithComments(raw);
 }
 function loadImportedConfig(importKind, cwd, warningPrefix) {
   if (importKind === "opencode") {
     let merged = {};
-    let highestPrecedencePath;
-    for (const path of resolveImportCandidates(importKind, cwd)) {
+    let highestPrecedenceSource;
+    const serverSources = new Map;
+    for (const source of resolveImportCandidates(importKind, cwd)) {
+      const { path } = source;
       if (!existsSync(path))
         continue;
       try {
@@ -658,19 +898,40 @@ function loadImportedConfig(importKind, cwd, warningPrefix) {
             }];
           }));
           merged = mergeOpenCodeConfigs(merged, { ...imported, mcp: normalized });
-          highestPrecedencePath = path;
+          for (const name of Object.keys(normalized))
+            serverSources.set(name, source);
+          highestPrecedenceSource = source;
         }
       } catch (error) {
         console.warn(warningPrefix, error);
       }
     }
-    return highestPrecedencePath ? { path: highestPrecedencePath, value: merged } : null;
+    if (!highestPrecedenceSource)
+      return null;
+    const finalNames = new Set(Object.keys(extractServers(merged, importKind)));
+    for (const name of serverSources.keys()) {
+      if (!finalNames.has(name))
+        serverSources.delete(name);
+    }
+    return {
+      path: highestPrecedenceSource.path,
+      value: merged,
+      source: highestPrecedenceSource,
+      serverSources
+    };
   }
-  for (const path of resolveImportCandidates(importKind, cwd)) {
+  for (const source of resolveImportCandidates(importKind, cwd)) {
+    const { path } = source;
     if (!existsSync(path))
       continue;
     try {
-      return { path, value: readImportedConfig(path) };
+      const value = readImportedConfig(path);
+      return {
+        path,
+        value,
+        source,
+        serverSources: new Map(Object.keys(extractServers(value, importKind)).map((name) => [name, source]))
+      };
     } catch (error) {
       console.warn(warningPrefix, error);
     }
@@ -693,6 +954,166 @@ function readValidatedConfig(path, label) {
     return null;
   }
 }
+function isPiMcpSource(id) {
+  return id === "pi-mcp-global" || id === "pi-mcp-project";
+}
+function readSourceConfig(id, path) {
+  return isPiMcpSource(id) ? readPiMcpConfig(path) : readValidatedConfig(path, `MCP config from ${path}`);
+}
+const PI_MCP_EXPOSURES = ["codemode", "codemode-deferred", "deferred", "direct", "hidden"];
+function readPiMcpConfig(path) {
+  if (!existsSync(path))
+    return null;
+  let raw;
+  try {
+    const text = readFileSync(path, "utf-8");
+    if (stripJsonComments(text, { trailingCommas: true }).trim() === "")
+      return null;
+    const parsed = parseJsonWithComments(text);
+    if (!isRecord(parsed) || parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)) {
+      throw new Error('expected an object with an "mcpServers" object');
+    }
+    raw = parsed;
+  } catch (error) {
+    console.warn(`Failed to load DM MCP config from ${path}:`, error);
+    return null;
+  }
+  const file = {
+    mcpServers: {},
+    adapterKeys: ["settings", "imports", "claudePlugins", "mcp-servers"].filter((key) => raw[key] !== undefined),
+    skipped: [],
+    ignoredSettings: new Map
+  };
+  for (const [name, value] of Object.entries(raw.mcpServers ?? {})) {
+    const translated = translatePiMcpServer(name, value);
+    if (typeof translated === "string") {
+      file.skipped.push(`"${name}" (${translated})`);
+      continue;
+    }
+    file.mcpServers[name] = translated.entry;
+    if (translated.ignored.length > 0)
+      file.ignoredSettings.set(name, translated.ignored);
+  }
+  return file;
+}
+export function translatePiMcpServer(name, value) {
+  if (!/^[A-Za-z0-9_-]+$/.test(name))
+    return 'invalid server name (use letters, digits, "_" and "-")';
+  if (!isRecord(value))
+    return "must be an object";
+  const { type, command, args, env, cwd, url, headers, oauth, exposure, toolExposure, enabled, timeout, auth, description, ...unknown } = value;
+  const isExposure = (candidate) => typeof candidate === "string" && PI_MCP_EXPOSURES.includes(candidate);
+  if (exposure !== undefined && !isExposure(exposure))
+    return `exposure must be one of ${PI_MCP_EXPOSURES.join(", ")}`;
+  if (toolExposure !== undefined && (!isRecord(toolExposure) || !Object.values(toolExposure).every(isExposure))) {
+    return `toolExposure must map tool names to one of ${PI_MCP_EXPOSURES.join(", ")}`;
+  }
+  if (enabled !== undefined && typeof enabled !== "boolean")
+    return "enabled must be a boolean";
+  if (timeout !== undefined && (typeof timeout !== "number" || !(timeout > 0)))
+    return "timeout must be a positive number of seconds";
+  if (description !== undefined && typeof description !== "string")
+    return "description must be a string";
+  if (type === "sse")
+    return "legacy SSE transport is not supported; use the streamable HTTP URL";
+  const ignored = Object.keys(unknown);
+  let entry;
+  let otherTransportKeys;
+  if (typeof url === "string" && (type === undefined || type === "http" || type === "streamable-http")) {
+    if (!URL.canParse(url) || !/^https?:$/.test(new URL(url).protocol))
+      return "url must be an http or https URL";
+    if (headers !== undefined && !isStringRecord(headers))
+      return "headers must map names to strings";
+    const translatedOAuth = oauth === undefined ? undefined : translatePiOAuth(oauth);
+    if (typeof translatedOAuth === "string")
+      return translatedOAuth;
+    entry = { url, ...headers !== undefined ? { headers } : {}, ...translatedOAuth ? { oauth: translatedOAuth.oauth } : {} };
+    if (auth !== undefined) {
+      if (!isRecord(auth) || typeof auth.provider !== "string" || !auth.provider)
+        return "auth.provider must be a provider name";
+      const urlError = providerAuthUrlError(url);
+      if (urlError)
+        return urlError;
+      entry.auth = { provider: auth.provider };
+    }
+    ignored.push(...translatedOAuth?.ignored ?? []);
+    otherTransportKeys = ["command", "args", "env", "cwd"];
+  } else if (typeof command === "string" && (type === undefined || type === "stdio")) {
+    if (args !== undefined && !(Array.isArray(args) && args.every((arg) => typeof arg === "string")))
+      return "args must be an array of strings";
+    if (env !== undefined && !isStringRecord(env))
+      return "env must map names to strings";
+    if (cwd !== undefined && typeof cwd !== "string")
+      return "cwd must be a string";
+    entry = {
+      command,
+      ...args !== undefined ? { args } : {},
+      ...env !== undefined ? { env } : {},
+      ...cwd !== undefined ? { cwd } : {}
+    };
+    otherTransportKeys = ["url", "headers", "oauth", "auth"];
+  } else {
+    return 'needs either "command" (stdio) or "url" (streamable HTTP)';
+  }
+  ignored.push(...otherTransportKeys.filter((key) => value[key] !== undefined));
+  if (description !== undefined)
+    entry.description = description;
+  const serverExposure = exposure === undefined || exposure === "codemode-deferred" ? "codemode" : exposure;
+  if (enabled === false || serverExposure === "hidden")
+    entry.disabled = true;
+  if (serverExposure === "direct")
+    entry.directTools = true;
+  if (serverExposure === "deferred")
+    entry.directTools = "search";
+  if (timeout !== undefined)
+    entry.requestTimeoutMs = Math.round(timeout * 1000);
+  const directTools = [];
+  const excludeTools = [];
+  for (const [tool, rawValue] of Object.entries(toolExposure ?? {})) {
+    const toolValue = rawValue === "codemode-deferred" ? "codemode" : rawValue;
+    if (toolValue === serverExposure)
+      continue;
+    if (toolValue === "hidden")
+      excludeTools.push(tool);
+    else if (toolValue === "direct" && !tool.includes("*") && serverExposure === "codemode")
+      directTools.push(tool);
+    else
+      ignored.push(`toolExposure ${JSON.stringify(tool)}: ${toolValue}`);
+  }
+  if (directTools.length > 0)
+    entry.directTools = directTools;
+  if (excludeTools.length > 0)
+    entry.excludeTools = excludeTools;
+  return { entry, ignored };
+}
+function translatePiOAuth(oauth) {
+  if (!isRecord(oauth))
+    return "oauth must be an object";
+  const { clientId, clientSecret, scope, clientName, callbackPort, callbackUrl, ...unknown } = oauth;
+  const copied = { clientId, clientSecret, scope, clientName };
+  for (const [key, field] of Object.entries(copied)) {
+    if (field !== undefined && (typeof field !== "string" || key === "clientName" && !field.trim())) {
+      return `oauth.${key} must be a ${key === "clientName" ? "non-empty " : ""}string`;
+    }
+  }
+  if (callbackPort !== undefined && (typeof callbackPort !== "number" || !Number.isInteger(callbackPort) || callbackPort < 1 || callbackPort > 65535)) {
+    return "oauth.callbackPort must be a port number";
+  }
+  const result = Object.fromEntries(Object.entries(copied).filter(([, field]) => field !== undefined));
+  if (callbackUrl !== undefined) {
+    const parsed = typeof callbackUrl === "string" && URL.canParse(callbackUrl) ? new URL(callbackUrl) : undefined;
+    if (!parsed || parsed.protocol !== "http:" || !["localhost", "127.0.0.1", "[::1]"].includes(parsed.hostname) || parsed.search !== "" || parsed.hash !== "") {
+      return "oauth.callbackUrl must be an http URI on localhost, 127.0.0.1, or [::1] without query or fragment";
+    }
+    if (parsed.port && callbackPort !== undefined && Number(parsed.port) !== callbackPort) {
+      return "oauth.callbackUrl and oauth.callbackPort name different ports";
+    }
+    result.redirectUri = parsed.port ? callbackUrl : `http://${parsed.hostname}:${callbackPort ?? "{port}"}${parsed.pathname}`;
+  } else if (callbackPort !== undefined) {
+    result.redirectUri = `http://127.0.0.1:${callbackPort}/callback`;
+  }
+  return { oauth: result, ignored: Object.keys(unknown).map((key) => `oauth.${key}`) };
+}
 function validateConfig(raw) {
   if (!isRecord(raw)) {
     return { mcpServers: {} };
@@ -746,8 +1167,24 @@ function toServerEntries(servers) {
     return {};
   const entries = {};
   for (const [name, entry] of Object.entries(servers)) {
-    if (isServerEntry(entry))
-      entries[name] = entry;
+    if (!isServerEntry(entry))
+      continue;
+    const auth = entry.auth;
+    if (typeof auth === "object") {
+      const provider = isRecord(auth) ? auth.provider : undefined;
+      const error = typeof provider !== "string" || !provider ? "auth.provider must be a provider name" : typeof entry.url !== "string" ? "auth.provider requires a url" : getMissingEnvVars(entry.url, {}).length > 0 ? undefined : providerAuthUrlError(entry.url);
+      if (error) {
+        console.warn(`Ignoring MCP server "${name}": ${error}`);
+        continue;
+      }
+    }
+    if (entry.description !== undefined && typeof entry.description !== "string") {
+      console.warn(`Ignoring invalid description for MCP server "${name}": expected a string`);
+      const { description: _description, ...rest } = entry;
+      entries[name] = rest;
+      continue;
+    }
+    entries[name] = entry;
   }
   return entries;
 }
@@ -757,6 +1194,9 @@ function isServerEntry(value) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isStringRecord(value) {
+  return isRecord(value) && Object.values(value).every((entry) => typeof entry === "string");
+}
 function mergeOpenCodeConfigs(base, next) {
   const baseMcp = base.mcp;
   const nextMcp = next.mcp;
@@ -908,7 +1348,7 @@ function extractServers(config, kind) {
     delete mapped.env_http_headers;
     mappedServers[name] = mapped;
   }
-  return mappedServers;
+  return toServerEntries(mappedServers);
 }
 function serializeRawConfig(raw) {
   return `${JSON.stringify(raw, null, 2)}
@@ -971,21 +1411,31 @@ function buildConfigWritePreview(filePath, nextRaw) {
   };
 }
 function readRawConfigObject(filePath) {
-  if (!existsSync(filePath))
+  if (!lstatSync(filePath, { throwIfNoEntry: false }))
     return {};
   try {
-    const raw = parseJsonWithComments(readFileSync(filePath, "utf-8"));
-    return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
-  } catch {
-    return {};
+    const text = readFileSync(filePath, "utf-8");
+    if (text.trim() === "")
+      return {};
+    const raw = parseJsonWithComments(text);
+    if (!isRecord(raw))
+      throw new Error("top-level value must be an object");
+    return raw;
+  } catch (error) {
+    throw new Error(`Failed to read MCP config at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
   }
 }
 function writeConfigText(writePath, text) {
+  const originalPath = writePath;
   let mode;
   try {
     writePath = realpathSync(writePath);
     mode = statSync(writePath).mode & 511;
-  } catch {}
+  } catch (error) {
+    if (lstatSync(originalPath, { throwIfNoEntry: false })?.isSymbolicLink()) {
+      throw new Error(`Cannot write MCP config at ${originalPath}: symbolic link target is unavailable`, { cause: error });
+    }
+  }
   mkdirSync(dirname(writePath), { recursive: true });
   const tmpPath = `${writePath}.${process.pid}.tmp`;
   rmSync(tmpPath, { force: true });
@@ -1012,17 +1462,7 @@ export function writeSharedConfigText(filePath, text) {
 }
 export function writeJevSemanticSearchConfig(overridePath, cwd, allowedServers, effectiveJev) {
   const filePath = overridePath ? getPiGlobalConfigPath(overridePath) : getProjectPiConfigPath(cwd);
-  let raw = {};
-  if (existsSync(filePath)) {
-    try {
-      const parsed = parseJsonWithComments(readFileSync(filePath, "utf8"));
-      if (!isRecord(parsed))
-        throw new Error("top-level value must be an object");
-      raw = parsed;
-    } catch (error) {
-      throw new Error(`Failed to update Jev settings at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
-    }
-  }
+  const raw = readRawConfigObject(filePath);
   if (raw.settings !== undefined && !isRecord(raw.settings)) {
     throw new Error(`Failed to update Jev settings at ${filePath}: settings must be an object`);
   }
@@ -1041,12 +1481,21 @@ export function writeJevSemanticSearchConfig(overridePath, cwd, allowedServers,
   writeRawConfigObject(filePath, raw);
   return { path: filePath, changed: true };
 }
-function getServersObject(raw) {
-  const existing = raw.mcpServers ?? raw["mcp-servers"] ?? {};
-  if (!existing || typeof existing !== "object" || Array.isArray(existing)) {
-    return {};
+function getServersObject(raw, filePath) {
+  for (const key of ["mcpServers", "mcp-servers"]) {
+    if (Object.hasOwn(raw, key) && !isRecord(raw[key])) {
+      throw new Error(`Failed to update MCP config at ${filePath}: ${key} must be an object`);
+    }
   }
-  return existing;
+  return raw.mcpServers ?? raw["mcp-servers"] ?? {};
+}
+function getConfigImports(raw, filePath) {
+  if (raw.imports === undefined)
+    return [];
+  if (!Array.isArray(raw.imports) || raw.imports.some((value) => typeof value !== "string")) {
+    throw new Error(`Failed to update MCP config at ${filePath}: imports must be an array of strings`);
+  }
+  return raw.imports;
 }
 function setServersObject(raw, servers) {
   delete raw["mcp-servers"];
@@ -1054,18 +1503,7 @@ function setServersObject(raw, servers) {
 }
 export function writeProjectServerDisabledOverride(overridePath, cwd, serverName, disabled) {
   const filePath = getProjectPiConfigPath(cwd);
-  let raw = {};
-  if (existsSync(filePath)) {
-    try {
-      const parsed = parseJsonWithComments(readFileSync(filePath, "utf-8"));
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new Error("root value must be an object");
-      }
-      raw = parsed;
-    } catch (error) {
-      throw new Error(`Failed to read project MCP override at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
-    }
-  }
+  const raw = readRawConfigObject(filePath);
   const serverKey = raw.mcpServers !== undefined ? "mcpServers" : raw["mcp-servers"] !== undefined ? "mcp-servers" : "mcpServers";
   const rawServers = raw[serverKey];
   if (rawServers !== undefined && (!rawServers || typeof rawServers !== "object" || Array.isArray(rawServers))) {
@@ -1086,15 +1524,15 @@ export function writeProjectServerDisabledOverride(overridePath, cwd, serverName
     for (const source of getConfigSources(overridePath, cwd)) {
       if (source.readPath === filePath)
         continue;
-      const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+      const loaded = readSourceConfig(source.id, source.readPath);
       if (loaded)
-        lowerConfig = mergeConfigs(lowerConfig, expandImports(loaded, cwd));
+        lowerConfig = mergeConfigs(lowerConfig, expandImports(loaded, cwd).config);
     }
     if (raw.imports !== undefined) {
       if (!Array.isArray(raw.imports) || raw.imports.some((kind) => typeof kind !== "string" || !Object.hasOwn(IMPORT_PATHS, kind))) {
         throw new Error(`Failed to update project MCP override at ${filePath}: imports contains an unsupported config kind`);
       }
-      lowerConfig = mergeConfigs(lowerConfig, expandImports({ mcpServers: {}, imports: raw.imports }, cwd));
+      lowerConfig = mergeConfigs(lowerConfig, expandImports({ mcpServers: {}, imports: raw.imports }, cwd).config);
     }
     if (isServerDisabled(lowerConfig.mcpServers[serverName]))
       next.disabled = false;
@@ -1144,7 +1582,7 @@ function detectRepoPrompt(summary, cwd = process.cwd()) {
   for (const source of summary.sources) {
     if (source.kind !== "shared" || source.serverCount === 0)
       continue;
-    const config = readValidatedConfig(source.path, `MCP config from ${source.path}`);
+    const config = readSourceConfig(source.id, source.path);
     if (!config)
       continue;
     for (const [name, entry] of Object.entries(config.mcpServers)) {
@@ -1170,23 +1608,23 @@ function detectRepoPrompt(summary, cwd = process.cwd()) {
 export function previewCompatibilityImports(importKinds, overridePath) {
   const targetPath = getPiGlobalConfigPath(overridePath);
   const raw = readRawConfigObject(targetPath);
-  const currentImports = Array.isArray(raw.imports) ? raw.imports.filter((value) => typeof value === "string") : [];
+  const currentImports = getConfigImports(raw, targetPath);
   const merged = [...new Set([...currentImports, ...importKinds])];
   const nextRaw = { ...raw, imports: merged };
-  setServersObject(nextRaw, getServersObject(nextRaw));
+  setServersObject(nextRaw, getServersObject(nextRaw, targetPath));
   return buildConfigWritePreview(targetPath, nextRaw);
 }
 export function ensureCompatibilityImports(importKinds, overridePath) {
   const targetPath = getPiGlobalConfigPath(overridePath);
   const raw = readRawConfigObject(targetPath);
-  const currentImports = Array.isArray(raw.imports) ? raw.imports.filter((value) => typeof value === "string") : [];
+  const currentImports = getConfigImports(raw, targetPath);
   const merged = [...new Set([...currentImports, ...importKinds])];
   const added = merged.filter((kind) => !currentImports.includes(kind));
   if (added.length === 0) {
     return { path: targetPath, added: [] };
   }
   raw.imports = merged;
-  const servers = getServersObject(raw);
+  const servers = getServersObject(raw, targetPath);
   setServersObject(raw, servers);
   writeRawConfigObject(targetPath, raw);
   return { path: targetPath, added };
@@ -1196,13 +1634,19 @@ export function buildStarterProjectConfig() {
     mcpServers: {}
   };
 }
+function assertScaffoldTargetAbsent(filePath) {
+  if (lstatSync(filePath, { throwIfNoEntry: false }))
+    throw new Error(`Cannot scaffold MCP config at ${filePath}: file already exists`);
+}
 export function previewStarterSharedConfig(target, cwd = process.cwd()) {
   const targetPath = getSharedConfigPath(target, cwd);
+  assertScaffoldTargetAbsent(targetPath);
   const nextRaw = { mcpServers: buildStarterProjectConfig().mcpServers };
   return buildConfigWritePreview(targetPath, nextRaw);
 }
 export function writeStarterSharedConfig(target, cwd = process.cwd()) {
   const targetPath = getSharedConfigPath(target, cwd);
+  assertScaffoldTargetAbsent(targetPath);
   const raw = { mcpServers: buildStarterProjectConfig().mcpServers };
   writeRawConfigObject(targetPath, raw);
   return targetPath;
@@ -1216,14 +1660,14 @@ export function writeStarterProjectConfig(cwd = process.cwd()) {
 export function previewSharedServerEntry(filePath, serverName, entry) {
   const raw = readRawConfigObject(filePath);
   const nextRaw = { ...raw };
-  const servers = getServersObject(nextRaw);
+  const servers = getServersObject(nextRaw, filePath);
   servers[serverName] = entry;
   setServersObject(nextRaw, servers);
   return buildConfigWritePreview(filePath, nextRaw);
 }
 export function writeSharedServerEntry(filePath, serverName, entry) {
   const raw = readRawConfigObject(filePath);
-  const servers = getServersObject(raw);
+  const servers = getServersObject(raw, filePath);
   servers[serverName] = entry;
   setServersObject(raw, servers);
   writeRawConfigObject(filePath, raw);
@@ -1243,7 +1687,7 @@ export function getServerProvenance(overridePath, cwd = process.cwd()) {
     }
   }
   for (const source of getConfigSources(overridePath, cwd)) {
-    const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
+    const loaded = readSourceConfig(source.id, source.readPath);
     if (!loaded)
       continue;
     if (loaded.imports?.length) {
@@ -1260,16 +1704,18 @@ export function getServerProvenance(overridePath, cwd = process.cwd()) {
       }
     }
     for (const name of Object.keys(loaded.mcpServers)) {
+      const ignoredSettings = loaded.ignoredSettings ? loaded.ignoredSettings.get(name) : provenance.get(name)?.ignoredSettings;
       provenance.set(name, {
         path: source.writePath,
         kind: source.kind,
-        ...source.importKind !== undefined ? { importKind: source.importKind } : {}
+        ...source.importKind !== undefined ? { importKind: source.importKind } : {},
+        ...ignoredSettings !== undefined ? { ignoredSettings } : {}
       });
     }
   }
   return provenance;
 }
-export function writeDirectToolsConfig(changes, provenance, fullConfig) {
+export function writeDirectToolsConfig(changes, provenance, fullConfig, onFileWritten) {
   const byPath = new Map;
   for (const [serverName, value] of changes) {
     const prov = provenance.get(serverName);
@@ -1280,9 +1726,11 @@ export function writeDirectToolsConfig(changes, provenance, fullConfig) {
       byPath.set(targetPath, []);
     byPath.get(targetPath).push({ name: serverName, value, prov });
   }
+  for (const filePath of byPath.keys())
+    getServersObject(readRawConfigObject(filePath), filePath);
   for (const [filePath, entries] of byPath) {
     const raw = readRawConfigObject(filePath);
-    const servers = getServersObject(raw);
+    const servers = getServersObject(raw, filePath);
     for (const { name, value, prov } of entries) {
       if (prov.kind === "import") {
         const fullDef = fullConfig.mcpServers[name];
@@ -1295,6 +1743,7 @@ export function writeDirectToolsConfig(changes, provenance, fullConfig) {
     }
     setServersObject(raw, servers);
     writeRawConfigObject(filePath, raw);
+    onFileWritten?.();
   }
 }
 export function resolveConfiguredOAuthDir(raw, cwd = process.cwd()) {