@vybestack/llxprt-code 0.1.20 → 0.1.21

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

@@ -0,0 +1,145 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { toolformatCommand } from './toolformatCommand.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { getProviderManager } from '../../providers/providerManagerInstance.js';
+vi.mock('../../providers/providerManagerInstance.js');
+function mockProvider(extra = {}) {
+    return {
+        name: 'openai',
+        getToolFormat: vi.fn().mockReturnValue('openai'),
+        setToolFormatOverride: vi.fn(),
+        getModels: vi.fn().mockResolvedValue([]),
+        generateChatCompletion: vi.fn(),
+        getServerTools: vi.fn().mockReturnValue([]),
+        invokeServerTool: vi.fn().mockResolvedValue({}),
+        ...extra,
+    };
+}
+describe('toolformatCommand', () => {
+    let mockContext;
+    let providerManager;
+    let provider;
+    let mockSettingsService;
+    beforeEach(() => {
+        provider = mockProvider();
+        providerManager = {
+            hasActiveProvider: vi.fn().mockReturnValue(true),
+            getActiveProvider: vi.fn().mockReturnValue(provider),
+            listProviders: vi.fn().mockReturnValue([]),
+            switchProvider: vi.fn(),
+            resetAllProviders: vi.fn(),
+        };
+        getProviderManager.mockReturnValue(providerManager);
+        // Mock SettingsService
+        mockSettingsService = {
+            getSettings: vi.fn().mockResolvedValue({ toolFormat: undefined }),
+            updateSettings: vi.fn().mockResolvedValue(undefined),
+        };
+        mockContext = createMockCommandContext();
+        mockContext.services.settings.merged.providerToolFormatOverrides = {
+            openai: 'xml',
+        };
+        mockContext.services.settings.setValue = vi.fn();
+        mockContext.services.config = {
+            getSettingsService: vi.fn().mockReturnValue(mockSettingsService),
+        };
+    });
+    it('shows current format and persist status if called with no arguments', async () => {
+        const result = await toolformatCommand.action(mockContext, '');
+        expect(result).toBeDefined();
+        expect(result?.type).toBe('message');
+        if (result && result.type === 'message') {
+            expect(result.content).toContain('Current tool format: openai');
+            expect(result.content).toMatch(/auto-detected|manual override/);
+        }
+    });
+    it('clears the override with auto', async () => {
+        const result = await toolformatCommand.action(mockContext, 'auto');
+        expect(result?.type).toBe('message');
+        if (result && result.type === 'message') {
+            expect(result.content).toMatch(/override cleared|auto-detection/);
+        }
+        expect(provider.setToolFormatOverride).toHaveBeenCalledWith(null);
+        // Should use SettingsService, not legacy settings
+        expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'auto' });
+    });
+    it('errors for invalid format', async () => {
+        const result = await toolformatCommand.action(mockContext, 'notrealformat');
+        expect(result?.type).toBe('message');
+        if (result && result.type === 'message') {
+            expect(result.messageType).toBe('error');
+            expect(result.content).toContain('Invalid tool format');
+        }
+    });
+    it('sets a valid override and persists', async () => {
+        const result = await toolformatCommand.action(mockContext, 'hermes');
+        expect(provider.setToolFormatOverride).toHaveBeenCalledWith('hermes');
+        // Should use SettingsService, not legacy settings
+        expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'hermes' });
+        expect(result?.type).toBe('message');
+        if (result && result.type === 'message') {
+            expect(result.messageType).toBe('info');
+            expect(result.content).toContain("override set to 'hermes'");
+        }
+    });
+    it('shows error if no active provider', async () => {
+        providerManager.hasActiveProvider = vi.fn().mockReturnValue(false);
+        const result = await toolformatCommand.action(mockContext, 'hermes');
+        expect(result?.type).toBe('message');
+        if (result && result.type === 'message') {
+            expect(result.messageType).toBe('error');
+            expect(result.content).toContain('No active provider');
+        }
+    });
+    describe('SettingsService integration', () => {
+        it('uses SettingsService when available for setting format', async () => {
+            const result = await toolformatCommand.action(mockContext, 'xml');
+            expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'xml' });
+            expect(result?.type).toBe('message');
+            if (result && result.type === 'message') {
+                expect(result.messageType).toBe('info');
+                expect(result.content).toContain("override set to 'xml'");
+            }
+        });
+        it('uses SettingsService when available for clearing format', async () => {
+            const result = await toolformatCommand.action(mockContext, 'auto');
+            expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'auto' });
+            expect(result?.type).toBe('message');
+            if (result && result.type === 'message') {
+                expect(result.content).toMatch(/override cleared|auto-detection/);
+            }
+        });
+        it('falls back to legacy settings when SettingsService is not available', async () => {
+            // Remove SettingsService
+            mockContext.services.config = {
+                getSettingsService: vi.fn().mockReturnValue(null),
+            };
+            const result = await toolformatCommand.action(mockContext, 'hermes');
+            expect(mockContext.services.settings.setValue).toHaveBeenCalledWith('User', 'providerToolFormatOverrides', { openai: 'hermes' });
+            expect(result?.type).toBe('message');
+            if (result && result.type === 'message') {
+                expect(result.messageType).toBe('info');
+                expect(result.content).toContain("override set to 'hermes'");
+            }
+        });
+        it('handles SettingsService errors gracefully', async () => {
+            // Make SettingsService throw an error
+            mockSettingsService.updateSettings = vi
+                .fn()
+                .mockRejectedValue(new Error('Settings update failed'));
+            const result = await toolformatCommand.action(mockContext, 'xml');
+            expect(result?.type).toBe('message');
+            if (result && result.type === 'message') {
+                expect(result.messageType).toBe('error');
+                expect(result.content).toContain('Failed to set tool format override');
+                expect(result.content).toContain('Settings update failed');
+            }
+        });
+    });
+});
+//# sourceMappingURL=toolformatCommand.test.js.map

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

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

