@strands-agents/sdk 0.3.0 → 0.4.0

package/README.md

@@ -41,6 +41,7 @@ Strands Agents is a simple yet powerful SDK that takes a model-driven approach t
 
 - **🪶 Lightweight & Flexible**: Simple agent loop that works seamlessly in Node.js and browser environments
 - **🔒 Type-Safe Tools**: Define tools easily using Zod schemas for robust input validation and type inference
+- **📋 Structured Output**: Get type-safe, validated responses from LLMs using Zod schemas with automatic retry on validation errors
 - **🔌 Model Agnostic**: First-class support for Amazon Bedrock and OpenAI, with extensible architecture for custom providers
 - **🔗 Built-in MCP**: Native support for Model Context Protocol (MCP) clients, enabling access to external tools and servers
 - **⚡ Streaming Support**: Real-time response streaming for better user experience
@@ -166,6 +167,48 @@ await agent.invoke('What is the weather in San Francisco?')
 - **HTTP Request Tool**: Make HTTP requests to external APIs
 
 
+### Structured Output
+
+Get type-safe, validated responses from LLMs by defining the expected output structure with Zod schemas. The agent automatically validates the LLM's response and retries on validation errors:
+
+```typescript
+import { Agent } from '@strands-agents/sdk'
+import { z } from 'zod'
+
+const PersonSchema = z.object({
+  name: z.string().describe('Name of the person'),
+  age: z.number().describe('Age of the person'),
+  occupation: z.string().describe('Occupation of the person')
+})
+
+// Configure structured output at the agent level
+const agent = new Agent({ 
+  structuredOutputSchema: PersonSchema 
+})
+
+const result = await agent.invoke('John Smith is a 30 year-old software engineer')
+
+// result.structuredOutput is fully typed based on the schema
+console.log(result.structuredOutput.name) // "John Smith"
+console.log(result.structuredOutput.age)  // 30
+```
+
+**Error handling**: The agent automatically retries with validation feedback when the LLM provides invalid output. If validation ultimately fails, a `StructuredOutputException` is thrown:
+
+```typescript
+import { StructuredOutputException } from '@strands-agents/sdk'
+
+try {
+  const result = await agent.invoke('Extract person info...')
+  console.log(result.structuredOutput)
+} catch (error) {
+  if (error instanceof StructuredOutputException) {
+    console.error('Validation failed:', error.message)
+  }
+}
+```
+
+
 ### MCP Integration
 
 Seamlessly integrate Model Context Protocol (MCP) servers:

package/dist/src/__fixtures__/mock-hook-provider.d.ts

@@ -1,13 +1,9 @@
-import type { HookEvent, HookProvider, HookRegistry } from '../hooks/index.js';
+import type { HookableEvent, HookProvider, HookRegistry } from '../hooks/index.js';
 /**
- * Mock hook provider that records all hook invocations for testing.
+ * Mock hook provider that records all hookable event invocations for testing.
  */
 export declare class MockHookProvider implements HookProvider {
-    invocations: HookEvent[];
-    private includeModelEvents;
-    constructor(options?: {
-        includeModelEvents?: boolean;
-    });
+    invocations: HookableEvent[];
     registerCallbacks(registry: HookRegistry): void;
     reset(): void;
 }

package/dist/src/__fixtures__/mock-hook-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-hook-provider.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-hook-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAc9E;;GAEG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD,WAAW,EAAE,SAAS,EAAE,CAAK;IAC7B,OAAO,CAAC,kBAAkB,CAAS;gBAEvB,OAAO,GAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAO;IAI1D,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAuB/C,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"mock-hook-provider.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-hook-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAalF;;GAEG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD,WAAW,EAAE,aAAa,EAAE,CAAK;IAEjC,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAmB/C,KAAK,IAAI,IAAI;CAGd"}

package/dist/src/__fixtures__/mock-hook-provider.js

