PBI-8: Sprint-flow MCP-orkestratie + verifier-fix
Schema sync vanaf upstream Scrum4Me (v77617e8): FAILED toegevoegd aan Task/Story/Pbi/SprintStatus, nieuw SprintRunStatus + PrStrategy enums, SprintRun model, ClaudeJob.sprint_run_id, Product.pr_strategy. T-18 — propagateStatusUpwards in src/lib/tasks-status-update.ts. Real-time cascade Task → Story → PBI → Sprint → SprintRun bij elke task-statuswijziging. Bij FAILED cancelt sibling-jobs in dezelfde SprintRun. PBI-status BLOCKED blijft handmatig. Houd deze helper bit- voor-bit synchroon met Scrum4Me/lib/tasks-status-update.ts. updateTaskStatusWithStoryPromotion blijft als BC-wrapper. T-19 — wait-for-job.ts claim-filter. Task-jobs worden alleen geclaimd als hun SprintRun status QUEUED of RUNNING heeft. Idea-jobs blijven ongefilterd. Bij eerste claim van een QUEUED SprintRun → RUNNING binnen dezelfde tx (race-safe). T-20 — update-job-status.ts roept propagateStatusUpwards aan na elke task DONE/FAILED. Bestaande cancelPbiOnFailure-aanroep blijft voor PR-cleanup; sibling-cancellation overlap is harmless (idempotent). T-21 — classify.ts (verifier) leest nu ook "--- a/<path>" zodat delete-only commits niet meer als EMPTY worden geclassificeerd. Bug had eerder geleid tot ten onrechte FAILED-status op cmotto5h en cmotto5i (06-05-2026); zou met cascade-flow een hele sprint laten falen. Cleanup: create-todo.ts en open_todos in get-claude-context.ts verwijderd (Todo-model is op main gedropt). Endpoint geeft nu open_ideas terug — ideeën die niet PLANNED zijn. Status-mappers (src/status.ts) uitgebreid met failed. Tests: 184/184 groen (180 → 184; vier nieuwe delete-only classify-tests en herwerkte propagate-status tests). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Madhura68
parent
c63e2c6730
commit
5c5ae20f10
14 changed files with 612 additions and 223 deletions
|
|
@ -1,42 +0,0 @@
|
|||
import { z } from 'zod'
|
||||
import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
|
||||
import { prisma } from '../prisma.js'
|
||||
import { requireWriteAccess } from '../auth.js'
|
||||
import { userCanAccessProduct } from '../access.js'
|
||||
import { toolError, toolJson, withToolErrors } from '../errors.js'
|
||||
|
||||
const inputSchema = z.object({
|
||||
title: z.string().min(1),
|
||||
description: z.string().max(2000).optional(),
|
||||
product_id: z.string().min(1).optional(),
|
||||
})
|
||||
|
||||
export function registerCreateTodoTool(server: McpServer) {
|
||||
server.registerTool(
|
||||
'create_todo',
|
||||
{
|
||||
title: 'Create todo',
|
||||
description:
|
||||
'Add a todo for the authenticated user, optionally scoped to a product. ' +
|
||||
'Forbidden for demo accounts.',
|
||||
inputSchema,
|
||||
},
|
||||
async ({ title, description, product_id }) =>
|
||||
withToolErrors(async () => {
|
||||
const auth = await requireWriteAccess()
|
||||
if (product_id && !(await userCanAccessProduct(product_id, auth.userId))) {
|
||||
return toolError(`Product ${product_id} not found or not accessible`)
|
||||
}
|
||||
const todo = await prisma.todo.create({
|
||||
data: {
|
||||
user_id: auth.userId,
|
||||
product_id: product_id ?? null,
|
||||
title,
|
||||
description: description ?? null,
|
||||
},
|
||||
select: { id: true, title: true, description: true, created_at: true },
|
||||
})
|
||||
return toolJson(todo)
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
|
@ -99,19 +99,21 @@ export function registerGetClaudeContextTool(server: McpServer) {
|
|||
}
|
||||
}
|
||||
|
||||
const openTodos = await prisma.todo.findMany({
|
||||
const openIdeas = await prisma.idea.findMany({
|
||||
where: {
|
||||
user_id: auth.userId,
|
||||
done: false,
|
||||
archived: false,
|
||||
status: { not: 'PLANNED' },
|
||||
OR: [{ product_id: product_id }, { product_id: null }],
|
||||
},
|
||||
orderBy: { created_at: 'asc' },
|
||||
take: 50,
|
||||
select: {
|
||||
id: true,
|
||||
code: true,
|
||||
title: true,
|
||||
description: true,
|
||||
status: true,
|
||||
created_at: true,
|
||||
},
|
||||
})
|
||||
|
|
@ -120,7 +122,7 @@ export function registerGetClaudeContextTool(server: McpServer) {
|
|||
product,
|
||||
active_sprint: activeSprint,
|
||||
next_story: nextStory,
|
||||
open_todos: openTodos,
|
||||
open_ideas: openIdeas,
|
||||
})
|
||||
}),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import { resolveRepoRoot } from './wait-for-job.js'
|
|||
import { pushBranchForJob } from '../git/push.js'
|
||||
import { createPullRequest } from '../git/pr.js'
|
||||
import { cancelPbiOnFailure } from '../cancel/pbi-cascade.js'
|
||||
import { propagateStatusUpwards } from '../lib/tasks-status-update.js'
|
||||
|
||||
const inputSchema = z.object({
|
||||
job_id: z.string().min(1),
|
||||
|
|
@ -420,6 +421,25 @@ export function registerUpdateJobStatusTool(server: McpServer) {
|
|||
},
|
||||
})
|
||||
|
||||
// PBI-46 sprint-flow: propageer Task → Story → PBI → Sprint → SprintRun
|
||||
// bij elke task-statusovergang (DONE of FAILED). De helper handelt ook
|
||||
// sibling-cancel binnen dezelfde SprintRun af bij FAILED.
|
||||
// Idea-jobs hebben geen task_id en worden hier overgeslagen.
|
||||
if (
|
||||
(actualStatus === 'done' || actualStatus === 'failed') &&
|
||||
job.kind === 'TASK_IMPLEMENTATION' &&
|
||||
job.task_id
|
||||
) {
|
||||
try {
|
||||
await propagateStatusUpwards(job.task_id, actualStatus === 'done' ? 'DONE' : 'FAILED')
|
||||
} catch (err) {
|
||||
console.warn(
|
||||
`[update_job_status] propagateStatusUpwards error for task ${job.task_id}:`,
|
||||
err,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// M12: bij failed voor IDEA_*-jobs: zet idea.status op
|
||||
// GRILL_FAILED / PLAN_FAILED + log JOB_EVENT. Bij done laten we de
|
||||
// idea-status met rust — die wordt door update_idea_*_md gezet.
|
||||
|
|
|
|||
|
|
@ -247,29 +247,47 @@ export async function tryClaimJob(
|
|||
tokenId: string,
|
||||
productId?: string,
|
||||
): Promise<string | null> {
|
||||
// Atomic claim in a single transaction — also captures plan_snapshot from task
|
||||
// Atomic claim in a single transaction — also captures plan_snapshot from task.
|
||||
//
|
||||
// Sprint-flow filter (PBI-46):
|
||||
// Idea-jobs (task_id IS NULL) blijven onafhankelijk claimable.
|
||||
// Task-jobs zijn alleen claimable wanneer ze aan een actieve SprintRun
|
||||
// hangen (status QUEUED of RUNNING). Legacy task-jobs zonder sprint_run_id
|
||||
// en jobs in PAUSED/FAILED/CANCELLED/DONE SprintRuns worden overgeslagen.
|
||||
// Bij eerste claim van een nog QUEUED SprintRun → status RUNNING.
|
||||
const rows = await prisma.$transaction(async (tx) => {
|
||||
// SELECT FOR UPDATE OF claude_jobs SKIP LOCKED — LEFT JOIN tasks zodat
|
||||
// idea-jobs (task_id IS NULL, M12) ook gevonden worden. plan_snapshot
|
||||
// blijft dan NULL/'' voor idea-jobs — niet nodig (geen verify-flow).
|
||||
const found = productId
|
||||
? await tx.$queryRaw<Array<{ id: string; implementation_plan: string | null }>>`
|
||||
SELECT cj.id, t.implementation_plan
|
||||
? await tx.$queryRaw<
|
||||
Array<{ id: string; implementation_plan: string | null; sprint_run_id: string | null }>
|
||||
>`
|
||||
SELECT cj.id, t.implementation_plan, cj.sprint_run_id
|
||||
FROM claude_jobs cj
|
||||
LEFT JOIN tasks t ON t.id = cj.task_id
|
||||
LEFT JOIN sprint_runs sr ON sr.id = cj.sprint_run_id
|
||||
WHERE cj.user_id = ${userId}
|
||||
AND cj.product_id = ${productId}
|
||||
AND cj.status = 'QUEUED'
|
||||
AND (
|
||||
cj.task_id IS NULL
|
||||
OR (cj.sprint_run_id IS NOT NULL AND sr.status IN ('QUEUED', 'RUNNING'))
|
||||
)
|
||||
ORDER BY cj.created_at ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE OF cj SKIP LOCKED
|
||||
`
|
||||
: await tx.$queryRaw<Array<{ id: string; implementation_plan: string | null }>>`
|
||||
SELECT cj.id, t.implementation_plan
|
||||
: await tx.$queryRaw<
|
||||
Array<{ id: string; implementation_plan: string | null; sprint_run_id: string | null }>
|
||||
>`
|
||||
SELECT cj.id, t.implementation_plan, cj.sprint_run_id
|
||||
FROM claude_jobs cj
|
||||
LEFT JOIN tasks t ON t.id = cj.task_id
|
||||
LEFT JOIN sprint_runs sr ON sr.id = cj.sprint_run_id
|
||||
WHERE cj.user_id = ${userId}
|
||||
AND cj.status = 'QUEUED'
|
||||
AND (
|
||||
cj.task_id IS NULL
|
||||
OR (cj.sprint_run_id IS NOT NULL AND sr.status IN ('QUEUED', 'RUNNING'))
|
||||
)
|
||||
ORDER BY cj.created_at ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE OF cj SKIP LOCKED
|
||||
|
|
@ -279,6 +297,7 @@ export async function tryClaimJob(
|
|||
|
||||
const jobId = found[0].id
|
||||
const snapshot = found[0].implementation_plan ?? ''
|
||||
const sprintRunId = found[0].sprint_run_id
|
||||
await tx.$executeRaw`
|
||||
UPDATE claude_jobs
|
||||
SET status = 'CLAIMED',
|
||||
|
|
@ -287,6 +306,19 @@ export async function tryClaimJob(
|
|||
plan_snapshot = ${snapshot}
|
||||
WHERE id = ${jobId}
|
||||
`
|
||||
|
||||
// SprintRun QUEUED → RUNNING bij eerste claim, in dezelfde tx zodat
|
||||
// concurrent claims dezelfde overgang niet dubbel doen (UPDATE skipt
|
||||
// rows die al RUNNING zijn).
|
||||
if (sprintRunId) {
|
||||
await tx.$executeRaw`
|
||||
UPDATE sprint_runs
|
||||
SET status = 'RUNNING',
|
||||
started_at = COALESCE(started_at, NOW()),
|
||||
updated_at = NOW()
|
||||
WHERE id = ${sprintRunId} AND status = 'QUEUED'
|
||||
`
|
||||
}
|
||||
return [{ id: jobId }]
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue