@loop_ouroboros/mcp-hub-lite 1.0.2 → 1.1.0

package/dist/server/src/config/path-validator.js

@@ -0,0 +1,53 @@
+/**
+ * Path validation utilities for configuration files.
+ * Provides basic path validation to prevent path traversal attacks.
+ */
+import { resolve, normalize } from 'node:path';
+/**
+ * Validates that a path is within an allowed directory.
+ *
+ * @param configPath - The path to validate
+ * @param allowedDirs - Array of allowed parent directories
+ * @returns true if path is valid, false otherwise
+ */
+export function isValidConfigPath(configPath, allowedDirs) {
+    try {
+        const normalizedPath = normalize(resolve(configPath));
+        for (const allowedDir of allowedDirs) {
+            const normalizedAllowedDir = normalize(resolve(allowedDir));
+            if (normalizedPath.startsWith(normalizedAllowedDir)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Ensures a path is absolute and normalized.
+ *
+ * @param configPath - The path to sanitize
+ * @returns Normalized absolute path
+ */
+export function sanitizeConfigPath(configPath) {
+    return normalize(resolve(configPath));
+}
+/**
+ * Validates that a filename doesn't contain path traversal characters.
+ *
+ * @param filename - The filename to validate
+ * @returns true if filename is safe, false otherwise
+ */
+export function isSafeFilename(filename) {
+    // Block path traversal patterns
+    if (filename.includes('..'))
+        return false;
+    if (filename.includes('/') || filename.includes('\\'))
+        return false;
+    // Block null bytes
+    if (filename.includes('\0'))
+        return false;
+    return true;
+}

package/dist/server/src/config/server-config-manager.d.ts

@@ -1,74 +1,80 @@
 /**
- * Server configuration management utilities.
- * Handles CRUD operations for server configurations and instances.
+ * Server configuration management utilities for v1.1 format.
+ * Handles CRUD operations for server templates and instances.
  */
-import type { ServerConfig, ServerInstanceConfig } from './config.schema.js';
+import type { ServerTemplate, ServerInstance, ServerConfig } from './config.schema.js';
 /**
  * Adds multiple server configurations to the system in a single operation.
  *
- * @param servers - Array of server objects containing name and partial configuration
+ * @param servers - Array of server objects containing name and partial template configuration
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
  * @returns The updated servers configuration
  */
 export declare function addServers(servers: Array<{
     name: string;
-    config: Partial<ServerConfig>;
-}>, currentServers: Record<string, ServerConfig>, serverInstances: Record<string, ServerInstanceConfig[]>): Record<string, ServerConfig>;
+    config: Partial<ServerTemplate>;
+}>, currentServers: Record<string, ServerConfig>): Record<string, ServerConfig>;
 /**
- * Adds a new server configuration to the system.
+ * Adds a new server configuration to the system (v1.1 format).
+ * Creates a template and a default instance.
  *
  * @param name - The unique name for the server
- * @param config - The server configuration (partial, will be validated)
+ * @param config - The server template configuration (partial, will be validated)
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
- * @returns The validated and complete server configuration
+ * @returns The complete server configuration (v1.1)
  */
-export declare function addServer(name: string, config: Partial<ServerConfig>, currentServers: Record<string, ServerConfig>, serverInstances: Record<string, ServerInstanceConfig[]>): ServerConfig;
+export declare function addServer(name: string, config: Partial<ServerTemplate>, currentServers: Record<string, ServerConfig>): ServerConfig;
 /**
  * Adds a new server instance for the specified server.
  *
  * @param name - The name of the server to add an instance for
  * @param instance - The server instance configuration (partial, will be validated)
- * @param serverInstances - Current server instances record (will be modified)
+ * @param currentServers - Current servers configuration object (will be modified)
  * @returns The validated and complete server instance configuration
  */
-export declare function addServerInstance(name: string, instance: Partial<ServerInstanceConfig>, serverInstances: Record<string, ServerInstanceConfig[]>): ServerInstanceConfig;
+export declare function addServerInstance(name: string, instance: Partial<ServerInstance>, currentServers: Record<string, ServerConfig>): ServerInstance;
 /**
- * Updates an existing server configuration with the provided changes.
+ * Reassigns server instance indexes to be consecutive (0, 1, 2, ...).
+ *
+ * @param name - The name of the server to reassign indexes for
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the server exists and indexes were reassigned
+ */
+export declare function reassignServerInstanceIndexes(name: string, currentServers: Record<string, ServerConfig>): boolean;
+/**
+ * Updates an existing server configuration (template and/or instance selection strategy).
  *
  * @param name - The name of the server to update
- * @param updates - The partial configuration updates to apply
+ * @param updates - The partial server configuration updates to apply (can include template and instanceSelectionStrategy)
  * @param currentServers - Current servers configuration object (will be modified)
- * @returns True if the server was updated, false if it didn't exist
+ * @returns True if the server was updated
  */
-export declare function updateServer(name: string, updates: Partial<ServerConfig>, currentServers: Record<string, ServerConfig>): boolean;
+export declare function updateServerTemplate(name: string, updates: Partial<ServerTemplate>, currentServers: Record<string, ServerConfig>): boolean;
 /**
- * Updates an existing server instance configuration with the provided changes.
+ * Updates an existing server instance configuration.
  *
  * @param name - The name of the server containing the instance to update
- * @param index - The index of the instance to update in the instances array
- * @param updates - The partial instance configuration updates to apply
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the instance was updated, false if it didn't exist
+ * @param index - The index of the instance to update
+ * @param updates - The partial instance updates to apply
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the instance was updated
  */
-export declare function updateServerInstance(name: string, index: number, updates: Partial<ServerInstanceConfig>, serverInstances: Record<string, ServerInstanceConfig[]>): boolean;
+export declare function updateServerInstance(name: string, index: number | string, updates: Partial<ServerInstance>, currentServers: Record<string, ServerConfig>): boolean;
 /**
  * Removes a server configuration and all its instances from the system.
  *
  * @param name - The name of the server to remove
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the server was removed, false if it didn't exist
+ * @returns True if the server was removed
  */
-export declare function removeServer(name: string, currentServers: Record<string, ServerConfig>, serverInstances: Record<string, ServerInstanceConfig[]>): boolean;
+export declare function removeServer(name: string, currentServers: Record<string, ServerConfig>): boolean;
 /**
  * Removes a specific server instance from the system.
  *
  * @param name - The name of the server containing the instance to remove
- * @param index - The index of the instance to remove from the instances array
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the instance was removed, false if it didn't exist
+ * @param index - The index of the instance to remove
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the instance was removed
  */
-export declare function removeServerInstance(name: string, index: number, serverInstances: Record<string, ServerInstanceConfig[]>): boolean;
+export declare function removeServerInstance(name: string, index: number | string, currentServers: Record<string, ServerConfig>): boolean;
 //# sourceMappingURL=server-config-manager.d.ts.map

package/dist/server/src/config/server-config-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-config-manager.d.ts","sourceRoot":"","sources":["../../../../src/config/server-config-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc7E;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;CAAE,CAAC,EAC/D,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAU9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAC7B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,YAAY,CAiBd;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,oBAAoB,CActB;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,OAAO,CAkBT;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACtC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,OAAO,CAMT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,OAAO,CAiBT;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,GACtD,OAAO,CAST"}
+{"version":3,"file":"server-config-manager.d.ts","sourceRoot":"","sources":["../../../../src/config/server-config-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmDvF;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAAE,CAAC,EACjE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CA+B9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,YAAY,CAuCd;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,EACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,cAAc,CAahB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,OAAO,CAkBT;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,EAChC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,OAAO,CAwCT;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,EAChC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,OAAO,CAiGT;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,OAAO,CAgBhG;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAC3C,OAAO,CAeT"}

package/dist/server/src/config/server-config-manager.js

@@ -1,118 +1,272 @@
 /**
- * Server configuration management utilities.
- * Handles CRUD operations for server configurations and instances.
+ * Server configuration management utilities for v1.1 format.
+ * Handles CRUD operations for server templates and instances.
  */
-import { ServerConfigSchema, ServerInstanceConfigSchema } from './config.schema.js';
+import { ServerTemplateSchema, ServerInstanceSchema, ServerConfigSchema } from './config.schema.js';
 import { convertHttpToStreamableHttp } from './type-converter.js';
+import { logger, LOG_MODULES } from '../utils/logger.js';
+import { getObjectChanges, logObjectChangesWithTitle } from './config-change-logger.js';
+import { sortServerConfigEnvHeaders } from '../utils/sort-utils.js';
+import { generateInstanceId } from '../utils/instance-id.js';
 /**
- * Generates a unique server instance ID.
+ * Creates a default server instance with index assignment.
  *
  * @param serverName - Name of the server
- * @returns A unique instance ID
+ * @param existingInstances - Existing instances for index calculation
+ * @param partialInstance - Partial instance configuration
+ * @returns A complete server instance
  */
-function generateInstanceId(serverName) {
-    const ts = Date.now();
-    return `${serverName}-${ts}-${Math.random().toString(36).substr(2, 5)}`;
+function createDefaultInstance(serverName, existingInstances, partialInstance = {}) {
+    const instance = {
+        ...partialInstance
+    };
+    // Generate content-based ID with deduplication
+    if (!instance.id) {
+        const baseId = generateInstanceId(serverName, partialInstance);
+        let id = baseId;
+        let suffix = 2;
+        while (existingInstances.some((inst) => inst.id === id)) {
+            id = `${baseId}-${suffix}`;
+            suffix++;
+        }
+        instance.id = id;
+    }
+    // Assign index: max index + 1, or 0 if no existing instances
+    if (instance.index === undefined) {
+        if (existingInstances.length === 0) {
+            instance.index = 0;
+        }
+        else {
+            const indexes = existingInstances.map((inst) => inst.index ?? 0);
+            const maxIndex = Math.max(...indexes);
+            instance.index = maxIndex + 1;
+        }
+    }
+    return ServerInstanceSchema.parse(instance);
 }
 /**
  * Adds multiple server configurations to the system in a single operation.
  *
- * @param servers - Array of server objects containing name and partial configuration
+ * @param servers - Array of server objects containing name and partial template configuration
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
  * @returns The updated servers configuration
  */
-export function addServers(servers, currentServers, serverInstances) {
+export function addServers(servers, currentServers) {
     for (const { name, config } of servers) {
         // Unified type conversion: convert http to streamable-http
         const convertedConfig = convertHttpToStreamableHttp(config);
-        currentServers[name] = ServerConfigSchema.parse(convertedConfig);
-        if (!serverInstances[name])
-            serverInstances[name] = [];
+        let template = ServerTemplateSchema.parse(convertedConfig);
+        // Sort env and headers keys for consistency
+        template = sortServerConfigEnvHeaders(template);
+        // Create default instance
+        let defaultInstance = createDefaultInstance(name, []);
+        // Sort env and headers keys for consistency
+        defaultInstance = sortServerConfigEnvHeaders(defaultInstance);
+        // Extract instance selection strategy from config if provided, otherwise default to random
+        const { instanceSelectionStrategy = 'random' } = config;
+        // Add instance selection strategy to template
+        template.instanceSelectionStrategy = instanceSelectionStrategy;
+        currentServers[name] = ServerConfigSchema.parse({
+            template,
+            instances: [defaultInstance]
+        });
     }
     // Ensure server configurations are sorted by name
     return Object.fromEntries(Object.entries(currentServers).sort(([a], [b]) => a.localeCompare(b)));
 }
 /**
- * Adds a new server configuration to the system.
+ * Adds a new server configuration to the system (v1.1 format).
+ * Creates a template and a default instance.
  *
  * @param name - The unique name for the server
- * @param config - The server configuration (partial, will be validated)
+ * @param config - The server template configuration (partial, will be validated)
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
- * @returns The validated and complete server configuration
+ * @returns The complete server configuration (v1.1)
  */
-export function addServer(name, config, currentServers, serverInstances) {
+export function addServer(name, config, currentServers) {
     // Unified type conversion: convert http to streamable-http
     const convertedConfig = convertHttpToStreamableHttp(config);
-    const validated = ServerConfigSchema.parse(convertedConfig);
-    currentServers[name] = validated;
-    if (!serverInstances[name])
-        serverInstances[name] = [];
+    let template = ServerTemplateSchema.parse(convertedConfig);
+    // Sort env and headers keys for consistency
+    template = sortServerConfigEnvHeaders(template);
+    // Create default instance
+    let defaultInstance = createDefaultInstance(name, []);
+    // Sort env and headers keys for consistency
+    defaultInstance = sortServerConfigEnvHeaders(defaultInstance);
+    // Extract instance selection strategy from config if provided, otherwise default to random
+    const { instanceSelectionStrategy = 'random' } = config;
+    // Add instance selection strategy to template
+    template.instanceSelectionStrategy = instanceSelectionStrategy;
+    const serverConfig = ServerConfigSchema.parse({
+        template,
+        instances: [defaultInstance]
+    });
+    currentServers[name] = serverConfig;
     // Ensure server configurations are sorted by name
     const sortedServers = Object.fromEntries(Object.entries(currentServers).sort(([a], [b]) => a.localeCompare(b)));
     // Update the reference
     Object.keys(currentServers).forEach((key) => delete currentServers[key]);
     Object.assign(currentServers, sortedServers);
-    return validated;
+    return serverConfig;
 }
 /**
  * Adds a new server instance for the specified server.
  *
  * @param name - The name of the server to add an instance for
  * @param instance - The server instance configuration (partial, will be validated)
- * @param serverInstances - Current server instances record (will be modified)
+ * @param currentServers - Current servers configuration object (will be modified)
  * @returns The validated and complete server instance configuration
  */
-export function addServerInstance(name, instance, serverInstances) {
-    if (!serverInstances[name])
-        serverInstances[name] = [];
-    // Minimal identity generation logic
-    if (!instance.id) {
-        const ts = Date.now();
-        instance.id = generateInstanceId(name);
-        instance.timestamp = ts;
-        instance.hash = Math.random().toString(36);
+export function addServerInstance(name, instance, currentServers) {
+    if (!currentServers[name]) {
+        throw new Error(`Server not found: ${name}`);
+    }
+    const existingInstances = currentServers[name].instances || [];
+    let newInstance = createDefaultInstance(name, existingInstances, instance);
+    // Sort env and headers keys for consistency
+    newInstance = sortServerConfigEnvHeaders(newInstance);
+    currentServers[name].instances = [...existingInstances, newInstance];
+    return newInstance;
+}
+/**
+ * Reassigns server instance indexes to be consecutive (0, 1, 2, ...).
+ *
+ * @param name - The name of the server to reassign indexes for
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the server exists and indexes were reassigned
+ */
+export function reassignServerInstanceIndexes(name, currentServers) {
+    if (!currentServers[name] || currentServers[name].instances.length === 0) {
+        return false;
     }
-    const validated = ServerInstanceConfigSchema.parse(instance);
-    serverInstances[name].push(validated);
-    return validated;
+    // Sort instances by their current index
+    const sortedInstances = [...currentServers[name].instances].sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
+    // Reassign indexes to be consecutive starting from 0
+    sortedInstances.forEach((instance, newIndex) => {
+        instance.index = newIndex;
+    });
+    // Update the server instances array
+    currentServers[name].instances = sortedInstances;
+    return true;
 }
 /**
- * Updates an existing server configuration with the provided changes.
+ * Updates an existing server configuration (template and/or instance selection strategy).
  *
  * @param name - The name of the server to update
- * @param updates - The partial configuration updates to apply
+ * @param updates - The partial server configuration updates to apply (can include template and instanceSelectionStrategy)
  * @param currentServers - Current servers configuration object (will be modified)
- * @returns True if the server was updated, false if it didn't exist
+ * @returns True if the server was updated
  */
-export function updateServer(name, updates, currentServers) {
+export function updateServerTemplate(name, updates, currentServers) {
     if (currentServers[name]) {
-        // Unified type conversion: convert http to streamable-http
-        const convertedUpdates = convertHttpToStreamableHttp(updates);
-        currentServers[name] = { ...currentServers[name], ...convertedUpdates };
+        const oldServerConfig = JSON.parse(JSON.stringify(currentServers[name]));
+        // Handle template updates
+        if (Object.keys(updates).length > 0) {
+            // Unified type conversion: convert http to streamable-http
+            const convertedUpdates = convertHttpToStreamableHttp(updates);
+            currentServers[name].template = {
+                ...currentServers[name].template,
+                ...convertedUpdates
+            };
+            // Sort env and headers keys for consistency
+            currentServers[name].template = sortServerConfigEnvHeaders(currentServers[name].template);
+        }
         // Ensure server configurations are sorted by name
         const sortedServers = Object.fromEntries(Object.entries(currentServers).sort(([a], [b]) => a.localeCompare(b)));
         // Update the reference
         Object.keys(currentServers).forEach((key) => delete currentServers[key]);
         Object.assign(currentServers, sortedServers);
+        // Log template changes
+        const changes = getObjectChanges(oldServerConfig, currentServers[name]);
+        if (changes.length > 0) {
+            const title = `Template updated: ${name}`;
+            logObjectChangesWithTitle(title, oldServerConfig, currentServers[name], LOG_MODULES.SERVER_CONFIG_MANAGER);
+        }
         return true;
     }
     return false;
 }
 /**
- * Updates an existing server instance configuration with the provided changes.
+ * Updates an existing server instance configuration.
  *
  * @param name - The name of the server containing the instance to update
- * @param index - The index of the instance to update in the instances array
- * @param updates - The partial instance configuration updates to apply
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the instance was updated, false if it didn't exist
+ * @param index - The index of the instance to update
+ * @param updates - The partial instance updates to apply
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the instance was updated
  */
-export function updateServerInstance(name, index, updates, serverInstances) {
-    if (serverInstances[name]?.[index]) {
-        serverInstances[name][index] = { ...serverInstances[name][index], ...updates };
-        return true;
+export function updateServerInstance(name, index, updates, currentServers) {
+    const numericIndex = typeof index === 'string' ? parseInt(index, 10) : index;
+    logger.debug(`updateServerInstance called: server=${name}, index=${numericIndex}`, LOG_MODULES.SERVER_CONFIG_MANAGER);
+    if (currentServers[name]?.instances) {
+        const instances = currentServers[name].instances;
+        const instanceIndex = instances.findIndex((inst) => inst.index === numericIndex);
+        if (instanceIndex !== -1) {
+            const originalInstance = JSON.parse(JSON.stringify(instances[instanceIndex]));
+            let updatedInstance = {
+                ...instances[instanceIndex],
+                ...updates,
+                // Explicitly preserve the original index field
+                index: originalInstance.index
+            };
+            // Sort env and headers keys for consistency
+            updatedInstance = sortServerConfigEnvHeaders(updatedInstance);
+            // Always recalculate ID based on current content
+            const newId = generateInstanceId(name, updatedInstance);
+            let finalId = newId;
+            let suffix = 2;
+            while (instances.some((inst, i) => i !== instanceIndex && inst.id === finalId)) {
+                finalId = `${newId}-${suffix}`;
+                suffix++;
+            }
+            updatedInstance.id = finalId;
+            instances[instanceIndex] = updatedInstance;
+            // Log instance changes
+            const changes = getObjectChanges(originalInstance, instances[instanceIndex]);
+            if (changes.length > 0) {
+                const title = originalInstance.displayName
+                    ? `Instance [id=${originalInstance.id}, displayName=${originalInstance.displayName}] updated:`
+                    : `Instance [id=${originalInstance.id}] updated:`;
+                logObjectChangesWithTitle(title, originalInstance, instances[instanceIndex], LOG_MODULES.SERVER_CONFIG_MANAGER);
+            }
+            return true;
+        }
+        else {
+            // Fallback: try array index directly
+            if (numericIndex >= 0 && numericIndex < instances.length) {
+                const originalInstance = JSON.parse(JSON.stringify(instances[numericIndex]));
+                let updatedInstance = {
+                    ...instances[numericIndex],
+                    ...updates,
+                    // Ensure index field is set to the numericIndex when using array index fallback
+                    index: numericIndex
+                };
+                // Sort env and headers keys for consistency
+                updatedInstance = sortServerConfigEnvHeaders(updatedInstance);
+                // Always recalculate ID based on current content
+                const newId = generateInstanceId(name, updatedInstance);
+                let finalId = newId;
+                let suffix = 2;
+                while (instances.some((inst, i) => i !== numericIndex && inst.id === finalId)) {
+                    finalId = `${newId}-${suffix}`;
+                    suffix++;
+                }
+                updatedInstance.id = finalId;
+                instances[numericIndex] = updatedInstance;
+                // Log instance changes
+                const changes = getObjectChanges(originalInstance, instances[numericIndex]);
+                if (changes.length > 0) {
+                    const title = originalInstance.displayName
+                        ? `Instance [id=${originalInstance.id}, displayName=${originalInstance.displayName}] updated:`
+                        : `Instance [id=${originalInstance.id}] updated:`;
+                    logObjectChangesWithTitle(title, originalInstance, instances[numericIndex], LOG_MODULES.SERVER_CONFIG_MANAGER);
+                }
+                return true;
+            }
+        }
+    }
+    else {
+        logger.debug(`Server ${name} not found or has no instances`, LOG_MODULES.SERVER_CONFIG_MANAGER);
     }
     return false;
 }
@@ -121,13 +275,11 @@ export function updateServerInstance(name, index, updates, serverInstances) {
  *
  * @param name - The name of the server to remove
  * @param currentServers - Current servers configuration object (will be modified)
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the server was removed, false if it didn't exist
+ * @returns True if the server was removed
  */
-export function removeServer(name, currentServers, serverInstances) {
+export function removeServer(name, currentServers) {
     if (currentServers[name]) {
         delete currentServers[name];
-        delete serverInstances[name];
         // Ensure server configurations are sorted by name
         const sortedServers = Object.fromEntries(Object.entries(currentServers).sort(([a], [b]) => a.localeCompare(b)));
         // Update the reference
@@ -141,17 +293,21 @@ export function removeServer(name, currentServers, serverInstances) {
  * Removes a specific server instance from the system.
  *
  * @param name - The name of the server containing the instance to remove
- * @param index - The index of the instance to remove from the instances array
- * @param serverInstances - Current server instances record (will be modified)
- * @returns True if the instance was removed, false if it didn't exist
+ * @param index - The index of the instance to remove
+ * @param currentServers - Current servers configuration object (will be modified)
+ * @returns True if the instance was removed
  */
-export function removeServerInstance(name, index, serverInstances) {
-    if (serverInstances[name]) {
-        serverInstances[name].splice(index, 1);
-        if (serverInstances[name].length === 0) {
-            delete serverInstances[name];
+export function removeServerInstance(name, index, currentServers) {
+    if (currentServers[name]?.instances) {
+        const numericIndex = typeof index === 'string' ? parseInt(index, 10) : index;
+        const instanceIndex = currentServers[name].instances.findIndex((inst) => inst.index === numericIndex);
+        if (instanceIndex !== -1) {
+            currentServers[name].instances.splice(instanceIndex, 1);
+            if (currentServers[name].instances.length === 0) {
+                // Keep the server even if it has no instances
+            }
+            return true;
         }
-        return true;
     }
     return false;
 }

package/dist/server/src/config/type-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-converter.d.ts","sourceRoot":"","sources":["../../../../src/config/type-converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CA2BpE"}
+{"version":3,"file":"type-converter.d.ts","sourceRoot":"","sources":["../../../../src/config/type-converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CA2BpE"}

package/dist/server/src/config/type-converter.js

@@ -2,6 +2,7 @@
  * Type conversion utilities for configuration management.
  * Handles backward compatibility type conversions.
  */
+import { TransportType } from './config.schema.js';
 /**
  * Unified type conversion method: convert type: 'http' to type: 'streamable-http'
  * Ensure compatibility across all scenarios (loading, adding, updating)
@@ -20,8 +21,8 @@ export function convertHttpToStreamableHttp(config) {
     if (typeof config === 'object' && config !== null) {
         const result = {};
         for (const [key, value] of Object.entries(config)) {
-            if (key === 'type' && value === 'http') {
-                result[key] = 'streamable-http';
+            if (key === 'type' && value === TransportType.HTTP) {
+                result[key] = TransportType.STREAMABLE_HTTP;
             }
             else if (typeof value === 'object' && value !== null) {
                 result[key] = convertHttpToStreamableHttp(value);