Fix shared session scrollback restore#10780
Merged
Merged
Conversation
Contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I completed the review and no human review was requested for this pull request. Comment Powered by Oz |
Contributor
There was a problem hiding this comment.
Overview
This PR updates shared-session scrollback restore to treat the active block as optional, restores completed-only scrollback without tripping the old active-block assertion, and adds regression coverage for initial and follow-up restore paths.
Concerns
- None identified in the changed lines.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
65b66c7 to
489b24a
Compare
Formalize shared-session scrollback snapshots as completed history plus an optional active block, and add regression coverage for completed-final snapshots. Co-Authored-By: Oz <oz-agent@warp.dev>
489b24a to
de77bbd
Compare
liliwilson
approved these changes
May 13, 2026
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.

Description
specs/APP-4457/TECH.mddocumenting the crash, Sentry issue, contract, and validation strategy.Linked Issue
ready-to-specorready-to-implement. N/A: this is a newly-created Linear issue for the crash fix.Testing
cargo fmtcargo nextest run -p warp --lib test_loading_scrollbackcargo nextest run -p warp --lib test_append_followup_scrollbackcargo clippy --workspace --all-targets --all-features --tests -- -D warningsgit --no-pager diff --check -- app/src/terminal/model/blocks.rs app/src/terminal/model/block.rs app/src/terminal/shared_session/mod.rs app/src/terminal/shared_session/mod_tests.rs app/src/terminal/shared_session/viewer/event_loop_tests.rs specs/APP-4457/TECH.mdI have manually tested my changes locally with
./script/runScreenshots / Videos
N/A — no user-visible UI change.
Agent Mode
Co-Authored-By: Oz oz-agent@warp.dev