@psnext/slingcli 2.5.20260623-1 → 2.5.20260629-1

package/node_modules/@earendil-works/pi-ai/dist/api/openai-responses.js

@@ -3,12 +3,28 @@ import { clampThinkingLevel } from "../models.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
 import { getProviderEnvValue } from "../utils/provider-env.js";
-import { isCloudflareProvider, resolveCloudflareBaseUrl } from "./cloudflare.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { clampOpenAIPromptCacheKey } from "./openai-prompt-cache.js";
 import { convertResponsesMessages, convertResponsesTools, processResponsesStream } from "./openai-responses-shared.js";
 import { buildBaseOptions } from "./simple-options.js";
 const OPENAI_TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
+function hasHeader(headers, name) {
+    if (!headers)
+        return false;
+    const expected = name.toLowerCase();
+    for (const [key, value] of Object.entries(headers)) {
+        if (key.toLowerCase() === expected && value !== null && value.trim().length > 0)
+            return true;
+    }
+    return false;
+}
+function getClientApiKey(provider, apiKey, headers) {
+    if (apiKey)
+        return apiKey;
+    if (hasHeader(headers, "authorization") || hasHeader(headers, "cf-aig-authorization"))
+        return "unused";
+    throw new Error(`No API key for provider: ${provider}`);
+}
 /**
  * Resolve cache retention preference.
  * Defaults to "short" and uses PI_CACHE_RETENTION for backward compatibility.
@@ -74,13 +90,10 @@ export const stream = (model, context, options) => {
         };
         try {
             // Create OpenAI client
-            const apiKey = options?.apiKey;
-            if (!apiKey) {
-                throw new Error(`No API key for provider: ${model.provider}`);
-            }
+            const apiKey = getClientApiKey(model.provider, options?.apiKey, options?.headers);
             const cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env);
             const cacheSessionId = cacheRetention === "none" ? undefined : options?.sessionId;
-            const client = createClient(model, context, apiKey, options?.headers, cacheSessionId, options?.env);
+            const client = createClient(model, context, apiKey, options?.headers, cacheSessionId);
             let params = buildParams(model, context, options);
             const nextParams = await options?.onPayload?.(params, model);
             if (nextParams !== undefined) {
@@ -122,11 +135,8 @@ export const stream = (model, context, options) => {
     return stream;
 };
 export const streamSimple = (model, context, options) => {
-    const apiKey = options?.apiKey;
-    if (!apiKey) {
-        throw new Error(`No API key for provider: ${model.provider}`);
-    }
-    const base = buildBaseOptions(model, options, apiKey);
+    getClientApiKey(model.provider, options?.apiKey, options?.headers);
+    const base = buildBaseOptions(model, context, options, options?.apiKey);
     const clampedReasoning = options?.reasoning ? clampThinkingLevel(model, options.reasoning) : undefined;
     const reasoningEffort = clampedReasoning === "off" ? undefined : clampedReasoning;
     return stream(model, context, {
@@ -134,7 +144,7 @@ export const streamSimple = (model, context, options) => {
         reasoningEffort,
     });
 };
-function createClient(model, context, apiKey, optionsHeaders, sessionId, env) {
+function createClient(model, context, apiKey, optionsHeaders, sessionId) {
     const compat = getCompat(model);
     const headers = { ...model.headers };
     if (model.provider === "github-copilot") {
@@ -155,18 +165,11 @@ function createClient(model, context, apiKey, optionsHeaders, sessionId, env) {
     if (optionsHeaders) {
         Object.assign(headers, optionsHeaders);
     }
-    const defaultHeaders = model.provider === "cloudflare-ai-gateway"
-        ? {
-            ...headers,
-            Authorization: headers.Authorization ?? null,
-            "cf-aig-authorization": `Bearer ${apiKey}`,
-        }
-        : headers;
     return new OpenAI({
         apiKey,
-        baseURL: isCloudflareProvider(model.provider) ? resolveCloudflareBaseUrl(model, env) : model.baseUrl,
+        baseURL: model.baseUrl,
         dangerouslyAllowBrowser: true,
-        defaultHeaders,
+        defaultHeaders: headers,
     });
 }
 function buildParams(model, context, options) {

package/node_modules/@earendil-works/pi-ai/dist/api/openrouter-images.js

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { headersToRecord } from "../utils/headers.js";
+import { headersToRecord, providerHeadersToRecord } from "../utils/headers.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
 export const generateImages = async (model, context, options) => {
     const output = {
@@ -68,10 +68,7 @@ function createClient(model, apiKey, optionsHeaders) {
         apiKey,
         baseURL: model.baseUrl,
         dangerouslyAllowBrowser: true,
-        defaultHeaders: {
-            ...model.headers,
-            ...optionsHeaders,
-        },
+        defaultHeaders: providerHeadersToRecord({ ...model.headers, ...optionsHeaders }),
     });
 }
 function buildParams(model, context) {

package/node_modules/@earendil-works/pi-ai/dist/api/simple-options.js

@@ -1,7 +1,16 @@
-export function buildBaseOptions(_model, options, apiKey) {
+import { estimateContextTokens } from "../utils/estimate.js";
+const CONTEXT_SAFETY_TOKENS = 4096;
+const MIN_MAX_TOKENS = 1;
+export function clampMaxTokensToContext(model, context, maxTokens) {
+    if (model.contextWindow <= 0)
+        return Math.max(MIN_MAX_TOKENS, maxTokens);
+    const available = model.contextWindow - estimateContextTokens(context).tokens - CONTEXT_SAFETY_TOKENS;
+    return Math.min(maxTokens, Math.max(MIN_MAX_TOKENS, available));
+}
+export function buildBaseOptions(model, context, options, apiKey) {
     return {
         temperature: options?.temperature,
-        maxTokens: options?.maxTokens,
+        maxTokens: clampMaxTokensToContext(model, context, options?.maxTokens ?? model.maxTokens),
         signal: options?.signal,
         apiKey: apiKey || options?.apiKey,
         transport: options?.transport,

package/node_modules/@earendil-works/pi-ai/dist/auth/helpers.js

@@ -1,7 +1,7 @@
 /**
  * Standard api-key auth: a stored credential key wins, otherwise the first
  * set env var resolves. Includes a `login` that prompts for the key.
- * Providers with non-standard resolution (metadata, ambient files, IAM)
+ * Providers with non-standard resolution (provider env, ambient files, IAM)
  * write their own `ApiKeyAuth`.
  */
 export function envApiKeyAuth(name, envVars) {
@@ -9,7 +9,7 @@ export function envApiKeyAuth(name, envVars) {
         name,
         login: async (callbacks) => {
             const key = await callbacks.prompt({ type: "secret", message: `Enter ${name}` });
-            return { type: "api-key", key };
+            return { type: "api_key", key };
         },
         resolve: async ({ ctx, credential }) => {
             if (credential?.key)

package/node_modules/@earendil-works/pi-ai/dist/auth/resolve.js

@@ -12,19 +12,34 @@ export class ModelsError extends Error {
  * nothing is stored. No silent env fallback after a failed refresh or for a
  * credential type without a matching handler.
  */
-export async function resolveProviderAuth(provider, model, credentials, authContext) {
+export async function resolveProviderAuth(provider, model, credentials, authContext, overrides) {
+    const requestAuthContext = overrides?.env ? overlayEnvAuthContext(authContext, overrides.env) : authContext;
+    if (overrides?.apiKey !== undefined && provider.auth.apiKey) {
+        return resolveApiKey(requestAuthContext, provider.auth.apiKey, model, {
+            type: "api_key",
+            key: overrides.apiKey,
+            env: overrides.env,
+        });
+    }
     const stored = await readCredential(credentials, provider.id);
     if (stored) {
         if (stored.type === "oauth" && provider.auth.oauth) {
             return resolveStoredOAuth(credentials, provider.id, provider.auth.oauth, stored);
         }
-        if (stored.type === "api-key" && provider.auth.apiKey) {
-            return resolveApiKey(authContext, provider.auth.apiKey, model, stored);
+        if (stored.type === "api_key" && provider.auth.apiKey) {
+            const credential = overrides?.env ? { ...stored, env: { ...stored.env, ...overrides.env } } : stored;
+            return resolveApiKey(requestAuthContext, provider.auth.apiKey, model, credential);
         }
         return undefined;
     }
     // Ambient (env vars, AWS profiles, ADC files).
-    return provider.auth.apiKey ? resolveApiKey(authContext, provider.auth.apiKey, model, undefined) : undefined;
+    return provider.auth.apiKey ? resolveApiKey(requestAuthContext, provider.auth.apiKey, model, undefined) : undefined;
+}
+function overlayEnvAuthContext(base, env) {
+    return {
+        env: async (name) => env[name] || (await base.env(name)),
+        fileExists: (path) => base.fileExists(path),
+    };
 }
 /**
  * OAuth resolution with double-checked locking (same pattern as today's

package/node_modules/@earendil-works/pi-ai/dist/compat.js

@@ -18,12 +18,12 @@ export * from "./api/mistral-conversations.lazy.js";
 export * from "./api/openai-codex-responses.lazy.js";
 export * from "./api/openai-completions.lazy.js";
 export * from "./api/openai-responses.lazy.js";
-export * from "./api-registry.js";
 export * from "./env-api-keys.js";
 export * from "./image-models.js";
 export * from "./images.js";
 export * from "./images-api-registry.js";
 export * from "./index.js";
+export * from "./legacy-api-aliases.js";
 export * from "./providers/images/register-builtins.js";
 import { anthropicMessagesApi } from "./api/anthropic-messages.lazy.js";
 import { azureOpenAIResponsesApi } from "./api/azure-openai-responses.lazy.js";
@@ -34,15 +34,75 @@ import { mistralConversationsApi } from "./api/mistral-conversations.lazy.js";
 import { openAICodexResponsesApi } from "./api/openai-codex-responses.lazy.js";
 import { openAICompletionsApi } from "./api/openai-completions.lazy.js";
 import { openAIResponsesApi } from "./api/openai-responses.lazy.js";
-import { clearApiProviders, getApiProvider, registerApiProvider } from "./api-registry.js";
 import { getEnvApiKey } from "./env-api-keys.js";
-import { getBuiltinModel, getBuiltinModels, getBuiltinProviders } from "./providers/all.js";
+import { builtinModels, getBuiltinModel, getBuiltinModels, getBuiltinProviders } from "./providers/all.js";
+import { createFauxCore } from "./providers/faux.js";
 /** @deprecated Static catalog read. Use `getBuiltinModel` from "@earendil-works/pi-ai/providers/all" or `Models.getModel()`. */
 export const getModel = getBuiltinModel;
 /** @deprecated Static catalog read. Use `getBuiltinModels` from "@earendil-works/pi-ai/providers/all" or `Models.getModels()`. */
 export const getModels = getBuiltinModels;
 /** @deprecated Static catalog read. Use `getBuiltinProviders` from "@earendil-works/pi-ai/providers/all" or `Models.getProviders()`. */
 export const getProviders = getBuiltinProviders;
+const apiProviderRegistry = new Map();
+function wrapStream(api, stream) {
+    return (model, context, options) => {
+        if (model.api !== api) {
+            throw new Error(`Mismatched api: ${model.api} expected ${api}`);
+        }
+        return stream(model, context, options);
+    };
+}
+function wrapStreamSimple(api, streamSimple) {
+    return (model, context, options) => {
+        if (model.api !== api) {
+            throw new Error(`Mismatched api: ${model.api} expected ${api}`);
+        }
+        return streamSimple(model, context, options);
+    };
+}
+export function registerApiProvider(provider, sourceId) {
+    apiProviderRegistry.set(provider.api, {
+        provider: {
+            api: provider.api,
+            stream: wrapStream(provider.api, provider.stream),
+            streamSimple: wrapStreamSimple(provider.api, provider.streamSimple),
+        },
+        sourceId,
+    });
+}
+export function getApiProvider(api) {
+    return apiProviderRegistry.get(api)?.provider;
+}
+export function getApiProviders() {
+    return Array.from(apiProviderRegistry.values(), (entry) => entry.provider);
+}
+export function unregisterApiProviders(sourceId) {
+    for (const [api, entry] of apiProviderRegistry.entries()) {
+        if (entry.sourceId === sourceId) {
+            apiProviderRegistry.delete(api);
+        }
+    }
+}
+function clearApiProviders() {
+    apiProviderRegistry.clear();
+}
+export function registerFauxProvider(options = {}) {
+    const core = createFauxCore(options);
+    const sourceId = `faux-provider-${Math.random().toString(36).slice(2, 10)}`;
+    registerApiProvider({ api: core.api, stream: core.stream, streamSimple: core.streamSimple }, sourceId);
+    return {
+        api: core.api,
+        models: core.models,
+        getModel: core.getModel,
+        state: core.state,
+        setResponses: core.setResponses,
+        appendResponses: core.appendResponses,
+        getPendingResponseCount: core.getPendingResponseCount,
+        unregister() {
+            unregisterApiProviders(sourceId);
+        },
+    };
+}
 const BUILTIN_APIS = [
     ["anthropic-messages", anthropicMessagesApi()],
     ["openai-completions", openAICompletionsApi()],
@@ -54,6 +114,7 @@ const BUILTIN_APIS = [
     ["mistral-conversations", mistralConversationsApi()],
     ["bedrock-converse-stream", bedrockConverseStreamApi()],
 ];
+const builtinApiProviderInstances = new Map();
 /**
  * Registers the builtin API implementations into the api-registry without
  * clobbering existing entries: compat may load after a test or extension has
@@ -61,27 +122,34 @@ const BUILTIN_APIS = [
  */
 export function registerBuiltInApiProviders() {
     for (const [api, streams] of BUILTIN_APIS) {
-        if (getApiProvider(api))
-            continue;
-        registerApiProvider({ api, stream: streams.stream, streamSimple: streams.streamSimple });
+        if (!getApiProvider(api)) {
+            registerApiProvider({ api, stream: streams.stream, streamSimple: streams.streamSimple });
+        }
+        builtinApiProviderInstances.set(api, getApiProvider(api));
     }
 }
 export function resetApiProviders() {
     clearApiProviders();
+    builtinApiProviderInstances.clear();
     registerBuiltInApiProviders();
 }
 registerBuiltInApiProviders();
+const compatModels = builtinModels();
 function hasExplicitApiKey(apiKey) {
     return typeof apiKey === "string" && apiKey.trim().length > 0;
 }
 function withEnvApiKey(model, options) {
     if (hasExplicitApiKey(options?.apiKey))
         return options;
-    const apiKey = getEnvApiKey(model.provider);
+    const apiKey = getEnvApiKey(model.provider, options?.env);
     if (!apiKey)
         return options;
     return { ...options, apiKey };
 }
+function shouldUseBuiltinModels(model) {
+    const builtin = compatModels.getModel(model.provider, model.id);
+    return builtin?.api === model.api && getApiProvider(model.api) === builtinApiProviderInstances.get(model.api);
+}
 function resolveApiProvider(api) {
     const provider = getApiProvider(api);
     if (!provider) {
@@ -90,6 +158,9 @@ function resolveApiProvider(api) {
     return provider;
 }
 export function stream(model, context, options) {
+    if (shouldUseBuiltinModels(model)) {
+        return compatModels.stream(model, context, options);
+    }
     const provider = resolveApiProvider(model.api);
     return provider.stream(model, context, withEnvApiKey(model, options));
 }
@@ -98,6 +169,9 @@ export async function complete(model, context, options) {
     return s.result();
 }
 export function streamSimple(model, context, options) {
+    if (shouldUseBuiltinModels(model)) {
+        return compatModels.streamSimple(model, context, options);
+    }
     const provider = resolveApiProvider(model.api);
     return provider.streamSimple(model, context, withEnvApiKey(model, options));
 }

package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.js

@@ -212,6 +212,51 @@ export const IMAGE_MODELS = {
                 "cacheWrite": 0
             }
         },
+        "openai/gpt-image-1": {
+            id: "openai/gpt-image-1",
+            name: "OpenAI: GPT Image 1",
+            api: "openrouter-images",
+            provider: "openrouter",
+            baseUrl: "https://openrouter.ai/api/v1",
+            input: ["text", "image"],
+            output: ["image"],
+            cost: {
+                "input": 10,
+                "output": 10,
+                "cacheRead": 1.25,
+                "cacheWrite": 0
+            }
+        },
+        "openai/gpt-image-1-mini": {
+            id: "openai/gpt-image-1-mini",
+            name: "OpenAI: GPT Image 1 Mini",
+            api: "openrouter-images",
+            provider: "openrouter",
+            baseUrl: "https://openrouter.ai/api/v1",
+            input: ["text", "image"],
+            output: ["image"],
+            cost: {
+                "input": 2.5,
+                "output": 2.5,
+                "cacheRead": 0.25,
+                "cacheWrite": 0
+            }
+        },
+        "openai/gpt-image-2": {
+            id: "openai/gpt-image-2",
+            name: "OpenAI: GPT Image 2",
+            api: "openrouter-images",
+            provider: "openrouter",
+            baseUrl: "https://openrouter.ai/api/v1",
+            input: ["text", "image"],
+            output: ["image"],
+            cost: {
+                "input": 8,
+                "output": 8,
+                "cacheRead": 2,
+                "cacheWrite": 0
+            }
+        },
         "openrouter/auto": {
             id: "openrouter/auto",
             name: "Auto Router",

package/node_modules/@earendil-works/pi-ai/dist/images-models.js

@@ -81,16 +81,20 @@ class ImagesModelsImpl {
             if (!provider) {
                 throw new ModelsError("provider", `Unknown provider: ${model.provider}`);
             }
-            const resolution = await this.getAuth(model);
+            const resolution = await resolveProviderAuth(provider, model, this.credentials, this.authContext, {
+                apiKey: options?.apiKey,
+                env: options?.env,
+            });
             const auth = resolution?.auth;
             if (!auth) {
                 return provider.generateImages(model, context, options);
             }
             const requestModel = auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model;
-            // Explicit request options win per-field; headers merge per header.
+            // Explicit request options win per-field; headers/env merge per key.
             const apiKey = options?.apiKey ?? auth.apiKey;
             const headers = auth.headers || options?.headers ? { ...auth.headers, ...options?.headers } : undefined;
-            return await provider.generateImages(requestModel, context, { ...options, apiKey, headers });
+            const env = resolution.env || options?.env ? { ...(resolution.env ?? {}), ...(options?.env ?? {}) } : undefined;
+            return await provider.generateImages(requestModel, context, { ...options, apiKey, headers, env });
         }
         catch (error) {
             return {

package/node_modules/@earendil-works/pi-ai/dist/index.js

@@ -13,6 +13,7 @@ export * from "./utils/diagnostics.js";
 export * from "./utils/event-stream.js";
 export * from "./utils/json-parse.js";
 export * from "./utils/overflow.js";
+export * from "./utils/retry.js";
 export * from "./utils/typebox-helpers.js";
 export * from "./utils/validation.js";
 //# sourceMappingURL=index.js.map

package/node_modules/@earendil-works/pi-ai/dist/legacy-api-aliases.js

@@ -0,0 +1,49 @@
+import { anthropicMessagesApi } from "./api/anthropic-messages.lazy.js";
+import { azureOpenAIResponsesApi } from "./api/azure-openai-responses.lazy.js";
+import { googleGenerativeAIApi } from "./api/google-generative-ai.lazy.js";
+import { googleVertexApi } from "./api/google-vertex.lazy.js";
+import { mistralConversationsApi } from "./api/mistral-conversations.lazy.js";
+import { openAICodexResponsesApi } from "./api/openai-codex-responses.lazy.js";
+import { openAICompletionsApi } from "./api/openai-completions.lazy.js";
+import { openAIResponsesApi } from "./api/openai-responses.lazy.js";
+const anthropicMessagesStreams = anthropicMessagesApi();
+const azureOpenAIResponsesStreams = azureOpenAIResponsesApi();
+const googleGenerativeAIStreams = googleGenerativeAIApi();
+const googleVertexStreams = googleVertexApi();
+const mistralConversationsStreams = mistralConversationsApi();
+const openAICodexResponsesStreams = openAICodexResponsesApi();
+const openAICompletionsStreams = openAICompletionsApi();
+const openAIResponsesStreams = openAIResponsesApi();
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/anthropic-messages` or `anthropicMessagesApi().stream`. */
+export const streamAnthropic = anthropicMessagesStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/anthropic-messages` or `anthropicMessagesApi().streamSimple`. */
+export const streamSimpleAnthropic = anthropicMessagesStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/azure-openai-responses` or `azureOpenAIResponsesApi().stream`. */
+export const streamAzureOpenAIResponses = azureOpenAIResponsesStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/azure-openai-responses` or `azureOpenAIResponsesApi().streamSimple`. */
+export const streamSimpleAzureOpenAIResponses = azureOpenAIResponsesStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/google-generative-ai` or `googleGenerativeAIApi().stream`. */
+export const streamGoogle = googleGenerativeAIStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/google-generative-ai` or `googleGenerativeAIApi().streamSimple`. */
+export const streamSimpleGoogle = googleGenerativeAIStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/google-vertex` or `googleVertexApi().stream`. */
+export const streamGoogleVertex = googleVertexStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/google-vertex` or `googleVertexApi().streamSimple`. */
+export const streamSimpleGoogleVertex = googleVertexStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/mistral-conversations` or `mistralConversationsApi().stream`. */
+export const streamMistral = mistralConversationsStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/mistral-conversations` or `mistralConversationsApi().streamSimple`. */
+export const streamSimpleMistral = mistralConversationsStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/openai-codex-responses` or `openAICodexResponsesApi().stream`. */
+export const streamOpenAICodexResponses = openAICodexResponsesStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/openai-codex-responses` or `openAICodexResponsesApi().streamSimple`. */
+export const streamSimpleOpenAICodexResponses = openAICodexResponsesStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/openai-completions` or `openAICompletionsApi().stream`. */
+export const streamOpenAICompletions = openAICompletionsStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/openai-completions` or `openAICompletionsApi().streamSimple`. */
+export const streamSimpleOpenAICompletions = openAICompletionsStreams.streamSimple;
+/** @deprecated Use `stream` from `@earendil-works/pi-ai/api/openai-responses` or `openAIResponsesApi().stream`. */
+export const streamOpenAIResponses = openAIResponsesStreams.stream;
+/** @deprecated Use `streamSimple` from `@earendil-works/pi-ai/api/openai-responses` or `openAIResponsesApi().streamSimple`. */
+export const streamSimpleOpenAIResponses = openAIResponsesStreams.streamSimple;
+//# sourceMappingURL=legacy-api-aliases.js.map

package/node_modules/@earendil-works/pi-ai/dist/models.js

@@ -85,15 +85,19 @@ class ModelsImpl {
         return provider;
     }
     async applyAuth(model, options) {
-        const resolution = await this.getAuth(model);
+        const resolution = await resolveProviderAuth(this.requireProvider(model), model, this.credentials, this.authContext, {
+            apiKey: options?.apiKey,
+            env: options?.env,
+        });
         const auth = resolution?.auth;
         if (!auth)
             return { requestModel: model, requestOptions: options };
         const requestModel = auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model;
-        // Explicit request options win per-field; headers merge per header.
+        // Explicit request options win per-field; headers/env merge per key.
         const apiKey = options?.apiKey ?? auth.apiKey;
         const headers = auth.headers || options?.headers ? { ...auth.headers, ...options?.headers } : undefined;
-        const requestOptions = { ...options, apiKey, headers };
+        const env = resolution.env || options?.env ? { ...(resolution.env ?? {}), ...(options?.env ?? {}) } : undefined;
+        const requestOptions = { ...options, apiKey, headers, env };
         return { requestModel, requestOptions };
     }
     stream(model, context, options) {

package/node_modules/@earendil-works/pi-ai/dist/providers/amazon-bedrock.models.js

@@ -373,10 +373,10 @@ export const AMAZON_BEDROCK_MODELS = {
         reasoning: true,
         input: ["text", "image"],
         cost: {
-            input: 1,
-            output: 5,
-            cacheRead: 0.1,
-            cacheWrite: 1.25,
+            input: 1.1,
+            output: 5.5,
+            cacheRead: 0.11,
+            cacheWrite: 1.375,
         },
         contextWindow: 200000,
         maxTokens: 64000,
@@ -390,10 +390,10 @@ export const AMAZON_BEDROCK_MODELS = {
         reasoning: true,
         input: ["text", "image"],
         cost: {
-            input: 5,
-            output: 25,
-            cacheRead: 0.5,
-            cacheWrite: 6.25,
+            input: 5.5,
+            output: 27.5,
+            cacheRead: 0.55,
+            cacheWrite: 6.875,
         },
         contextWindow: 200000,
         maxTokens: 64000,
@@ -1620,6 +1620,23 @@ export const AMAZON_BEDROCK_MODELS = {
         contextWindow: 1040000,
         maxTokens: 8192,
     },
+    "xai.grok-4.3": {
+        id: "xai.grok-4.3",
+        name: "Grok 4.3",
+        api: "bedrock-converse-stream",
+        provider: "amazon-bedrock",
+        baseUrl: "https://bedrock-runtime.us-east-1.amazonaws.com",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: {
+            input: 1.25,
+            output: 2.5,
+            cacheRead: 0.2,
+            cacheWrite: 0,
+        },
+        contextWindow: 1000000,
+        maxTokens: 131072,
+    },
     "zai.glm-4.7": {
         id: "zai.glm-4.7",
         name: "GLM-4.7",

package/node_modules/@earendil-works/pi-ai/dist/providers/ant-ling.models.js

@@ -7,7 +7,7 @@ export const ANT_LING_MODELS = {
         api: "openai-completions",
         provider: "ant-ling",
         baseUrl: "https://api.ant-ling.com/v1",
-        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "supportsLongCacheRetention": false },
+        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "thinkingFormat": "ant-ling", "supportsLongCacheRetention": false },
         reasoning: false,
         input: ["text"],
         cost: {
@@ -25,7 +25,7 @@ export const ANT_LING_MODELS = {
         api: "openai-completions",
         provider: "ant-ling",
         baseUrl: "https://api.ant-ling.com/v1",
-        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "supportsLongCacheRetention": false },
+        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "thinkingFormat": "ant-ling", "supportsLongCacheRetention": false },
         reasoning: false,
         input: ["text"],
         cost: {
@@ -43,7 +43,7 @@ export const ANT_LING_MODELS = {
         api: "openai-completions",
         provider: "ant-ling",
         baseUrl: "https://api.ant-ling.com/v1",
-        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "supportsLongCacheRetention": false, "thinkingFormat": "ant-ling" },
+        compat: { "supportsStore": false, "supportsDeveloperRole": false, "supportsReasoningEffort": false, "maxTokensField": "max_tokens", "thinkingFormat": "ant-ling", "supportsLongCacheRetention": false },
         reasoning: true,
         thinkingLevelMap: { "off": null, "minimal": null, "low": null, "medium": null, "high": "high", "xhigh": "xhigh" },
         input: ["text"],

package/node_modules/@earendil-works/pi-ai/dist/providers/anthropic.models.js

@@ -1,40 +1,6 @@
 // This file is auto-generated by scripts/generate-models.ts
 // Do not edit manually - run 'npm run generate-models' to update
 export const ANTHROPIC_MODELS = {
-    "claude-3-5-haiku-20241022": {
-        id: "claude-3-5-haiku-20241022",
-        name: "Claude Haiku 3.5",
-        api: "anthropic-messages",
-        provider: "anthropic",
-        baseUrl: "https://api.anthropic.com",
-        reasoning: false,
-        input: ["text", "image"],
-        cost: {
-            input: 0.8,
-            output: 4,
-            cacheRead: 0.08,
-            cacheWrite: 1,
-        },
-        contextWindow: 200000,
-        maxTokens: 8192,
-    },
-    "claude-3-5-haiku-latest": {
-        id: "claude-3-5-haiku-latest",
-        name: "Claude Haiku 3.5 (latest)",
-        api: "anthropic-messages",
-        provider: "anthropic",
-        baseUrl: "https://api.anthropic.com",
-        reasoning: false,
-        input: ["text", "image"],
-        cost: {
-            input: 0.8,
-            output: 4,
-            cacheRead: 0.08,
-            cacheWrite: 1,
-        },
-        contextWindow: 200000,
-        maxTokens: 8192,
-    },
     "claude-3-5-sonnet-20240620": {
         id: "claude-3-5-sonnet-20240620",
         name: "Claude Sonnet 3.5",

package/node_modules/@earendil-works/pi-ai/dist/providers/cerebras.models.js

@@ -7,6 +7,7 @@ export const CEREBRAS_MODELS = {
         api: "openai-completions",
         provider: "cerebras",
         baseUrl: "https://api.cerebras.ai/v1",
+        compat: { "supportsStore": false, "supportsDeveloperRole": false },
         reasoning: true,
         input: ["text"],
         cost: {
@@ -24,6 +25,7 @@ export const CEREBRAS_MODELS = {
         api: "openai-completions",
         provider: "cerebras",
         baseUrl: "https://api.cerebras.ai/v1",
+        compat: { "supportsStore": false, "supportsDeveloperRole": false },
         reasoning: true,
         input: ["text"],
         cost: {