Skip to content

fix(patch): cherry-pick 35ee2a8 to release/v0.33.0-preview.10-pr-21713#21859

Merged
jerop merged 2 commits intorelease/v0.33.0-preview.10-pr-21713from
hotfix/v0.33.0-preview.10/0.33.0-preview.11/preview/cherry-pick-35ee2a8/pr-21713
Mar 10, 2026
Merged

fix(patch): cherry-pick 35ee2a8 to release/v0.33.0-preview.10-pr-21713#21859
jerop merged 2 commits intorelease/v0.33.0-preview.10-pr-21713from
hotfix/v0.33.0-preview.10/0.33.0-preview.11/preview/cherry-pick-35ee2a8/pr-21713

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

@gemini-cli-robot gemini-cli-robot commented Mar 10, 2026

This PR automatically cherry-picks commit 35ee2a8 to patch version v0.33.0-preview.10 in the preview release to create version 0.33.0-preview.11.

Conflicts have been manually resolved:

  • packages/core/src/config/config.ts: Plan Mode enabled by default. The trackerEnabled property from the cherry-picked commit was omitted as it does not exist in this release branch.
  • docs/cli/plan-mode.md: Documentation updated to reflect that Plan Mode is now enabled by default.

# Conflicts:
#	docs/cli/plan-mode.md
#	packages/core/src/config/config.ts
@gemini-cli-robot gemini-cli-robot requested review from a team as code owners March 10, 2026 11:53
@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 10, 2026
@jerop jerop changed the title fix(patch): cherry-pick 35ee2a8 to release/v0.33.0-preview.10-pr-21713 [CONFLICTS] fix(patch): cherry-pick 35ee2a8 to release/v0.33.0-preview.10-pr-21713 Mar 10, 2026
@jerop jerop enabled auto-merge (squash) March 10, 2026 12:03
@github-actions
Copy link
Copy Markdown

Size Change: -34 B (0%)

Total Size: 25.9 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.4 MB -34 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

@jerop jerop merged commit 0af0fb6 into release/v0.33.0-preview.10-pr-21713 Mar 10, 2026
26 checks passed
@jerop jerop deleted the hotfix/v0.33.0-preview.10/0.33.0-preview.11/preview/cherry-pick-35ee2a8/pr-21713 branch March 10, 2026 12:17
@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 cherry-picks a commit to enable Plan Mode by default in the Gemini CLI. This change simplifies the user experience by removing the need to manually enable Plan Mode. The documentation and configuration have been updated to reflect this change.

Highlights

  • Plan Mode Enabled by Default: This PR makes Plan Mode enabled by default in the Gemini CLI, simplifying the user experience.
  • Documentation Updates: The documentation has been updated to reflect the change in Plan Mode's default setting.
  • Configuration Changes: The default value for the experimental.plan setting has been changed to true in the configuration schema.
Changelog
  • docs/cli/plan-mode.md
    • Updated documentation to reflect that Plan Mode is now enabled by default.
  • docs/cli/settings.md
    • Updated the settings documentation to reflect the change in Plan Mode's default setting.
  • docs/reference/commands.md
    • Updated the documentation for the /plan command to reflect that Plan Mode is now enabled by default.
  • docs/reference/configuration.md
    • Updated the configuration documentation to reflect the change in Plan Mode's default setting.
  • packages/cli/src/acp/acpClient.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/acp/acpResume.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default and added Plan approval mode.
    • Added Plan approval mode to the list of available approval modes.
  • packages/cli/src/config/config.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/config/settingsSchema.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/config/settingsSchema.ts
    • Updated the settings schema to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/services/BuiltinCommandLoader.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/ui/components/Composer.test.tsx
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/cli/src/ui/hooks/useApprovalModeIndicator.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/core/src/config/config.test.ts
    • Updated tests to reflect that Plan Mode is now enabled by default.
  • packages/core/src/config/config.ts
    • Enabled Plan Mode by default.
  • schemas/settings.schema.json
    • Updated the settings schema to reflect that Plan Mode is now enabled by default.
Activity
  • Commit 35ee2a8 cherry-picked to release/v0.33.0-preview.10-pr-21713
  • Conflicts resolved in packages/core/src/config/config.ts and docs/cli/plan-mode.md
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.

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

The pull request changes the default state of "Plan Mode" from disabled to enabled, updating its description across documentation, configuration schemas, and test files. A critical issue was identified in packages/core/src/config/config.ts where an unresolved merge conflict exists, preventing the correct default enablement of planEnabled and introducing an unrelated trackerEnabled property, which needs to be resolved.

Note: Security Review did not run due to the size of the PR.

I am having trouble creating individual review comments. Click here to see my feedback.

packages/core/src/config/config.ts (872-877)

critical

This file contains unresolved merge conflict markers. Based on the pull request description, it seems the intention was to enable planEnabled by default and omit trackerEnabled. Please resolve the conflict.

    this.planEnabled = params.plan ?? true;

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