@vybestack/llxprt-code 0.1.20 → 0.1.21

package/dist/src/providers/provider-switching.integration.test.js

@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { getProviderManager, resetProviderManager, } from './providerManagerInstance.js';
+describe('Provider Switching Integration', () => {
+    beforeEach(() => {
+        resetProviderManager();
+    });
+    afterEach(() => {
+        resetProviderManager();
+    });
+    it('should support switching between providers and back to Gemini', () => {
+        const manager = getProviderManager(undefined, true);
+        // Clear any auto-loaded active provider
+        if (manager.hasActiveProvider()) {
+            manager.clearActiveProvider();
+        }
+        // Now no active provider (Gemini is default)
+        expect(manager.hasActiveProvider()).toBe(false);
+        // Register a mock provider
+        const mockProvider = {
+            name: 'test-provider',
+            async getModels() {
+                return [
+                    {
+                        id: 'test-model',
+                        name: 'Test Model',
+                        provider: 'test-provider',
+                        supportedToolFormats: ['json'],
+                    },
+                ];
+            },
+            async *generateChatCompletion() {
+                yield { role: 'assistant', content: 'test response' };
+            },
+            getDefaultModel() {
+                return 'test-model';
+            },
+            getServerTools() {
+                return [];
+            },
+            async invokeServerTool() {
+                return {};
+            },
+        };
+        manager.registerProvider(mockProvider);
+        // Switch to the test provider
+        manager.setActiveProvider('test-provider');
+        expect(manager.hasActiveProvider()).toBe(true);
+        expect(manager.getActiveProviderName()).toBe('test-provider');
+        // Switch back to Gemini
+        manager.clearActiveProvider();
+        expect(manager.hasActiveProvider()).toBe(false);
+        expect(manager.getActiveProviderName()).toBe('');
+    });
+    it('should list gemini as an available option even when not registered', () => {
+        const manager = getProviderManager(undefined, true);
+        // Register some providers
+        const provider1 = {
+            name: 'provider1',
+            async getModels() {
+                return [];
+            },
+            async *generateChatCompletion() {
+                yield { role: 'assistant', content: '' };
+            },
+            getDefaultModel() {
+                return 'default';
+            },
+            getServerTools() {
+                return [];
+            },
+            async invokeServerTool() {
+                return {};
+            },
+        };
+        const provider2 = {
+            name: 'provider2',
+            async getModels() {
+                return [];
+            },
+            async *generateChatCompletion() {
+                yield { role: 'assistant', content: '' };
+            },
+            getDefaultModel() {
+                return 'default';
+            },
+            getServerTools() {
+                return [];
+            },
+            async invokeServerTool() {
+                return {};
+            },
+        };
+        manager.registerProvider(provider1);
+        manager.registerProvider(provider2);
+        // List providers - should not include 'gemini' as it's not a registered provider
+        const providers = manager.listProviders();
+        // Filter out any auto-loaded providers like 'openai'
+        const testProviders = providers.filter((p) => p.startsWith('provider'));
+        expect(testProviders).toEqual(['provider1', 'provider2']);
+        expect(providers).not.toContain('gemini');
+        // But we can still clear to go back to Gemini
+        manager.setActiveProvider('provider1');
+        expect(manager.getActiveProviderName()).toBe('provider1');
+        manager.clearActiveProvider();
+        expect(manager.hasActiveProvider()).toBe(false);
+    });
+});
+//# sourceMappingURL=provider-switching.integration.test.js.map

