Skip to content

fix(patch): cherry-pick 8432bce to release/v0.33.0-pr-22069 to patch version v0.33.0 and create version 0.33.1#22206

Merged
abhipatel12 merged 2 commits intorelease/v0.33.0-pr-22069from
hotfix/v0.33.0/0.33.1/stable/cherry-pick-8432bce/pr-22069
Mar 12, 2026
Merged

fix(patch): cherry-pick 8432bce to release/v0.33.0-pr-22069 to patch version v0.33.0 and create version 0.33.1#22206
abhipatel12 merged 2 commits intorelease/v0.33.0-pr-22069from
hotfix/v0.33.0/0.33.1/stable/cherry-pick-8432bce/pr-22069

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 8432bce to patch version v0.33.0 in the stable release to create version 0.33.1.

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request streamlines tool management within the system by introducing support for wildcard tool names and standardizing the naming convention for Micro-Component Platform (MCP) tools. These changes simplify how agents declare and register tools, improving flexibility and consistency in tool discovery and usage.

Highlights

  • Tool Name Validation: Updated isValidToolName to support wildcard patterns (e.g., *, mcp_*, mcp_server_*) for more flexible tool referencing.
  • MCP Tool Naming Convention: Adopted a new mcp_server_tool format for Micro-Component Platform (MCP) tools, replacing the previous server__tool convention.
  • Simplified MCP Tool Handling: Removed the asFullyQualifiedTool method from DiscoveredMCPTool and streamlined tool registration logic, reducing complexity.
  • Enhanced Tool Registration: Refactored LocalAgentExecutor to correctly register tools using the new wildcard patterns and ensure MCP tool schemas are consistently represented with their fully qualified names.
Changelog
  • packages/core/src/agents/agentLoader.ts
    • Updated tool name validation to allow wildcards.
  • packages/core/src/agents/local-executor.ts
    • Refactored tool registration logic to support wildcards for global, MCP, and server-specific tools, and removed explicit handling of fully qualified MCP tools during registration.
  • packages/core/src/tools/mcp-tool.ts
    • Removed the asFullyQualifiedTool method and refined the parseMcpToolName function for stricter parsing.
  • packages/core/src/tools/tool-names.test.ts
    • Modified isValidToolName tests to cover wildcard scenarios and the new mcp_server_tool naming format.
  • packages/core/src/tools/tool-names.ts
    • Reworked isValidToolName to support wildcard patterns and the mcp_server_tool naming convention.
  • packages/core/src/tools/tool-registry.test.ts
    • Adjusted tests to align with the simplified MCP tool registration and the removal of asFullyQualifiedTool.
  • packages/core/src/tools/tool-registry.ts
    • Simplified registerTool by removing special handling for DiscoveredMCPTool, updated getFunctionDeclarations to ensure MCP tool schemas use fully qualified names, and removed redundant logic for resolving MCP tools by unqualified names in getTool.
Activity
  • This pull request was automatically cherry-picked from commit 8432bce to patch version v0.33.0 and create version 0.33.1.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 12, 2026
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request cherry-picks a commit to support wildcard tool definitions in agents and to standardize the naming convention for MCP (Model Context Protocol) tools. The changes are well-implemented across agent loading, execution, and tool registration. The new MCP tool name format (mcp_server_tool) is consistently applied and validated. The logic for expanding wildcard tool definitions (*, mcp_*, mcp_server_*) is correctly handled in the LocalAgentExecutor. The removal of the asFullyQualifiedTool method simplifies the handling of MCP tools, and the necessary adjustments in the tool registry ensure that correct, fully-qualified tool names are used in schemas sent to the model. The accompanying test updates properly cover the new functionality and format changes. Overall, the changes are robust and I have no further feedback.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 12, 2026

Size Change: +170 B (0%)

Total Size: 25.6 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.2 MB +170 B (0%)
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B

compressed-size-action

This commit fixes an issue where LocalAgentExecutor would push the schema of an instantiated tool twice during agent invocation, leading to 'Duplicate function declaration' API errors.
@abhipatel12 abhipatel12 merged commit f59f9e9 into release/v0.33.0-pr-22069 Mar 12, 2026
25 checks passed
@abhipatel12 abhipatel12 deleted the hotfix/v0.33.0/0.33.1/stable/cherry-pick-8432bce/pr-22069 branch March 12, 2026 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants