feat(tool): add execute options (#35)

* fix(tool/generate-text): add reference * feat(tool): add execute options
moeru-ai · Jan 22, 2025 · 210f2c4 · 210f2c4
1 parent 796154b
commit 210f2c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/packages/generate-text/src/index.ts b/packages/generate-text/src/index.ts
@@ -117,7 +117,7 @@ const rawGenerateText: RawGenerateText = async (options: GenerateTextOptions) =>
       } of message.tool_calls) {
         const tool = (options.tools as Tool[]).find(tool => tool.function.name === toolName)!
         const parsedArgs = JSON.parse(toolArgs) as Record<string, unknown>
-        const result = await tool.execute(parsedArgs)
+        const result = await tool.execute(parsedArgs, { abortSignal: options.abortSignal, messages, toolCallId })
 
         toolCalls.push({
           args: toolArgs,

diff --git a/packages/shared-chat/src/types/tool.ts b/packages/shared-chat/src/types/tool.ts
@@ -1,5 +1,7 @@
+import type { Message } from './message'
+
 export interface Tool {
-  execute: (input: unknown) => Promise<string> | string
+  execute: (input: unknown, options: ToolExecuteOptions) => Promise<string> | string
   function: {
     description?: string
     name: string
@@ -8,3 +10,9 @@ export interface Tool {
   }
   type: 'function'
 }
+
+interface ToolExecuteOptions {
+  abortSignal?: AbortSignal
+  messages: Message[]
+  toolCallId: string
+}
diff --git a/packages/tool/src/generate-text.ts b/packages/tool/src/generate-text.ts
@@ -1,3 +1,5 @@
+/// <reference types="@xsai/generate-text" />
+
 import type { Schema } from '@typeschema/main'
 
 import type { ToolResult } from '.'