zidane 1.6.0 → 1.6.1

package/README.md

@@ -166,10 +166,10 @@ Extended reasoning with named levels or exact token budgets.
 await agent.run({ prompt: 'solve this', thinking: 'high' })
 
 // Exact budget (overrides level default)
-await agent.run({ prompt: 'solve this', thinking: 'high', thinkingBudget: 50000 })
+await agent.run({ prompt: 'solve this', thinking: 'high', behavior: { thinkingBudget: 50000 } })
 
 // Agent-level default
-const agent = createAgent({ provider, harness, thinkingBudget: 16384 })
+const agent = createAgent({ provider, harness, behavior: { thinkingBudget: 16384 } })
 ```
 
 ## Hooks
@@ -184,12 +184,19 @@ agent.hooks.hook('turn:before', (ctx) => {
 })
 
 agent.hooks.hook('turn:after', (ctx) => {
-  // ctx.turn, ctx.turnId, ctx.usage { input, output }
+  // ctx.turn, ctx.turnId, ctx.usage, ctx.message (full SessionTurn)
   // Always fires — even if the provider throws mid-stream
+  // Turn is guaranteed to be in agent.turns before this fires
+})
+
+agent.hooks.hook('usage', (ctx) => {
+  // ctx.turn, ctx.turnId, ctx.usage (per-turn)
+  // ctx.totalIn, ctx.totalOut (running totals)
 })
 
 agent.hooks.hook('agent:done', (ctx) => {
   // ctx.totalIn, ctx.totalOut, ctx.turns, ctx.elapsed, ctx.children?
+  // ctx.output — structured output (when behavior.schema is set)
   // Fires on all exit paths: completion, maxTurns, and abort
 })
 ```
