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

mrcabbage972 · Oct 9, 2025

TLDR

This PR introduces a new feature to automatically "retry" a model call when the response stream terminates unexpectedly.

New Config Flag: A continueOnFailedApiCall flag (defaults to true) is added to control this behavior.
Retry Logic: If the flag is enabled and an InvalidStream event occurs, the client will automatically send the prompt "Please continue." to try and recover the rest of the model's response.
Safeguard: This retry mechanism will only execute once per user request.

Dive Deeper

Reviewer Test Plan

Testing Matrix

	🍏	🪟	🐧
npm run	❓	❓	❓
npx	❓	❓	❓
Docker	❓	❓	❓
Podman	❓	-	-
Seatbelt	❓	-	-

Linked issues / bugs

github-actions · Oct 9, 2025

Size Change: +1.51 kB (+0.01%)

Total Size: 17.7 MB

Filename	Size	Change
`./bundle/gemini.js`	17.7 MB	+1.51 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 9, 2025

packages/core/src/core/client.ts

-          boundedTurns - 1,
-          // isInvalidStreamRetry is false here, as this is a next speaker check
-        );
+        if (this.config.getContinueOnFailedApiCall()) {


not necessary here since we now won don't run the next speaker check anymore.

anj-s · Oct 9, 2025

packages/core/src/core/client.ts

+            );
+            return turn;
+          }
+          const nextRequest = [{ text: 'Please continue.' }];


Can we say "System: Please continue"? This disambiguates from the user and won't be confusing.

anj-s · Oct 9, 2025

packages/core/src/config/config.ts

    this.enableMessageBusIntegration =
      params.enableMessageBusIntegration ?? false;
    this.enableSubagents = params.enableSubagents ?? false;
+    this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? false;


do we want to turn this on by default to get immediate metrics?

mrcabbage972 · Oct 9, 2025

/gemini review

gemini-code-assist

Code Review

This pull request introduces a valuable feature to automatically retry a model call when the response stream terminates unexpectedly, controlled by a new continueOnFailedApiCall flag. The implementation is mostly sound, with new configurations, core client logic, and tests. However, I've found a few critical and high-severity issues. The new configuration flag incorrectly defaults to true instead of false, which is a critical issue. Additionally, there are inconsistencies in the retry prompt and incorrect hardcoded values in telemetry logging that should be addressed to ensure correctness and maintainability.

packages/core/src/config/config.ts

gemini-code-assist · Oct 9, 2025

packages/core/src/core/client.ts

+            );
+            return turn;
+          }
+          const nextRequest = [{ text: 'System: Please continue.' }];


The retry prompt includes a "System: " prefix, which is inconsistent with other parts of the code that send a continuation prompt (e.g., the nextSpeakerCheck logic, which just sends "Please continue."). This inconsistency might confuse the model and lead to unexpected behavior. It's better to use a consistent prompt for continuations.

Suggested change

const nextRequest = [{ text: 'System: Please continue.' }];

const nextRequest = [{ text: 'Please continue.' }];

gemini-code-assist · Oct 9, 2025

packages/core/src/core/client.ts

+              new ContentRetryFailureEvent(
+                4, // 2 initial + 2 after injections
+                'FAILED_AFTER_PROMPT_INJECTION',
+                modelToUse,
+              ),


The total_attempts in this ContentRetryFailureEvent is hardcoded to 4. According to the logic, there is only one retry attempt, so the total number of attempts should be 2 (1 initial + 1 retry). The comment // 2 initial + 2 after injections is also unclear and doesn't seem to match the logic here. Please correct the number of attempts to reflect the actual behavior.

Suggested change

new ContentRetryFailureEvent(

4, // 2 initial + 2 after injections

'FAILED_AFTER_PROMPT_INJECTION',

modelToUse,

),

new ContentRetryFailureEvent(

2, // 1 initial + 1 retry

'FAILED_AFTER_PROMPT_INJECTION',

modelToUse,

),

Co-authored-by: Sandy Tao <sandytao520@icloud.com>

mrcabbage972 · Oct 10, 2025

/patch preview

github-actions · Oct 10, 2025

✅ Patch workflow(s) dispatched successfully!

📋 Details:

Channels: preview
Commit: 0b6c02000f2301717c38fb3c8ba2423d70d6c0b0
Workflows Created: 1

🔗 Track Progress:

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

github-actions · Oct 10, 2025

🚀 Patch PR Created!

📋 Patch Details:

Channel: preview → will publish to npm tag preview
Commit: 0b6c02000f2301717c38fb3c8ba2423d70d6c0b0
Hotfix Branch: hotfix/v0.9.0-preview.1/0.9.0-preview.2/preview/cherry-pick-0b6c020/pr-10828
Hotfix PR: #10920
⚠️ Status: Cherry-pick conflicts detected - manual resolution required

