zidane 1.6.8 → 1.6.10

package/README.md

@@ -225,36 +225,37 @@ agent.hooks.hook('stream:thinking', (ctx) => {
 
 ### Tool execution
 
-```ts
-agent.hooks.hook('tool:before', (ctx) => { /* ctx.name, ctx.input */ })
-agent.hooks.hook('tool:after', (ctx) => { /* ctx.name, ctx.input, ctx.result */ })
-agent.hooks.hook('tool:error', (ctx) => { /* ctx.name, ctx.input, ctx.error */ })
-```
-
-### Tool gate
-
-Block a tool from running:
+All tool hooks include `turnId` and `callId` for correlation. Typed via `ToolHookContext`.
 
 ```ts
 agent.hooks.hook('tool:gate', (ctx) => {
+  // ctx.turnId, ctx.callId, ctx.name, ctx.input
   if (ctx.name === 'shell' && String(ctx.input.command).includes('rm -rf')) {
     ctx.block = true
     ctx.reason = 'dangerous command'
   }
 })
-```
-
-### Tool transform
-
-Modify tool output before it's sent back to the model:
 
-```ts
+agent.hooks.hook('tool:before', (ctx) => { /* ctx.turnId, ctx.callId, ctx.name, ctx.input */ })
+agent.hooks.hook('tool:after', (ctx) => { /* + ctx.result */ })
+agent.hooks.hook('tool:error', (ctx) => { /* + ctx.error */ })
 agent.hooks.hook('tool:transform', (ctx) => {
+  // + ctx.result, ctx.isError — mutate to modify output
   if (ctx.result.length > 5000)
     ctx.result = ctx.result.slice(0, 5000) + '\n... (truncated)'
 })
 ```
 
+MCP tool hooks mirror the same pattern with `server` and `tool` fields. Typed via `McpToolHookContext`.
+
+```ts
+agent.hooks.hook('mcp:tool:gate', (ctx) => { /* ctx.turnId, ctx.callId, ctx.server, ctx.tool, ctx.input, ctx.block, ctx.reason */ })
+agent.hooks.hook('mcp:tool:before', (ctx) => { /* ctx.turnId, ctx.callId, ctx.server, ctx.tool, ctx.input */ })
+agent.hooks.hook('mcp:tool:after', (ctx) => { /* + ctx.result */ })
+agent.hooks.hook('mcp:tool:transform', (ctx) => { /* + ctx.result — mutate to modify */ })
+agent.hooks.hook('mcp:tool:error', (ctx) => { /* + ctx.error */ })
+```
+
 ### Context transform
 
 Prune messages before each LLM call:
@@ -581,6 +582,9 @@ All types are available from `zidane/types`:
 
 ```ts
 import type { Agent, SessionTurn, TurnUsage, Provider, ToolDef } from 'zidane/types'
+
+// Hook context types for typed event handlers
+import type { ToolHookContext, McpToolHookContext, SessionHookContext, StreamHookContext } from 'zidane/types'
 ```
 
 ## Testing
@@ -589,7 +593,7 @@ import type { Agent, SessionTurn, TurnUsage, Provider, ToolDef } from 'zidane/ty
 bun test
 ```
 
-484+ tests with mock provider and execution context. No API keys or Docker needed.
+489+ tests with mock provider and execution context. No API keys or Docker needed.
 
 ## License
 

package/dist/{chunk-GCALAOLD.js → chunk-GGPBK22K.js}

@@ -777,13 +777,28 @@ ${skillsCatalog}`;
         hooks.callHook("session:turns", { sessionId: session.id, count: turns.length });
       }
     }) : void 0;
