@machina.ai/cell-cli 1.33.0-rc1 → 1.38.1-rc1

package/dist/src/services/SlashCommandConflictHandler.js

@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { coreEvents, CoreEvent, } from '@google/gemini-cli-core';
+import { CommandKind } from '../ui/commands/types.js';
+/**
+ * Handles slash command conflict events and provides user feedback.
+ *
+ * This handler batches multiple conflict events into a single notification
+ * block per command name to avoid UI clutter during startup or incremental loading.
+ */
+export class SlashCommandConflictHandler {
+    notifiedConflicts = new Set();
+    pendingConflicts = [];
+    flushTimeout = null;
+    constructor() {
+        this.handleConflicts = this.handleConflicts.bind(this);
+    }
+    start() {
+        coreEvents.on(CoreEvent.SlashCommandConflicts, this.handleConflicts);
+    }
+    stop() {
+        coreEvents.off(CoreEvent.SlashCommandConflicts, this.handleConflicts);
+        if (this.flushTimeout) {
+            clearTimeout(this.flushTimeout);
+            this.flushTimeout = null;
+        }
+    }
+    handleConflicts(payload) {
+        const newConflicts = payload.conflicts.filter((c) => {
+            // Use a unique key to prevent duplicate notifications for the same conflict
+            const sourceId = c.loserExtensionName || c.loserMcpServerName || c.loserKind;
+            const key = `${c.name}:${sourceId}:${c.renamedTo}`;
+            if (this.notifiedConflicts.has(key)) {
+                return false;
+            }
+            this.notifiedConflicts.add(key);
+            return true;
+        });
+        if (newConflicts.length > 0) {
+            this.pendingConflicts.push(...newConflicts);
+            this.scheduleFlush();
+        }
+    }
+    scheduleFlush() {
+        if (this.flushTimeout) {
+            clearTimeout(this.flushTimeout);
+        }
+        // Use a trailing debounce to capture staggered reloads during startup
+        this.flushTimeout = setTimeout(() => this.flush(), 500);
+    }
+    flush() {
+        this.flushTimeout = null;
+        const conflicts = [...this.pendingConflicts];
+        this.pendingConflicts = [];
+        if (conflicts.length === 0) {
+            return;
+        }
+        // Group conflicts by their original command name
+        const grouped = new Map();
+        for (const c of conflicts) {
+            const list = grouped.get(c.name) ?? [];
+            list.push(c);
+            grouped.set(c.name, list);
+        }
+        for (const [name, commandConflicts] of grouped) {
+            if (commandConflicts.length > 1) {
+                this.emitGroupedFeedback(name, commandConflicts);
+            }
+            else {
+                this.emitSingleFeedback(commandConflicts[0]);
+            }
+        }
+    }
+    /**
+     * Emits a grouped notification for multiple conflicts sharing the same name.
+     */
+    emitGroupedFeedback(name, conflicts) {
+        const messages = conflicts
+            .map((c) => {
+            const source = this.getSourceDescription(c.loserExtensionName, c.loserKind, c.loserMcpServerName);
+            return `- ${this.capitalize(source)} '/${c.name}' was renamed to '/${c.renamedTo}'`;
+        })
+            .join('\n');
+        coreEvents.emitFeedback('info', `Conflicts detected for command '/${name}':\n${messages}`);
+    }
+    /**
+     * Emits a descriptive notification for a single command conflict.
+     */
+    emitSingleFeedback(c) {
+        const loserSource = this.getSourceDescription(c.loserExtensionName, c.loserKind, c.loserMcpServerName);
+        const winnerSource = this.getSourceDescription(c.winnerExtensionName, c.winnerKind, c.winnerMcpServerName);
+        coreEvents.emitFeedback('info', `${this.capitalize(loserSource)} '/${c.name}' was renamed to '/${c.renamedTo}' because it conflicts with ${winnerSource}.`);
+    }
+    capitalize(s) {
+        return s.charAt(0).toUpperCase() + s.slice(1);
+    }
+    /**
+     * Returns a human-readable description of a command's source.
+     */
+    getSourceDescription(extensionName, kind, mcpServerName) {
+        switch (kind) {
+            case CommandKind.EXTENSION_FILE:
+                return extensionName
+                    ? `extension '${extensionName}' command`
+                    : 'extension command';
+            case CommandKind.SKILL:
+                return extensionName
+                    ? `extension '${extensionName}' skill`
+                    : 'skill command';
+            case CommandKind.MCP_PROMPT:
+                return mcpServerName
+                    ? `MCP server '${mcpServerName}' command`
+                    : 'MCP server command';
+            case CommandKind.USER_FILE:
+                return 'user command';
+            case CommandKind.WORKSPACE_FILE:
+                return 'workspace command';
+            case CommandKind.BUILT_IN:
+                return 'built-in command';
+            default:
+                return 'existing command';
+        }
+    }
+}
+//# sourceMappingURL=SlashCommandConflictHandler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SlashCommandConflictHandler.js","sourceRoot":"","sources":["../../../src/services/SlashCommandConflictHandler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,UAAU,EACV,SAAS,GAGV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,OAAO,2BAA2B;IAC9B,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,gBAAgB,GAA2B,EAAE,CAAC;IAC9C,YAAY,GAAyC,IAAI,CAAC;IAElE;QACE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,KAAK;QACH,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACvE,CAAC;IAED,IAAI;QACF,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACtE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,OAAqC;QAC3D,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,4EAA4E;YAC5E,MAAM,QAAQ,GACZ,CAAC,CAAC,kBAAkB,IAAI,CAAC,CAAC,kBAAkB,IAAI,CAAC,CAAC,SAAS,CAAC;YAC9D,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QACD,sEAAsE;QACtE,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAEO,KAAK;QACX,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7C,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QAED,iDAAiD;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkC,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,OAAO,EAAE,CAAC;YAC/C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,mBAAmB,CACzB,IAAY,EACZ,SAAiC;QAEjC,MAAM,QAAQ,GAAG,SAAS;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CACtC,CAAC,CAAC,kBAAkB,EACpB,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,kBAAkB,CACrB,CAAC;YACF,OAAO,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC,SAAS,GAAG,CAAC;QACtF,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,UAAU,CAAC,YAAY,CACrB,MAAM,EACN,oCAAoC,IAAI,OAAO,QAAQ,EAAE,CAC1D,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,kBAAkB,CAAC,CAAuB;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAC3C,CAAC,CAAC,kBAAkB,EACpB,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,kBAAkB,CACrB,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAC5C,CAAC,CAAC,mBAAmB,EACrB,CAAC,CAAC,UAAU,EACZ,CAAC,CAAC,mBAAmB,CACtB,CAAC;QAEF,UAAU,CAAC,YAAY,CACrB,MAAM,EACN,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC,SAAS,+BAA+B,YAAY,GAAG,CAC3H,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,CAAS;QAC1B,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACK,oBAAoB,CAC1B,aAAsB,EACtB,IAAa,EACb,aAAsB;QAEtB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,WAAW,CAAC,cAAc;gBAC7B,OAAO,aAAa;oBAClB,CAAC,CAAC,cAAc,aAAa,WAAW;oBACxC,CAAC,CAAC,mBAAmB,CAAC;YAC1B,KAAK,WAAW,CAAC,KAAK;gBACpB,OAAO,aAAa;oBAClB,CAAC,CAAC,cAAc,aAAa,SAAS;oBACtC,CAAC,CAAC,eAAe,CAAC;YACtB,KAAK,WAAW,CAAC,UAAU;gBACzB,OAAO,aAAa;oBAClB,CAAC,CAAC,eAAe,aAAa,WAAW;oBACzC,CAAC,CAAC,oBAAoB,CAAC;YAC3B,KAAK,WAAW,CAAC,SAAS;gBACxB,OAAO,cAAc,CAAC;YACxB,KAAK,WAAW,CAAC,cAAc;gBAC7B,OAAO,mBAAmB,CAAC;YAC7B,KAAK,WAAW,CAAC,QAAQ;gBACvB,OAAO,kBAAkB,CAAC;YAC5B;gBACE,OAAO,kBAAkB,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}

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

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

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

