@google/gemini-cli 0.1.13 → 0.1.15

package/dist/src/services/McpPromptLoader.js

@@ -0,0 +1,192 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getErrorMessage, getMCPServerPrompts, } from '@google/gemini-cli-core';
+import { CommandKind, } from '../ui/commands/types.js';
+/**
+ * Discovers and loads executable slash commands from prompts exposed by
+ * Model-Context-Protocol (MCP) servers.
+ */
+export class McpPromptLoader {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    /**
+     * Loads all available prompts from all configured MCP servers and adapts
+     * them into executable SlashCommand objects.
+     *
+     * @param _signal An AbortSignal (unused for this synchronous loader).
+     * @returns A promise that resolves to an array of loaded SlashCommands.
+     */
+    loadCommands(_signal) {
+        const promptCommands = [];
+        if (!this.config) {
+            return Promise.resolve([]);
+        }
+        const mcpServers = this.config.getMcpServers() || {};
+        for (const serverName in mcpServers) {
+            const prompts = getMCPServerPrompts(this.config, serverName) || [];
+            for (const prompt of prompts) {
+                const commandName = `${prompt.name}`;
+                const newPromptCommand = {
+                    name: commandName,
+                    description: prompt.description || `Invoke prompt ${prompt.name}`,
+                    kind: CommandKind.MCP_PROMPT,
+                    subCommands: [
+                        {
+                            name: 'help',
+                            description: 'Show help for this prompt',
+                            kind: CommandKind.MCP_PROMPT,
+                            action: async () => {
+                                if (!prompt.arguments || prompt.arguments.length === 0) {
+                                    return {
+                                        type: 'message',
+                                        messageType: 'info',
+                                        content: `Prompt "${prompt.name}" has no arguments.`,
+                                    };
+                                }
+                                let helpMessage = `Arguments for "${prompt.name}":\n\n`;
+                                if (prompt.arguments && prompt.arguments.length > 0) {
+                                    helpMessage += `You can provide arguments by name (e.g., --argName="value") or by position.\n\n`;
+                                    helpMessage += `e.g., ${prompt.name} ${prompt.arguments?.map((_) => `"foo"`)} is equivalent to ${prompt.name} ${prompt.arguments?.map((arg) => `--${arg.name}="foo"`)}\n\n`;
+                                }
+                                for (const arg of prompt.arguments) {
+                                    helpMessage += `  --${arg.name}\n`;
+                                    if (arg.description) {
+                                        helpMessage += `    ${arg.description}\n`;
+                                    }
+                                    helpMessage += `    (required: ${arg.required ? 'yes' : 'no'})\n\n`;
+                                }
+                                return {
+                                    type: 'message',
+                                    messageType: 'info',
+                                    content: helpMessage,
+                                };
+                            },
+                        },
+                    ],
+                    action: async (context, args) => {
+                        if (!this.config) {
+                            return {
+                                type: 'message',
+                                messageType: 'error',
+                                content: 'Config not loaded.',
+                            };
+                        }
+                        const promptInputs = this.parseArgs(args, prompt.arguments);
+                        if (promptInputs instanceof Error) {
+                            return {
+                                type: 'message',
+                                messageType: 'error',
+                                content: promptInputs.message,
+                            };
+                        }
+                        try {
+                            const mcpServers = this.config.getMcpServers() || {};
+                            const mcpServerConfig = mcpServers[serverName];
+                            if (!mcpServerConfig) {
+                                return {
+                                    type: 'message',
+                                    messageType: 'error',
+                                    content: `MCP server config not found for '${serverName}'.`,
+                                };
+                            }
+                            const result = await prompt.invoke(promptInputs);
+                            if (result.error) {
+                                return {
+                                    type: 'message',
+                                    messageType: 'error',
+                                    content: `Error invoking prompt: ${result.error}`,
+                                };
+                            }
+                            if (!result.messages?.[0]?.content?.text) {
+                                return {
+                                    type: 'message',
+                                    messageType: 'error',
+                                    content: 'Received an empty or invalid prompt response from the server.',
+                                };
+                            }
+                            return {
+                                type: 'submit_prompt',
+                                content: JSON.stringify(result.messages[0].content.text),
+                            };
+                        }
+                        catch (error) {
+                            return {
+                                type: 'message',
+                                messageType: 'error',
+                                content: `Error: ${getErrorMessage(error)}`,
+                            };
+                        }
+                    },
+                    completion: async (_, partialArg) => {
+                        if (!prompt || !prompt.arguments) {
+                            return [];
+                        }
+                        const suggestions = [];
+                        const usedArgNames = new Set((partialArg.match(/--([^=]+)/g) || []).map((s) => s.substring(2)));
+                        for (const arg of prompt.arguments) {
+                            if (!usedArgNames.has(arg.name)) {
+                                suggestions.push(`--${arg.name}=""`);
+                            }
+                        }
+                        return suggestions;
+                    },
+                };
+                promptCommands.push(newPromptCommand);
+            }
+        }
+        return Promise.resolve(promptCommands);
+    }
+    parseArgs(userArgs, promptArgs) {
+        const argValues = {};
+        const promptInputs = {};
+        // arg parsing: --key="value" or --key=value
+        const namedArgRegex = /--([^=]+)=(?:"((?:\\.|[^"\\])*)"|([^ ]*))/g;
+        let match;
+        const remainingArgs = [];
+        let lastIndex = 0;
+        while ((match = namedArgRegex.exec(userArgs)) !== null) {
+            const key = match[1];
+            const value = match[2] ?? match[3]; // Quoted or unquoted value
+            argValues[key] = value;
+            // Capture text between matches as potential positional args
+            if (match.index > lastIndex) {
+                remainingArgs.push(userArgs.substring(lastIndex, match.index).trim());
+            }
+            lastIndex = namedArgRegex.lastIndex;
+        }
+        // Capture any remaining text after the last named arg
+        if (lastIndex < userArgs.length) {
+            remainingArgs.push(userArgs.substring(lastIndex).trim());
+        }
+        const positionalArgs = remainingArgs.join(' ').split(/ +/);
+        if (!promptArgs) {
+            return promptInputs;
+        }
+        for (const arg of promptArgs) {
+            if (argValues[arg.name]) {
+                promptInputs[arg.name] = argValues[arg.name];
+            }
+        }
+        const unfilledArgs = promptArgs.filter((arg) => arg.required && !promptInputs[arg.name]);
+        const missingArgs = [];
+        for (let i = 0; i < unfilledArgs.length; i++) {
+            if (positionalArgs.length > i && positionalArgs[i]) {
+                promptInputs[unfilledArgs[i].name] = positionalArgs[i];
+            }
+            else {
+                missingArgs.push(unfilledArgs[i].name);
+            }
+        }
+        if (missingArgs.length > 0) {
+            const missingArgNames = missingArgs.map((name) => `--${name}`).join(', ');
+            return new Error(`Missing required argument(s): ${missingArgNames}`);
+        }
+        return promptInputs;
+    }
+}
+//# sourceMappingURL=McpPromptLoader.js.map

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

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

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/shellProcessor.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandContext } from '../../ui/commands/types.js';
+import { IPromptProcessor } from './types.js';
+export declare class ConfirmationRequiredError extends Error {
+    commandsToConfirm: string[];
+    constructor(message: string, commandsToConfirm: string[]);
+}
+/**
+ * Finds all instances of shell command injections (`!{...}`) in a prompt,
+ * executes them, and replaces the injection site with the command's output.
+ *
+ * This processor ensures that only allowlisted commands are executed. If a
+ * disallowed command is found, it halts execution and reports an error.
+ */
+export declare class ShellProcessor implements IPromptProcessor {
+    private readonly commandName;
+    /**
+     * A regular expression to find all instances of `!{...}`. The inner
+     * capture group extracts the command itself.
+     */
+    private static readonly SHELL_INJECTION_REGEX;
+    /**
+     * @param commandName The name of the custom command being executed, used
+     *   for logging and error messages.
+     */
+    constructor(commandName: string);
+    process(prompt: string, context: CommandContext): Promise<string>;
+}

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

