@1mcp/agent 0.35.0-beta.3 → 0.35.0

package/build/domains/admin/configuredToolInventory.js

@@ -0,0 +1,135 @@
+import { createHash } from 'node:crypto';
+import { TokenEstimationService } from '../../application/services/tokenEstimationService.js';
+import { publishLastConfiguredToolSnapshot, readConfiguredToolSnapshot, readLastConfiguredToolSnapshot, } from '../../core/capabilities/configuredToolSnapshot.js';
+import { getDisabledTools, getLogicalToolName, isToolDisabled } from '../../core/server/disabledTools.js';
+import { applyEffectiveToolDescription, getToolDescriptionOverrides, } from '../../core/server/toolDescriptionOverrides.js';
+import { ClientStatus } from '../../core/types/index.js';
+import { isConfiguredServerTargetDisabled } from '../../domains/config-change/configChange.js';
+export async function createConfiguredToolInventory(input) {
+    const model = input.model?.trim() || 'gpt-4o';
+    const matchingConnections = Array.from(input.connections.entries()).filter(([, connection]) => {
+        const logicalName = connection.name;
+        return connection.status === ClientStatus.Connected && logicalName === input.targetName;
+    });
+    const activeInstanceCount = matchingConnections.length;
+    const toolsByName = new Map();
+    let successfulInstances = 0;
+    const snapshotAvailability = [];
+    for (const [connectionKey, connection] of matchingConnections) {
+        const tools = readConfiguredToolSnapshot(connection);
+        snapshotAvailability.push({ connectionKey, available: tools !== undefined });
+        if (!tools)
+            continue;
+        successfulInstances += 1;
+        for (const tool of tools) {
+            const existing = toolsByName.get(tool.name);
+            if (existing)
+                existing.instances.add(connectionKey);
+            else
+                toolsByName.set(tool.name, { tool, instances: new Set([connectionKey]), live: true });
+        }
+    }
+    if (activeInstanceCount > 0 && successfulInstances === activeInstanceCount) {
+        publishLastConfiguredToolSnapshot(input.targetName, Array.from(toolsByName.values(), ({ tool }) => tool));
+    }
+    for (const tool of readLastConfiguredToolSnapshot(input.targetName)) {
+        if (!toolsByName.has(tool.name))
+            toolsByName.set(tool.name, { tool, instances: new Set(), live: false });
+    }
+    const overrides = getToolDescriptionOverrides(input.config);
+    const configuredNames = new Set([
+        ...getDisabledTools(input.config).map((name) => getLogicalToolName(input.targetName, name)),
+        ...Object.keys(overrides).map((name) => getLogicalToolName(input.targetName, name)),
+    ]);
+    const allNames = new Set([...toolsByName.keys(), ...configuredNames]);
+    const tokenEstimator = new TokenEstimationService(model);
+    const serverConfigs = { [input.targetName]: input.config };
+    let rows;
+    try {
+        rows = Array.from(allNames)
+            .sort((left, right) => left.localeCompare(right))
+            .map((name) => {
+            const observed = toolsByName.get(name);
+            const effectiveTool = observed
+                ? applyEffectiveToolDescription(observed.tool, input.config, input.targetName)
+                : undefined;
+            const approximateTokens = effectiveTool
+                ? (tokenEstimator.estimateServerTokens(input.targetName, [effectiveTool], [], [], true).breakdown.tools[0]
+                    ?.tokens ?? 0)
+                : 0;
+            const observedInstanceCount = observed?.instances.size ?? 0;
+            const descriptionOverride = overrides[name];
+            return {
+                name,
+                ...(observed?.tool.description !== undefined ? { upstreamDescription: observed.tool.description } : {}),
+                ...(effectiveTool?.description !== undefined
+                    ? { effectiveDescription: effectiveTool.description }
+                    : descriptionOverride !== undefined
+                        ? { effectiveDescription: descriptionOverride }
+                        : {}),
+                ...(descriptionOverride !== undefined ? { descriptionOverride } : {}),
+                descriptionOverridden: descriptionOverride !== undefined,
+                enabled: !isToolDisabled(serverConfigs, input.targetName, name),
+                observed: observed?.live ?? false,
+                stale: observed !== undefined && !observed.live,
+                unresolved: observed === undefined,
+                observedInstanceCount,
+                activeInstanceCount,
+                observedInSomeInstances: successfulInstances === activeInstanceCount &&
+                    observedInstanceCount > 0 &&
+                    observedInstanceCount < activeInstanceCount,
+                approximateTokens,
+            };
+        });
+    }
+    finally {
+        tokenEstimator.dispose();
+    }
+    const allObservedTokens = rows.reduce((total, row) => total + row.approximateTokens, 0);
+    const enabledTokens = rows.reduce((total, row) => total + (row.enabled ? row.approximateTokens : 0), 0);
+    const generation = createHash('sha256')
+        .update(JSON.stringify({
+        targetName: input.targetName,
+        source: input.source,
+        instances: snapshotAvailability.sort((left, right) => left.connectionKey.localeCompare(right.connectionKey)),
+        tools: Array.from(toolsByName.entries())
+            .sort(([left], [right]) => left.localeCompare(right))
+            .map(([name, observed]) => ({
+            name,
+            tool: normalizeGenerationValue(observed.tool),
+            instances: Array.from(observed.instances).sort(),
+        })),
+    }))
+        .digest('base64url');
+    return {
+        targetName: input.targetName,
+        source: input.source,
+        targetEnabled: !isConfiguredServerTargetDisabled(input.config.disabled),
+        freshness: activeInstanceCount > 0 && successfulInstances === activeInstanceCount ? 'live' : 'unavailable',
+        model,
+        generation,
+        activeInstanceCount,
+        rows,
+        counts: {
+            observed: rows.filter((row) => row.observed).length,
+            enabled: rows.filter((row) => row.enabled).length,
+            disabled: rows.filter((row) => !row.enabled).length,
+            unresolved: rows.filter((row) => row.unresolved).length,
+        },
+        approximateTokens: {
+            enabled: enabledTokens,
+            allObserved: allObservedTokens,
+            savings: allObservedTokens - enabledTokens,
+        },
+    };
+}
+function normalizeGenerationValue(value) {
+    if (Array.isArray(value))
+        return value.map(normalizeGenerationValue);
+    if (!value || typeof value !== 'object')
+        return value;
+    return Object.fromEntries(Object.entries(value)
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([key, nested]) => [key, normalizeGenerationValue(nested)]));
+}
+//# sourceMappingURL=configuredToolInventory.js.map

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

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

