fix(openclaw-plugin): serialize per-session commits to prevent CONFLICT errors#1035
Open
mobilebarn wants to merge 1 commit intovolcengine:mainfrom
Open
fix(openclaw-plugin): serialize per-session commits to prevent CONFLICT errors#1035mobilebarn wants to merge 1 commit intovolcengine:mainfrom
mobilebarn wants to merge 1 commit intovolcengine:mainfrom
Conversation
…CT errors Adds a per-session commit lock (promise chain) in the context engine to serialize overlapping commits from afterTurn, before_reset, and compact fallback paths. The OV server rejects concurrent commits on the same session with CONFLICT; this ensures they run sequentially.
|
Failed to generate code suggestions for PR |
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
context-engine.tsto serialize overlappingcommitSessioncalls targeting the same OV session ID.afterTurn,doCommitOVSessionviabefore_reset/compact, andmemory_store) that can overlap. This change ensures they execute sequentially viawithCommitLock.commitWithLockon theContextEngineWithSessionMappingtype soindex.tscallers can opt in to the same lock in the future.Test plan
npx tsc --noEmitpasses with no errorsnpx vitest runpasses (10/10 tests)afterTurn+before_resetcommits and verify no CONFLICT errorsmemory_storetool still works when context engine is active