f7f5a487ec
Adds two interlocking PBIs:
PBI-9 — Worktree foundation + persistent product-worktrees for idea-jobs
- src/git/worktree-paths.ts: centralised root + skip-set + lock-path helpers
- src/git/file-lock.ts: proper-lockfile wrapper, deadlock-safe ordered acquire
- src/git/product-worktree.ts: detached-HEAD worktree per product, .scratch/
excluded via git rev-parse --git-path (handles linked .git file)
- src/git/job-locks.ts: setupProductWorktrees + releaseLocksOnTerminal
- wait-for-job.ts: idea-branch wires product-worktrees for IDEA_GRILL/MAKE_PLAN
- update-job-status.ts + pbi-cascade.ts + stale-reset: release on all four
server-side terminal transitions (DONE/FAILED/CANCELLED/stale)
- cleanup-my-worktrees: skip _products/ + *.lock
- README: worktrees section with single-host invariant + advisory-lock path
PBI-47 — Sprint-flow P0 corrections + PAUSED flow with rich pause_context
- prisma schema: ClaudeJob.{base_sha,head_sha} + SprintRun.pause_context
- tryClaimJob captures base_sha; prepareDoneUpdate captures head_sha
- verify-task-against-plan diffs vs base_sha (no more origin/main fallback);
rejects with MISSING_BASE_SHA when null — fixes per-task verify-scope P0
- pr.ts: createPullRequest enableAutoMerge default false; new
enableAutoMergeOnPr with --match-head-commit guard + 5-category typed
EnableAutoMergeResult — fixes STORY auto-merge timing P0
- src/flow/{effects,worktree-lease,pr-flow,sprint-run}.ts: pure transition
modules + idempotent declarative effects executor
- update-job-status: STORY auto-merge fires only on the last task of the
story (story.status === DONE), with head_sha as merge guard; MERGE_CONFLICT
routes to sprint-run flow which produces CREATE_CLAUDE_QUESTION +
SET_SPRINT_RUN_STATUS effects with rich pause_context
Tests: 31 test files, 242 passing. Pure-transition tests cover STORY 3-tasks
auto-merge timing, SPRINT draft→ready, MERGE_CONFLICT pause/resume, file-lock
deadlock prevention, worktree-lease lifecycle, delete-only verify (ALIGNED),
per-job verify scope (base_sha isolation), 5-category auto-merge errors.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
82 lines
2.9 KiB
TypeScript
82 lines
2.9 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { transition, type WorktreeLeaseState } from '../../src/flow/worktree-lease.js'
|
|
|
|
describe('worktree-lease pure transitions', () => {
|
|
it('idle + JOB_CLAIMED → acquiring_lock, no effects', () => {
|
|
const r = transition({ kind: 'idle' }, { type: 'JOB_CLAIMED', jobId: 'j1', productIds: ['p1'] })
|
|
expect(r.nextState.kind).toBe('acquiring_lock')
|
|
expect(r.effects).toEqual([])
|
|
})
|
|
|
|
it('acquiring_lock + LOCK_ACQUIRED → creating_or_reusing', () => {
|
|
const state: WorktreeLeaseState = {
|
|
kind: 'acquiring_lock',
|
|
jobId: 'j1',
|
|
productIds: ['p1'],
|
|
}
|
|
const r = transition(state, { type: 'LOCK_ACQUIRED' })
|
|
expect(r.nextState.kind).toBe('creating_or_reusing')
|
|
expect(r.effects).toEqual([])
|
|
})
|
|
|
|
it('acquiring_lock + LOCK_TIMEOUT → lock_timeout', () => {
|
|
const state: WorktreeLeaseState = {
|
|
kind: 'acquiring_lock',
|
|
jobId: 'j1',
|
|
productIds: ['p1'],
|
|
}
|
|
const r = transition(state, { type: 'LOCK_TIMEOUT' })
|
|
expect(r.nextState.kind).toBe('lock_timeout')
|
|
})
|
|
|
|
it('creating_or_reusing + WORKTREE_READY → syncing', () => {
|
|
const r = transition(
|
|
{ kind: 'creating_or_reusing', jobId: 'j1', productIds: ['p1'] },
|
|
{ type: 'WORKTREE_READY' },
|
|
)
|
|
expect(r.nextState.kind).toBe('syncing')
|
|
})
|
|
|
|
it('syncing + SYNC_DONE → ready (no release effect yet)', () => {
|
|
const r = transition(
|
|
{ kind: 'syncing', jobId: 'j1', productIds: ['p1'] },
|
|
{ type: 'SYNC_DONE' },
|
|
)
|
|
expect(r.nextState.kind).toBe('ready')
|
|
expect(r.effects).toEqual([])
|
|
})
|
|
|
|
it('syncing + SYNC_FAILED → sync_failed + RELEASE_WORKTREE_LOCKS effect', () => {
|
|
const r = transition(
|
|
{ kind: 'syncing', jobId: 'j1', productIds: ['p1'] },
|
|
{ type: 'SYNC_FAILED', error: 'boom' },
|
|
)
|
|
expect(r.nextState.kind).toBe('sync_failed')
|
|
expect(r.effects).toEqual([{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'j1' }])
|
|
})
|
|
|
|
it('ready + JOB_TERMINAL → releasing + RELEASE_WORKTREE_LOCKS effect', () => {
|
|
const r = transition(
|
|
{ kind: 'ready', jobId: 'j1', productIds: ['p1'] },
|
|
{ type: 'JOB_TERMINAL', jobId: 'j1' },
|
|
)
|
|
expect(r.nextState.kind).toBe('releasing')
|
|
expect(r.effects).toEqual([{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'j1' }])
|
|
})
|
|
|
|
it('ready + STALE_RESET → stale_released + RELEASE_WORKTREE_LOCKS effect', () => {
|
|
const r = transition(
|
|
{ kind: 'ready', jobId: 'j1', productIds: ['p1'] },
|
|
{ type: 'STALE_RESET', jobId: 'j1' },
|
|
)
|
|
expect(r.nextState.kind).toBe('stale_released')
|
|
expect(r.effects).toEqual([{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'j1' }])
|
|
})
|
|
|
|
it('forbidden transition (idle + LOCK_ACQUIRED) keeps state, no effects', () => {
|
|
const state: WorktreeLeaseState = { kind: 'idle' }
|
|
const r = transition(state, { type: 'LOCK_ACQUIRED' })
|
|
expect(r.nextState).toEqual(state)
|
|
expect(r.effects).toEqual([])
|
|
})
|
|
})
|