ai 7.0.135 → 7.0.137

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ai
 
+## 7.0.137
+
+### Patch Changes
+
+- e27cc64: fix(ai): discard unrelated message state when reading resumed streams
+
+## 7.0.136
+
+### Patch Changes
+
+- 7b5497c: Fix streaming output timeouts: stop `chunkMs` and `firstChunkMs` when the model response ends, so long-running local tools do not trigger model output timeouts. Give each retry fresh output timeout budgets. `stepMs` continues to cover the complete step, including local tools.
+- Updated dependencies [e280aa1]
+  - @ai-sdk/gateway@4.0.110
+
 ## 7.0.135
 
 ### Patch Changes

package/dist/index.d.ts

@@ -749,9 +749,9 @@ type LanguageModelCallOptions = {
  * Timeout configuration for API calls. Can be specified as:
  * - A number representing milliseconds
  * - An object with `totalMs` property for the total timeout in milliseconds
- * - An object with `stepMs` property for the timeout of each step in milliseconds
+ * - An object with `stepMs` property for the timeout of each complete step, including model generation, retries, and local tool execution, in milliseconds
  * - An object with `firstChunkMs` property for the timeout until the first content chunk of each step (streaming only)
- * - An object with `chunkMs` property for the timeout between content chunks (streaming only)
+ * - An object with `chunkMs` property for the timeout between meaningful model output chunks, starting with the first output and ending when the model response ends (streaming only)
  * - An object with `toolMs` property for the default timeout for all tool executions
  * - An object with `tools` property for per-tool timeout overrides using `{toolName}Ms` keys
  */

package/dist/index.js

@@ -1174,7 +1174,7 @@ function cloneValue(value) {
 }
 //#endregion
 //#region src/version.ts
-const VERSION = "7.0.135";
+const VERSION = "7.0.137";
 //#endregion
 //#region src/util/download/download.ts
 /**
@@ -9511,6 +9511,7 @@ var DefaultStreamTextResult = class {
 				let chunkTimeoutId = void 0;
 				function resetChunkTimeout() {
 					if (chunkTimeoutId != null) clearTimeout(chunkTimeoutId);
+					if (abortSignal?.aborted) return;
 					chunkTimeoutId = setAbortTimeout({
 						abortController: chunkAbortController,
 						label: "Chunk",
@@ -9523,13 +9524,16 @@ var DefaultStreamTextResult = class {
 						chunkTimeoutId = void 0;
 					}
 				}
+				function clearModelOutputTimeouts() {
+					clearFirstChunkTimeout();
+					clearChunkTimeout();
+				}
 				function clearStepTimeout() {
 					if (stepTimeoutId != null) clearTimeout(stepTimeoutId);
 				}
 				function clearStepTimeouts() {
 					clearStepTimeout();
-					clearFirstChunkTimeout();
-					clearChunkTimeout();
+					clearModelOutputTimeouts();
 				}
 				function cleanupStepTimeouts() {
 					abortSignal?.removeEventListener("abort", cleanupStepTimeouts);
@@ -9664,7 +9668,6 @@ var DefaultStreamTextResult = class {
 					let automaticStreamRetryCount = 0;
 					let callbackStreamRetryCount = 0;
 					let bufferedAttemptParts = [];
-					const outputChunksHandledBeforeBuffering = /* @__PURE__ */ new WeakSet();
 					const openTextParts = /* @__PURE__ */ new Set();
 					const openReasoningParts = /* @__PURE__ */ new Set();
 					let enqueueStreamRetryAttemptBoundary = false;
@@ -9703,28 +9706,36 @@ var DefaultStreamTextResult = class {
 								openReasoningParts.clear();
 							};
 							while (true) {
-								const { done, value } = await languageModelStreamReader.read();
+								let result;
+								try {
+									result = await languageModelStreamReader.read();
+								} catch (error) {
+									clearModelOutputTimeouts();
+									throw error;
+								}
+								const { done, value } = result;
 								if (enqueueStreamRetryAttemptBoundary) {
 									controller.enqueue(createStreamRetryAttemptBoundaryPart({ warnings: !done && value.type === "model-call-start" ? value.warnings : [] }));
 									enqueueStreamRetryAttemptBoundary = false;
 								}
 								if (done) {
+									clearModelOutputTimeouts();
 									flushBufferedAttemptParts();
 									controller.close();
 									return;
 								}
 								const isToolPart = value.type === "tool-input-start" || value.type === "tool-input-delta" || value.type === "tool-input-end" || value.type === "tool-call" || value.type === "tool-approval-request" || value.type === "tool-approval-response" || value.type === "tool-result" || value.type === "tool-error";
 								if (value.type === "model-call-end") {
+									clearModelOutputTimeouts();
 									flushBufferedAttemptParts();
 									enqueueAttemptPart(value);
 									return;
 								}
+								if (isOutputChunk(value)) {
+									clearFirstChunkTimeout();
+									resetChunkTimeout();
+								}
 								if (shouldBufferToolParts && value.type !== "error" && (isToolPart || bufferedAttemptParts.length > 0)) {
-									if (isOutputChunk(value)) {
-										clearFirstChunkTimeout();
-										resetChunkTimeout();
-										outputChunksHandledBeforeBuffering.add(value);
-									}
 									bufferedAttemptParts.push(value);
 									continue;
 								}
@@ -9732,6 +9743,7 @@ var DefaultStreamTextResult = class {
 									enqueueAttemptPart(value);
 									return;
 								}
+								clearModelOutputTimeouts();
 								await notify({
 									event: { chunk: value },
 									callbacks: onChunk
@@ -9769,10 +9781,12 @@ var DefaultStreamTextResult = class {
 								request = retryLanguageModelCall.request;
 								response = retryLanguageModelCall.response;
 								languageModelStreamReader = retryLanguageModelCall.stream.getReader();
+								startFirstChunkTimeout();
 								enqueueStreamRetryAttemptBoundary = true;
 							}
 						},
 						cancel(reason) {
+							clearModelOutputTimeouts();
 							return languageModelStreamReader.cancel(reason);
 						}
 					});
@@ -9875,12 +9889,7 @@ var DefaultStreamTextResult = class {
 								});
 							}
 							const chunkType = chunk.type;
-							if (isOutputChunk(chunk)) {
-								const timeoutHandledBeforeBuffering = outputChunksHandledBeforeBuffering.has(chunk);
-								if (!hasReceivedOutputChunk && !timeoutHandledBeforeBuffering) clearFirstChunkTimeout();
-								hasReceivedOutputChunk = true;
-								if (!timeoutHandledBeforeBuffering) resetChunkTimeout();
-							}
+							if (isOutputChunk(chunk)) hasReceivedOutputChunk = true;
 							switch (chunkType) {
 								case "file":
 								case "custom":
@@ -10645,6 +10654,7 @@ function readUIMessageStream({ message, stream, onError, terminateOnError = fals
 	consumeStream({
 		stream: processUIMessageStream({
 			stream,
+			resetStateOnMessageIdChange: true,
 			runUpdateMessageJob(job) {
 				return job({
 					state,