fraim-framework 2.0.81 → 2.0.83

package/dist/src/cli/api/get-provider-client.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProviderClient = getProviderClient;
+// Helper to get provider client with FRAIM key from config
+const provider_client_1 = require("./provider-client");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+/**
+ * Get user FRAIM directory
+ */
+function getUserFraimDir() {
+    return process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim');
+}
+/**
+ * Get provider client using FRAIM key from global config
+ * Throws error if no config found - caller should handle and use local fallback
+ */
+function getProviderClient() {
+    const globalConfigPath = path_1.default.join(getUserFraimDir(), 'config.json');
+    if (!fs_1.default.existsSync(globalConfigPath)) {
+        throw new Error('No FRAIM configuration found');
+    }
+    try {
+        const config = JSON.parse(fs_1.default.readFileSync(globalConfigPath, 'utf8'));
+        const fraimKey = config.apiKey;
+        if (!fraimKey) {
+            throw new Error('FRAIM API key not found in config');
+        }
+        // Use FRAIM_REMOTE_URL if set (for tests or custom deployments)
+        // Otherwise ProviderClient will use its default
+        const serverUrl = process.env.FRAIM_REMOTE_URL || undefined;
+        return new provider_client_1.ProviderClient(fraimKey, serverUrl);
+    }
+    catch (error) {
+        throw new Error(`Failed to load FRAIM configuration: ${error.message}`);
+    }
+}

package/dist/src/cli/api/provider-client.js

@@ -0,0 +1,107 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderClient = void 0;
+// CLI client for fetching provider metadata from server
+const axios_1 = __importDefault(require("axios"));
+class ProviderClient {
+    constructor(fraimKey, serverUrl) {
+        this.serverUrl = serverUrl || process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me';
+        this.client = axios_1.default.create({
+            baseURL: this.serverUrl,
+            headers: {
+                'x-api-key': fraimKey,
+                'Content-Type': 'application/json'
+            },
+            timeout: 10000 // 10 second timeout
+        });
+    }
+    /**
+     * Get all providers from server
+     */
+    async getAllProviders() {
+        try {
+            const response = await this.client.get('/api/providers');
+            return response.data.providers;
+        }
+        catch (error) {
+            if (error.response) {
+                // Server responded with error status
+                throw new Error(`Failed to fetch providers: ${error.response.status} - ${JSON.stringify(error.response.data)}`);
+            }
+            else if (error.request) {
+                // Request was made but no response
+                throw new Error(`Failed to fetch providers: No response from server`);
+            }
+            else {
+                // Something else happened
+                throw new Error(`Failed to fetch providers: ${error.message}`);
+            }
+        }
+    }
+    /**
+     * Get a specific provider by ID
+     */
+    async getProvider(id) {
+        const providers = await this.getAllProviders();
+        return providers.find(p => p.id === id) || null;
+    }
+    /**
+     * Get provider config schema
+     */
+    async getProviderSchema(id) {
+        try {
+            const response = await this.client.get(`/api/providers/${id}/schema`);
+            return response.data;
+        }
+        catch (error) {
+            if (error.response?.status === 404) {
+                throw new Error(`Provider '${id}' not found`);
+            }
+            throw new Error(`Failed to fetch provider schema: ${error.message}`);
+        }
+    }
+    /**
+     * Validate provider config
+     */
+    async validateProviderConfig(id, config) {
+        try {
+            const response = await this.client.post(`/api/providers/${id}/validate`, config);
+            return response.data;
+        }
+        catch (error) {
+            throw new Error(`Failed to validate provider config: ${error.message}`);
+        }
+    }
+    /**
+     * Get all provider IDs
+     */
+    async getAllProviderIds() {
+        const providers = await this.getAllProviders();
+        return providers.map(p => p.id);
+    }
+    /**
+     * Get providers with a specific capability
+     */
+    async getProvidersWithCapability(capability) {
+        const providers = await this.getAllProviders();
+        return providers.filter(p => p.capabilities.includes(capability));
+    }
+    /**
+     * Check if a provider has a specific capability
+     */
+    async providerHasCapability(providerId, capability) {
+        const provider = await this.getProvider(providerId);
+        return provider ? provider.capabilities.includes(capability) : false;
+    }
+    /**
+     * Check if provider requires additional config
+     */
+    async requiresAdditionalConfig(providerId) {
+        const provider = await this.getProvider(providerId);
+        return provider?.hasAdditionalConfig || false;
+    }
+}
+exports.ProviderClient = ProviderClient;

