extrait 0.5.5 → 0.6.0

package/dist/index.js

@@ -1228,6 +1228,17 @@ async function executeMCPToolCalls(calls, toolset, context) {
       remoteName: tool.remoteName,
       clientId: tool.clientId
     }) : rawArgs;
+    const toolParams = context.request.transformToolCallParams ? await context.request.transformToolCallParams({
+      name: tool.remoteName,
+      arguments: args
+    }, {
+      name: toolName,
+      remoteName: tool.remoteName,
+      clientId: tool.clientId
+    }) : {
+      name: tool.remoteName,
+      arguments: args
+    };
     const metadata = {
       id: callId,
       type: call.type ?? "function",
@@ -1237,10 +1248,7 @@ async function executeMCPToolCalls(calls, toolset, context) {
     const startedAt = new Date().toISOString();
     const startedAtMs = Date.now();
     try {
-      const output = await tool.client.callTool({
-        name: tool.remoteName,
-        arguments: args
-      });
+      const output = await tool.client.callTool(toolParams);
       const executionContext = {
         callId,
         type: call.type ?? "function",
@@ -1564,6 +1572,7 @@ function createOpenAICompatibleAdapter(options) {
           model: options.model,
           messages: buildMessages(request),
           temperature: request.temperature,
+          reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
           max_tokens: request.maxTokens,
           stream: true
         })),
@@ -1575,6 +1584,7 @@ function createOpenAICompatibleAdapter(options) {
       }
       callbacks.onStart?.();
       let text = "";
+      let reasoning = "";
       let usage;
       let finishReason;
       await consumeSSE(response, (data) => {
@@ -1586,6 +1596,7 @@ function createOpenAICompatibleAdapter(options) {
           return;
         }
         const delta = pickAssistantDelta(json);
+        const reasoningDelta = pickAssistantReasoningDelta(json);
         const chunkUsage = pickUsage(json);
         const chunkFinishReason = pickFinishReason(json);
         usage = preferLatestUsage(usage, chunkUsage);
@@ -1596,9 +1607,13 @@ function createOpenAICompatibleAdapter(options) {
           text += delta;
           callbacks.onToken?.(delta);
         }
-        if (delta || chunkUsage || chunkFinishReason) {
+        if (reasoningDelta) {
+          reasoning += reasoningDelta;
+        }
+        if (delta || reasoningDelta || chunkUsage || chunkFinishReason) {
           const chunk = {
             textDelta: delta,
+            reasoningDelta: reasoningDelta || undefined,
             raw: json,
             usage: chunkUsage,
             finishReason: chunkFinishReason
@@ -1606,7 +1621,12 @@ function createOpenAICompatibleAdapter(options) {
           callbacks.onChunk?.(chunk);
         }
       });
-      const out = { text, usage, finishReason };
+      const out = {
+        text,
+        reasoning: reasoning.length > 0 ? reasoning : undefined,
+        usage,
+        finishReason
+      };
       callbacks.onComplete?.(out);
       return out;
     },
@@ -1666,6 +1686,7 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
       model: options.model,
       messages: buildMessages(request),
       temperature: request.temperature,
+      reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
       max_tokens: request.maxTokens,
       stream: false
     })),
@@ -1681,8 +1702,10 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
     throw new Error("No assistant message in OpenAI-compatible response.");
   }
   const toolCalls = pickChatToolCalls(payload);
