@jaypie/llm 1.2.10 → 1.2.12

package/dist/cjs/index.cjs

@@ -1128,17 +1128,24 @@ class AnthropicAdapter extends BaseProviderAdapter {
     //
     // API Execution
     //
-    async executeRequest(client, request) {
+    async executeRequest(client, request, signal) {
         const anthropic = client;
-        return (await anthropic.messages.create(request));
+        try {
+            return (await anthropic.messages.create(request, signal ? { signal } : undefined));
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return undefined;
+            throw error;
+        }
     }
-    async *executeStreamRequest(client, request) {
+    async *executeStreamRequest(client, request, signal) {
         const anthropic = client;
         const streamRequest = {
             ...request,
             stream: true,
         };
-        const stream = await anthropic.messages.create(streamRequest);
+        const stream = await anthropic.messages.create(streamRequest, signal ? { signal } : undefined);
         // Track current tool call being built
         let currentToolCall = null;
         // Track usage for final chunk
@@ -1568,19 +1575,26 @@ class GeminiAdapter extends BaseProviderAdapter {
     //
     // API Execution
     //
-    async executeRequest(client, request) {
+    async executeRequest(client, request, signal) {
         const genAI = client;
         const geminiRequest = request;
-        // Cast config to any to bypass strict type checking between our internal types
-        // and the SDK's types. The SDK will validate at runtime.
-        const response = await genAI.models.generateContent({
-            model: geminiRequest.model,
-            contents: geminiRequest.contents,
-            config: geminiRequest.config,
-        });
-        return response;
+        try {
+            // Cast config to any to bypass strict type checking between our internal types
+            // and the SDK's types. The SDK will validate at runtime.
+            const response = await genAI.models.generateContent({
+                model: geminiRequest.model,
+                contents: geminiRequest.contents,
+                config: geminiRequest.config,
+            });
+            return response;
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return undefined;
+            throw error;
+        }
     }
-    async *executeStreamRequest(client, request) {
+    async *executeStreamRequest(client, request, signal) {
         const genAI = client;
         const geminiRequest = request;
         // Use generateContentStream for streaming
@@ -2230,19 +2244,26 @@ class OpenAiAdapter extends BaseProviderAdapter {
     //
     // API Execution
     //
-    async executeRequest(client, request) {
+    async executeRequest(client, request, signal) {
         const openai = client;
-        // @ts-expect-error OpenAI SDK types don't match our request format exactly
-        return await openai.responses.create(request);
+        try {
+            // @ts-expect-error OpenAI SDK types don't match our request format exactly
+            return await openai.responses.create(request, signal ? { signal } : undefined);
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return undefined;
+            throw error;
+        }
     }
-    async *executeStreamRequest(client, request) {
+    async *executeStreamRequest(client, request, signal) {
         const openai = client;
         const baseRequest = request;
         const streamRequest = {
             ...baseRequest,
             stream: true,
         };
-        const stream = await openai.responses.create(streamRequest);
+        const stream = await openai.responses.create(streamRequest, signal ? { signal } : undefined);
         // Track current function call being built
         let currentFunctionCall = null;
         // Track usage for final chunk
@@ -2673,19 +2694,26 @@ 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({
-            model: openRouterRequest.model,
-            messages: openRouterRequest.messages,
-            tools: openRouterRequest.tools,
-            toolChoice: openRouterRequest.tool_choice,
-            user: openRouterRequest.user,
-        });
-        return response;
+        try {
+            const response = await openRouter.chat.send({
+                model: openRouterRequest.model,
+                messages: openRouterRequest.messages,
+                tools: openRouterRequest.tools,
+                toolChoice: openRouterRequest.tool_choice,
+                user: openRouterRequest.user,
+            }, signal ? { signal } : undefined);
+            return response;
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return undefined;
+            throw error;
+        }
     }
-    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 +2724,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 +3935,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 +3948,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`);
@@ -3964,7 +3998,19 @@ class RetryExecutor {
                     providerRequest: options.context.providerRequest,
                     error,
                 });
-                await kit.sleep(delay);
+                // Guard against stale socket errors that fire during sleep
+                const staleHandler = (reason) => {
+                    if (isTransientNetworkError(reason)) {
+                        log$1.trace("Suppressed stale socket error during retry sleep");
+                    }
+                };
+                process.on("unhandledRejection", staleHandler);
+                try {
+                    await kit.sleep(delay);
+                }
+                finally {
+                    process.removeListener("unhandledRejection", staleHandler);
+                }
                 attempt++;
             }
         }
@@ -4149,7 +4195,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 +4588,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 +4626,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);
@@ -4605,7 +4654,19 @@ class StreamLoop {
                 const delay = this.retryPolicy.getDelayForAttempt(attempt);
                 log$1.warn(`Stream request failed. Retrying in ${delay}ms...`);
                 log$1.var({ error });
-                await kit.sleep(delay);
+                // Guard against stale socket errors that fire during sleep
+                const staleHandler = (reason) => {
+                    if (isTransientNetworkError(reason)) {
+                        log$1.trace("Suppressed stale socket error during retry sleep");
+                    }
+                };
+                process.on("unhandledRejection", staleHandler);
+                try {
+                    await kit.sleep(delay);
+                }
+                finally {
+                    process.removeListener("unhandledRejection", staleHandler);
+                }
                 attempt++;
             }
         }