@google/gemini-cli 0.1.13 → 0.1.14

package/dist/src/services/BuiltinCommandLoader.js

@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { aboutCommand } from '../ui/commands/aboutCommand.js';
+import { authCommand } from '../ui/commands/authCommand.js';
+import { bugCommand } from '../ui/commands/bugCommand.js';
+import { chatCommand } from '../ui/commands/chatCommand.js';
+import { clearCommand } from '../ui/commands/clearCommand.js';
+import { compressCommand } from '../ui/commands/compressCommand.js';
+import { copyCommand } from '../ui/commands/copyCommand.js';
+import { corgiCommand } from '../ui/commands/corgiCommand.js';
+import { docsCommand } from '../ui/commands/docsCommand.js';
+import { editorCommand } from '../ui/commands/editorCommand.js';
+import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
+import { helpCommand } from '../ui/commands/helpCommand.js';
+import { ideCommand } from '../ui/commands/ideCommand.js';
+import { mcpCommand } from '../ui/commands/mcpCommand.js';
+import { memoryCommand } from '../ui/commands/memoryCommand.js';
+import { privacyCommand } from '../ui/commands/privacyCommand.js';
+import { quitCommand } from '../ui/commands/quitCommand.js';
+import { restoreCommand } from '../ui/commands/restoreCommand.js';
+import { statsCommand } from '../ui/commands/statsCommand.js';
+import { themeCommand } from '../ui/commands/themeCommand.js';
+import { toolsCommand } from '../ui/commands/toolsCommand.js';
+/**
+ * Loads the core, hard-coded slash commands that are an integral part
+ * of the Gemini CLI application.
+ */
+export class BuiltinCommandLoader {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    /**
+     * Gathers all raw built-in command definitions, injects dependencies where
+     * needed (e.g., config) and filters out any that are not available.
+     *
+     * @param _signal An AbortSignal (unused for this synchronous loader).
+     * @returns A promise that resolves to an array of `SlashCommand` objects.
+     */
+    async loadCommands(_signal) {
+        const allDefinitions = [
+            aboutCommand,
+            authCommand,
+            bugCommand,
+            chatCommand,
+            clearCommand,
+            compressCommand,
+            copyCommand,
+            corgiCommand,
+            docsCommand,
+            editorCommand,
+            extensionsCommand,
+            helpCommand,
+            ideCommand(this.config),
+            mcpCommand,
+            memoryCommand,
+            privacyCommand,
+            quitCommand,
+            restoreCommand(this.config),
+            statsCommand,
+            themeCommand,
+            toolsCommand,
+        ];
+        return allDefinitions.filter((cmd) => cmd !== null);
+    }
+}
+//# sourceMappingURL=BuiltinCommandLoader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BuiltinCommandLoader.js","sourceRoot":"","sources":["../../../src/services/BuiltinCommandLoader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IACX;IAApB,YAAoB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAE7C;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAAC,OAAoB;QACrC,MAAM,cAAc,GAA+B;YACjD,YAAY;YACZ,WAAW;YACX,UAAU;YACV,WAAW;YACX,YAAY;YACZ,eAAe;YACf,WAAW;YACX,YAAY;YACZ,WAAW;YACX,aAAa;YACb,iBAAiB;YACjB,WAAW;YACX,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;YACvB,UAAU;YACV,aAAa;YACb,cAAc;YACd,WAAW;YACX,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3B,YAAY;YACZ,YAAY;YACZ,YAAY;SACb,CAAC;QAEF,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAuB,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF"}

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

@@ -3,13 +3,49 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Config } from '@google/gemini-cli-core';
 import { SlashCommand } from '../ui/commands/types.js';