+    async function flushTurns() {
+      if (!session) return;
+      const remaining = turns.slice(lastPersistedTurnCount);
+      if (remaining.length > 0) {
+        await session.appendTurns(remaining);
+        lastPersistedTurnCount = turns.length;
+      }
+    }
+    async function finalizeSession(status) {
+      if (!session) return;
+      const run2 = session.runs.find((r) => r.id === runId);
+      if (run2)
+        await session.updateRun(run2);
+      await session.updateStatus(status === "aborted" ? "idle" : status);
+      await hooks.callHook("session:end", { sessionId: session.id, runId, status, turnRange: [runTurnStart, turns.length - 1] });
+    }
     try {
       const stats = await runLoop({
         provider,
         hooks,
         harness,
         tools,
-        toolSpecs,
         formattedTools,
         model,
         system,
@@ -806,26 +821,16 @@ ${skillsCatalog}`;
         ...stats,
         children: childrenStats.length > 0 ? childrenStats : void 0
       };
+      await flushTurns();
       if (abortController.signal.aborted) {
         session?.abortRun(runId);
-        if (session) {
-          const run2 = session.runs.find((r) => r.id === runId);
-          if (run2)
-            await session.updateRun(run2);
-          await session.updateStatus("idle");
-          await hooks.callHook("session:end", { sessionId: session.id, runId, status: "aborted", turnRange: [runTurnStart, turns.length - 1] });
-        }
+        await finalizeSession("aborted");
         await hooks.callHook("agent:done", finalStats);
         return finalStats;
       }
       const totalCost = finalStats.turnUsage?.reduce((sum, t) => sum + (t.cost ?? 0), 0);
       if (totalCost)
         finalStats.cost = totalCost;
-      const finalNewTurns = turns.slice(lastPersistedTurnCount);
-      if (session && finalNewTurns.length > 0) {
-        await session.appendTurns(finalNewTurns);
-        lastPersistedTurnCount = turns.length;
-      }
       session?.completeRun(runId, {
         turns: finalStats.turns,
         tokensIn: finalStats.totalIn,
@@ -833,37 +838,20 @@ ${skillsCatalog}`;
         turnUsage: finalStats.turnUsage,
         cost: totalCost
       });
-      if (session) {
-        const run2 = session.runs.find((r) => r.id === runId);
-        if (run2)
-          await session.updateRun(run2);
-        await session.updateStatus("completed");
-        await hooks.callHook("session:end", { sessionId: session.id, runId, status: "completed", turnRange: [runTurnStart, turns.length - 1] });
-      }
+      await finalizeSession("completed");
       await hooks.callHook("agent:done", finalStats);
       return finalStats;
     } catch (err) {
+      await flushTurns();
       if (abortController.signal.aborted) {
         session?.abortRun(runId);
-        if (session) {
-          const run2 = session.runs.find((r) => r.id === runId);
-          if (run2)
-            await session.updateRun(run2);
-          await session.updateStatus("idle");
-          await hooks.callHook("session:end", { sessionId: session.id, runId, status: "aborted", turnRange: [runTurnStart, turns.length - 1] });
-        }
+        await finalizeSession("aborted");
         const stats = { totalIn: 0, totalOut: 0, turns: 0, elapsed: 0 };
         await hooks.callHook("agent:done", stats);
         return stats;
       }
       session?.errorRun(runId, err.message);
-      if (session) {
-        const run2 = session.runs.find((r) => r.id === runId);
-        if (run2)
-          await session.updateRun(run2);
-        await session.updateStatus("error");
-        await hooks.callHook("session:end", { sessionId: session.id, runId, status: "error", turnRange: [runTurnStart, turns.length - 1] });
-      }
+      await finalizeSession("error");
       throw err;
     } finally {
       unregisterSpawnHook();

package/dist/{chunk-Z2NZSEBZ.js → chunk-NPXSTO6S.js}

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

package/dist/harnesses.js

@@ -3,8 +3,8 @@ import {
   basic_default,
   defineHarness,
   noTools
-} from "./chunk-Z2NZSEBZ.js";
-import "./chunk-GCALAOLD.js";
+} from "./chunk-NPXSTO6S.js";
+import "./chunk-GGPBK22K.js";
 import "./chunk-5LOHDFK3.js";
 import "./chunk-4C6Y56CC.js";
 export {

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   defineHarness,
   noTools
-} from "./chunk-Z2NZSEBZ.js";
+} from "./chunk-NPXSTO6S.js";
 import {
   createAgent,
   createDockerContext,
@@ -10,7 +10,7 @@ import {
   createSandboxContext,
   createSpawnTool,
   spawn
-} from "./chunk-GCALAOLD.js";
+} from "./chunk-GGPBK22K.js";
 import {
   connectMcpServers
 } from "./chunk-5LOHDFK3.js";

package/dist/tools.js

@@ -7,7 +7,7 @@ import {
   spawn,
   validateToolArgs,
   writeFile
-} from "./chunk-GCALAOLD.js";
+} from "./chunk-GGPBK22K.js";
 import "./chunk-5LOHDFK3.js";
 import "./chunk-4C6Y56CC.js";
 export {

package/package.json

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