@x12i/ai-gateway 10.4.3 → 11.0.0

package/README.md

@@ -8,12 +8,12 @@ Unified gateway for LLM provider routing, structured logging, optional Activix a
 |------|----------|
 | **Routing** | Registers providers (or lazy-registers from env), invokes the router with merged model config, retries, and optional fallback chain. |
 | **`invoke()`** | Builds messages from instructions + prompt templates + `workingMemory`; requires runtime **identity** and **actionType** / **actionRef**. |
-| **`invokeChat()`** | Raw chat-style requests; no instruction builder or action classification. |
+| **`invokeChat()`** | Same **`buildMessages`** path as **`invoke()`** (instructions + prompt templates + `workingMemory`). |
 | **Cost** | Steps A→D on every successful **`invoke()`** / **`invokeChat()`**: router cost first, then **`@x12i/ai-tools`** catalog via **`calculateFromRecord`** when still unpriced. Single path — **`resolveCostCompletionWithAiTools`**. |
 | **Activix** | Optional Mongo-backed activity rows; billing written from gateway-computed slice on **`completeRecord`** (`outer.cost` + root fields). No Activix **`autoCost`** re-pricing. |
 | **Trace mode** | `diagnostics.mode === 'trace'` adds `metadata.attempts[]`, `metadata.usage`, and per-attempt **`costUsd`** / **`costStatus`**. |
 
-Pinned dependency versions are in `package.json` (currently **Activix ^9.0**, **ai-tools ^3.3**, **ai-profiles ^3.4**, **ai-providers-router ^4.9**, **openrouter-runtime ^1.0**).
+Pinned dependency versions are in `package.json` (currently **Activix ^9.0**, **ai-tools ^3.3**, **ai-profiles ^3.4**, **ai-providers-router ^4.10**, **openrouter-runtime ^1.0.4**).
 
 ---
 
