@x12i/ai-gateway 10.0.2 → 10.0.5

package/dist-cjs/gateway-utils.d.ts

@@ -16,7 +16,10 @@ export declare function ensureTaskTypeId(request: ChatRequest, logger: Logxer):
 export type MergeConfigOptions = {
     catalog?: AiModelsCatalogClient | null;
     routingEnv?: OpenRouterRoutingConfig;
+    openRouterApiKey?: string;
+    preferOpenRouter?: boolean;
 };
+export { MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, } from '@x12i/ai-tools';
 /**
  * Merges config with defaults
  * Supports using internal system action defaults (internalSkill or skillAudit) when useInternalDefaults is set
@@ -91,13 +94,38 @@ export type ResolveCostCompletionOptions = {
     calculator?: CostCalculator | null;
     calculateCost?: boolean;
 };
-/** Record shape for {@link CostCalculator.calculateFromRecord} (router + merged config + usage). */
+/** Optional cache/reasoning token fields for catalog pricing records. */
+export type InvokeUsageExtras = {
+    cached?: number;
+    cacheWrite?: number;
+    reasoning?: number;
+};
+/**
+ * Best-effort cache/reasoning token counts from router usage buckets
+ * (for {@link buildGatewayPricingRecord} / ai-tools {@link CostCalculator.calculateFromRecord}).
+ */
+export declare function extractUsageExtrasFromRouterResponse(routerResponse: unknown): InvokeUsageExtras;
+/**
+ * Whether ai-tools catalog pricing is authoritative enough for Step B (`priced`).
+ * Matches the generic engine contract: authoritative catalog hit with finite cost ≥ 0.
+ */
+export declare function catalogPricingSucceeded(result: AiCostResult): boolean;
+/** Record shape for {@link CostCalculator.calculateFromRecord} (shared engine contract). */
 export declare function buildGatewayPricingRecord(routerResponse: unknown, tokens: {
     prompt: number;
     completion: number;
     total: number;
 }, mergedConfig?: unknown): Record<string, unknown>;
 export declare function mapAiCostResultToResolvedActivityCost(base: ResolvedActivityCost, result: AiCostResult): ResolvedActivityCost;
+/**
+ * G8 safety net: token usage without a billing signal → `unpriced`.
+ * Used at invoke boundaries after {@link resolveCostCompletionWithAiTools}.
+ */
+export declare function ensureInvokeBillingCostStatus(billing: ResolvedActivityCost, tokens: {
+    prompt: number;
+    completion: number;
+    total: number;
+}): ResolvedActivityCost;
 /**
  * Router cost passthrough, then optional @x12i/ai-tools catalog pricing when still unpriced.
  */
