@axlsdk/axl 0.7.6 → 0.9.0

package/dist/index.js

@@ -1922,7 +1922,7 @@ var defaultRegistry = new ProviderRegistry();
 
 // src/context.ts
 import { AsyncLocalStorage } from "async_hooks";
-import { ZodError } from "zod";
+import { z, ZodError } from "zod";
 
 // src/errors.ts
 var AxlError = class extends Error {
@@ -1998,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;
@@ -2090,48 +2102,9 @@ function resolveConfig(config) {
 // src/context.ts
 var signalStorage = new AsyncLocalStorage();
 function zodToJsonSchema(schema) {
-  const def = schema._def;
-  if (!def || !def.typeName) return {};
-  switch (def.typeName) {
-    case "ZodString":
-      return { type: "string" };
-    case "ZodNumber":
-      return { type: "number" };
-    case "ZodBoolean":
-      return { type: "boolean" };
-    case "ZodArray":
-      return { type: "array", items: zodToJsonSchema(def.type) };
-    case "ZodObject": {
-      const shape = def.shape?.() ?? {};
-      const properties = {};
-      const required = [];
-      for (const [key, value] of Object.entries(shape)) {
-        properties[key] = zodToJsonSchema(value);
-        const innerDef = value._def;
-        if (innerDef?.typeName !== "ZodOptional" && innerDef?.typeName !== "ZodDefault") {
-          required.push(key);
-        }
-      }
-      return { type: "object", properties, required: required.length > 0 ? required : void 0 };
-    }
-    case "ZodOptional":
-      return zodToJsonSchema(def.innerType);
-    case "ZodDefault":
-      return zodToJsonSchema(def.innerType);
-    case "ZodEnum":
-      return { type: "string", enum: def.values };
-    case "ZodLiteral": {
-      const v = def.value;
-      const t = v === null ? "null" : typeof v;
-      return { type: t, const: v };
-    }
-    case "ZodUnion":
-      return { oneOf: def.options.map((o) => zodToJsonSchema(o)) };
-    case "ZodNullable":
-      return { ...zodToJsonSchema(def.innerType), nullable: true };
-    default:
-      return {};
-  }
+  const result = z.toJSONSchema(schema, { unrepresentable: "any" });
+  delete result.$schema;
+  return result;
 }
 function estimateTokens(text) {
   return Math.ceil(text.length / 4);
@@ -2262,9 +2235,6 @@ var WorkflowContext = class _WorkflowContext {
           agent2,
           prompt,
           options,
-          0,
-          void 0,
-          void 0,
           void 0,
           usageCapture
         );
@@ -2314,7 +2284,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") {
@@ -2386,16 +2356,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) {
@@ -2440,9 +2400,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);
@@ -2570,14 +2538,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
               );
@@ -2911,26 +2882,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([
             {
@@ -2939,11 +2910,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);
   }
@@ -3300,32 +3315,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
     );
@@ -3427,7 +3467,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);
@@ -3440,6 +3480,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);
@@ -3691,7 +3758,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 };
@@ -3732,7 +3801,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 ───────────────────────────────────────────────────────────
@@ -6012,6 +6083,7 @@ export {
   SqliteVectorStore,
   TimeoutError,
   ToolDenied,
+  ValidationError,
   VerifyError,
   WorkflowContext,
   agent,