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
3.2 KiB
TypeScript
82 lines
3.2 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { transition, type SprintRunState } from '../../src/flow/sprint-run.js'
|
|
|
|
describe('sprint-run pure transitions', () => {
|
|
it('queued + CLAIM_FIRST_JOB → running with SET_SPRINT_RUN_STATUS effect', () => {
|
|
const state: SprintRunState = { kind: 'queued', sprintRunId: 'sr1' }
|
|
const r = transition(state, { type: 'CLAIM_FIRST_JOB' })
|
|
expect(r.nextState.kind).toBe('running')
|
|
expect(r.effects).toEqual([
|
|
{ type: 'SET_SPRINT_RUN_STATUS', sprintRunId: 'sr1', status: 'RUNNING' },
|
|
])
|
|
})
|
|
|
|
it('running + MERGE_CONFLICT → paused_merge_conflict + 2 effects in order', () => {
|
|
const state: SprintRunState = { kind: 'running', sprintRunId: 'sr1' }
|
|
const r = transition(state, {
|
|
type: 'MERGE_CONFLICT',
|
|
prUrl: 'https://github.com/o/r/pull/1',
|
|
prHeadSha: 'abc123',
|
|
conflictFiles: ['a.ts', 'b.ts'],
|
|
resumeInstructions: 'Resolve and push',
|
|
})
|
|
expect(r.nextState.kind).toBe('paused_merge_conflict')
|
|
expect(r.effects).toHaveLength(2)
|
|
expect(r.effects[0].type).toBe('CREATE_CLAUDE_QUESTION')
|
|
expect(r.effects[1].type).toBe('SET_SPRINT_RUN_STATUS')
|
|
if (r.effects[1].type === 'SET_SPRINT_RUN_STATUS') {
|
|
expect(r.effects[1].status).toBe('PAUSED')
|
|
expect(r.effects[1].pauseContextDraft).toMatchObject({
|
|
pause_reason: 'MERGE_CONFLICT',
|
|
pr_url: 'https://github.com/o/r/pull/1',
|
|
pr_head_sha: 'abc123',
|
|
conflict_files: ['a.ts', 'b.ts'],
|
|
})
|
|
}
|
|
})
|
|
|
|
it('paused + USER_RESUMED → running + CLOSE_CLAUDE_QUESTION + clear pause_context', () => {
|
|
const state: SprintRunState = {
|
|
kind: 'paused_merge_conflict',
|
|
sprintRunId: 'sr1',
|
|
pauseContext: {
|
|
pause_reason: 'MERGE_CONFLICT',
|
|
pr_url: 'x',
|
|
pr_head_sha: 'y',
|
|
conflict_files: [],
|
|
claude_question_id: 'q1',
|
|
resume_instructions: 'r',
|
|
paused_at: new Date().toISOString(),
|
|
},
|
|
}
|
|
const r = transition(state, { type: 'USER_RESUMED' })
|
|
expect(r.nextState.kind).toBe('running')
|
|
expect(r.effects[0]).toEqual({ type: 'CLOSE_CLAUDE_QUESTION', questionId: 'q1' })
|
|
expect(r.effects[1]).toMatchObject({
|
|
type: 'SET_SPRINT_RUN_STATUS',
|
|
status: 'RUNNING',
|
|
clearPauseContext: true,
|
|
})
|
|
})
|
|
|
|
it('running + TASK_FAILED → failed (no PAUSE)', () => {
|
|
const state: SprintRunState = { kind: 'running', sprintRunId: 'sr1' }
|
|
const r = transition(state, { type: 'TASK_FAILED', taskId: 't1', error: 'CI red' })
|
|
expect(r.nextState.kind).toBe('failed')
|
|
expect(r.effects[0]).toMatchObject({ status: 'FAILED' })
|
|
})
|
|
|
|
it('running + ALL_DONE → done + SET_SPRINT_RUN_STATUS DONE', () => {
|
|
const state: SprintRunState = { kind: 'running', sprintRunId: 'sr1' }
|
|
const r = transition(state, { type: 'ALL_DONE' })
|
|
expect(r.nextState.kind).toBe('done')
|
|
expect(r.effects[0]).toMatchObject({ status: 'DONE' })
|
|
})
|
|
|
|
it('forbidden transition (running + CLAIM_FIRST_JOB) keeps state and emits no effects', () => {
|
|
const state: SprintRunState = { kind: 'running', sprintRunId: 'sr1' }
|
|
const r = transition(state, { type: 'CLAIM_FIRST_JOB' })
|
|
expect(r.nextState).toEqual(state)
|
|
expect(r.effects).toEqual([])
|
|
})
|
|
})
|