berget 2.0.2 → 2.0.4

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

@@ -0,0 +1,217 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, 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"));
+const logger_1 = require("./logger");
+class ConfigLoader {
+    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;
+    }
+    /**
+     * 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)}`);
+        }
+    }
+    /**
+     * Get agent configuration by name
+     */
+    getAgentConfig(agentName) {
+        var _a;
+        const config = this.loadConfig();
+        return ((_a = config.agent) === null || _a === void 0 ? void 0 : _a[agentName]) || null;
+    }
+    /**
+     * Get all agent configurations
+     */
+    getAllAgentConfigs() {
+        const config = this.loadConfig();
+        return config.agent || {};
+    }
+    /**
+     * Get model configuration
+     */
+    getModelConfig() {
+        const config = this.loadConfig();
+        // Extract from config or fall back to defaults
+        const primary = config.model || 'berget/deepseek-r1';
+        const small = config.small_model || 'berget/gpt-oss';
+        return { primary, small };
+    }
+    /**
+     * Get provider model configuration
+     */
+    getProviderModels() {
+        var _a, _b;
+        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) {
+            return config.provider.berget.models;
+        }
+        // Fallback to defaults
+        return {
+            'deepseek-r1': {
+                name: 'GLM-4.6',
+                limit: { output: 4000, context: 90000 }
+            },
+            'gpt-oss': {
+                name: 'GPT-OSS',
+                limit: { output: 4000, context: 128000 }
+            },
+            'llama-8b': {
+                name: 'llama-3.1-8b',
+                limit: { output: 4000, context: 128000 }
+            }
+        };
+    }
+    /**
+     * Get command configurations
+     */
+    getCommandConfigs() {
+        const config = this.loadConfig();
+        return config.command || {};
+    }
+    /**
+     * Get watcher configuration
+     */
+    getWatcherConfig() {
+        const config = this.loadConfig();
+        return config.watcher || { ignore: ['node_modules', 'dist', '.git', 'coverage'] };
+    }
+    /**
+     * Get provider configuration
+     */
+    getProviderConfig() {
+        const config = this.loadConfig();
+        return config.provider || {};
+    }
+    /**
+     * Check if an agent exists
+     */
+    hasAgent(agentName) {
+        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')
+     */
+    getSubagentNames() {
+        const agents = this.getAllAgentConfigs();
+        return Object.keys(agents).filter(name => agents[name].mode === 'subagent');
+    }
+    /**
+     * Reload configuration from file
+     */
+    reloadConfig() {
+        this.config = null;
+        return this.loadConfig();
+    }
+    /**
+     * Set custom configuration path (for testing or different environments)
+     */
+    setConfigPath(configPath) {
+        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
+ */
+function getAgentConfig(agentName, configPath) {
+    return getConfigLoader(configPath).getAgentConfig(agentName);
+}
+exports.getAgentConfig = getAgentConfig;
+/**
+ * Convenience function to get all agent configurations
+ */
+function getAllAgentConfigs(configPath) {
+    return getConfigLoader(configPath).getAllAgentConfigs();
+}
+exports.getAllAgentConfigs = getAllAgentConfigs;
+/**
+ * Convenience function to get model configuration
+ */
+function getModelConfig(configPath) {
+    return getConfigLoader(configPath).getModelConfig();
+}
+exports.getModelConfig = getModelConfig;
+/**
+ * Convenience function to get provider models
+ */
+function getProviderModels(configPath) {
+    return getConfigLoader(configPath).getProviderModels();
+}
+exports.getProviderModels = getProviderModels;

package/dist/tests/utils/config-loader.test.js

@@ -0,0 +1,182 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const config_loader_1 = require("../../src/utils/config-loader");
+const path = __importStar(require("path"));
+const fs_1 = require("fs");
+(0, vitest_1.describe)('ConfigLoader Singleton Pattern', () => {
+    const testConfigPath = path.join(process.cwd(), 'test-config.json');
+    const testConfigPath2 = path.join(process.cwd(), 'test-config2.json');
+    const testConfig = {
+        $schema: 'https://opencode.ai/config.json',
+        username: 'test-user',
+        model: 'test-model',
+        agent: {
+            test: {
+                model: 'test-model',
+                temperature: 0.5,
+                mode: 'primary',
+                permission: { edit: 'allow', bash: 'allow', webfetch: 'allow' },
+                description: 'Test agent',
+                prompt: 'Test prompt'
+            }
+        }
+    };
+    (0, vitest_1.beforeEach)(() => {
+        // Clean up any existing test files
+        if ((0, fs_1.existsSync)(testConfigPath))
+            (0, fs_1.unlinkSync)(testConfigPath);
+        if ((0, fs_1.existsSync)(testConfigPath2))
+            (0, fs_1.unlinkSync)(testConfigPath2);
+        config_loader_1.ConfigLoader.instance = null;
+    });
+    (0, vitest_1.afterEach)(() => {
+        // Clean up test files
+        if ((0, fs_1.existsSync)(testConfigPath))
+            (0, fs_1.unlinkSync)(testConfigPath);
+        if ((0, fs_1.existsSync)(testConfigPath2))
+            (0, fs_1.unlinkSync)(testConfigPath2);
+        config_loader_1.ConfigLoader.instance = null;
+    });
+    (0, vitest_1.it)('should create singleton instance on first call', () => {
+        const instance1 = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const instance2 = config_loader_1.ConfigLoader.getInstance();
+        (0, vitest_1.expect)(instance1).toBe(instance2);
+        (0, vitest_1.expect)(instance1.getConfigPath()).toBe(testConfigPath);
+    });
+    (0, vitest_1.it)('should ignore configPath parameter after first instantiation', () => {
+        const instance1 = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const instance2 = config_loader_1.ConfigLoader.getInstance(testConfigPath2); // Should be ignored
+        (0, vitest_1.expect)(instance1).toBe(instance2);
+        (0, vitest_1.expect)(instance1.getConfigPath()).toBe(testConfigPath); // Still uses first path
+    });
+    (0, vitest_1.it)('should load and cache configuration', () => {
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(testConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const config1 = loader.loadConfig();
+        const config2 = loader.loadConfig();
+        (0, vitest_1.expect)(config1).toBe(config2); // Same object reference (cached)
+        (0, vitest_1.expect)(config1.username).toBe('test-user');
+    });
+    (0, vitest_1.it)('should reload configuration when reloadConfig is called', () => {
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(testConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const config1 = loader.loadConfig();
+        // Modify file
+        const modifiedConfig = Object.assign(Object.assign({}, testConfig), { username: 'modified-user' });
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(modifiedConfig));
+        const config2 = loader.loadConfig(); // Should still be cached
+        (0, vitest_1.expect)(config2).toBe(config1);
+        (0, vitest_1.expect)(config2.username).toBe('test-user');
+        const config3 = loader.reloadConfig(); // Should reload
+        (0, vitest_1.expect)(config3).not.toBe(config1);
+        (0, vitest_1.expect)(config3.username).toBe('modified-user');
+    });
+    (0, vitest_1.it)('should change config path and clear cache with setConfigPath', () => {
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(testConfig));
+        (0, fs_1.writeFileSync)(testConfigPath2, JSON.stringify(Object.assign(Object.assign({}, testConfig), { username: 'user2' })));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const config1 = loader.loadConfig();
+        (0, vitest_1.expect)(config1.username).toBe('test-user');
+        loader.setConfigPath(testConfigPath2);
+        const config2 = loader.loadConfig();
+        (0, vitest_1.expect)(config2.username).toBe('user2');
+        (0, vitest_1.expect)(loader.getConfigPath()).toBe(testConfigPath2);
+    });
+    (0, vitest_1.it)('should throw error when config file does not exist', () => {
+        const loader = config_loader_1.ConfigLoader.getInstance('/nonexistent/config.json');
+        (0, vitest_1.expect)(() => loader.loadConfig()).toThrow('Configuration file not found');
+    });
+    (0, vitest_1.it)('should throw error when config file has invalid JSON', () => {
+        (0, fs_1.writeFileSync)(testConfigPath, 'invalid json content');
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        (0, vitest_1.expect)(() => loader.loadConfig()).toThrow('Invalid JSON in configuration file');
+    });
+    (0, vitest_1.it)('should provide fallback model configuration with warning', () => {
+        const minimalConfig = { username: 'test' }; // No model settings
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(minimalConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const modelConfig = loader.getModelConfig();
+        (0, vitest_1.expect)(modelConfig.primary).toBe('berget/deepseek-r1');
+        (0, vitest_1.expect)(modelConfig.small).toBe('berget/gpt-oss');
+    });
+    (0, vitest_1.it)('should provide fallback provider models with warning', () => {
+        const minimalConfig = { username: 'test' }; // No provider settings
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(minimalConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const providerModels = loader.getProviderModels();
+        (0, vitest_1.expect)(providerModels['deepseek-r1']).toBeDefined();
+        (0, vitest_1.expect)(providerModels['gpt-oss']).toBeDefined();
+        (0, vitest_1.expect)(providerModels['llama-8b']).toBeDefined();
+    });
+    (0, vitest_1.it)('should provide fallback watcher configuration with warning', () => {
+        const minimalConfig = { username: 'test' }; // No watcher settings
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(minimalConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const watcherConfig = loader.getWatcherConfig();
+        (0, vitest_1.expect)(watcherConfig.ignore).toContain('node_modules');
+        (0, vitest_1.expect)(watcherConfig.ignore).toContain('dist');
+        (0, vitest_1.expect)(watcherConfig.ignore).toContain('.git');
+        (0, vitest_1.expect)(watcherConfig.ignore).toContain('coverage');
+    });
+    (0, vitest_1.it)('should use actual configuration when provided', () => {
+        const fullConfig = Object.assign(Object.assign({}, testConfig), { model: 'custom-primary-model', small_model: 'custom-small-model', provider: {
+                berget: {
+                    models: {
+                        'custom-model': {
+                            name: 'Custom Model',
+                            limit: { output: 2000, context: 4000 }
+                        }
+                    }
+                }
+            }, watcher: {
+                ignore: ['custom-ignore']
+            } });
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(fullConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        const modelConfig = loader.getModelConfig();
+        (0, vitest_1.expect)(modelConfig.primary).toBe('custom-primary-model');
+        (0, vitest_1.expect)(modelConfig.small).toBe('custom-small-model');
+        const providerModels = loader.getProviderModels();
+        (0, vitest_1.expect)(providerModels['custom-model']).toBeDefined();
+        (0, vitest_1.expect)(providerModels['custom-model'].name).toBe('Custom Model');
+        const watcherConfig = loader.getWatcherConfig();
+        (0, vitest_1.expect)(watcherConfig.ignore).toEqual(['custom-ignore']);
+    });
+    (0, vitest_1.it)('should maintain consistent getter method behavior', () => {
+        (0, fs_1.writeFileSync)(testConfigPath, JSON.stringify(testConfig));
+        const loader = config_loader_1.ConfigLoader.getInstance(testConfigPath);
+        // All getter methods should use the same cached config
+        const agentConfig = loader.getAgentConfig('test');
+        const allAgents = loader.getAllAgentConfigs();
+        const commandConfigs = loader.getCommandConfigs();
+        const providerConfig = loader.getProviderConfig();
+        (0, vitest_1.expect)(agentConfig).toBeDefined();
+        (0, vitest_1.expect)(allAgents.test).toBeDefined();
+        (0, vitest_1.expect)(commandConfigs).toEqual({});
+        (0, vitest_1.expect)(providerConfig).toEqual({});
+    });
+});

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.2",
+  "version": "2.0.4",
   "main": "dist/index.js",
   "bin": {
     "berget": "dist/index.js"

package/src/commands/api-keys.ts

@@ -34,7 +34,7 @@ export function registerApiKeyCommands(program: Command): void {
 
         // Create a table-like format with headers
         console.log(
-          chalk.dim('ID'.padEnd(10)) +
+          chalk.dim('ID (8)'.padEnd(8)) +
             chalk.dim('NAME'.padEnd(25)) +
             chalk.dim('PREFIX'.padEnd(12)) +
             chalk.dim('STATUS'.padEnd(12)) +
@@ -52,6 +52,9 @@ export function registerApiKeyCommands(program: Command): void {
             ? chalk.green('● Active')
             : chalk.red('● Inactive')
 
+          // Show only first 8 characters of ID for easier reading
+          const shortId = String(key.id).substring(0, 8)
+
           // Format the prefix to ensure it's not too long
           const prefixStr =
             key.prefix.length > 12
@@ -59,7 +62,7 @@ export function registerApiKeyCommands(program: Command): void {
               : key.prefix
 
           console.log(
-            String(key.id).padEnd(10) +
+            shortId.padEnd(8) +
               key.name.padEnd(25) +
               prefixStr.padEnd(15) +
               status.padEnd(12) +
@@ -90,6 +93,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 +153,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(