Skip to content

Conversation

@adamfweidman
Copy link
Contributor

Summary

Fixes fallback behavior so switching to Flash persists within the same prompt and across continuations.
Core fallback now owns the model switch, and GeminiClient clears the sticky sequence model when the configured model changes, ensuring routing re-evaluates after fallback.

Details

  • Core fallback uses activateFallbackMode to perform session-level setModel and emit ModelChanged.
  • UI no longer sets the model directly; it only resolves intent and logs the info message.
  • GeminiClient listens for ModelChanged and clears currentSequenceModel, so continuations in the same prompt re-route using the new configured model.
  • Added a routing test that verifies re-routing within the same prompt after a model change.

Related Issues

How to Validate

Select Auto, Trigger Pro quota exceeded error, select fallback to flash, confirm that the turn and subsequent prompts use flash.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@adamfweidman adamfweidman requested a review from a team as a code owner January 20, 2026 00:53
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Jan 20, 2026

Hi @adamfweidman, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @adamfweidman, 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 refactors the model fallback mechanism to ensure consistent behavior when switching to a fallback model like Flash. Previously, the fallback model might not persist across continuations within the same conversation. The changes centralize the model activation logic within the core fallback handler, removing it from the UI layer. Crucially, the GeminiClient now actively responds to model changes by resetting its internal state, guaranteeing that subsequent messages are routed using the newly configured model. This improves the user experience by making fallback model selection more robust and predictable.

Highlights

  • Centralized Fallback Model Activation: The responsibility for activating the fallback model has been moved from the UI hook (useQuotaAndFallback) to the core fallback handler, centralizing this logic.
  • Persistent Fallback Model Behavior: Ensures that once a fallback model (e.g., Flash) is selected due to a quota error, it persists for subsequent turns within the same prompt and across continuations.
  • Dynamic Routing Re-evaluation: The GeminiClient now listens for ModelChanged events and clears its currentSequenceModel, forcing a re-evaluation of the routing policy for new messages after a model change.
  • New Routing Test Coverage: A dedicated test case has been added to client.test.ts to explicitly verify the re-routing behavior when the configured model changes mid-prompt.
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.

@github-actions
Copy link

Size Change: +226 B (0%)

Total Size: 23.2 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 23.2 MB +226 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
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 effectively addresses the issue of fallback model persistence. The changes are well-thought-out, moving the responsibility of activating the fallback model from the UI to the core, which improves the separation of concerns. The introduction of the ModelChanged event and its handling in GeminiClient to reset the sequence model is a clean solution to ensure routing is re-evaluated. The addition of a specific test case for re-routing within the same prompt is excellent and provides confidence in the fix. Furthermore, the inclusion of dispose methods for cleanup is a good practice for resource management. Overall, this is a high-quality contribution that improves both functionality and code structure.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Jan 20, 2026
@sehoon38 sehoon38 added this pull request to the merge queue Jan 20, 2026
Merged via the queue into main with commit e34f0b4 Jan 20, 2026
26 checks passed
@sehoon38 sehoon38 deleted the afw/fallback-fix branch January 20, 2026 06:35
@adamfweidman
Copy link
Contributor Author

/patch preview

@github-actions
Copy link

Patch workflow(s) dispatched successfully!

📋 Details:

  • Channels: preview
  • Commit: e34f0b4a983a4cb4e88eb9c958bce60b5b9357bb
  • Workflows Created: 1

🔗 Track Progress:

Thomas-Shephard pushed a commit to Thomas-Shephard/gemini-cli that referenced this pull request Jan 21, 2026
thacio added a commit to thacio/auditaria that referenced this pull request Jan 24, 2026
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