Дмитрий
79493879ae
Closes Stream H Task 7 (H7). Prevents two Claude sessions on the same
workspace from concurrently mutating files — addresses the cross-session
worktree collisions seen on 28.05/29.05 (deploy branch hijack + push
non-fast-forward incidents).
Architecture:
- Pure module tools/parallel-session-lock.mjs with injectable I/O
(readLock/writeLock/deleteLock) so unit tests cover all branches without
touching the real filesystem. Exports acquire(), refresh(), release(),
computeWorkspaceHash(), LOCK_DEFAULT_TTL_MS (5 minutes).
- Lock record schema (schema_version=1): {session_id, pid, acquired_at, ttl_ms}.
Stored at ~/.claude/runtime/session-lock-<workspaceHash>.json (production
binding handled in deferred batch). Workspace hash is MD5 first-12 hex of
the resolved workspace path.
- Acquisition semantics: stale (past TTL) → take over; same-session → idempotent
re-acquire; other-session fresh → block. refresh() is same-session only
(never steals). release() is same-session only (never deletes other's lock).
- Wrapper tools/enforce-parallel-session-lock.mjs exports decide(acquireResult,
sessionId) → {block, reason?}. Fail-open if acquireResult is missing
(internal-error safety net — avoids the Stream G Task 8 self-lockout
pattern). Block message names the other holder's pid for human triage
("parallel session lock held by <other> (pid N) — wait or close that
session first").
Defensive design:
- main() is a no-op (exit 0) until settings.json registration AND a Stop-hook
release pathway are wired together in the batched activation step. Activating
this hook before release-on-Stop would lock the user out of their own
session on first abnormal exit.
Regression: vitest tools 1763/1763 GREEN (was 1748; +10 pure-module tests
under "parallel-session-lock pure module (Stream H Task 7)" and
"computeWorkspaceHash (Stream H Task 7)" describe blocks; +5 wrapper-decide
tests under "enforce-parallel-session-lock wrapper (Stream H Task 7)").
DEFERRED: .claude/settings.json registration (PreToolUse matcher
"Edit|Write|MultiEdit|NotebookEdit|Bash", block-mode, timeout 3000ms);
Stop-hook release wiring; PostToolUse refresh-on-success wiring.
Batched at end of Phase H-α/H-β.
Stream H Task 7 of 11. Plan: docs/superpowers/plans/2026-05-30-router-gate-v4-stream-H.md
45 lines
1.7 KiB
JavaScript
45 lines
1.7 KiB
JavaScript
// tools/enforce-parallel-session-lock.test.mjs
|
|
// Stream H Task 7 — wrapper tests around the pure parallel-session-lock module.
|
|
import { describe, it, expect } from 'vitest';
|
|
import { decide } from './enforce-parallel-session-lock.mjs';
|
|
|
|
describe('enforce-parallel-session-lock wrapper (Stream H Task 7)', () => {
|
|
it('allow when acquire succeeded (fresh own-lock)', () => {
|
|
const r = decide({
|
|
acquireResult: { acquired: true, holder: { session_id: 's1', pid: 100, acquired_at: 1000 } },
|
|
sessionId: 's1',
|
|
});
|
|
expect(r.block).toBe(false);
|
|
});
|
|
|
|
it('block when another session holds the lock', () => {
|
|
const r = decide({
|
|
acquireResult: { acquired: false, holder: { session_id: 'other-session', pid: 999, acquired_at: 500 } },
|
|
sessionId: 's1',
|
|
});
|
|
expect(r.block).toBe(true);
|
|
expect(r.reason).toMatch(/parallel session lock.*other-session/i);
|
|
});
|
|
|
|
it('allow when same-session re-acquires (takeover)', () => {
|
|
const r = decide({
|
|
acquireResult: { acquired: true, holder: { session_id: 's1', pid: 100, acquired_at: 2000 } },
|
|
sessionId: 's1',
|
|
});
|
|
expect(r.block).toBe(false);
|
|
});
|
|
|
|
it('fail-open when acquireResult is missing (internal error path)', () => {
|
|
expect(decide({ acquireResult: null, sessionId: 's1' }).block).toBe(false);
|
|
expect(decide({ acquireResult: undefined, sessionId: 's1' }).block).toBe(false);
|
|
});
|
|
|
|
it('block message identifies the other holder pid for human triage', () => {
|
|
const r = decide({
|
|
acquireResult: { acquired: false, holder: { session_id: 'other', pid: 42, acquired_at: 0 } },
|
|
sessionId: 's1',
|
|
});
|
|
expect(r.reason).toMatch(/pid 42/);
|
|
});
|
|
});
|