ai 5.0.0-alpha.2 → 5.0.0-alpha.3

package/dist/index.mjs

@@ -504,9 +504,8 @@ var uiMessageStreamPartSchema = z.union([
     providerMetadata: z.record(z.any()).optional()
   }),
   z.object({
-    type: z.literal("source"),
-    sourceType: z.literal("url"),
-    id: z.string(),
+    type: z.literal("source-url"),
+    sourceId: z.string(),
     url: z.string(),
     title: z.string().optional(),
     providerMetadata: z.any().optional()
@@ -1062,16 +1061,13 @@ function processUIMessageStream({
               write();
               break;
             }
-            case "source": {
+            case "source-url": {
               state.message.parts.push({
-                type: "source",
-                source: {
-                  sourceType: "url",
-                  id: part.id,
-                  url: part.url,
-                  title: part.title,
-                  providerMetadata: part.providerMetadata
-                }
+                type: "source-url",
+                sourceId: part.sourceId,
+                url: part.url,
+                title: part.title,
+                providerMetadata: part.providerMetadata
               });
               write();
               break;
@@ -1254,7 +1250,6 @@ var getOriginalFetch = () => fetch;
 async function fetchUIMessageStream({
   api,
   body,
-  streamProtocol = "ui-message",
   credentials,
   headers,
   abortController,
@@ -1288,9 +1283,7 @@ async function fetchUIMessageStream({
   if (!response.body) {
     throw new Error("The response body is empty.");
   }
-  return streamProtocol === "text" ? transformTextToUiMessageStream({
-    stream: response.body.pipeThrough(new TextDecoderStream())
-  }) : parseJsonEventStream({
+  return parseJsonEventStream({
     stream: response.body,
     schema: uiMessageStreamPartSchema
   }).pipeThrough(
@@ -1304,6 +1297,46 @@ async function fetchUIMessageStream({
     })
   );
 }
+async function fetchTextStream({
+  api,
+  body,
+  credentials,
+  headers,
+  abortController,
+  fetch: fetch2 = getOriginalFetch(),
+  requestType = "generate"
+}) {
+  var _a17, _b, _c;
+  const response = requestType === "resume" ? await fetch2(`${api}?chatId=${body.chatId}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_a17 = abortController == null ? void 0 : abortController()) == null ? void 0 : _a17.signal,
+    credentials
+  }) : await fetch2(api, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    signal: (_b = abortController == null ? void 0 : abortController()) == null ? void 0 : _b.signal,
+    credentials
+  });
+  if (!response.ok) {
+    throw new Error(
+      (_c = await response.text()) != null ? _c : "Failed to fetch the chat response."
+    );
+  }
+  if (!response.body) {
+    throw new Error("The response body is empty.");
+  }
+  return transformTextToUiMessageStream({
+    stream: response.body.pipeThrough(new TextDecoderStream())
+  });
+}
 async function consumeUIMessageStream({
   stream,
   onUpdate,
@@ -1354,10 +1387,17 @@ async function callChatApi({
   requestType = "generate",
   messageMetadataSchema
 }) {
-  const stream = await fetchUIMessageStream({
+  const stream = streamProtocol === "text" ? await fetchTextStream({
+    api,
+    body,
+    credentials,
+    headers,
+    abortController,
+    fetch: fetch2,
+    requestType
+  }) : await fetchUIMessageStream({
     api,
     body,
-    streamProtocol,
     credentials,
     headers,
     abortController,
@@ -1911,7 +1951,6 @@ var DefaultChatTransport = class {
     credentials,
     headers,
     body,
-    streamProtocol,
     fetch: fetch2,
     prepareRequestBody
   }) {
@@ -1919,7 +1958,6 @@ var DefaultChatTransport = class {
     this.credentials = credentials;
     this.headers = headers;
     this.body = body;
-    this.streamProtocol = streamProtocol;
     this.fetch = fetch2;
     this.prepareRequestBody = prepareRequestBody;
   }
@@ -1949,7 +1987,55 @@ var DefaultChatTransport = class {
         ...this.body,
         ...body
       },
-      streamProtocol: this.streamProtocol,
+      credentials: this.credentials,
+      abortController: () => abortController,
+      fetch: this.fetch,
+      requestType
+    });
+  }
+};
+var TextStreamChatTransport = class {
+  constructor({
+    api,
+    credentials,
+    headers,
+    body,
+    fetch: fetch2,
+    prepareRequestBody
+  }) {
+    this.api = api;
+    this.credentials = credentials;
+    this.headers = headers;
+    this.body = body;
+    this.fetch = fetch2;
+    this.prepareRequestBody = prepareRequestBody;
+  }
+  submitMessages({
+    chatId,
+    messages,
+    abortController,
+    body,
+    headers,
+    requestType
+  }) {
+    var _a17, _b;
+    return fetchTextStream({
+      api: this.api,
+      headers: {
+        ...this.headers,
+        ...headers
+      },
+      body: (_b = (_a17 = this.prepareRequestBody) == null ? void 0 : _a17.call(this, {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      })) != null ? _b : {
+        chatId,
+        messages,
+        ...this.body,
+        ...body
+      },
       credentials: this.credentials,
       abortController: () => abortController,
       fetch: this.fetch,
@@ -2151,7 +2237,6 @@ import {
 function defaultChatStore({
   api,
   fetch: fetch2,
-  streamProtocol = "ui-message",
   credentials,
   headers,
   body,
@@ -2166,7 +2251,6 @@ function defaultChatStore({
     transport: new DefaultChatTransport({
       api,
       fetch: fetch2,
-      streamProtocol,
       credentials,
       headers,
       body,
@@ -4684,11 +4768,11 @@ var DelayedPromise = class {
     this._resolve = void 0;
     this._reject = void 0;
   }
-  get value() {
-    if (this.promise) {
-      return this.promise;
+  get promise() {
+    if (this._promise) {
+      return this._promise;
     }
-    this.promise = new Promise((resolve, reject) => {
+    this._promise = new Promise((resolve, reject) => {
       if (this.status.type === "resolved") {
         resolve(this.status.value);
       } else if (this.status.type === "rejected") {
@@ -4697,19 +4781,19 @@ var DelayedPromise = class {
       this._resolve = resolve;
       this._reject = reject;
     });
-    return this.promise;
+    return this._promise;
   }
   resolve(value) {
     var _a17;
     this.status = { type: "resolved", value };
-    if (this.promise) {
+    if (this._promise) {
       (_a17 = this._resolve) == null ? void 0 : _a17.call(this, value);
     }
   }
   reject(error) {
     var _a17;
     this.status = { type: "rejected", error };
-    if (this.promise) {
+    if (this._promise) {
       (_a17 = this._reject) == null ? void 0 : _a17.call(this, error);
     }
   }
@@ -4804,12 +4888,12 @@ var DefaultStreamObjectResult = class {
     currentDate,
     now: now2
   }) {
-    this.objectPromise = new DelayedPromise();
-    this.usagePromise = new DelayedPromise();
-    this.providerMetadataPromise = new DelayedPromise();
-    this.warningsPromise = new DelayedPromise();
-    this.requestPromise = new DelayedPromise();
-    this.responsePromise = new DelayedPromise();
+    this._object = new DelayedPromise();
+    this._usage = new DelayedPromise();
+    this._providerMetadata = new DelayedPromise();
+    this._warnings = new DelayedPromise();
+    this._request = new DelayedPromise();
+    this._response = new DelayedPromise();
     const { maxRetries, retry } = prepareRetries({
       maxRetries: maxRetriesArg
     });
@@ -4928,7 +5012,7 @@ var DefaultStreamObjectResult = class {
             })
           })
         );
-        self.requestPromise.resolve(request != null ? request : {});
+        self._request.resolve(request != null ? request : {});
         let warnings;
         let usage = {
           inputTokens: void 0,
@@ -5021,9 +5105,9 @@ var DefaultStreamObjectResult = class {
                     usage,
                     response: fullResponse
                   });
-                  self.usagePromise.resolve(usage);
-                  self.providerMetadataPromise.resolve(providerMetadata);
-                  self.responsePromise.resolve({
+                  self._usage.resolve(usage);
+                  self._providerMetadata.resolve(providerMetadata);
+                  self._response.resolve({
                     ...fullResponse,
                     headers: response == null ? void 0 : response.headers
                   });
@@ -5037,7 +5121,7 @@ var DefaultStreamObjectResult = class {
                   );
                   if (validationResult.success) {
                     object2 = validationResult.value;
-                    self.objectPromise.resolve(object2);
+                    self._object.resolve(object2);
                   } else {
                     error = new NoObjectGeneratedError({
                       message: "No object generated: response did not match schema.",
@@ -5047,7 +5131,7 @@ var DefaultStreamObjectResult = class {
                       usage,
                       finishReason
                     });
-                    self.objectPromise.reject(error);
+                    self._object.reject(error);
                   }
                   break;
                 }
@@ -5142,22 +5226,22 @@ var DefaultStreamObjectResult = class {
     this.outputStrategy = outputStrategy;
   }
   get object() {
-    return this.objectPromise.value;
+    return this._object.promise;
   }
   get usage() {
-    return this.usagePromise.value;
+    return this._usage.promise;
   }
   get providerMetadata() {
-    return this.providerMetadataPromise.value;
+    return this._providerMetadata.promise;
   }
   get warnings() {
-    return this.warningsPromise.value;
+    return this._warnings.promise;
   }
   get request() {
-    return this.requestPromise.value;
+    return this._request.promise;
   }
   get response() {
-    return this.responsePromise.value;
+    return this._response.promise;
   }
   get partialObjectStream() {
     return createAsyncIterableStream(
@@ -6413,7 +6497,7 @@ function streamText({
   maxRetries,
   abortSignal,
   headers,
-  maxSteps: maxSteps2 = 1,
+  continueUntil = maxSteps(1),
   experimental_output: output,
   experimental_telemetry: telemetry,
   providerOptions,
@@ -6449,7 +6533,7 @@ function streamText({
     transforms: asArray(transform),
     activeTools,
     repairToolCall,
-    maxSteps: maxSteps2,
+    continueUntil,
     output,
     providerOptions,
     onChunk,
@@ -6526,7 +6610,7 @@ var DefaultStreamTextResult = class {
     transforms,
     activeTools,
     repairToolCall,
-    maxSteps: maxSteps2,
+    continueUntil,
     output,
     providerOptions,
     now: now2,
@@ -6537,18 +6621,12 @@ var DefaultStreamTextResult = class {
     onFinish,
     onStepFinish
   }) {
-    this.totalUsagePromise = new DelayedPromise();
-    this.finishReasonPromise = new DelayedPromise();
-    this.stepsPromise = new DelayedPromise();
-    if (maxSteps2 < 1) {
-      throw new InvalidArgumentError({
-        parameter: "maxSteps",
-        value: maxSteps2,
-        message: "maxSteps must be at least 1"
-      });
-    }
+    this._totalUsage = new DelayedPromise();
+    this._finishReason = new DelayedPromise();
+    this._steps = new DelayedPromise();
     this.output = output;
     this.generateId = generateId3;
+    let stepFinish;
     let activeReasoningPart = void 0;
     let recordedContent = [];
     const recordedResponseMessages = [];
@@ -6630,6 +6708,7 @@ var DefaultStreamTextResult = class {
           recordedContent = [];
           activeReasoningPart = void 0;
           recordedResponseMessages.push(...stepMessages);
+          stepFinish.resolve();
         }
         if (part.type === "finish") {
           recordedTotalUsage = part.totalUsage;
@@ -6647,9 +6726,9 @@ var DefaultStreamTextResult = class {
             outputTokens: void 0,
             totalTokens: void 0
           };
-          self.finishReasonPromise.resolve(finishReason);
-          self.totalUsagePromise.resolve(totalUsage);
-          self.stepsPromise.resolve(recordedSteps);
+          self._finishReason.resolve(finishReason);
+          self._totalUsage.resolve(totalUsage);
+          self._steps.resolve(recordedSteps);
           const finalStep = recordedSteps[recordedSteps.length - 1];
           await (onFinish == null ? void 0 : onFinish({
             finishReason,
@@ -6740,8 +6819,7 @@ var DefaultStreamTextResult = class {
           // specific settings that only make sense on the outer level:
           "ai.prompt": {
             input: () => JSON.stringify({ system, prompt, messages })
-          },
-          "ai.settings.maxSteps": maxSteps2
+          }
         }
       }),
       tracer,
@@ -6753,6 +6831,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
+          stepFinish = new DelayedPromise();
           const initialPrompt = await standardizePrompt({
             system,
             prompt,
@@ -6834,7 +6913,7 @@ var DefaultStreamTextResult = class {
               }
             })
           );
-          const transformedStream = runToolsTransformation({
+          const streamWithToolResults = runToolsTransformation({
             tools,
             generatorStream: stream2,
             toolCallStreaming,
@@ -6873,7 +6952,7 @@ var DefaultStreamTextResult = class {
             stepText += chunk.text;
           }
           self.addStream(
-            transformedStream.pipeThrough(
+            streamWithToolResults.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
                   var _a17, _b, _c, _d;
@@ -7028,9 +7107,9 @@ var DefaultStreamTextResult = class {
                     }
                   });
                   const combinedUsage = addLanguageModelUsage(usage, stepUsage);
-                  if (currentStep + 1 < maxSteps2 && // there are tool calls:
-                  stepToolCalls.length > 0 && // all current tool calls have results:
-                  stepToolResults.length === stepToolCalls.length) {
+                  await stepFinish.promise;
+                  if (stepToolCalls.length > 0 && // all current tool calls have results:
+                  stepToolResults.length === stepToolCalls.length && !await continueUntil({ steps: recordedSteps })) {
                     responseMessages.push(
                       ...toResponseMessages({
                         content: stepContent,
@@ -7078,7 +7157,7 @@ var DefaultStreamTextResult = class {
     });
   }
   get steps() {
-    return this.stepsPromise.value;
+    return this._steps.promise;
   }
   get finalStep() {
     return this.steps.then((steps) => steps[steps.length - 1]);
@@ -7123,10 +7202,10 @@ var DefaultStreamTextResult = class {
     return this.finalStep.then((step) => step.response);
   }
   get totalUsage() {
-    return this.totalUsagePromise.value;
+    return this._totalUsage.promise;
   }
   get finishReason() {
-    return this.finishReasonPromise.value;
+    return this._finishReason.promise;
   }
   /**
   Split out a new stream from the original stream.
@@ -7246,9 +7325,8 @@ var DefaultStreamTextResult = class {
             case "source": {
               if (sendSources) {
                 controller.enqueue({
-                  type: "source",
-                  sourceType: part.sourceType,
-                  id: part.id,
+                  type: "source-url",
+                  sourceId: part.id,
                   url: part.url,
                   title: part.title,
                   providerMetadata: part.providerMetadata
@@ -8477,6 +8555,7 @@ export {
   NoSuchToolError,
   output_exports as Output,
   RetryError,
+  TextStreamChatTransport,
   ToolCallRepairError,
   ToolExecutionError,
   TypeValidationError,