@1mcp/agent 0.36.0 → 0.38.0

package/build/domains/admin/templateServerDefinitionAnalyzer.js

@@ -0,0 +1,148 @@
+import Handlebars from 'handlebars';
+const HANDLEBARS_BUILT_INS = new Set([
+    'and',
+    'contains',
+    'div',
+    'each',
+    'else',
+    'endsWith',
+    'eq',
+    'gt',
+    'if',
+    'len',
+    'lookup',
+    'lt',
+    'math',
+    'ne',
+    'or',
+    'startsWith',
+    'subtract',
+    'substring',
+    'unless',
+    'with',
+]);
+export function analyzeTemplateServerDefinition(config) {
+    const fields = renderedTemplateFields(config).map(({ fieldPath, value }) => analyzeField(fieldPath, value));
+    const variables = Array.from(new Set(fields.flatMap((field) => field.variables))).sort();
+    const errors = fields.flatMap((field) => field.syntax.valid
+        ? []
+        : [{ fieldPath: field.fieldPath, code: 'invalid_handlebars', message: field.syntax.message }]);
+    return {
+        syntax: { valid: errors.length === 0, errors },
+        variables,
+        // Preview is intentionally context-free, so every referenced variable is unresolved.
+        unresolvedVariables: variables,
+        fields,
+    };
+}
+function renderedTemplateFields(config) {
+    const fields = [];
+    pushStringField(fields, ['transport', 'command'], config.command);
+    for (const [index, value] of (config.args ?? []).entries()) {
+        pushStringField(fields, ['transport', 'args', String(index)], value);
+    }
+    if (config.env && !Array.isArray(config.env)) {
+        for (const [key, value] of Object.entries(config.env)) {
+            pushStringField(fields, ['transport', 'env', key], value);
+        }
+    }
+    pushStringField(fields, ['transport', 'cwd'], config.cwd);
+    pushStringField(fields, ['transport', 'url'], config.url);
+    pushStringField(fields, ['transport', 'disabled'], config.disabled);
+    return fields;
+}
+function pushStringField(fields, fieldPath, value) {
+    if (typeof value === 'string' && value.includes('{{'))
+        fields.push({ fieldPath, value });
+}
+function analyzeField(fieldPath, value) {
+    try {
+        const ast = Handlebars.parse(value);
+        const variables = new Set();
+        collectPathExpressions(ast, variables, new Set(), false);
+        return {
+            fieldPath,
+            variables: Array.from(variables).filter(isContextVariable).sort(),
+            syntax: { valid: true },
+        };
+    }
+    catch (error) {
+        return {
+            fieldPath,
+            variables: [],
+            syntax: { valid: false, message: handlebarsSyntaxDiagnostic(error) },
+        };
+    }
+}
+function collectPathExpressions(value, variables, inheritedLocals, implicitBlockContext) {
+    if (!value || typeof value !== 'object')
+        return;
+    if (Array.isArray(value)) {
+        for (const item of value)
+            collectPathExpressions(item, variables, inheritedLocals, implicitBlockContext);
+        return;
+    }
+    const node = value;
+    if (node.type === 'BlockStatement') {
+        collectPathExpressions(node.path, variables, inheritedLocals, implicitBlockContext);
+        collectPathExpressions(node.params, variables, inheritedLocals, implicitBlockContext);
+        collectPathExpressions(node.hash, variables, inheritedLocals, implicitBlockContext);
+        const blockName = readPathOriginal(node.path);
+        const program = node.program;
+        collectPathExpressions(program, variables, inheritedLocals, implicitBlockContext || blockName === 'each' || blockName === 'with');
+        collectPathExpressions(node.inverse, variables, inheritedLocals, implicitBlockContext);
+        return;
+    }
+    const locals = new Set(inheritedLocals);
+    if (Array.isArray(node.blockParams)) {
+        for (const blockParam of node.blockParams)
+            if (typeof blockParam === 'string')
+                locals.add(blockParam);
+    }
+    if (node.type === 'PathExpression' &&
+        typeof node.original === 'string' &&
+        !isBlockLocal(node.original, locals) &&
+        !(implicitBlockContext && isBarePath(node.original))) {
+        variables.add(node.original);
+    }
+    for (const nested of Object.values(node))
+        collectPathExpressions(nested, variables, locals, implicitBlockContext);
+}
+function isContextVariable(value) {
+    return (value.length > 0 &&
+        !HANDLEBARS_BUILT_INS.has(value) &&
+        !value.startsWith('@') &&
+        value !== 'this' &&
+        !value.startsWith('this.') &&
+        value !== '.' &&
+        !/^(?:true|false|null|undefined)$/u.test(value));
+}
+function isBlockLocal(value, locals) {
+    const root = value.split('.')[0];
+    return locals.has(root);
+}
+function isBarePath(value) {
+    return !value.includes('.') && !value.includes('/') && !value.startsWith('../');
+}
+function readPathOriginal(value) {
+    if (!value || typeof value !== 'object')
+        return undefined;
+    const original = value.original;
+    return typeof original === 'string' ? original : undefined;
+}
+function handlebarsSyntaxDiagnostic(error) {
+    if (!error || typeof error !== 'object')
+        return 'Invalid Handlebars syntax.';
+    const hash = error.hash;
+    if (!hash || typeof hash !== 'object')
+        return 'Invalid Handlebars syntax.';
+    const loc = hash.loc;
+    if (!loc || typeof loc !== 'object')
+        return 'Invalid Handlebars syntax.';
+    const firstLine = loc.first_line;
+    const firstColumn = loc.first_column;
+    return typeof firstLine === 'number' && typeof firstColumn === 'number'
+        ? `Invalid Handlebars syntax at line ${firstLine}, column ${firstColumn}.`
+        : 'Invalid Handlebars syntax.';
+}
+//# sourceMappingURL=templateServerDefinitionAnalyzer.js.map

