Return an explicit outcome from snapshot conflict recovery / 会话冲突恢复显式返回结果类型#6124
Merged
SivanCola merged 3 commits intoJul 6, 2026
Merged
Conversation
added 3 commits
July 7, 2026 01:17
The caller inferred what recovery did from path and session-pointer comparisons; the depth-cap baseline bug hid in exactly that inference. Declare the outcome (adopted / force-saved / forked / dropped) at the site that performs it, and let replaceSessionAfterCancel log when its cancel cleanup was dropped instead of silently discarding the result.
github-actions
Bot
added
v2
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
1 participant
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.
Summary
recoverSnapshotConflictnow returns a declaredconflictOutcome(adopted / force-saved / forked / dropped) instead of(path, recovered bool, err), sosnapshot()acts on what recovery says it did rather than re-deriving it from path and session-pointer comparisons — the inference that hid the depth-cap baseline misclassification fixed in Fix session conflict diagnostics and depth-cap baseline / 修复会话冲突诊断与深度上限基线 #6120.replaceSessionAfterCancelstops discarding the recovery result and logs when its post-cancel cleanup was dropped.Stacked on #6120 (contains its commits until it merges; review the top commit only). Part of the #6027 convergence work.
Tests
go test ./internal/agent ./internal/control ./internal/cli ./internal/serve ./internal/acp ./internal/doctorgolangci-lint run(clean, CI-matching v2.12.2)