@google/gemini-cli 0.0.1

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

@@ -0,0 +1,107 @@
+/**
+ * @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', async () => {
+    const { CommandKind } = await import('../ui/commands/types.js');
+    return {
+        ideCommand: vi.fn().mockResolvedValue({
+            name: 'ide',
+            description: 'IDE command',
+            kind: CommandKind.BUILT_IN,
+        }),
+    };
+});
+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 { 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/corgiCommand.js', () => ({ corgiCommand: {} }));
+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/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/mcpCommand.js', () => ({
+    mcpCommand: {
+        name: 'mcp',
+        description: 'MCP command',
+        kind: 'BUILT_IN',
+    },
+}));
+describe('BuiltinCommandLoader', () => {
+    let mockConfig;
+    const restoreCommandMock = restoreCommand;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockConfig = { some: 'config' };
+        restoreCommandMock.mockReturnValue({
+            name: 'restore',
+            description: 'Restore command',
+            kind: CommandKind.BUILT_IN,
+        });
+    });
+    it('should correctly pass the config object to restore command factory', async () => {
+        const loader = new BuiltinCommandLoader(mockConfig);
+        await loader.loadCommands(new AbortController().signal);
+        // ideCommand is now a constant, no longer needs config
+        expect(restoreCommandMock).toHaveBeenCalledTimes(1);
+        expect(restoreCommandMock).toHaveBeenCalledWith(mockConfig);
+    });
+    it('should filter out null command definitions returned by factories', async () => {
+        // ideCommand is now a constant SlashCommand
+        const loader = new BuiltinCommandLoader(mockConfig);
+        const commands = await loader.loadCommands(new AbortController().signal);
+        // The 'ide' command should be present.
+        const ideCmd = commands.find((c) => c.name === 'ide');
+        expect(ideCmd).toBeDefined();
+        // 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);
+        // ideCommand is now a constant, no longer needs config
+        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.d.ts

@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SlashCommand } from '../ui/commands/types.js';
+import type { ICommandLoader } from './types.js';
+/**
+ * Orchestrates the discovery and loading of all slash commands for the CLI.
+ *
+ * This service operates on a provider-based loader pattern. It is initialized
+ * with an array of `ICommandLoader` instances, each responsible for fetching
+ * commands from a specific source (e.g., built-in code, local files).
+ *
+ * The CommandService is responsible for invoking these loaders, aggregating their
+ * results, and resolving any name conflicts. This architecture allows the command
+ * system to be extended with new sources without modifying the service itself.
+ */
+export declare class CommandService {
+    private readonly commands;
+    /**
+     * Private constructor to enforce the use of the async factory.
+     * @param commands A readonly array of the fully loaded and de-duplicated commands.
+     */
+    private constructor();
+    /**
+     * Asynchronously creates and initializes a new CommandService instance.
+     *
+     * This factory method orchestrates the entire command loading process. It
+     * runs all provided loaders in parallel, aggregates their results, handles
+     * name conflicts for extension commands by renaming them, and then returns a
+     * fully constructed `CommandService` instance.
+     *
+     * Conflict resolution:
+     * - Extension commands that conflict with existing commands are renamed to
+     *   `extensionName.commandName`
+     * - Non-extension commands (built-in, user, project) override earlier commands
+     *   with the same name based on loader order
+     *
+     * @param loaders An array of objects that conform to the `ICommandLoader`
+     *   interface. Built-in commands should come first, followed by FileCommandLoader.
+     * @param signal An AbortSignal to cancel the loading process.
+     * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
+     */
+    static create(loaders: ICommandLoader[], signal: AbortSignal): Promise<CommandService>;
+    /**
+     * Retrieves the currently loaded and de-duplicated list of slash commands.
+     *
+     * This method is a safe accessor for the service's state. It returns a
+     * readonly array, preventing consumers from modifying the service's internal state.
+     *
+     * @returns A readonly, unified array of available `SlashCommand` objects.
+     */
+    getCommands(): readonly SlashCommand[];
+}

package/dist/src/services/CommandService.js