@@ -0,0 +1,144 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { SlashCommandConflictHandler } from './SlashCommandConflictHandler.js';
+import { coreEvents, CoreEvent, } from '@google/gemini-cli-core';
+import { CommandKind } from '../ui/commands/types.js';
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        coreEvents: {
+            on: vi.fn(),
+            off: vi.fn(),
+            emitFeedback: vi.fn(),
+        },
+    };
+});
+describe('SlashCommandConflictHandler', () => {
+    let handler;
+    /**
+     * Helper to find and invoke the registered conflict event listener.
+     */
+    const simulateEvent = (conflicts) => {
+        const callback = vi
+            .mocked(coreEvents.on)
+            .mock.calls.find((call) => call[0] === CoreEvent.SlashCommandConflicts)[1];
+        callback({ conflicts });
+    };
+    beforeEach(() => {
+        vi.useFakeTimers();
+        handler = new SlashCommandConflictHandler();
+        handler.start();
+    });
+    afterEach(() => {
+        handler.stop();
+        vi.clearAllMocks();
+        vi.useRealTimers();
+    });
+    it('should listen for conflict events on start', () => {
+        expect(coreEvents.on).toHaveBeenCalledWith(CoreEvent.SlashCommandConflicts, expect.any(Function));
+    });
+    it('should display a descriptive message for a single extension conflict', () => {
+        simulateEvent([
+            {
+                name: 'deploy',
+                renamedTo: 'firebase.deploy',
+                loserExtensionName: 'firebase',
+                loserKind: CommandKind.EXTENSION_FILE,
+                winnerKind: CommandKind.BUILT_IN,
+            },
+        ]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('info', "Extension 'firebase' command '/deploy' was renamed to '/firebase.deploy' because it conflicts with built-in command.");
+    });
+    it('should display a descriptive message for a single MCP conflict', () => {
+        simulateEvent([
+            {
+                name: 'pickle',
+                renamedTo: 'test-server.pickle',
+                loserMcpServerName: 'test-server',
+                loserKind: CommandKind.MCP_PROMPT,
+                winnerExtensionName: 'pickle-rick',
+                winnerKind: CommandKind.EXTENSION_FILE,
+            },
+        ]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('info', "MCP server 'test-server' command '/pickle' was renamed to '/test-server.pickle' because it conflicts with extension 'pickle-rick' command.");
+    });
+    it('should group multiple conflicts for the same command name', () => {
+        simulateEvent([
+            {
+                name: 'launch',
+                renamedTo: 'user.launch',
+                loserKind: CommandKind.USER_FILE,
+                winnerKind: CommandKind.WORKSPACE_FILE,
+            },
+            {
+                name: 'launch',
+                renamedTo: 'workspace.launch',
+                loserKind: CommandKind.WORKSPACE_FILE,
+                winnerKind: CommandKind.USER_FILE,
+            },
+        ]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('info', `Conflicts detected for command '/launch':
+- User command '/launch' was renamed to '/user.launch'
+- Workspace command '/launch' was renamed to '/workspace.launch'`);
+    });
+    it('should debounce multiple events within the flush window', () => {
+        simulateEvent([
+            {
+                name: 'a',
+                renamedTo: 'user.a',
+                loserKind: CommandKind.USER_FILE,
+                winnerKind: CommandKind.BUILT_IN,
+            },
+        ]);
+        vi.advanceTimersByTime(200);
+        simulateEvent([
+            {
+                name: 'b',
+                renamedTo: 'user.b',
+                loserKind: CommandKind.USER_FILE,
+                winnerKind: CommandKind.BUILT_IN,
+            },
+        ]);
+        vi.advanceTimersByTime(600);
+        // Should emit two feedbacks (one for each unique command name)
+        expect(coreEvents.emitFeedback).toHaveBeenCalledTimes(2);
+    });
+    it('should deduplicate already notified conflicts', () => {
+        const conflict = {
+            name: 'deploy',
+            renamedTo: 'firebase.deploy',
+            loserExtensionName: 'firebase',
+            loserKind: CommandKind.EXTENSION_FILE,
+            winnerKind: CommandKind.BUILT_IN,
+        };
+        simulateEvent([conflict]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledTimes(1);
+        vi.mocked(coreEvents.emitFeedback).mockClear();
+        simulateEvent([conflict]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
+    });
+    it('should display a descriptive message for a skill conflict', () => {
+        simulateEvent([
+            {
+                name: 'chat',
+                renamedTo: 'google-workspace.chat',
+                loserExtensionName: 'google-workspace',
+                loserKind: CommandKind.SKILL,
+                winnerKind: CommandKind.BUILT_IN,
+            },
+        ]);
+        vi.advanceTimersByTime(600);
+        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('info', "Extension 'google-workspace' skill '/chat' was renamed to '/google-workspace.chat' because it conflicts with built-in command.");
+    });
+});
+//# sourceMappingURL=SlashCommandConflictHandler.test.js.map

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

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

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

@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type SlashCommand } from '../ui/commands/types.js';
+import type { CommandConflict } from './types.js';
+/**
+ * Resolves name conflicts among slash commands.
+ *
+ * Rules:
+ * 1. Built-in commands always keep the original name.
+ * 2. All other types are prefixed with their source name (e.g. user.name).
+ * 3. If multiple non-built-in commands conflict, all of them are renamed.
+ */
+export declare class SlashCommandResolver {
+    /**
+     * Orchestrates conflict resolution by applying renaming rules to ensures
+     * every command has a unique name.
+     */
+    static resolve(allCommands: SlashCommand[]): {
+        finalCommands: SlashCommand[];
+        conflicts: CommandConflict[];
+    };
+    /**
+     * Resolves a name collision by deciding which command keeps the name and which is renamed.
+     *
+     * @param incoming The command currently being processed that has a name collision.
+     * @param registry The internal state of the resolution process.
+     * @returns The final name to be assigned to the `incoming` command.
+     */
+    private static handleConflict;
+    /**
+     * Safely renames the command currently occupying a name in the registry.
+     *
+     * @param name The name of the command to prefix.
+     * @param reason The incoming command that is causing the prefixing.
+     * @param registry The internal state of the resolution process.
+     */
+    private static prefixExistingCommand;
+    /**
+     * Generates a unique name using numeric suffixes if needed.
+     */
+    private static getRenamedName;
+    /**
+     * Returns a suitable prefix for a conflicting command.
+     */
+    private static getPrefix;
+    /**
+     * Logs a conflict event.
+     */
+    private static trackConflict;
+}

package/dist/src/services/SlashCommandResolver.js

@@ -0,0 +1,156 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandKind } from '../ui/commands/types.js';
+/**
+ * Internal registry to track commands and conflicts during resolution.
+ */
+class CommandRegistry {
+    commandMap = new Map();
+    conflictsMap = new Map();
+    firstEncounters = new Map();
+    get finalCommands() {
+        return Array.from(this.commandMap.values());
+    }
+    get conflicts() {
+        return Array.from(this.conflictsMap.values());
+    }
+}
+/**
+ * Resolves name conflicts among slash commands.
+ *
+ * Rules:
+ * 1. Built-in commands always keep the original name.
+ * 2. All other types are prefixed with their source name (e.g. user.name).
+ * 3. If multiple non-built-in commands conflict, all of them are renamed.
+ */
+export class SlashCommandResolver {
+    /**
+     * Orchestrates conflict resolution by applying renaming rules to ensures
+     * every command has a unique name.
+     */
+    static resolve(allCommands) {
+        const registry = new CommandRegistry();
+        for (const cmd of allCommands) {
+            const originalName = cmd.name;
+            let finalName = originalName;
+            const shouldAlwaysPrefix = cmd.kind === CommandKind.SKILL && !!cmd.extensionName;
+            if (shouldAlwaysPrefix) {
+                finalName = this.getRenamedName(originalName, this.getPrefix(cmd), registry.commandMap, cmd.kind);
+            }
+            else if (registry.firstEncounters.has(originalName)) {
+                // We've already seen a command with this name, so resolve the conflict.
+                finalName = this.handleConflict(cmd, registry);
+            }
+            else {
+                // Track the first claimant to report them as the conflict reason later.
+                registry.firstEncounters.set(originalName, cmd);
+            }
+            // Store under final name, ensuring the command object reflects it.
+            registry.commandMap.set(finalName, {
+                ...cmd,
+                name: finalName,
+            });
+        }
+        return {
+            finalCommands: registry.finalCommands,
+            conflicts: registry.conflicts,
+        };
+    }
+    /**
+     * Resolves a name collision by deciding which command keeps the name and which is renamed.
+     *
+     * @param incoming The command currently being processed that has a name collision.
+     * @param registry The internal state of the resolution process.
+     * @returns The final name to be assigned to the `incoming` command.
+     */
+    static handleConflict(incoming, registry) {
+        const collidingName = incoming.name;
+        const originalClaimant = registry.firstEncounters.get(collidingName);
+        // Incoming built-in takes priority. Prefix any existing owner.
+        if (incoming.kind === CommandKind.BUILT_IN) {
+            this.prefixExistingCommand(collidingName, incoming, registry);
+            return collidingName;
+        }
+        // Incoming non-built-in is renamed to its source-prefixed version.
+        const renamedName = this.getRenamedName(incoming.name, this.getPrefix(incoming), registry.commandMap, incoming.kind);
+        this.trackConflict(registry.conflictsMap, collidingName, originalClaimant, incoming, renamedName);
+        // Prefix current owner as well if it isn't a built-in.
+        this.prefixExistingCommand(collidingName, incoming, registry);
+        return renamedName;
+    }
+    /**
+     * Safely renames the command currently occupying a name in the registry.
+     *
+     * @param name The name of the command to prefix.
+     * @param reason The incoming command that is causing the prefixing.
+     * @param registry The internal state of the resolution process.
+     */
+    static prefixExistingCommand(name, reason, registry) {
+        const currentOwner = registry.commandMap.get(name);
+        // Only non-built-in commands can be prefixed.
+        if (!currentOwner || currentOwner.kind === CommandKind.BUILT_IN) {
+            return;
+        }
+        // Determine the new name for the owner using its source prefix.
+        const renamedName = this.getRenamedName(currentOwner.name, this.getPrefix(currentOwner), registry.commandMap, currentOwner.kind);
+        // Update the registry: remove the old name and add the owner under the new name.
+        registry.commandMap.delete(name);
+        const renamedOwner = { ...currentOwner, name: renamedName };
+        registry.commandMap.set(renamedName, renamedOwner);
+        // Record the conflict so the user can be notified of the prefixing.
+        this.trackConflict(registry.conflictsMap, name, reason, currentOwner, renamedName);
+    }
+    /**
+     * Generates a unique name using numeric suffixes if needed.
+     */
+    static getRenamedName(name, prefix, commandMap, kind) {
+        const isExtensionPrefix = kind === CommandKind.SKILL || kind === CommandKind.EXTENSION_FILE;
+        const separator = isExtensionPrefix ? ':' : '.';
+        const base = prefix ? `${prefix}${separator}${name}` : name;
+        let renamedName = base;
+        let suffix = 1;
+        while (commandMap.has(renamedName)) {
+            renamedName = `${base}${suffix}`;
+            suffix++;
+        }
+        return renamedName;
+    }
+    /**
+     * Returns a suitable prefix for a conflicting command.
+     */
+    static getPrefix(cmd) {
+        switch (cmd.kind) {
+            case CommandKind.EXTENSION_FILE:
+            case CommandKind.SKILL:
+                return cmd.extensionName;
+            case CommandKind.MCP_PROMPT:
+                return cmd.mcpServerName;
+            case CommandKind.USER_FILE:
+                return 'user';
+            case CommandKind.WORKSPACE_FILE:
+                return 'workspace';
+            default:
+                return undefined;
+        }
+    }
+    /**
+     * Logs a conflict event.
+     */
+    static trackConflict(conflictsMap, originalName, reason, displacedCommand, renamedTo) {
+        if (!conflictsMap.has(originalName)) {
+            conflictsMap.set(originalName, {
+                name: originalName,
+                losers: [],
+            });
+        }
+        conflictsMap.get(originalName).losers.push({
+            command: displacedCommand,
+            renamedTo,
+            reason,
+        });
+    }
+}
+//# sourceMappingURL=SlashCommandResolver.js.map

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

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

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

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