straighten up types

christian-bromann · christian-bromann · commit 167117ce1c00 · 2025-12-10T15:17:21.000-08:00
diff --git a/libs/providers/langchain-anthropic/package.json b/libs/providers/langchain-anthropic/package.json
@@ -97,4 +97,4 @@
     "README.md",
     "LICENSE"
   ]
-}
+}
diff --git a/libs/providers/langchain-anthropic/src/tools/bash.ts b/libs/providers/langchain-anthropic/src/tools/bash.ts
@@ -1,7 +1,6 @@
-import { z } from "zod/v4";
 import Anthropic from "@anthropic-ai/sdk";
 import { tool } from "@langchain/core/tools";
-import type { ToolRuntime } from "@langchain/core/tools";
+import type { DynamicStructuredTool, ToolRuntime } from "@langchain/core/tools";
 
 import {
   Bash20250124CommandSchema,
@@ -100,7 +99,7 @@ export function bash_20250124(options?: Bash20250124Options) {
     {
       name,
       description: "A tool for executing bash commands",
-      schema: z.toJSONSchema(Bash20250124CommandSchema),
+      schema: Bash20250124CommandSchema,
     }
   );
 
@@ -112,5 +111,10 @@ export function bash_20250124(options?: Bash20250124Options) {
     } satisfies Anthropic.Beta.BetaToolBash20250124,
   };
 
-  return bashTool;
+  return bashTool as DynamicStructuredTool<
+    typeof Bash20250124CommandSchema,
+    Bash20250124Command,
+    unknown,
+    string
+  >;
 }
