@loop_ouroboros/mcp-hub-lite 1.0.1 → 1.1.0

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

@@ -1,6 +1,7 @@
 /**
- * Configuration loading utilities.
+ * Configuration loading utilities (v1.1 only).
  * Handles loading and parsing configuration from files with validation.
+ * Supports automatic migration from v1.0 to v1.1.
  */
 import type { SystemConfig } from './config.schema.js';
 /**
@@ -9,14 +10,14 @@ import type { SystemConfig } from './config.schema.js';
  * This function handles the complete configuration loading process:
  * - Checks if the config file exists at the specified path
  * - Reads and parses the JSON configuration
+ * - Detects legacy v1.0 configuration and auto-migrates to v1.1
  * - Performs type conversion for compatibility (e.g., 'http' to 'streamable-http')
  * - Validates the configuration using Zod schema
  * - Handles validation failures gracefully by falling back to default configuration
  *
- * If the config file doesn't exist or fails to load, a default configuration is returned.
- *
  * @param configPath - Path to the configuration file
- * @returns The loaded and validated system configuration
+ * @param autoMigrate - Whether to automatically migrate v1.0 to v1.1 (default: true)
+ * @returns The loaded and validated system configuration (v1.1 format)
  */
-export declare function loadConfig(configPath: string): SystemConfig;
+export declare function loadConfig(configPath: string, autoMigrate?: boolean): SystemConfig;
 //# sourceMappingURL=config-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../../../src/config/config-loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CA0C3D"}
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../../../src/config/config-loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKvD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,GAAE,OAAc,GAAG,YAAY,CAoGxF"}

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

@@ -1,66 +1,104 @@
 /**
- * Configuration loading utilities.
+ * Configuration loading utilities (v1.1 only).
  * Handles loading and parsing configuration from files with validation.
+ * Supports automatic migration from v1.0 to v1.1.
  */
 import * as fs from 'fs';
 import { logger, LOG_MODULES } from '../utils/logger.js';
-import { SystemConfigSchema } from './config.schema.js';
+import { SystemConfigSchema, isLegacyV1Config } from './config.schema.js';
+import { migrateConfig } from './config-migrator.js';
 import { convertHttpToStreamableHttp } from './type-converter.js';
+import { reassignServerInstanceIndexes } from './server-config-manager.js';
 /**
  * Loads configuration from the specified file path.
  *
  * This function handles the complete configuration loading process:
  * - Checks if the config file exists at the specified path
  * - Reads and parses the JSON configuration
+ * - Detects legacy v1.0 configuration and auto-migrates to v1.1
  * - Performs type conversion for compatibility (e.g., 'http' to 'streamable-http')
  * - Validates the configuration using Zod schema
  * - Handles validation failures gracefully by falling back to default configuration
  *
- * If the config file doesn't exist or fails to load, a default configuration is returned.
- *
  * @param configPath - Path to the configuration file
- * @returns The loaded and validated system configuration
+ * @param autoMigrate - Whether to automatically migrate v1.0 to v1.1 (default: true)
+ * @returns The loaded and validated system configuration (v1.1 format)
  */
