fix(chat): clear pendingToolUseID in EndSession to prevent reaper leak - #142
Merged
mhersson merged 1 commit intoMay 23, 2026
Merged
Conversation
- Add `delete(m.pendingToolUseID, id)` under `m.mu` guard in `EndSession`, mirroring the identical cleanup already performed by `DeleteSession` - Fixes the defect where a session TTL-evicted by the reaper retained its stale `tool_use_id` in the map; on next `openCold`, `SendUserMessage` would forward the ID to a container that no longer has the matching `tool_use` block - Add regression test `TestManager_EndSession_ClearsPendingToolUseID` mirroring `TestManager_DeleteSession_ClearsPendingToolUseID`
mhersson
deleted the
ctxmax-626/follow-up-endsession-reaper-path-leaks-pendingtool
branch
May 23, 2026 17:35
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
Fixes the
pendingToolUseIDmap leak inEndSession— the reaper-eviction path mirror of theDeleteSessionleak fixed previously.delete(m.pendingToolUseID, id)underm.muguard inEndSession, symmetric with the existing cleanup inDeleteSessiontool_use_id; onopenCold,SendUserMessagewould forward the ID referencing atool_useblock that no longer exists in the new containerTestManager_EndSession_ClearsPendingToolUseIDregression test mirroringTestManager_DeleteSession_ClearsPendingToolUseIDTest plan
go test ./internal/chat/...— all chat package tests pass (verified)TestManager_EndSession_ClearsPendingToolUseID— new regression test passes