feat: Phase 7b - Wire LockGuardedToolExecutor into tool runner#12353
Closed
roomote-v0[bot] wants to merge 1 commit into
Closed
feat: Phase 7b - Wire LockGuardedToolExecutor into tool runner#12353roomote-v0[bot] wants to merge 1 commit into
roomote-v0[bot] wants to merge 1 commit into
Conversation
- Integrate file lock guards into presentAssistantMessage.ts tool dispatch - Acquire locks before write tool execution, release in finally block - Block concurrent writes with LLM-friendly conflict error messages - Wire releaseAllLocks into Task.dispose() for stale lock cleanup - Add singleton getters (getFileLockManager, getLockGuardedToolExecutor) - Add 14 integration tests covering lifecycle, conflicts, and cleanup Phase 7b tool runner integration for parallel agent file coordination.
Contributor
Author
|
Closing in favor of consolidated PR #12356 which merges all Phase 7 work into a single PR as requested. |
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.
Related GitHub Issue
Closes: #12330
Description
This PR attempts to address Issue #12330 by completing the Phase 7b integration -- wiring the
LockGuardedToolExecutor(from PR #12352) into the actual tool dispatch flow.What it includes:
Tool runner integration (
presentAssistantMessage.ts):tryAcquireLocks()is called to acquire file lockspushToolResultand the tool is skippedfinallyblock after tool execution completes (success or failure)Task dispose cleanup (
Task.ts):releaseAllLocks(taskId)is called inTask.dispose()to release any stale locks when a task is aborted or disposedSingleton management (
file-lock/index.ts):getFileLockManager()andgetLockGuardedToolExecutor()singleton getters for shared instancesresetFileLockSingletons()for test isolation14 integration tests covering:
releaseAllLockscleanup on disposeStacked branching:
main-> Phase 1 -> Phase 2+3 -> Phase 4+5+6 -> Phase 7a -> Phase 7b -> Phase 7b integration (this PR)Re: Phase 7c (UI surfacing): Lock conflicts are currently returned to the LLM only. UI surfacing in the Background Tasks panel is planned for Phase 7c.
Feedback and guidance are welcome.
Test Procedure
cd src && npx vitest run services/file-lock/__tests__/Pre-Submission Checklist
Interactively review PR in Roo Code Cloud