singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(gsd): recover from stale lockfile after crash or SIGKILL

Browse source 
Add pre-flight stale lock cleanup before proper-lockfile acquisition:
if the .lock/ directory exists but no auto.lock metadata is present
(or the owning PID is dead), remove it proactively instead of waiting
for the 30-min stale window. Also improve the error message when
recovery fails to include the rm command for manual cleanup.

Fixes #3218

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Tibsfox 2026-04-06 18:33:27 -07:00
parent b4c6229360
commit 7790808a29
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/resources/extensions/gsd/session-lock.ts
View file

@ -288,6 +288,20 @@ export function acquireSessionLock(basePath: string): SessionLockResult {
const gsdDir = gsdRoot(basePath);
const lockTarget = effectiveLockTarget(gsdDir);
// #3218: Pre-flight stale lock cleanup — if the .lock/ directory exists but
// no auto.lock metadata is present (or the PID is dead), remove the lock
// directory before attempting acquisition. This prevents the 30-min stale
// window from blocking /gsd after crashes, SIGKILL, or laptop sleep.
const lockDir = lockTarget + ".lock";
if (existsSync(lockDir)) {
const existingData = readExistingLockData(lp);
const isOrphan = !existingData || (existingData.pid && !isPidAlive(existingData.pid));
if (isOrphan) {
try { rmSync(lockDir, { recursive: true, force: true }); } catch { /* best-effort */ }
try { if (existsSync(lp)) unlinkSync(lp); } catch { /* best-effort */ }
}
}
try {
// Try to acquire an exclusive OS-level lock on the lock target.
// We lock a directory since proper-lockfile works best on directories,
@ -344,9 +358,11 @@ export function acquireSessionLock(basePath: string): SessionLockResult {
}
}
// #3218: Provide actionable workaround when lock recovery fails
const lockDirPath = lockTarget + ".lock";
const reason = existingPid
? `Another auto-mode session (PID ${existingPid}) appears to be running.\nStop it with \`kill ${existingPid}\` before starting a new session.`
: `Another auto-mode session is already running on this project.`;
: `Another auto-mode session lock is stuck on this project.\nRun: rm -rf "${lockDirPath}" && rm -f "${lp}"`;
return { acquired: false, reason, existingPid };
}