package/build/domains/admin/templateServerDefinitionAnalyzer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"templateServerDefinitionAnalyzer.js","sourceRoot":"","sources":["../../../src/domains/admin/templateServerDefinitionAnalyzer.ts"],"names":[],"mappings":"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"}

package/build/domains/config-change/configChange.d.ts

@@ -1,6 +1,6 @@
 import type { MCPServerParams } from '../../core/types/index.js';
 import type { ConfigChangePorts, ConfigChangeService } from './types.js';
-export type { ConfigBackupPolicy, ConfigBackupResult, ConfigChangeOperation, ConfigChangePorts, ConfigChangeReason, ConfigChangeResult, ConfigChangeService, ConfigChangeStatus, ConfigReloadResult, ConfigReloadStatus, ConfigRetentionCleanupResult, ConfiguredServerTargetRef, ConfiguredServerTargetSource, InstructionOverrideMutation, ChangeConfiguredServerInstructionOverrideInput, CreateStaticConfiguredServerTargetInput, EditConfiguredServerTargetInput, RemoveConfiguredServerTargetInput, SetConfiguredServerTargetEnabledStateInput, SetInstructionTemplateConfigurationInput, SetStaticConfiguredServerTargetInput, } from './types.js';
+export type { ConfigBackupPolicy, ConfigBackupResult, ConfigChangeOperation, ConfigChangePorts, ConfigChangeReason, ConfigChangeResult, ConfigChangeService, ConfigChangeStatus, ConfigReloadResult, ConfigReloadStatus, ConfigRetentionCleanupResult, ConfiguredServerTargetRef, ConfiguredServerTargetSource, InstructionOverrideMutation, ChangeConfiguredServerInstructionOverrideInput, CreateStaticConfiguredServerTargetInput, CreateTemplateConfiguredServerTargetInput, EditConfiguredServerTargetInput, RemoveConfiguredServerTargetInput, SetConfiguredServerTargetEnabledStateInput, SetInstructionTemplateConfigurationInput, SetStaticConfiguredServerTargetInput, } from './types.js';
 export declare function createConfigChangeService(ports?: ConfigChangePorts): ConfigChangeService;
 export declare function fingerprintConfiguredServerTarget(serverConfig: MCPServerParams): string;
 export declare function fingerprintConfiguredServerDefaults(serverDefaults: unknown): string;