+import { 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 config;
-    private commandLoader;
-    private commands;
-    constructor(config: Config | null, commandLoader?: (config: Config | null) => Promise<SlashCommand[]>);
-    loadCommands(): Promise<void>;
-    getCommands(): SlashCommand[];
+    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 by letting the last-loaded command win, and then returns a
+     * fully constructed `CommandService` instance.
+     *
+     * @param loaders An array of objects that conform to the `ICommandLoader`
+     *   interface. The order of loaders is significant: if multiple loaders
+     *   provide a command with the same name, the command from the loader that
+     *   appears later in the array will take precedence.
+     * @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

@@ -3,65 +3,70 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { memoryCommand } from '../ui/commands/memoryCommand.js';
-import { helpCommand } from '../ui/commands/helpCommand.js';
-import { clearCommand } from '../ui/commands/clearCommand.js';
-import { corgiCommand } from '../ui/commands/corgiCommand.js';
-import { docsCommand } from '../ui/commands/docsCommand.js';
-import { mcpCommand } from '../ui/commands/mcpCommand.js';
-import { authCommand } from '../ui/commands/authCommand.js';
-import { themeCommand } from '../ui/commands/themeCommand.js';
-import { editorCommand } from '../ui/commands/editorCommand.js';
-import { chatCommand } from '../ui/commands/chatCommand.js';
-import { statsCommand } from '../ui/commands/statsCommand.js';
-import { privacyCommand } from '../ui/commands/privacyCommand.js';
-import { aboutCommand } from '../ui/commands/aboutCommand.js';
-import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
-import { toolsCommand } from '../ui/commands/toolsCommand.js';
-import { compressCommand } from '../ui/commands/compressCommand.js';
-import { ideCommand } from '../ui/commands/ideCommand.js';
-import { bugCommand } from '../ui/commands/bugCommand.js';
-import { quitCommand } from '../ui/commands/quitCommand.js';
-import { restoreCommand } from '../ui/commands/restoreCommand.js';
-const loadBuiltInCommands = async (config) => {
-    const allCommands = [
-        aboutCommand,
-        authCommand,
-        bugCommand,
-        chatCommand,
-        clearCommand,
-        compressCommand,
-        corgiCommand,
-        docsCommand,
-        editorCommand,
-        extensionsCommand,
-        helpCommand,
-        ideCommand(config),
-        mcpCommand,
-        memoryCommand,
-        privacyCommand,
-        quitCommand,
-        restoreCommand(config),
-        statsCommand,
-        themeCommand,
-        toolsCommand,
-    ];
-    return allCommands.filter((command) => command !== null);
-};
+/**
+ * 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 {
-    config;
-    commandLoader;
-    commands = [];
-    constructor(config, commandLoader = loadBuiltInCommands) {
-        this.config = config;
-        this.commandLoader = commandLoader;
-        // The constructor can be used for dependency injection in the future.
+    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;
     }
-    async loadCommands() {
-        // For now, we only load the built-in commands.
-        // File-based and remote commands will be added later.
-        this.commands = await this.commandLoader(this.config);
+    /**
+     * 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 by letting the last-loaded command win, and then returns a
+     * fully constructed `CommandService` instance.
+     *
+     * @param loaders An array of objects that conform to the `ICommandLoader`
+     *   interface. The order of loaders is significant: if multiple loaders
+     *   provide a command with the same name, the command from the loader that
+     *   appears later in the array will take precedence.
+     * @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);
+            }
+        }
+        // De-duplicate commands using a Map. The last one found with a given name wins.
+        // This creates a natural override system based on the order of the loaders
+        // passed to the constructor.
+        const commandMap = new Map();
+        for (const cmd of allCommands) {
+            commandMap.set(cmd.name, cmd);
+        }
+        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;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"CommandService.js","sourceRoot":"","sources":["../../../src/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,MAAM,mBAAmB,GAAG,KAAK,EAC/B,MAAqB,EACI,EAAE;IAC3B,MAAM,WAAW,GAAG;QAClB,YAAY;QACZ,WAAW;QACX,UAAU;QACV,WAAW;QACX,YAAY;QACZ,eAAe;QACf,YAAY;QACZ,WAAW;QACX,aAAa;QACb,iBAAiB;QACjB,WAAW;QACX,UAAU,CAAC,MAAM,CAAC;QAClB,UAAU;QACV,aAAa;QACb,cAAc;QACd,WAAW;QACX,cAAc,CAAC,MAAM,CAAC;QACtB,YAAY;QACZ,YAAY;QACZ,YAAY;KACb,CAAC;IAEF,OAAO,WAAW,CAAC,MAAM,CACvB,CAAC,OAAO,EAA2B,EAAE,CAAC,OAAO,KAAK,IAAI,CACvD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,cAAc;IAIf;IACA;IAJF,QAAQ,GAAmB,EAAE,CAAC;IAEtC,YACU,MAAqB,EACrB,gBAEuB,mBAAmB;QAH1C,WAAM,GAAN,MAAM,CAAe;QACrB,kBAAa,GAAb,aAAa,CAE6B;QAElD,sEAAsE;IACxE,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,+CAA+C;QAC/C,sDAAsD;QACtD,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}
+{"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;;;;;;;;;;;;;;OAcG;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,gFAAgF;QAChF,2EAA2E;QAC3E,6BAA6B;QAC7B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,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/FileCommandLoader.d.ts

@@ -0,0 +1,37 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Config } from '@google/gemini-cli-core';
+import { ICommandLoader } from './types.js';
+import { 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;
+    constructor(config: Config | null);
+    /**
+     * Loads all commands, applying the precedence rule where project-level
+     * commands override user-level commands with the same name.
+     * @param signal An AbortSignal to cancel the loading process.
+     * @returns A promise that resolves to an array of loaded SlashCommands.
+     */
+    loadCommands(signal: AbortSignal): Promise<SlashCommand[]>;
+    /**
+     * 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.
+     * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
+     */
+    private parseAndAdaptFile;
+}

