@jaypie/llm 1.2.10 → 1.2.11

package/dist/cjs/index.cjs

@@ -2673,7 +2673,7 @@ class OpenRouterAdapter extends BaseProviderAdapter {
     //
     // API Execution
     //
-    async executeRequest(client, request) {
+    async executeRequest(client, request, signal) {
         const openRouter = client;
         const openRouterRequest = request;
         const response = await openRouter.chat.send({
@@ -2682,10 +2682,10 @@ class OpenRouterAdapter extends BaseProviderAdapter {
             tools: openRouterRequest.tools,
             toolChoice: openRouterRequest.tool_choice,
             user: openRouterRequest.user,
-        });
+        }, signal ? { signal } : undefined);
         return response;
     }
-    async *executeStreamRequest(client, request) {
+    async *executeStreamRequest(client, request, signal) {
         const openRouter = client;
         const openRouterRequest = request;
         // Use chat.send with stream: true for streaming responses
@@ -2696,7 +2696,7 @@ class OpenRouterAdapter extends BaseProviderAdapter {
             toolChoice: openRouterRequest.tool_choice,
             user: openRouterRequest.user,
             stream: true,
-        });
+        }, signal ? { signal } : undefined);
         // Track current tool call being built
         let currentToolCall = null;
         // Track usage for final chunk
@@ -3907,9 +3907,12 @@ class RetryExecutor {
         this.errorClassifier = config.errorClassifier;
     }
     /**
-     * Execute an operation with retry logic
+     * Execute an operation with retry logic.
+     * Each attempt receives an AbortSignal. On failure, the signal is aborted
+     * before sleeping — this kills lingering socket callbacks from the previous
+     * request and prevents stale async errors from escaping the retry loop.
      *
-     * @param operation - The async operation to execute
+     * @param operation - The async operation to execute (receives AbortSignal)
      * @param options - Execution options including context and hooks
      * @returns The result of the operation
      * @throws BadGatewayError if all retries are exhausted or error is not retryable
@@ -3917,14 +3920,17 @@ class RetryExecutor {
     async execute(operation, options) {
         let attempt = 0;
         while (true) {
+            const controller = new AbortController();
             try {
-                const result = await operation();
+                const result = await operation(controller.signal);
                 if (attempt > 0) {
                     log$1.debug(`API call succeeded after ${attempt} retries`);
                 }
                 return result;
             }
             catch (error) {
+                // Abort the previous request to kill lingering socket callbacks
+                controller.abort("retry");
                 // Check if we've exhausted retries
                 if (!this.policy.shouldRetry(attempt)) {
                     log$1.error(`API call failed after ${this.policy.maxRetries} retries`);
@@ -4149,7 +4155,7 @@ class OperateLoop {
             providerRequest,
         });
         // Execute with retry (RetryExecutor handles error hooks and throws appropriate errors)
-        const response = await retryExecutor.execute(() => this.adapter.executeRequest(this.client, providerRequest), {
+        const response = await retryExecutor.execute((signal) => this.adapter.executeRequest(this.client, providerRequest, signal), {
             context: {
                 input: state.currentInput,
                 options,
@@ -4542,9 +4548,10 @@ class StreamLoop {
         let attempt = 0;
         let chunksYielded = false;
         while (true) {
+            const controller = new AbortController();
             try {
                 // Execute streaming request
-                const streamGenerator = this.adapter.executeStreamRequest(this.client, providerRequest);
+                const streamGenerator = this.adapter.executeStreamRequest(this.client, providerRequest, controller.signal);
                 for await (const chunk of streamGenerator) {
                     // Pass through text chunks
                     if (chunk.type === exports.LlmStreamChunkType.Text) {
@@ -4579,6 +4586,8 @@ class StreamLoop {
                 break;
             }
             catch (error) {
+                // Abort the previous request to kill lingering socket callbacks
+                controller.abort("retry");
                 // If chunks were already yielded, we can't transparently retry
                 if (chunksYielded) {
                     const errorMessage = error instanceof Error ? error.message : String(error);