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>
78 lines
3 KiB
TypeScript
78 lines
3 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { transition, type PrFlowState } from '../../src/flow/pr-flow.js'
|
|
|
|
describe('pr-flow STORY-mode 3-tasks scenario', () => {
|
|
it('opens PR early; auto-merge only fires on the last task', () => {
|
|
let state: PrFlowState = { kind: 'none', strategy: 'STORY' }
|
|
const allEffects: Array<Record<string, unknown>> = []
|
|
|
|
// Task 1 DONE → PR_CREATED
|
|
let r = transition(state, { type: 'PR_CREATED', prUrl: 'https://github.com/o/r/pull/1' })
|
|
state = r.nextState
|
|
allEffects.push(...r.effects)
|
|
expect(state.kind).toBe('pr_opened')
|
|
expect(allEffects.filter((e) => e.type === 'ENABLE_AUTO_MERGE')).toHaveLength(0)
|
|
|
|
// Task 2 DONE → no STORY_COMPLETED yet, no transition emitted
|
|
r = transition(state, { type: 'TASK_DONE', taskId: 't2', headSha: 'abc123' })
|
|
state = r.nextState
|
|
allEffects.push(...r.effects)
|
|
expect(state.kind).toBe('pr_opened')
|
|
expect(allEffects.filter((e) => e.type === 'ENABLE_AUTO_MERGE')).toHaveLength(0)
|
|
|
|
// Task 3 DONE = STORY_COMPLETED → ENABLE_AUTO_MERGE with head guard
|
|
r = transition(state, { type: 'STORY_COMPLETED', storyId: 's1', headSha: 'def456' })
|
|
state = r.nextState
|
|
allEffects.push(...r.effects)
|
|
expect(state.kind).toBe('waiting_for_checks')
|
|
const enableEffects = allEffects.filter((e) => e.type === 'ENABLE_AUTO_MERGE')
|
|
expect(enableEffects).toHaveLength(1)
|
|
expect(enableEffects[0]).toMatchObject({ expectedHeadSha: 'def456' })
|
|
|
|
// CI green + merge OK
|
|
r = transition(state, { type: 'MERGE_RESULT' })
|
|
state = r.nextState
|
|
expect(state.kind).toBe('auto_merge_enabled')
|
|
})
|
|
|
|
it('CHECKS_FAILED → checks_failed (no pause)', () => {
|
|
const state: PrFlowState = {
|
|
kind: 'waiting_for_checks',
|
|
strategy: 'STORY',
|
|
prUrl: 'x',
|
|
headSha: 'y',
|
|
}
|
|
const r = transition(state, { type: 'MERGE_RESULT', reason: 'CHECKS_FAILED' })
|
|
expect(r.nextState.kind).toBe('checks_failed')
|
|
})
|
|
|
|
it('MERGE_CONFLICT → merge_conflict_paused', () => {
|
|
const state: PrFlowState = {
|
|
kind: 'waiting_for_checks',
|
|
strategy: 'STORY',
|
|
prUrl: 'x',
|
|
headSha: 'y',
|
|
}
|
|
const r = transition(state, { type: 'MERGE_RESULT', reason: 'MERGE_CONFLICT' })
|
|
expect(r.nextState.kind).toBe('merge_conflict_paused')
|
|
})
|
|
})
|
|
|
|
describe('pr-flow SPRINT-mode', () => {
|
|
it('draft stays draft until SPRINT_COMPLETED → MARK_PR_READY effect', () => {
|
|
let state: PrFlowState = { kind: 'none', strategy: 'SPRINT' }
|
|
let r = transition(state, { type: 'PR_CREATED', prUrl: 'x' })
|
|
expect(r.nextState.kind).toBe('draft_opened')
|
|
expect(r.effects).toHaveLength(0)
|
|
|
|
state = r.nextState
|
|
r = transition(state, { type: 'TASK_DONE', taskId: 't1', headSha: 'a' })
|
|
expect(r.nextState.kind).toBe('draft_opened')
|
|
expect(r.effects).toHaveLength(0)
|
|
|
|
state = r.nextState
|
|
r = transition(state, { type: 'SPRINT_COMPLETED', sprintRunId: 'sr1' })
|
|
expect(r.nextState.kind).toBe('ready_for_review')
|
|
expect(r.effects.filter((e) => e.type === 'MARK_PR_READY')).toHaveLength(1)
|
|
})
|
|
})
|