Skip to content

fix(patch): cherry-pick 37f128a to release/v0.28.0-pr-18478#18821

Merged
mattKorwel merged 3 commits intorelease/v0.28.0-pr-18478from
hotfix/v0.28.0/0.28.1/stable/cherry-pick-37f128a/pr-18478
Feb 11, 2026
Merged

fix(patch): cherry-pick 37f128a to release/v0.28.0-pr-18478#18821
mattKorwel merged 3 commits intorelease/v0.28.0-pr-18478from
hotfix/v0.28.0/0.28.1/stable/cherry-pick-37f128a/pr-18478

Conversation

@gemini-cli-robot
Copy link
Collaborator

This PR automatically cherry-picks commit 37f128a to patch version v0.28.0 in the stable release to create version 0.28.1.

⚠️ 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-cli-robot and others added 2 commits February 10, 2026 17:01
… [CONFLICTS] (#18732)

Co-authored-by: matt korwel <matt.korwel@gmail.com>
# Conflicts:
#	packages/core/src/routing/strategies/classifierStrategy.test.ts
#	packages/core/src/routing/strategies/numericalClassifierStrategy.test.ts
#	packages/core/src/routing/strategies/numericalClassifierStrategy.ts
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @gemini-cli-robot, 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 refines the model routing mechanism by introducing a specific check for Gemini 3 models. The core intent is to ensure that the numerical routing strategy, which dynamically selects models, is only engaged when a Gemini 3 model is in use. This change enhances the precision of model selection and prevents unintended routing behavior with other model families, thereby improving the overall stability and predictability of the routing system.

Highlights

  • Gemini 3 Model Identification: A new utility function, isGemini3Model, has been introduced to accurately identify Gemini 3 models based on their naming conventions.
  • Numerical Routing Restriction: The numerical routing strategy has been updated to exclusively apply to Gemini 3 models, preventing its use with older Gemini versions.
  • Updated Routing Strategies: Both ClassifierStrategy and NumericalClassifierStrategy have been modified to incorporate the isGemini3Model check, ensuring routing decisions align with the new restriction.
  • Test Coverage: Comprehensive tests have been added and updated across relevant files to validate the correct behavior of the new isGemini3Model function and the revised routing logic for Gemini 3 and non-Gemini 3 models.
Changelog
  • packages/core/src/config/models.test.ts
    • Added tests for the new isGemini3Model function.
  • packages/core/src/config/models.ts
    • Implemented the isGemini3Model utility function.
  • packages/core/src/routing/strategies/classifierStrategy.test.ts
    • Updated test cases to reflect the restriction of numerical routing to Gemini 3 models.
  • packages/core/src/routing/strategies/classifierStrategy.ts
    • Modified the ClassifierStrategy to check if the model is Gemini 3 before applying numerical routing.
  • packages/core/src/routing/strategies/numericalClassifierStrategy.test.ts
    • Adjusted tests to verify that NumericalClassifierStrategy only applies to Gemini 3 models and updated expected routed models to preview versions.
  • packages/core/src/routing/strategies/numericalClassifierStrategy.ts
    • Updated the NumericalClassifierStrategy to explicitly check if the model is Gemini 3.
Activity
  • This pull request was automatically generated to cherry-pick commit 37f128a1099cd7097ddab45509a847e046cc4102 to the release/v0.28.0-pr-18478 branch.
  • Merge conflicts were detected during the automated cherry-pick process.
  • Manual resolution of the identified merge conflicts is required before this PR can be merged.
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
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

This pull request cherry-picks a feature to restrict numerical routing to Gemini 3 models. The changes look mostly correct, but there are several critical issues. Multiple files contain unresolved merge conflict markers which will break the build. I've provided suggestions to resolve them. Additionally, I've found a logic bug in the new isGemini3Model function and its usage, which doesn't correctly handle model aliases with preview features enabled. I've included suggestions to fix this bug and the related tests.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Feb 11, 2026
@mattKorwel mattKorwel force-pushed the hotfix/v0.28.0/0.28.1/stable/cherry-pick-37f128a/pr-18478 branch from 45688f4 to 3b3f7d7 Compare February 11, 2026 16:30
@github-actions
Copy link

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 mattKorwel changed the title fix(patch): cherry-pick 37f128a to release/v0.28.0-pr-18478 [CONFLICTS] fix(patch): cherry-pick 37f128a to release/v0.28.0-pr-18478 Feb 11, 2026
Copy link
Collaborator

@mattKorwel mattKorwel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally and approved.

@mattKorwel mattKorwel enabled auto-merge (squash) February 11, 2026 16:39
@mattKorwel mattKorwel merged commit dc80b6e into release/v0.28.0-pr-18478 Feb 11, 2026
25 checks passed
@mattKorwel mattKorwel deleted the hotfix/v0.28.0/0.28.1/stable/cherry-pick-37f128a/pr-18478 branch February 11, 2026 16:43
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