@jaypie/llm 1.2.11 → 1.2.13

package/dist/cjs/operate/adapters/AnthropicAdapter.d.ts

@@ -17,8 +17,8 @@ export declare class AnthropicAdapter extends BaseProviderAdapter {
     buildRequest(request: OperateRequest): Anthropic.MessageCreateParams;
     formatTools(toolkit: Toolkit, outputSchema?: JsonObject): ProviderToolDefinition[];
     formatOutputSchema(schema: JsonObject | NaturalSchema | z.ZodType): JsonObject;
-    executeRequest(client: unknown, request: unknown): Promise<Anthropic.Message>;
-    executeStreamRequest(client: unknown, request: unknown): AsyncIterable<LlmStreamChunk>;
+    executeRequest(client: unknown, request: unknown, signal?: AbortSignal): Promise<Anthropic.Message>;
+    executeStreamRequest(client: unknown, request: unknown, signal?: AbortSignal): AsyncIterable<LlmStreamChunk>;
     parseResponse(response: unknown, _options?: LlmOperateOptions): ParsedResponse;
     extractToolCalls(response: unknown): StandardToolCall[];
     extractUsage(response: unknown, model: string): LlmUsageItem;

package/dist/cjs/operate/adapters/GeminiAdapter.d.ts

@@ -17,8 +17,8 @@ export declare class GeminiAdapter extends BaseProviderAdapter {
     buildRequest(request: OperateRequest): GeminiRequest;
     formatTools(toolkit: Toolkit, outputSchema?: JsonObject): ProviderToolDefinition[];
     formatOutputSchema(schema: JsonObject | NaturalSchema | z.ZodType): JsonObject;
-    executeRequest(client: unknown, request: unknown): Promise<GeminiRawResponse>;
-    executeStreamRequest(client: unknown, request: unknown): AsyncIterable<LlmStreamChunk>;
+    executeRequest(client: unknown, request: unknown, signal?: AbortSignal): Promise<GeminiRawResponse>;
+    executeStreamRequest(client: unknown, request: unknown, signal?: AbortSignal): AsyncIterable<LlmStreamChunk>;
     parseResponse(response: unknown, options?: LlmOperateOptions): ParsedResponse;
     extractToolCalls(response: unknown): StandardToolCall[];
     extractUsage(response: unknown, model: string): LlmUsageItem;

package/dist/cjs/operate/adapters/OpenAiAdapter.d.ts

@@ -16,8 +16,8 @@ export declare class OpenAiAdapter extends BaseProviderAdapter {
     buildRequest(request: OperateRequest): unknown;
     formatTools(toolkit: Toolkit, _outputSchema?: JsonObject): ProviderToolDefinition[];
     formatOutputSchema(schema: JsonObject | NaturalSchema | z.ZodType): JsonObject;
-    executeRequest(client: unknown, request: unknown): Promise<unknown>;
-    executeStreamRequest(client: unknown, request: unknown): AsyncIterable<LlmStreamChunk>;
+    executeRequest(client: unknown, request: unknown, signal?: AbortSignal): Promise<unknown>;
+    executeStreamRequest(client: unknown, request: unknown, signal?: AbortSignal): AsyncIterable<LlmStreamChunk>;
     parseResponse(response: unknown, options?: LlmOperateOptions): ParsedResponse;
     extractToolCalls(response: unknown): StandardToolCall[];
     extractUsage(response: unknown, model: string): LlmUsageItem;

package/dist/esm/index.js

@@ -1126,17 +1126,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
@@ -1566,19 +1573,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
@@ -2081,7 +2095,17 @@ class GeminiAdapter extends BaseProviderAdapter {
                 return JSON.parse(textContent);
             }
             catch {
-                // If parsing fails, return the original string
+                // Strip markdown code fences and retry (Gemini sometimes wraps JSON in fences)
+                const jsonMatch = textContent.match(/```(?:json)?\s*([\s\S]*?)\s*```/) ||
+                    textContent.match(/\{[\s\S]*\}/);
+                if (jsonMatch) {
+                    try {
+                        return JSON.parse(jsonMatch[1] || jsonMatch[0]);
+                    }
+                    catch {
+                        // Fall through to return original string
+                    }
+                }
                 return textContent;
             }
         }
@@ -2228,19 +2252,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
@@ -2674,14 +2705,21 @@ class OpenRouterAdapter extends BaseProviderAdapter {
     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,
-        }, signal ? { signal } : undefined);
-        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, signal) {
         const openRouter = client;
@@ -3968,7 +4006,19 @@ class RetryExecutor {
                     providerRequest: options.context.providerRequest,
                     error,
                 });
-                await 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 sleep(delay);
+                }
+                finally {
+                    process.removeListener("unhandledRejection", staleHandler);
+                }
                 attempt++;
             }
         }
@@ -4612,7 +4662,19 @@ class StreamLoop {
                 const delay = this.retryPolicy.getDelayForAttempt(attempt);
                 log$1.warn(`Stream request failed. Retrying in ${delay}ms...`);
                 log$1.var({ error });
-                await 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 sleep(delay);
+                }
+                finally {
+                    process.removeListener("unhandledRejection", staleHandler);
+                }
                 attempt++;
             }
         }
@@ -5089,6 +5151,17 @@ class GeminiProvider {
                 return JSON.parse(text);
             }
             catch {
+                // Strip markdown code fences and retry (Gemini sometimes wraps JSON in fences)
+                const jsonMatch = text.match(/```(?:json)?\s*([\s\S]*?)\s*```/) ||
+                    text.match(/\{[\s\S]*\}/);
+                if (jsonMatch) {
+                    try {
+                        return JSON.parse(jsonMatch[1] || jsonMatch[0]);
+                    }
+                    catch {
+                        // Fall through to return original text
+                    }
+                }
                 return text || "";
             }
         }