berget 2.2.7 → 2.2.8

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

@@ -23,21 +23,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProviderModels = exports.getModelConfig = exports.getAllAgentConfigs = exports.getAgentConfig = exports.getConfigLoader = exports.ConfigLoader = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+exports.getProviderModels = exports.getModelConfig = exports.getConfigLoader = exports.getAllAgentConfigs = exports.getAgentConfig = exports.ConfigLoader = void 0;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
 const logger_1 = require("./logger");
 class ConfigLoader {
+    static instance;
+    config = null;
+    configPath;
     constructor(configPath) {
-        this.config = null;
         // Default to opencode.json in current working directory
-        this.configPath = configPath || path.join(process.cwd(), "opencode.json");
-    }
-    static getInstance(configPath) {
-        if (!ConfigLoader.instance) {
-            ConfigLoader.instance = new ConfigLoader(configPath);
-        }
-        return ConfigLoader.instance;
+        this.configPath = configPath || path.join(process.cwd(), 'opencode.json');
     }
     /**
      * Clear the singleton instance (for testing purposes)
@@ -45,41 +41,31 @@ class ConfigLoader {
     static clearInstance() {
         ConfigLoader.instance = null;
     }
-    /**
-     * Load configuration from opencode.json
-     */
-    loadConfig() {
-        if (this.config) {
-            return this.config;
-        }
-        try {
-            if (!fs.existsSync(this.configPath)) {
-                throw new Error(`Configuration file not found: ${this.configPath}`);
-            }
-            const configContent = fs.readFileSync(this.configPath, "utf8");
-            this.config = JSON.parse(configContent);
-            logger_1.logger.debug(`Loaded configuration from ${this.configPath}`);
-            return this.config;
-        }
-        catch (error) {
-            logger_1.logger.error(`Failed to load configuration from ${this.configPath}:`, error);
-            throw new Error(`Failed to load configuration: ${error instanceof Error ? error.message : String(error)}`);
+    static getInstance(configPath) {
+        if (!ConfigLoader.instance) {
+            ConfigLoader.instance = new ConfigLoader(configPath);
         }
+        return ConfigLoader.instance;
     }
     /**
      * Get agent configuration by name
      */
     getAgentConfig(agentName) {
-        var _a;
         try {
             const config = this.loadConfig();
-            return ((_a = config.agent) === null || _a === void 0 ? void 0 : _a[agentName]) || null;
+            return config.agent?.[agentName] || null;
         }
-        catch (_b) {
+        catch {
             // Config file doesn't exist, return null
             return null;
         }
     }
+    /**
+     * Get list of all available agent names
+     */
+    getAgentNames() {
+        return Object.keys(this.getAllAgentConfigs());
+    }
     /**
      * Get all agent configurations
      */
@@ -88,11 +74,30 @@ class ConfigLoader {
             const config = this.loadConfig();
             return config.agent || {};
         }
-        catch (_a) {
+        catch {
+            // Config file doesn't exist, return empty object
+            return {};
+        }
+    }
+    /**
+     * Get command configurations
+     */
+    getCommandConfigs() {
+        try {
+            const config = this.loadConfig();
+            return config.command || {};
+        }
+        catch {
             // Config file doesn't exist, return empty object
             return {};
         }
     }
+    /**
+     * Get the current configuration path
+     */
+    getConfigPath() {
+        return this.configPath;
+    }
     /**
      * Get model configuration
      */
@@ -100,65 +105,78 @@ class ConfigLoader {
         try {
             const config = this.loadConfig();
             // Extract from config or fall back to defaults
-            const primary = config.model || "berget/glm-4.7";
-            const small = config.small_model || "berget/gpt-oss";
+            const primary = config.model || 'berget/glm-4.7';
+            const small = config.small_model || 'berget/gpt-oss';
             return { primary, small };
         }
-        catch (_a) {
+        catch {
             // Fallback to defaults when no config exists (init scenario)
             return {
-                primary: "berget/glm-4.7",
-                small: "berget/gpt-oss",
+                primary: 'berget/glm-4.7',
+                small: 'berget/gpt-oss',
             };
         }
     }
+    /**
+     * Get list of primary agents (mode: 'primary')
+     */
+    getPrimaryAgentNames() {
+        const agents = this.getAllAgentConfigs();
+        return Object.keys(agents).filter((name) => agents[name].mode === 'primary');
+    }
+    /**
+     * Get provider configuration
+     */
+    getProviderConfig() {
+        try {
+            const config = this.loadConfig();
+            return config.provider || {};
+        }
+        catch {
+            // Config file doesn't exist, return empty object
+            return {};
+        }
+    }
     /**
      * Get provider model configuration
      */
     getProviderModels() {
-        var _a, _b;
         try {
             const config = this.loadConfig();
             // Extract from provider configuration
-            if ((_b = (_a = config.provider) === null || _a === void 0 ? void 0 : _a.berget) === null || _b === void 0 ? void 0 : _b.models) {
+            if (config.provider?.berget?.models) {
                 return config.provider.berget.models;
             }
         }
-        catch (_c) {
+        catch {
             // Config file doesn't exist, use fallback defaults
         }
         // Fallback to defaults
         return {
-            "glm-4.7": {
-                name: "GLM-4.7",
-                limit: { output: 4000, context: 90000 },
+            'glm-4.7': {
+                limit: { context: 90000, output: 4000 },
+                name: 'GLM-4.7',
             },
-            "gpt-oss": {
-                name: "GPT-OSS",
-                limit: { output: 4000, context: 128000 },
+            'gpt-oss': {
+                limit: { context: 128000, output: 4000 },
                 modalities: {
-                    input: ["text", "image"],
-                    output: ["text"],
+                    input: ['text', 'image'],
+                    output: ['text'],
                 },
+                name: 'GPT-OSS',
             },
-            "llama-8b": {
-                name: "llama-3.1-8b",
-                limit: { output: 4000, context: 128000 },
+            'llama-8b': {
+                limit: { context: 128000, output: 4000 },
+                name: 'llama-3.1-8b',
             },
         };
     }
     /**
-     * Get command configurations
+     * Get list of subagents (mode: 'subagent')
      */
-    getCommandConfigs() {
-        try {
-            const config = this.loadConfig();
-            return config.command || {};
-        }
-        catch (_a) {
-            // Config file doesn't exist, return empty object
-            return {};
-        }
+    getSubagentNames() {
+        const agents = this.getAllAgentConfigs();
+        return Object.keys(agents).filter((name) => agents[name].mode === 'subagent');
     }
     /**
      * Get watcher configuration
@@ -167,25 +185,12 @@ class ConfigLoader {
         try {
             const config = this.loadConfig();
             return (config.watcher || {
-                ignore: ["node_modules", "dist", ".git", "coverage"],
+                ignore: ['node_modules', 'dist', '.git', 'coverage'],
             });
         }
-        catch (_a) {
+        catch {
             // Config file doesn't exist, return default watcher config
-            return { ignore: ["node_modules", "dist", ".git", "coverage"] };
-        }
-    }
-    /**
-     * Get provider configuration
-     */
-    getProviderConfig() {
-        try {
-            const config = this.loadConfig();
-            return config.provider || {};
-        }
-        catch (_a) {
-            // Config file doesn't exist, return empty object
-            return {};
+            return { ignore: ['node_modules', 'dist', '.git', 'coverage'] };
         }
     }
     /**
@@ -195,24 +200,25 @@ class ConfigLoader {
         return agentName in this.getAllAgentConfigs();
     }
     /**
-     * Get list of all available agent names
-     */
-    getAgentNames() {
-        return Object.keys(this.getAllAgentConfigs());
-    }
-    /**
-     * Get list of primary agents (mode: 'primary')
-     */
-    getPrimaryAgentNames() {
-        const agents = this.getAllAgentConfigs();
-        return Object.keys(agents).filter(name => agents[name].mode === "primary");
-    }
-    /**
-     * Get list of subagents (mode: 'subagent')
+     * Load configuration from opencode.json
      */
-    getSubagentNames() {
-        const agents = this.getAllAgentConfigs();
-        return Object.keys(agents).filter(name => agents[name].mode === "subagent");
+    loadConfig() {
+        if (this.config) {
+            return this.config;
+        }
+        try {
+            if (!fs.existsSync(this.configPath)) {
+                throw new Error(`Configuration file not found: ${this.configPath}`);
+            }
+            const configContent = fs.readFileSync(this.configPath, 'utf8');
+            this.config = JSON.parse(configContent);
+            logger_1.logger.debug(`Loaded configuration from ${this.configPath}`);
+            return this.config;
+        }
+        catch (error) {
+            logger_1.logger.error(`Failed to load configuration from ${this.configPath}:`, error);
+            throw new Error(`Failed to load configuration: ${error instanceof Error ? error.message : String(error)}`);
+        }
     }
     /**
      * Reload configuration from file
@@ -228,21 +234,8 @@ class ConfigLoader {
         this.configPath = configPath;
         this.config = null; // Force reload
     }
-    /**
-     * Get the current configuration path
-     */
-    getConfigPath() {
-        return this.configPath;
-    }
 }
 exports.ConfigLoader = ConfigLoader;
-/**
- * Convenience function to get the config loader instance
- */
-function getConfigLoader(configPath) {
-    return ConfigLoader.getInstance(configPath);
-}
-exports.getConfigLoader = getConfigLoader;
 /**
  * Convenience function to get agent configuration
  */
@@ -257,6 +250,13 @@ function getAllAgentConfigs(configPath) {
     return getConfigLoader(configPath).getAllAgentConfigs();
 }
 exports.getAllAgentConfigs = getAllAgentConfigs;
+/**
+ * Convenience function to get the config loader instance
+ */
+function getConfigLoader(configPath) {
+    return ConfigLoader.getInstance(configPath);
+}
+exports.getConfigLoader = getConfigLoader;
 /**
  * Convenience function to get model configuration
  */

package/dist/src/utils/default-api-key.js

@@ -22,38 +22,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultApiKeyManager = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const os = __importStar(require("os"));
+const fs = __importStar(require("node:fs"));
+const os = __importStar(require("node:os"));
+const path = __importStar(require("node:path"));
+const node_readline_1 = __importDefault(require("node:readline"));
 const api_key_service_1 = require("../services/api-key-service");
-const readline_1 = __importDefault(require("readline"));
 const logger_1 = require("./logger");
 /**
  * Manages the default API key for chat commands
  */
 class DefaultApiKeyManager {
+    static instance;
+    configFilePath;
+    defaultApiKey = null;
     constructor() {
-        this.defaultApiKey = null;
         // Set up config file path in user's home directory
-        const bergetDir = path.join(os.homedir(), ".berget");
+        const bergetDir = path.join(os.homedir(), '.berget');
         if (!fs.existsSync(bergetDir)) {
             fs.mkdirSync(bergetDir, { recursive: true });
         }
-        this.configFilePath = path.join(bergetDir, "default-api-key.json");
+        this.configFilePath = path.join(bergetDir, 'default-api-key.json');
         this.loadConfig();
     }
     static getInstance() {
@@ -62,18 +55,133 @@ class DefaultApiKeyManager {
         }
         return DefaultApiKeyManager.instance;
     }
+    /**
+     * Clear the default API key
+     */
+    clearDefaultApiKey() {
+        this.defaultApiKey = null;
+        this.saveConfig();
+    }
+    /**
+     * Get the default API key string
+     */
+    getDefaultApiKey() {
+        return this.defaultApiKey?.key || null;
+    }
+    /**
+     * Get the default API key data object
+     */
+    getDefaultApiKeyData() {
+        return this.defaultApiKey;
+    }
+    /**
+     * Prompts the user to select a default API key if none is set
+     * @returns The selected API key or null if none was selected
+     */
+    async promptForDefaultApiKey() {
+        try {
+            logger_1.logger.debug('promptForDefaultApiKey called');
+            // If we already have a default API key, return it
+            if (this.defaultApiKey) {
+                logger_1.logger.debug('Using existing default API key');
+                return this.defaultApiKey.key;
+            }
+            logger_1.logger.debug('No default API key found, getting ApiKeyService');
+            const apiKeyService = api_key_service_1.ApiKeyService.getInstance();
+            // Get all API keys
+            let apiKeys;
+            try {
+                logger_1.logger.debug('Calling apiKeyService.list()');
+                apiKeys = await apiKeyService.list();
+                logger_1.logger.debug(`Got ${apiKeys ? apiKeys.length : 0} API keys`);
+                if (!apiKeys || apiKeys.length === 0) {
+                    logger_1.logger.warn('No API keys found. Create one with:');
+                    logger_1.logger.info('  berget api-keys create --name "My Key"');
+                    return null;
+                }
+            }
+            catch (error) {
+                // Check if this is an authentication error
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                const isAuthError = errorMessage.includes('Unauthorized') ||
+                    errorMessage.includes('Authentication failed') ||
+                    errorMessage.includes('AUTH_FAILED');
+                if (isAuthError) {
+                    logger_1.logger.warn('Authentication required. Please run `berget auth login` first.');
+                }
+                else {
+                    logger_1.logger.error('Error fetching API keys:');
+                    if (error instanceof Error) {
+                        logger_1.logger.error(error.message);
+                        logger_1.logger.debug(`API key list error: ${error.message}`);
+                        logger_1.logger.debug(`Stack: ${error.stack}`);
+                    }
+                }
+                return null;
+            }
+            logger_1.logger.info('Select an API key to use as default:');
+            // Display available API keys
+            for (const [index, key] of apiKeys.entries()) {
+                logger_1.logger.log(`  ${index + 1}. ${key.name} (${key.prefix}...)`);
+            }
+            // Create readline interface for user input
+            const rl = node_readline_1.default.createInterface({
+                input: process.stdin,
+                output: process.stdout,
+            });
+            // Prompt for selection
+            const selection = await new Promise((resolve) => {
+                rl.question('Enter number (or press Enter to cancel): ', (answer) => {
+                    rl.close();
+                    const number_ = Number.parseInt(answer.trim(), 10);
+                    if (isNaN(number_) || number_ < 1 || number_ > apiKeys.length) {
+                        resolve(-1); // Invalid selection
+                    }
+                    else {
+                        resolve(number_ - 1); // Convert to zero-based index
+                    }
+                });
+            });
+            if (selection === -1) {
+                logger_1.logger.warn('No API key selected');
+                return null;
+            }
+            const selectedKey = apiKeys[selection];
+            // Create a new API key with the selected name
+            const newKey = await apiKeyService.create({
+                description: 'Created automatically by the Berget CLI for default use',
+                name: `CLI Default (copy of ${selectedKey.name})`,
+            });
+            // Save the new key as default
+            this.setDefaultApiKey(newKey.id.toString(), newKey.name, newKey.key.slice(0, 8), // Use first 8 chars as prefix
+            newKey.key);
+            logger_1.logger.success(`✓ Default API key set to: ${newKey.name}`);
+            return newKey.key;
+        }
+        catch (error) {
+            logger_1.logger.error('Failed to set default API key:', error);
+            return null;
+        }
+    }
+    /**
+     * Set the default API key
+     */
+    setDefaultApiKey(id, name, prefix, key) {
+        this.defaultApiKey = { id, key, name, prefix };
+        this.saveConfig();
+    }
     /**
      * Load default API key from file
      */
     loadConfig() {
         try {
             if (fs.existsSync(this.configFilePath)) {
-                const data = fs.readFileSync(this.configFilePath, "utf8");
+                const data = fs.readFileSync(this.configFilePath, 'utf8');
                 this.defaultApiKey = JSON.parse(data);
             }
         }
-        catch (_a) {
-            logger_1.logger.debug("Failed to load default API key configuration");
+        catch {
+            logger_1.logger.debug('Failed to load default API key configuration');
             this.defaultApiKey = null;
         }
     }
@@ -94,127 +202,9 @@ class DefaultApiKeyManager {
                 }
             }
         }
-        catch (_a) {
-            logger_1.logger.debug("Failed to save default API key configuration");
+        catch {
+            logger_1.logger.debug('Failed to save default API key configuration');
         }
     }
-    /**
-     * Set the default API key
-     */
-    setDefaultApiKey(id, name, prefix, key) {
-        this.defaultApiKey = { id, name, prefix, key };
-        this.saveConfig();
-    }
-    /**
-     * Get the default API key string
-     */
-    getDefaultApiKey() {
-        var _a;
-        return ((_a = this.defaultApiKey) === null || _a === void 0 ? void 0 : _a.key) || null;
-    }
-    /**
-     * Get the default API key data object
-     */
-    getDefaultApiKeyData() {
-        return this.defaultApiKey;
-    }
-    /**
-     * Clear the default API key
-     */
-    clearDefaultApiKey() {
-        this.defaultApiKey = null;
-        this.saveConfig();
-    }
-    /**
-     * Prompts the user to select a default API key if none is set
-     * @returns The selected API key or null if none was selected
-     */
-    promptForDefaultApiKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                logger_1.logger.debug("promptForDefaultApiKey called");
-                // If we already have a default API key, return it
-                if (this.defaultApiKey) {
-                    logger_1.logger.debug("Using existing default API key");
-                    return this.defaultApiKey.key;
-                }
-                logger_1.logger.debug("No default API key found, getting ApiKeyService");
-                const apiKeyService = api_key_service_1.ApiKeyService.getInstance();
-                // Get all API keys
-                let apiKeys;
-                try {
-                    logger_1.logger.debug("Calling apiKeyService.list()");
-                    apiKeys = yield apiKeyService.list();
-                    logger_1.logger.debug(`Got ${apiKeys ? apiKeys.length : 0} API keys`);
-                    if (!apiKeys || apiKeys.length === 0) {
-                        logger_1.logger.warn("No API keys found. Create one with:");
-                        logger_1.logger.info('  berget api-keys create --name "My Key"');
-                        return null;
-                    }
-                }
-                catch (error) {
-                    // Check if this is an authentication error
-                    const errorMessage = error instanceof Error ? error.message : String(error);
-                    const isAuthError = errorMessage.includes("Unauthorized") ||
-                        errorMessage.includes("Authentication failed") ||
-                        errorMessage.includes("AUTH_FAILED");
-                    if (isAuthError) {
-                        logger_1.logger.warn("Authentication required. Please run `berget auth login` first.");
-                    }
-                    else {
-                        logger_1.logger.error("Error fetching API keys:");
-                        if (error instanceof Error) {
-                            logger_1.logger.error(error.message);
-                            logger_1.logger.debug(`API key list error: ${error.message}`);
-                            logger_1.logger.debug(`Stack: ${error.stack}`);
-                        }
-                    }
-                    return null;
-                }
-                logger_1.logger.info("Select an API key to use as default:");
-                // Display available API keys
-                apiKeys.forEach((key, index) => {
-                    logger_1.logger.log(`  ${index + 1}. ${key.name} (${key.prefix}...)`);
-                });
-                // Create readline interface for user input
-                const rl = readline_1.default.createInterface({
-                    input: process.stdin,
-                    output: process.stdout,
-                });
-                // Prompt for selection
-                const selection = yield new Promise(resolve => {
-                    rl.question("Enter number (or press Enter to cancel): ", answer => {
-                        rl.close();
-                        const num = parseInt(answer.trim(), 10);
-                        if (isNaN(num) || num < 1 || num > apiKeys.length) {
-                            resolve(-1); // Invalid selection
-                        }
-                        else {
-                            resolve(num - 1); // Convert to zero-based index
-                        }
-                    });
-                });
-                if (selection === -1) {
-                    logger_1.logger.warn("No API key selected");
-                    return null;
-                }
-                const selectedKey = apiKeys[selection];
-                // Create a new API key with the selected name
-                const newKey = yield apiKeyService.create({
-                    name: `CLI Default (copy of ${selectedKey.name})`,
-                    description: "Created automatically by the Berget CLI for default use",
-                });
-                // Save the new key as default
-                this.setDefaultApiKey(newKey.id.toString(), newKey.name, newKey.key.substring(0, 8), // Use first 8 chars as prefix
-                newKey.key);
-                logger_1.logger.success(`✓ Default API key set to: ${newKey.name}`);
-                return newKey.key;
-            }
-            catch (error) {
-                logger_1.logger.error("Failed to set default API key:", error);
-                return null;
-            }
-        });
-    }
 }
 exports.DefaultApiKeyManager = DefaultApiKeyManager;