@@ -149,14 +177,6 @@ export declare function pickEffectiveModelConfigFromInvokeRequest(request: Pick<
  */
 export declare function tryExtractRouterLikePayloadFromErrorChain(error: unknown, maxDepth?: number): unknown;
 export declare function pickRequestIdsFromRouterLike(gatewayAiRequestId: string | undefined, routerLike: unknown): GatewayTraceRequestIds | undefined;
-/** Error code hint when a bundled profile name cannot be routed to a catalog target. */
-export declare const MODEL_PROFILE_UNROUTABLE = "MODEL_PROFILE_UNROUTABLE";
-export declare class ModelProfileUnroutableError extends Error {
-    readonly profileAlias: string;
-    readonly provider: string | undefined;
-    readonly code = "MODEL_PROFILE_UNROUTABLE";
-    constructor(profileAlias: string, provider: string | undefined, cause?: unknown);
-}
 type ModelResolutionCandidate = {
     provider: string;
     model: string;
@@ -175,7 +195,7 @@ export declare function mapGatewayFallbackAttemptsToRouter(attempts: GatewayFall
     responsePreview?: string;
 }>;
 /**
- * Log profile alias vs OpenRouter model id actually sent to the router after catalog resolution.
+ * Log original input vs OpenRouter model id actually sent to the router after catalog resolution.
  */
 export declare function logResolvedModelRouting(logger: Logxer, request: ChatRequest, mergedConfig: ChatRequest['config']): void;
 /**

package/dist-cjs/gateway.cjs

@@ -11,10 +11,9 @@ import { resolveRetryConfig } from './gateway-defaults.js';
 import { buildMessages } from './message-builder.js';
 import { extractJsonFromFlexMd } from './flex-md-loader.js';
 import { enrichParsedContentForOutputContract, resolveOutputContractFieldKeys } from './output-contract-normalizer.js';
-import { attachGatewayInvokeRejectionMetadata, buildGatewayFallbackAttemptsFromTrace, buildInvokeRejectionMetadata, capActivityFullResponsePayload, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter, hasNonZeroTokenUsage, DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, extractCostUsdFromRouterResponse, extractTokenUsageFromRouterResponse, mergeConfig, pickEffectiveModelConfigForMetadata, pickInvokeRoutingMetadataSlice, pickTraceMergedRouterConfig, resolveCostCompletionWithAiTools, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, tryExtractRouterLikePayloadFromErrorChain } from './gateway-utils.js';
+import { attachGatewayInvokeRejectionMetadata, buildGatewayFallbackAttemptsFromTrace, buildInvokeRejectionMetadata, capActivityFullResponsePayload, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter, DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, extractCostUsdFromRouterResponse, extractTokenUsageFromRouterResponse, mergeConfig, pickEffectiveModelConfigForMetadata, pickInvokeRoutingMetadataSlice, pickTraceMergedRouterConfig, resolveCostCompletionWithAiTools, ensureInvokeBillingCostStatus, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, tryExtractRouterLikePayloadFromErrorChain } from './gateway-utils.js';
 import { getAiToolsClient } from './ai-tools-client.js';
 import { autoRegisterProviders } from './gateway-provider-auto-register.js';
-import { applyOpenRouterInvokePolicy } from './ai-tools-client.js';
 import { setGatewayLastJobId, setGatewayRuntimeClients } from './runtime-objects.js';
 import { gatewayLogDebug, withActivityIdentity, withGatewayLogContext } from './gateway-log-meta.js';
 import { exceptionEvidence, fieldEvidence, GatewayLogCode, gatewayErrorCode, gatewayWarnCode } from './gateway-log-diagnostics.js';
@@ -100,15 +99,11 @@ export class AIGateway {
             const mergedConfig = await mergeConfig(request, this.config, this.logger, {
                 catalog: aiTools?.catalog ?? null,
                 routingEnv: aiTools?.routingEnv,
+                openRouterApiKey: this.openRouterApiKey,
+                preferOpenRouter: this.preferOpenRouter,
             });
             // Activix start snapshot must match what the router receives (modelConfig-only callers omit request.config.model).
             request._mergedRouterConfig = mergedConfig;
-            applyOpenRouterInvokePolicy(mergedConfig, {
-                preferOpenRouter: this.preferOpenRouter,
-                openRouterApiKey: this.openRouterApiKey,
-                routingEnv: aiTools?.routingEnv,
-                resolution: request._modelResolution,
-            });
             // Lazy auto-register providers from env (OPENAI_API_KEY, etc.) so consumers don't have to call init
             if (!this._autoRegisterDone) {
                 await autoRegisterProviders(this.router, this.logger);
@@ -140,11 +135,12 @@ export class AIGateway {
                 });
                 const metaChat = response?.metadata || {};
                 const tokensChat = extractTokenUsageFromRouterResponse(response);
-                const costCompletionChat = await resolveCostCompletionWithAiTools(response, tokensChat, {
+                let costCompletionChat = await resolveCostCompletionWithAiTools(response, tokensChat, {
                     mergedConfig,
                     calculator: aiTools?.calculator ?? null,
                     calculateCost: this.config.aiTools?.calculateCost
                 });
+                costCompletionChat = ensureInvokeBillingCostStatus(costCompletionChat, tokensChat);
                 // Create enhanced response
                 const enhancedResponse = {
                     content: response.content || '',
@@ -292,14 +288,10 @@ export class AIGateway {
             const mergedConfig = await mergeConfig(request, this.config, this.logger, {
                 catalog: aiTools?.catalog ?? null,
                 routingEnv: aiTools?.routingEnv,
-            });
-            request._mergedRouterConfig = mergedConfig;
-            applyOpenRouterInvokePolicy(mergedConfig, {
-                preferOpenRouter: this.preferOpenRouter,
                 openRouterApiKey: this.openRouterApiKey,
-                routingEnv: aiTools?.routingEnv,
-                resolution: request._modelResolution,
+                preferOpenRouter: this.preferOpenRouter,
             });
+            request._mergedRouterConfig = mergedConfig;
             logResolvedModelRouting(this.logger, request, mergedConfig);
             const diagnosticsMode = request.diagnostics?.mode;
             const traceEnabled = diagnosticsMode === 'trace';
@@ -623,9 +615,7 @@ export class AIGateway {
                     calculator: aiTools?.calculator ?? null,
                     calculateCost: this.config.aiTools?.calculateCost
                 });
-                if (!costCompletion.costStatus && hasNonZeroTokenUsage(tokens)) {
-                    costCompletion = { ...costCompletion, costStatus: 'unpriced' };
-                }
+                costCompletion = ensureInvokeBillingCostStatus(costCompletion, tokens);
                 const routerMetaForCost = routerResponse?.metadata || {};
                 const routingMetadataSlice = pickInvokeRoutingMetadataSlice(routerResponse, mergedConfig);
                 const effectiveModelConfig = pickEffectiveModelConfigForMetadata(mergedConfig);

package/dist-cjs/index.cjs

@@ -17,7 +17,7 @@ export * from '@x12i/ai-providers-router';
 export { AIGateway } from './gateway.js';
 export { InstructionNotFoundError, InstructionBackendError, ModelRequiredError, MaxTokensRequiredError } from './instruction-errors.js';
 export { autoRegisterProviders } from './gateway-provider-auto-register.js';
-export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
+export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, ensureInvokeBillingCostStatus, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
 export { getGatewayOperationalMode, isProdGatewayMode, parseModelProviderSpec } from './gateway-mode.js';
 export { DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, GATEWAY_DEFAULT_FREQUENCY_PENALTY, GATEWAY_DEFAULT_PRESENCE_PENALTY, GATEWAY_DEFAULT_RETRY, GATEWAY_DEFAULT_TEMPERATURE, GATEWAY_DEFAULT_TOP_P, resolveRetryConfig } from './gateway-defaults.js';
 export { contractSpecToFieldKeys, enrichParsedContentForOutputContract, resolveOutputContractFieldKeys } from './output-contract-normalizer.js';
@@ -33,6 +33,8 @@ export { activityIdentityToLogContext, activityIdentityToLogMeta, withActivityId
 export { createGatewayLogger, resolveGatewayVerboseEnabled } from './logger-factory.js';
 export { GATEWAY_LOG_ENV_PREFIX, GATEWAY_LOGXER_PACKAGE, GATEWAY_STACK_LOG_PREFIXES, initializeGatewayPackageLogLevels, resetGatewayPackageLogLevelsInit } from './gateway-log-levels.js';
 export { GatewayLogCode, gatewayErrorCode, gatewayInfoCode, gatewayWarnCode, gatewayAnomalyMeta, resolveLogDiagnosticsCatalogPath, exceptionEvidence, fieldEvidence } from './gateway-log-diagnostics.js';
+/** Re-export @x12i/ai-tools invoke orchestrator (≥ 2.5.0) for engine callers. */
+export { resolveInvokeModel, applyModelResolution, applyOpenRouterInvokePolicy, mapResolutionToRouterConfig, buildInvokeModelResolverOptions, buildModelResolverOptions, enrichModelResolutionError, getAiToolsClient, resetAiToolsClientForTests, resolveOpenRouterApiKey, resolvePreferOpenRouter, readPreferOpenRouterFromEnv, getAiToolsInvokeClient, createAiToolsInvokeClient, } from './ai-tools-client.js';
 // Re-export logging (@x12i/logxer)
 export { createLogxer, DebugLogAbstract, runWithLogContext, getStationRuntimeIdentity, mergeRuntimeIdentity, conditionEvidence, sourceEvidence, logReferenceEvidence, readAgentLoggingInstructions, resolveAgentLoggingInstructionsPath, applyPackageLogLevelsFromEnv, configurePackageLogLevels, mergePackageLogLevelsConfig, setPackageLogLevel, resolveStackLogLevelForPrefix, resolvePackageLogsLevel, parseLogxerPackageLevelsEnv, LOGXER_PACKAGE_LEVELS_ENV, LOGXER_PACKAGE_LOGS_DEFAULT_ENV } from '@x12i/logxer';
 export { ROUTER_LOG_ENV_PREFIX } from '@x12i/ai-providers-router';

package/dist-cjs/index.d.ts

@@ -17,7 +17,7 @@ export { AIGateway } from './gateway.js';
 export { InstructionNotFoundError, InstructionBackendError, ModelRequiredError, MaxTokensRequiredError } from './instruction-errors.js';
 export { autoRegisterProviders } from './gateway-provider-auto-register.js';
 export type { GatewayConfig, ProviderModelRef, ModelConfig, RetryConfig, ChatRequest, AIInvokeRequest, AIRequest, GatewayActionType, GatewayInvokeRejectionMetadata, GatewayFallbackAttempt, GatewayTraceRequestIds, GatewayTraceAttempt, GatewayTraceUsageSummary, GatewayTraceMergedConfig, EnhancedLLMResponse, InstructionMetadata, ValidationRule, TemplateRenderOptions, SmartInputConfig, SmartInputRenderOptions } from './types.js';
-export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
+export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, ensureInvokeBillingCostStatus, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
 export { getGatewayOperationalMode, isProdGatewayMode, parseModelProviderSpec } from './gateway-mode.js';
 export type { GatewayOperationalMode } from './gateway-mode.js';
 export { DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, GATEWAY_DEFAULT_FREQUENCY_PENALTY, GATEWAY_DEFAULT_PRESENCE_PENALTY, GATEWAY_DEFAULT_RETRY, GATEWAY_DEFAULT_TEMPERATURE, GATEWAY_DEFAULT_TOP_P, resolveRetryConfig } from './gateway-defaults.js';
@@ -40,6 +40,9 @@ export type { GatewayLoggerConfig } from './logger-factory.js';
 export { GATEWAY_LOG_ENV_PREFIX, GATEWAY_LOGXER_PACKAGE, GATEWAY_STACK_LOG_PREFIXES, initializeGatewayPackageLogLevels, resetGatewayPackageLogLevelsInit } from './gateway-log-levels.js';
 export { GatewayLogCode, gatewayErrorCode, gatewayInfoCode, gatewayWarnCode, gatewayAnomalyMeta, resolveLogDiagnosticsCatalogPath, exceptionEvidence, fieldEvidence } from './gateway-log-diagnostics.js';
 export type { GatewayLogCode as GatewayDiagnosticCode } from './gateway-log-diagnostics.js';
+/** Re-export @x12i/ai-tools invoke orchestrator (≥ 2.5.0) for engine callers. */
+export { resolveInvokeModel, applyModelResolution, applyOpenRouterInvokePolicy, mapResolutionToRouterConfig, buildInvokeModelResolverOptions, buildModelResolverOptions, enrichModelResolutionError, getAiToolsClient, resetAiToolsClientForTests, resolveOpenRouterApiKey, resolvePreferOpenRouter, readPreferOpenRouterFromEnv, getAiToolsInvokeClient, createAiToolsInvokeClient, } from './ai-tools-client.js';
+export type { AiToolsClientBundle, AiToolsInvokeClient, InvokeModelResolutionDiagnostics, InvokeModelResolutionInput, InvokeModelResolutionOptions, InvokeModelResolutionResult, InvokeRouterConfigSlice, } from './ai-tools-client.js';
 export { createLogxer, DebugLogAbstract, runWithLogContext, getStationRuntimeIdentity, mergeRuntimeIdentity, conditionEvidence, sourceEvidence, logReferenceEvidence, readAgentLoggingInstructions, resolveAgentLoggingInstructionsPath, applyPackageLogLevelsFromEnv, configurePackageLogLevels, mergePackageLogLevelsConfig, setPackageLogLevel, resolveStackLogLevelForPrefix, resolvePackageLogsLevel, parseLogxerPackageLevelsEnv, LOGXER_PACKAGE_LEVELS_ENV, LOGXER_PACKAGE_LOGS_DEFAULT_ENV } from '@x12i/logxer';
 export { ROUTER_LOG_ENV_PREFIX } from '@x12i/ai-providers-router';
 export type { Logxer, LogMeta, RuntimeIdentity, LogRuntimeContext, GetJobLogsInput, GetJobLogsResult, QueryableLogLine, LogDiagnostics, DiagnosticEvidence, ScopeCriteria, ScopeLogsResult, StackLoggingOptions, PackageLogLevelsConfig, PackageLogLevelSetting } from '@x12i/logxer';

package/dist-cjs/openrouter-routing.cjs

@@ -1,37 +1,11 @@
 /**
- * OpenRouter API key and gateway-level "prefer OpenRouter" flag.
- * Provider/model routing (openrouter vs vendor) is resolved by @x12i/ai-tools in mergeConfig.
+ * Gateway-level OpenRouter key + prefer flags mapped to @x12i/ai-tools invoke helpers.
  */
+import { readPreferOpenRouterFromEnv, resolveOpenRouterApiKey as resolveOpenRouterApiKeyFromTools, resolvePreferOpenRouter as resolvePreferFromTools, } from '@x12i/ai-tools';
+export { readPreferOpenRouterFromEnv };
 export function resolveOpenRouterApiKey(config = {}) {
-    const explicit = config.openrouter?.apiKey;
-    if (typeof explicit === 'string' && explicit.trim() && !explicit.startsWith('ENV.')) {
-        return explicit.trim();
-    }
-    const env = process.env.OPENROUTER_API_KEY?.trim();
-    return env || undefined;
+    return resolveOpenRouterApiKeyFromTools(config.openrouter?.apiKey);
 }
-/**
- * Read operator preference from env: `PREFER_OPENROUTER` (current), then deprecated `USE_OPENROUTER`.
- * Returns undefined when neither is set.
- */
-export function readPreferOpenRouterFromEnv() {
-    const prefer = process.env.PREFER_OPENROUTER?.trim();
-    if (prefer === 'false' || prefer === '0')
-        return false;
-    if (prefer === 'true' || prefer === '1')
-        return true;
-    const legacy = process.env.USE_OPENROUTER?.trim();
-    if (legacy === 'false' || legacy === '0')
-        return false;
-    if (legacy === 'true' || legacy === '1')
-        return true;
-    return undefined;
-}
-/**
- * When true, pass `routeViaOpenRouter: true` into ai-tools resolveModel (prefer OpenRouter when a key exists).
- * Default: true. `PREFER_OPENROUTER=false` (or deprecated `USE_OPENROUTER=false`) forces vendor-direct when keys exist;
- * ai-tools still falls back to OpenRouter when the requested provider has no direct key.
- */
 export function resolvePreferOpenRouter(config = {}) {
     if (config.openRouter?.prefer === true)
         return true;
@@ -41,8 +15,5 @@ export function resolvePreferOpenRouter(config = {}) {
         return true;
     if (config.openRouter?.enabled === false)
         return false;
-    const fromEnv = readPreferOpenRouterFromEnv();
-    if (fromEnv !== undefined)
-        return fromEnv;
-    return true;
+    return resolvePreferFromTools();
 }

package/dist-cjs/openrouter-routing.d.ts

@@ -1,17 +1,8 @@
 /**
- * OpenRouter API key and gateway-level "prefer OpenRouter" flag.
- * Provider/model routing (openrouter vs vendor) is resolved by @x12i/ai-tools in mergeConfig.
+ * Gateway-level OpenRouter key + prefer flags mapped to @x12i/ai-tools invoke helpers.
  */
+import { readPreferOpenRouterFromEnv } from '@x12i/ai-tools';
 import type { GatewayConfig } from './types.js';
+export { readPreferOpenRouterFromEnv };
 export declare function resolveOpenRouterApiKey(config?: GatewayConfig): string | undefined;
-/**
- * Read operator preference from env: `PREFER_OPENROUTER` (current), then deprecated `USE_OPENROUTER`.
- * Returns undefined when neither is set.
- */
-export declare function readPreferOpenRouterFromEnv(): boolean | undefined;
-/**
- * When true, pass `routeViaOpenRouter: true` into ai-tools resolveModel (prefer OpenRouter when a key exists).
- * Default: true. `PREFER_OPENROUTER=false` (or deprecated `USE_OPENROUTER=false`) forces vendor-direct when keys exist;
- * ai-tools still falls back to OpenRouter when the requested provider has no direct key.
- */
 export declare function resolvePreferOpenRouter(config?: GatewayConfig): boolean;

package/dist-cjs/types.d.ts

@@ -9,6 +9,7 @@ type AIModel = string;
 export type UsageTier = string;
 import type { Activix } from '@x12i/activix';
 import type { SmartInputConfig, SmartInputRenderOptions, TemplateRenderOptions } from '@x12i/rendrix';
+import type { ProfileCatalogLane } from '@x12i/ai-profiles';
 import type { Logxer, PackageLogLevelsConfig } from '@x12i/logxer';
 /**
  * Diagnostics options for opt-in authoritative tracing.
@@ -415,10 +416,21 @@ export interface GatewayConfig extends Omit<RouterConfig, 'defaultEngine' | 'log
         cacheTtlMs?: number;
         /** Use bundled catalog JSON only (offline / tests). */
         bundledOnly?: boolean;
+        /**
+         * Catalog lane for model resolution and cost lookup (`text`, `image`, …).
+         * @default `"text"` in ai-tools when omitted.
+         */
+        catalogLane?: ProfileCatalogLane;
         /** @default true */
         resolveModels?: boolean;
+        /**
+         * When true (default), reject profile/choice keys and shortcuts (`cheap/default`, `cheapest`, …).
+         * Only concrete catalog model ids are accepted; ai-tools still normalizes aliases and routing.
+         */
+        modelsOnly?: boolean;
         /** @default true */
         calculateCost?: boolean;
+        /** @default false — when true, priced results may include prompt/completion breakdown. */
         costIncludeBreakdown?: boolean;
     };
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x12i/ai-gateway",
-  "version": "10.0.2",
+  "version": "10.0.5",
   "description": "AI Gateway - Unified interface for LLM provider routing and management",
   "type": "module",
   "exports": {
@@ -43,7 +43,7 @@
   "dependencies": {
     "@x12i/activix": "^8.5.0",
     "@x12i/ai-providers-router": "^4.9.2",
-    "@x12i/ai-tools": "^2.4.0",
+    "@x12i/ai-tools": "^2.5.0",
     "@x12i/flex-md": "^4.8.0",
     "@x12i/logxer": "^4.6.0",
     "@x12i/rendrix": "^4.3.0"