aieo 0.1.38 → 0.1.39

package/dist/index.d.cts

@@ -126,6 +126,9 @@ declare function gatewayEnvForProviders(baseUrl: string): {
 declare const normalizeCallerBaseURL: typeof gatewayUrlFor;
 declare const PROVIDERS: Provider[];
 type ModelName = "sonnet" | "opus" | "haiku" | "gemini" | "gpt" | "kimi" | "grok";
+type ModelId = string;
+declare const MODELS: Record<Provider, Partial<Record<ModelName, ModelId>>>;
+declare const DEFAULT_MODELS: Record<Provider, string>;
 declare function getLightModelForProvider(provider: Provider): string;
 interface TokenPricing {
     inputTokenPrice: number;
@@ -152,6 +155,11 @@ declare function getProviderForModel(modelName?: ModelName | string): Provider;
  * pasted with a trailing space still authenticates.
  */
 declare function normalizeApiKey(key?: string | null): string | undefined;
+/**
+ * The env var each provider's API key is read from. Exported so a host with
+ * its own secret store knows which NAME to look up (see resolve.ts).
+ */
+declare const API_KEY_ENV: Record<Provider, string>;
 declare function hasApiKeyForProvider(provider: Provider | string): boolean;
 declare function getApiKeyForProvider(provider: Provider | string): string;
 interface GetModelOptions {
@@ -253,6 +261,91 @@ declare function resolveLLMConfig(opts?: {
     light?: boolean;
 }): LLMConfig;
 
+interface ModelOption {
+    provider: Provider;
+    alias: ModelName;
+    modelId: string;
+    /** The provider's default — what you get with no model name at all. */
+    default: boolean;
+}
+/**
+ * Every alias in the MODELS table, in PROVIDERS order. Pure and keyless,
+ * which is what a UI picker or a server-config endpoint needs.
+ */
+declare function listModels(): ModelOption[];
+interface ParsedModelName {
+    /** Set only when the name carries an explicit "<provider>/" prefix. */
+    provider?: Provider;
+    /** The name with that prefix stripped. Aliases are NOT resolved here.
+     *  undefined for an empty name (or a bare "<provider>/"). */
+    modelId?: string;
+}
+/** Pure syntax: strip an explicit provider prefix, nothing else. */
+declare function parseModelName(name?: string): ParsedModelName;
+interface ModelRef {
+    provider: Provider;
+    /** Concrete id as the provider knows it (alias resolved, prefix stripped). */
+    modelId: string;
+    /** Canonical "<provider>/<modelId>" — unambiguous, itself a valid model name. */
+    name: string;
+}
+/**
+ * Resolve a model name to its provider + concrete id WITHOUT an API key.
+ * Follows getModel's rules — explicit `provider` wins, then an explicit
+ * prefix, then getProviderForModel's inference; aliases map through MODELS;
+ * no name → the provider's default — so what this reports is what
+ * resolveModel / getModel will build. (One deliberate extra: an alias after
+ * a prefix, "anthropic/sonnet", resolves too.)
+ *
+ * Rejects the one input getModel silently gets wrong: a slashed name whose
+ * first segment is NOT a provider ("moonshotai/kimi-k2.6") with nothing
+ * else naming the provider — inference falls to the default and the request
+ * 404s at the wrong API. Say so up front, with the fix. LLM_PROVIDER, when
+ * set, counts as "something naming the provider", exactly as it does for
+ * getProviderForModel.
+ */
+declare function canonicalModelName(model?: string, provider?: Provider | string): ModelRef;
+/**
+ * Per-call output-token cap. An explicit MAX_OUTPUT_TOKENS env always wins.
+ * Otherwise the default is provider-aware: Anthropic runs at 128k because
+ * @ai-sdk/anthropic clamps known models down to their true per-model max
+ * instead of erroring, while OpenAI-compatible hosts (OpenRouter et al)
+ * reject max_tokens above the model limit rather than clamping, so they keep
+ * the conservative 64k default. Thinking tokens count against this same
+ * budget, so headroom matters more than the visible text length suggests.
+ */
+declare function maxOutputTokensFor(provider?: string): number;
+interface ResolveOptions {
+    /** alias | id | "provider/id" | "openrouter/org/id". Omit for the provider's default. */
+    model?: string;
+    /** Explicit provider; otherwise inferred from `model`. */
+    provider?: Provider | string;
+    apiKey?: string;
+    /**
+     * Async key source consulted by env-var NAME ("OPENAI_API_KEY", …) before
+     * process.env — a host's own secret store. Only called when `apiKey` is
+     * absent.
+     */
+    getSecret?: (envName: string) => Promise<string | undefined>;
+    baseUrl?: string;
+    headers?: Record<string, string>;
+    abortSignal?: AbortSignal;
+    timeoutMs?: number;
+}
+interface ResolvedModel extends ModelRef {
+    model: LanguageModel;
+    apiKey: string;
+    contextLimit: number;
+    maxOutputTokens: number;
+}
+/**
+ * Name → everything a caller needs to run: provider, concrete id, canonical
+ * name, the API key that was used, the LanguageModel, its context window,
+ * and the output-token cap. Key precedence: `apiKey` → `getSecret(envName)`
+ * → process.env; none → an error that names the env var. Logs nothing.
+ */
+declare function resolveModel(opts?: ResolveOptions): Promise<ResolvedModel>;
+
 interface AiUsage {
     input: number;
     cache_read: number;
@@ -750,4 +843,4 @@ declare function createWebFetch(opts: CreateWebFetchOptions): WebFetchHandle;
  */
 declare function captureNativeFetchResults(stepContent: unknown, target: WebFetchResult[]): void;
 
-export { type AiUsage, type AiUsageWithLegacy, type Conversation, type ConversationData, ConversationStorage, type CreateWebFetchOptions, type CreateWebSearchOptions, type FetchBackend, type FetchUrlOptions, GATEWAY_PATHS, type GetModelOptions, type HostLookup, type LLMConfig, type Logger, MAX_CONVERSATIONS, type ModelName, OUTRO, PROVIDERS, type Provider, type ProviderTool, SYSTEM, type SearchBackend, type ThinkingSpeed, type TokenPricing, type TokenUsageForCost, WEB_FETCH_TOOL_NAME, WEB_SEARCH_TOOL_NAME, type WebFetchHandle, type WebFetchOptions, type WebFetchResult, type WebSearchHandle, type WebSearchOptions, type WebSearchResult, addUsage, callGenerateObject, callGenerateText, callModel, captureNativeFetchResults, captureNativeResults, computeSessionCost, consoleLogger, createWebFetch, createWebSearch, emptyUsage, fetchUrl, gatewayEnvForProviders, gatewayUrlFor, gatewayUrlForModel, getApiKeyForProvider, getContextLimit, getGatewayBaseURL, getLightModelForProvider, getModel, getModelDetails, getProviderForModel, getProviderOptions, getProviderTool, getSearchApiKey, getTokenPricing, hasApiKeyForProvider, hasSearchApiKey, htmlToText, isPrivateAddress, linkifyCitations, loadModelPricing, normalizeApiKey, normalizeCallerBaseURL, normalizeUsage, resolveFetchBackend, resolveLLMConfig, resolveSearchBackend, searchWeb, stripCitations, validateFetchUrl, withLegacyUsage, withProviderCacheUsage };
+export { API_KEY_ENV, type AiUsage, type AiUsageWithLegacy, type Conversation, type ConversationData, ConversationStorage, type CreateWebFetchOptions, type CreateWebSearchOptions, DEFAULT_MODELS, type FetchBackend, type FetchUrlOptions, GATEWAY_PATHS, type GetModelOptions, type HostLookup, type LLMConfig, type Logger, MAX_CONVERSATIONS, MODELS, type ModelName, type ModelOption, type ModelRef, OUTRO, PROVIDERS, type ParsedModelName, type Provider, type ProviderTool, type ResolveOptions, type ResolvedModel, SYSTEM, type SearchBackend, type ThinkingSpeed, type TokenPricing, type TokenUsageForCost, WEB_FETCH_TOOL_NAME, WEB_SEARCH_TOOL_NAME, type WebFetchHandle, type WebFetchOptions, type WebFetchResult, type WebSearchHandle, type WebSearchOptions, type WebSearchResult, addUsage, callGenerateObject, callGenerateText, callModel, canonicalModelName, captureNativeFetchResults, captureNativeResults, computeSessionCost, consoleLogger, createWebFetch, createWebSearch, emptyUsage, fetchUrl, gatewayEnvForProviders, gatewayUrlFor, gatewayUrlForModel, getApiKeyForProvider, getContextLimit, getGatewayBaseURL, getLightModelForProvider, getModel, getModelDetails, getProviderForModel, getProviderOptions, getProviderTool, getSearchApiKey, getTokenPricing, hasApiKeyForProvider, hasSearchApiKey, htmlToText, isPrivateAddress, linkifyCitations, listModels, loadModelPricing, maxOutputTokensFor, normalizeApiKey, normalizeCallerBaseURL, normalizeUsage, parseModelName, resolveFetchBackend, resolveLLMConfig, resolveModel, resolveSearchBackend, searchWeb, stripCitations, validateFetchUrl, withLegacyUsage, withProviderCacheUsage };

package/dist/index.d.ts

@@ -126,6 +126,9 @@ declare function gatewayEnvForProviders(baseUrl: string): {
 declare const normalizeCallerBaseURL: typeof gatewayUrlFor;
 declare const PROVIDERS: Provider[];
 type ModelName = "sonnet" | "opus" | "haiku" | "gemini" | "gpt" | "kimi" | "grok";
+type ModelId = string;
+declare const MODELS: Record<Provider, Partial<Record<ModelName, ModelId>>>;
+declare const DEFAULT_MODELS: Record<Provider, string>;
 declare function getLightModelForProvider(provider: Provider): string;
 interface TokenPricing {
     inputTokenPrice: number;
@@ -152,6 +155,11 @@ declare function getProviderForModel(modelName?: ModelName | string): Provider;
  * pasted with a trailing space still authenticates.
  */
 declare function normalizeApiKey(key?: string | null): string | undefined;
+/**
+ * The env var each provider's API key is read from. Exported so a host with
+ * its own secret store knows which NAME to look up (see resolve.ts).
+ */
+declare const API_KEY_ENV: Record<Provider, string>;
 declare function hasApiKeyForProvider(provider: Provider | string): boolean;
 declare function getApiKeyForProvider(provider: Provider | string): string;
 interface GetModelOptions {
@@ -253,6 +261,91 @@ declare function resolveLLMConfig(opts?: {
     light?: boolean;
 }): LLMConfig;
 
+interface ModelOption {
+    provider: Provider;
+    alias: ModelName;
+    modelId: string;
+    /** The provider's default — what you get with no model name at all. */
+    default: boolean;
+}
+/**
+ * Every alias in the MODELS table, in PROVIDERS order. Pure and keyless,
+ * which is what a UI picker or a server-config endpoint needs.
+ */
+declare function listModels(): ModelOption[];
+interface ParsedModelName {
+    /** Set only when the name carries an explicit "<provider>/" prefix. */
+    provider?: Provider;
+    /** The name with that prefix stripped. Aliases are NOT resolved here.
+     *  undefined for an empty name (or a bare "<provider>/"). */
+    modelId?: string;
+}
+/** Pure syntax: strip an explicit provider prefix, nothing else. */
+declare function parseModelName(name?: string): ParsedModelName;
+interface ModelRef {
+    provider: Provider;
+    /** Concrete id as the provider knows it (alias resolved, prefix stripped). */
+    modelId: string;
+    /** Canonical "<provider>/<modelId>" — unambiguous, itself a valid model name. */
+    name: string;
+}
+/**
+ * Resolve a model name to its provider + concrete id WITHOUT an API key.
+ * Follows getModel's rules — explicit `provider` wins, then an explicit
+ * prefix, then getProviderForModel's inference; aliases map through MODELS;
+ * no name → the provider's default — so what this reports is what
+ * resolveModel / getModel will build. (One deliberate extra: an alias after
+ * a prefix, "anthropic/sonnet", resolves too.)
+ *
+ * Rejects the one input getModel silently gets wrong: a slashed name whose
+ * first segment is NOT a provider ("moonshotai/kimi-k2.6") with nothing
+ * else naming the provider — inference falls to the default and the request
+ * 404s at the wrong API. Say so up front, with the fix. LLM_PROVIDER, when
+ * set, counts as "something naming the provider", exactly as it does for
+ * getProviderForModel.
+ */
+declare function canonicalModelName(model?: string, provider?: Provider | string): ModelRef;
+/**
+ * Per-call output-token cap. An explicit MAX_OUTPUT_TOKENS env always wins.
+ * Otherwise the default is provider-aware: Anthropic runs at 128k because
+ * @ai-sdk/anthropic clamps known models down to their true per-model max
+ * instead of erroring, while OpenAI-compatible hosts (OpenRouter et al)
+ * reject max_tokens above the model limit rather than clamping, so they keep
+ * the conservative 64k default. Thinking tokens count against this same
+ * budget, so headroom matters more than the visible text length suggests.
+ */
+declare function maxOutputTokensFor(provider?: string): number;
+interface ResolveOptions {
+    /** alias | id | "provider/id" | "openrouter/org/id". Omit for the provider's default. */
+    model?: string;
+    /** Explicit provider; otherwise inferred from `model`. */
+    provider?: Provider | string;
+    apiKey?: string;
+    /**
+     * Async key source consulted by env-var NAME ("OPENAI_API_KEY", …) before
+     * process.env — a host's own secret store. Only called when `apiKey` is
+     * absent.
+     */
+    getSecret?: (envName: string) => Promise<string | undefined>;
+    baseUrl?: string;
+    headers?: Record<string, string>;
+    abortSignal?: AbortSignal;
+    timeoutMs?: number;
+}
+interface ResolvedModel extends ModelRef {
+    model: LanguageModel;
+    apiKey: string;
+    contextLimit: number;
+    maxOutputTokens: number;
+}
+/**
+ * Name → everything a caller needs to run: provider, concrete id, canonical
+ * name, the API key that was used, the LanguageModel, its context window,
+ * and the output-token cap. Key precedence: `apiKey` → `getSecret(envName)`
+ * → process.env; none → an error that names the env var. Logs nothing.
+ */
+declare function resolveModel(opts?: ResolveOptions): Promise<ResolvedModel>;
+
 interface AiUsage {
     input: number;
     cache_read: number;
@@ -750,4 +843,4 @@ declare function createWebFetch(opts: CreateWebFetchOptions): WebFetchHandle;
  */
 declare function captureNativeFetchResults(stepContent: unknown, target: WebFetchResult[]): void;
 
-export { type AiUsage, type AiUsageWithLegacy, type Conversation, type ConversationData, ConversationStorage, type CreateWebFetchOptions, type CreateWebSearchOptions, type FetchBackend, type FetchUrlOptions, GATEWAY_PATHS, type GetModelOptions, type HostLookup, type LLMConfig, type Logger, MAX_CONVERSATIONS, type ModelName, OUTRO, PROVIDERS, type Provider, type ProviderTool, SYSTEM, type SearchBackend, type ThinkingSpeed, type TokenPricing, type TokenUsageForCost, WEB_FETCH_TOOL_NAME, WEB_SEARCH_TOOL_NAME, type WebFetchHandle, type WebFetchOptions, type WebFetchResult, type WebSearchHandle, type WebSearchOptions, type WebSearchResult, addUsage, callGenerateObject, callGenerateText, callModel, captureNativeFetchResults, captureNativeResults, computeSessionCost, consoleLogger, createWebFetch, createWebSearch, emptyUsage, fetchUrl, gatewayEnvForProviders, gatewayUrlFor, gatewayUrlForModel, getApiKeyForProvider, getContextLimit, getGatewayBaseURL, getLightModelForProvider, getModel, getModelDetails, getProviderForModel, getProviderOptions, getProviderTool, getSearchApiKey, getTokenPricing, hasApiKeyForProvider, hasSearchApiKey, htmlToText, isPrivateAddress, linkifyCitations, loadModelPricing, normalizeApiKey, normalizeCallerBaseURL, normalizeUsage, resolveFetchBackend, resolveLLMConfig, resolveSearchBackend, searchWeb, stripCitations, validateFetchUrl, withLegacyUsage, withProviderCacheUsage };
+export { API_KEY_ENV, type AiUsage, type AiUsageWithLegacy, type Conversation, type ConversationData, ConversationStorage, type CreateWebFetchOptions, type CreateWebSearchOptions, DEFAULT_MODELS, type FetchBackend, type FetchUrlOptions, GATEWAY_PATHS, type GetModelOptions, type HostLookup, type LLMConfig, type Logger, MAX_CONVERSATIONS, MODELS, type ModelName, type ModelOption, type ModelRef, OUTRO, PROVIDERS, type ParsedModelName, type Provider, type ProviderTool, type ResolveOptions, type ResolvedModel, SYSTEM, type SearchBackend, type ThinkingSpeed, type TokenPricing, type TokenUsageForCost, WEB_FETCH_TOOL_NAME, WEB_SEARCH_TOOL_NAME, type WebFetchHandle, type WebFetchOptions, type WebFetchResult, type WebSearchHandle, type WebSearchOptions, type WebSearchResult, addUsage, callGenerateObject, callGenerateText, callModel, canonicalModelName, captureNativeFetchResults, captureNativeResults, computeSessionCost, consoleLogger, createWebFetch, createWebSearch, emptyUsage, fetchUrl, gatewayEnvForProviders, gatewayUrlFor, gatewayUrlForModel, getApiKeyForProvider, getContextLimit, getGatewayBaseURL, getLightModelForProvider, getModel, getModelDetails, getProviderForModel, getProviderOptions, getProviderTool, getSearchApiKey, getTokenPricing, hasApiKeyForProvider, hasSearchApiKey, htmlToText, isPrivateAddress, linkifyCitations, listModels, loadModelPricing, maxOutputTokensFor, normalizeApiKey, normalizeCallerBaseURL, normalizeUsage, parseModelName, resolveFetchBackend, resolveLLMConfig, resolveModel, resolveSearchBackend, searchWeb, stripCitations, validateFetchUrl, withLegacyUsage, withProviderCacheUsage };

package/dist/index.js

@@ -23178,23 +23178,19 @@ function normalizeApiKey(key) {
   const trimmed = key.trim();
   return trimmed.length > 0 ? trimmed : void 0;
 }
+var API_KEY_ENV = {
+  anthropic: "ANTHROPIC_API_KEY",
+  google: "GOOGLE_API_KEY",
+  openai: "OPENAI_API_KEY",
+  openrouter: "OPENROUTER_API_KEY",
+  xai: "XAI_API_KEY"
+};
 function lookupApiKeyForProvider(provider) {
-  switch (provider) {
-    case "anthropic":
-      return normalizeApiKey(process.env.ANTHROPIC_API_KEY);
-    case "google":
-      return normalizeApiKey(process.env.GOOGLE_API_KEY);
-    case "openai":
-      return normalizeApiKey(process.env.OPENAI_API_KEY);
-    case "openrouter":
-      return normalizeApiKey(process.env.OPENROUTER_API_KEY);
-    case "xai":
-      return normalizeApiKey(process.env.XAI_API_KEY);
-    case "claude_code":
-      return normalizeApiKey(process.env.CLAUDE_CODE_API_KEY);
-    default:
-      return void 0;
+  if (provider === "claude_code") {
+    return normalizeApiKey(process.env.CLAUDE_CODE_API_KEY);
   }
+  if (!PROVIDERS.includes(provider)) return void 0;
+  return normalizeApiKey(process.env[API_KEY_ENV[provider]]);
 }
 function hasApiKeyForProvider(provider) {
   return !!lookupApiKeyForProvider(provider);
@@ -23665,6 +23661,95 @@ function resolveLLMConfig(opts) {
   return { provider, apiKey, model, modelName: effectiveModelName };
 }
 
+// src/resolve.ts
+function listModels() {
+  const out = [];
+  for (const provider of PROVIDERS) {
+    for (const [alias, modelId] of Object.entries(MODELS[provider])) {
+      if (!modelId) continue;
+      out.push({
+        provider,
+        alias,
+        modelId,
+        default: DEFAULT_MODELS[provider] === modelId
+      });
+    }
+  }
+  return out;
+}
+function parseModelName(name19) {
+  if (!name19) return {};
+  const slash = name19.indexOf("/");
+  if (slash > 0) {
+    const head = name19.slice(0, slash);
+    if (PROVIDERS.includes(head)) {
+      return { provider: head, modelId: name19.slice(slash + 1) || void 0 };
+    }
+  }
+  return { modelId: name19 };
+}
+var ALIASES = new Set(Object.values(MODELS).flatMap((m) => Object.keys(m)));
+function envProvider() {
+  const v = process.env.LLM_PROVIDER;
+  return v && PROVIDERS.includes(v) ? v : void 0;
+}
+function canonicalModelName(model, provider) {
+  const parsed = parseModelName(model);
+  const chosen = provider ?? parsed.provider ?? getProviderForModel(model);
+  if (!PROVIDERS.includes(chosen)) {
+    throw new Error(`Unknown LLM provider: "${chosen}". Supported: ${PROVIDERS.join(", ")}`);
+  }
+  const p = chosen;
+  if (model && !provider && !parsed.provider && model.includes("/") && !envProvider()) {
+    const head = model.split("/")[0];
+    throw new Error(
+      `Model "${model}" has no provider prefix: "${head}" is not a provider (${PROVIDERS.join(", ")}). For an OpenRouter-hosted model write "openrouter/${model}"; otherwise pass the provider explicitly.`
+    );
+  }
+  let modelId = parsed.modelId;
+  if (modelId && ALIASES.has(modelId)) {
+    const hit = MODELS[p][modelId];
+    if (!hit) {
+      throw new Error(
+        `Model "${modelId}" is not available for provider "${p}". Available models: ${Object.keys(MODELS[p]).join(", ")}`
+      );
+    }
+    modelId = hit;
+  }
+  if (!modelId) modelId = DEFAULT_MODELS[p];
+  return { provider: p, modelId, name: `${p}/${modelId}` };
+}
+function maxOutputTokensFor(provider) {
+  const env = Number(process.env.MAX_OUTPUT_TOKENS);
+  if (env > 0) return env;
+  return provider === "anthropic" ? 128e3 : 64e3;
+}
+async function resolveModel(opts = {}) {
+  const ref = canonicalModelName(opts.model, opts.provider);
+  const envName = API_KEY_ENV[ref.provider];
+  const apiKey = normalizeApiKey(opts.apiKey) ?? normalizeApiKey(await opts.getSecret?.(envName)) ?? normalizeApiKey(process.env[envName]);
+  if (!apiKey) {
+    throw new Error(
+      `No API key for provider "${ref.provider}": set ${envName} (or pass apiKey / getSecret)`
+    );
+  }
+  const model = getModel(ref.provider, {
+    modelName: ref.name,
+    apiKey,
+    baseUrl: opts.baseUrl,
+    headers: opts.headers,
+    abortSignal: opts.abortSignal,
+    timeoutMs: opts.timeoutMs
+  });
+  return {
+    ...ref,
+    model,
+    apiKey,
+    contextLimit: getContextLimit(ref.modelId, ref.provider),
+    maxOutputTokens: maxOutputTokensFor(ref.provider)
+  };
+}
+
 // src/stream.ts
 import {
   streamText,
@@ -24484,9 +24569,12 @@ function consoleLogger(name19) {
   };
 }
 export {
+  API_KEY_ENV,
   ConversationStorage,
+  DEFAULT_MODELS,
   GATEWAY_PATHS,
   MAX_CONVERSATIONS,
+  MODELS,
   OUTRO,
   PROVIDERS,
   SYSTEM,
@@ -24496,6 +24584,7 @@ export {
   callGenerateObject,
   callGenerateText,
   callModel,
+  canonicalModelName,
   captureNativeFetchResults,
   captureNativeResults,
   computeSessionCost,
@@ -24523,12 +24612,16 @@ export {
   htmlToText,
   isPrivateAddress,
   linkifyCitations,
+  listModels,
   loadModelPricing,
+  maxOutputTokensFor,
   normalizeApiKey,
   normalizeCallerBaseURL,
   normalizeUsage,
+  parseModelName,
   resolveFetchBackend,
   resolveLLMConfig,
+  resolveModel,
   resolveSearchBackend,
   searchWeb,
   stripCitations,