Guard session snapshots against stale overwrites / 防止旧快照覆盖会话#5851
Merged
SivanCola merged 2 commits intoJul 3, 2026
Conversation
Closed
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.
Closes #5783.
Summary
compact, rewind, cold-resume pruning, interrupted-turn/cancel recovery) only when the controller still owns the current on-disk transcript baseline.Root cause
Normal controller snapshots rewrote the whole JSONL file. If an older tab/runtime still held a shorter in-memory session for the same session path, a later autosave or tab close could replace the newer JSONL with that stale snapshot, making messages appear to roll back or disappear.
Validation
go test ./internal/agent ./internal/controlcd desktop && go test .git diff --checkgo test ./internal/environment -run TestRunProbesUsesOverridePathAndFirstLine -count=1Note:
go test ./...was also attempted; the only failure was the same intermittentinternal/environmentprobe timeout, and the focused probe test passed when rerun separately.