package/dist/src/services/FileCommandLoader.js

@@ -0,0 +1,156 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { promises as fs } from 'fs';
+import path from 'path';
+import toml from '@iarna/toml';
+import { glob } from 'glob';
+import { z } from 'zod';
+import { getProjectCommandsDir, getUserCommandsDir, } from '@google/gemini-cli-core';
+import { CommandKind, } from '../ui/commands/types.js';
+import { DefaultArgumentProcessor, ShorthandArgumentProcessor, } from './prompt-processors/argumentProcessor.js';
+import { SHORTHAND_ARGS_PLACEHOLDER, } from './prompt-processors/types.js';
+/**
+ * Defines the Zod schema for a command definition file. This serves as the
+ * single source of truth for both validation and type inference.
+ */
+const TomlCommandDefSchema = z.object({
+    prompt: z.string({
+        required_error: "The 'prompt' field is required.",
+        invalid_type_error: "The 'prompt' field must be a string.",
+    }),
+    description: z.string().optional(),
+});
+/**
+ * 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 class FileCommandLoader {
+    config;
+    projectRoot;
+    constructor(config) {
+        this.config = config;
+        this.projectRoot = config?.getProjectRoot() || process.cwd();
+    }
+    /**
+     * Loads all commands, applying the precedence rule where project-level
+     * commands override user-level commands with the same name.
+     * @param signal An AbortSignal to cancel the loading process.
+     * @returns A promise that resolves to an array of loaded SlashCommands.
+     */
+    async loadCommands(signal) {
+        const commandMap = new Map();
+        const globOptions = {
+            nodir: true,
+            dot: true,
+            signal,
+        };
+        try {
+            // User Commands
+            const userDir = getUserCommandsDir();
+            const userFiles = await glob('**/*.toml', {
+                ...globOptions,
+                cwd: userDir,
+            });
+            const userCommandPromises = userFiles.map((file) => this.parseAndAdaptFile(path.join(userDir, file), userDir));
+            const userCommands = (await Promise.all(userCommandPromises)).filter((cmd) => cmd !== null);
+            for (const cmd of userCommands) {
+                commandMap.set(cmd.name, cmd);
+            }
+            // Project Commands (these intentionally override user commands)
+            const projectDir = getProjectCommandsDir(this.projectRoot);
+            const projectFiles = await glob('**/*.toml', {
+                ...globOptions,
+                cwd: projectDir,
+            });
+            const projectCommandPromises = projectFiles.map((file) => this.parseAndAdaptFile(path.join(projectDir, file), projectDir));
+            const projectCommands = (await Promise.all(projectCommandPromises)).filter((cmd) => cmd !== null);
+            for (const cmd of projectCommands) {
+                commandMap.set(cmd.name, cmd);
+            }
+        }
+        catch (error) {
+            console.error(`[FileCommandLoader] Error during file search:`, error);
+        }
+        return Array.from(commandMap.values());
+    }
+    /**
+     * 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.
+     * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
+     */
+    async parseAndAdaptFile(filePath, baseDir) {
+        let fileContent;
+        try {
+            fileContent = await fs.readFile(filePath, 'utf-8');
+        }
+        catch (error) {
+            console.error(`[FileCommandLoader] Failed to read file ${filePath}:`, error instanceof Error ? error.message : String(error));
+            return null;
+        }
+        let parsed;
+        try {
+            parsed = toml.parse(fileContent);
+        }
+        catch (error) {
+            console.error(`[FileCommandLoader] Failed to parse TOML file ${filePath}:`, error instanceof Error ? error.message : String(error));
+            return null;
+        }
+        const validationResult = TomlCommandDefSchema.safeParse(parsed);
+        if (!validationResult.success) {
+            console.error(`[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`, validationResult.error.flatten());
+            return null;
+        }
+        const validDef = validationResult.data;
+        const relativePathWithExt = path.relative(baseDir, filePath);
+        const relativePath = relativePathWithExt.substring(0, relativePathWithExt.length - 5);
+        const commandName = relativePath
+            .split(path.sep)
+            // Sanitize each path segment to prevent ambiguity. Since ':' is our
+            // namespace separator, we replace any literal colons in filenames
+            // with underscores to avoid naming conflicts.
+            .map((segment) => segment.replaceAll(':', '_'))
+            .join(':');
+        const processors = [];
+        // The presence of '{{args}}' is the switch that determines the behavior.
+        if (validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER)) {
+            processors.push(new ShorthandArgumentProcessor());
+        }
+        else {
+            processors.push(new DefaultArgumentProcessor());
+        }
+        return {
+            name: commandName,
+            description: validDef.description ||
+                `Custom command from ${path.basename(filePath)}`,
+            kind: CommandKind.FILE,
+            action: async (context, _args) => {
+                if (!context.invocation) {
+                    console.error(`[FileCommandLoader] Critical error: Command '${commandName}' was executed without invocation context.`);
+                    return {
+                        type: 'submit_prompt',
+                        content: validDef.prompt, // Fallback to unprocessed prompt
+                    };
+                }
+                let processedPrompt = validDef.prompt;
+                for (const processor of processors) {
+                    processedPrompt = await processor.process(processedPrompt, context);
+                }
+                return {
+                    type: 'submit_prompt',
+                    content: processedPrompt,
+                };
+            },
+        };
+    }
+}
+//# sourceMappingURL=FileCommandLoader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FileCommandLoader.js","sourceRoot":"","sources":["../../../src/services/FileCommandLoader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,WAAW,GAGZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,cAAc,EAAE,iCAAiC;QACjD,kBAAkB,EAAE,sCAAsC;KAC3D,CAAC;IACF,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACnC,CAAC,CAAC;AAEH;;;;;;;;;GASG;AACH,MAAM,OAAO,iBAAiB;IAGC;IAFZ,WAAW,CAAS;IAErC,YAA6B,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;QAChD,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,cAAc,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CAAC,MAAmB;QACpC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QACnD,MAAM,WAAW,GAAG;YAClB,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,IAAI;YACT,MAAM;SACP,CAAC;QAEF,IAAI,CAAC;YACH,gBAAgB;YAChB,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE;gBACxC,GAAG,WAAW;gBACd,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;YACH,MAAM,mBAAmB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAC1D,CAAC;YACF,MAAM,YAAY,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAClE,CAAC,GAAG,EAAuB,EAAE,CAAC,GAAG,KAAK,IAAI,CAC3C,CAAC;YACF,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;gBAC/B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,gEAAgE;YAChE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE;gBAC3C,GAAG,WAAW;gBACd,GAAG,EAAE,UAAU;aAChB,CAAC,CAAC;YACH,MAAM,sBAAsB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAChE,CAAC;YACF,MAAM,eAAe,GAAG,CACtB,MAAM,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAC1C,CAAC,MAAM,CAAC,CAAC,GAAG,EAAuB,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACrD,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;gBAClC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,OAAe;QAEf,IAAI,WAAmB,CAAC;QACxB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CACX,2CAA2C,QAAQ,GAAG,EACtD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CACX,iDAAiD,QAAQ,GAAG,EAC5D,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEhE,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,KAAK,CACX,sDAAsD,QAAQ,sBAAsB,EACpF,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,CACjC,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC;QAEvC,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAG,mBAAmB,CAAC,SAAS,CAChD,CAAC,EACD,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAC/B,CAAC;QACF,MAAM,WAAW,GAAG,YAAY;aAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YAChB,oEAAoE;YACpE,kEAAkE;YAClE,8CAA8C;aAC7C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9C,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,UAAU,GAAuB,EAAE,CAAC;QAE1C,yEAAyE;QACzE,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACzD,UAAU,CAAC,IAAI,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,IAAI,wBAAwB,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,WAAW,EACT,QAAQ,CAAC,WAAW;gBACpB,uBAAuB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAClD,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,KAAa,EACsB,EAAE;gBACrC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;oBACxB,OAAO,CAAC,KAAK,CACX,gDAAgD,WAAW,4CAA4C,CACxG,CAAC;oBACF,OAAO;wBACL,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,iCAAiC;qBAC5D,CAAC;gBACJ,CAAC;gBAED,IAAI,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC;gBACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,eAAe,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACtE,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,eAAe;oBACrB,OAAO,EAAE,eAAe;iBACzB,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/services/prompt-processors/argumentProcessor.d.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { IPromptProcessor } from './types.js';
+import { CommandContext } from '../../ui/commands/types.js';
+/**
+ * Replaces all instances of `{{args}}` in a prompt with the user-provided
+ * argument string.
+ */
+export declare class ShorthandArgumentProcessor implements IPromptProcessor {
+    process(prompt: string, context: CommandContext): Promise<string>;
+}
+/**
+ * Appends the user's full command invocation to the prompt if arguments are
+ * provided, allowing the model to perform its own argument parsing.
+ */
+export declare class DefaultArgumentProcessor implements IPromptProcessor {
+    process(prompt: string, context: CommandContext): Promise<string>;
+}

