berget 2.1.2 → 2.2.0

package/src/client.ts

@@ -9,13 +9,20 @@ import { logger } from './utils/logger'
 
 // API Base URL
 // Use --local flag to test against local API
+// Use --stage flag to test against stage API
 const isLocalMode = process.argv.includes('--local')
+const isStageMode = process.argv.includes('--stage')
+
 export const API_BASE_URL =
   process.env.BERGET_API_URL ||
-  (isLocalMode ? 'http://localhost:3000' : 'https://api.berget.ai')
+  (isLocalMode ? 'http://localhost:3000' :
+   isStageMode ? 'https://api.stage.berget.ai' :
+   'https://api.berget.ai') // production default
 
 if (isLocalMode && !process.env.BERGET_API_URL) {
   logger.debug('Using local API endpoint: http://localhost:3000')
+} else if (isStageMode && !process.env.BERGET_API_URL) {
+  logger.debug('Using stage API endpoint: https://api.stage.berget.ai')
 }
 
 // Create a typed client for the Berget API
@@ -209,6 +216,13 @@ export const createAuthenticatedClient = () => {
   })
 }
 
+// Keycloak configuration for token refresh (must match auth-service.ts)
+const KEYCLOAK_URL = (isStageMode || isLocalMode)
+  ? 'https://keycloak.stage.berget.ai'
+  : 'https://keycloak.berget.ai'
+const KEYCLOAK_REALM = 'berget'
+const KEYCLOAK_CLIENT_ID = 'berget-code'
+
 // Helper function to refresh the access token
 async function refreshAccessToken(
   tokenManager: TokenManager,
@@ -219,16 +233,22 @@ async function refreshAccessToken(
 
     logger.debug('Attempting to refresh access token')
 
-    // Use fetch directly since this endpoint might not be in the OpenAPI spec
+    // Refresh directly against Keycloak (berget-code is a public PKCE client)
     try {
-      const response = await fetch(`${API_BASE_URL}/v1/auth/refresh`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
+      const response = await fetch(
+        `${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/token`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+          body: new URLSearchParams({
+            grant_type: 'refresh_token',
+            client_id: KEYCLOAK_CLIENT_ID,
+            refresh_token: refreshToken,
+          }),
         },
-        body: JSON.stringify({ refresh_token: refreshToken }),
-      })
+      )
 
       // Handle HTTP errors
       if (!response.ok) {

package/src/commands/code.ts

@@ -10,7 +10,7 @@ import { readFile, writeFile } from 'fs/promises'
 import path from 'path'
 import { spawn } from 'child_process'
 import { updateEnvFile } from '../utils/env-manager'
-import { createAuthenticatedClient } from '../client'
+import { createAuthenticatedClient, getAuthToken } from '../client'
 import {
   getConfigLoader,
   getModelConfig,
@@ -829,7 +829,7 @@ export function registerCodeCommands(program: Command): void {
               npm: '@ai-sdk/openai-compatible',
               name: 'Berget AI',
               options: {
-                baseURL: 'https://api.berget.ai/v1',
+                baseURL: '{env:BERGET_API_URL}',
                 apiKey: '{env:BERGET_API_KEY}',
               },
               models: {
@@ -1181,6 +1181,32 @@ All agents follow these principles:
         // Set environment variables for opencode
         const env = { ...process.env }
 
+        // Set API base URL based on flags (default to production)
+        const isLocalMode = process.argv.includes('--local')
+        const isStageMode = process.argv.includes('--stage')
+        if (isLocalMode) {
+          env.BERGET_API_URL = 'http://localhost:3000/v1'
+          console.log(chalk.dim('Using local API: http://localhost:3000/v1'))
+        } else if (isStageMode) {
+          env.BERGET_API_URL = 'https://api.stage.berget.ai/v1'
+          console.log(chalk.dim('Using stage API: https://api.stage.berget.ai/v1'))
+        } else {
+          env.BERGET_API_URL = 'https://api.berget.ai/v1'
+        }
+
+        // Auth resolution: JWT first (if valid), then API-key
+        // This ensures seat-based users get proper tracking
+        const jwtToken = getAuthToken()
+        if (jwtToken) {
+          env.BERGET_API_KEY = jwtToken
+          console.log(chalk.dim('Using JWT token for authentication'))
+        } else if (env.BERGET_API_KEY) {
+          console.log(chalk.dim('Using API key for authentication'))
+        } else {
+          console.log(chalk.yellow('Warning: No authentication found'))
+          console.log(chalk.dim('  Run `berget auth login` or set BERGET_API_KEY'))
+        }
+
         // Prepare opencode command
         const opencodeArgs: string[] = []
 
@@ -1487,7 +1513,7 @@ All agents follow these principles:
               npm: '@ai-sdk/openai-compatible',
               name: 'Berget AI',
               options: {
-                baseURL: 'https://api.berget.ai/v1',
+                baseURL: '{env:BERGET_API_URL}',
                 apiKey: '{env:BERGET_API_KEY}',
               },
               models: getProviderModels(),