📝 Next Steps:

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

🔗 Track Progress:

View hotfix PR #10920

github-actions · Oct 10, 2025

🚀 Patch Release Started!

📋 Release Details:

Channel: preview → publishing to npm tag preview
Version: v0.9.0-preview.1
Hotfix PR: Merged ✅
Release Branch: release/v0.9.0-preview.1-pr-10828

⏳ Status: The patch release is now running. You'll receive another update when it completes.

🔗 Track Progress:

View release workflow

github-actions · Oct 10, 2025

❌ Patch Release Failed!

📋 Details:

Version: 0.9.0-preview.2
Channel: preview
Error: The patch release workflow encountered an error

🔍 Next Steps:

Check the workflow logs for detailed error information
The maintainers have been notified via automatic issue creation
You may need to retry the patch once the issue is resolved

🔗 Troubleshooting:

github-actions · Oct 11, 2025

✅ Patch Release Complete!

📦 Release Details:

Version: 0.9.0-preview.2
NPM Tag: preview
Channel: preview
Dry Run: false

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

📝 What's Available:

GitHub Release: View release v0.9.0-preview.2
NPM Package: npm install @google/gemini-cli@preview

🔗 Links:

…rompt (google-gemini#10828)

SandyTao520 and others added 5 commits October 6, 2025 20:33

Say "Please continue" and sendMessageStream for invalid streams

04f8c2c

feat(core): retry once on InvalidStreamError with 'Please continue.'

0decf62

log

4859b76

wip

ce90b69

Merge branch 'main' into mrcabbage972/empty-stream-plz-continue

0917481

mrcabbage972 changed the title ~~Empty Response Workaround~~ feat(core): Empty Response Workaround Oct 9, 2025

mrcabbage972 marked this pull request as ready for review October 9, 2025 20:15

mrcabbage972 requested a review from a team as a code owner October 9, 2025 20:15

mrcabbage972 requested review from SandyTao520 and anj-s October 9, 2025 20:15

mrcabbage972 changed the title ~~feat(core): Empty Response Workaround~~ feat(core): Failed Response Retry vs Extra Prompt Oct 9, 2025

mrcabbage972 changed the title ~~feat(core): Failed Response Retry vs Extra Prompt~~ feat(core): Failed Response Retry via Extra Prompt Oct 9, 2025

SandyTao520 reviewed Oct 9, 2025

View reviewed changes

wip

c1bc1f7

anj-s reviewed Oct 9, 2025

View reviewed changes

anj-s approved these changes Oct 9, 2025

View reviewed changes

mrcabbage972 added 2 commits October 9, 2025 21:37

wip

92305fd

wip

3c60d13

gemini-code-assist bot reviewed Oct 9, 2025

View reviewed changes

wip

50465ec

mrcabbage972 added this pull request to the merge queue Oct 9, 2025

Merged via the queue into main with commit 0b6c020 Oct 9, 2025
20 checks passed

mrcabbage972 deleted the mrcabbage972/empty-stream-plz-continue branch October 9, 2025 22:11

giraffe-tree pushed a commit to giraffe-tree/gemini-cli that referenced this pull request Oct 10, 2025

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

dda4f45

Co-authored-by: Sandy Tao <sandytao520@icloud.com>

SandyTao520 added a commit that referenced this pull request Oct 10, 2025

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

18479ef

Co-authored-by: Sandy Tao <sandytao520@icloud.com>

github-actions bot pushed a commit that referenced this pull request Oct 10, 2025

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

thacio added a commit to thacio/auditaria that referenced this pull request Oct 11, 2025

Merge Commit '0b6c020': feat(core): Failed Response Retry via Extra P…

ca6f007

…rompt (google-gemini#10828)

	const nextRequest = [{ text: 'System: Please continue.' }];
	const nextRequest = [{ text: 'Please continue.' }];

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

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

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

Uh oh!

Conversation

mrcabbage972 commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TLDR

Dive Deeper

Reviewer Test Plan

Testing Matrix

Linked issues / bugs

Uh oh!

github-actions bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SandyTao520 Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

mrcabbage972 Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

anj-s Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

mrcabbage972 Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

anj-s Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

mrcabbage972 Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

mrcabbage972 commented Oct 9, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

gemini-code-assist bot Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mrcabbage972 commented Oct 10, 2025

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

github-actions bot commented Oct 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mrcabbage972 commented Oct 9, 2025 •

edited

Loading

github-actions bot commented Oct 9, 2025 •

edited

Loading