extrait 0.4.0 → 0.5.2

package/dist/index.js

@@ -1,3 +1,6 @@
+import { createRequire } from "node:module";
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+
 // src/extract.ts
 import { jsonrepair } from "jsonrepair";
 
@@ -697,45 +700,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 +745,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 "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 "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 "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 +848,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);
-    }
-    const fallback = current.description;
-    if (typeof fallback === "string" && fallback.trim().length > 0) {
-      return sanitizeDescription(fallback);
+  while (current?._def?.type) {
+    const desc = current.description;
+    if (typeof desc === "string" && desc.trim().length > 0) {
+      return sanitizeDescription(desc);
     }
-    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;
@@ -2177,6 +2154,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 });
@@ -2188,18 +2171,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) {
@@ -2611,6 +2592,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),
@@ -2618,8 +2600,8 @@ 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
@@ -2670,6 +2652,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),
@@ -2677,8 +2660,8 @@ 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
@@ -2705,7 +2688,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;
@@ -2721,7 +2705,7 @@ 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),
@@ -2788,7 +2772,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;
@@ -2805,7 +2790,7 @@ 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),
@@ -2916,6 +2901,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) {
@@ -3802,22 +3840,25 @@ 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 resolvedRequest = normalized.timeout?.tool !== undefined && normalized.request?.mcpClients !== undefined ? {
+    ...normalized.request,
+    mcpClients: applyToolTimeout(normalized.request.mcpClients, normalized.timeout.tool)
+  } : normalized.request;
   const first = await executeAttempt(adapter, {
-    prompt,
+    prompt: preparedPrompt.prompt,
+    messages: preparedPrompt.messages,
     schema: normalized.schema,
     parseOptions,
     stream: streamConfig,
-    request: normalized.request,
-    systemPrompt,
+    request: resolvedRequest,
+    systemPrompt: preparedPrompt.systemPrompt,
     observe: normalized.observe,
     debug: debugConfig,
     attemptNumber: 1,
     selfHeal: false,
-    selfHealEnabled: selfHealConfig.enabled
+    selfHealEnabled: selfHealConfig.enabled,
+    timeout: normalized.timeout
   });
   attempts.push(first.trace);
   if (first.trace.success) {
@@ -3871,13 +3912,14 @@ async function structured(adapter, schemaOrOptions, promptInput, callOptions) {
       schema: normalized.schema,
       parseOptions,
       stream: streamConfig,
-      request: normalized.request,
-      systemPrompt,
+      request: resolvedRequest,
+      systemPrompt: preparedPrompt.systemPrompt,
       observe: normalized.observe,
       debug: debugConfig,
       attemptNumber,
       selfHeal: true,
-      selfHealEnabled: selfHealConfig.enabled
+      selfHealEnabled: selfHealConfig.enabled,
+      timeout: normalized.timeout
     });
     attempts.push(healed.trace);
     if (healed.trace.success) {
@@ -3934,12 +3976,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) {
@@ -3947,10 +3992,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;
@@ -3966,6 +4025,73 @@ 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];
+  if (Array.isArray(target?.content)) {
+    const parts = target.content;
+    const textIndex = parts.findIndex((p) => p.type === "text");
+    const existingText = textIndex !== -1 ? (parts[textIndex]?.text ?? "").trim() : "";
+    const formatted2 = shouldInjectFormat(existingText, schemaInstruction) ? formatPrompt(schema, existingText, { schemaInstruction }) : existingText;
+    let newParts;
+    if (textIndex !== -1) {
+      newParts = parts.map((p, i) => i === textIndex ? { ...p, text: formatted2 } : p);
+    } else {
+      newParts = [{ type: "text", text: formatted2 }, ...parts];
+    }
+    return messages.map((message, index) => index === lastUserIndex ? { ...message, content: newParts } : message);
+  }
+  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);
@@ -4144,6 +4270,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,
@@ -4151,7 +4278,8 @@ async function executeAttempt(adapter, input) {
     debug: input.debug,
     attempt: input.attemptNumber,
     selfHeal: input.selfHeal,
-    selfHealEnabled: input.selfHealEnabled
+    selfHealEnabled: input.selfHealEnabled,
+    timeout: input.timeout
   });
   const parsed = parseWithObserve(response.text, input.schema, input.parseOptions, {
     observe: input.observe,
@@ -4178,9 +4306,32 @@ async function executeAttempt(adapter, input) {
     trace
   };
 }
+function withToolTimeout(client, toolTimeoutMs) {
+  return {
+    id: client.id,
+    listTools: client.listTools.bind(client),
+    close: client.close?.bind(client),
+    async callTool(params) {
+      let timeoutId;
+      const timeoutPromise = new Promise((_, reject) => {
+        timeoutId = setTimeout(() => reject(new Error(`Tool call timed out after ${toolTimeoutMs}ms`)), toolTimeoutMs);
+      });
+      try {
+        return await Promise.race([client.callTool(params), timeoutPromise]);
+      } finally {
+        clearTimeout(timeoutId);
+      }
+    }
+  };
+}
+function applyToolTimeout(clients, toolTimeoutMs) {
+  return clients.map((client) => withToolTimeout(client, toolTimeoutMs));
+}
 async function callModel(adapter, options) {
+  const requestSignal = options.request?.signal ?? (options.timeout?.request !== undefined ? AbortSignal.timeout(options.timeout.request) : undefined);
   const requestPayload = {
     prompt: options.prompt,
+    messages: options.messages,
     systemPrompt: options.systemPrompt,
     temperature: options.request?.temperature,
     maxTokens: options.request?.maxTokens,
@@ -4191,7 +4342,7 @@ async function callModel(adapter, options) {
     onToolExecution: options.request?.onToolExecution,
     toolDebug: options.request?.toolDebug,
     body: options.request?.body,
-    signal: options.request?.signal
+    signal: requestSignal
   };
   emitDebugRequest(options.debug, {
     provider: adapter.provider,
@@ -4491,6 +4642,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]",
@@ -4504,7 +4656,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"),
@@ -4571,7 +4725,8 @@ function mergeStructuredOptions(defaults, overrides) {
     },
     stream: mergeObjectLike(defaults?.stream, overrides?.stream),
     selfHeal: mergeObjectLike(defaults?.selfHeal, overrides?.selfHeal),
-    debug: mergeObjectLike(defaults?.debug, overrides?.debug)
+    debug: mergeObjectLike(defaults?.debug, overrides?.debug),
+    timeout: mergeObjectLike(defaults?.timeout, overrides?.timeout)
   };
 }
 function mergeObjectLike(defaults, overrides) {
@@ -4664,6 +4819,53 @@ function toImplementation(clientInfo) {
     version: clientInfo?.version ?? "0.1.0"
   };
 }
+// src/image.ts
+import { extname } from "path";
+var IMAGE_SIZE_MAP = {
+  low: 256,
+  mid: 512,
+  high: 1024,
+  xhigh: 1280
+};
+var IMAGE_MIME_TYPES = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp"
+};
+var MIME_TO_SHARP_FORMAT = {
+  "image/jpeg": "jpeg",
+  "image/png": "png",
+  "image/webp": "webp",
+  "image/gif": "gif"
+};
+function images(input) {
+  const inputs = Array.isArray(input) ? input : [input];
+  return inputs.map(({ base64, mimeType }) => ({
+    type: "image_url",
+    image_url: { url: `data:${mimeType};base64,${base64}` }
+  }));
+}
+async function resizeImage(source, size, mimeType) {
+  const resolvedMime = mimeType ?? (typeof source === "string" ? IMAGE_MIME_TYPES[extname(source).toLowerCase()] ?? "image/jpeg" : "image/jpeg");
+  let sharp;
+  try {
+    sharp = (await import("sharp")).default;
+  } catch {
+    throw new Error('resizeImage() requires "sharp" to be installed. Run: bun add sharp');
+  }
+  const input = source instanceof ArrayBuffer ? Buffer.from(source) : source;
+  let img = sharp(input);
+  if (size !== "raw") {
+    const targetPx = typeof size === "number" ? size : IMAGE_SIZE_MAP[size];
+    img = img.resize(targetPx, targetPx, { fit: "inside", withoutEnlargement: true });
+  }
+  const sharpFormat = MIME_TO_SHARP_FORMAT[resolvedMime] ?? "jpeg";
+  const outputMime = MIME_TO_SHARP_FORMAT[resolvedMime] ? resolvedMime : "image/jpeg";
+  const buf = await img.toFormat(sharpFormat).toBuffer();
+  return { base64: buf.toString("base64"), mimeType: outputMime };
+}
 // src/prompt.ts
 function toPromptString(value) {
   if (value === null || value === undefined) {
@@ -4725,35 +4927,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) {
@@ -4863,8 +5058,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;
@@ -4875,33 +5070,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;
@@ -4910,34 +5097,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();
+  while (current?._def?.type) {
+    const desc = current.description;
+    if (typeof desc === "string" && desc.trim().length > 0) {
+      return desc.trim();
     }
-    const fallback = current.description;
-    if (typeof fallback === "string" && fallback.trim().length > 0) {
-      return fallback.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;
@@ -4947,27 +5122,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;
@@ -4984,11 +5151,13 @@ export {
   sanitizeThink,
   s,
   resolveSchemaInstruction,
+  resizeImage,
   registerBuiltinProviders,
   prompt,
   parseLLMOutput,
   inspectSchemaMetadata,
   inferSchemaExample,
+  images,
   formatZodIssues,
   formatPrompt,
   extractMarkdownCodeBlocks,