Skip to content

Comments

fix(patch): cherry-pick 37f128a to release/v0.27.3-pr-18478 [CONFLICTS]#18743

Merged
mattKorwel merged 3 commits intorelease/v0.27.3-pr-18478from
hotfix/v0.27.3/0.27.4/stable/cherry-pick-37f128a/pr-18478
Feb 10, 2026
Merged

fix(patch): cherry-pick 37f128a to release/v0.27.3-pr-18478 [CONFLICTS]#18743
mattKorwel merged 3 commits intorelease/v0.27.3-pr-18478from
hotfix/v0.27.3/0.27.4/stable/cherry-pick-37f128a/pr-18478

Conversation

@gemini-cli-robot
Copy link
Collaborator

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

⚠️ 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

# 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 is an automated cherry-pick to integrate a feature that restricts numerical routing to only Gemini 3 models into a patch release. The core change introduces a mechanism to identify Gemini 3 models and modifies existing routing strategies to leverage this identification, ensuring that numerical classification is applied appropriately. Due to conflicts arising during the automated cherry-pick process, manual intervention is required to resolve these discrepancies before the patch can be fully integrated.

Highlights

  • Gemini 3 Model Identification: A new utility function, isGemini3Model, has been introduced to accurately identify Gemini 3 models based on their naming convention or aliases.
  • Numerical Routing Restriction: The numerical classifier routing strategy has been updated to exclusively apply to Gemini 3 models, ensuring that other model families do not undergo numerical classification.
  • Classifier Strategy Update: The general classifier strategy now bypasses its logic for Gemini 3 models when numerical routing is enabled, deferring to the more specific numerical classifier.
  • Merge Conflicts: This automated cherry-pick resulted in merge conflicts, primarily within test files and strategy implementations, which require manual resolution before merging.
Changelog
  • packages/core/src/config/models.test.ts
    • Imported the new isGemini3Model function.
    • Added comprehensive test cases for isGemini3Model to verify its behavior with various model names and aliases.
  • packages/core/src/config/models.ts
    • Implemented and exported the isGemini3Model function, which checks if a given model string corresponds to a Gemini 3 model using a regular expression.
  • packages/core/src/routing/strategies/classifierStrategy.test.ts
    • Imported PREVIEW_GEMINI_MODEL_AUTO for use in tests.
    • Resolved merge conflicts related to mocking the getModel function.
    • Modified an existing test to ensure the strategy returns null when numerical routing is enabled and the model is Gemini 3.
    • Added a new test case to confirm the 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 isGemini3Model for use in the strategy.
    • Updated the route method to incorporate a check for isGemini3Model when numerical routing is enabled, causing the strategy to return null for Gemini 3 models under these conditions.
    • Adjusted the resolveClassifierModel call to consistently use the model variable.
  • packages/core/src/routing/strategies/numericalClassifierStrategy.test.ts
    • Imported PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, and PREVIEW_GEMINI_MODEL_AUTO.
    • Resolved merge conflicts related to mocking the getModel function.
    • Added new test cases to verify that the strategy returns null if the model is not a Gemini 3 model.
    • Updated existing test assertions to use PREVIEW_GEMINI_FLASH_MODEL and PREVIEW_GEMINI_MODEL for expected model outcomes.
  • packages/core/src/routing/strategies/numericalClassifierStrategy.ts
    • Imported isGemini3Model for use in the strategy.
    • Added a conditional check in the route method to ensure the strategy only proceeds if the model is a Gemini 3 model.
    • Resolved merge conflicts affecting the parameters passed to resolveClassifierModel.
Activity
  • This pull request was automatically created as a cherry-pick from commit 37f128a1099cd7097ddab45509a847e046cc4102 to the release/v0.27.3-pr-18478 branch.
  • Merge conflicts were detected during the cherry-pick process, requiring manual resolution.
  • The PR description provides clear instructions for resolving conflicts, testing, and updating the branch.
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 the Gemini 3 model family. The logic changes in classifierStrategy.ts and numericalClassifierStrategy.ts correctly implement this restriction, and the new tests in models.test.ts and the strategy test files validate the new isGemini3Model function and routing behavior. However, the manual conflict resolution appears to be incomplete, as there are several files with leftover merge conflict markers. These are critical issues that must be resolved before merging.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Feb 10, 2026
@github-actions
Copy link

github-actions bot commented Feb 10, 2026

Size Change: +595 B (0%)

Total Size: 23.5 MB

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

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 and working. Approved.

@mattKorwel mattKorwel merged commit d621f40 into release/v0.27.3-pr-18478 Feb 10, 2026
24 checks passed
@mattKorwel mattKorwel deleted the hotfix/v0.27.3/0.27.4/stable/cherry-pick-37f128a/pr-18478 branch February 10, 2026 19:45
@anowardear062-svg
Copy link

Support and proses earnings

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.

3 participants