package/dist/src/providers/provider-switching.integration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-switching.integration.test.js","sourceRoot":"","sources":["../../../src/providers/provider-switching.integration.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAGtC,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,UAAU,CAAC,GAAG,EAAE;QACd,oBAAoB,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,oBAAoB,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEpD,wCAAwC;QACxC,IAAI,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAChC,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAChC,CAAC;QAED,6CAA6C;QAC7C,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhD,2BAA2B;QAC3B,MAAM,YAAY,GAAc;YAC9B,IAAI,EAAE,eAAe;YACrB,KAAK,CAAC,SAAS;gBACb,OAAO;oBACL;wBACE,EAAE,EAAE,YAAY;wBAChB,IAAI,EAAE,YAAY;wBAClB,QAAQ,EAAE,eAAe;wBACzB,oBAAoB,EAAE,CAAC,MAAM,CAAC;qBAC/B;iBACF,CAAC;YACJ,CAAC;YACD,KAAK,CAAC,CAAC,sBAAsB;gBAC3B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;YACxD,CAAC;YACD,eAAe;gBACb,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,cAAc;gBACZ,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,CAAC,gBAAgB;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC;QAEF,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAEvC,8BAA8B;QAC9B,OAAO,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE9D,wBAAwB;QACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,MAAM,SAAS,GAAc;YAC3B,IAAI,EAAE,WAAW;YACjB,KAAK,CAAC,SAAS;gBACb,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,CAAC,CAAC,sBAAsB;gBAC3B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC3C,CAAC;YACD,eAAe;gBACb,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,cAAc;gBACZ,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,CAAC,gBAAgB;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC;QAEF,MAAM,SAAS,GAAc;YAC3B,IAAI,EAAE,WAAW;YACjB,KAAK,CAAC,SAAS;gBACb,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,CAAC,CAAC,sBAAsB;gBAC3B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC3C,CAAC;YACD,eAAe;gBACb,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,cAAc;gBACZ,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,CAAC,gBAAgB;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC;QAEF,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACpC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAEpC,iFAAiF;QACjF,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1C,qDAAqD;QACrD,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE1C,8CAA8C;QAC9C,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE1D,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/providers/providerManagerInstance.test.d.ts

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

package/dist/src/providers/providerManagerInstance.test.js

@@ -0,0 +1,104 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { sanitizeForByteString, needsSanitization, } from '@vybestack/llxprt-code-core';
+import { MockFileSystem } from './IFileSystem.js';
+import { setFileSystem, resetProviderManager, } from './providerManagerInstance.js';
+// Mock os module and set homedir before imports
+vi.mock('os', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        homedir: vi.fn(() => '/home/user'),
+        platform: vi.fn(() => 'linux'),
+    };
+});
+// Mock stripJsonComments
+vi.mock('strip-json-comments', () => ({
+    default: (content) => content,
+}));
+// Mock the sanitizeApiKey function using the core utilities
+function sanitizeApiKey(key) {
+    const sanitized = sanitizeForByteString(key);
+    if (needsSanitization(key)) {
+        console.warn('[ProviderManager] API key contained non-ASCII or control characters that were removed. ' +
+            'Please check your API key file encoding (should be UTF-8 without BOM).');
+    }
+    return sanitized;
+}
+describe('API key sanitization regression tests', () => {
+    let mockFileSystem;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockFileSystem = new MockFileSystem();
+        setFileSystem(mockFileSystem);
+    });
+    afterEach(() => {
+        resetProviderManager();
+    });
+    it('should sanitize API keys containing Unicode replacement characters', () => {
+        // Mock file content with Unicode replacement character (U+FFFD)
+        const apiKeyWithReplacementChar = 'sk-1234567890abcdef\uFFFDghijklmnop';
+        mockFileSystem.setMockFile('/home/user/.openai_key', apiKeyWithReplacementChar);
+        const sanitizedKey = sanitizeApiKey(apiKeyWithReplacementChar);
+        expect(sanitizedKey).toBe('sk-1234567890abcdefghijklmnop');
+        expect(sanitizedKey).not.toContain('\uFFFD');
+    });
+    it('should sanitize API keys with control characters', () => {
+        // Mock file content with control characters
+        const apiKeyWithControlChars = 'sk-abc\x00def\x1Fghi';
+        mockFileSystem.setMockFile('/home/user/.openai_key', apiKeyWithControlChars);
+        const sanitizedKey = sanitizeApiKey(apiKeyWithControlChars);
+        expect(sanitizedKey).toBe('sk-abcdefghi');
+        // Verify no control characters remain
+        for (let i = 0; i < sanitizedKey.length; i++) {
+            const charCode = sanitizedKey.charCodeAt(i);
+            expect(charCode).toBeGreaterThan(0x1f);
+            expect(charCode).not.toBe(0x7f);
+        }
+    });
+    it('should handle API keys from files with BOM', () => {
+        // UTF-8 BOM followed by API key
+        const bomString = '\uFEFFsk-validapikey123';
+        mockFileSystem.setMockFile('/home/user/.openai_key', bomString);
+        // Simulate BOM removal and sanitization
+        let content = bomString;
+        if (content.charCodeAt(0) === 0xfeff) {
+            content = content.slice(1);
+        }
+        const sanitizedKey = sanitizeApiKey(content);
+        expect(sanitizedKey).toBe('sk-validapikey123');
+    });
+    it('should warn when sanitization removes characters', () => {
+        const consoleWarnSpy = vi
+            .spyOn(console, 'warn')
+            .mockImplementation(() => { });
+        const apiKeyWithIssues = 'sk-abc\uFFFDdef';
+        mockFileSystem.setMockFile('/home/user/.openai_key', apiKeyWithIssues);
+        sanitizeApiKey(apiKeyWithIssues);
+        expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('API key contained non-ASCII or control characters'));
+        consoleWarnSpy.mockRestore();
+    });
+    it('should apply sanitization to all providers consistently', () => {
+        const providers = ['openai', 'anthropic', 'google'];
+        const problematicKey = 'key-with\uFFFDissues\x00';
+        // Set up mock files for each provider
+        mockFileSystem.setMockFile('/home/user/.openai_key', problematicKey);
+        mockFileSystem.setMockFile('/home/user/.anthropic_key', problematicKey);
+        mockFileSystem.setMockFile('/home/user/.google_key', problematicKey);
+        const results = providers.map((provider) => ({
+            provider,
+            key: sanitizeApiKey(problematicKey),
+        }));
+        // All providers should get the same sanitized result
+        results.forEach((result) => {
+            expect(result.key).toBe('key-withissues');
+            expect(result.key).not.toContain('\uFFFD');
+            expect(result.key).not.toContain('\x00');
+        });
+    });
+});
+//# sourceMappingURL=providerManagerInstance.test.js.map

