berget 1.1.0 → 1.3.0

package/dist/index.js

@@ -1,9 +1,14 @@
 #!/usr/bin/env node
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const commands_1 = require("./src/commands");
 const config_checker_1 = require("./src/utils/config-checker");
+const chalk_1 = __importDefault(require("chalk"));
+const package_json_1 = require("./package.json");
 // Set version and description
 commander_1.program
     .name('berget')
@@ -15,7 +20,7 @@ commander_1.program
 \\____/ \\___|_|  \\__, |\\___|\\_\\_ \\_| |_/\\___/ 
                  __/ |                      
                 |___/   AI on European terms`)
-    .version(process.env.npm_package_version || '0.0.1', '-v, --version')
+    .version(package_json_1.version, '-v, --version')
     .option('--local', 'Use local API endpoint (hidden)', false)
     .option('--debug', 'Enable debug output', false);
 // Register all commands
@@ -23,5 +28,46 @@ commander_1.program
 // Check for .bergetconfig if not running a command
 if (process.argv.length <= 2) {
     (0, config_checker_1.checkBergetConfig)();
+    // Show helpful welcome message
+    console.log(chalk_1.default.blue('\nWelcome to the Berget CLI!'));
+    console.log(chalk_1.default.blue('Common commands:'));
+    console.log(chalk_1.default.blue(`  ${chalk_1.default.bold('berget auth login')}      - Log in to Berget`));
+    console.log(chalk_1.default.blue(`  ${chalk_1.default.bold('berget models list')}     - List available AI models`));
+    console.log(chalk_1.default.blue(`  ${chalk_1.default.bold('berget chat run')}        - Start a chat session`));
+    console.log(chalk_1.default.blue(`  ${chalk_1.default.bold('berget api-keys list')}   - List your API keys`));
+    console.log(chalk_1.default.blue(`\nRun ${chalk_1.default.bold('berget --help')} for a complete list of commands.`));
 }
+// Add helpful suggestions for common command mistakes
+const commonMistakes = {
+    'login': 'auth login',
+    'logout': 'auth logout',
+    'whoami': 'auth whoami',
+    'list-models': 'models list',
+    'list-keys': 'api-keys list',
+    'create-key': 'api-keys create',
+    'list-clusters': 'clusters list',
+    'usage': 'billing usage'
+};
+// Add error handler for unknown commands
+commander_1.program.on('command:*', (operands) => {
+    const unknownCommand = operands[0];
+    console.error(chalk_1.default.red(`Error: unknown command '${unknownCommand}'`));
+    // Check if this is a known mistake and suggest the correct command
+    if (unknownCommand in commonMistakes) {
+        console.log(chalk_1.default.yellow(`Did you mean? ${chalk_1.default.bold(`berget ${commonMistakes[unknownCommand]}`)}`));
+    }
+    else {
+        // Try to find similar commands
+        const availableCommands = commander_1.program.commands.map(cmd => cmd.name());
+        const similarCommands = availableCommands.filter(cmd => cmd.includes(unknownCommand) || unknownCommand.includes(cmd));
+        if (similarCommands.length > 0) {
+            console.log(chalk_1.default.yellow('Similar commands:'));
+            similarCommands.forEach(cmd => {
+                console.log(chalk_1.default.yellow(`  ${chalk_1.default.bold(`berget ${cmd}`)}`));
+            });
+        }
+        console.log(chalk_1.default.blue('\nRun `berget --help` for a list of available commands.'));
+    }
+    process.exit(1);
+});
 commander_1.program.parse(process.argv);

package/dist/package.json

@@ -0,0 +1,35 @@
+{
+    "name": "berget",
+    "version": "1.3.0",
+    "main": "dist/index.js",
+    "bin": {
+        "berget": "dist/index.js"
+    },
+    "private": false,
+    "scripts": {
+        "start": "node --import tsx ./index.ts --local",
+        "login": "node --import tsx ./index.ts --local auth login",
+        "logout": "node --import tsx ./index.ts --local auth logout",
+        "whoami": "node --import tsx ./index.ts --local auth whoami",
+        "build": "tsc",
+        "prepublishOnly": "npm run build",
+        "generate-types": "openapi-typescript https://api.berget.ai/openapi.json -o src/types/api.d.ts"
+    },
+    "author": "Berget AI AB",
+    "license": "MIT",
+    "description": "This is a cli command for interacting with the AI infrastructure provider Berget",
+    "devDependencies": {
+        "@types/node": "^20.11.20",
+        "tsx": "^4.19.3",
+        "typescript": "^5.3.3"
+    },
+    "dependencies": {
+        "chalk": "^4.1.2",
+        "commander": "^12.0.0",
+        "fs-extra": "^11.3.0",
+        "open": "^9.1.0",
+        "openapi-fetch": "^0.9.1",
+        "openapi-typescript": "^6.7.4",
+        "readline": "^1.3.0"
+    }
+}

package/dist/src/client.js

@@ -12,21 +12,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthenticatedClient = exports.clearAuthToken = exports.saveAuthToken = exports.getAuthToken = exports.apiClient = void 0;
+exports.createAuthenticatedClient = exports.clearAuthToken = exports.saveAuthToken = exports.getAuthToken = exports.apiClient = exports.API_BASE_URL = void 0;
 const openapi_fetch_1 = __importDefault(require("openapi-fetch"));
 const chalk_1 = __importDefault(require("chalk"));
 const token_manager_1 = require("./utils/token-manager");
+const logger_1 = require("./utils/logger");
 // API Base URL
 // Use --local flag to test against local API
 const isLocalMode = process.argv.includes('--local');
-const API_BASE_URL = process.env.BERGET_API_URL ||
+exports.API_BASE_URL = process.env.BERGET_API_URL ||
     (isLocalMode ? 'http://localhost:3000' : 'https://api.berget.ai');
-if (isLocalMode && !process.env.BERGET_API_URL && process.argv.includes('--debug')) {
-    console.log(chalk_1.default.yellow('Using local API endpoint: http://localhost:3000'));
+if (isLocalMode && !process.env.BERGET_API_URL) {
+    logger_1.logger.debug('Using local API endpoint: http://localhost:3000');
 }
 // Create a typed client for the Berget API
 exports.apiClient = (0, openapi_fetch_1.default)({
-    baseUrl: API_BASE_URL,
+    baseUrl: exports.API_BASE_URL,
     headers: {
         'Content-Type': 'application/json',
         Accept: 'application/json',
@@ -51,12 +52,12 @@ exports.clearAuthToken = clearAuthToken;
 // Create an authenticated client with refresh token support
 const createAuthenticatedClient = () => {
     const tokenManager = token_manager_1.TokenManager.getInstance();
-    if (!tokenManager.getAccessToken() && process.argv.includes('--debug')) {
-        console.warn(chalk_1.default.yellow('No authentication token found. Please run `berget auth login` first.'));
+    if (!tokenManager.getAccessToken()) {
+        logger_1.logger.debug('No authentication token found. Please run `berget auth login` first.');
     }
     // Create the base client
     const client = (0, openapi_fetch_1.default)({
-        baseUrl: API_BASE_URL,
+        baseUrl: exports.API_BASE_URL,
         headers: tokenManager.getAccessToken()
             ? {
                 Authorization: `Bearer ${tokenManager.getAccessToken()}`,
@@ -75,13 +76,14 @@ const createAuthenticatedClient = () => {
             if (typeof target[prop] === 'function' &&
                 ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(String(prop))) {
                 return (...args) => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     // Check if token is expired before making the request
                     if (tokenManager.isTokenExpired() && tokenManager.getRefreshToken()) {
                         yield refreshAccessToken(tokenManager);
                     }
                     // Update the Authorization header with the current token
-                    if (tokenManager.getAccessToken()) {
+                    if (!((_b = (_a = args[1]) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.Authorization) &&
+                        tokenManager.getAccessToken()) {
                         if (!args[1])
                             args[1] = {};
                         if (!args[1].headers)
@@ -94,11 +96,9 @@ const createAuthenticatedClient = () => {
                         result = yield target[prop](...args);
                     }
                     catch (requestError) {
-                        if (process.argv.includes('--debug')) {
-                            console.log(chalk_1.default.red(`DEBUG: Request error: ${requestError instanceof Error
-                                ? requestError.message
-                                : String(requestError)}`));
-                        }
+                        logger_1.logger.debug(`Request error: ${requestError instanceof Error
+                            ? requestError.message
+                            : String(requestError)}`);
                         return {
                             error: {
                                 message: `Request failed: ${requestError instanceof Error
@@ -110,31 +110,45 @@ const createAuthenticatedClient = () => {
                     // If we get an auth error, try to refresh the token and retry
                     if (result.error) {
                         // Detect various forms of authentication errors
-                        const isAuthError = 
-                        // Standard 401 Unauthorized
-                        (typeof result.error === 'object' && result.error.status === 401) ||
+                        let isAuthError = false;
+                        try {
+                            // Standard 401 Unauthorized
+                            if (typeof result.error === 'object' &&
+                                result.error.status === 401) {
+                                isAuthError = true;
+                            }
                             // OAuth specific errors
-                            (result.error.error &&
+                            else if (result.error.error &&
                                 (result.error.error.code === 'invalid_token' ||
                                     result.error.error.code === 'token_expired' ||
                                     result.error.error.message === 'Invalid API key' ||
-                                    ((_a = result.error.error.message) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('token')) ||
-                                    ((_b = result.error.error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('unauthorized')))) ||
+                                    ((_c = result.error.error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('token')) ||
+                                    ((_d = result.error.error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('unauthorized')))) {
+                                isAuthError = true;
+                            }
                             // Message-based detection as fallback
-                            (typeof result.error === 'string' &&
+                            else if (typeof result.error === 'string' &&
                                 (result.error.toLowerCase().includes('unauthorized') ||
                                     result.error.toLowerCase().includes('token') ||
-                                    result.error.toLowerCase().includes('auth')));
-                        if (isAuthError && tokenManager.getRefreshToken()) {
-                            if (process.argv.includes('--debug')) {
-                                console.log(chalk_1.default.yellow('DEBUG: Auth error detected, attempting token refresh'));
-                                console.log(chalk_1.default.yellow(`DEBUG: Error details: ${JSON.stringify(result.error, null, 2)}`));
+                                    result.error.toLowerCase().includes('auth'))) {
+                                isAuthError = true;
                             }
+                        }
+                        catch (parseError) {
+                            // If we can't parse the error structure, do a simple string check
+                            const errorStr = String(result.error);
+                            if (errorStr.toLowerCase().includes('unauthorized') ||
+                                errorStr.toLowerCase().includes('token') ||
+                                errorStr.toLowerCase().includes('auth')) {
+                                isAuthError = true;
+                            }
+                        }
+                        if (isAuthError && tokenManager.getRefreshToken()) {
+                            logger_1.logger.debug('Auth error detected, attempting token refresh');
+                            logger_1.logger.debug(`Error details: ${JSON.stringify(result.error, null, 2)}`);
                             const refreshed = yield refreshAccessToken(tokenManager);
                             if (refreshed) {
-                                if (process.argv.includes('--debug')) {
-                                    console.log(chalk_1.default.green('DEBUG: Token refreshed successfully, retrying request'));
-                                }
+                                logger_1.logger.debug('Token refreshed successfully, retrying request');
                                 // Update the Authorization header with the new token
                                 if (!args[1])
                                     args[1] = {};
@@ -145,12 +159,11 @@ const createAuthenticatedClient = () => {
                                 return yield target[prop](...args);
                             }
                             else {
-                                if (process.argv.includes('--debug')) {
-                                    console.log(chalk_1.default.red('DEBUG: Token refresh failed'));
-                                }
+                                logger_1.logger.debug('Token refresh failed');
                                 // Add a more helpful error message for users
                                 if (typeof result.error === 'object') {
-                                    result.error.userMessage = 'Your session has expired. Please run `berget auth login` to log in again.';
+                                    result.error.userMessage =
+                                        'Your session has expired. Please run `berget auth login` to log in again.';
                                 }
                             }
                         }
@@ -171,12 +184,10 @@ function refreshAccessToken(tokenManager) {
             const refreshToken = tokenManager.getRefreshToken();
             if (!refreshToken)
                 return false;
-            if (process.argv.includes('--debug')) {
-                console.log(chalk_1.default.yellow('DEBUG: Attempting to refresh access token'));
-            }
+            logger_1.logger.debug('Attempting to refresh access token');
             // Use fetch directly since this endpoint might not be in the OpenAPI spec
             try {
-                const response = yield fetch(`${API_BASE_URL}/v1/auth/refresh`, {
+                const response = yield fetch(`${exports.API_BASE_URL}/v1/auth/refresh`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
@@ -186,9 +197,7 @@ function refreshAccessToken(tokenManager) {
                 });
                 // Handle HTTP errors
                 if (!response.ok) {
-                    if (process.argv.includes('--debug')) {
-                        console.log(chalk_1.default.yellow(`DEBUG: Token refresh error: HTTP ${response.status} ${response.statusText}`));
-                    }
+                    logger_1.logger.debug(`Token refresh error: HTTP ${response.status} ${response.statusText}`);
                     // Check if the refresh token itself is expired or invalid
                     if (response.status === 401 || response.status === 403) {
                         console.warn(chalk_1.default.yellow('Your refresh token has expired. Please run `berget auth login` again.'));
@@ -212,21 +221,19 @@ function refreshAccessToken(tokenManager) {
                     console.warn(chalk_1.default.yellow('Invalid token response. Please run `berget auth login` again.'));
                     return false;
                 }
-                if (process.argv.includes('--debug')) {
-                    console.log(chalk_1.default.green('DEBUG: Token refreshed successfully'));
-                }
+                logger_1.logger.debug('Token refreshed successfully');
                 // Update the token
                 tokenManager.updateAccessToken(data.token, data.expires_in || 3600);
                 // If a new refresh token was provided, update that too
                 if (data.refresh_token) {
                     tokenManager.setTokens(data.token, data.refresh_token, data.expires_in || 3600);
-                    if (process.argv.includes('--debug')) {
-                        console.log(chalk_1.default.green('DEBUG: Refresh token also updated'));
-                    }
+                    logger_1.logger.debug('Refresh token also updated');
                 }
             }
             catch (fetchError) {
-                console.warn(chalk_1.default.yellow(`Failed to refresh token: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`));
+                console.warn(chalk_1.default.yellow(`Failed to refresh token: ${fetchError instanceof Error
+                    ? fetchError.message
+                    : String(fetchError)}`));
                 return false;
             }
             return true;

package/dist/src/commands/api-keys.js

@@ -50,9 +50,13 @@ function registerApiKeyCommands(program) {
                 const status = key.active
                     ? chalk_1.default.green('● Active')
                     : chalk_1.default.red('● Inactive');
+                // Format the prefix to ensure it's not too long
+                const prefixStr = key.prefix.length > 12
+                    ? key.prefix.substring(0, 12) + '...'
+                    : key.prefix;
                 console.log(String(key.id).padEnd(10) +
                     key.name.padEnd(25) +
-                    key.prefix.padEnd(12) +
+                    prefixStr.padEnd(15) +
                     status.padEnd(12) +
                     key.created.substring(0, 10).padEnd(12) +
                     lastUsed);
@@ -230,7 +234,9 @@ function registerApiKeyCommands(program) {
             }
             // Save the default API key
             const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
-            defaultApiKeyManager.setDefaultApiKey(id, selectedKey.name, selectedKey.prefix);
+            // We need to rotate the key to get the actual key value
+            const rotatedKey = yield apiKeyService.rotate(id);
+            defaultApiKeyManager.setDefaultApiKey(id, selectedKey.name, selectedKey.prefix, rotatedKey.key);
             console.log(chalk_1.default.green(`✓ API key "${selectedKey.name}" set as default for chat commands`));
             console.log('');
             console.log(chalk_1.default.dim('This API key will be used by default when running chat commands'));
@@ -246,8 +252,8 @@ function registerApiKeyCommands(program) {
         .action(() => {
         try {
             const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
-            const defaultApiKey = defaultApiKeyManager.getDefaultApiKey();
-            if (!defaultApiKey) {
+            const defaultApiKeyData = defaultApiKeyManager.getDefaultApiKeyData();
+            if (!defaultApiKeyData) {
                 console.log(chalk_1.default.yellow('No default API key set'));
                 console.log('');
                 console.log('To set a default API key, run:');
@@ -256,9 +262,9 @@ function registerApiKeyCommands(program) {
             }
             console.log(chalk_1.default.bold('Default API key:'));
             console.log('');
-            console.log(`${chalk_1.default.dim('ID:')}     ${defaultApiKey.id}`);
-            console.log(`${chalk_1.default.dim('Name:')}   ${defaultApiKey.name}`);
-            console.log(`${chalk_1.default.dim('Prefix:')} ${defaultApiKey.prefix}`);
+            console.log(`${chalk_1.default.dim('ID:')}     ${defaultApiKeyData.id}`);
+            console.log(`${chalk_1.default.dim('Name:')}   ${defaultApiKeyData.name}`);
+            console.log(`${chalk_1.default.dim('Prefix:')} ${defaultApiKeyData.prefix}`);
             console.log('');
             console.log(chalk_1.default.dim('This API key will be used by default when running chat commands'));
             console.log(chalk_1.default.dim('You can override it with --api-key or --api-key-id options'));

package/dist/src/commands/chat.js

@@ -48,25 +48,70 @@ function registerChatCommands(program) {
     chat
         .command(command_structure_1.SUBCOMMANDS.CHAT.RUN)
         .description('Run a chat session with a specified model')
-        .argument('[model]', 'Model to use (default: berget-70b-instruct)')
+        .argument('[model]', 'Model to use (default: google/gemma-3-27b-it)')
         .option('-s, --system <message>', 'System message')
         .option('-t, --temperature <temp>', 'Temperature (0-1)', parseFloat)
         .option('-m, --max-tokens <tokens>', 'Maximum tokens to generate', parseInt)
         .option('-k, --api-key <key>', 'API key to use for this chat session')
         .option('--api-key-id <id>', 'ID of the API key to use from your saved keys')
+        .option('--stream', 'Stream the response')
         .action((options) => __awaiter(this, void 0, void 0, function* () {
         try {
             const chatService = chat_service_1.ChatService.getInstance();
             // Check if we have an API key or need to get one
             let apiKey = options.apiKey;
             let apiKeyId = options.apiKeyId;
-            // If no API key or API key ID provided, check for default API key
-            if (!apiKey && !apiKeyId) {
-                const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
-                const defaultApiKey = defaultApiKeyManager.getDefaultApiKey();
-                if (defaultApiKey) {
-                    apiKeyId = defaultApiKey.id;
-                    console.log(chalk_1.default.dim(`Using default API key: ${defaultApiKey.name}`));
+            // Check for environment variable first
+            const envApiKey = process.env.BERGET_API_KEY;
+            if (envApiKey) {
+                console.log(chalk_1.default.dim(`Using API key from BERGET_API_KEY environment variable`));
+                apiKey = envApiKey;
+                // Debug the API key (first few characters only)
+                if (process.argv.includes('--debug')) {
+                    console.log(chalk_1.default.yellow(`DEBUG: API key from env starts with: ${envApiKey.substring(0, 4)}...`));
+                }
+            }
+            // If API key is already provided via command line, use it
+            else if (options.apiKey) {
+                console.log(chalk_1.default.dim(`Using API key from command line argument`));
+                apiKey = options.apiKey;
+            }
+            // If no API key or API key ID provided and no env var, check for default API key
+            else if (!apiKey && !apiKeyId) {
+                try {
+                    const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
+                    const defaultApiKeyData = defaultApiKeyManager.getDefaultApiKeyData();
+                    if (defaultApiKeyData) {
+                        apiKeyId = defaultApiKeyData.id;
+                        apiKey = defaultApiKeyData.key;
+                        if (apiKey) {
+                            console.log(chalk_1.default.dim(`Using default API key: ${defaultApiKeyData.name}`));
+                        }
+                        else {
+                            console.log(chalk_1.default.yellow(`Default API key "${defaultApiKeyData.name}" exists but the key value is missing.`));
+                            console.log(chalk_1.default.yellow(`Try rotating the key with: berget api-keys rotate ${defaultApiKeyData.id}`));
+                        }
+                    }
+                    else {
+                        // No default API key, prompt the user to create one
+                        console.log(chalk_1.default.yellow('No default API key set.'));
+                        // Try to prompt for a default API key
+                        apiKey = yield defaultApiKeyManager.promptForDefaultApiKey();
+                        if (!apiKey) {
+                            console.log(chalk_1.default.red('Error: An API key is required to use the chat command.'));
+                            console.log(chalk_1.default.yellow('You can:'));
+                            console.log(chalk_1.default.yellow('1. Create an API key with: berget api-keys create --name "My Key"'));
+                            console.log(chalk_1.default.yellow('2. Set a default API key with: berget api-keys set-default <id>'));
+                            console.log(chalk_1.default.yellow('3. Provide an API key with the --api-key option'));
+                            return;
+                        }
+                    }
+                }
+                catch (error) {
+                    if (process.argv.includes('--debug')) {
+                        console.log(chalk_1.default.yellow('DEBUG: Error checking default API key:'));
+                        console.log(chalk_1.default.yellow(String(error)));
+                    }
                 }
             }
             // If no direct API key, try to get one from API key ID
@@ -92,8 +137,18 @@ function registerChatCommands(program) {
                     }
                 }
                 catch (error) {
-                    console.error(chalk_1.default.red('Error fetching API key:'));
-                    console.error(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) {
+                        console.log(chalk_1.default.yellow('Authentication required. Please run `berget auth login` first.'));
+                    }
+                    else {
+                        console.error(chalk_1.default.red('Error fetching API key:'));
+                        console.error(error);
+                    }
                     console.log(chalk_1.default.yellow('Using default authentication instead.'));
                 }
             }
@@ -145,13 +200,40 @@ function registerChatCommands(program) {
                     });
                     try {
                         // Call the API
-                        const response = yield chatService.createCompletion({
-                            model: ((_a = options.args) === null || _a === void 0 ? void 0 : _a[0]) || 'berget-70b-instruct',
+                        const completionOptions = {
+                            model: ((_a = options.args) === null || _a === void 0 ? void 0 : _a[0]) || 'google/gemma-3-27b-it',
                             messages: messages,
                             temperature: options.temperature !== undefined ? options.temperature : 0.7,
                             max_tokens: options.maxTokens || 4096,
-                            apiKey: apiKey,
-                        });
+                            stream: options.stream || false
+                        };
+                        // Only add apiKey if it actually exists
+                        if (apiKey) {
+                            completionOptions.apiKey = apiKey;
+                        }
+                        // Add streaming support
+                        if (options.stream) {
+                            let assistantResponse = '';
+                            process.stdout.write(chalk_1.default.blue('Assistant: '));
+                            completionOptions.onChunk = (chunk) => {
+                                if (chunk.choices && chunk.choices[0] && chunk.choices[0].delta && chunk.choices[0].delta.content) {
+                                    const content = chunk.choices[0].delta.content;
+                                    process.stdout.write(content);
+                                    assistantResponse += content;
+                                }
+                            };
+                            yield chatService.createCompletion(completionOptions);
+                            console.log('\n');
+                            // Add assistant response to messages
+                            messages.push({
+                                role: 'assistant',
+                                content: assistantResponse
+                            });
+                            // Continue the conversation
+                            askQuestion();
+                            return;
+                        }
+                        const response = yield chatService.createCompletion(completionOptions);
                         // Debug output
                         if (program.opts().debug) {
                             console.log(chalk_1.default.yellow('DEBUG: Full response:'));
@@ -209,10 +291,10 @@ function registerChatCommands(program) {
             // If no API key or API key ID provided, check for default API key
             if (!apiKey && !apiKeyId) {
                 const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
-                const defaultApiKey = defaultApiKeyManager.getDefaultApiKey();
-                if (defaultApiKey) {
-                    apiKeyId = defaultApiKey.id;
-                    console.log(chalk_1.default.dim(`Using default API key: ${defaultApiKey.name}`));
+                const defaultApiKeyData = defaultApiKeyManager.getDefaultApiKeyData();
+                if (defaultApiKeyData) {
+                    apiKeyId = defaultApiKeyData.id;
+                    console.log(chalk_1.default.dim(`Using default API key: ${defaultApiKeyData.name}`));
                 }
             }
             if (apiKeyId && !apiKey) {

package/dist/src/services/api-key-service.js

@@ -35,18 +35,8 @@ class ApiKeyService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { data, error } = yield this.client.GET('/v1/api-keys');
-                if (error) {
-                    // Check if this is an authentication error
-                    const errorObj = typeof error === 'string' ? JSON.parse(error) : error;
-                    if (errorObj.status === 401) {
-                        throw new Error(JSON.stringify({
-                            error: "Authentication failed. Your session may have expired.",
-                            code: "AUTH_FAILED",
-                            details: "Please run 'berget login' to authenticate again."
-                        }));
-                    }
-                    throw new Error(JSON.stringify(error));
-                }
+                if (error)
+                    throw error;
                 return data || [];
             }
             catch (error) {
@@ -63,7 +53,7 @@ class ApiKeyService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { data, error } = yield this.client.POST('/v1/api-keys', {
-                    body: options
+                    body: options,
                 });
                 if (error)
                     throw new Error(JSON.stringify(error));
@@ -83,7 +73,7 @@ class ApiKeyService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { error } = yield this.client.DELETE('/v1/api-keys/{id}', {
-                    params: { path: { id } }
+                    params: { path: { id } },
                 });
                 if (error)
                     throw new Error(JSON.stringify(error));
@@ -103,7 +93,7 @@ class ApiKeyService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { data, error } = yield this.client.PUT('/v1/api-keys/{id}/rotate', {
-                    params: { path: { id } }
+                    params: { path: { id } },
                 });
                 if (error)
                     throw new Error(JSON.stringify(error));
@@ -123,7 +113,7 @@ class ApiKeyService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { data, error } = yield this.client.GET('/v1/api-keys/{id}/usage', {
-                    params: { path: { id } }
+                    params: { path: { id } },
                 });
                 if (error)
                     throw new Error(JSON.stringify(error));