modelrig 0.1.0 → 0.3.0

package/dist/adapters/grok.js

@@ -20,6 +20,9 @@ exports.classifyGrokFailure = classifyGrokFailure;
 exports.buildGrokParams = buildGrokParams;
 exports.createGrokAdapter = createGrokAdapter;
 const openai_1 = __importDefault(require("openai"));
+const tool_mapping_1 = require("./tool-mapping");
+const openai_stream_1 = require("./openai-stream");
+const sampling_1 = require("./sampling");
 const GROK_BASE_URL = "https://api.x.ai/v1";
 const DEFAULT_MAX_TOKENS = 32000;
 function grokSupports(feature, _model) {
@@ -27,12 +30,13 @@ function grokSupports(feature, _model) {
         case "structured_native":
         case "json_mode":
         case "prefix_cache_implicit":
+        case "prompt_cache_key": // prompt_cache_key routing hint (WS-C) — cache-policy registry truth
             return true;
         case "grounded_native": // Live Search exists but is not wired — probes may grant later
         case "context_cache_explicit":
-        case "prompt_cache_key":
         case "tier_flex":
         case "trace_visible":
+        case "zero_retention": // never a static adapter attestation — set only from the credential-scoped registry facts (claims.ts)
             return false;
     }
 }
@@ -70,10 +74,16 @@ function buildGrokParams(model, req) {
     ];
     return {
         model,
-        max_tokens: req.maxOutputTokens ?? DEFAULT_MAX_TOKENS,
+        max_tokens: (0, sampling_1.effectiveMaxOutputTokens)(req, DEFAULT_MAX_TOKENS),
         messages,
         stream: true,
         stream_options: { include_usage: true },
+        ...(0, sampling_1.openAISamplingFields)(req),
+        // Prompt caching (WS-C): the run loop stamps `cache.key` (the stable-prefix
+        // fingerprint) for prompt_cache_key providers; pass it through as xAI's hint.
+        ...(req.cache?.key !== undefined && req.cache.key !== ""
+            ? { prompt_cache_key: req.cache.key }
+            : {}),
         ...(req.outputSchema !== null
             ? {
                 response_format: {
@@ -86,12 +96,21 @@ function buildGrokParams(model, req) {
                 },
             }
             : {}),
+        ...(req.tools !== undefined && req.tools.length > 0
+            ? {
+                tools: (0, tool_mapping_1.toOpenAITools)(req.tools),
+                ...((0, tool_mapping_1.toOpenAIToolChoice)(req.toolChoice) !== undefined
+                    ? { tool_choice: (0, tool_mapping_1.toOpenAIToolChoice)(req.toolChoice) }
+                    : {}),
+            }
+            : {}),
     };
 }
 function createGrokAdapter(config) {
     return {
         id: "grok",
         supports: grokSupports,
+        supportsTools: () => true,
         async call(req) {
             const model = req.candidate.model;
             // F1: post-stream failures still billed tokens — attach usage.
@@ -118,28 +137,40 @@ function createGrokAdapter(config) {
                 let promptTokens = 0;
                 let completionTokens = 0;
                 let cachedTokens = 0;
+                let cacheWriteTokens = 0;
                 let finishReason = null;
+                const toolCallAcc = (0, tool_mapping_1.createOpenAIToolCallAccumulator)();
                 // Only delta.content is accumulated — a reasoning model's trace must
                 // never leak into the JSON buffer (deepseek reasoner rule applied).
                 for await (const chunk of stream) {
                     const choice = chunk.choices[0];
                     if (choice?.delta?.content)
                         text += choice.delta.content;
+                    toolCallAcc.push(choice?.delta?.tool_calls);
                     if (choice?.finish_reason)
                         finishReason = choice.finish_reason;
                     if (chunk.usage) {
                         promptTokens = chunk.usage.prompt_tokens ?? 0;
                         completionTokens = chunk.usage.completion_tokens ?? 0;
                         cachedTokens = chunk.usage.prompt_tokens_details?.cached_tokens ?? 0;
+                        cacheWriteTokens = chunk.usage.input_tokens_details?.cache_write_tokens ?? 0;
                     }
                 }
-                // xAI has no service tiers — served is always standard.
+                // xAI has no service tiers — served is always standard. prompt_tokens
+                // already INCLUDES cached → tokensIn is subset-correct.
                 const usage = {
                     tokensIn: promptTokens,
                     tokensOut: completionTokens,
                     tokensCached: cachedTokens,
+                    tokensCacheWrite: cacheWriteTokens,
                     servedTier: "standard",
                 };
+                // Tool-call turn (spec §4.4): surface normalized calls, skip the
+                // empty/truncation content guards below.
+                const toolCalls = toolCallAcc.finalize();
+                if (toolCalls !== undefined) {
+                    return { ok: true, text, usage, toolCalls };
+                }
                 if (text.trim().length === 0) {
                     return fail("content_invalid", `empty response from Grok (finish_reason=${finishReason ?? "none"})`, undefined, usage);
                 }
@@ -164,5 +195,38 @@ function createGrokAdapter(config) {
                 };
             }
         },
+        async *stream(req) {
+            const model = req.candidate.model;
+            try {
+                const client = new openai_1.default({ apiKey: config.apiKey, baseURL: GROK_BASE_URL, timeout: req.timeoutMs });
+                const params = buildGrokParams(model, req);
+                const dispatchedAt = Date.now();
+                const stream = await client.chat.completions.create(params);
+                // xAI has no service tiers — served is always standard.
+                yield* (0, openai_stream_1.streamOpenAIDialect)(stream, req, dispatchedAt, {
+                    provider: "grok",
+                    cachedTokenSource: "details",
+                    mapServedTier: () => "standard",
+                });
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                const { cls, fixHint } = classifyGrokFailure(message);
+                yield {
+                    kind: "final",
+                    result: {
+                        ok: false,
+                        failure: {
+                            class: cls,
+                            message,
+                            provider: "grok",
+                            model,
+                            cause: error,
+                            ...(fixHint !== undefined ? { fixHint } : {}),
+                        },
+                    },
+                };
+            }
+        },
     };
 }

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

