la-machina-engine 0.7.2 → 0.7.3

package/dist/index.d.cts

@@ -2020,11 +2020,19 @@ interface RunOptions {
      */
     readonly outputFormat?: 'text' | 'json' | undefined;
     /**
-     * Zod schema for structured output. Only used when outputFormat is 'json'.
-     * Injected into system prompt as JSON Schema description, used to
-     * validate the model's response. If validation fails, retries once.
+     * Schema for structured output. Only used when outputFormat is 'json'.
+     * Injected into the system prompt and (for Zod schemas) used to
+     * validate the model's response.
+     *
+     * Two shapes accepted:
+     *   - A Zod schema — strictly validated via `safeParse`; retries
+     *     once on failure with a corrective prompt.
+     *   - A plain JSON Schema object — used verbatim in the prompt; no
+     *     server-side strict validation (callers wanting that should
+     *     pass Zod). This shape is what serialized workflow definitions
+     *     (e.g. nikaido) carry, since they can't embed Zod instances.
      */
-    readonly outputSchema?: zod.ZodTypeAny | undefined;
+    readonly outputSchema?: zod.ZodTypeAny | Record<string, unknown> | undefined;
     /**
      * Per-run skill override (Plan 017). When present, the engine IGNORES
      * `config.skills.autoload` + `config.skills.path` and uses this list
@@ -3047,11 +3055,21 @@ declare const defaultToolResultSummarizer: ToolResultSummarizerV1;
  * All pure JS — no `node:` imports, Workers-compatible.
  */
 
+/**
+ * Schema users can supply for structured output. Either:
+ *   - a Zod schema (typed validation, runs `safeParse` post-parse), or
+ *   - a plain JSON Schema object (used verbatim in the system prompt;
+ *     no strict server-side validation in v1).
+ *
+ * Workflow definitions stored as JSON (e.g. nikaido) can only carry
+ * the JSON Schema variant; native TS callers may use either.
+ */
+type OutputSchema = ZodTypeAny | Record<string, unknown>;
 /**
  * Build the output format section to append to the system prompt.
  * Called when outputFormat is 'json'.
  */
-declare function buildSchemaPrompt(schema?: ZodTypeAny): string;
+declare function buildSchemaPrompt(schema?: OutputSchema): string;
 interface ParseResult {
     readonly ok: boolean;
     readonly value?: unknown;
@@ -3065,10 +3083,14 @@ interface ParseResult {
  */
 declare function tryParseJSON(text: string): ParseResult;
 /**
- * Validate parsed JSON against a Zod schema.
- * Returns the validated data or an error message.
+ * Validate parsed JSON against a schema.
+ *
+ * Zod schemas get strict `safeParse` validation. Plain JSON Schema
+ * objects are NOT strictly validated (skipping ajv keeps the bundle
+ * small for Workers); the prompt-injected schema is the contract and
+ * the caller can validate downstream if needed.
  */
-declare function validateOutput(value: unknown, schema: ZodTypeAny): {
+declare function validateOutput(value: unknown, schema: OutputSchema): {
     ok: true;
     data: unknown;
 } | {

package/dist/index.d.ts

@@ -2020,11 +2020,19 @@ interface RunOptions {
      */
     readonly outputFormat?: 'text' | 'json' | undefined;
     /**
-     * Zod schema for structured output. Only used when outputFormat is 'json'.
-     * Injected into system prompt as JSON Schema description, used to
-     * validate the model's response. If validation fails, retries once.
+     * Schema for structured output. Only used when outputFormat is 'json'.
+     * Injected into the system prompt and (for Zod schemas) used to
+     * validate the model's response.
+     *
+     * Two shapes accepted:
+     *   - A Zod schema — strictly validated via `safeParse`; retries
+     *     once on failure with a corrective prompt.
+     *   - A plain JSON Schema object — used verbatim in the prompt; no
+     *     server-side strict validation (callers wanting that should
+     *     pass Zod). This shape is what serialized workflow definitions
+     *     (e.g. nikaido) carry, since they can't embed Zod instances.
      */
-    readonly outputSchema?: zod.ZodTypeAny | undefined;
+    readonly outputSchema?: zod.ZodTypeAny | Record<string, unknown> | undefined;
     /**
      * Per-run skill override (Plan 017). When present, the engine IGNORES
      * `config.skills.autoload` + `config.skills.path` and uses this list
@@ -3047,11 +3055,21 @@ declare const defaultToolResultSummarizer: ToolResultSummarizerV1;
  * All pure JS — no `node:` imports, Workers-compatible.
  */
 
+/**
+ * Schema users can supply for structured output. Either:
+ *   - a Zod schema (typed validation, runs `safeParse` post-parse), or
+ *   - a plain JSON Schema object (used verbatim in the system prompt;
+ *     no strict server-side validation in v1).
+ *
+ * Workflow definitions stored as JSON (e.g. nikaido) can only carry
+ * the JSON Schema variant; native TS callers may use either.
+ */
+type OutputSchema = ZodTypeAny | Record<string, unknown>;
 /**
  * Build the output format section to append to the system prompt.
  * Called when outputFormat is 'json'.
  */
-declare function buildSchemaPrompt(schema?: ZodTypeAny): string;
+declare function buildSchemaPrompt(schema?: OutputSchema): string;
 interface ParseResult {
     readonly ok: boolean;
     readonly value?: unknown;
@@ -3065,10 +3083,14 @@ interface ParseResult {
  */
 declare function tryParseJSON(text: string): ParseResult;
 /**
- * Validate parsed JSON against a Zod schema.
- * Returns the validated data or an error message.
+ * Validate parsed JSON against a schema.
+ *
+ * Zod schemas get strict `safeParse` validation. Plain JSON Schema
+ * objects are NOT strictly validated (skipping ajv keeps the bundle
+ * small for Workers); the prompt-injected schema is the contract and
+ * the caller can validate downstream if needed.
  */
-declare function validateOutput(value: unknown, schema: ZodTypeAny): {
+declare function validateOutput(value: unknown, schema: OutputSchema): {
     ok: true;
     data: unknown;
 } | {

package/dist/index.js

@@ -7767,6 +7767,9 @@ async function collectSkills(storage, skillsDir) {
 // src/engine/jsonOutput.ts
 init_esm_shims();
 import { zodToJsonSchema as zodToJsonSchema2 } from "zod-to-json-schema";
+function isZodSchema(s) {
+  return s !== null && typeof s === "object" && "_def" in s && typeof s.safeParse === "function";
+}
 function buildSchemaPrompt(schema) {
   const lines = [
     "# Output Format",
@@ -7776,11 +7779,18 @@ function buildSchemaPrompt(schema) {
     "Do NOT wrap in ```json ... ```. Just raw JSON."
   ];
   if (schema) {
-    const jsonSchema2 = zodToJsonSchema2(schema, {
-      target: "jsonSchema7",
-      $refStrategy: "none"
-    });
-    const { $schema: _, ...clean } = jsonSchema2;
+    let clean;
+    if (isZodSchema(schema)) {
+      const jsonSchema2 = zodToJsonSchema2(schema, {
+        target: "jsonSchema7",
+        $refStrategy: "none"
+      });
+      const { $schema: _z, ...rest } = jsonSchema2;
+      clean = rest;
+    } else {
+      const { $schema: _j, ...rest } = schema;
+      clean = rest;
+    }
     lines.push("", "The JSON MUST conform to this schema:", JSON.stringify(clean, null, 2));
   } else {
     lines.push("", "Return a JSON object with the relevant data.");
@@ -7816,6 +7826,9 @@ function tryParseJSON2(text2) {
   return { ok: false, error: "No valid JSON found in response" };
 }
 function validateOutput(value, schema) {
+  if (!isZodSchema(schema)) {
+    return { ok: true, data: value };
+  }
   const result = schema.safeParse(value);
   if (result.success) {
     return { ok: true, data: result.data };