@1mcp/agent 0.16.0 → 0.17.0

package/README.md

@@ -11,6 +11,7 @@ A unified Model Context Protocol server implementation that aggregates multiple
 - [Overview](#overview)
 - [Features](#features)
 - [Quick Start](#quick-start)
+- [Commands](#commands)
 - [Prerequisites](#prerequisites)
 - [Usage](#usage)
 - [Docker](#docker)
@@ -35,6 +36,7 @@ A unified Model Context Protocol server implementation that aggregates multiple
 - **Simplified Configuration**: Simplifies configuration management across different AI assistants.
 - **Standardized Interaction**: Provides a standardized way for AI models to interact with external tools and resources.
 - **Dynamic Configuration**: Supports dynamic configuration reloading without server restart.
+- **Async Loading**: Optional asynchronous server loading with real-time capability updates via listChanged notifications.
 - **Graceful Shutdown**: Handles graceful shutdown and resource cleanup.
 - **Secure**: Includes comprehensive authentication and security features.
 - **Optimized**: Supports advanced filtering, pagination, and request optimization.
@@ -65,6 +67,37 @@ npx -y @1mcp/agent --config ~/Library/Application\ Support/Claude/claude_desktop
 
 3. Enjoy it!
 
+## Commands
+
+1MCP provides several commands to manage your MCP server configuration:
+
+### Core Commands
+
+- **`npx -y @1mcp/agent [serve]`** - Start the 1MCP server (default command)
+  - `--transport` - Choose transport type (stdio, http, sse)
+  - `--config` - Use specific config file
+  - `--port` - Change HTTP port
+
+### MCP Management
+
+- **`npx -y @1mcp/agent mcp add <name>`** - Add a new MCP server to configuration
+- **`npx -y @1mcp/agent mcp remove <name>`** - Remove an MCP server
+- **`npx -y @1mcp/agent mcp list`** - List all configured MCP servers
+- **`npx -y @1mcp/agent mcp status [name]`** - Show server status and details
+- **`npx -y @1mcp/agent mcp enable/disable <name>`** - Enable or disable servers
+- **`npx -y @1mcp/agent mcp update <name>`** - Update server configuration
+
+### App Integration
+
+- **`npx -y @1mcp/agent app consolidate`** - Consolidate configurations from other MCP apps
+- **`npx -y @1mcp/agent app discover`** - Discover MCP servers from installed applications
+- **`npx -y @1mcp/agent app list`** - List discovered applications
+- **`npx -y @1mcp/agent app status`** - Show consolidation status
+
+For detailed command usage, run: `1mcp <command> --help`
+
+Full documentation: [Commands Reference](https://docs.1mcp.app/commands/)
+
 ## Prerequisites
 
 - [Node.js](https://nodejs.org/) (version 21 or higher)
@@ -113,8 +146,10 @@ Available options:
 | `--session-storage-path`     | `ONE_MCP_SESSION_STORAGE_PATH`     | Custom session storage directory path (string)                                |            |
 | `--rate-limit-window`        | `ONE_MCP_RATE_LIMIT_WINDOW`        | OAuth rate limit window in minutes (number)                                   |     15     |
 | `--rate-limit-max`           | `ONE_MCP_RATE_LIMIT_MAX`           | Maximum requests per OAuth rate limit window (number)                         |    100     |
-| `--health-info-level`        | `ONE_MCP_HEALTH_INFO_LEVEL`        | Health endpoint information detail level ("full", "basic", "minimal")         | "minimal"  |
-| `--help`, `-h`               |                                    | Show help                                                                     |            |
+
+| `--enable-async-loading` | `ONE_MCP_ENABLE_ASYNC_LOADING` | Enable asynchronous MCP server loading(boolean) | false |
+| `--health-info-level` | `ONE_MCP_HEALTH_INFO_LEVEL` | Health endpoint information detail level ("full", "basic", "minimal") | "minimal" |
+| `--help`, `-h` | | Show help | |
 
 ## Docker
 

package/build/commands/app/backups.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Backups command - Manage and list backup files.
+ *
+ * Provides backup management functionality including listing,
+ * verification, and cleanup of old backup files.
+ */
+interface BackupsOptions {
+    'app-name'?: string;
+    cleanup?: number;
+    verify: boolean;
+}
+/**
+ * Main backups command handler
+ */
+export declare function backupsCommand(options: BackupsOptions): Promise<void>;
+export {};
+//# sourceMappingURL=backups.d.ts.map

package/build/commands/app/backups.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backups.d.ts","sourceRoot":"","sources":["../../../src/commands/app/backups.ts"],"names":[],"mappings":"AAQA;;;;;GAKG;AAEH,UAAU,cAAc;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3E"}

package/build/commands/app/backups.js

@@ -0,0 +1,162 @@
+import { listAppBackups, cleanupOldBackups, verifyBackupIntegrity, findBackupByMetaPath, } from '../../utils/backupManager.js';
+import { getAppPreset } from '../../utils/appPresets.js';
+/**
+ * Main backups command handler
+ */
+export async function backupsCommand(options) {
+    console.log('💾 MCP Configuration Backup Management\n');
+    // Cleanup mode
+    if (options.cleanup !== undefined) {
+        await cleanupBackups(options.cleanup);
+        return;
+    }
+    // List and optionally verify backups
+    await listBackupsWithDetails(options['app-name'], options.verify);
+}
+/**
+ * List backups with detailed information
+ */
+async function listBackupsWithDetails(appName, verify = false) {
+    const backups = listAppBackups(appName);
+    if (backups.length === 0) {
+        if (appName) {
+            console.log(`📭 No backups found for ${appName}.`);
+        }
+        else {
+            console.log('📭 No backups found.');
+        }
+        console.log('\n💡 Backups are created automatically during consolidation.');
+        return;
+    }
+    if (appName) {
+        const preset = getAppPreset(appName);
+        console.log(`📋 Backups for ${preset?.displayName || appName}:\n`);
+    }
+    else {
+        console.log('📋 All Available Backups:\n');
+    }
+    // Group by application
+    const groupedBackups = backups.reduce((groups, backup) => {
+        if (!groups[backup.app]) {
+            groups[backup.app] = [];
+        }
+        groups[backup.app].push(backup);
+        return groups;
+    }, {});
+    let totalSize = 0;
+    let verifiedCount = 0;
+    let corruptedCount = 0;
+    for (const [app, appBackups] of Object.entries(groupedBackups)) {
+        const preset = getAppPreset(app);
+        console.log(`📱 ${preset?.displayName || app} (${app}):`);
+        for (const backup of appBackups) {
+            const backupInfo = findBackupByMetaPath(backup.metaPath);
+            console.log(`   🕐 ${backup.age} - ${backup.operation} operation`);
+            console.log(`      📁 ${backup.backupPath}`);
+            console.log(`      🔧 ${backup.serverCount} servers backed up`);
+            if (backupInfo) {
+                const fileSizeKB = Math.round(backupInfo.metadata.fileSize / 1024);
+                totalSize += backupInfo.metadata.fileSize;
+                console.log(`      📊 Size: ${fileSizeKB} KB`);
+                // Verify integrity if requested
+                if (verify) {
+                    const isValid = verifyBackupIntegrity(backupInfo);
+                    if (isValid) {
+                        console.log(`      ✅ Integrity: Valid`);
+                        verifiedCount++;
+                    }
+                    else {
+                        console.log(`      ❌ Integrity: Corrupted`);
+                        corruptedCount++;
+                    }
+                }
+            }
+            console.log(`      📝 Metadata: ${backup.metaPath}`);
+            console.log();
+        }
+    }
+    // Summary
+    const totalSizeMB = Math.round((totalSize / (1024 * 1024)) * 100) / 100;
+    console.log('📊 Backup Summary:');
+    console.log(`   📦 Total backups: ${backups.length}`);
+    console.log(`   📱 Applications: ${Object.keys(groupedBackups).length}`);
+    console.log(`   💽 Total size: ${totalSizeMB} MB`);
+    if (verify) {
+        console.log(`   ✅ Verified: ${verifiedCount}`);
+        if (corruptedCount > 0) {
+            console.log(`   ❌ Corrupted: ${corruptedCount}`);
+        }
+    }
+    // Show oldest and newest
+    if (backups.length > 1) {
+        const oldest = backups[backups.length - 1];
+        const newest = backups[0];
+        console.log(`   🕐 Oldest: ${oldest.age} (${getAppPreset(oldest.app)?.displayName || oldest.app})`);
+        console.log(`   🕐 Newest: ${newest.age} (${getAppPreset(newest.app)?.displayName || newest.app})`);
+    }
+    // Usage recommendations
+    console.log('\n💡 Management Commands:');
+    console.log('   📋 List app backups: npx @1mcp/agent app backups <app-name>');
+    console.log('   🔍 Verify integrity: npx @1mcp/agent app backups --verify');
+    console.log('   🧹 Cleanup old: npx @1mcp/agent app backups --cleanup=30');
+    console.log('   🔄 Restore: npx @1mcp/agent app restore <app-name>');
+    if (corruptedCount > 0) {
+        console.log('\n⚠️ Warning: Some backups failed integrity verification.');
+        console.log('   Consider creating fresh backups for affected applications.');
+    }
+}
+/**
+ * Cleanup old backups
+ */
+async function cleanupBackups(maxAgeDays) {
+    console.log(`🧹 Cleaning up backups older than ${maxAgeDays} days...\n`);
+    if (maxAgeDays < 1) {
+        console.error('❌ Invalid age: must be at least 1 day.');
+        process.exit(1);
+    }
+    // Show what will be deleted first
+    const allBackups = listAppBackups();
+    const cutoffTime = Date.now() - maxAgeDays * 24 * 60 * 60 * 1000;
+    const oldBackups = allBackups.filter((backup) => backup.timestamp < cutoffTime);
+    if (oldBackups.length === 0) {
+        console.log(`✅ No backups older than ${maxAgeDays} days found.`);
+        return;
+    }
+    console.log(`📋 Found ${oldBackups.length} backups to delete:\n`);
+    const groupedOld = oldBackups.reduce((groups, backup) => {
+        if (!groups[backup.app]) {
+            groups[backup.app] = [];
+        }
+        groups[backup.app].push(backup);
+        return groups;
+    }, {});
+    Object.entries(groupedOld).forEach(([app, appBackups]) => {
+        const preset = getAppPreset(app);
+        console.log(`📱 ${preset?.displayName || app}: ${appBackups.length} backups`);
+        appBackups.forEach((backup) => {
+            console.log(`   🕐 ${backup.age} - ${backup.operation}`);
+        });
+    });
+    // Perform cleanup
+    console.log('\n🗑️ Deleting old backups...');
+    const deletedCount = cleanupOldBackups(maxAgeDays);
+    if (deletedCount > 0) {
+        console.log(`✅ Successfully deleted ${deletedCount} old backups.`);
+        // Show remaining backups
+        const remainingBackups = listAppBackups();
+        console.log(`📦 Remaining backups: ${remainingBackups.length}`);
+        if (remainingBackups.length > 0) {
+            const totalSize = remainingBackups.reduce((sum, backup) => {
+                const backupInfo = findBackupByMetaPath(backup.metaPath);
+                return sum + (backupInfo?.metadata.fileSize || 0);
+            }, 0);
+            const totalSizeMB = Math.round((totalSize / (1024 * 1024)) * 100) / 100;
+            console.log(`💽 Total size: ${totalSizeMB} MB`);
+        }
+    }
+    else {
+        console.log('⚠️ No backups were deleted (they may have been removed already).');
+    }
+    console.log('\n💡 To see remaining backups: npx @1mcp/agent app backups');
+}
+//# sourceMappingURL=backups.js.map

package/build/commands/app/backups.js.map

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

package/build/commands/app/consolidate.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Consolidate command - Main consolidation logic for MCP servers.
+ *
+ * Extracts MCP servers from desktop applications and consolidates
+ * them into 1mcp with safe backup and validation.
+ */
+interface ConsolidateOptions {
+    'app-name': string[];
+    url?: string;
+    'dry-run': boolean;
+    yes: boolean;
+    'manual-only': boolean;
+    'backup-only': boolean;
+    force: boolean;
+}
+/**
+ * Main consolidate command handler
+ */
+export declare function consolidateCommand(options: ConsolidateOptions): Promise<void>;
+export {};
+//# sourceMappingURL=consolidate.d.ts.map

package/build/commands/app/consolidate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"consolidate.d.ts","sourceRoot":"","sources":["../../../src/commands/app/consolidate.ts"],"names":[],"mappings":"AAyBA;;;;;GAKG;AAEH,UAAU,kBAAkB;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,OAAO,CAAC;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAWD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2GnF"}

package/build/commands/app/consolidate.js

@@ -0,0 +1,383 @@
+import fs from 'fs';
+import path from 'path';
+import readline from 'readline';
+import { getServer1mcpUrl, validateServer1mcpUrl } from '../../utils/urlDetection.js';
+import { discoverAppConfigs, handleMultipleConfigs, extractAndFilterServers, generateAppConfig, checkConsolidationStatus, } from '../../utils/appDiscovery.js';
+import { isAppSupported, isAppConfigurable, generateManualInstructions, getAppPreset, showPlatformWarningIfNeeded, } from '../../utils/appPresets.js';
+import { validateOperation, generateOperationPreview } from '../../utils/validationHelpers.js';
+import { createBackup, withFileLock } from '../../utils/backupManager.js';
+import { getAppBackupDir } from '../../constants.js';
+import { McpConfigManager } from '../../config/mcpConfigManager.js';
+import { setServer } from '../mcp/utils/configUtils.js';
+/**
+ * Main consolidate command handler
+ */
+export async function consolidateCommand(options) {
+    const appNames = options['app-name'];
+    // Check if app names were provided
+    if (!appNames || appNames.length === 0) {
+        console.error('❌ Error: No application names provided.');
+        console.log('Please specify at least one application to consolidate.');
+        console.log('Example: npx @1mcp/agent app consolidate claude-desktop');
+        console.log('Use "npx @1mcp/agent app list" to see supported applications.');
+        process.exit(1);
+    }
+    // Show platform warning if needed
+    showPlatformWarningIfNeeded();
+    console.log('🔍 Starting MCP server consolidation...\n');
+    // Validate all app names first
+    const invalidApps = appNames.filter((app) => !isAppSupported(app));
+    if (invalidApps.length > 0) {
+        console.error(`❌ Unsupported applications: ${invalidApps.join(', ')}`);
+        console.log('Use "npx @1mcp/agent app list" to see supported applications.');
+        process.exit(1);
+    }
+    // Get 1mcp server URL
+    const serverUrl = await getServer1mcpUrl(options.url);
+    console.log(`🔗 Using 1mcp server: ${serverUrl}`);
+    // Validate server connectivity (unless force mode)
+    if (!options.force) {
+        const connectivityCheck = await validateServer1mcpUrl(serverUrl);
+        if (!connectivityCheck.valid) {
+            console.error(`❌ Cannot connect to 1mcp server: ${connectivityCheck.error}`);
+            console.log('Make sure the 1mcp server is running or use --force to skip validation.');
+            process.exit(1);
+        }
+        console.log('✅ 1mcp server connectivity verified\n');
+    }
+    const results = [];
+    // Process each app
+    for (const appName of appNames) {
+        console.log(`\n🔍 Processing ${getAppPreset(appName)?.displayName || appName}...`);
+        try {
+            const result = await consolidateApp(appName, serverUrl, options);
+            results.push(result);
+            // Display result
+            if (result.status === 'success') {
+                console.log(`✅ ${result.message}`);
+                if (result.serversImported !== undefined) {
+                    console.log(`📋 Imported ${result.serversImported} MCP servers`);
+                }
+                if (result.backupPath) {
+                    console.log(`💾 Backup created: ${result.backupPath}`);
+                }
+            }
+            else if (result.status === 'manual') {
+                console.log(`🔧 ${result.message}`);
+                if (result.manualInstructions) {
+                    console.log(result.manualInstructions);
+                }
+            }
+            else if (result.status === 'skipped') {
+                console.log(`⏭️ ${result.message}`);
+            }
+            else {
+                console.error(`❌ ${result.message}`);
+            }
+        }
+        catch (error) {
+            const errorResult = {
+                app: appName,
+                status: 'failed',
+                message: `Failed to consolidate ${appName}: ${error.message}`,
+            };
+            results.push(errorResult);
+            console.error(`❌ ${errorResult.message}`);
+        }
+    }
+    // Final summary
+    console.log('\n' + '='.repeat(60));
+    console.log('📊 Consolidation Summary:');
+    const successful = results.filter((r) => r.status === 'success');
+    const manual = results.filter((r) => r.status === 'manual');
+    const failed = results.filter((r) => r.status === 'failed');
+    const skipped = results.filter((r) => r.status === 'skipped');
+    console.log(`✅ Successful: ${successful.length}`);
+    console.log(`🔧 Manual setup required: ${manual.length}`);
+    console.log(`⏭️ Skipped: ${skipped.length}`);
+    console.log(`❌ Failed: ${failed.length}`);
+    if (successful.length > 0) {
+        console.log('\n🔄 Restart the following applications to use consolidated configuration:');
+        successful.forEach((result) => {
+            console.log(`   - ${getAppPreset(result.app)?.displayName || result.app}`);
+        });
+        console.log('\n💡 To undo consolidation, use:');
+        console.log('   npx @1mcp/agent app restore <app-name>');
+    }
+    if (failed.length > 0) {
+        process.exit(1);
+    }
+}
+/**
+ * Consolidate a single application
+ */
+async function consolidateApp(appName, serverUrl, options) {
+    // Check if app is already consolidated (unless force mode)
+    if (!options.force) {
+        const consolidationStatus = await checkConsolidationStatus(appName);
+        if (consolidationStatus.isConsolidated) {
+            return {
+                app: appName,
+                status: 'skipped',
+                message: `Already consolidated to ${consolidationStatus.consolidatedUrl}`,
+                serversImported: 0,
+            };
+        }
+    }
+    // Check if app is configurable
+    if (!isAppConfigurable(appName)) {
+        // Manual setup required
+        const instructions = generateManualInstructions(appName, serverUrl);
+        return {
+            app: appName,
+            status: 'manual',
+            message: `${getAppPreset(appName)?.displayName || appName} requires manual configuration`,
+            manualInstructions: instructions,
+        };
+    }
+    // Manual-only mode
+    if (options['manual-only']) {
+        const instructions = generateManualInstructions(appName, serverUrl);
+        return {
+            app: appName,
+            status: 'manual',
+            message: `Manual setup instructions for ${getAppPreset(appName)?.displayName || appName}`,
+            manualInstructions: instructions,
+        };
+    }
+    // Discover configurations
+    const discovery = await discoverAppConfigs(appName);
+    if (discovery.configs.length === 0) {
+        return {
+            app: appName,
+            status: 'skipped',
+            message: `No configuration files found for ${getAppPreset(appName)?.displayName || appName}`,
+        };
+    }
+    // Handle multiple configs
+    const strategy = handleMultipleConfigs(discovery);
+    if (strategy.action === 'none') {
+        return {
+            app: appName,
+            status: 'skipped',
+            message: `No valid configuration found for ${getAppPreset(appName)?.displayName || appName}`,
+        };
+    }
+    let targetConfig = strategy.target;
+    // If multiple configs and not in yes mode, ask user to choose
+    if (strategy.action === 'choose' && !options.yes && !options['dry-run']) {
+        targetConfig = await promptUserChoice(strategy.options);
+    }
+    // Extract servers
+    const servers = extractAndFilterServers(targetConfig.content, getAppPreset(appName)?.configFormat);
+    if (servers.length === 0 && !options.force) {
+        return {
+            app: appName,
+            status: 'skipped',
+            message: `No MCP servers found in ${getAppPreset(appName)?.displayName || appName} configuration`,
+        };
+    }
+    // Validate operation
+    if (!options.force) {
+        const validation = await validateOperation(targetConfig.path, targetConfig.content, serverUrl);
+        if (!validation.canProceed) {
+            const errors = [
+                ...validation.configValidation.errors,
+                ...validation.permissionValidation.errors,
+                ...validation.connectivityValidation.errors,
+            ];
+            throw new Error(`Validation failed: ${errors.join(', ')}`);
+        }
+    }
+    // Generate preview with correct backup path
+    const timestamp = Date.now();
+    const dateStr = new Date(timestamp).toISOString().replace(/[:.-]/g, '').slice(0, 15); // YYYYMMDDTHHMMSS
+    const appBackupDir = getAppBackupDir(appName);
+    const backupFileName = `${dateStr}_consolidate.backup`;
+    const backupPath = path.join(appBackupDir, backupFileName);
+    const preview = generateOperationPreview(appName, targetConfig.path, servers.map((s) => s.name), serverUrl, backupPath);
+    // Show preview and get confirmation
+    if (!options.yes && !options['dry-run']) {
+        const confirmed = await confirmOperation(preview);
+        if (!confirmed) {
+            return {
+                app: appName,
+                status: 'skipped',
+                message: `Consolidation cancelled by user for ${getAppPreset(appName)?.displayName || appName}`,
+            };
+        }
+    }
+    // Dry run mode - just show what would happen
+    if (options['dry-run']) {
+        console.log('\n📋 Dry Run Preview:');
+        console.log(`App: ${getAppPreset(appName)?.displayName || appName}`);
+        console.log(`Config: ${targetConfig.path}`);
+        console.log(`Servers to import: ${servers.map((s) => s.name).join(', ') || 'none'}`);
+        console.log(`Replacement URL: ${serverUrl}`);
+        console.log(`Backup would be created: ${backupPath}`);
+        return {
+            app: appName,
+            status: 'success',
+            message: `Dry run completed for ${getAppPreset(appName)?.displayName || appName}`,
+            serversImported: servers.length,
+        };
+    }
+    // Create backup
+    const backup = createBackup(targetConfig.path, appName, 'consolidate', servers.length);
+    // Backup-only mode
+    if (options['backup-only']) {
+        return {
+            app: appName,
+            status: 'success',
+            message: `Backup created for ${getAppPreset(appName)?.displayName || appName}`,
+            backupPath: backup.backupPath,
+        };
+    }
+    // Perform consolidation with file locking
+    await withFileLock(targetConfig.path, async () => {
+        try {
+            // Import servers to 1mcp
+            if (servers.length > 0) {
+                await importServersTo1mcp(servers);
+            }
+            // Generate new config
+            const newConfig = generateAppConfig(appName, serverUrl);
+            // Write new configuration
+            fs.writeFileSync(targetConfig.path, JSON.stringify(newConfig, null, 2));
+        }
+        catch (error) {
+            // Rollback on failure
+            fs.copyFileSync(backup.backupPath, backup.originalPath);
+            throw error;
+        }
+    });
+    return {
+        app: appName,
+        status: 'success',
+        message: `Successfully consolidated ${getAppPreset(appName)?.displayName || appName}`,
+        serversImported: servers.length,
+        backupPath: backup.backupPath,
+    };
+}
+/**
+ * Convert MCPServerConfig to MCPServerParams format
+ */
+function convertToMCPServerParams(server) {
+    const params = {
+        disabled: false,
+    };
+    // Determine transport type and set appropriate parameters
+    if (server.command) {
+        // Stdio transport
+        params.type = 'stdio';
+        params.command = server.command;
+        if (server.args && server.args.length > 0) {
+            params.args = server.args;
+        }
+        if (server.env) {
+            params.env = server.env;
+        }
+    }
+    else if (server.url) {
+        // HTTP transport - determine if SSE or regular HTTP
+        if (server.url.includes('/sse') || server.url.includes('text/event-stream')) {
+            params.type = 'sse';
+        }
+        else {
+            params.type = 'http';
+        }
+        params.url = server.url;
+    }
+    else {
+        throw new Error(`Invalid server configuration: ${server.name} has neither command nor url`);
+    }
+    return params;
+}
+/**
+ * Import MCP servers to 1mcp configuration
+ */
+async function importServersTo1mcp(servers) {
+    const mcpConfig = McpConfigManager.getInstance();
+    // Get current transport config
+    const currentConfig = mcpConfig.getTransportConfig();
+    for (const server of servers) {
+        // Check if server already exists
+        if (currentConfig[server.name]) {
+            console.log(`⚠️ Server "${server.name}" already exists in 1mcp config - skipping`);
+            continue;
+        }
+        try {
+            // Convert to proper MCPServerParams format
+            const serverParams = convertToMCPServerParams(server);
+            // Add server to configuration
+            setServer(server.name, serverParams);
+            console.log(`✅ Imported server: ${server.name}`);
+            // Log what was imported
+            if (serverParams.type === 'stdio') {
+                console.log(`   Type: stdio`);
+                console.log(`   Command: ${serverParams.command}`);
+                if (serverParams.args)
+                    console.log(`   Args: ${serverParams.args.join(' ')}`);
+            }
+            else if (serverParams.type === 'http' || serverParams.type === 'sse') {
+                console.log(`   Type: ${serverParams.type}`);
+                console.log(`   URL: ${serverParams.url}`);
+            }
+        }
+        catch (error) {
+            console.error(`❌ Failed to import server "${server.name}": ${error.message}`);
+        }
+    }
+}
+/**
+ * Prompt user to choose from multiple configurations
+ */
+async function promptUserChoice(configs) {
+    console.log('\n📋 Multiple configurations found:');
+    configs.forEach((config, index) => {
+        console.log(`${index + 1}. ${config.path} (${config.level}, ${config.servers.length} servers)`);
+    });
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question('\nWhich configuration would you like to use? (number): ', (answer) => {
+            rl.close();
+            const choice = parseInt(answer, 10);
+            if (choice >= 1 && choice <= configs.length) {
+                resolve(configs[choice - 1]);
+            }
+            else {
+                console.log('Invalid choice, using first option.');
+                resolve(configs[0]);
+            }
+        });
+    });
+}
+/**
+ * Confirm operation with user
+ */
+async function confirmOperation(preview) {
+    console.log('\n📋 Operation Preview:');
+    console.log(`App: ${preview.app}`);
+    console.log(`Config: ${preview.configPath}`);
+    console.log(`Servers to import: ${preview.serversToImport.join(', ') || 'none'}`);
+    console.log(`Replacement URL: ${preview.replacementUrl}`);
+    console.log(`Backup will be created: ${preview.backupPath}`);
+    if (preview.risks.length > 0) {
+        console.log('\n⚠️ Potential Issues:');
+        preview.risks.forEach((risk) => console.log(`  - ${risk}`));
+    }
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question('\nAre you sure you want to proceed? (y/n): ', (answer) => {
+            rl.close();
+            resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+        });
+    });
+}
+//# sourceMappingURL=consolidate.js.map