@zhixuan92/multi-model-agent-core 4.5.4 → 4.6.0

package/README.md

@@ -228,9 +228,14 @@ mmagent logs --follow --batch=<id>   # tail + filter
 
 As of 3.4.0 every task-execution event the worker emits to the verbose stderr stream is also written to the JSONL log via a single `emit(TaskEvent)` writer — schema parity across both sinks. Crash/disconnect events (`startup`, `request_start`, `request_complete`, `shutdown`, `error`) are written unconditionally; per-task events (`heartbeat`, `stage_change`, `tool_call`, `turn_complete`, etc.) flow through the same writer.
 
-## What's new in 4.5.4
-
-- **`buildSyntheticReviewStage(findings)` emits `costUSD: 0`, not `null`.** The 4.5.3 implementation used `null` to mean "no LLM call backs this stage" — but `task-completion-summary.ts` sums stage costs via `sumFinite`, which propagates `null` to top-level `totalCostUSD: null`. The backend wire schema rejects that as a Zod parse failure, so every 4.5.3 daemon's read-only-route upload was 400'd and silently dropped. `null` is now reserved for honest measurement failures (e.g. real LLM call whose provider didn't return cost info); synthetic stages use `0` ("no call happened").
+## What's new in 4.6.0
+
+- **`isLlmStage: boolean` on the internal `StageEntryInternal` shape** (required, no default — compile-time enforced). `rollupByTier` filters out non-LLM stages (synthetic review, commit) before computing tier rollup, so synthetic placeholders no longer corrupt `tierUsage.<tier>.model` under last-seen semantics.
+- **`StageModelMissingError` + `safeBuild` wrapper** around stage builders. Missing-model errors drop the offending stage with a `validation_warnings` diagnostic; the rest of the event ships.
+- **Tier-uniformity invariant.** Two LLM stages on the same tier with different models trigger an `R-TIER-MODEL-DIVERGENCE` diagnostic and the tier is omitted from `tierUsage`.
+- **`RunAnnotatorResult` and `RunReviewerResult` carry full token attribution** (`inputTokens`, `outputTokens`, `cachedReadTokens`, `cachedNonReadTokens`) plus `model` — read from `turn.usage` and `turn.model` on the `Session.send` return.
+- **Cross-tier reviewer policy** via `invertedReviewerTier()` helper exported from `review/run-reviewer.ts`. Single-tier deployments fall back to the implementer tier.
+- **`buildSyntheticReviewStage(findings)`** continues to emit `costUSD: 0` and `model: 'custom'` with `isLlmStage: false`.
 
 Full history: [CHANGELOG](https://github.com/zhixuan312/multi-model-agent/blob/master/CHANGELOG.md).
 

package/dist/escalation/delegate-with-escalation.d.ts

@@ -1,4 +1,4 @@
-import type { TaskSpec, RunResult, Provider, AgentType } from '../types.js';
+import type { TaskSpec, RuntimeRunResult, Provider, AgentType } from '../types.js';
 import type { InternalRunnerEvent } from '../providers/runner-types.js';
 import type { EventEmitter } from '../events/event-emitter.js';
 export interface DelegateOptions {
@@ -48,5 +48,5 @@ export interface DelegateOptions {
      */
     stageLabel?: string;
 }
-export declare function delegateWithEscalation(task: TaskSpec, chain: Provider[], options?: DelegateOptions): Promise<RunResult>;
+export declare function delegateWithEscalation(task: TaskSpec, chain: Provider[], options?: DelegateOptions): Promise<RuntimeRunResult>;
 //# sourceMappingURL=delegate-with-escalation.d.ts.map

package/dist/escalation/delegate-with-escalation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delegate-with-escalation.d.ts","sourceRoot":"","sources":["../../src/escalation/delegate-with-escalation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAEV,mBAAmB,EAGpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAe/D,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAClD;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiBD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,QAAQ,EAAE,EACjB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,SAAS,CAAC,CA4LpB"}
+{"version":3,"file":"delegate-with-escalation.d.ts","sourceRoot":"","sources":["../../src/escalation/delegate-with-escalation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EAEV,mBAAmB,EAGpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAe/D,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAClD;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiBD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,QAAQ,EAAE,EACjB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAmL3B"}

package/dist/escalation/delegate-with-escalation.js

@@ -4,7 +4,7 @@
 // lifecycle review-chain handlers. This function only handles transient
 // retries (api_error / network_error).
 import { retryableFor } from '../error-codes.js';
-import { hasCompletedWork, extractToolName } from '../providers/stall-detector.js';
+import { extractToolName } from '../providers/stall-detector.js';
 import { assembleRunResult } from '../providers/assemble-run-result.js';
 import { HUMAN_LABEL } from '../lifecycle/stage-labels.js';
 function deriveCause(status, errorCode) {
@@ -73,11 +73,12 @@ export async function delegateWithEscalation(task, chain, options = {}) {
                         : remainingClamped;
             }
             // v4.4: ProviderConfig.type is one of: 'claude' | 'codex'.
-            const cfgType = provider.config.type;
+            const cfg = provider.config;
+            const cfgType = cfg.type ?? 'codex';
             const providerTypeName = cfgType === 'claude' ? 'claude' : 'codex';
             safeSink?.({
                 kind: 'worker_start',
-                model: provider.config.model,
+                model: cfg.model ?? 'unknown',
                 providerType: providerTypeName,
                 tier: options.assignedTier ?? 'standard',
             });
@@ -175,25 +176,18 @@ export async function delegateWithEscalation(task, chain, options = {}) {
             best = a.result;
         }
     }
-    const baseStatus = best.status === 'ok' ? 'incomplete' : best.status;
-    // C2: Promote incomplete → ok when agent self-assessed as done AND produced work artifacts
-    // OR verified with shell (ran tests/builds) even without writing files
-    const outputIsSubstantive = best.output.trim().length > 0 && !best.outputIsDiagnostic;
-    const hasShellVerification = best.toolCalls.some(tc => extractToolName(tc) === 'runShell');
-    const finalStatus = baseStatus === 'incomplete' &&
-        best.workerStatus === 'done' &&
-        outputIsSubstantive &&
-        (best.filesWritten.length > 0 || hasCompletedWork(best.toolCalls) || hasShellVerification || task.skipCompletionHeuristic === true)
-        ? 'ok'
-        : baseStatus;
-    const wasPromoted = finalStatus === 'ok' && baseStatus === 'incomplete';
+    // v5: escalation no longer gates on workerSelfAssessment. Annotate is the
+    // single point of truth for `completed` (spec §5.7 + §9 M1/M3 fixes).
+    // Escalation only records attempts and selects the best one; status flows
+    // through unchanged to annotate which makes the final verdict.
+    const finalStatus = best.status === 'ok' ? 'incomplete' : best.status;
     const terminationReason = {
         cause: deriveCause(finalStatus, best.errorCode),
         turnsUsed: best.turns,
         hasFileArtifacts: best.filesWritten.length > 0,
         usedShell: best.toolCalls.some(tc => extractToolName(tc) === 'runShell'),
-        workerSelfAssessment: best.workerStatus ?? null,
-        wasPromoted,
+        workerSelfAssessment: best.workerStatus ?? null, // truthful read; NOT stamped (M3 fix)
+        wasPromoted: false,
     };
     return {
         ...best,

package/dist/escalation/delegate-with-escalation.js.map

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

package/dist/escalation/fallback-helpers.d.ts

@@ -1,20 +1,20 @@
-import type { Provider, AgentType, RunResult } from '../types.js';
+import type { Provider, AgentType, RuntimeRunResult } from '../types.js';
 /** Two providers are "identical" iff they resolve to the same effective backend
  *  (type + model + baseUrl + apiKey wiring). When an operator points both tiers
  *  at the same backend (one-provider deployment), cross-tier fallback is
  *  structurally pointless — alt would just hit the same place. Comparing the
  *  serialized config catches this without a new operator-facing flag. */
 export declare function providersIdentical(a: Provider, b: Provider): boolean;
-/** Lifecycle helper: builds the synthetic RunResult expected when both tiers are
+/** Lifecycle helper: builds the synthetic RuntimeRunResult expected when both tiers are
  *  unavailable. Status is the new 'unavailable' value (NOT 'api_error') so
  *  re-passing the synthetic into runWithFallback's isTransportFailure cannot
  *  retrigger fallback.
  *
- *  IMPORTANT: This shape MUST satisfy `RunResult` (see types.ts). Confirmed
+ *  IMPORTANT: This shape MUST satisfy `RuntimeRunResult` (see types.ts). Confirmed
  *  required fields: output, status, usage, turns, filesRead, filesWritten,
- *  toolCalls, outputIsDiagnostic, escalationLog. All other RunResult fields
+ *  toolCalls, outputIsDiagnostic, escalationLog. All other RuntimeRunResult fields
  *  are optional. */
-export declare function makeSyntheticRunResult(assigned: AgentType, errorCode: string): RunResult;
+export declare function makeSyntheticRunResult(assigned: AgentType, errorCode: string): RuntimeRunResult;
 export declare function isReviewTransportFailure(r: {
     status?: string;
 }): boolean;

package/dist/escalation/fallback-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fallback-helpers.d.ts","sourceRoot":"","sources":["../../src/escalation/fallback-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElE;;;;yEAIyE;AACzE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAEpE;AAED;;;;;;;;oBAQoB;AACpB,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAexF;AAED,wBAAgB,wBAAwB,CACtC,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACrB,OAAO,CAET;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,MAAM,CAMrD"}
+{"version":3,"file":"fallback-helpers.d.ts","sourceRoot":"","sources":["../../src/escalation/fallback-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEzE;;;;yEAIyE;AACzE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAEpE;AAED;;;;;;;;oBAQoB;AACpB,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAiB/F;AAED,wBAAgB,wBAAwB,CACtC,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACrB,OAAO,CAET;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,MAAM,CAMrD"}

package/dist/escalation/fallback-helpers.js

@@ -6,14 +6,14 @@
 export function providersIdentical(a, b) {
     return JSON.stringify(a.config) === JSON.stringify(b.config);
 }
-/** Lifecycle helper: builds the synthetic RunResult expected when both tiers are
+/** Lifecycle helper: builds the synthetic RuntimeRunResult expected when both tiers are
  *  unavailable. Status is the new 'unavailable' value (NOT 'api_error') so
  *  re-passing the synthetic into runWithFallback's isTransportFailure cannot
  *  retrigger fallback.
  *
- *  IMPORTANT: This shape MUST satisfy `RunResult` (see types.ts). Confirmed
+ *  IMPORTANT: This shape MUST satisfy `RuntimeRunResult` (see types.ts). Confirmed
  *  required fields: output, status, usage, turns, filesRead, filesWritten,
- *  toolCalls, outputIsDiagnostic, escalationLog. All other RunResult fields
+ *  toolCalls, outputIsDiagnostic, escalationLog. All other RuntimeRunResult fields
  *  are optional. */
 export function makeSyntheticRunResult(assigned, errorCode) {
     return {
@@ -29,6 +29,8 @@ export function makeSyntheticRunResult(assigned, errorCode) {
         filesWritten: [],
         toolCalls: [],
         escalationLog: [],
+        actualCostUSD: 0,
+        directoriesListed: [],
     };
 }
 export function isReviewTransportFailure(r) {

package/dist/escalation/fallback-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"fallback-helpers.js","sourceRoot":"","sources":["../../src/escalation/fallback-helpers.ts"],"names":[],"mappings":"AAEA;;;;yEAIyE;AACzE,MAAM,UAAU,kBAAkB,CAAC,CAAW,EAAE,CAAW;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;;;;oBAQoB;AACpB,MAAM,UAAU,sBAAsB,CAAC,QAAmB,EAAE,SAAiB;IAC3E,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,EAAE;QACV,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,qDAAqD,QAAQ,GAAG;QACvE,SAAS;QACT,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE;QACvF,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,EAAE;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,CAAsB;IAEtB,OAAO,CAAC,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,MAAM,KAAK,4BAA4B,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;AACzG,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,CAAgB;IAC3C,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,MAAM,KAAK,GAAI,CAA0C,CAAC,KAAK,IAAI,EAAE,CAAC;IACtE,MAAM,KAAK,GAAI,CAAwB,CAAC,KAAK,IAAI,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,CAAE,CAAkC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAC1F,OAAO,KAAK,GAAG,YAAY,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;AAChE,CAAC"}
+{"version":3,"file":"fallback-helpers.js","sourceRoot":"","sources":["../../src/escalation/fallback-helpers.ts"],"names":[],"mappings":"AAEA;;;;yEAIyE;AACzE,MAAM,UAAU,kBAAkB,CAAC,CAAW,EAAE,CAAW;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;;;;oBAQoB;AACpB,MAAM,UAAU,sBAAsB,CAAC,QAAmB,EAAE,SAAiB;IAC3E,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,EAAE;QACV,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,qDAAqD,QAAQ,GAAG;QACvE,SAAS;QACT,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE;QACvF,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,EAAE;QACjB,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,EAAE;KACtB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,CAAsB;IAEtB,OAAO,CAAC,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,MAAM,KAAK,4BAA4B,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;AACzG,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,CAAgB;IAC3C,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,MAAM,KAAK,GAAI,CAA0C,CAAC,KAAK,IAAI,EAAE,CAAC;IACtE,MAAM,KAAK,GAAI,CAAwB,CAAC,KAAK,IAAI,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,CAAE,CAAkC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAC1F,OAAO,KAAK,GAAG,YAAY,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;AAChE,CAAC"}

package/dist/events/event-builder.d.ts

@@ -1,24 +1,55 @@
-import type { RunResult } from '../types.js';
+import type { RuntimeRunResult } from '../types.js';
+import type { StageGate } from '../lifecycle/stage-io.js';
 import { type WireTelemetryRecord } from './telemetry-types.js';
+/**
+ * Thrown when a stage marked `isLlmStage: true` arrives at the builder
+ * with no model identifier. Caught one level up by the stage-build loop
+ * (Task A5b) and converted into a `validation_warnings` diagnostic; the
+ * offending stage is dropped from the emitted event but the rest of the
+ * event still ships. Per spec D5 + §6.
+ */
+export declare class StageModelMissingError extends Error {
+    readonly stageName: string;
+    constructor(stageName: string);
+}
 export interface BuildContext {
     route: 'delegate' | 'audit' | 'review' | 'debug' | 'execute-plan' | 'retry' | 'investigate' | 'research' | 'register-context-block';
     taskSpec: {
         filePaths?: string[];
         subtype?: string;
     };
-    runResult: RunResult;
+    runResult: RuntimeRunResult;
     realFilesChanged: string[];
     client: string;
     mainModel: string | null;
     reviewPolicy?: 'full' | 'quality_only' | 'diff_only' | 'none';
     verifyCommandPresent?: boolean;
+    /**
+     * v5 — per-stage gates from LifecycleState. When present, the wire builder
+     * cross-checks each stage's runResult.stageStats against gates[name].telemetry
+     * and prefers the gate's values for `costUSD`, `durationMs`, `turnsUsed`,
+     * `stopReason` (the canonical v5 source). stageStats supplies the remaining
+     * fields (tokens, tool calls, files read/written) because they're not on the
+     * gate's telemetry block.
+     */
+    gates?: Record<string, StageGate<unknown>>;
 }
 export declare function buildTaskCompletedEvent(ctx: BuildContext): WireTelemetryRecord;
 /**
  * Wire payload builder. Internal record fields match the wire schema 1:1
  * after the v4.0.3 rename (mainModel/mainModelFamily everywhere — DB column
- * is `main_model`, header is `X-MMA-Main-Model`, no more `mainModel`
- * translation shim).
+ * is `main_model`, header is `X-MMA-Main-Model`).
+ *
+ * v5 — this used to be a `as unknown as WireTelemetryRecord` passthrough.
+ * The translator is now real: the internal record is passed through Zod
+ * (`WireTelemetryRecordSchema`) so the wire payload is schema-validated at
+ * the egress boundary. When the schema rejects, we fall back to the
+ * passthrough to preserve "best-effort telemetry" semantics — but the
+ * validation failure is observable on bus emits so backend can detect drift
+ * before the warehouse 400s. Callers that need strict validation should
+ * call `WireTelemetryRecordSchema.parse` directly.
  */
-export declare function buildWirePayload(internalRecord: Record<string, unknown>): WireTelemetryRecord;
+export declare function buildWirePayload(internalRecord: Record<string, unknown>, opts?: {
+    onValidationError?: (err: unknown) => void;
+}): WireTelemetryRecord;
 //# sourceMappingURL=event-builder.d.ts.map

package/dist/events/event-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-builder.d.ts","sourceRoot":"","sources":["../../src/events/event-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAyF,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAmBvJ,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,cAAc,GAAG,OAAO,GAAG,aAAa,GAAG,UAAU,GAAG,wBAAwB,CAAC;IACpI,QAAQ,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,MAAM,CAAC;IAC9D,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAqDD,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,YAAY,GAAG,mBAAmB,CAoI9E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB,CAE7F"}
+{"version":3,"file":"event-builder.d.ts","sourceRoot":"","sources":["../../src/events/event-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAiB,MAAM,aAAa,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAkH,KAAK,mBAAmB,EAA6B,MAAM,sBAAsB,CAAC;AAmB3M;;;;;;GAMG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aACnB,SAAS,EAAE,MAAM;gBAAjB,SAAS,EAAE,MAAM;CAI9C;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,cAAc,GAAG,OAAO,GAAG,aAAa,GAAG,UAAU,GAAG,wBAAwB,CAAC;IACpI,QAAQ,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,SAAS,EAAE,gBAAgB,CAAC;IAC5B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,MAAM,CAAC;IAC9D,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CAC5C;AA0ED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,YAAY,GAAG,mBAAmB,CAuL9E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,IAAI,CAAC,EAAE;IAAE,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GACpD,mBAAmB,CAcrB"}

package/dist/events/event-builder.js

@@ -1,13 +1,45 @@
 import { randomUUID } from 'node:crypto';
 import { normalizeModel } from './normalize.js';
 import { classifyConcern } from './concern-classifier.js';
-import { ErrorCode } from './telemetry-types.js';
+import { ErrorCode, WireTelemetryRecordSchema } from './telemetry-types.js';
 import { bucketFindingsBySeverity } from '../reporting/severity.js';
 import { rollupByTier, sumTokens } from '../bounded-execution/cost-rollup.js';
 import { priceTokens, resolveRateCard } from '../bounded-execution/cost-compute.js';
 import { clampStageCost, clampTaskCost, clampInputTokens, clampOutputTokens, clampCachedTokens, clampToolCallCount, clampFilesReadCount, clampFilesWrittenCount, clampTurnCount, clampDurationMsStage, clampDurationMsTotal, } from './clamp.js';
+/**
+ * Thrown when a stage marked `isLlmStage: true` arrives at the builder
+ * with no model identifier. Caught one level up by the stage-build loop
+ * (Task A5b) and converted into a `validation_warnings` diagnostic; the
+ * offending stage is dropped from the emitted event but the rest of the
+ * event still ships. Per spec D5 + §6.
+ */
+export class StageModelMissingError extends Error {
+    stageName;
+    constructor(stageName) {
+        super(`Stage '${stageName}' is marked isLlmStage:true but raw.model is null.`);
+        this.stageName = stageName;
+        this.name = 'StageModelMissingError';
+    }
+}
 const REVIEWED_ROUTES = new Set(['delegate', 'audit', 'review', 'debug', 'execute-plan', 'investigate']);
 const QUALITY_ONLY_ROUTES = new Set(['audit', 'review', 'debug', 'investigate']);
+/**
+ * Catches StageModelMissingError thrown by LLM stage builders and converts
+ * it into a validation warning. The stage is dropped from the emitted event,
+ * but the rest of the event still ships. Per spec §6 + task A5b.
+ */
+function safeBuild(name, fn, validationWarnings) {
+    try {
+        return fn();
+    }
+    catch (e) {
+        if (e instanceof StageModelMissingError) {
+            validationWarnings.push({ path: `stages.${name}`, rule: 'StageModelMissingError' });
+            return null;
+        }
+        throw e;
+    }
+}
 /** Read findings from the v4.4 lifecycle sources:
  *   - structuredReport.findings  → read-only routes (audit/review/debug/investigate/research/explore)
  *   - structuredReport.reviewConcerns → reviewed write routes (delegate/execute-plan)
@@ -41,7 +73,8 @@ function normalizeSeverity(s) {
 }
 export function buildTaskCompletedEvent(ctx) {
     const { route, runResult, client, mainModel } = ctx;
-    const stages = buildStages(route, runResult);
+    const validationWarnings = [];
+    const stages = buildStages(route, runResult, ctx.gates, validationWarnings);
     // Compute per-stage main-model-equivalent cost using the resolved rate card.
     // Plugs into StageEntryBase.mainEquivalentCostUSD so the schema stays valid
     // without weakening the field to optional.
@@ -52,6 +85,12 @@ export function buildTaskCompletedEvent(ctx) {
                 cachedReadTokens: st.cachedReadTokens ?? 0, cachedNonReadTokens: st.cachedNonReadTokens ?? 0 }, mainCard)
             : null;
     }
+    // Spec D11: when the implementing or rework stage was dropped due to
+    // StageModelMissingError, omit tierUsage.<tier> entirely — do not let
+    // another stage's model become the tier attribution.
+    const droppedImpl = validationWarnings.some(w => w.rule === 'StageModelMissingError'
+        && (w.path === 'stages.implementing' || w.path === 'stages.rework'));
+    const droppedTier = (runResult.stageStats?.implementing?.agentTier === 'complex') ? 'complex' : 'standard';
     // Gap 3 fix (4.0.3+): R4 invariant `totalDurationMs >= Σ stage.durationMs`
     // is satisfied by Math.max-ing the executor wall-clock against the stage
     // sum. Pre-fix, runResult.durationMs only covered the implementer's
@@ -75,7 +114,34 @@ export function buildTaskCompletedEvent(ctx) {
     const rawTotal = Math.max(runResult.durationMs ?? 0, stageDurationsSum);
     const totalDurationMs = clampDurationMsTotal(rawTotal);
     // ── Tier-level rollup (§3.2, §3.3) ───────────────────────────────────
-    const tierUsage = rollupByTier(stages.map(s => ({
+    // Filter to LLM-billable stages only — synthetic stages (annotated
+    // placeholder review on read-only routes, the commit stage) carry
+    // model: 'custom' and would corrupt tier rollup under last-seen
+    // semantics. Per spec §4.1.1 and §4.1.2.
+    const llmStages = stages.filter(s => s.isLlmStage);
+    // Tier-uniformity invariant (spec D9). Every LLM-billable stage at
+    // a given tier must share the same canonical model id. If violated,
+    // omit that tier from tierUsage and record a diagnostic — better
+    // honest-null than silent-wrong attribution.
+    const tierModels = {};
+    for (const s of llmStages) {
+        const tier = s.tier;
+        const set = tierModels[tier] ?? new Set();
+        set.add(s.model);
+        tierModels[tier] = set;
+    }
+    const divergentTiers = new Set();
+    for (const tier of ['standard', 'complex']) {
+        if ((tierModels[tier]?.size ?? 0) > 1) {
+            divergentTiers.add(tier);
+            validationWarnings.push({ path: `tierUsage.${tier}`, rule: 'R-TIER-MODEL-DIVERGENCE' });
+        }
+    }
+    if (droppedImpl) {
+        divergentTiers.add(droppedTier);
+    }
+    const rollupInput = llmStages.filter(s => !divergentTiers.has(s.tier));
+    const tierUsage = rollupByTier(rollupInput.map(s => ({
         tier: s.tier,
         model: s.model,
         costUSD: s.costUSD,
@@ -114,6 +180,13 @@ export function buildTaskCompletedEvent(ctx) {
     const escalationLog = runResult.escalationLog ?? [];
     const distinctProviders = new Set(escalationLog.map(a => a.provider)).size;
     const escalationCount = Math.max(0, distinctProviders - 1);
+    // Strip producer-internal isLlmStage before wire emission. Wire schema
+    // (telemetry-types.ts) does not include this field; backend transformer
+    // does not read it. Per spec D2.
+    const wireStages = stages.map(s => {
+        const { isLlmStage: _drop, ...rest } = s;
+        return rest;
+    });
     const internalRecord = {
         eventId: randomUUID(),
         route,
@@ -149,29 +222,51 @@ export function buildTaskCompletedEvent(ctx) {
         taskMaxIdleMs: runResult.taskMaxIdleMs ?? 0,
         sandboxViolationCount: Math.min(runResult.sandboxViolationCount ?? 0, 100),
         filesWrittenCount: (ctx.realFilesChanged ?? []).length,
-        stages,
+        stages: wireStages,
+        validation_warnings: validationWarnings.length > 0 ? validationWarnings : undefined,
     };
     return buildWirePayload(internalRecord);
 }
 /**
  * Wire payload builder. Internal record fields match the wire schema 1:1
  * after the v4.0.3 rename (mainModel/mainModelFamily everywhere — DB column
- * is `main_model`, header is `X-MMA-Main-Model`, no more `mainModel`
- * translation shim).
+ * is `main_model`, header is `X-MMA-Main-Model`).
+ *
+ * v5 — this used to be a `as unknown as WireTelemetryRecord` passthrough.
+ * The translator is now real: the internal record is passed through Zod
+ * (`WireTelemetryRecordSchema`) so the wire payload is schema-validated at
+ * the egress boundary. When the schema rejects, we fall back to the
+ * passthrough to preserve "best-effort telemetry" semantics — but the
+ * validation failure is observable on bus emits so backend can detect drift
+ * before the warehouse 400s. Callers that need strict validation should
+ * call `WireTelemetryRecordSchema.parse` directly.
  */
-export function buildWirePayload(internalRecord) {
+export function buildWirePayload(internalRecord, opts) {
+    const parsed = WireTelemetryRecordSchema.safeParse(internalRecord);
+    if (parsed.success) {
+        // Schema-strip: drop unknown fields by returning the parsed record. This
+        // is the v5 contract guarantee — only wire-schema fields cross the
+        // boundary.
+        return parsed.data;
+    }
+    // Schema rejected — surface the error to the caller and fall back to the
+    // passthrough so we never silently drop a telemetry row. Backend will
+    // 400 on schema mismatch; the bus event makes the drift discoverable
+    // before that point.
+    opts?.onValidationError?.(parsed.error);
     return internalRecord;
 }
-function buildStages(route, rr) {
+function buildStages(route, rr, gates, validationWarnings) {
+    const warnings = validationWarnings ?? [];
     const result = [];
-    const impl = buildImplStage(rr);
+    const impl = safeBuild('implementing', () => buildImplStage(rr, gates?.['implement']), warnings);
     if (impl)
         result.push(impl);
     if (REVIEWED_ROUTES.has(route)) {
         const status = rr.reviewVerdict ?? rr.qualityReviewStatus ?? rr.specReviewStatus ?? null;
         const stageRounds = rr.stageStats?.review?.roundsUsed;
         const rounds = stageRounds ?? (Math.max(rr.reviewRounds?.spec ?? 0, rr.reviewRounds?.quality ?? 0) || null);
-        const rev = buildReviewStage(rr, status, rounds);
+        const rev = safeBuild('review', () => buildReviewStage(rr, status, rounds, gates?.['review']), warnings);
         if (rev) {
             result.push(rev);
         }
@@ -190,23 +285,43 @@ function buildStages(route, rr) {
         }
     }
     if (REVIEWED_ROUTES.has(route) && !QUALITY_ONLY_ROUTES.has(route)) {
-        const rw = buildReworkStage(rr);
+        const rw = safeBuild('rework', () => buildReworkStage(rr, gates?.['rework']), warnings);
         if (rw)
             result.push(rw);
     }
-    const an = buildAnnotatingStage(rr);
+    const an = safeBuild('annotating', () => buildAnnotatingStage(rr, gates?.['annotate']), warnings);
     if (an)
         result.push(an);
-    const cm = buildCommitStage(rr);
+    const cm = safeBuild('committing', () => buildCommitStage(rr, gates?.['commit']), warnings);
     if (cm)
         result.push(cm);
     return result.slice(0, 8);
 }
+/**
+ * Overlay gate telemetry onto an extracted-stage base. Gates are the v5
+ * canonical source for `durationMs`, `costUSD`, `turnsUsed`. When both
+ * sources have a value, the gate wins (intentional: the gate is what the
+ * lifecycle actually produced; stageStats is the legacy mirror that the
+ * runner-shell and per-stage tracker fill in). Tokens, tool calls, and
+ * files-read/written remain on stageStats because the gate telemetry block
+ * doesn't carry them.
+ */
+function applyGateOverlay(base, gate) {
+    if (!gate)
+        return base;
+    const t = gate.telemetry;
+    return {
+        ...base,
+        durationMs: clampDurationMsStage(t.durationMs ?? base.durationMs),
+        costUSD: clampStageCost(t.costUSD ?? base.costUSD),
+        turnCount: clampTurnCount(t.turnsUsed ?? base.turnCount),
+    };
+}
 function extractStageData(raw, _rr, _stageName) {
     if (!raw || !raw.entered)
         return null;
     return {
-        model: raw.model ? normalizeModel(raw.model).canonical ?? raw.model : 'custom',
+        model: raw.model ? (normalizeModel(raw.model).canonical ?? raw.model) : null,
         tier: raw.agentTier ?? 'standard',
         round: raw.round ?? 0,
         durationMs: clampDurationMsStage(raw.durationMs ?? 0),
@@ -223,12 +338,16 @@ function extractStageData(raw, _rr, _stageName) {
         totalIdleMs: raw.totalIdleMs ?? 0,
     };
 }
-function buildImplStage(rr) {
+function buildImplStage(rr, gate) {
     const ss = rr.stageStats?.implementing;
-    const base = extractStageData(ss, rr, 'implementing');
+    let base = extractStageData(ss, rr, 'implementing');
     if (!base)
         return null;
-    return { name: 'implementing', ...base };
+    base = applyGateOverlay(base, gate);
+    if (base.model === null) {
+        throw new StageModelMissingError('implementing');
+    }
+    return { name: 'implementing', ...base, model: base.model, mainEquivalentCostUSD: null, isLlmStage: true };
 }
 /** Synthetic review stage entry for read-only routes that hardcode
  *  reviewPolicy: 'none'. The implementer is the finding producer; v5
@@ -268,13 +387,18 @@ function buildSyntheticReviewStage(findings) {
         roundsUsed: 1,
         concernCategories: categories.slice(0, 9),
         findingsBySeverity,
+        isLlmStage: false,
     };
 }
-function buildReviewStage(rr, status, rounds) {
+function buildReviewStage(rr, status, rounds, gate) {
     const ss = rr.stageStats?.review;
-    const base = extractStageData(ss, rr, 'review');
+    let base = extractStageData(ss, rr, 'review');
     if (!base)
         return null;
+    base = applyGateOverlay(base, gate);
+    if (base.model === null) {
+        throw new StageModelMissingError('review');
+    }
     // v4.4.x: projectFindings reads from structuredReport.findings (read-only
     // routes) and structuredReport.reviewConcerns (reviewed write routes). The
     // pre-v4.4 rr.concerns field is no longer populated by the lifecycle, so
@@ -300,42 +424,63 @@ function buildReviewStage(rr, status, rounds) {
     return {
         name: 'review',
         ...base,
+        model: base.model,
         verdict,
         roundsUsed: Math.min(rounds ?? 1, 10),
         concernCategories: categories.slice(0, 9),
         findingsBySeverity,
+        mainEquivalentCostUSD: null,
+        isLlmStage: true,
     };
 }
-function buildReworkStage(rr) {
+function buildReworkStage(rr, gate) {
     const ss = rr.stageStats?.rework;
-    const base = extractStageData(ss, rr, 'rework');
+    let base = extractStageData(ss, rr, 'rework');
     if (!base)
         return null;
+    base = applyGateOverlay(base, gate);
+    if (base.model === null) {
+        throw new StageModelMissingError('rework');
+    }
     const stageConcerns = projectFindings(rr).filter(c => c.source === 'spec_review' || c.source === 'quality_review' || c.source === 'review' || c.source === 'implementer');
     const triggeringCategories = [...new Set(stageConcerns.map(c => classifyConcern(c)))];
     return {
         name: 'rework',
         ...base,
+        model: base.model,
         triggeringConcernCategories: triggeringCategories.slice(0, 9),
+        mainEquivalentCostUSD: null,
+        isLlmStage: true,
     };
 }
-function buildAnnotatingStage(rr) {
+function buildAnnotatingStage(rr, gate) {
     const ss = rr.stageStats?.annotating;
-    const base = extractStageData(ss, rr, 'annotating');
+    let base = extractStageData(ss, rr, 'annotating');
     if (!base)
         return null;
+    base = applyGateOverlay(base, gate);
+    // Annotator is an LLM stage iff the runtime actually invoked a model.
+    // Per spec §4.1.3, the observable signal is whether stageStats.annotating.model
+    // was populated. Task A6 fixes the upstream so this is always populated when
+    // the LLM was called. When null (degraded pure-transform path), the stage
+    // appears in wire stages[] but is excluded from tier rollup.
+    const isLlmStage = base.model !== null && base.model !== 'custom';
     return {
         name: 'annotating',
         ...base,
+        model: base.model || 'custom',
+        isLlmStage,
+        mainEquivalentCostUSD: null,
         outcome: ss?.outcome ?? 'not_applicable',
         skipReason: ss?.outcome === 'skipped' ? (ss?.skipReason ?? 'other') : null,
     };
 }
-function buildCommitStage(rr) {
+function buildCommitStage(rr, gate) {
     const ss = rr.stageStats?.committing;
-    const base = extractStageData(ss, rr, 'committing');
+    let base = extractStageData(ss, rr, 'committing');
     if (!base)
         return null;
+    base = applyGateOverlay(base, gate);
     const commits = Array.isArray(rr.commits) ? rr.commits : [];
     const allFiles = commits.flatMap((c) => Array.isArray(c?.filesChanged)
         ? c.filesChanged.filter((f) => typeof f === 'string')
@@ -344,23 +489,20 @@ function buildCommitStage(rr) {
     return {
         name: 'committing',
         ...base,
+        model: base.model || 'custom',
         filesCommittedCount,
         // CommitStageRunner does not track branch-creation directly today;
         // name-diff against pre-commit refs is unreliable, so we report
         // false. A future change can wire this when CommitStageRunner emits
         // an explicit signal alongside filesCommittedCount.
         branchCreated: false,
+        mainEquivalentCostUSD: null,
+        isLlmStage: false,
     };
 }
 // ── Derivation helpers ─────────────────────────────────────────────────────
 function deriveTerminalStatus(rr) {
     const tr = rr.terminationReason;
-    if (tr === 'all_tiers_unavailable')
-        return 'unavailable';
-    if (tr === 'cost_ceiling')
-        return 'cost_exceeded';
-    if (tr === 'round_cap')
-        return 'incomplete';
     if (!tr || typeof tr !== 'object')
         return 'incomplete';
     switch (tr.cause) {