fix(asap): acquire agent mutex around inbound mcp.tool_call dispatch - #60
Draft
cursor[bot] wants to merge 1 commit into
Draft
fix(asap): acquire agent mutex around inbound mcp.tool_call dispatch#60cursor[bot] wants to merge 1 commit into
cursor[bot] wants to merge 1 commit into
Conversation
handle_mcp_tool_call executed tools without agent_lock while task.request already held the mutex, allowing concurrent tool/session access from HTTP threads during an active agent_run. Co-authored-by: esadrianno <esadrianno@gmail.com>
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.
Bug and impact
Inbound
mcp.tool_callASAP envelopes executed tools viadispatch_tool_by_name()without acquiringagent_lock(), whiletask.requestalready held the mutex. Concurrent HTTP threads could run tools (shell, file, cron) during an activeagent_run, racing on shared session/memory state.Root cause
handle_mcp_tool_call()insrc/asap/server.comitted the mutex discipline documented in README and used byhandle_task_request().Fix and validation
Wrap tool dispatch (hook and default path) with
agent_lock()/agent_unlock().Existing
test_asap_servercoverage exercisesmcp.tool_callpaths.