@axlsdk/axl 0.7.5 → 0.8.0

package/dist/index.js

@@ -165,29 +165,32 @@ async function fetchWithRetry(input, init, maxRetries = MAX_RETRIES) {
 
 // src/providers/openai.ts
 var OPENAI_PRICING = {
-  "gpt-4o": [25e-7, 1e-5],
-  "gpt-4o-mini": [15e-8, 6e-7],
-  "gpt-4-turbo": [1e-5, 3e-5],
-  "gpt-4": [3e-5, 6e-5],
-  "gpt-3.5-turbo": [5e-7, 15e-7],
-  "gpt-5": [125e-8, 1e-5],
-  "gpt-5-mini": [25e-8, 2e-6],
-  "gpt-5-nano": [5e-8, 4e-7],
-  "gpt-5.1": [125e-8, 1e-5],
-  "gpt-5.2": [175e-8, 14e-6],
-  "gpt-5.3": [175e-8, 14e-6],
-  "gpt-5.4": [25e-7, 15e-6],
-  "gpt-5.4-pro": [3e-5, 18e-5],
-  o1: [15e-6, 6e-5],
-  "o1-mini": [3e-6, 12e-6],
-  "o1-pro": [15e-5, 6e-4],
-  o3: [1e-5, 4e-5],
-  "o3-mini": [11e-7, 44e-7],
-  "o3-pro": [2e-5, 8e-5],
-  "o4-mini": [11e-7, 44e-7],
-  "gpt-4.1": [2e-6, 8e-6],
-  "gpt-4.1-mini": [4e-7, 16e-7],
-  "gpt-4.1-nano": [1e-7, 4e-7]
+  // gpt-4o era — cache reads at 50% of input rate
+  "gpt-4o": [25e-7, 1e-5, 0.5],
+  "gpt-4o-mini": [15e-8, 6e-7, 0.5],
+  "gpt-4-turbo": [1e-5, 3e-5, 0.5],
+  "gpt-4": [3e-5, 6e-5, 0.5],
+  "gpt-3.5-turbo": [5e-7, 15e-7, 0.5],
+  o1: [15e-6, 6e-5, 0.5],
+  "o1-mini": [3e-6, 12e-6, 0.5],
+  "o1-pro": [15e-5, 6e-4, 0.5],
+  // gpt-4.1 / o3 / o4 era — cache reads at 25% of input rate
+  "gpt-4.1": [2e-6, 8e-6, 0.25],
+  "gpt-4.1-mini": [4e-7, 16e-7, 0.25],
+  "gpt-4.1-nano": [1e-7, 4e-7, 0.25],
+  o3: [1e-5, 4e-5, 0.25],
+  "o3-mini": [11e-7, 44e-7, 0.25],
+  "o3-pro": [2e-5, 8e-5, 0.25],
+  "o4-mini": [11e-7, 44e-7, 0.25],
+  // gpt-5 era — cache reads at 10% of input rate
+  "gpt-5": [125e-8, 1e-5, 0.1],
+  "gpt-5-mini": [25e-8, 2e-6, 0.1],
+  "gpt-5-nano": [5e-8, 4e-7, 0.1],
+  "gpt-5.1": [125e-8, 1e-5, 0.1],
+  "gpt-5.2": [175e-8, 14e-6, 0.1],
+  "gpt-5.3": [175e-8, 14e-6, 0.1],
+  "gpt-5.4": [25e-7, 15e-6, 0.1],
+  "gpt-5.4-pro": [3e-5, 18e-5, 0.1]
 };
 var PRICING_KEYS_BY_LENGTH = Object.keys(OPENAI_PRICING).sort((a, b) => b.length - a.length);
 function estimateOpenAICost(model, promptTokens, completionTokens, cachedTokens) {
@@ -201,9 +204,9 @@ function estimateOpenAICost(model, promptTokens, completionTokens, cachedTokens)
     }
   }
   if (!pricing) return 0;
