fix(patch): cherry-pick aa9163d to release/v0.29.5-pr-19991 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit aa9163d to patch version v0.29.5 in the stable release to create version 0.29.6.

⚠️ 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 @gemini-cli-robot, 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, an automated cherry-pick, integrates support for the new Gemini 3.1 models, including a custom tools variant, into the core model availability policy. It enhances the model policy chain resolution logic to intelligently select these new models based on user configuration and access, and includes robust testing for the updated behavior. Reviewers must manually resolve merge conflicts before this PR can be merged.

Highlights

• Gemini 3.1 Model Support: Introduced new constants for PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL and PREVIEW_GEMINI_3_1_MODEL to support the latest Gemini 3.1 models.
• Dynamic Model Policy Chain Resolution: Updated the getModelPolicyChain function to dynamically select Gemini 3.1 models based on new useGemini31 and useCustomToolModel options, enhancing flexibility in model selection.
• Enhanced Test Coverage: Added new test cases to validate the correct selection and behavior of Gemini 3.1 and Gemini 3.1 Custom Tools model chains under various configurations.
• Intelligent Model Downgrade Logic: Modified resolvePolicyChain to incorporate Gemini 3.1 launch status and authentication type for model selection, including a mechanism to proactively downgrade to stable Gemini 2.5 if Gemini 3 access is unavailable.
• Merge Conflicts Detected: This automated cherry-pick resulted in merge conflicts that require manual resolution before the pull request can be merged.

Changelog

• packages/core/src/availability/policyCatalog.test.ts
  • Added tests for Gemini 3.1 and Gemini 3.1 Custom Tools model policy chains.
• packages/core/src/availability/policyCatalog.ts
  • Updated model policy options and chain resolution to support Gemini 3.1 models.
• packages/core/src/availability/policyHelpers.test.ts
  • Expanded mock configuration and added tests for Gemini 3.1 model resolution and fallback logic.
• packages/core/src/availability/policyHelpers.ts
  • Modified model resolution logic to include Gemini 3.1 and custom tool model considerations, and implemented a downgrade path for users without Gemini 3 access.

Activity

• An automated cherry-pick operation was performed for commit aa9163da60e69f6077c6e9bc2d7142c0bcd7abb4 to create a patch version.
• Merge conflicts were encountered during the cherry-pick process, preventing automatic completion.
• Instructions were provided for manual conflict resolution, testing the changes, and updating the pull request.

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

The pull request introduces support for Gemini 3.1 models in the policy chain, including a custom tools model. It also adds new test cases to verify the correct policy chain is returned based on useGemini31 and useCustomToolModel flags. Additionally, it resolves merge conflicts by incorporating the new logic for Gemini 3.1 model selection and fallback behavior.

[github-actions]

Size Change: +697 B (0%)

Total Size: 23.9 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.9 MB	+697 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}