Fix: activePrompt lock should be per-session, not global#9
Open
WXY-V1hZ wants to merge 1 commit into
Open
Conversation
The AtomicReference<ActivePrompt> used a single slot for all sessions, rejecting concurrent prompts from different logical sessions. Changed to ConcurrentHashMap<String, ActivePrompt> keyed by sessionId so that only same-session prompts are rejected, while different sessions can run concurrently.
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.
Description
Problem
AcpAgentSessionuses a singleAtomicReference<ActivePrompt>to enforce single-turn semantics, but the lock is global across all logical sessions. When session A has an in-progress prompt, session B's prompt request is immediately rejected with error-32000, even though theActivePromptrecord already storessessionId— it just wasn't being used for the lock check.Root Cause
The
compareAndSet(null, newPrompt)on a singleAtomicReferenceacts as a global mutex. TheActivePromptrecord was correctly designed with asessionIdfield, but the lock implementation ignored it:Fix
Change
AtomicReference<ActivePrompt>toConcurrentHashMap<String, ActivePrompt>keyed bysessionId:Different sessions can run prompts concurrently. Same session still enforces single-turn.
Changes
AcpAgentSession.java: ReplaceAtomicReferencewithConcurrentHashMap, update lock/acquire/release/cancel pathsAcpAgentSessionTest.java: Update reflection-based tests to work with the new field typeVerification
./mvnw test -pl acp-core→ 323 tests passed, 0 failures