@strands-agents/sdk 1.2.0 → 1.4.0

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

@@ -5,6 +5,7 @@ import { MockMessageModel } from '../../__fixtures__/mock-message-model.js';
 import { collectGenerator } from '../../__fixtures__/model-test-helpers.js';
 import { createMockTool } from '../../__fixtures__/tool-helpers.js';
 import { TextBlock, ToolResultBlock } from '../../types/messages.js';
+import { BeforeToolCallEvent, BeforeToolsEvent } from '../../hooks/events.js';
 describe('AgentPrinter', () => {
     describe('end-to-end scenarios', () => {
         it('prints simple text output', async () => {
@@ -74,7 +75,7 @@ describe('AgentPrinter', () => {
             agent._printer = new AgentPrinter(mockAppender);
             await collectGenerator(agent.stream('Test'));
             const allOutput = outputs.join('');
-            expect(allOutput).toBe('\n🔧 Tool #1: calc\n✓ Tool completed\nResult: 4\n');
+            expect(allOutput).toBe('\n  ⏳ calc\n\n🔧 Tool #1: calc\n✓ Tool completed\nResult: 4\n');
         });
         it('prints tool error', async () => {
             const model = new MockMessageModel()
@@ -91,7 +92,47 @@ describe('AgentPrinter', () => {
             agent._printer = new AgentPrinter(mockAppender);
             await collectGenerator(agent.stream('Test'));
             const allOutput = outputs.join('');
-            expect(allOutput).toBe('\n🔧 Tool #1: bad_tool\n✗ Tool failed\nError handled\n');
+            expect(allOutput).toBe('\n  ⏳ bad_tool\n\n🔧 Tool #1: bad_tool\n✗ Tool failed\nError handled\n');
+        });
+        it('prints denied tool with denied icon', async () => {
+            const model = new MockMessageModel()
+                .addTurn({ type: 'toolUseBlock', name: 'dangerous_tool', toolUseId: 'tool-1', input: {} })
+                .addTurn({ type: 'textBlock', text: 'Tool was denied' });
+            const tool = createMockTool('dangerous_tool', () => new ToolResultBlock({
+                toolUseId: 'tool-1',
+                status: 'error',
+                content: [new TextBlock('denied')],
+            }));
+            const outputs = [];
+            const mockAppender = (text) => outputs.push(text);
+            const agent = new Agent({ model, tools: [tool], printer: false });
+            agent._printer = new AgentPrinter(mockAppender);
+            agent.addHook(BeforeToolCallEvent, (event) => {
+                event.cancel = 'Tool not allowed';
+            });
+            await collectGenerator(agent.stream('Test'));
+            const allOutput = outputs.join('');
+            expect(allOutput).toBe('\n  ⏳ dangerous_tool\n\n🚫 Tool #1: dangerous_tool (denied)\n✗ Tool failed\nTool was denied\n');
+        });
+        it('prints batch cancel notice when BeforeToolsEvent cancels', async () => {
+            const model = new MockMessageModel()
+                .addTurn({ type: 'toolUseBlock', name: 'tool_a', toolUseId: 'tool-1', input: {} })
+                .addTurn({ type: 'textBlock', text: 'Done' });
+            const tool = createMockTool('tool_a', () => new ToolResultBlock({
+                toolUseId: 'tool-1',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const outputs = [];
+            const mockAppender = (text) => outputs.push(text);
+            const agent = new Agent({ model, tools: [tool], printer: false });
+            agent._printer = new AgentPrinter(mockAppender);
+            agent.addHook(BeforeToolsEvent, (event) => {
+                event.cancel = true;
+            });
+            await collectGenerator(agent.stream('Test'));
+            const allOutput = outputs.join('');
+            expect(allOutput).toBe('\n  ⏳ tool_a\n\n🚫 All tools denied\n✗ Tool failed\nDone\n');
         });
         it('prints comprehensive scenario with all output types', async () => {
             const model = new MockMessageModel()
@@ -125,22 +166,21 @@ describe('AgentPrinter', () => {
             agent._printer = new AgentPrinter(mockAppender);
             await collectGenerator(agent.stream('Test'));
             const allOutput = outputs.join('');
-            const expected = `Let me help you. 
-💭 Reasoning:
-   I need to use the calculator
-
-🔧 Tool #1: calculator
-✓ Tool completed
-The calculation succeeded. 
-💭 Reasoning:
-   Now trying validation
-
-🔧 Tool #2: validator
-✗ Tool failed
-All done. 
-💭 Reasoning:
-   Task completed successfully
-\n`;
+            const expected = [
+                'Let me help you. ',
+                '\n💭 Reasoning:\n   I need to use the calculator\n',
+                '\n  ⏳ calculator\n',
+                '\n🔧 Tool #1: calculator\n',
+                '✓ Tool completed\n',
+                'The calculation succeeded. ',
+                '\n💭 Reasoning:\n   Now trying validation\n',
+                '\n  ⏳ validator\n',
+                '\n🔧 Tool #2: validator\n',
+                '✗ Tool failed\n',
+                'All done. ',
+                '\n💭 Reasoning:\n   Task completed successfully\n',
+                '\n',
+            ].join('');
             expect(allOutput).toBe(expected);
         });
     });

package/dist/src/agent/__tests__/printer.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"printer.test.js","sourceRoot":"","sources":["../../../../src/agent/__tests__/printer.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"printer.test.js","sourceRoot":"","sources":["../../../../src/agent/__tests__/printer.test.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/__tests__/tool-caller.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tool-caller.test.d.ts.map

package/dist/src/agent/__tests__/tool-caller.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-caller.test.d.ts","sourceRoot":"","sources":["../../../../src/agent/__tests__/tool-caller.test.ts"],"names":[],"mappings":""}

package/dist/src/agent/__tests__/tool-caller.test.js

@@ -0,0 +1,459 @@
+import { describe, expect, it } from 'vitest';
+import { Agent } from '../agent.js';
+import { MockMessageModel } from '../../__fixtures__/mock-message-model.js';
+import { createMockTool } from '../../__fixtures__/tool-helpers.js';
+import { Message, ToolResultBlock, TextBlock, ToolUseBlock } from '../../types/messages.js';
+import { ConcurrentInvocationError, ToolNotFoundError } from '../../errors.js';
+import { ToolStreamEvent } from '../../tools/tool.js';
+describe('ToolCaller', () => {
+    describe('basic tool calling via .invoke()', () => {
+        it('calls a tool by name and returns the result', async () => {
+            const tool = createMockTool('calculator', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('8')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            const result = await agent.tool.calculator.invoke({ a: 5, b: 3 });
+            expect(result).toStrictEqual(new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('8')],
+            }));
+        });
+        it('calls a tool with empty input when no input provided', async () => {
+            const tool = createMockTool('ping', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('pong')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            const result = await agent.tool.ping.invoke();
+            expect(result).toStrictEqual(new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('pong')],
+            }));
+        });
+        it('throws when tool is not found', async () => {
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [] });
+            await expect(agent.tool.nonexistent.invoke()).rejects.toThrow(ToolNotFoundError);
+            await expect(agent.tool.nonexistent.invoke()).rejects.toThrow("Tool 'nonexistent' not found");
+        });
+    });
+    describe('underscore-to-hyphen normalization', () => {
+        it('resolves underscore names to hyphenated tool names', async () => {
+            const tool = createMockTool('my-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            const result = await agent.tool.my_tool.invoke();
+            expect(result.status).toBe('success');
+        });
+        it('prefers exact name match over normalized match', async () => {
+            const exactTool = createMockTool('my_tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('exact')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [exactTool] });
+            const result = await agent.tool.my_tool.invoke();
+            expect(result).toStrictEqual(new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('exact')],
+            }));
+        });
+    });
+    describe('case-insensitive name resolution', () => {
+        it('resolves tool names case-insensitively', async () => {
+            const tool = createMockTool('MyTool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            const result = await agent.tool.mytool.invoke();
+            expect(result.status).toBe('success');
+        });
+        it('prefers exact match over case-insensitive match', async () => {
+            const exactTool = createMockTool('myTool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('exact')],
+            }));
+            const upperTool = createMockTool('MYTOOL', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('upper')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [exactTool, upperTool] });
+            const result = await agent.tool.myTool.invoke();
+            expect(result.content[0]).toStrictEqual(new TextBlock('exact'));
+        });
+    });
+    describe('message history recording', () => {
+        it('records tool call in message history by default', async () => {
+            const tool = createMockTool('calculator', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('8')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.calculator.invoke({ a: 5, b: 3 });
+            // Per TESTING.md, prefer full-object assertions over per-field checks.
+            // toolUseId is non-deterministic (UUID), so use expect.stringMatching.
+            expect(agent.messages).toEqual([
+                new Message({
+                    role: 'assistant',
+                    content: [
+                        new ToolUseBlock({
+                            toolUseId: expect.stringMatching(/^tooluse_/),
+                            name: 'calculator',
+                            input: { a: 5, b: 3 },
+                        }),
+                    ],
+                }),
+                new Message({
+                    role: 'user',
+                    content: [
+                        new ToolResultBlock({
+                            toolUseId: 'test-id',
+                            status: 'success',
+                            content: [new TextBlock('8')],
+                        }),
+                    ],
+                }),
+                new Message({
+                    role: 'assistant',
+                    content: [new TextBlock('agent.tool.calculator was called.')],
+                }),
+            ]);
+        });
+        it('does not record when recordDirectToolCall is false per-call', async () => {
+            const tool = createMockTool('calculator', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('8')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.calculator.invoke({ a: 5, b: 3 }, { recordDirectToolCall: false });
+            expect(agent.messages).toHaveLength(0);
+        });
+        it('records when explicitly set to true per-call', async () => {
+            const tool = createMockTool('calculator', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('8')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.calculator.invoke({ a: 5, b: 3 }, { recordDirectToolCall: true });
+            expect(agent.messages).toHaveLength(3);
+        });
+        it('records full input without filtering', async () => {
+            const tool = createMockTool('my-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            Object.defineProperty(tool, 'toolSpec', {
+                value: {
+                    name: 'my-tool',
+                    description: 'Tool with strict schema',
+                    inputSchema: {
+                        type: 'object',
+                        properties: {
+                            allowed: { type: 'string' },
+                        },
+                    },
+                },
+            });
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.my_tool.invoke({ allowed: 'yes', extra: 'also-recorded' });
+            // Input is recorded as-is — no filtering
+            const recToolUseBlock = agent.messages[0].content[0];
+            expect(recToolUseBlock).toBeInstanceOf(ToolUseBlock);
+            expect(recToolUseBlock.input).toStrictEqual({ allowed: 'yes', extra: 'also-recorded' });
+        });
+    });
+    describe('concurrency protection', () => {
+        it('throws ConcurrentInvocationError when agent is invoking and recording is enabled', async () => {
+            const tool = createMockTool('slow-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('done')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            // Simulate the agent being in the middle of an invocation by mocking isInvoking
+            Object.defineProperty(agent, 'isInvoking', { get: () => true });
+            await expect(agent.tool.slow_tool.invoke()).rejects.toThrow(ConcurrentInvocationError);
+            await expect(agent.tool.slow_tool.invoke()).rejects.toThrow('Direct tool call cannot be made while the agent is in the middle of an invocation');
+        });
+        it('allows direct tool call during invocation when recordDirectToolCall is false', async () => {
+            const tool = createMockTool('quick-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            // Simulate the agent being in the middle of an invocation
+            Object.defineProperty(agent, 'isInvoking', { get: () => true });
+            // Should NOT throw when recording is disabled
+            const result = await agent.tool.quick_tool.invoke({}, { recordDirectToolCall: false });
+            expect(result.status).toBe('success');
+        });
+        it('isInvoking is false on a fresh agent', () => {
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model });
+            expect(agent.isInvoking).toBe(false);
+        });
+    });
+    describe('tool error handling', () => {
+        it('propagates errors when tool throws', async () => {
+            const throwingTool = createMockTool('thrower', () => {
+                throw new Error('Boom!');
+            });
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [throwingTool] });
+            await expect(agent.tool.thrower.invoke()).rejects.toThrow('Boom!');
+        });
+    });
+    describe('agent.tool accessor', () => {
+        it('is accessible as a property', () => {
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model });
+            expect(agent.tool).toBeDefined();
+        });
+        it('returns same instance on multiple accesses', () => {
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model });
+            expect(agent.tool).toBe(agent.tool);
+        });
+        it('returns a ToolHandle with invoke and stream methods', () => {
+            const tool = createMockTool('calculator', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            const handle = agent.tool.calculator;
+            expect(typeof handle.invoke).toBe('function');
+            expect(typeof handle.stream).toBe('function');
+        });
+    });
+    describe('tool use ID generation', () => {
+        it('generates unique tool use IDs using crypto.randomUUID', async () => {
+            const tool = createMockTool('id-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('ok')],
+            }));
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.id_tool.invoke();
+            await agent.tool.id_tool.invoke();
+            // Each call records 3 messages: [0]=assistant(toolUse), [1]=user(toolResult), [2]=assistant(ack)
+            // Second call: [3]=assistant(toolUse), [4]=user(toolResult), [5]=assistant(ack)
+            expect(agent.messages).toHaveLength(6);
+            const toolUse1 = agent.messages[0].content[0];
+            const toolUse2 = agent.messages[3].content[0];
+            // Verify both are ToolUseBlocks at the correct indices
+            expect(toolUse1).toBeInstanceOf(ToolUseBlock);
+            expect(toolUse2).toBeInstanceOf(ToolUseBlock);
+            // Verify IDs are unique and follow the expected format
+            expect(toolUse1.toolUseId).toMatch(/^tooluse_/);
+            expect(toolUse2.toolUseId).toMatch(/^tooluse_/);
+            expect(toolUse1.toolUseId).not.toBe(toolUse2.toolUseId);
+        });
+    });
+    describe('streaming via .stream()', () => {
+        it('yields intermediate events and returns final result', async () => {
+            const yields = [];
+            const streamingTool = {
+                name: 'streamer',
+                description: 'A tool that yields progress events',
+                toolSpec: {
+                    name: 'streamer',
+                    description: 'A tool that yields progress events',
+                    inputSchema: { type: 'object', properties: {} },
+                },
+                async *stream() {
+                    yields.push('first');
+                    yield new ToolStreamEvent({ data: 'step 1' });
+                    yields.push('second');
+                    yield new ToolStreamEvent({ data: 'step 2' });
+                    yields.push('third');
+                    yield new ToolStreamEvent({ data: 'step 3' });
+                    return new ToolResultBlock({
+                        toolUseId: 'stream-id',
+                        status: 'success',
+                        content: [new TextBlock('complete')],
+                    });
+                },
+            };
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [streamingTool] });
+            const events = [];
+            const gen = agent.tool.streamer.stream();
+            let result = await gen.next();
+            while (!result.done) {
+                events.push(result.value);
+                result = await gen.next();
+            }
+            const finalResult = result.value;
+            expect(finalResult.status).toBe('success');
+            expect(finalResult.content[0]).toStrictEqual(new TextBlock('complete'));
+            // Verify all yields were consumed (generator fully iterated)
+            expect(yields).toStrictEqual(['first', 'second', 'third']);
+            // Verify we received all 3 stream events
+            expect(events).toHaveLength(3);
+        });
+        it('invoke() also fully consumes multi-yield generator', async () => {
+            const yields = [];
+            const streamingTool = {
+                name: 'streamer',
+                description: 'A tool that yields progress events',
+                toolSpec: {
+                    name: 'streamer',
+                    description: 'A tool that yields progress events',
+                    inputSchema: { type: 'object', properties: {} },
+                },
+                async *stream() {
+                    yields.push('first');
+                    yield new ToolStreamEvent({ data: 'step 1' });
+                    yields.push('second');
+                    yield new ToolStreamEvent({ data: 'step 2' });
+                    yields.push('third');
+                    yield new ToolStreamEvent({ data: 'step 3' });
+                    return new ToolResultBlock({
+                        toolUseId: 'stream-id',
+                        status: 'success',
+                        content: [new TextBlock('complete')],
+                    });
+                },
+            };
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [streamingTool] });
+            const result = await agent.tool.streamer.invoke();
+            expect(result.status).toBe('success');
+            expect(result.content[0]).toStrictEqual(new TextBlock('complete'));
+            // Verify all yields were consumed even when using .invoke()
+            expect(yields).toStrictEqual(['first', 'second', 'third']);
+        });
+    });
+    describe('tool input passthrough', () => {
+        it('passes ALL parameters to tool execution', async () => {
+            let receivedInput = null;
+            const tool = createMockTool('capture-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('captured')],
+            }));
+            // Override stream to capture input
+            const originalStream = tool.stream.bind(tool);
+            tool.stream = function (context) {
+                receivedInput = context.toolUse.input;
+                return originalStream(context);
+            };
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [tool] });
+            await agent.tool.capture_tool.invoke({ allowed: 'yes', extra: 'should-pass-through' });
+            // Tool receives ALL parameters
+            expect(receivedInput).toStrictEqual({ allowed: 'yes', extra: 'should-pass-through' });
+        });
+    });
+    describe('dynamically added tools', () => {
+        it('can call a tool that was added after agent creation', async () => {
+            const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+            const agent = new Agent({ model, tools: [] });
+            // Add tool after creation
+            const laterTool = createMockTool('later-tool', () => new ToolResultBlock({
+                toolUseId: 'test-id',
+                status: 'success',
+                content: [new TextBlock('dynamic')],
+            }));
+            agent.toolRegistry.add(laterTool);
+            const result = await agent.tool.later_tool.invoke();
+            expect(result.status).toBe('success');
+            expect(result.content[0]).toStrictEqual(new TextBlock('dynamic'));
+        });
+    });
+});
+describe('MessageAddedEvent hooks', () => {
+    it('fires MessageAddedEvent for each message recorded during direct tool call', async () => {
+        const { MessageAddedEvent } = await import('../../hooks/events.js');
+        const tool = createMockTool('calculator', () => new ToolResultBlock({
+            toolUseId: 'test-id',
+            status: 'success',
+            content: [new TextBlock('8')],
+        }));
+        const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+        const agent = new Agent({ model, tools: [tool] });
+        const firedEvents = [];
+        agent.addHook(MessageAddedEvent, (event) => {
+            firedEvents.push(event);
+        });
+        await agent.tool.calculator.invoke({ a: 5, b: 3 });
+        // Should fire 3 MessageAddedEvents (one per recorded message).
+        // Use full-object assertions per TESTING.md.
+        expect(firedEvents).toHaveLength(3);
+        expect(firedEvents[0].message).toEqual(new Message({
+            role: 'assistant',
+            content: [
+                new ToolUseBlock({
+                    toolUseId: expect.stringMatching(/^tooluse_/),
+                    name: 'calculator',
+                    input: { a: 5, b: 3 },
+                }),
+            ],
+        }));
+        expect(firedEvents[1].message).toEqual(new Message({
+            role: 'user',
+            content: [
+                new ToolResultBlock({
+                    toolUseId: 'test-id',
+                    status: 'success',
+                    content: [new TextBlock('8')],
+                }),
+            ],
+        }));
+        expect(firedEvents[2].message).toEqual(new Message({
+            role: 'assistant',
+            content: [new TextBlock('agent.tool.calculator was called.')],
+        }));
+    });
+    it('does not fire MessageAddedEvent when recordDirectToolCall is false', async () => {
+        const { MessageAddedEvent } = await import('../../hooks/events.js');
+        const tool = createMockTool('calculator', () => new ToolResultBlock({
+            toolUseId: 'test-id',
+            status: 'success',
+            content: [new TextBlock('8')],
+        }));
+        const model = new MockMessageModel().addTurn({ type: 'textBlock', text: 'Hello' });
+        const agent = new Agent({ model, tools: [tool] });
+        const firedEvents = [];
+        agent.addHook(MessageAddedEvent, (event) => {
+            firedEvents.push(event);
+        });
+        await agent.tool.calculator.invoke({ a: 5, b: 3 }, { recordDirectToolCall: false });
+        // No events should fire when recording is disabled
+        expect(firedEvents).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=tool-caller.test.js.map