fix: recover watcher and serialize database writers - #1486
Draft
stsoul wants to merge 4 commits into
Draft
Conversation
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.
Summary
Root causes
The watcher previously treated lock contention like a terminal sync failure. After five retries it degraded permanently, discarded pending state, and could not recover when the competing writer exited.
Separately, the short-lived index lock protected individual synchronization calls but not the complete lifetime of a mutating process. An MCP server and an index/sync command could therefore open and mutate the same SQLite database concurrently. The new project-local writer lease covers the mutating process lifetime and uses PID liveness for stale-owner recovery.
Behavior
Validation
npm run build: PASSsecurity.test.tsmcp-daemon.test.ts: 8/9 PASS; the remaining Windows-only failure is teardownEBUSYwhile removing its temporary directory, outside the files changed by this PRmain: 7 intended files onlyThe PR remains draft while upstream CI and maintainer review run.