@strands-agents/sdk 0.5.0 → 0.7.0

package/dist/src/tools/function-tool.js

@@ -1,7 +1,8 @@
 import { createErrorResult, Tool } from './tool.js';
 import { ToolStreamEvent } from './tool.js';
 import { deepCopy } from '../types/json.js';
-import { JsonBlock, TextBlock, ToolResultBlock } from '../types/messages.js';
+import { JsonBlock, TextBlock, ToolResultBlock, toolResultContentFromData, } from '../types/messages.js';
+import { DocumentBlock, ImageBlock, VideoBlock } from '../types/media.js';
 /**
  * A Tool implementation that wraps a callback function and handles all ToolResultBlock conversion.
  *
@@ -134,16 +135,42 @@ export class FunctionTool extends Tool {
             return createErrorResult(error, toolUse.toolUseId);
         }
     }
+    /**
+     * Invokes the tool directly with raw input and returns the unwrapped result.
+     *
+     * Unlike stream(), this method:
+     * - Returns the raw result (not wrapped in ToolResult)
+     * - Consumes async generators and returns the generator's return value
+     * - Lets errors throw naturally (not wrapped in error ToolResult)
+     *
+     * @param input - The input parameters for the tool
+     * @param context - Optional tool execution context
+     * @returns The unwrapped result
+     */
+    async invoke(input, context) {
+        const result = this._callback(input, context);
+        if (result && typeof result === 'object' && Symbol.asyncIterator in result) {
+            const generator = result;
+            let iterResult = await generator.next();
+            while (!iterResult.done) {
+                iterResult = await generator.next();
+            }
+            return iterResult.value;
+        }
+        return (await result);
+    }
     /**
      * Wraps a value in a ToolResultBlock with success status.
      *
      * Due to AWS Bedrock limitations (only accepts objects as JSON content), the following
      * rules are applied:
+     * - Content blocks (TextBlock, JsonBlock, ImageBlock, VideoBlock, DocumentBlock) → passed through directly
+     * - Arrays of content blocks → used directly as content array
      * - Strings → TextBlock
      * - Numbers, Booleans → TextBlock (converted to string)
      * - null, undefined → TextBlock (special string representation)
      * - Objects → JsonBlock (with deep copy)
-     * - Arrays → JsonBlock wrapped in \{ $value: array \} (with deep copy)
+     * - Arrays (non-content blocks) → JsonBlock wrapped in \{ $value: array \} (with deep copy)
      *
      * @param value - The value to wrap (can be any type)
      * @param toolUseId - The tool use ID for the ToolResultBlock
@@ -151,6 +178,14 @@ export class FunctionTool extends Tool {
      */
     _wrapInToolResult(value, toolUseId) {
         try {
+            // Handle media blocks - pass through directly
+            if (value instanceof DocumentBlock || value instanceof ImageBlock || value instanceof VideoBlock) {
+                return new ToolResultBlock({
+                    toolUseId,
+                    status: 'success',
+                    content: [value],
+                });
+            }
             // Handle null with special string representation as text content
             if (value === null) {
                 return new ToolResultBlock({
@@ -167,6 +202,15 @@ export class FunctionTool extends Tool {
                     content: [new TextBlock('<undefined>')],
                 });
             }
+            // Handle content blocks - class instances or plain data objects
+            const contentBlock = this._asToolResultContent(value);
+            if (contentBlock) {
+                return new ToolResultBlock({
+                    toolUseId,
+                    status: 'success',
+                    content: [contentBlock],
+                });
+            }
             // Handle primitives (strings, numbers, booleans) as text content
             // Bedrock doesn't accept primitives as JSON content, so we convert all to strings
             if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
@@ -176,8 +220,20 @@ export class FunctionTool extends Tool {
                     content: [new TextBlock(String(value))],
                 });
             }
-            // Handle arrays by wrapping in object { $value: array }
+            // Handle arrays
             if (Array.isArray(value)) {
+                // Check if array contains only content blocks (class instances or plain data objects)
+                if (value.length > 0) {
+                    const converted = value.map((item) => this._asToolResultContent(item));
+                    if (converted.every((item) => item !== undefined)) {
+                        return new ToolResultBlock({
+                            toolUseId,
+                            status: 'success',
+                            content: converted,
+                        });
+                    }
+                }
+                // Otherwise wrap in object { $value: array }
                 const copiedValue = deepCopy(value);
                 return new ToolResultBlock({
                     toolUseId,
@@ -198,5 +254,34 @@ export class FunctionTool extends Tool {
             return createErrorResult(error, toolUseId);
         }
     }
+    /**
+     * Converts a value to a ToolResultContent instance if it matches a known content type.
+     * Accepts both class instances and plain data objects.
+     *
+     * @param value - Value to check and convert
+     * @returns ToolResultContent instance, or undefined if not a recognized content type
+     */
+    _asToolResultContent(value) {
+        if (typeof value !== 'object')
+            return undefined;
+        // Class instances — pass through
+        if (value instanceof TextBlock ||
+            value instanceof JsonBlock ||
+            value instanceof ImageBlock ||
+            value instanceof VideoBlock ||
+            value instanceof DocumentBlock) {
+            return value;
+        }
+        // Plain data objects — require exactly one key to match the discriminated
+        // union shape; multi-key objects fall through to JsonBlock instead.
+        try {
+            if (Object.keys(value).length !== 1)
+                return undefined;
+            return toolResultContentFromData(value);
+        }
+        catch {
+            return undefined;
+        }
+    }
 }
 //# sourceMappingURL=function-tool.js.map

package/dist/src/tools/function-tool.js.map

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

package/dist/src/tools/tool-factory.d.ts

@@ -0,0 +1,22 @@
+import type { InvokableTool } from './tool.js';
+import type { FunctionToolConfig } from './function-tool.js';
+import type { JSONValue } from '../types/json.js';
+import { z } from 'zod';
+import { type ZodToolConfig } from './zod-tool.js';
+/**
+ * Creates an InvokableTool from a Zod schema and callback function.
+ *
+ * @typeParam TInput - Zod schema type for input validation
+ * @typeParam TReturn - Return type of the callback function
+ * @param config - Tool configuration with Zod schema
+ * @returns An InvokableTool with typed input and output
+ */
+export declare function tool<TInput extends z.ZodType, TReturn extends JSONValue = JSONValue>(config: ZodToolConfig<TInput, TReturn>): InvokableTool<z.infer<TInput>, TReturn>;
+/**
+ * Creates an InvokableTool from a JSON schema and callback function.
+ *
+ * @param config - Tool configuration with optional JSON schema
+ * @returns An InvokableTool with unknown input
+ */
+export declare function tool(config: FunctionToolConfig): InvokableTool<unknown, JSONValue>;
+//# sourceMappingURL=tool-factory.d.ts.map

package/dist/src/tools/tool-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-factory.d.ts","sourceRoot":"","sources":["../../../src/tools/tool-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAW,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAY3D;;;;;;;GAOG;AACH,wBAAgB,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,EAClF,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;AAE1C;;;;;GAKG;AACH,wBAAgB,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA"}

package/dist/src/tools/tool-factory.js

@@ -0,0 +1,55 @@
+import { FunctionTool } from './function-tool.js';
+import { z } from 'zod';
+import { ZodTool } from './zod-tool.js';
+/**
+ * Checks whether a value is a Zod schema type.
+ *
+ * @param value - The value to check
+ * @returns True if the value is a Zod schema
+ */
+function isZodType(value) {
+    return value instanceof z.ZodType;
+}
+/**
+ * Creates an InvokableTool from either a Zod schema or JSON schema configuration.
+ *
+ * When a Zod schema is provided as `inputSchema`, input is validated at runtime and
+ * the callback receives typed input. When a JSON schema (or no schema) is provided,
+ * the callback receives `unknown` input with no runtime validation.
+ *
+ * @example
+ * ```typescript
+ * import { tool } from '@strands-agents/sdk'
+ * import { z } from 'zod'
+ *
+ * // With Zod schema (typed + validated)
+ * const calculator = tool({
+ *   name: 'calculator',
+ *   description: 'Adds two numbers',
+ *   inputSchema: z.object({ a: z.number(), b: z.number() }),
+ *   callback: (input) => input.a + input.b,
+ * })
+ *
+ * // With JSON schema (untyped, no validation)
+ * const greeter = tool({
+ *   name: 'greeter',
+ *   description: 'Greets a person',
+ *   inputSchema: {
+ *     type: 'object',
+ *     properties: { name: { type: 'string' } },
+ *     required: ['name'],
+ *   },
+ *   callback: (input) => `Hello, ${(input as { name: string }).name}!`,
+ * })
+ * ```
+ *
+ * @param config - Tool configuration
+ * @returns An InvokableTool that implements the Tool interface with invoke() method
+ */
+export function tool(config) {
+    if (config.inputSchema && isZodType(config.inputSchema)) {
+        return new ZodTool(config);
+    }
+    return new FunctionTool(config);
+}
+//# sourceMappingURL=tool-factory.js.map

package/dist/src/tools/tool-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-factory.js","sourceRoot":"","sources":["../../../src/tools/tool-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,OAAO,EAAsB,MAAM,eAAe,CAAA;AAE3D;;;;;GAKG;AACH,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,CAAC,CAAC,OAAO,CAAA;AACnC,CAAC;AAsBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,UAAU,IAAI,CAClB,MAA4E;IAE5E,IAAI,MAAM,CAAC,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,OAAO,CAAC,MAA6C,CAAC,CAAA;IACnE,CAAC;IAED,OAAO,IAAI,YAAY,CAAC,MAA4B,CAAC,CAAA;AACvD,CAAC"}

package/dist/src/tools/tool.d.ts

@@ -1,6 +1,6 @@
 import type { ToolSpec, ToolUse } from './types.js';
 import { ToolResultBlock } from '../types/messages.js';
-import type { AgentData } from '../types/agent.js';
+import type { LocalAgent } from '../types/agent.js';
 export type { ToolSpec } from './types.js';
 /**
  * Context provided to tool implementations during execution.
@@ -16,7 +16,7 @@ export interface ToolContext {
      * The agent instance that is executing this tool.
      * Provides access to agent state and other agent-level information.
      */
-    agent: AgentData;
+    agent: LocalAgent;
 }
 /**
  * Data for a tool stream event.

package/dist/src/tools/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAa,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGlD,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAA;IAEhB;;;OAGG;IACH,KAAK,EAAE,SAAS,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAA;IAEvB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IACzD;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAG,iBAAiB,CAAS;IAE1C;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;gBAEX,SAAS,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE;CAK1C;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,eAAe,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;AAE7F;;;;;;;;GAQG;AACH,8BAAsB,IAAI;IACxB;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAC/D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa,CAAC,MAAM,EAAE,OAAO,CAAE,SAAQ,IAAI;IAC1D;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAUpF"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../src/tools/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAa,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAGnD,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAA;IAEhB;;;OAGG;IACH,KAAK,EAAE,UAAU,CAAA;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAA;IAEvB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IACzD;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAG,iBAAiB,CAAS;IAE1C;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;gBAEX,SAAS,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE;CAK1C;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,eAAe,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;AAE7F;;;;;;;;GAQG;AACH,8BAAsB,IAAI;IACxB;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAC/D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa,CAAC,MAAM,EAAE,OAAO,CAAE,SAAQ,IAAI;IAC1D;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAUpF"}

package/dist/src/tools/zod-tool.d.ts

@@ -1,4 +1,6 @@
-import type { InvokableTool, ToolContext } from './tool.js';
+import type { InvokableTool, ToolContext, ToolStreamGenerator } from './tool.js';
+import { Tool } from './tool.js';
+import type { ToolSpec } from './types.js';
 import type { JSONValue } from '../types/json.js';
 import { z } from 'zod';
 /**
@@ -11,7 +13,7 @@ type ZodInferred<TInput> = TInput extends z.ZodType ? z.infer<TInput> : never;
  * @typeParam TInput - Zod schema type for input validation
  * @typeParam TReturn - Return type of the callback function
  */
-export interface ToolConfig<TInput extends z.ZodType | undefined, TReturn extends JSONValue = JSONValue> {
+export interface ZodToolConfig<TInput extends z.ZodType | undefined, TReturn extends JSONValue = JSONValue> {
     /** The name of the tool */
     name: string;
     /** A description of what the tool does (optional) */
@@ -31,56 +33,57 @@ export interface ToolConfig<TInput extends z.ZodType | undefined, TReturn extend
     callback: (input: ZodInferred<TInput>, context?: ToolContext) => AsyncGenerator<unknown, TReturn, never> | Promise<TReturn> | TReturn;
 }
 /**
- * Creates an InvokableTool from a Zod schema and callback function.
- *
- * The tool() function validates input against the schema and generates JSON schema
- * for model providers using Zod v4's built-in z.toJSONSchema() method.
- *
- * @example
- * ```typescript
- * import { tool } from '@strands-agents/sdk'
- * import { z } from 'zod'
- *
- * // Tool with input parameters
- * const calculator = tool({
- *   name: 'calculator',
- *   description: 'Performs basic arithmetic',
- *   inputSchema: z.object({
- *     operation: z.enum(['add', 'subtract', 'multiply', 'divide']),
- *     a: z.number(),
- *     b: z.number()
- *   }),
- *   callback: (input) => {
- *     switch (input.operation) {
- *       case 'add': return input.a + input.b
- *       case 'subtract': return input.a - input.b
- *       case 'multiply': return input.a * input.b
- *       case 'divide': return input.a / input.b
- *     }
- *   }
- * })
- *
- * // Tool without input (omit inputSchema)
- * const getStatus = tool({
- *   name: 'getStatus',
- *   description: 'Gets system status',
- *   callback: () => ({ status: 'operational', uptime: 99.9 })
- * })
- *
- * // Direct invocation
- * const result = await calculator.invoke({ operation: 'add', a: 5, b: 3 })
- *
- * // Agent usage
- * for await (const event of calculator.stream(context)) {
- *   console.log(event)
- * }
- * ```
- *
- * @typeParam TInput - Zod schema type for input validation
- * @typeParam TReturn - Return type of the callback function
- * @param config - Tool configuration
- * @returns An InvokableTool that implements the Tool interface with invoke() method
+ * Zod-based tool implementation.
+ * Extends Tool abstract class and implements InvokableTool interface.
  */
-export declare function tool<TInput extends z.ZodType | undefined, TReturn extends JSONValue = JSONValue>(config: ToolConfig<TInput, TReturn>): InvokableTool<ZodInferred<TInput>, TReturn>;
+export declare class ZodTool<TInput extends z.ZodType | undefined, TReturn extends JSONValue = JSONValue> extends Tool implements InvokableTool<ZodInferred<TInput>, TReturn> {
+    /**
+     * Internal FunctionTool for delegating stream operations.
+     */
+    private readonly _functionTool;
+    /**
+     * Zod schema for input validation.
+     * Note: undefined is normalized to z.void() in constructor, so this is always defined.
+     */
+    private readonly _inputSchema;
+    /**
+     * User callback function.
+     */
+    private readonly _callback;
+    constructor(config: ZodToolConfig<TInput, TReturn>);
+    /**
+     * The unique name of the tool.
+     */
+    get name(): string;
+    /**
+     * Human-readable description of what the tool does.
+     */
+    get description(): string;
+    /**
+     * OpenAPI JSON specification for the tool.
+     */
+    get toolSpec(): ToolSpec;
+    /**
+     * Executes the tool with streaming support.
+     * Delegates to internal FunctionTool implementation.
+     *
+     * @param toolContext - Context information including the tool use request and invocation state
+     * @returns Async generator that yields ToolStreamEvents and returns a ToolResultBlock
+     */
+    stream(toolContext: ToolContext): ToolStreamGenerator;
+    /**
+     * Invokes the tool directly with type-safe input and returns the unwrapped result.
+     *
+     * Unlike stream(), this method:
+     * - Returns the raw result (not wrapped in ToolResult)
+     * - Consumes async generators and returns only the final value
+     * - Lets errors throw naturally (not wrapped in error ToolResult)
+     *
+     * @param input - The input parameters for the tool
+     * @param context - Optional tool execution context
+     * @returns The unwrapped result
+     */
+    invoke(input: ZodInferred<TInput>, context?: ToolContext): Promise<TReturn>;
+}
 export {};
 //# sourceMappingURL=zod-tool.d.ts.map

package/dist/src/tools/zod-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/zod-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAuB,MAAM,WAAW,CAAA;AAGhF,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE7D,OAAO,EAAE,CAAC,EAAW,MAAM,KAAK,CAAA;AAGhC;;GAEG;AACH,KAAK,WAAW,CAAC,MAAM,IAAI,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAA;AAE7E;;;;;GAKG;AACH,MAAM,WAAW,UAAU,CAAC,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS;IACrG,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAA;IAEZ,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;;;OAMG;IACH,QAAQ,EAAE,CACR,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAC1B,OAAO,CAAC,EAAE,WAAW,KAClB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;CAC1E;AAwID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,wBAAgB,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9F,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAE7C"}
+{"version":3,"file":"zod-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/zod-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE7D,OAAO,EAAE,CAAC,EAAW,MAAM,KAAK,CAAA;AAGhC;;GAEG;AACH,KAAK,WAAW,CAAC,MAAM,IAAI,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAA;AAE7E;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS;IACxG,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAA;IAEZ,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;;;OAMG;IACH,QAAQ,EAAE,CACR,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAC1B,OAAO,CAAC,EAAE,WAAW,KAClB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;CAC1E;AAED;;;GAGG;AACH,qBAAa,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAC9F,SAAQ,IACR,YAAW,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEtD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAc;IAE5C;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAW;IAExC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAG+C;gBAE7D,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC;IAyClD;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;IAIrD;;;;;;;;;;;OAWG;IACG,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBlF"}

package/dist/src/tools/zod-tool.js

@@ -3,10 +3,10 @@ import { FunctionTool } from './function-tool.js';
 import { z, ZodVoid } from 'zod';
 import { zodSchemaToJsonSchema } from '../utils/zod.js';
 /**
- * Internal implementation of a Zod-based tool.
+ * Zod-based tool implementation.
  * Extends Tool abstract class and implements InvokableTool interface.
  */
-class ZodTool extends Tool {
+export class ZodTool extends Tool {
     /**
      * Internal FunctionTool for delegating stream operations.
      */
@@ -98,12 +98,12 @@ class ZodTool extends Tool {
         const result = this._callback(validatedInput, context);
         // Handle different return types
         if (result && typeof result === 'object' && Symbol.asyncIterator in result) {
-            // AsyncGenerator - consume all yielded values and return the last one
-            let lastValue = undefined;
-            for await (const value of result) {
-                lastValue = value;
+            const generator = result;
+            let iterResult = await generator.next();
+            while (!iterResult.done) {
+                iterResult = await generator.next();
             }
-            return lastValue;
+            return iterResult.value;
         }
         else {
             // Regular value or Promise - return directly
@@ -111,58 +111,4 @@ class ZodTool extends Tool {
         }
     }
 }
-/**
- * Creates an InvokableTool from a Zod schema and callback function.
- *
- * The tool() function validates input against the schema and generates JSON schema
- * for model providers using Zod v4's built-in z.toJSONSchema() method.
- *
- * @example
- * ```typescript
- * import { tool } from '@strands-agents/sdk'
- * import { z } from 'zod'
- *
- * // Tool with input parameters
- * const calculator = tool({
- *   name: 'calculator',
- *   description: 'Performs basic arithmetic',
- *   inputSchema: z.object({
- *     operation: z.enum(['add', 'subtract', 'multiply', 'divide']),
- *     a: z.number(),
- *     b: z.number()
- *   }),
- *   callback: (input) => {
- *     switch (input.operation) {
- *       case 'add': return input.a + input.b
- *       case 'subtract': return input.a - input.b
- *       case 'multiply': return input.a * input.b
- *       case 'divide': return input.a / input.b
- *     }
- *   }
- * })
- *
- * // Tool without input (omit inputSchema)
- * const getStatus = tool({
- *   name: 'getStatus',
- *   description: 'Gets system status',
- *   callback: () => ({ status: 'operational', uptime: 99.9 })
- * })
- *
- * // Direct invocation
- * const result = await calculator.invoke({ operation: 'add', a: 5, b: 3 })
- *
- * // Agent usage
- * for await (const event of calculator.stream(context)) {
- *   console.log(event)
- * }
- * ```
- *
- * @typeParam TInput - Zod schema type for input validation
- * @typeParam TReturn - Return type of the callback function
- * @param config - Tool configuration
- * @returns An InvokableTool that implements the Tool interface with invoke() method
- */
-export function tool(config) {
-    return new ZodTool(config);
-}
 //# sourceMappingURL=zod-tool.js.map

package/dist/src/tools/zod-tool.js.map

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