fix(core): ensure enter_plan_mode tool registration respects experimental.plan

[jerop]

The enter_plan_mode tool was being registered unconditionally when not in plan mode. This change updates syncPlanModeTools to only register the tool if experimental.plan is enabled. Follow up to #18352 where syncPlanModeTools was introduced. Added regression tests to verify that the tool is correctly registered or unregistered based on the experimental.plan setting.

Related to #18334.

[gemini-cli]

Hi @jerop, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

[gemini-code-assist]

Summary of Changes

Hello @jerop, I'm Gemini Code Assist¹! 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 resolves an issue where the enter_plan_mode tool was being registered unconditionally, regardless of the experimental.plan feature flag's status. The changes ensure that the tool's availability is now correctly tied to the experimental.plan setting, preventing its activation when the feature is intended to be disabled. This enhances the precision of tool management within the application's configuration and includes new tests to validate the corrected behavior.

Highlights

• Conditional Tool Registration: The enter_plan_mode tool's registration in syncPlanModeTools is now conditional, ensuring it is only registered when the experimental.plan feature flag is enabled.
• Tool Unregistration: Added logic to explicitly unregister the enter_plan_mode tool if experimental.plan is disabled and the tool is currently active.
• Regression Tests: New regression tests have been added to verify that the enter_plan_mode tool is correctly registered or unregistered based on the experimental.plan setting.

Changelog

• packages/core/src/config/config.test.ts
  • Updated the description of an existing test case to clarify that EnterPlanModeTool registration occurs when experimental.plan is enabled.
  • Added a new test case to confirm that EnterPlanModeTool is explicitly not registered when experimental.plan is disabled.
• packages/core/src/config/config.ts
  • Modified the syncPlanModeTools method to check the this.planEnabled property before registering EnterPlanModeTool.
  • Introduced an else block within syncPlanModeTools to unregister EnterPlanModeTool if this.planEnabled is false and the tool is currently registered.

Activity

• No human activity (comments, reviews, etc.) has been recorded on this pull request yet.

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. ↩

[github-actions]

Size Change: +214 B (0%)

Total Size: 23.9 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.8 MB	+214 B (0%)
./bundle/sandbox-macos-permissive-closed.sb	1.03 kB	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-closed.sb	3.29 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

_{compressed-size-action}

[gemini-code-assist]

Code Review

This pull request correctly addresses the issue where the enter_plan_mode tool was registered unconditionally. The changes in syncPlanModeTools now ensure that the tool is only registered if the experimental.plan feature is enabled, and also correctly unregisters it if the feature is disabled. The addition of regression tests to cover both scenarios is excellent and ensures the fix is robust. The code is clean and the logic is sound. Great work!