fix: only rewind matching session suffixes#3090
Open
Aphroq wants to merge 2 commits intoopenai:mainfrom
Open
Conversation
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.
Summary
Fixes
rewind_session_items()insrc/agents/run_internal/session_persistence.pyso retry cleanup only removes the exact session tail that belongs to the retry being rolled back.Previously, the helper popped session items before confirming the tail matched the rewind target, which could delete unrelated tail records. The server-tracker cleanup path could also keep popping until it found a known server item, removing the unrelated suffix and the first known server item itself. This change switches both paths to exact-suffix matching before deletion, adds best-effort restoration on mid-rewind mismatches, and restricts tracker cleanup to retry-owned tail items only.
Also adds regression coverage in
tests/test_agent_runner.pyfor mismatched tails, server-tracker cleanup preserving unrelated items, and stripping only retry-owned local suffixes before a known server item.Test plan
uv run pytest tests/test_agent_runner.py -k rewindbash .agents/skills/code-change-verification/scripts/run.shIssue number
Closes #3089
Checks
make lintandmake format