* fix(ST-1272): allow PLAN_READY → GRILLING re-grill transition
actions/ideas.ts already lists PLAN_READY in GRILL_TRIGGERABLE_FROM,
but lib/idea-status.ts ALLOWED_TRANSITIONS was missing the
PLAN_READY → GRILLING edge. As a result, clicking Grill on a PLAN_READY
idea returned 422 "Status-transitie ongeldig" while the UI button was
enabled. Mirrors the existing PLANNED → GRILLING re-grill behaviour.
- lib/idea-status.ts: PLAN_READY allows GRILLING in addition to
PLANNING/PLANNED
- __tests__/lib/idea-status.test.ts: explicit assert for
PLAN_READY → GRILLING and PLAN_READY added to the regrill loop
covering every GRILL_TRIGGERABLE_FROM status
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(ST-1275): render SKIPPED job status in chart-colors and insights
Closing the gap left when ClaudeJobStatus.SKIPPED was added to the schema:
the badge map and case-mapper already covered it, but the chart palette,
the per-day insights aggregator and the stacked-bar chart did not. SKIPPED
jobs (e.g. cmovkur8 manually flipped during the no-op-exit hotfix) now
render with a muted style consistent with cancelled.
- lib/chart-colors.ts: JOB_STATUS_COLORS gains a 'skipped' entry
(var(--muted-foreground), same intensity as cancelled — neither rood/orange)
- lib/insights/agent-throughput.ts: DayCount + STATUSES + perDay zero-fill
now include 'skipped'; the SQL terminal_7d filter already counted SKIPPED
- app/(app)/insights/components/agent-throughput.tsx: STACKED_STATUSES and
the empty-state guard include 'skipped'
- __tests__: chart-colors keys list, job-status round-trip ('all 7 statuses')
and the insights non-zero filter all account for SKIPPED
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
120 lines
4.2 KiB
TypeScript
120 lines
4.2 KiB
TypeScript
import { prisma } from '@/lib/prisma'
|
|
|
|
export interface DayCount {
|
|
day: string
|
|
queued: number
|
|
claimed: number
|
|
running: number
|
|
done: number
|
|
failed: number
|
|
cancelled: number
|
|
skipped: number
|
|
}
|
|
|
|
export interface ThroughputKpi {
|
|
todayCount: number
|
|
successRate7d: number
|
|
avgDurationSeconds7d: number | null
|
|
}
|
|
|
|
export interface JobsPerDayResult {
|
|
perDay: DayCount[]
|
|
kpi: ThroughputKpi
|
|
}
|
|
|
|
const STATUSES = ['queued', 'claimed', 'running', 'done', 'failed', 'cancelled', 'skipped'] as const
|
|
|
|
type RawDayRow = { day: Date; status: string; count: bigint }
|
|
type RawKpiRow = { today_count: bigint; done_7d: bigint; terminal_7d: bigint; avg_seconds: number | null }
|
|
|
|
function toDateStr(d: Date): string {
|
|
return d.toISOString().slice(0, 10)
|
|
}
|
|
|
|
export async function getJobsPerDay(
|
|
userId: string,
|
|
days = 14,
|
|
productId?: string,
|
|
): Promise<JobsPerDayResult> {
|
|
const [dayRows, kpiRows] = await Promise.all([
|
|
productId
|
|
? prisma.$queryRaw<RawDayRow[]>`
|
|
SELECT DATE(created_at) AS day, LOWER(status::text) AS status, COUNT(*) AS count
|
|
FROM claude_jobs
|
|
WHERE user_id = ${userId}
|
|
AND product_id = ${productId}
|
|
AND created_at > NOW() - (${days} || ' days')::INTERVAL
|
|
GROUP BY DATE(created_at), status
|
|
ORDER BY day ASC
|
|
`
|
|
: prisma.$queryRaw<RawDayRow[]>`
|
|
SELECT DATE(created_at) AS day, LOWER(status::text) AS status, COUNT(*) AS count
|
|
FROM claude_jobs
|
|
WHERE user_id = ${userId}
|
|
AND created_at > NOW() - (${days} || ' days')::INTERVAL
|
|
GROUP BY DATE(created_at), status
|
|
ORDER BY day ASC
|
|
`,
|
|
productId
|
|
? prisma.$queryRaw<RawKpiRow[]>`
|
|
SELECT
|
|
COUNT(*) FILTER (WHERE DATE(created_at) = CURRENT_DATE) AS today_count,
|
|
COUNT(*) FILTER (WHERE status = 'DONE' AND created_at > NOW() - INTERVAL '7 days') AS done_7d,
|
|
COUNT(*) FILTER (WHERE status IN ('DONE','FAILED','CANCELLED','SKIPPED') AND created_at > NOW() - INTERVAL '7 days') AS terminal_7d,
|
|
AVG(EXTRACT(EPOCH FROM (finished_at - claimed_at))) FILTER (WHERE status = 'DONE' AND created_at > NOW() - INTERVAL '7 days') AS avg_seconds
|
|
FROM claude_jobs
|
|
WHERE user_id = ${userId}
|
|
AND product_id = ${productId}
|
|
`
|
|
: prisma.$queryRaw<RawKpiRow[]>`
|
|
SELECT
|
|
COUNT(*) FILTER (WHERE DATE(created_at) = CURRENT_DATE) AS today_count,
|
|
COUNT(*) FILTER (WHERE status = 'DONE' AND created_at > NOW() - INTERVAL '7 days') AS done_7d,
|
|
COUNT(*) FILTER (WHERE status IN ('DONE','FAILED','CANCELLED','SKIPPED') AND created_at > NOW() - INTERVAL '7 days') AS terminal_7d,
|
|
AVG(EXTRACT(EPOCH FROM (finished_at - claimed_at))) FILTER (WHERE status = 'DONE' AND created_at > NOW() - INTERVAL '7 days') AS avg_seconds
|
|
FROM claude_jobs
|
|
WHERE user_id = ${userId}
|
|
`,
|
|
])
|
|
|
|
// Build lookup: dayStr → status → count
|
|
const lookup = new Map<string, Map<string, number>>()
|
|
for (const row of dayRows) {
|
|
const d = toDateStr(row.day)
|
|
if (!lookup.has(d)) lookup.set(d, new Map())
|
|
lookup.get(d)!.set(row.status, Number(row.count))
|
|
}
|
|
|
|
// Generate full date range with zero-fills
|
|
const now = new Date()
|
|
const perDay: DayCount[] = []
|
|
for (let i = days - 1; i >= 0; i--) {
|
|
const d = new Date(now)
|
|
d.setUTCDate(d.getUTCDate() - i)
|
|
const key = toDateStr(d)
|
|
const statusMap = lookup.get(key) ?? new Map()
|
|
perDay.push({
|
|
day: key,
|
|
queued: statusMap.get('queued') ?? 0,
|
|
claimed: statusMap.get('claimed') ?? 0,
|
|
running: statusMap.get('running') ?? 0,
|
|
done: statusMap.get('done') ?? 0,
|
|
failed: statusMap.get('failed') ?? 0,
|
|
cancelled: statusMap.get('cancelled') ?? 0,
|
|
skipped: statusMap.get('skipped') ?? 0,
|
|
})
|
|
}
|
|
|
|
const kpiRow = kpiRows[0]
|
|
const done7d = Number(kpiRow?.done_7d ?? 0)
|
|
const terminal7d = Number(kpiRow?.terminal_7d ?? 0)
|
|
|
|
return {
|
|
perDay,
|
|
kpi: {
|
|
todayCount: Number(kpiRow?.today_count ?? 0),
|
|
successRate7d: terminal7d === 0 ? 0 : Math.round((done7d / terminal7d) * 100) / 100,
|
|
avgDurationSeconds7d: kpiRow?.avg_seconds != null ? Math.round(Number(kpiRow.avg_seconds)) : null,
|
|
},
|
|
}
|
|
}
|