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>
103 lines
3.3 KiB
TypeScript
103 lines
3.3 KiB
TypeScript
import type { FlowEffect } from './effects.js'
|
|
|
|
export type WorktreeLeaseState =
|
|
| { kind: 'idle' }
|
|
| { kind: 'acquiring_lock'; jobId: string; productIds: string[] }
|
|
| { kind: 'creating_or_reusing'; jobId: string; productIds: string[] }
|
|
| { kind: 'syncing'; jobId: string; productIds: string[] }
|
|
| { kind: 'ready'; jobId: string; productIds: string[] }
|
|
| { kind: 'releasing'; jobId: string }
|
|
| { kind: 'released'; jobId: string }
|
|
| { kind: 'lock_timeout'; jobId: string; productIds: string[] }
|
|
| { kind: 'sync_failed'; jobId: string; productIds: string[]; error: string }
|
|
| { kind: 'stale_released'; jobId: string }
|
|
|
|
export type WorktreeLeaseEvent =
|
|
| { type: 'JOB_CLAIMED'; jobId: string; productIds: string[] }
|
|
| { type: 'LOCK_ACQUIRED' }
|
|
| { type: 'LOCK_TIMEOUT' }
|
|
| { type: 'WORKTREE_READY' }
|
|
| { type: 'SYNC_DONE' }
|
|
| { type: 'SYNC_FAILED'; error: string }
|
|
| { type: 'JOB_TERMINAL'; jobId: string }
|
|
| { type: 'STALE_RESET'; jobId: string }
|
|
|
|
export type TransitionResult = {
|
|
nextState: WorktreeLeaseState
|
|
effects: FlowEffect[]
|
|
}
|
|
|
|
export function transition(
|
|
state: WorktreeLeaseState,
|
|
event: WorktreeLeaseEvent,
|
|
): TransitionResult {
|
|
switch (state.kind) {
|
|
case 'idle':
|
|
if (event.type === 'JOB_CLAIMED') {
|
|
return {
|
|
nextState: { kind: 'acquiring_lock', jobId: event.jobId, productIds: event.productIds },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
case 'acquiring_lock':
|
|
if (event.type === 'LOCK_ACQUIRED') {
|
|
return {
|
|
nextState: { kind: 'creating_or_reusing', jobId: state.jobId, productIds: state.productIds },
|
|
effects: [],
|
|
}
|
|
}
|
|
if (event.type === 'LOCK_TIMEOUT') {
|
|
return {
|
|
nextState: { kind: 'lock_timeout', jobId: state.jobId, productIds: state.productIds },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
case 'creating_or_reusing':
|
|
if (event.type === 'WORKTREE_READY') {
|
|
return {
|
|
nextState: { kind: 'syncing', jobId: state.jobId, productIds: state.productIds },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
case 'syncing':
|
|
if (event.type === 'SYNC_DONE') {
|
|
return {
|
|
nextState: { kind: 'ready', jobId: state.jobId, productIds: state.productIds },
|
|
effects: [],
|
|
}
|
|
}
|
|
if (event.type === 'SYNC_FAILED') {
|
|
return {
|
|
nextState: {
|
|
kind: 'sync_failed',
|
|
jobId: state.jobId,
|
|
productIds: state.productIds,
|
|
error: event.error,
|
|
},
|
|
effects: [{ type: 'RELEASE_WORKTREE_LOCKS', jobId: state.jobId }],
|
|
}
|
|
}
|
|
break
|
|
case 'ready':
|
|
if (event.type === 'JOB_TERMINAL') {
|
|
return {
|
|
nextState: { kind: 'releasing', jobId: state.jobId },
|
|
effects: [{ type: 'RELEASE_WORKTREE_LOCKS', jobId: state.jobId }],
|
|
}
|
|
}
|
|
if (event.type === 'STALE_RESET') {
|
|
return {
|
|
nextState: { kind: 'stale_released', jobId: state.jobId },
|
|
effects: [{ type: 'RELEASE_WORKTREE_LOCKS', jobId: state.jobId }],
|
|
}
|
|
}
|
|
break
|
|
case 'releasing':
|
|
return { nextState: { kind: 'released', jobId: state.jobId }, effects: [] }
|
|
}
|
|
// Unknown or forbidden transition — keep current state, no effects
|
|
return { nextState: state, effects: [] }
|
|
}
|