fix(patch): cherry-pick 0b6c020 to release/v0.9.0-preview.1-pr-10828 [CONFLICTS] #10920

gemini-cli-robot · Oct 10, 2025

This PR automatically cherry-picks commit 0b6c020 to patch version v0.9.0-preview.1 in the preview release to create version 0.9.0-preview.2.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

Review the conflicts: Check out this branch and review the conflict markers
Resolve conflicts: Edit the affected files to resolve the conflicts
Test the changes: Ensure the patch works correctly after resolution
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

Co-authored-by: Sandy Tao <sandytao520@icloud.com> # Conflicts: # packages/core/src/core/turn.ts

gemini-code-assist · Oct 10, 2025

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 cherry-picks a commit designed to enhance the resilience of the system's interactions with the Gemini API. It introduces a new strategy for handling InvalidStream events, allowing the system to automatically attempt a single retry by prompting the model to continue. This behavior is now configurable, providing flexibility in how the application responds to such API anomalies. The changes aim to improve stability and user experience by mitigating issues arising from unexpected stream terminations.

Highlights

Invalid Stream Handling: Introduced a mechanism to detect and handle InvalidStream events from the Gemini API, which can occur when the API stream is malformed or unexpectedly terminated.
Automated Retry Logic: Implemented an automated retry mechanism where, upon receiving an InvalidStream event, the system can send a 'System: Please continue.' prompt to the model to attempt recovery. This retry is limited to a single attempt to prevent infinite loops.
Configurable Behavior: Added a new configuration option, continueOnFailedApiCall, to the Config class. This boolean flag, defaulting to true, controls whether the system attempts to retry on InvalidStream events.
Telemetry Integration: Integrated telemetry logging for ContentRetryFailureEvent to track instances where the automated retry mechanism for invalid streams is triggered but ultimately fails to recover.
Merge Conflicts: This pull request is a cherry-pick that resulted in merge conflicts, requiring manual resolution before it can be merged.

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.

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 feature to retry failed API calls. The changes introduce a new configuration option continueOnFailedApiCall and logic to handle InvalidStream events. However, there are critical issues with unresolved merge conflicts in packages/core/src/core/turn.ts that must be fixed. Additionally, a test description in packages/core/src/config/config.test.ts is incorrect and should be updated to match the code's behavior.

packages/core/src/core/turn.ts

packages/core/src/config/config.test.ts

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

SandyTao520 · Oct 10, 2025

packages/core/src/core/turn.ts

  | ServerGeminiUserCancelledEvent
-  | ServerGeminiRetryEvent;
+  | ServerGeminiRetryEvent
+  | ServerGeminiRetryEvent


SandyTao520 · Oct 10, 2025

packages/core/src/core/turn.ts

  type: GeminiEventType.Retry;
 };

+export type ServerGeminiContextWindowWillOverflowEvent = {


is this expected to be here?

github-actions · Oct 10, 2025

Size Change: +1.59 kB (+0.01%)

Total Size: 17.7 MB

Filename	Size	Change
`./bundle/gemini.js`	17.7 MB	+1.59 kB (+0.01%)

ℹ️ View Unchanged

Filename	Size
`./bundle/sandbox-macos-permissive-closed.sb`	1.03 kB
`./bundle/sandbox-macos-permissive-open.sb`	830 B
`./bundle/sandbox-macos-permissive-proxied.sb`	1.31 kB
`./bundle/sandbox-macos-restrictive-closed.sb`	3.29 kB
`./bundle/sandbox-macos-restrictive-open.sb`	3.36 kB
`./bundle/sandbox-macos-restrictive-proxied.sb`	3.56 kB

_{compressed-size-action}

SandyTao520 · Oct 10, 2025

packages/core/src/core/turn.ts

  LoopDetected = 'loop_detected',
  Citation = 'citation',
  Retry = 'retry',
+  ContextWindowWillOverflow = 'context_window_will_overflow',


this is not part of the original fix

feat(core): Failed Response Retry via Extra Prompt (#10828)

2cdae59

Co-authored-by: Sandy Tao <sandytao520@icloud.com> # Conflicts: # packages/core/src/core/turn.ts

gemini-cli-robot requested a review from a team as a code owner October 10, 2025 18:42

github-actions bot mentioned this pull request Oct 10, 2025

feat(core): Failed Response Retry via Extra Prompt #10828

Merged

gemini-code-assist bot reviewed Oct 10, 2025

View reviewed changes

packages/core/src/core/turn.ts Outdated Show resolved Hide resolved

packages/core/src/core/turn.ts Outdated Show resolved Hide resolved

packages/core/src/config/config.test.ts Outdated Show resolved Hide resolved

mrcabbage972 and others added 2 commits October 10, 2025 14:46

Update packages/core/src/config/config.test.ts

0d11372

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

wip

80ecaf2

SandyTao520 reviewed Oct 10, 2025

View reviewed changes

wip

496136f

SandyTao520 reviewed Oct 10, 2025

View reviewed changes

SandyTao520 approved these changes Oct 10, 2025

View reviewed changes

SandyTao520 merged commit a07fbbe into release/v0.9.0-preview.1-pr-10828 Oct 10, 2025
20 checks passed

SandyTao520 deleted the hotfix/v0.9.0-preview.1/0.9.0-preview.2/preview/cherry-pick-0b6c020/pr-10828 branch October 10, 2025 23:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(patch): cherry-pick 0b6c020 to release/v0.9.0-preview.1-pr-10828 [CONFLICTS] #10920

fix(patch): cherry-pick 0b6c020 to release/v0.9.0-preview.1-pr-10828 [CONFLICTS] #10920

gemini-cli-robot commented Oct 10, 2025

Uh oh!

gemini-code-assist bot commented Oct 10, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SandyTao520 Oct 10, 2025

Uh oh!

SandyTao520 Oct 10, 2025

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

SandyTao520 Oct 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Search code, repositories, users, issues, pull requests...

fix(patch): cherry-pick 0b6c020 to release/v0.9.0-preview.1-pr-10828 [CONFLICTS] #10920

fix(patch): cherry-pick 0b6c020 to release/v0.9.0-preview.1-pr-10828 [CONFLICTS] #10920

Conversation

gemini-cli-robot commented Oct 10, 2025

⚠️ Merge Conflicts Detected

🔧 Next Steps:

📋 Files with conflicts:

🚨 Important:

Uh oh!

gemini-code-assist bot commented Oct 10, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SandyTao520 Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

SandyTao520 Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

SandyTao520 Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants