extrait 0.3.1 → 0.5.1

package/dist/index.js

@@ -697,45 +697,38 @@ function unwrap(schema) {
   let optional = false;
   let nullable = false;
   while (true) {
-    const typeName = current?._def?.typeName;
+    const typeName = current?._def?.type;
     if (!typeName) {
       break;
     }
-    if (typeName === "ZodOptional") {
+    if (typeName === "optional") {
       optional = true;
       current = current._def?.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodDefault") {
+    if (typeName === "default") {
       optional = true;
       current = current._def?.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodNullable") {
+    if (typeName === "nullable") {
       nullable = true;
       current = current._def?.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodEffects") {
-      current = current._def?.schema ?? current;
-      continue;
-    }
-    if (typeName === "ZodBranded") {
-      current = current._def?.type ?? current;
-      continue;
-    }
-    if (typeName === "ZodCatch") {
-      current = current._def?.innerType ?? current;
+    if (typeName === "pipe") {
+      const outType = current._def?.out?._def?.type;
+      if (outType === "transform") {
+        current = current._def?.in ?? current;
+      } else {
+        current = current._def?.out ?? current;
+      }
       continue;
     }
-    if (typeName === "ZodReadonly") {
+    if (typeName === "catch" || typeName === "readonly") {
       current = current._def?.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodPipeline") {
-      current = current._def?.out ?? current;
-      continue;
-    }
     break;
   }
   return {
@@ -749,81 +742,74 @@ function formatCore(schema, depth, seen) {
     return "unknown";
   }
   seen.add(schema);
-  const typeName = schema?._def?.typeName;
+  const typeName = schema?._def?.type;
   switch (typeName) {
-    case "ZodString":
+    case "string":
       return "string";
-    case "ZodNumber":
+    case "number":
       return isIntegerNumber(schema) ? "int" : "number";
-    case "ZodBoolean":
+    case "boolean":
       return "boolean";
-    case "ZodBigInt":
+    case "bigint":
       return "bigint";
-    case "ZodDate":
+    case "date":
       return "Date";
-    case "ZodUndefined":
+    case "undefined":
       return "undefined";
-    case "ZodNull":
+    case "null":
       return "null";
-    case "ZodAny":
+    case "any":
       return "any";
-    case "ZodUnknown":
+    case "unknown":
       return "unknown";
-    case "ZodNever":
+    case "never":
       return "never";
-    case "ZodVoid":
+    case "void":
       return "void";
-    case "ZodLiteral": {
-      const value = schema._def?.value;
+    case "literal": {
+      const value = schema._def?.values?.[0];
       return JSON.stringify(value);
     }
-    case "ZodEnum": {
-      const values = schema._def?.values ?? [];
-      return values.map((value) => JSON.stringify(value)).join(" | ") || "string";
-    }
-    case "ZodNativeEnum": {
-      const values = Object.values(schema._def?.values ?? {});
-      const unique = [...new Set(values.filter((value) => typeof value !== "string" || Number.isNaN(Number(value))))];
-      return unique.map((value) => JSON.stringify(value)).join(" | ") || "string";
+    case "enum": {
+      const entries = schema._def?.entries;
+      const values = Object.values(entries ?? {});
+      const unique = [...new Set(values.filter((v) => typeof v !== "string" || Number.isNaN(Number(v))))];
+      return unique.map((v) => JSON.stringify(v)).join(" | ") || "string";
     }
-    case "ZodArray": {
-      const inner = formatType(schema._def?.type ?? schema, depth, seen);
+    case "array": {
+      const inner = formatType(schema._def?.element ?? schema, depth, seen);
       return requiresParentheses(inner) ? `(${inner})[]` : `${inner}[]`;
     }
-    case "ZodTuple": {
+    case "tuple": {
       const items = (schema._def?.items ?? []).map((item) => formatType(item, depth, seen));
       return `[${items.join(", ")}]`;
     }
-    case "ZodUnion": {
+    case "union": {
       const options = (schema._def?.options ?? []).map((option) => formatType(option, depth, seen));
       return options.join(" | ") || "unknown";
     }
-    case "ZodDiscriminatedUnion": {
-      const options = Array.from((schema._def?.options ?? new Map).values()).map((option) => formatType(option, depth, seen));
-      return options.join(" | ") || "unknown";
-    }
-    case "ZodIntersection": {
+    case "intersection": {
       const left = formatType(schema._def?.left ?? schema, depth, seen);
       const right = formatType(schema._def?.right ?? schema, depth, seen);
       return `${left} & ${right}`;
     }
-    case "ZodRecord": {
+    case "record": {
       const keyType = formatType(schema._def?.keyType ?? schema, depth, seen);
       const valueType = formatType(schema._def?.valueType ?? schema, depth, seen);
       return `Record<${keyType}, ${valueType}>`;
     }
-    case "ZodMap": {
+    case "map": {
       const keyType = formatType(schema._def?.keyType ?? schema, depth, seen);
       const valueType = formatType(schema._def?.valueType ?? schema, depth, seen);
       return `Map<${keyType}, ${valueType}>`;
     }
-    case "ZodSet": {
+    case "set": {
       const valueType = formatType(schema._def?.valueType ?? schema, depth, seen);
       return `Set<${valueType}>`;
     }
-    case "ZodObject":
+    case "object":
       return formatObject(schema, depth, seen);
-    case "ZodLazy":
+    case "lazy":
       return "unknown";
     default:
       return "unknown";
@@ -859,40 +845,28 @@ function requiresParentheses(typeText) {
 }
 function isIntegerNumber(schema) {
   const checks = schema._def?.checks ?? [];
-  return checks.some((check) => check.kind === "int");
+  return checks.some((check) => check.isInt === true);
 }
 function readSchemaDescription(schema) {
   let current = schema;
-  while (current?._def?.typeName) {
-    const direct = current._def.description;
-    if (typeof direct === "string" && direct.trim().length > 0) {
-      return sanitizeDescription(direct);
+  while (current?._def?.type) {
+    const desc = current.description;
+    if (typeof desc === "string" && desc.trim().length > 0) {
+      return sanitizeDescription(desc);
     }
-    const fallback = current.description;
-    if (typeof fallback === "string" && fallback.trim().length > 0) {
-      return sanitizeDescription(fallback);
-    }
-    const typeName = current._def.typeName;
-    if (typeName === "ZodOptional" || typeName === "ZodDefault" || typeName === "ZodNullable") {
+    const typeName = current._def.type;
+    if (typeName === "optional" || typeName === "default" || typeName === "nullable") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodEffects") {
-      current = current._def.schema ?? current;
-      continue;
-    }
-    if (typeName === "ZodBranded") {
-      current = current._def.type ?? current;
+    if (typeName === "pipe") {
+      current = current._def.in ?? current;
       continue;
     }
-    if (typeName === "ZodCatch" || typeName === "ZodReadonly") {
+    if (typeName === "catch" || typeName === "readonly") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodPipeline") {
-      current = current._def.out ?? current;
-      continue;
-    }
     break;
   }
   return;
@@ -1245,7 +1219,12 @@ async function executeMCPToolCalls(calls, toolset, context) {
       out.push({ call: metadata2, execution });
       continue;
     }
-    const args = isRecord(parsedArguments) ? parsedArguments : {};
+    const rawArgs = isRecord(parsedArguments) ? parsedArguments : {};
+    const args = context.request.transformToolArguments ? await context.request.transformToolArguments(rawArgs, {
+      name: toolName,
+      remoteName: tool.remoteName,
+      clientId: tool.clientId
+    }) : rawArgs;
     const metadata = {
       id: callId,
       type: call.type ?? "function",
@@ -1564,7 +1543,8 @@ function createOpenAICompatibleAdapter(options) {
           temperature: request.temperature,
           max_tokens: request.maxTokens,
           stream: true
-        }))
+        })),
+        signal: request.signal
       });
       if (!response.ok) {
         const message = await response.text();
@@ -1635,7 +1615,8 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
       temperature: request.temperature,
       max_tokens: request.maxTokens,
       stream: false
-    }))
+    })),
+    signal: request.signal
   });
   if (!response.ok) {
     const message = await response.text();
@@ -1679,7 +1660,8 @@ async function completeWithChatCompletionsWithMCP(options, fetcher, path, reques
         tools: transportTools,
         tool_choice: request.toolChoice,
         parallel_tool_calls: request.parallelToolCalls
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -1744,7 +1726,8 @@ async function completeWithResponsesAPIPassThrough(options, fetcher, path, reque
       previous_response_id: pickString(body?.previous_response_id),
       temperature: request.temperature,
       max_output_tokens: request.maxTokens
-    }))
+    })),
+    signal: request.signal
   });
   if (!response.ok) {
     const message = await response.text();
@@ -1786,7 +1769,8 @@ async function completeWithResponsesAPIWithMCP(options, fetcher, path, request)
         tools: transportTools,
         tool_choice: request.toolChoice,
         parallel_tool_calls: request.parallelToolCalls
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -1862,7 +1846,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
         tool_choice: request.toolChoice,
         parallel_tool_calls: request.parallelToolCalls,
         stream: true
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -1964,7 +1949,8 @@ async function streamWithResponsesAPIPassThrough(options, fetcher, path, request
       temperature: request.temperature,
       max_output_tokens: request.maxTokens,
       stream: true
-    }))
+    })),
+    signal: request.signal
   });
   if (!response.ok) {
     const message = await response.text();
@@ -2046,7 +2032,8 @@ async function streamWithResponsesAPIWithMCP(options, fetcher, path, request, ca
         tool_choice: request.toolChoice,
         parallel_tool_calls: request.parallelToolCalls,
         stream: true
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -2164,6 +2151,12 @@ function buildHeaders(options) {
   };
 }
 function buildMessages(request) {
+  if (Array.isArray(request.messages) && request.messages.length > 0) {
+    return request.messages.map((message) => toOpenAIMessage(message));
+  }
+  if (typeof request.prompt !== "string" || request.prompt.trim().length === 0) {
+    throw new Error("LLMRequest must include a prompt or messages.");
+  }
   const messages = [];
   if (request.systemPrompt) {
     messages.push({ role: "system", content: request.systemPrompt });
@@ -2175,18 +2168,16 @@ function buildResponsesInput(request) {
   if (isRecord2(request.body) && "input" in request.body) {
     return request.body.input;
   }
-  const input = [];
-  if (request.systemPrompt) {
-    input.push({
-      role: "system",
-      content: request.systemPrompt
-    });
+  if (Array.isArray(request.messages) && request.messages.length > 0) {
+    return request.messages.map((message) => toOpenAIMessage(message));
   }
-  input.push({
-    role: "user",
-    content: request.prompt
-  });
-  return input;
+  return buildMessages(request);
+}
+function toOpenAIMessage(message) {
+  return {
+    role: message.role,
+    content: message.content
+  };
 }
 function toResponsesTools(tools) {
   if (!Array.isArray(tools) || tools.length === 0) {
@@ -2598,6 +2589,7 @@ function createAnthropicCompatibleAdapter(options) {
       if (hasMCPClients(request.mcpClients)) {
         return streamWithMCPToolLoop(options, fetcher, path, request, callbacks);
       }
+      const input = resolveAnthropicInput(request);
       const response = await fetcher(buildURL(options.baseURL, path), {
         method: "POST",
         headers: buildHeaders2(options),
@@ -2605,12 +2597,13 @@ function createAnthropicCompatibleAdapter(options) {
           ...options.defaultBody,
           ...request.body,
           model: options.model,
-          system: request.systemPrompt,
-          messages: [{ role: "user", content: request.prompt }],
+          system: input.systemPrompt,
+          messages: input.messages,
           temperature: request.temperature,
           max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
           stream: true
-        }))
+        })),
+        signal: request.signal
       });
       if (!response.ok) {
         const message = await response.text();
@@ -2656,6 +2649,7 @@ function createAnthropicCompatibleAdapter(options) {
   };
 }
 async function completePassThrough(options, fetcher, path, request) {
+  const input = resolveAnthropicInput(request);
   const response = await fetcher(buildURL(options.baseURL, path), {
     method: "POST",
     headers: buildHeaders2(options),
@@ -2663,12 +2657,13 @@ async function completePassThrough(options, fetcher, path, request) {
       ...options.defaultBody,
       ...request.body,
       model: options.model,
-      system: request.systemPrompt,
-      messages: [{ role: "user", content: request.prompt }],
+      system: input.systemPrompt,
+      messages: input.messages,
       temperature: request.temperature,
       max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
       stream: false
-    }))
+    })),
+    signal: request.signal
   });
   if (!response.ok) {
     const message = await response.text();
@@ -2690,7 +2685,8 @@ async function completePassThrough(options, fetcher, path, request) {
 }
 async function completeWithMCPToolLoop(options, fetcher, path, request) {
   const maxToolRounds = normalizeMaxToolRounds(request.maxToolRounds ?? options.defaultMaxToolRounds);
-  let messages = [{ role: "user", content: request.prompt }];
+  const input = resolveAnthropicInput(request);
+  let messages = input.messages;
   let aggregatedUsage;
   let finishReason;
   let lastPayload;
@@ -2706,14 +2702,15 @@ async function completeWithMCPToolLoop(options, fetcher, path, request) {
         ...options.defaultBody,
         ...request.body,
         model: options.model,
-        system: request.systemPrompt,
+        system: input.systemPrompt,
         messages,
         temperature: request.temperature,
         max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
         tools,
         tool_choice: toAnthropicToolChoice(request.toolChoice),
         stream: false
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -2772,7 +2769,8 @@ async function completeWithMCPToolLoop(options, fetcher, path, request) {
 }
 async function streamWithMCPToolLoop(options, fetcher, path, request, callbacks) {
   const maxToolRounds = normalizeMaxToolRounds(request.maxToolRounds ?? options.defaultMaxToolRounds);
-  let messages = [{ role: "user", content: request.prompt }];
+  const input = resolveAnthropicInput(request);
+  let messages = input.messages;
   let aggregatedUsage;
   let finishReason;
   let lastPayload;
@@ -2789,14 +2787,15 @@ async function streamWithMCPToolLoop(options, fetcher, path, request, callbacks)
         ...options.defaultBody,
         ...request.body,
         model: options.model,
-        system: request.systemPrompt,
+        system: input.systemPrompt,
         messages,
         temperature: request.temperature,
         max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
         tools,
         tool_choice: toAnthropicToolChoice(request.toolChoice),
         stream: true
-      }))
+      })),
+      signal: request.signal
     });
     if (!response.ok) {
       const message = await response.text();
@@ -2899,6 +2898,59 @@ function buildHeaders2(options) {
     ...options.headers
   };
 }
