modelrig 0.9.0 → 0.10.0

package/dist/adapters/grok.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../src/adapters/grok.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMhE,OAAO,KAAK,EAAuB,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAShG,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAKD,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAc7E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CA+BtE;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAA;KAAE,CAAC;IAC1D,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;8EAC0E;IAC1E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;4DAGwD;IACxD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,eAAe,CAAC,EACrB;QAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;KAAE,GAChC;QACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;SAAE,CAAC;KACjG,CAAC;IACN,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,gBAAgB,CAmDlF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAsL5E"}
+{"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../src/adapters/grok.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMhE,OAAO,KAAK,EAAuB,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAUhG,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAKD,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAc7E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAkDtE;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAA;KAAE,CAAC;IAC1D,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;8EAC0E;IAC1E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;4DAGwD;IACxD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,eAAe,CAAC,EACrB;QAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;KAAE,GAChC;QACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;SAAE,CAAC;KACjG,CAAC;IACN,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,gBAAgB,CAmDlF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAqN5E"}

package/dist/adapters/grok.js

@@ -25,6 +25,7 @@ const openai_stream_1 = require("./openai-stream");
 const attempt_meta_map_1 = require("./attempt-meta-map");
 const sampling_1 = require("./sampling");
 const raw_support_1 = require("../run/raw-support");
+const responses_api_1 = require("./responses-api");
 const GROK_BASE_URL = "https://api.x.ai/v1";
 const DEFAULT_MAX_TOKENS = 32000;
 function grokSupports(feature, _model) {
@@ -75,6 +76,23 @@ function classifyGrokFailure(message) {
             fixHint: "this Grok model does not accept reasoning_effort — remove reasoning or pick a Grok reasoning variant",
         };
     }