@@ -19,6 +19,7 @@
  */
 import type { CapabilityFlag, ProviderAdapter, ProviderId } from "../types/provider";
 import type { ClassifiedFailure, ShapingInput } from "./gemini";
+import type { OpenAIWireTool, OpenAIWireToolChoice } from "./tool-mapping";
 /** Fireworks serves models at accounts/fireworks/models/<short> — routes
  * declare the short name; the wire gets the full path (LiteLLM
  * fireworks_ai transformation, harvested). */
@@ -45,6 +46,9 @@ export interface OpenAICompatShapedParams {
     readonly stream_options: {
         readonly include_usage: true;
     };
+    /** CE-6 declared sampling — present only when the route/raw asks for them. */
+    readonly temperature?: number;
+    readonly top_p?: number;
     readonly response_format?: {
         readonly type: "json_object";
     } | {
@@ -55,6 +59,8 @@ export interface OpenAICompatShapedParams {
             readonly schema: object;
         };
     };
+    readonly tools?: readonly OpenAIWireTool[];
+    readonly tool_choice?: OpenAIWireToolChoice;
 }
 /** Pure request shaping. The PROFILE decides the wire shape: strict
  * json_schema only when the registry granted structured_native for this

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":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EACf,UAAU,EACX,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIhE;;8CAE8C;AAC9C,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACnD;AAED;;;0EAG0E;AAC1E,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,EAAE,gBAAgB,CAAC,CAG7F,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAiBtF;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,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,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,IAAI,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KACjG,CAAC;CACP;AAOD;;2DAE2D;AAC3D,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,YAAY,EACjB,YAAY,EAAE,WAAW,CAAC,cAAc,CAAC,GACxC,wBAAwB,CA4B1B;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD;+DAC2D;IAC3D,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW,CAAC,cAAc,CAAC,CAAC;CAC5E;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,yBAAyB,GAAG,eAAe,CAqH5F"}
+{"version":3,"file":"openai-compat.d.ts","sourceRoot":"","sources":["../../src/adapters/openai-compat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAIV,cAAc,EACd,eAAe,EACf,UAAU,EACX,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;;8CAE8C;AAC9C,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACnD;AAED;;;0EAG0E;AAC1E,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,EAAE,gBAAgB,CAAC,CAG7F,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAiBtF;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,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,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,IAAI,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KACjG,CAAC;IACN,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAOD;;2DAE2D;AAC3D,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,YAAY,EACjB,YAAY,EAAE,WAAW,CAAC,cAAc,CAAC,GACxC,wBAAwB,CAqC1B;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD;+DAC2D;IAC3D,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW,CAAC,cAAc,CAAC,CAAC;CAC5E;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,yBAAyB,GAAG,eAAe,CAwK5F"}

package/dist/adapters/openai-compat.js

@@ -28,6 +28,9 @@ exports.classifyCompatFailure = classifyCompatFailure;
 exports.buildOpenAICompatParams = buildOpenAICompatParams;
 exports.createOpenAICompatAdapter = createOpenAICompatAdapter;
 const openai_1 = __importDefault(require("openai"));
+const tool_mapping_1 = require("./tool-mapping");
+const openai_stream_1 = require("./openai-stream");
+const sampling_1 = require("./sampling");
 const DEFAULT_MAX_TOKENS = 32000;
 /** Fireworks serves models at accounts/fireworks/models/<short> — routes
  * declare the short name; the wire gets the full path (LiteLLM
@@ -85,10 +88,11 @@ function buildOpenAICompatParams(model, req, profileFlags) {
     ];
     return {
         model,
-        max_tokens: req.maxOutputTokens ?? DEFAULT_MAX_TOKENS,
+        max_tokens: (0, sampling_1.effectiveMaxOutputTokens)(req, DEFAULT_MAX_TOKENS),
         messages,
         stream: true,
         stream_options: { include_usage: true },
+        ...(0, sampling_1.openAISamplingFields)(req),
         ...(wantJson
             ? strict
                 ? {
@@ -99,6 +103,14 @@ function buildOpenAICompatParams(model, req, profileFlags) {
                 }
                 : { response_format: { type: "json_object" } }
             : {}),
+        ...(req.tools !== undefined && req.tools.length > 0
+            ? {
+                tools: (0, tool_mapping_1.toOpenAITools)(req.tools),
+                ...((0, tool_mapping_1.toOpenAIToolChoice)(req.toolChoice) !== undefined
+                    ? { tool_choice: (0, tool_mapping_1.toOpenAIToolChoice)(req.toolChoice) }
+                    : {}),
+            }
+            : {}),
     };
 }
 function createOpenAICompatAdapter(config) {
@@ -108,6 +120,7 @@ function createOpenAICompatAdapter(config) {
         supports(feature, model) {
             return config.capabilityProfile(model).has(feature);
         },
+        supportsTools: () => true,
         async call(req) {
             const model = req.candidate.model;
             const fail = (cls, message, fixHint, usage) => ({
@@ -134,31 +147,42 @@ function createOpenAICompatAdapter(config) {
                 let promptTokens = 0;
                 let completionTokens = 0;
                 let cachedTokens = 0;
+                let cacheWriteTokens = 0;
                 let finishReason = null;
                 // TTFB (Phase 4 WS3): first streamed chunk = first body byte.
                 let ttfbMs;
+                const toolCallAcc = (0, tool_mapping_1.createOpenAIToolCallAccumulator)();
                 for await (const chunk of stream) {
                     if (ttfbMs === undefined)
                         ttfbMs = Date.now() - dispatchedAt;
                     const choice = chunk.choices[0];
                     if (choice?.delta?.content)
                         text += choice.delta.content;
+                    toolCallAcc.push(choice?.delta?.tool_calls);
                     if (choice?.finish_reason)
                         finishReason = choice.finish_reason;
                     if (chunk.usage) {
                         promptTokens = chunk.usage.prompt_tokens ?? 0;
                         completionTokens = chunk.usage.completion_tokens ?? 0;
                         cachedTokens = chunk.usage.prompt_tokens_details?.cached_tokens ?? 0;
+                        cacheWriteTokens = chunk.usage.input_tokens_details?.cache_write_tokens ?? 0;
                     }
                 }
                 // Hosts have no service tiers in this dialect — standard, always.
+                // prompt_tokens already INCLUDES cached → tokensIn is subset-correct.
                 const usage = {
                     tokensIn: promptTokens,
                     tokensOut: completionTokens,
                     tokensCached: cachedTokens,
+                    tokensCacheWrite: cacheWriteTokens,
                     servedTier: "standard",
                     ...(ttfbMs !== undefined ? { ttfbMs } : {}),
                 };
+                // Tool-call turn (spec §4.4): surface normalized calls, skip content guards.
+                const toolCalls = toolCallAcc.finalize();
+                if (toolCalls !== undefined) {
+                    return { ok: true, text, usage, toolCalls };
+                }
                 if (text.trim().length === 0) {
                     return fail("content_invalid", `empty response from ${config.providerId} (finish_reason=${finishReason ?? "none"})`, undefined, usage);
                 }
@@ -183,5 +207,38 @@ function createOpenAICompatAdapter(config) {
                 };
             }
         },
+        async *stream(req) {
+            const model = req.candidate.model;
+            try {
+                const client = new openai_1.default({ apiKey: config.apiKey, baseURL: config.baseUrl, timeout: req.timeoutMs });
+                const params = buildOpenAICompatParams(shapeModel(model), req, config.capabilityProfile(model));
+                const dispatchedAt = Date.now();
+                const stream = await client.chat.completions.create(params);
+                // Compat hosts have no service tiers in this dialect — standard, always.
+                yield* (0, openai_stream_1.streamOpenAIDialect)(stream, req, dispatchedAt, {
+                    provider: config.providerId,
+                    cachedTokenSource: "details",
+                    mapServedTier: () => "standard",
+                });
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                const { cls, fixHint } = classifyCompatFailure(message, config.providerId);
+                yield {
+                    kind: "final",
+                    result: {
+                        ok: false,
+                        failure: {
+                            class: cls,
+                            message,
+                            provider: config.providerId,
+                            model,
+                            cause: error,
+                            ...(fixHint !== undefined ? { fixHint } : {}),
+                        },
+                    },
+                };
+            }
+        },
     };
 }

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

@@ -0,0 +1,58 @@
+/**
+ * Shared streaming loop for the OpenAI-dialect adapters (G-1/G-5 Phase A,
+ * spec §4.3). The openai / grok / deepseek / deepinfra / fireworks adapters all
+ * speak `client.chat.completions.create({ stream: true })`; this is the one
+ * place that drains such a stream into `AdapterStreamEvent`s — raw text deltas
+ * as they arrive, then a single terminal `final` carrying the same
+ * `AdapterResult` the adapter's buffered `call()` would return.
+ *
+ * ADDITIVE: `call()` is untouched. This powers the OPTIONAL `stream()` method
+ * the run loop uses only when a delta sink is wired (`rig.runStream`); every
+ * other path is byte-for-byte the pre-Phase-A behavior. Providers without a
+ * `stream()` (anthropic events / gemini non-streaming) fall back to buffered
+ * dispatch, which is the spec's sanctioned `buffered` mode.
+ */
+import type { AdapterRequest, AdapterStreamEvent, ProviderId, ServiceTier } from "../types/provider";
+import type { OpenAIToolCallDelta } from "./tool-mapping";
+/** The permissive chunk shape common to the OpenAI-dialect hosts. */
+export interface OpenAIDialectChunk {
+    readonly service_tier?: string;
+    readonly choices: Array<{
+        readonly delta?: {
+            readonly content?: string | null;
+            readonly refusal?: string | null;
+            readonly tool_calls?: readonly OpenAIToolCallDelta[];
+        };
+        readonly finish_reason?: string | null;
+    }>;
+    readonly usage?: {
+        readonly prompt_tokens?: number;
+        readonly completion_tokens?: number;
+        readonly prompt_tokens_details?: {
+            readonly cached_tokens?: number;
+        };
+        readonly prompt_cache_hit_tokens?: number;
+        /** Cache-WRITE tokens — GPT-5.6+ bills explicit writes at 1.25× and reports
+         * them here (spec §2 table). Absent on ≤5.5 (writes free) and every non-
+         * openai dialect host, so cache-write is 0 there. */
+        readonly input_tokens_details?: {
+            readonly cache_write_tokens?: number;
+        };
+    } | null;
+}
+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;
+}
+/**
+ * Drain an OpenAI-dialect completion stream into `AdapterStreamEvent`s. Emits a
+ * `delta` per content token, then exactly one `final`. The final result mirrors
+ * `call()`'s terminal decisions for the shared dialect: refusal → fail;
+ * tool-call turn → ok + normalized calls; empty → content_invalid; a
+ * schema-route truncation (`finish_reason=length`) → content_invalid.
+ */
+export declare function streamOpenAIDialect(chunks: AsyncIterable<OpenAIDialectChunk>, req: AdapterRequest, dispatchedAt: number, cfg: OpenAIStreamConfig): AsyncGenerator<AdapterStreamEvent>;
+//# sourceMappingURL=openai-stream.d.ts.map

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