package/dist/src/ui/components/AuthDialog.js

@@ -85,6 +85,6 @@ export function AuthDialog({ onSelect, settings, initialErrorMessage, }) {
             onSelect(undefined, SettingScope.User);
         }
     }, { isActive: true });
-    return (_jsxs(Box, { borderStyle: "round", borderColor: Colors.Gray, flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Text, { bold: true, children: "OAuth Authentication" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Select an OAuth provider to authenticate:" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Note: You can also use API keys via /key, /keyfile, --key, --keyfile, or environment variables" }) }), _jsx(Box, { marginTop: 1, children: _jsx(RadioButtonSelect, { items: items, initialIndex: safeInitialIndex, onSelect: handleAuthSelect, isFocused: true }) }), errorMessage && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.AccentRed, children: errorMessage }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.Gray, children: "(Use Enter to select, ESC to close)" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Terms of Services and Privacy Notice for Gemini CLI" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.AccentBlue, children: 'https://github.com/acoliver/llxprt-code/blob/main/docs/tos-privacy.md' }) })] }));
+    return (_jsxs(Box, { borderStyle: "round", borderColor: Colors.Gray, flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Text, { bold: true, children: "OAuth Authentication" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Select an OAuth provider to authenticate:" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Note: You can also use API keys via /key, /keyfile, --key, --keyfile, or environment variables" }) }), _jsx(Box, { marginTop: 1, children: _jsx(RadioButtonSelect, { items: items, initialIndex: safeInitialIndex, onSelect: handleAuthSelect }) }), errorMessage && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.AccentRed, children: errorMessage }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.Gray, children: "(Use Enter to select, ESC to close)" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: "Terms of Services and Privacy Notice for Gemini CLI" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.AccentBlue, children: 'https://github.com/acoliver/llxprt-code/blob/main/docs/tos-privacy.md' }) })] }));
 }
 //# sourceMappingURL=AuthDialog.js.map

package/dist/src/ui/components/AuthDialog.js.map

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

package/dist/src/ui/components/AuthDialog.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/components/AuthDialog.test.js