+    // Native Web Search (spec N1, CE-9b, R1): xAI retired the old Live Search
+    // (`search_parameters` → HTTP 410); the native path is the Responses-API
+    // `web_search` tool. A 410 on the retired surface, or a `web_search` tool
+    // rejection, is taught rather than surfaced as a cryptic error. Retryable to
+    // the next candidate (network), never terminal.
+    if (/\b410\b|retired|no longer (available|supported)|search_parameters/.test(msg)) {
+        return {
+            cls: "network",
+            fixHint: "xAI retired the legacy Live Search surface (HTTP 410) — native grounding now uses the Responses-API web_search tool; upgrade the xAI SDK/endpoint or remove grounding",
+        };
+    }
+    if (/web_search|web search/.test(msg)) {
+        return {
+            cls: "network",
+            fixHint: "this Grok model does not support the native web_search tool on the Responses API — remove grounding, or pick a Grok model that supports native web search (or use the inject rung)",
+        };
+    }
     return { cls: "network" };
 }
 function buildGrokParams(model, req) {
@@ -99,10 +117,10 @@ function buildGrokParams(model, req) {
         ...(req.reasoning !== undefined
             ? { reasoning_effort: (0, raw_support_1.coarsenGrokReasoningEffort)(req.reasoning.level) }
             : {}),
-        // CE-9b: grounding is NOT mapped here. xAI retired Live Search
-        // (`search_parameters` → HTTP 410 on the CE-9 live gate); the replacement
-        // `web_search` tool is Responses-API-only. The raw-lane guard fails grok
-        // grounding closed (matrix: supported=false) until CE-9b adds that path.
+        // Grounding is NOT mapped on the Chat Completions path: the native
+        // `web_search` tool is Responses-API-only, so a grounded request is routed to
+        // `client.responses.create` (buildResponsesParams) in `call()` above — this
+        // chat path only ever runs for a NON-grounded request (absent ⇒ byte-identical).
         // response_format: a native strict json_schema (routed lane) wins; else the
         // RAW lane's mime-shaping json_object (CE-9 R4). Absent both ⇒ no key.
         ...(req.outputSchema !== null
@@ -157,6 +175,37 @@ function createGrokAdapter(config) {
                     baseURL: GROK_BASE_URL,
                     timeout: req.timeoutMs,
                 });
+                // Native Web Search (spec N1/N4): a GROUNDED request dispatches to the
+                // Responses API (`web_search` tool — xAI Agent Tools) and buffers the
+                // result. Non-grounded requests fall through to the EXISTING
+                // chat.completions path, unchanged (absent ⇒ byte-identical). The shape
+                // lives in responses-api.ts.
+                if (req.grounding === true) {
+                    const groundedAt = Date.now();
+                    // 7.x Responses types include `web_search` natively (the 4.x union only
+                    // knew `web_search_preview`) — buildResponsesParams returns the SDK's own
+                    // ResponseCreateParamsNonStreaming, so NO cast is needed here.
+                    const raw = await client.responses.create((0, responses_api_1.buildResponsesParams)(req));
+                    const mapped = (0, responses_api_1.mapResponsesResult)(raw);
+                    const usage = { ...mapped.usage, ttfbMs: Date.now() - groundedAt };
+                    attemptMeta = (0, attempt_meta_map_1.buildAdapterMeta)("grok", {
+                        req,
+                        finishReasonRaw: null,
+                        grounding: { citations: mapped.citations.length, searchProvider: "grok" },
+                        streaming: false,
+                    });
+                    if (mapped.text.trim().length === 0) {
+                        return fail("content_invalid", "empty response from Grok web_search (Responses API)", undefined, usage);
+                    }
+                    return {
+                        ok: true,
+                        text: mapped.text,
+                        usage,
+                        citations: mapped.citations,
+                        ...(mapped.searchCalls !== undefined ? { searchCalls: mapped.searchCalls } : {}),
+                        meta: attemptMeta,
+                    };
+                }
                 const params = buildGrokParams(model, req);
                 const stream = await client.chat.completions.create(params);
                 let text = "";

package/dist/adapters/openai-compat.d.ts

@@ -31,8 +31,14 @@ export interface OpenAICompatHost {
 /** The researched Tier-2 hosts (provider-coverage-plan §2, architect pick
  * 2026-08-02): DeepInfra (widest open catalog, lowest price) + Fireworks
  * (SOC 2/HIPAA reliability counterweight). Same weights on both on purpose
- * — host-level conformance/latency/price deltas become registry facts. */
-export declare const OPENAI_COMPAT_HOSTS: Readonly<Record<"deepinfra" | "fireworks", OpenAICompatHost>>;
+ * — host-level conformance/latency/price deltas become registry facts.
+ *
+ * B4a joins Z.ai (Zhipu, the GLM family) as a first-party OpenAI-compat host on
+ * its international endpoint. NO `shapeModelId`: Z.ai serves models by their bare
+ * id (`glm-5p2`) with no wire prefix (unlike Fireworks' `accounts/…` path), so
+ * the model id passes through verbatim — same as DeepInfra. Grounding stays
+ * fail-closed (raw-support.ts) until B4b wires native GLM `web_search`. */
+export declare const OPENAI_COMPAT_HOSTS: Readonly<Record<"deepinfra" | "fireworks" | "zai", OpenAICompatHost>>;
 export declare function classifyCompatFailure(message: string, host: string): ClassifiedFailure;
 interface ChatMessage {
     readonly role: "system" | "user";

package/dist/adapters/openai-compat.d.ts.map

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

package/dist/adapters/openai-compat.js

@@ -42,10 +42,17 @@ function shapeFireworksModelId(model) {
 /** The researched Tier-2 hosts (provider-coverage-plan §2, architect pick
  * 2026-08-02): DeepInfra (widest open catalog, lowest price) + Fireworks
  * (SOC 2/HIPAA reliability counterweight). Same weights on both on purpose
- * — host-level conformance/latency/price deltas become registry facts. */
+ * — host-level conformance/latency/price deltas become registry facts.
+ *
+ * B4a joins Z.ai (Zhipu, the GLM family) as a first-party OpenAI-compat host on
+ * its international endpoint. NO `shapeModelId`: Z.ai serves models by their bare
+ * id (`glm-5p2`) with no wire prefix (unlike Fireworks' `accounts/…` path), so
+ * the model id passes through verbatim — same as DeepInfra. Grounding stays
+ * fail-closed (raw-support.ts) until B4b wires native GLM `web_search`. */
 exports.OPENAI_COMPAT_HOSTS = {
     deepinfra: { baseUrl: "https://api.deepinfra.com/v1/openai" },
     fireworks: { baseUrl: "https://api.fireworks.ai/inference/v1", shapeModelId: shapeFireworksModelId },
+    zai: { baseUrl: "https://api.z.ai/api/paas/v4" },
 };
 function classifyCompatFailure(message, host) {
     const msg = message.toLowerCase();

package/dist/adapters/openai-stream.d.ts

@@ -13,6 +13,7 @@
  * dispatch, which is the spec's sanctioned `buffered` mode.
  */
 import type { AdapterRequest, AdapterStreamEvent, ProviderId, ServiceTier } from "../types/provider";
+import type { ServedTierSource } from "../telemetry/attempt-meta";
 import type { OpenAIToolCallDelta } from "./tool-mapping";
 /** The permissive chunk shape common to the OpenAI-dialect hosts. */
 export interface OpenAIDialectChunk {
@@ -46,8 +47,15 @@ export interface OpenAIStreamConfig {
     readonly provider: ProviderId;
     /** Where cached-token counts live in this dialect's usage block. */
     readonly cachedTokenSource: "details" | "cache_hit";
-    /** Served-tier resolver (openai maps flex/priority; the rest are standard). */
-    readonly mapServedTier: (raw: string | null, requested: ServiceTier) => ServiceTier;
+    /** Served-tier resolver (openai maps flex/priority; the rest are standard).
+     * Issue #2 (L6 F5): a resolver may return `{ tier, source }` to disclose
+     * whether the tier was echoed by the provider or fell back to the requested
+     * tier (`meta.served_tier_source`); a bare tier (the tier-less hosts) leaves
+     * the meta key absent. */
+    readonly mapServedTier: (raw: string | null, requested: ServiceTier) => ServiceTier | {
+        readonly tier: ServiceTier;
+        readonly source: ServedTierSource;
+    };
 }
 /**
  * Drain an OpenAI-dialect completion stream into `AdapterStreamEvent`s. Emits a

package/dist/adapters/openai-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-stream.d.ts","sourceRoot":"","sources":["../../src/adapters/openai-stream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAElB,UAAU,EACV,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,qEAAqE;AACrE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;QACtB,QAAQ,CAAC,KAAK,CAAC,EAAE;YACf,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;SACtD,CAAC;QACF,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACxC,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QACpC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACrE,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QAC1C;;6DAEqD;QACrD,QAAQ,CAAC,oBAAoB,CAAC,EAAE;YAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1E,GAAG,IAAI,CAAC;CACV;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAC9B,oEAAoE;IACpE,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,WAAW,CAAC;IACpD,+EAA+E;IAC/E,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,WAAW,KAAK,WAAW,CAAC;CACrF;AAED;;;;;;GAMG;AACH,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,aAAa,CAAC,kBAAkB,CAAC,EACzC,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,kBAAkB,GACtB,cAAc,CAAC,kBAAkB,CAAC,CAuHpC"}
+{"version":3,"file":"openai-stream.d.ts","sourceRoot":"","sources":["../../src/adapters/openai-stream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAElB,UAAU,EACV,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,qEAAqE;AACrE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;QACtB,QAAQ,CAAC,KAAK,CAAC,EAAE;YACf,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;SACtD,CAAC;QACF,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACxC,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QACpC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACrE,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QAC1C;;6DAEqD;QACrD,QAAQ,CAAC,oBAAoB,CAAC,EAAE;YAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1E,GAAG,IAAI,CAAC;CACV;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAC9B,oEAAoE;IACpE,QAAQ,CAAC,iBAAiB,EAAE,SAAS,GAAG,WAAW,CAAC;IACpD;;;;8BAI0B;IAC1B,QAAQ,CAAC,aAAa,EAAE,CACtB,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,EAAE,WAAW,KACnB,WAAW,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;KAAE,CAAC;CACtF;AAED;;;;;;GAMG;AACH,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,aAAa,CAAC,kBAAkB,CAAC,EACzC,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,kBAAkB,GACtB,cAAc,CAAC,kBAAkB,CAAC,CA2HpC"}

package/dist/adapters/openai-stream.js

@@ -72,12 +72,15 @@ async function* streamOpenAIDialect(chunks, req, dispatchedAt, cfg) {
     // prompt_tokens already INCLUDES cached (and any write) on the OpenAI dialect,
     // so tokensIn = promptTokens honors the subset invariant as-is. There is no 1h
     // TTL tier on this dialect (OpenAI 5.6 writes are a single 30m tier) → 1h = 0.
+    const resolvedTier = cfg.mapServedTier(responseTier, req.requestedTier);
+    const servedTier = typeof resolvedTier === "string" ? resolvedTier : resolvedTier.tier;
+    const servedTierSource = typeof resolvedTier === "string" ? undefined : resolvedTier.source;
     const usage = {
         tokensIn: promptTokens,
         tokensOut: completionTokens,
         tokensCached: cachedTokens,
         tokensCacheWrite: cacheWriteTokens,
-        servedTier: cfg.mapServedTier(responseTier, req.requestedTier),
+        servedTier,
         ...(ttfbMs !== undefined ? { ttfbMs } : {}),
     };
     const toolCalls = toolCallAcc.finalize();
@@ -91,6 +94,7 @@ async function* streamOpenAIDialect(chunks, req, dispatchedAt, cfg) {
         providerRequestId: responseId,
         toolCalls,
         streaming: true,
+        ...(servedTierSource !== undefined ? { servedTierSource } : {}),
     });
     const fail = (message, fixHint) => ({
         kind: "final",

package/dist/adapters/openai.d.ts

@@ -11,9 +11,10 @@
  * Copyright (c) 2023 Berri AI, MIT License — retain this notice if LiteLLM's
  * openai transformation logic is consulted during the port.
  */
-import type { CapabilityFlag, ProviderAdapter } from "../types/provider";
+import type { CapabilityFlag, ProviderAdapter, ServiceTier } from "../types/provider";
 import type { ClassifiedFailure, ShapingInput } from "./gemini";
 import type { OpenAIWireTool, OpenAIWireToolChoice } from "./tool-mapping";
+import type { ServedTierSource } from "../telemetry/attempt-meta";
 export interface OpenAIAdapterConfig {
     readonly apiKey: string;
 }
@@ -57,6 +58,14 @@ export interface OpenAIShapedParams {
     readonly tool_choice?: OpenAIWireToolChoice;
 }
 export declare function buildOpenAIParams(model: string, req: ShapingInput): OpenAIShapedParams;
+/** Served tier from the response's `service_tier` echo; absent ⇒ the requested
+ * tier (a flex request without an echo bills flex in production). Issue #2 (L6
+ * F5): the fallback is disclosed on `meta.served_tier_source` now that cost rows
+ * price at the served tier. Pure; exported for the unit test. */
+export declare function mapOpenAIServedTier(raw: string | null, requested: ServiceTier): {
+    readonly tier: ServiceTier;
+    readonly source: ServedTierSource;
+};
 export declare function createOpenAIAdapter(config: OpenAIAdapterConfig): ProviderAdapter;
 export {};
 //# sourceMappingURL=openai.d.ts.map

package/dist/adapters/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/adapters/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMhE,OAAO,KAAK,EAAuB,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAQhG,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAMD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAI9D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAe9E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CA8BxE;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAA;KAAE,CAAC;IAC1D,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,KAAK,CAAC;IACxC;;;oEAGgE;IAChE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAClE,QAAQ,CAAC,eAAe,CAAC,EACrB;QAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;KAAE,GAChC;QACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;SAAE,CAAC;KACjG,CAAC;IACN,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,CAuDtF;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,eAAe,CAsOhF"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/adapters/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EACf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMhE,OAAO,KAAK,EAAuB,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAIhG,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKjF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAMD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAI9D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAe9E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CA0CxE;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAA;KAAE,CAAC;IAC1D,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,KAAK,CAAC;IACxC;;;oEAGgE;IAChE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAClE,QAAQ,CAAC,eAAe,CAAC,EACrB;QAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;KAAE,GAChC;QACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;SAAE,CAAC;KACjG,CAAC;IACN,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,CAuDtF;AAOD;;;iEAGiE;AACjE,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,EAAE,WAAW,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAKnE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,eAAe,CAuQhF"}

package/dist/adapters/openai.js

@@ -20,12 +20,14 @@ exports.isModelFlexEligible = isModelFlexEligible;
 exports.openaiSupports = openaiSupports;
 exports.classifyOpenAIFailure = classifyOpenAIFailure;
 exports.buildOpenAIParams = buildOpenAIParams;
+exports.mapOpenAIServedTier = mapOpenAIServedTier;
 exports.createOpenAIAdapter = createOpenAIAdapter;
 const openai_1 = __importDefault(require("openai"));
 const tool_mapping_1 = require("./tool-mapping");
 const openai_stream_1 = require("./openai-stream");
 const attempt_meta_map_1 = require("./attempt-meta-map");
 const sampling_1 = require("./sampling");
+const responses_api_1 = require("./responses-api");
 /** OpenAI's documented flex-eligible allowlist as of 2026-05 (ported).
  * Mini and nano variants are silently downgraded to default tier. */
 const FLEX_ELIGIBLE_PREFIXES = ["gpt-5.4", "gpt-5.2", "gpt-5.1", "gpt-5", "gpt-4.1"];
@@ -84,6 +86,17 @@ function classifyOpenAIFailure(message) {
             fixHint: "this model does not accept reasoning_effort — remove reasoning or pick a reasoning model (e.g. an o-series / gpt-5 reasoning model)",
         };
     }
+    // Native Web Search (spec N1, R1): a Responses-API `web_search` tool rejection
+    // (400 unsupported tool / unknown tool / model without web search) is taught,
+    // not surfaced as a cryptic generic 400 — the point of forwarding verbatim
+    // rather than a per-model allowlist. Retryable to the next candidate (network),
+    // never terminal.
+    if (/web_search|web search/.test(msg)) {
+        return {
+            cls: "network",
+            fixHint: "this OpenAI model does not support the native web_search tool on the Responses API — remove grounding, or pick a model that supports native web search (or use the inject rung)",
+        };
+    }
     return { cls: "network" };
 }
 const DEFAULT_MAX_COMPLETION_TOKENS = 32000;
@@ -147,14 +160,18 @@ function buildOpenAIParams(model, req) {
  * completion tokens on a 50K+ token prompt = flex degradation / stream drop. */
 const SUSPICIOUSLY_SHORT_VISIBLE = 200;
 const LONG_FORM_PROMPT_THRESHOLD = 50000;
-function mapServedTier(raw, requested) {
+/** Served tier from the response's `service_tier` echo; absent ⇒ the requested
+ * tier (a flex request without an echo bills flex in production). Issue #2 (L6
+ * F5): the fallback is disclosed on `meta.served_tier_source` now that cost rows
+ * price at the served tier. Pure; exported for the unit test. */
+function mapOpenAIServedTier(raw, requested) {
     if (raw === "flex")
-        return "flex";
+        return { tier: "flex", source: "provider" };
     if (raw === "priority")
-        return "priority";
+        return { tier: "priority", source: "provider" };
     if (raw === "default" || raw === "auto")
-        return "standard";
-    return requested === "flex" || requested === "priority" ? requested : "standard";
+        return { tier: "standard", source: "provider" };
+    return { tier: requested === "flex" || requested === "priority" ? requested : "standard", source: "requested_fallback" };
 }
 function createOpenAIAdapter(config) {
     return {
@@ -183,6 +200,37 @@ function createOpenAIAdapter(config) {
             });
             try {
                 const client = new openai_1.default({ apiKey: config.apiKey, timeout: req.timeoutMs });
+                // Native Web Search (spec N1/N4): a GROUNDED request dispatches to the
+                // Responses API (`web_search` tool) and buffers the result. Non-grounded
+                // requests fall through to the EXISTING chat.completions path, unchanged
+                // (absent ⇒ byte-identical). Kept as thin as possible — the shape lives
+                // in responses-api.ts.
+                if (req.grounding === true) {
+                    const groundedAt = Date.now();
+                    // 7.x Responses types include `web_search` natively (the 4.x union only
+                    // knew `web_search_preview`) — buildResponsesParams returns the SDK's own
+                    // ResponseCreateParamsNonStreaming, so NO cast is needed here.
+                    const raw = await client.responses.create((0, responses_api_1.buildResponsesParams)(req));
+                    const mapped = (0, responses_api_1.mapResponsesResult)(raw);
+                    const usage = { ...mapped.usage, ttfbMs: Date.now() - groundedAt };
+                    attemptMeta = (0, attempt_meta_map_1.buildAdapterMeta)("openai", {
+                        req,
+                        finishReasonRaw: null,
+                        grounding: { citations: mapped.citations.length, searchProvider: "openai" },
+                        streaming: false,
+                    });
+                    if (mapped.text.trim().length === 0) {
+                        return fail("content_invalid", "empty response from OpenAI web_search (Responses API)", undefined, usage);
+                    }
+                    return {
+                        ok: true,
+                        text: mapped.text,
+                        usage,
+                        citations: mapped.citations,
+                        ...(mapped.searchCalls !== undefined ? { searchCalls: mapped.searchCalls } : {}),
+                        meta: attemptMeta,
+                    };
+                }
                 const params = buildOpenAIParams(model, req);
                 const dispatchedAt = Date.now();
                 const stream = await client.chat.completions.create(params);
@@ -228,13 +276,14 @@ function createOpenAIAdapter(config) {
                         reasoningTokens = chunk.usage.completion_tokens_details?.reasoning_tokens ?? 0;
                     }
                 }
+                const servedTierInfo = mapOpenAIServedTier(responseTier, req.requestedTier);
                 // prompt_tokens already INCLUDES cached+write → tokensIn is subset-correct.
                 const usage = {
                     tokensIn: promptTokens,
                     tokensOut: completionTokens,
                     tokensCached: cachedTokens,
                     tokensCacheWrite: cacheWriteTokens,
-                    servedTier: mapServedTier(responseTier, req.requestedTier),
+                    servedTier: servedTierInfo.tier,
                     ...(ttfbMs !== undefined ? { ttfbMs } : {}),
                 };
                 // Tool-call turn (spec §4.4): the model chose to call a tool. Surface
@@ -253,6 +302,7 @@ function createOpenAIAdapter(config) {
                     providerRequestId: responseId,
                     toolCalls,
                     streaming: false,
+                    servedTierSource: servedTierInfo.source,
                 });
                 // Any streamed refusal is terminal for this call, even alongside
                 // partial content — OpenAI's structured-output semantics (ported).
@@ -307,7 +357,7 @@ function createOpenAIAdapter(config) {
                 yield* (0, openai_stream_1.streamOpenAIDialect)(stream, req, dispatchedAt, {
                     provider: "openai",
                     cachedTokenSource: "details",
-                    mapServedTier,
+                    mapServedTier: mapOpenAIServedTier,
                 });
             }
             catch (error) {

package/dist/adapters/responses-api.d.ts

@@ -0,0 +1,61 @@
+/**
+ * Responses-API dispatch path (Native Web Search lane, spec N1–N2) — the SHARED
+ * request/response mapping for providers whose native `web_search` tool lives only
+ * on `/v1/responses` (OpenAI + xAI/Grok today; same shape). This is a NEW dispatch
+ * path, NOT an extension of the Chat Completions `tools` block — see research §2.
+ *
+ * DOCTRINE (inherited from CE-9):
+ *  - ABSENT ⇒ BYTE-IDENTICAL. This path is entered ONLY for a grounded request
+ *    (`req.grounding === true`). A non-grounded request stays on the adapter's
+ *    existing `chat.completions.create` call, unchanged. The per-adapter branch
+ *    lives in openai.ts / grok.ts (Step 2); this module owns only the Responses shape.
+ *  - FORWARD-VERBATIM + CLASSIFY-TEACHABLY: forward the web_search tool + sampling/
+ *    reasoning under their Responses-dialect names; let the provider enforce; map a
+ *    rejection onto an EXISTING FailureClass with a teaching fixHint (no new class).
+ *  - CITATIONS: map `response` citations onto the `url_citation` shape already used
+ *    by the inject rung (src/run/grounding.ts) — do NOT invent a second type.
+ */
+import type OpenAI from "openai";
+import type { AdapterRequest, AdapterUsage } from "../types/provider";
+import type { UrlCitation } from "../run/grounding";
+/**
+ * Shaped parameters for `client.responses.create` on the grounded path. This is
+ * the SDK's own non-streaming Responses request type (openai@7.x
+ * `ResponseCreateParamsNonStreaming`) — the grounded path buffers a single
+ * `Response` (no `stream: true`), so the params type-check natively against
+ * `client.responses.create` with NO cast. `input` is the message list
+ * (EasyInputMessage `{ role, content }`), `tools` carries the native
+ * `web_search` server tool (now a first-class member of the SDK `Tool` union —
+ * the 4.x types only knew `web_search_preview`, which is why this path used to
+ * cast), and sampling/reasoning ride their Responses-dialect names
+ * (`temperature`/`top_p` unchanged, `max_output_tokens`, `reasoning.effort`).
+ */
+export type ResponsesShapedParams = OpenAI.Responses.ResponseCreateParamsNonStreaming;
+/** Normalized result of a grounded Responses call (spec N2). Citations reuse the
+ * inject rung's `url_citation` shape (`src/run/grounding.ts`) — no second type. */
+export interface ResponsesResult {
+    readonly text: string;
+    readonly usage: AdapterUsage;
+    readonly citations: readonly UrlCitation[];
+    /** Native web_search tool calls billed on this response (spec N3). Absent ⇒ the
+     * raw success path assumes 1 (disclosed). */
+    readonly searchCalls?: number;
+}
+/**
+ * Build the `responses.create` params for a grounded request. Appends the
+ * `web_search` tool; forwards sampling/reasoning. Callers MUST only invoke this when
+ * `req.grounding === true` (the guard already enforced provider support pre-dispatch).
+ *
+ * Reasoning maps 1:1 for OpenAI (`level` → `reasoning.effort`); for grok the neutral
+ * four-level `level` is coarsened to xAI's `low|high` via `coarsenGrokReasoningEffort`
+ * (the SAME disclosed mapping the Chat Completions path uses — never a silent drop).
+ */
+export declare function buildResponsesParams(req: AdapterRequest): ResponsesShapedParams;
+/**
+ * Map a raw `responses.create` result onto ModelRig's normalized shape: output text,
+ * AdapterUsage (cache-read is a SUBSET of `tokensIn`, per the WS-A invariant), and
+ * citations in the `url_citation` shape. A zero-citation grounded response is
+ * SURFACED (empty array), never thrown (spec N2).
+ */
+export declare function mapResponsesResult(response: unknown): ResponsesResult;
+//# sourceMappingURL=responses-api.d.ts.map

package/dist/adapters/responses-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"responses-api.d.ts","sourceRoot":"","sources":["../../src/adapters/responses-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAOpD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,gCAAgC,CAAC;AAEtF;mFACmF;AACnF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;IAC3C;iDAC6C;IAC7C,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,qBAAqB,CA8B/E;AA6BD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,GAAG,eAAe,CAyDrE"}

package/dist/adapters/responses-api.js

@@ -0,0 +1,124 @@
+"use strict";
+/**
+ * Responses-API dispatch path (Native Web Search lane, spec N1–N2) — the SHARED
+ * request/response mapping for providers whose native `web_search` tool lives only
+ * on `/v1/responses` (OpenAI + xAI/Grok today; same shape). This is a NEW dispatch
+ * path, NOT an extension of the Chat Completions `tools` block — see research §2.
+ *
+ * DOCTRINE (inherited from CE-9):
+ *  - ABSENT ⇒ BYTE-IDENTICAL. This path is entered ONLY for a grounded request
+ *    (`req.grounding === true`). A non-grounded request stays on the adapter's
+ *    existing `chat.completions.create` call, unchanged. The per-adapter branch
+ *    lives in openai.ts / grok.ts (Step 2); this module owns only the Responses shape.
+ *  - FORWARD-VERBATIM + CLASSIFY-TEACHABLY: forward the web_search tool + sampling/
+ *    reasoning under their Responses-dialect names; let the provider enforce; map a
+ *    rejection onto an EXISTING FailureClass with a teaching fixHint (no new class).
+ *  - CITATIONS: map `response` citations onto the `url_citation` shape already used
+ *    by the inject rung (src/run/grounding.ts) — do NOT invent a second type.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildResponsesParams = buildResponsesParams;
+exports.mapResponsesResult = mapResponsesResult;
+const sampling_1 = require("./sampling");
+const raw_support_1 = require("../run/raw-support");
+/** Parity with the Chat Completions default output cap (openai.ts / grok.ts). */
+const DEFAULT_MAX_OUTPUT_TOKENS = 32000;
+/**
+ * Build the `responses.create` params for a grounded request. Appends the
+ * `web_search` tool; forwards sampling/reasoning. Callers MUST only invoke this when
+ * `req.grounding === true` (the guard already enforced provider support pre-dispatch).
+ *
+ * Reasoning maps 1:1 for OpenAI (`level` → `reasoning.effort`); for grok the neutral
+ * four-level `level` is coarsened to xAI's `low|high` via `coarsenGrokReasoningEffort`
+ * (the SAME disclosed mapping the Chat Completions path uses — never a silent drop).
+ */
+function buildResponsesParams(req) {
+    const input = [
+        ...(req.systemPrompt !== "" ? [{ role: "system", content: req.systemPrompt }] : []),
+        { role: "user", content: req.userPrompt },
+    ];
+    const reasoning = req.reasoning !== undefined
+        ? {
+            reasoning: {
+                effort: req.candidate.provider === "grok"
+                    ? (0, raw_support_1.coarsenGrokReasoningEffort)(req.reasoning.level)
+                    : req.reasoning.level,
+            },
+        }
+        : {};
+    return {
+        model: req.candidate.model,
+        input,
+        // Native web-search server tool, left at defaults. As of openai@7.x the
+        // `web_search` tool type also accepts `filters`, `external_web_access`, and
+        // `search_context_size` (a token/context-budget knob) — NOT wired here on
+        // purpose (they need product knobs); available for a follow-up mission.
+        tools: [{ type: "web_search" }],
+        max_output_tokens: (0, sampling_1.effectiveMaxOutputTokens)(req, DEFAULT_MAX_OUTPUT_TOKENS),
+        // temperature / top_p share the Chat Completions dialect names on the
+        // Responses API — reuse the one sampling mapper (absent ⇒ no keys added).
+        ...(0, sampling_1.openAISamplingFields)(req),
+        ...reasoning,
+    };
+}
+/**
+ * Map a raw `responses.create` result onto ModelRig's normalized shape: output text,
+ * AdapterUsage (cache-read is a SUBSET of `tokensIn`, per the WS-A invariant), and
+ * citations in the `url_citation` shape. A zero-citation grounded response is
+ * SURFACED (empty array), never thrown (spec N2).
+ */
+function mapResponsesResult(response) {
+    const r = (typeof response === "object" && response !== null ? response : {});
+    const items = Array.isArray(r.output) ? r.output : [];
+    // Text: prefer the SDK convenience aggregate, else concatenate output_text parts.
+    const aggregate = typeof r.output_text === "string" ? r.output_text : "";
+    const text = aggregate !== ""
+        ? aggregate
+        : items
+            .filter((it) => it.type === "message")
+            .flatMap((it) => it.content ?? [])
+            .filter((c) => c.type === "output_text" && typeof c.text === "string")
+            .map((c) => c.text)
+            .join("");
+    // Citations: url_citation annotations on output_text parts, deduped by URL,
+    // first-seen title wins. Reuses the inject rung's UrlCitation shape.
+    const seen = new Set();
+    const citations = [];
+    for (const it of items) {
+        if (it.type !== "message")
+            continue;
+        for (const part of it.content ?? []) {
+            if (part.type !== "output_text")
+                continue;
+            for (const ann of part.annotations ?? []) {
+                if (ann.type !== "url_citation" || typeof ann.url !== "string" || ann.url === "")
+                    continue;
+                if (seen.has(ann.url))
+                    continue;
+                seen.add(ann.url);
+                citations.push({
+                    type: "url_citation",
+                    url: ann.url,
+                    ...(typeof ann.title === "string" && ann.title !== "" ? { title: ann.title } : {}),
+                });
+            }
+        }
+    }
+    // usage: input_tokens already INCLUDES cached_tokens → tokensIn is subset-correct
+    // (WS-A). The Responses API reports no cache-write on these providers ⇒ 0/omit.
+    const usage = {
+        tokensIn: r.usage?.input_tokens ?? 0,
+        tokensOut: r.usage?.output_tokens ?? 0,
+        tokensCached: r.usage?.input_tokens_details?.cached_tokens ?? 0,
+        servedTier: "standard",
+    };
+    // searchCalls: count the web_search_call output items (spec N3). None ⇒ undefined
+    // (the raw success path assumes 1, disclosed).
+    const searchCalls = items.filter((it) => it.type === "web_search_call").length;
+    return {
+        text,
+        usage,
+        citations,
+        ...(searchCalls > 0 ? { searchCalls } : {}),
+    };
+}

package/dist/artifacts/artifact.d.ts

@@ -18,6 +18,7 @@ import type { EvalCaseOrigin } from "../types/telemetry";
 import { type ScrubMode } from "./scrub";
 import { type TaskSettingsResolver } from "../settings/task-settings";
 import type { ContentUploadInput, ContentUploadOutcome } from "./content-uploader";
+import { type Manifest } from "../prompts/manifest";
 /** The upload transport `save` fires content through — injected so the SDK's
  * networked implementation and the tests share one seam. */
 export type ArtifactContentUploader = (input: ContentUploadInput) => Promise<ContentUploadOutcome>;
@@ -64,6 +65,15 @@ export interface ArtifactSaveOptions {
     readonly supersedes?: ArtifactHandle;
     readonly expiresAt?: string;
 }
+/** Options for {@link ArtifactApi.saveManifest} — the grouping keys the manifest
+ * artifact inherits from its prompt (task/step), mirroring a normal save. */
+export interface ArtifactManifestOptions {
+    /** Artifact name; defaults to `<prompt name>.manifest` / `"manifest"`. */
+    readonly name?: string;
+    readonly task?: string;
+    readonly stepKey?: string;
+    readonly attemptNo?: number;
+}
 export interface ArtifactPromoteOptions {
     readonly note?: string;
     /** The route/task this case belongs to. Falls back to the task the source
@@ -81,6 +91,16 @@ export interface ArtifactApi {
      * a handle. Returns null when the namespace is disabled or a zeroRetention run
      * refuses it (fail-closed). */
     save(value: unknown, opts: ArtifactSaveOptions): ArtifactHandle | null;
+    /** PSR-1: attach a **structure-only** assembly manifest (spec §2.1) to a
+     * `prompt` artifact. Validates the manifest, saves it as a linked free-text
+     * `type: "manifest"` artifact (ZERO-DDL — the `type` column is open), and
+     * links `prompt → manifest` with a `derived_from` edge so the manifest joins
+     * the existing prompt lineage and stays addressable for PSR-2 ingest. Returns
+     * the manifest handle, or null when the manifest is invalid (a counted,
+     * teaching warn — never throws) or custody/zeroRetention refuses the save.
+     * A no-op unless explicitly called, so `save` stays byte-identical (the emit
+     * is inert without a manifest). */
+    saveManifest(prompt: ArtifactHandle | string, manifest: Manifest, opts?: ArtifactManifestOptions): ArtifactHandle | null;
     /** Mark an artifact consumed by the current run (feeds derived_from lineage). */
     load(ref: ArtifactHandle | string): void;
     /** Explicit lineage edge the runtime cannot infer. */

package/dist/artifacts/artifact.d.ts.map

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