@@ -0,0 +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;AAG3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,qEAAqE;AACrE,MAAM,WAAW,kBAAkB;IACjC,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,CAqGpC"}

package/dist/adapters/openai-stream.js

@@ -0,0 +1,120 @@
+"use strict";
+/**
+ * Shared streaming loop for the OpenAI-dialect adapters (G-1/G-5 Phase A,
+ * spec §4.3). The openai / grok / deepseek / deepinfra / fireworks adapters all
+ * speak `client.chat.completions.create({ stream: true })`; this is the one
+ * place that drains such a stream into `AdapterStreamEvent`s — raw text deltas
+ * as they arrive, then a single terminal `final` carrying the same
+ * `AdapterResult` the adapter's buffered `call()` would return.
+ *
+ * ADDITIVE: `call()` is untouched. This powers the OPTIONAL `stream()` method
+ * the run loop uses only when a delta sink is wired (`rig.runStream`); every
+ * other path is byte-for-byte the pre-Phase-A behavior. Providers without a
+ * `stream()` (anthropic events / gemini non-streaming) fall back to buffered
+ * dispatch, which is the spec's sanctioned `buffered` mode.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.streamOpenAIDialect = streamOpenAIDialect;
+const tool_mapping_1 = require("./tool-mapping");
+/**
+ * Drain an OpenAI-dialect completion stream into `AdapterStreamEvent`s. Emits a
+ * `delta` per content token, then exactly one `final`. The final result mirrors
+ * `call()`'s terminal decisions for the shared dialect: refusal → fail;
+ * tool-call turn → ok + normalized calls; empty → content_invalid; a
+ * schema-route truncation (`finish_reason=length`) → content_invalid.
+ */
+async function* streamOpenAIDialect(chunks, req, dispatchedAt, cfg) {
+    let ttfbMs;
+    let text = "";
+    let refusalText = "";
+    const toolCallAcc = (0, tool_mapping_1.createOpenAIToolCallAccumulator)();
+    let promptTokens = 0;
+    let completionTokens = 0;
+    let cachedTokens = 0;
+    let cacheWriteTokens = 0;
+    let responseTier = null;
+    let finishReason = null;
+    for await (const chunk of chunks) {
+        if (ttfbMs === undefined)
+            ttfbMs = Date.now() - dispatchedAt;
+        if (responseTier === null && chunk.service_tier !== undefined)
+            responseTier = chunk.service_tier;
+        const choice = chunk.choices[0];
+        const content = choice?.delta?.content;
+        if (content) {
+            text += content;
+            yield { kind: "delta", text: content };
+        }
+        if (typeof choice?.delta?.refusal === "string" && choice.delta.refusal.length > 0) {
+            refusalText += choice.delta.refusal;
+        }
+        toolCallAcc.push(choice?.delta?.tool_calls);
+        if (choice?.finish_reason)
+            finishReason = choice.finish_reason;
+        if (chunk.usage) {
+            promptTokens = chunk.usage.prompt_tokens ?? 0;
+            completionTokens = chunk.usage.completion_tokens ?? 0;
+            cachedTokens =
+                cfg.cachedTokenSource === "cache_hit"
+                    ? chunk.usage.prompt_cache_hit_tokens ?? 0
+                    : chunk.usage.prompt_tokens_details?.cached_tokens ?? 0;
+            // Cache-write (GPT-5.6+): 0 on every dialect that does not report it.
+            cacheWriteTokens = chunk.usage.input_tokens_details?.cache_write_tokens ?? 0;
+        }
+    }
+    // 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 usage = {
+        tokensIn: promptTokens,
+        tokensOut: completionTokens,
+        tokensCached: cachedTokens,
+        tokensCacheWrite: cacheWriteTokens,
+        servedTier: cfg.mapServedTier(responseTier, req.requestedTier),
+        ...(ttfbMs !== undefined ? { ttfbMs } : {}),
+    };
+    const fail = (message, fixHint) => ({
+        kind: "final",
+        result: {
+            ok: false,
+            failure: {
+                class: "content_invalid",
+                message,
+                provider: cfg.provider,
+                model: req.candidate.model,
+                ...(fixHint !== undefined ? { fixHint } : {}),
+            },
+            usage,
+        },
+    });
+    if (refusalText.length > 0) {
+        yield {
+            kind: "final",
+            result: {
+                ok: false,
+                failure: {
+                    class: "refusal",
+                    message: `${cfg.provider} refused output: ${refusalText.slice(0, 200)}`,
+                    provider: cfg.provider,
+                    model: req.candidate.model,
+                },
+                usage,
+            },
+        };
+        return;
+    }
+    const toolCalls = toolCallAcc.finalize();
+    if (toolCalls !== undefined) {
+        yield { kind: "final", result: { ok: true, text, usage, toolCalls } };
+        return;
+    }
+    if (text.trim().length === 0) {
+        yield fail(`empty response from ${cfg.provider} (finish_reason=${finishReason ?? "none"})`);
+        return;
+    }
+    if (finishReason === "length" && req.outputSchema !== null) {
+        yield fail(`${cfg.provider} output truncated (finish_reason=length)`, "raise maxOutputTokens for this route");
+        return;
+    }
+    yield { kind: "final", result: { ok: true, text, usage } };
+}

