fix(patch): cherry-pick 48130eb to release/v0.33.1-pr-22665 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit 48130eb to patch version v0.33.1 in the stable release to create version 0.33.2.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

1. Review the conflicts: Check out this branch and review the conflict markers
2. Resolve conflicts: Edit the affected files to resolve the conflicts
3. Test the changes: Ensure the patch works correctly after resolution
4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

• Do not merge this PR until conflicts are resolved
• The automated patch release will trigger once this PR is merged

[gemini-code-assist]

Summary of Changes

Hello, 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 integrates a new mechanism to manage user access to Pro models within the CLI, enhancing the model selection experience. It introduces an experiment flag to control Pro model visibility and modifies the model selection dialog to reflect a user's access level, ensuring that only appropriate models are presented. For users without Pro access, the system will automatically select a Flash model if an 'auto' model is chosen. This change improves user experience by tailoring model options to individual entitlements.

Highlights

• Pro Model Access Control: Introduced an experiment flag (PRO_MODEL_NO_ACCESS) and associated logic to determine if a user has access to Pro models.
• Dynamic Model Selection UI: The ModelDialog component now dynamically filters available models, hiding Pro models for users without access and defaulting to a Flash model if 'auto' is selected.
• New Model Support: Added PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL across relevant configurations and UI components.
• Conflict Resolution Required: This PR is an automated cherry-pick that resulted in merge conflicts, requiring manual resolution before merging.

Changelog

• packages/cli/src/ui/components/ModelDialog.test.tsx
  • Updated test suite to include new model definitions, mock Config methods for Pro model access, and added tests for filtering models based on user access and tier.
• packages/cli/src/ui/components/ModelDialog.tsx
  • Modified the model selection dialog to incorporate hasAccessToProModel state, dynamically adjust the view based on Pro model access, and filter manual model options accordingly.
• packages/core/src/code_assist/experiments/flagNames.ts
  • Defined a new experiment flag, PRO_MODEL_NO_ACCESS, to control Pro model access.
• packages/core/src/config/config.test.ts
  • Expanded configuration tests to verify model switching behavior when a user lacks Pro model access and an auto model is selected.
• packages/core/src/config/config.ts
  • Implemented getProModelNoAccess and getProModelNoAccessSync methods to check the new experiment flag and added logic to automatically switch to a Flash model if an auto model is selected without Pro access.
• packages/core/src/config/models.test.ts
  • Added tests for getDisplayString and isActiveModel to support the new PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL and updated resolveModel tests for preview access logic.
• packages/core/src/config/models.ts
  • Declared PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL and integrated it into the list of valid and preview models.

Activity

• This pull request was automatically generated as a cherry-pick from commit 48130eb to create a patch version.
• It currently has merge conflicts that require manual resolution by a human.
• The PR description provides clear instructions for resolving these conflicts, testing, and updating the PR.

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-code-assist]

Code Review

This pull request cherry-picks a commit to a release branch. The changes introduce logic to handle different user tiers (free vs. pro), adjusting the available models in the model selection dialog. However, there is a critical issue: an unresolved merge conflict remains in packages/core/src/config/models.test.ts, which will prevent the code from compiling and tests from running. This must be resolved before merging.

[github-actions]

Size Change: +2.29 kB (+0.01%)

Total Size: 25.6 MB

Filename	Size	Change
./bundle/gemini.js	25.2 MB	+2.29 kB (+0.01%)

ℹ️ View Unchanged

Filename	Size
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js	221 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js	227 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js	11.5 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js	132 B
./bundle/sandbox-macos-permissive-open.sb	890 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB
./bundle/sandbox-macos-strict-open.sb	4.82 kB
./bundle/sandbox-macos-strict-proxied.sb	5.02 kB

_{compressed-size-action}