Skip to content

Fix shared session scrollback restore#10780

Merged
zachbai merged 1 commit into
masterfrom
zb/fix-restore-session-crash
May 13, 2026
Merged

Fix shared session scrollback restore#10780
zachbai merged 1 commit into
masterfrom
zb/fix-restore-session-crash

Conversation

@zachbai
Copy link
Copy Markdown
Contributor

@zachbai zachbai commented May 12, 2026

Description

  • Formalizes shared-session scrollback snapshots as completed historical blocks plus an optional unfinished active block.
  • Restores completed-only snapshots without asserting that the final serialized block is active, and ensures the viewer model still has a fresh hidden active block.
  • Preserves follow-up duplicate skipping and adds focused regression coverage.
  • Adds specs/APP-4457/TECH.md documenting the crash, Sentry issue, contract, and validation strategy.

Linked Issue

Testing

  • cargo fmt

  • cargo nextest run -p warp --lib test_loading_scrollback

  • cargo nextest run -p warp --lib test_append_followup_scrollback

  • cargo clippy --workspace --all-targets --all-features --tests -- -D warnings

  • git --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.md

  • I have manually tested my changes locally with ./script/run

Screenshots / Videos

N/A — no user-visible UI change.

Agent Mode

  • Warp Agent Mode - This PR was created via Warp's AI Agent Mode
    Co-Authored-By: Oz oz-agent@warp.dev

@zachbai zachbai requested a review from liliwilson May 12, 2026 23:52
@cla-bot cla-bot Bot added the cla-signed label May 12, 2026
@oz-for-oss
Copy link
Copy Markdown
Contributor

oz-for-oss Bot commented May 12, 2026

@zachbai

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 /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Copy link
Copy Markdown
Contributor Author

zachbai commented May 12, 2026

This stack of pull requests is managed by Graphite. Learn more about stacking.

Copy link
Copy Markdown
Contributor

@oz-for-oss oz-for-oss Bot left a comment

Choose a reason for hiding this comment

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

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

@zachbai zachbai force-pushed the zb/fix-restore-session-crash branch from 65b66c7 to 489b24a Compare May 13, 2026 01:01
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>
@zachbai zachbai force-pushed the zb/fix-restore-session-crash branch from 489b24a to de77bbd Compare May 13, 2026 01:02
@zachbai zachbai merged commit b41ee71 into master May 13, 2026
26 of 27 checks passed
@zachbai zachbai deleted the zb/fix-restore-session-crash branch May 13, 2026 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants