feat(PBI-67/ST-1299): job-config snapshot bij enqueue + worker-flag-runbook
T-789: Snapshot van resolved JobConfig in ClaudeJob.requested_*
bij elke job-creatie. Helper in lib/job-config-snapshot.ts laadt
product (preferred_*) en task (requires_opus) en draait de resolver
uit lib/job-config.ts (mirror van scrum4me-mcp/src/lib/job-config.ts —
zelfde matrix, sync-comment in bestand). Toegepast op alle 5
enqueue-locaties:
- actions/user-questions.ts (PLAN_CHAT)
- actions/sprint-runs.ts × 3 (SPRINT_IMPLEMENTATION x2,
TASK_IMPLEMENTATION loop)
- actions/ideas.ts (IDEA_GRILL / IDEA_MAKE_PLAN)
Test-mocks uitgebreid met product.findUnique en task.findUnique zodat
de helper bij unit tests veilig terugvalt op kind-defaults (alle 563
tests groen).
T-790: Sectie 'Config doorgeven aan Claude Code' toegevoegd aan
docs/runbooks/worker-idempotency.md met CLI-flag-mapping en de
verwachte aanroep per kind. Forward-link naar
docs/runbooks/job-model-selection.md (volgt in T-794).
Plus: docs/plans/job-model-selection.md (de approved plan-doc).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
946ac8f960
commit
86472674f5
10 changed files with 413 additions and 1 deletions
|
|
@ -47,6 +47,10 @@ vi.mock('@/lib/prisma', () => ({
|
|||
findMany: vi.fn(),
|
||||
create: vi.fn(),
|
||||
count: vi.fn(),
|
||||
findUnique: vi.fn().mockResolvedValue(null),
|
||||
},
|
||||
product: {
|
||||
findUnique: vi.fn().mockResolvedValue(null),
|
||||
},
|
||||
$transaction: vi.fn(),
|
||||
$executeRaw: vi.fn().mockResolvedValue(0),
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ vi.mock('@/lib/prisma', () => ({
|
|||
},
|
||||
task: {
|
||||
updateMany: vi.fn(),
|
||||
findUnique: vi.fn().mockResolvedValue(null),
|
||||
},
|
||||
claudeQuestion: {
|
||||
findMany: vi.fn(),
|
||||
|
|
@ -38,6 +39,9 @@ vi.mock('@/lib/prisma', () => ({
|
|||
create: vi.fn(),
|
||||
updateMany: vi.fn(),
|
||||
},
|
||||
product: {
|
||||
findUnique: vi.fn().mockResolvedValue(null),
|
||||
},
|
||||
$transaction: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import { getIronSession } from 'iron-session'
|
|||
import { z } from 'zod'
|
||||
|
||||
import { prisma } from '@/lib/prisma'
|
||||
import { getJobConfigSnapshot } from '@/lib/job-config-snapshot'
|
||||
import { SessionData, sessionOptions } from '@/lib/session'
|
||||
import { enforceUserRateLimit } from '@/lib/rate-limit'
|
||||
import { ideaCreateSchema, ideaUpdateSchema } from '@/lib/schemas/idea'
|
||||
|
|
@ -413,6 +414,8 @@ async function startIdeaJob(
|
|||
}
|
||||
}
|
||||
|
||||
const ideaSnapshot = await getJobConfigSnapshot({ kind, productId: idea.product_id! })
|
||||
|
||||
// Atomic: create job + flip idea-status + log.
|
||||
const job = await prisma.$transaction(async (tx) => {
|
||||
const j = await tx.claudeJob.create({
|
||||
|
|
@ -422,6 +425,7 @@ async function startIdeaJob(
|
|||
idea_id: id,
|
||||
kind,
|
||||
status: 'QUEUED',
|
||||
...ideaSnapshot,
|
||||
},
|
||||
select: { id: true },
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import { Prisma } from '@prisma/client'
|
|||
import { prisma } from '@/lib/prisma'
|
||||
import { SessionData, sessionOptions } from '@/lib/session'
|
||||
import { parsePauseContext } from '@/lib/pause-context'
|
||||
import { getJobConfigSnapshot } from '@/lib/job-config-snapshot'
|
||||
|
||||
async function getSession() {
|
||||
return getIronSession<SessionData>(await cookies(), sessionOptions)
|
||||
|
|
@ -176,6 +177,10 @@ async function startSprintRunCore(
|
|||
// server-side bij claim aangemaakt zodat order/base_sha consistent zijn
|
||||
// met de worktree-state op claim-tijd.
|
||||
if (sprint.product.pr_strategy === 'SPRINT_BATCH') {
|
||||
const sprintSnapshot = await getJobConfigSnapshot({
|
||||
kind: 'SPRINT_IMPLEMENTATION',
|
||||
productId: sprint.product_id,
|
||||
})
|
||||
await tx.claudeJob.create({
|
||||
data: {
|
||||
user_id,
|
||||
|
|
@ -185,13 +190,20 @@ async function startSprintRunCore(
|
|||
sprint_run_id: sprintRun.id,
|
||||
kind: 'SPRINT_IMPLEMENTATION',
|
||||
status: 'QUEUED',
|
||||
...sprintSnapshot,
|
||||
},
|
||||
})
|
||||
return { ok: true, sprint_run_id: sprintRun.id, jobs_count: 1 }
|
||||
}
|
||||
|
||||
// STORY / SPRINT (per-task): bestaand pad.
|
||||
// STORY / SPRINT (per-task): bestaand pad. Snapshot per task zodat
|
||||
// task.requires_opus de cascade kan overrulen.
|
||||
for (const t of orderedTasks) {
|
||||
const taskSnapshot = await getJobConfigSnapshot({
|
||||
kind: 'TASK_IMPLEMENTATION',
|
||||
productId: sprint.product_id,
|
||||
taskId: t.id,
|
||||
})
|
||||
await tx.claudeJob.create({
|
||||
data: {
|
||||
user_id,
|
||||
|
|
@ -200,6 +212,7 @@ async function startSprintRunCore(
|
|||
sprint_run_id: sprintRun.id,
|
||||
kind: 'TASK_IMPLEMENTATION',
|
||||
status: 'QUEUED',
|
||||
...taskSnapshot,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
@ -360,6 +373,10 @@ export async function resumePausedSprintRunAction(
|
|||
started_at: new Date(),
|
||||
},
|
||||
})
|
||||
const resumeSnapshot = await getJobConfigSnapshot({
|
||||
kind: 'SPRINT_IMPLEMENTATION',
|
||||
productId: sprintJob.product_id,
|
||||
})
|
||||
await tx.claudeJob.create({
|
||||
data: {
|
||||
user_id: userId,
|
||||
|
|
@ -369,6 +386,7 @@ export async function resumePausedSprintRunAction(
|
|||
sprint_run_id: newRun.id,
|
||||
kind: 'SPRINT_IMPLEMENTATION',
|
||||
status: 'QUEUED',
|
||||
...resumeSnapshot,
|
||||
},
|
||||
})
|
||||
await tx.sprintRun.update({
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import { prisma } from '@/lib/prisma'
|
|||
import { SessionData, sessionOptions } from '@/lib/session'
|
||||
import { enforceUserRateLimit } from '@/lib/rate-limit'
|
||||
import { ACTIVE_JOB_STATUSES } from '@/lib/job-status'
|
||||
import { getJobConfigSnapshot } from '@/lib/job-config-snapshot'
|
||||
|
||||
async function getSession() {
|
||||
return getIronSession<SessionData>(await cookies(), sessionOptions)
|
||||
|
|
@ -56,6 +57,8 @@ export async function createUserQuestionAction(
|
|||
})
|
||||
if (existing) return { error: 'Er loopt al een actieve PLAN_CHAT voor dit idee', code: 409 }
|
||||
|
||||
const snapshot = await getJobConfigSnapshot({ kind: 'PLAN_CHAT', productId: idea.product_id })
|
||||
|
||||
const [uq, job] = await prisma.$transaction([
|
||||
prisma.userQuestion.create({
|
||||
data: {
|
||||
|
|
@ -71,6 +74,7 @@ export async function createUserQuestionAction(
|
|||
idea_id: parsed.data.ideaId,
|
||||
kind: 'PLAN_CHAT',
|
||||
status: 'QUEUED',
|
||||
...snapshot,
|
||||
},
|
||||
}),
|
||||
])
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ Auto-generated on 2026-05-08 from front-matter and headings.
|
|||
| [Plan — Auto-PR + selectieve deploy-controle + sync-zicht (end-to-end batch flow)](./plans/auto-pr-deploy-sync.md) | — | — |
|
||||
| [Docs-restructuur — geoptimaliseerd voor AI-lookup](./plans/docs-restructure-ai-lookup.md) | proposal | 2026-05-02 |
|
||||
| [PBI Bulk-Create Spec — Docs-Restructure for AI-Optimized Lookup](./plans/docs-restructure-pbi-spec.md) | done | 2026-05-03 |
|
||||
| [Plan: model + mode-selectie per ClaudeJob-kind](./plans/job-model-selection.md) | — | — |
|
||||
| [Landing v2 — lokaal & veilig + architectuurdiagram](./plans/landing-local-first.md) | active | 2026-05-03 |
|
||||
| [Landing v3 — van idee tot pull request](./plans/landing-v3-idea-flow.md) | active | 2026-05-04 |
|
||||
| [M10 — Password-loze inlog via QR-pairing](./plans/M10-qr-pairing-login.md) | active | 2026-05-03 |
|
||||
|
|
|
|||
152
docs/plans/job-model-selection.md
Normal file
152
docs/plans/job-model-selection.md
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
# Plan: model + mode-selectie per ClaudeJob-kind
|
||||
|
||||
## Context
|
||||
|
||||
`ClaudeJob` heeft 5 kinds (`TASK_IMPLEMENTATION`, `IDEA_GRILL`, `IDEA_MAKE_PLAN`, `PLAN_CHAT`, `SPRINT_IMPLEMENTATION`) maar er is **geen per-kind model-/mode-configuratie**. Alle jobs draaien op de Claude Code CLI default. `ClaudeJob.model_id` ([prisma/schema.prisma](../../prisma/schema.prisma)) wordt alleen post-hoc gevuld voor kostenberekening via [lib/insights/token-stats.ts](../../lib/insights/token-stats.ts) en `model_prices` (PBI-66).
|
||||
|
||||
Probleem: een grill-sessie verdient meer thinking-budget en geen file-edits, terwijl een task-implementation acceptEdits/bypassPermissions in een worktree wil. Nu is dat allemaal hetzelfde — wat leidt tot:
|
||||
|
||||
- Te dure runs (Opus voor triviale Haiku-waardige taken)
|
||||
- Te schrale runs (Sonnet zonder thinking voor architectuurkeuze in `IDEA_MAKE_PLAN`)
|
||||
- Geen cost-attribution per kind voor budgettering
|
||||
- Geen product-level override voor klanten met eigen model-voorkeur
|
||||
|
||||
**Doel:** een resolver die per `ClaudeJob` bepaalt: model, thinking-budget, permission-mode, max_turns, allowed_tools — gebaseerd op kind-defaults met overrides per product en per job. De worker geeft de geresolveerde config door aan Claude Code via CLI-flags.
|
||||
|
||||
**Niet-doel:** de runtime vervangen door de Claude Agent SDK. Worker blijft Claude Code CLI; we bouwen erbovenop.
|
||||
|
||||
## Aanpak
|
||||
|
||||
### 1. Datamodel-uitbreiding
|
||||
|
||||
| Tabel | Veld | Type | Doel |
|
||||
|---|---|---|---|
|
||||
| `Product` | `preferred_model` | `String?` | Product-brede default (bv. "alle taken op Sonnet voor budget") |
|
||||
| `Product` | `thinking_budget_default` | `Int?` | Idem voor thinking |
|
||||
| `Task` | `requires_opus` | `Boolean @default(false)` | Per-task escalatie (cross-file refactor) |
|
||||
| `ClaudeJob` | `requested_model` | `String?` | Snapshot van resolved model (audit) |
|
||||
| `ClaudeJob` | `requested_thinking_budget` | `Int?` | Snapshot van resolved budget |
|
||||
| `ClaudeJob` | `requested_permission_mode` | `String?` | Snapshot van resolved mode |
|
||||
| `ClaudeJob` | `actual_thinking_tokens` | `Int?` | Werkelijk verbruikte thinking-tokens (cost-attribution) |
|
||||
|
||||
Migration is additief. Bestaande rijen krijgen `NULL` → resolver valt terug op kind-defaults.
|
||||
|
||||
### 2. Centrale resolver
|
||||
|
||||
**Locatie:** `scrum4me-mcp/src/lib/job-config.ts` (nieuw bestand in MCP-repo).
|
||||
|
||||
```ts
|
||||
type JobConfig = {
|
||||
model: 'claude-opus-4-7' | 'claude-sonnet-4-6' | 'claude-haiku-4-5-20251001'
|
||||
thinking_budget: number // 0 = uit
|
||||
permission_mode: 'plan' | 'default' | 'acceptEdits' | 'bypassPermissions'
|
||||
max_turns: number | null // null = onbegrensd
|
||||
allowed_tools: string[] | null // null = alle
|
||||
}
|
||||
|
||||
function resolveJobConfig(job: ClaudeJob, product: Product, task?: Task): JobConfig
|
||||
```
|
||||
|
||||
**Resolutie-volgorde** (eerste match wint):
|
||||
1. `task.requires_opus === true` → forceer model = `claude-opus-4-7`
|
||||
2. `job.requested_*` (al ingevuld door enqueue-laag)
|
||||
3. `product.preferred_*`
|
||||
4. **Kind-default** uit deze tabel:
|
||||
|
||||
| Kind | Model | Thinking | Permission | max_turns | allowed_tools |
|
||||
|---|---|---|---|---|---|
|
||||
| `IDEA_GRILL` | sonnet-4-6 | 12000 | `plan` | 15 | Read, Grep, Glob, WebSearch, AskUserQuestion |
|
||||
| `IDEA_MAKE_PLAN` | opus-4-7 | 24000 | `plan` | 20 | Read, Grep, Glob, WebSearch, AskUserQuestion, Write |
|
||||
| `PLAN_CHAT` | sonnet-4-6 | 6000 | `plan` | 5 | Read, Grep, AskUserQuestion |
|
||||
| `TASK_IMPLEMENTATION` | sonnet-4-6 | 6000 | `bypassPermissions` | 50 | null |
|
||||
| `SPRINT_IMPLEMENTATION` | sonnet-4-6 | 6000 | `bypassPermissions` | null | null |
|
||||
|
||||
`bypassPermissions` is verdedigbaar omdat task/sprint-implementatie altijd in een geïsoleerde git-worktree draait (zie [docs/runbooks/branch-and-commit.md](../runbooks/branch-and-commit.md)). Voor productie-omgevingen kan `Product.preferred_permission_mode = 'acceptEdits'` als opt-in.
|
||||
|
||||
### 3. `wait_for_job` response uitbreiden
|
||||
|
||||
Huidig: `wait_for_job` returnt `{ job_id, kind, context }`. Toevoegen: `config: JobConfig`.
|
||||
|
||||
Worker leest `config` en spawnt Claude Code subprocess met:
|
||||
```
|
||||
claude --model {config.model} \
|
||||
--permission-mode {config.permission_mode} \
|
||||
--thinking-budget {config.thinking_budget} \
|
||||
[--max-turns {config.max_turns}] \
|
||||
[--allowed-tools "{config.allowed_tools.join(',')}"]
|
||||
```
|
||||
|
||||
Documentatie van vlaggen verwijst naar [Claude Code model-config](https://code.claude.com/docs/en/model-config). Als een vlag (nog) niet bestaat in de huidige CLI: skippen + log-warning, niet hardcrashen.
|
||||
|
||||
### 4. Audit + cost-attribution
|
||||
|
||||
Bij job-completion (in `update_job_status` MCP-tool):
|
||||
- `actual_thinking_tokens` schrijven naar `ClaudeJob` (al beschikbaar in Claude Code result-payload)
|
||||
- Bestaande `model_id`-update behouden (cost-berekening via `model_prices`)
|
||||
|
||||
Token-stats-laag ([lib/insights/token-stats.ts](../../lib/insights/token-stats.ts)) uitbreiden:
|
||||
- Aggregeren per kind (nu per dag/product) — feature-gate tot ST-N nodig
|
||||
- Thinking-tokens apart tonen (andere prijs dan output-tokens)
|
||||
|
||||
### 5. Documentatie
|
||||
|
||||
- **Nieuw:** [docs/runbooks/job-model-selection.md](../runbooks/job-model-selection.md) — de matrix + wanneer je override gebruikt
|
||||
- **CLAUDE.md** Hardstop-bullet: "Model/mode per ClaudeJob: kind-default → product → task — zie runbook"
|
||||
- **Patterns quickref** in CLAUDE.md: regel toevoegen voor `job-config.ts` resolver-pattern
|
||||
|
||||
## Voorgestelde PBI/story-breakdown
|
||||
|
||||
Voor de Scrum4Me-MCP `create_pbi` / `create_story` / `create_task` ronde na goedkeuring:
|
||||
|
||||
**PBI:** "Model + mode-selectie per ClaudeJob-kind"
|
||||
|
||||
| Story | Doel | Tasks (indicatief) |
|
||||
|---|---|---|
|
||||
| **ST-1: Datamodel + migration** | Velden op Product/Task/ClaudeJob | Schema wijzigen · migration · Prisma generate · seed/factories updaten |
|
||||
| **ST-2: Resolver in scrum4me-mcp** | `job-config.ts` met kind-defaults + override-cascade | Resolver-functie · unit tests per kind · export voor MCP-tools |
|
||||
| **ST-3: `wait_for_job` integratie** | Config in response + snapshot in `requested_*` | Tool-output uitbreiden · enqueue-laag snapshot · worker-flag-passing documenteren |
|
||||
| **ST-4: Audit + cost-attribution** | `actual_thinking_tokens` opslaan + tonen | `update_job_status` uitbreiden · token-stats per kind · admin/jobs UI-kolom |
|
||||
| **ST-5: Documentatie** | Runbook + CLAUDE.md updates | runbook schrijven · CLAUDE.md hardstop · patterns-row |
|
||||
|
||||
ST-1 → ST-2 → ST-3 zijn de kritieke pad-stories. ST-4 en ST-5 kunnen parallel met ST-3.
|
||||
|
||||
## Bestanden
|
||||
|
||||
| Bestand | Repo | Actie |
|
||||
|---|---|---|
|
||||
| `prisma/schema.prisma` | scrum4me | **Wijzigen** — 7 nieuwe velden |
|
||||
| `prisma/migrations/<ts>_job_model_selection/` | scrum4me | **Nieuw** — additive migration |
|
||||
| `scrum4me-mcp/src/lib/job-config.ts` | scrum4me-mcp | **Nieuw** — resolver |
|
||||
| `scrum4me-mcp/src/lib/job-config.test.ts` | scrum4me-mcp | **Nieuw** — unit tests per kind |
|
||||
| `scrum4me-mcp/src/tools/wait-for-job.ts` | scrum4me-mcp | **Wijzigen** — config in response |
|
||||
| `scrum4me-mcp/src/tools/update-job-status.ts` | scrum4me-mcp | **Wijzigen** — `actual_thinking_tokens` |
|
||||
| `lib/insights/token-stats.ts` | scrum4me | **Wijzigen** — per-kind aggregatie + thinking-prijs |
|
||||
| `actions/admin/jobs.ts` + UI-kolom | scrum4me | **Wijzigen** — model/mode tonen |
|
||||
| `docs/runbooks/job-model-selection.md` | scrum4me | **Nieuw** — runbook |
|
||||
| `CLAUDE.md` | scrum4me | **Wijzigen** — hardstop-bullet + patterns-row |
|
||||
|
||||
## Verificatie
|
||||
|
||||
Per story:
|
||||
- **ST-1:** `npm run verify` slaagt na schema-wijziging; migration runt clean op test-DB
|
||||
- **ST-2:** unit tests dekken alle 5 kinds × 4 cascade-niveaus (default/product/job/task)
|
||||
- **ST-3:** integratietest: enqueue een `IDEA_GRILL` met product-override → `wait_for_job` returnt config met override toegepast
|
||||
- **ST-4:** end-to-end: run een dummy-job, verifieer dat `actual_thinking_tokens` ingevuld wordt en dat token-stats het kostbedrag correct rekent (input + output + thinking-input rate)
|
||||
- **ST-5:** `npm run docs:check-links` groen; CLAUDE.md ≤ 150 regels
|
||||
|
||||
End-to-end-validatie van het geheel:
|
||||
1. Maak een nieuw idee → `IDEA_GRILL`-job → controleer dat de worker met `--permission-mode plan` en `--thinking-budget 12000` start
|
||||
2. Approve het idee → `IDEA_MAKE_PLAN`-job → controleer Opus-aanroep met thinking 24000
|
||||
3. Sprint starten → `SPRINT_IMPLEMENTATION` met `bypassPermissions` in worktree
|
||||
4. Admin-jobs-pagina toont per job het gebruikte model + thinking-tokens
|
||||
|
||||
## Vastgelegde beslissingen (review-uitkomst)
|
||||
|
||||
1. **`bypassPermissions` als default voor implement-kinds** (TASK_IMPLEMENTATION, SPRINT_IMPLEMENTATION). Verdedigbaar door git-worktree-isolatie. `Product.preferred_permission_mode` blijft beschikbaar als opt-in voor productie-product
|
||||
2. **Opus-cost-controle = per-task** via `Task.requires_opus`-flag. Géén product-budget, géén automatische Opus-escalatie. Ad-hoc beslissing per taak
|
||||
3. **`PLAN_CHAT` runtime bevestigd: Claude Code CLI** — `wait_for_job` ([scrum4me-mcp/src/tools/wait-for-job.ts:386](../../../scrum4me-mcp/src/tools/wait-for-job.ts)) selecteert `IDEA_GRILL`, `IDEA_MAKE_PLAN` én `PLAN_CHAT` uit dezelfde queue. Resolver past 1:1, geen aparte runtime-route
|
||||
4. **`wait_for_job`-response: pure additief** (geen `protocol_version`-veld). Worker negeert onbekende velden veilig; mismatch is operationeel zichtbaar via `model_id` in token-stats. Geen multi-tenant fleet → geen versioning-overhead nodig
|
||||
|
||||
---
|
||||
|
||||
Bij goedkeuring: PBI + 5 stories + ~20 tasks aanmaken via `mcp__scrum4me__create_pbi/story/task`. Volgorde: ST-1 → ST-2 → ST-3 → (ST-4 ‖ ST-5).
|
||||
|
|
@ -110,6 +110,49 @@ Drie protocol-overtredingen die we met deze runbook + de nieuwe
|
|||
|
||||
---
|
||||
|
||||
## Config doorgeven aan Claude Code (PBI-67)
|
||||
|
||||
`wait_for_job` levert sinds PBI-67 een `config`-object mee in de
|
||||
response. Geef deze door aan `claude` als CLI-flags:
|
||||
|
||||
```bash
|
||||
claude \
|
||||
--model "$MODEL" \
|
||||
--permission-mode "$PERMISSION_MODE" \
|
||||
--thinking-budget "$THINKING_BUDGET" \
|
||||
${MAX_TURNS:+--max-turns $MAX_TURNS} \
|
||||
${ALLOWED_TOOLS:+--allowed-tools "$ALLOWED_TOOLS"}
|
||||
```
|
||||
|
||||
Waar:
|
||||
|
||||
| Variabele | Bron in response | Voorbeeld |
|
||||
|---|---|---|
|
||||
| `MODEL` | `config.model` | `claude-sonnet-4-6` |
|
||||
| `PERMISSION_MODE` | `config.permission_mode` | `bypassPermissions` |
|
||||
| `THINKING_BUDGET` | `config.thinking_budget` (0 = uit) | `12000` |
|
||||
| `MAX_TURNS` | `config.max_turns` (null = onbegrensd) | `15` of leeg |
|
||||
| `ALLOWED_TOOLS` | `config.allowed_tools.join(',')` (null = alle) | `Read,Grep,WebSearch` |
|
||||
|
||||
Verwachte CLI-aanroep per kind (kind-defaults zonder overrides):
|
||||
|
||||
| Kind | Model | thinking | permission_mode | max_turns |
|
||||
|---|---|---|---|---|
|
||||
| `IDEA_GRILL` | sonnet-4-6 | 12000 | plan | 15 |
|
||||
| `IDEA_MAKE_PLAN` | opus-4-7 | 24000 | plan | 20 |
|
||||
| `PLAN_CHAT` | sonnet-4-6 | 6000 | plan | 5 |
|
||||
| `TASK_IMPLEMENTATION` | sonnet-4-6 | 6000 | bypassPermissions | 50 |
|
||||
| `SPRINT_IMPLEMENTATION` | sonnet-4-6 | 6000 | bypassPermissions | (geen) |
|
||||
|
||||
**Onbekende flag:** als de huidige Claude Code-versie een vlag niet
|
||||
kent, log een waarschuwing en sla 'm over — geen hard error. De server
|
||||
blijft jobs queuen.
|
||||
|
||||
Volledige resolver-uitleg + override-cascade staat in
|
||||
[job-model-selection.md](./job-model-selection.md).
|
||||
|
||||
---
|
||||
|
||||
## Referenties
|
||||
|
||||
- Enum: `prisma/schema.prisma` → `enum ClaudeJobStatus`
|
||||
|
|
@ -119,4 +162,5 @@ Drie protocol-overtredingen die we met deze runbook + de nieuwe
|
|||
- KPI-aggregatie: `lib/insights/agent-throughput.ts` (terminal_7d
|
||||
inclusief SKIPPED)
|
||||
- Gerelateerd plan: `docs/plans/auto-pr-deploy-sync.md` Deel D
|
||||
- PBI-67 resolver: `scrum4me-mcp/src/lib/job-config.ts` + `lib/job-config.ts`
|
||||
(Sync-tab toont per-Story job-status incl. SKIPPED)
|
||||
|
|
|
|||
40
lib/job-config-snapshot.ts
Normal file
40
lib/job-config-snapshot.ts
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
// PBI-67: snapshot-helper voor ClaudeJob.requested_*-velden.
|
||||
//
|
||||
// Roep hem aan vóór elke `prisma.claudeJob.create({ data: { ... } })` en spread
|
||||
// het resultaat in `data`. Doet één extra Product-query (en optioneel Task)
|
||||
// om de override-cascade in te vullen op enqueue-tijd. Bij claim (in scrum4me-
|
||||
// mcp/wait-for-job) wordt dezelfde resolver opnieuw aangeroepen — als
|
||||
// requested_* dan al gezet zijn winnen die boven product/kind-defaults.
|
||||
|
||||
import { prisma } from '@/lib/prisma'
|
||||
import { resolveJobConfig, snapshotFromConfig, type ClaudeJobSnapshotFields } from '@/lib/job-config'
|
||||
|
||||
export async function getJobConfigSnapshot(opts: {
|
||||
kind: string
|
||||
productId: string
|
||||
taskId?: string | null
|
||||
}): Promise<ClaudeJobSnapshotFields> {
|
||||
const [product, task] = await Promise.all([
|
||||
prisma.product.findUnique({
|
||||
where: { id: opts.productId },
|
||||
select: {
|
||||
preferred_model: true,
|
||||
thinking_budget_default: true,
|
||||
preferred_permission_mode: true,
|
||||
},
|
||||
}),
|
||||
opts.taskId
|
||||
? prisma.task.findUnique({
|
||||
where: { id: opts.taskId },
|
||||
select: { requires_opus: true },
|
||||
})
|
||||
: Promise.resolve(null),
|
||||
])
|
||||
|
||||
const cfg = resolveJobConfig(
|
||||
{ kind: opts.kind },
|
||||
product ?? {},
|
||||
task ?? undefined,
|
||||
)
|
||||
return snapshotFromConfig(cfg)
|
||||
}
|
||||
141
lib/job-config.ts
Normal file
141
lib/job-config.ts
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
// PBI-67: model + mode-selectie per ClaudeJob-kind.
|
||||
//
|
||||
// Sync with scrum4me-mcp/src/lib/job-config.ts — als je hier een veld
|
||||
// aanpast, doe hetzelfde aan de MCP-kant. Dit is bewust een duplicate
|
||||
// (geen gedeeld package) om de MCP-server eigenstandig te houden.
|
||||
//
|
||||
// Override-cascade (eerste match wint):
|
||||
// 1. task.requires_opus === true → forceer Opus
|
||||
// 2. job.requested_* (snapshot bij enqueue, ingevuld door deze module)
|
||||
// 3. product.preferred_*
|
||||
// 4. KIND_DEFAULTS hieronder
|
||||
|
||||
export type ClaudeModel =
|
||||
| 'claude-opus-4-7'
|
||||
| 'claude-sonnet-4-6'
|
||||
| 'claude-haiku-4-5-20251001'
|
||||
|
||||
export type PermissionMode = 'plan' | 'default' | 'acceptEdits' | 'bypassPermissions'
|
||||
|
||||
export type JobConfig = {
|
||||
model: ClaudeModel
|
||||
thinking_budget: number
|
||||
permission_mode: PermissionMode
|
||||
max_turns: number | null
|
||||
allowed_tools: string[] | null
|
||||
}
|
||||
|
||||
export type JobInput = {
|
||||
kind: string
|
||||
requested_model?: string | null
|
||||
requested_thinking_budget?: number | null
|
||||
requested_permission_mode?: string | null
|
||||
}
|
||||
|
||||
export type ProductInput = {
|
||||
preferred_model?: string | null
|
||||
thinking_budget_default?: number | null
|
||||
preferred_permission_mode?: string | null
|
||||
}
|
||||
|
||||
export type TaskInput = {
|
||||
requires_opus?: boolean | null
|
||||
}
|
||||
|
||||
const KIND_DEFAULTS: Record<string, JobConfig> = {
|
||||
IDEA_GRILL: {
|
||||
model: 'claude-sonnet-4-6',
|
||||
thinking_budget: 12000,
|
||||
permission_mode: 'plan',
|
||||
max_turns: 15,
|
||||
allowed_tools: ['Read', 'Grep', 'Glob', 'WebSearch', 'AskUserQuestion'],
|
||||
},
|
||||
IDEA_MAKE_PLAN: {
|
||||
model: 'claude-opus-4-7',
|
||||
thinking_budget: 24000,
|
||||
permission_mode: 'plan',
|
||||
max_turns: 20,
|
||||
allowed_tools: ['Read', 'Grep', 'Glob', 'WebSearch', 'AskUserQuestion', 'Write'],
|
||||
},
|
||||
PLAN_CHAT: {
|
||||
model: 'claude-sonnet-4-6',
|
||||
thinking_budget: 6000,
|
||||
permission_mode: 'plan',
|
||||
max_turns: 5,
|
||||
allowed_tools: ['Read', 'Grep', 'AskUserQuestion'],
|
||||
},
|
||||
TASK_IMPLEMENTATION: {
|
||||
model: 'claude-sonnet-4-6',
|
||||
thinking_budget: 6000,
|
||||
permission_mode: 'bypassPermissions',
|
||||
max_turns: 50,
|
||||
allowed_tools: null,
|
||||
},
|
||||
SPRINT_IMPLEMENTATION: {
|
||||
model: 'claude-sonnet-4-6',
|
||||
thinking_budget: 6000,
|
||||
permission_mode: 'bypassPermissions',
|
||||
max_turns: null,
|
||||
allowed_tools: null,
|
||||
},
|
||||
}
|
||||
|
||||
const FALLBACK: JobConfig = {
|
||||
model: 'claude-sonnet-4-6',
|
||||
thinking_budget: 6000,
|
||||
permission_mode: 'default',
|
||||
max_turns: 50,
|
||||
allowed_tools: null,
|
||||
}
|
||||
|
||||
export function getKindDefault(kind: string): JobConfig {
|
||||
return KIND_DEFAULTS[kind] ?? FALLBACK
|
||||
}
|
||||
|
||||
// max_turns en allowed_tools blijven kind-default (geen product/task override
|
||||
// in V1 — als de behoefte ontstaat, voeg analoge velden toe aan Product/Task).
|
||||
export function resolveJobConfig(
|
||||
job: JobInput,
|
||||
product: ProductInput,
|
||||
task?: TaskInput,
|
||||
): JobConfig {
|
||||
const base = getKindDefault(job.kind)
|
||||
|
||||
const model = (
|
||||
task?.requires_opus
|
||||
? 'claude-opus-4-7'
|
||||
: job.requested_model ?? product.preferred_model ?? base.model
|
||||
) as ClaudeModel
|
||||
|
||||
const thinking_budget =
|
||||
job.requested_thinking_budget ?? product.thinking_budget_default ?? base.thinking_budget
|
||||
|
||||
const permission_mode = (job.requested_permission_mode ??
|
||||
product.preferred_permission_mode ??
|
||||
base.permission_mode) as PermissionMode
|
||||
|
||||
return {
|
||||
model,
|
||||
thinking_budget,
|
||||
permission_mode,
|
||||
max_turns: base.max_turns,
|
||||
allowed_tools: base.allowed_tools,
|
||||
}
|
||||
}
|
||||
|
||||
// Snapshot-velden voor ClaudeJob.requested_*. Bij elke enqueue laden we
|
||||
// product (voor preferred_*) en optioneel task (voor requires_opus), draaien
|
||||
// de resolver, en schrijven het resultaat als auditspoor in de job-rij.
|
||||
export type ClaudeJobSnapshotFields = {
|
||||
requested_model: string
|
||||
requested_thinking_budget: number
|
||||
requested_permission_mode: string
|
||||
}
|
||||
|
||||
export function snapshotFromConfig(cfg: JobConfig): ClaudeJobSnapshotFields {
|
||||
return {
|
||||
requested_model: cfg.model,
|
||||
requested_thinking_budget: cfg.thinking_budget,
|
||||
requested_permission_mode: cfg.permission_mode,
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue