Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,9 @@ export class ProviderAssignmentLifecycleService {
? { ...record(assignment.metadata), operationalState: options.status }
: null);
const metadataWrite = transitionMetadata ? ', metadata_json = ?' : '';
const performance = options.status === 'returned' ? input.performance ?? null : terminalPerformance(assignment, input, options.status==='completed'?'completed':'failed', now);
const settledUsage = assignment.reservationId && options.status !== 'returned'
? await this.store.first(`SELECT active_seconds, elapsed_seconds, input_tokens, cached_input_tokens, reasoning_tokens, output_tokens, actual_usd FROM capacity_usage_actuals WHERE id = ? AND assignment_id = ? AND accounting_mode = 'aggregate' LIMIT 1`, [`usage:${assignment.id}:${assignment.attemptCount}:aggregate`, assignment.id]) : null;
const performance = options.status === 'returned' ? input.performance ?? null : terminalPerformance(assignment, input, options.status==='completed'?'completed':'failed', now, record(settledUsage));
const lifecycleOutput = composeAssignmentLifecycleOutput(record(input), performance);
const params: unknown[] = [
input.runnerId ?? null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export function terminalPerformance(
input: ExtendedProviderAssignmentLifecycleRequest,
status: 'completed' | 'failed',
now: string,
settledUsage: JsonRecord = {},
) {
if (input.performance) return input.performance;
const metadata = record(assignment.metadata);
Expand Down Expand Up @@ -59,10 +60,10 @@ export function terminalPerformance(
disposition, reason: String(input.reason ?? input.message ?? (status === 'completed' ? 'Assignment completed.' : 'Assignment failed.')),
acceptanceChecks: Array.isArray(completion.acceptanceChecks) ? completion.acceptanceChecks : [],
completedScope: [], remainingScope: [], artifactRefs: Array.isArray(completion.durableArtifactRefs) ? completion.durableArtifactRefs.map(String) : [], budget,
actual: { activeSeconds: Math.max(0, Number(input.activeSeconds ?? 0)), elapsedSeconds: Math.max(0, Number(input.elapsedSeconds ?? 0)),
inputTokens: Math.max(0, Number(usage.inputTokens ?? 0)), cachedInputTokens: Math.max(0, Number(usage.cachedInputTokens ?? 0)),
reasoningTokens: Math.max(0, Number(usage.reasoningTokens ?? 0)), outputTokens: Math.max(0, Number(usage.outputTokens ?? 0)), costAmount: input.actualUsd == null ? null : Number(input.actualUsd),
costCurrency: input.actualUsd == null ? null : 'USD', native: [], attempts: Number(assignment.attemptCount ?? 0) + 1 },
actual: { activeSeconds: Math.max(0, Number(settledUsage.active_seconds ?? input.activeSeconds ?? 0)), elapsedSeconds: Math.max(0, Number(settledUsage.elapsed_seconds ?? input.elapsedSeconds ?? 0)),
inputTokens: Math.max(0, Number(settledUsage.input_tokens ?? usage.inputTokens ?? 0)), cachedInputTokens: Math.max(0, Number(settledUsage.cached_input_tokens ?? usage.cachedInputTokens ?? 0)),
reasoningTokens: Math.max(0, Number(settledUsage.reasoning_tokens ?? usage.reasoningTokens ?? 0)), outputTokens: Math.max(0, Number(settledUsage.output_tokens ?? usage.outputTokens ?? 0)), costAmount: settledUsage.actual_usd == null && input.actualUsd == null ? null : Number(settledUsage.actual_usd ?? input.actualUsd),
costCurrency: settledUsage.actual_usd == null && input.actualUsd == null ? null : 'USD', native: [], attempts: Number(assignment.attemptCount ?? 0) + 1 },
noUsefulScopedWorkRemaining: completion.noUsefulScopedWorkRemaining === true, agentAssessment: null,
systemAssessment: { generatedBy: 'api-recovery', measuredAt: now, enforcementConfidence: record(budget).enforcementConfidence }, downstreamOutcomes: [],
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { describe, expect, it } from 'vitest';
import type { DurableProviderAssignment } from '../../../../../src/api/capacity/repositories/capacity/assignments/assignment.ts';
import { terminalPerformance } from '../../../../../src/api/capacity/services/capacity/assignments/lifecycle/completion/assignment-terminal-performance.ts';

describe('terminal assignment performance', () => {
it('uses the committed aggregate usage rather than an empty completion payload', () => {
const assignment = {
id: 'assignment-1', workDayId: 'workday-1', teamId: 'team-1', projectId: 'project-1',
projectAgentClassId: 'project-1:architect', agentId: 'sdk/architect', mode: 'planning',
handlerId: 'writer', capacityProviderId: 'provider-1', executionProviderId: 'codex-implementation',
attemptCount: 0, metadata: {}, capacityEnvelope: {},
} as unknown as DurableProviderAssignment;
const performance = terminalPerformance(assignment, { completion: { disposition: 'completed' } },
'completed', '2026-09-20T00:00:00.000Z', {
active_seconds: 50, elapsed_seconds: 54, input_tokens: 455633,
cached_input_tokens: 396544, reasoning_tokens: 292, output_tokens: 1785,
});
expect(performance.actual).toMatchObject({ activeSeconds: 50, elapsedSeconds: 54,
inputTokens: 455633, cachedInputTokens: 396544, reasoningTokens: 292, outputTokens: 1785 });
});
});
Loading