@fitchmultz/pi-mcp-adapter 8.0.6 → 8.0.8

package/dist/config.js

@@ -1,5 +1,5 @@
 // config.ts - Config loading with import support
-import { existsSync, readFileSync, writeFileSync, mkdirSync, realpathSync, renameSync, statSync, chmodSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, mkdirSync, realpathSync, renameSync, statSync, chmodSync, } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -7,7 +7,7 @@ import { isDeepStrictEqual } from "node:util";
 import { parse as parseToml } from "smol-toml";
 import stripJsonComments from "strip-json-comments";
 import { getAdapterPath } from "./agent-dir.js";
-import { isServerDisabled, validateServerProtocolConfig } from "./types.js";
+import { isServerDisabled, validateServerProtocolConfig, } from "./types.js";
 import { toStringRecord } from "./utils.js";
 const GENERIC_GLOBAL_CONFIG_PATH = join(homedir(), ".config", "mcp", "mcp.json");
 const AGENTS_GLOBAL_CONFIG_PATHS = [
@@ -59,15 +59,11 @@ const IMPORT_PATHS = {
         join(homedir(), ".claude.json"),
         join(homedir(), ".claude", "claude_desktop_config.json"),
     ],
-    "claude-desktop": [join(homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json")],
-    codex: [
-        join(homedir(), ".codex", "config.toml"),
-        join(homedir(), ".codex", "config.json"),
-    ],
-    opencode: [
-        join(homedir(), ".config", "opencode", "opencode.json"),
-        "./opencode.json",
+    "claude-desktop": [
+        join(homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json"),
     ],
+    codex: [join(homedir(), ".codex", "config.toml"), join(homedir(), ".codex", "config.json")],
+    opencode: [join(homedir(), ".config", "opencode", "opencode.json"), "./opencode.json"],
     windsurf: [join(homedir(), ".windsurf", "mcp.json")],
     vscode: [".vscode/mcp.json"],
 };
@@ -97,8 +93,9 @@ export function getMcpDiscoverySummary(overridePath, cwd = process.cwd()) {
     const imports = Object.keys(IMPORT_PATHS)
         .map((kind) => {
         const imported = loadImportedConfig(kind, cwd, `Failed to inspect imported MCP config from ${kind}:`);
-        if (!imported)
+        if (!imported) {
             return null;
+        }
         return {
             kind,
             path: imported.path,
@@ -135,8 +132,7 @@ export function cloneMcpConfig(config) {
 }
 export function loadMcpConfig(overridePath, cwd = process.cwd(), options = {}) {
     const includeProject = options.includeProject !== false;
-    const sourceSpecs = getConfigSources(overridePath, cwd)
-        .filter((source) => includeProject || !isProjectConfigSource(source, cwd));
+    const sourceSpecs = getConfigSources(overridePath, cwd).filter((source) => includeProject || !isProjectConfigSource(source, cwd));
     const hostConfigDiscovery = getConfiguredHostConfigDiscovery(overridePath, cwd, includeProject);
     // Host files are a lower-precedence fallback. This ordering means an opt-in
     // discovery cannot override a shared or Pi-owned definition, and all normal
@@ -146,8 +142,9 @@ export function loadMcpConfig(overridePath, cwd = process.cwd(), options = {}) {
         : { mcpServers: {} };
     for (const source of sourceSpecs) {
         const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
-        if (!loaded)
+        if (!loaded) {
             continue;
+        }
         config = mergeConfigs(config, expandImports(loaded, cwd, includeProject));
     }
     return config;
@@ -155,12 +152,14 @@ export function loadMcpConfig(overridePath, cwd = process.cwd(), options = {}) {
 function getConfiguredHostConfigDiscovery(overridePath, cwd = process.cwd(), includeProject = true) {
     let configured = "off";
     for (const source of getConfigSources(overridePath, cwd)) {
-        if (!includeProject && isProjectConfigSource(source, cwd))
+        if (!includeProject && isProjectConfigSource(source, cwd)) {
             continue;
+        }
         const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
         const value = loaded?.settings?.hostConfigDiscovery;
-        if (value === "off" || value === "on")
+        if (value === "off" || value === "on") {
             configured = value;
+        }
     }
     return configured;
 }
@@ -168,8 +167,9 @@ function loadDiscoveredHostConfigs(cwd, includeProject) {
     let config = { mcpServers: {} };
     for (const importKind of Object.keys(IMPORT_PATHS)) {
         const imported = loadImportedConfig(importKind, cwd, `Failed to discover imported MCP config from ${importKind}:`, includeProject);
-        if (!imported)
+        if (!imported) {
             continue;
+        }
         config = mergeConfigs(config, {
             mcpServers: extractServers(imported.value, importKind),
         });
@@ -180,29 +180,33 @@ function getConfigConflicts(sourceSpecs, imports, cwd) {
     const seen = new Map();
     const record = (name, source) => {
         const entries = seen.get(name) ?? [];
-        if (!entries.some((entry) => entry.kind === source.kind && entry.path === source.path))
+        if (!entries.some((entry) => entry.kind === source.kind && entry.path === source.path)) {
             entries.push(source);
+        }
         seen.set(name, entries);
     };
     // Host candidates are listed first because, when enabled, they are the
     // lowest-precedence fallback. The fixed IMPORT_PATHS order is deterministic.
     for (const entry of imports) {
         const imported = loadImportedConfig(entry.kind, cwd, `Failed to inspect imported MCP config from ${entry.kind}:`);
-        if (!imported)
+        if (!imported) {
             continue;
+        }
         for (const name of Object.keys(extractServers(imported.value, entry.kind))) {
             record(name, { kind: "host", path: imported.path });
         }
     }
     for (const source of sourceSpecs) {
         const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
-        if (!loaded)
+        if (!loaded) {
             continue;
+        }
         if (loaded.imports?.length) {
             for (const importKind of loaded.imports) {
                 const imported = loadImportedConfig(importKind, cwd, `Failed to inspect imported MCP config from ${importKind}:`);
-                if (!imported)
+                if (!imported) {
                     continue;
+                }
                 for (const name of Object.keys(extractServers(imported.value, importKind))) {
                     record(name, { kind: "host", path: imported.path });
                 }
@@ -225,8 +229,9 @@ function canonicalPath(path) {
     let existingPath = resolvedPath;
     while (!existsSync(existingPath)) {
         const parent = dirname(existingPath);
-        if (parent === existingPath)
+        if (parent === existingPath) {
             return resolvedPath;
+        }
         existingPath = parent;
     }
     try {
@@ -238,16 +243,13 @@ function canonicalPath(path) {
 }
 export function isPathInsideProject(path, cwd) {
     const projectRoots = findProjectRoots(cwd);
-    const roots = projectRoots.length > 0
-        ? projectRoots
-        : isHomePath(cwd) ? [] : [cwd];
+    const roots = projectRoots.length > 0 ? projectRoots : isHomePath(cwd) ? [] : [cwd];
     const contains = (root, candidate) => {
         const pathFromRoot = relative(root, candidate);
-        return pathFromRoot === ""
-            || (pathFromRoot !== ".." && !pathFromRoot.startsWith(`..${sep}`) && !isAbsolute(pathFromRoot));
+        return (pathFromRoot === "" ||
+            (pathFromRoot !== ".." && !pathFromRoot.startsWith(`..${sep}`) && !isAbsolute(pathFromRoot)));
     };
-    return roots.some((root) => contains(resolve(root), resolve(path))
-        || contains(canonicalPath(root), canonicalPath(path)));
+    return roots.some((root) => contains(resolve(root), resolve(path)) || contains(canonicalPath(root), canonicalPath(path)));
 }
 function isProjectConfigSource(source, cwd) {
     return source.scope === "project" || isPathInsideProject(source.readPath, cwd);
@@ -270,8 +272,9 @@ function getConfigSources(overridePath, cwd = process.cwd()) {
         });
     }
     for (const [index, agentsPath] of AGENTS_GLOBAL_CONFIG_PATHS.entries()) {
-        if (agentsPath === userPath || agentsPath === GENERIC_GLOBAL_CONFIG_PATH)
+        if (agentsPath === userPath || agentsPath === GENERIC_GLOBAL_CONFIG_PATH) {
             continue;
+        }
         sources.push({
             id: index === 0 ? "agents-global" : "agents-nested-global",
             label: index === 0 ? "user-global .agents MCP" : "user-global .agents nested MCP",
@@ -349,19 +352,29 @@ function mergeServerMaps(base, next) {
         if (existing && typeof definition.socket === "string") {
             baseEntry = { ...existing };
             for (const field of [
-                "command", "args", "env", "cwd", "url", "headers", "auth",
-                "bearerToken", "bearerTokenEnv", "oauth",
+                "command",
+                "args",
+                "env",
+                "cwd",
+                "url",
+                "headers",
+                "auth",
+                "bearerToken",
+                "bearerTokenEnv",
+                "oauth",
             ]) {
                 delete baseEntry[field];
             }
         }
-        else if (existing?.socket && (typeof definition.command === "string" || typeof definition.url === "string")) {
+        else if (existing?.socket &&
+            (typeof definition.command === "string" || typeof definition.url === "string")) {
             baseEntry = { ...existing };
             delete baseEntry.socket;
         }
         if (existing && typeof definition.url === "string" && definition.url !== existing.url) {
-            if (baseEntry === existing)
+            if (baseEntry === existing) {
                 baseEntry = { ...existing };
+            }
             for (const field of URL_BOUND_AUTH_FIELDS) {
                 delete baseEntry[field];
             }
@@ -370,11 +383,14 @@ function mergeServerMaps(base, next) {
             }
         }
         // Stdio env belongs to the program that received it, not just the server name.
-        if (existing?.command && ((definition.command !== undefined && definition.command !== existing.command)
-            || (definition.args !== undefined && !isDeepStrictEqual(definition.args, existing.args ?? []))
-            || (definition.cwd !== undefined && definition.cwd !== existing.cwd))) {
-            if (baseEntry === existing)
+        if (existing?.command &&
+            ((definition.command !== undefined && definition.command !== existing.command) ||
+                (definition.args !== undefined &&
+                    !isDeepStrictEqual(definition.args, existing.args ?? [])) ||
+                (definition.cwd !== undefined && definition.cwd !== existing.cwd))) {
+            if (baseEntry === existing) {
                 baseEntry = { ...existing };
+            }
             delete baseEntry.env;
         }
         merged[name] = { ...baseEntry, ...definition };
@@ -383,18 +399,21 @@ function mergeServerMaps(base, next) {
 }
 function mergeImports(left, right) {
     const merged = [...(left ?? []), ...(right ?? [])];
-    if (merged.length === 0)
+    if (merged.length === 0) {
         return undefined;
+    }
     return [...new Set(merged)];
 }
 function expandImports(config, cwd, includeProject) {
-    if (!config.imports?.length)
+    if (!config.imports?.length) {
         return config;
+    }
     const importedServers = {};
     for (const importKind of config.imports) {
         const imported = loadImportedConfig(importKind, cwd, `Failed to import MCP config from ${importKind}:`, includeProject);
-        if (!imported)
+        if (!imported) {
             continue;
+        }
         const servers = extractServers(imported.value, importKind);
         for (const [name, definition] of Object.entries(servers)) {
             if (!importedServers[name]) {
@@ -421,17 +440,20 @@ function resolveImportCandidates(importKind, cwd, includeProject) {
                     break;
                 }
                 const parent = dirname(current);
-                if (parent === current)
+                if (parent === current) {
                     break;
+                }
                 current = parent;
             }
-            if (!gitRoot)
+            if (!gitRoot) {
                 return join(start, "opencode.json");
+            }
             current = start;
             while (true) {
                 const projectConfig = join(current, "opencode.json");
-                if (existsSync(projectConfig) || current === gitRoot)
+                if (existsSync(projectConfig) || current === gitRoot) {
                     return projectConfig;
+                }
                 current = dirname(current);
             }
         }
@@ -451,8 +473,9 @@ function loadImportedConfig(importKind, cwd, warningPrefix, includeProject = tru
         let merged = {};
         let highestPrecedencePath;
         for (const path of resolveImportCandidates(importKind, cwd, includeProject)) {
-            if (!existsSync(path))
+            if (!existsSync(path)) {
                 continue;
+            }
             try {
                 const value = readImportedConfig(path);
                 if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -467,8 +490,9 @@ function loadImportedConfig(importKind, cwd, warningPrefix, includeProject = tru
         return highestPrecedencePath ? { path: highestPrecedencePath, value: merged } : null;
     }
     for (const path of resolveImportCandidates(importKind, cwd, includeProject)) {
-        if (!existsSync(path))
+        if (!existsSync(path)) {
             continue;
+        }
         try {
             return { path, value: readImportedConfig(path) };
         }
@@ -479,8 +503,9 @@ function loadImportedConfig(importKind, cwd, warningPrefix, includeProject = tru
     return null;
 }
 function readValidatedConfig(path, label) {
-    if (!existsSync(path))
+    if (!existsSync(path)) {
         return null;
+    }
     try {
         return validateConfig(parseJsonConfig(readFileSync(path, "utf-8")));
     }
@@ -503,8 +528,9 @@ function validateConfig(raw) {
         return { mcpServers: {} };
     }
     for (const entry of Object.values(servers)) {
-        if (entry && typeof entry === "object")
+        if (entry && typeof entry === "object") {
             validateServerProtocolConfig(entry);
+        }
     }
     return {
         mcpServers: servers,
@@ -521,13 +547,18 @@ function mergeOpenCodeConfigs(base, next) {
     if (nextMcp && typeof nextMcp === "object" && !Array.isArray(nextMcp)) {
         for (const [name, nextEntry] of Object.entries(nextMcp)) {
             const baseEntry = mergedMcp[name];
-            if (baseEntry && typeof baseEntry === "object" && !Array.isArray(baseEntry)
-                && nextEntry && typeof nextEntry === "object" && !Array.isArray(nextEntry)) {
+            if (baseEntry &&
+                typeof baseEntry === "object" &&
+                !Array.isArray(baseEntry) &&
+                nextEntry &&
+                typeof nextEntry === "object" &&
+                !Array.isArray(nextEntry)) {
                 const safeBase = { ...baseEntry };
                 const override = nextEntry;
                 if (typeof override.type === "string" && override.type !== safeBase.type) {
-                    for (const field of ["command", "environment", "cwd", "url", "headers", "oauth"])
+                    for (const field of ["command", "environment", "cwd", "url", "headers", "oauth"]) {
                         delete safeBase[field];
+                    }
                 }
                 if (typeof override.url === "string" && override.url !== safeBase.url) {
                     delete safeBase.headers;
@@ -535,23 +566,31 @@ function mergeOpenCodeConfigs(base, next) {
                 }
                 if (Array.isArray(override.command)) {
                     const baseCommand = safeBase.command;
-                    const commandChanged = !Array.isArray(baseCommand)
-                        || override.command.length !== baseCommand.length
-                        || override.command.some((value, index) => value !== baseCommand[index]);
+                    const commandChanged = !Array.isArray(baseCommand) ||
+                        override.command.length !== baseCommand.length ||
+                        override.command.some((value, index) => value !== baseCommand[index]);
                     if (commandChanged) {
                         delete safeBase.environment;
                         delete safeBase.cwd;
                     }
                 }
-                if (Object.hasOwn(override, "cwd") && override.cwd !== safeBase.cwd)
+                if (Object.hasOwn(override, "cwd") && override.cwd !== safeBase.cwd) {
                     delete safeBase.environment;
+                }
                 const mergedEntry = { ...safeBase, ...override };
                 for (const field of ["headers", "oauth"]) {
                     const baseField = safeBase[field];
                     const nextField = override[field];
-                    if (baseField && typeof baseField === "object" && !Array.isArray(baseField)
-                        && nextField && typeof nextField === "object" && !Array.isArray(nextField)) {
-                        mergedEntry[field] = { ...baseField, ...nextField };
+                    if (baseField &&
+                        typeof baseField === "object" &&
+                        !Array.isArray(baseField) &&
+                        nextField &&
+                        typeof nextField === "object" &&
+                        !Array.isArray(nextField)) {
+                        mergedEntry[field] = {
+                            ...baseField,
+                            ...nextField,
+                        };
                     }
                 }
                 mergedMcp[name] = mergedEntry;
@@ -564,8 +603,9 @@ function mergeOpenCodeConfigs(base, next) {
     return { ...base, ...next, mcp: mergedMcp };
 }
 function extractServers(config, kind) {
-    if (!config || typeof config !== "object")
+    if (!config || typeof config !== "object") {
         return {};
+    }
     const obj = config;
     let servers;
     switch (kind) {
@@ -593,16 +633,22 @@ function extractServers(config, kind) {
     const mappedServers = {};
     for (const [name, entry] of Object.entries(servers)) {
         if (kind === "opencode") {
-            if (!entry || typeof entry !== "object" || Array.isArray(entry))
+            if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
                 continue;
+            }
             const raw = entry;
-            if (raw.enabled === false)
+            if (raw.enabled === false) {
                 continue;
-            if (raw.type === "local" && Array.isArray(raw.command) && raw.command.length > 0 && raw.command.every((value) => typeof value === "string")) {
+            }
+            if (raw.type === "local" &&
+                Array.isArray(raw.command) &&
+                raw.command.length > 0 &&
+                raw.command.every((value) => typeof value === "string")) {
                 const env = toStringRecord(raw.environment);
                 const command = raw.command[0];
-                if (command === undefined)
+                if (command === undefined) {
                     continue;
+                }
                 const mapped = {
                     command,
                     args: raw.command.slice(1),
@@ -644,17 +690,22 @@ function extractServers(config, kind) {
         const envHttpHeaders = mapped.env_http_headers;
         if (typeof bearerTokenEnv === "string") {
             mapped.bearerTokenEnv = bearerTokenEnv;
-            if (mapped.auth === undefined)
+            if (mapped.auth === undefined) {
                 mapped.auth = "bearer";
+            }
         }
         if (httpHeaders && typeof httpHeaders === "object" && !Array.isArray(httpHeaders)) {
-            mapped.headers = { ...mapped.headers, ...httpHeaders };
+            mapped.headers = {
+                ...mapped.headers,
+                ...httpHeaders,
+            };
         }
         if (envHttpHeaders && typeof envHttpHeaders === "object" && !Array.isArray(envHttpHeaders)) {
             const headers = { ...mapped.headers };
             for (const [header, envVar] of Object.entries(envHttpHeaders)) {
-                if (typeof envVar === "string" && headers[header] === undefined)
+                if (typeof envVar === "string" && headers[header] === undefined) {
                     headers[header] = `$env:${envVar}`;
+                }
             }
             mapped.headers = headers;
         }
@@ -669,8 +720,9 @@ function serializeRawConfig(raw) {
     return `${JSON.stringify(raw, null, 2)}\n`;
 }
 function buildUnifiedDiff(beforeText, afterText) {
-    if (beforeText === afterText)
+    if (beforeText === afterText) {
         return "(no changes)";
+    }
     const before = beforeText.split("\n");
     const after = afterText.split("\n");
     const rows = before.length;
@@ -680,11 +732,13 @@ function buildUnifiedDiff(beforeText, afterText) {
         for (let j = cols - 1; j >= 0; j--) {
             const row = lcs[i];
             const nextRow = lcs[i + 1];
-            if (!row || !nextRow)
+            if (!row || !nextRow) {
                 continue;
-            row[j] = before[i] === after[j]
-                ? (nextRow[j + 1] ?? 0) + 1
-                : Math.max(nextRow[j] ?? 0, row[j + 1] ?? 0);
+            }
+            row[j] =
+                before[i] === after[j]
+                    ? (nextRow[j + 1] ?? 0) + 1
+                    : Math.max(nextRow[j] ?? 0, row[j + 1] ?? 0);
         }
     }
     const lines = ["--- before", "+++ after"];
@@ -724,8 +778,9 @@ function buildConfigWritePreview(filePath, nextRaw) {
     };
 }
 function readRawConfigObject(filePath) {
-    if (!existsSync(filePath))
+    if (!existsSync(filePath)) {
         return {};
+    }
     let raw;
     try {
         raw = parseJsonConfig(readFileSync(filePath, "utf-8"));
@@ -747,13 +802,16 @@ function writeRawConfigObject(filePath, raw) {
         mode: existingMode ?? 0o666,
         flag: "wx",
     });
-    if (existingMode !== undefined)
+    if (existingMode !== undefined) {
         chmodSync(tmpPath, existingMode);
+    }
     renameSync(tmpPath, filePath);
 }
 function getServersObject(raw, filePath) {
-    const existing = raw.mcpServers !== undefined ? raw.mcpServers
-        : raw["mcp-servers"] !== undefined ? raw["mcp-servers"]
+    const existing = raw.mcpServers !== undefined
+        ? raw.mcpServers
+        : raw["mcp-servers"] !== undefined
+            ? raw["mcp-servers"]
             : {};
     if (!existing || typeof existing !== "object" || Array.isArray(existing)) {
         throw new Error(`Invalid MCP config at ${filePath}: mcpServers must be an object`);
@@ -784,14 +842,20 @@ export function writeProjectServerDisabledOverride(overridePath, cwd, serverName
             throw new Error(`Failed to read project MCP override at ${filePath}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
         }
     }
-    const serverKey = raw.mcpServers !== undefined ? "mcpServers" : raw["mcp-servers"] !== undefined ? "mcp-servers" : "mcpServers";
+    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))) {
+    if (rawServers !== undefined &&
+        (!rawServers || typeof rawServers !== "object" || Array.isArray(rawServers))) {
         throw new Error(`Failed to update project MCP override at ${filePath}: ${serverKey} must be an object`);
     }
     const servers = (rawServers ?? {});
     const previous = servers[serverName];
-    if (previous !== undefined && (!previous || typeof previous !== "object" || Array.isArray(previous))) {
+    if (previous !== undefined &&
+        (!previous || typeof previous !== "object" || Array.isArray(previous))) {
         throw new Error(`Failed to update project MCP override at ${filePath}: server "${serverName}" must be an object`);
     }
     const existing = previous;
@@ -803,28 +867,35 @@ export function writeProjectServerDisabledOverride(overridePath, cwd, serverName
         next = Object.fromEntries(Object.entries(existing ?? {}).filter(([key]) => key !== "disabled"));
         let lowerConfig = { mcpServers: {} };
         for (const source of getConfigSources(overridePath, cwd)) {
-            if (source.readPath === filePath)
+            if (source.readPath === filePath) {
                 continue;
+            }
             const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
-            if (loaded)
+            if (loaded) {
                 lowerConfig = mergeConfigs(lowerConfig, expandImports(loaded, cwd, true));
+            }
         }
         if (raw.imports !== undefined) {
-            if (!Array.isArray(raw.imports) || raw.imports.some((kind) => typeof kind !== "string" || !Object.hasOwn(IMPORT_PATHS, kind))) {
+            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, true));
         }
-        if (isServerDisabled(lowerConfig.mcpServers[serverName]))
+        if (isServerDisabled(lowerConfig.mcpServers[serverName])) {
             next.disabled = false;
+        }
     }
-    if ((!existing && Object.keys(next).length === 0) || JSON.stringify(existing) === JSON.stringify(next)) {
+    if ((!existing && Object.keys(next).length === 0) ||
+        JSON.stringify(existing) === JSON.stringify(next)) {
         return { path: filePath, changed: false };
     }
-    if (Object.keys(next).length === 0)
+    if (Object.keys(next).length === 0) {
         delete servers[serverName];
-    else
+    }
+    else {
         servers[serverName] = next;
+    }
     raw[serverKey] = servers;
     writeRawConfigObject(filePath, raw);
     return { path: filePath, changed: true };
@@ -835,7 +906,9 @@ function isRepoPromptServer(name, entry) {
         return true;
     }
     const command = entry.command?.toLowerCase() ?? "";
-    if (command.includes("repoprompt") || command.includes("rp-mcp") || command.endsWith("repoprompt_cli")) {
+    if (command.includes("repoprompt") ||
+        command.includes("rp-mcp") ||
+        command.endsWith("repoprompt_cli")) {
         return true;
     }
     return (entry.args ?? []).some((arg) => typeof arg === "string" && arg.toLowerCase().includes("repoprompt"));
@@ -851,18 +924,19 @@ function findProjectRoots(cwd = process.cwd()) {
     for (const startPath of startPaths) {
         let current = startPath;
         while (true) {
-            if (!isHomePath(current)
-                && (existsSync(join(current, ".git"))
-                    || existsSync(join(current, "package.json"))
-                    || existsSync(join(current, PROJECT_CONFIG_NAME))
-                    || existsSync(join(current, ".pi")))
-                && !seen.has(current)) {
+            if (!isHomePath(current) &&
+                (existsSync(join(current, ".git")) ||
+                    existsSync(join(current, "package.json")) ||
+                    existsSync(join(current, PROJECT_CONFIG_NAME)) ||
+                    existsSync(join(current, ".pi"))) &&
+                !seen.has(current)) {
                 roots.push(current);
                 seen.add(current);
             }
             const parent = dirname(current);
-            if (parent === current)
+            if (parent === current) {
                 break;
+            }
             current = parent;
         }
     }
@@ -880,11 +954,13 @@ function buildRepoPromptEntry(executablePath) {
 }
 function detectRepoPrompt(summary, cwd = process.cwd()) {
     for (const source of summary.sources) {
-        if (source.kind !== "shared" || source.serverCount === 0)
+        if (source.kind !== "shared" || source.serverCount === 0) {
             continue;
+        }
         const config = readValidatedConfig(source.path, `MCP config from ${source.path}`);
-        if (!config)
+        if (!config) {
             continue;
+        }
         for (const [name, entry] of Object.entries(config.mcpServers)) {
             if (isRepoPromptServer(name, entry)) {
                 return { configured: true, configuredPath: source.path };
@@ -896,7 +972,9 @@ function detectRepoPrompt(summary, cwd = process.cwd()) {
         return { configured: false };
     }
     const projectRoot = findProjectRoot(cwd);
-    const targetPath = projectRoot ? join(projectRoot, PROJECT_CONFIG_NAME) : GENERIC_GLOBAL_CONFIG_PATH;
+    const targetPath = projectRoot
+        ? join(projectRoot, PROJECT_CONFIG_NAME)
+        : GENERIC_GLOBAL_CONFIG_PATH;
     return {
         configured: false,
         executablePath,
@@ -908,7 +986,9 @@ 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 = Array.isArray(raw.imports)
+        ? raw.imports.filter((value) => typeof value === "string")
+        : [];
     const merged = [...new Set([...currentImports, ...importKinds])];
     const nextRaw = { ...raw, imports: merged };
     setServersObject(nextRaw, getServersObject(nextRaw, targetPath));
@@ -917,7 +997,9 @@ export function previewCompatibilityImports(importKinds, overridePath) {
 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 = Array.isArray(raw.imports)
+        ? raw.imports.filter((value) => typeof value === "string")
+        : [];
     const merged = [...new Set([...currentImports, ...importKinds])];
     const added = merged.filter((kind) => !currentImports.includes(kind));
     if (added.length === 0) {
@@ -967,8 +1049,9 @@ export function getServerProvenance(overridePath, cwd = process.cwd()) {
     if (getConfiguredHostConfigDiscovery(overridePath, cwd) === "on") {
         for (const importKind of Object.keys(IMPORT_PATHS)) {
             const imported = loadImportedConfig(importKind, cwd, `Failed to inspect imported MCP config from ${importKind}:`);
-            if (!imported)
+            if (!imported) {
                 continue;
+            }
             for (const name of Object.keys(extractServers(imported.value, importKind))) {
                 // Keep writes inside Pi-owned storage even though the source is external.
                 // Later import kinds win in the same deterministic order as loadDiscoveredHostConfigs.
@@ -978,13 +1061,15 @@ export function getServerProvenance(overridePath, cwd = process.cwd()) {
     }
     for (const source of getConfigSources(overridePath, cwd)) {
         const loaded = readValidatedConfig(source.readPath, `MCP config from ${source.readPath}`);
-        if (!loaded)
+        if (!loaded) {
             continue;
+        }
         if (loaded.imports?.length) {
             for (const importKind of loaded.imports) {
                 const imported = loadImportedConfig(importKind, cwd, `Failed to inspect imported MCP config from ${importKind}:`);
-                if (!imported)
+                if (!imported) {
                     continue;
+                }
                 const servers = extractServers(imported.value, importKind);
                 for (const name of Object.keys(servers)) {
                     if (!provenance.has(name)) {
@@ -1007,11 +1092,13 @@ export function writeDirectToolsConfig(changes, provenance) {
     const byPath = new Map();
     for (const [serverName, value] of changes) {
         const prov = provenance.get(serverName);
-        if (!prov)
+        if (!prov) {
             continue;
+        }
         const targetPath = prov.path;
-        if (!byPath.has(targetPath))
+        if (!byPath.has(targetPath)) {
             byPath.set(targetPath, []);
+        }
         byPath.get(targetPath).push({ name: serverName, value });
     }
     for (const [filePath, entries] of byPath) {
@@ -1026,13 +1113,15 @@ export function writeDirectToolsConfig(changes, provenance) {
     }
 }
 export function resolveConfiguredOAuthDir(raw, cwd = process.cwd()) {
-    if (raw === undefined || raw === null)
+    if (raw === undefined || raw === null) {
         return undefined;
+    }
     if (typeof raw !== "string") {
         throw new Error("settings.oauthDir must be a string");
     }
     const trimmed = raw.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return undefined;
+    }
     return resolve(cwd, trimmed);
 }