Skip to content

Conversation

@gemini-cli-robot
Copy link
Collaborator

This PR automatically cherry-picks commit 07e597d to patch version v0.23.0-preview.3 in the preview release to create version 0.23.0-preview.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

@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 of a commit aimed at refining the handling of retry delays for Google API quota errors. It removes a hardcoded 5-second default delay, making the retryDelayMs property in RetryableQuotaError optional. This change requires manual resolution of a merge conflict in the retry.ts utility to correctly integrate the updated retry logic, ensuring that the system can gracefully handle quota errors without an explicit retry duration.

Highlights

  • Retry Delay Refactoring: The default 5-second retry delay for generic 429 (Too Many Requests) errors has been removed, allowing RetryableQuotaError instances to be created without a predefined delay.
  • Optional Retry Delay: The retryDelayMs property in RetryableQuotaError is now optional, reflecting that a specific delay might not always be provided by the API response.
  • Test Case Updates: Existing test cases for classifyGoogleError have been updated to assert that retryDelayMs is undefined for generic 429 errors, aligning with the removal of the default fallback.
  • Merge Conflict: A merge conflict exists in packages/core/src/utils/retry.ts related to how RetryableQuotaError instances are handled when retryDelayMs might be undefined, requiring manual resolution.

🧠 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.

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 fix for handling Google Quota errors. The main change is the removal of a default retry delay for RetryableQuotaError, with the retry logic now using exponential backoff when a specific delay isn't provided. While the changes in googleQuotaErrors.ts and the corresponding tests are correct, I've found a critical issue in packages/core/src/utils/retry.ts. The file contains unresolved merge conflict markers which will break the build and must be resolved before this pull request can be merged.

@sehoon38 sehoon38 enabled auto-merge (squash) December 30, 2025 21:12
@github-actions
Copy link

Size Change: +180 B (0%)

Total Size: 22 MB

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

@sehoon38 sehoon38 merged commit b7ad7e1 into release/v0.23.0-preview.3-pr-15684 Dec 30, 2025
19 checks passed
@sehoon38 sehoon38 deleted the hotfix/v0.23.0-preview.3/0.23.0-preview.4/preview/cherry-pick-07e597d/pr-15684 branch December 30, 2025 21:23
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.

2 participants