@zhixuan92/multi-model-agent-core 4.0.1 → 4.0.3

package/dist/lifecycle/handlers/spec-chain-handlers.js

@@ -4,6 +4,7 @@ import { delegateWithEscalation } from '../../escalation/delegate-with-escalatio
 import { runWithFallback, TRANSPORT_FAILURES, isReviewTransportFailure, makeSyntheticRunResult, } from '../../escalation/fallback.js';
 import { makeSkippedReviewResult } from '../../review/skipped-result.js';
 import { makeRunnerShell } from '../../providers/make-runner-shell.js';
+import { mergeStageStats } from '../merge-stage-stats.js';
 async function runSpecReviewRound(input) {
     const { state, ctx, round } = input;
     const last = state.lastRunResult;
@@ -23,7 +24,7 @@ async function runSpecReviewRound(input) {
         isTransportFailure: (r) => isReviewTransportFailure(r),
         getStatus: (r) => r.status,
         makeSyntheticFailure: () => makeSkippedReviewResult('all_tiers_unavailable'),
-        call: async (provider) => {
+        call: async (provider, usedTier) => {
             const shell = makeRunnerShell(provider);
             const engine = ctx.reviewerEngine;
             if (!engine)
@@ -36,6 +37,11 @@ async function runSpecReviewRound(input) {
                     route: (state.route ?? ctx.route),
                     abortSignal: ctx.stall.controller.signal,
                     deadlineMs: ctx.timing.deadlineMs,
+                    ...(ctx.bus && { bus: ctx.bus }),
+                    ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
+                    ...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
+                    tier: usedTier,
+                    stageLabel: 'Spec review',
                 });
             }
             catch (err) {
@@ -73,17 +79,27 @@ async function runSpecRework(input) {
         isTransportFailure: (r) => TRANSPORT_FAILURES.has(r.status) && r.incompleteReason === undefined,
         getStatus: (r) => r.status,
         makeSyntheticFailure: (assigned) => makeSyntheticRunResult(assigned, 'all_tiers_unavailable'),
-        call: (provider) => delegateWithEscalation({
+        call: (provider, usedTier) => delegateWithEscalation({
             prompt: reworkTask.prompt,
             cwd: ctx.cwd,
-            agentType: decision.impl,
+            agentType: usedTier,
             briefQualityPolicy: 'off',
             timeoutMs: ctx.timing.timeoutMs,
         }, [provider], {
             explicitlyPinned: true,
             taskDeadlineMs: ctx.timing.deadlineMs,
             abortSignal: ctx.stall.controller.signal,
-            assignedTier: decision.impl,
+            assignedTier: usedTier,
+            // Without bus the rework's runner-shell.emit calls go nowhere — the
+            // implementer turns then run silently, the reviewer keeps seeing
+            // (slightly) updated code, and the chain marches through 3 rounds
+            // with no visible Implementing events. Pass the same bus + ids the
+            // initial-impl call uses so verbose stderr + the running headline
+            // surface the rework's progress.
+            ...(ctx.bus && { bus: ctx.bus }),
+            ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
+            ...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
+            stageLabel: `Spec rework round ${round - 1}`,
         }),
     });
     if (reworkCall.bothUnavailable)
@@ -105,17 +121,102 @@ function makeSpecReviewHandler(round) {
         if (!result)
             return;
         state[slot] = result.verdict;
+        // Persist concerns into lastRunResult so the wire's per-stage
+        // findingsBySeverity (driven by rr.concerns) reflects what the
+        // reviewer raised — without this, findings_critical/high/medium/low
+        // for spec_review stays 0 even on changes_required outcomes.
+        persistSpecReviewConcerns(state, result);
+        // Record per-round cost so wire task.completed sums reviewer tokens
+        // and the spec_review stage entry has cumulative roundsUsed across
+        // 1..3 rounds. Reviewer tier is derived from policy (round-based).
+        const baseTier = ctx.assignedTier;
+        const reviewerTier = (round - 1 < 2)
+            ? (baseTier === 'standard' ? 'complex' : 'standard')
+            : baseTier; // round 3 swaps back to base tier per SPEC_LOOP policy
+        const reviewerProvider = ctx.providers[reviewerTier];
+        mergeStageStats(state, 'spec_review', {
+            inputTokens: result.cost?.inputTokens ?? 0,
+            outputTokens: result.cost?.outputTokens ?? 0,
+            turnCount: result.cost?.turnCount ?? 0,
+            toolCallCount: result.cost?.toolCallCount ?? 0,
+            costUSD: result.cost?.costUSD ?? null,
+            durationMs: result.cost?.durationMs ?? null,
+        }, {
+            tier: reviewerTier,
+            model: reviewerProvider?.config?.model ?? null,
+            verdict: result.verdict,
+        });
     };
 }
+/** Push reviewer concerns into state.lastRunResult.concerns so the wire
+ *  findingsBySeverity bucket for spec_review counts them. Spec reviewer
+ *  emits free-text concerns (no per-item severity), so we default to
+ *  'medium' — this matches the v3.x defaulting in event-builder. */
+function persistSpecReviewConcerns(state, result) {
+    const last = state.lastRunResult;
+    if (!last)
+        return;
+    const reviewerConcerns = result.concerns;
+    if (!Array.isArray(reviewerConcerns) || reviewerConcerns.length === 0)
+        return;
+    const newConcerns = reviewerConcerns.map(text => ({
+        source: 'spec_review',
+        severity: 'medium',
+        message: text,
+    }));
+    last.concerns = [...(last.concerns ?? []), ...newConcerns];
+}
 function makeSpecReworkHandler(round) {
     return async function specReworkHandler(state) {
         const ctx = state.executionContext;
         if (!ctx)
             return;
         const newResult = await runSpecRework({ state, ctx, round: (round + 1) });
-        if (!newResult)
+        if (!newResult) {
+            // The rework's implementer call did not return an ok RunResult.
+            // Don't silently fall through to the next review round — that would
+            // re-review the unchanged code and produce the "3 reviews, 0 reworks"
+            // pattern. Mark the chain failed so the next round's `!s.terminal`
+            // gate stops the cascade and settle_spec_chain can record the
+            // failure on the wire envelope.
+            state.specReworkFailed = true;
+            state.terminal = true;
+            if (ctx.verbose && typeof ctx.verboseStream === 'function') {
+                ctx.verboseStream(`[mmagent verbose] event=spec_rework_failed ts=${new Date().toISOString()} batch_id=${ctx.batchId ?? ''} task_index=${ctx.taskIndex ?? 0} round=${round}\n`);
+            }
             return;
-        state.lastRunResult = newResult;
+        }
+        // Preserve accumulated stageStats when replacing lastRunResult — the
+        // fresh RunResult from the rework's call has no stageStats of its own,
+        // and overwriting wholesale would drop every prior stage entry
+        // (implementing, spec_review, etc.) so the wire event would only show
+        // the rework's own slice.
+        const priorStageStats = state.lastRunResult?.stageStats;
+        state.lastRunResult = priorStageStats
+            ? { ...newResult, stageStats: priorStageStats }
+            : newResult;
+        // Record rework cost in spec_rework stage stats so wire telemetry sees
+        // it. round=1 → attemptIndex 1, round=2 → attemptIndex 2; rework tier
+        // mirrors pickEscalation (impl=standard for attemptIndex 1; impl=complex
+        // for attemptIndex 2 when baseTier=standard).
+        const baseTier = ctx.assignedTier;
+        const reworkTier = (round === 2 && baseTier === 'standard') ? 'complex' : baseTier;
+        const reworkProvider = ctx.providers[reworkTier];
+        mergeStageStats(state, 'spec_rework', {
+            inputTokens: newResult.usage?.inputTokens ?? 0,
+            outputTokens: newResult.usage?.outputTokens ?? 0,
+            cachedReadTokens: newResult.usage?.cachedReadTokens ?? 0,
+            cachedNonReadTokens: newResult.usage?.cachedNonReadTokens ?? 0,
+            turnCount: newResult.turns ?? 0,
+            toolCallCount: Array.isArray(newResult.toolCalls) ? newResult.toolCalls.length : 0,
+            costUSD: newResult.cost?.costUSD ?? null,
+            durationMs: newResult.durationMs ?? null,
+            filesReadCount: Array.isArray(newResult.filesRead) ? newResult.filesRead.length : 0,
+            filesWrittenCount: Array.isArray(newResult.filesWritten) ? newResult.filesWritten.length : 0,
+        }, {
+            tier: reworkTier,
+            model: reworkProvider?.config?.model ?? null,
+        });
     };
 }
 export const specReviewRound1Handler = makeSpecReviewHandler(1);

package/dist/lifecycle/handlers/spec-chain-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"spec-chain-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/spec-chain-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spec-chain-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/spec-chain-handlers.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/handlers/terminal-handlers.d.ts

@@ -2,5 +2,13 @@ import type { LifecycleState } from '../stage-plan-types.js';
 export declare function registerTerminalBlockHandler(state: LifecycleState): void;
 export declare function emitTaskTerminalHandler(state: LifecycleState): void;
 export declare function persistToBatchRegistryHandler(state: LifecycleState): void;
+/**
+ * Row 5.6 — record_task_completed.
+ *
+ * Builds the cloud `task.completed` wire event and hands it to the server
+ * recorder. Idempotent on state.taskCompletedRecorded. No-op when the
+ * server hasn't supplied a recorder (CLI/test paths).
+ */
+export declare function recordTaskCompletedHandler(state: LifecycleState): void;
 export declare function flushTelemetryHandler(state: LifecycleState): Promise<void>;
 //# sourceMappingURL=terminal-handlers.d.ts.map

package/dist/lifecycle/handlers/terminal-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAiC7D,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAqBxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAuCnE;AAMD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAkBzE;AAMD,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhF"}
+{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAiC7D,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAqBxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CA0GnE;AAMD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAkBzE;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAoCtE;AA8CD,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhF"}

package/dist/lifecycle/handlers/terminal-handlers.js

@@ -33,8 +33,78 @@ export function emitTaskTerminalHandler(state) {
         return;
     }
     const last = state.lastRunResult;
-    const usage = last?.usage ?? { inputTokens: 0, outputTokens: 0, cachedReadTokens: 0, cachedNonReadTokens: 0 };
-    const stages = JSON.stringify({});
+    // Sum tokens / counts across every recorded stage so the local task_completed
+    // event carries the FULL cost (implementer + reviewer + annotator + rework
+    // + diff). Previously this read last.usage directly which only carried the
+    // implementer tokens — reviewer / annotator costs were dropped.
+    let inputTokens = 0;
+    let outputTokens = 0;
+    let cachedReadTokens = 0;
+    let cachedNonReadTokens = 0;
+    let totalCostUSD = null;
+    let toolCallsTotal = 0;
+    let turnsTotal = 0;
+    let filesReadTotal = 0;
+    let filesWrittenTotal = 0;
+    const ss = last?.stageStats;
+    if (ss) {
+        for (const stage of Object.values(ss)) {
+            if (!stage || !stage['entered'])
+                continue;
+            inputTokens += stage['inputTokens'] ?? 0;
+            outputTokens += stage['outputTokens'] ?? 0;
+            cachedReadTokens += stage['cachedReadTokens'] ?? 0;
+            cachedNonReadTokens += stage['cachedNonReadTokens'] ?? 0;
+            toolCallsTotal += stage['toolCallCount'] ?? 0;
+            turnsTotal += stage['turnCount'] ?? 0;
+            filesReadTotal += stage['filesReadCount'] ?? 0;
+            filesWrittenTotal += stage['filesWrittenCount'] ?? 0;
+            const stageCost = stage['costUSD'];
+            if (stageCost !== null && stageCost !== undefined) {
+                totalCostUSD = (totalCostUSD ?? 0) + stageCost;
+            }
+        }
+    }
+    // Fallback to last.usage when stageStats wasn't populated (legacy paths).
+    if (inputTokens === 0 && outputTokens === 0 && last?.usage) {
+        inputTokens = last.usage.inputTokens ?? 0;
+        outputTokens = last.usage.outputTokens ?? 0;
+        cachedReadTokens = last.usage.cachedReadTokens ?? 0;
+        cachedNonReadTokens = last.usage.cachedNonReadTokens ?? 0;
+    }
+    if (turnsTotal === 0)
+        turnsTotal = last?.turns ?? 0;
+    if (toolCallsTotal === 0)
+        toolCallsTotal = Array.isArray(last?.toolCalls) ? last.toolCalls.length : 0;
+    if (filesReadTotal === 0)
+        filesReadTotal = Array.isArray(last?.filesRead) ? last.filesRead.length : 0;
+    if (filesWrittenTotal === 0)
+        filesWrittenTotal = Array.isArray(last?.filesWritten) ? last.filesWritten.length : 0;
+    // Emit a per-stage map so consumers see the breakdown without unpacking
+    // RunResult. Each entry: stage -> { inputTokens, outputTokens, costUSD,
+    // turnCount, toolCallCount, durationMs, tier, model, verdict? }.
+    const stagesMap = {};
+    if (ss) {
+        for (const [name, stage] of Object.entries(ss)) {
+            if (!stage || !stage['entered'])
+                continue;
+            stagesMap[name] = {
+                inputTokens: stage['inputTokens'] ?? 0,
+                outputTokens: stage['outputTokens'] ?? 0,
+                cachedReadTokens: stage['cachedReadTokens'] ?? 0,
+                cachedNonReadTokens: stage['cachedNonReadTokens'] ?? 0,
+                costUSD: stage['costUSD'] ?? null,
+                turnCount: stage['turnCount'] ?? 0,
+                toolCallCount: stage['toolCallCount'] ?? 0,
+                durationMs: stage['durationMs'] ?? null,
+                agentTier: stage['agentTier'] ?? null,
+                model: stage['model'] ?? null,
+                ...(stage['verdict'] !== undefined && { verdict: stage['verdict'] }),
+                ...(stage['roundsUsed'] !== undefined && { roundsUsed: stage['roundsUsed'] }),
+            };
+        }
+    }
+    const stages = JSON.stringify(stagesMap);
     bus.emit({
         event: 'task_completed',
         ts: new Date().toISOString(),
@@ -43,16 +113,16 @@ export function emitTaskTerminalHandler(state) {
         route: state.route,
         status: last?.status ?? 'error',
         workerStatus: last?.workerStatus ?? null,
-        turns: last?.turns ?? 0,
+        turns: turnsTotal,
         durationMs: last?.durationMs ?? null,
-        filesRead: Array.isArray(last?.filesRead) ? last.filesRead.length : 0,
-        filesWritten: Array.isArray(last?.filesWritten) ? last.filesWritten.length : 0,
-        toolCalls: Array.isArray(last?.toolCalls) ? last.toolCalls.length : 0,
-        inputTokens: usage.inputTokens ?? 0,
-        outputTokens: usage.outputTokens ?? 0,
-        cachedReadTokens: usage.cachedReadTokens ?? 0,
-        cachedNonReadTokens: usage.cachedNonReadTokens ?? 0,
-        costUSD: null,
+        filesRead: filesReadTotal,
+        filesWritten: filesWrittenTotal,
+        toolCalls: toolCallsTotal,
+        inputTokens,
+        outputTokens,
+        cachedReadTokens,
+        cachedNonReadTokens,
+        costUSD: totalCostUSD,
         taskMaxIdleMs: null,
         stallTriggered: false,
         stages,
@@ -83,6 +153,93 @@ export function persistToBatchRegistryHandler(state) {
     }
     state.batchRegistryPersisted = true;
 }
+/**
+ * Row 5.6 — record_task_completed.
+ *
+ * Builds the cloud `task.completed` wire event and hands it to the server
+ * recorder. Idempotent on state.taskCompletedRecorded. No-op when the
+ * server hasn't supplied a recorder (CLI/test paths).
+ */
+export function recordTaskCompletedHandler(state) {
+    if (state.taskCompletedRecorded)
+        return;
+    const ctx = state.executionContext;
+    if (!ctx)
+        return;
+    const recorder = ctx.recorder;
+    if (!recorder || typeof recorder.recordTaskCompleted !== 'function') {
+        state.taskCompletedRecorded = true;
+        return;
+    }
+    const task = state.task;
+    const last = state.lastRunResult;
+    if (!task || !last) {
+        state.taskCompletedRecorded = true;
+        return;
+    }
+    ensureImplementingStage(last, ctx);
+    try {
+        // Gap 15 fix (4.0.3+): thread the per-task reviewPolicy into the
+        // wire BuildContext so the wire row reflects what the lifecycle
+        // actually ran. Pre-fix the BuildContext fell back to the route
+        // default ('full' for delegate, 'quality_only' for read-only),
+        // overriding per-task TaskSpec.reviewPolicy that the lifecycle
+        // had already honored at the row level. Now: per-task wins; the
+        // route default applies only when the task didn't specify.
+        recorder.recordTaskCompleted({
+            route: ctx.route,
+            taskSpec: task,
+            runResult: last,
+            client: ctx.client ?? '',
+            mainModel: ctx.mainModel ?? null,
+            ...(task.reviewPolicy !== undefined && { reviewPolicy: task.reviewPolicy }),
+        });
+    }
+    catch {
+        // recorder is best-effort — never break terminal flow on telemetry.
+    }
+    state.taskCompletedRecorded = true;
+}
+/**
+ * Synthesize an `implementing` stage entry from top-level RunResult fields
+ * when the per-stage tracker hasn't populated it. Without this, the wire
+ * event ships with `stages: []` for every task, which violates the backend's
+ * R2.1 invariant ("empty stages only allowed for brief_too_vague|error")
+ * for any task that succeeded — every upload would 400.
+ *
+ * This is a fallback; it does not replace stats already populated by the
+ * runner-shell or lifecycle stage tracker.
+ */
+function ensureImplementingStage(rr, ctx) {
+    const existing = (rr.stageStats?.implementing);
+    if (existing?.entered)
+        return;
+    const usage = rr.usage ?? { inputTokens: 0, outputTokens: 0, cachedReadTokens: 0, cachedNonReadTokens: 0 };
+    const synthesized = {
+        stage: 'implementing',
+        entered: true,
+        durationMs: rr.durationMs ?? 0,
+        costUSD: rr.cost?.costUSD ?? null,
+        agentTier: ctx.assignedTier ?? 'standard',
+        modelFamily: null,
+        model: null,
+        maxIdleMs: 0,
+        totalIdleMs: 0,
+        activityEvents: 0,
+        inputTokens: usage.inputTokens ?? 0,
+        outputTokens: usage.outputTokens ?? 0,
+        cachedReadTokens: usage.cachedReadTokens ?? 0,
+        cachedNonReadTokens: usage.cachedNonReadTokens ?? 0,
+        turnCount: rr.turns ?? 0,
+        toolCallCount: Array.isArray(rr.toolCalls) ? rr.toolCalls.length : 0,
+        filesReadCount: Array.isArray(rr.filesRead) ? rr.filesRead.length : 0,
+        filesWrittenCount: Array.isArray(rr.filesWritten) ? rr.filesWritten.length : 0,
+    };
+    rr.stageStats = {
+        ...(rr.stageStats ?? {}),
+        implementing: synthesized,
+    };
+}
 export async function flushTelemetryHandler(state) {
     if (state.telemetryFlushed)
         return;

package/dist/lifecycle/handlers/terminal-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/terminal-handlers.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/lifecycle-context.d.ts

@@ -25,7 +25,6 @@ export interface ExecutionContext {
     cwd: string;
     route: string;
     client: string;
-    triggeringSkill: string;
     mainModel: string | null;
     /** Tier the dispatcher assigned to this task. Stays fixed; rotation lives in per-round handlers via pickReviewer/pickEscalation. */
     assignedTier: AgentType;
@@ -77,7 +76,6 @@ export interface ExecutionContext {
             taskSpec: TaskSpec;
             runResult: import('../types.js').RunResult;
             client: string;
-            triggeringSkill: string;
             mainModel: string | null;
             reviewPolicy?: 'full' | 'quality_only' | 'diff_only' | 'none';
             verifyCommandPresent?: boolean;

package/dist/lifecycle/lifecycle-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lifecycle-context.d.ts","sourceRoot":"","sources":["../../src/lifecycle/lifecycle-context.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/merge-stage-stats.d.ts

@@ -0,0 +1,31 @@
+import type { LifecycleState } from './stage-plan-types.js';
+export type StageName = 'implementing' | 'spec_review' | 'spec_rework' | 'quality_review' | 'quality_rework' | 'diff_review' | 'verifying' | 'committing';
+interface StageDelta {
+    inputTokens: number;
+    outputTokens: number;
+    cachedReadTokens?: number;
+    cachedNonReadTokens?: number;
+    turnCount: number;
+    toolCallCount: number;
+    costUSD: number | null;
+    durationMs: number | null;
+    filesReadCount?: number;
+    filesWrittenCount?: number;
+}
+interface StageOptions {
+    tier: 'standard' | 'complex' | null;
+    model: string | null;
+    modelFamily?: string | null;
+    /** For spec_review / quality_review / diff_review only. */
+    verdict?: string;
+    /** For spec_review / quality_review / diff_review only — defaults to +1
+     *  per call so multi-round chains accumulate naturally. */
+    roundsDelta?: number;
+}
+/**
+ * Merge a stage's per-call cost into state.lastRunResult.stageStats.
+ * Multi-round stages accumulate; single-shot stages overwrite.
+ */
+export declare function mergeStageStats(state: LifecycleState, stage: StageName, delta: StageDelta, options: StageOptions): void;
+export {};
+//# sourceMappingURL=merge-stage-stats.d.ts.map

package/dist/lifecycle/merge-stage-stats.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-stage-stats.d.ts","sourceRoot":"","sources":["../../src/lifecycle/merge-stage-stats.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,MAAM,SAAS,GACjB,cAAc,GACd,aAAa,GACb,aAAa,GACb,gBAAgB,GAChB,gBAAgB,GAChB,aAAa,GACb,WAAW,GACX,YAAY,CAAC;AAEjB,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;+DAC2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,YAAY,GACpB,IAAI,CAsCN"}

package/dist/lifecycle/merge-stage-stats.js

@@ -0,0 +1,64 @@
+// merge-stage-stats.ts
+//
+// Helper that mutates state.lastRunResult.stageStats[<stage>] to record
+// per-stage execution costs as each stage handler completes. Without this,
+// only the implementer's RunResult.usage is visible at terminal — the
+// reviewer / annotator / rework / diff / verify costs are dropped on the
+// floor. Affected events:
+//   - local `task_completed` (top-level inputTokens / outputTokens / cost)
+//   - wire `task.completed` (per-stage `stages[]` array + tier rollup)
+//
+// Stages with multi-round semantics (spec_review, quality_review) accumulate
+// across rounds; the schema has one slot per stage name with `roundsUsed`
+// reflecting the total number of rounds executed.
+/**
+ * Merge a stage's per-call cost into state.lastRunResult.stageStats.
+ * Multi-round stages accumulate; single-shot stages overwrite.
+ */
+export function mergeStageStats(state, stage, delta, options) {
+    const rr = state.lastRunResult;
+    if (!rr)
+        return;
+    const existing = (rr.stageStats ?? {})[stage];
+    const accumulated = {
+        stage,
+        entered: true,
+        durationMs: (existing?.['durationMs'] ?? 0) + (delta.durationMs ?? 0),
+        costUSD: combineCost(existing?.['costUSD'], delta.costUSD),
+        agentTier: options.tier ?? existing?.['agentTier'] ?? null,
+        modelFamily: options.modelFamily ?? existing?.['modelFamily'] ?? null,
+        model: options.model ?? existing?.['model'] ?? null,
+        maxIdleMs: 0,
+        totalIdleMs: 0,
+        activityEvents: 0,
+        inputTokens: (existing?.['inputTokens'] ?? 0) + delta.inputTokens,
+        outputTokens: (existing?.['outputTokens'] ?? 0) + delta.outputTokens,
+        cachedReadTokens: (existing?.['cachedReadTokens'] ?? 0) + (delta.cachedReadTokens ?? 0),
+        cachedNonReadTokens: (existing?.['cachedNonReadTokens'] ?? 0) + (delta.cachedNonReadTokens ?? 0),
+        turnCount: (existing?.['turnCount'] ?? 0) + delta.turnCount,
+        toolCallCount: (existing?.['toolCallCount'] ?? 0) + delta.toolCallCount,
+        filesReadCount: (existing?.['filesReadCount'] ?? 0) + (delta.filesReadCount ?? 0),
+        filesWrittenCount: (existing?.['filesWrittenCount'] ?? 0) + (delta.filesWrittenCount ?? 0),
+    };
+    if (stage === 'spec_review' || stage === 'quality_review' || stage === 'diff_review') {
+        accumulated['verdict'] = options.verdict ?? existing?.['verdict'] ?? null;
+        accumulated['roundsUsed'] = (existing?.['roundsUsed'] ?? 0) + (options.roundsDelta ?? 1);
+        accumulated['concernCategories'] = existing?.['concernCategories'] ?? [];
+        accumulated['findingsBySeverity'] = existing?.['findingsBySeverity'] ?? { critical: 0, high: 0, medium: 0, low: 0 };
+    }
+    else if (stage === 'spec_rework' || stage === 'quality_rework') {
+        accumulated['triggeringConcernCategories'] = existing?.['triggeringConcernCategories'] ?? [];
+    }
+    const stageStatsObj = (rr.stageStats ?? {});
+    stageStatsObj[stage] = accumulated;
+    rr.stageStats = stageStatsObj;
+}
+/** Sum nullable cost slots; null when both contributions are null (honest-null). */
+function combineCost(a, b) {
+    if (a === null || a === undefined)
+        return b;
+    if (b === null)
+        return a;
+    return a + b;
+}
+//# sourceMappingURL=merge-stage-stats.js.map

package/dist/lifecycle/merge-stage-stats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-stage-stats.js","sourceRoot":"","sources":["../../src/lifecycle/merge-stage-stats.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/shared-compute.js

@@ -5,15 +5,15 @@ export function computeTimings(wallClockMs, results) {
 }
 export function computeAggregateCost(results) {
     let totalActualCostUSD = 0;
-    let totalCostDeltaVsParentUSD = 0;
+    let totalCostDeltaVsMainUSD = 0;
     for (const r of results) {
         if (r.cost?.costUSD !== null && r.cost?.costUSD !== undefined) {
             totalActualCostUSD += r.cost.costUSD;
         }
-        if (r.cost?.costDeltaVsParentUSD !== null && r.cost?.costDeltaVsParentUSD !== undefined) {
-            totalCostDeltaVsParentUSD += r.cost.costDeltaVsParentUSD;
+        if (r.cost?.costDeltaVsMainUSD !== null && r.cost?.costDeltaVsMainUSD !== undefined) {
+            totalCostDeltaVsMainUSD += r.cost.costDeltaVsMainUSD;
         }
     }
-    return { totalActualCostUSD, totalCostDeltaVsParentUSD };
+    return { totalActualCostUSD, totalCostDeltaVsMainUSD };
 }
 //# sourceMappingURL=shared-compute.js.map

package/dist/lifecycle/shared-compute.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-compute.js","sourceRoot":"","sources":["../../src/lifecycle/shared-compute.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,cAAc,CAAC,WAAmB,EAAE,OAAoB;IACtE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,MAAM,0BAA0B,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;IAC1E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,yBAAyB,GAAG,CAAC,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9D,kBAAkB,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACxF,yBAAyB,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAC3D,CAAC;IACH,CAAC;IACD,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"shared-compute.js","sourceRoot":"","sources":["../../src/lifecycle/shared-compute.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,cAAc,CAAC,WAAmB,EAAE,OAAoB;IACtE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,MAAM,0BAA0B,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;IAC1E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,uBAAuB,GAAG,CAAC,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9D,kBAAkB,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACpF,uBAAuB,IAAI,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACvD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AACzD,CAAC"}

package/dist/lifecycle/stage-plan-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stage-plan-builder.d.ts","sourceRoot":"","sources":["../../src/lifecycle/stage-plan-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAA4B,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAoLhE"}
+{"version":3,"file":"stage-plan-builder.d.ts","sourceRoot":"","sources":["../../src/lifecycle/stage-plan-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAA4B,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CA0LhE"}