berget 2.0.3 → 2.0.5

package/index.ts

@@ -5,6 +5,8 @@ import { registerCommands } from './src/commands'
 import { checkBergetConfig } from './src/utils/config-checker'
 import chalk from 'chalk'
 import { version } from './package.json'
+process.env.DOTENV_CONFIG_OVERRIDE = 'true'
+import 'dotenv/config'
 
 // Set version and description
 program
@@ -18,7 +20,7 @@ program
 \\____/ \\___|_|  \\__, |\\___|\\_\\_ \\_| |_/\\___/ 
                  __/ |                      
                 |___/   AI on European terms
-Version: ${version}`,
+Version: ${version}`
   )
   .version(version, '-v, --version')
   .option('--local', 'Use local API endpoint (hidden)', false)
@@ -35,34 +37,32 @@ if (process.argv.length <= 2) {
   console.log(chalk.blue('\nWelcome to the Berget CLI!'))
   console.log(chalk.blue('Common commands:'))
   console.log(
-    chalk.blue(`  ${chalk.bold('berget auth login')}      - Log in to Berget`),
+    chalk.blue(`  ${chalk.bold('berget auth login')}      - Log in to Berget`)
   )
   console.log(
     chalk.blue(
-      `  ${chalk.bold('berget models list')}     - List available AI models`,
-    ),
+      `  ${chalk.bold('berget models list')}     - List available AI models`
+    )
   )
   console.log(
     chalk.blue(
-      `  ${chalk.bold('berget chat run')}        - Start a chat session`,
-    ),
+      `  ${chalk.bold('berget chat run')}        - Start a chat session`
+    )
   )
   console.log(
     chalk.blue(
       `  ${chalk.bold(
-        'berget code init',
-      )}       - Initialize AI coding assistant`,
-    ),
+        'berget code init'
+      )}       - Initialize AI coding assistant`
+    )
   )
   console.log(
-    chalk.blue(
-      `  ${chalk.bold('berget api-keys list')}   - List your API keys`,
-    ),
+    chalk.blue(`  ${chalk.bold('berget api-keys list')}   - List your API keys`)
   )
   console.log(
     chalk.blue(
-      `\nRun ${chalk.bold('berget --help')} for a complete list of commands.`,
-    ),
+      `\nRun ${chalk.bold('berget --help')} for a complete list of commands.`
+    )
   )
 }
 
@@ -89,15 +89,15 @@ program.on('command:*', (operands) => {
     console.log(
       chalk.yellow(
         `Did you mean? ${chalk.bold(
-          `berget ${commonMistakes[unknownCommand]}`,
-        )}`,
-      ),
+          `berget ${commonMistakes[unknownCommand]}`
+        )}`
+      )
     )
   } else {
     // Try to find similar commands
     const availableCommands = program.commands.map((cmd) => cmd.name())
     const similarCommands = availableCommands.filter(
-      (cmd) => cmd.includes(unknownCommand) || unknownCommand.includes(cmd),
+      (cmd) => cmd.includes(unknownCommand) || unknownCommand.includes(cmd)
     )
 
     if (similarCommands.length > 0) {
@@ -108,7 +108,7 @@ program.on('command:*', (operands) => {
     }
 
     console.log(
-      chalk.blue('\nRun `berget --help` for a list of available commands.'),
+      chalk.blue('\nRun `berget --help` for a list of available commands.')
     )
   }
 

package/opencode.json

@@ -58,7 +58,7 @@
         "webfetch": "allow"
       },
       "description": "Declarative GitOps infra with FluxCD, Kustomize, Helm, operators.",
-      "prompt": "You are Berget Code DevOps agent. Voice: Scandinavian calm—precise, concise, confident. Start simple: k8s/{deployment,service,ingress}. Add FluxCD sync to repo and image automation. Use Kustomize bases/overlays (staging, production). Add dependencies via Helm from upstream sources; prefer native operators when available (CloudNativePG, cert-manager, external-dns). SemVer with -rc tags keeps CI environments current. Observability with Prometheus/Grafana. No manual kubectl in production—Git is the source of truth."
+      "prompt": "You are Berget Code DevOps agent. Voice: Scandinavian calm—precise, concise, confident. Start simple: k8s/{deployment,service,ingress}. Add FluxCD sync to repo and image automation. Use Kustomize bases/overlays (staging, production). Add dependencies via Helm from upstream sources; prefer native operators when available (CloudNativePG, cert-manager, external-dns). SemVer with -rc tags keeps CI environments current. Observability with Prometheus/Grafana. No manual kubectl in production—Git is the source of truth.\n\nHelm Values Configuration Process:\n1. Documentation First Approach: Always fetch official documentation from Artifact Hub/GitHub for the specific chart version before writing values. Search Artifact Hub for exact chart version documentation, check the chart's GitHub repository for official docs and examples, verify the exact version being used in the deployment.\n2. Validation Requirements: Check for available validation schemas before committing YAML files. Use Helm's built-in validation tools (helm lint, helm template). Validate against JSON schema if available for the chart. Ensure YAML syntax correctness with linters.\n3. Standard Workflow: Identify chart name and exact version. Fetch official documentation from Artifact Hub/GitHub. Check for available schemas and validation tools. Write values according to official documentation. Validate against schema (if available). Test with helm template or helm lint. Commit validated YAML files.\n4. Quality Assurance: Never commit unvalidated Helm values. Use helm dependency update when adding new charts. Test rendering with helm template --dry-run before deployment. Document any custom values with comments referencing official docs."
     },
     "app": {
       "model": "berget/deepseek-r1",

package/package.json

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

package/src/commands/api-keys.ts

@@ -4,6 +4,35 @@ import { ApiKeyService, ApiKey } from '../services/api-key-service'
 import { handleError } from '../utils/error-handler'
 import { DefaultApiKeyManager } from '../utils/default-api-key'
 
+// Helper functions for better date formatting
+function formatDate(dateString: string): string {
+  const date = new Date(dateString)
+  const now = new Date()
+  const diffTime = Math.abs(now.getTime() - date.getTime())
+  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+  
+  if (diffDays === 0) return chalk.green('Today')
+  if (diffDays === 1) return chalk.yellow('Yesterday')
+  if (diffDays < 7) return chalk.yellow(`${diffDays} days ago`)
+  if (diffDays < 30) return chalk.blue(`${Math.floor(diffDays / 7)} weeks ago`)
+  if (diffDays < 365) return chalk.magenta(`${Math.floor(diffDays / 30)} months ago`)
+  return chalk.gray(`${Math.floor(diffDays / 365)} years ago`)
+}
+
+function formatLastUsed(dateString: string): string {
+  const date = new Date(dateString)
+  const now = new Date()
+  const diffTime = Math.abs(now.getTime() - date.getTime())
+  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+  
+  if (diffDays === 0) return chalk.green('Today')
+  if (diffDays === 1) return chalk.yellow('Yesterday')
+  if (diffDays < 7) return chalk.yellow(`${diffDays} days ago`)
+  if (diffDays < 30) return chalk.blue(`${Math.floor(diffDays / 7)} weeks ago`)
+  if (diffDays < 365) return chalk.magenta(`${Math.floor(diffDays / 30)} months ago`)
+  return chalk.gray(`${Math.floor(diffDays / 365)} years ago`)
+}
+
 /**
  * Register API key commands
  */
@@ -29,42 +58,59 @@ export function registerApiKeyCommands(program: Command): void {
           return
         }
 
-        console.log(chalk.bold('Your API keys:'))
+        console.log(chalk.bold('🔑 Your API keys:'))
         console.log('')
 
-        // Create a table-like format with headers
+        // Create a more readable table with better spacing and colors
+        const idWidth = 10
+        const nameWidth = 30
+        const prefixWidth = 20
+        const statusWidth = 12
+        const createdWidth = 12
+        const usedWidth = 15
+
         console.log(
-          chalk.dim('ID'.padEnd(10)) +
-            chalk.dim('NAME'.padEnd(25)) +
-            chalk.dim('PREFIX'.padEnd(12)) +
-            chalk.dim('STATUS'.padEnd(12)) +
-            chalk.dim('CREATED'.padEnd(12)) +
-            chalk.dim('LAST USED'),
+          chalk.dim('ID'.padEnd(idWidth)) +
+            chalk.dim('NAME'.padEnd(nameWidth)) +
+            chalk.dim('PREFIX'.padEnd(prefixWidth)) +
+            chalk.dim('STATUS'.padEnd(statusWidth)) +
+            chalk.dim('CREATED'.padEnd(createdWidth)) +
+            chalk.dim('LAST USED')
         )
 
-        console.log(chalk.dim('─'.repeat(85)))
+        console.log(chalk.dim('─'.repeat(idWidth + nameWidth + prefixWidth + statusWidth + createdWidth + usedWidth + 5)))
 
         keys.forEach((key: ApiKey) => {
           const lastUsed = key.lastUsed
-            ? key.lastUsed.substring(0, 10)
-            : 'Never'
+            ? formatLastUsed(key.lastUsed)
+            : chalk.yellow('Never used')
           const status = key.active
             ? chalk.green('● Active')
             : chalk.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
+          // Show only first 8 characters of ID for easier reading
+          const shortId = chalk.cyan(String(key.id).substring(0, 8))
+
+          // Format the prefix with better truncation
+          const prefixStr = key.prefix.length > prefixWidth
+            ? key.prefix.substring(0, prefixWidth - 3) + '...'
+            : chalk.gray(key.prefix)
+
+          // Truncate name if too long
+          const nameStr = key.name.length > nameWidth
+            ? key.name.substring(0, nameWidth - 3) + '...'
+            : key.name
+
+          // Format created date
+          const createdDate = formatDate(key.created)
 
           console.log(
-            String(key.id).padEnd(10) +
-              key.name.padEnd(25) +
-              prefixStr.padEnd(15) +
-              status.padEnd(12) +
-              key.created.substring(0, 10).padEnd(12) +
-              lastUsed,
+            shortId.padEnd(idWidth) +
+              nameStr.padEnd(nameWidth) +
+              prefixStr.padEnd(prefixWidth) +
+              status.padEnd(statusWidth) +
+              createdDate.padEnd(createdWidth) +
+              lastUsed
           )
         })
 
@@ -90,6 +136,7 @@ export function registerApiKeyCommands(program: Command): void {
     .description('Create a new API key')
     .option('--name <name>', 'Name of the API key')
     .option('--description <description>', 'Description of the API key')
+
     .action(async (options) => {
       try {
         if (!options.name) {
@@ -149,15 +196,96 @@ export function registerApiKeyCommands(program: Command): void {
   apiKey
     .command(ApiKeyService.COMMANDS.DELETE)
     .description('Delete an API key')
-    .argument('<id>', 'ID of the API key to delete')
-    .action(async (id) => {
+    .argument(
+      '<identifier>',
+      'ID (first 8 chars), full ID, or name of the API key to delete',
+    )
+    .action(async (identifier) => {
       try {
-        console.log(chalk.blue(`Deleting API key ${id}...`))
-
         const apiKeyService = ApiKeyService.getInstance()
-        await apiKeyService.delete(id)
 
-        console.log(chalk.green(`✓ API key ${id} has been deleted`))
+        // First, get all API keys to find the matching one
+        const keys = await apiKeyService.list()
+
+        // Try to find the key by:
+        // 1. Full ID match
+        // 2. Short ID (first 8 chars) match
+        // 3. Exact name match
+        // 4. Partial name match
+
+        // Check for exact matches first (full ID or exact name)
+        let exactMatches = keys.filter(
+          (key) => String(key.id) === identifier || key.name === identifier,
+        )
+
+        // If no exact matches, check for short ID matches
+        if (exactMatches.length === 0) {
+          exactMatches = keys.filter(
+            (key) => String(key.id).substring(0, 8) === identifier,
+          )
+        }
+
+        // If still no matches, check for partial name matches
+        if (exactMatches.length === 0) {
+          exactMatches = keys.filter((key) =>
+            key.name.toLowerCase().includes(identifier.toLowerCase()),
+          )
+        }
+
+        // Handle multiple matches
+        if (exactMatches.length > 1) {
+          console.error(
+            chalk.red(
+              `Error: Multiple API keys found matching "${identifier}"`,
+            ),
+          )
+          console.log('')
+          console.log('Please be more specific. Matching keys:')
+          exactMatches.forEach((key) => {
+            const shortId = String(key.id).substring(0, 8)
+            console.log(`  ${shortId.padEnd(8)} ${key.name}`)
+          })
+          console.log('')
+          console.log(
+            'Use the first 8 characters of the ID to specify which key to delete.',
+          )
+          return
+        }
+
+        // Handle no matches
+        if (exactMatches.length === 0) {
+          console.error(
+            chalk.red(`Error: No API key found matching "${identifier}"`),
+          )
+          console.log('')
+          console.log('Available API keys:')
+          keys.forEach((key) => {
+            const shortId = String(key.id).substring(0, 8)
+            console.log(`  ${shortId.padEnd(8)} ${key.name}`)
+          })
+          console.log('')
+          console.log(
+            'Use the first 8 characters of the ID, full ID, or name to delete.',
+          )
+          return
+        }
+
+        const matchingKey = exactMatches[0]
+
+        const keyId = String(matchingKey.id)
+        const shortId = keyId.substring(0, 8)
+
+        console.log(
+          chalk.blue(`Deleting API key ${shortId} (${matchingKey.name})...`),
+        )
+
+        await apiKeyService.delete(keyId)
+
+        console.log(
+          chalk.green(
+            `✓ API key ${shortId} (${matchingKey.name}) has been deleted`,
+          ),
+        )
         console.log('')
         console.log(
           chalk.dim(

package/src/commands/chat.ts

@@ -41,11 +41,11 @@ export function registerChatCommands(program: Command): void {
   chat
     .command(SUBCOMMANDS.CHAT.RUN)
     .description('Run a chat session with a specified model')
-    .argument('[model]', 'Model to use (default: openai/gpt-oss)')
     .argument('[message]', 'Message to send directly (skips interactive mode)')
-    .option('-s, --system <message>', 'System message')
+.option('-m, --model <model>', 'Model to use (default: deepseek-r1)')
+    .option('--no-reasoning', 'Disable reasoning mode (adds </think> to messages)')
     .option('-t, --temperature <temp>', 'Temperature (0-1)', parseFloat)
-    .option('-m, --max-tokens <tokens>', 'Maximum tokens to generate', parseInt)
+    .option('--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>',
@@ -55,7 +55,7 @@ export function registerChatCommands(program: Command): void {
       '--no-stream',
       'Disable streaming (streaming is enabled by default)',
     )
-    .action(async (model, message, options) => {
+    .action(async (message, options) => {
       try {
         const chatService = ChatService.getInstance()
 
@@ -279,7 +279,7 @@ export function registerChatCommands(program: Command): void {
           try {
             // Call the API
             const completionOptions: ChatCompletionOptions = {
-              model: model || 'openai/gpt-oss',
+              model: options.model || 'openai/gpt-oss',
               messages: messages,
               temperature:
                 options.temperature !== undefined ? options.temperature : 0.7,
@@ -415,7 +415,7 @@ export function registerChatCommands(program: Command): void {
             try {
               // Call the API
               const completionOptions: ChatCompletionOptions = {
-                model: model || 'openai/gpt-oss',
+                model: options.model || 'openai/gpt-oss',
                 messages: messages,
                 temperature:
                   options.temperature !== undefined ? options.temperature : 0.7,