modelrig 0.9.0 → 0.10.0

package/dist/routes/screen-loader.js

@@ -67,7 +67,7 @@ function parseClassificationAndPhiGate(raw, ctx, problems) {
 /** Push a problem for every `{{var}}` referenced in the system template or the
  * grounding query that was not declared in `prompt.variables`. Colocated with
  * the variable parser it validates. */
-function pushUndeclaredVariableProblems(systemTemplate, groundingQuery, variables, problems) {
+function pushUndeclaredVariableProblems(systemTemplate, groundingQuery, variables, problems, userTemplate) {
     const declared = new Set(variables);
     if (systemTemplate !== "") {
         for (const ref of (0, template_1.scanTemplateVariables)(systemTemplate)) {
@@ -76,6 +76,13 @@ function pushUndeclaredVariableProblems(systemTemplate, groundingQuery, variable
             }
         }
     }
+    if (userTemplate !== undefined) {
+        for (const ref of (0, template_1.scanTemplateVariables)(userTemplate)) {
+            if (!declared.has(ref)) {
+                problems.push(`prompt.user references undeclared variable "${ref}" (declare it in prompt.variables)`);
+            }
+        }
+    }
     if (groundingQuery !== undefined) {
         for (const ref of (0, template_1.scanTemplateVariables)(groundingQuery)) {
             if (!declared.has(ref))

package/dist/run/accept.d.ts

@@ -42,6 +42,9 @@ export interface SuccessMetaInput {
     readonly mask?: RunMeta["mask"];
     /** SC-1a screen receipt (spec §5) — counts-only, when the route screens. */
     readonly screen?: RunMeta["screen"];
+    /** Unified Route U2 (D-2): the resolved served destination (always `direct` in
+     * U2 — `modelrig-served` fails closed pre-dispatch). Additive result metadata. */
+    readonly destination?: RunMeta["destination"];
 }
 /** The validated `RunMeta` for the accept path — `repairedBy` is null here (the
  * repair path builds its own meta), `validated` is always true. */

package/dist/run/accept.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../../src/run/accept.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE;;;iDAGiD;AACjD,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,UAAU,GAAG,IAAI,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,gBAAgB,CAiBlB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1C,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1C,uDAAuD;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACtC,uEAAuE;IACvE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,4EAA4E;IAC5E,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrC;AAED;mEACmE;AACnE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CA0BjE"}
+{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../../src/run/accept.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE;;;iDAGiD;AACjD,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,UAAU,GAAG,IAAI,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,gBAAgB,CAiBlB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1C,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1C,uDAAuD;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACtC,uEAAuE;IACvE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,4EAA4E;IAC5E,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC;sFACkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CAC/C;AAED;mEACmE;AACnE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CA2BjE"}

package/dist/run/accept.js

@@ -64,5 +64,6 @@ function buildSuccessMeta(input) {
         ...(input.quality !== undefined ? { quality: input.quality } : {}),
         ...(input.mask !== undefined ? { mask: input.mask } : {}),
         ...(input.screen !== undefined ? { screen: input.screen } : {}),
+        ...(input.destination !== undefined ? { destination: input.destination } : {}),
     };
 }

package/dist/run/cost.d.ts

@@ -4,8 +4,36 @@
  * site: a model with no pricing entry NEVER costs $0 against an active
  * envelope — the envelope is charged a conservative per-token rate instead,
  * while telemetry keeps the honest $0 with `pricing_missing` flagged.
+ *
+ * KNOWN GAP (issue #2 follow-up, S9c record): context bands are LISTED on
+ * `pricing_v2.context_bands` but NOT APPLIED here — a Gemini row whose prompt
+ * exceeds 200k tokens is priced at the ≤200k rates (Google doubles input,
+ * output and cache read above 200k), so such rows UNDER-state Google's list.
+ * The snapshot's `*_above_200k_tokens` keys were always ignored; this is not
+ * new, only now stated.
+ *
+ * SCOPE (QA-S5, 2026-10-12): served-tier pricing applies to what THIS module
+ * prices — the attempt cost row (`cost_estimate_usd`, both lanes, every
+ * attempt) and the `meta.cost` components. The server's managed re-pricing
+ * (`modelrig-server/src/compute-fee.ts` `listPriceCents`, which feeds the
+ * `/costs` rollup and the settlement draw) still calls `estimateCostUsd`
+ * WITHOUT a served tier and so prices at base. That is a money path and is
+ * deliberately not changed alongside this; tracked for the next money-path MR.
  */
-import type { AdapterUsage, ProviderId } from "../types/provider";
+import type { ModelPricing } from "../registry/pricing";
+import type { AdapterUsage, ProviderId, ServiceTier } from "../types/provider";
+/** The `servedTier` an attempt reports, when the caller has it — optional so
+ * every existing (tier-less) caller is unchanged and bills at base. */
+type UsageTier = Partial<Pick<AdapterUsage, "servedTier">>;
+/**
+ * Per-token rates for the tier that actually SERVED an attempt (issue #2).
+ * `standard` (or an unknown tier) ⇒ the flat base price — today's behaviour,
+ * byte-identical. `flex` / `priority` ⇒ the model's published `pricing_v2`
+ * tier rates (`tierRates`, per component — Gemini flex halves input + output
+ * but NOT cache read); a model that publishes no such tier bills at base, never
+ * at a guessed multiplier. Returns null only when the model is unpriced.
+ */
+export declare function pricingForServedTier(provider: ProviderId, model: string, servedTier: ServiceTier | undefined): ModelPricing | null;
 export declare const ESTIMATE_CHARS_PER_TOKEN = 4;
 export declare const ESTIMATE_MAX_OUTPUT_TOKENS = 64000;
 /** Addendum A1 conservative default — above the priciest frontier output
@@ -26,7 +54,7 @@ export declare function attemptCost(provider: ProviderId, model: string, usage:
  * `attemptCost`'s `pricingMissing`). Every component uses the SAME per-token
  * rates as {@link estimateCostUsd}, so the sum equals the recorded
  * `cost_estimate_usd` for a priced model. `other` is reserved (0 today). */
-export declare function costComponents(provider: ProviderId, model: string, usage: Pick<AdapterUsage, "tokensIn" | "tokensOut" | "tokensCached" | "tokensCacheWrite" | "tokensCacheWrite1h">): {
+export declare function costComponents(provider: ProviderId, model: string, usage: Pick<AdapterUsage, "tokensIn" | "tokensOut" | "tokensCached" | "tokensCacheWrite" | "tokensCacheWrite1h"> & UsageTier): {
     in: number;
     out: number;
     cache_read: number;
@@ -36,4 +64,5 @@ export declare function costComponents(provider: ProviderId, model: string, usag
 /** Pre-dispatch upper-bound estimate for the envelope precheck: prompt
  * length + the full output bound, at real pricing or the conservative rate. */
 export declare function dispatchEstimateUsd(provider: ProviderId, model: string, promptChars: number, unpricedRatePerTok: number): number;
+export {};
 //# sourceMappingURL=cost.d.ts.map

package/dist/run/cost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cost.d.ts","sourceRoot":"","sources":["../../src/run/cost.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAElE,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAEjD;;yEAEyE;AACzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,uEAAuE;IACvE,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,WAAW,CACzB,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,YAAY,EACnB,kBAAkB,EAAE,MAAM,GACzB,WAAW,CAkBb;AAED;;;;;4EAK4E;AAC5E,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,IAAI,CACT,YAAY,EACZ,UAAU,GAAG,WAAW,GAAG,cAAc,GAAG,kBAAkB,GAAG,oBAAoB,CACtF,GACA;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAkB5F;AAED;+EAC+E;AAC/E,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAOR"}
+{"version":3,"file":"cost.d.ts","sourceRoot":"","sources":["../../src/run/cost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAS/E;uEACuE;AACvE,KAAK,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;AAE3D;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,WAAW,GAAG,SAAS,GAClC,YAAY,GAAG,IAAI,CAiBrB;AAED,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAEjD;;yEAEyE;AACzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,uEAAuE;IACvE,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,WAAW,CACzB,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,YAAY,EACnB,kBAAkB,EAAE,MAAM,GACzB,WAAW,CAoBb;AAED;;;;;4EAK4E;AAC5E,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,IAAI,CACT,YAAY,EACZ,UAAU,GAAG,WAAW,GAAG,cAAc,GAAG,kBAAkB,GAAG,oBAAoB,CACtF,GACC,SAAS,GACV;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAmB5F;AAED;+EAC+E;AAC/E,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAOR"}

package/dist/run/cost.js

@@ -5,13 +5,65 @@
  * site: a model with no pricing entry NEVER costs $0 against an active
  * envelope — the envelope is charged a conservative per-token rate instead,
  * while telemetry keeps the honest $0 with `pricing_missing` flagged.
+ *
+ * KNOWN GAP (issue #2 follow-up, S9c record): context bands are LISTED on
+ * `pricing_v2.context_bands` but NOT APPLIED here — a Gemini row whose prompt
+ * exceeds 200k tokens is priced at the ≤200k rates (Google doubles input,
+ * output and cache read above 200k), so such rows UNDER-state Google's list.
+ * The snapshot's `*_above_200k_tokens` keys were always ignored; this is not
+ * new, only now stated.
+ *
+ * SCOPE (QA-S5, 2026-10-12): served-tier pricing applies to what THIS module
+ * prices — the attempt cost row (`cost_estimate_usd`, both lanes, every
+ * attempt) and the `meta.cost` components. The server's managed re-pricing
+ * (`modelrig-server/src/compute-fee.ts` `listPriceCents`, which feeds the
+ * `/costs` rollup and the settlement draw) still calls `estimateCostUsd`
+ * WITHOUT a served tier and so prices at base. That is a money path and is
+ * deliberately not changed alongside this; tracked for the next money-path MR.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_UNPRICED_RATE_USD_PER_MTOK = exports.ESTIMATE_MAX_OUTPUT_TOKENS = exports.ESTIMATE_CHARS_PER_TOKEN = void 0;
+exports.pricingForServedTier = pricingForServedTier;
 exports.attemptCost = attemptCost;
 exports.costComponents = costComponents;
 exports.dispatchEstimateUsd = dispatchEstimateUsd;
 const pricing_1 = require("../registry/pricing");
+const pricing_shape_1 = require("../registry/pricing-shape");
+/** The served tiers that carry their own published rates (issue #2). `standard`
+ * is `base` by definition; an unlisted tier bills at base (fail-closed, L5). */
+const SERVED_TIER_RATES = {
+    flex: "flex",
+    priority: "priority",
+};
+/**
+ * Per-token rates for the tier that actually SERVED an attempt (issue #2).
+ * `standard` (or an unknown tier) ⇒ the flat base price — today's behaviour,
+ * byte-identical. `flex` / `priority` ⇒ the model's published `pricing_v2`
+ * tier rates (`tierRates`, per component — Gemini flex halves input + output
+ * but NOT cache read); a model that publishes no such tier bills at base, never
+ * at a guessed multiplier. Returns null only when the model is unpriced.
+ */
+function pricingForServedTier(provider, model, servedTier) {
+    const base = (0, pricing_1.getPricing)(provider, model);
+    if (base === null)
+        return null;
+    const tier = servedTier === undefined ? undefined : SERVED_TIER_RATES[servedTier];
+    if (tier === undefined)
+        return base;
+    const v2 = (0, pricing_1.getPricingV2)(provider, model);
+    const rates = v2 === null ? null : (0, pricing_shape_1.tierRates)(v2, tier);
+    if (rates === null)
+        return base;
+    return {
+        inputUsdPerTok: rates.input,
+        outputUsdPerTok: rates.output,
+        // A component the richer shape does not carry falls back to the flat base
+        // rate (the authoritative snapshot value), never to a scaled guess.
+        cachedInputUsdPerTok: rates.cache_read ?? base.cachedInputUsdPerTok,
+        cacheWriteUsdPerTok: rates.cache_write ?? base.cacheWriteUsdPerTok,
+        cacheWrite1hUsdPerTok: rates.cache_write_1h ?? base.cacheWrite1hUsdPerTok,
+    };
+}
 exports.ESTIMATE_CHARS_PER_TOKEN = 4;
 exports.ESTIMATE_MAX_OUTPUT_TOKENS = 64000;
 /** Addendum A1 conservative default — above the priciest frontier output
@@ -19,7 +71,9 @@ exports.ESTIMATE_MAX_OUTPUT_TOKENS = 64000;
  * free. Override via MODELRIG_UNPRICED_RATE_USD_PER_MTOK / RigConfig. */
 exports.DEFAULT_UNPRICED_RATE_USD_PER_MTOK = 100;
 function attemptCost(provider, model, usage, unpricedRatePerTok) {
-    const pricing = (0, pricing_1.getPricing)(provider, model);
+    // Issue #2: price at the tier that SERVED (usage.servedTier), not the
+    // standard base — a flex row at standard rates overstated Gemini ~1.6×.
+    const pricing = pricingForServedTier(provider, model, usage.servedTier);
     if (pricing === null) {
         return {
             costUsd: 0,
@@ -37,7 +91,8 @@ function attemptCost(provider, model, usage, unpricedRatePerTok) {
  * rates as {@link estimateCostUsd}, so the sum equals the recorded
  * `cost_estimate_usd` for a priced model. `other` is reserved (0 today). */
 function costComponents(provider, model, usage) {
-    const pricing = (0, pricing_1.getPricing)(provider, model);
+    // Same served-tier rates as attemptCost, so the components still sum to the row.
+    const pricing = pricingForServedTier(provider, model, usage.servedTier);
     if (pricing === null)
         return null;
     const tokensIn = Math.max(usage.tokensIn, 0);

package/dist/run/destination.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Serving destination axis (Unified Route lane, spec U1 / ruling D-2) — the
+ * SINGLE vocabulary for WHERE a model call is served:
+ *   - "direct"          → called directly (today's behavior: routed lane uses the
+ *                          configured key; the raw inline on-ramp uses the caller's BYOK
+ *                          key). This is the default; ABSENT ⇒ BYTE-IDENTICAL.
+ *   - "modelrig-served" → ModelRig serves the model on its OWN managed credentials
+ *                          (Fireworks / DeepInfra today; Z.ai deferred), behind the
+ *                          `config.managedServing` flag (set in code, default off; wired in U3).
+ *
+ * RULING D-2 (Matt, 2026-09-08, final): this axis is a "destination", NEVER a
+ * "lane"/"mode", and its served value is NEVER "managed" — that word already means
+ * key_ownership:managed (billing, registry/claims.ts) and artifact_posture:managed
+ * (content custody, settings/task-settings.ts), both orthogonal and both keep their
+ * names. See docs/ModelRig/unified-route/{research,spec}.md.
+ *
+ * The per-provider serving facts are seeded in raw-support.ts's capability table (the
+ * ONE source of truth), not here — this module owns the type + the vocabulary set + the
+ * lookups, which READ that table. Wired in U1 (raw-support.ts); the route contract
+ * consumes it in U2.
+ */
+import type { ProviderId } from "../types/provider";
+/** The serving destination for a model call (ruling D-2). */
+export type Destination = "direct" | "modelrig-served";
+/** The ordered, exhaustive set — the loader validates a route's `destination:` against
+ * this (routes/loader.ts, U2), mirroring PROVIDERS/TIERS. */
+export declare const DESTINATIONS: readonly Destination[];
+/** The default when a route/run declares none — ABSENT ⇒ BYTE-IDENTICAL. */
+export declare const DEFAULT_DESTINATION: Destination;
+/**
+ * Which destinations a provider can be served through. Seeded in the capability table
+ * (raw-support.ts) — `direct` for every provider; `modelrig-served` only for providers
+ * with a ModelRig-owned key today (fireworks, deepinfra — config.ts:303-304). Reads the
+ * seeded serving cell from RAW_KNOB_SUPPORT — no second list (one source of truth).
+ */
+export declare function servedDestinations(provider: ProviderId): readonly Destination[];
+/** True when a provider can serve the given destination (over servedDestinations()). */
+export declare function destinationSupported(provider: ProviderId, destination: Destination): boolean;
+//# sourceMappingURL=destination.d.ts.map

package/dist/run/destination.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"destination.d.ts","sourceRoot":"","sources":["../../src/run/destination.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,6DAA6D;AAC7D,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAEvD;6DAC6D;AAC7D,eAAO,MAAM,YAAY,EAAE,SAAS,WAAW,EAAkC,CAAC;AAElF,4EAA4E;AAC5E,eAAO,MAAM,mBAAmB,EAAE,WAAsB,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,GAAG,SAAS,WAAW,EAAE,CAE/E;AAED,wFAAwF;AACxF,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAE5F"}

package/dist/run/destination.js

@@ -0,0 +1,45 @@
+"use strict";
+/**
+ * Serving destination axis (Unified Route lane, spec U1 / ruling D-2) — the
+ * SINGLE vocabulary for WHERE a model call is served:
+ *   - "direct"          → called directly (today's behavior: routed lane uses the
+ *                          configured key; the raw inline on-ramp uses the caller's BYOK
+ *                          key). This is the default; ABSENT ⇒ BYTE-IDENTICAL.
+ *   - "modelrig-served" → ModelRig serves the model on its OWN managed credentials
+ *                          (Fireworks / DeepInfra today; Z.ai deferred), behind the
+ *                          `config.managedServing` flag (set in code, default off; wired in U3).
+ *
+ * RULING D-2 (Matt, 2026-09-08, final): this axis is a "destination", NEVER a
+ * "lane"/"mode", and its served value is NEVER "managed" — that word already means
+ * key_ownership:managed (billing, registry/claims.ts) and artifact_posture:managed
+ * (content custody, settings/task-settings.ts), both orthogonal and both keep their
+ * names. See docs/ModelRig/unified-route/{research,spec}.md.
+ *
+ * The per-provider serving facts are seeded in raw-support.ts's capability table (the
+ * ONE source of truth), not here — this module owns the type + the vocabulary set + the
+ * lookups, which READ that table. Wired in U1 (raw-support.ts); the route contract
+ * consumes it in U2.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_DESTINATION = exports.DESTINATIONS = void 0;
+exports.servedDestinations = servedDestinations;
+exports.destinationSupported = destinationSupported;
+const raw_support_1 = require("./raw-support");
+/** The ordered, exhaustive set — the loader validates a route's `destination:` against
+ * this (routes/loader.ts, U2), mirroring PROVIDERS/TIERS. */
+exports.DESTINATIONS = ["direct", "modelrig-served"];
+/** The default when a route/run declares none — ABSENT ⇒ BYTE-IDENTICAL. */
+exports.DEFAULT_DESTINATION = "direct";
+/**
+ * Which destinations a provider can be served through. Seeded in the capability table
+ * (raw-support.ts) — `direct` for every provider; `modelrig-served` only for providers
+ * with a ModelRig-owned key today (fireworks, deepinfra — config.ts:303-304). Reads the
+ * seeded serving cell from RAW_KNOB_SUPPORT — no second list (one source of truth).
+ */
+function servedDestinations(provider) {
+    return raw_support_1.RAW_KNOB_SUPPORT[provider].serving.destinations;
+}
+/** True when a provider can serve the given destination (over servedDestinations()). */
+function destinationSupported(provider, destination) {
+    return servedDestinations(provider).includes(destination);
+}

package/dist/run/dispatch.d.ts

@@ -8,11 +8,12 @@
  * Tool *execution* is never ours (spec §4.4); these helpers normalize the
  * protocol and surface it — nothing here runs a tool.
  */
-import type { AdapterRequest, AdapterResult, CandidateRef, ProviderAdapter, ToolDefinition } from "../types/provider";
+import type { AdapterRequest, AdapterResult, CandidateRef, ProviderAdapter, ServiceTier, ToolDefinition } from "../types/provider";
 import type { RigFailure } from "../types/failures";
-import type { RouteBundle, RunMeta, RunOptions, RunResult, RunTags } from "../types/route";
+import type { OutputKind, RouteBundle, RunMeta, RunOptions, RunResult, RunTags } from "../types/route";
 import type { TelemetryRung, TelemetryStore } from "../types/telemetry";
 import type { AttemptMetaSource } from "../telemetry/attempt-meta";
+import type { Destination } from "./destination";
 import type { LadderKeyMinter } from "./ladder-key";
 import type { MaskReceipt, ResolvedMaskPolicy } from "../mask/types";
 import type { RunVault } from "../mask/vault";
@@ -23,7 +24,9 @@ import type { ResolvedScreenPolicy, ScreenReceipt } from "../screen/types";
  * the tool-call helper here can record through the same closure. */
 export interface AttemptTelemetry {
     readonly candidate: CandidateRef;
-    readonly servedTier: string;
+    /** Issue #2 (L6 F1): typed as the tier vocabulary (every producer passes a
+     * `ServiceTier`) so the meta usage can price at the served tier. */
+    readonly servedTier: ServiceTier;
     readonly tokensIn: number;
     readonly tokensOut: number;
     readonly tokensCached: number;
@@ -72,12 +75,28 @@ export declare function attemptMetaInputs(args: {
     readonly systemPrompt: string;
     readonly userDirective: string;
     readonly outputSchema: object | null;
+    /** QA-S7: the route's `outputKind` (absent on the bundle ⇒ `json`). This
+     * helper serves the ROUTE lane only, so every row it feeds carries the
+     * contract; the raw lane assembles its inputs inline and never sets it. */
+    readonly outputKind?: OutputKind | undefined;
     readonly result: AdapterResult;
     readonly tools?: readonly ToolDefinition[];
 }): AttemptMetaSource;
 /** run.ts's recordAttempt, threaded in so the tool-call path records through
  * the same ledger/tenancy closure the rest of the loop uses. */
 export type RecordAttempt = (attempt: AttemptTelemetry) => string;
+/**
+ * Telemetry tag entry for a serving destination (Unified Route U2, ruling D-2 —
+ * the SINGLE tag literal U3/U4 stamp through). Returns the `destination` tag
+ * ONLY for a NON-default destination; for `direct` (the default) it returns `{}`
+ * so a routed telemetry row gains NO new tag — this is the CRITICAL
+ * absent⇒byte-identical rule (never stamp `destination` when it is `direct`, or
+ * every routed row would drift). DORMANT in U2: `modelrig-served` fails closed
+ * pre-dispatch (resolve-destination.ts), so no successful row reaches recording
+ * with a non-default destination yet; U3 stamps through this one helper once
+ * managed serving is enabled.
+ */
+export declare function destinationTag(destination: Destination): Record<string, string>;
 /** Record the grounding-inject search's own telemetry row (WS3): a $-only line
  * under the synthetic "search" provider. Extracted from run.ts to keep it under
  * the LOC cap; behaviour is byte-identical to the prior inline recorder. */
@@ -185,6 +204,9 @@ export interface ToolCallResultParts {
     readonly callId: string;
     /** WI-1: the attempt-envelope inputs for the recorded row (spec §2). */
     readonly metaInputs?: AttemptMetaSource;
+    /** Unified Route U2 (D-2): the resolved served destination for `RunMeta`
+     * (always `direct` in U2 — `modelrig-served` fails closed pre-dispatch). */
+    readonly destination?: RunMeta["destination"];
 }
 /**
  * Record a tool-call turn and build its RunResult (spec §4.4). A tool call is

package/dist/run/dispatch.d.ts.map

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

package/dist/run/dispatch.js

@@ -11,6 +11,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attemptMetaInputs = attemptMetaInputs;
+exports.destinationTag = destinationTag;
 exports.recordSearchCostRow = recordSearchCostRow;
 exports.jsonModeCoaching = jsonModeCoaching;
 exports.buildAdapterRequest = buildAdapterRequest;
@@ -24,6 +25,8 @@ const node_crypto_1 = require("node:crypto");
 const attempt_meta_1 = require("../telemetry/attempt-meta");
 const cache_stamp_1 = require("./cache-stamp");
 const cache_handle_1 = require("./cache-handle");
+const destination_1 = require("./destination");
+const telemetry_row_1 = require("./telemetry-row");
 const seam_1 = require("../mask/seam");
 const grounding_1 = require("./grounding");
 const screen_1 = require("../screen/screen");
@@ -34,6 +37,7 @@ const screen_1 = require("../screen/screen");
 function attemptMetaInputs(args) {
     return {
         ...(args.result.meta !== undefined ? { adapterMeta: args.result.meta } : {}),
+        outputKind: args.outputKind ?? "json",
         renderedRequest: (0, attempt_meta_1.renderRequestForHash)({
             system: args.systemPrompt,
             user: args.userDirective,
@@ -43,6 +47,20 @@ function attemptMetaInputs(args) {
         ...(args.tools !== undefined ? { declaredToolNames: args.tools.map((t) => t.function.name) } : {}),
     };
 }
+/**
+ * Telemetry tag entry for a serving destination (Unified Route U2, ruling D-2 —
+ * the SINGLE tag literal U3/U4 stamp through). Returns the `destination` tag
+ * ONLY for a NON-default destination; for `direct` (the default) it returns `{}`
+ * so a routed telemetry row gains NO new tag — this is the CRITICAL
+ * absent⇒byte-identical rule (never stamp `destination` when it is `direct`, or
+ * every routed row would drift). DORMANT in U2: `modelrig-served` fails closed
+ * pre-dispatch (resolve-destination.ts), so no successful row reaches recording
+ * with a non-default destination yet; U3 stamps through this one helper once
+ * managed serving is enabled.
+ */
+function destinationTag(destination) {
+    return destination === destination_1.DEFAULT_DESTINATION ? {} : { destination };
+}
 /** Record the grounding-inject search's own telemetry row (WS3): a $-only line
  * under the synthetic "search" provider. Extracted from run.ts to keep it under
  * the LOC cap; behaviour is byte-identical to the prior inline recorder. */
@@ -51,9 +69,11 @@ function recordSearchCostRow(telemetry, route, effectiveTags, servedVariant, sea
     // rides the same monotonic seq; candidate_index is the candidate this search
     // grounds for (the current one — the run loop set it before the search).
     const ladderKey = ladder.stamp();
-    telemetry.record({
+    // U4: assembled by the ONE shared builder (./telemetry-row.ts). This row
+    // carries NO attempt-envelope `meta` — buildTelemetryRow omits the key when
+    // `meta` is not passed, preserving the former shape exactly.
+    telemetry.record((0, telemetry_row_1.buildTelemetryRow)({
         id: (0, node_crypto_1.randomUUID)(),
-        ts: new Date().toISOString(),
         route: route.route,
         routeVersion: route.version,
         provider: "search",
@@ -71,7 +91,8 @@ function recordSearchCostRow(telemetry, route, effectiveTags, servedVariant, sea
         failureClass: null,
         attemptsJson: "{}",
         // Rung tag (R1 review, F1): the grounding-inject search-cost row.
-        tagsJson: JSON.stringify({ ...effectiveTags, rung: "search" }),
+        baseTags: effectiveTags,
+        rung: "search",
         fingerprintCell: route.fingerprintCell,
         servedVariant,
         repairedBy: null,
@@ -81,7 +102,7 @@ function recordSearchCostRow(telemetry, route, effectiveTags, servedVariant, sea
         callId: ladderKey.callId,
         attemptSeq: ladderKey.attemptSeq,
         candidateIndex: ladderKey.candidateIndex,
-    });
+    }));
 }
 /** Schema coaching for the json_mode rung — ported from the production DeepSeek
  * provider's schema-in-prompt guidance (minLength-is-a-FLOOR etc.). Lives here
@@ -349,6 +370,7 @@ function emitToolCallResult(record, parts) {
             repairedBy: null,
             callId: parts.callId,
             toolCalls: result.toolCalls,
+            ...(parts.destination !== undefined ? { destination: parts.destination } : {}),
         },
     };
 }

package/dist/run/raw-defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raw-defaults.d.ts","sourceRoot":"","sources":["../../src/run/raw-defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAI9D,CAAC;AAEF,uDAAuD;AACvD,MAAM,WAAW,aAAa;IAC5B,kDAAkD;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;4EACwE;IACxE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAeD;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,EAAE,SAAS,aAAa,EA6DhD,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAK1C"}
+{"version":3,"file":"raw-defaults.d.ts","sourceRoot":"","sources":["../../src/run/raw-defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAI9D,CAAC;AAEF,uDAAuD;AACvD,MAAM,WAAW,aAAa;IAC5B,kDAAkD;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;4EACwE;IACxE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAeD;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,EAAE,SAAS,aAAa,EAkEhD,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAK1C"}

package/dist/run/raw-defaults.js

@@ -55,7 +55,7 @@ exports.RAW_DEFAULTS = [
     {
         knob: "serviceTier",
         default: "standard",
-        note: "forwarded to the adapter; `meta.servedTier` reports what actually served. On `flex`, set `timeoutMs` in minutes (default 900 s)",
+        note: "forwarded to the adapter; `meta.servedTier` reports what actually served, and the cost row is priced at the SERVED tier (gemini flex = 0.5× input + output, cache read NOT discounted; priority = 1.8×). On `flex`, set `timeoutMs` in minutes (default 900 s)",
     },
     {
         knob: "temperature",
@@ -87,6 +87,11 @@ exports.RAW_DEFAULTS = [
         default: "absent ⇒ byte-identical",
         note: "syntactic-JSON forcing (mime-shaping only); provider support per the raw-lane knob matrix",
     },
+    {
+        knob: "responseSchema",
+        default: "absent ⇒ byte-identical (no schema sent, no validation)",
+        note: "JSON Schema forwarded natively AND Ajv-checked client-side — a miss is a billed, terminal `content_invalid` (never repaired); `meta.schema_sha` on the row; provider support per the raw-lane knob matrix",
+    },
     {
         knob: "cache",
         default: "none",

package/dist/run/raw-finalize.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Raw-lane finalize + telemetry (spec §4.2/§4.3), extracted from raw.ts (Unified
+ * Route U4) to keep raw.ts under the 700-LOC cap (dev-rule P1). PURE MOVE in
+ * Phase A — `prepareRawStep`, `finalizeRaw`, `recordRawRow`, and the tier-aware
+ * timeout fixHint are byte-identical to their former raw.ts definitions.
+ *
+ * Raw-lane no-hard-hot-path-dependency invariant preserved: this module imports
+ * cost/telemetry/run-context/attempt-meta helpers and the native-search cost
+ * recorder — NO route/registry/capability-gate dependency.
+ */
+import { type ActiveRunContext } from "../artifacts/run-context";
+import type { AdapterResult, ServiceTier } from "../types/provider";
+import type { RunResult } from "../types/route";
+import type { RawRunDeps, RawRunInput } from "./raw";
+/** R1 — the teaching `fixHint` attached to a `timeout` failure on the raw lane:
+ * it names the elapsed budget, the tier, that tier's advertised target, and the
+ * two fixes (raise `timeoutMs`, or drop to `standard`). Built from
+ * `RAW_TIMEOUT_DEFAULT_MS` so the default it quotes can never drift. */
+export declare function rawTimeoutFixHint(input: RawRunInput, tier: ServiceTier): string;
+/** The active-run-context binding a raw call resolves ONCE at entry (the ALS
+ * boundary — read synchronously before the stream generator defers), so
+ * `finalizeRaw` can mirror the call into a ground-truth step (G1 spec §4). Null
+ * when there is no `run.start` on this path (the common, uninstrumented case). */
+export interface RawStepContext {
+    readonly runCtx: ActiveRunContext;
+    readonly stepKey: string;
+    readonly startedAtIso: string;
+}
+/**
+ * Read the ambient run context at the ENTRY of a raw call (spec §4) and, if
+ * present, resolve the step key `input.stepKey ?? tags.step ?? provider/model#n`
+ * (validated) — so `finalizeRaw` records a ground-truth step exactly like the
+ * routed lane. Also runs the required-dimension hygiene warning (spec §4),
+ * unconditionally, as the routed lane does. Fail-open: no context ⇒ null and no
+ * step is ever recorded; the dispatch is byte-identical to pre-G1.
+ */
+export declare function prepareRawStep(deps: RawRunDeps, input: RawRunInput): RawStepContext | null;
+/**
+ * Turn an `AdapterResult` into a RunResult, recording exactly one telemetry row.
+ * Shared by the buffered and streaming paths so cost/telemetry are byte-identical.
+ * On a failure result: record the (possibly billed) row, then throw
+ * `RigFailureError` — the server maps it to a status exactly like the slug lane.
+ *
+ * G1: when a run context was captured at entry (`step`), a ground-truth step is
+ * emitted after the telemetry row on BOTH branches (success and failure) —
+ * fail-open, so a buffer error there never affects the returned result. No
+ * artifact CONTENT is written on the raw lane (spec F3): steps are metadata.
+ */
+export declare function finalizeRaw(deps: RawRunDeps, input: RawRunInput, result: AdapterResult, latencyMs: number, step: RawStepContext | null): RunResult;
+//# sourceMappingURL=raw-finalize.d.ts.map

package/dist/run/raw-finalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-finalize.d.ts","sourceRoot":"","sources":["../../src/run/raw-finalize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,aAAa,EAGb,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAW,SAAS,EAAW,MAAM,gBAAgB,CAAC;AAKlE,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAErD;;;wEAGwE;AACxE,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,GAAG,MAAM,CAS/E;AA6ED;;;kFAGkF;AAClF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAG,cAAc,GAAG,IAAI,CAU1F;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,cAAc,GAAG,IAAI,GAC1B,SAAS,CA6JX"}