-export function loadConfig(configPath) {
+export function loadConfig(configPath, autoMigrate = true) {
     try {
         if (fs.existsSync(configPath)) {
             logger.info(`Loading configuration from: ${configPath}`, LOG_MODULES.CONFIG_MANAGER);
             const content = fs.readFileSync(configPath, 'utf-8');
             let config = JSON.parse(content);
+            // Check if automatic migration is enabled and config is legacy v1.0
+            if (autoMigrate && isLegacyV1Config(config)) {
+                logger.info('Detected legacy v1.0 configuration, starting automatic migration to v1.1', LOG_MODULES.CONFIG_MANAGER);
+                const migrationResult = migrateConfig(configPath, {
+                    dryRun: false,
+                    createBackup: true,
+                    validateAfterMigration: true
+                });
+                if (migrationResult.success && migrationResult.migratedConfig) {
+                    logger.info('Configuration successfully migrated to v1.1', LOG_MODULES.CONFIG_MANAGER);
+                    if (migrationResult.backupPath) {
+                        logger.info(`Backup created at: ${migrationResult.backupPath}`, LOG_MODULES.CONFIG_MANAGER);
+                    }
+                    config = migrationResult.migratedConfig;
+                }
+                else {
+                    logger.warn(`Migration failed, continuing with default config: ${migrationResult.error}`, LOG_MODULES.CONFIG_MANAGER);
+                    return SystemConfigSchema.parse({});
+                }
+            }
             // Unified type conversion: convert http to streamable-http
             config = convertHttpToStreamableHttp(config);
-            // Ensure defaults without validation errors blocking
+            // Handle backward compatibility for instanceSelectionStrategy in root level
+            if (config.servers) {
+                for (const [serverName, serverConfig] of Object.entries(config.servers)) {
+                    if (serverConfig &&
+                        typeof serverConfig === 'object' &&
+                        'instanceSelectionStrategy' in serverConfig &&
+                        serverConfig.instanceSelectionStrategy !== undefined) {
+                        const legacyConfig = serverConfig;
+                        const strategy = legacyConfig.instanceSelectionStrategy;
+                        if (typeof strategy === 'string') {
+                            legacyConfig.template.instanceSelectionStrategy = strategy;
+                        }
+                        delete legacyConfig.instanceSelectionStrategy;
+                        logger.debug(`Migrated instanceSelectionStrategy for server ${serverName} to template`, LOG_MODULES.CONFIG_LOADER);
+                    }
+                }
+            }
+            // Validate and return configuration
             try {
-                // Use safeParse to validate configuration
                 const parsed = SystemConfigSchema.safeParse(config);
                 if (parsed.success) {
-                    // Ensure server configurations are sorted by name
                     const configWithSortedServers = {
                         ...parsed.data,
                         servers: Object.fromEntries(Object.entries(parsed.data.servers).sort(([a], [b]) => a.localeCompare(b)))
                     };
+                    // Ensure all server instances have proper indexes
+                    for (const serverName of Object.keys(configWithSortedServers.servers)) {
+                        reassignServerInstanceIndexes(serverName, configWithSortedServers.servers);
+                    }
                     return configWithSortedServers;
                 }
                 else {
-                    // On validation failure, log error and use default configuration
-                    logger.error(`Config validation failed: ${parsed.error}`);
+                    logger.error(`Config validation failed: ${parsed.error}`, LOG_MODULES.CONFIG_LOADER);
                     return SystemConfigSchema.parse({});
                 }
             }
             catch (e) {
-                logger.error(`Failed to parse config: ${e}`);
-                // On parsing failure, use default configuration
+                logger.error(`Failed to parse config: ${e}`, LOG_MODULES.CONFIG_LOADER);
                 return SystemConfigSchema.parse({});
             }
         }
         else {
-            // When config file doesn't exist, create default config in memory only
             return SystemConfigSchema.parse({});
         }
     }
     catch (error) {
-        logger.error(`Failed to load config: ${error}`);
-        // On config file load failure, use default configuration
+        logger.error(`Failed to load config: ${error}`, LOG_MODULES.CONFIG_LOADER);
         return SystemConfigSchema.parse({});
     }
 }

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

@@ -16,10 +16,10 @@
  * // Get the config manager instance
  * const configManager = getConfigManager();
  *
- * // Get all servers
+ * // Get all servers (v1.1 format)
  * const servers = configManager.getServers();
  *
- * // Add a new server
+ * // Add a new server with template and default instance
  * await configManager.addServer('my-server', {
  *   type: 'stdio',
  *   command: 'npx my-mcp-server',
@@ -27,15 +27,13 @@
  * });
  * ```
  */
-import { SystemConfigSchema, ServerConfigSchema, ServerInstanceConfigSchema } from './config.schema.js';
-import type { ServerConfig, SystemConfig, ServerInstanceConfig } from './config.schema.js';
-export { ServerConfig, SystemConfig, ServerInstanceConfig, SystemConfigSchema, ServerConfigSchema, ServerInstanceConfigSchema };
+import { SystemConfigSchema, ServerInstanceSchema, ServerConfigSchema } from './config.schema.js';
+import type { SystemConfig, ServerTemplate, ServerInstance, ServerConfig } from './config.schema.js';
+export { ServerConfig, SystemConfig, ServerInstance, ServerTemplate, SystemConfigSchema, ServerConfigSchema, ServerInstanceSchema };
 export declare class ConfigManager {
     private configPath;
     private config;
-    private serverInstances;
     constructor(configPath?: string);
-    private initServerInstances;
     /**
      * Retrieves the current system configuration.
      *
@@ -43,7 +41,7 @@ export declare class ConfigManager {
      */
     getConfig(): SystemConfig;
     /**
-     * Retrieves all configured servers with their configurations.
+     * Retrieves all configured servers with their configurations (v1.1 format).
      *
      * @param sortByName - Whether to sort servers by name
      * @returns Array of server objects with name and config
@@ -53,53 +51,45 @@ export declare class ConfigManager {
         config: ServerConfig;
     }>;
     /**
-     * Retrieves a server configuration by name.
+     * Retrieves a server configuration by name (v1.1 format).
      *
      * @param name - The name of the server to retrieve
-     * @returns The server configuration or undefined if not found
+     * @returns The server configuration (v1.1) or undefined if not found
      */
     getServerByName(name: string): ServerConfig | undefined;
-    /**
-     * Retrieves all server instances grouped by server name.
-     *
-     * @returns Server instances grouped by server name
-     */
-    getServerInstances(): Record<string, ServerInstanceConfig[]>;
     /**
      * Retrieves all server instances for a specific server by name.
      *
      * @param name - The name of the server to retrieve instances for
      * @returns Array of server instances, or empty array if none exist
      */
-    getServerInstanceByName(name: string): ServerInstanceConfig[];
+    getServerInstancesByName(name: string): ServerInstance[];
     /**
-     * Retrieves server information by its unique instance ID.
+     * Retrieves a specific server instance by index.
      *
-     * @param id - The unique instance ID to search for
-     * @returns Complete server information including name, configuration, and instance details
+     * @param name - The name of the server
+     * @param index - The index of the instance
+     * @returns The server instance or undefined if not found
      */
-    getServerById(id: string): {
-        name: string;
-        config: ServerConfig;
-        instance: ServerInstanceConfig;
-    } | undefined;
+    getServerInstanceByIndex(name: string, index: number): ServerInstance | undefined;
     /**
      * 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
      */
     addServers(servers: Array<{
         name: string;
-        config: Partial<ServerConfig>;
+        config: Partial<ServerTemplate>;
     }>): Promise<void>;
     /**
-     * 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
-     * @returns The validated and complete server configuration
+     * @param config - The server template configuration
+     * @returns The complete server configuration (v1.1)
      */
-    addServer(name: string, config: Partial<ServerConfig>): Promise<ServerConfig>;
+    addServer(name: string, config: Partial<ServerTemplate>): Promise<ServerConfig>;
     /**
      * Adds a new server instance for the specified server.
      *
@@ -107,36 +97,54 @@ export declare class ConfigManager {
      * @param instance - The server instance configuration
      * @returns The validated and complete server instance configuration
      */
-    addServerInstance(name: string, instance: Partial<ServerInstanceConfig>): Promise<ServerInstanceConfig>;
+    addServerInstance(name: string, instance: Partial<ServerInstance>): Promise<ServerInstance>;
+    /**
+     * Updates an existing server template configuration.
+     *
+     * @param name - The name of the server to update
+     * @param updates - The partial template updates to apply
+     * @returns The updated server configuration or null if not found
+     */
+    updateServer(name: string, updates: Partial<ServerTemplate>): Promise<ServerConfig | null>;
     /**
-     * Updates an existing server configuration with the provided changes.
+     * Updates an existing server configuration.
      *
      * @param name - The name of the server to update
-     * @param updates - The partial configuration updates to apply
+     * @param updates - The partial server template updates to apply
+     * @returns The updated server configuration or null if not found
      */
-    updateServer(name: string, updates: Partial<ServerConfig>): Promise<void>;
+    updateServerConfig(name: string, updates: Partial<ServerTemplate>): Promise<ServerConfig | null>;
     /**
-     * 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 index - The index of the instance to update
+     * @param updates - The partial instance updates to apply
+     * @returns True if the instance was updated
      */
-    updateServerInstance(name: string, index: number, updates: Partial<ServerInstanceConfig>): Promise<void>;
+    updateServerInstance(name: string, index: number, updates: Partial<ServerInstance>): Promise<boolean>;
     /**
      * Removes a server configuration and all its instances from the system.
      *
      * @param name - The name of the server to remove
-     * @returns True if the server was removed, false if it didn't exist
+     * @returns True if the server was removed
      */
-    removeServer(name: string): Promise<void>;
+    removeServer(name: string): Promise<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 index - The index of the instance to remove
+     * @returns True if the instance was removed
+     */
+    removeServerInstance(name: string, index: number): Promise<boolean>;
+    /**
+     * Reassigns server instance indexes to be consecutive (0, 1, 2, ...).
+     *
+     * @param name - The name of the server to reassign indexes for
+     * @returns True if the server exists and indexes were reassigned
      */
-    removeServerInstance(name: string, index: number): Promise<void>;
+    reassignInstanceIndexes(name: string): Promise<boolean>;
     /**
      * Updates the entire system configuration with the provided partial configuration.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../../../src/config/config-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAKH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAgB3F,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC3B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAA8C;gBAEzD,UAAU,CAAC,EAAE,MAAM;IAU/B,OAAO,CAAC,mBAAmB;IAW3B;;;;OAIG;IACI,SAAS,IAAI,YAAY;IAIhC;;;;;OAKG;IACI,UAAU,CAAC,UAAU,GAAE,OAAe,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,CAAC;IAW7F;;;;;OAKG;IACI,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;;;OAIG;IACI,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAInE;;;;;OAKG;IACI,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,EAAE;IAIpE;;;;;OAKG;IACI,aAAa,CAClB,EAAE,EAAE,MAAM,GACT;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,oBAAoB,CAAA;KAAE,GAAG,SAAS;IAUrF;;;;OAIG;IACU,UAAU,CACrB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;KAAE,CAAC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;OAMG;IACU,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAM1F;;;;;;OAMG;IACU,iBAAiB,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACtC,OAAO,CAAC,oBAAoB,CAAC;IAIhC;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtF;;;;;;OAMG;IACU,oBAAoB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtD;;;;;OAKG;IACU,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7E;;;;OAIG;IACU,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1E,OAAO,CAAC,aAAa;IAIrB;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAIzC;AAKD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CAchD;AAGD,eAAO,MAAM,aAAa,eAAqB,CAAC"}
+{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../../../src/config/config-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAKH,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAClG,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,cAAc,EACd,YAAY,EACb,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACrB,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAgB;gBAElB,UAAU,CAAC,EAAE,MAAM;IAS/B;;;;OAIG;IACI,SAAS,IAAI,YAAY;IAIhC;;;;;OAKG;IACI,UAAU,CAAC,UAAU,GAAE,OAAe,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,CAAC;IAW7F;;;;;OAKG;IACI,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;;;;OAKG;IACI,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE;IAI/D;;;;;;OAMG;IACI,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAKxF;;;;OAIG;IACU,UAAU,CACrB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;KAAE,CAAC,GAChE,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACU,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAM5F;;;;;;OAMG;IACU,iBAAiB,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,GAChC,OAAO,CAAC,cAAc,CAAC;IAM1B;;;;;;OAMG;IACU,YAAY,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAQ/B;;;;;;OAMG;IACU,kBAAkB,CAC7B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAQ/B;;;;;;;OAOG;IACU,oBAAoB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzD;;;;;;OAMG;IACU,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQhF;;;;;OAKG;IACU,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQpE;;;;OAIG;IACU,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1E,OAAO,CAAC,aAAa;IAIrB;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAGzC;AAKD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CAchD;AAGD,eAAO,MAAM,aAAa,eAAqB,CAAC"}

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

@@ -16,10 +16,10 @@
  * // Get the config manager instance
  * const configManager = getConfigManager();
  *
- * // Get all servers
+ * // Get all servers (v1.1 format)
  * const servers = configManager.getServers();
  *
- * // Add a new server
+ * // Add a new server with template and default instance
  * await configManager.addServer('my-server', {
  *   type: 'stdio',
  *   command: 'npx my-mcp-server',
@@ -30,38 +30,24 @@
 import path from 'path';
 import os from 'os';
 import { logger, LOG_MODULES } from '../utils/logger.js';
-import { SystemConfigSchema, ServerConfigSchema, ServerInstanceConfigSchema } from './config.schema.js';
+import { SystemConfigSchema, ServerInstanceSchema, ServerConfigSchema } from './config.schema.js';
 import { loadConfig } from './config-loader.js';
 import { saveConfig } from './config-saver.js';
-import { convertHttpToStreamableHttp } from './type-converter.js';
 import { logConfigChanges } from './config-change-logger.js';
-import { addServers, addServer, addServerInstance, updateServer, updateServerInstance, removeServer, removeServerInstance } from './server-config-manager.js';
+import { convertHttpToStreamableHttp } from './type-converter.js';
+import { addServers, addServer, addServerInstance, updateServerTemplate, updateServerInstance, removeServer, removeServerInstance, reassignServerInstanceIndexes } from './server-config-manager.js';
 // Re-export types for external use
-export { SystemConfigSchema, ServerConfigSchema, ServerInstanceConfigSchema };
+export { SystemConfigSchema, ServerConfigSchema, ServerInstanceSchema };
 export class ConfigManager {
     configPath;
     config;
-    serverInstances = {};
     constructor(configPath) {
         this.configPath =
             configPath ||
                 process.env.MCP_HUB_CONFIG_PATH ||
                 path.join(os.homedir(), '.mcp-hub-lite', 'config', '.mcp-hub.json');
         logger.info(`Using config file: ${this.configPath}`, LOG_MODULES.CONFIG_MANAGER);
-        this.config = loadConfig(this.configPath);
-        this.initServerInstances();
-    }
-    initServerInstances() {
-        // Init server instances
-        if (this.config && this.config.servers && typeof this.config.servers === 'object') {
-            Object.keys(this.config.servers).forEach((name) => {
-                if (!this.serverInstances[name])
-                    this.serverInstances[name] = [];
-            });
-        }
-        else if (!this.config) {
-            this.config = SystemConfigSchema.parse({});
-        }
+        this.config = loadConfig(this.configPath, true);
     }
     /**
      * Retrieves the current system configuration.
@@ -72,7 +58,7 @@ export class ConfigManager {
         return { ...this.config };
     }
     /**
-     * Retrieves all configured servers with their configurations.
+     * Retrieves all configured servers with their configurations (v1.1 format).
      *
      * @param sortByName - Whether to sort servers by name
      * @returns Array of server objects with name and config
@@ -88,64 +74,53 @@ export class ConfigManager {
         return servers;
     }
     /**
-     * Retrieves a server configuration by name.
+     * Retrieves a server configuration by name (v1.1 format).
      *
      * @param name - The name of the server to retrieve
-     * @returns The server configuration or undefined if not found
+     * @returns The server configuration (v1.1) or undefined if not found
      */
     getServerByName(name) {
         return this.config.servers?.[name];
     }
-    /**
-     * Retrieves all server instances grouped by server name.
-     *
-     * @returns Server instances grouped by server name
-     */
-    getServerInstances() {
-        return { ...this.serverInstances };
-    }
     /**
      * Retrieves all server instances for a specific server by name.
      *
      * @param name - The name of the server to retrieve instances for
      * @returns Array of server instances, or empty array if none exist
      */
-    getServerInstanceByName(name) {
-        return this.serverInstances[name] || [];
+    getServerInstancesByName(name) {
+        return this.config.servers?.[name]?.instances || [];
     }
     /**
-     * Retrieves server information by its unique instance ID.
+     * Retrieves a specific server instance by index.
      *
-     * @param id - The unique instance ID to search for
-     * @returns Complete server information including name, configuration, and instance details
-     */
-    getServerById(id) {
-        for (const [serverName, instances] of Object.entries(this.serverInstances)) {
-            const instance = instances.find((inst) => inst.id === id);
-            if (instance) {
-                return { name: serverName, config: this.config.servers[serverName], instance };
-            }
-        }
-        return undefined;
+     * @param name - The name of the server
+     * @param index - The index of the instance
+     * @returns The server instance or undefined if not found
+     */
+    getServerInstanceByIndex(name, index) {
+        const instances = this.getServerInstancesByName(name);
+        return instances[index];
     }
     /**
      * 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
      */
     async addServers(servers) {
-        this.config.servers = addServers(servers, this.config.servers, this.serverInstances);
+        this.config.servers = addServers(servers, this.config.servers);
         this.persistConfig();
     }
     /**
-     * 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
-     * @returns The validated and complete server configuration
+     * @param config - The server template configuration
+     * @returns The complete server configuration (v1.1)
      */
     async addServer(name, config) {
-        const validated = addServer(name, config, this.config.servers, this.serverInstances);
+        const validated = addServer(name, config, this.config.servers);
         this.persistConfig();
         return validated;
     }
@@ -157,48 +132,92 @@ export class ConfigManager {
      * @returns The validated and complete server instance configuration
      */
     async addServerInstance(name, instance) {
-        return addServerInstance(name, instance, this.serverInstances);
+        const newInstance = addServerInstance(name, instance, this.config.servers);
+        this.persistConfig();
+        return newInstance;
     }
     /**
-     * Updates an existing server configuration with the provided changes.
+     * Updates an existing server template configuration.
      *
      * @param name - The name of the server to update
-     * @param updates - The partial configuration updates to apply
+     * @param updates - The partial template updates to apply
+     * @returns The updated server configuration or null if not found
      */
     async updateServer(name, updates) {
-        if (updateServer(name, updates, this.config.servers)) {
+        if (updateServerTemplate(name, updates, this.config.servers)) {
+            this.persistConfig();
+            return this.config.servers[name] || null;
+        }
+        return null;
+    }
+    /**
+     * Updates an existing server configuration.
+     *
+     * @param name - The name of the server to update
+     * @param updates - The partial server template updates to apply
+     * @returns The updated server configuration or null if not found
+     */
+    async updateServerConfig(name, updates) {
+        if (updateServerTemplate(name, updates, this.config.servers)) {
             this.persistConfig();
+            return this.config.servers[name] || null;
         }
+        return null;
     }
     /**
-     * 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 index - The index of the instance to update
+     * @param updates - The partial instance updates to apply
+     * @returns True if the instance was updated
      */
     async updateServerInstance(name, index, updates) {
-        updateServerInstance(name, index, updates, this.serverInstances);
+        const result = updateServerInstance(name, index, updates, this.config.servers);
+        if (result) {
+            this.persistConfig();
+        }
+        return result;
     }
     /**
      * Removes a server configuration and all its instances from the system.
      *
      * @param name - The name of the server to remove
-     * @returns True if the server was removed, false if it didn't exist
+     * @returns True if the server was removed
      */
     async removeServer(name) {
-        if (removeServer(name, this.config.servers, this.serverInstances)) {
+        if (removeServer(name, this.config.servers)) {
             this.persistConfig();
+            return true;
         }
+        return false;
     }
     /**
      * 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 index - The index of the instance to remove
+     * @returns True if the instance was removed
      */
     async removeServerInstance(name, index) {
-        removeServerInstance(name, index, this.serverInstances);
+        if (removeServerInstance(name, index, this.config.servers)) {
+            this.persistConfig();
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Reassigns server instance indexes to be consecutive (0, 1, 2, ...).
+     *
+     * @param name - The name of the server to reassign indexes for
+     * @returns True if the server exists and indexes were reassigned
+     */
+    async reassignInstanceIndexes(name) {
+        if (reassignServerInstanceIndexes(name, this.config.servers)) {
+            this.persistConfig();
+            return true;
+        }
+        return false;
     }
     /**
      * Updates the entire system configuration with the provided partial configuration.
@@ -219,8 +238,7 @@ export class ConfigManager {
      * Synchronizes the in-memory configuration with the on-disk configuration file.
      */
     async syncConfig() {
-        this.config = loadConfig(this.configPath);
-        this.initServerInstances();
+        this.config = loadConfig(this.configPath, true);
     }
 }
 // Lazy initialization of configManager to avoid creating instance during module import