@google/gemini-cli-core 0.1.12 → 0.1.14

package/dist/src/tools/shell.test.js

@@ -6,341 +6,115 @@
 import { expect, describe, it, vi, beforeEach } from 'vitest';
 import { ShellTool } from './shell.js';
 import * as summarizer from '../utils/summarizer.js';
-describe('ShellTool', () => {
-    it('should allow a command if no restrictions are provided', async () => {
-        const config = {
+import os from 'os';
+describe('ShellTool Bug Reproduction', () => {
+    let shellTool;
+    let config;
+    beforeEach(() => {
+        config = {
             getCoreTools: () => undefined,
             getExcludeTools: () => undefined,
+            getDebugMode: () => false,
+            getGeminiClient: () => ({}),
+            getTargetDir: () => '.',
+            getSummarizeToolOutputConfig: () => ({
+                [shellTool.name]: {},
+            }),
         };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ls -l');
-        expect(result.allowed).toBe(true);
-    });
-    it('should allow a command if it is in the allowed list', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool(ls -l)'],
-            getExcludeTools: () => undefined,
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ls -l');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block a command if it is not in the allowed list', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool(ls -l)'],
-            getExcludeTools: () => undefined,
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is not in the allowed commands list");
+        shellTool = new ShellTool(config);
     });
-    it('should block a command if it is in the blocked list', async () => {
-        const config = {
-            getCoreTools: () => undefined,
-            getExcludeTools: () => ['ShellTool(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
+    it('should not let the summarizer override the return display', async () => {
+        const summarizeSpy = vi
+            .spyOn(summarizer, 'summarizeToolOutput')
+            .mockResolvedValue('summarized output');
+        const abortSignal = new AbortController().signal;
+        const result = await shellTool.execute({ command: 'echo hello' }, abortSignal, () => { });
+        expect(result.returnDisplay).toBe('hello' + os.EOL);
+        expect(result.llmContent).toBe('summarized output');
+        expect(summarizeSpy).toHaveBeenCalled();
     });
-    it('should allow a command if it is not in the blocked list', async () => {
-        const config = {
+    it('should not call summarizer if disabled in config', async () => {
+        config = {
             getCoreTools: () => undefined,
-            getExcludeTools: () => ['ShellTool(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ls -l');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block a command if it is in both the allowed and blocked lists', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool(rm -rf /)'],
-            getExcludeTools: () => ['ShellTool(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should allow any command when ShellTool is in coreTools without specific commands', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block any command when ShellTool is in excludeTools without specific commands', async () => {
-        const config = {
-            getCoreTools: () => [],
-            getExcludeTools: () => ['ShellTool'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe('Shell tool is globally disabled in configuration');
-    });
-    it('should allow a command if it is in the allowed list using the public-facing name', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(ls -l)'],
             getExcludeTools: () => undefined,
+            getDebugMode: () => false,
+            getGeminiClient: () => ({}),
+            getTargetDir: () => '.',
+            getSummarizeToolOutputConfig: () => ({}),
         };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ls -l');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block a command if it is in the blocked list using the public-facing name', async () => {
-        const config = {
-            getCoreTools: () => undefined,
-            getExcludeTools: () => ['run_shell_command(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should block any command when ShellTool is in excludeTools using the public-facing name', async () => {
-        const config = {
-            getCoreTools: () => [],
-            getExcludeTools: () => ['run_shell_command'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe('Shell tool is globally disabled in configuration');
-    });
-    it('should block any command if coreTools contains an empty ShellTool command list using the public-facing name', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command()'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'any command' is not in the allowed commands list");
-    });
-    it('should block any command if coreTools contains an empty ShellTool command list', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool()'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'any command' is not in the allowed commands list");
+        shellTool = new ShellTool(config);
+        const summarizeSpy = vi
+            .spyOn(summarizer, 'summarizeToolOutput')
+            .mockResolvedValue('summarized output');
+        const abortSignal = new AbortController().signal;
+        const result = await shellTool.execute({ command: 'echo hello' }, abortSignal, () => { });
+        expect(result.returnDisplay).toBe('hello' + os.EOL);
+        expect(result.llmContent).not.toBe('summarized output');
+        expect(summarizeSpy).not.toHaveBeenCalled();
     });
-    it('should block a command with extra whitespace if it is in the blocked list', async () => {
-        const config = {
+    it('should pass token budget to summarizer', async () => {
+        config = {
             getCoreTools: () => undefined,
-            getExcludeTools: () => ['ShellTool(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed(' rm  -rf  / ');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should allow any command when ShellTool is present with specific commands', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool', 'ShellTool(ls)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('any command');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block a command on the blocklist even with a wildcard allow', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool'],
-            getExcludeTools: () => ['ShellTool(rm -rf /)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should allow a command that starts with an allowed command prefix', async () => {
-        const config = {
-            getCoreTools: () => ['ShellTool(gh issue edit)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue edit 1 --add-label "kind/feature"');
-        expect(result.allowed).toBe(true);
-    });
-    it('should allow a command that starts with an allowed command prefix using the public-facing name', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue edit)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue edit 1 --add-label "kind/feature"');
-        expect(result.allowed).toBe(true);
-    });
-    it('should not allow a command that starts with an allowed command prefix but is chained with another command', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue edit)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue edit&&rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is not in the allowed commands list");
-    });
-    it('should not allow a command that is a prefix of an allowed command', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue edit)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'gh issue' is not in the allowed commands list");
-    });
-    it('should not allow a command that is a prefix of a blocked command', async () => {
-        const config = {
-            getCoreTools: () => [],
-            getExcludeTools: () => ['run_shell_command(gh issue edit)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue');
-        expect(result.allowed).toBe(true);
-    });
-    it('should not allow a command that is chained with a pipe', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue list)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue list | rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is not in the allowed commands list");
-    });
-    it('should not allow a command that is chained with a semicolon', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue list)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue list; rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is not in the allowed commands list");
-    });
-    it('should block a chained command if any part is blocked', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(echo "hello")'],
-            getExcludeTools: () => ['run_shell_command(rm)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('echo "hello" && rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should block a command if its prefix is on the blocklist, even if the command itself is on the allowlist', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(git push)'],
-            getExcludeTools: () => ['run_shell_command(git)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('git push');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'git push' is blocked by configuration");
-    });
-    it('should be case-sensitive in its matching', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(echo)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ECHO "hello"');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe('Command \'ECHO "hello"\' is not in the allowed commands list');
-    });
-    it('should correctly handle commands with extra whitespace around chaining operators', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(ls -l)'],
-            getExcludeTools: () => ['run_shell_command(rm)'],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('ls -l  ;  rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is blocked by configuration");
-    });
-    it('should allow a chained command if all parts are allowed', async () => {
-        const config = {
-            getCoreTools: () => [
-                'run_shell_command(echo)',
-                'run_shell_command(ls -l)',
-            ],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('echo "hello" && ls -l');
-        expect(result.allowed).toBe(true);
-    });
-    it('should allow a command with command substitution using backticks', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(echo)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('echo `rm -rf /`');
-        expect(result.allowed).toBe(true);
-    });
-    it('should block a command with command substitution using $()', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(echo)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('echo $(rm -rf /)');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe('Command substitution using $() is not allowed for security reasons');
-    });
-    it('should allow a command with I/O redirection', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(echo)'],
-            getExcludeTools: () => [],
-        };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('echo "hello" > file.txt');
-        expect(result.allowed).toBe(true);
-    });
-    it('should not allow a command that is chained with a double pipe', async () => {
-        const config = {
-            getCoreTools: () => ['run_shell_command(gh issue list)'],
-            getExcludeTools: () => [],
+            getExcludeTools: () => undefined,
+            getDebugMode: () => false,
+            getGeminiClient: () => ({}),
+            getTargetDir: () => '.',
+            getSummarizeToolOutputConfig: () => ({
+                [shellTool.name]: { tokenBudget: 1000 },
+            }),
         };
-        const shellTool = new ShellTool(config);
-        const result = shellTool.isCommandAllowed('gh issue list || rm -rf /');
-        expect(result.allowed).toBe(false);
-        expect(result.reason).toBe("Command 'rm -rf /' is not in the allowed commands list");
+        shellTool = new ShellTool(config);
+        const summarizeSpy = vi
+            .spyOn(summarizer, 'summarizeToolOutput')
+            .mockResolvedValue('summarized output');
+        const abortSignal = new AbortController().signal;
+        await shellTool.execute({ command: 'echo "hello"' }, abortSignal, () => { });
+        expect(summarizeSpy).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Object), 1000);
     });
-});
-describe('ShellTool Bug Reproduction', () => {
-    let shellTool;
-    let config;
-    beforeEach(() => {
+    it('should use default token budget if not specified', async () => {
         config = {
             getCoreTools: () => undefined,
             getExcludeTools: () => undefined,
             getDebugMode: () => false,
             getGeminiClient: () => ({}),
             getTargetDir: () => '.',
+            getSummarizeToolOutputConfig: () => ({
+                [shellTool.name]: {},
+            }),
         };
         shellTool = new ShellTool(config);
-    });
-    it('should not let the summarizer override the return display', async () => {
         const summarizeSpy = vi
             .spyOn(summarizer, 'summarizeToolOutput')
             .mockResolvedValue('summarized output');
         const abortSignal = new AbortController().signal;
-        const result = await shellTool.execute({ command: 'echo "hello"' }, abortSignal);
-        expect(result.returnDisplay).toBe('hello\n');
-        expect(result.llmContent).toBe('summarized output');
-        expect(summarizeSpy).toHaveBeenCalled();
+        await shellTool.execute({ command: 'echo "hello"' }, abortSignal, () => { });
+        expect(summarizeSpy).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Object), undefined);
+    });
+    it('should pass GEMINI_CLI environment variable to executed commands', async () => {
+        config = {
+            getCoreTools: () => undefined,
+            getExcludeTools: () => undefined,
+            getDebugMode: () => false,
+            getGeminiClient: () => ({}),
+            getTargetDir: () => '.',
+            getSummarizeToolOutputConfig: () => ({}),
+        };
+        shellTool = new ShellTool(config);
+        const abortSignal = new AbortController().signal;
+        const result = await shellTool.execute({ command: 'echo "$GEMINI_CLI"' }, abortSignal, () => { });
+        expect(result.returnDisplay).toBe('1' + os.EOL);
+    });
+});
+describe('shouldConfirmExecute', () => {
+    it('should de-duplicate command roots before asking for confirmation', async () => {
+        const shellTool = new ShellTool({
+            getCoreTools: () => ['run_shell_command'],
+            getExcludeTools: () => [],
+        });
+        const result = (await shellTool.shouldConfirmExecute({
+            command: 'git status && git log',
+        }, new AbortController().signal));
+        expect(result.rootCommand).toEqual('git');
     });
 });
 //# sourceMappingURL=shell.test.js.map

package/dist/src/tools/shell.test.js.map

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

package/dist/src/tools/tool-registry.d.ts

@@ -9,7 +9,6 @@ import { Config } from '../config/config.js';
 type ToolParams = Record<string, unknown>;
 export declare class DiscoveredTool extends BaseTool<ToolParams, ToolResult> {
     private readonly config;
-    readonly name: string;
     readonly description: string;
     readonly parameterSchema: Record<string, unknown>;
     constructor(config: Config, name: string, description: string, parameterSchema: Record<string, unknown>);
@@ -27,8 +26,20 @@ export declare class ToolRegistry {
     /**
      * Discovers tools from project (if available and configured).
      * Can be called multiple times to update discovered tools.
+     * This will discover tools from the command line and from MCP servers.
      */
-    discoverTools(): Promise<void>;
+    discoverAllTools(): Promise<void>;
+    /**
+     * Discovers tools from project (if available and configured).
+     * Can be called multiple times to update discovered tools.
+     * This will NOT discover tools from the command line, only from MCP servers.
+     */
+    discoverMcpTools(): Promise<void>;
+    /**
+     * Discover or re-discover tools for a single MCP server.
+     * @param serverName - The name of the server to discover tools from.
+     */
+    discoverToolsForServer(serverName: string): Promise<void>;
     private discoverAndRegisterToolsFromCommand;
     /**
      * Retrieves the list of tool schemas (FunctionDeclaration array).

package/dist/src/tools/tool-registry.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Type } from '@google/genai';
-import { BaseTool } from './tools.js';
+import { BaseTool, Icon } from './tools.js';
 import { spawn } from 'node:child_process';
 import { StringDecoder } from 'node:string_decoder';
 import { discoverMcpTools } from './mcp-client.js';
@@ -12,7 +12,6 @@ import { DiscoveredMCPTool } from './mcp-tool.js';
 import { parse } from 'shell-quote';
 export class DiscoveredTool extends BaseTool {
     config;
-    name;
     description;
     parameterSchema;
     constructor(config, name, description, parameterSchema) {
@@ -34,10 +33,9 @@ Error: Error or \`(none)\` if no error was reported for the subprocess.
 Exit Code: Exit code or \`(none)\` if terminated by signal.
 Signal: Signal number or \`(none)\` if no signal was received.
 `;
-        super(name, name, description, parameterSchema, false, // isOutputMarkdown
+        super(name, name, description, Icon.Hammer, parameterSchema, false, // isOutputMarkdown
         false);
         this.config = config;
-        this.name = name;
         this.description = description;
         this.parameterSchema = parameterSchema;
     }
@@ -113,16 +111,22 @@ export class ToolRegistry {
      */
     registerTool(tool) {
         if (this.tools.has(tool.name)) {
-            // Decide on behavior: throw error, log warning, or allow overwrite
-            console.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
+            if (tool instanceof DiscoveredMCPTool) {
+                tool = tool.asFullyQualifiedTool();
+            }
+            else {
+                // Decide on behavior: throw error, log warning, or allow overwrite
+                console.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
+            }
         }
         this.tools.set(tool.name, tool);
     }
     /**
      * Discovers tools from project (if available and configured).
      * Can be called multiple times to update discovered tools.
+     * This will discover tools from the command line and from MCP servers.
      */
-    async discoverTools() {
+    async discoverAllTools() {
         // remove any previously discovered tools
         for (const tool of this.tools.values()) {
             if (tool instanceof DiscoveredTool || tool instanceof DiscoveredMCPTool) {
@@ -131,7 +135,39 @@ export class ToolRegistry {
         }
         await this.discoverAndRegisterToolsFromCommand();
         // discover tools using MCP servers, if configured
-        await discoverMcpTools(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this);
+        await discoverMcpTools(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this, this.config.getDebugMode());
+    }
+    /**
+     * Discovers tools from project (if available and configured).
+     * Can be called multiple times to update discovered tools.
+     * This will NOT discover tools from the command line, only from MCP servers.
+     */
+    async discoverMcpTools() {
+        // remove any previously discovered tools
+        for (const tool of this.tools.values()) {
+            if (tool instanceof DiscoveredMCPTool) {
+                this.tools.delete(tool.name);
+            }
+        }
+        // discover tools using MCP servers, if configured
+        await discoverMcpTools(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this, this.config.getDebugMode());
+    }
+    /**
+     * Discover or re-discover tools for a single MCP server.
+     * @param serverName - The name of the server to discover tools from.
+     */
+    async discoverToolsForServer(serverName) {
+        // Remove any previously discovered tools from this server
+        for (const [name, tool] of this.tools.entries()) {
+            if (tool instanceof DiscoveredMCPTool && tool.serverName === serverName) {
+                this.tools.delete(name);
+            }
+        }
+        const mcpServers = this.config.getMcpServers() ?? {};
+        const serverConfig = mcpServers[serverName];
+        if (serverConfig) {
+            await discoverMcpTools({ [serverName]: serverConfig }, undefined, this, this.config.getDebugMode());
+        }
     }
     async discoverAndRegisterToolsFromCommand() {
         const discoveryCmd = this.config.getToolDiscoveryCommand();
@@ -248,7 +284,7 @@ export class ToolRegistry {
      * Returns an array of all registered and discovered tool instances.
      */
     getAllTools() {
-        return Array.from(this.tools.values());
+        return Array.from(this.tools.values()).sort((a, b) => a.displayName.localeCompare(b.displayName));
     }
     /**
      * Returns an array of tools registered from a specific MCP server.
@@ -260,7 +296,7 @@ export class ToolRegistry {
                 serverTools.push(tool);
             }
         }
-        return serverTools;
+        return serverTools.sort((a, b) => a.name.localeCompare(b.name));
     }
     /**
      * Get the definition of a specific tool.
@@ -314,6 +350,17 @@ function _sanitizeParameters(schema, visited) {
             }
         }
     }
+    // Handle enum values - Gemini API only allows enum for STRING type
+    if (schema.enum && Array.isArray(schema.enum)) {
+        if (schema.type !== Type.STRING) {
+            // If enum is present but type is not STRING, convert type to STRING
+            schema.type = Type.STRING;
+        }
+        // Filter out null and undefined values, then convert remaining values to strings for Gemini API compatibility
+        schema.enum = schema.enum
+            .filter((value) => value !== null && value !== undefined)
+            .map((value) => String(value));
+    }
     // Vertex AI only supports 'enum' and 'date-time' for STRING format.
     if (schema.type === Type.STRING) {
         if (schema.format &&