@@ -1,15 +1,11 @@
-import { InitializedEvent, BeforeInvocationEvent, AfterInvocationEvent, MessageAddedEvent, BeforeToolCallEvent, AfterToolCallEvent, BeforeModelCallEvent, AfterModelCallEvent, ModelStreamEventHook, } from '../hooks/index.js';
+import { InitializedEvent, BeforeInvocationEvent, AfterInvocationEvent, MessageAddedEvent, BeforeToolCallEvent, AfterToolCallEvent, BeforeModelCallEvent, AfterModelCallEvent, } from '../hooks/index.js';
 /**
- * Mock hook provider that records all hook invocations for testing.
+ * Mock hook provider that records all hookable event invocations for testing.
  */
 export class MockHookProvider {
     invocations = [];
-    includeModelEvents;
-    constructor(options = {}) {
-        this.includeModelEvents = options.includeModelEvents ?? true;
-    }
     registerCallbacks(registry) {
-        const lifecycleEvents = [
+        const eventTypes = [
             InitializedEvent,
             BeforeInvocationEvent,
             AfterInvocationEvent,
@@ -19,8 +15,6 @@ export class MockHookProvider {
             BeforeModelCallEvent,
             AfterModelCallEvent,
         ];
-        const modelEvents = [ModelStreamEventHook];
-        const eventTypes = this.includeModelEvents ? [...lifecycleEvents, ...modelEvents] : lifecycleEvents;
         for (const eventType of eventTypes) {
             registry.addCallback(eventType, (e) => {
                 this.invocations.push(e);

package/dist/src/__fixtures__/mock-hook-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-hook-provider.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-hook-provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAG1B;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B,WAAW,GAAgB,EAAE,CAAA;IACrB,kBAAkB,CAAS;IAEnC,YAAY,UAA4C,EAAE;QACxD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,IAAI,CAAA;IAC9D,CAAC;IAED,iBAAiB,CAAC,QAAsB;QACtC,MAAM,eAAe,GAA2B;YAC9C,gBAAgB;YAChB,qBAAqB;YACrB,oBAAoB;YACpB,iBAAiB;YACjB,mBAAmB;YACnB,kBAAkB;YAClB,oBAAoB;YACpB,mBAAmB;SACpB,CAAA;QAED,MAAM,WAAW,GAA2B,CAAC,oBAAoB,CAAC,CAAA;QAElE,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAA;QAEnG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;IACvB,CAAC;CACF"}
+{"version":3,"file":"mock-hook-provider.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-hook-provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAG1B;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B,WAAW,GAAoB,EAAE,CAAA;IAEjC,iBAAiB,CAAC,QAAsB;QACtC,MAAM,UAAU,GAA+B;YAC7C,gBAAgB;YAChB,qBAAqB;YACrB,oBAAoB;YACpB,iBAAiB;YACjB,mBAAmB;YACnB,kBAAkB;YAClB,oBAAoB;YACpB,mBAAmB;SACpB,CAAA;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;IACvB,CAAC;CACF"}

package/dist/src/__fixtures__/mock-message-model.d.ts

@@ -5,9 +5,14 @@
  * construct events in tests.
  */
 import { Model } from '../models/model.js';
-import type { Message, ContentBlock, StopReason } from '../types/messages.js';
+import type { Message, StopReason } from '../types/messages.js';
 import type { ModelStreamEvent } from '../models/streaming.js';
 import type { BaseModelConfig, StreamOptions } from '../models/model.js';
+import type { PlainContentBlock } from './slim-types.js';
+/**
+ * Input type for addTurn - accepts plain objects or class instances.
+ */
+type ContentBlockInput = PlainContentBlock | PlainContentBlock[] | Error;
 /**
  * Test model provider that operates at the content block level.
  * Simplifies agent loop tests by allowing specification of content blocks
@@ -42,7 +47,7 @@ export declare class MockMessageModel extends Model<BaseModelConfig> {
      *   .addTurn(new Error('Failed'))  // Error turn
      * ```
      */
-    addTurn(turn: ContentBlock | ContentBlock[] | Error, stopReason?: StopReason): this;
+    addTurn(turn: ContentBlockInput, stopReason?: StopReason): this;
     /**
      * Updates the model configuration.
      *
@@ -90,4 +95,5 @@ export declare class MockMessageModel extends Model<BaseModelConfig> {
      */
     private _generateEventsForBlock;
 }
+export {};
 //# sourceMappingURL=mock-message-model.d.ts.map

package/dist/src/__fixtures__/mock-message-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-message-model.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-message-model.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQxE;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,eAAe,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;;IAQH;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IAKnF;;;;OAIG;IACH,YAAY,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAIhD;;;;OAIG;IACH,SAAS,IAAI,eAAe;IAI5B;;;;;;;;;;OAUG;IACI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,cAAc,CAAC,gBAAgB,CAAC;IA4B/F;;;OAGG;YACY,yBAAyB;IAiBxC;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;YACY,yBAAyB;IAcxC;;OAEG;YACY,uBAAuB;CAgFvC"}
+{"version":3,"file":"mock-message-model.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-message-model.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD;;GAEG;AACH,KAAK,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,KAAK,CAAA;AAQxE;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,eAAe,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;;IAQH;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IAK/D;;;;OAIG;IACH,YAAY,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAIhD;;;;OAIG;IACH,SAAS,IAAI,eAAe;IAI5B;;;;;;;;;;OAUG;IACI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,cAAc,CAAC,gBAAgB,CAAC;IA4B/F;;;OAGG;YACY,yBAAyB;IAiBxC;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;YACY,yBAAyB;IAcxC;;OAEG;YACY,uBAAuB;CAiFvC"}

package/dist/src/__fixtures__/mock-message-model.js

@@ -213,6 +213,7 @@ export class MockMessageModel extends Model {
             case 'imageBlock':
             case 'videoBlock':
             case 'documentBlock':
+            case 'jsonBlock':
                 // These blocks don't generate events in mock - just skip them
                 break;
             default: {

package/dist/src/__fixtures__/mock-message-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-message-model.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-message-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mock-message-model.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-message-model.ts"],"names":[],"mappings":"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"}

package/dist/src/__fixtures__/mock-storage-provider.d.ts

@@ -0,0 +1,37 @@
+import type { Scope, Snapshot, SnapshotManifest } from '../session/types.js';
+import type { SnapshotStorage, SnapshotLocation } from '../session/index.js';
+export declare function createTestSnapshot(overrides?: Partial<Snapshot>): Snapshot;
+export declare function createTestManifest(overrides?: Partial<SnapshotManifest>): SnapshotManifest;
+export declare function createTestScope(kind?: 'agent' | 'multiAgent'): Scope;
+export declare function createTestSnapshots(count: number, baseSnapshot?: Partial<Snapshot>): Snapshot[];
+/**
+ * Mock storage implementation for testing that stores data in memory
+ */
+export declare class MockSnapshotStorage implements SnapshotStorage {
+    private snapshots;
+    private manifests;
+    shouldThrowErrors: boolean;
+    saveSnapshot(params: {
+        location: SnapshotLocation;
+        snapshotId: string;
+        isLatest: boolean;
+        snapshot: Snapshot;
+    }): Promise<void>;
+    loadSnapshot(params: {
+        location: SnapshotLocation;
+        snapshotId?: string;
+    }): Promise<Snapshot | null>;
+    listSnapshotIds(params: {
+        location: SnapshotLocation;
+    }): Promise<string[]>;
+    loadManifest(params: {
+        location: SnapshotLocation;
+    }): Promise<SnapshotManifest>;
+    saveManifest(params: {
+        location: SnapshotLocation;
+        manifest: SnapshotManifest;
+    }): Promise<void>;
+    private getKey;
+    private getManifestKey;
+}
+//# sourceMappingURL=mock-storage-provider.d.ts.map

package/dist/src/__fixtures__/mock-storage-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-storage-provider.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-storage-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAE5E,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,OAAO,CAAC,QAAQ,CAAM,GAAG,QAAQ,CAa9E;AAED,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAAG,gBAAgB,CAO9F;AAED,wBAAgB,eAAe,CAAC,IAAI,GAAE,OAAO,GAAG,YAAsB,GAAG,KAAK,CAE7E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,EAAE,CAO/F;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,eAAe;IACzD,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,SAAS,CAAsC;IAChD,iBAAiB,UAAQ;IAE1B,YAAY,CAAC,MAAM,EAAE;QACzB,QAAQ,EAAE,gBAAgB,CAAA;QAC1B,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,OAAO,CAAA;QACjB,QAAQ,EAAE,QAAQ,CAAA;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYX,YAAY,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IASnG,eAAe,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAe1E,YAAY,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkB/E,YAAY,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAC;QAAC,QAAQ,EAAE,gBAAgB,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrG,OAAO,CAAC,MAAM;IAOd,OAAO,CAAC,cAAc;CAMvB"}

package/dist/src/__fixtures__/mock-storage-provider.js

@@ -0,0 +1,105 @@
+export function createTestSnapshot(overrides = {}) {
+    return {
+        schemaVersion: '1.0',
+        scope: 'agent',
+        createdAt: '2024-01-01T00:00:00.000Z',
+        data: {
+            messages: [],
+            state: { testKey: 'testValue' },
+            systemPrompt: 'You are a test assistant',
+        },
+        appData: {},
+        ...overrides,
+    };
+}
+export function createTestManifest(overrides = {}) {
+    return {
+        schemaVersion: '1.0',
+        nextSnapshotId: '2',
+        updatedAt: '2024-01-01T00:00:00.000Z',
+        ...overrides,
+    };
+}
+export function createTestScope(kind = 'agent') {
+    return kind;
+}
+export function createTestSnapshots(count, baseSnapshot) {
+    return Array.from({ length: count }, (_, i) => createTestSnapshot({
+        ...baseSnapshot,
+        createdAt: new Date(2024, 0, 1, 0, i).toISOString(),
+    }));
+}
+/**
+ * Mock storage implementation for testing that stores data in memory
+ */
+export class MockSnapshotStorage {
+    snapshots = new Map();
+    manifests = new Map();
+    shouldThrowErrors = false;
+    async saveSnapshot(params) {
+        if (this.shouldThrowErrors)
+            throw new Error('Mock save error');
+        const { location, snapshotId, isLatest, snapshot } = params;
+        const key = this.getKey(location, snapshotId);
+        this.snapshots.set(key, snapshot);
+        if (isLatest) {
+            this.snapshots.set(this.getKey(location, 'latest'), snapshot);
+        }
+    }
+    async loadSnapshot(params) {
+        if (this.shouldThrowErrors)
+            throw new Error('Mock load error');
+        if (params.snapshotId === undefined) {
+            return this.snapshots.get(this.getKey(params.location, 'latest')) ?? null;
+        }
+        return this.snapshots.get(this.getKey(params.location, params.snapshotId)) ?? null;
+    }
+    async listSnapshotIds(params) {
+        if (this.shouldThrowErrors)
+            throw new Error('Mock list error');
+        const prefix = `${params.location.sessionId}::${params.location.scope}::${params.location.scopeId}::`;
+        const ids = [];
+        for (const [key, _snapshot] of this.snapshots) {
+            if (key.startsWith(prefix) && !key.endsWith('::latest')) {
+                ids.push(key.slice(prefix.length));
+            }
+        }
+        return ids.sort();
+    }
+    async loadManifest(params) {
+        if (this.shouldThrowErrors)
+            throw new Error('Mock manifest load error');
+        const { sessionId } = params.location;
+        if (!sessionId) {
+            throw new Error('Invalid sessionId: cannot be empty or undefined');
+        }
+        const key = this.getManifestKey(params.location);
+        return (this.manifests.get(key) ?? {
+            schemaVersion: '1',
+            nextSnapshotId: '1',
+            updatedAt: new Date().toISOString(),
+        });
+    }
+    async saveManifest(params) {
+        if (this.shouldThrowErrors)
+            throw new Error('Mock manifest save error');
+        const { sessionId } = params.location;
+        if (!sessionId) {
+            throw new Error('Invalid sessionId: cannot be empty or undefined');
+        }
+        this.manifests.set(this.getManifestKey(params.location), params.manifest);
+    }
+    getKey(location, snapshotId) {
+        if (!location.sessionId) {
+            throw new Error('Invalid sessionId: cannot be empty or undefined');
+        }
+        return `${location.sessionId}::${location.scope}::${location.scopeId}::${snapshotId}`;
+    }
+    getManifestKey(location) {
+        if (!location.sessionId) {
+            throw new Error('Invalid sessionId: cannot be empty or undefined');
+        }
+        return `${location.sessionId}::${location.scope}::${location.scopeId}::manifest`;
+    }
+}
+//# sourceMappingURL=mock-storage-provider.js.map

package/dist/src/__fixtures__/mock-storage-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-storage-provider.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-storage-provider.ts"],"names":[],"mappings":"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"}

package/dist/src/__fixtures__/slim-types.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Utility types for testing that strip methods from classes.
+ * Allows tests to use plain objects without needing to construct class instances.
+ */
+import type { Message, ToolResultBlock, TextBlock, ToolUseBlock, ReasoningBlock, CachePointBlock, GuardContentBlock, JsonBlock } from '../types/messages.js';
+import type { ImageBlock, VideoBlock, DocumentBlock } from '../types/media.js';
+/**
+ * Strips the toJSON method from a type, allowing plain objects to be used in tests.
+ * This is useful when you want to pass plain object literals where class instances are expected.
+ *
+ * @example
+ * ```typescript
+ * const messages: NoJSON<Message>[] = [
+ *   { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }
+ * ]
+ * ```
+ */
+export type NoJSON<T> = Omit<T, 'toJSON'>;
+/**
+ * Plain content block without toJSON method - preserves discriminated union.
+ */
+export type PlainContentBlock = NoJSON<TextBlock> | NoJSON<ToolUseBlock> | NoJSON<ToolResultBlock> | NoJSON<ReasoningBlock> | NoJSON<CachePointBlock> | NoJSON<GuardContentBlock> | NoJSON<JsonBlock> | NoJSON<ImageBlock> | NoJSON<VideoBlock> | NoJSON<DocumentBlock>;
+/**
+ * Plain system content block without toJSON method.
+ */
+export type PlainSystemContentBlock = NoJSON<TextBlock> | NoJSON<CachePointBlock> | NoJSON<GuardContentBlock>;
+/**
+ * Plain tool result block without toJSON method.
+ */
+export type PlainToolResultBlock = NoJSON<ToolResultBlock>;
+/**
+ * Recursively strips toJSON from a type and its nested content.
+ * Use this for Message which contains ContentBlock arrays.
+ */
+export type PlainMessage = NoJSON<Message> & {
+    content: PlainContentBlock[];
+};
+/**
+ * Type assertion helper for using plain message objects where Message[] is expected.
+ * Use this when calling model.stream() with plain objects in tests.
+ *
+ * @example
+ * ```typescript
+ * const messages = [
+ *   { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }
+ * ] as PlainMessage[] as Message[]
+ * ```
+ */
+export type { Message };
+//# sourceMappingURL=slim-types.d.ts.map

package/dist/src/__fixtures__/slim-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slim-types.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/slim-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,eAAe,EACf,SAAS,EACT,YAAY,EACZ,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,SAAS,EACV,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE9E;;;;;;;;;;GAUG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEzC;;GAEG;AACH,MAAM,MAAM,iBAAiB,GACzB,MAAM,CAAC,SAAS,CAAC,GACjB,MAAM,CAAC,YAAY,CAAC,GACpB,MAAM,CAAC,eAAe,CAAC,GACvB,MAAM,CAAC,cAAc,CAAC,GACtB,MAAM,CAAC,eAAe,CAAC,GACvB,MAAM,CAAC,iBAAiB,CAAC,GACzB,MAAM,CAAC,SAAS,CAAC,GACjB,MAAM,CAAC,UAAU,CAAC,GAClB,MAAM,CAAC,UAAU,CAAC,GAClB,MAAM,CAAC,aAAa,CAAC,CAAA;AAEzB;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,eAAe,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;AAE7G;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,eAAe,CAAC,CAAA;AAE1D;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG;IAAE,OAAO,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAAA;AAE7E;;;;;;;;;;GAUG;AACH,YAAY,EAAE,OAAO,EAAE,CAAA"}

package/dist/src/__fixtures__/slim-types.js

@@ -0,0 +1,6 @@
+/**
+ * Utility types for testing that strip methods from classes.
+ * Allows tests to use plain objects without needing to construct class instances.
+ */
+export {};
+//# sourceMappingURL=slim-types.js.map

package/dist/src/__fixtures__/slim-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slim-types.js","sourceRoot":"","sources":["../../../src/__fixtures__/slim-types.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/src/__fixtures__/tool-helpers.d.ts

@@ -3,8 +3,8 @@
  * This module provides utilities for testing Tool implementations.
  */
 import type { Tool, ToolContext } from '../tools/tool.js';
-import { ToolResultBlock } from '../types/messages.js';
 import type { JSONValue } from '../types/json.js';
+import type { PlainToolResultBlock } from './slim-types.js';
 /**
  * Helper to create a mock ToolContext for testing.
  *
@@ -17,14 +17,18 @@ export declare function createMockContext(toolUse: {
     toolUseId: string;
     input: JSONValue;
 }, agentState?: Record<string, JSONValue>): ToolContext;
+/**
+ * Result function type for createMockTool - accepts plain objects or class instances.
+ */
+type ToolResultFn = () => PlainToolResultBlock | AsyncGenerator<never, PlainToolResultBlock, never>;
 /**
  * Helper to create a mock tool for testing.
  *
  * @param name - The name of the mock tool
- * @param resultFn - Function that returns a ToolResultBlock or an AsyncGenerator that yields nothing and returns a ToolResultBlock
+ * @param resultFn - Function that returns a ToolResultBlock (plain object or class instance) or an AsyncGenerator
  * @returns Mock Tool object
  */
-export declare function createMockTool(name: string, resultFn: () => ToolResultBlock | AsyncGenerator<never, ToolResultBlock, never>): Tool;
+export declare function createMockTool(name: string, resultFn: ToolResultFn): Tool;
 /**
  * Helper to create a simple mock tool with minimal configuration for testing.
  * This is a lighter-weight version of createMockTool for scenarios where the tool's
@@ -34,4 +38,5 @@ export declare function createMockTool(name: string, resultFn: () => ToolResultB
  * @returns Mock Tool object
  */
 export declare function createRandomTool(name?: string): Tool;
+export {};
 //# sourceMappingURL=tool-helpers.d.ts.map

package/dist/src/__fixtures__/tool-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,EAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACrC,WAAW,CAQb;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,GAC9E,IAAI,CA8BN;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAWpD"}
+{"version":3,"file":"tool-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAE3D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,EAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACrC,WAAW,CAQb;AAED;;GAEG;AACH,KAAK,YAAY,GAAG,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAA;AAEnG;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CA8BzE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAWpD"}

package/dist/src/__fixtures__/tool-helpers.js

@@ -24,7 +24,7 @@ export function createMockContext(toolUse, agentState) {
  * Helper to create a mock tool for testing.
  *
  * @param name - The name of the mock tool
- * @param resultFn - Function that returns a ToolResultBlock or an AsyncGenerator that yields nothing and returns a ToolResultBlock
+ * @param resultFn - Function that returns a ToolResultBlock (plain object or class instance) or an AsyncGenerator
  * @returns Mock Tool object
  */
 export function createMockTool(name, resultFn) {

package/dist/src/__fixtures__/tool-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-helpers.js","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA8D,EAC9D,UAAsC;IAEtC,OAAO;QACL,OAAO;QACP,KAAK,EAAE;YACL,KAAK,EAAE,IAAI,UAAU,CAAC,UAAU,CAAC;YACjC,QAAQ,EAAE,EAAE;SACb;KACF,CAAA;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,QAA+E;IAE/E,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,aAAa,IAAI,EAAE;QAChC,QAAQ,EAAE;YACR,IAAI;YACJ,WAAW,EAAE,aAAa,IAAI,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAChD;QACD,yCAAyC;QACzC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ;YACpB,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAA;YACzB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACpF,mCAAmC;gBACnC,MAAM,GAAG,GAAG,MAAuD,CAAA;gBACnE,IAAI,IAAI,GAAG,KAAK,CAAA;gBAChB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACb,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;oBAChD,IAAI,GAAG,MAAM,IAAI,KAAK,CAAA;oBACtB,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,KAAK,CAAA;oBACd,CAAC;gBACH,CAAC;gBACD,6DAA6D;gBAC7D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAyB,CAAA;YAClC,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,MAAM,QAAQ,GAAG,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;IACvD,OAAO,cAAc,CACnB,QAAQ,EACR,GAAG,EAAE,CACH,IAAI,eAAe,CAAC;QAClB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAkB;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CACL,CAAA;AACH,CAAC"}
+{"version":3,"file":"tool-helpers.js","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAG9C;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA8D,EAC9D,UAAsC;IAEtC,OAAO;QACL,OAAO;QACP,KAAK,EAAE;YACL,KAAK,EAAE,IAAI,UAAU,CAAC,UAAU,CAAC;YACjC,QAAQ,EAAE,EAAE;SACb;KACF,CAAA;AACH,CAAC;AAOD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAsB;IACjE,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,aAAa,IAAI,EAAE;QAChC,QAAQ,EAAE;YACR,IAAI;YACJ,WAAW,EAAE,aAAa,IAAI,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAChD;QACD,yCAAyC;QACzC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ;YACpB,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAA;YACzB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACpF,mCAAmC;gBACnC,MAAM,GAAG,GAAG,MAAuD,CAAA;gBACnE,IAAI,IAAI,GAAG,KAAK,CAAA;gBAChB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACb,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;oBAChD,IAAI,GAAG,MAAM,IAAI,KAAK,CAAA;oBACtB,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,KAAK,CAAA;oBACd,CAAC;gBACH,CAAC;gBACD,6DAA6D;gBAC7D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAyB,CAAA;YAClC,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,MAAM,QAAQ,GAAG,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;IACvD,OAAO,cAAc,CACnB,QAAQ,EACR,GAAG,EAAE,CACH,IAAI,eAAe,CAAC;QAClB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAkB;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CACL,CAAA;AACH,CAAC"}

package/dist/src/agent/__tests__/agent.hook.test.js

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 import { Agent } from '../agent.js';
-import { AfterInvocationEvent, AfterModelCallEvent, AfterToolCallEvent, BeforeInvocationEvent, BeforeModelCallEvent, BeforeToolCallEvent, MessageAddedEvent, ModelStreamEventHook, InitializedEvent, } from '../../hooks/index.js';
+import { AfterInvocationEvent, AfterModelCallEvent, AfterToolCallEvent, BeforeInvocationEvent, BeforeModelCallEvent, BeforeToolCallEvent, MessageAddedEvent, ModelStreamUpdateEvent, InitializedEvent, } from '../../hooks/index.js';
 import { MockMessageModel } from '../../__fixtures__/mock-message-model.js';
 import { MockHookProvider } from '../../__fixtures__/mock-hook-provider.js';
 import { collectIterator } from '../../__fixtures__/model-test-helpers.js';
@@ -13,7 +13,7 @@ describe('Agent Hooks Integration', () => {
     });
     describe('invocation lifecycle', () => {
         it('fires hooks during invoke', async () => {
-            const lifecycleProvider = new MockHookProvider({ includeModelEvents: false });
+            const lifecycleProvider = new MockHookProvider();
             const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
             const agent = new Agent({ model, hooks: [lifecycleProvider] });
             await agent.invoke('Hi');
@@ -36,7 +36,7 @@ describe('Agent Hooks Integration', () => {
             expect(lifecycleProvider.invocations[6]).toEqual(new AfterInvocationEvent({ agent }));
         });
         it('fires hooks during stream', async () => {
-            const lifecycleProvider = new MockHookProvider({ includeModelEvents: false });
+            const lifecycleProvider = new MockHookProvider();
             const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
             const agent = new Agent({ model, hooks: [lifecycleProvider] });
             await collectIterator(agent.stream('Hi'));
@@ -64,7 +64,7 @@ describe('Agent Hooks Integration', () => {
     });
     describe('runtime hook registration', () => {
         it('allows adding hooks after agent creation', async () => {
-            const lifecycleProvider = new MockHookProvider({ includeModelEvents: false });
+            const lifecycleProvider = new MockHookProvider();
             const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
             const agent = new Agent({ model });
             agent.hooks.addHook(lifecycleProvider);
@@ -77,7 +77,7 @@ describe('Agent Hooks Integration', () => {
     });
     describe('multi-turn conversations', () => {
         it('fires hooks for each invoke call', async () => {
-            const lifecycleProvider = new MockHookProvider({ includeModelEvents: false });
+            const lifecycleProvider = new MockHookProvider();
             const model = new MockMessageModel()
                 .addTurn({ type: 'textBlock', text: 'First response' })
                 .addTurn({ type: 'textBlock', text: 'Second response' });
@@ -169,26 +169,26 @@ describe('Agent Hooks Integration', () => {
             }));
         });
     });
-    describe('ModelStreamEventHook', () => {
-        it('fires for each streaming event from the model', async () => {
+    describe('ModelStreamUpdateEvent', () => {
+        it('is yielded in the stream and dispatched to hooks', async () => {
             const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
-            const agent = new Agent({
-                model,
-                hooks: [mockProvider],
+            const streamUpdateEvents = [];
+            const agent = new Agent({ model });
+            agent.hooks.addCallback(ModelStreamUpdateEvent, (event) => {
+                streamUpdateEvents.push(event);
             });
             // Collect all stream events
             const allStreamEvents = [];
             for await (const event of agent.stream('Test')) {
                 allStreamEvents.push(event);
             }
-            const streamEventHooks = mockProvider.invocations.filter((e) => e instanceof ModelStreamEventHook);
-            // Should have events
-            expect(streamEventHooks.length).toBeGreaterThan(0);
-            // Verify each hook event matches a stream event
-            for (const hookEvent of streamEventHooks) {
-                const event = hookEvent.event;
-                expect(allStreamEvents).toContain(event);
-            }
+            // Should be yielded in the stream
+            const streamUpdates = allStreamEvents.filter((e) => e instanceof ModelStreamUpdateEvent);
+            expect(streamUpdates.length).toBeGreaterThan(0);
+            // Should also fire as hook
+            expect(streamUpdateEvents.length).toBeGreaterThan(0);
+            // Stream and hook should receive the same event instances
+            expect(streamUpdates).toStrictEqual(streamUpdateEvents);
         });
     });
     describe('MessageAddedEvent', () => {