extrait 0.6.1 → 0.7.0

package/dist/parse.d.ts

@@ -1,4 +1,4 @@
 import type { z } from "zod";
 import type { ParseLLMOutputOptions, ParseLLMOutputResult } from "./types";
 export declare function parseLLMOutput<TSchema extends z.ZodTypeAny>(output: string, schema: TSchema, options?: ParseLLMOutputOptions): ParseLLMOutputResult<z.infer<TSchema>>;
-export declare function formatZodIssues(issues: z.ZodIssue[]): string;
+export declare function formatZodIssues(issues: z.core.$ZodIssue[]): string;

package/dist/providers/mcp-runtime.d.ts

@@ -27,7 +27,7 @@ export interface ExecutedMCPToolCall {
     call: LLMToolCall;
     execution: LLMToolExecution;
 }
-export declare const DEFAULT_MAX_TOOL_ROUNDS = 8;
+export declare const DEFAULT_MAX_TOOL_ROUNDS = 100;
 export declare function resolveMCPToolset(clients: MCPToolClient[] | undefined): Promise<ResolvedMCPToolset>;
 export declare function toProviderFunctionTools(toolset: ResolvedMCPToolset): Array<Record<string, unknown>> | undefined;
 export declare function executeMCPToolCalls(calls: RuntimeToolCall[], toolset: ResolvedMCPToolset, context: ExecuteMCPToolCallsOptions): Promise<ExecutedMCPToolCall[]>;

package/dist/structured.d.ts

@@ -5,7 +5,7 @@ export declare class StructuredParseError extends Error implements StructuredErr
     readonly text: string;
     readonly reasoning: string;
     readonly candidates: string[];
-    readonly zodIssues?: z.ZodIssue[];
+    readonly zodIssues?: z.core.$ZodIssue[];
     readonly repairLog?: string[];
     readonly attempt: number;
     constructor(input: {
@@ -13,7 +13,7 @@ export declare class StructuredParseError extends Error implements StructuredErr
         text: string;
         reasoning: string;
         candidates: string[];
-        zodIssues?: z.ZodIssue[];
+        zodIssues?: z.core.$ZodIssue[];
         repairLog?: string[];
         attempt: number;
     });
