fix(patch): cherry-pick 07e597d to release/v0.22.4-pr-15684 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit 07e597d to patch version v0.22.4 in the stable release to create version 0.22.5.

⚠️ 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, automatically generated as a cherry-pick, updates the handling of Google quota errors by removing a fixed 5-second default retry delay. The change makes the retryDelayMs property optional for RetryableQuotaError instances, allowing the retry mechanism to proceed without a predefined delay when one is not specified by the error. This PR currently has merge conflicts that require manual resolution to integrate these changes into the target release branch.

Highlights

• Retry Delay Removal: The hardcoded 5-second default retry delay for generic Google quota errors has been removed, making the retryDelayMs property optional in RetryableQuotaError and TerminalQuotaError classes.
• Test Updates: Unit tests have been updated to reflect that generic 429 errors will now result in RetryableQuotaError instances with an undefined retry delay, rather than a fixed 5000ms.
• Retry Logic Enhancements: A warning log has been introduced when maximum retry attempts are reached in the retryWithBackoff utility, and the retry logging condition has been adjusted to only display a specific delay if retryDelayMs is explicitly set on the RetryableQuotaError.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

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 cherry-picks a fix to remove the default retry delay for generic 429 quota errors, instead relying on exponential backoff when no specific delay is provided by the API. However, a critical issue was found in packages/core/src/utils/retry.ts where unresolved merge conflicts are present, which will cause the application to crash and must be resolved before merging. The rest of the changes do not appear to introduce security vulnerabilities.

[github-actions]

Size Change: +180 B (0%)

Total Size: 21.6 MB

ℹ️ View Unchanged

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