package/build/domains/backend-logs/backendLogSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backendLogSource.d.ts","sourceRoot":"","sources":["../../../src/domains/backend-logs/backendLogSource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,iBAA6B,GACrC,gBAAgB,CASlB;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,gBAAgB,CASnB"}
+{"version":3,"file":"backendLogSource.d.ts","sourceRoot":"","sources":["../../../src/domains/backend-logs/backendLogSource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,iBAA6B,GAAG,gBAAgB,CAS7G;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,gBAAgB,CASnB"}

package/build/domains/backend-logs/backendLogSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"backendLogSource.js","sourceRoot":"","sources":["../../../src/domains/backend-logs/backendLogSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIhF,MAAM,UAAU,sBAAsB,CACpC,IAAY,EACZ,UAA6B,SAAS;IAEtC,OAAO;QACL,EAAE,EAAE,UAAU,IAAI,EAAE;QACpB,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,QAAQ;QACd,OAAO;QACP,SAAS,EAAE,QAAQ;KACpB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAIxC;IACC,OAAO;QACL,EAAE,EAAE,YAAY,KAAK,CAAC,UAAU,EAAE;QAClC,aAAa,EAAE,KAAK,CAAC,UAAU;QAC/B,WAAW,EAAE,GAAG,KAAK,CAAC,YAAY,KAAK,wBAAwB,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG;QACpF,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,SAAS;QACnC,SAAS,EAAE,QAAQ;KACpB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"backendLogSource.js","sourceRoot":"","sources":["../../../src/domains/backend-logs/backendLogSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIhF,MAAM,UAAU,sBAAsB,CAAC,IAAY,EAAE,UAA6B,SAAS;IACzF,OAAO;QACL,EAAE,EAAE,UAAU,IAAI,EAAE;QACpB,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,QAAQ;QACd,OAAO;QACP,SAAS,EAAE,QAAQ;KACpB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAIxC;IACC,OAAO;QACL,EAAE,EAAE,YAAY,KAAK,CAAC,UAAU,EAAE;QAClC,aAAa,EAAE,KAAK,CAAC,UAAU;QAC/B,WAAW,EAAE,GAAG,KAAK,CAAC,YAAY,KAAK,wBAAwB,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG;QACpF,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,SAAS;QACnC,SAAS,EAAE,QAAQ;KACpB,CAAC;AACJ,CAAC"}

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

@@ -1,9 +1,10 @@
 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, EditConfiguredServerTargetInput, RemoveConfiguredServerTargetInput, SetConfiguredServerTargetEnabledStateInput, SetStaticConfiguredServerTargetInput, } 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 declare function createConfigChangeService(ports?: ConfigChangePorts): ConfigChangeService;
 export declare function fingerprintConfiguredServerTarget(serverConfig: MCPServerParams): string;
 export declare function fingerprintConfiguredServerDefaults(serverDefaults: unknown): string;
+export declare function fingerprintConfiguredServerConfigDocument(config: unknown): string;
 export declare function fingerprintConfiguredServerSecretValue(value: string): string;
 export declare function isConfiguredServerTargetDisabled(value: MCPServerParams['disabled']): boolean;
 //# sourceMappingURL=configChange.d.ts.map

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;AAiBhE,OAAO,KAAK,EAGV,iBAAiB,EAGjB,mBAAmB,EASpB,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,+BAA+B,EAC/B,iCAAiC,EACjC,0CAA0C,EAC1C,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,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,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"}

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

@@ -4,6 +4,7 @@ import path from 'path';
 import ConfigContext from '../../config/configContext.js';
 import { ConfigLoader } from '../../config/configLoader.js';
 import { McpConfigManager } from '../../config/mcpConfigManager.js';
+import { mcpServerConfigSchema } from '../../core/types/transport.js';
 import logger from '../../logger/logger.js';
 import { parse as parseToml } from 'smol-toml';
 import { DEFAULT_BACKUP_RETENTION, listConfigBackups, retentionSkipped, } from './backupRetention.js';
@@ -18,6 +19,14 @@ export function fingerprintConfiguredServerTarget(serverConfig) {
 export function fingerprintConfiguredServerDefaults(serverDefaults) {
     return `configured_server_defaults_${keyedConfiguredServerFingerprint('defaults', stableStringify(serverDefaults ?? {}))}`;
 }
+export function fingerprintConfiguredServerConfigDocument(config) {
+    const record = config && typeof config === 'object' && !Array.isArray(config) ? config : {};
+    const normalized = {
+        ...record,
+        mcpServers: record.mcpServers && typeof record.mcpServers === 'object' ? record.mcpServers : {},
+    };
+    return `configured_server_config_${keyedConfiguredServerFingerprint('config-document', stableStringify(normalized))}`;
+}
 export function fingerprintConfiguredServerSecretValue(value) {
     return keyedConfiguredServerFingerprint('inline-secret', value);
 }
@@ -172,6 +181,86 @@ class DefaultConfigChangeService {
             reload: this.reloadConfig(configPath),
         };
     }
+    async createStaticConfiguredServerTarget(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 {
+                    status: 'failed',
+                    operation: 'create_static',
+                    configPath,
+                    target: { name: input.targetName },
+                    changed: false,
+                    backup: { created: false },
+                    retentionCleanup: retentionSkipped(),
+                    reload: { status: 'skipped' },
+                    warnings: [],
+                    error: error.message,
+                };
+            }
+            throw error;
+        }
+        let resultWithoutReload;
+        try {
+            const config = this.loadConfigForSet(configPath);
+            if (input.expectedConfigFingerprint !== undefined &&
+                fingerprintConfiguredServerConfigDocument(config) !== input.expectedConfigFingerprint) {
+                return {
+                    status: 'source_conflict',
+                    operation: 'create_static',
+                    configPath,
+                    target: { name: input.targetName },
+                    changed: false,
+                    backup: { created: false },
+                    retentionCleanup: retentionSkipped(),
+                    reload: { status: 'skipped' },
+                    warnings: [],
+                    error: 'Configured server state changed after preview',
+                };
+            }
+            const target = resolveConfiguredServerTarget(config, input.targetName);
+            if (target.source) {
+                const templateConflict = target.source === 'mcpTemplates';
+                return {
+                    status: templateConflict ? 'template_conflict' : 'destination_conflict',
+                    operation: 'create_static',
+                    configPath,
+                    target,
+                    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.mcpServers = normalizeServerRecord(config.mcpServers);
+            config.mcpServers[input.targetName] = input.serverConfig;
+            this.validateConfig(configPath, config);
+            this.writeConfig(configPath, config);
+            const retentionCleanup = this.cleanupBackups(configPath, backup);
+            resultWithoutReload = {
+                status: 'changed',
+                operation: 'create_static',
+                configPath,
+                target: { name: input.targetName, source: 'mcpServers' },
+                changed: true,
+                backup,
+                retentionCleanup,
+                reload: { status: 'skipped' },
+                warnings: retentionCleanup.warnings,
+            };
+        }
+        finally {
+            releaseLock();
+        }
+        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+    }
     async setConfiguredServerTargetEnabledState(input) {
         const configPath = this.resolveConfigPath();
         const operation = input.enabled ? 'enable' : 'disable';
@@ -199,7 +288,7 @@ class DefaultConfigChangeService {
         let resultWithoutReload;
         try {
             const config = this.loadConfig(configPath);
-            const target = resolveConfiguredServerTarget(config, input.targetName);
+            const target = resolveConfiguredServerTargetForSource(config, input.targetName, input.targetSource);
             if (!target.source) {
                 resultWithoutReload = {
                     status: 'not_found',
@@ -306,14 +395,12 @@ class DefaultConfigChangeService {
         let resultWithoutReload;
         try {
             const config = this.loadConfig(configPath);
-            const source = resolveConfiguredServerTarget(config, input.sourceName);
+            const source = resolveConfiguredServerTargetForSource(config, input.sourceName, input.targetSource);
             if (!source.source) {
                 return editConflictResult('not_found', configPath, source);
             }
-            if (source.source === 'mcpTemplates') {
-                return editConflictResult('template_conflict', configPath, source, `Configured server target '${input.sourceName}' exists in mcpTemplates and cannot be edited`);
-            }
-            const existingConfig = config.mcpServers?.[input.sourceName];
+            const sourceSection = source.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
+            const existingConfig = sourceSection?.[input.sourceName];
             if (!existingConfig) {
                 return editConflictResult('not_found', configPath, source);
             }
@@ -325,8 +412,9 @@ class DefaultConfigChangeService {
                 return editConflictResult('source_conflict', configPath, source, 'Global transport defaults changed after preview');
             }
             if (input.targetName !== input.sourceName) {
-                const destination = resolveConfiguredServerTarget(config, input.targetName);
-                if (destination.source) {
+                const destinationSection = source.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
+                if (destinationSection?.[input.targetName]) {
+                    const destination = { name: input.targetName, source: source.source };
                     return editConflictResult('destination_conflict', configPath, destination, `Configured server target '${input.targetName}' already exists`);
                 }
             }
@@ -335,9 +423,10 @@ class DefaultConfigChangeService {
                 return editConflictResult('unchanged', configPath, source);
             }
             const nextConfig = cloneConfig(config);
-            nextConfig.mcpServers = normalizeServerRecord(nextConfig.mcpServers);
-            delete nextConfig.mcpServers[input.sourceName];
-            nextConfig.mcpServers[input.targetName] = input.serverConfig;
+            const nextSection = normalizeServerRecord(nextConfig[source.source]);
+            nextConfig[source.source] = nextSection;
+            delete nextSection[input.sourceName];
+            nextSection[input.targetName] = input.serverConfig;
             this.validateConfig(configPath, nextConfig);
             const backup = this.createBackupIfNeeded(configPath, 'required');
             this.writeConfig(configPath, nextConfig);
@@ -346,7 +435,7 @@ class DefaultConfigChangeService {
                 status: 'changed',
                 operation: 'edit',
                 configPath,
-                target: { name: input.targetName, source: 'mcpServers' },
+                target: { name: input.targetName, source: source.source },
                 changed: true,
                 backup,
                 retentionCleanup,
@@ -363,7 +452,7 @@ class DefaultConfigChangeService {
         const configPath = this.resolveConfigPath();
         const operation = input.enabled ? 'enable' : 'disable';
         const config = this.loadConfig(configPath);
-        const target = resolveConfiguredServerTarget(config, input.targetName);
+        const target = resolveConfiguredServerTargetForSource(config, input.targetName, input.targetSource);
         if (!target.source) {
             return {
                 status: 'not_found',
@@ -461,6 +550,125 @@ class DefaultConfigChangeService {
             warnings: [],
         };
     }
+    async setInstructionTemplateConfiguration(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 instructionChangeResult('failed', input.operation, configPath, { name: input.identity }, error.message);
+            }
+            throw error;
+        }
+        let resultWithoutReload;
+        try {
+            const config = this.loadConfig(configPath);
+            if (fingerprintConfiguredServerConfigDocument(config) !== input.expectedConfigFingerprint) {
+                return instructionChangeResult('source_conflict', input.operation, configPath, { name: input.identity }, 'Instruction template configuration changed after it was read');
+            }
+            const currentState = {
+                instructionTemplates: config.instructionTemplates,
+                publishedInstructionTemplates: config.publishedInstructionTemplates,
+                activeInstructionTemplate: config.activeInstructionTemplate,
+            };
+            const requestedState = {
+                instructionTemplates: input.instructionTemplates,
+                publishedInstructionTemplates: input.publishedInstructionTemplates,
+                activeInstructionTemplate: input.activeInstructionTemplate,
+            };
+            if (stableStringify(currentState) === stableStringify(requestedState)) {
+                return instructionChangeResult('unchanged', input.operation, configPath, { name: input.identity });
+            }
+            const nextConfig = cloneConfig(config);
+            if (input.instructionTemplates === undefined)
+                delete nextConfig.instructionTemplates;
+            else
+                nextConfig.instructionTemplates = input.instructionTemplates;
+            if (input.publishedInstructionTemplates === undefined)
+                delete nextConfig.publishedInstructionTemplates;
+            else
+                nextConfig.publishedInstructionTemplates = input.publishedInstructionTemplates;
+            if (input.activeInstructionTemplate === undefined)
+                delete nextConfig.activeInstructionTemplate;
+            else
+                nextConfig.activeInstructionTemplate = input.activeInstructionTemplate;
+            this.validateConfig(configPath, nextConfig);
+            const backup = this.createBackupIfNeeded(configPath, 'required');
+            this.writeConfig(configPath, nextConfig);
+            const retentionCleanup = this.cleanupBackups(configPath, backup);
+            resultWithoutReload = {
+                ...instructionChangeResult('changed', input.operation, configPath, { name: input.identity }),
+                changed: true,
+                backup,
+                retentionCleanup,
+                warnings: retentionCleanup.warnings,
+            };
+        }
+        finally {
+            releaseLock();
+        }
+        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+    }
+    async changeConfiguredServerInstructionOverride(input) {
+        const configPath = this.resolveConfigPath();
+        const operation = input.mutation.action === 'set' ? 'instruction_override_set' : 'instruction_override_remove';
+        let releaseLock;
+        try {
+            releaseLock = await acquireConfigLock(configPath, this.ports.lockTimeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS);
+        }
+        catch (error) {
+            if (error instanceof ConfigLockTimeoutError) {
+                return instructionChangeResult('failed', operation, configPath, input.target, error.message);
+            }
+            throw error;
+        }
+        let resultWithoutReload;
+        try {
+            const config = this.loadConfig(configPath);
+            if (input.expectedConfigFingerprint !== undefined &&
+                fingerprintConfiguredServerConfigDocument(config) !== input.expectedConfigFingerprint) {
+                return instructionChangeResult('source_conflict', operation, configPath, input.target, 'Configured server state changed after it was read');
+            }
+            const section = input.target.source === 'mcpServers' ? config.mcpServers : config.mcpTemplates;
+            const existing = section?.[input.target.name];
+            if (!existing)
+                return instructionChangeResult('not_found', operation, configPath, input.target);
+            if (fingerprintConfiguredServerTarget(existing) !== input.expectedSourceFingerprint) {
+                return instructionChangeResult('source_conflict', operation, configPath, input.target, `Configured server target '${input.target.name}' changed after it was read`);
+            }
+            const hasOverride = Object.hasOwn(existing, 'instructionOverride');
+            if ((input.mutation.action === 'set' && hasOverride && existing.instructionOverride === input.mutation.value) ||
+                (input.mutation.action === 'remove' && !hasOverride)) {
+                return instructionChangeResult('unchanged', operation, configPath, input.target);
+            }
+            const nextConfig = cloneConfig(config);
+            const nextSection = input.target.source === 'mcpServers' ? nextConfig.mcpServers : nextConfig.mcpTemplates;
+            const nextTarget = nextSection?.[input.target.name];
+            if (!nextTarget)
+                return instructionChangeResult('not_found', operation, configPath, input.target);
+            if (input.mutation.action === 'set')
+                nextTarget.instructionOverride = input.mutation.value;
+            else
+                delete nextTarget.instructionOverride;
+            this.validateConfig(configPath, nextConfig);
+            const backup = this.createBackupIfNeeded(configPath, 'required');
+            this.writeConfig(configPath, nextConfig);
+            const retentionCleanup = this.cleanupBackups(configPath, backup);
+            resultWithoutReload = {
+                ...instructionChangeResult('changed', operation, configPath, input.target),
+                changed: true,
+                backup,
+                retentionCleanup,
+                warnings: retentionCleanup.warnings,
+            };
+        }
+        finally {
+            releaseLock();
+        }
+        return { ...resultWithoutReload, reload: this.reloadConfig(configPath) };
+    }
     async acquireConfigLockForTest(configPath) {
         return acquireConfigLock(configPath, DEFAULT_LOCK_TIMEOUT_MS);
     }
@@ -568,6 +776,7 @@ class DefaultConfigChangeService {
     }
     validateConfig(configPath, config) {
         const loader = new ConfigLoader(configPath, { ensureConfigExists: false });
+        mcpServerConfigSchema.parse(config);
         for (const [serverName, serverConfig] of Object.entries(config.mcpServers ?? {})) {
             loader.validateServerConfig(serverName, serverConfig);
         }
@@ -626,6 +835,11 @@ function resolveConfiguredServerTarget(config, targetName) {
     }
     return { name: targetName };
 }
+function resolveConfiguredServerTargetForSource(config, targetName, targetSource) {
+    if (!targetSource)
+        return resolveConfiguredServerTarget(config, targetName);
+    return config[targetSource]?.[targetName] ? { name: targetName, source: targetSource } : { name: targetName };
+}
 function removeTarget(config, target) {
     const section = target.source === 'mcpTemplates' ? config.mcpTemplates : config.mcpServers;
     if (!section) {
@@ -653,6 +867,20 @@ function editConflictResult(status, configPath, target, error) {
         ...(error ? { error } : {}),
     };
 }
+function instructionChangeResult(status, operation, configPath, target, error) {
+    return {
+        status,
+        operation,
+        configPath,
+        target,
+        changed: false,
+        backup: { created: false },
+        retentionCleanup: retentionSkipped(),
+        reload: { status: 'skipped' },
+        warnings: [],
+        ...(error ? { error } : {}),
+    };
+}
 function stableStringify(value) {
     if (Array.isArray(value))
         return `[${value.map(stableStringify).join(',')}]`;