@vybestack/llxprt-code 0.4.7 → 0.5.0-nightly.251102.f115237d

package/dist/src/ui/commands/keyCommand.js

@@ -4,67 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind, } from './types.js';
-import { AuthType } from '@vybestack/llxprt-code-core';
+import { getRuntimeApi } from '../contexts/RuntimeContext.js';
 export const keyCommand = {
     name: 'key',
     description: 'set or remove API key for the current provider',
     kind: CommandKind.BUILT_IN,
     action: async (context, args) => {
-        const config = context.services.config;
-        if (!config) {
-            return {
-                type: 'message',
-                messageType: 'error',
-                content: 'No configuration available',
-            };
-        }
-        // Settings service not needed for command-level auth
-        const providerManager = config.getProviderManager();
-        if (!providerManager) {
-            return {
-                type: 'message',
-                messageType: 'error',
-                content: 'No provider manager available',
-            };
-        }
-        const activeProvider = providerManager.getActiveProvider();
-        const providerName = activeProvider.name;
         const apiKey = args?.trim();
-        // If no key provided or 'none', remove the key
-        if (!apiKey || apiKey.toLowerCase() === 'none') {
-            // Clear authentication using the provider's method (which now stores in SettingsService)
-            if (activeProvider.setApiKey) {
-                activeProvider.setApiKey('');
-            }
-            // If this is the Gemini provider, we might need to switch auth mode
-            const requiresAuthRefresh = providerName === 'gemini';
-            if (requiresAuthRefresh) {
-                await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
-            }
-            const isPaidMode = activeProvider.isPaidMode?.() ?? true;
-            const paymentMessage = !isPaidMode && providerName === 'gemini'
-                ? '\n✅ You are now in FREE MODE - using OAuth authentication'
-                : '';
-            return {
-                type: 'message',
-                messageType: 'info',
-                content: `API key removed for provider '${providerName}'${paymentMessage}`,
-            };
-        }
-        // Set the API key using the provider's method (which now stores in SettingsService)
-        if (activeProvider.setApiKey) {
-            activeProvider.setApiKey(apiKey);
-            // If this is the Gemini provider, we need to refresh auth to use API key mode
-            const requiresAuthRefresh = providerName === 'gemini';
-            if (requiresAuthRefresh) {
-                await config.refreshAuth(AuthType.USE_GEMINI);
-            }
-            // Check if we're now in paid mode
-            const isPaidMode = activeProvider.isPaidMode?.() ?? true;
-            const paymentWarning = isPaidMode
-                ? '\nWARNING: You are now in PAID MODE - API usage will be charged to your account'
-                : '';
-            // Trigger payment mode check if available
+        const runtime = getRuntimeApi();
+        try {
+            const targetKey = !apiKey || apiKey.toLowerCase() === 'none' ? null : apiKey;
+            const result = await runtime.updateActiveProviderApiKey(targetKey);
             const extendedContext = context;
             if (extendedContext.checkPaymentModeChange) {
                 setTimeout(extendedContext.checkPaymentModeChange, 100);
@@ -72,14 +22,15 @@ export const keyCommand = {
             return {
                 type: 'message',
                 messageType: 'info',
-                content: `API key updated for provider '${providerName}'${paymentWarning}`,
+                content: result.message,
             };
         }
-        else {
+        catch (error) {
+            const status = runtime.getActiveProviderStatus();
             return {
                 type: 'message',
                 messageType: 'error',
-                content: `Provider '${providerName}' does not support API key updates`,
+                content: `Failed to update API key for provider '${status.providerName ?? 'unknown'}': ${error instanceof Error ? error.message : String(error)}`,
             };
         }
     },

package/dist/src/ui/commands/keyCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keyCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,MAAM,CAAC,MAAM,UAAU,GAAiB;IACtC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,gDAAgD;IAC7D,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,SAAS,GACb,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;YAEnE,MAAM,eAAe,GAAG,OAEvB,CAAC;YACF,IAAI,eAAe,CAAC,sBAAsB,EAAE,CAAC;gBAC3C,UAAU,CAAC,eAAe,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;YACjD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,0CAA0C,MAAM,CAAC,YAAY,IAAI,SAAS,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;aAClJ,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/src/ui/commands/keyCommand.test.js

@@ -3,125 +3,71 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { keyCommand } from './keyCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+const mockRuntime = vi.hoisted(() => ({
+    updateActiveProviderApiKey: vi.fn(),
+    getActiveProviderStatus: vi.fn(),
+}));
+vi.mock('../contexts/RuntimeContext.js', () => ({
+    getRuntimeApi: () => mockRuntime,
+}));
 describe('keyCommand', () => {
-    let mockContext;
-    let mockActiveProvider;
-    let mockProviderManager;
-    let mockConfig;
+    let context;
     beforeEach(() => {
         vi.clearAllMocks();
-        // Create mock active provider
-        mockActiveProvider = {
-            name: 'test-provider',
-            setApiKey: vi.fn(),
-            isPaidMode: vi.fn().mockReturnValue(true),
-        };
-        // Create mock provider manager
-        mockProviderManager = {
-            getActiveProvider: vi.fn().mockReturnValue(mockActiveProvider),
-            getActiveProviderName: vi.fn().mockReturnValue('test-provider'),
-        };
-        // Create mock config with provider manager
-        mockConfig = {
-            getProviderManager: vi.fn().mockReturnValue(mockProviderManager),
-            setEphemeralSetting: vi.fn(),
-            refreshAuth: vi.fn(),
-            getSettingsService: vi.fn().mockReturnValue(null), // Return null to use fallback behavior
-        };
-        mockContext = createMockCommandContext({
-            services: {
-                config: mockConfig,
-            },
+        context = createMockCommandContext();
+        mockRuntime.getActiveProviderStatus.mockReturnValue({
+            providerName: 'test-provider',
+            modelName: 'model-x',
+            displayLabel: 'test-provider:model-x',
         });
-    });
-    it('should set API key when provided', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
-        }
-        const testApiKey = 'test-api-key-12345';
-        const result = await keyCommand.action(mockContext, testApiKey);
-        expect(mockActiveProvider.setApiKey).toHaveBeenCalledWith(testApiKey);
-        // setEphemeralSetting is no longer called - auth is stored via SettingsService through activeProvider.setApiKey()
-        expect(result).toEqual({
-            type: 'message',
-            messageType: 'info',
-            content: `API key updated for provider 'test-provider'\nWARNING: You are now in PAID MODE - API usage will be charged to your account`,
+        mockRuntime.updateActiveProviderApiKey.mockResolvedValue({
+            changed: true,
+            providerName: 'test-provider',
+            message: 'API key updated for provider',
+            isPaidMode: true,
         });
     });
-    it('should remove API key when empty string is provided', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
-        }
-        const result = await keyCommand.action(mockContext, '');
-        expect(mockActiveProvider.setApiKey).toHaveBeenCalledWith('');
-        // setEphemeralSetting is no longer called - auth is stored via SettingsService through activeProvider.setApiKey()
-        expect(result).toEqual({
-            type: 'message',
-            messageType: 'info',
-            content: `API key removed for provider 'test-provider'`,
-        });
+    it('updates API key when value provided', async () => {
+        const result = await keyCommand.action(context, 'abc123');
+        expect(mockRuntime.updateActiveProviderApiKey).toHaveBeenCalledWith('abc123');
+        expect(result?.type).toBe('message');
     });
-    it('should remove API key when "none" is provided', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
-        }
-        const result = await keyCommand.action(mockContext, 'none');
-        expect(mockActiveProvider.setApiKey).toHaveBeenCalledWith('');
-        // setEphemeralSetting is no longer called - auth is stored via SettingsService through activeProvider.setApiKey()
-        expect(result).toEqual({
-            type: 'message',
-            messageType: 'info',
-            content: `API key removed for provider 'test-provider'`,
+    it('removes API key when argument is none', async () => {
+        mockRuntime.updateActiveProviderApiKey.mockResolvedValue({
+            changed: true,
+            providerName: 'test-provider',
+            message: 'API key removed',
         });
-    });
-    it('should handle errors gracefully', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
+        const result = await keyCommand.action(context, 'none');
+        expect(mockRuntime.updateActiveProviderApiKey).toHaveBeenCalledWith(null);
+        expect(result?.type).toBe('message');
+        if (result?.type === 'message') {
+            expect(result.content).toContain('API key removed');
         }
-        // Mock a provider that doesn't support setApiKey
-        mockActiveProvider.setApiKey = undefined;
-        const result = await keyCommand.action(mockContext, 'invalid-key');
-        expect(result).toEqual({
-            type: 'message',
-            messageType: 'error',
-            content: `Provider 'test-provider' does not support API key updates`,
-        });
     });
-    it('should trigger payment mode check when successful and callback is available', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
+    it('returns error when updateActiveProviderApiKey throws', async () => {
+        mockRuntime.updateActiveProviderApiKey.mockRejectedValue(new Error('unsupported'));
+        const result = await keyCommand.action(context, 'abc123');
+        expect(result?.type).toBe('message');
+        if (result?.type === 'message') {
+            expect(result.messageType).toBe('error');
+            expect(result.content).toContain('unsupported');
         }
-        const mockCheckPaymentModeChange = vi.fn();
-        const extendedContext = {
-            ...mockContext,
-            checkPaymentModeChange: mockCheckPaymentModeChange,
-        };
-        vi.useFakeTimers();
-        await keyCommand.action(extendedContext, 'api-key-123');
-        expect(mockCheckPaymentModeChange).not.toHaveBeenCalled();
-        // Fast-forward the timer
-        vi.advanceTimersByTime(100);
-        expect(mockCheckPaymentModeChange).toHaveBeenCalledTimes(1);
-        vi.useRealTimers();
     });
-    it('should not trigger payment mode check when unsuccessful', async () => {
-        if (!keyCommand.action) {
-            throw new Error('keyCommand must have an action.');
-        }
-        // Mock a provider that doesn't support setApiKey
-        mockActiveProvider.setApiKey = undefined;
-        const mockCheckPaymentModeChange = vi.fn();
+    it('invokes payment mode callback asynchronously', async () => {
+        vi.useFakeTimers();
+        const checkPaymentModeChange = vi.fn();
         const extendedContext = {
-            ...mockContext,
-            checkPaymentModeChange: mockCheckPaymentModeChange,
+            ...context,
+            checkPaymentModeChange,
         };
-        vi.useFakeTimers();
-        await keyCommand.action(extendedContext, 'invalid-key');
+        await keyCommand.action(extendedContext, 'abc123');
+        expect(checkPaymentModeChange).not.toHaveBeenCalled();
         vi.advanceTimersByTime(100);
-        expect(mockCheckPaymentModeChange).not.toHaveBeenCalled();
+        expect(checkPaymentModeChange).toHaveBeenCalledTimes(1);
         vi.useRealTimers();
     });
 });

package/dist/src/ui/commands/keyCommand.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keyCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/keyfileCommand.js

@@ -4,29 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind, } from './types.js';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { homedir } from 'os';
+import { getRuntimeApi } from '../contexts/RuntimeContext.js';
 export const keyfileCommand = {
     name: 'keyfile',
     description: 'manage API key file for the current provider',
     kind: CommandKind.BUILT_IN,
     action: async (context, args) => {
-        const providerManager = getProviderManager();
         const filePath = args?.trim();
+        const runtime = getRuntimeApi();
+        const status = runtime.getActiveProviderStatus();
+        const providerName = status.providerName;
+        if (!providerName) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'No active provider available. Set a provider with /provider first.',
+            };
+        }
         try {
-            const activeProvider = providerManager.getActiveProvider();
-            const providerName = activeProvider.name;
-            // If no path provided, check for existing keyfile
             if (!filePath || filePath === '') {
-                // Check common keyfile locations
                 const keyfilePaths = [
                     path.join(homedir(), `.${providerName}_key`),
                     path.join(homedir(), `.${providerName}-key`),
                     path.join(homedir(), `.${providerName}_api_key`),
                 ];
-                // For specific providers, check their known keyfile locations
                 if (providerName === 'openai') {
                     keyfilePaths.unshift(path.join(homedir(), '.openai_key'));
                 }
@@ -34,14 +38,14 @@ export const keyfileCommand = {
                     keyfilePaths.unshift(path.join(homedir(), '.anthropic_key'));
                 }
                 let foundKeyfile = null;
-                for (const keyfilePath of keyfilePaths) {
+                for (const candidate of keyfilePaths) {
                     try {
-                        await fs.access(keyfilePath);
-                        foundKeyfile = keyfilePath;
+                        await fs.access(candidate);
+                        foundKeyfile = candidate;
                         break;
                     }
                     catch {
-                        // File doesn't exist, continue checking
+                        // continue searching
                     }
                 }
                 if (foundKeyfile) {
@@ -51,108 +55,53 @@ export const keyfileCommand = {
                         content: `Current keyfile for provider '${providerName}': ${foundKeyfile}\nTo remove: /keyfile none\nTo change: /keyfile <new_path>`,
                     };
                 }
-                else {
-                    return {
-                        type: 'message',
-                        messageType: 'info',
-                        content: `No keyfile found for provider '${providerName}'\nTo set: /keyfile <path>`,
-                    };
-                }
-            }
-            // Handle removal
-            if (filePath === 'none') {
-                const removedPath = context.services.settings.getProviderKeyfile(providerName);
-                // Clear authentication using the provider's method (which now stores in SettingsService)
-                if ('clearAuth' in activeProvider &&
-                    typeof activeProvider.clearAuth === 'function') {
-                    activeProvider.clearAuth();
-                }
-                else if (activeProvider.setApiKey) {
-                    // Fallback to clearing just the API key if clearAuth is not available
-                    activeProvider.setApiKey('');
-                }
-                else {
-                    return {
-                        type: 'message',
-                        messageType: 'error',
-                        content: `Provider '${providerName}' does not support keyfile commands`,
-                    };
-                }
-                // Remove from saved settings
-                if (removedPath) {
-                    context.services.settings.removeProviderKeyfile(providerName);
-                }
                 return {
                     type: 'message',
                     messageType: 'info',
-                    content: `Cleared keyfile and API key for provider '${providerName}'`,
+                    content: `No keyfile found for provider '${providerName}'\nTo set: /keyfile <path>`,
                 };
             }
-            // Verify keyfile exists and read the key
-            try {
-                const resolvedPath = filePath.replace(/^~/, homedir());
-                // Check if file exists
-                await fs.access(resolvedPath);
-                // Verify the file is not empty
-                const apiKey = (await fs.readFile(resolvedPath, 'utf-8')).trim();
-                if (!apiKey) {
-                    return {
-                        type: 'message',
-                        messageType: 'error',
-                        content: 'The specified file is empty',
-                    };
-                }
-                // Get the active provider
-                const activeProvider = providerManager.getActiveProvider();
-                const providerName = activeProvider.name;
-                // Set the API key directly on the provider
-                if (activeProvider.setApiKey) {
-                    activeProvider.setApiKey(apiKey);
-                }
-                else {
-                    return {
-                        type: 'message',
-                        messageType: 'error',
-                        content: `Provider '${providerName}' does not support API key authentication`,
-                    };
-                }
-                // Store the keyfile PATH in ephemeral settings for reference
-                // This helps track that we're using a keyfile vs direct key
-                if (context.services.config) {
-                    context.services.config.setEphemeralSetting('auth-keyfile', resolvedPath);
-                    // Don't clear auth-key - we just set it via setApiKey above!
-                    // The auth-key will be used immediately, and auth-keyfile is stored
-                    // for future reference (e.g., when reloading profiles)
-                }
-                // Check if we're now in paid mode
-                const isPaidMode = activeProvider.isPaidMode?.() ?? true;
-                const paymentWarning = isPaidMode
-                    ? '\nWARNING: You are now in PAID MODE - API usage will be charged to your account'
-                    : '';
-                // Trigger payment mode check if available
-                const extendedContext = context;
-                if (extendedContext.checkPaymentModeChange) {
-                    setTimeout(extendedContext.checkPaymentModeChange, 100);
-                }
+            if (filePath === 'none') {
+                await runtime.updateActiveProviderApiKey(null);
+                runtime.setEphemeralSetting('auth-keyfile', undefined);
+                context.services.settings.removeProviderKeyfile?.(providerName);
                 return {
                     type: 'message',
                     messageType: 'info',
-                    content: `API key loaded from ${resolvedPath} for provider '${providerName}'${paymentWarning}`,
+                    content: `Cleared keyfile and API key for provider '${providerName}'`,
                 };
             }
-            catch (error) {
+            const resolvedPath = filePath.replace(/^~/, homedir());
+            await fs.access(resolvedPath);
+            const apiKey = (await fs.readFile(resolvedPath, 'utf-8')).trim();
+            if (!apiKey) {
                 return {
                     type: 'message',
                     messageType: 'error',
-                    content: `Failed to manage keyfile: ${error instanceof Error ? error.message : String(error)}`,
+                    content: 'The specified file is empty',
                 };
             }
+            const result = await runtime.updateActiveProviderApiKey(apiKey);
+            runtime.setEphemeralSetting('auth-keyfile', resolvedPath);
+            context.services.settings.setProviderKeyfile?.(providerName, resolvedPath);
+            const extendedContext = context;
+            if (extendedContext.checkPaymentModeChange) {
+                setTimeout(extendedContext.checkPaymentModeChange, 100);
+            }
+            const paymentWarning = result.isPaidMode
+                ? '\nWARNING: You are now in PAID MODE - API usage will be charged to your account'
+                : '';
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `API key loaded from ${resolvedPath} for provider '${providerName}'${paymentWarning}`,
+            };
         }
         catch (error) {
             return {
                 type: 'message',
                 messageType: 'error',
-                content: `Failed to access provider: ${error instanceof Error ? error.message : String(error)}`,
+                content: `Failed to manage keyfile: ${error instanceof Error ? error.message : String(error)}`,
             };
         }
     },

package/dist/src/ui/commands/keyfileCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyfileCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyfileCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,MAAM,CAAC,MAAM,cAAc,GAAiB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,8CAA8C;IAC3D,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC;YAEzC,kDAAkD;YAClD,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBACjC,iCAAiC;gBACjC,MAAM,YAAY,GAAG;oBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,MAAM,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,MAAM,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,UAAU,CAAC;iBACjD,CAAC;gBAEF,8DAA8D;gBAC9D,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC9B,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;oBACxC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;gBAC/D,CAAC;gBAED,IAAI,YAAY,GAAkB,IAAI,CAAC;gBACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;oBACvC,IAAI,CAAC;wBACH,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC7B,YAAY,GAAG,WAAW,CAAC;wBAC3B,MAAM;oBACR,CAAC;oBAAC,MAAM,CAAC;wBACP,wCAAwC;oBAC1C,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,MAAM;wBACnB,OAAO,EAAE,iCAAiC,YAAY,MAAM,YAAY,4DAA4D;qBACrI,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,MAAM;wBACnB,OAAO,EAAE,kCAAkC,YAAY,4BAA4B;qBACpF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,iBAAiB;YACjB,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;gBAE7D,yFAAyF;gBACzF,IACE,WAAW,IAAI,cAAc;oBAC7B,OAAO,cAAc,CAAC,SAAS,KAAK,UAAU,EAC9C,CAAC;oBACD,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC7B,CAAC;qBAAM,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;oBACpC,sEAAsE;oBACtE,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,OAAO;wBACpB,OAAO,EAAE,aAAa,YAAY,qCAAqC;qBACxE,CAAC;gBACJ,CAAC;gBAED,6BAA6B;gBAC7B,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;gBAChE,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,6CAA6C,YAAY,GAAG;iBACtE,CAAC;YACJ,CAAC;YAED,yCAAyC;YACzC,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEvD,uBAAuB;gBACvB,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAE9B,+BAA+B;gBAC/B,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACjE,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,OAAO;wBACpB,OAAO,EAAE,6BAA6B;qBACvC,CAAC;gBACJ,CAAC;gBAED,0BAA0B;gBAC1B,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;gBAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC;gBAEzC,2CAA2C;gBAC3C,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;oBAC7B,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACN,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,OAAO;wBACpB,OAAO,EAAE,aAAa,YAAY,2CAA2C;qBAC9E,CAAC;gBACJ,CAAC;gBAED,6DAA6D;gBAC7D,4DAA4D;gBAC5D,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CACzC,cAAc,EACd,YAAY,CACb,CAAC;oBACF,6DAA6D;oBAC7D,oEAAoE;oBACpE,uDAAuD;gBACzD,CAAC;gBAED,kCAAkC;gBAClC,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,EAAE,EAAE,IAAI,IAAI,CAAC;gBACzD,MAAM,cAAc,GAAG,UAAU;oBAC/B,CAAC,CAAC,iFAAiF;oBACnF,CAAC,CAAC,EAAE,CAAC;gBAEP,0CAA0C;gBAC1C,MAAM,eAAe,GAAG,OAEvB,CAAC;gBACF,IAAI,eAAe,CAAC,sBAAsB,EAAE,CAAC;oBAC3C,UAAU,CAAC,eAAe,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;gBAC1D,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,uBAAuB,YAAY,kBAAkB,YAAY,IAAI,cAAc,EAAE;iBAC/F,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,6BAA6B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC/F,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,8BAA8B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;aAChG,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"keyfileCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyfileCommand.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/logoutCommand.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind, } from './types.js';
-import { getOAuthManager } from '../../providers/providerManagerInstance.js';
+import { getRuntimeApi } from '../contexts/RuntimeContext.js';
 export const logoutCommand = {
     name: 'logout',
     description: 'logout from OAuth authentication for a provider (gemini, qwen, anthropic)',
@@ -20,7 +20,7 @@ export const logoutCommand = {
             };
         }
         try {
-            const oauthManager = getOAuthManager();
+            const oauthManager = getRuntimeApi().getCliOAuthManager();
             if (!oauthManager) {
                 return {
                     type: 'message',

package/dist/src/ui/commands/logoutCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"logoutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/logoutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,IAAI,EAAE,QAAQ;IACd,WAAW,EACT,2EAA2E;IAC7E,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAE9B,uCAAuC;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EACL,4GAA4G;aAC/G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;YACvC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,gDAAgD;iBAC1D,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,MAAM,kBAAkB,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAChE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,qBAAqB,QAAQ,0BAA0B,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChG,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAErE,kFAAkF;YAClF,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEpC,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,8BAA8B,QAAQ,EAAE;iBAClD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,+DAA+D;gBAC/D,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,uCAAuC,QAAQ,0BAA0B;iBACnF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,yBAAyB,QAAQ,KAAK,YAAY,EAAE;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"logoutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/logoutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,IAAI,EAAE,QAAQ;IACd,WAAW,EACT,2EAA2E;IAC7E,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAE9B,uCAAuC;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EACL,4GAA4G;aAC/G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,aAAa,EAAE,CAAC,kBAAkB,EAAE,CAAC;YAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,gDAAgD;iBAC1D,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,MAAM,kBAAkB,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAChE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,qBAAqB,QAAQ,0BAA0B,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAChG,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAErE,kFAAkF;YAClF,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEpC,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,8BAA8B,QAAQ,EAAE;iBAClD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,+DAA+D;gBAC/D,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,uCAAuC,QAAQ,0BAA0B;iBACnF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,yBAAyB,QAAQ,KAAK,YAAY,EAAE;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/src/ui/commands/mcpCommand.js

@@ -11,6 +11,34 @@ const COLOR_RED = '\u001b[31m';
 const COLOR_CYAN = '\u001b[36m';
 const COLOR_GREY = '\u001b[90m';
 const RESET_COLOR = '\u001b[0m';
+const mcpAuthSchema = [
+    {
+        kind: 'value',
+        name: 'server',
+        description: 'Select MCP server to authenticate',
+        /**
+         * @plan:PLAN-20251013-AUTOCOMPLETE.P11
+         * @requirement:REQ-004
+         * Schema completer replaces legacy server list.
+         */
+        completer: async (ctx, partialArg) => {
+            const { config } = ctx.services;
+            if (!config) {
+                return [];
+            }
+            const mcpServers = config.getMcpServers() || {};
+            const normalizedPartial = partialArg.toLowerCase();
+            return Object.keys(mcpServers)
+                .filter((name) => normalizedPartial.length === 0
+                ? true
+                : name.toLowerCase().startsWith(normalizedPartial))
+                .map((name) => ({
+                value: name,
+                description: 'Configured MCP server',
+            }));
+        },
+    },
+];
 const getMcpStatus = async (context, showDescriptions, showSchema, showTips = false) => {
     const { config } = context.services;
     if (!config) {
@@ -268,6 +296,7 @@ const authCommand = {
     name: 'auth',
     description: 'Authenticate with an OAuth-enabled MCP server',
     kind: CommandKind.BUILT_IN,
+    schema: mcpAuthSchema,
     action: async (context, args) => {
         const serverName = args.trim();
         const { config } = context.services;
@@ -355,13 +384,6 @@ const authCommand = {
             };
         }
     },
-    completion: async (context, partialArg) => {
-        const { config } = context.services;
-        if (!config)
-            return [];
-        const mcpServers = config.getMcpServers() || {};
-        return Object.keys(mcpServers).filter((name) => name.startsWith(partialArg));
-    },
 };
 const listCommand = {
     name: 'list',