+  const reasoning = pickAssistantReasoning(payload);
   return {
     text: pickAssistantText(payload),
+    reasoning: reasoning.length > 0 ? reasoning : undefined,
     raw: payload,
     usage: pickUsage(payload),
     finishReason: pickFinishReason(payload),
@@ -1709,6 +1732,7 @@ async function completeWithChatCompletionsWithMCP(options, fetcher, path, reques
         model: options.model,
         messages,
         temperature: request.temperature,
+        reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
         max_tokens: request.maxTokens,
         tools: transportTools,
         tool_choice: request.toolChoice,
@@ -1730,8 +1754,10 @@ async function completeWithChatCompletionsWithMCP(options, fetcher, path, reques
       throw new Error("No assistant message in OpenAI-compatible response.");
     }
     if (calledTools.length === 0) {
+      const reasoning = pickAssistantReasoning(payload);
       return {
         text: pickAssistantText(payload),
+        reasoning: reasoning.length > 0 ? reasoning : undefined,
         raw: payload,
         usage: aggregatedUsage,
         finishReason,
@@ -1759,6 +1785,10 @@ async function completeWithChatCompletionsWithMCP(options, fetcher, path, reques
   }
   return {
     text: pickAssistantText(lastPayload ?? {}),
+    reasoning: (() => {
+      const value = pickAssistantReasoning(lastPayload ?? {});
+      return value.length > 0 ? value : undefined;
+    })(),
     raw: lastPayload,
     usage: aggregatedUsage,
     finishReason,
@@ -1778,6 +1808,7 @@ async function completeWithResponsesAPIPassThrough(options, fetcher, path, reque
       input: buildResponsesInput(request),
       previous_response_id: pickString(body?.previous_response_id),
       temperature: request.temperature,
+      reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
       max_output_tokens: request.maxTokens
     })),
     signal: request.signal
@@ -1818,6 +1849,7 @@ async function completeWithResponsesAPIWithMCP(options, fetcher, path, request)
         input,
         previous_response_id: previousResponseId,
         temperature: request.temperature,
+        reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
         max_output_tokens: request.maxTokens,
         tools: transportTools,
         tool_choice: request.toolChoice,
@@ -1882,6 +1914,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
   const executedToolCalls = [];
   const toolExecutions = [];
   callbacks.onStart?.();
+  let lastRoundText = "";
+  let lastRoundReasoning = "";
   for (let round = 1;round <= maxToolRounds + 1; round += 1) {
     const mcpToolset = await resolveMCPToolset(request.mcpClients);
     const transportTools = toProviderFunctionTools(mcpToolset);
@@ -1894,6 +1928,7 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
         model: options.model,
         messages,
         temperature: request.temperature,
+        reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
         max_tokens: request.maxTokens,
         tools: transportTools,
         tool_choice: request.toolChoice,
@@ -1907,9 +1942,11 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
       throw new Error(`HTTP ${response.status}: ${message}`);
     }
     let roundText = "";
+    let roundReasoning = "";
     let roundUsage;
     let roundFinishReason;
     const streamedToolCalls = new Map;
+    let reasoningFieldName;
     await consumeSSE(response, (data) => {
       if (data === "[DONE]") {
         return;
@@ -1920,6 +1957,7 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
       }
       lastPayload = json;
       const delta = pickAssistantDelta(json);
+      const reasoningDelta = pickAssistantReasoningDelta(json);
       const chunkUsage = pickUsage(json);
       const chunkFinishReason = pickFinishReason(json);
       collectOpenAIStreamToolCalls(json, streamedToolCalls);
@@ -1931,9 +1969,14 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
         roundText += delta;
         callbacks.onToken?.(delta);
       }
-      if (delta || chunkUsage || chunkFinishReason) {
+      if (reasoningDelta) {
+        roundReasoning += reasoningDelta;
+        reasoningFieldName ??= pickAssistantReasoningDeltaFieldName(json);
+      }
+      if (delta || reasoningDelta || chunkUsage || chunkFinishReason) {
         const chunk = {
           textDelta: delta,
+          reasoningDelta: reasoningDelta || undefined,
           raw: json,
           usage: chunkUsage,
           finishReason: chunkFinishReason
@@ -1949,6 +1992,7 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
     if (calledTools.length === 0) {
       const out2 = {
         text: roundText,
+        reasoning: roundReasoning.length > 0 ? roundReasoning : undefined,
         raw: lastPayload,
         usage: aggregatedUsage,
         finishReason,
@@ -1969,7 +2013,12 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
     });
     executedToolCalls.push(...outputs.map((entry) => entry.call));
     toolExecutions.push(...outputs.map((entry) => entry.execution));
-    const assistantMessage = buildOpenAIAssistantToolMessage(roundText, calledTools);
+    lastRoundText = roundText;
+    lastRoundReasoning = roundReasoning;
+    const assistantMessage = buildOpenAIAssistantToolMessage(roundText, calledTools, {
+      reasoning: roundReasoning,
+      reasoningFieldName
+    });
     const toolMessages = outputs.map((entry) => ({
       role: "tool",
       tool_call_id: entry.call.id,
@@ -1978,7 +2027,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
     messages = [...messages, assistantMessage, ...toolMessages];
   }
   const out = {
-    text: "",
+    text: lastRoundText,
+    reasoning: lastRoundReasoning.length > 0 ? lastRoundReasoning : undefined,
     raw: lastPayload,
     usage: aggregatedUsage,
     finishReason,
@@ -2000,6 +2050,7 @@ async function streamWithResponsesAPIPassThrough(options, fetcher, path, request
       input: buildResponsesInput(request),
       previous_response_id: pickString(body?.previous_response_id),
       temperature: request.temperature,
+      reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
       max_output_tokens: request.maxTokens,
       stream: true
     })),
@@ -2080,6 +2131,7 @@ async function streamWithResponsesAPIWithMCP(options, fetcher, path, request, ca
         input,
         previous_response_id: previousResponseId,
         temperature: request.temperature,
+        reasoning_effort: toOpenAIReasoningEffort(request.reasoningEffort),
         max_output_tokens: request.maxTokens,
         tools: transportTools,
         tool_choice: request.toolChoice,
@@ -2246,6 +2298,12 @@ function toResponsesTools(tools) {
     return { ...tool };
   });
 }
+function toOpenAIReasoningEffort(value) {
+  if (!value) {
+    return;
+  }
+  return value === "max" ? "xhigh" : value;
+}
 function pickChatToolCalls(payload) {
   const message = pickAssistantMessage(payload);
   if (!message) {
@@ -2327,20 +2385,50 @@ function pickAssistantDelta(payload) {
   if (!isRecord2(delta)) {
     return "";
   }
-  const content = delta.content;
-  if (typeof content === "string") {
-    return content;
+  return pickTextFromOpenAIContent(delta.content);
+}
+function pickAssistantReasoning(payload) {
+  const message = pickAssistantMessage(payload);
+  if (!message) {
+    return "";
   }
-  if (Array.isArray(content)) {
-    return content.map((part) => {
-      if (!isRecord2(part)) {
-        return "";
-      }
-      const text = part.text;
-      return typeof text === "string" ? text : "";
-    }).join("");
+  return pickReasoningText(message);
+}
+function pickAssistantReasoningDelta(payload) {
+  const choices = payload.choices;
+  if (!Array.isArray(choices) || choices.length === 0) {
+    return "";
   }
-  return "";
+  const first = choices[0];
+  if (!isRecord2(first)) {
+    return "";
+  }
+  const delta = first.delta;
+  if (!isRecord2(delta)) {
+    return "";
+  }
+  return pickReasoningText(delta);
+}
+function pickAssistantReasoningDeltaFieldName(payload) {
+  const choices = payload.choices;
+  if (!Array.isArray(choices) || choices.length === 0) {
+    return;
+  }
+  const first = choices[0];
+  if (!isRecord2(first)) {
+    return;
+  }
+  const delta = first.delta;
+  if (!isRecord2(delta)) {
+    return;
+  }
+  if (hasTextLikeValue(delta.reasoning)) {
+    return "reasoning";
+  }
+  if (hasTextLikeValue(delta.reasoning_content)) {
+    return "reasoning_content";
+  }
+  return;
 }
 function collectOpenAIStreamToolCalls(payload, state) {
   const choices = payload.choices;
@@ -2389,8 +2477,8 @@ function buildOpenAIStreamToolCalls(state) {
     arguments: entry.argumentsText.length > 0 ? entry.argumentsText : {}
   }));
 }
-function buildOpenAIAssistantToolMessage(text, toolCalls) {
-  return {
+function buildOpenAIAssistantToolMessage(text, toolCalls, reasoning) {
+  const message = {
     role: "assistant",
     content: text,
     tool_calls: toolCalls.map((call) => ({
@@ -2402,6 +2490,10 @@ function buildOpenAIAssistantToolMessage(text, toolCalls) {
       }
     }))
   };
+  if (reasoning?.reasoning && reasoning.reasoning.length > 0) {
+    message[reasoning.reasoningFieldName ?? "reasoning"] = reasoning.reasoning;
+  }
+  return message;
 }
 function pickResponsesStreamPayload(payload) {
   if (isRecord2(payload.response)) {
@@ -2563,21 +2655,9 @@ function pickResponsesText(payload) {
 function pickAssistantText(payload) {
   const message = pickAssistantMessage(payload);
   if (message) {
-    const content = message.content;
-    if (typeof content === "string") {
-      return content;
-    }
-    if (Array.isArray(content)) {
-      return content.map((part) => {
-        if (typeof part === "string") {
-          return part;
-        }
-        if (!isRecord2(part)) {
-          return "";
-        }
-        const text = part.text;
-        return typeof text === "string" ? text : "";
-      }).join("");
+    const text = pickTextFromOpenAIContent(message.content);
+    if (text.length > 0) {
+      return text;
     }
   }
   const choices = payload.choices;
@@ -2589,6 +2669,36 @@ function pickAssistantText(payload) {
   }
   return "";
 }
+function pickReasoningText(value) {
+  return pickTextLike(value.reasoning) || pickTextLike(value.reasoning_content);
+}
+function pickTextFromOpenAIContent(value) {
+  return pickTextLike(value);
+}
+function pickTextLike(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((part) => pickTextLikePart(part)).join("");
+  }
+  if (!isRecord2(value)) {
+    return "";
+  }
+  return pickTextLikePart(value);
+}
+function pickTextLikePart(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (!isRecord2(value)) {
+    return "";
+  }
+  return pickString(value.text) ?? pickString(value.output_text) ?? pickString(value.reasoning) ?? pickString(value.reasoning_content) ?? (Array.isArray(value.content) ? value.content.map((part) => pickTextLikePart(part)).join("") : "");
+}
+function hasTextLikeValue(value) {
+  return pickTextLike(value).length > 0;
+}
 function pickUsage(payload) {
   const usage = payload.usage;
   if (!isRecord2(usage)) {
@@ -2642,14 +2752,13 @@ function createAnthropicCompatibleAdapter(options) {
       const response = await fetcher(buildURL(options.baseURL, path), {
         method: "POST",
         headers: buildHeaders2(options),
-        body: JSON.stringify(cleanUndefined({
+        body: JSON.stringify(buildAnthropicRequestBody(options, request, {
           ...options.defaultBody,
           ...request.body,
           model: options.model,
           system: input.systemPrompt,
           messages: input.messages,
           temperature: request.temperature,
-          max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
           stream: true
         })),
         signal: request.signal
@@ -2705,14 +2814,13 @@ async function completePassThrough(options, fetcher, path, request) {
   const response = await fetcher(buildURL(options.baseURL, path), {
     method: "POST",
     headers: buildHeaders2(options),
-    body: JSON.stringify(cleanUndefined({
+    body: JSON.stringify(buildAnthropicRequestBody(options, request, {
       ...options.defaultBody,
       ...request.body,
       model: options.model,
       system: input.systemPrompt,
       messages: input.messages,
       temperature: request.temperature,
-      max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
       stream: false
     })),
     signal: request.signal
@@ -2750,14 +2858,13 @@ async function completeWithMCPToolLoop(options, fetcher, path, request) {
     const response = await fetcher(buildURL(options.baseURL, path), {
       method: "POST",
       headers: buildHeaders2(options),
-      body: JSON.stringify(cleanUndefined({
+      body: JSON.stringify(buildAnthropicRequestBody(options, request, {
         ...options.defaultBody,
         ...request.body,
         model: options.model,
         system: input.systemPrompt,
         messages,
         temperature: request.temperature,
-        max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
         tools,
         tool_choice: toAnthropicToolChoice(request.toolChoice),
         stream: false
@@ -2835,14 +2942,13 @@ async function streamWithMCPToolLoop(options, fetcher, path, request, callbacks)
     const response = await fetcher(buildURL(options.baseURL, path), {
       method: "POST",
       headers: buildHeaders2(options),
-      body: JSON.stringify(cleanUndefined({
+      body: JSON.stringify(buildAnthropicRequestBody(options, request, {
         ...options.defaultBody,
         ...request.body,
         model: options.model,
         system: input.systemPrompt,
         messages,
         temperature: request.temperature,
-        max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
         tools,
         tool_choice: toAnthropicToolChoice(request.toolChoice),
         stream: true
@@ -2950,6 +3056,21 @@ function buildHeaders2(options) {
     ...options.headers
   };
 }
+function buildAnthropicRequestBody(options, request, body) {
+  const bodyOutputConfig = isRecord2(body.output_config) ? body.output_config : undefined;
+  const bodyThinking = body.thinking;
+  const hasExplicitThinking = Object.prototype.hasOwnProperty.call(body, "thinking");
+  const reasoningEffort = request.reasoningEffort;
+  return cleanUndefined({
+    ...body,
+    max_tokens: resolveMaxTokens(request.maxTokens, options.defaultMaxTokens),
+    output_config: reasoningEffort ? cleanUndefined({
+      ...bodyOutputConfig,
+      effort: reasoningEffort
+    }) : bodyOutputConfig,
+    thinking: reasoningEffort ? hasExplicitThinking ? bodyThinking : { type: "adaptive" } : bodyThinking
+  });
+}
 function resolveAnthropicInput(request) {
   if (Array.isArray(request.messages) && request.messages.length > 0) {
     return toAnthropicInput(request.messages);
@@ -3304,8 +3425,34 @@ function buildProviderOptions(config) {
   };
 }
 
-// src/structured.ts
-import { jsonrepair as jsonrepair3 } from "jsonrepair";
+// src/utils/debug-colors.ts
+var ANSI = {
+  reset: "\x1B[0m",
+  bold: "\x1B[1m",
+  cyan: "\x1B[36m",
+  yellow: "\x1B[33m",
+  green: "\x1B[32m",
+  red: "\x1B[31m",
+  dim: "\x1B[2m"
+};
+function color(config, text, tone) {
+  if (!config.colors) {
+    return text;
+  }
+  return `${ANSI[tone]}${text}${ANSI.reset}`;
+}
+function dim(config, text) {
+  if (!config.colors) {
+    return text;
+  }
+  return `${ANSI.dim}${text}${ANSI.reset}`;
+}
+function title(config, text) {
+  if (!config.colors) {
+    return text;
+  }
+  return `${ANSI.bold}${text}${ANSI.reset}`;
+}
 
 // src/outdent.ts
 var DEFAULT_OPTIONS = {
@@ -3444,39 +3591,598 @@ function createOutdent(options = {}) {
   return outdent;
 }
 
-// src/parse.ts
-import { jsonrepair as jsonrepair2 } from "jsonrepair";
-function parseLLMOutput(output, schema, options = {}) {
-  const sanitized = sanitizeThink(output);
-  const parseOptions = {
-    repair: options.repair ?? true,
-    maxCandidates: options.maxCandidates ?? 5,
-    acceptArrays: options.acceptArrays ?? true,
-    extraction: options.extraction,
-    onTrace: options.onTrace
+// src/generate-shared.ts
+var sharedOutdent = createOutdent({
+  trimLeadingNewline: true,
+  trimTrailingNewline: true,
+  newline: `
+`
+});
+var RE_THINK_TAGS = /<\/?think\s*>/gi;
+function resolvePrompt(prompt, context) {
+  const resolved = typeof prompt === "function" ? prompt(context) : prompt;
+  return normalizePromptValue(resolved, context);
+}
+function normalizePromptValue(value, _context) {
+  if (typeof value === "string") {
+    return {
+      prompt: value
+    };
+  }
+  if (isPromptResolver(value)) {
+    return normalizePromptPayload(value.resolvePrompt(_context));
+  }
+  return normalizePromptPayload(value);
+}
+function normalizePromptPayload(value) {
+  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,
+    systemPrompt: typeof value.systemPrompt === "string" ? value.systemPrompt : undefined,
+    messages: messages && messages.length > 0 ? messages.map((message) => ({ ...message })) : undefined
   };
-  const candidates = extractJsonCandidates(sanitized.visibleText, {
-    maxCandidates: parseOptions.maxCandidates,
-    acceptArrays: parseOptions.acceptArrays,
-    allowRepairHints: parseOptions.repair,
-    heuristics: parseOptions.extraction
-  });
-  emitTrace(parseOptions.onTrace, {
-    stage: "extract",
-    level: "info",
-    message: `Extracted ${candidates.length} candidate(s).`,
-    details: {
-      maxCandidates: parseOptions.maxCandidates,
-      thinkBlocks: sanitized.thinkBlocks.length,
-      thinkDiagnostics: sanitized.diagnostics
+}
+function applyPromptOutdent(payload, enabled) {
+  if (!enabled) {
+    return payload;
+  }
+  return {
+    prompt: typeof payload.prompt === "string" ? sharedOutdent.string(payload.prompt) : undefined,
+    systemPrompt: applyOutdentToOptionalPrompt(payload.systemPrompt, enabled),
+    messages: payload.messages?.map((message) => ({
+      ...message,
+      content: typeof message.content === "string" ? sharedOutdent.string(message.content) : message.content
+    }))
+  };
+}
+function applyOutdentToOptionalPrompt(value, enabled) {
+  if (!enabled || typeof value !== "string") {
+    return value;
+  }
+  return sharedOutdent.string(value);
+}
+function mergeSystemPrompts(primary, secondary) {
+  const prompts = [primary, secondary].map((value) => value?.trim()).filter((value) => Boolean(value));
+  if (prompts.length === 0) {
+    return;
+  }
+  return prompts.join(`
+
+`);
+}
+function normalizeStreamConfig(option) {
+  if (typeof option === "boolean") {
+    return {
+      enabled: option
+    };
+  }
+  if (!option) {
+    return {
+      enabled: false
+    };
+  }
+  return {
+    enabled: option.enabled ?? true,
+    onData: option.onData,
+    to: option.to
+  };
+}
+function normalizeDebugConfig(option) {
+  if (typeof option === "boolean") {
+    return {
+      enabled: option,
+      colors: true,
+      verbose: false,
+      logger: (line) => console.log(line)
+    };
+  }
+  if (!option) {
+    return {
+      enabled: false,
+      colors: true,
+      verbose: false,
+      logger: (line) => console.log(line)
+    };
+  }
+  return {
+    enabled: option.enabled ?? true,
+    colors: option.colors ?? true,
+    verbose: option.verbose ?? false,
+    logger: option.logger ?? ((line) => console.log(line))
+  };
+}
+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);
+      }
     }
-  });
-  const errors = [];
-  const diagnostics = [];
-  let bestIssues = [];
-  let bestCandidate = candidates[0] ?? null;
-  let bestParsed = null;
-  let bestRepaired = null;
+  };
+}
+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,
+    reasoningEffort: options.request?.reasoningEffort,
+    maxTokens: options.request?.maxTokens,
+    mcpClients: options.request?.mcpClients,
+    toolChoice: options.request?.toolChoice,
+    parallelToolCalls: options.request?.parallelToolCalls,
+    maxToolRounds: options.request?.maxToolRounds,
+    onToolExecution: options.request?.onToolExecution,
+    transformToolOutput: options.request?.transformToolOutput,
+    transformToolArguments: options.request?.transformToolArguments,
+    transformToolCallParams: options.request?.transformToolCallParams,
+    unknownToolError: options.request?.unknownToolError,
+    toolDebug: options.request?.toolDebug,
+    body: options.request?.body,
+    signal: requestSignal
+  };
+  emitDebugRequest(options.debug, {
+    label: options.debugLabel,
+    provider: adapter.provider,
+    model: adapter.model,
+    attempt: options.attempt,
+    selfHealAttempt: options.selfHeal,
+    selfHealEnabled: options.selfHealEnabled,
+    stream: options.stream.enabled && !!adapter.stream,
+    requestPayload
+  });
+  options.observe?.(options.buildEvent({
+    stage: "llm.request",
+    message: "Sending LLM request.",
+    details: {
+      provider: adapter.provider,
+      model: adapter.model,
+      stream: options.stream.enabled && !!adapter.stream
+    }
+  }));
+  if (options.stream.enabled && adapter.stream) {
+    let latestUsage;
+    let latestFinishReason;
+    let streamedProviderText = "";
+    let streamedDedicatedReasoning = "";
+    let lastSnapshotFingerprint;
+    let previousSnapshotText = "";
+    let previousSnapshotReasoning = "";
+    const emitStreamingData = (done, usage2, finishReason2) => {
+      const normalized2 = normalizeModelOutput(streamedProviderText, streamedDedicatedReasoning);
+      const snapshot = options.buildSnapshot(normalized2);
+      const fingerprint = toStreamDataFingerprint(snapshot);
+      if (!done && fingerprint === lastSnapshotFingerprint) {
+        return;
+      }
+      const delta = {
+        text: normalized2.text.startsWith(previousSnapshotText) ? normalized2.text.slice(previousSnapshotText.length) : "",
+        reasoning: normalized2.reasoning.startsWith(previousSnapshotReasoning) ? normalized2.reasoning.slice(previousSnapshotReasoning.length) : ""
+      };
+      lastSnapshotFingerprint = fingerprint;
+      previousSnapshotText = normalized2.text;
+      previousSnapshotReasoning = normalized2.reasoning;
+      options.stream.onData?.({
+        delta,
+        snapshot,
+        done,
+        usage: usage2,
+        finishReason: finishReason2
+      });
+      if (options.stream.to === "stdout" && delta.text) {
+        process.stdout.write(delta.text);
+      }
+      options.observe?.(options.buildEvent({
+        stage: "llm.stream.data",
+        message: done ? "Streaming response completed." : "Streaming response updated.",
+        details: {
+          done,
+          finishReason: finishReason2
+        }
+      }));
+    };
+    const handleTextDelta = (delta) => {
+      if (!delta) {
+        return;
+      }
+      streamedProviderText += delta;
+      options.observe?.(options.buildEvent({
+        stage: "llm.stream.delta",
+        message: "Received stream delta.",
+        details: {
+          chars: delta.length
+        }
+      }));
+      emitStreamingData(false);
+    };
+    const handleReasoningDelta = (delta) => {
+      if (!delta) {
+        return;
+      }
+      streamedDedicatedReasoning += delta;
+      emitStreamingData(false);
+    };
+    const response2 = await adapter.stream(requestPayload, {
+      onChunk: (chunk) => {
+        if (chunk.textDelta) {
+          handleTextDelta(chunk.textDelta);
+        }
+        if (chunk.reasoningDelta) {
+          handleReasoningDelta(chunk.reasoningDelta);
+        }
+        if (chunk.usage) {
+          latestUsage = preferLatestUsage(latestUsage, chunk.usage);
+        }
+        if (chunk.finishReason) {
+          latestFinishReason = chunk.finishReason;
+        }
+      }
+    });
+    streamedProviderText = typeof response2.text === "string" ? response2.text : streamedProviderText;
+    streamedDedicatedReasoning = typeof response2.reasoning === "string" ? response2.reasoning : streamedDedicatedReasoning;
+    const finalNormalized = normalizeModelOutput(streamedProviderText, streamedDedicatedReasoning);
+    const usage = preferLatestUsage(latestUsage, response2.usage);
+    const finishReason = response2.finishReason ?? latestFinishReason;
+    emitStreamingData(true, usage, finishReason);
+    options.observe?.(options.buildEvent({
+      stage: "llm.response",
+      message: "Streaming response completed.",
+      details: {
+        via: "stream",
+        chars: finalNormalized.parseSource.length,
+        finishReason
+      }
+    }));
+    emitDebugResponse(options.debug, {
+      label: options.debugLabel,
+      attempt: options.attempt,
+      selfHealAttempt: options.selfHeal,
+      selfHealEnabled: options.selfHealEnabled,
+      via: "stream",
+      text: finalNormalized.text,
+      reasoning: finalNormalized.reasoning,
+      parseSource: finalNormalized.parseSource,
+      usage,
+      finishReason
+    });
+    return {
+      text: finalNormalized.text,
+      reasoning: finalNormalized.reasoning,
+      thinkBlocks: finalNormalized.thinkBlocks,
+      parseSource: finalNormalized.parseSource,
+      via: "stream",
+      usage,
+      finishReason
+    };
+  }
+  const response = await adapter.complete(requestPayload);
+  const normalized = normalizeModelOutput(response.text, response.reasoning);
+  options.observe?.(options.buildEvent({
+    stage: "llm.response",
+    message: "Completion response received.",
+    details: {
+      via: "complete",
+      chars: normalized.parseSource.length,
+      finishReason: response.finishReason
+    }
+  }));
+  emitDebugResponse(options.debug, {
+    label: options.debugLabel,
+    attempt: options.attempt,
+    selfHealAttempt: options.selfHeal,
+    selfHealEnabled: options.selfHealEnabled,
+    via: "complete",
+    text: normalized.text,
+    reasoning: normalized.reasoning,
+    parseSource: normalized.parseSource,
+    usage: response.usage,
+    finishReason: response.finishReason
+  });
+  return {
+    text: normalized.text,
+    reasoning: normalized.reasoning,
+    thinkBlocks: normalized.thinkBlocks,
+    parseSource: normalized.parseSource,
+    via: "complete",
+    usage: response.usage,
+    finishReason: response.finishReason
+  };
+}
+function normalizeModelOutput(text, dedicatedReasoning) {
+  const sanitized = sanitizeThink(text);
+  const visibleText = stripThinkBlocks(text, sanitized.thinkBlocks);
+  const reasoning = joinReasoningSegments([
+    dedicatedReasoning,
+    ...sanitized.thinkBlocks.map((block) => block.content)
+  ]);
+  return {
+    text: visibleText,
+    reasoning,
+    thinkBlocks: sanitized.thinkBlocks,
+    parseSource: composeParseSource(visibleText, reasoning)
+  };
+}
+function composeParseSource(text, reasoning) {
+  if (typeof reasoning !== "string" || reasoning.length === 0) {
+    return text;
+  }
+  const sanitized = reasoning.replace(RE_THINK_TAGS, "");
+  if (sanitized.length === 0) {
+    return text;
+  }
+  return `<think>${sanitized}</think>${text}`;
+}
+function aggregateUsage(attempts) {
+  let usage;
+  for (const attempt of attempts) {
+    usage = mergeUsage2(usage, attempt.usage);
+  }
+  return usage;
+}
+function mergeUsage2(base, next) {
+  if (!base && !next) {
+    return;
+  }
+  return {
+    inputTokens: (base?.inputTokens ?? 0) + (next?.inputTokens ?? 0),
+    outputTokens: (base?.outputTokens ?? 0) + (next?.outputTokens ?? 0),
+    totalTokens: (base?.totalTokens ?? 0) + (next?.totalTokens ?? 0),
+    cost: (base?.cost ?? 0) + (next?.cost ?? 0)
+  };
+}
+function isPromptResolver(value) {
+  return typeof value === "object" && value !== null && "resolvePrompt" in value && typeof value.resolvePrompt === "function";
+}
+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 joinReasoningSegments(parts) {
+  return parts.map((value) => value?.trim()).filter((value) => Boolean(value)).join(`
+
+`);
+}
+function stripThinkBlocks(text, thinkBlocks) {
+  if (thinkBlocks.length === 0) {
+    return text;
+  }
+  let output = "";
+  let cursor = 0;
+  for (const block of thinkBlocks) {
+    output += text.slice(cursor, block.start);
+    cursor = block.end;
+  }
+  output += text.slice(cursor);
+  return output;
+}
+function toStreamDataFingerprint(value) {
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "__unserializable__";
+  }
+}
+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, [
+      `[${input.label}][request]`,
+      `attempt=${input.attempt}`,
+      `selfHealEnabled=${input.selfHealEnabled}`,
+      `selfHealAttempt=${input.selfHealAttempt}`
+    ].join(" ")), "cyan"),
+    dim(config, [
+      `provider=${input.provider ?? "unknown"}`,
+      `model=${input.model ?? "unknown"}`,
+      `stream=${input.stream}`
+    ].join(" ")),
+    color(config, "prompt:", "yellow"),
+    input.requestPayload.prompt ?? "(none)",
+    color(config, "messages:", "yellow"),
+    requestMessages,
+    color(config, "systemPrompt:", "yellow"),
+    input.requestPayload.systemPrompt ?? "(none)",
+    color(config, "request.body:", "yellow"),
+    requestBody
+  ];
+  emitDebug(config, lines.join(`
+`));
+}
+function emitDebugResponse(config, input) {
+  const text = input.text.length > 0 ? input.text : "(none)";
+  const reasoning = input.reasoning.length > 0 ? input.reasoning : "(none)";
+  const metadata = [
+    `via=${input.via}`,
+    `textChars=${input.text.length}`,
+    `reasoningChars=${input.reasoning.length}`
+  ];
+  if (config.verbose) {
+    metadata.push(`parseSourceChars=${input.parseSource.length}`);
+  }
+  metadata.push(`finishReason=${input.finishReason ?? "unknown"}`, `usage=${JSON.stringify(input.usage ?? {})}`);
+  const lines = [
+    color(config, title(config, [
+      `[${input.label}][response]`,
+      `attempt=${input.attempt}`,
+      `selfHealEnabled=${input.selfHealEnabled}`,
+      `selfHealAttempt=${input.selfHealAttempt}`
+    ].join(" ")), "green"),
+    dim(config, metadata.join(" ")),
+    color(config, "text:", "yellow"),
+    text,
+    color(config, "reasoning:", "yellow"),
+    reasoning
+  ];
+  if (config.verbose) {
+    lines.push(color(config, "parseSource:", "yellow"), input.parseSource);
+  }
+  emitDebug(config, lines.join(`
+`));
+}
+function emitDebug(config, message) {
+  if (!config.enabled) {
+    return;
+  }
+  config.logger(message);
+}
+
+// src/generate.ts
+async function generate(adapter, promptOrOptions, callOptions) {
+  const normalized = normalizeGenerateInput(promptOrOptions, callOptions);
+  const useOutdent = normalized.outdent ?? true;
+  const streamConfig = normalizeStreamConfig(normalized.stream);
+  const debugConfig = normalizeDebugConfig(normalized.debug);
+  const resolvedPrompt = applyPromptOutdent(resolvePrompt(normalized.prompt, { mode: "loose" }), useOutdent);
+  const resolvedSystemPrompt = applyOutdentToOptionalPrompt(normalized.systemPrompt, useOutdent);
+  const preparedPrompt = prepareGeneratePromptPayload(resolvedPrompt, resolvedSystemPrompt);
+  const resolvedRequest = normalized.timeout?.tool !== undefined && normalized.request?.mcpClients !== undefined ? {
+    ...normalized.request,
+    mcpClients: applyToolTimeout(normalized.request.mcpClients, normalized.timeout.tool)
+  } : normalized.request;
+  const response = await callModel(adapter, {
+    prompt: preparedPrompt.prompt,
+    messages: preparedPrompt.messages,
+    systemPrompt: preparedPrompt.systemPrompt,
+    request: resolvedRequest,
+    stream: streamConfig,
+    observe: normalized.observe,
+    buildEvent: ({ stage, message, details }) => ({
+      stage,
+      attempt: 1,
+      message,
+      details
+    }),
+    buildSnapshot: (model) => ({
+      text: model.text,
+      reasoning: model.reasoning
+    }),
+    debug: debugConfig,
+    debugLabel: "generate",
+    attempt: 1,
+    selfHeal: false,
+    selfHealEnabled: false,
+    timeout: normalized.timeout
+  });
+  const attempt = {
+    attempt: 1,
+    via: response.via,
+    text: response.text,
+    reasoning: response.reasoning,
+    usage: response.usage,
+    finishReason: response.finishReason
+  };
+  const attempts = [attempt];
+  normalized.observe?.({
+    stage: "result",
+    attempt: 1,
+    message: "Text generation completed.",
+    details: {
+      via: response.via,
+      finishReason: response.finishReason
+    }
+  });
+  return {
+    text: attempt.text,
+    reasoning: attempt.reasoning,
+    attempts,
+    usage: aggregateUsage(attempts),
+    finishReason: attempt.finishReason
+  };
+}
+function normalizeGenerateInput(promptOrOptions, callOptions) {
+  if (isGenerateOptions(promptOrOptions)) {
+    return promptOrOptions;
+  }
+  if (!promptOrOptions) {
+    throw new Error("Missing prompt in generate(adapter, prompt, options?) call.");
+  }
+  return {
+    ...callOptions ?? {},
+    prompt: promptOrOptions
+  };
+}
+function isGenerateOptions(value) {
+  return typeof value === "object" && value !== null && "prompt" in value;
+}
+function prepareGeneratePromptPayload(payload, systemPrompt) {
+  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: [...systemMessages, ...messages]
+    };
+  }
+  const resolvedPrompt = payload.prompt?.trim();
+  if (!resolvedPrompt) {
+    throw new Error("Structured prompt payload must include a non-empty prompt or messages.");
+  }
+  return {
+    prompt: resolvedPrompt,
+    systemPrompt: mergeSystemPrompts(payload.systemPrompt, systemPrompt)
+  };
+}
+
+// src/structured.ts
+import { jsonrepair as jsonrepair3 } from "jsonrepair";
+
+// src/parse.ts
+import { jsonrepair as jsonrepair2 } from "jsonrepair";
+function parseLLMOutput(output, schema, options = {}) {
+  const sanitized = sanitizeThink(output);
+  const parseOptions = {
+    repair: options.repair ?? true,
+    maxCandidates: options.maxCandidates ?? 5,
+    acceptArrays: options.acceptArrays ?? true,
+    extraction: options.extraction,
+    onTrace: options.onTrace
+  };
+  const candidates = extractJsonCandidates(sanitized.visibleText, {
+    maxCandidates: parseOptions.maxCandidates,
+    acceptArrays: parseOptions.acceptArrays,
+    allowRepairHints: parseOptions.repair,
+    heuristics: parseOptions.extraction
+  });
+  emitTrace(parseOptions.onTrace, {
+    stage: "extract",
+    level: "info",
+    message: `Extracted ${candidates.length} candidate(s).`,
+    details: {
+      maxCandidates: parseOptions.maxCandidates,
+      thinkBlocks: sanitized.thinkBlocks.length,
+      thinkDiagnostics: sanitized.diagnostics
+    }
+  });
+  const errors = [];
+  const diagnostics = [];
+  let bestIssues = [];
+  let bestCandidate = candidates[0] ?? null;
+  let bestParsed = null;
+  let bestRepaired = null;
   for (const candidate of candidates) {
     const parseAttempt = parseAttemptFromHint(candidate.parseHint, parseOptions.repair) ?? tryParseJsonCandidate(candidate.content, parseOptions.repair);
     if (!parseAttempt.success) {
@@ -3743,48 +4449,19 @@ function formatZodIssues(issues) {
 `);
 }
 
-// src/utils/debug-colors.ts
-var ANSI = {
-  reset: "\x1B[0m",
-  bold: "\x1B[1m",
-  cyan: "\x1B[36m",
-  yellow: "\x1B[33m",
-  green: "\x1B[32m",
-  red: "\x1B[31m",
-  dim: "\x1B[2m"
-};
-function color(config, text, tone) {
-  if (!config.colors) {
-    return text;
-  }
-  return `${ANSI[tone]}${text}${ANSI.reset}`;
-}
-function dim(config, text) {
-  if (!config.colors) {
-    return text;
-  }
-  return `${ANSI.dim}${text}${ANSI.reset}`;
-}
-function title(config, text) {
-  if (!config.colors) {
-    return text;
-  }
-  return `${ANSI.bold}${text}${ANSI.reset}`;
-}
-
 // src/structured.ts
 class StructuredParseError extends Error {
   name = "StructuredParseError";
-  raw;
-  thinkBlocks;
+  text;
+  reasoning;
   candidates;
   zodIssues;
   repairLog;
   attempt;
   constructor(input) {
     super(input.message ?? `Structured parsing failed after ${input.attempt} attempt(s).`);
-    this.raw = input.raw;
-    this.thinkBlocks = input.thinkBlocks;
+    this.text = input.text;
+    this.reasoning = input.reasoning;
     this.candidates = input.candidates;
     this.zodIssues = input.zodIssues;
     this.repairLog = input.repairLog;
@@ -3815,12 +4492,6 @@ var RE_SIMPLE_IDENTIFIER2 = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 var RE_ESCAPE_QUOTE = /"/g;
 var RE_WHITESPACE2 = /\s+/g;
 var DEFAULT_SELF_HEAL_MAX_DIAGNOSTICS = 8;
-var structuredOutdent = createOutdent({
-  trimLeadingNewline: true,
-  trimTrailingNewline: true,
-  newline: `
-`
-});
 var DEFAULT_STRICT_PARSE_OPTIONS = {
   repair: false,
   maxCandidates: 3,
@@ -3950,7 +4621,7 @@ async function structured(adapter, schemaOrOptions, promptInput, callOptions) {
     });
     const selfHealSource = resolveSelfHealSource(previous);
     const repairPrompt = buildSelfHealPrompt({
-      rawOutput: previous.raw,
+      rawOutput: composeParseSource(previous.text, previous.reasoning),
       issues: previous.zodIssues,
       schema: normalized.schema,
       schemaInstruction: normalized.schemaInstruction,
@@ -4023,74 +4694,6 @@ function normalizeStructuredInput(schemaOrOptions, promptInput, callOptions) {
 function isStructuredOptions(value) {
   return typeof value === "object" && value !== null && "schema" in value && "prompt" in value;
 }
-function resolvePrompt(prompt, context) {
-  const resolved = typeof prompt === "function" ? prompt(context) : prompt;
-  return normalizePromptValue(resolved, context);
-}
-function normalizePromptValue(value, context) {
-  if (typeof value === "string") {
-    return {
-      prompt: value
-    };
-  }
-  if (isPromptResolver(value)) {
-    return normalizePromptPayload(value.resolvePrompt(context));
-  }
-  return normalizePromptPayload(value);
-}
-function isPromptResolver(value) {
-  return typeof value === "object" && value !== null && "resolvePrompt" in value && typeof value.resolvePrompt === "function";
-}
-function normalizePromptPayload(value) {
-  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,
-    systemPrompt: typeof value.systemPrompt === "string" ? value.systemPrompt : undefined,
-    messages: messages && messages.length > 0 ? messages.map((message) => ({ ...message })) : undefined
-  };
-}
-function applyPromptOutdent(payload, enabled) {
-  if (!enabled) {
-    return payload;
-  }
-  return {
-    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;
-  }
-  return structuredOutdent.string(value);
-}
-function mergeSystemPrompts(primary, secondary) {
-  const prompts = [primary, secondary].map((value) => value?.trim()).filter((value) => Boolean(value));
-  if (prompts.length === 0) {
-    return;
-  }
-  return prompts.join(`
-
-`);
-}
 function prepareStructuredPromptPayload(payload, systemPrompt, schema, schemaInstruction) {
   if (Array.isArray(payload.messages) && payload.messages.length > 0) {
     const messages = payload.messages.map((message) => ({ ...message }));
@@ -4271,70 +4874,32 @@ function resolveSelfHealSource(attempt) {
   }
   return {
     kind: "raw",
-    text: attempt.raw
-  };
-}
-function isSelfHealStalled(previous, current) {
-  if (current.success) {
-    return false;
-  }
-  if (current.zodIssues.length < previous.zodIssues.length) {
-    return false;
-  }
-  if (current.parsed.errors.length < previous.parsed.errors.length) {
-    return false;
-  }
-  return buildSelfHealFailureFingerprint(previous) === buildSelfHealFailureFingerprint(current);
-}
-function buildSelfHealFailureFingerprint(attempt) {
-  const issues = attempt.zodIssues.map((issue) => `${formatIssuePath(issue.path)}:${issue.code}:${normalizeWhitespace(issue.message)}`).sort().join("|");
-  const errors = attempt.parsed.errors.map((error) => `${error.stage}:${error.candidateId ?? "-"}:${normalizeWhitespace(error.message)}`).sort().join("|");
-  const source = normalizeWhitespace(resolveSelfHealSource(attempt).text).slice(0, 512);
-  return [issues, errors, source].join("::");
-}
-function normalizeWhitespace(value) {
-  return value.replace(RE_WHITESPACE2, " ").trim();
-}
-function normalizeStreamConfig(option) {
-  if (typeof option === "boolean") {
-    return {
-      enabled: option
-    };
-  }
-  if (!option) {
-    return {
-      enabled: false
-    };
-  }
-  return {
-    enabled: option.enabled ?? true,
-    onData: option.onData,
-    to: option.to
-  };
-}
-function normalizeDebugConfig(option) {
-  if (typeof option === "boolean") {
-    return {
-      enabled: option,
-      colors: true,
-      logger: (line) => console.log(line)
-    };
-  }
-  if (!option) {
-    return {
-      enabled: false,
-      colors: true,
-      logger: (line) => console.log(line)
-    };
-  }
-  return {
-    enabled: option.enabled ?? true,
-    colors: option.colors ?? true,
-    logger: option.logger ?? ((line) => console.log(line))
+    text: composeParseSource(attempt.text, attempt.reasoning)
   };
 }
+function isSelfHealStalled(previous, current) {
+  if (current.success) {
+    return false;
+  }
+  if (current.zodIssues.length < previous.zodIssues.length) {
+    return false;
+  }
+  if (current.parsed.errors.length < previous.parsed.errors.length) {
+    return false;
+  }
+  return buildSelfHealFailureFingerprint(previous) === buildSelfHealFailureFingerprint(current);
+}
+function buildSelfHealFailureFingerprint(attempt) {
+  const issues = attempt.zodIssues.map((issue) => `${formatIssuePath(issue.path)}:${issue.code}:${normalizeWhitespace(issue.message)}`).sort().join("|");
+  const errors = attempt.parsed.errors.map((error) => `${error.stage}:${error.candidateId ?? "-"}:${normalizeWhitespace(error.message)}`).sort().join("|");
+  const source = normalizeWhitespace(resolveSelfHealSource(attempt).text).slice(0, 512);
+  return [issues, errors, source].join("::");
+}
+function normalizeWhitespace(value) {
+  return value.replace(RE_WHITESPACE2, " ").trim();
+}
 async function executeAttempt(adapter, input) {
-  const response = await callModel(adapter, {
+  const response = await callModel2(adapter, {
     prompt: input.prompt,
     messages: input.messages,
     systemPrompt: input.systemPrompt,
@@ -4347,7 +4912,7 @@ async function executeAttempt(adapter, input) {
     selfHealEnabled: input.selfHealEnabled,
     timeout: input.timeout
   });
-  const parsed = parseWithObserve(response.text, input.schema, input.parseOptions, {
+  const parsed = parseWithObserve(response.parseSource, input.schema, input.parseOptions, {
     observe: input.observe,
     attempt: input.attemptNumber,
     selfHeal: input.selfHeal
@@ -4356,8 +4921,8 @@ async function executeAttempt(adapter, input) {
     attempt: input.attemptNumber,
     selfHeal: input.selfHeal,
     via: response.via,
-    raw: response.text,
-    thinkBlocks: parsed.thinkBlocks,
+    text: response.text,
+    reasoning: response.reasoning,
     json: parsed.parsed,
     candidates: parsed.candidates.map((candidate) => candidate.content),
     repairLog: collectRepairLog(parsed),
@@ -4372,195 +4937,26 @@ 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,
-    mcpClients: options.request?.mcpClients,
-    toolChoice: options.request?.toolChoice,
-    parallelToolCalls: options.request?.parallelToolCalls,
-    maxToolRounds: options.request?.maxToolRounds,
-    onToolExecution: options.request?.onToolExecution,
-    toolDebug: options.request?.toolDebug,
-    body: options.request?.body,
-    signal: requestSignal
-  };
-  emitDebugRequest(options.debug, {
-    provider: adapter.provider,
-    model: adapter.model,
-    attempt: options.attempt,
-    selfHealAttempt: options.selfHeal,
-    selfHealEnabled: options.selfHealEnabled,
-    stream: options.stream.enabled && !!adapter.stream,
-    requestPayload
-  });
-  emitObserve(options.observe, {
-    stage: "llm.request",
-    attempt: options.attempt,
-    selfHeal: options.selfHeal,
-    message: "Sending LLM request.",
-    details: {
-      provider: adapter.provider,
-      model: adapter.model,
-      stream: options.stream.enabled && !!adapter.stream
-    }
-  });
-  if (options.stream.enabled && adapter.stream) {
-    let latestUsage;
-    let latestFinishReason;
-    let streamedRaw = "";
-    let sawToken = false;
-    let lastDataFingerprint;
-    const emitStreamingData = (raw, done, usage2, finishReason2) => {
-      const data = parseStreamingStructuredData(raw);
-      if (data === null && !done) {
-        return;
-      }
-      const fingerprint = toStreamDataFingerprint(data ?? null);
-      if (!done && fingerprint === lastDataFingerprint) {
-        return;
-      }
-      lastDataFingerprint = fingerprint;
-      options.stream.onData?.({
-        data: data ?? null,
-        raw,
-        done,
-        usage: usage2,
-        finishReason: finishReason2
-      });
-      emitObserve(options.observe, {
-        stage: "llm.stream.data",
-        attempt: options.attempt,
-        selfHeal: options.selfHeal,
-        message: done ? "Streaming structured data completed." : "Streaming structured data updated.",
-        details: {
-          done,
-          finishReason: finishReason2
-        }
-      });
-    };
-    const handleTextDelta = (delta) => {
-      if (!delta) {
-        return;
-      }
-      streamedRaw += delta;
-      if (options.stream.to === "stdout") {
-        process.stdout.write(delta);
-      }
-      emitObserve(options.observe, {
-        stage: "llm.stream.delta",
-        attempt: options.attempt,
-        selfHeal: options.selfHeal,
-        message: "Received stream delta.",
-        details: {
-          chars: delta.length
-        }
-      });
-      emitStreamingData(streamedRaw, false);
-    };
-    const response2 = await adapter.stream(requestPayload, {
-      onToken: (token) => {
-        sawToken = true;
-        handleTextDelta(token);
-      },
-      onChunk: (chunk) => {
-        if (!sawToken && chunk.textDelta) {
-          handleTextDelta(chunk.textDelta);
-        }
-        if (chunk.usage) {
-          latestUsage = preferLatestUsage(latestUsage, chunk.usage);
-        }
-        if (chunk.finishReason) {
-          latestFinishReason = chunk.finishReason;
-        }
-      }
-    });
-    const finalText = typeof response2.text === "string" && response2.text.length > 0 ? response2.text : streamedRaw;
-    const usage = preferLatestUsage(latestUsage, response2.usage);
-    const finishReason = response2.finishReason ?? latestFinishReason;
-    emitStreamingData(finalText, true, usage, finishReason);
-    emitObserve(options.observe, {
-      stage: "llm.response",
+async function callModel2(adapter, options) {
+  return callModel(adapter, {
+    ...options,
+    buildEvent: ({ stage, message, details }) => ({
+      stage,
       attempt: options.attempt,
       selfHeal: options.selfHeal,
-      message: "Streaming response completed.",
-      details: {
-        via: "stream",
-        chars: finalText.length,
-        finishReason
-      }
-    });
-    emitDebugResponse(options.debug, {
-      attempt: options.attempt,
-      selfHealAttempt: options.selfHeal,
-      selfHealEnabled: options.selfHealEnabled,
-      via: "stream",
-      responseText: finalText,
-      usage,
-      finishReason
-    });
-    return {
-      text: finalText,
-      via: "stream",
-      usage,
-      finishReason
-    };
-  }
-  const response = await adapter.complete(requestPayload);
-  emitObserve(options.observe, {
-    stage: "llm.response",
-    attempt: options.attempt,
-    selfHeal: options.selfHeal,
-    message: "Completion response received.",
-    details: {
-      via: "complete",
-      chars: response.text.length,
-      finishReason: response.finishReason
-    }
-  });
-  emitDebugResponse(options.debug, {
-    attempt: options.attempt,
-    selfHealAttempt: options.selfHeal,
-    selfHealEnabled: options.selfHealEnabled,
-    via: "complete",
-    responseText: response.text,
-    usage: response.usage,
-    finishReason: response.finishReason
+      message,
+      details
+    }),
+    buildSnapshot: (normalized) => ({
+      text: normalized.text,
+      reasoning: normalized.reasoning,
+      data: parseStreamingStructuredData(normalized.parseSource) ?? null
+    }),
+    debugLabel: "structured"
   });
-  return {
-    text: response.text,
-    via: "complete",
-    usage: response.usage,
-    finishReason: response.finishReason
-  };
 }
-function parseStreamingStructuredData(raw) {
-  const sanitized = sanitizeThink(raw);
+function parseStreamingStructuredData(parseSource) {
+  const sanitized = sanitizeThink(parseSource);
   const start = findFirstJsonRootStart(sanitized.visibleText);
   if (start < 0) {
     return null;
@@ -4620,13 +5016,6 @@ function findFirstJsonRootStart(input) {
   }
   return Math.min(objectStart, arrayStart);
 }
-function toStreamDataFingerprint(value) {
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return "__unserializable__";
-  }
-}
 function parseWithObserve(output, schema, parseOptions, context) {
   const userParseTrace = parseOptions.onTrace;
   return parseLLMOutput(output, schema, {
@@ -4656,38 +5045,20 @@ function buildSuccessResult(data, attempts) {
   const final = attempts.at(-1);
   return {
     data,
-    raw: final?.raw ?? "",
-    thinkBlocks: final?.thinkBlocks ?? [],
+    text: final?.text ?? "",
+    reasoning: final?.reasoning ?? "",
     json: final?.json ?? null,
     attempts,
     usage: aggregateUsage(attempts),
     finishReason: final?.finishReason
   };
 }
-function aggregateUsage(attempts) {
-  let usage;
-  for (const attempt of attempts) {
-    usage = mergeUsage2(usage, attempt.usage);
-  }
-  return usage;
-}
-function mergeUsage2(base, next) {
-  if (!base && !next) {
-    return;
-  }
-  return {
-    inputTokens: (base?.inputTokens ?? 0) + (next?.inputTokens ?? 0),
-    outputTokens: (base?.outputTokens ?? 0) + (next?.outputTokens ?? 0),
-    totalTokens: (base?.totalTokens ?? 0) + (next?.totalTokens ?? 0),
-    cost: (base?.cost ?? 0) + (next?.cost ?? 0)
-  };
-}
 function toStructuredError(attempt) {
   if (!attempt) {
     return new StructuredParseError({
       message: "Structured parsing failed before any model response.",
-      raw: "",
-      thinkBlocks: [],
+      text: "",
+      reasoning: "",
       candidates: [],
       zodIssues: [],
       repairLog: [],
@@ -4695,8 +5066,8 @@ function toStructuredError(attempt) {
     });
   }
   return new StructuredParseError({
-    raw: attempt.raw,
-    thinkBlocks: attempt.thinkBlocks,
+    text: attempt.text,
+    reasoning: attempt.reasoning,
     candidates: attempt.candidates,
     zodIssues: attempt.zodIssues,
     repairLog: attempt.repairLog,
@@ -4706,59 +5077,6 @@ function toStructuredError(attempt) {
 function emitObserve(observe, event) {
   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]",
-      `attempt=${input.attempt}`,
-      `selfHealEnabled=${input.selfHealEnabled}`,
-      `selfHealAttempt=${input.selfHealAttempt}`
-    ].join(" ")), "cyan"),
-    dim(config, [
-      `provider=${input.provider ?? "unknown"}`,
-      `model=${input.model ?? "unknown"}`,
-      `stream=${input.stream}`
-    ].join(" ")),
-    color(config, "prompt:", "yellow"),
-    input.requestPayload.prompt ?? "(none)",
-    color(config, "messages:", "yellow"),
-    requestMessages,
-    color(config, "systemPrompt:", "yellow"),
-    input.requestPayload.systemPrompt ?? "(none)",
-    color(config, "request.body:", "yellow"),
-    requestBody
-  ];
-  emitDebug(config, lines.join(`
-`));
-}
-function emitDebugResponse(config, input) {
-  const lines = [
-    color(config, title(config, [
-      "[structured][response]",
-      `attempt=${input.attempt}`,
-      `selfHealEnabled=${input.selfHealEnabled}`,
-      `selfHealAttempt=${input.selfHealAttempt}`
-    ].join(" ")), "green"),
-    dim(config, [
-      `via=${input.via}`,
-      `chars=${input.responseText.length}`,
-      `finishReason=${input.finishReason ?? "unknown"}`,
-      `usage=${JSON.stringify(input.usage ?? {})}`
-    ].join(" ")),
-    color(config, "text:", "yellow"),
-    input.responseText
-  ];
-  emitDebug(config, lines.join(`
-`));
-}
-function emitDebug(config, message) {
-  if (!config.enabled) {
-    return;
-  }
-  config.logger(message);
-}
 
 // src/llm.ts
 function createLLM(config, registry = createDefaultProviderRegistry()) {
@@ -4772,6 +5090,17 @@ function createLLM(config, registry = createDefaultProviderRegistry()) {
       const merged = mergeStructuredOptions(defaults, options);
       return structured(adapter, schema, prompt, merged);
     },
+    async generate(promptOrOptions, options) {
+      if (isGenerateOptions2(promptOrOptions)) {
+        const merged2 = {
+          ...mergeGenerateOptions(defaults, promptOrOptions),
+          prompt: promptOrOptions.prompt
+        };
+        return generate(adapter, merged2);
+      }
+      const merged = mergeGenerateOptions(defaults, options);
+      return generate(adapter, promptOrOptions, merged);
+    },
     async embed(input, options = {}) {
       if (!adapter.embed) {
         throw new Error(`Provider "${adapter.provider ?? "unknown"}" does not support embeddings.`);
@@ -4801,6 +5130,26 @@ function mergeStructuredOptions(defaults, overrides) {
     timeout: mergeObjectLike(defaults?.timeout, overrides?.timeout)
   };
 }
+function mergeGenerateOptions(defaults, overrides) {
+  if (!defaults && !overrides) {
+    return {};
+  }
+  return {
+    outdent: overrides?.outdent ?? defaults?.outdent,
+    systemPrompt: overrides?.systemPrompt ?? defaults?.systemPrompt,
+    request: {
+      ...defaults?.request ?? {},
+      ...overrides?.request ?? {}
+    },
+    stream: mergeObjectLike(defaults?.stream, overrides?.stream),
+    debug: mergeObjectLike(defaults?.debug, overrides?.debug),
+    timeout: mergeObjectLike(defaults?.timeout, overrides?.timeout),
+    observe: overrides?.observe ?? defaults?.observe
+  };
+}
+function isGenerateOptions2(value) {
+  return typeof value === "object" && value !== null && "prompt" in value;
+}
 function mergeObjectLike(defaults, overrides) {
   if (overrides === undefined) {
     return defaults;
@@ -5268,6 +5617,7 @@ export {
   inspectSchemaMetadata,
   inferSchemaExample,
   images,
+  generate,
   formatZodIssues,
   formatPrompt,
   extractMarkdownCodeBlocks,