package/dist/src/services/prompt-processors/argumentProcessor.js

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { SHORTHAND_ARGS_PLACEHOLDER } from './types.js';
+/**
+ * Replaces all instances of `{{args}}` in a prompt with the user-provided
+ * argument string.
+ */
+export class ShorthandArgumentProcessor {
+    async process(prompt, context) {
+        return prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, context.invocation.args);
+    }
+}
+/**
+ * Appends the user's full command invocation to the prompt if arguments are
+ * provided, allowing the model to perform its own argument parsing.
+ */
+export class DefaultArgumentProcessor {
+    async process(prompt, context) {
+        if (context.invocation.args) {
+            return `${prompt}\n\n${context.invocation.raw}`;
+        }
+        return prompt;
+    }
+}
+//# sourceMappingURL=argumentProcessor.js.map

package/dist/src/services/prompt-processors/argumentProcessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"argumentProcessor.js","sourceRoot":"","sources":["../../../../src/services/prompt-processors/argumentProcessor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAoB,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAG1E;;;GAGG;AACH,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAAuB;QACnD,OAAO,MAAM,CAAC,UAAU,CACtB,0BAA0B,EAC1B,OAAO,CAAC,UAAW,CAAC,IAAI,CACzB,CAAC;IACJ,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,wBAAwB;IACnC,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAAuB;QACnD,IAAI,OAAO,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,GAAG,MAAM,OAAO,OAAO,CAAC,UAAW,CAAC,GAAG,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/dist/src/services/prompt-processors/types.d.ts

@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandContext } from '../../ui/commands/types.js';
+/**
+ * Defines the interface for a prompt processor, a module that can transform
+ * a prompt string before it is sent to the model. Processors are chained
+ * together to create a processing pipeline.
+ */
+export interface IPromptProcessor {
+    /**
+     * Processes a prompt string, applying a specific transformation as part of a pipeline.
+     *
+     * Each processor in a command's pipeline receives the output of the previous
+     * processor. This method provides the full command context, allowing for
+     * complex transformations that may require access to invocation details,
+     * application services, or UI state.
+     *
+     * @param prompt The current state of the prompt string. This may have been
+     *   modified by previous processors in the pipeline.
+     * @param context The full command context, providing access to invocation
+     *   details (like `context.invocation.raw` and `context.invocation.args`),
+     *   application services, and UI handlers.
+     * @returns A promise that resolves to the transformed prompt string, which
+     *   will be passed to the next processor or, if it's the last one, sent to the model.
+     */
+    process(prompt: string, context: CommandContext): Promise<string>;
+}
+/**
+ * The placeholder string for shorthand argument injection in custom commands.
+ */
+export declare const SHORTHAND_ARGS_PLACEHOLDER = "{{args}}";

package/dist/src/services/prompt-processors/types.js

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * The placeholder string for shorthand argument injection in custom commands.
+ */
+export const SHORTHAND_ARGS_PLACEHOLDER = '{{args}}';
+//# sourceMappingURL=types.js.map

package/dist/src/services/prompt-processors/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/prompt-processors/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA6BH;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,UAAU,CAAC"}

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

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { SlashCommand } from '../ui/commands/types.js';
+/**
+ * Defines the contract for any class that can load and provide slash commands.
+ * This allows the CommandService to be extended with new command sources
+ * (e.g., file-based, remote APIs) without modification.
+ *
+ * Loaders should receive any necessary dependencies (like Config) via their
+ * constructor.
+ */
+export interface ICommandLoader {
+    /**
+     * Discovers and returns a list of slash commands from the loader's source.
+     * @param signal An AbortSignal to allow cancellation.
+     * @returns A promise that resolves to an array of SlashCommand objects.
+     */
+    loadCommands(signal: AbortSignal): Promise<SlashCommand[]>;
+}

package/dist/src/services/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}