extrait 0.7.1 → 0.7.3

package/README.md

@@ -658,6 +658,8 @@ type MCPCallToolParams = {
 };
 ```
 
+MCP toolsets may change between tool rounds. Providers call `listTools()` before each round, so a client can expose additional tools after a previous `callTool()` result, or remove tools that are no longer available.
+
 Use `transformToolCallParams()` when you need to attach MCP-specific metadata, override the final remote tool name, or otherwise change the full request passed to `client.callTool()`. This hook is exported as `LLMToolCallParamsTransformer`.
 
 ### Timeouts

package/dist/index.cjs

@@ -58,6 +58,7 @@ __export(exports_src, {
   extractMarkdownCodeBlocks: () => extractMarkdownCodeBlocks,
   extractJsonCandidates: () => extractJsonCandidates,
   extractFirstMarkdownCode: () => extractFirstMarkdownCode,
+  dedent: () => dedent,
   createProviderRegistry: () => createProviderRegistry,
   createOpenAICompatibleAdapter: () => createOpenAICompatibleAdapter,
   createModelAdapter: () => createModelAdapter,
@@ -1709,7 +1710,8 @@ function createOpenAICompatibleAdapter(options) {
 async function streamWithChatCompletionsPassThrough(options, fetcher, path, request, callbacks) {
   const response = await sendOpenAIRequest(options, fetcher, path, request, buildChatCompletionsBody(options, request, {
     messages: buildMessages(request),
-    stream: true
+    stream: true,
+    stream_options: streamUsageOptions(request)
   }));
   if (!response.ok) {
     const message = await response.text();
@@ -1801,6 +1803,10 @@ async function completeOpenAIRequest(options, fetcher, chatPath, responsesPath,
 function buildChatCompletionsBody(options, request, overrides) {
   return buildOpenAIRequestBody(options, request, "max_tokens", overrides);
 }
+function streamUsageOptions(request) {
+  const userOptions = isRecord2(request.body?.stream_options) ? request.body.stream_options : undefined;
+  return { include_usage: true, ...userOptions };
+}
 function buildResponsesBody(options, request, overrides) {
   return buildOpenAIRequestBody(options, request, "max_output_tokens", overrides);
 }
@@ -2058,7 +2064,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
       tools: transportTools,
       tool_choice: request.toolChoice,
       parallel_tool_calls: request.parallelToolCalls,
-      stream: true
+      stream: true,
+      stream_options: streamUsageOptions(request)
     }));
     if (!response.ok) {
       const message = await response.text();
@@ -5624,7 +5631,7 @@ function toPromptString(value) {
     return String(value);
   }
 }
-var dedent = createOutdent({
+var outdent = createOutdent({
   trimLeadingNewline: true,
   trimTrailingNewline: true,
   newline: `
