fraim 2.0.176 → 2.0.179

package/dist/src/cli/commands/setup.js

@@ -44,8 +44,6 @@ const prompts_1 = __importDefault(require("prompts"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const auto_mcp_setup_1 = require("../setup/auto-mcp-setup");
-const provider_client_1 = require("../api/provider-client");
-const provider_prompts_1 = require("../setup/provider-prompts");
 const provider_registry_1 = require("../providers/provider-registry");
 const script_sync_utils_1 = require("../utils/script-sync-utils");
 function parseModeOption(mode) {
@@ -170,67 +168,15 @@ const promptForMode = async () => {
     }
     return response.mode;
 };
-/**
- * Sanitize a token by removing control characters that cause JSON serialization issues
- */
-const sanitizeToken = (token) => {
-    if (!token)
-        return token;
-    // Remove control characters (0x00-0x1F and 0x7F) that cause JSON escaping issues
-    // These characters are not valid in API tokens and are likely copy-paste artifacts
-    return token.replace(/[\x00-\x1F\x7F]/g, '');
-};
-/**
- * Sanitize all tokens in a ProviderTokens object
- */
-const sanitizeTokens = (tokens) => {
-    const sanitized = {};
-    Object.entries(tokens).forEach(([providerId, token]) => {
-        if (token) {
-            const originalToken = token;
-            const sanitizedToken = sanitizeToken(token);
-            if (originalToken !== sanitizedToken) {
-                console.log(chalk_1.default.yellow(`⚠️  Sanitized ${providerId} token: removed ${originalToken.length - sanitizedToken.length} control character(s)`));
-            }
-            sanitized[providerId] = sanitizedToken;
-        }
-    });
-    return sanitized;
-};
-const saveGlobalConfig = (fraimKey, mode, tokens, configs) => {
+const saveGlobalConfig = (fraimKey, mode) => {
     const globalConfigDir = (0, script_sync_utils_1.getUserFraimDir)();
     const globalConfigPath = path_1.default.join(globalConfigDir, 'config.json');
     if (!fs_1.default.existsSync(globalConfigDir)) {
         fs_1.default.mkdirSync(globalConfigDir, { recursive: true });
     }
-    // Read existing config to preserve any existing data
-    let existingConfig = {};
-    if (fs_1.default.existsSync(globalConfigPath)) {
-        try {
-            existingConfig = JSON.parse(fs_1.default.readFileSync(globalConfigPath, 'utf8'));
-        }
-        catch (e) {
-            // Ignore parse errors, will create new config
-        }
-    }
-    // Sanitize tokens before saving to prevent JSON serialization issues
-    const sanitizedTokens = sanitizeTokens(tokens);
-    // Merge provider configs (e.g., jiraConfig)
-    const providerConfigs = { ...(existingConfig.providerConfigs || {}) };
-    Object.entries(configs).forEach(([providerId, config]) => {
-        providerConfigs[`${providerId}Config`] = {
-            ...(providerConfigs[`${providerId}Config`] || {}),
-            ...config
-        };
-    });
     const config = {
         apiKey: fraimKey,
         mode: mode,
-        tokens: {
-            ...(existingConfig.tokens || {}),
-            ...sanitizedTokens
-        },
-        providerConfigs,
         configuredAt: new Date().toISOString(),
         userPreferences: {
             autoSync: true,
@@ -241,49 +187,6 @@ const saveGlobalConfig = (fraimKey, mode, tokens, configs) => {
     console.log(chalk_1.default.green('✅ Global FRAIM configuration saved'));
 };
 exports.saveGlobalConfig = saveGlobalConfig;
-// Parse CLI options into generic format using provider registry from server
-// Tokens/config are optional - will prompt if not provided
-const parseLegacyOptions = async (options, fraimKey) => {
-    const requestedProviders = [];
-    const providedTokens = {};
-    const providedConfigs = {};
-    // Use provider registry (with fallback) instead of direct client call
-    const { getAllProviderIds, getProviderConfigRequirements } = await Promise.resolve().then(() => __importStar(require('../providers/provider-registry')));
-    const providerIds = await getAllProviderIds();
-    // Dynamically check for provider flags from server registry
-    for (const providerId of providerIds) {
-        // Check for provider flag (e.g., --github)
-        if (options[providerId]) {
-            requestedProviders.push(providerId);
-        }
-        // Check for token option (e.g., --github-token)
-        const tokenKey = `${providerId}Token`;
-        if (options[tokenKey]) {
-            providedTokens[providerId] = options[tokenKey];
-        }
-        // Check for provider-specific config options
-        const configReqs = await getProviderConfigRequirements(providerId);
-        if (configReqs.length > 0) {
-            const config = {};
-            let hasAnyConfig = false;
-            configReqs.forEach(req => {
-                // Use custom CLI option name if provided, otherwise convert key to camelCase
-                const optionSuffix = req.cliOptionName
-                    ? req.cliOptionName.charAt(0).toUpperCase() + req.cliOptionName.slice(1)
-                    : req.key.charAt(0).toUpperCase() + req.key.slice(1);
-                const optionKey = `${providerId}${optionSuffix}`;
-                if (options[optionKey]) {
-                    config[req.key] = options[optionKey];
-                    hasAnyConfig = true;
-                }
-            });
-            if (hasAnyConfig) {
-                providedConfigs[providerId] = config;
-            }
-        }
-    }
-    return { requestedProviders, providedTokens, providedConfigs };
-};
 const runSetup = async (options) => {
     console.log(chalk_1.default.blue('🚀 Welcome to FRAIM! Let\'s get you set up.\n'));
     // Determine if this is an update (adding platforms to existing setup)
@@ -291,54 +194,27 @@ const runSetup = async (options) => {
     const isUpdate = fs_1.default.existsSync(globalConfigPath);
     let fraimKey;
     let mode;
-    const tokens = {};
-    const configs = {};
-    let requestedProviders = [];
-    let providedTokens = {};
-    let providedConfigs = {};
     if (isUpdate) {
-        // Update existing setup - add platforms
         console.log(chalk_1.default.blue('📝 Existing FRAIM configuration detected.\n'));
         try {
             const existingConfig = JSON.parse(fs_1.default.readFileSync(globalConfigPath, 'utf8'));
-            // Allow updating FRAIM key even without provider changes
             fraimKey = options.key || existingConfig.apiKey;
-            // Now we can parse options with the FRAIM key
-            const parsed = await parseLegacyOptions(options, fraimKey);
-            requestedProviders = parsed.requestedProviders;
-            providedTokens = parsed.providedTokens;
-            providedConfigs = parsed.providedConfigs;
-            // Check if this is just a key update or a provider update
+            mode = existingConfig.mode || 'integrated';
             const isKeyUpdate = options.key && options.key !== existingConfig.apiKey;
-            const isProviderUpdate = requestedProviders.length > 0;
-            // If no specific changes requested, offer interactive update
-            if (!isKeyUpdate && !isProviderUpdate) {
+            if (!isKeyUpdate) {
                 console.log(chalk_1.default.gray('   Current configuration:'));
-                console.log(chalk_1.default.gray(`   • Mode: ${existingConfig.mode || 'integrated'}`));
-                // Show existing tokens
-                const { getProvider } = await Promise.resolve().then(() => __importStar(require('../providers/provider-registry')));
-                if (existingConfig.tokens && Object.keys(existingConfig.tokens).length > 0) {
-                    const providerNames = await Promise.all(Object.keys(existingConfig.tokens).map(async (id) => {
-                        const provider = await getProvider(id);
-                        return provider?.displayName || id;
-                    }));
-                    console.log(chalk_1.default.gray(`   • Providers: ${providerNames.join(', ')}`));
-                }
-                else {
-                    console.log(chalk_1.default.gray('   • Providers: none'));
-                }
+                console.log(chalk_1.default.gray(`   • Mode: ${mode}`));
+                console.log(chalk_1.default.gray('   • Platforms: managed per-project via fraim add-provider'));
                 console.log();
-                // Ask user what they want to do
+                if (process.env.FRAIM_NON_INTERACTIVE || process.env.CI) {
+                    console.log(chalk_1.default.gray('Setup already configured. Use "fraim add-provider <provider>" to connect platforms.'));
+                    return;
+                }
                 const response = await (0, prompts_1.default)({
                     type: 'select',
                     name: 'action',
                     message: 'What would you like to do?',
                     choices: [
-                        {
-                            title: 'Add a provider',
-                            value: 'add-provider',
-                            description: 'Add a new platform integration (GitHub, GitLab, etc.)'
-                        },
                         {
                             title: 'Update FRAIM key',
                             value: 'update-key',
@@ -361,104 +237,27 @@ const runSetup = async (options) => {
                     console.log(chalk_1.default.gray('\nSetup cancelled. No changes made.'));
                     return;
                 }
-                if (response.action === 'add-provider') {
-                    console.log(chalk_1.default.blue('\n📦 Adding a provider...\n'));
-                    const providerClient = new provider_client_1.ProviderClient(fraimKey, process.env.FRAIM_REMOTE_URL || undefined);
-                    // Prompt for which provider to add
-                    const providersToAdd = await (0, provider_prompts_1.promptForProviders)(providerClient);
-                    requestedProviders = providersToAdd;
-                }
-                else if (response.action === 'update-key') {
+                if (response.action === 'update-key') {
                     console.log(chalk_1.default.blue('\n🔑 Updating FRAIM key...\n'));
                     fraimKey = await promptForFraimKey();
                 }
                 else if (response.action === 'reconfigure') {
                     console.log(chalk_1.default.blue('\n🔄 Starting fresh setup...\n'));
-                    // Backup existing config
                     const backupPath = globalConfigPath + '.backup.' + Date.now();
                     fs_1.default.copyFileSync(globalConfigPath, backupPath);
                     console.log(chalk_1.default.gray(`   Backed up existing config to: ${path_1.default.basename(backupPath)}\n`));
-                    // Treat as fresh setup
                     fraimKey = options.key || await promptForFraimKey();
                     console.log(chalk_1.default.green('✅ FRAIM key accepted\n'));
                     mode = options.mode ? parseModeOption(options.mode) : await promptForMode();
-                    const parsed = await parseLegacyOptions(options, fraimKey);
-                    requestedProviders = parsed.requestedProviders;
-                    providedTokens = parsed.providedTokens;
-                    providedConfigs = parsed.providedConfigs;
-                    // Clear existing tokens/configs for fresh start
-                    Object.keys(tokens).forEach(key => delete tokens[key]);
-                    Object.keys(configs).forEach(key => delete configs[key]);
-                    // Continue with fresh setup flow
-                    const providerClient = new provider_client_1.ProviderClient(fraimKey, process.env.FRAIM_REMOTE_URL || undefined);
-                    if (mode === 'integrated') {
-                        let providersToSetup = requestedProviders;
-                        if (providersToSetup.length === 0) {
-                            providersToSetup = await (0, provider_prompts_1.promptForProviders)(providerClient);
-                        }
-                        for (const providerId of providersToSetup) {
-                            try {
-                                const creds = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, providerId, providedTokens[providerId], providedConfigs[providerId]);
-                                tokens[providerId] = creds.token;
-                                if (creds.config) {
-                                    configs[providerId] = creds.config;
-                                }
-                            }
-                            catch (e) {
-                                const providerName = await (0, provider_registry_1.getProviderDisplayName)(providerId);
-                                console.log(chalk_1.default.red(`❌ Failed to get ${providerName} credentials`));
-                                process.exit(1);
-                            }
-                        }
-                    }
-                    else if (mode === 'split') {
-                        // Split mode setup
-                        console.log(chalk_1.default.blue('\n🔀 Split Mode Configuration'));
-                        console.log(chalk_1.default.gray('Configure separate platforms for code hosting and issue tracking.\n'));
-                        const codeRepoProvider = await (0, provider_prompts_1.promptForSingleProvider)(providerClient, 'code');
-                        const creds1 = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, codeRepoProvider, providedTokens[codeRepoProvider], providedConfigs[codeRepoProvider]);
-                        tokens[codeRepoProvider] = creds1.token;
-                        if (creds1.config) {
-                            configs[codeRepoProvider] = creds1.config;
-                        }
-                        const issueProvider = await (0, provider_prompts_1.promptForSingleProvider)(providerClient, 'issues');
-                        if (!tokens[issueProvider]) {
-                            const creds2 = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, issueProvider, providedTokens[issueProvider], providedConfigs[issueProvider]);
-                            tokens[issueProvider] = creds2.token;
-                            if (creds2.config) {
-                                configs[issueProvider] = creds2.config;
-                            }
-                        }
-                    }
-                    // Save and configure MCP
                     console.log(chalk_1.default.blue('\n💾 Saving global configuration...'));
-                    (0, exports.saveGlobalConfig)(fraimKey, mode, tokens, configs);
+                    (0, exports.saveGlobalConfig)(fraimKey, mode);
                     console.log(chalk_1.default.blue('\n🔌 Configuring MCP servers...'));
-                    const mcpTokens = {};
-                    Object.entries(tokens).forEach(([id, token]) => {
-                        mcpTokens[id] = token;
-                    });
-                    const providerConfigsMap = {};
-                    Object.entries(configs).forEach(([providerId, config]) => {
-                        providerConfigsMap[providerId] = config;
-                    });
-                    await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, mcpTokens, options.ide ? [options.ide] : undefined, providerConfigsMap);
+                    await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, options.ide ? [options.ide] : undefined);
                     console.log(chalk_1.default.green('\n🎯 Reconfiguration complete!'));
+                    console.log(chalk_1.default.cyan('\n💡 To connect platforms, run: fraim add-provider <github|gitlab|ado|jira>'));
                     return;
                 }
             }
-            mode = existingConfig.mode || 'integrated';
-            // Preserve existing tokens
-            if (existingConfig.tokens) {
-                Object.assign(tokens, existingConfig.tokens);
-            }
-            // Preserve existing configs
-            if (existingConfig.providerConfigs) {
-                Object.entries(existingConfig.providerConfigs).forEach(([key, value]) => {
-                    const providerId = key.replace('Config', '');
-                    configs[providerId] = value;
-                });
-            }
         }
         catch (e) {
             console.log(chalk_1.default.red('❌ Failed to read existing configuration'));
@@ -467,129 +266,29 @@ const runSetup = async (options) => {
         }
     }
     else {
-        // Initial setup
         console.log(chalk_1.default.yellow('📋 This setup will:'));
         console.log(chalk_1.default.gray('   • Validate your FRAIM key'));
         console.log(chalk_1.default.gray('   • Choose your usage mode'));
-        console.log(chalk_1.default.gray('   • Configure platform integrations'));
+        console.log(chalk_1.default.gray('   • Configure FRAIM MCP servers in your IDEs'));
         console.log(chalk_1.default.gray('   • Sync FRAIM scripts to your system\n'));
-        // Get FRAIM key
+        console.log(chalk_1.default.gray('   Platforms (GitHub, GitLab, etc.) are connected per-project'));
+        console.log(chalk_1.default.gray('   via "fraim add-provider" — no tokens needed here.\n'));
         fraimKey = options.key || await promptForFraimKey();
         console.log(chalk_1.default.green('✅ FRAIM key accepted\n'));
-        // Ask for mode preference (or use explicit option)
         mode = options.mode ? parseModeOption(options.mode) : await promptForMode();
-        // Parse provider CLI flags on first-time setup too
-        const parsed = await parseLegacyOptions(options, fraimKey);
-        requestedProviders = parsed.requestedProviders;
-        providedTokens = parsed.providedTokens;
-        providedConfigs = parsed.providedConfigs;
-    }
-    const providerClient = new provider_client_1.ProviderClient(fraimKey, process.env.FRAIM_REMOTE_URL || undefined);
-    // Handle platform tokens based on mode
-    if (mode === 'integrated') {
-        let providersToSetup = requestedProviders;
-        // If no specific providers requested and not an update, ask user
-        if (!isUpdate && providersToSetup.length === 0) {
-            providersToSetup = await (0, provider_prompts_1.promptForProviders)(providerClient);
-        }
-        // Get credentials for each provider
-        for (const providerId of providersToSetup) {
-            if (!tokens[providerId]) {
-                try {
-                    // Use provided tokens if available, otherwise prompt
-                    const creds = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, providerId, providedTokens[providerId], providedConfigs[providerId]);
-                    tokens[providerId] = creds.token;
-                    if (creds.config) {
-                        configs[providerId] = creds.config;
-                    }
-                }
-                catch (e) {
-                    const providerName = await (0, provider_registry_1.getProviderDisplayName)(providerId);
-                    console.log(chalk_1.default.red(`❌ Failed to get ${providerName} credentials`));
-                    process.exit(1);
-                }
-            }
-        }
-        if (Object.keys(tokens).length === 0) {
-            console.log(chalk_1.default.yellow('⚠️  No platform tokens configured.'));
-            console.log(chalk_1.default.gray('   You can add them later with:'));
-            const allProviderIds = await (0, provider_registry_1.getAllProviderIds)();
-            allProviderIds.forEach(id => {
-                console.log(chalk_1.default.cyan(`   fraim setup --${id}`));
-            });
-            console.log();
-        }
-    }
-    else if (mode === 'split') {
-        // Split mode: separate platforms for code repository and issue tracking
-        console.log(chalk_1.default.blue('\n🔀 Split Mode Configuration'));
-        console.log(chalk_1.default.gray('Configure separate platforms for code hosting and issue tracking.\n'));
-        // Get code repository platform
-        const codeRepoProvider = await (0, provider_prompts_1.promptForSingleProvider)(providerClient, 'code');
-        // Get code repository credentials
-        if (!tokens[codeRepoProvider]) {
-            try {
-                // Use provided tokens if available, otherwise prompt
-                const creds = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, codeRepoProvider, providedTokens[codeRepoProvider], providedConfigs[codeRepoProvider]);
-                tokens[codeRepoProvider] = creds.token;
-                if (creds.config) {
-                    configs[codeRepoProvider] = creds.config;
-                }
-            }
-            catch (e) {
-                const providerName = await (0, provider_registry_1.getProviderDisplayName)(codeRepoProvider);
-                console.log(chalk_1.default.red(`❌ Failed to get ${providerName} credentials`));
-                process.exit(1);
-            }
-        }
-        // Get issue tracking platform
-        const issueProvider = await (0, provider_prompts_1.promptForSingleProvider)(providerClient, 'issues');
-        // Get issue tracking credentials (if different from code repo)
-        if (!tokens[issueProvider]) {
-            try {
-                // Use provided tokens if available, otherwise prompt
-                const creds = await (0, provider_prompts_1.promptForProviderCredentials)(providerClient, issueProvider, providedTokens[issueProvider], providedConfigs[issueProvider]);
-                tokens[issueProvider] = creds.token;
-                if (creds.config) {
-                    configs[issueProvider] = creds.config;
-                }
-            }
-            catch (e) {
-                const providerName = await (0, provider_registry_1.getProviderDisplayName)(issueProvider);
-                console.log(chalk_1.default.red(`❌ Failed to get ${providerName} credentials`));
-                process.exit(1);
-            }
-        }
-        const codeRepoName = await (0, provider_registry_1.getProviderDisplayName)(codeRepoProvider);
-        const issueName = await (0, provider_registry_1.getProviderDisplayName)(issueProvider);
-        console.log(chalk_1.default.green(`\n✅ Split mode configured: ${codeRepoName} (code) + ${issueName} (issues)\n`));
-    }
-    else {
-        console.log(chalk_1.default.gray('ℹ️  Conversational mode: No platform tokens needed\n'));
     }
-    // Save global configuration
+    // Save global configuration (key + mode only; provider tokens live in IDE MCP configs)
     console.log(chalk_1.default.blue('💾 Saving global configuration...'));
-    (0, exports.saveGlobalConfig)(fraimKey, mode, tokens, configs);
+    (0, exports.saveGlobalConfig)(fraimKey, mode);
     // Configure MCP servers
     if (!isUpdate) {
-        // Initial setup - configure all detected IDEs
         console.log(chalk_1.default.blue('\n🔌 Configuring MCP servers...'));
-        // Convert to legacy format for MCP config generator
-        const mcpTokens = {};
-        Object.entries(tokens).forEach(([id, token]) => {
-            mcpTokens[id] = token;
-        });
-        if (mode === 'conversational' && Object.keys(mcpTokens).length === 0) {
-            console.log(chalk_1.default.yellow('ℹ️  Conversational mode: Configuring MCP servers without platform integration'));
-            console.log(chalk_1.default.gray('   FRAIM jobs will work, but platform-specific features will be unavailable\n'));
+        if (mode === 'conversational') {
+            console.log(chalk_1.default.yellow('ℹ️  Conversational mode: Configuring FRAIM MCP server'));
+            console.log(chalk_1.default.gray('   FRAIM jobs will work; platform-specific features are added via fraim add-provider\n'));
         }
         try {
-            // Build providerConfigs map from configs
-            const providerConfigsMap = {};
-            Object.entries(configs).forEach(([providerId, config]) => {
-                providerConfigsMap[providerId] = config;
-            });
-            await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, mcpTokens, options.ide ? [options.ide] : undefined, providerConfigsMap);
+            await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, options.ide ? [options.ide] : undefined);
         }
         catch (e) {
             console.log(chalk_1.default.yellow('⚠️  MCP configuration encountered issues'));
@@ -597,7 +296,6 @@ const runSetup = async (options) => {
         }
     }
     else {
-        // Update existing setup - refresh all IDE MCP configs with new keys
         console.log(chalk_1.default.blue('\n🔄 Updating IDE MCP configurations...'));
         try {
             const { detectInstalledIDEs } = await Promise.resolve().then(() => __importStar(require('../setup/ide-detector')));
@@ -606,18 +304,8 @@ const runSetup = async (options) => {
                 console.log(chalk_1.default.gray('   No IDE configurations found to update'));
             }
             else {
-                // Convert to legacy format for MCP config generator
-                const mcpTokens = {};
-                Object.entries(tokens).forEach(([id, token]) => {
-                    mcpTokens[id] = token;
-                });
-                // Build providerConfigs map from configs
-                const providerConfigsMap = {};
-                Object.entries(configs).forEach(([providerId, config]) => {
-                    providerConfigsMap[providerId] = config;
-                });
                 const ideNames = installedIDEs.map(ide => ide.name);
-                await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, mcpTokens, ideNames, providerConfigsMap);
+                await (0, auto_mcp_setup_1.autoConfigureMCP)(fraimKey, ideNames);
                 console.log(chalk_1.default.green(`✅ Updated MCP configs for: ${ideNames.join(', ')}`));
             }
         }
@@ -709,18 +397,10 @@ const runSetup = async (options) => {
             console.log(chalk_1.default.white('    cd your-project && fraim init-project'));
             console.log(chalk_1.default.gray('    This enables project-specific customizations,'));
             console.log(chalk_1.default.gray('    GitHub workflows, and team learning.'));
-            const configuredProviders = await Promise.all(Object.keys(tokens).map(async (id) => await (0, provider_registry_1.getProviderDisplayName)(id)));
-            if (configuredProviders.length > 0) {
-                console.log(chalk_1.default.gray(`\n  Platforms: ${configuredProviders.join(', ')}`));
-            }
-            const allProviderIds = await (0, provider_registry_1.getAllProviderIds)();
-            const unconfiguredProviders = allProviderIds.filter(id => !tokens[id]);
-            if (unconfiguredProviders.length > 0) {
-                console.log(chalk_1.default.gray('\n  To add more platforms later:'));
-                unconfiguredProviders.forEach(id => {
-                    console.log(chalk_1.default.gray(`    fraim setup --${id}`));
-                });
-            }
+            console.log(chalk_1.default.cyan('\n  To connect platforms (GitHub, GitLab, ADO, Jira):'));
+            console.log(chalk_1.default.white('    fraim add-provider <provider>'));
+            console.log(chalk_1.default.gray('    Provider tokens are stored directly in IDE MCP configs.'));
+            console.log(chalk_1.default.gray('    GitHub uses IDE-native OAuth — no token needed.'));
         }
     }
     else {