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>
110 lines
3.6 KiB
TypeScript
110 lines
3.6 KiB
TypeScript
import type { FlowEffect } from './effects.js'
|
|
import type { AutoMergeFailReason } from '../git/pr.js'
|
|
|
|
export type PrStrategy = 'STORY' | 'SPRINT'
|
|
|
|
export type PrFlowState =
|
|
| { kind: 'none'; strategy: PrStrategy }
|
|
| { kind: 'branch_pushed'; strategy: PrStrategy; prUrl?: string }
|
|
| { kind: 'pr_opened'; strategy: 'STORY'; prUrl: string }
|
|
| { kind: 'draft_opened'; strategy: 'SPRINT'; prUrl: string }
|
|
| { kind: 'waiting_for_checks'; strategy: 'STORY'; prUrl: string; headSha: string }
|
|
| { kind: 'auto_merge_enabled'; strategy: 'STORY'; prUrl: string; headSha: string }
|
|
| { kind: 'ready_for_review'; strategy: 'SPRINT'; prUrl: string }
|
|
| { kind: 'merged'; strategy: PrStrategy; prUrl: string }
|
|
| { kind: 'checks_failed'; strategy: PrStrategy; prUrl: string }
|
|
| { kind: 'merge_conflict_paused'; strategy: PrStrategy; prUrl: string; headSha: string }
|
|
|
|
export type PrFlowEvent =
|
|
| { type: 'PR_CREATED'; prUrl: string }
|
|
| { type: 'TASK_DONE'; taskId: string; headSha: string }
|
|
| { type: 'STORY_COMPLETED'; storyId: string; headSha: string }
|
|
| { type: 'SPRINT_COMPLETED'; sprintRunId: string }
|
|
| { type: 'MERGE_RESULT'; reason?: AutoMergeFailReason }
|
|
|
|
export type TransitionResult = { nextState: PrFlowState; effects: FlowEffect[] }
|
|
|
|
export function transition(state: PrFlowState, event: PrFlowEvent): TransitionResult {
|
|
if (state.strategy === 'STORY') {
|
|
switch (state.kind) {
|
|
case 'none':
|
|
case 'branch_pushed':
|
|
if (event.type === 'PR_CREATED') {
|
|
return {
|
|
nextState: { kind: 'pr_opened', strategy: 'STORY', prUrl: event.prUrl },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
case 'pr_opened':
|
|
if (event.type === 'STORY_COMPLETED') {
|
|
return {
|
|
nextState: {
|
|
kind: 'waiting_for_checks',
|
|
strategy: 'STORY',
|
|
prUrl: state.prUrl,
|
|
headSha: event.headSha,
|
|
},
|
|
effects: [
|
|
{ type: 'ENABLE_AUTO_MERGE', prUrl: state.prUrl, expectedHeadSha: event.headSha },
|
|
],
|
|
}
|
|
}
|
|
break
|
|
case 'waiting_for_checks':
|
|
if (event.type === 'MERGE_RESULT' && !event.reason) {
|
|
return {
|
|
nextState: {
|
|
kind: 'auto_merge_enabled',
|
|
strategy: 'STORY',
|
|
prUrl: state.prUrl,
|
|
headSha: state.headSha,
|
|
},
|
|
effects: [],
|
|
}
|
|
}
|
|
if (event.type === 'MERGE_RESULT' && event.reason === 'MERGE_CONFLICT') {
|
|
return {
|
|
nextState: {
|
|
kind: 'merge_conflict_paused',
|
|
strategy: 'STORY',
|
|
prUrl: state.prUrl,
|
|
headSha: state.headSha,
|
|
},
|
|
effects: [],
|
|
}
|
|
}
|
|
if (event.type === 'MERGE_RESULT' && event.reason === 'CHECKS_FAILED') {
|
|
return {
|
|
nextState: { kind: 'checks_failed', strategy: 'STORY', prUrl: state.prUrl },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
}
|
|
}
|
|
|
|
if (state.strategy === 'SPRINT') {
|
|
switch (state.kind) {
|
|
case 'none':
|
|
case 'branch_pushed':
|
|
if (event.type === 'PR_CREATED') {
|
|
return {
|
|
nextState: { kind: 'draft_opened', strategy: 'SPRINT', prUrl: event.prUrl },
|
|
effects: [],
|
|
}
|
|
}
|
|
break
|
|
case 'draft_opened':
|
|
if (event.type === 'SPRINT_COMPLETED') {
|
|
return {
|
|
nextState: { kind: 'ready_for_review', strategy: 'SPRINT', prUrl: state.prUrl },
|
|
effects: [{ type: 'MARK_PR_READY', prUrl: state.prUrl }],
|
|
}
|
|
}
|
|
break
|
|
}
|
|
}
|
|
|
|
return { nextState: state, effects: [] }
|
|
}
|