@jaypie/llm 1.2.20 → 1.2.22

package/dist/cjs/constants.d.ts

@@ -4,9 +4,9 @@ export declare const PROVIDER: {
             readonly DEFAULT: 4096;
         };
         readonly MODEL: {
-            readonly DEFAULT: "claude-sonnet-4-5";
-            readonly LARGE: "claude-opus-4-5";
-            readonly SMALL: "claude-sonnet-4-5";
+            readonly DEFAULT: "claude-sonnet-4-6";
+            readonly LARGE: "claude-opus-4-6";
+            readonly SMALL: "claude-sonnet-4-6";
             readonly TINY: "claude-haiku-4-5";
         };
         readonly MODEL_MATCH_WORDS: readonly ["anthropic", "claude", "haiku", "opus", "sonnet"];
@@ -26,10 +26,10 @@ export declare const PROVIDER: {
     };
     readonly GEMINI: {
         readonly MODEL: {
-            readonly DEFAULT: "gemini-3-pro-preview";
-            readonly LARGE: "gemini-3-pro-preview";
+            readonly DEFAULT: "gemini-3.1-pro-preview";
+            readonly LARGE: "gemini-3.1-pro-preview";
             readonly SMALL: "gemini-3-flash-preview";
-            readonly TINY: "gemini-3-flash-preview";
+            readonly TINY: "gemini-3.1-flash-lite-preview";
         };
         readonly MODEL_MATCH_WORDS: readonly ["gemini", "google"];
         readonly NAME: "google";
@@ -40,20 +40,20 @@ export declare const PROVIDER: {
     };
     readonly OPENAI: {
         readonly MODEL: {
-            readonly DEFAULT: "gpt-5.2";
-            readonly LARGE: "gpt-5.2-pro";
-            readonly SMALL: "gpt-5-mini";
-            readonly TINY: "gpt-5-nano";
+            readonly DEFAULT: "gpt-5.4";
+            readonly LARGE: "gpt-5.4";
+            readonly SMALL: "gpt-5.4-mini";
+            readonly TINY: "gpt-5.4-nano";
         };
         readonly MODEL_MATCH_WORDS: readonly ["openai", "gpt", RegExp];
         readonly NAME: "openai";
     };
     readonly OPENROUTER: {
         readonly MODEL: {
-            readonly DEFAULT: "z-ai/glm-4.7";
-            readonly LARGE: "z-ai/glm-4.7";
-            readonly SMALL: "z-ai/glm-4.7";
-            readonly TINY: "z-ai/glm-4.7";
+            readonly DEFAULT: "anthropic/claude-sonnet-4-6";
+            readonly LARGE: "anthropic/claude-opus-4-6";
+            readonly SMALL: "anthropic/claude-sonnet-4-6";
+            readonly TINY: "anthropic/claude-haiku-4-5";
         };
         readonly MODEL_MATCH_WORDS: readonly ["openrouter"];
         readonly NAME: "openrouter";
@@ -68,10 +68,10 @@ export declare const PROVIDER: {
         readonly API_KEY: "XAI_API_KEY";
         readonly BASE_URL: "https://api.x.ai/v1";
         readonly MODEL: {
-            readonly DEFAULT: "grok-4-1-fast-reasoning";
-            readonly LARGE: "grok-4-1-fast-reasoning";
-            readonly SMALL: "grok-3";
-            readonly TINY: "grok-3-mini";
+            readonly DEFAULT: "grok-4.20-0309-reasoning";
+            readonly LARGE: "grok-4.20-0309-reasoning";
+            readonly SMALL: "grok-4.20-0309-non-reasoning";
+            readonly TINY: "grok-4-1-fast-non-reasoning";
         };
         readonly MODEL_MATCH_WORDS: readonly ["grok", "xai"];
         readonly NAME: "xai";
@@ -80,26 +80,26 @@ export declare const PROVIDER: {
 export type LlmProviderName = typeof PROVIDER.ANTHROPIC.NAME | typeof PROVIDER.GEMINI.NAME | typeof PROVIDER.OPENAI.NAME | typeof PROVIDER.OPENROUTER.NAME | typeof PROVIDER.XAI.NAME;
 export declare const DEFAULT: {
     readonly MODEL: {
-        readonly BASE: "gpt-5.2";
-        readonly LARGE: "gpt-5.2-pro";
-        readonly SMALL: "gpt-5-mini";
-        readonly TINY: "gpt-5-nano";
+        readonly BASE: "gpt-5.4";
+        readonly LARGE: "gpt-5.4";
+        readonly SMALL: "gpt-5.4-mini";
+        readonly TINY: "gpt-5.4-nano";
     };
     readonly PROVIDER: {
         readonly MODEL: {
-            readonly DEFAULT: "gpt-5.2";
-            readonly LARGE: "gpt-5.2-pro";
-            readonly SMALL: "gpt-5-mini";
-            readonly TINY: "gpt-5-nano";
+            readonly DEFAULT: "gpt-5.4";
+            readonly LARGE: "gpt-5.4";
+            readonly SMALL: "gpt-5.4-mini";
+            readonly TINY: "gpt-5.4-nano";
         };
         readonly MODEL_MATCH_WORDS: readonly ["openai", "gpt", RegExp];
         readonly NAME: "openai";
     };
 };
 export declare const ALL: {
-    readonly BASE: readonly ["claude-sonnet-4-5", "gemini-3-pro-preview", "gpt-5.2", "grok-4-1-fast-reasoning"];
-    readonly COMBINED: readonly ["claude-sonnet-4-5", "claude-opus-4-5", "claude-sonnet-4-5", "claude-haiku-4-5", "gemini-3-pro-preview", "gemini-3-pro-preview", "gemini-3-flash-preview", "gemini-3-flash-preview", "gpt-5.2", "gpt-5.2-pro", "gpt-5-mini", "gpt-5-nano", "grok-4-1-fast-reasoning", "grok-4-1-fast-reasoning", "grok-3", "grok-3-mini"];
-    readonly LARGE: readonly ["claude-opus-4-5", "gemini-3-pro-preview", "gpt-5.2-pro", "grok-4-1-fast-reasoning"];
-    readonly SMALL: readonly ["claude-sonnet-4-5", "gemini-3-flash-preview", "gpt-5-mini", "grok-3"];
-    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3-flash-preview", "gpt-5-nano", "grok-3-mini"];
+    readonly BASE: readonly ["claude-sonnet-4-6", "gemini-3.1-pro-preview", "gpt-5.4", "grok-4.20-0309-reasoning"];
+    readonly COMBINED: readonly ["claude-sonnet-4-6", "claude-opus-4-6", "claude-sonnet-4-6", "claude-haiku-4-5", "gemini-3.1-pro-preview", "gemini-3.1-pro-preview", "gemini-3-flash-preview", "gemini-3.1-flash-lite-preview", "gpt-5.4", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-nano", "grok-4.20-0309-reasoning", "grok-4.20-0309-reasoning", "grok-4.20-0309-non-reasoning", "grok-4-1-fast-non-reasoning"];
+    readonly LARGE: readonly ["claude-opus-4-6", "gemini-3.1-pro-preview", "gpt-5.4", "grok-4.20-0309-reasoning"];
+    readonly SMALL: readonly ["claude-sonnet-4-6", "gemini-3-flash-preview", "gpt-5.4-mini", "grok-4.20-0309-non-reasoning"];
+    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3.1-flash-lite-preview", "gpt-5.4-nano", "grok-4-1-fast-non-reasoning"];
 };

package/dist/cjs/index.cjs

@@ -14,35 +14,33 @@ var aws = require('@jaypie/aws');
 var openmeteo = require('openmeteo');
 
 const FIRST_CLASS_PROVIDER = {
+    // https://docs.anthropic.com/en/docs/about-claude/models/overview
     ANTHROPIC: {
-        DEFAULT: "claude-sonnet-4-5",
-        LARGE: "claude-opus-4-5",
-        SMALL: "claude-sonnet-4-5",
+        DEFAULT: "claude-sonnet-4-6",
+        LARGE: "claude-opus-4-6",
+        SMALL: "claude-sonnet-4-6",
         TINY: "claude-haiku-4-5",
     },
+    // https://ai.google.dev/gemini-api/docs/models
     GEMINI: {
-        DEFAULT: "gemini-3-pro-preview",
-        LARGE: "gemini-3-pro-preview",
+        DEFAULT: "gemini-3.1-pro-preview",
+        LARGE: "gemini-3.1-pro-preview",
         SMALL: "gemini-3-flash-preview",
-        TINY: "gemini-3-flash-preview",
+        TINY: "gemini-3.1-flash-lite-preview",
     },
+    // https://developers.openai.com/api/docs/models
     OPENAI: {
-        DEFAULT: "gpt-5.2",
-        LARGE: "gpt-5.2-pro",
-        SMALL: "gpt-5-mini",
-        TINY: "gpt-5-nano",
-    },
-    OPENROUTER: {
-        DEFAULT: "z-ai/glm-4.7",
-        LARGE: "z-ai/glm-4.7",
-        SMALL: "z-ai/glm-4.7",
-        TINY: "z-ai/glm-4.7",
+        DEFAULT: "gpt-5.4",
+        LARGE: "gpt-5.4",
+        SMALL: "gpt-5.4-mini",
+        TINY: "gpt-5.4-nano",
     },
+    // https://docs.x.ai/developers/models
     XAI: {
-        DEFAULT: "grok-4-1-fast-reasoning",
-        LARGE: "grok-4-1-fast-reasoning",
-        SMALL: "grok-3",
-        TINY: "grok-3-mini",
+        DEFAULT: "grok-4.20-0309-reasoning",
+        LARGE: "grok-4.20-0309-reasoning",
+        SMALL: "grok-4.20-0309-non-reasoning",
+        TINY: "grok-4-1-fast-non-reasoning",
     },
 };
 const PROVIDER = {
@@ -105,15 +103,11 @@ const PROVIDER = {
         NAME: "openai",
     },
     OPENROUTER: {
-        // https://openrouter.ai/models
-        // OpenRouter provides access to hundreds of models from various providers
-        // The model format is: provider/model-name (e.g., "openai/gpt-4", "anthropic/claude-3-opus")
         MODEL: {
-            // Default uses env var OPENROUTER_MODEL if set, otherwise a reasonable default
-            DEFAULT: FIRST_CLASS_PROVIDER.OPENROUTER.DEFAULT,
-            LARGE: FIRST_CLASS_PROVIDER.OPENROUTER.LARGE,
-            SMALL: FIRST_CLASS_PROVIDER.OPENROUTER.SMALL,
-            TINY: FIRST_CLASS_PROVIDER.OPENROUTER.TINY,
+            DEFAULT: `anthropic/${FIRST_CLASS_PROVIDER.ANTHROPIC.DEFAULT}`,
+            LARGE: `anthropic/${FIRST_CLASS_PROVIDER.ANTHROPIC.LARGE}`,
+            SMALL: `anthropic/${FIRST_CLASS_PROVIDER.ANTHROPIC.SMALL}`,
+            TINY: `anthropic/${FIRST_CLASS_PROVIDER.ANTHROPIC.TINY}`,
         },
         MODEL_MATCH_WORDS: ["openrouter"],
         NAME: "openrouter",
@@ -563,7 +557,7 @@ const log$1 = getLogger$5();
 
 // Turn policy constants
 const MAX_TURNS_ABSOLUTE_LIMIT = 72;
-const MAX_TURNS_DEFAULT_LIMIT = 12;
+const MAX_TURNS_DEFAULT_LIMIT = 24;
 /**
  * Determines the maximum number of turns based on the provided options
  *
@@ -4155,6 +4149,7 @@ class RetryExecutor {
 const ERROR$1 = {
     BAD_FUNCTION_CALL: "Bad Function Call",
 };
+const MAX_CONSECUTIVE_TOOL_ERRORS = 6;
 //
 //
 // Helpers
@@ -4277,6 +4272,7 @@ class OperateLoop {
             }
         }
         return {
+            consecutiveToolErrors: 0,
             currentInput: processedInput.history,
             currentTurn: 0,
             formattedFormat,
@@ -4401,6 +4397,8 @@ class OperateLoop {
                             output: JSON.stringify(result),
                             success: true,
                         };
+                        // Reset consecutive error counter on success
+                        state.consecutiveToolErrors = 0;
                         // Update provider request with tool result
                         currentProviderRequest = this.adapter.appendToolResult(currentProviderRequest, toolCall, formattedResult);
                         // Sync state from updated request
@@ -4442,6 +4440,19 @@ class OperateLoop {
                         state.responseBuilder.appendToHistory(toolResultFormatted);
                         log$1.error(`Error executing function call ${toolCall.name}`);
                         log$1.var({ error });
+                        // Track consecutive errors and stop if threshold reached
+                        state.consecutiveToolErrors++;
+                        if (state.consecutiveToolErrors >= MAX_CONSECUTIVE_TOOL_ERRORS) {
+                            const detail = `Stopped after ${MAX_CONSECUTIVE_TOOL_ERRORS} consecutive tool errors`;
+                            log$1.warn(detail);
+                            state.responseBuilder.setError({
+                                detail,
+                                status: 502,
+                                title: ERROR$1.BAD_FUNCTION_CALL,
+                            });
+                            state.responseBuilder.incomplete();
+                            return false; // Stop loop
+                        }
                     }
                 }
                 // Check if we've reached max turns
@@ -4689,6 +4700,7 @@ class StreamLoop {
             ? this.adapter.formatTools(toolkit, formattedFormat)
             : undefined;
         return {
+            consecutiveToolErrors: 0,
             currentInput: processedInput.history,
             currentTurn: 0,
             formattedFormat,
@@ -4882,6 +4894,8 @@ class StreamLoop {
                     result,
                     toolName: toolCall.name,
                 });
+                // Reset consecutive error counter on success
+                state.consecutiveToolErrors = 0;
                 // Yield tool result chunk
                 yield {
                     type: exports.LlmStreamChunkType.ToolResult,
@@ -4934,6 +4948,21 @@ class StreamLoop {
                 });
                 log$1.error(`Error executing function call ${toolCall.name}`);
                 log$1.var({ error });
+                // Track consecutive errors and stop if threshold reached
+                state.consecutiveToolErrors++;
+                if (state.consecutiveToolErrors >= MAX_CONSECUTIVE_TOOL_ERRORS) {
+                    const stopDetail = `Stopped after ${MAX_CONSECUTIVE_TOOL_ERRORS} consecutive tool errors`;
+                    log$1.warn(stopDetail);
+                    yield {
+                        type: exports.LlmStreamChunkType.Error,
+                        error: {
+                            detail: stopDetail,
+                            status: 502,
+                            title: ERROR.BAD_FUNCTION_CALL,
+                        },
+                    };
+                    return; // Stop processing tools
+                }
             }
         }
     }