package/build/domains/config-change/configChange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configChange.d.ts","sourceRoot":"","sources":["../../../src/domains/config-change/configChange.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAkBhE,OAAO,KAAK,EAIV,iBAAiB,EAGjB,mBAAmB,EAYpB,MAAM,YAAY,CAAC;AAEpB,YAAY,EACV,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,8CAA8C,EAC9C,uCAAuC,EACvC,+BAA+B,EAC/B,iCAAiC,EACjC,0CAA0C,EAC1C,wCAAwC,EACxC,oCAAoC,GACrC,MAAM,YAAY,CAAC;AAEpB,wBAAgB,yBAAyB,CAAC,KAAK,GAAE,iBAAsB,GAAG,mBAAmB,CAE5F;AAID,wBAAgB,iCAAiC,CAAC,YAAY,EAAE,eAAe,GAAG,MAAM,CAEvF;AAED,wBAAgB,mCAAmC,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAEnF;AAED,wBAAgB,yCAAyC,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQjF;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAI5F"}
+{"version":3,"file":"configChange.d.ts","sourceRoot":"","sources":["../../../src/domains/config-change/configChange.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAkBhE,OAAO,KAAK,EAIV,iBAAiB,EAGjB,mBAAmB,EAcpB,MAAM,YAAY,CAAC;AAEpB,YAAY,EACV,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,EAC5B,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,8CAA8C,EAC9C,uCAAuC,EACvC,yCAAyC,EACzC,+BAA+B,EAC/B,iCAAiC,EACjC,0CAA0C,EAC1C,wCAAwC,EACxC,oCAAoC,GACrC,MAAM,YAAY,CAAC;AAEpB,wBAAgB,yBAAyB,CAAC,KAAK,GAAE,iBAAsB,GAAG,mBAAmB,CAE5F;AAID,wBAAgB,iCAAiC,CAAC,YAAY,EAAE,eAAe,GAAG,MAAM,CAEvF;AAED,wBAAgB,mCAAmC,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAEnF;AAED,wBAAgB,yCAAyC,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQjF;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAI5F"}

package/build/domains/config-change/configChange.js

@@ -106,9 +106,58 @@ class DefaultConfigChangeService {
         }
         return {
             ...resultWithoutReload,
-            reload: this.reloadConfig(configPath),
+            reload: await this.reloadConfig(configPath),
         };
     }