@@ -333,7 +340,7 @@ if (session) {
 
 ```ts
 agent.hooks.hook('session:start', (ctx) => { /* ctx.sessionId, ctx.runId, ctx.prompt */ })
-agent.hooks.hook('session:end', (ctx) => { /* ctx.sessionId, ctx.runId, ctx.status */ })
+agent.hooks.hook('session:end', (ctx) => { /* ctx.sessionId, ctx.runId, ctx.status, ctx.turnRange */ })
 agent.hooks.hook('session:turns', (ctx) => { /* ctx.sessionId, ctx.count */ })
 ```
 
@@ -453,7 +460,7 @@ const agent = createAgent({
 
 ```ts
 agent.isRunning           // is a run in progress?
-agent.messages            // conversation history
+agent.turns               // conversation history (SessionTurn[])
 agent.abort()             // cancel the current run
 agent.reset()             // clear messages and queues
 await agent.destroy()     // clean up context + MCP connections
@@ -484,6 +491,45 @@ Converters for external interop:
 import { fromAnthropic, toAnthropic, fromOpenAI, toOpenAI, autoDetectAndConvert } from 'zidane'
 ```
 
+## Structured Output
+
+Force the agent's final response to match a JSON Schema via provider-level tool forcing.
+
+```ts
+const stats = await agent.run({
+  prompt: 'Extract the entities',
+  behavior: {
+    schema: {
+      type: 'object',
+      properties: { name: { type: 'string' }, age: { type: 'number' } },
+      required: ['name', 'age'],
+    },
+  },
+})
+
+console.log(stats.output) // { name: 'Alice', age: 30 }
+```
+
+The `output` hook fires when structured output is extracted:
+
+```ts
+agent.hooks.hook('output', (ctx) => {
+  // ctx.output — the parsed JSON matching the schema
+  // ctx.schema — the schema that was enforced
+})
+```
+
+### Zod v4 integration
+
+Use `zodToJsonSchema` to normalize `z.toJsonSchema()` output for tool schemas:
+
+```ts
+import { z } from 'zod'
+import { zodToJsonSchema } from 'zidane'
+
+const schema = zodToJsonSchema(z.toJsonSchema(z.object({ name: z.string() })))
+```
+
 ## Usage Tracking
 
 ```ts
@@ -492,13 +538,21 @@ stats.turnUsage   // TurnUsage[] — per-turn { input, output, cacheCreation?, c
 stats.cost        // total USD cost (if reported by provider)
 ```
 
+## Types
+
+All types are available from `zidane/types`:
+
+```ts
+import type { Agent, SessionTurn, TurnUsage, Provider, ToolDef } from 'zidane/types'
+```
+
 ## Testing
 
 ```bash
 bun test
 ```
 
-430+ tests with mock provider and execution context. No API keys or Docker needed.
+460+ tests with mock provider and execution context. No API keys or Docker needed.
 
 ## License
 

package/dist/{agent-DVvuhEN-.d.ts → agent-C7X6yygt.d.ts}

@@ -1,5 +1,5 @@
 import { Hookable } from 'hookable';
-import { b as ExecutionContext, c as ExecutionHandle, e as SkillsConfig, S as SkillConfig } from './types-CyRzBgm0.js';
+import { b as ExecutionContext, c as ExecutionHandle, e as SkillsConfig, S as SkillConfig } from './types-CKXAp41h.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
 /**

package/dist/{chunk-3K5D27BF.js → chunk-4C6Y56CC.js}

@@ -229,10 +229,9 @@ async function parseSkillFile(filePath) {
     config.allowedTools = frontmatter["allowed-tools"].split(WHITESPACE_SPLIT_RE);
   if (frontmatter.model)
     config.model = frontmatter.model;
-  if (frontmatter.thinking)
-    config.thinking = frontmatter.thinking;
-  if (frontmatter.effort)
-    config.thinking = frontmatter.effort;
+  const thinkingValue = frontmatter.thinking ?? frontmatter.effort;
+  if (thinkingValue)
+    config.thinking = thinkingValue;
   if (frontmatter.paths) {
     const raw = frontmatter.paths;
     config.paths = raw.split(COMMA_OR_SPACE_RE).filter(Boolean);

package/dist/{chunk-7V33E7LT.js → chunk-JR4QNFMD.js}

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

package/dist/{chunk-VRAZJES3.js → chunk-SKLAWY7O.js}

@@ -6,7 +6,7 @@ import {
   interpolateShellCommands,
   mergeSkillsConfig,
   resolveSkills
-} from "./chunk-3K5D27BF.js";
+} from "./chunk-4C6Y56CC.js";
 
 // src/tools/list-files.ts
 var listFiles = {

package/dist/harnesses.d.ts

@@ -1,4 +1,4 @@
 import 'hookable';
-export { H as Harness, i as HarnessConfig, u as ToolContext, v as ToolDef, x as ToolMap, a1 as basic, a2 as basicTools, Q as defineHarness, X as noTools } from './agent-DVvuhEN-.js';
-import './types-CyRzBgm0.js';
+export { H as Harness, i as HarnessConfig, u as ToolContext, v as ToolDef, x as ToolMap, a1 as basic, a2 as basicTools, Q as defineHarness, X as noTools } from './agent-C7X6yygt.js';
+import './types-CKXAp41h.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/harnesses.js

@@ -3,10 +3,10 @@ import {
   basic_default,
   defineHarness,
   noTools
-} from "./chunk-7V33E7LT.js";
-import "./chunk-VRAZJES3.js";
+} from "./chunk-JR4QNFMD.js";
+import "./chunk-SKLAWY7O.js";
 import "./chunk-YTZOORAP.js";
-import "./chunk-3K5D27BF.js";
+import "./chunk-4C6Y56CC.js";
 export {
   basic_default as basic,
   basicTools,

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-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, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, T as ThinkingLevel, u as ToolContext, v as ToolDef, w as ToolExecutionMode, x as ToolMap, D as TurnUsage, E as autoDetectAndConvert, F as connectMcpServers, G as createAgent, J as createMemoryStore, K as createRemoteStore, L as createSession, N as createSqliteStore, Q as defineHarness, U as fromAnthropic, V as fromOpenAI, W as loadSession, X as noTools, Y as toAnthropic, Z as toOpenAI } from './agent-DVvuhEN-.js';
-import { f as SpawnConfig, b as ExecutionContext } from './types-CyRzBgm0.js';
-export { C as ContextCapabilities, a as ContextType, E as ExecResult, c as ExecutionHandle, S as SkillConfig, d as SkillResource, e as SkillsConfig } from './types-CyRzBgm0.js';
-export { S as SandboxProvider, c as createSandboxContext } from './sandbox-C08DQPTu.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, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, T as ThinkingLevel, u as ToolContext, v as ToolDef, w as ToolExecutionMode, x as ToolMap, D as TurnUsage, E as autoDetectAndConvert, F as connectMcpServers, G as createAgent, J as createMemoryStore, K as createRemoteStore, L as createSession, N as createSqliteStore, Q as defineHarness, U as fromAnthropic, V as fromOpenAI, W as loadSession, X as noTools, Y as toAnthropic, Z as toOpenAI } from './agent-C7X6yygt.js';
+import { f as SpawnConfig, b as ExecutionContext } from './types-CKXAp41h.js';
+export { C as ContextCapabilities, a as ContextType, E as ExecResult, c as ExecutionHandle, S as SkillConfig, d as SkillResource, e as SkillsConfig } from './types-CKXAp41h.js';
+export { S as SandboxProvider, c as createSandboxContext } from './sandbox-DZn3ybp_.js';
 export { buildCatalog, defineSkill, discoverSkills, interpolateShellCommands, mergeSkillsConfig, parseSkillFile, resolveSkills, validateSkillName, writeSkillToDisk, writeSkillsToDisk } from './skills.js';
-export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState, c as createSpawnTool, s as spawn } from './spawn-DJZZ9ZWw.js';
+export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState, c as createSpawnTool, s as spawn } from './spawn-CIxEFPrs.js';
 import 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   defineHarness,
   noTools
-} from "./chunk-7V33E7LT.js";
+} from "./chunk-JR4QNFMD.js";
 import {
   createAgent,
   createDockerContext,
@@ -9,7 +9,7 @@ import {
   createSandboxContext,
   createSpawnTool,
   spawn
-} from "./chunk-VRAZJES3.js";
+} from "./chunk-SKLAWY7O.js";
 import {
   connectMcpServers
 } from "./chunk-YTZOORAP.js";
@@ -40,7 +40,7 @@ import {
   validateSkillName,
   writeSkillToDisk,
   writeSkillsToDisk
-} from "./chunk-3K5D27BF.js";
+} from "./chunk-4C6Y56CC.js";
 
 // src/zod.ts
 function zodToJsonSchema(jsonSchema) {

package/dist/mcp.d.ts

@@ -1,4 +1,4 @@
 import 'hookable';
-export { M as McpConnection, j as McpServerConfig, F as connectMcpServers, a3 as resultToString } from './agent-DVvuhEN-.js';
+export { M as McpConnection, j as McpServerConfig, F as connectMcpServers, a3 as resultToString } from './agent-C7X6yygt.js';
 import '@modelcontextprotocol/sdk/client/index.js';
-import './types-CyRzBgm0.js';
+import './types-CKXAp41h.js';

package/dist/providers.d.ts

@@ -1,4 +1,4 @@
-export { f as AnthropicParams, C as CerebrasParams, O as OpenRouterParams, P as Provider, r as StreamCallbacks, s as StreamOptions, t as ToolCall, y as ToolResult, z as ToolSpec, B as TurnResult, _ as anthropic, $ as cerebras, a0 as openrouter } from './agent-DVvuhEN-.js';
+export { f as AnthropicParams, C as CerebrasParams, O as OpenRouterParams, P as Provider, r as StreamCallbacks, s as StreamOptions, t as ToolCall, y as ToolResult, z as ToolSpec, B as TurnResult, _ as anthropic, $ as cerebras, a0 as openrouter } from './agent-C7X6yygt.js';
 import 'hookable';
-import './types-CyRzBgm0.js';
+import './types-CKXAp41h.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/{sandbox-C08DQPTu.d.ts → sandbox-DZn3ybp_.d.ts}

@@ -1,4 +1,4 @@
-import { f as SpawnConfig, E as ExecResult, b as ExecutionContext } from './types-CyRzBgm0.js';
+import { f as SpawnConfig, E as ExecResult, b as ExecutionContext } from './types-CKXAp41h.js';
 
 /**
  * Remote sandbox execution context.

package/dist/session.d.ts

@@ -1,4 +1,4 @@
-export { h as CreateSessionOptions, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, E as autoDetectAndConvert, J as createMemoryStore, K as createRemoteStore, L as createSession, N as createSqliteStore, U as fromAnthropic, V as fromOpenAI, W as loadSession, Y as toAnthropic, Z as toOpenAI } from './agent-DVvuhEN-.js';
+export { h as CreateSessionOptions, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, E as autoDetectAndConvert, J as createMemoryStore, K as createRemoteStore, L as createSession, N as createSqliteStore, U as fromAnthropic, V as fromOpenAI, W as loadSession, Y as toAnthropic, Z as toOpenAI } from './agent-C7X6yygt.js';
 import 'hookable';
-import './types-CyRzBgm0.js';
+import './types-CKXAp41h.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/skills.d.ts

@@ -1,5 +1,5 @@
-import { S as SkillConfig, b as ExecutionContext, c as ExecutionHandle, e as SkillsConfig } from './types-CyRzBgm0.js';
-export { d as SkillResource } from './types-CyRzBgm0.js';
+import { S as SkillConfig, b as ExecutionContext, c as ExecutionHandle, e as SkillsConfig } from './types-CKXAp41h.js';
+export { d as SkillResource } from './types-CKXAp41h.js';
 
 /**
  * Skill catalog generation.

package/dist/skills.js

@@ -13,7 +13,7 @@ import {
   validateSkillName,
   writeSkillToDisk,
   writeSkillsToDisk
-} from "./chunk-3K5D27BF.js";
+} from "./chunk-4C6Y56CC.js";
 export {
   buildCatalog,
   defineSkill,

package/dist/{spawn-DJZZ9ZWw.d.ts → spawn-CIxEFPrs.d.ts}

@@ -1,4 +1,4 @@
-import { i as HarnessConfig, e as AgentStats, v as ToolDef } from './agent-DVvuhEN-.js';
+import { i as HarnessConfig, e as AgentStats, v as ToolDef } from './agent-C7X6yygt.js';
 
 /**
  * Spawn tool — create sub-agents from a parent agent.

package/dist/tools.d.ts

@@ -1,8 +1,8 @@
-import { v as ToolDef } from './agent-DVvuhEN-.js';
-export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState, c as createSpawnTool, s as spawn } from './spawn-DJZZ9ZWw.js';
+import { v as ToolDef } from './agent-C7X6yygt.js';
+export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState, c as createSpawnTool, s as spawn } from './spawn-CIxEFPrs.js';
 export { V as ValidationResult, v as validateToolArgs } from './validation-CwSuvOKf.js';
 import 'hookable';
-import './types-CyRzBgm0.js';
+import './types-CKXAp41h.js';
 import '@modelcontextprotocol/sdk/client/index.js';
 
 declare const listFiles: ToolDef;

package/dist/tools.js

@@ -6,9 +6,9 @@ import {
   spawn,
   validateToolArgs,
   writeFile
-} from "./chunk-VRAZJES3.js";
+} from "./chunk-SKLAWY7O.js";
 import "./chunk-YTZOORAP.js";
-import "./chunk-3K5D27BF.js";
+import "./chunk-4C6Y56CC.js";
 export {
   createSpawnTool,
   listFiles,

package/dist/{types-CyRzBgm0.d.ts → types-CKXAp41h.d.ts}

@@ -113,8 +113,8 @@ interface SkillConfig {
     thinking?: 'off' | 'minimal' | 'low' | 'medium' | 'high';
     /**
      * Glob patterns that limit when this skill auto-activates.
-     * When set, the skill is only included in the catalog when
-     * the agent is working with files matching these patterns.
+     * Parsed and stored per the Agent Skills spec, but not yet
+     * enforced at runtime — all skills are included in the catalog.
      */
     paths?: string[];
 }

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-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, O as OpenRouterParams, P as Provider, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, r as StreamCallbacks, s as StreamOptions, T as ThinkingLevel, t as ToolCall, u as ToolContext, v as ToolDef, w as ToolExecutionMode, x as ToolMap, y as ToolResult, z as ToolSpec, B as TurnResult, D as TurnUsage } from './agent-DVvuhEN-.js';
-export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SkillConfig, d as SkillResource, e as SkillsConfig, f as SpawnConfig } from './types-CyRzBgm0.js';
-export { S as SandboxProvider } from './sandbox-C08DQPTu.js';
-export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState } from './spawn-DJZZ9ZWw.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, O as OpenRouterParams, P as Provider, R as RemoteStoreOptions, S as Session, k as SessionContentBlock, l as SessionData, m as SessionMessage, n as SessionRun, o as SessionStore, p as SessionTurn, q as SqliteStoreOptions, r as StreamCallbacks, s as StreamOptions, T as ThinkingLevel, t as ToolCall, u as ToolContext, v as ToolDef, w as ToolExecutionMode, x as ToolMap, y as ToolResult, z as ToolSpec, B as TurnResult, D as TurnUsage } from './agent-C7X6yygt.js';
+export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SkillConfig, d as SkillResource, e as SkillsConfig, f as SpawnConfig } from './types-CKXAp41h.js';
+export { S as SandboxProvider } from './sandbox-DZn3ybp_.js';
+export { C as ChildAgent, S as SpawnToolOptions, a as SpawnToolState } from './spawn-CIxEFPrs.js';
 export { V as ValidationResult } from './validation-CwSuvOKf.js';
 import 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';

package/package.json

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