Skip to content

fix stale state in /rewind#26286

Open
joshualitt wants to merge 2 commits into
mainfrom
jl/fix-rewind
Open

fix stale state in /rewind#26286
joshualitt wants to merge 2 commits into
mainfrom
jl/fix-rewind

Conversation

@joshualitt
Copy link
Copy Markdown
Contributor

Fixes #25646

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 30, 2026

Size Change: +3.2 kB (+0.01%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-BGAR6AQB.js 0 B -657 kB (removed) 🏆
./bundle/chunk-C3KHTQEY.js 0 B -14.7 MB (removed) 🏆
./bundle/chunk-GPK7BDSJ.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-NAIAUZ5K.js 0 B -12.5 kB (removed) 🏆
./bundle/chunk-RJUJPT65.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-TBJMWCMN.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-XASP7IES.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-YSWT4ATC.js 0 B -2.72 MB (removed) 🏆
./bundle/core-DMMTYCGL.js 0 B -48.2 kB (removed) 🏆
./bundle/devtoolsService-NIZHAFVV.js 0 B -28 kB (removed) 🏆
./bundle/gemini-ALZGVTYO.js 0 B -582 kB (removed) 🏆
./bundle/interactiveCli-6IGLLGRE.js 0 B -1.32 MB (removed) 🏆
./bundle/liteRtServerManager-3A4VXWBF.js 0 B -2.11 kB (removed) 🏆
./bundle/oauth2-provider-2WIS36TD.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-5ICVGHZM.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-7UZYRWAS.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-LPQ7G6DX.js 657 kB +657 kB (new file) 🆕
./bundle/chunk-MFIXSXJD.js 12.6 kB +12.6 kB (new file) 🆕
./bundle/chunk-NS3SNJ3W.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-RIJH6QZQ.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-SFJXPB5J.js 2.72 MB +2.72 MB (new file) 🆕
./bundle/chunk-YM3FH474.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/core-W4KB2K47.js 48.2 kB +48.2 kB (new file) 🆕
./bundle/devtoolsService-SDBMBACE.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-35JJCCJ4.js 582 kB +582 kB (new file) 🆕
./bundle/interactiveCli-IEWHFDTB.js 1.32 MB +1.32 MB (new file) 🆕
./bundle/liteRtServerManager-EKTW6NYS.js 2.11 kB +2.11 kB (new file) 🆕
./bundle/oauth2-provider-HT3TBJAX.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-533APETE.js 1.97 MB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-THSBBDK7.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 5.14 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-LIJKMASE.js 980 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 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-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-G2YQR2XQ.js 0 B -652 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-WGLTW23G.js 932 B +932 B (new file) 🆕
./bundle/start-ZM3GLCJ5.js 652 B +652 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added the area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality label Apr 30, 2026
@joshualitt joshualitt marked this pull request as ready for review April 30, 2026 21:37
@joshualitt joshualitt requested a review from a team as a code owner April 30, 2026 21:37
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 resolves an issue where the chat state could become stale or inconsistent after using the /rewind command. The changes ensure that when a chat session is resumed or its history is loaded, the underlying chat recording service accurately reflects the current conversation, preventing data discrepancies and improving the reliability of chat interactions.

Highlights

  • Stale State Fix for /rewind: The /rewind command now correctly re-initializes the chat state by replacing the setHistory method with resumeChat, ensuring that the chat context is accurately restored.
  • Robust History Reconstruction: A new reconstructMessagesFromHistory method has been introduced in ChatRecordingService to rebuild the conversation history from raw content, addressing issues where the cached conversation could become stale or empty after operations like /rewind.
  • Improved Type Safety: Parameters for chat history in GeminiClient and getInitialChatHistory have been updated to use readonly Content[], enhancing type safety and indicating that the history array should not be modified directly.
  • Enhanced Testing for History Management: New test cases were added to chatRecordingService.test.ts to cover scenarios where the cached conversation needs to be repopulated from history and when a forced reconstruction of history is required.
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.

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
Copy Markdown
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 implements history reconstruction within the ChatRecordingService to correctly handle session resumption, ensuring that the recording cache is populated when loading existing chat history. Key changes include updating GeminiClient and GeminiChat to utilize resumeChat, syncing history during initialization, and adopting readonly Content[] for improved type safety. Feedback focuses on maintaining consistency by storing Gemini message content as strings, refining the look-ahead logic for tool responses to prevent data loss, and ensuring atomic updates to session records to avoid race conditions.

Comment thread packages/core/src/services/chatRecordingService.ts
Comment thread packages/core/src/services/chatRecordingService.ts Outdated
Comment thread packages/core/src/services/chatRecordingService.ts Outdated
Copy link
Copy Markdown
Contributor

@akh64bit akh64bit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@gemini-cli
Copy link
Copy Markdown
Contributor

gemini-cli Bot commented May 8, 2026

Hi there! Thank you for your interest in contributing to Gemini CLI.

To ensure we maintain high code quality and focus on our prioritized roadmap, we only guarantee review and consideration of pull requests for issues that are explicitly labeled as 'help wanted'.

This PR will be closed in 7 days if it remains without that designation. We encourage you to find and contribute to existing 'help wanted' issues in our backlog! Thank you for your understanding.

@gemini-cli gemini-cli Bot added status/pr-nudge-sent priority/p2 Important but can be addressed in a future release. area/core Issues related to User Interface, OS Support, Core Functionality labels May 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality area/core Issues related to User Interface, OS Support, Core Functionality priority/p2 Important but can be addressed in a future release. status/pr-nudge-sent

Projects

None yet

Development

Successfully merging this pull request may close these issues.

/rewind shows pre-load rewind points after /chat resume, /resume, or /restore

2 participants