+    async deleteConfiguredServerTarget(input) {
+        const configPath = this.resolveConfigPath();
+        let releaseLock;
+        try {
+            releaseLock = await acquireConfigLock(configPath, this.ports.lockTimeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS);
+        }
+        catch (error) {
+            if (error instanceof ConfigLockTimeoutError) {
+                return deleteConflictResult('failed', configPath, { name: input.targetName, source: input.targetSource }, error.message);
+            }
+            throw error;
+        }
+        let resultWithoutReload;
+        try {
+            const config = this.loadConfig(configPath);
+            const existingConfig = config[input.targetSource]?.[input.targetName];
+            if (!existingConfig) {
+                const otherSource = input.targetSource === 'mcpServers' ? 'mcpTemplates' : 'mcpServers';
+                const otherTarget = config[otherSource]?.[input.targetName];
+                return deleteConflictResult(otherTarget ? 'source_conflict' : 'not_found', configPath, { name: input.targetName, ...(otherTarget ? { source: otherSource } : {}) }, otherTarget
+                    ? `Configured server target '${input.targetName}' no longer exists in ${input.targetSource}; the same name exists in ${otherSource}`
+                    : `Configured server target '${input.targetSource}/${input.targetName}' was already removed`);
+            }
+            if (fingerprintConfiguredServerTarget(existingConfig) !== input.expectedTargetFingerprint) {
+                return deleteConflictResult('source_conflict', configPath, { name: input.targetName, source: input.targetSource }, `Configured server target '${input.targetSource}/${input.targetName}' changed after preview`);
+            }
+            const nextConfig = cloneConfig(config);
+            removeTarget(nextConfig, { name: input.targetName, source: input.targetSource });
+            this.validateConfig(configPath, nextConfig);
+            const backup = this.createBackupIfNeeded(configPath, 'required');
+            this.writeConfig(configPath, nextConfig);
+            const retentionCleanup = this.cleanupBackups(configPath, backup);
+            resultWithoutReload = {
+                status: 'changed',
+                operation: 'remove',
+                configPath,
+                target: { name: input.targetName, source: input.targetSource },
+                changed: true,
+                backup,
+                retentionCleanup,
+                reload: { status: 'skipped' },
+                warnings: retentionCleanup.warnings,
+            };
+        }
+        finally {
+            releaseLock();
+        }
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
+    }
     async setStaticConfiguredServerTarget(input) {
         const configPath = this.resolveConfigPath();
         const operation = input.operation ?? 'config_change';
@@ -178,7 +227,7 @@ class DefaultConfigChangeService {
         }
         return {
             ...resultWithoutReload,
-            reload: this.reloadConfig(configPath),
+            reload: await this.reloadConfig(configPath),
         };
     }
     async createStaticConfiguredServerTarget(input) {
@@ -259,11 +308,10 @@ class DefaultConfigChangeService {
         finally {
             releaseLock();
         }
-        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
     }
-    async setConfiguredServerTargetEnabledState(input) {
+    async createTemplateConfiguredServerTarget(input) {
         const configPath = this.resolveConfigPath();
-        const operation = input.enabled ? 'enable' : 'disable';
         let releaseLock;
         try {
             releaseLock = await acquireConfigLock(configPath, this.ports.lockTimeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS);
@@ -272,9 +320,9 @@ class DefaultConfigChangeService {
             if (error instanceof ConfigLockTimeoutError) {
                 return {
                     status: 'failed',
-                    operation,
+                    operation: 'create_template',
                     configPath,
-                    target: { name: input.targetName },
+                    target: { name: input.targetName, source: 'mcpTemplates' },
                     changed: false,
                     backup: { created: false },
                     retentionCleanup: retentionSkipped(),
@@ -287,25 +335,91 @@ class DefaultConfigChangeService {
         }
         let resultWithoutReload;
         try {
-            const config = this.loadConfig(configPath);
-            const target = resolveConfiguredServerTargetForSource(config, input.targetName, input.targetSource);
-            if (!target.source) {
-                resultWithoutReload = {
-                    status: 'not_found',
+            const config = this.loadConfigForSet(configPath);
+            if (input.expectedConfigFingerprint !== undefined &&
+                fingerprintConfiguredServerConfigDocument(config) !== input.expectedConfigFingerprint) {
+                return {
+                    status: 'source_conflict',
+                    operation: 'create_template',
+                    configPath,
+                    target: { name: input.targetName, source: 'mcpTemplates' },
+                    changed: false,
+                    backup: { created: false },
+                    retentionCleanup: retentionSkipped(),
+                    reload: { status: 'skipped' },
+                    warnings: [],
+                    error: 'Configured server state changed after preview',
+                };
+            }
+            const occupied = resolveConfiguredServerTarget(config, input.targetName);
+            if (occupied.source) {
+                return {
+                    status: 'destination_conflict',
+                    operation: 'create_template',
+                    configPath,
+                    target: occupied,
+                    changed: false,
+                    backup: { created: false },
+                    retentionCleanup: retentionSkipped(),
+                    reload: { status: 'skipped' },
+                    warnings: [],
+                    error: `Configured server target '${input.targetName}' already exists`,
+                };
+            }
+            const backup = this.createBackupIfNeeded(configPath, input.backup ?? 'skip');
+            config.mcpTemplates = normalizeServerRecord(config.mcpTemplates);
+            config.mcpTemplates[input.targetName] = input.serverConfig;
+            this.validateConfig(configPath, config);
+            this.writeConfig(configPath, config);
+            const retentionCleanup = this.cleanupBackups(configPath, backup);
+            resultWithoutReload = {
+                status: 'changed',
+                operation: 'create_template',
+                configPath,
+                target: { name: input.targetName, source: 'mcpTemplates' },
+                changed: true,
+                backup,
+                retentionCleanup,
+                reload: { status: 'skipped' },
+                warnings: retentionCleanup.warnings,
+            };
+        }
+        finally {
+            releaseLock();
+        }
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
+    }
+    async setConfiguredServerTargetEnabledState(input) {
+        const configPath = this.resolveConfigPath();
+        const operation = input.enabled ? 'enable' : 'disable';
+        let releaseLock;
+        try {
+            releaseLock = await acquireConfigLock(configPath, this.ports.lockTimeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS);
+        }
+        catch (error) {
+            if (error instanceof ConfigLockTimeoutError) {
+                return {
+                    status: 'failed',
                     operation,
                     configPath,
-                    target,
+                    target: { name: input.targetName },
                     changed: false,
                     backup: { created: false },
                     retentionCleanup: retentionSkipped(),
                     reload: { status: 'skipped' },
                     warnings: [],
+                    error: error.message,
                 };
-                return resultWithoutReload;
             }
-            if (target.source === 'mcpTemplates') {
+            throw error;
+        }
+        let resultWithoutReload;
+        try {
+            const config = this.loadConfig(configPath);
+            const target = resolveConfiguredServerTargetForSource(config, input.targetName, input.targetSource);
+            if (!target.source) {
                 resultWithoutReload = {
-                    status: 'template_conflict',
+                    status: 'not_found',
                     operation,
                     configPath,
                     target,
@@ -314,11 +428,11 @@ class DefaultConfigChangeService {
                     retentionCleanup: retentionSkipped(),
                     reload: { status: 'skipped' },
                     warnings: [],
-                    error: `Configured server target '${input.targetName}' exists in mcpTemplates and does not support enable/disable`,
                 };
                 return resultWithoutReload;
             }
-            const existingConfig = config.mcpServers?.[input.targetName];
+            const targetSection = target.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
+            const existingConfig = targetSection?.[input.targetName];
             if (!existingConfig) {
                 resultWithoutReload = {
                     status: 'not_found',
@@ -333,6 +447,11 @@ class DefaultConfigChangeService {
                 };
                 return resultWithoutReload;
             }
+            if (input.expectedTargetFingerprint !== undefined &&
+                fingerprintConfiguredServerTarget(existingConfig) !== input.expectedTargetFingerprint) {
+                resultWithoutReload = editConflictResult('source_conflict', configPath, target, `Configured server target '${target.source}/${input.targetName}' changed after preview`, operation);
+                return resultWithoutReload;
+            }
             if (isConfiguredServerTargetDisabled(existingConfig.disabled) === !input.enabled) {
                 resultWithoutReload = {
                     status: 'unchanged',
@@ -355,8 +474,8 @@ class DefaultConfigChangeService {
             if (input.enabled) {
                 delete updatedConfig.disabled;
             }
-            config.mcpServers = normalizeServerRecord(config.mcpServers);
-            config.mcpServers[input.targetName] = updatedConfig;
+            config[target.source] = normalizeServerRecord(config[target.source]);
+            config[target.source][input.targetName] = updatedConfig;
             this.validateConfig(configPath, config);
             this.writeConfig(configPath, config);
             const retentionCleanup = this.cleanupBackups(configPath, backup);
@@ -377,7 +496,7 @@ class DefaultConfigChangeService {
         }
         return {
             ...resultWithoutReload,
-            reload: this.reloadConfig(configPath),
+            reload: await this.reloadConfig(configPath),
         };
     }
     async editConfiguredServerTarget(input) {
@@ -412,9 +531,8 @@ class DefaultConfigChangeService {
                 return editConflictResult('source_conflict', configPath, source, 'Global transport defaults changed after preview');
             }
             if (input.targetName !== input.sourceName) {
-                const destinationSection = source.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
-                if (destinationSection?.[input.targetName]) {
-                    const destination = { name: input.targetName, source: source.source };
+                const destination = resolveConfiguredServerTarget(config, input.targetName);
+                if (destination.source) {
                     return editConflictResult('destination_conflict', configPath, destination, `Configured server target '${input.targetName}' already exists`);
                 }
             }
@@ -446,7 +564,7 @@ class DefaultConfigChangeService {
         finally {
             releaseLock();
         }
-        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
     }
     async previewConfiguredServerTargetEnabledState(input) {
         const configPath = this.resolveConfigPath();
@@ -466,21 +584,8 @@ class DefaultConfigChangeService {
                 warnings: [],
             };
         }
-        if (target.source === 'mcpTemplates') {
-            return {
-                status: 'template_conflict',
-                operation,
-                configPath,
-                target,
-                changed: false,
-                backup: { created: false },
-                retentionCleanup: retentionSkipped(),
-                reload: { status: 'skipped' },
-                warnings: [],
-                error: `Configured server target '${input.targetName}' exists in mcpTemplates and does not support enable/disable`,
-            };
-        }
-        const existingConfig = config.mcpServers?.[input.targetName];
+        const targetSection = target.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
+        const existingConfig = targetSection?.[input.targetName];
         if (!existingConfig) {
             return {
                 status: 'not_found',
@@ -497,8 +602,8 @@ class DefaultConfigChangeService {
         const changed = isConfiguredServerTargetDisabled(existingConfig.disabled) !== !input.enabled;
         if (changed) {
             const previewConfig = cloneConfig(config);
-            previewConfig.mcpServers = normalizeServerRecord(previewConfig.mcpServers);
-            const previewTargetConfig = previewConfig.mcpServers[input.targetName];
+            previewConfig[target.source] = normalizeServerRecord(previewConfig[target.source]);
+            const previewTargetConfig = previewConfig[target.source][input.targetName];
             if (!previewTargetConfig) {
                 return {
                     status: 'not_found',
@@ -519,7 +624,7 @@ class DefaultConfigChangeService {
             if (input.enabled) {
                 delete updatedConfig.disabled;
             }
-            previewConfig.mcpServers[input.targetName] = updatedConfig;
+            previewConfig[target.source][input.targetName] = updatedConfig;
             try {
                 this.validateConfig(configPath, previewConfig);
             }
@@ -609,7 +714,7 @@ class DefaultConfigChangeService {
         finally {
             releaseLock();
         }
-        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
     }
     async changeConfiguredServerInstructionOverride(input) {
         const configPath = this.resolveConfigPath();
@@ -667,7 +772,7 @@ class DefaultConfigChangeService {
         finally {
             releaseLock();
         }
-        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+        return { ...resultWithoutReload, reload: await this.reloadConfig(configPath) };
     }
     async acquireConfigLockForTest(configPath) {
         return acquireConfigLock(configPath, DEFAULT_LOCK_TIMEOUT_MS);
@@ -791,10 +896,10 @@ class DefaultConfigChangeService {
         }
         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     }
-    reloadConfig(configPath) {
+    async reloadConfig(configPath) {
         try {
             if (this.ports.reloadConfig) {
-                this.ports.reloadConfig(configPath);
+                await this.ports.reloadConfig(configPath);
             }
             else {
                 McpConfigManager.getInstance(configPath).reloadConfig();
@@ -853,10 +958,24 @@ function cloneConfig(config) {
 function failedEditResult(configPath, targetName, error) {
     return editConflictResult('failed', configPath, { name: targetName }, error);
 }
-function editConflictResult(status, configPath, target, error) {
+function deleteConflictResult(status, configPath, target, error) {
     return {
         status,
-        operation: 'edit',
+        operation: 'remove',
+        configPath,
+        target,
+        changed: false,
+        backup: { created: false },
+        retentionCleanup: retentionSkipped(),
+        reload: { status: 'skipped' },
+        warnings: [],
+        error,
+    };
+}
+function editConflictResult(status, configPath, target, error, operation = 'edit') {
+    return {
+        status,
+        operation,
         configPath,
         target,
         changed: false,