@@ -0,0 +1,252 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { AuthDialog } from './AuthDialog.js';
+import { LoadedSettings, SettingScope } from '../../config/settings.js';
+import { AuthType } from '@vybestack/llxprt-code-core';
+describe('AuthDialog', () => {
+    const wait = (ms = 50) => new Promise((resolve) => setTimeout(resolve, ms));
+    let originalEnv;
+    beforeEach(() => {
+        originalEnv = { ...process.env };
+        process.env.GEMINI_API_KEY = '';
+        process.env.GEMINI_DEFAULT_AUTH_TYPE = '';
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    it('should show an error if the initial auth type is invalid', () => {
+        process.env.GEMINI_API_KEY = '';
+        const settings = new LoadedSettings({
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, {
+            settings: {
+                selectedAuthType: AuthType.USE_GEMINI,
+            },
+            path: '',
+        }, {
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, []);
+        const mockOnSelect = vi.fn();
+        const { lastFrame } = render(_jsx(AuthDialog, { onSelect: mockOnSelect, settings: settings, initialErrorMessage: "GEMINI_API_KEY  environment variable not found" }));
+        expect(lastFrame()).toContain('GEMINI_API_KEY  environment variable not found');
+    });
+    describe('GEMINI_API_KEY environment variable', () => {
+        it('should show OAuth dialog even when GEMINI_API_KEY is set', () => {
+            process.env.GEMINI_API_KEY = 'foobar';
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const mockOnSelect = vi.fn();
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: mockOnSelect, settings: settings }));
+            // OAuth-only dialog shows regardless of API key presence
+            expect(lastFrame()).toContain('OAuth Authentication');
+            expect(lastFrame()).toContain('Gemini (Google OAuth)');
+            expect(lastFrame()).toContain('Qwen (OAuth)');
+        });
+        it('should show OAuth options regardless of GEMINI_DEFAULT_AUTH_TYPE', () => {
+            process.env.GEMINI_API_KEY = 'foobar';
+            process.env.GEMINI_DEFAULT_AUTH_TYPE = AuthType.LOGIN_WITH_GOOGLE;
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: vi.fn(), settings: settings }));
+            // OAuth-only implementation doesn't show API key messages
+            expect(lastFrame()).not.toContain('Existing API key detected (GEMINI_API_KEY)');
+            expect(lastFrame()).toContain('OAuth Authentication');
+        });
+        it('should show OAuth dialog even when GEMINI_DEFAULT_AUTH_TYPE is set to use api key', () => {
+            process.env.GEMINI_API_KEY = 'foobar';
+            process.env.GEMINI_DEFAULT_AUTH_TYPE = AuthType.USE_GEMINI;
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: vi.fn(), settings: settings }));
+            // OAuth-only dialog shows, API key message not shown
+            expect(lastFrame()).not.toContain('Existing API key detected (GEMINI_API_KEY)');
+            expect(lastFrame()).toContain('OAuth Authentication');
+            expect(lastFrame()).toContain('Note: You can also use API keys');
+        });
+    });
+    describe('GEMINI_DEFAULT_AUTH_TYPE environment variable', () => {
+        it('should select the auth type specified by GEMINI_DEFAULT_AUTH_TYPE', () => {
+            process.env.GEMINI_DEFAULT_AUTH_TYPE = AuthType.LOGIN_WITH_GOOGLE;
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: vi.fn(), settings: settings }));
+            // OAuth-only implementation always shows first option selected by default
+            expect(lastFrame()).toContain('[*]1. Gemini (Google OAuth)');
+        });
+        it('should fall back to default if GEMINI_DEFAULT_AUTH_TYPE is not set', () => {
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: vi.fn(), settings: settings }));
+            // OAuth-only implementation defaults to Gemini OAuth
+            expect(lastFrame()).toContain('[*]1. Gemini (Google OAuth)');
+        });
+        it('should show an error and fall back to default if GEMINI_DEFAULT_AUTH_TYPE is invalid', () => {
+            process.env.GEMINI_DEFAULT_AUTH_TYPE = 'invalid-auth-type';
+            const settings = new LoadedSettings({
+                settings: {
+                    selectedAuthType: undefined,
+                    customThemes: {},
+                    mcpServers: {},
+                },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, {
+                settings: { customThemes: {}, mcpServers: {} },
+                path: '',
+            }, []);
+            const { lastFrame } = render(_jsx(AuthDialog, { onSelect: vi.fn(), settings: settings }));
+            // OAuth-only implementation doesn't validate GEMINI_DEFAULT_AUTH_TYPE anymore
+            expect(lastFrame()).not.toContain('Invalid value for GEMINI_DEFAULT_AUTH_TYPE');
+            // OAuth-only implementation defaults to Gemini OAuth
+            expect(lastFrame()).toContain('[*]1. Gemini (Google OAuth)');
+        });
+    });
+    it('should close dialog when ESC is pressed', async () => {
+        const onSelect = vi.fn();
+        const settings = new LoadedSettings({
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, {
+            settings: {
+                selectedAuthType: undefined,
+                customThemes: {},
+                mcpServers: {},
+            },
+            path: '',
+        }, {
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, []);
+        const { stdin, unmount } = render(_jsx(AuthDialog, { onSelect: onSelect, settings: settings }));
+        await wait();
+        // Simulate pressing escape key
+        stdin.write('\u001b'); // ESC key
+        await wait();
+        // Should call onSelect with undefined to close the dialog
+        expect(onSelect).toHaveBeenCalledWith(undefined, 'User');
+        unmount();
+    });
+    it('should close dialog even with an error message when ESC is pressed', async () => {
+        const onSelect = vi.fn();
+        const settings = new LoadedSettings({
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, {
+            settings: {
+                selectedAuthType: undefined,
+                customThemes: {},
+                mcpServers: {},
+            },
+            path: '',
+        }, {
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, []);
+        const { lastFrame, stdin, unmount } = render(_jsx(AuthDialog, { onSelect: onSelect, settings: settings, initialErrorMessage: "Initial error" }));
+        await wait();
+        expect(lastFrame()).toContain('Initial error');
+        // Simulate pressing escape key
+        stdin.write('\u001b'); // ESC key
+        await wait();
+        // Should call onSelect with undefined to close the dialog
+        expect(onSelect).toHaveBeenCalledWith(undefined, 'User');
+        unmount();
+    });
+    it('should allow exiting when auth method is already selected', async () => {
+        const onSelect = vi.fn();
+        const settings = new LoadedSettings({
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, {
+            settings: {
+                selectedAuthType: AuthType.USE_GEMINI,
+                customThemes: {},
+                mcpServers: {},
+            },
+            path: '',
+        }, {
+            settings: { customThemes: {}, mcpServers: {} },
+            path: '',
+        }, []);
+        const { stdin, unmount } = render(_jsx(AuthDialog, { onSelect: onSelect, settings: settings }));
+        await wait();
+        // Simulate pressing escape key
+        stdin.write('\u001b'); // ESC key
+        await wait();
+        // Should call onSelect with undefined to exit
+        expect(onSelect).toHaveBeenCalledWith(undefined, SettingScope.User);
+        unmount();
+    });
+});
+//# sourceMappingURL=AuthDialog.test.js.map

package/dist/src/ui/components/AuthDialog.test.js.map

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

package/dist/src/ui/components/ContextIndicator.ui.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/ui/components/ContextIndicator.ui.test.js

@@ -0,0 +1,89 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { Footer } from './Footer.js';
+import { getProviderManager } from '../../providers/providerManagerInstance.js';
+import { OpenAIProvider, ProviderManager, } from '@vybestack/llxprt-code-core';
+// Mock the provider manager
+vi.mock('../../providers/providerManagerInstance.js', () => ({
+    getProviderManager: vi.fn(),
+}));
+describe('ContextIndicator UI', () => {
+    let mockProvider;
+    let mockProviderManager;
+    beforeEach(() => {
+        // Create mock OpenAI provider
+        mockProvider = {
+            estimateContextUsage: vi.fn(),
+        };
+        // Make it an instance of OpenAIProvider for instanceof check
+        Object.setPrototypeOf(mockProvider, OpenAIProvider.prototype);
+        // Create a real ProviderManager instance and mock its methods
+        mockProviderManager = new ProviderManager();
+        // Mock the methods we need
+        vi.spyOn(mockProviderManager, 'hasActiveProvider').mockReturnValue(true);
+        vi.spyOn(mockProviderManager, 'getActiveProvider').mockReturnValue(mockProvider);
+        vi.mocked(getProviderManager).mockReturnValue(mockProviderManager);
+    });
+    it('should display context percentage without remote tokens', () => {
+        const { lastFrame } = render(_jsx(Footer, { model: "gpt-4o", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should show context in new format: Ctx: 1.0k/128k
+        expect(lastFrame()).toContain('Ctx: 1.0k/128k');
+    });
+    it('should display context percentage when using OpenAI', () => {
+        // Mock the context estimation
+        mockProvider.estimateContextUsage.mockReturnValue({
+            totalTokens: 52000,
+            remoteTokens: 50000,
+            promptTokens: 2000,
+            maxTokens: 128000,
+            contextUsedPercent: 40.625,
+            tokensRemaining: 76000,
+        });
+        const { lastFrame } = render(_jsx(Footer, { model: "gpt-4o", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should show context in new format: Ctx: 1.0k/128k
+        expect(lastFrame()).toContain('Ctx: 1.0k/128k');
+    });
+    it('should handle high token usage', () => {
+        // Mock near-limit context usage
+        mockProvider.estimateContextUsage.mockReturnValue({
+            totalTokens: 120000,
+            remoteTokens: 115000,
+            promptTokens: 5000,
+            maxTokens: 128000,
+            contextUsedPercent: 93.75,
+            tokensRemaining: 8000,
+        });
+        const { lastFrame } = render(_jsx(Footer, { model: "gpt-4o", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should show context in new format: Ctx: 1.0k/128k
+        expect(lastFrame()).toContain('Ctx: 1.0k/128k');
+    });
+    it('should fallback to local calculation on error', () => {
+        // Make estimateContextUsage throw an error
+        mockProvider.estimateContextUsage.mockImplementation(() => {
+            throw new Error('API error');
+        });
+        const { lastFrame } = render(_jsx(Footer, { model: "gpt-4o", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should fallback to local calculation in new format
+        expect(lastFrame()).toContain('Ctx: 1.0k/128k');
+        expect(lastFrame()).not.toContain('remote');
+    });
+    it('should handle non-OpenAI providers', () => {
+        // Mock a non-OpenAI provider
+        vi.mocked(mockProviderManager.getActiveProvider).mockReturnValue({
+            name: 'anthropic',
+        });
+        const { lastFrame } = render(_jsx(Footer, { model: "claude-3-opus", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should use local calculation for non-OpenAI providers in new format
+        expect(lastFrame()).toContain('Ctx: 1.0k/1049k');
+        expect(lastFrame()).not.toContain('remote');
+    });
+    it('should handle missing conversation context', () => {
+        const { lastFrame } = render(_jsx(Footer, { model: "gpt-4o", targetDir: "/test/dir", debugMode: false, debugMessage: "", errorCount: 0, showErrorDetails: false, promptTokenCount: 1000, nightly: false }));
+        // Should not attempt to get remote context
+        expect(mockProvider.estimateContextUsage).not.toHaveBeenCalled();
+        expect(lastFrame()).toContain('Ctx: 1.0k/128k');
+        expect(lastFrame()).not.toContain('remote');
+    });
+});
+//# sourceMappingURL=ContextIndicator.ui.test.js.map

package/dist/src/ui/components/ContextIndicator.ui.test.js.map

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

package/dist/src/ui/components/ContextSummaryDisplay.js

@@ -15,7 +15,7 @@ export const ContextSummaryDisplay = ({ activeFile: _activeFile, llxprtMdFileCou
         if (openFileCount === 0) {
             return '';
         }
-        return `${openFileCount} open file${openFileCount > 1 ? 's' : ''} (ctrl+e to view)`;
+        return `${openFileCount} open file${openFileCount > 1 ? 's' : ''} (ctrl+g to view)`;
     })();
     const geminiMdText = (() => {
         if (llxprtMdFileCount === 0) {

package/dist/src/ui/components/ContextUsageDisplay.semantic.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};