From 4d9e4de3871e08b39f7862782c46db95e8bdd43c Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Thu, 29 Oct 2026 20:34:48 -0500 Subject: [PATCH] fix(ai): accept typed tools in loop (#60390) --- packages/ai/src/tool.ts | 9 ++--- packages/ai/test/loop-tools.types.ts | 50 ++++++++++++++++++++++++++++ packages/ai/tsconfig.types.json | 2 ++ 3 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 packages/ai/test/loop-tools.types.ts diff --git a/packages/ai/src/tool.ts b/packages/ai/src/tool.ts index 9fd9da30f25..6d48cb6193b 100644 --- a/packages/ai/src/tool.ts +++ b/packages/ai/src/tool.ts @@ -74,14 +74,11 @@ export interface Definition, Success extends readonly toStructuredOutput?: (output: Success["Encoded"]) => unknown /** @internal */ readonly _decode: (input: unknown) => Effect.Effect, Schema.SchemaError> + // Method syntax keeps these parameters bivariant, so a concrete tool stays assignable to `AnyExecutableTool`. /** @internal */ - readonly _encode: (value: Schema.Schema.Type) => Effect.Effect + _encode(value: Schema.Schema.Type): Effect.Effect /** @internal */ - readonly _project: ( - parameters: Schema.Schema.Type, - id: ToolCallPart["id"], - output: unknown, - ) => ToolOutputType + _project(parameters: Schema.Schema.Type, id: ToolCallPart["id"], output: unknown): ToolOutputType /** @internal */ readonly _legacyResult: boolean /** @internal */ diff --git a/packages/ai/test/loop-tools.types.ts b/packages/ai/test/loop-tools.types.ts new file mode 100644 index 00000000000..843baa7a34a --- /dev/null +++ b/packages/ai/test/loop-tools.types.ts @@ -0,0 +1,50 @@ +import { Effect, Schema } from "effect" +import { LLM } from "../src/effect.js" +import * as OpenAIChat from "../src/protocols/openai-chat.js" +import { Auth } from "../src/route.js" +import { Tool } from "../src/tool.js" +import { AI, ai } from "../src/index.js" + +const model = OpenAIChat.route.with({ auth: Auth.bearer("fixture") }).model({ id: "gpt-4o-mini" }) + +const add = AI.tool({ + description: "Add two numbers.", + parameters: Schema.Struct({ a: Schema.Number, b: Schema.Number }), + execute: (input) => input.a + input.b, +}) + +const echo = AI.tool({ + description: "Echo text.", + parameters: Schema.String, + execute: (input) => input.toUpperCase(), +}) + +const weather = Tool.make({ + description: "Get weather.", + parameters: Schema.Struct({ city: Schema.String }), + success: Schema.Struct({ forecast: Schema.String }), + execute: (input) => Effect.succeed({ forecast: input.city }), +}) + +const shout = Tool.make({ + description: "Shout text.", + parameters: Schema.String, + success: Schema.String, + execute: (input) => Effect.succeed(input.toUpperCase()), +}) + +const schemaOnly = Tool.make({ + description: "Get weather.", + parameters: Schema.Struct({ city: Schema.String }), + success: Schema.Struct({ forecast: Schema.String }), +}) + +ai.llm.loop({ model, prompt: "Add 2 and 3.", tools: { add } }) +ai.llm.loop({ model, prompt: "Get weather.", tools: { weather } }) +ai.llm.loop({ model, prompt: "Use any tool.", tools: { add, echo, weather, shout } }) +LLM.loop({ model, prompt: "Add 2 and 3.", tools: { add } }) +LLM.loop({ model, prompt: "Get weather.", tools: { weather } }) +LLM.loop({ model, prompt: "Use any tool.", tools: { add, echo, weather, shout } }) + +// @ts-expect-error The loop runs tools, so each one needs an execute handler. +LLM.loop({ model, prompt: "Get weather.", tools: { schemaOnly } }) diff --git a/packages/ai/tsconfig.types.json b/packages/ai/tsconfig.types.json index 911f47029d0..fd12c46e32a 100644 --- a/packages/ai/tsconfig.types.json +++ b/packages/ai/tsconfig.types.json @@ -8,6 +8,8 @@ "include": [ "example/**/*.ts", "test/**/*.types.ts", + "test/loop.test.ts", + "test/promise.test.ts", "test/testing.test.ts", "test/testing-media.test.ts", "test/provider/checkpoint.test.ts"