fix(patch): cherry-pick 37f128a to release/v0.28.0-preview.6-pr-18478 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit 37f128a to patch version v0.28.0-preview.6 in the preview release to create version 0.28.0-preview.7.

⚠️ 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 is an automated patch to a preview release, integrating a new feature that refines model routing logic. The core change restricts the application of numerical routing strategies specifically to Gemini 3 models, enhancing control over how different model families are handled. This change currently requires manual conflict resolution.

Highlights

• Automated Cherry-Pick: This pull request is an automated cherry-pick of a feature commit to a preview release branch.
• Gemini 3 Model Identification: A new utility function, isGemini3Model, has been introduced to accurately identify Gemini 3 models and their aliases.
• Numerical Routing Restriction: The numerical routing strategy has been updated to exclusively apply to Gemini 3 models, ensuring that other model families do not use this routing mechanism.
• Updated Test Coverage: Comprehensive test cases have been added and modified for both isGemini3Model and the routing strategies to validate the new Gemini 3 model restriction.
• Merge Conflicts: The automated cherry-pick resulted in merge conflicts that require manual resolution before this pull request can be merged.

Changelog

• packages/core/src/config/models.test.ts
  • Imported the new isGemini3Model function.
  • Added a new test suite for isGemini3Model to verify its behavior with various model names and aliases.
• packages/core/src/config/models.ts
  • Added a new isGemini3Model export function that checks if a given model string corresponds to a Gemini 3 model.
• packages/core/src/routing/strategies/classifierStrategy.test.ts
  • Imported PREVIEW_GEMINI_MODEL_AUTO for use in tests.
  • Modified the getModel mock to be a vi.fn() for better test control.
  • Updated an existing test description to clarify that numerical routing is checked for Gemini 3 models.
  • Added a new test case to ensure the classifier strategy does not return null if numerical routing is enabled but the model is not Gemini 3.
• packages/core/src/routing/strategies/classifierStrategy.ts
  • Imported the isGemini3Model utility function.
  • Modified the route method to incorporate a check for isGemini3Model when numerical routing is enabled, allowing the strategy to return null only for Gemini 3 models.
  • Updated the resolveClassifierModel call to use the dynamically determined model instead of config.getModel().
• packages/core/src/routing/strategies/numericalClassifierStrategy.test.ts
  • Imported PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, and PREVIEW_GEMINI_MODEL_AUTO.
  • Updated the getModel mock to return PREVIEW_GEMINI_MODEL_AUTO by default.
  • Added two new test cases to verify that the strategy returns null if the model is not a Gemini 3 model.
  • Updated expected model values in several test assertions from DEFAULT_ to PREVIEW_ Gemini models.
• packages/core/src/routing/strategies/numericalClassifierStrategy.ts
  • Imported the isGemini3Model utility function.
  • Modified the route method to include a check that returns null if the requested model is not a Gemini 3 model, even if numerical routing is enabled.
  • Adjusted the resolveClassifierModel call to use the dynamically determined model.

Activity

• This pull request was automatically generated by gemini-cli-robot to cherry-pick commit 37f128a1099cd7097ddab45509a847e046cc4102.
• The cherry-pick operation resulted in merge conflicts that require manual intervention.
• Instructions have been provided for reviewing and resolving the detected conflicts.
• A warning has been issued that the PR should not be merged until all conflicts are resolved.

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 appears to have unresolved merge conflicts, as indicated by the presence of conflict markers (<<<<<<<, =======, >>>>>>>) in several files. These must be resolved before merging. Additionally, there's a critical logic bug in the new isGemini3Model function and its usage. It doesn't account for the previewFeatures setting when resolving model aliases, which will cause incorrect routing behavior for users with settings like model: auto and preview features enabled. I've left detailed comments on the affected files with suggestions for fixes.

[github-actions]

Size Change: +465 B (0%)

Total Size: 23.7 MB

ℹ️ View Unchanged

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

[mattKorwel]

Fixed merge conflicts and tested. Approving, good to go.