extrait 0.3.0 → 0.3.1

package/dist/index.cjs

@@ -1294,10 +1294,36 @@ async function executeMCPToolCalls(calls, toolset, context) {
       throw new Error("Received a function tool call without id or name.");
     }
     const tool = toolset.byName.get(toolName);
+    const parsedArguments = parseToolArguments(call.arguments);
     if (!tool) {
-      throw new Error(`No MCP tool registered for "${toolName}".`);
+      const errorMessage = context.request.unknownToolError ? context.request.unknownToolError(toolName) : `Tool "${toolName}" is not registered in the current toolset.`;
+      const metadata2 = {
+        id: callId,
+        type: call.type ?? "function",
+        name: toolName,
+        arguments: parsedArguments,
+        error: errorMessage
+      };
+      const startedAt2 = new Date().toISOString();
+      const execution = {
+        callId,
+        type: metadata2.type,
+        name: toolName,
+        clientId: "__unregistered__",
+        remoteName: toolName,
+        arguments: parsedArguments,
+        error: errorMessage,
+        round: context.round,
+        provider: context.provider,
+        model: context.model,
+        handledLocally: true,
+        startedAt: startedAt2,
+        durationMs: 0
+      };
+      emitToolExecution(context.request, execution);
+      out.push({ call: metadata2, execution });
+      continue;
     }
-    const parsedArguments = parseToolArguments(call.arguments);
     const args = isRecord(parsedArguments) ? parsedArguments : {};
     const metadata = {
       id: callId,
@@ -4640,7 +4666,8 @@ async function createMCPClient(options) {
   return wrapMCPClient({
     id: options.id,
     client,
-    transport
+    transport,
+    toolCallTimeoutMs: options.toolCallTimeoutMs
   });
 }
 function wrapMCPClient(options) {
@@ -4660,7 +4687,8 @@ function wrapMCPClient(options) {
       };
     },
     async callTool(params) {
-      return options.client.callTool(params);
+      const callOptions = options.toolCallTimeoutMs === undefined ? undefined : { timeout: options.toolCallTimeoutMs };
+      return options.client.callTool(params, undefined, callOptions);
     },
     async close() {
       await options.client.close();

package/dist/index.js

@@ -1215,10 +1215,36 @@ async function executeMCPToolCalls(calls, toolset, context) {
       throw new Error("Received a function tool call without id or name.");
     }
     const tool = toolset.byName.get(toolName);
+    const parsedArguments = parseToolArguments(call.arguments);
     if (!tool) {
-      throw new Error(`No MCP tool registered for "${toolName}".`);
+      const errorMessage = context.request.unknownToolError ? context.request.unknownToolError(toolName) : `Tool "${toolName}" is not registered in the current toolset.`;
+      const metadata2 = {
+        id: callId,
+        type: call.type ?? "function",
+        name: toolName,
+        arguments: parsedArguments,
+        error: errorMessage
+      };
+      const startedAt2 = new Date().toISOString();
+      const execution = {
+        callId,
+        type: metadata2.type,
+        name: toolName,
+        clientId: "__unregistered__",
+        remoteName: toolName,
+        arguments: parsedArguments,
+        error: errorMessage,
+        round: context.round,
+        provider: context.provider,
+        model: context.model,
+        handledLocally: true,
+        startedAt: startedAt2,
+        durationMs: 0
+      };
+      emitToolExecution(context.request, execution);
+      out.push({ call: metadata2, execution });
+      continue;
     }
-    const parsedArguments = parseToolArguments(call.arguments);
     const args = isRecord(parsedArguments) ? parsedArguments : {};
     const metadata = {
       id: callId,
@@ -4565,7 +4591,8 @@ async function createMCPClient(options) {
   return wrapMCPClient({
     id: options.id,
     client,
-    transport
+    transport,
+    toolCallTimeoutMs: options.toolCallTimeoutMs
   });
 }
 function wrapMCPClient(options) {
@@ -4585,7 +4612,8 @@ function wrapMCPClient(options) {
       };
     },
     async callTool(params) {
-      return options.client.callTool(params);
+      const callOptions = options.toolCallTimeoutMs === undefined ? undefined : { timeout: options.toolCallTimeoutMs };
+      return options.client.callTool(params, undefined, callOptions);
     },
     async close() {
       await options.client.close();

package/dist/mcp.d.ts

@@ -26,6 +26,7 @@ export interface CreateMCPClientOptions {
     id: string;
     transport: MCPTransportConfig;
     clientInfo?: MCPClientInfo;
+    toolCallTimeoutMs?: number;
 }
 export interface ManagedMCPToolClient extends MCPToolClient {
     sdkClient: Client;
@@ -36,5 +37,6 @@ export interface WrapMCPClientOptions {
     id: string;
     client: Client;
     transport?: Transport;
+    toolCallTimeoutMs?: number;
 }
 export declare function wrapMCPClient(options: WrapMCPClientOptions): ManagedMCPToolClient;

package/dist/types.d.ts

@@ -130,6 +130,7 @@ export interface LLMRequest {
     maxToolRounds?: number;
     onToolExecution?: (execution: LLMToolExecution) => void;
     transformToolOutput?: LLMToolOutputTransformer;
+    unknownToolError?: (toolName: string) => string;
     toolDebug?: boolean | LLMToolDebugOptions;
     body?: Record<string, unknown>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extrait",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -35,7 +35,8 @@
     "lint": "bunx tsc -p tsconfig.lint.json",
     "prepublishOnly": "bun run lint && bun run build && bun run build:types",
     "test": "bun test tests/ --reporter=dots --only-failures",
-    "typecheck": "bunx tsc --noEmit"
+    "typecheck": "bunx tsc --noEmit",
+    "pack": "bun run build && npm pack"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",