fix: release stranded bootstrap locks and handle re-entrant reacquire (#1351)#1352
Merged
glittercowboy merged 1 commit intogsd-build:mainfrom Mar 19, 2026
Conversation
Release session locks on bootstrap abort paths and reset same-process lock state before re-acquiring so stale proper-lockfile callbacks cannot poison a fresh auto-mode session. Adds regression coverage for bootstrap cleanup and re-entrant lock acquisition.
Collaborator
Contributor
Author
|
@trek-e as of right now my pr has no merge conflicts with main. if you merge yours in first then I'll fix the merge conflicts |
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
acquireSessionLock()by releasing the old proper-lockfile handle first, preventing staleonCompromisedcallbacks from poisoning the new lock_lockCompromisedon retry acquire path for belt-and-suspenders safetyTest plan
session-lock-regression.test.ts— all 10 tests pass (2 new: re-entrant acquire, re-entrant artifact refresh)auto-lock-creation.test.ts— all 12 tests pass (1 new: bootstrap cleanup releases artifacts)session-lock.test.ts— all 23 existing tests pass/gsd→ abort discussion →/gsd auto→ starts cleanly without "Session lock lost"Closes #1351