@@ -152,7 +152,7 @@ import {
 
 ### Template rendering (`defaults/template-rendering.json`)
 
-Used by **@x12i/rendrix** when parsing `instructions`, `prompt`, and `context`:
+Used by **@x12i/rendrix** when parsing `instructions` and `prompt`:
 
 1. Loaded at gateway init from `defaults/template-rendering.json` (copied to `dist/defaults/` on build).
 2. Merged with `GatewayConfig.templateRendering`.
@@ -308,6 +308,17 @@ Do **not** add a direct **`@x12i/ai-tools`** dependency for post-call cost. For
 
 Full contract: [AI Gateway invoke execution metadata](./docs/AI_GATEWAY_INVOKE_EXECUTION_METADATA.md).
 
+### Provider failure taxonomy (router ≥ 4.10)
+
+When the fallback chain exhausts, **`@x12i/ai-providers-router`** assigns stable sub-codes (`PROVIDER_AUTH_FAILED`, `PROVIDER_RATE_LIMITED`, `PROVIDER_QUOTA_EXCEEDED`, `PROVIDER_MODEL_NOT_FOUND`, `PROVIDER_GATEWAY_UNREACHABLE`, `OPENROUTER_API_KEY_MISSING`, …). The gateway forwards them on:
+
+| Surface | Fields |
+|---------|--------|
+| Thrown error | `error.code`, `error.operatorHint`, `error.details.providerAttempts[]` |
+| Rejection metadata | `error.metadata.fallbackAttempts[]`, `error.metadata.providerAttempts[]`, `error.metadata.providerSubCode`, `error.metadata.operatorHint` |
+
+Each attempt includes `{ provider, modelId?, httpStatus?, message, code }` — no prose parsing required. Trace-mode exhaustion uses `enrichGatewayFallbackExhaustedError()` before throw. Helpers are re-exported from `@x12i/ai-gateway` via the router (`enrichRunTaskError`, `providerAttemptsFromFallbackAttempts`, `operatorHintForProviderFailureCode`, …).
+
 ### Trace diagnostics
 
 ```typescript

package/dist/activity-manager.js

@@ -549,7 +549,6 @@ export class ActivityManager {
         // Build request object snapshots (raw = incoming; parsed = constructed messages/meta)
         const rawSnapshot = request._rawRequest ?? {
             instructions: request.instructions,
-            context: request.context,
             prompt: request.prompt,
             messages: request.messages,
             workingMemory: request.workingMemory,
@@ -559,31 +558,26 @@ export class ActivityManager {
         const requestData = {};
         // raw snapshot (only allowed fields)
         if (rawSnapshot.instructions !== undefined ||
-            rawSnapshot.context !== undefined ||
             rawSnapshot.prompt !== undefined) {
             requestData.raw = {
                 instructions: rawSnapshot.instructions,
-                context: rawSnapshot.context,
                 prompt: rawSnapshot.prompt
             };
         }
         // parsed snapshot (only allowed fields)
         // Ensure parsed is populated if parsedSnapshot has data, even if individual fields are undefined
         if (parsedSnapshot.instructions !== undefined ||
-            parsedSnapshot.context !== undefined ||
             parsedSnapshot.prompt !== undefined) {
             requestData.parsed = {
                 instructions: parsedSnapshot.instructions,
-                context: parsedSnapshot.context,
                 prompt: parsedSnapshot.prompt
             };
         }
         else if (Object.keys(parsedSnapshot).length > 0) {
-            // If parsedSnapshot exists but doesn't have instructions/context/prompt,
+            // If parsedSnapshot exists but doesn't have instructions/prompt,
             // still create parsed with what's available (mirror of raw request after processing)
             requestData.parsed = {
                 instructions: rawSnapshot.instructions,
-                context: rawSnapshot.context,
                 prompt: rawSnapshot.prompt
             };
         }
@@ -631,11 +625,9 @@ export class ActivityManager {
         // Only attach if any field is present
         const hasRequest = (requestData.raw &&
             (requestData.raw.instructions !== undefined ||
-                requestData.raw.context !== undefined ||
                 requestData.raw.prompt !== undefined)) ||
             (requestData.parsed &&
                 (requestData.parsed.instructions !== undefined ||
-                    requestData.parsed.context !== undefined ||
                     requestData.parsed.prompt !== undefined)) ||
             requestData.messages !== undefined ||
             requestData.workingMemory !== undefined ||
@@ -750,7 +742,6 @@ export class ActivityManager {
         // Build request object snapshots (same as startActivity)
         const rawSnapshot = request._rawRequest ?? {
             instructions: request.instructions,
-            context: request.context,
             prompt: request.prompt,
             messages: request.messages,
             workingMemory: request.workingMemory,
@@ -760,21 +751,17 @@ export class ActivityManager {
         const requestData = {};
         // raw snapshot
         if (rawSnapshot.instructions !== undefined ||
-            rawSnapshot.context !== undefined ||
             rawSnapshot.prompt !== undefined) {
             requestData.raw = {
                 instructions: rawSnapshot.instructions,
-                context: rawSnapshot.context,
                 prompt: rawSnapshot.prompt
             };
         }
         // parsed snapshot
         if (parsedSnapshot.instructions !== undefined ||
-            parsedSnapshot.context !== undefined ||
             parsedSnapshot.prompt !== undefined) {
             requestData.parsed = {
                 instructions: parsedSnapshot.instructions,
-                context: parsedSnapshot.context,
                 prompt: parsedSnapshot.prompt
             };
         }
@@ -802,20 +789,17 @@ export class ActivityManager {
             requestData.workingMemory = rawSnapshot.workingMemory;
         }
         // Add skill-specific request structure
-        if (rawSnapshot.workingMemory || rawSnapshot.context) {
+        if (rawSnapshot.workingMemory) {
             requestData.skill = {
-                variables: rawSnapshot.workingMemory,
-                context: rawSnapshot.context
+                variables: rawSnapshot.workingMemory
             };
         }
         // Only attach if any field is present
         const hasRequest = (requestData.raw &&
             (requestData.raw.instructions !== undefined ||
-                requestData.raw.context !== undefined ||
                 requestData.raw.prompt !== undefined)) ||
             (requestData.parsed &&
                 (requestData.parsed.instructions !== undefined ||
-                    requestData.parsed.context !== undefined ||
                     requestData.parsed.prompt !== undefined)) ||
             requestData.messages !== undefined ||
             requestData.workingMemory !== undefined ||

package/dist/gateway-memory.js

@@ -104,10 +104,6 @@ export function buildWorkingMemory(request, existingWorkingMemory, otherMemories
     if (!workingMemory.job.objective && request.instructions) {
         workingMemory.job.objective = request.instructions;
     }
-    if (!workingMemory.job.context && request.context) {
-        workingMemory.job.context = request.context;
-    }
-    // Input field has been removed - data should come from workingMemory.input
     if (!workingMemory.job.narrative && request.prompt) {
         workingMemory.job.narrative = request.prompt;
     }
@@ -118,9 +114,6 @@ export function buildWorkingMemory(request, existingWorkingMemory, otherMemories
     if (!workingMemory.task.objective && request.instructions) {
         workingMemory.task.objective = request.instructions;
     }
-    if (!workingMemory.task.context && request.context) {
-        workingMemory.task.context = request.context;
-    }
     // Input field has been removed - data should come from workingMemory.input
     if (!workingMemory.task.id && request.identity.taskId) {
         workingMemory.task.id = request.identity.taskId;

package/dist/gateway-messages.d.ts

@@ -7,14 +7,11 @@ import type { Logxer } from '@x12i/logxer';
 import { type MessageBuilderConfig } from './message-builder.js';
 type Request = ChatRequest | AIRequest;
 /**
- * Constructs messages from instructions/prompt/input/context
+ * Constructs messages from instructions and prompt (two-message contract).
  *
  * Uses direct message builder which handles:
- * - Token resolution (3-tier system)
  * - Template parsing (via Rendrix, @x12i/rendrix)
- * - Instruction block resolution and composition
- * - Flex-md format specification
- * - Message assembly
+ * - Message assembly: system (instructions) + user (prompt or input fallback)
  */
 export declare function constructMessages(request: Request, config: MessageBuilderConfig, logger: Logxer, parsedSnapshot?: any): Promise<Array<{
     role: string;

package/dist/gateway-messages.js

@@ -13,21 +13,17 @@ function isAIRequest(request) {
         'reasoningEncrypted' in request;
 }
 /**
- * Constructs messages from instructions/prompt/input/context
+ * Constructs messages from instructions and prompt (two-message contract).
  *
  * Uses direct message builder which handles:
- * - Token resolution (3-tier system)
  * - Template parsing (via Rendrix, @x12i/rendrix)
- * - Instruction block resolution and composition
- * - Flex-md format specification
- * - Message assembly
+ * - Message assembly: system (instructions) + user (prompt or input fallback)
  */
 export async function constructMessages(request, config, logger, parsedSnapshot) {
     logger.verbose('Constructing messages from request', {
         jobId: request.identity.jobId,
         agentId: request.agentId,
         hasInstructions: !!request.instructions,
-        hasContext: !!request.context,
         hasPrompt: !!request.prompt,
         hasWorkingMemory: !!request.workingMemory
     });

package/dist/gateway-utils.d.ts

@@ -3,6 +3,8 @@
  * Handles utility functions
  */
 import type { AIInvokeRequest, ChatRequest, GatewayConfig, GatewayFallbackAttempt, GatewayInvokeRejectionMetadata, GatewayTraceAttempt, GatewayTraceMergedConfig, GatewayTraceRequestIds, GatewayTraceUsageSummary, ModelConfig } from './types.js';
+import { FallbackExhaustedError } from '@x12i/ai-providers-router';
+import type { ProviderFailureCode } from '@x12i/ai-providers-router';
 import type { Logxer } from '@x12i/logxer';
 import { type AiCostResult, type AiModelsCatalogClient, type CostCalculator, type OpenRouterRoutingConfig } from '@x12i/ai-tools';
 import { pickOpenRouterRuntimeMetadataSlice, enrichTraceOpenRouterRuntimeMetadata } from './openrouter-runtime-adapter/index.js';
@@ -191,9 +193,13 @@ export declare function mapGatewayFallbackAttemptsToRouter(attempts: GatewayFall
     provider: string;
     model?: string;
     httpStatus?: number;
+    code?: ProviderFailureCode;
+    message?: string;
     error: Error;
     responsePreview?: string;
 }>;
+/** Apply router ≥ 4.10 provider failure enrichment (code, operatorHint, details.providerAttempts). */
+export declare function enrichGatewayFallbackExhaustedError(exhausted: FallbackExhaustedError): FallbackExhaustedError;
 /**
  * Log original input vs OpenRouter model id actually sent to the router after catalog resolution.
  */

package/dist/gateway-utils.js

@@ -3,7 +3,7 @@
  * Handles utility functions
  */
 import * as crypto from 'crypto';
-import { FallbackExhaustedError } from '@x12i/ai-providers-router';
+import { FallbackExhaustedError, enrichRunTaskError, providerAttemptsFromFallbackAttempts } from '@x12i/ai-providers-router';
 import { ModelResolutionError, ModelProfileInputRejectedError, ModelProfileUnroutableError, resolveInvokeModel, } from '@x12i/ai-tools';
 import { extractHttpStatusCode } from './gateway-retry.js';
 import { gatewayLogDebug, withActivityIdentity } from './gateway-log-meta.js';
@@ -980,10 +980,17 @@ export function mapGatewayFallbackAttemptsToRouter(attempts) {
         provider: a.provider,
         model: a.model,
         httpStatus: a.httpStatus,
+        ...(a.code !== undefined ? { code: a.code } : {}),
+        message: a.error,
         error: new Error(a.error),
-        responsePreview: a.responsePreview
+        responsePreview: a.responsePreview,
     }));
 }
+/** Apply router ≥ 4.10 provider failure enrichment (code, operatorHint, details.providerAttempts). */
+export function enrichGatewayFallbackExhaustedError(exhausted) {
+    const routerAttempts = providerAttemptsFromFallbackAttempts(exhausted.attempts);
+    return enrichRunTaskError(exhausted, { providerAttempts: routerAttempts });
+}
 /**
  * Log original input vs OpenRouter model id actually sent to the router after catalog resolution.
  */
@@ -1009,20 +1016,58 @@ export function logResolvedModelRouting(logger, request, mergedConfig) {
     }));
 }
 function mapRouterFallbackAttempts(attempts) {
-    return attempts.map((attempt) => ({
-        provider: String(attempt.provider),
-        ...(attempt.model !== undefined ? { model: attempt.model } : {}),
-        ...(attempt.httpStatus !== undefined ? { httpStatus: attempt.httpStatus } : {}),
-        error: attempt.error instanceof Error ? attempt.error.message : String(attempt.error),
-        ...(attempt.responsePreview !== undefined ? { responsePreview: attempt.responsePreview } : {})
+    return attempts.map((attempt) => {
+        const errorMsg = typeof attempt.message === 'string' && attempt.message.trim()
+            ? attempt.message
+            : attempt.error instanceof Error
+                ? attempt.error.message
+                : String(attempt.error);
+        return {
+            provider: String(attempt.provider),
+            ...(attempt.model !== undefined ? { model: attempt.model } : {}),
+            ...(attempt.httpStatus !== undefined ? { httpStatus: attempt.httpStatus } : {}),
+            error: errorMsg,
+            ...(attempt.code !== undefined ? { code: attempt.code } : {}),
+            ...(attempt.responsePreview !== undefined ? { responsePreview: attempt.responsePreview } : {}),
+        };
+    });
+}
+function mapProviderAttemptDetailsToGateway(attempts) {
+    return attempts.map((a) => ({
+        provider: a.provider,
+        ...(a.modelId !== undefined ? { model: a.modelId } : {}),
+        ...(a.httpStatus !== undefined ? { httpStatus: a.httpStatus } : {}),
+        error: a.message,
+        ...(a.code !== undefined ? { code: a.code } : {}),
     }));
 }
+function extractEnrichedFieldsFromError(error) {
+    if (error == null || typeof error !== 'object')
+        return {};
+    const e = error;
+    return {
+        ...(typeof e.code === 'string' ? { providerSubCode: e.code } : {}),
+        ...(typeof e.operatorHint === 'string' ? { operatorHint: e.operatorHint } : {}),
+        ...(e.details?.providerAttempts?.length
+            ? { providerAttempts: e.details.providerAttempts }
+            : {}),
+    };
+}
 function extractFallbackAttemptsFromError(error) {
-    if (error instanceof FallbackExhaustedError && error.attempts.length > 0) {
-        return mapRouterFallbackAttempts(error.attempts);
+    if (error instanceof FallbackExhaustedError) {
+        if (error.details?.providerAttempts?.length) {
+            return mapProviderAttemptDetailsToGateway(error.details.providerAttempts);
+        }
+        if (error.attempts.length > 0) {
+            return mapRouterFallbackAttempts(error.attempts);
+        }
     }
     if (error != null && typeof error === 'object') {
         const record = error;
+        const details = record.details;
+        if (details?.providerAttempts?.length) {
+            return mapProviderAttemptDetailsToGateway(details.providerAttempts);
+        }
         if (record.name === 'FallbackExhaustedError' && Array.isArray(record.attempts) && record.attempts.length > 0) {
             return mapRouterFallbackAttempts(record.attempts);
         }
@@ -1064,6 +1109,17 @@ export function buildInvokeRejectionMetadata(args) {
     const fallbackAttempts = args.error !== undefined
         ? tryExtractFallbackAttemptsFromErrorChain(args.error)
         : undefined;
+    const enriched = args.error !== undefined ? extractEnrichedFieldsFromError(args.error) : {};
+    const providerAttempts = enriched.providerAttempts ??
+        (fallbackAttempts?.length
+            ? fallbackAttempts.map((a) => ({
+                provider: a.provider,
+                ...(a.model ? { modelId: a.model } : {}),
+                ...(a.httpStatus !== undefined ? { httpStatus: a.httpStatus } : {}),
+                message: a.error,
+                ...(a.code ? { code: a.code } : {}),
+            }))
+            : undefined);
     const openrouterFromPartial = partial !== undefined ? pickEnhancedOpenRouterMetadata(partial, false) : {};
     const openrouterFromError = args.error !== undefined ? tryExtractOpenRouterMetadataFromErrorChain(args.error) : {};
     const openrouterMetadata = {
@@ -1090,6 +1146,9 @@ export function buildInvokeRejectionMetadata(args) {
         ...(tokens !== undefined ? { tokens } : {}),
         ...(requestIds !== undefined ? { requestIds } : {}),
         ...(fallbackAttempts !== undefined ? { fallbackAttempts } : {}),
+        ...(providerAttempts?.length ? { providerAttempts } : {}),
+        ...(enriched.providerSubCode ? { providerSubCode: enriched.providerSubCode } : {}),
+        ...(enriched.operatorHint ? { operatorHint: enriched.operatorHint } : {}),
         ...(mc === undefined ? { mergeConfigUnavailable: true } : {}),
         ...(openrouterMetadata.serverTools ? { serverTools: openrouterMetadata.serverTools } : {}),
         ...(openrouterMetadata.citations?.length ? { citations: openrouterMetadata.citations } : {}),

package/dist/gateway-validation.js

@@ -2,6 +2,17 @@
  * Gateway Validation Module
  * Basic validation for clean proxy implementation
  */
+function rejectRemovedContextField(request) {
+    if ('context' in request && request.context !== undefined) {
+        const err = new Error(`The 'context' field has been removed. Context is not sent to the LLM. Merge background data into workingMemory upstream and use the prompt template for the user turn.`);
+        err.code = 'CONTEXT_FIELD_REMOVED';
+        err.details = {
+            field: 'context',
+            alternative: 'workingMemory + prompt template'
+        };
+        throw err;
+    }
+}
 function validateMandatoryRuntimeIdentity(request) {
     const id = request.identity;
     if (id === undefined || id === null || typeof id !== 'object') {
@@ -20,6 +31,7 @@ export function validateChatRequest(request) {
         throw new Error('agentId is required');
     }
     validateMandatoryRuntimeIdentity(request);
+    rejectRemovedContextField(request);
     // Reject input field - it has been removed
     if ('input' in request && request.input !== undefined) {
         const err = new Error(`The 'input' field has been removed. Use workingMemory.input instead for template rendering. Prompt templates should contain {{input}} which will be resolved from workingMemory.input.`);
@@ -44,6 +56,7 @@ export function validateAIRequest(request) {
         throw new Error('agentId is required for AI requests');
     }
     validateMandatoryRuntimeIdentity(request);
+    rejectRemovedContextField(request);
     if (!request.actionType ||
         !GATEWAY_ACTION_TYPES.includes(request.actionType)) {
         throw new Error(`actionType is required and must be one of: ${GATEWAY_ACTION_TYPES.join(', ')}`);

package/dist/gateway.d.ts

@@ -29,10 +29,6 @@ export declare class AIGateway {
      * Invoke AI request (with structured output support)
      */
     invoke<TContent = unknown>(request: AIInvokeRequest): Promise<EnhancedLLMResponse<TContent>>;
-    /**
-     * Build simple messages from request (instructions and prompt as literal template text; no registry).
-     */
-    private buildSimpleMessages;
     register(provider: any): void;
     listProviders(): string[];
     getRouter(): LLMProviderRouter;

package/dist/gateway.js

@@ -11,7 +11,7 @@ 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, DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, extractCostUsdFromRouterResponse, extractTokenUsageFromRouterResponse, mergeConfig, pickEffectiveModelConfigForMetadata, pickInvokeRoutingMetadataSlice, pickTraceMergedRouterConfig, pickEnhancedOpenRouterMetadata, resolveCostCompletionWithAiTools, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, } from './gateway-utils.js';
+import { attachGatewayInvokeRejectionMetadata, buildGatewayFallbackAttemptsFromTrace, buildInvokeRejectionMetadata, capActivityFullResponsePayload, formatFallbackExhaustionMessage, logResolvedModelRouting, enrichGatewayFallbackExhaustedError, mapGatewayFallbackAttemptsToRouter, DEFAULT_ACTIVITY_FULL_RESPONSE_MAX_CHARS, extractCostUsdFromRouterResponse, extractTokenUsageFromRouterResponse, mergeConfig, pickEffectiveModelConfigForMetadata, pickInvokeRoutingMetadataSlice, pickTraceMergedRouterConfig, pickEnhancedOpenRouterMetadata, resolveCostCompletionWithAiTools, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, } from './gateway-utils.js';
 import { buildTraceAttemptOpenRouterRuntimeSlice } from './openrouter-runtime-adapter/index.js';
 import { getAiToolsClient } from './ai-tools-client.js';
 import { autoRegisterProviders } from './gateway-provider-auto-register.js';
@@ -93,8 +93,54 @@ export class AIGateway {
             const startTime = Date.now();
             // Generate simple task type ID
             const taskTypeId = request.taskTypeId || `task-${Date.now()}`;
-            // Simple message construction
-            const messages = this.buildSimpleMessages(request);
+            const parsedSnapshot = {};
+            let messages = [];
+            try {
+                const builtMessages = await buildMessages(request, this.messageBuilderConfig, {
+                    parsedSnapshot
+                });
+                messages = builtMessages.messages;
+            }
+            catch (error) {
+                const err = error instanceof Error ? error : new Error(String(error));
+                const endTime = Date.now();
+                const duration = endTime - startTime;
+                const errWithCode = err;
+                const isResolutionError = err.name === 'InstructionNotFoundError' ||
+                    err.name === 'InstructionBackendError' ||
+                    err.name === 'TemplateResolutionError' ||
+                    errWithCode.code === 'PROMPT_NOT_FOUND' ||
+                    errWithCode.code === 'PROMPT_RESOLUTION_ERROR' ||
+                    errWithCode.code === 'PROMPT_RENDERED_EMPTY' ||
+                    errWithCode.code === 'TEMPLATE_RESOLUTION_ERROR' ||
+                    errWithCode.code === 'TEMPLATE_VARIABLE_MISSING' ||
+                    errWithCode.code === 'USER_CONTENT_REQUIRED' ||
+                    err.message.includes('Failed to resolve') ||
+                    err.message.includes('Failed to render prompt template') ||
+                    err.message.includes('not found') ||
+                    err.message.includes('Instruction not found') ||
+                    err.message.includes('Prompt not found');
+                if (isResolutionError && this.activityManager) {
+                    await this.activityManager.logBadRequest(request, err, {
+                        endTime,
+                        duration,
+                        error: err.message,
+                        errorType: errWithCode.code || 'MessageBuildError',
+                        diagnosticInfo: {
+                            errorCode: errWithCode.code,
+                            errorName: err.name,
+                            failureType: 'validation-failure',
+                            stage: 'message-building',
+                            prompt: request.prompt,
+                            instructions: typeof request.instructions === 'string' ? request.instructions.substring(0, 100) : '(object)'
+                        },
+                        failureType: 'validation-failure'
+                    }, startTime);
+                }
+                throw err;
+            }
+            parsedSnapshot.messages = messages;
+            request._parsedRequest = parsedSnapshot;
             // Merge config (modelConfig > request.config > gateway defaults)
             const aiTools = await this.getAiTools();
             const mergedConfig = await mergeConfig(request, this.config, this.logger, {
@@ -247,6 +293,7 @@ export class AIGateway {
                     errWithCode.code === 'PROMPT_RENDERED_EMPTY' ||
                     errWithCode.code === 'TEMPLATE_RESOLUTION_ERROR' ||
                     errWithCode.code === 'TEMPLATE_VARIABLE_MISSING' ||
+                    errWithCode.code === 'USER_CONTENT_REQUIRED' ||
                     err.message.includes('Failed to resolve') ||
                     err.message.includes('Failed to render prompt template') ||
                     err.message.includes('not found') ||
@@ -284,9 +331,6 @@ export class AIGateway {
             parsedSnapshot.messages = messages;
             // parsed.instructions and parsed.prompt are set by buildMessages to the resolved/rendered content
             // (after key resolution and Rendrix). Do not overwrite with raw request keys.
-            if (parsedSnapshot.context === undefined) {
-                parsedSnapshot.context = request.context;
-            }
             // Attach parsedSnapshot to request for activity tracking
             request._parsedRequest = parsedSnapshot;
             // Merge config (modelConfig > request.config > gateway defaults)
@@ -512,7 +556,7 @@ export class AIGateway {
                                 actual: 'All candidates failed or returned no response.'
                             }
                         });
-                        const exhausted = new FallbackExhaustedError(mapGatewayFallbackAttemptsToRouter(fallbackAttempts));
+                        const exhausted = enrichGatewayFallbackExhaustedError(new FallbackExhaustedError(mapGatewayFallbackAttemptsToRouter(fallbackAttempts)));
                         exhausted.message = formatFallbackExhaustionMessage(fallbackAttempts, deduped);
                         if (lastError) {
                             exhausted.cause = lastError;
@@ -775,37 +819,6 @@ export class AIGateway {
             }
         });
     }
-    /**
-     * Build simple messages from request (instructions and prompt as literal template text; no registry).
-     */
-    buildSimpleMessages(request) {
-        const messages = [];
-        // Add instructions as system message if present
-        if (request.instructions) {
-            const instructions = typeof request.instructions === 'string'
-                ? request.instructions
-                : 'Default instructions';
-            messages.push({ role: 'system', content: instructions });
-        }
-        // Add context as assistant message if present
-        if (request.context) {
-            const context = typeof request.context === 'string'
-                ? request.context
-                : JSON.stringify(request.context);
-            messages.push({ role: 'assistant', content: context });
-        }
-        // Add prompt/input as user message
-        // Input field has been removed - prompt template should contain {{input}} which resolves from workingMemory.input
-        const userContent = request.prompt || '';
-        if (userContent) {
-            messages.push({ role: 'user', content: userContent });
-        }
-        // Add direct messages if present
-        if (request.messages) {
-            messages.push(...request.messages);
-        }
-        return messages;
-    }
     // Provider management methods
     register(provider) {
         this.router.registerProvider(provider);

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { LLMProviderRouter } from '@x12i/ai-providers-router';
 export type { RouterConfig, HealthCheckResult } from '@x12i/ai-providers-router';
 export { createRouter, createRouterFromConfig } from '@x12i/ai-providers-router';
 export type { CreateRouterConfig } from '@x12i/ai-providers-router';
-export { ProviderNotFoundError, FallbackExhaustedError } from '@x12i/ai-providers-router';
+export { ProviderNotFoundError, FallbackExhaustedError, OpenRouterApiKeyMissingError, } from '@x12i/ai-providers-router';
 export type { RequestInterceptor, ResponseInterceptor } from '@x12i/ai-providers-router';
 export type { UsageTracker } from '@x12i/ai-providers-router';
 export * from '@x12i/ai-providers-router';
@@ -19,7 +19,7 @@ export { normalizeInvokeModelAtIngress } from './invoke-model-ingress.js';
 export { autoRegisterProviders } from './gateway-provider-auto-register.js';
 export { registerOpenRouterRuntime, shouldUseOpenRouterRuntime, mapGatewayServerTools, } from './openrouter-runtime-adapter/index.js';
 export type { GatewayConfig, ProviderModelRef, ModelConfig, GatewayModelConfig, GatewayServerToolsConfig, GatewayServerToolMode, GatewayServerToolUsage, GatewayNestedServerTool, GatewayWebSearchToolConfig, GatewayWebFetchToolConfig, GatewayDatetimeToolConfig, GatewayImageGenerationToolConfig, GatewayApplyPatchToolConfig, GatewayFusionToolConfig, GatewayAdvisorToolConfig, GatewaySubagentToolConfig, GatewayOpenRouterErrorMetadata, GatewayOpenRouterConfig, GatewayOpenRouterRuntimeConfig, GatewayServerToolUsageMap, GatewayCitation, GatewayGeneratedImage, GatewayPatchProposal, GatewayOpenRouterRuntimeMetadata, RetryConfig, ChatRequest, AIInvokeRequest, AIRequest, GatewayActionType, GatewayInvokeRejectionMetadata, GatewayFallbackAttempt, GatewayTraceRequestIds, GatewayTraceAttempt, GatewayTraceUsageSummary, GatewayTraceMergedConfig, EnhancedLLMResponse, InstructionMetadata, ValidationRule, TemplateRenderOptions, SmartInputConfig, SmartInputRenderOptions } from './types.js';
-export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, pickEnhancedOpenRouterMetadata, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
+export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, pickEnhancedOpenRouterMetadata, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, enrichGatewayFallbackExhaustedError, 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';

package/dist/index.js

@@ -10,7 +10,7 @@ export { LLMProviderRouter } from '@x12i/ai-providers-router';
 // Re-export factory functions
 export { createRouter, createRouterFromConfig } from '@x12i/ai-providers-router';
 // Re-export error classes
-export { ProviderNotFoundError, FallbackExhaustedError } from '@x12i/ai-providers-router';
+export { ProviderNotFoundError, FallbackExhaustedError, OpenRouterApiKeyMissingError, } from '@x12i/ai-providers-router';
 // Re-export all from router (includes everything it exports)
 export * from '@x12i/ai-providers-router';
 // Export enhanced gateway
@@ -19,7 +19,7 @@ export { InstructionNotFoundError, InstructionBackendError, ModelRequiredError,
 export { normalizeInvokeModelAtIngress } from './invoke-model-ingress.js';
 export { autoRegisterProviders } from './gateway-provider-auto-register.js';
 export { registerOpenRouterRuntime, shouldUseOpenRouterRuntime, mapGatewayServerTools, } from './openrouter-runtime-adapter/index.js';
-export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, pickEnhancedOpenRouterMetadata, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, logResolvedModelRouting, mapGatewayFallbackAttemptsToRouter } from './gateway-utils.js';
+export { attachGatewayInvokeRejectionMetadata, buildInvokeRejectionMetadata, tryExtractRouterLikePayloadFromErrorChain, tryExtractOpenRouterMetadataFromErrorChain, tryExtractFallbackAttemptsFromErrorChain, pickRequestIdsFromRouterLike, resolveActivityCostCompletion, resolveCostCompletionForActivity, resolveCostCompletionWithAiTools, buildGatewayPricingRecord, mapAiCostResultToResolvedActivityCost, catalogPricingSucceeded, extractUsageExtrasFromRouterResponse, buildTraceUsageSummary, enrichTraceAttemptsWithBilling, pickEnhancedOpenRouterMetadata, hasNonZeroTokenUsage, MODEL_PROFILE_UNROUTABLE, ModelProfileUnroutableError, ModelProfileInputRejectedError, buildGatewayFallbackAttemptsFromTrace, formatFallbackExhaustionMessage, enrichGatewayFallbackExhaustedError, 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';

package/dist/message-builder.d.ts

@@ -28,6 +28,10 @@ export interface BuiltMessages {
         hasObjectTypes?: boolean;
     };
 }
+/**
+ * Serializes workingMemory.input when no prompt template is provided.
+ */
+export declare function formatInputFallback(input: unknown): string;
 /**
  * Main function to build messages
  */