@xsai/text 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { S as StepEndDoneEvent, T as ToolCallPart, a as ToolResultPart, U as Usage, b as TextEvent, M as Message, L as LanguageModelOptions, c as LanguageModel, d as ToolExecuteOptions } from './language-model-CAPBb-ti.js';
+import { S as StepEndDoneEvent, T as ToolCallPart, a as ToolResultPart, U as Usage, b as TextEvent, L as LanguageModelOptions, M as Message, c as LanguageModel, d as ToolExecuteOptions } from './language-model-CAPBb-ti.js';
 export { A as AssistantMessage, e as AssistantMessageContent, f as AudioPart, C as CombinedStandardSchema, g as Content, h as ContentEndEvent, i as ContentMap, j as ContentStartEvent, k as ContentType, D as DeveloperMessage, l as DeveloperMessageContent, E as ExecutableTool, F as FilePart, m as FinishReason, I as ImagePart, n as InferSchemaInput, o as InferSchemaOutput, J as JSONSchema7, p as JSONSchema7Definition, q as LanguageModelProviderOptions, r as MessageMap, s as MessageProviderMetadata, t as MessageType, P as PartProviderMetadata, u as ProviderPart, R as RawEvent, v as ReasoningDeltaEvent, w as ReasoningPart, x as ReasoningPartContent, y as RefusalDeltaEvent, z as RefusalPart, B as ResolvedSchema, G as StepEndEvent, H as StepEndFailEvent, K as StepStartEvent, N as StepStatus, O as SystemMessage, Q as SystemMessageContent, V as TextDeltaEvent, W as TextEventMap, X as TextEventType, Y as TextPart, Z as Tool, _ as ToolCallDeltaEvent, $ as ToolChoice, a0 as ToolOptions, a1 as ToolResultPartContent, a2 as UnresolvedSchema, a3 as UserMessage, a4 as UserMessageContent, a5 as formatIssues, a6 as resolveSchema, a7 as tool } from './language-model-CAPBb-ti.js';
 import { Promisable } from '@xsai/shared';
 export { HttpError, XSAIError, XSAIErrorCause, XSAIErrorCauseMap, XSAIErrorCode, XSAIErrorOptions } from '@xsai/shared';
@@ -16,8 +16,9 @@ interface CollectResult extends StepResult {
 declare const collect: (stream: ReadableStream<TextEvent>) => Promise<CollectResult>;
 
 type PrepareStep = (options: PrepareStepOptions) => Promisable<PrepareStepResult | undefined>;
-interface PrepareStepOptions {
+interface PrepareStepOptions extends Pick<LanguageModelOptions, 'instructions' | 'tools'> {
     input: readonly Message[];
+    model: LanguageModel;
     signal: AbortSignal;
     stepNumber: number;
     steps: readonly StepResult[];

package/dist/index.js

@@ -112,6 +112,13 @@ const runTool = async (call, tools, options) => {
   }
   return { callId: call.callId, output: await tool.execute(input, options), type: "tool-result" };
 };
+const finishTool = async (call, result, { postToolCall, signal }) => {
+  const posted = await attempt(call, signal, async () => postToolCall?.(result, { callId: call.callId, signal }));
+  if (posted == null)
+    return result;
+  assertSameCallId(result.callId, posted.callId);
+  return posted;
+};
 const executeTool = async (call, { postToolCall, preToolCall, signal, tools }) => {
   const options = { callId: call.callId, signal };
   const prepared = await attempt(call, signal, async () => preToolCall?.(call, options));
@@ -122,13 +129,8 @@ const executeTool = async (call, { postToolCall, preToolCall, signal, tools }) =
     call = prepared;
   }
   const result = await attempt(call, signal, async () => runTool(call, tools, options));
-  const posted = await attempt(call, signal, async () => postToolCall?.(result, options));
-  if (posted == null)
-    return result;
-  assertSameCallId(result.callId, posted.callId);
-  return posted;
+  return finishTool(call, result, { postToolCall, signal });
 };
-const executeTools = async ({ reason, toolCalls, ...options }) => reason === "length" ? toolCalls.map((call) => toolError(call, "The response reached the output token limit before the tool call was complete.")) : Promise.all(toolCalls.map(async (call) => executeTool(call, options)));
 
 const streamText = (model, { postToolCall, prepareStep, preToolCall, stopWhen: stopWhenOption, ...options }) => {
   const stopWhen = stopWhenOption ?? maxSteps(10);
@@ -139,7 +141,7 @@ const streamText = (model, { postToolCall, prepareStep, preToolCall, stopWhen: s
   const generate = async function* () {
     while (true) {
       signal.throwIfAborted();
-      const { model: preparedModel = model, ...preparedOptions } = await prepareStep?.({ input, signal, stepNumber: steps.length, steps }) ?? {};
+      const { model: preparedModel = model, ...preparedOptions } = await prepareStep?.({ input, instructions: options.instructions, model, signal, stepNumber: steps.length, steps, tools: options.tools }) ?? {};
       signal.throwIfAborted();
       const modelOptions = {
         ...options,
@@ -159,13 +161,8 @@ const streamText = (model, { postToolCall, prepareStep, preToolCall, stopWhen: s
       signal.throwIfAborted();
       if (step.toolCalls.length === 0)
         continue;
-      const results = await executeTools({
-        ...modelOptions,
-        postToolCall,
-        preToolCall,
-        reason: step.reason,
-        toolCalls: step.toolCalls
-      });
+      const toolOptions = { ...modelOptions, postToolCall, preToolCall };
+      const results = await Promise.all(step.toolCalls.map(async (call) => step.reason === "length" ? finishTool(call, toolError(call, "The response reached the output token limit before the tool call was complete."), toolOptions) : executeTool(call, toolOptions)));
       signal.throwIfAborted();
       step.toolResults.push(...results);
       input.push({ content: results, role: "user" });
@@ -216,26 +213,24 @@ const tool = ((options) => {
     name: options.name,
     outputSchema
   };
-  if (options.execute == null) {
+  if (options.execute == null)
     return tool2;
-  } else {
-    return {
-      ...tool2,
-      execute: async (input, executeOptions) => {
-        let result = await options.execute(input, executeOptions);
-        if (outputSchema?.validate != null) {
-          const validation = await outputSchema.validate(result);
-          if (validation.issues)
-            throw new Error(`Tool output validation failed for "${options.name}": ${formatIssues(validation.issues)}`);
-          result = validation.value;
-        }
-        if (outputSchema)
-          return JSON.stringify(result);
-        else
-          return result;
+  return {
+    ...tool2,
+    execute: async (input, executeOptions) => {
+      let result = await options.execute(input, executeOptions);
+      if (outputSchema?.validate != null) {
+        const validation = await outputSchema.validate(result);
+        if (validation.issues)
+          throw new Error(`Tool output validation failed for "${options.name}": ${formatIssues(validation.issues)}`);
+        result = validation.value;
       }
-    };
-  }
+      if (outputSchema)
+        return JSON.stringify(result);
+      else
+        return result;
+    }
+  };
 });
 
 export { TextEventTarget, and, collect, executeTool, generateText, hasToolCall, maxSteps, not, or, stepCountAtLeast, streamText, toCustomEvent, tool, withEventTarget };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/text",
   "type": "module",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "extra-small AI SDK: provider-agnostic text generation, streaming and tool calling.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "node": ">=26"
   },
   "dependencies": {
-    "@xsai/shared": "1.0.0-beta.6"
+    "@xsai/shared": "1.0.0-beta.7"
   },
   "devDependencies": {
     "@standard-schema/spec": "1.1.0",