package/dist/adapters/openai.d.ts

@@ -13,6 +13,7 @@
  */
 import type { CapabilityFlag, ProviderAdapter } from "../types/provider";
 import type { ClassifiedFailure, ShapingInput } from "./gemini";
+import type { OpenAIWireTool, OpenAIWireToolChoice } from "./tool-mapping";
 export interface OpenAIAdapterConfig {
     readonly apiKey: string;
 }
@@ -31,6 +32,9 @@ export interface OpenAIShapedParams {
     readonly stream_options: {
         readonly include_usage: true;
     };
+    /** CE-6 declared sampling — present only when the route/raw asks for them. */
+    readonly temperature?: number;
+    readonly top_p?: number;
     readonly service_tier?: "flex" | "priority";
     readonly prompt_cache_key?: string;
     readonly prompt_cache_retention?: "24h";
@@ -42,6 +46,8 @@ export interface OpenAIShapedParams {
             readonly strict: true;
         };
     };
+    readonly tools?: readonly OpenAIWireTool[];
+    readonly tool_choice?: OpenAIWireToolChoice;
 }
 export declare function buildOpenAIParams(model: string, req: ShapingInput): OpenAIShapedParams;
 export declare function createOpenAIAdapter(config: OpenAIAdapterConfig): ProviderAdapter;

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;AAEhE,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,CAc9E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAiBxE;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,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,QAAQ,CAAC,eAAe,CAAC,EAAE;QACzB,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;CACH;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,CAoCtF;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,eAAe,CAiJhF"}
+{"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;AAMhG,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,CAiBxE;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,QAAQ,CAAC,eAAe,CAAC,EAAE;QACzB,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;IACF,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,CA6CtF;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,eAAe,CAwMhF"}