package/dist/src/providers/providerManagerInstance.test.js.map

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

package/dist/src/services/BuiltinCommandLoader.test.d.ts

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

package/dist/src/services/BuiltinCommandLoader.test.js

@@ -0,0 +1,118 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+vi.mock('../ui/commands/aboutCommand.js', async () => {
+    const { CommandKind } = await import('../ui/commands/types.js');
+    return {
+        aboutCommand: {
+            name: 'about',
+            description: 'About the CLI',
+            kind: CommandKind.BUILT_IN,
+        },
+    };
+});
+vi.mock('../ui/commands/ideCommand.js', () => ({ ideCommand: vi.fn() }));
+vi.mock('../ui/commands/restoreCommand.js', () => ({
+    restoreCommand: vi.fn(),
+}));
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { BuiltinCommandLoader } from './BuiltinCommandLoader.js';
+import { CommandKind } from '../ui/commands/types.js';
+import { ideCommand } from '../ui/commands/ideCommand.js';
+import { restoreCommand } from '../ui/commands/restoreCommand.js';
+vi.mock('../ui/commands/authCommand.js', () => ({ authCommand: {} }));
+vi.mock('../ui/commands/bugCommand.js', () => ({ bugCommand: {} }));
+vi.mock('../ui/commands/chatCommand.js', () => ({ chatCommand: {} }));
+vi.mock('../ui/commands/clearCommand.js', () => ({ clearCommand: {} }));
+vi.mock('../ui/commands/compressCommand.js', () => ({ compressCommand: {} }));
+vi.mock('../ui/commands/docsCommand.js', () => ({ docsCommand: {} }));
+vi.mock('../ui/commands/editorCommand.js', () => ({ editorCommand: {} }));
+vi.mock('../ui/commands/extensionsCommand.js', () => ({
+    extensionsCommand: {},
+}));
+vi.mock('../ui/commands/helpCommand.js', () => ({ helpCommand: {} }));
+vi.mock('../ui/commands/memoryCommand.js', () => ({ memoryCommand: {} }));
+vi.mock('../ui/commands/privacyCommand.js', () => ({ privacyCommand: {} }));
+vi.mock('../ui/commands/loggingCommand.js', () => ({ loggingCommand: {} }));
+vi.mock('../ui/commands/quitCommand.js', () => ({ quitCommand: {} }));
+vi.mock('../ui/commands/statsCommand.js', () => ({ statsCommand: {} }));
+vi.mock('../ui/commands/themeCommand.js', () => ({ themeCommand: {} }));
+vi.mock('../ui/commands/toolsCommand.js', () => ({ toolsCommand: {} }));
+vi.mock('../ui/commands/copyCommand.js', () => ({ copyCommand: {} }));
+vi.mock('../ui/commands/vimCommand.js', () => ({ vimCommand: {} }));
+vi.mock('../ui/commands/providerCommand.js', () => ({ providerCommand: {} }));
+vi.mock('../ui/commands/modelCommand.js', () => ({ modelCommand: {} }));
+vi.mock('../ui/commands/keyCommand.js', () => ({ keyCommand: {} }));
+vi.mock('../ui/commands/keyfileCommand.js', () => ({ keyfileCommand: {} }));
+vi.mock('../ui/commands/baseurlCommand.js', () => ({ baseurlCommand: {} }));
+vi.mock('../ui/commands/toolformatCommand.js', () => ({
+    toolformatCommand: {},
+}));
+vi.mock('../ui/commands/mcpCommand.js', () => ({
+    mcpCommand: {
+        name: 'mcp',
+        description: 'MCP command',
+        kind: 'BUILT_IN',
+    },
+}));
+describe('BuiltinCommandLoader', () => {
+    let mockConfig;
+    const ideCommandMock = ideCommand;
+    const restoreCommandMock = restoreCommand;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockConfig = { some: 'config' };
+        ideCommandMock.mockReturnValue({
+            name: 'ide',
+            description: 'IDE command',
+            kind: CommandKind.BUILT_IN,
+        });
+        restoreCommandMock.mockReturnValue({
+            name: 'restore',
+            description: 'Restore command',
+            kind: CommandKind.BUILT_IN,
+        });
+    });
+    it('should correctly pass the config object to command factory functions', async () => {
+        const loader = new BuiltinCommandLoader(mockConfig);
+        await loader.loadCommands(new AbortController().signal);
+        expect(ideCommandMock).toHaveBeenCalledTimes(1);
+        expect(ideCommandMock).toHaveBeenCalledWith(mockConfig);
+        expect(restoreCommandMock).toHaveBeenCalledTimes(1);
+        expect(restoreCommandMock).toHaveBeenCalledWith(mockConfig);
+    });
+    it('should filter out null command definitions returned by factories', async () => {
+        // Override the mock's behavior for this specific test.
+        ideCommandMock.mockReturnValue(null);
+        const loader = new BuiltinCommandLoader(mockConfig);
+        const commands = await loader.loadCommands(new AbortController().signal);
+        // The 'ide' command should be filtered out.
+        const ideCmd = commands.find((c) => c.name === 'ide');
+        expect(ideCmd).toBeUndefined();
+        // Other commands should still be present.
+        const aboutCmd = commands.find((c) => c.name === 'about');
+        expect(aboutCmd).toBeDefined();
+    });
+    it('should handle a null config gracefully when calling factories', async () => {
+        const loader = new BuiltinCommandLoader(null);
+        await loader.loadCommands(new AbortController().signal);
+        expect(ideCommandMock).toHaveBeenCalledTimes(1);
+        expect(ideCommandMock).toHaveBeenCalledWith(null);
+        expect(restoreCommandMock).toHaveBeenCalledTimes(1);
+        expect(restoreCommandMock).toHaveBeenCalledWith(null);
+    });
+    it('should return a list of all loaded commands', async () => {
+        const loader = new BuiltinCommandLoader(mockConfig);
+        const commands = await loader.loadCommands(new AbortController().signal);
+        const aboutCmd = commands.find((c) => c.name === 'about');
+        expect(aboutCmd).toBeDefined();
+        expect(aboutCmd?.kind).toBe(CommandKind.BUILT_IN);
+        const ideCmd = commands.find((c) => c.name === 'ide');
+        expect(ideCmd).toBeDefined();
+        const mcpCmd = commands.find((c) => c.name === 'mcp');
+        expect(mcpCmd).toBeDefined();
+    });
+});
+//# sourceMappingURL=BuiltinCommandLoader.test.js.map

