scrum4me-mcp/__tests__/wait-for-job-worktree.test.ts
Janpeter Visser f01fab8c38
feat: branch-per-story + worktree-defer + verify EMPTY edge-cases (#12)
Implementeert vier open stories uit PBI 'Veilige Claude-agent-workflow':

**Branch per story (cmon11tbe001zbortx35n155c)**
- `resolveBranchForJob`: zoek sibling-job in dezelfde story; reuse z'n
  branch (1 PR per story i.p.v. per task).
- Branch-naam: `feat/story-<8-char>` voor nieuwe stories.
- `createWorktreeForJob` kent nu `reuseBranch=true`: detecteert stale
  sibling-worktree die de branch nog vasthoudt en verwijdert die eerst.
- `attachWorktreeToJob` neemt `storyId` mee.

**PR-hergebruik (zelfde story)**
- `maybeCreateAutoPr`: als sibling-job in story al een pr_url heeft,
  hergebruik die zonder nieuwe `gh pr create`-call. PR-titel komt nu
  van de story (was task) zodat het als 'story-PR' leest.

**Worktree-cleanup uitgesteld bij actieve siblings**
- `cleanupWorktreeForTerminalStatus`: count active sibling-jobs in
  dezelfde story; defer als > 0 (volgende sub-task gebruikt branch).

**Worktree-cleanup logging (cmon0jc14001ubortjxf2a2ck)**
- Warning bij ontbrekende repoRoot, met productId + jobId in message.
- Warning bij removeWorktreeForJob-failure met keepBranch in message.

**resolveRepoRoot fallback (cmon0jc14001ubortjxf2a2ck)**
- Convention-based fallback: `~/Projects/<repo-name>` afgeleid uit
  `product.repo_url` als noch env-var noch config-bestand iets oplevert.
- `repoNameFromUrl` helper geëxporteerd voor herbruikbaarheid.

**Verify EMPTY-detection edge-case (cmon0kdq6001xbort2kgbcqmr)**
- `classifyDiffAgainstPlan`: na file-paths-check ook content-lines
  checken; als alle +/- regels alleen headers of whitespace zijn,
  return EMPTY met duidelijke reasoning.

Tests: 120/120 groen (3 nieuwe), tsc clean, build clean.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-01 17:04:54 +02:00

164 lines
6.1 KiB
TypeScript

import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
import * as os from 'node:os'
import * as path from 'node:path'
import * as fs from 'node:fs/promises'
vi.mock('../src/prisma.js', () => ({
prisma: {
$executeRaw: vi.fn(),
claudeJob: { findFirst: vi.fn() },
product: { findUnique: vi.fn() },
},
}))
vi.mock('../src/git/worktree.js', () => ({
createWorktreeForJob: vi.fn(),
}))
import { prisma } from '../src/prisma.js'
import { createWorktreeForJob } from '../src/git/worktree.js'
import { resolveRepoRoot, rollbackClaim, attachWorktreeToJob } from '../src/tools/wait-for-job.js'
const mockPrisma = prisma as unknown as {
$executeRaw: ReturnType<typeof vi.fn>
claudeJob: { findFirst: ReturnType<typeof vi.fn> }
product: { findUnique: ReturnType<typeof vi.fn> }
}
const mockCreateWorktree = createWorktreeForJob as ReturnType<typeof vi.fn>
beforeEach(() => {
vi.clearAllMocks()
})
describe('resolveRepoRoot', () => {
const originalEnv = { ...process.env }
afterEach(() => {
// Restore env
for (const key of Object.keys(process.env)) {
if (key.startsWith('SCRUM4ME_REPO_ROOT_')) delete process.env[key]
}
Object.assign(process.env, originalEnv)
})
it('returns value from env var when set', async () => {
process.env['SCRUM4ME_REPO_ROOT_prod-001'] = '/repos/my-project'
const result = await resolveRepoRoot('prod-001')
expect(result).toBe('/repos/my-project')
})
it('returns null when no env var and no config file', async () => {
delete process.env['SCRUM4ME_REPO_ROOT_prod-999']
// Config file at home won't have this productId in CI
const result = await resolveRepoRoot('prod-999-nonexistent')
expect(result).toBeNull()
})
it('reads from config file when env var is absent', async () => {
const configPath = path.join(os.homedir(), '.scrum4me-agent-config.json')
const config = { repoRoots: { 'prod-config': '/repos/from-config' } }
let wroteConfig = false
try {
await fs.writeFile(configPath, JSON.stringify(config), 'utf-8')
wroteConfig = true
delete process.env['SCRUM4ME_REPO_ROOT_prod-config']
const result = await resolveRepoRoot('prod-config')
expect(result).toBe('/repos/from-config')
} finally {
// Clean up only what we wrote — don't delete if it pre-existed
if (wroteConfig) {
try {
const existing = JSON.parse(await fs.readFile(configPath, 'utf-8'))
delete existing.repoRoots?.['prod-config']
if (Object.keys(existing.repoRoots ?? {}).length === 0 && Object.keys(existing).length === 1) {
await fs.rm(configPath)
} else {
await fs.writeFile(configPath, JSON.stringify(existing), 'utf-8')
}
} catch {
await fs.rm(configPath).catch(() => {})
}
}
}
})
})
describe('attachWorktreeToJob', () => {
const originalEnv = { ...process.env }
afterEach(() => {
for (const key of Object.keys(process.env)) {
if (key.startsWith('SCRUM4ME_REPO_ROOT_')) delete process.env[key]
}
Object.assign(process.env, originalEnv)
})
it('returns worktree_path and branch_name on success (no sibling → fresh story branch)', async () => {
process.env['SCRUM4ME_REPO_ROOT_prod-001'] = '/repos/my-project'
mockPrisma.claudeJob.findFirst.mockResolvedValue(null)
mockCreateWorktree.mockResolvedValue({
worktreePath: '/home/user/.scrum4me-agent-worktrees/job-abc12345',
branchName: 'feat/story-XXXstory',
})
mockPrisma.$executeRaw.mockResolvedValue(0)
const result = await attachWorktreeToJob('prod-001', 'job-abc12345', 'story-XXXstory')
expect(result).toEqual({
worktree_path: '/home/user/.scrum4me-agent-worktrees/job-abc12345',
branch_name: 'feat/story-XXXstory',
reused_branch: false,
})
expect(mockCreateWorktree).toHaveBeenCalledWith({
repoRoot: '/repos/my-project',
jobId: 'job-abc12345',
branchName: 'feat/story-XXXstory',
reuseBranch: false,
})
})
it('reuses sibling branch when sibling job already has a branch in same story', async () => {
process.env['SCRUM4ME_REPO_ROOT_prod-001'] = '/repos/my-project'
mockPrisma.claudeJob.findFirst.mockResolvedValue({ branch: 'feat/story-existing' })
mockCreateWorktree.mockResolvedValue({
worktreePath: '/home/user/.scrum4me-agent-worktrees/job-zzz',
branchName: 'feat/story-existing',
})
mockPrisma.$executeRaw.mockResolvedValue(0)
const result = await attachWorktreeToJob('prod-001', 'job-zzz', 'story-shared')
expect(result).toMatchObject({ branch_name: 'feat/story-existing', reused_branch: true })
expect(mockCreateWorktree).toHaveBeenCalledWith(expect.objectContaining({ reuseBranch: true }))
})
it('rolls back claim and returns error when no repoRoot configured', async () => {
delete process.env['SCRUM4ME_REPO_ROOT_prod-no-root']
mockPrisma.product.findUnique.mockResolvedValue({ repo_url: null })
mockPrisma.$executeRaw.mockResolvedValue(0)
const result = await attachWorktreeToJob('prod-no-root', 'job-xyz', 'story-y')
expect('error' in result).toBe(true)
expect((result as { error: string }).error).toContain('No repo root configured')
expect(mockPrisma.$executeRaw).toHaveBeenCalledOnce()
const sqlParts: string[] = mockPrisma.$executeRaw.mock.calls[0][0]
expect(sqlParts.join('')).toContain("status = 'QUEUED'")
})
it('rolls back claim and returns error when createWorktreeForJob throws', async () => {
process.env['SCRUM4ME_REPO_ROOT_prod-001'] = '/repos/my-project'
mockPrisma.claudeJob.findFirst.mockResolvedValue(null)
mockCreateWorktree.mockRejectedValue(new Error('git fetch failed'))
mockPrisma.$executeRaw.mockResolvedValue(0)
const result = await attachWorktreeToJob('prod-001', 'job-fail', 'story-z')
expect('error' in result).toBe(true)
expect((result as { error: string }).error).toContain('git fetch failed')
expect(mockPrisma.$executeRaw).toHaveBeenCalledOnce()
const sqlParts: string[] = mockPrisma.$executeRaw.mock.calls[0][0]
expect(sqlParts.join('')).toContain("status = 'QUEUED'")
})
})