scrum4me-mcp/src/tools/cleanup-my-worktrees.ts
Madhura68 f7f5a487ec 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>
2026-05-06 21:09:48 +02:00

110 lines
3.4 KiB
TypeScript

import { z } from 'zod'
import * as fs from 'node:fs/promises'
import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
import { prisma } from '../prisma.js'
import { requireWriteAccess } from '../auth.js'
import { toolJson, withToolErrors } from '../errors.js'
import { removeWorktreeForJob } from '../git/worktree.js'
import { getWorktreeRoot, SYSTEM_WORKTREE_DIRS } from '../git/worktree-paths.js'
import { resolveRepoRoot } from './wait-for-job.js'
const TERMINAL_STATUSES = new Set(['DONE', 'FAILED', 'CANCELLED'])
const ACTIVE_STATUSES = new Set(['QUEUED', 'CLAIMED', 'RUNNING'])
const inputSchema = z.object({})
export async function getWorktreeParent(): Promise<string> {
return getWorktreeRoot()
}
export async function listWorktreeJobIds(worktreeParent: string): Promise<string[]> {
try {
const entries = await fs.readdir(worktreeParent, { withFileTypes: true })
return entries
.filter(
(e) =>
e.isDirectory()
&& !SYSTEM_WORKTREE_DIRS.has(e.name)
&& !e.name.endsWith('.lock'),
)
.map((e) => e.name)
} catch {
return []
}
}
export async function cleanupWorktrees(
worktreeParent: string,
userId: string,
): Promise<{ removed: string[]; kept: string[]; skipped: string[] }> {
const jobIds = await listWorktreeJobIds(worktreeParent)
const removed: string[] = []
const kept: string[] = []
const skipped: string[] = []
if (jobIds.length === 0) return { removed, kept, skipped }
const jobs = await prisma.claudeJob.findMany({
where: { id: { in: jobIds }, user_id: userId },
select: { id: true, status: true, product_id: true, branch: true },
})
const jobMap = new Map(jobs.map((j) => [j.id, j]))
for (const jobId of jobIds) {
const job = jobMap.get(jobId)
// No DB record for this jobId — orphan worktree, skip safely
if (!job) {
skipped.push(jobId)
continue
}
if (ACTIVE_STATUSES.has(job.status)) {
kept.push(jobId)
continue
}
if (TERMINAL_STATUSES.has(job.status)) {
const repoRoot = await resolveRepoRoot(job.product_id)
if (!repoRoot) {
skipped.push(jobId)
continue
}
// Keep branch for DONE jobs that already pushed (job.branch is set)
const keepBranch = job.status === 'DONE' && job.branch !== null
try {
await removeWorktreeForJob({ repoRoot, jobId, keepBranch })
removed.push(jobId)
} catch {
skipped.push(jobId)
}
}
}
return { removed, kept, skipped }
}
export function registerCleanupMyWorktreesTool(server: McpServer) {
server.registerTool(
'cleanup_my_worktrees',
{
title: 'Cleanup my worktrees',
description:
'Remove stale git worktrees left by crashed or cancelled agent runs. ' +
'Scans ~/.scrum4me-agent-worktrees/ (or SCRUM4ME_AGENT_WORKTREE_DIR) for job directories, ' +
'looks up each job\'s status, and removes worktrees whose jobs are in a terminal state ' +
'(DONE, FAILED, CANCELLED). Worktrees for active jobs (QUEUED, CLAIMED, RUNNING) are kept. ' +
'Returns { removed, kept, skipped } for inspection.',
inputSchema,
annotations: { readOnlyHint: false },
},
async () =>
withToolErrors(async () => {
const auth = await requireWriteAccess()
const worktreeParent = await getWorktreeParent()
const result = await cleanupWorktrees(worktreeParent, auth.userId)
return toolJson(result)
}),
)
}