feat(cli): add session rewind and restore flows#96
Open
BingqingLyu wants to merge 7 commits into
Open
Conversation
Add session rewind and restore flows in the CLI. Users can browse history from the active session, restore conversation state from a selected prompt, restore code when checkpoints are available, and summarize from a selected point before continuing. This also updates session history, checkpoint handling, and summarize feedback so rewind stays aligned with the active branch and latest persisted state after restores.
Wait for the highlighted history entry to render before submitting Enter in the selection test. This avoids selecting the previous item when UI updates lag on slower runners.
…pshot. Avoid deleting untracked manual files when restoring a snapshot, and summarize only messages after the selected rewind point to prevent duplicate prompt context.
Address rewind review feedback by making checkpoint creation run before edit tools execute, including fast approval paths. Improve restore reliability, error handling, branch validation, cleanup behavior, and picker stability. Add focused coverage for checkpoint ordering, rewind entries, restore actions, and picker interactions.
Make snapshot restore handling explicit for tracked and untracked files. Use a preserve policy for /restore and a delete-listed policy for /rewind so callers state their intended behavior clearly. Update rewind confirmation copy to describe when later edits can be overwritten or removed. Wire rewind dialogs into the global close path so Ctrl+C closes them consistently.
Fix invalid stream test events and use a complete scheduled tool call fixture. Prevent swarm workers from recursively invoking orchestration tools by default. Clean up unused webview provider state and use bracket notation for index-signature access.
This was referenced Apr 28, 2026
This was referenced May 7, 2026
Owner
Author
Conflict Group 1This PR shares modified functions with 21 other PR(s): #100, #106, #107, #109, #112, #113, #114, #117, #24, #28, #52, #55, #57, #6, #68, #83, #86, #87, #88, #9, #91. These PRs should be reviewed as a batch — merging one may affect the others.
Posted by codegraph-ai conflict detection. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TLDR
Add session rewind and restore flows in the CLI.
This change lets users:
Screenshots / Video Demo
Dive Deeper
Reviewer Test Plan
Testing Matrix
Linked issues / bugs
Closes QwenLM#3186