@@ -57,7 +57,7 @@ export declare const DEFAULT_SELF_HEAL_BY_MODE: {
 export declare function buildDefaultStructuredPrompt(task: string, options?: BuildDefaultStructuredPromptOptions): string;
 interface SelfHealPromptInput {
     rawOutput: string;
-    issues: z.ZodIssue[];
+    issues: z.core.$ZodIssue[];
     schema: z.ZodTypeAny;
     schemaInstruction?: string;
     selectedOutput?: string;

package/dist/types.d.ts

@@ -63,7 +63,7 @@ export interface CandidateDiagnostics {
     selected: boolean;
     stage: "repair" | "parse" | "validate" | "success";
     message?: string;
-    zodIssues?: z.ZodIssue[];
+    zodIssues?: z.core.$ZodIssue[];
 }
 export interface ThinkBlock {
     id: string;
@@ -90,7 +90,7 @@ export interface ParseLLMOutputResult<T> {
     candidates: ExtractionCandidate[];
     diagnostics: CandidateDiagnostics[];
     errors: PipelineError[];
-    zodIssues: z.ZodIssue[];
+    zodIssues: z.core.$ZodIssue[];
 }
 export interface MCPToolSchema {
     type?: string;
@@ -139,6 +139,16 @@ export interface LLMToolCallRef {
         arguments: string;
     };
 }
+export interface ReasoningBlock {
+    turnIndex: number;
+    text: string;
+}
+export interface StreamTurnTransition {
+    turnIndex: number;
+    kind: "reasoningComplete" | "toolCallsEmit" | "toolResultsReceived" | "streamEnd";
+    reasoningText?: string;
+    toolCalls?: LLMToolCall[];
+}
 export interface LLMMessage {
     role: "system" | "user" | "assistant" | "tool";
     content: LLMMessageContent;
@@ -162,6 +172,7 @@ export interface LLMRequest {
     transformToolCallParams?: LLMToolCallParamsTransformer;
     unknownToolError?: (toolName: string) => string;
     toolDebug?: boolean | LLMToolDebugOptions;
+    onTurnTransition?: (transition: StreamTurnTransition) => void;
     body?: Record<string, unknown>;
     signal?: AbortSignal;
 }
@@ -174,6 +185,7 @@ export interface LLMUsage {
 export interface LLMResponse {
     text: string;
     reasoning?: string;
+    reasoningBlocks?: ReasoningBlock[];
     raw?: unknown;
     usage?: LLMUsage;
     finishReason?: string;
@@ -183,6 +195,8 @@ export interface LLMResponse {
 export interface LLMStreamChunk {
     textDelta: string;
     reasoningDelta?: string;
+    turnIndex?: number;
+    toolCalls?: LLMToolCall[];
     raw?: unknown;
     done?: boolean;
     usage?: LLMUsage;
@@ -317,6 +331,7 @@ export interface StructuredStreamDelta {
 export interface StructuredStreamSnapshot<T = unknown> {
     text: string;
     reasoning: string;
+    reasoningBlocks?: ReasoningBlock[];
     data: StructuredStreamData<T> | null;
 }
 export interface StructuredStreamEvent<T = unknown> {
@@ -325,10 +340,13 @@ export interface StructuredStreamEvent<T = unknown> {
     done: boolean;
     usage?: LLMUsage;
     finishReason?: string;
+    turnIndex?: number;
+    toolCalls?: LLMToolCall[];
 }
 export interface StructuredStreamOptions<T = unknown> {
     enabled?: boolean;
     onData?: (event: StructuredStreamEvent<T>) => void;
+    onTurnTransition?: (transition: StreamTurnTransition) => void;
     to?: "stdout";
 }
 export type StructuredStreamInput<T = unknown> = boolean | StructuredStreamOptions<T>;
@@ -339,6 +357,7 @@ export interface GenerateStreamDelta {
 export interface GenerateStreamSnapshot {
     text: string;
     reasoning: string;
+    reasoningBlocks?: ReasoningBlock[];
 }
 export interface GenerateStreamEvent {
     delta: GenerateStreamDelta;
@@ -346,10 +365,13 @@ export interface GenerateStreamEvent {
     done: boolean;
     usage?: LLMUsage;
     finishReason?: string;
+    turnIndex?: number;
+    toolCalls?: LLMToolCall[];
 }
 export interface GenerateStreamOptions {
     enabled?: boolean;
     onData?: (event: GenerateStreamEvent) => void;
+    onTurnTransition?: (transition: StreamTurnTransition) => void;
     to?: "stdout";
 }
 export type GenerateStreamInput = boolean | GenerateStreamOptions;
@@ -391,10 +413,11 @@ export interface StructuredAttempt<T> {
     json: unknown | null;
     candidates: string[];
     repairLog: string[];
-    zodIssues: z.ZodIssue[];
+    zodIssues: z.core.$ZodIssue[];
     success: boolean;
     usage?: LLMUsage;
     finishReason?: string;
+    reasoningBlocks?: ReasoningBlock[];
     parsed: ParseLLMOutputResult<T>;
 }
 export interface GenerateAttempt {
@@ -404,6 +427,7 @@ export interface GenerateAttempt {
     reasoning: string;
     usage?: LLMUsage;
     finishReason?: string;
+    reasoningBlocks?: ReasoningBlock[];
 }
 export interface StructuredResult<T> {
     data: T;
@@ -413,6 +437,7 @@ export interface StructuredResult<T> {
     attempts: StructuredAttempt<T>[];
     usage?: LLMUsage;
     finishReason?: string;
+    reasoningBlocks?: ReasoningBlock[];
 }
 export interface GenerateResult {
     text: string;
@@ -420,13 +445,14 @@ export interface GenerateResult {
     attempts: GenerateAttempt[];
     usage?: LLMUsage;
     finishReason?: string;
+    reasoningBlocks?: ReasoningBlock[];
 }
 export interface StructuredError {
     name: "StructuredParseError";
     text: string;
     reasoning: string;
     candidates: string[];
-    zodIssues?: z.ZodIssue[];
+    zodIssues?: z.core.$ZodIssue[];
     repairLog?: string[];
     attempt: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extrait",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tterrasson/extrait.git"
@@ -9,11 +9,11 @@
   "module": "./dist/index.js",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "jsonrepair": "^3.13.3",
-    "zod": "^4.3.6"
+    "jsonrepair": "^3.14.0",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.11",
+    "@types/bun": "^1.3.13",
     "@types/sharp": "^0.32.0",
     "typescript": "^5.9.3"
   },
@@ -34,9 +34,6 @@
     "LICENSE"
   ],
   "license": "MIT",
-  "overrides": {
-    "zod": "^4.3.6"
-  },
   "peerDependencies": {
     "sharp": "^0.34.5"
   },
@@ -45,20 +42,17 @@
       "optional": true
     }
   },
-  "resolutions": {
-    "zod": "^4.3.6"
-  },
   "scripts": {
     "dev": "bun run examples/runner.ts",
-    "build": "bun run build:esm && bun run build:cjs",
+    "build": "bun run build:types && bun run build:esm && bun run build:cjs",
     "build:esm": "bun build ./src/index.ts --outfile ./dist/index.js --target node --format esm --packages external",
     "build:cjs": "bun build ./src/index.ts --outfile ./dist/index.cjs --target node --format cjs --packages external",
     "build:types": "bunx tsc -p tsconfig.build.json",
     "lint": "bunx tsc -p tsconfig.lint.json",
-    "prepublishOnly": "bun run lint && bun run build && bun run build:types",
+    "prepublishOnly": "bun run lint && bun run build",
     "test": "bun test tests/ --reporter=dots --only-failures",
     "typecheck": "bunx tsc --noEmit",
-    "pack": "bun run build:types && bun run build && npm pack"
+    "pack": "bun run build && npm pack"
   },
   "type": "module",
   "types": "./dist/index.d.ts"