package/dist/src/cli/commands/add-ide.js

@@ -1,9 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveGitHubTokenToConfig = exports.loadGlobalConfig = exports.addIDECommand = exports.runAddIDE = void 0;
+exports.saveProviderTokenToConfig = exports.loadGlobalConfig = exports.addIDECommand = exports.runAddIDE = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
@@ -13,20 +46,52 @@ const ide_detector_1 = require("../setup/ide-detector");
 const mcp_config_generator_1 = require("../setup/mcp-config-generator");
 const codex_local_config_1 = require("../setup/codex-local-config");
 const script_sync_utils_1 = require("../utils/script-sync-utils");
-const loadGlobalConfig = () => {
+const mcp_server_registry_1 = require("../mcp/mcp-server-registry");
+const get_provider_client_1 = require("../api/get-provider-client");
+const provider_prompts_1 = require("../setup/provider-prompts");
+const provider_registry_1 = require("../providers/provider-registry");
+const loadGlobalConfig = async () => {
     const globalConfigPath = path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'config.json');
     if (!fs_1.default.existsSync(globalConfigPath)) {
         return null;
     }
     try {
         const config = JSON.parse(fs_1.default.readFileSync(globalConfigPath, 'utf8'));
+        // Support both old and new token format
+        const tokens = config.tokens || {};
+        // Backward compatibility: map old format to new
+        // Only try to fetch provider IDs if we have a valid FRAIM key
+        if (config.apiKey) {
+            try {
+                const client = (0, get_provider_client_1.getProviderClient)();
+                const providerIds = await client.getAllProviderIds();
+                for (const id of providerIds) {
+                    const oldKey = `${id}Token`;
+                    if (config[oldKey] && !tokens[id]) {
+                        tokens[id] = config[oldKey];
+                    }
+                }
+            }
+            catch (e) {
+                // If provider client fails (network error, invalid key, etc.), 
+                // skip backward compatibility mapping and use local fallback
+                // This is fine - the config will still work with the new format
+            }
+        }
+        // Load all provider configs
+        const providerConfigs = {};
+        // New format: providerConfigs object
+        if (config.providerConfigs) {
+            Object.entries(config.providerConfigs).forEach(([key, value]) => {
+                const providerId = key.replace('Config', '');
+                providerConfigs[providerId] = value;
+            });
+        }
         return {
             fraimKey: config.apiKey,
-            githubToken: config.tokens?.github || config.githubToken, // Support both old and new format
-            gitlabToken: config.tokens?.gitlab,
-            jiraToken: config.tokens?.jira,
+            tokens,
             mode: config.mode,
-            jiraConfig: config.jiraConfig
+            providerConfigs
         };
     }
     catch (e) {
@@ -34,71 +99,65 @@ const loadGlobalConfig = () => {
     }
 };
 exports.loadGlobalConfig = loadGlobalConfig;
-const promptForGitHubToken = async (isConversationalMode = false) => {
-    if (isConversationalMode) {
-        console.log(chalk_1.default.yellow('\n🔑 GitHub token (optional for conversational mode)'));
-        console.log(chalk_1.default.gray('GitHub token enables GitHub-specific MCP features.\n'));
+const promptForProviderTokenIfNeeded = async (providerId, isOptional = false) => {
+    const client = (0, get_provider_client_1.getProviderClient)();
+    const provider = await client.getProvider(providerId);
+    if (!provider)
+        return '';
+    if (isOptional) {
+        console.log(chalk_1.default.yellow(`\n🔑 ${provider.displayName} token (optional for conversational mode)`));
+        console.log(chalk_1.default.gray(`${provider.displayName} token enables ${provider.displayName}-specific MCP features.\n`));
         const wantsToken = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'addToken',
-            message: 'Do you want to add a GitHub token?',
+            message: `Do you want to add a ${provider.displayName} token?`,
             initial: false
         });
         if (!wantsToken.addToken) {
-            console.log(chalk_1.default.blue('ℹ️  Skipping GitHub token - GitHub MCP server will not be configured'));
+            console.log(chalk_1.default.blue(`ℹ️  Skipping ${provider.displayName} token - ${provider.displayName} MCP server will not be configured`));
             return '';
         }
     }
     else {
-        console.log(chalk_1.default.yellow('\n🔑 GitHub token needed for MCP configuration'));
-        console.log(chalk_1.default.gray('This is required for git and GitHub MCP servers to function properly.\n'));
+        console.log(chalk_1.default.yellow(`\n🔑 ${provider.displayName} token needed for MCP configuration`));
+        console.log(chalk_1.default.gray(`This is required for ${provider.displayName} MCP servers to function properly.\n`));
     }
-    const tokenResponse = await (0, prompts_1.default)({
-        type: 'password',
-        name: 'token',
-        message: 'Enter your GitHub token',
-        validate: (value) => {
-            if (!value && !isConversationalMode)
-                return 'GitHub token is required';
-            if (!value && isConversationalMode)
-                return true; // Allow empty in conversational mode
-            if (value.startsWith('ghp_') || value.startsWith('github_pat_'))
-                return true;
-            return 'Please enter a valid GitHub token (starts with ghp_ or github_pat_)';
-        }
-    });
-    if (!tokenResponse.token) {
-        if (isConversationalMode) {
-            console.log(chalk_1.default.blue('ℹ️  No GitHub token provided - GitHub MCP server will not be configured'));
+    try {
+        return await (0, provider_prompts_1.promptForProviderToken)(client, providerId);
+    }
+    catch (error) {
+        if (isOptional) {
+            console.log(chalk_1.default.blue(`ℹ️  No ${provider.displayName} token provided - ${provider.displayName} MCP server will not be configured`));
             return '';
         }
-        console.log(chalk_1.default.red('GitHub token is required. Exiting.'));
+        console.log(chalk_1.default.red(`${provider.displayName} token is required. Exiting.`));
         process.exit(1);
     }
-    return tokenResponse.token;
 };
-const saveGitHubTokenToConfig = (githubToken) => {
+const saveProviderTokenToConfig = async (providerId, token) => {
     const globalConfigPath = path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'config.json');
     if (fs_1.default.existsSync(globalConfigPath)) {
         try {
             const config = JSON.parse(fs_1.default.readFileSync(globalConfigPath, 'utf8'));
-            // Use new tokens structure if it exists, otherwise fall back to old format
-            if (config.tokens) {
-                config.tokens.github = githubToken;
-            }
-            else {
-                config.githubToken = githubToken;
+            // Use new tokens structure
+            if (!config.tokens) {
+                config.tokens = {};
             }
+            config.tokens[providerId] = token;
             fs_1.default.writeFileSync(globalConfigPath, JSON.stringify(config, null, 2));
-            console.log(chalk_1.default.green('✅ GitHub token saved to global config'));
+            const { getProvider } = await Promise.resolve().then(() => __importStar(require('../providers/provider-registry')));
+            const provider = await getProvider(providerId);
+            console.log(chalk_1.default.green(`✅ ${provider?.displayName || providerId} token saved to global config`));
         }
         catch (e) {
-            console.log(chalk_1.default.yellow('⚠️ Could not save GitHub token to config'));
+            const { getProvider } = await Promise.resolve().then(() => __importStar(require('../providers/provider-registry')));
+            const provider = await getProvider(providerId);
+            console.log(chalk_1.default.yellow(`⚠️ Could not save ${provider?.displayName || providerId} token to config`));
         }
     }
 };
-exports.saveGitHubTokenToConfig = saveGitHubTokenToConfig;
-const configureIDEMCP = async (ide, fraimKey, tokens, jiraConfig) => {
+exports.saveProviderTokenToConfig = saveProviderTokenToConfig;
+const configureIDEMCP = async (ide, fraimKey, tokens, providerConfigs) => {
     const configPath = (0, ide_detector_1.expandPath)(ide.configPath);
     console.log(chalk_1.default.blue(`🔧 Configuring ${ide.name}...`));
     // Create backup if config exists
@@ -127,14 +186,18 @@ const configureIDEMCP = async (ide, fraimKey, tokens, jiraConfig) => {
         }
     }
     if (ide.configFormat === 'toml') {
-        // Handle TOML format (Codex)
+        // Handle TOML format (e.g., Codex, Zed)
         let existingTomlContent = '';
         if (fs_1.default.existsSync(configPath)) {
             existingTomlContent = fs_1.default.readFileSync(configPath, 'utf8');
             console.log(chalk_1.default.gray(`  📋 Found existing TOML config`));
         }
-        const newTomlContent = (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, tokens, jiraConfig);
-        const serversToAdd = ['fraim', 'git', 'github', 'gitlab', 'jira', 'playwright'];
+        const newTomlContent = await (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, tokens, providerConfigs);
+        const { getAllMCPServerIds } = await Promise.resolve().then(() => __importStar(require('../mcp/mcp-server-registry')));
+        const baseServerIds = getAllMCPServerIds();
+        // Add provider server IDs from tokens
+        const providerServerIds = Object.keys(tokens).filter(id => tokens[id]);
+        const serversToAdd = [...baseServerIds, ...providerServerIds];
         const mergeResult = (0, mcp_config_generator_1.mergeTomlMCPServers)(existingTomlContent, newTomlContent, serversToAdd);
         fs_1.default.writeFileSync(configPath, mergeResult.content);
         mergeResult.addedServers.forEach(server => {
@@ -149,7 +212,7 @@ const configureIDEMCP = async (ide, fraimKey, tokens, jiraConfig) => {
     }
     else {
         // For JSON configs - intelligent merging
-        const newConfig = (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, tokens, jiraConfig);
+        const newConfig = await (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, tokens, providerConfigs);
         const newMCPServers = newConfig[serversKey] || newConfig.mcpServers || {};
         // Merge MCP servers intelligently
         const mergedMCPServers = { ...existingMCPServers };
@@ -180,10 +243,11 @@ const configureIDEMCP = async (ide, fraimKey, tokens, jiraConfig) => {
         });
     }
     console.log(chalk_1.default.green(`✅ Updated ${configPath}`));
+    // Handle IDE-specific local config (e.g., Codex needs project-level config)
     if (ide.configType === 'codex') {
         const localResult = (0, codex_local_config_1.ensureCodexLocalConfig)(process.cwd());
         const status = localResult.created ? 'Created' : localResult.updated ? 'Updated' : 'Verified';
-        console.log(chalk_1.default.green(`  ✅ ${status} local Codex config: ${localResult.path}`));
+        console.log(chalk_1.default.green(`  ✅ ${status} local ${ide.name} config: ${localResult.path}`));
     }
 };
 const listSupportedIDEs = () => {
@@ -210,18 +274,18 @@ const promptForIDESelection = async (availableIDEs, tokens) => {
         console.log(chalk_1.default.white(`   ${index + 1}. ${ide.name} ${statusIcon} (${statusText})`));
     });
     console.log(chalk_1.default.blue('\nFRAIM will add these MCP servers:'));
-    console.log(chalk_1.default.gray('   • fraim (workflows and AI management)'));
-    console.log(chalk_1.default.gray('   • git (version control integration)'));
-    if (tokens?.github) {
-        console.log(chalk_1.default.gray('   - github (GitHub API access)'));
-    }
-    if (tokens?.gitlab) {
-        console.log(chalk_1.default.gray('   - gitlab (GitLab API access)'));
-    }
-    if (tokens?.jira) {
-        console.log(chalk_1.default.gray('   - jira (Jira issue tracking)'));
+    // Show base servers
+    for (const server of mcp_server_registry_1.BASE_MCP_SERVERS) {
+        console.log(chalk_1.default.gray(`   • ${server.id} (${server.description})`));
+    }
+    // Show provider servers (only if tokens exist)
+    const allProviders = await (0, provider_registry_1.getAllProviders)();
+    for (const provider of allProviders) {
+        const hasToken = tokens?.[provider.id];
+        if (hasToken && provider.mcpServer) {
+            console.log(chalk_1.default.gray(`   - ${provider.id} (${provider.description})`));
+        }
     }
-    console.log(chalk_1.default.gray('   - playwright (browser automation)'));
     const response = await (0, prompts_1.default)({
         type: 'text',
         name: 'selection',
@@ -253,29 +317,32 @@ const runAddIDE = async (options) => {
     }
     console.log(chalk_1.default.blue('🔧 FRAIM IDE Configuration\n'));
     // Load existing configuration
-    const globalConfig = loadGlobalConfig();
+    const globalConfig = await loadGlobalConfig();
     if (!globalConfig || !globalConfig.fraimKey) {
         console.log(chalk_1.default.red('❌ No FRAIM configuration found.'));
-        console.log(chalk_1.default.yellow('💡 Please run "fraim setup" first to configure your FRAIM and GitHub keys.'));
+        console.log(chalk_1.default.yellow('💡 Please run "fraim setup" first to configure your FRAIM keys.'));
         process.exit(1);
     }
-    let githubToken = globalConfig.githubToken;
-    const platformTokens = {
-        github: globalConfig.githubToken,
-        gitlab: globalConfig.gitlabToken,
-        jira: globalConfig.jiraToken
-    };
+    const platformTokens = globalConfig.tokens || {};
     const isConversationalMode = globalConfig.mode === 'conversational';
-    if (!githubToken && !platformTokens.gitlab && !platformTokens.jira && !isConversationalMode) {
-        console.log(chalk_1.default.yellow('⚠️ No GitHub token found in configuration.'));
-        githubToken = await promptForGitHubToken(false);
-        if (githubToken) {
-            saveGitHubTokenToConfig(githubToken);
-            platformTokens.github = githubToken;
+    // Check if any provider tokens exist
+    const allProviderIds = await (0, provider_registry_1.getAllProviderIds)();
+    const hasAnyToken = allProviderIds.some(id => platformTokens[id]);
+    if (!hasAnyToken && !isConversationalMode) {
+        console.log(chalk_1.default.yellow('⚠️ No provider tokens found in configuration.'));
+        // Prompt for first integrated provider as default
+        const integratedProviders = await (0, provider_registry_1.getProvidersWithCapability)('integrated');
+        const defaultProviderId = integratedProviders[0]?.id;
+        if (defaultProviderId) {
+            const token = await promptForProviderTokenIfNeeded(defaultProviderId, false);
+            if (token) {
+                await saveProviderTokenToConfig(defaultProviderId, token);
+                platformTokens[defaultProviderId] = token;
+            }
         }
     }
-    if (isConversationalMode && !githubToken) {
-        console.log(chalk_1.default.blue('ℹ️  Conversational mode: Configuring MCP without GitHub integration\n'));
+    if (isConversationalMode && !hasAnyToken) {
+        console.log(chalk_1.default.blue('ℹ️  Conversational mode: Configuring MCP without platform integration\n'));
     }
     else {
         console.log(chalk_1.default.green('✅ Using existing FRAIM configuration\n'));
@@ -324,7 +391,7 @@ const runAddIDE = async (options) => {
     };
     for (const ide of idesToConfigure) {
         try {
-            await configureIDEMCP(ide, globalConfig.fraimKey, platformTokens, globalConfig.jiraConfig);
+            await configureIDEMCP(ide, globalConfig.fraimKey, platformTokens, globalConfig.providerConfigs);
             results.successful.push(ide.name);
         }
         catch (error) {