ai-retry 1.6.0 → 1.6.1

package/README.md

@@ -782,7 +782,9 @@ const retryableModel = createRetryable({
 
 #### Timeouts
 
-When a retry specifies a `timeout` value, a fresh `AbortSignal.timeout()` is created for that retry attempt, replacing any existing abort signal. This is essential when retrying after timeout errors, as the original abort signal would already be in an aborted state.
+When a retry specifies a `timeout` value, a fresh `AbortSignal.timeout()` is created for that retry attempt. If the original `abortSignal` is still alive, the fresh deadline is composed with it via `AbortSignal.any()` so user cancellation still works mid-retry. If the original signal is already aborted (for example it carried a request-level deadline that already fired), it is dropped so the retry runs against the fresh deadline alone.
+
+If the original `abortSignal` is already aborted at the time of retry and the chosen retry does **not** supply a `timeout`, ai-retry rethrows the original error rather than firing a misleading retry against the dead signal. `onError` still fires for observability, but `onRetry` is skipped. Setting `retry.timeout` is the explicit opt-in for retrying past an aborted signal.
 
 ```typescript
 const retryableModel = createRetryable({
@@ -925,7 +927,7 @@ The following options can be overridden:
 
 #### Dynamic Call Options
 
-You can also override call options dynamically from inside the `onRetry` callback, instead of declaring them statically on the retry object. This is useful when the override depends on something only known at runtime, like the prompt that just failed, the model that's about to be tried next, or the error that triggered the retry. The overrides apply to the upcoming retry attempt only, and can change the same fields as the static `options` on a retry plus the request `timeout`. The callback may also be `async` if computing the override needs to do work (e.g. fetching a fresh credential).
+You can also override call options dynamically from inside the `onRetry` callback, instead of declaring them statically on the retry object. This is useful when the override depends on something only known at runtime, like the prompt that just failed, the model that's about to be tried next, or the error that triggered the retry. The overrides apply to the upcoming retry attempt only, and can change the same fields as the static `options` on a retry. The callback may also be `async` if computing the override needs to do work (e.g. fetching a fresh credential).
 
 A common use case is sanitizing provider-scoped metadata when falling back to a different provider, for example stripping `providerOptions.azure.itemId` references from the previous prompt before retrying on OpenAI:
 
@@ -1090,7 +1092,7 @@ interface RetryableModelOptions<
 - `disabled`: Disable all retry logic. Can be a boolean or function returning boolean. Default: `false` (retries enabled).
 - `reset`: Controls when to reset back to the base model after a successful retry. Default: `after-request`.
 - `onError`: Callback invoked when an error occurs.
-- `onRetry`: Callback invoked before attempting a retry. May optionally return an `OnRetryOverrides` object (or a `Promise` of one) to override `options.*` and `timeout` for the upcoming attempt only. See [Dynamic Call Options via `onRetry`](#dynamic-call-options-via-onretry).
+- `onRetry`: Callback invoked before attempting a retry. May optionally return an `OnRetryOverrides` object (or a `Promise` of one) to override `options.*` for the upcoming attempt only. See [Dynamic Call Options via `onRetry`](#dynamic-call-options-via-onretry).
 - `onSuccess`: Callback invoked after a successful request. Receives the model that handled the request and all previous attempts.
 
 #### `Reset`

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { A as RetryResultAttempt, C as Result, D as RetryCallOptions, E as RetryAttempt, F as SuccessContext, M as RetryableModelOptions, N as RetryableOptions, O as RetryContext, P as SuccessAttempt, S as ResolvedModel, T as Retry, _ as OnRetryOverrides, a as EmbeddingModelRetryCallOptions, b as ResolvableLanguageModel, c as ImageModelCallOptions, d as LanguageModel, f as LanguageModelCallOptions, g as LanguageModelStreamPart, h as LanguageModelStream, i as EmbeddingModelEmbed, j as Retryable, k as RetryErrorAttempt, l as ImageModelGenerate, m as LanguageModelRetryCallOptions, n as EmbeddingModel, o as GatewayLanguageModelId, p as LanguageModelGenerate, r as EmbeddingModelCallOptions, s as ImageModel, t as CallOptions, u as ImageModelRetryCallOptions, v as ProviderOptions, w as Retries, x as ResolvableModel, y as Reset } from "./types-pGdkwtOE.mjs";
+import { A as RetryResultAttempt, C as Result, D as RetryCallOptions, E as RetryAttempt, F as SuccessContext, M as RetryableModelOptions, N as RetryableOptions, O as RetryContext, P as SuccessAttempt, S as ResolvedModel, T as Retry, _ as OnRetryOverrides, a as EmbeddingModelRetryCallOptions, b as ResolvableLanguageModel, c as ImageModelCallOptions, d as LanguageModel, f as LanguageModelCallOptions, g as LanguageModelStreamPart, h as LanguageModelStream, i as EmbeddingModelEmbed, j as Retryable, k as RetryErrorAttempt, l as ImageModelGenerate, m as LanguageModelRetryCallOptions, n as EmbeddingModel, o as GatewayLanguageModelId, p as LanguageModelGenerate, r as EmbeddingModelCallOptions, s as ImageModel, t as CallOptions, u as ImageModelRetryCallOptions, v as ProviderOptions, w as Retries, x as ResolvableModel, y as Reset } from "./types-CRKV-hdW.mjs";
 import * as _ai_sdk_provider0 from "@ai-sdk/provider";
 
 //#region src/create-retryable-model.d.ts

package/dist/index.mjs

@@ -197,14 +197,18 @@ function resolveProviderOptions(base, currentRetry, onRetryOverrides) {
 /**
 * Resolve `abortSignal` for the upcoming attempt.
 *
-* If either `onRetryOverrides.timeout` or `currentRetry.timeout` is set, a
-* fresh `AbortSignal.timeout(...)` is created (override wins). Otherwise
-* the base `abortSignal` is preserved unchanged.
+* If `currentRetry.timeout` is set, a fresh `AbortSignal.timeout(...)` is
+* created. When the base signal is still alive, the fresh deadline is
+* composed with it via `AbortSignal.any` so the user can still cancel
+* mid-retry. When the base is already aborted, it is dropped so the retry
+* runs against the fresh deadline alone. Without a retry timeout, the base
+* is preserved unchanged.
 */
-function resolveAbortSignal(base, currentRetry, onRetryOverrides) {
-	if (onRetryOverrides?.timeout !== void 0) return AbortSignal.timeout(onRetryOverrides.timeout);
-	if (currentRetry?.timeout !== void 0) return AbortSignal.timeout(currentRetry.timeout);
-	return base;
+function resolveAbortSignal(base, currentRetry) {
+	if (currentRetry?.timeout === void 0) return base;
+	const fresh = AbortSignal.timeout(currentRetry.timeout);
+	if (base !== void 0 && !base.aborted) return AbortSignal.any([base, fresh]);
+	return fresh;
 }
 /**
 * Merge call options for the upcoming language model retry attempt.
@@ -231,7 +235,7 @@ function mergeLanguageModelCallOptions(input) {
 		seed: overrideOptions.seed ?? retryOptions.seed ?? callOptions.seed,
 		headers: overrideOptions.headers ?? retryOptions.headers ?? callOptions.headers,
 		providerOptions: resolveProviderOptions(callOptions.providerOptions, currentRetry, onRetryOverrides),
-		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry, onRetryOverrides)
+		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry)
 	};
 }
 /**
@@ -246,7 +250,7 @@ function mergeEmbeddingModelCallOptions(input) {
 		values: overrideOptions.values ?? retryOptions.values ?? callOptions.values,
 		headers: overrideOptions.headers ?? retryOptions.headers ?? callOptions.headers,
 		providerOptions: resolveProviderOptions(callOptions.providerOptions, currentRetry, onRetryOverrides),
-		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry, onRetryOverrides)
+		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry)
 	};
 }
 /**
@@ -264,7 +268,7 @@ function mergeImageModelCallOptions(input) {
 		seed: overrideOptions.seed ?? retryOptions.seed ?? callOptions.seed,
 		headers: overrideOptions.headers ?? retryOptions.headers ?? callOptions.headers,
 		providerOptions: resolveProviderOptions(callOptions.providerOptions, currentRetry, onRetryOverrides),
-		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry, onRetryOverrides)
+		abortSignal: resolveAbortSignal(callOptions.abortSignal, currentRetry)
 	};
 }
 
@@ -331,9 +335,15 @@ var RetryableEmbeddingModel = class extends BaseRetryableModel {
 					callOptions: retryCallOptions
 				};
 			} catch (error) {
-				if (isAbortError(error)) throw error;
 				const { retryModel, attempt } = await this.handleError(error, attempts, retryCallOptions);
 				attempts.push(attempt);
+				/**
+				* If the inbound abort signal is already aborted and the chosen
+				* retry does not supply a fresh deadline, the retry would die
+				* instantly with the same abort. Rethrow rather than fire a
+				* misleading retry against a dead signal.
+				*/
+				if (input.callOptions.abortSignal?.aborted && retryModel.timeout === void 0) throw error;
 				if (retryModel.delay) {
 					/**
 					* Calculate exponential backoff delay based on the number of attempts for this specific model.
@@ -474,11 +484,15 @@ var RetryableImageModel = class extends BaseRetryableModel {
 					callOptions: retryCallOptions
 				};
 			} catch (error) {
-				/** Don't retry if user manually aborted the request. */
-				/** TimeoutError from AbortSignal.timeout() will still be handled by retry handlers. */
-				if (isAbortError(error)) throw error;
 				const { retryModel, attempt } = await this.handleError(error, attempts, retryCallOptions);
 				attempts.push(attempt);
+				/**
+				* If the inbound abort signal is already aborted and the chosen
+				* retry does not supply a fresh deadline, the retry would die
+				* instantly with the same abort. Rethrow rather than fire a
+				* misleading retry against a dead signal.
+				*/
+				if (input.callOptions.abortSignal?.aborted && retryModel.timeout === void 0) throw error;
 				if (retryModel.delay) {
 					/**
 					* Calculate exponential backoff delay based on the number of attempts for this specific model.
@@ -650,9 +664,15 @@ var RetryableLanguageModel = class extends BaseRetryableModel {
 					callOptions: retryCallOptions
 				};
 			} catch (error) {
-				if (isAbortError(error)) throw error;
 				const { retryModel, attempt } = await this.handleError(error, attempts, retryCallOptions);
 				attempts.push(attempt);
+				/**
+				* If the inbound abort signal is already aborted and the chosen
+				* retry does not supply a fresh deadline, the retry would die
+				* instantly with the same abort. Rethrow rather than fire a
+				* misleading retry against a dead signal.
+				*/
+				if (input.callOptions.abortSignal?.aborted && retryModel.timeout === void 0) throw error;
 				if (retryModel.delay) {
 					/**
 					* Calculate exponential backoff delay based on the number of attempts for this specific model.
@@ -825,6 +845,13 @@ var RetryableLanguageModel = class extends BaseRetryableModel {
 				* Save the attempt
 				*/
 				attempts.push(attempt);
+				/**
+				* If the inbound abort signal is already aborted and the chosen
+				* retry does not supply a fresh deadline, the retry would die
+				* instantly with the same abort. Rethrow rather than fire a
+				* misleading retry against a dead signal.
+				*/
+				if (callOptions.abortSignal?.aborted && retryModel.timeout === void 0) throw error;
 				if (retryModel.delay) {
 					/**
 					* Calculate exponential backoff delay based on the number of attempts for this specific model.

package/dist/retryables/experimental/index.d.mts

@@ -1,4 +1,4 @@
-import { O as RetryContext, T as Retry, b as ResolvableLanguageModel, j as Retryable, n as EmbeddingModel, p as LanguageModelGenerate, s as ImageModel } from "../../types-pGdkwtOE.mjs";
+import { O as RetryContext, T as Retry, b as ResolvableLanguageModel, j as Retryable, n as EmbeddingModel, p as LanguageModelGenerate, s as ImageModel } from "../../types-CRKV-hdW.mjs";
 
 //#region src/retryables/experimental/condition.d.ts
 /**

package/dist/retryables/index.d.mts

@@ -1,4 +1,4 @@
-import { N as RetryableOptions, b as ResolvableLanguageModel, j as Retryable, n as EmbeddingModel, s as ImageModel } from "../types-pGdkwtOE.mjs";
+import { N as RetryableOptions, b as ResolvableLanguageModel, j as Retryable, n as EmbeddingModel, s as ImageModel } from "../types-CRKV-hdW.mjs";
 
 //#region src/retryables/content-filter-triggered.d.ts
 /**

package/dist/{types-pGdkwtOE.d.mts → types-CRKV-hdW.d.mts}

@@ -34,7 +34,7 @@ type RetryCallOptions<MODEL extends LanguageModel | EmbeddingModel | ImageModel>
 /**
  * Override returned by `onRetry` to influence the upcoming retry attempt.
  */
-type OnRetryOverrides<MODEL extends LanguageModel | EmbeddingModel | ImageModel> = Pick<Retry<MODEL>, 'options' | 'timeout'>;
+type OnRetryOverrides<MODEL extends LanguageModel | EmbeddingModel | ImageModel> = Pick<Retry<MODEL>, 'options'>;
 /**
  * Maps a model type to its call options type.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-retry",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Retry and fallback mechanisms for AI SDK",
   "keywords": [
     "ai",