Skip to content

Update policy so transient errors are not marked terminal#26066

Merged
DavidAPierce merged 5 commits intomainfrom
fix-transient-fallback
Apr 28, 2026
Merged

Update policy so transient errors are not marked terminal#26066
DavidAPierce merged 5 commits intomainfrom
fix-transient-fallback

Conversation

@DavidAPierce
Copy link
Copy Markdown
Contributor

Summary

Addresses an issue where the CLI would unexpectedly ignore user-selected models (like Gemini Pro Preview) and silently fall back to the Flash model during temporary API failures.

By updating the error handling policy to treat transient errors (like rate limits or 503s) as sticky_retry instead of terminal, the policy engine will now retry the currently selected model rather than instantly degrading to the next fallback model in the chain.

Details

  • Updated DEFAULT_STATE in packages/core/src/availability/policyCatalog.ts to transition transient errors to sticky_retry.
  • Applied the same transition update across multiple model entries in packages/core/src/config/defaultModelConfigs.ts.
  • Updated unit tests in packages/core/src/availability/policyCatalog.test.ts to verify the new retry behavior explicitly (e.g., ensuring preview models trigger
    sticky retries).

Related Issues

Fixes #25898

How to Validate

  1. Run unit tests: npm test packages/core/src/availability/policyCatalog.test.ts
  2. Verify that transient errors in the policy catalog now return sticky_retry instead of terminal.
  3. Run the CLI with the Pro Preview model (--model flag or via config) and force a transient error (or simulate one), ensuring it retries instead of falling back to 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:
    • Linux
      • npm run

@DavidAPierce DavidAPierce requested a review from a team as a code owner April 27, 2026 18:15
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 improves the reliability of the CLI by adjusting how it handles transient API errors. By modifying the state transition logic, the system will now attempt to retry the currently selected model when encountering temporary failures, rather than immediately falling back to a different model. This ensures a more consistent user experience when using specific models like Gemini Pro Preview.

Highlights

  • Error Handling Policy Update: Updated the policy engine to treat transient errors as 'sticky_retry' instead of 'terminal', preventing premature fallback to other models during temporary API issues.
  • Configuration Updates: Applied the new error handling state to the default policy catalog and multiple model configurations.
  • Test Verification: Updated unit tests to explicitly verify that transient errors now trigger sticky retries for preview models.
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.

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
Copy Markdown
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 updates the default state transition for transient errors from terminal to sticky_retry across the core availability policy catalog and multiple model configurations. Corresponding unit tests in policyCatalog.test.ts have also been updated to reflect this change. I have no feedback to provide.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 27, 2026

Size Change: +28 B (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-6N6VON4E.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-BT4ZALV4.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-GE7TRVLB.js 0 B -673 kB (removed) 🏆
./bundle/chunk-IDZRDY23.js 0 B -2.73 MB (removed) 🏆
./bundle/chunk-PIKRZ7PR.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-RTK2UIQA.js 0 B -14.7 MB (removed) 🏆
./bundle/core-ONWS5ED4.js 0 B -48.1 kB (removed) 🏆
./bundle/devtoolsService-7QLF4TIY.js 0 B -27.8 kB (removed) 🏆
./bundle/gemini-CZAHRFG4.js 0 B -573 kB (removed) 🏆
./bundle/interactiveCli-VIUHNVCP.js 0 B -1.31 MB (removed) 🏆
./bundle/liteRtServerManager-4EWVAH7Q.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-JOSZ5C5N.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-4WE7IGYH.js 2.73 MB +2.73 MB (new file) 🆕
./bundle/chunk-CA5QBHPG.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-JYKNXQVS.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-PR35LCME.js 673 kB +673 kB (new file) 🆕
./bundle/chunk-VRY6PRU2.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-X6QZ5EY3.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/core-LNKDAAUQ.js 48.1 kB +48.1 kB (new file) 🆕
./bundle/devtoolsService-VBISHOV7.js 27.8 kB +27.8 kB (new file) 🆕
./bundle/gemini-B3B6CXLG.js 573 kB +573 kB (new file) 🆕
./bundle/interactiveCli-TBTUCBNW.js 1.31 MB +1.31 MB (new file) 🆕
./bundle/liteRtServerManager-72XAWGYG.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-VJOB5TF4.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-MTD736U4.js 1.97 MB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-LMPPOO3F.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 4.97 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-NSOLCG4U.js 980 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 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-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-A65L475V.js 0 B -622 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-PFJ7HWKN.js 932 B +932 B (new file) 🆕
./bundle/start-S7NYY4IC.js 622 B +622 B (new file) 🆕

compressed-size-action

@DavidAPierce DavidAPierce requested a review from a team as a code owner April 27, 2026 19:00
@DavidAPierce DavidAPierce added this pull request to the merge queue Apr 28, 2026
Merged via the queue into main with commit 54b7586 Apr 28, 2026
26 of 27 checks passed
@DavidAPierce DavidAPierce deleted the fix-transient-fallback branch April 28, 2026 16:15
@scidomino
Copy link
Copy Markdown
Collaborator

/patch preview

@github-actions
Copy link
Copy Markdown

🚀 [Step 1/4] Patch workflow(s) waiting for approval!

📋 Details:

  • Channels: preview
  • Commit: 54b7586106bb3431080978be8960ab9a8d3cf0d8
  • Workflows Created: 1

⏳ Status: The patch creation workflow has been triggered and is waiting for deployment approval. Please visit the specific workflow links below and approve the runs.

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

🚀 [Step 2/4] Patch PR Created!

📋 Patch Details:

📝 Next Steps:

  1. ⚠️ Resolve conflicts in the hotfix PR first: #26124
  2. Test your changes after resolving conflicts
  3. Once merged, the patch release will automatically trigger
  4. You'll receive updates here when the release completes

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

🚀 [Step 3/4] Patch Release Waiting for Approval!

📋 Release Details:

  • Environment: prod
  • Channel: preview → publishing to npm tag preview
  • Version: v0.40.0-preview.4
  • Hotfix PR: Merged ✅
  • Release Branch: release/v0.40.0-preview.4-pr-26066

⏳ Status: The patch release has been triggered and is waiting for deployment approval. Please visit the specific workflow run link below and approve the deployment. You'll receive another update when it completes.

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

[Step 4/4] Patch Release Complete!

📦 Release Details:

🎉 Status: Your patch has been successfully released and published to npm!

📝 What's Available:

🔗 Links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] Gemini CLI ignores model choices made on command line at startup and in settings, is not aware which model is used

3 participants