fix(relay): prevent agent session corruption on timeout#405
Merged
chenhg5 merged 2 commits intochenhg5:mainfrom Apr 2, 2026
Merged
fix(relay): prevent agent session corruption on timeout#405chenhg5 merged 2 commits intochenhg5:mainfrom
chenhg5 merged 2 commits intochenhg5:mainfrom
Conversation
Three issues caused agents to become unresponsive after a relay timeout: 1. StartSession received the relay timeout context -- when the deadline fired, exec.CommandContext killed the Claude process mid-turn, corrupting the session state. Now uses the engine context instead. 2. defer agentSession.Close() killed the process immediately on return. Now the session drains in a background goroutine (drainRelaySession) so the agent can finish its turn and save state cleanly. 3. No fallback when resuming a corrupted session. Added retry logic that clears the stale session ID and starts fresh, matching the existing interactive message flow. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
chenhg5
approved these changes
Apr 1, 2026
Owner
chenhg5
left a comment
There was a problem hiding this comment.
LGTM. Well-designed fix for relay timeout handling.
Review summary:
- ✅ Correct: Uses engine context instead of relay timeout context to prevent killing agent process
- ✅ drainRelaySession goroutine for clean session state preservation
- ✅ Fallback to fresh session on resume failure
- ✅ All tests pass
- ✅ CI passes
Good fix for session corruption issue.
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
Test plan