+function resolveAnthropicInput(request) {
+  if (Array.isArray(request.messages) && request.messages.length > 0) {
+    return toAnthropicInput(request.messages);
+  }
+  if (typeof request.prompt !== "string" || request.prompt.trim().length === 0) {
+    throw new Error("LLMRequest must include a prompt or messages.");
+  }
+  return {
+    systemPrompt: request.systemPrompt,
+    messages: [{ role: "user", content: request.prompt }]
+  };
+}
+function toAnthropicInput(messages) {
+  const systemParts = [];
+  const normalizedMessages = [];
+  let sawNonSystem = false;
+  for (const message of messages) {
+    if (message.role === "system") {
+      if (sawNonSystem) {
+        throw new Error('Anthropic-compatible messages only support "system" turns at the beginning.');
+      }
+      systemParts.push(stringifyAnthropicSystemContent(message.content));
+      continue;
+    }
+    sawNonSystem = true;
+    normalizedMessages.push({
+      role: message.role,
+      content: message.content
+    });
+  }
+  if (normalizedMessages.length === 0) {
+    throw new Error("Anthropic-compatible requests require at least one non-system message.");
+  }
+  return {
+    systemPrompt: systemParts.length > 0 ? systemParts.join(`
+
+`) : undefined,
+    messages: normalizedMessages
+  };
+}
+function stringifyAnthropicSystemContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (content === null || content === undefined) {
+    return "";
+  }
+  try {
+    return JSON.stringify(content, null, 2) ?? "";
+  } catch {
+    return String(content);
+  }
+}
 function resolveMaxTokens(value, fallback) {
   const requested = toFiniteNumber(value);
   if (requested !== undefined && requested > 0) {
@@ -3785,17 +3837,15 @@ async function structured(adapter, schemaOrOptions, promptInput, callOptions) {
   const useOutdent = normalized.outdent ?? true;
   const resolvedPrompt = applyPromptOutdent(resolvePrompt(normalized.prompt, { mode }), useOutdent);
   const resolvedSystemPrompt = applyOutdentToOptionalPrompt(normalized.systemPrompt, useOutdent);
-  const prompt = shouldInjectFormat(resolvedPrompt.prompt, normalized.schemaInstruction) ? formatPrompt(normalized.schema, resolvedPrompt.prompt, {
-    schemaInstruction: normalized.schemaInstruction
-  }) : resolvedPrompt.prompt.trim();
-  const systemPrompt = mergeSystemPrompts(resolvedPrompt.systemPrompt, resolvedSystemPrompt);
+  const preparedPrompt = prepareStructuredPromptPayload(resolvedPrompt, resolvedSystemPrompt, normalized.schema, normalized.schemaInstruction);
   const first = await executeAttempt(adapter, {
-    prompt,
+    prompt: preparedPrompt.prompt,
+    messages: preparedPrompt.messages,
     schema: normalized.schema,
     parseOptions,
     stream: streamConfig,
     request: normalized.request,
-    systemPrompt,
+    systemPrompt: preparedPrompt.systemPrompt,
     observe: normalized.observe,
     debug: debugConfig,
     attemptNumber: 1,
@@ -3855,7 +3905,7 @@ async function structured(adapter, schemaOrOptions, promptInput, callOptions) {
       parseOptions,
       stream: streamConfig,
       request: normalized.request,
-      systemPrompt,
+      systemPrompt: preparedPrompt.systemPrompt,
       observe: normalized.observe,
       debug: debugConfig,
       attemptNumber,
@@ -3917,12 +3967,15 @@ function isPromptResolver(value) {
   return typeof value === "object" && value !== null && "resolvePrompt" in value && typeof value.resolvePrompt === "function";
 }
 function normalizePromptPayload(value) {
-  if (typeof value.prompt !== "string") {
-    throw new Error("Structured prompt payload must include a string prompt.");
+  const prompt = typeof value.prompt === "string" ? value.prompt : undefined;
+  const messages = Array.isArray(value.messages) ? value.messages.filter(isLLMMessage) : undefined;
+  if ((!prompt || prompt.trim().length === 0) && (!messages || messages.length === 0)) {
+    throw new Error("Structured prompt payload must include a non-empty prompt or messages.");
   }
   return {
-    prompt: value.prompt,
-    systemPrompt: typeof value.systemPrompt === "string" ? value.systemPrompt : undefined
+    prompt,
+    systemPrompt: typeof value.systemPrompt === "string" ? value.systemPrompt : undefined,
+    messages: messages && messages.length > 0 ? messages.map((message) => ({ ...message })) : undefined
   };
 }
 function applyPromptOutdent(payload, enabled) {
@@ -3930,10 +3983,24 @@ function applyPromptOutdent(payload, enabled) {
     return payload;
   }
   return {
-    prompt: structuredOutdent.string(payload.prompt),
-    systemPrompt: applyOutdentToOptionalPrompt(payload.systemPrompt, enabled)
+    prompt: typeof payload.prompt === "string" ? structuredOutdent.string(payload.prompt) : undefined,
+    systemPrompt: applyOutdentToOptionalPrompt(payload.systemPrompt, enabled),
+    messages: payload.messages?.map((message) => ({
+      ...message,
+      content: typeof message.content === "string" ? structuredOutdent.string(message.content) : message.content
+    }))
   };
 }
+function isLLMMessage(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const candidate = value;
+  if (candidate.role !== "system" && candidate.role !== "user" && candidate.role !== "assistant" && candidate.role !== "tool") {
+    return false;
+  }
+  return "content" in candidate;
+}
 function applyOutdentToOptionalPrompt(value, enabled) {
   if (!enabled || typeof value !== "string") {
     return value;
@@ -3949,6 +4016,60 @@ function mergeSystemPrompts(primary, secondary) {
 
 `);
 }
+function prepareStructuredPromptPayload(payload, systemPrompt, schema, schemaInstruction) {
+  if (Array.isArray(payload.messages) && payload.messages.length > 0) {
+    const messages = payload.messages.map((message) => ({ ...message }));
+    const mergedSystemPrompt = mergeSystemPrompts(payload.systemPrompt, systemPrompt);
+    const systemMessages = mergedSystemPrompt ? [{ role: "system", content: mergedSystemPrompt }] : [];
+    return {
+      messages: injectStructuredFormatIntoMessages([...systemMessages, ...messages], schema, schemaInstruction)
+    };
+  }
+  const resolvedPrompt = payload.prompt?.trim();
+  if (!resolvedPrompt) {
+    throw new Error("Structured prompt payload must include a non-empty prompt or messages.");
+  }
+  return {
+    prompt: shouldInjectFormat(resolvedPrompt, schemaInstruction) ? formatPrompt(schema, resolvedPrompt, {
+      schemaInstruction
+    }) : resolvedPrompt,
+    systemPrompt: mergeSystemPrompts(payload.systemPrompt, systemPrompt)
+  };
+}
+function injectStructuredFormatIntoMessages(messages, schema, schemaInstruction) {
+  const lastUserIndex = findLastUserMessageIndex(messages);
+  if (lastUserIndex === -1) {
+    throw new Error("Structured prompts with messages must include at least one user message.");
+  }
+  const target = messages[lastUserIndex];
+  const content = typeof target?.content === "string" ? target.content.trim() : stringifyPromptContent(target?.content);
+  const formatted = shouldInjectFormat(content, schemaInstruction) ? formatPrompt(schema, content, { schemaInstruction }) : content.trim();
+  return messages.map((message, index) => index === lastUserIndex ? {
+    ...message,
+    content: formatted
+  } : message);
+}
+function findLastUserMessageIndex(messages) {
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    if (messages[index]?.role === "user") {
+      return index;
+    }
+  }
+  return -1;
+}
+function stringifyPromptContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (content === null || content === undefined) {
+    return "";
+  }
+  try {
+    return JSON.stringify(content, null, 2) ?? "";
+  } catch {
+    return String(content);
+  }
+}
 function shouldInjectFormat(prompt, schemaInstruction) {
   const instruction = resolveSchemaInstruction(schemaInstruction);
   return !prompt.trimStart().startsWith(instruction);
@@ -4127,6 +4248,7 @@ function normalizeDebugConfig(option) {
 async function executeAttempt(adapter, input) {
   const response = await callModel(adapter, {
     prompt: input.prompt,
+    messages: input.messages,
     systemPrompt: input.systemPrompt,
     request: input.request,
     stream: input.stream,
@@ -4164,6 +4286,7 @@ async function executeAttempt(adapter, input) {
 async function callModel(adapter, options) {
   const requestPayload = {
     prompt: options.prompt,
+    messages: options.messages,
     systemPrompt: options.systemPrompt,
     temperature: options.request?.temperature,
     maxTokens: options.request?.maxTokens,
@@ -4173,7 +4296,8 @@ async function callModel(adapter, options) {
     maxToolRounds: options.request?.maxToolRounds,
     onToolExecution: options.request?.onToolExecution,
     toolDebug: options.request?.toolDebug,
-    body: options.request?.body
+    body: options.request?.body,
+    signal: options.request?.signal
   };
   emitDebugRequest(options.debug, {
     provider: adapter.provider,
@@ -4473,6 +4597,7 @@ function emitObserve(observe, event) {
 }
 function emitDebugRequest(config, input) {
   const requestBody = input.requestPayload.body !== undefined ? JSON.stringify(input.requestPayload.body, null, 2) : "(none)";
+  const requestMessages = input.requestPayload.messages !== undefined ? JSON.stringify(input.requestPayload.messages, null, 2) : "(none)";
   const lines = [
     color(config, title(config, [
       "[structured][request]",
@@ -4486,7 +4611,9 @@ function emitDebugRequest(config, input) {
       `stream=${input.stream}`
     ].join(" ")),
     color(config, "prompt:", "yellow"),
-    input.requestPayload.prompt,
+    input.requestPayload.prompt ?? "(none)",
+    color(config, "messages:", "yellow"),
+    requestMessages,
     color(config, "systemPrompt:", "yellow"),
     input.requestPayload.systemPrompt ?? "(none)",
     color(config, "request.body:", "yellow"),
@@ -4707,35 +4834,28 @@ function toPromptMessage(input, values) {
   }
   return renderPromptTemplate(input, values);
 }
-function joinMessages(messages) {
-  return messages.join(`
-
-`);
-}
 
 class PromptMessageBuilderImpl {
-  systemMessages = [];
-  userMessages = [];
+  messages = [];
   system(input, ...values) {
-    const message = toPromptMessage(input, values);
-    if (message.length > 0) {
-      this.systemMessages.push(message);
-    }
-    return this;
+    return this.pushMessage("system", input, values);
   }
   user(input, ...values) {
+    return this.pushMessage("user", input, values);
+  }
+  assistant(input, ...values) {
+    return this.pushMessage("assistant", input, values);
+  }
+  pushMessage(role, input, values) {
     const message = toPromptMessage(input, values);
     if (message.length > 0) {
-      this.userMessages.push(message);
+      this.messages.push({ role, content: message });
     }
     return this;
   }
   build() {
-    const prompt = joinMessages(this.userMessages);
-    const systemPrompt = joinMessages(this.systemMessages);
     return {
-      prompt,
-      systemPrompt: systemPrompt.length > 0 ? systemPrompt : undefined
+      messages: this.messages.map((message) => ({ ...message }))
     };
   }
   resolvePrompt(_context) {
@@ -4845,8 +4965,8 @@ function inferSchemaExample(schema) {
 }
 function getObjectShape(schema) {
   const unwrapped = unwrap2(schema).schema;
-  const typeName = unwrapped._def?.typeName;
-  if (typeName !== "ZodObject") {
+  const typeName = unwrapped._def?.type;
+  if (typeName !== "object") {
     return null;
   }
   const rawShape = unwrapped._def?.shape;
@@ -4857,33 +4977,25 @@ function getObjectShape(schema) {
 }
 function readDefaultValue(schema) {
   let current = schema;
-  while (current?._def?.typeName) {
-    const typeName = current._def.typeName;
-    if (typeName === "ZodDefault") {
-      const raw = current._def.defaultValue;
-      if (typeof raw === "function") {
-        try {
+  while (current?._def?.type) {
+    const typeName = current._def.type;
+    if (typeName === "default") {
+      try {
+        const raw = current._def.defaultValue;
+        if (typeof raw === "function") {
           return raw();
-        } catch {
-          return;
         }
+        return raw;
+      } catch {
+        return;
       }
-      return raw;
     }
-    if (typeName === "ZodOptional" || typeName === "ZodNullable" || typeName === "ZodCatch" || typeName === "ZodReadonly") {
+    if (typeName === "optional" || typeName === "nullable" || typeName === "catch" || typeName === "readonly") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodEffects") {
-      current = current._def.schema ?? current;
-      continue;
-    }
-    if (typeName === "ZodBranded") {
-      current = current._def.type ?? current;
-      continue;
-    }
-    if (typeName === "ZodPipeline") {
-      current = current._def.out ?? current;
+    if (typeName === "pipe") {
+      current = current._def.in ?? current;
       continue;
     }
     return;
@@ -4892,34 +5004,22 @@ function readDefaultValue(schema) {
 }
 function readSchemaDescription2(schema) {
   let current = schema;
-  while (current?._def?.typeName) {
-    const raw = current._def.description;
-    if (typeof raw === "string" && raw.trim().length > 0) {
-      return raw.trim();
-    }
-    const fallback = current.description;
-    if (typeof fallback === "string" && fallback.trim().length > 0) {
-      return fallback.trim();
+  while (current?._def?.type) {
+    const desc = current.description;
+    if (typeof desc === "string" && desc.trim().length > 0) {
+      return desc.trim();
     }
-    const typeName = current._def.typeName;
-    if (typeName === "ZodOptional" || typeName === "ZodDefault" || typeName === "ZodNullable") {
+    const typeName = current._def.type;
+    if (typeName === "optional" || typeName === "default" || typeName === "nullable") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodCatch" || typeName === "ZodReadonly") {
+    if (typeName === "catch" || typeName === "readonly") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodEffects") {
-      current = current._def.schema ?? current;
-      continue;
-    }
-    if (typeName === "ZodBranded") {
-      current = current._def.type ?? current;
-      continue;
-    }
-    if (typeName === "ZodPipeline") {
-      current = current._def.out ?? current;
+    if (typeName === "pipe") {
+      current = current._def.in ?? current;
       continue;
     }
     break;
@@ -4929,27 +5029,19 @@ function readSchemaDescription2(schema) {
 function unwrap2(schema) {
   let current = schema;
   let optional = false;
-  while (current?._def?.typeName) {
-    const typeName = current._def.typeName;
-    if (typeName === "ZodOptional" || typeName === "ZodDefault") {
+  while (current?._def?.type) {
+    const typeName = current._def.type;
+    if (typeName === "optional" || typeName === "default") {
       optional = true;
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodNullable" || typeName === "ZodCatch" || typeName === "ZodReadonly") {
+    if (typeName === "nullable" || typeName === "catch" || typeName === "readonly") {
       current = current._def.innerType ?? current;
       continue;
     }
-    if (typeName === "ZodEffects") {
-      current = current._def.schema ?? current;
-      continue;
-    }
-    if (typeName === "ZodBranded") {
-      current = current._def.type ?? current;
-      continue;
-    }
-    if (typeName === "ZodPipeline") {
-      current = current._def.out ?? current;
+    if (typeName === "pipe") {
+      current = current._def.in ?? current;
       continue;
     }
     break;