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>
66 lines
2.3 KiB
TypeScript
66 lines
2.3 KiB
TypeScript
import { execFile } from 'node:child_process'
|
|
import { promisify } from 'node:util'
|
|
import * as fs from 'node:fs/promises'
|
|
import * as path from 'node:path'
|
|
import { getProductWorktreePath } from './worktree-paths.js'
|
|
|
|
const exec = promisify(execFile)
|
|
|
|
export async function getOrCreateProductWorktree(opts: {
|
|
repoRoot: string
|
|
productId: string
|
|
}): Promise<{ worktreePath: string; created: boolean }> {
|
|
const worktreePath = getProductWorktreePath(opts.productId)
|
|
await fs.mkdir(path.dirname(worktreePath), { recursive: true })
|
|
|
|
try {
|
|
await fs.access(worktreePath)
|
|
return { worktreePath, created: false }
|
|
} catch {
|
|
// Path bestaat niet — aanmaken
|
|
}
|
|
|
|
await exec('git', ['fetch', 'origin', '--prune'], { cwd: opts.repoRoot })
|
|
await exec('git', ['worktree', 'add', '--detach', worktreePath, 'origin/main'], {
|
|
cwd: opts.repoRoot,
|
|
})
|
|
|
|
// Resolve REAL exclude-pad (linked worktree heeft .git als file, niet directory)
|
|
const { stdout } = await exec('git', ['rev-parse', '--git-path', 'info/exclude'], {
|
|
cwd: worktreePath,
|
|
})
|
|
const excludePath = path.resolve(worktreePath, stdout.trim())
|
|
const existing = await fs.readFile(excludePath, 'utf8').catch(() => '')
|
|
if (!existing.split('\n').includes('.scratch/')) {
|
|
const sep = existing === '' || existing.endsWith('\n') ? '' : '\n'
|
|
await fs.appendFile(excludePath, `${sep}.scratch/\n`)
|
|
}
|
|
|
|
return { worktreePath, created: true }
|
|
}
|
|
|
|
export async function syncProductWorktree(opts: { worktreePath: string }): Promise<void> {
|
|
const { worktreePath } = opts
|
|
await exec('git', ['fetch', 'origin', '--prune'], { cwd: worktreePath })
|
|
await exec('git', ['reset', '--hard', 'origin/main'], { cwd: worktreePath })
|
|
await exec('git', ['clean', '-fd', '-e', '.scratch/'], { cwd: worktreePath })
|
|
// Wis .scratch/ inhoud, behoud de map
|
|
const scratch = path.join(worktreePath, '.scratch')
|
|
await fs.rm(scratch, { recursive: true, force: true })
|
|
await fs.mkdir(scratch, { recursive: true })
|
|
}
|
|
|
|
export async function removeProductWorktree(opts: {
|
|
repoRoot: string
|
|
productId: string
|
|
}): Promise<{ removed: boolean }> {
|
|
const worktreePath = getProductWorktreePath(opts.productId)
|
|
try {
|
|
await exec('git', ['worktree', 'remove', '--force', worktreePath], {
|
|
cwd: opts.repoRoot,
|
|
})
|
|
return { removed: true }
|
|
} catch {
|
|
return { removed: false }
|
|
}
|
|
}
|