PBI-9 + PBI-47: worktree foundation, product-worktrees, P0 fixes, PAUSED flow
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>
This commit is contained in:
Madhura68
parent
454d96ee04
commit
f7f5a487ec
29 changed files with 1731 additions and 46 deletions
22
__tests__/flow/effects.test.ts
Normal file
22
__tests__/flow/effects.test.ts
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
import { describe, it, expect } from 'vitest'
|
||||
import { executeEffects } from '../../src/flow/effects.js'
|
||||
|
||||
describe('effects executor', () => {
|
||||
it('RELEASE_WORKTREE_LOCKS for unknown jobId is a no-op (no throw)', async () => {
|
||||
const out = await executeEffects([{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'no-such-job' }])
|
||||
expect(out).toEqual([])
|
||||
})
|
||||
|
||||
it('multiple effects execute in order; failure in one is logged but does not abort', async () => {
|
||||
const out = await executeEffects([
|
||||
{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'a' },
|
||||
{ type: 'RELEASE_WORKTREE_LOCKS', jobId: 'b' },
|
||||
])
|
||||
expect(out).toEqual([])
|
||||
})
|
||||
|
||||
it('empty effects array returns empty outcomes', async () => {
|
||||
const out = await executeEffects([])
|
||||
expect(out).toEqual([])
|
||||
})
|
||||
})
|
||||
78
__tests__/flow/pr-flow.test.ts
Normal file
78
__tests__/flow/pr-flow.test.ts
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
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)
|
||||
})
|
||||
})
|
||||
82
__tests__/flow/sprint-run.test.ts
Normal file
82
__tests__/flow/sprint-run.test.ts
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
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([])
|
||||
})
|
||||
})
|
||||
82
__tests__/flow/worktree-lease.test.ts
Normal file
82
__tests__/flow/worktree-lease.test.ts
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
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([])
|
||||
})
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue