fix(patch): cherry-pick f47d6c6 to release/v0.53.0-pr-28566 [CONFLICTS] - #28610
Conversation
…c empty response guidance (#28566) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> # Conflicts: # packages/core/src/core/geminiChat.ts
GitHub Actions
Failure
|
📊 PR Size: size/XL
|
Summary of ChangesHello, 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 cherry-picks a critical fix to improve the robustness of stream handling within the Gemini CLI. It addresses issues where empty or malformed responses could lead to inconsistent application states. By implementing granular error categorization, automatic history restoration, and enhanced telemetry, the changes ensure that the system can gracefully recover from transient API issues and provide clearer feedback to the user. Highlights
Using Gemini Code AssistThe 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
Customization To customize the 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 Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. 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
|
|
✅ 70 tests passed successfully on gemini-3-flash-preview. 🧠 Model Steering GuidanceThis PR modifies files that affect the model's behavior (prompts, tools, or instructions).
This is an automated guidance message triggered by steering logic signatures. |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces comprehensive handling and propagation of InvalidStreamError details to the UI, providing specific guidance for empty responses (such as safety blocks, token limit exhaustion, or thinking-only responses). It also implements context-aware retries with on-retry nudging, history rollback on stream failures to prevent un-responded turns from polluting the chat history, and distinct telemetry tracking for semantic validation errors. However, a critical issue was found in packages/core/src/core/geminiChat.ts where unresolved git merge conflict markers remain in the code, which will cause compilation failures.
Note: Security Review did not run due to the size of the PR.
gemini-cli
Bot
added
the
status/need-issue
|
Size Change: +14 kB (+0.04%) Total Size: 35.2 MB
ℹ️ View Unchanged
|
2 participants
This PR automatically cherry-picks commit f47d6c6 to patch version v0.53.0 in the stable release to create version 0.53.1.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: