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>
182 lines
6.7 KiB
TypeScript
182 lines
6.7 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
import * as path from 'node:path'
|
|
import * as os from 'node:os'
|
|
|
|
vi.mock('../src/prisma.js', () => ({
|
|
prisma: {
|
|
claudeJob: { findMany: vi.fn() },
|
|
},
|
|
}))
|
|
|
|
vi.mock('../src/git/worktree.js', () => ({
|
|
removeWorktreeForJob: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('../src/tools/wait-for-job.js', async (importOriginal) => {
|
|
const original = await importOriginal<typeof import('../src/tools/wait-for-job.js')>()
|
|
return { ...original, resolveRepoRoot: vi.fn() }
|
|
})
|
|
|
|
vi.mock('node:fs/promises', () => ({
|
|
readdir: vi.fn(),
|
|
}))
|
|
|
|
import { prisma } from '../src/prisma.js'
|
|
import { removeWorktreeForJob } from '../src/git/worktree.js'
|
|
import { resolveRepoRoot } from '../src/tools/wait-for-job.js'
|
|
import * as fsPromises from 'node:fs/promises'
|
|
import { cleanupWorktrees, listWorktreeJobIds, getWorktreeParent } from '../src/tools/cleanup-my-worktrees.js'
|
|
|
|
const mockPrisma = prisma as unknown as {
|
|
claudeJob: { findMany: ReturnType<typeof vi.fn> }
|
|
}
|
|
const mockRemove = removeWorktreeForJob as ReturnType<typeof vi.fn>
|
|
const mockResolve = resolveRepoRoot as ReturnType<typeof vi.fn>
|
|
const mockReaddir = fsPromises.readdir as ReturnType<typeof vi.fn>
|
|
|
|
const REPO_ROOT = '/repos/my-project'
|
|
const USER_ID = 'user-1'
|
|
const PRODUCT_ID = 'product-1'
|
|
const WORKTREE_PARENT = '/home/user/.scrum4me-agent-worktrees'
|
|
|
|
function makeDirent(name: string, isDir = true) {
|
|
return { name, isDirectory: () => isDir } as unknown as import('node:fs').Dirent
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockResolve.mockResolvedValue(REPO_ROOT)
|
|
mockRemove.mockResolvedValue({ removed: true })
|
|
})
|
|
|
|
describe('getWorktreeParent', () => {
|
|
it('uses SCRUM4ME_AGENT_WORKTREE_DIR env var when set', async () => {
|
|
process.env.SCRUM4ME_AGENT_WORKTREE_DIR = '/custom/dir'
|
|
expect(await getWorktreeParent()).toBe('/custom/dir')
|
|
delete process.env.SCRUM4ME_AGENT_WORKTREE_DIR
|
|
})
|
|
|
|
it('defaults to ~/.scrum4me-agent-worktrees', async () => {
|
|
delete process.env.SCRUM4ME_AGENT_WORKTREE_DIR
|
|
expect(await getWorktreeParent()).toBe(path.join(os.homedir(), '.scrum4me-agent-worktrees'))
|
|
})
|
|
})
|
|
|
|
describe('listWorktreeJobIds', () => {
|
|
it('returns directory names from the worktree parent', async () => {
|
|
mockReaddir.mockResolvedValue([makeDirent('job-aaa'), makeDirent('job-bbb'), makeDirent('file.txt', false)])
|
|
const ids = await listWorktreeJobIds(WORKTREE_PARENT)
|
|
expect(ids).toEqual(['job-aaa', 'job-bbb'])
|
|
})
|
|
|
|
it('returns empty array when parent does not exist', async () => {
|
|
mockReaddir.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
|
|
expect(await listWorktreeJobIds(WORKTREE_PARENT)).toEqual([])
|
|
})
|
|
|
|
it('skips _products/ system dir and *.lock files (PBI-9)', async () => {
|
|
mockReaddir.mockResolvedValue([
|
|
makeDirent('job-aaa'),
|
|
makeDirent('_products'),
|
|
makeDirent('product-abc.lock'),
|
|
makeDirent('job-bbb'),
|
|
])
|
|
const ids = await listWorktreeJobIds(WORKTREE_PARENT)
|
|
expect(ids).toEqual(['job-aaa', 'job-bbb'])
|
|
})
|
|
})
|
|
|
|
describe('cleanupWorktrees', () => {
|
|
it('removes worktrees for DONE/FAILED/CANCELLED jobs', async () => {
|
|
mockReaddir.mockResolvedValue([
|
|
makeDirent('job-done'),
|
|
makeDirent('job-failed'),
|
|
makeDirent('job-cancelled'),
|
|
])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([
|
|
{ id: 'job-done', status: 'DONE', product_id: PRODUCT_ID, branch: 'feat/job-done' },
|
|
{ id: 'job-failed', status: 'FAILED', product_id: PRODUCT_ID, branch: null },
|
|
{ id: 'job-cancelled', status: 'CANCELLED', product_id: PRODUCT_ID, branch: null },
|
|
])
|
|
|
|
const result = await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(result.removed).toEqual(expect.arrayContaining(['job-done', 'job-failed', 'job-cancelled']))
|
|
expect(result.kept).toEqual([])
|
|
expect(result.skipped).toEqual([])
|
|
expect(mockRemove).toHaveBeenCalledTimes(3)
|
|
})
|
|
|
|
it('keeps worktrees for QUEUED/CLAIMED/RUNNING jobs', async () => {
|
|
mockReaddir.mockResolvedValue([
|
|
makeDirent('job-queued'),
|
|
makeDirent('job-claimed'),
|
|
makeDirent('job-running'),
|
|
])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([
|
|
{ id: 'job-queued', status: 'QUEUED', product_id: PRODUCT_ID, branch: null },
|
|
{ id: 'job-claimed', status: 'CLAIMED', product_id: PRODUCT_ID, branch: null },
|
|
{ id: 'job-running', status: 'RUNNING', product_id: PRODUCT_ID, branch: null },
|
|
])
|
|
|
|
const result = await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(result.kept).toEqual(expect.arrayContaining(['job-queued', 'job-claimed', 'job-running']))
|
|
expect(result.removed).toEqual([])
|
|
expect(mockRemove).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('calls removeWorktreeForJob with keepBranch=true for DONE with branch', async () => {
|
|
mockReaddir.mockResolvedValue([makeDirent('job-done')])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([
|
|
{ id: 'job-done', status: 'DONE', product_id: PRODUCT_ID, branch: 'feat/job-done' },
|
|
])
|
|
|
|
await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(mockRemove).toHaveBeenCalledWith({ repoRoot: REPO_ROOT, jobId: 'job-done', keepBranch: true })
|
|
})
|
|
|
|
it('calls removeWorktreeForJob with keepBranch=false for FAILED jobs', async () => {
|
|
mockReaddir.mockResolvedValue([makeDirent('job-failed')])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([
|
|
{ id: 'job-failed', status: 'FAILED', product_id: PRODUCT_ID, branch: null },
|
|
])
|
|
|
|
await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(mockRemove).toHaveBeenCalledWith({ repoRoot: REPO_ROOT, jobId: 'job-failed', keepBranch: false })
|
|
})
|
|
|
|
it('skips orphan worktrees (no DB record)', async () => {
|
|
mockReaddir.mockResolvedValue([makeDirent('job-orphan')])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([])
|
|
|
|
const result = await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(result.skipped).toContain('job-orphan')
|
|
expect(mockRemove).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('skips worktrees when no repoRoot is configured', async () => {
|
|
mockReaddir.mockResolvedValue([makeDirent('job-norepo')])
|
|
mockPrisma.claudeJob.findMany.mockResolvedValue([
|
|
{ id: 'job-norepo', status: 'FAILED', product_id: 'unknown-product', branch: null },
|
|
])
|
|
mockResolve.mockResolvedValue(null)
|
|
|
|
const result = await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(result.skipped).toContain('job-norepo')
|
|
expect(mockRemove).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('returns empty result when worktree parent is empty', async () => {
|
|
mockReaddir.mockResolvedValue([])
|
|
|
|
const result = await cleanupWorktrees(WORKTREE_PARENT, USER_ID)
|
|
|
|
expect(result).toEqual({ removed: [], kept: [], skipped: [] })
|
|
expect(mockPrisma.claudeJob.findMany).not.toHaveBeenCalled()
|
|
})
|
|
})
|