extrait 0.4.0 → 0.5.2

package/dist/prompt.d.ts

@@ -4,6 +4,8 @@ export interface PromptMessageBuilder extends StructuredPromptResolver {
     system(strings: TemplateStringsArray, ...values: unknown[]): PromptMessageBuilder;
     user(input: string): PromptMessageBuilder;
     user(strings: TemplateStringsArray, ...values: unknown[]): PromptMessageBuilder;
+    assistant(input: string): PromptMessageBuilder;
+    assistant(strings: TemplateStringsArray, ...values: unknown[]): PromptMessageBuilder;
     build(): StructuredPromptPayload;
 }
 export declare function prompt(strings: TemplateStringsArray, ...values: unknown[]): string;

package/dist/types.d.ts

@@ -119,9 +119,25 @@ export interface MCPToolClient {
     callTool(params: MCPCallToolParams): Promise<unknown>;
     close?(): Promise<void>;
 }
+export interface LLMTextContent {
+    type: "text";
+    text: string;
+}
+export interface LLMImageContent {
+    type: "image_url";
+    image_url: {
+        url: string;
+    };
+}
+export type LLMMessageContent = string | (LLMTextContent | LLMImageContent)[];
+export interface LLMMessage {
+    role: "system" | "user" | "assistant" | "tool";
+    content: LLMMessageContent;
+}
 export interface LLMRequest {
-    prompt: string;
+    prompt?: string;
     systemPrompt?: string;
+    messages?: LLMMessage[];
     temperature?: number;
     maxTokens?: number;
     mcpClients?: MCPToolClient[];
@@ -224,8 +240,9 @@ export interface StructuredPromptContext {
     mode: StructuredMode;
 }
 export interface StructuredPromptPayload {
-    prompt: string;
+    prompt?: string;
     systemPrompt?: string;
+    messages?: LLMMessage[];
 }
 export interface StructuredPromptResolver {
     resolvePrompt(context: StructuredPromptContext): StructuredPromptPayload;
@@ -244,6 +261,12 @@ export interface StructuredSelfHealOptions {
     maxContextChars?: number;
 }
 export type StructuredSelfHealInput = boolean | number | StructuredSelfHealOptions;
+export interface StructuredTimeoutOptions {
+    /** Timeout in ms for each LLM HTTP request. Creates an AbortSignal.timeout internally if no signal is already provided. */
+    request?: number;
+    /** Timeout in ms for each MCP tool call. */
+    tool?: number;
+}
 export type StructuredStreamData<T> = T extends Array<infer TItem> ? Array<StructuredStreamData<TItem>> : T extends object ? {
     [K in keyof T]?: StructuredStreamData<T[K]> | null;
 } : T | null;
@@ -269,8 +292,9 @@ export interface StructuredCallOptions<TSchema extends z.ZodTypeAny> {
     debug?: boolean | StructuredDebugOptions;
     observe?: (event: StructuredTraceEvent) => void;
     systemPrompt?: string;
-    request?: Omit<LLMRequest, "prompt" | "systemPrompt">;
+    request?: Omit<LLMRequest, "prompt" | "systemPrompt" | "messages">;
     schemaInstruction?: string;
+    timeout?: StructuredTimeoutOptions;
 }
 export interface StructuredOptions<TSchema extends z.ZodTypeAny> extends StructuredCallOptions<TSchema> {
     schema: TSchema;

package/package.json

@@ -1,17 +1,22 @@
 {
   "name": "extrait",
-  "version": "0.4.0",
-  "license": "MIT",
+  "version": "0.5.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tterrasson/extrait.git"
   },
-  "bugs": {
-    "url": "https://github.com/tterrasson/extrait/issues"
-  },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.27.1",
+    "jsonrepair": "^3.13.2",
+    "zod": "^4.3.6"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.3.10",
+    "@types/sharp": "^0.32.0",
+    "typescript": "^5.9.3"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,12 +25,29 @@
       "default": "./dist/index.js"
     }
   },
+  "bugs": {
+    "url": "https://github.com/tterrasson/extrait/issues"
+  },
   "files": [
     "dist",
     "README.md",
     "LICENSE"
   ],
-  "type": "module",
+  "license": "MIT",
+  "overrides": {
+    "zod": "^4.3.6"
+  },
+  "peerDependencies": {
+    "sharp": "^0.34.5"
+  },
+  "peerDependenciesMeta": {
+    "sharp": {
+      "optional": true
+    }
+  },
+  "resolutions": {
+    "zod": "^4.3.6"
+  },
   "scripts": {
     "dev": "bun run examples/runner.ts",
     "build": "bun run build:esm && bun run build:cjs",
@@ -38,13 +60,6 @@
     "typecheck": "bunx tsc --noEmit",
     "pack": "bun run build:types && bun run build && npm pack"
   },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.27.1",
-    "jsonrepair": "^3.13.2",
-    "zod": "^3.25.76"
-  },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "typescript": "^5.9.3"
-  }
+  "type": "module",
+  "types": "./dist/index.d.ts"
 }