@@ -5657,7 +5664,7 @@ function stripOuterBlankLines(text) {
 `);
 }
 function renderPromptTemplate(strings, values) {
-  return stripOuterBlankLines(dedent(strings, ...values.map(toPromptString)));
+  return stripOuterBlankLines(outdent(strings, ...values.map(toPromptString)));
 }
 function isTemplateStringsArray(value) {
   return Array.isArray(value) && "raw" in value;
@@ -5705,6 +5712,9 @@ class PromptMessageBuilderImpl {
 function createPromptMessageBuilder() {
   return new PromptMessageBuilderImpl;
 }
+function dedent(strings, ...values) {
+  return renderPromptTemplate(strings, values);
+}
 function prompt(input, ...values) {
   if (isTemplateStringsArray(input)) {
     return renderPromptTemplate(input, values);

package/dist/index.d.ts

@@ -8,7 +8,7 @@ export { formatZodIssues, parseLLMOutput } from "./parse";
 export { createMCPClient, wrapMCPClient, type CreateMCPClientOptions, type MCPClientInfo, type MCPInMemoryTransportConfig, type MCPStdioTransportConfig, type MCPStreamableHTTPTransportConfig, type MCPTransportConfig, type ManagedMCPToolClient, } from "./mcp";
 export { images, resizeImage, type ImageInput, type ImageSize } from "./image";
 export { conversation, type ConversationEntry } from "./conversation";
-export { prompt, type PromptMessageBuilder } from "./prompt";
+export { dedent, prompt, type PromptMessageBuilder } from "./prompt";
 export { s, inspectSchemaMetadata, inferSchemaExample } from "./schema-builder";
 export { buildDefaultStructuredPrompt, DEFAULT_LOOSE_PARSE_OPTIONS, DEFAULT_SELF_HEAL_BY_MODE, DEFAULT_SELF_HEAL_CONTEXT_LABEL, DEFAULT_SELF_HEAL_FIX_INSTRUCTION, DEFAULT_SELF_HEAL_MAX_CONTEXT_CHARS, DEFAULT_SELF_HEAL_NO_ISSUES_MESSAGE, DEFAULT_SELF_HEAL_PROTOCOL, DEFAULT_SELF_HEAL_RAW_OUTPUT_LABEL, DEFAULT_SELF_HEAL_RETURN_INSTRUCTION, DEFAULT_SELF_HEAL_STOP_ON_NO_PROGRESS, DEFAULT_SELF_HEAL_VALIDATION_LABEL, DEFAULT_STRICT_PARSE_OPTIONS, DEFAULT_STRUCTURED_OBJECT_INSTRUCTION, DEFAULT_STRUCTURED_STYLE_INSTRUCTION, buildSelfHealPrompt, structured, StructuredParseError, type BuildDefaultStructuredPromptOptions, type SelfHealPromptTextOptions, } from "./structured";
 export { createOpenAICompatibleAdapter, type OpenAICompatibleAdapterOptions, } from "./providers/openai-compatible";

package/dist/index.js

@@ -1619,7 +1619,8 @@ function createOpenAICompatibleAdapter(options) {
 async function streamWithChatCompletionsPassThrough(options, fetcher, path, request, callbacks) {
   const response = await sendOpenAIRequest(options, fetcher, path, request, buildChatCompletionsBody(options, request, {
     messages: buildMessages(request),
-    stream: true
+    stream: true,
+    stream_options: streamUsageOptions(request)
   }));
   if (!response.ok) {
     const message = await response.text();
@@ -1711,6 +1712,10 @@ async function completeOpenAIRequest(options, fetcher, chatPath, responsesPath,
 function buildChatCompletionsBody(options, request, overrides) {
   return buildOpenAIRequestBody(options, request, "max_tokens", overrides);
 }
+function streamUsageOptions(request) {
+  const userOptions = isRecord2(request.body?.stream_options) ? request.body.stream_options : undefined;
+  return { include_usage: true, ...userOptions };
+}
 function buildResponsesBody(options, request, overrides) {
   return buildOpenAIRequestBody(options, request, "max_output_tokens", overrides);
 }
@@ -1968,7 +1973,8 @@ async function streamWithChatCompletionsWithMCP(options, fetcher, path, request,
       tools: transportTools,
       tool_choice: request.toolChoice,
       parallel_tool_calls: request.parallelToolCalls,
-      stream: true
+      stream: true,
+      stream_options: streamUsageOptions(request)
     }));
     if (!response.ok) {
       const message = await response.text();
@@ -5538,7 +5544,7 @@ function toPromptString(value) {
     return String(value);
   }
 }
-var dedent = createOutdent({
+var outdent = createOutdent({
   trimLeadingNewline: true,
   trimTrailingNewline: true,
   newline: `
@@ -5571,7 +5577,7 @@ function stripOuterBlankLines(text) {
 `);
 }
 function renderPromptTemplate(strings, values) {
-  return stripOuterBlankLines(dedent(strings, ...values.map(toPromptString)));
+  return stripOuterBlankLines(outdent(strings, ...values.map(toPromptString)));
 }
 function isTemplateStringsArray(value) {
   return Array.isArray(value) && "raw" in value;
@@ -5619,6 +5625,9 @@ class PromptMessageBuilderImpl {
 function createPromptMessageBuilder() {
   return new PromptMessageBuilderImpl;
 }
+function dedent(strings, ...values) {
+  return renderPromptTemplate(strings, values);
+}
 function prompt(input, ...values) {
   if (isTemplateStringsArray(input)) {
     return renderPromptTemplate(input, values);
@@ -5825,6 +5834,7 @@ export {
   extractMarkdownCodeBlocks,
   extractJsonCandidates,
   extractFirstMarkdownCode,
+  dedent,
   createProviderRegistry,
   createOpenAICompatibleAdapter,
   createModelAdapter,

package/dist/prompt.d.ts

@@ -10,5 +10,19 @@ export interface PromptMessageBuilder extends StructuredPromptResolver {
     assistant(content: LLMMessageContent): PromptMessageBuilder;
     build(): StructuredPromptPayload;
 }
+/**
+ * Tagged template for formatting multi-line prompt strings: dedents the block
+ * and trims surrounding blank lines, so you can write readable indented
+ * templates instead of concatenating strings with `+`. Interpolated values are
+ * coerced the same way as in `prompt`. Returns a plain string — no role/message
+ * handling.
+ *
+ * @example
+ * const instructions = dedent`
+ *   You are a helpful assistant.
+ *   Answer in ${language} and keep responses concise.
+ * `;
+ */
+export declare function dedent(strings: TemplateStringsArray, ...values: unknown[]): string;
 export declare function prompt(strings: TemplateStringsArray, ...values: unknown[]): string;
 export declare function prompt(): PromptMessageBuilder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extrait",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tterrasson/extrait.git"