-  const [inputRate, outputRate] = pricing;
+  const [inputRate, outputRate, cacheMultiplier] = pricing;
   const cached = cachedTokens ?? 0;
-  const inputCost = (promptTokens - cached) * inputRate + cached * inputRate * 0.5;
+  const inputCost = (promptTokens - cached) * inputRate + cached * inputRate * cacheMultiplier;
   return inputCost + completionTokens * outputRate;
 }
 function isOSeriesModel(model) {
@@ -313,7 +316,7 @@ var OpenAIProvider = class {
     if (!res.body) {
       throw new Error("OpenAI stream response has no body");
     }
-    yield* this.parseSSEStream(res.body);
+    yield* this.parseSSEStream(res.body, options.model);
   }
   // ---------------------------------------------------------------------------
   // Internal helpers
@@ -387,7 +390,7 @@ var OpenAIProvider = class {
     if (msg.tool_call_id) out.tool_call_id = msg.tool_call_id;
     return out;
   }
-  async *parseSSEStream(body) {
+  async *parseSSEStream(body, model) {
     const reader = body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
@@ -404,7 +407,16 @@ var OpenAIProvider = class {
           const trimmed = line.trim();
           if (!trimmed || trimmed.startsWith(":")) continue;
           if (trimmed === "data: [DONE]") {
-            yield { type: "done", usage: usageData };
+            yield {
+              type: "done",
+              usage: usageData,
+              cost: usageData ? estimateOpenAICost(
+                model,
+                usageData.prompt_tokens,
+                usageData.completion_tokens,
+                usageData.cached_tokens
+              ) : void 0
+            };
             return;
           }
           if (trimmed.startsWith("data: ")) {
@@ -447,7 +459,16 @@ var OpenAIProvider = class {
           }
         }
       }
-      yield { type: "done", usage: usageData };
+      yield {
+        type: "done",
+        usage: usageData,
+        cost: usageData ? estimateOpenAICost(
+          model,
+          usageData.prompt_tokens,
+          usageData.completion_tokens,
+          usageData.cached_tokens
+        ) : void 0
+      };
     } finally {
       reader.releaseLock();
     }
@@ -705,6 +726,7 @@ var OpenAIResponsesProvider = class {
     const decoder = new TextDecoder();
     let buffer = "";
     const callIdMap = /* @__PURE__ */ new Map();
+    let eventType = "";
     try {
       while (true) {
         const { done, value } = await reader.read();
@@ -712,7 +734,6 @@ var OpenAIResponsesProvider = class {
         buffer += decoder.decode(value, { stream: true });
         const lines = buffer.split("\n");
         buffer = lines.pop() ?? "";
-        let eventType = "";
         for (const line of lines) {
           const trimmed = line.trim();
           if (!trimmed || trimmed.startsWith(":")) continue;
@@ -780,7 +801,17 @@ var OpenAIResponsesProvider = class {
         } : void 0;
         const reasoningItems = response?.output?.filter((item) => item.type === "reasoning") ?? [];
         const providerMetadata = reasoningItems.length > 0 ? { openaiReasoningItems: reasoningItems } : void 0;
-        return { type: "done", usage, providerMetadata };
+        return {
+          type: "done",
+          usage,
+          cost: usage ? estimateOpenAICost(
+            model,
+            usage.prompt_tokens,
+            usage.completion_tokens,
+            usage.cached_tokens
+          ) : void 0,
+          providerMetadata
+        };
       }
       case "response.failed": {
         const errorMsg = data.response?.error?.message ?? data.response?.status_details?.error?.message ?? "Unknown error";
@@ -913,7 +944,7 @@ var AnthropicProvider = class {
     if (!res.body) {
       throw new Error("Anthropic stream response has no body");
     }
-    yield* this.parseSSEStream(res.body);
+    yield* this.parseSSEStream(res.body, options.model);
   }
   // ---------------------------------------------------------------------------
   // Internal: request building
@@ -1156,13 +1187,14 @@ ${jsonInstruction}` : jsonInstruction;
   // ---------------------------------------------------------------------------
   // Internal: SSE stream parsing
   // ---------------------------------------------------------------------------
-  async *parseSSEStream(body) {
+  async *parseSSEStream(body, model) {
     const reader = body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
     let currentToolId = "";
     let currentToolName = "";
     let usage;
+    let cacheWrite = 0;
     try {
       while (true) {
         const { done, value } = await reader.read();
@@ -1219,7 +1251,7 @@ ${jsonInstruction}` : jsonInstruction;
             case "message_start": {
               if (event.message?.usage) {
                 const cacheRead = event.message.usage.cache_read_input_tokens ?? 0;
-                const cacheWrite = event.message.usage.cache_creation_input_tokens ?? 0;
+                cacheWrite = event.message.usage.cache_creation_input_tokens ?? 0;
                 const inputTokens = (event.message.usage.input_tokens ?? 0) + cacheRead + cacheWrite;
                 usage = {
                   prompt_tokens: inputTokens,
@@ -1250,13 +1282,33 @@ ${jsonInstruction}` : jsonInstruction;
               if (usage) {
                 usage.total_tokens = usage.prompt_tokens + usage.completion_tokens;
               }
-              yield { type: "done", usage };
+              yield {
+                type: "done",
+                usage,
+                cost: usage ? estimateAnthropicCost(
+                  model,
+                  usage.prompt_tokens,
+                  usage.completion_tokens,
+                  usage.cached_tokens,
+                  cacheWrite
+                ) : void 0
+              };
               return;
             }
           }
         }
       }
-      yield { type: "done", usage };
+      yield {
+        type: "done",
+        usage,
+        cost: usage ? estimateAnthropicCost(
+          model,
+          usage.prompt_tokens,
+          usage.completion_tokens,
+          usage.cached_tokens,
+          cacheWrite
+        ) : void 0
+      };
     } finally {
       reader.releaseLock();
     }
@@ -1383,7 +1435,7 @@ var GeminiProvider = class {
     if (!res.body) {
       throw new Error("Gemini stream response has no body");
     }
-    yield* this.parseSSEStream(res.body);
+    yield* this.parseSSEStream(res.body, options.model);
   }
   // ---------------------------------------------------------------------------
   // Internal: request building
@@ -1664,7 +1716,7 @@ var GeminiProvider = class {
   // ---------------------------------------------------------------------------
   // Internal: SSE stream parsing
   // ---------------------------------------------------------------------------
-  async *parseSSEStream(body) {
+  async *parseSSEStream(body, model) {
     const reader = body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
@@ -1720,7 +1772,17 @@ var GeminiProvider = class {
         }
       }
       const providerMetadata = accumulatedParts.length > 0 ? { geminiParts: accumulatedParts } : void 0;
-      yield { type: "done", usage, providerMetadata };
+      yield {
+        type: "done",
+        usage,
+        cost: usage ? estimateGeminiCost(
+          model,
+          usage.prompt_tokens,
+          usage.completion_tokens,
+          usage.cached_tokens
+        ) : void 0,
+        providerMetadata
+      };
     } finally {
       reader.releaseLock();
     }
@@ -1936,6 +1998,18 @@ var GuardrailError = class extends AxlError {
     this.reason = reason;
   }
 };
+var ValidationError = class extends AxlError {
+  lastOutput;
+  reason;
+  retries;
+  constructor(lastOutput, reason, retries) {
+    super("VALIDATION_ERROR", `Validation failed after ${retries} retries: ${reason}`);
+    this.name = "ValidationError";
+    this.lastOutput = lastOutput;
+    this.reason = reason;
+    this.retries = retries;
+  }
+};
 var ToolDenied = class extends AxlError {
   toolName;
   agentName;
@@ -2200,9 +2274,6 @@ var WorkflowContext = class _WorkflowContext {
           agent2,
           prompt,
           options,
-          0,
-          void 0,
-          void 0,
           void 0,
           usageCapture
         );
@@ -2252,7 +2323,7 @@ var WorkflowContext = class _WorkflowContext {
       return result;
     });
   }
-  async executeAgentCall(agent2, prompt, options, retryCount = 0, previousOutput, previousError, handoffMessages, usageCapture) {
+  async executeAgentCall(agent2, prompt, options, handoffMessages, usageCapture) {
     if (this.budgetContext?.exceeded) {
       const { limit, totalCost: spent, policy } = this.budgetContext;
       if (policy === "warn") {
@@ -2324,16 +2395,6 @@ var WorkflowContext = class _WorkflowContext {
 
 Respond with valid JSON matching this schema:
 ${JSON.stringify(jsonSchema, null, 2)}`;
-    }
-    if (previousOutput && previousError) {
-      userContent += `
-
-Your previous response was invalid:
-${previousOutput}
-
-Error: ${previousError}
-
-Please fix and try again.`;
     }
     messages.push({ role: "user", content: userContent });
     if (handoffMessages && handoffMessages.length > 0) {
@@ -2378,9 +2439,17 @@ Please fix and try again.`;
     const maxTurns = agent2._config.maxTurns ?? 25;
     const timeoutMs = parseDuration(agent2._config.timeout ?? "60s");
     const startTime = Date.now();
+    if (this.onToken && options?.validate) {
+      throw new AxlError(
+        "INVALID_CONFIG",
+        "Cannot use validate with streaming. Validate requires schema (JSON output) which does not benefit from token streaming. Use a non-streaming call instead."
+      );
+    }
     const currentMessages = [...messages];
     let turns = 0;
     let guardrailOutputRetries = 0;
+    let schemaRetries = 0;
+    let validateRetries = 0;
     while (turns < maxTurns) {
       if (Date.now() - startTime > timeoutMs) {
         throw new TimeoutError("ctx.ask()", timeoutMs);
@@ -2430,7 +2499,8 @@ Please fix and try again.`;
               response = {
                 content: content2,
                 tool_calls: void 0,
-                usage: chunk.usage
+                usage: chunk.usage,
+                cost: chunk.cost
               };
             }
           }
@@ -2507,14 +2577,17 @@ Please fix and try again.`;
                 }
               }
               const handoffStart = Date.now();
-              const handoffOptions = options ? { schema: options.schema, retries: options.retries, metadata: options.metadata } : void 0;
+              const handoffOptions = options ? {
+                schema: options.schema,
+                retries: options.retries,
+                metadata: options.metadata,
+                validate: options.validate,
+                validateRetries: options.validateRetries
+              } : void 0;
               const handoffFn = () => this.executeAgentCall(
                 descriptor.agent,
                 handoffPrompt,
                 handoffOptions,
-                0,
-                void 0,
-                void 0,
                 currentMessages,
                 usageCapture
               );
@@ -2848,26 +2921,26 @@ Please fix and try again.`;
           throw new GuardrailError("output", outputResult.reason ?? "Output blocked by guardrail");
         }
       }
+      let validated = void 0;
       if (options?.schema) {
         try {
           const parsed = JSON.parse(stripMarkdownFences(content));
-          const validated = options.schema.parse(parsed);
-          this.pushAssistantToSessionHistory(content, response.providerMetadata);
-          return validated;
+          validated = options.schema.parse(parsed);
         } catch (err) {
-          const maxRetries = options.retries ?? 3;
-          if (retryCount < maxRetries) {
+          const maxSchemaRetries = options.retries ?? 3;
+          if (schemaRetries < maxSchemaRetries) {
+            schemaRetries++;
             const errorMsg = err instanceof Error ? err.message : String(err);
-            return this.executeAgentCall(
-              agent2,
-              prompt,
-              options,
-              retryCount + 1,
+            currentMessages.push({
+              role: "assistant",
               content,
-              errorMsg,
-              void 0,
-              usageCapture
-            );
+              ...response.providerMetadata ? { providerMetadata: response.providerMetadata } : {}
+            });
+            currentMessages.push({
+              role: "system",
+              content: `Your response was not valid JSON or did not match the required schema: ${errorMsg}. Please fix and try again.`
+            });
+            continue;
           }
           const zodErr = err instanceof ZodError ? err : new ZodError([
             {
@@ -2876,11 +2949,55 @@ Please fix and try again.`;
               message: err instanceof Error ? err.message : String(err)
             }
           ]);
-          throw new VerifyError(content, zodErr, maxRetries);
+          throw new VerifyError(content, zodErr, maxSchemaRetries);
+        }
+      }
+      if (options?.schema && options.validate) {
+        let validateResult;
+        try {
+          validateResult = await options.validate(validated, {
+            metadata: this.metadata
+          });
+        } catch (err) {
+          const reason = err instanceof Error ? err.message : String(err);
+          validateResult = { valid: false, reason: `Validator error: ${reason}` };
+        }
+        this.emitTrace({
+          type: "validate",
+          agent: agent2._name,
+          data: {
+            valid: validateResult.valid,
+            ...validateResult.reason ? { reason: validateResult.reason } : {}
+          }
+        });
+        this.spanManager?.addEventToActiveSpan("axl.validate.check", {
+          "axl.validate.valid": validateResult.valid,
+          ...validateResult.reason ? { "axl.validate.reason": validateResult.reason } : {}
+        });
+        if (!validateResult.valid) {
+          const maxValidateRetries = options.validateRetries ?? 2;
+          if (validateRetries < maxValidateRetries) {
+            validateRetries++;
+            currentMessages.push({
+              role: "assistant",
+              content,
+              ...response.providerMetadata ? { providerMetadata: response.providerMetadata } : {}
+            });
+            currentMessages.push({
+              role: "system",
+              content: `Your response parsed correctly but failed validation: ${validateResult.reason ?? "Validation failed"}. Previous attempts are visible above. Please fix and try again.`
+            });
+            continue;
+          }
+          throw new ValidationError(
+            validated,
+            validateResult.reason ?? "Validation failed",
+            maxValidateRetries
+          );
         }
       }
       this.pushAssistantToSessionHistory(content, response.providerMetadata);
-      return content;
+      return validated ?? content;
     }
     throw new MaxTurnsError("ctx.ask()", maxTurns);
   }
@@ -3237,32 +3354,57 @@ ${summaryResponse.content}`
   // ── ctx.verify() ──────────────────────────────────────────────────────
   async verify(fn, schema, options) {
     const maxRetries = options?.retries ?? 3;
-    let lastOutput = void 0;
-    let lastErrorMessage = void 0;
+    let lastRetry = void 0;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      let result;
+      let rawOutput;
       try {
-        result = await fn(lastOutput, lastErrorMessage);
-        lastOutput = result;
-        return schema.parse(result);
+        const result = await fn(lastRetry);
+        rawOutput = result;
+        const parsed = schema.parse(result);
+        if (options?.validate) {
+          let validateResult;
+          try {
+            validateResult = await options.validate(parsed, { metadata: this.metadata });
+          } catch (err) {
+            const reason = err instanceof Error ? err.message : String(err);
+            validateResult = { valid: false, reason: `Validator error: ${reason}` };
+          }
+          if (!validateResult.valid) {
+            const errorMsg = validateResult.reason ?? "Validation failed";
+            lastRetry = { error: errorMsg, output: rawOutput, parsed };
+            if (attempt === maxRetries) {
+              if (options?.fallback !== void 0) return options.fallback;
+              throw new ValidationError(parsed, errorMsg, maxRetries);
+            }
+            continue;
+          }
+        }
+        return parsed;
       } catch (err) {
-        if (err instanceof ZodError) {
-          lastErrorMessage = err.message;
-        } else if (err instanceof Error) {
-          lastErrorMessage = err.message;
-        } else {
-          lastErrorMessage = String(err);
+        if (err instanceof ValidationError) {
+          lastRetry = {
+            error: err.reason,
+            output: rawOutput,
+            parsed: err.lastOutput
+          };
+          if (attempt === maxRetries) {
+            if (options?.fallback !== void 0) return options.fallback;
+            throw err;
+          }
+          continue;
         }
+        const errorMsg = err instanceof ZodError ? err.message : err instanceof Error ? err.message : String(err);
+        lastRetry = { error: errorMsg, output: rawOutput };
         if (attempt === maxRetries) {
           if (options?.fallback !== void 0) return options.fallback;
-          const zodErr = err instanceof ZodError ? err : new ZodError([{ code: "custom", path: [], message: lastErrorMessage }]);
-          throw new VerifyError(lastOutput, zodErr, maxRetries);
+          const zodErr = err instanceof ZodError ? err : new ZodError([{ code: "custom", path: [], message: errorMsg }]);
+          throw new VerifyError(rawOutput, zodErr, maxRetries);
         }
       }
     }
     if (options?.fallback !== void 0) return options.fallback;
     throw new VerifyError(
-      lastOutput,
+      lastRetry?.output,
       new ZodError([{ code: "custom", path: [], message: "Verify failed" }]),
       maxRetries
     );
@@ -3364,7 +3506,7 @@ ${summaryResponse.content}`
       let remaining = fns.length;
       for (const fn of fns) {
         const p = signalStorage.run(composedSignal, fn);
-        p.then((value) => {
+        p.then(async (value) => {
           if (settled) return;
           if (schema) {
             const parsed = schema.safeParse(value);
@@ -3377,6 +3519,33 @@ ${summaryResponse.content}`
               }
               return;
             }
+            if (options?.validate) {
+              try {
+                const validateResult = await options.validate(parsed.data, {
+                  metadata: this.metadata
+                });
+                if (!validateResult.valid) {
+                  remaining--;
+                  lastError = new Error(
+                    `Validation failed: ${validateResult.reason ?? "Validation failed"}`
+                  );
+                  if (remaining === 0 && !settled) {
+                    settled = true;
+                    reject(lastError);
+                  }
+                  return;
+                }
+              } catch (err) {
+                remaining--;
+                lastError = err instanceof Error ? err : new Error(`Validator error: ${String(err)}`);
+                if (remaining === 0 && !settled) {
+                  settled = true;
+                  reject(lastError);
+                }
+                return;
+              }
+            }
+            if (settled) return;
             settled = true;
             controller.abort();
             resolve(parsed.data);
@@ -3628,7 +3797,9 @@ ${summaryResponse.content}`
       return this.ask(agents[0], prompt, {
         schema: options?.schema,
         retries: options?.retries,
-        metadata: options?.metadata
+        metadata: options?.metadata,
+        validate: options?.validate,
+        validateRetries: options?.validateRetries
       });
     }
     const resolveCtx = options?.metadata ? { metadata: { ...this.metadata, ...options.metadata } } : { metadata: this.metadata };
@@ -3669,7 +3840,9 @@ ${summaryResponse.content}`
     return this.ask(routerAgent, prompt, {
       schema: options?.schema,
       retries: options?.retries,
-      metadata: options?.metadata
+      metadata: options?.metadata,
+      validate: options?.validate,
+      validateRetries: options?.validateRetries
     });
   }
   // ── Private ───────────────────────────────────────────────────────────
@@ -5949,6 +6122,7 @@ export {
   SqliteVectorStore,
   TimeoutError,
   ToolDenied,
+  ValidationError,
   VerifyError,
   WorkflowContext,
   agent,