zidane 1.6.15 → 1.6.17

package/dist/{agent-CUKZMA-_.d.ts → agent-CtGvwTdo.d.ts}

@@ -23,6 +23,8 @@ interface McpServerConfig {
     url?: string;
     /** Optional headers for HTTP transports */
     headers?: Record<string, string>;
+    /** Timeout in milliseconds for MCP tool calls (default: 30000) */
+    toolTimeout?: number;
 }
 type ToolExecutionMode = 'sequential' | 'parallel';
 interface AgentBehavior {

package/dist/{chunk-33HRG7NC.js → chunk-KLFSGJE4.js}

@@ -4,7 +4,7 @@ import {
   shell,
   spawn,
   writeFile
-} from "./chunk-4GCOSJ7J.js";
+} from "./chunk-OJATGJ5F.js";
 
 // src/harnesses/basic.ts
 var basicTools = { shell, readFile, writeFile, listFiles };

package/dist/{chunk-4GCOSJ7J.js → chunk-OJATGJ5F.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-SZA4FKW5.js";
 import {
   connectMcpServers
-} from "./chunk-5LOHDFK3.js";
+} from "./chunk-WDBO3JCO.js";
 
 // src/tools/interaction.ts
 function createInteractionTool(options) {
@@ -21,8 +21,8 @@ function createInteractionTool(options) {
       description,
       inputSchema: options.schema
     },
-    async execute(input) {
-      const result = await options.onRequest(input);
+    async execute(input, ctx) {
+      const result = await options.onRequest(input, ctx);
       return typeof result === "string" ? result : JSON.stringify(result);
     }
   };
@@ -362,8 +362,15 @@ async function executeToolsSequential(ctx, toolCalls, turnId) {
 }
 async function executeToolsParallel(ctx, toolCalls, turnId) {
   const executions = toolCalls.map((call) => executeSingleTool(ctx, call, turnId));
-  const settled = await Promise.all(executions);
-  return settled.map((s) => s.result);
+  const settled = await Promise.allSettled(executions);
+  return settled.map((s, i) => {
+    if (s.status === "fulfilled")
+      return s.value.result;
+    return {
+      id: toolCalls[i].id,
+      content: `Error: ${s.reason instanceof Error ? s.reason.message : String(s.reason)}`
+    };
+  });
 }
 
 // src/agent.ts

package/dist/{chunk-5LOHDFK3.js → chunk-WDBO3JCO.js}

@@ -60,8 +60,15 @@ async function connectMcpServers(configs, _clientFactory, hooks) {
             if (gateCtx.block)
               return `Blocked: ${gateCtx.reason}`;
             await hooks?.callHook("mcp:tool:before", { turnId, callId, server: config.name, tool: tool.name, input });
+            const timeout = config.toolTimeout ?? 3e4;
             try {
-              const result = await client.callTool({ name: tool.name, arguments: input });
+              let timer;
+              const result = await Promise.race([
+                client.callTool({ name: tool.name, arguments: input }),
+                new Promise((_, reject) => {
+                  timer = setTimeout(() => reject(new Error(`MCP tool "${tool.name}" on server "${config.name}" timed out after ${timeout}ms`)), timeout);
+                })
+              ]).finally(() => clearTimeout(timer));
               let output = resultToString(result.content);
               const transformCtx = { turnId, callId, server: config.name, tool: tool.name, input, result: output };
               await hooks?.callHook("mcp:tool:transform", transformCtx);
@@ -70,6 +77,7 @@ async function connectMcpServers(configs, _clientFactory, hooks) {
               return output;
             } catch (err) {
               await hooks?.callHook("mcp:tool:error", { turnId, callId, server: config.name, tool: tool.name, input, error: err });
+              await hooks?.callHook("mcp:tool:after", { turnId, callId, server: config.name, tool: tool.name, input, result: err.message ?? String(err) });
               throw err;
             }
           }

package/dist/harnesses.d.ts

@@ -1,5 +1,5 @@
 import 'hookable';
-export { H as Harness, i as HarnessConfig, z as ToolContext, B as ToolDef, F as ToolMap, a7 as basic, a8 as basicTools, Z as defineHarness, a1 as noTools } from './agent-CUKZMA-_.js';
+export { H as Harness, i as HarnessConfig, z as ToolContext, B as ToolDef, F as ToolMap, a7 as basic, a8 as basicTools, Z as defineHarness, a1 as noTools } from './agent-CtGvwTdo.js';
 import './types-BpvTmawk.js';
 import './types-CDI8Kmve.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/harnesses.js

@@ -3,11 +3,11 @@ import {
   basic_default,
   defineHarness,
   noTools
-} from "./chunk-33HRG7NC.js";
-import "./chunk-4GCOSJ7J.js";
+} from "./chunk-KLFSGJE4.js";
+import "./chunk-OJATGJ5F.js";
 import "./chunk-4C6Y56CC.js";
 import "./chunk-SZA4FKW5.js";
-import "./chunk-5LOHDFK3.js";
+import "./chunk-WDBO3JCO.js";
 export {
   basic_default as basic,
   basicTools,

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-export { A as Agent, a as AgentBehavior, b as AgentHooks, c as AgentOptions, d as AgentRunOptions, e as AgentStats, h as CreateSessionOptions, H as Harness, i as HarnessConfig, I as ImageContent, M as McpConnection, j as McpServerConfig, k as McpToolHookContext, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, n as SessionEndStatus, o as SessionHookContext, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, t as SpawnHookContext, u as SqliteStoreOptions, w as StreamHookContext, T as ThinkingLevel, z as ToolContext, B as ToolDef, D as ToolExecutionMode, E as ToolHookContext, F as ToolMap, L as TurnUsage, N as autoDetectAndConvert, Q as connectMcpServers, U as createAgent, V as createMemoryStore, W as createRemoteStore, X as createSession, Y as createSqliteStore, Z as defineHarness, _ as fromAnthropic, $ as fromOpenAI, a0 as loadSession, a1 as noTools, a2 as toAnthropic, a3 as toOpenAI } from './agent-CUKZMA-_.js';
+export { A as Agent, a as AgentBehavior, b as AgentHooks, c as AgentOptions, d as AgentRunOptions, e as AgentStats, h as CreateSessionOptions, H as Harness, i as HarnessConfig, I as ImageContent, M as McpConnection, j as McpServerConfig, k as McpToolHookContext, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, n as SessionEndStatus, o as SessionHookContext, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, t as SpawnHookContext, u as SqliteStoreOptions, w as StreamHookContext, T as ThinkingLevel, z as ToolContext, B as ToolDef, D as ToolExecutionMode, E as ToolHookContext, F as ToolMap, L as TurnUsage, N as autoDetectAndConvert, Q as connectMcpServers, U as createAgent, V as createMemoryStore, W as createRemoteStore, X as createSession, Y as createSqliteStore, Z as defineHarness, _ as fromAnthropic, $ as fromOpenAI, a0 as loadSession, a1 as noTools, a2 as toAnthropic, a3 as toOpenAI } from './agent-CtGvwTdo.js';
 export { createDockerContext, createProcessContext } from './contexts.js';
 export { S as SandboxProvider, c as createSandboxContext } from './sandbox-CW72eLDP.js';
 export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SpawnConfig } from './types-BpvTmawk.js';
 export { buildCatalog, defineSkill, discoverSkills, interpolateShellCommands, mergeSkillsConfig, parseSkillFile, resolveSkills, validateSkillName, writeSkillToDisk, writeSkillsToDisk } from './skills.js';
 export { S as SkillConfig, a as SkillResource, b as SkillsConfig } from './types-CDI8Kmve.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, c as createInteractionTool, b as createSpawnTool, s as spawn } from './spawn-B7AtyfuG.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, c as createInteractionTool, b as createSpawnTool, s as spawn } from './spawn-hNTJA3Iw.js';
 import 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';
 

