@nanocollective/nanocoder 1.23.0 → 1.24.1

package/dist/config/index.js

@@ -1,6 +1,5 @@
 import { config as loadEnv } from 'dotenv';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
-import { homedir } from 'os';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { loadAllMCPConfigs, loadAllProviderConfigs, } from '../config/mcp-config-loader.js';
@@ -38,14 +37,6 @@ export function getClosestConfigFile(fileName) {
                 confDirMap[fileName] = cwdPath; // nosemgrep
                 return cwdPath; // nosemgrep
             }
-            // Next lets check the $HOME for a hidden file. This should only be for
-            // legacy support
-            const homePath = join(homedir(), `.${fileName}`); // nosemgrep
-            if (existsSync(homePath)) {
-                // nosemgrep
-                confDirMap[fileName] = homePath; // nosemgrep
-                return homePath; // nosemgrep
-            }
         }
         // Last, lets look for an user level config.
         // If the file doesn't exist, create it
@@ -130,12 +121,6 @@ function loadAutoCompactConfig() {
     if (globalConfig) {
         return globalConfig;
     }
-    // Fallback to home directory
-    const homePath = join(homedir(), '.agents.config.json');
-    const homeConfig = tryLoadAutoCompactFromPath(homePath, defaults);
-    if (homeConfig) {
-        return homeConfig;
-    }
     return defaults;
 }
 // Validate and clamp threshold to valid range (50-95)
@@ -150,6 +135,66 @@ function validateMode(mode) {
     }
     return 'conservative';
 }
+// Try to load session config from a specific path
+// Returns the config if found and valid, null otherwise
+function tryLoadSessionsFromPath(configPath, defaults) {
+    if (!existsSync(configPath)) {
+        return null;
+    }
+    try {
+        const rawData = readFileSync(configPath, 'utf-8');
+        const config = JSON.parse(rawData);
+        const sessions = config.nanocoder?.sessions;
+        if (sessions && typeof sessions === 'object') {
+            const normalizeSessionNumber = (value, min, fallback) => {
+                if (typeof value === 'number' && Number.isFinite(value)) {
+                    return Math.max(min, value);
+                }
+                return fallback;
+            };
+            return {
+                autoSave: sessions.autoSave !== undefined
+                    ? Boolean(sessions.autoSave)
+                    : defaults.autoSave,
+                saveInterval: normalizeSessionNumber(sessions.saveInterval, 1000, // Minimum 1 second
+                defaults.saveInterval ?? 30000),
+                maxSessions: normalizeSessionNumber(sessions.maxSessions, 1, defaults.maxSessions ?? 100),
+                maxMessages: normalizeSessionNumber(sessions.maxMessages, 1, defaults.maxMessages ?? 1000),
+                retentionDays: normalizeSessionNumber(sessions.retentionDays, 1, defaults.retentionDays ?? 30),
+                directory: sessions.directory || defaults.directory,
+            };
+        }
+    }
+    catch (error) {
+        logError(`Failed to load session config from ${configPath}: ${String(error)}`);
+    }
+    return null;
+}
+// Load session configuration and Returns default config if not specified
+function loadSessionConfig() {
+    const defaults = {
+        autoSave: true,
+        saveInterval: 30000, // 30 seconds
+        maxSessions: 100,
+        maxMessages: 1000,
+        retentionDays: 30,
+        directory: '',
+    };
+    // Try to load from project-level config first
+    const projectConfigPath = join(process.cwd(), 'agents.config.json');
+    const projectConfig = tryLoadSessionsFromPath(projectConfigPath, defaults);
+    if (projectConfig) {
+        return projectConfig;
+    }
+    // Try global config
+    const configDir = getConfigPath();
+    const globalConfigPath = join(configDir, 'agents.config.json');
+    const globalConfig = tryLoadSessionsFromPath(globalConfigPath, defaults);
+    if (globalConfig) {
+        return globalConfig;
+    }
+    return defaults;
+}
 // Function to load app configuration from agents.config.json if it exists
 function loadAppConfig() {
     // Load providers from the new hierarchical configuration system
@@ -159,10 +204,13 @@ function loadAppConfig() {
     const mcpServers = mcpServersWithSource.map(item => item.server);
     // Load auto-compact configuration
     const autoCompact = loadAutoCompactConfig();
+    // Load session configuration
+    const sessions = loadSessionConfig();
     return {
         providers,
         mcpServers,
         autoCompact,
+        sessions,
     };
 }
 let _appConfig = null;
@@ -176,12 +224,6 @@ export function getAppConfig() {
     }
     return _appConfig;
 }