@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { checkCommandPermissions, ShellExecutionService, } from '@google/gemini-cli-core';
+export class ConfirmationRequiredError extends Error {
+    commandsToConfirm;
+    constructor(message, commandsToConfirm) {
+        super(message);
+        this.commandsToConfirm = commandsToConfirm;
+        this.name = 'ConfirmationRequiredError';
+    }
+}
+/**
+ * Finds all instances of shell command injections (`!{...}`) in a prompt,
+ * executes them, and replaces the injection site with the command's output.
+ *
+ * This processor ensures that only allowlisted commands are executed. If a
+ * disallowed command is found, it halts execution and reports an error.
+ */
+export class ShellProcessor {
+    commandName;
+    /**
+     * A regular expression to find all instances of `!{...}`. The inner
+     * capture group extracts the command itself.
+     */
+    static SHELL_INJECTION_REGEX = /!\{([^}]*)\}/g;
+    /**
+     * @param commandName The name of the custom command being executed, used
+     *   for logging and error messages.
+     */
+    constructor(commandName) {
+        this.commandName = commandName;
+    }
+    async process(prompt, context) {
+        const { config, sessionShellAllowlist } = {
+            ...context.services,
+            ...context.session,
+        };
+        const commandsToExecute = [];
+        const commandsToConfirm = new Set();
+        const matches = [...prompt.matchAll(ShellProcessor.SHELL_INJECTION_REGEX)];
+        if (matches.length === 0) {
+            return prompt; // No shell commands, nothing to do.
+        }
+        // Discover all commands and check permissions.
+        for (const match of matches) {
+            const command = match[1].trim();
+            const { allAllowed, disallowedCommands, blockReason, isHardDenial } = checkCommandPermissions(command, config, sessionShellAllowlist);
+            if (!allAllowed) {
+                // If it's a hard denial, this is a non-recoverable security error.
+                if (isHardDenial) {
+                    throw new Error(`${this.commandName} cannot be run. ${blockReason || 'A shell command in this custom command is explicitly blocked in your config settings.'}`);
+                }
+                // Add each soft denial disallowed command to the set for confirmation.
+                disallowedCommands.forEach((uc) => commandsToConfirm.add(uc));
+            }
+            commandsToExecute.push({ fullMatch: match[0], command });
+        }
+        // If any commands require confirmation, throw a special error to halt the
+        // pipeline and trigger the UI flow.
+        if (commandsToConfirm.size > 0) {
+            throw new ConfirmationRequiredError('Shell command confirmation required', Array.from(commandsToConfirm));
+        }
+        // Execute all commands (only runs if no confirmation was needed).
+        let processedPrompt = prompt;
+        for (const { fullMatch, command } of commandsToExecute) {
+            const { result } = ShellExecutionService.execute(command, config.getTargetDir(), () => { }, // No streaming needed.
+            new AbortController().signal);
+            const executionResult = await result;
+            processedPrompt = processedPrompt.replace(fullMatch, executionResult.output);
+        }
+        return processedPrompt;
+    }
+}
+//# sourceMappingURL=shellProcessor.js.map

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

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

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

@@ -0,0 +1,38 @@
+/**
+ * @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}}";
+/**
+ * The trigger string for shell command injection in custom commands.
+ */
+export declare const SHELL_INJECTION_TRIGGER = "!{";

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

@@ -0,0 +1,14 @@
+/**
+ * @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}}';
+/**
+ * The trigger string for shell command injection in custom commands.
+ */
+export const SHELL_INJECTION_TRIGGER = '!{';
+//# 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;AAErD;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,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"}