berget 2.1.0 → 2.1.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "berget",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "main": "dist/index.js",
     "bin": {
         "berget": "dist/index.js"

package/dist/src/commands/code.js

@@ -357,9 +357,8 @@ function loadLatestAgentConfig() {
  */
 function checkOpencodeInstalled() {
     return new Promise((resolve) => {
-        const child = (0, child_process_1.spawn)('opencode', ['--version'], {
+        const child = (0, child_process_1.spawn)('which', ['opencode'], {
             stdio: 'pipe',
-            shell: true,
         });
         child.on('close', (code) => {
             resolve(code === 0);
@@ -475,12 +474,9 @@ function registerCodeCommands(program) {
             }
             else {
                 // Only require authentication if we don't have an API key
-                try {
-                    const authService = auth_service_1.AuthService.getInstance();
-                    // This will throw if not authenticated
-                    yield authService.whoami();
-                }
-                catch (error) {
+                const authService = auth_service_1.AuthService.getInstance();
+                const profile = yield authService.whoami();
+                if (!profile) {
                     console.log(chalk_1.default.red('❌ Not authenticated with Berget AI.'));
                     console.log(chalk_1.default.blue('To get started, you have two options:'));
                     console.log('');
@@ -504,62 +500,35 @@ function registerCodeCommands(program) {
             let keyName;
             try {
                 const apiKeyService = api_key_service_1.ApiKeyService.getInstance();
-                // Check for environment variable first (regardless of automation mode)
                 if (process.env.BERGET_API_KEY) {
-                    console.log(chalk_1.default.blue('🔑 Using BERGET_API_KEY from environment'));
-                    apiKey = process.env.BERGET_API_KEY;
-                    keyName = `env-key-${projectName}`;
-                }
-                else {
-                    // List existing API keys
-                    if (!options.yes) {
-                        console.log(chalk_1.default.blue('\n📋 Checking existing API keys...'));
+                    if (options.yes) {
+                        console.log(chalk_1.default.blue('🔑 Using BERGET_API_KEY from environment'));
+                        apiKey = process.env.BERGET_API_KEY;
+                        keyName = `env-key-${projectName}`;
                     }
-                    const existingKeys = yield apiKeyService.list();
-                    if (existingKeys.length > 0 && !options.yes) {
-                        console.log(chalk_1.default.blue('Found existing API keys:'));
+                    else {
+                        console.log(chalk_1.default.blue('\n📋 API key setup:'));
                         console.log(chalk_1.default.dim('─'.repeat(60)));
-                        existingKeys.forEach((key, index) => {
-                            console.log(`${chalk_1.default.cyan((index + 1).toString())}. ${chalk_1.default.bold(key.name)} (${key.prefix}...)`);
-                            console.log(chalk_1.default.dim(`   Created: ${new Date(key.created).toLocaleDateString('sv-SE')}`));
-                            console.log(chalk_1.default.dim(`   Last used: ${key.lastUsed
-                                ? new Date(key.lastUsed).toLocaleDateString('sv-SE')
-                                : 'Never'}`));
-                            if (index < existingKeys.length - 1)
-                                console.log();
-                        });
+                        console.log(`${chalk_1.default.cyan('1')} ${chalk_1.default.bold('Use existing API key')}`);
+                        console.log(chalk_1.default.dim('   Uses BERGET_API_KEY from environment'));
+                        console.log(`${chalk_1.default.cyan('2')} ${chalk_1.default.bold('Create a new API key')}`);
                         console.log(chalk_1.default.dim('─'.repeat(60)));
-                        console.log(chalk_1.default.cyan(`${existingKeys.length + 1}. Create a new API key`));
-                        // Get user choice
                         const choice = yield new Promise((resolve) => {
                             const rl = readline_1.default.createInterface({
                                 input: process.stdin,
                                 output: process.stdout,
                             });
-                            rl.question(chalk_1.default.blue('\nSelect an option (1-' + (existingKeys.length + 1) + '): '), (answer) => {
+                            rl.question(chalk_1.default.blue('\nSelect an option (1-2, default: 1): '), (answer) => {
                                 rl.close();
-                                resolve(answer.trim());
+                                resolve(answer.trim() || '1');
                             });
                         });
-                        const choiceIndex = parseInt(choice) - 1;
-                        if (choiceIndex >= 0 && choiceIndex < existingKeys.length) {
-                            // Use existing key
-                            const selectedKey = existingKeys[choiceIndex];
-                            keyName = selectedKey.name;
-                            // We need to rotate the key to get the actual key value
-                            console.log(chalk_1.default.yellow(`\n🔄 Rotating API key "${selectedKey.name}" to get the key value...`));
-                            if (yield confirm(chalk_1.default.yellow('This will invalidate the current key. Continue? (Y/n): '), options.yes)) {
-                                const rotatedKey = yield apiKeyService.rotate(selectedKey.id.toString());
-                                apiKey = rotatedKey.key;
-                                console.log(chalk_1.default.green(`✓ API key rotated successfully`));
-                            }
-                            else {
-                                console.log(chalk_1.default.yellow('Cancelled. Please select a different option or create a new key.'));
-                                return;
-                            }
+                        if (choice === '1') {
+                            console.log(chalk_1.default.blue('🔑 Using BERGET_API_KEY from environment'));
+                            apiKey = process.env.BERGET_API_KEY;
+                            keyName = `env-key-${projectName}`;
                         }
-                        else if (choiceIndex === existingKeys.length) {
-                            // Create new key
+                        else if (choice === '2') {
                             console.log(chalk_1.default.blue('\n🔑 Creating new API key...'));
                             const defaultKeyName = `opencode-${projectName}-${Date.now()}`;
                             const customName = yield getInput(chalk_1.default.blue(`Enter key name (default: ${defaultKeyName}): `), defaultKeyName, options.yes);
@@ -574,20 +543,21 @@ function registerCodeCommands(program) {
                             return;
                         }
                     }
-                    else {
-                        // No existing keys or automation mode - create new one
-                        if (!options.yes) {
-                            console.log(chalk_1.default.yellow('No existing API keys found.'));
-                            console.log(chalk_1.default.blue('Creating a new API key...'));
-                        }
-                        const defaultKeyName = `opencode-${projectName}-${Date.now()}`;
-                        const customName = yield getInput(chalk_1.default.blue(`Enter key name (default: ${defaultKeyName}): `), defaultKeyName, options.yes);
-                        keyName = customName;
-                        const createOptions = { name: keyName };
-                        const keyData = yield apiKeyService.create(createOptions);
-                        apiKey = keyData.key;
-                        console.log(chalk_1.default.green(`✓ Created new API key: ${keyName}`));
+                }
+                else {
+                    if (!options.yes) {
+                        console.log(chalk_1.default.yellow('No BERGET_API_KEY environment variable found.'));
+                        console.log(chalk_1.default.blue('Creating a new API key...'));
+                        console.log(chalk_1.default.dim('\n💡 Tip: Set BERGET_API_KEY environment variable to reuse an existing key:'));
+                        console.log(chalk_1.default.dim('   export BERGET_API_KEY=your_api_key_here'));
                     }
+                    const defaultKeyName = `opencode-${projectName}-${Date.now()}`;
+                    const customName = yield getInput(chalk_1.default.blue(`Enter key name (default: ${defaultKeyName}): `), defaultKeyName, options.yes);
+                    keyName = customName;
+                    const createOptions = { name: keyName };
+                    const keyData = yield apiKeyService.create(createOptions);
+                    apiKey = keyData.key;
+                    console.log(chalk_1.default.green(`✓ Created new API key: ${keyName}`));
                 }
             }
             catch (error) {
@@ -1050,7 +1020,6 @@ All agents follow these principles:
             const opencode = (0, child_process_1.spawn)('opencode', opencodeArgs, {
                 stdio: 'inherit',
                 env: env,
-                shell: true,
             });
             opencode.on('close', (code) => {
                 if (code !== 0) {
@@ -1090,7 +1059,6 @@ All agents follow these principles:
             // Spawn opencode serve process
             const opencode = (0, child_process_1.spawn)('opencode', serveArgs, {
                 stdio: 'inherit',
-                shell: true,
             });
             opencode.on('close', (code) => {
                 if (code !== 0) {

package/dist/src/services/auth-service.js

@@ -60,12 +60,11 @@ class AuthService {
             try {
                 const { data: profile, error } = yield this.client.GET('/v1/users/me');
                 if (error) {
-                    throw new Error(error ? JSON.stringify(error) : 'Failed to get user profile');
+                    return null;
                 }
                 return profile;
             }
             catch (error) {
-                (0, error_handler_1.handleError)('Failed to get user profile', error);
                 return null;
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "berget",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "dist/index.js",
   "bin": {
     "berget": "dist/index.js"

package/src/commands/code.ts

@@ -376,9 +376,8 @@ async function loadLatestAgentConfig(): Promise<any> {
  */
 function checkOpencodeInstalled(): Promise<boolean> {
   return new Promise((resolve) => {
-    const child = spawn('opencode', ['--version'], {
+    const child = spawn('which', ['opencode'], {
       stdio: 'pipe',
-      shell: true,
     })
 
     child.on('close', (code) => {
@@ -530,11 +529,10 @@ export function registerCodeCommands(program: Command): void {
           )
         } else {
           // Only require authentication if we don't have an API key
-          try {
-            const authService = AuthService.getInstance()
-            // This will throw if not authenticated
-            await authService.whoami()
-          } catch (error) {
+          const authService = AuthService.getInstance()
+          const profile = await authService.whoami()
+
+          if (!profile) {
             console.log(chalk.red('❌ Not authenticated with Berget AI.'))
             console.log(chalk.blue('To get started, you have two options:'))
             console.log('')
@@ -578,104 +576,39 @@ export function registerCodeCommands(program: Command): void {
         try {
           const apiKeyService = ApiKeyService.getInstance()
 
-          // Check for environment variable first (regardless of automation mode)
           if (process.env.BERGET_API_KEY) {
-            console.log(chalk.blue('🔑 Using BERGET_API_KEY from environment'))
-            apiKey = process.env.BERGET_API_KEY
-            keyName = `env-key-${projectName}`
-          } else {
-            // List existing API keys
-            if (!options.yes) {
-              console.log(chalk.blue('\n📋 Checking existing API keys...'))
-            }
-            const existingKeys = await apiKeyService.list()
-
-            if (existingKeys.length > 0 && !options.yes) {
-              console.log(chalk.blue('Found existing API keys:'))
-              console.log(chalk.dim('─'.repeat(60)))
-              existingKeys.forEach((key, index) => {
-                console.log(
-                  `${chalk.cyan((index + 1).toString())}. ${chalk.bold(
-                    key.name
-                  )} (${key.prefix}...)`
-                )
-                console.log(
-                  chalk.dim(
-                    `   Created: ${new Date(key.created).toLocaleDateString(
-                      'sv-SE'
-                    )}`
-                  )
-                )
-                console.log(
-                  chalk.dim(
-                    `   Last used: ${
-                      key.lastUsed
-                        ? new Date(key.lastUsed).toLocaleDateString('sv-SE')
-                        : 'Never'
-                    }`
-                  )
-                )
-                if (index < existingKeys.length - 1) console.log()
-              })
+            if (options.yes) {
+              console.log(chalk.blue('🔑 Using BERGET_API_KEY from environment'))
+              apiKey = process.env.BERGET_API_KEY
+              keyName = `env-key-${projectName}`
+            } else {
+              console.log(chalk.blue('\n📋 API key setup:'))
               console.log(chalk.dim('─'.repeat(60)))
               console.log(
-                chalk.cyan(`${existingKeys.length + 1}. Create a new API key`)
+                `${chalk.cyan('1')} ${chalk.bold('Use existing API key')}`
+              )
+              console.log(chalk.dim('   Uses BERGET_API_KEY from environment'))
+              console.log(
+                `${chalk.cyan('2')} ${chalk.bold('Create a new API key')}`
               )
+              console.log(chalk.dim('─'.repeat(60)))
 
-              // Get user choice
               const choice = await new Promise<string>((resolve) => {
                 const rl = readline.createInterface({
                   input: process.stdin,
                   output: process.stdout,
                 })
-                rl.question(
-                  chalk.blue(
-                    '\nSelect an option (1-' + (existingKeys.length + 1) + '): '
-                  ),
-                  (answer) => {
-                    rl.close()
-                    resolve(answer.trim())
-                  }
-                )
+                rl.question(chalk.blue('\nSelect an option (1-2, default: 1): '), (answer) => {
+                  rl.close()
+                  resolve(answer.trim() || '1')
+                })
               })
 
-              const choiceIndex = parseInt(choice) - 1
-
-              if (choiceIndex >= 0 && choiceIndex < existingKeys.length) {
-                // Use existing key
-                const selectedKey = existingKeys[choiceIndex]
-                keyName = selectedKey.name
-
-                // We need to rotate the key to get the actual key value
-                console.log(
-                  chalk.yellow(
-                    `\n🔄 Rotating API key "${selectedKey.name}" to get the key value...`
-                  )
-                )
-
-                if (
-                  await confirm(
-                    chalk.yellow(
-                      'This will invalidate the current key. Continue? (Y/n): '
-                    ),
-                    options.yes
-                  )
-                ) {
-                  const rotatedKey = await apiKeyService.rotate(
-                    selectedKey.id.toString()
-                  )
-                  apiKey = rotatedKey.key
-                  console.log(chalk.green(`✓ API key rotated successfully`))
-                } else {
-                  console.log(
-                    chalk.yellow(
-                      'Cancelled. Please select a different option or create a new key.'
-                    )
-                  )
-                  return
-                }
-              } else if (choiceIndex === existingKeys.length) {
-                // Create new key
+              if (choice === '1') {
+                console.log(chalk.blue('🔑 Using BERGET_API_KEY from environment'))
+                apiKey = process.env.BERGET_API_KEY
+                keyName = `env-key-${projectName}`
+              } else if (choice === '2') {
                 console.log(chalk.blue('\n🔑 Creating new API key...'))
 
                 const defaultKeyName = `opencode-${projectName}-${Date.now()}`
@@ -694,26 +627,27 @@ export function registerCodeCommands(program: Command): void {
                 console.log(chalk.red('Invalid selection.'))
                 return
               }
-            } else {
-              // No existing keys or automation mode - create new one
-              if (!options.yes) {
-                console.log(chalk.yellow('No existing API keys found.'))
-                console.log(chalk.blue('Creating a new API key...'))
-              }
+            }
+          } else {
+            if (!options.yes) {
+              console.log(chalk.yellow('No BERGET_API_KEY environment variable found.'))
+              console.log(chalk.blue('Creating a new API key...'))
+              console.log(chalk.dim('\n💡 Tip: Set BERGET_API_KEY environment variable to reuse an existing key:'))
+              console.log(chalk.dim('   export BERGET_API_KEY=your_api_key_here'))
+            }
 
-              const defaultKeyName = `opencode-${projectName}-${Date.now()}`
-              const customName = await getInput(
-                chalk.blue(`Enter key name (default: ${defaultKeyName}): `),
-                defaultKeyName,
-                options.yes
-              )
+            const defaultKeyName = `opencode-${projectName}-${Date.now()}`
+            const customName = await getInput(
+              chalk.blue(`Enter key name (default: ${defaultKeyName}): `),
+              defaultKeyName,
+              options.yes
+            )
 
-              keyName = customName
-              const createOptions: CreateApiKeyOptions = { name: keyName }
-              const keyData = await apiKeyService.create(createOptions)
-              apiKey = keyData.key
-              console.log(chalk.green(`✓ Created new API key: ${keyName}`))
-            }
+            keyName = customName
+            const createOptions: CreateApiKeyOptions = { name: keyName }
+            const keyData = await apiKeyService.create(createOptions)
+            apiKey = keyData.key
+            console.log(chalk.green(`✓ Created new API key: ${keyName}`))
           }
         } catch (error) {
           if (process.env.BERGET_API_KEY) {
@@ -1269,7 +1203,6 @@ All agents follow these principles:
         const opencode = spawn('opencode', opencodeArgs, {
           stdio: 'inherit',
           env: env,
-          shell: true,
         })
 
         opencode.on('close', (code) => {
@@ -1322,7 +1255,6 @@ All agents follow these principles:
         // Spawn opencode serve process
         const opencode = spawn('opencode', serveArgs, {
           stdio: 'inherit',
-          shell: true,
         })
 
         opencode.on('close', (code) => {

package/src/services/auth-service.ts

@@ -36,13 +36,10 @@ export class AuthService {
     try {
       const { data: profile, error } = await this.client.GET('/v1/users/me')
       if (error) {
-        throw new Error(
-          error ? JSON.stringify(error) : 'Failed to get user profile',
-        )
+        return null
       }
       return profile
     } catch (error) {
-      handleError('Failed to get user profile', error)
       return null
     }
   }