-// Legacy export for backward compatibility - use a getter
-export const appConfig = new Proxy({}, {
-    get(_target, prop) {
-        return getAppConfig()[prop];
-    },
-});
 // Function to reload the app configuration (useful after config file changes)
 export function reloadAppConfig() {
     _appConfig = loadAppConfig();
@@ -199,12 +241,6 @@ export function getColors() {
     }
     return cachedColors;
 }
-// Legacy export for backwards compatibility - use a getter to avoid circular dependency
-export const colors = new Proxy({}, {
-    get(_target, prop) {
-        return getColors()[prop];
-    },
-});
 // Get the package root directory (where this module is installed)
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"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"}

package/dist/config/mcp-config-loader.d.ts

@@ -1,5 +1,5 @@
 import type { MCPServerConfig, ProviderConfig } from '../types/config.js';
-export type ConfigSource = 'project' | 'global';
+export type ConfigSource = 'project' | 'global' | 'env';
 export interface MCPServerWithSource {
     server: MCPServerConfig;
     source: ConfigSource;
@@ -10,7 +10,6 @@ export interface MCPServerWithSource {
 export declare function loadProjectMCPConfig(): MCPServerWithSource[];
 /**
  * Load global MCP configuration from ~/.config/nanocoder/.mcp.json
- * Falls back to agents.config.json with deprecation warning
  */
 export declare function loadGlobalMCPConfig(): MCPServerWithSource[];
 /**
@@ -18,7 +17,7 @@ export declare function loadGlobalMCPConfig(): MCPServerWithSource[];
  * ALL servers from both locations are loaded (project servers shown first)
  * No overriding - each unique server is preserved
  */
-export declare function mergeMCPConfigs(projectServers: MCPServerWithSource[], globalServers: MCPServerWithSource[]): MCPServerWithSource[];
+export declare function mergeMCPConfigs(projectServers: MCPServerWithSource[], globalServers: MCPServerWithSource[], envServers?: MCPServerWithSource[]): MCPServerWithSource[];
 /**
  * Load all MCP configurations with proper hierarchy and merging
  */

package/dist/config/mcp-config-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-config-loader.d.ts","sourceRoot":"","sources":["../../source/config/mcp-config-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAIpE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;CACrB;AA0ED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,mBAAmB,EAAE,CA4C5D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,mBAAmB,EAAE,CA0D3D;AAuED;;;;GAIG;AACH,wBAAgB,eAAe,CAC9B,cAAc,EAAE,mBAAmB,EAAE,EACrC,aAAa,EAAE,mBAAmB,EAAE,GAClC,mBAAmB,EAAE,CAgBvB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,mBAAmB,EAAE,CAOzD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,cAAc,EAAE,CAqBzD"}
+{"version":3,"file":"mcp-config-loader.d.ts","sourceRoot":"","sources":["../../source/config/mcp-config-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAIpE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAExD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;CACrB;AAmDD;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,mBAAmB,EAAE,CA0B5D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,mBAAmB,EAAE,CA2B3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC9B,cAAc,EAAE,mBAAmB,EAAE,EACrC,aAAa,EAAE,mBAAmB,EAAE,EACpC,UAAU,GAAE,mBAAmB,EAAO,GACpC,mBAAmB,EAAE,CAuBvB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,mBAAmB,EAAE,CAQzD;AAmDD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,cAAc,EAAE,CA0BzD"}

package/dist/config/mcp-config-loader.js

@@ -1,68 +1,47 @@
 import { existsSync, readFileSync } from 'fs';
-import { homedir } from 'os';
 import { join } from 'path';
 import { substituteEnvVars } from '../config/env-substitution.js';
 import { getConfigPath } from '../config/paths.js';
 import { logError } from '../utils/message-queue.js';
 /**
- * Show deprecation warning for array format MCP configuration
- */
-function showArrayFormatDeprecationWarning() {
-    logError('Warning: Array format for MCP servers is deprecated.');
-    logError('Please use object format: { "mcpServers": { "serverName": { ... } } }');
-}
-/**
- * Show deprecation warning for MCP servers in agents.config.json
- */
-function showAgentsConfigDeprecationWarning() {
-    const _configPath = join(getConfigPath(), '.mcp.json');
-    logError('Warning: MCP servers in agents.config.json are deprecated.');
-    logError(`Please migrate to ${_configPath}. See documentation for details.`);
-}
-/**
- * Parse MCP servers from config object, supporting both array and object formats
- * Converts array format to normalized server list with deprecation warning
+ * Parse MCP servers from .mcp.json config object.
+ * Only supports object format: { "mcpServers": { "serverName": { ... } } }
  */
 function parseMCPServers(config) {
     if (typeof config !== 'object' || config === null) {
         return null;
     }
     const configObj = config;
-    let mcpServers = null;
-    let usedArrayFormat = false;
-    // Direct array format at root
-    if (Array.isArray(config)) {
-        mcpServers = config;
-        usedArrayFormat = true;
-    }
-    else if ('nanocoder' in configObj &&
-        configObj.nanocoder &&
-        typeof configObj.nanocoder === 'object' &&
-        'mcpServers' in configObj.nanocoder &&
-        Array.isArray(configObj.nanocoder.mcpServers)) {
-        mcpServers = configObj.nanocoder
-            .mcpServers;
-        usedArrayFormat = true;
-    }
-    else if ('mcpServers' in configObj && Array.isArray(configObj.mcpServers)) {
-        mcpServers = configObj.mcpServers;
-        usedArrayFormat = true;
-    }
-    else if ('mcpServers' in configObj &&
+    if ('mcpServers' in configObj &&
         configObj.mcpServers &&
         typeof configObj.mcpServers === 'object' &&
         !Array.isArray(configObj.mcpServers)) {
-        // Claude Code format: { "serverName": { ...serverConfig } }
-        mcpServers = Object.entries(configObj.mcpServers).map(([name, serverConfig]) => ({
+        return Object.entries(configObj.mcpServers).map(([name, serverConfig]) => ({
             name,
             ...serverConfig,
         }));
     }
-    // Show deprecation warning if array format was used
-    if (usedArrayFormat && mcpServers && mcpServers.length > 0) {
-        showArrayFormatDeprecationWarning();
-    }
-    return mcpServers;
+    return null;
+}
+/**
+ * Map a raw parsed server object to MCPServerConfig
+ */
+function mapServerConfig(server) {
+    const typedServer = server;
+    return {
+        name: typedServer.name,
+        transport: typedServer.transport,
+        command: typedServer.command,
+        args: typedServer.args,
+        env: typedServer.env,
+        url: typedServer.url,
+        headers: typedServer.headers,
+        timeout: typedServer.timeout,
+        alwaysAllow: typedServer.alwaysAllow,
+        description: typedServer.description,
+        tags: typedServer.tags,
+        enabled: typedServer.enabled,
+    };
 }
 /**
  * Load project-level MCP configuration from .mcp.json
@@ -77,29 +56,11 @@ export function loadProjectMCPConfig() {
         const config = JSON.parse(rawData);
         const mcpServers = parseMCPServers(config);
         if (Array.isArray(mcpServers) && mcpServers.length > 0) {
-            // Apply environment variable substitution
             const processedServers = substituteEnvVars(mcpServers);
-            return processedServers.map((server) => {
-                const typedServer = server;
-                return {
-                    server: {
-                        name: typedServer.name,
-                        transport: typedServer.transport,
-                        command: typedServer.command,
-                        args: typedServer.args,
-                        env: typedServer.env,
-                        url: typedServer.url,
-                        headers: typedServer.headers,
-                        auth: typedServer.auth,
-                        timeout: typedServer.timeout,
-                        reconnect: typedServer.reconnect,
-                        description: typedServer.description,
-                        tags: typedServer.tags,
-                        enabled: typedServer.enabled,
-                    },
-                    source: 'project',
-                };
-            });
+            return processedServers.map((server) => ({
+                server: mapServerConfig(server),
+                source: 'project',
+            }));
         }
     }
     catch (error) {
@@ -109,113 +70,27 @@ export function loadProjectMCPConfig() {
 }
 /**
  * Load global MCP configuration from ~/.config/nanocoder/.mcp.json
- * Falls back to agents.config.json with deprecation warning
  */
 export function loadGlobalMCPConfig() {
     const configDir = getConfigPath();
-    const newConfigPath = join(configDir, '.mcp.json');
-    // First, check the new .mcp.json location
-    if (existsSync(newConfigPath)) {
-        try {
-            const rawData = readFileSync(newConfigPath, 'utf-8');
-            const config = JSON.parse(rawData);
-            const mcpServers = parseMCPServers(config);
-            if (Array.isArray(mcpServers) && mcpServers.length > 0) {
-                const processedServers = substituteEnvVars(mcpServers);
-                return processedServers.map((server) => {
-                    const typedServer = server;
-                    return {
-                        server: {
-                            name: typedServer.name,
-                            transport: typedServer.transport,
-                            command: typedServer.command,
-                            args: typedServer.args,
-                            env: typedServer.env,
-                            url: typedServer.url,
-                            headers: typedServer.headers,
-                            auth: typedServer.auth,
-                            timeout: typedServer.timeout,
-                            reconnect: typedServer.reconnect,
-                            description: typedServer.description,
-                            tags: typedServer.tags,
-                            enabled: typedServer.enabled,
-                        },
-                        source: 'global',
-                    };
-                });
-            }
-        }
-        catch (error) {
-            logError(`Failed to load MCP config from ${newConfigPath}: ${String(error)}`);
-        }
+    const configPath = join(configDir, '.mcp.json');
+    if (!existsSync(configPath)) {
         return [];
     }
-    // Fallback to legacy agents.config.json with deprecation warning
-    const homePath = join(homedir(), '.agents.config.json');
-    if (existsSync(homePath)) {
-        return loadMCPConfigFromAgentsConfig(homePath);
-    }
-    const legacyConfigPath = join(configDir, 'agents.config.json');
-    if (existsSync(legacyConfigPath)) {
-        return loadMCPConfigFromAgentsConfig(legacyConfigPath);
-    }
-    return [];
-}
-/**
- * Load MCP config from legacy agents.config.json with deprecation warning
- */
-function loadMCPConfigFromAgentsConfig(filePath) {
     try {
-        const rawData = readFileSync(filePath, 'utf-8');
+        const rawData = readFileSync(configPath, 'utf-8');
         const config = JSON.parse(rawData);
-        let mcpServers = null;
-        let hasMcpServers = false;
-        if (config.nanocoder && Array.isArray(config.nanocoder.mcpServers)) {
-            mcpServers = config.nanocoder.mcpServers;
-            hasMcpServers = mcpServers !== null && mcpServers.length > 0;
-        }
-        else if (config.nanocoder &&
-            config.nanocoder.mcpServers &&
-            typeof config.nanocoder.mcpServers === 'object' &&
-            !Array.isArray(config.nanocoder.mcpServers)) {
-            // Claude Code format in agents.config.json
-            mcpServers = Object.entries(config.nanocoder.mcpServers).map(([name, serverConfig]) => ({
-                name,
-                ...serverConfig,
-            }));
-            hasMcpServers = mcpServers && mcpServers.length > 0;
-        }
-        // Show deprecation warning if MCP servers found in agents.config.json
-        if (hasMcpServers) {
-            showAgentsConfigDeprecationWarning();
-        }
+        const mcpServers = parseMCPServers(config);
         if (Array.isArray(mcpServers) && mcpServers.length > 0) {
             const processedServers = substituteEnvVars(mcpServers);
-            return processedServers.map((server) => {
-                const typedServer = server;
-                return {
-                    server: {
-                        name: typedServer.name,
-                        transport: typedServer.transport,
-                        command: typedServer.command,
-                        args: typedServer.args,
-                        env: typedServer.env,
-                        url: typedServer.url,
-                        headers: typedServer.headers,
-                        auth: typedServer.auth,
-                        timeout: typedServer.timeout,
-                        reconnect: typedServer.reconnect,
-                        description: typedServer.description,
-                        tags: typedServer.tags,
-                        enabled: typedServer.enabled,
-                    },
-                    source: 'global',
-                };
-            });
+            return processedServers.map((server) => ({
+                server: mapServerConfig(server),
+                source: 'global',
+            }));
         }
     }
     catch (error) {
-        logError(`Failed to load MCP config from ${filePath}: ${String(error)}`);
+        logError(`Failed to load MCP config from ${configPath}: ${String(error)}`);
     }
     return [];
 }
@@ -224,13 +99,19 @@ function loadMCPConfigFromAgentsConfig(filePath) {
  * ALL servers from both locations are loaded (project servers shown first)
  * No overriding - each unique server is preserved
  */
-export function mergeMCPConfigs(projectServers, globalServers) {
+export function mergeMCPConfigs(projectServers, globalServers, envServers = []) {
     const serverMap = new Map();
-    // Add project servers first (displayed first in UI)
+    // Add env servers first (highest priority, displayed first in UI)
+    for (const envServer of envServers) {
+        serverMap.set(envServer.server.name, envServer);
+    }
+    // Add project servers next
     for (const projectServer of projectServers) {
-        serverMap.set(projectServer.server.name, projectServer);
+        if (!serverMap.has(projectServer.server.name)) {
+            serverMap.set(projectServer.server.name, projectServer);
+        }
     }
-    // Add global servers (only if not already added from project)
+    // Add global servers (only if not already added from project or env)
     for (const globalServer of globalServers) {
         if (!serverMap.has(globalServer.server.name)) {
             serverMap.set(globalServer.server.name, globalServer);
@@ -245,7 +126,49 @@ export function loadAllMCPConfigs() {
     const projectServers = loadProjectMCPConfig();
     // Skip loading global servers in test environment to allow test isolation
     const globalServers = process.env.NODE_ENV === 'test' ? [] : loadGlobalMCPConfig();
-    return mergeMCPConfigs(projectServers, globalServers);
+    const envServers = loadEnvMCPConfigs();
+    return mergeMCPConfigs(projectServers, globalServers, envServers);
+}
+/**
+ * Load MCP configuration from environment variables (highest precedence)
+ */
+function loadEnvMCPConfigs() {
+    let rawData = process.env.NANOCODER_MCPSERVERS;
+    if (!rawData && process.env.NANOCODER_MCPSERVERS_FILE) {
+        if (existsSync(process.env.NANOCODER_MCPSERVERS_FILE)) {
+            try {
+                rawData = readFileSync(process.env.NANOCODER_MCPSERVERS_FILE, 'utf-8');
+            }
+            catch (error) {
+                logError(`Failed to read NANOCODER_MCPSERVERS_FILE at ${process.env.NANOCODER_MCPSERVERS_FILE}: ${String(error)}`);
+            }
+        }
+    }
+    if (!rawData) {
+        return [];
+    }
+    try {
+        const config = JSON.parse(rawData);
+        // Accept direct array format (env vars) or standard .mcp.json wrapper format
+        let servers = null;
+        if (Array.isArray(config)) {
+            servers = config;
+        }
+        else {
+            servers = parseMCPServers(config);
+        }
+        if (Array.isArray(servers) && servers.length > 0) {
+            const processedServers = substituteEnvVars(servers);
+            return processedServers.map((server) => ({
+                server: mapServerConfig(server),
+                source: 'env',
+            }));
+        }
+    }
+    catch (error) {
+        logError(`Failed to parse MCP configs from environment: ${String(error)}`);
+    }
+    return [];
 }
 /**
  * Load provider configurations from all available levels (project and global)
@@ -255,17 +178,21 @@ export function loadAllProviderConfigs() {
     const projectProviders = loadProjectProviderConfigs();
     // Skip loading global providers in test environment to allow test isolation
     const globalProviders = process.env.NODE_ENV === 'test' ? [] : loadGlobalProviderConfigs();
-    // Merge providers with project providers taking precedence over global ones
-    // If a provider with the same name exists in both, project version wins
+    const envProviders = loadEnvProviderConfigs();
+    // Merge providers with env providers taking highest precedence
     const providerMap = new Map();
-    // Add global providers first (lower priority)
+    // Add global providers first (lowest priority)
     for (const provider of globalProviders) {
         providerMap.set(provider.name, provider);
     }
-    // Add project providers (higher priority) - they will override global ones
+    // Add project providers (medium priority) - overrides global ones
     for (const provider of projectProviders) {
         providerMap.set(provider.name, provider);
     }
+    // Add env providers last (highest priority) - overrides all
+    for (const provider of envProviders) {
+        providerMap.set(provider.name, provider);
+    }
     return Array.from(providerMap.values());
 }
 /**
@@ -301,15 +228,7 @@ function loadProjectProviderConfigs() {
 function loadGlobalProviderConfigs() {
     // Use the same path resolution logic as getClosestConfigFile
     const configDir = getConfigPath();
-    // Check the $HOME for a hidden file. This should only be for legacy support
-    const homePath = join(homedir(), '.agents.config.json');
-    if (existsSync(homePath)) {
-        const providers = loadProviderConfigFromFile(homePath);
-        if (providers.length > 0) {
-            return providers;
-        }
-    }
-    // Next, lets look for a user level config.
+    // Look for a user level config.
     const configPath = join(configDir, 'agents.config.json');
     if (existsSync(configPath)) {
         return loadProviderConfigFromFile(configPath);
@@ -338,4 +257,40 @@ function loadProviderConfigFromFile(filePath) {
     }
     return [];
 }
+/**
+ * Load provider configurations from environment variables
+ */
+function loadEnvProviderConfigs() {
+    let rawData = process.env.NANOCODER_PROVIDERS;
+    if (!rawData && process.env.NANOCODER_PROVIDERS_FILE) {
+        if (existsSync(process.env.NANOCODER_PROVIDERS_FILE)) {
+            try {
+                rawData = readFileSync(process.env.NANOCODER_PROVIDERS_FILE, 'utf-8');
+            }
+            catch (error) {
+                logError(`Failed to read NANOCODER_PROVIDERS_FILE at ${process.env.NANOCODER_PROVIDERS_FILE}: ${String(error)}`);
+            }
+        }
+    }
+    if (!rawData) {
+        return [];
+    }
+    try {
+        const config = JSON.parse(rawData);
+        // Accept direct array format or standard agents.config.json wrapper format
+        if (Array.isArray(config)) {
+            return substituteEnvVars(config);
+        }
+        else if (config.nanocoder && Array.isArray(config.nanocoder.providers)) {
+            return substituteEnvVars(config.nanocoder.providers);
+        }
+        else if (Array.isArray(config.providers)) {
+            return substituteEnvVars(config.providers);
+        }
+    }
+    catch (error) {
+        logError(`Failed to parse provider configs from environment: ${String(error)}`);
+    }
+    return [];
+}
 //# sourceMappingURL=mcp-config-loader.js.map