package/dist/index.js

@@ -4,13 +4,13 @@ import {
 import {
   defineHarness,
   noTools
-} from "./chunk-33HRG7NC.js";
+} from "./chunk-KLFSGJE4.js";
 import {
   createAgent,
   createInteractionTool,
   createSpawnTool,
   spawn
-} from "./chunk-4GCOSJ7J.js";
+} from "./chunk-OJATGJ5F.js";
 import {
   buildCatalog,
   discoverSkills,
@@ -29,7 +29,7 @@ import {
 } from "./chunk-SZA4FKW5.js";
 import {
   connectMcpServers
-} from "./chunk-5LOHDFK3.js";
+} from "./chunk-WDBO3JCO.js";
 import {
   createMemoryStore,
   createRemoteStore,

package/dist/mcp.d.ts

@@ -1,5 +1,5 @@
 import 'hookable';
-export { M as McpConnection, j as McpServerConfig, Q as connectMcpServers, a9 as resultToString } from './agent-CUKZMA-_.js';
+export { M as McpConnection, j as McpServerConfig, Q as connectMcpServers, a9 as resultToString } from './agent-CtGvwTdo.js';
 import '@modelcontextprotocol/sdk/client/index.js';
 import './types-BpvTmawk.js';
 import './types-CDI8Kmve.js';

package/dist/mcp.js

@@ -1,7 +1,7 @@
 import {
   connectMcpServers,
   resultToString
-} from "./chunk-5LOHDFK3.js";
+} from "./chunk-WDBO3JCO.js";
 export {
   connectMcpServers,
   resultToString

package/dist/providers.d.ts

@@ -1,4 +1,4 @@
-export { f as AnthropicParams, C as CerebrasParams, O as OpenRouterParams, P as Provider, v as StreamCallbacks, x as StreamOptions, y as ToolCall, G as ToolResult, J as ToolSpec, K as TurnResult, a4 as anthropic, a5 as cerebras, a6 as openrouter } from './agent-CUKZMA-_.js';
+export { f as AnthropicParams, C as CerebrasParams, O as OpenRouterParams, P as Provider, v as StreamCallbacks, x as StreamOptions, y as ToolCall, G as ToolResult, J as ToolSpec, K as TurnResult, a4 as anthropic, a5 as cerebras, a6 as openrouter } from './agent-CtGvwTdo.js';
 import 'hookable';
 import './types-BpvTmawk.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/session.d.ts

@@ -1,4 +1,4 @@
-export { h as CreateSessionOptions, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, u as SqliteStoreOptions, N as autoDetectAndConvert, V as createMemoryStore, W as createRemoteStore, X as createSession, Y as createSqliteStore, _ as fromAnthropic, $ as fromOpenAI, a0 as loadSession, a2 as toAnthropic, a3 as toOpenAI } from './agent-CUKZMA-_.js';
+export { h as CreateSessionOptions, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, u as SqliteStoreOptions, N as autoDetectAndConvert, V as createMemoryStore, W as createRemoteStore, X as createSession, Y as createSqliteStore, _ as fromAnthropic, $ as fromOpenAI, a0 as loadSession, a2 as toAnthropic, a3 as toOpenAI } from './agent-CtGvwTdo.js';
 import 'hookable';
 import './types-BpvTmawk.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/{spawn-B7AtyfuG.d.ts → spawn-hNTJA3Iw.d.ts}

@@ -1,4 +1,4 @@
-import { B as ToolDef, i as HarnessConfig, e as AgentStats } from './agent-CUKZMA-_.js';
+import { z as ToolContext, B as ToolDef, i as HarnessConfig, e as AgentStats } from './agent-CtGvwTdo.js';
 
 /**
  * Interaction tool — lets the agent request structured input from the outside world.
@@ -25,8 +25,8 @@ interface InteractionToolOptions {
     name?: string;
     /** Tool description shown to the model */
     description?: string;
-    /** Called when the model invokes this tool. Receives the validated payload, returns data for the model. */
-    onRequest: (payload: Record<string, unknown>) => Promise<Record<string, unknown> | string>;
+    /** Called when the model invokes this tool. Receives the validated payload and tool context, returns data for the model. */
+    onRequest: (payload: Record<string, unknown>, ctx: ToolContext) => Promise<Record<string, unknown> | string>;
 }
 /**
  * Create an interaction tool that lets the agent request structured input.

package/dist/tools.d.ts

@@ -1,5 +1,5 @@
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, c as createInteractionTool, b as createSpawnTool, s as spawn } from './spawn-B7AtyfuG.js';
-import { B as ToolDef } from './agent-CUKZMA-_.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, c as createInteractionTool, b as createSpawnTool, s as spawn } from './spawn-hNTJA3Iw.js';
+import { B as ToolDef } from './agent-CtGvwTdo.js';
 export { V as ValidationResult, v as validateToolArgs } from './validation-DOY_k7lW.js';
 import 'hookable';
 import './types-BpvTmawk.js';

package/dist/tools.js

@@ -7,10 +7,10 @@ import {
   spawn,
   validateToolArgs,
   writeFile
-} from "./chunk-4GCOSJ7J.js";
+} from "./chunk-OJATGJ5F.js";
 import "./chunk-4C6Y56CC.js";
 import "./chunk-SZA4FKW5.js";
-import "./chunk-5LOHDFK3.js";
+import "./chunk-WDBO3JCO.js";
 export {
   createInteractionTool,
   createSpawnTool,

package/dist/types.d.ts

@@ -1,8 +1,8 @@
-export { A as Agent, a as AgentBehavior, b as AgentHooks, c as AgentOptions, d as AgentRunOptions, e as AgentStats, f as AnthropicParams, C as CerebrasParams, g as ChildRunStats, h as CreateSessionOptions, H as Harness, i as HarnessConfig, I as ImageContent, M as McpConnection, j as McpServerConfig, k as McpToolHookContext, O as OpenRouterParams, P as Provider, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, n as SessionEndStatus, o as SessionHookContext, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, t as SpawnHookContext, u as SqliteStoreOptions, v as StreamCallbacks, w as StreamHookContext, x as StreamOptions, T as ThinkingLevel, y as ToolCall, z as ToolContext, B as ToolDef, D as ToolExecutionMode, E as ToolHookContext, F as ToolMap, G as ToolResult, J as ToolSpec, K as TurnResult, L as TurnUsage } from './agent-CUKZMA-_.js';
+export { A as Agent, a as AgentBehavior, b as AgentHooks, c as AgentOptions, d as AgentRunOptions, e as AgentStats, f as AnthropicParams, C as CerebrasParams, g as ChildRunStats, h as CreateSessionOptions, H as Harness, i as HarnessConfig, I as ImageContent, M as McpConnection, j as McpServerConfig, k as McpToolHookContext, O as OpenRouterParams, P as Provider, R as RemoteStoreOptions, S as Session, l as SessionContentBlock, m as SessionData, n as SessionEndStatus, o as SessionHookContext, p as SessionMessage, q as SessionRun, r as SessionStore, s as SessionTurn, t as SpawnHookContext, u as SqliteStoreOptions, v as StreamCallbacks, w as StreamHookContext, x as StreamOptions, T as ThinkingLevel, y as ToolCall, z as ToolContext, B as ToolDef, D as ToolExecutionMode, E as ToolHookContext, F as ToolMap, G as ToolResult, J as ToolSpec, K as TurnResult, L as TurnUsage } from './agent-CtGvwTdo.js';
 export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SpawnConfig } from './types-BpvTmawk.js';
 export { S as SandboxProvider } from './sandbox-CW72eLDP.js';
 export { S as SkillConfig, a as SkillResource, b as SkillsConfig } from './types-CDI8Kmve.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState } from './spawn-B7AtyfuG.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState } from './spawn-hNTJA3Iw.js';
 export { V as ValidationResult } from './validation-DOY_k7lW.js';
 import 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zidane",
-  "version": "1.6.15",
+  "version": "1.6.17",
   "description": "an agent that goes straight to the goal",
   "type": "module",
   "private": false,