@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Orchestrates the discovery and loading of all slash commands for the CLI.
+ *
+ * This service operates on a provider-based loader pattern. It is initialized
+ * with an array of `ICommandLoader` instances, each responsible for fetching
+ * commands from a specific source (e.g., built-in code, local files).
+ *
+ * The CommandService is responsible for invoking these loaders, aggregating their
+ * results, and resolving any name conflicts. This architecture allows the command
+ * system to be extended with new sources without modifying the service itself.
+ */
+export class CommandService {
+    commands;
+    /**
+     * Private constructor to enforce the use of the async factory.
+     * @param commands A readonly array of the fully loaded and de-duplicated commands.
+     */
+    constructor(commands) {
+        this.commands = commands;
+    }
+    /**
+     * Asynchronously creates and initializes a new CommandService instance.
+     *
+     * This factory method orchestrates the entire command loading process. It
+     * runs all provided loaders in parallel, aggregates their results, handles
+     * name conflicts for extension commands by renaming them, and then returns a
+     * fully constructed `CommandService` instance.
+     *
+     * Conflict resolution:
+     * - Extension commands that conflict with existing commands are renamed to
+     *   `extensionName.commandName`
+     * - Non-extension commands (built-in, user, project) override earlier commands
+     *   with the same name based on loader order
+     *
+     * @param loaders An array of objects that conform to the `ICommandLoader`
+     *   interface. Built-in commands should come first, followed by FileCommandLoader.
+     * @param signal An AbortSignal to cancel the loading process.
+     * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
+     */
+    static async create(loaders, signal) {
+        const results = await Promise.allSettled(loaders.map((loader) => loader.loadCommands(signal)));
+        const allCommands = [];
+        for (const result of results) {
+            if (result.status === 'fulfilled') {
+                allCommands.push(...result.value);
+            }
+            else {
+                console.debug('A command loader failed:', result.reason);
+            }
+        }
+        const commandMap = new Map();
+        for (const cmd of allCommands) {
+            let finalName = cmd.name;
+            // Extension commands get renamed if they conflict with existing commands
+            if (cmd.extensionName && commandMap.has(cmd.name)) {
+                let renamedName = `${cmd.extensionName}.${cmd.name}`;
+                let suffix = 1;
+                // Keep trying until we find a name that doesn't conflict
+                while (commandMap.has(renamedName)) {
+                    renamedName = `${cmd.extensionName}.${cmd.name}${suffix}`;
+                    suffix++;
+                }
+                finalName = renamedName;
+            }
+            commandMap.set(finalName, {
+                ...cmd,
+                name: finalName,
+            });
+        }
+        const finalCommands = Object.freeze(Array.from(commandMap.values()));
+        return new CommandService(finalCommands);
+    }
+    /**
+     * Retrieves the currently loaded and de-duplicated list of slash commands.
+     *
+     * This method is a safe accessor for the service's state. It returns a
+     * readonly array, preventing consumers from modifying the service's internal state.
+     *
+     * @returns A readonly, unified array of available `SlashCommand` objects.
+     */
+    getCommands() {
+        return this.commands;
+    }
+}
+//# sourceMappingURL=CommandService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CommandService.js","sourceRoot":"","sources":["../../../src/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,cAAc;IAKY;IAJrC;;;OAGG;IACH,YAAqC,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IAAG,CAAC;IAE1E;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAyB,EACzB,MAAmB;QAEnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CACrD,CAAC;QAEF,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAClC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC;YAEzB,yEAAyE;YACzE,IAAI,GAAG,CAAC,aAAa,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,IAAI,WAAW,GAAG,GAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACrD,IAAI,MAAM,GAAG,CAAC,CAAC;gBAEf,yDAAyD;gBACzD,OAAO,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBACnC,WAAW,GAAG,GAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC;oBAC1D,MAAM,EAAE,CAAC;gBACX,CAAC;gBAED,SAAS,GAAG,WAAW,CAAC;YAC1B,CAAC;YAED,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE;gBACxB,GAAG,GAAG;gBACN,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}

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,233 @@
+/**
+ * @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 {} from './types.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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"}

package/dist/src/services/FileCommandLoader.d.ts

@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config } from '@google/gemini-cli-core';
+import type { ICommandLoader } from './types.js';
+import type { SlashCommand } from '../ui/commands/types.js';
+/**
+ * Discovers and loads custom slash commands from .toml files in both the
+ * user's global config directory and the current project's directory.
+ *
+ * This loader is responsible for:
+ * - Recursively scanning command directories.
+ * - Parsing and validating TOML files.
+ * - Adapting valid definitions into executable SlashCommand objects.
+ * - Handling file system errors and malformed files gracefully.
+ */
+export declare class FileCommandLoader implements ICommandLoader {
+    private readonly config;
+    private readonly projectRoot;
+    private readonly folderTrustEnabled;
+    private readonly folderTrust;
+    constructor(config: Config | null);
+    /**
+     * Loads all commands from user, project, and extension directories.
+     * Returns commands in order: user → project → extensions (alphabetically).
+     *
+     * Order is important for conflict resolution in CommandService:
+     * - User/project commands (without extensionName) use "last wins" strategy
+     * - Extension commands (with extensionName) get renamed if conflicts exist
+     *
+     * @param signal An AbortSignal to cancel the loading process.
+     * @returns A promise that resolves to an array of all loaded SlashCommands.
+     */
+    loadCommands(signal: AbortSignal): Promise<SlashCommand[]>;
+    /**
+     * Get all command directories in order for loading.
+     * User commands → Project commands → Extension commands
+     * This order ensures extension commands can detect all conflicts.
+     */
+    private getCommandDirectories;
+    /**
+     * Parses a single .toml file and transforms it into a SlashCommand object.
+     * @param filePath The absolute path to the .toml file.
+     * @param baseDir The root command directory for name calculation.
+     * @param extensionName Optional extension name to prefix commands with.
+     * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
+     */
+    private parseAndAdaptFile;
+}