diff --git a/libs/providers/langchain-anthropic/src/tools/computer.ts b/libs/providers/langchain-anthropic/src/tools/computer.ts
@@ -15,7 +15,7 @@ import {
 
 const TOOL_NAME = "computer";
 
-type ComputerUseReturnType =
+export type ComputerUseReturnType =
   | string
   | Promise<string>
   | ToolMessage<any>
@@ -266,6 +266,6 @@ export function computer_20250124(options: Computer20250124Options) {
     typeof Computer20250124ActionSchema,
     Computer20250124Action,
     any,
-    ToolMessage<any>
+    ComputerUseReturnType
   >;
 }
diff --git a/libs/providers/langchain-anthropic/src/tools/index.ts b/libs/providers/langchain-anthropic/src/tools/index.ts
@@ -18,6 +18,7 @@ import {
   computer_20250124,
   type Computer20251124Options,
   type Computer20250124Options,
+  type ComputerUseReturnType,
 } from "./computer.js";
 import {
   codeExecution_20250825,
@@ -45,6 +46,7 @@ export type {
   Bash20250124Options,
   Computer20251124Options,
   Computer20250124Options,
+  ComputerUseReturnType,
   CodeExecution20250825Options,
   TextEditor20250728Options,
   ToolSearchOptions,
diff --git a/libs/providers/langchain-anthropic/src/tools/memory.ts b/libs/providers/langchain-anthropic/src/tools/memory.ts
@@ -1,11 +1,11 @@
-import { z } from "zod/v4";
 import Anthropic from "@anthropic-ai/sdk";
 import { tool } from "@langchain/core/tools";
 import type { DynamicStructuredTool, ToolRuntime } from "@langchain/core/tools";
 
 import {
   Memory20250818CommandSchema,
   type MemoryTool20250818Options,
+  type Memory20250818Command,
 } from "./types.js";
 
 /**
@@ -51,7 +51,7 @@ export function memory_20250818(
     ) => string | Promise<string>,
     {
       name: "memory",
-      schema: z.toJSONSchema(Memory20250818CommandSchema),
+      schema: Memory20250818CommandSchema,
     }
   );
 
@@ -63,5 +63,10 @@ export function memory_20250818(
     } satisfies Anthropic.Beta.BetaMemoryTool20250818,
   };
 
-  return memoryTool;
+  return memoryTool as DynamicStructuredTool<
+    typeof Memory20250818CommandSchema,
+    Memory20250818Command,
+    unknown,
+    string | Promise<string>
+  >;
 }
diff --git a/libs/providers/langchain-anthropic/src/tools/textEditor.ts b/libs/providers/langchain-anthropic/src/tools/textEditor.ts
@@ -1,4 +1,3 @@
-import { z } from "zod/v4";
 import Anthropic from "@anthropic-ai/sdk";
 import { tool } from "@langchain/core/tools";
 import type { DynamicStructuredTool, ToolRuntime } from "@langchain/core/tools";
@@ -77,9 +76,7 @@ export interface TextEditor20250728Options {
  *
  * @see https://docs.anthropic.com/en/docs/agents-and-tools/tool-use/text-editor-tool
  */
-export function textEditor_20250728(
-  options?: TextEditor20250728Options
-): DynamicStructuredTool {
+export function textEditor_20250728(options?: TextEditor20250728Options) {
   const name = "str_replace_based_edit_tool";
   const textEditorTool = tool(
     options?.execute as (
@@ -89,7 +86,7 @@ export function textEditor_20250728(
     {
       name,
       description: "A tool for editing text files",
-      schema: z.toJSONSchema(TextEditor20250728CommandSchema),
+      schema: TextEditor20250728CommandSchema,
     }
   );
 
@@ -104,5 +101,10 @@ export function textEditor_20250728(
     } satisfies Anthropic.Beta.Messages.BetaToolTextEditor20250728,
   };
 
-  return textEditorTool;
+  return textEditorTool as DynamicStructuredTool<
+    typeof TextEditor20250728CommandSchema,
+    TextEditor20250728Command,
+    unknown,
+    string | Promise<string>
+  >;
 }
diff --git a/libs/providers/langchain-openai/src/tools/applyPatch.ts b/libs/providers/langchain-openai/src/tools/applyPatch.ts
@@ -1,6 +1,6 @@
 import { z } from "zod/v4";
 import { OpenAI as OpenAIClient } from "openai";
-import { tool } from "@langchain/core/tools";
+import { tool, type DynamicStructuredTool } from "@langchain/core/tools";
 
 /**
  * Re-export operation types from OpenAI SDK for convenience.
@@ -170,7 +170,7 @@ export function applyPatch(options: ApplyPatchOptions) {
     name: TOOL_NAME,
     description:
       "Apply structured diffs to create, update, or delete files in the codebase.",
-    schema: z.toJSONSchema(ApplyPatchOperationSchema),
+    schema: ApplyPatchOperationSchema,
   });
 
   patchTool.extras = {
@@ -180,5 +180,10 @@ export function applyPatch(options: ApplyPatchOptions) {
     } satisfies ApplyPatchTool,
   };
 
-  return patchTool;
+  return patchTool as DynamicStructuredTool<
+    typeof ApplyPatchOperationSchema,
+    ApplyPatchOperation,
+    unknown,
+    string
+  >;
 }
diff --git a/libs/providers/langchain-openai/src/tools/codeInterpreter.ts b/libs/providers/langchain-openai/src/tools/codeInterpreter.ts
@@ -1,4 +1,5 @@
 import { OpenAI as OpenAIClient } from "openai";
+import type { ServerTool } from "@langchain/core/tools";
 
 /**
  * Memory limit options for the Code Interpreter container.
@@ -141,9 +142,7 @@ function convertContainer(
  * - Files in model input are automatically uploaded to the container
  * - Generated files are returned as `container_file_citation` annotations
  */
-export function codeInterpreter(
-  options?: CodeInterpreterOptions
-): CodeInterpreterTool {
+export function codeInterpreter(options?: CodeInterpreterOptions): ServerTool {
   return {
     type: "code_interpreter",
     container: convertContainer(options?.container),
diff --git a/libs/providers/langchain-openai/src/tools/computerUse.ts b/libs/providers/langchain-openai/src/tools/computerUse.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { z } from "zod/v4";
 import { OpenAI as OpenAIClient } from "openai";
 import { tool, type DynamicStructuredTool } from "@langchain/core/tools";
@@ -155,6 +156,12 @@ export interface ComputerUseInput {
   action: ComputerUseAction;
 }
 
+export type ComputerUseReturnType =
+  | string
+  | Promise<string>
+  | ToolMessage<any>
+  | Promise<ToolMessage<any>>;
+
 /**
  * Options for the Computer Use tool.
  */
@@ -186,9 +193,8 @@ export interface ComputerUseOptions {
    */
   execute: (
     action: ComputerUseAction,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     runtime: ToolRuntime<any, any>
-  ) => string | Promise<string> | ToolMessage | Promise<ToolMessage>;
+  ) => ComputerUseReturnType;
 }
 
 /**
@@ -381,7 +387,6 @@ export function computerUse(options: ComputerUseOptions) {
     typeof ComputerUseActionSchema,
     ComputerUseInput,
     unknown,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ToolMessage<any>
+    ComputerUseReturnType
   >;
 }
diff --git a/libs/providers/langchain-openai/src/tools/fileSearch.ts b/libs/providers/langchain-openai/src/tools/fileSearch.ts
@@ -1,4 +1,5 @@
 import { OpenAI as OpenAIClient } from "openai";
+import type { ServerTool } from "@langchain/core/tools";
 
 /**
  * Comparison operators for file attribute filtering.
@@ -250,7 +251,7 @@ function convertRankingOptions(
  * - Use `include: ["file_search_call.results"]` in the API call to get search results
  * - Supported file types include PDF, DOCX, TXT, MD, and many code file formats
  */
-export function fileSearch(options: FileSearchOptions): FileSearchTool {
+export function fileSearch(options: FileSearchOptions): ServerTool {
   return {
     type: "file_search",
     vector_store_ids: options.vectorStoreIds,
diff --git a/libs/providers/langchain-openai/src/tools/imageGeneration.ts b/libs/providers/langchain-openai/src/tools/imageGeneration.ts
@@ -1,4 +1,5 @@
 import { OpenAI as OpenAIClient } from "openai";
+import type { ServerTool } from "@langchain/core/tools";
 
 /**
  * Optional mask for inpainting. Allows you to specify areas of the image
@@ -215,9 +216,7 @@ function convertInputImageMask(
  * - Access the revised prompt via `revised_prompt` field in the output
  * - Multi-turn editing is supported by passing previous response messages
  */
-export function imageGeneration(
-  options?: ImageGenerationOptions
-): ImageGenerationTool {
+export function imageGeneration(options?: ImageGenerationOptions): ServerTool {
   return {
     type: "image_generation",
     background: options?.background,
diff --git a/libs/providers/langchain-openai/src/tools/localShell.ts b/libs/providers/langchain-openai/src/tools/localShell.ts
@@ -1,6 +1,6 @@
 import { z } from "zod/v4";
 import { OpenAI as OpenAIClient } from "openai";
-import { tool } from "@langchain/core/tools";
+import { tool, type DynamicStructuredTool } from "@langchain/core/tools";
 
 /**
  * Re-export action type from OpenAI SDK for convenience.
@@ -178,7 +178,7 @@ export function localShell(options: LocalShellOptions) {
     name: TOOL_NAME,
     description:
       "Execute shell commands locally on the machine. Commands are provided as argv tokens.",
-    schema: z.toJSONSchema(LocalShellActionSchema),
+    schema: LocalShellActionSchema,
   });
 
   shellTool.extras = {
@@ -188,5 +188,10 @@ export function localShell(options: LocalShellOptions) {
     } satisfies LocalShellTool,
   };
 
-  return shellTool;
+  return shellTool as DynamicStructuredTool<
+    typeof LocalShellActionSchema,
+    LocalShellAction,
+    unknown,
+    string
+  >;
 }
diff --git a/libs/providers/langchain-openai/src/tools/mcp.ts b/libs/providers/langchain-openai/src/tools/mcp.ts
@@ -1,4 +1,5 @@
 import { OpenAI as OpenAIClient } from "openai";
+import type { ServerTool } from "@langchain/core/tools";
 
 /**
  * Available connector IDs for OpenAI's built-in service connectors.
@@ -227,11 +228,11 @@ function convertRequireApproval(
  * });
  * ```
  */
-export function mcp(options: McpRemoteServerOptions): McpTool;
-export function mcp(options: McpConnectorOptions): McpTool;
+export function mcp(options: McpRemoteServerOptions): ServerTool;
+export function mcp(options: McpConnectorOptions): ServerTool;
 export function mcp(
   options: McpRemoteServerOptions | McpConnectorOptions
-): McpTool {
+): ServerTool {
   const baseConfig: McpTool = {
     type: "mcp",
     server_label: options.serverLabel,
diff --git a/libs/providers/langchain-openai/src/tools/shell.ts b/libs/providers/langchain-openai/src/tools/shell.ts
@@ -1,6 +1,6 @@
 import { z } from "zod/v4";
 import { OpenAI as OpenAIClient } from "openai";
-import { tool } from "@langchain/core/tools";
+import { tool, type DynamicStructuredTool } from "@langchain/core/tools";
 
 /**
  * Re-export action type from OpenAI SDK for convenience.
@@ -249,7 +249,7 @@ export function shell(options: ShellOptions) {
     name: TOOL_NAME,
     description:
       "Execute shell commands in a managed environment. Commands can be run concurrently.",
-    schema: z.toJSONSchema(ShellActionSchema),
+    schema: ShellActionSchema,
   });
 
   shellTool.extras = {
@@ -259,5 +259,10 @@ export function shell(options: ShellOptions) {
     } satisfies ShellTool,
   };
 
-  return shellTool;
+  return shellTool as DynamicStructuredTool<
+    typeof ShellActionSchema,
+    ShellAction,
+    unknown,
+    string
+  >;
 }
diff --git a/libs/providers/langchain-openai/src/tools/webSearch.ts b/libs/providers/langchain-openai/src/tools/webSearch.ts
@@ -1,4 +1,5 @@
 import { OpenAI as OpenAIClient } from "openai";
+import type { ServerTool } from "@langchain/core/tools";
 
 /**
  * User location configuration for geographic search refinement.
@@ -125,7 +126,7 @@ export type WebSearchTool = OpenAIClient.Responses.WebSearchTool;
  * });
  * ```
  */
-export function webSearch(options?: WebSearchOptions): WebSearchTool {
+export function webSearch(options?: WebSearchOptions): ServerTool {
   return {
     type: "web_search",
     filters: options?.filters?.allowedDomains

Original file line number	Diff line number	Diff line change
`@@ -97,4 +97,4 @@`
`97`	`97`	`"README.md",`
`98`	`98`	`"LICENSE"`
`99`	`99`	`]`
`100`		`-}`
	`100`	`+}`