package/dist/src/services/BuiltinCommandLoader.test.js.map

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

package/dist/src/services/CommandService.test.d.ts

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

package/dist/src/services/CommandService.test.js

@@ -0,0 +1,232 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { CommandService } from './CommandService.js';
+import { CommandKind } from '../ui/commands/types.js';
+const createMockCommand = (name, kind) => ({
+    name,
+    description: `Description for ${name}`,
+    kind,
+    action: vi.fn(),
+});
+const mockCommandA = createMockCommand('command-a', CommandKind.BUILT_IN);
+const mockCommandB = createMockCommand('command-b', CommandKind.BUILT_IN);
+const mockCommandC = createMockCommand('command-c', CommandKind.FILE);
+const mockCommandB_Override = createMockCommand('command-b', CommandKind.FILE);
+class MockCommandLoader {
+    commandsToLoad;
+    constructor(commandsToLoad) {
+        this.commandsToLoad = commandsToLoad;
+    }
+    loadCommands = vi.fn(async () => Promise.resolve(this.commandsToLoad));
+}
+describe('CommandService', () => {
+    beforeEach(() => {
+        vi.spyOn(console, 'debug').mockImplementation(() => { });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should load commands from a single loader', async () => {
+        const mockLoader = new MockCommandLoader([mockCommandA, mockCommandB]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(mockLoader.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
+    });
+    it('should aggregate commands from multiple loaders', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const loader2 = new MockCommandLoader([mockCommandC]);
+        const service = await CommandService.create([loader1, loader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(loader1.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader2.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandC]));
+    });
+    it('should override commands from earlier loaders with those from later loaders', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA, mockCommandB]);
+        const loader2 = new MockCommandLoader([
+            mockCommandB_Override,
+            mockCommandC,
+        ]);
+        const service = await CommandService.create([loader1, loader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(3); // Should be A, C, and the overridden B.
+        // The final list should contain the override from the *last* loader.
+        const commandB = commands.find((cmd) => cmd.name === 'command-b');
+        expect(commandB).toBeDefined();
+        expect(commandB?.kind).toBe(CommandKind.FILE); // Verify it's the overridden version.
+        expect(commandB).toEqual(mockCommandB_Override);
+        // Ensure the other commands are still present.
+        expect(commands).toEqual(expect.arrayContaining([
+            mockCommandA,
+            mockCommandC,
+            mockCommandB_Override,
+        ]));
+    });
+    it('should handle loaders that return an empty array of commands gracefully', async () => {
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const emptyLoader = new MockCommandLoader([]);
+        const loader3 = new MockCommandLoader([mockCommandB]);
+        const service = await CommandService.create([loader1, emptyLoader, loader3], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(emptyLoader.loadCommands).toHaveBeenCalledTimes(1);
+        expect(commands).toHaveLength(2);
+        expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
+    });
+    it('should load commands from successful loaders even if one fails', async () => {
+        const successfulLoader = new MockCommandLoader([mockCommandA]);
+        const failingLoader = new MockCommandLoader([]);
+        const error = new Error('Loader failed');
+        vi.spyOn(failingLoader, 'loadCommands').mockRejectedValue(error);
+        const service = await CommandService.create([successfulLoader, failingLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(1);
+        expect(commands).toEqual([mockCommandA]);
+        expect(console.debug).toHaveBeenCalledWith('A command loader failed:', error);
+    });
+    it('getCommands should return a readonly array that cannot be mutated', async () => {
+        const service = await CommandService.create([new MockCommandLoader([mockCommandA])], new AbortController().signal);
+        const commands = service.getCommands();
+        // Expect it to throw a TypeError at runtime because the array is frozen.
+        expect(() => {
+            // @ts-expect-error - Testing immutability is intentional here.
+            commands.push(mockCommandB);
+        }).toThrow();
+        // Verify the original array was not mutated.
+        expect(service.getCommands()).toHaveLength(1);
+    });
+    it('should pass the abort signal to all loaders', async () => {
+        const controller = new AbortController();
+        const signal = controller.signal;
+        const loader1 = new MockCommandLoader([mockCommandA]);
+        const loader2 = new MockCommandLoader([mockCommandB]);
+        await CommandService.create([loader1, loader2], signal);
+        expect(loader1.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader1.loadCommands).toHaveBeenCalledWith(signal);
+        expect(loader2.loadCommands).toHaveBeenCalledTimes(1);
+        expect(loader2.loadCommands).toHaveBeenCalledWith(signal);
+    });
+    it('should rename extension commands when they conflict', async () => {
+        const builtinCommand = createMockCommand('deploy', CommandKind.BUILT_IN);
+        const userCommand = createMockCommand('sync', CommandKind.FILE);
+        const extensionCommand1 = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'firebase',
+            description: '[firebase] Deploy to Firebase',
+        };
+        const extensionCommand2 = {
+            ...createMockCommand('sync', CommandKind.FILE),
+            extensionName: 'git-helper',
+            description: '[git-helper] Sync with remote',
+        };
+        const mockLoader1 = new MockCommandLoader([builtinCommand]);
+        const mockLoader2 = new MockCommandLoader([
+            userCommand,
+            extensionCommand1,
+            extensionCommand2,
+        ]);
+        const service = await CommandService.create([mockLoader1, mockLoader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(4);
+        // Built-in command keeps original name
+        const deployBuiltin = commands.find((cmd) => cmd.name === 'deploy' && !cmd.extensionName);
+        expect(deployBuiltin).toBeDefined();
+        expect(deployBuiltin?.kind).toBe(CommandKind.BUILT_IN);
+        // Extension command conflicting with built-in gets renamed
+        const deployExtension = commands.find((cmd) => cmd.name === 'firebase.deploy');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.extensionName).toBe('firebase');
+        // User command keeps original name
+        const syncUser = commands.find((cmd) => cmd.name === 'sync' && !cmd.extensionName);
+        expect(syncUser).toBeDefined();
+        expect(syncUser?.kind).toBe(CommandKind.FILE);
+        // Extension command conflicting with user command gets renamed
+        const syncExtension = commands.find((cmd) => cmd.name === 'git-helper.sync');
+        expect(syncExtension).toBeDefined();
+        expect(syncExtension?.extensionName).toBe('git-helper');
+    });
+    it('should handle user/project command override correctly', async () => {
+        const builtinCommand = createMockCommand('help', CommandKind.BUILT_IN);
+        const userCommand = createMockCommand('help', CommandKind.FILE);
+        const projectCommand = createMockCommand('deploy', CommandKind.FILE);
+        const userDeployCommand = createMockCommand('deploy', CommandKind.FILE);
+        const mockLoader1 = new MockCommandLoader([builtinCommand]);
+        const mockLoader2 = new MockCommandLoader([
+            userCommand,
+            userDeployCommand,
+            projectCommand,
+        ]);
+        const service = await CommandService.create([mockLoader1, mockLoader2], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(2);
+        // User command overrides built-in
+        const helpCommand = commands.find((cmd) => cmd.name === 'help');
+        expect(helpCommand).toBeDefined();
+        expect(helpCommand?.kind).toBe(CommandKind.FILE);
+        // Project command overrides user command (last wins)
+        const deployCommand = commands.find((cmd) => cmd.name === 'deploy');
+        expect(deployCommand).toBeDefined();
+        expect(deployCommand?.kind).toBe(CommandKind.FILE);
+    });
+    it('should handle secondary conflicts when renaming extension commands', async () => {
+        // User has both /deploy and /gcp.deploy commands
+        const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
+        const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
+        // Extension also has a deploy command that will conflict with user's /deploy
+        const extensionCommand = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'gcp',
+            description: '[gcp] Deploy to Google Cloud',
+        };
+        const mockLoader = new MockCommandLoader([
+            userCommand1,
+            userCommand2,
+            extensionCommand,
+        ]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(3);
+        // Original user command keeps its name
+        const deployUser = commands.find((cmd) => cmd.name === 'deploy' && !cmd.extensionName);
+        expect(deployUser).toBeDefined();
+        // User's dot notation command keeps its name
+        const gcpDeployUser = commands.find((cmd) => cmd.name === 'gcp.deploy' && !cmd.extensionName);
+        expect(gcpDeployUser).toBeDefined();
+        // Extension command gets renamed with suffix due to secondary conflict
+        const deployExtension = commands.find((cmd) => cmd.name === 'gcp.deploy1' && cmd.extensionName === 'gcp');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    });
+    it('should handle multiple secondary conflicts with incrementing suffixes', async () => {
+        // User has /deploy, /gcp.deploy, and /gcp.deploy1
+        const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
+        const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
+        const userCommand3 = createMockCommand('gcp.deploy1', CommandKind.FILE);
+        // Extension has a deploy command
+        const extensionCommand = {
+            ...createMockCommand('deploy', CommandKind.FILE),
+            extensionName: 'gcp',
+            description: '[gcp] Deploy to Google Cloud',
+        };
+        const mockLoader = new MockCommandLoader([
+            userCommand1,
+            userCommand2,
+            userCommand3,
+            extensionCommand,
+        ]);
+        const service = await CommandService.create([mockLoader], new AbortController().signal);
+        const commands = service.getCommands();
+        expect(commands).toHaveLength(4);
+        // Extension command gets renamed with suffix 2 due to multiple conflicts
+        const deployExtension = commands.find((cmd) => cmd.name === 'gcp.deploy2' && cmd.extensionName === 'gcp');
+        expect(deployExtension).toBeDefined();
+        expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    });
+});
+//# sourceMappingURL=CommandService.test.js.map

package/dist/src/services/CommandService.test.js.map

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