@jaypie/llm 1.2.21 → 1.2.23

package/dist/cjs/constants.d.ts

@@ -98,7 +98,7 @@ export declare const DEFAULT: {
 };
 export declare const ALL: {
     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 COMBINED: readonly ("claude-sonnet-4-6" | "claude-opus-4-6" | "claude-haiku-4-5" | "gemini-3.1-pro-preview" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite-preview" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-nano" | "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

@@ -151,22 +151,24 @@ const ALL = {
         PROVIDER.XAI.MODEL.DEFAULT,
     ],
     COMBINED: [
-        PROVIDER.ANTHROPIC.MODEL.DEFAULT,
-        PROVIDER.ANTHROPIC.MODEL.LARGE,
-        PROVIDER.ANTHROPIC.MODEL.SMALL,
-        PROVIDER.ANTHROPIC.MODEL.TINY,
-        PROVIDER.GEMINI.MODEL.DEFAULT,
-        PROVIDER.GEMINI.MODEL.LARGE,
-        PROVIDER.GEMINI.MODEL.SMALL,
-        PROVIDER.GEMINI.MODEL.TINY,
-        PROVIDER.OPENAI.MODEL.DEFAULT,
-        PROVIDER.OPENAI.MODEL.LARGE,
-        PROVIDER.OPENAI.MODEL.SMALL,
-        PROVIDER.OPENAI.MODEL.TINY,
-        PROVIDER.XAI.MODEL.DEFAULT,
-        PROVIDER.XAI.MODEL.LARGE,
-        PROVIDER.XAI.MODEL.SMALL,
-        PROVIDER.XAI.MODEL.TINY,
+        ...new Set([
+            PROVIDER.ANTHROPIC.MODEL.DEFAULT,
+            PROVIDER.ANTHROPIC.MODEL.LARGE,
+            PROVIDER.ANTHROPIC.MODEL.SMALL,
+            PROVIDER.ANTHROPIC.MODEL.TINY,
+            PROVIDER.GEMINI.MODEL.DEFAULT,
+            PROVIDER.GEMINI.MODEL.LARGE,
+            PROVIDER.GEMINI.MODEL.SMALL,
+            PROVIDER.GEMINI.MODEL.TINY,
+            PROVIDER.OPENAI.MODEL.DEFAULT,
+            PROVIDER.OPENAI.MODEL.LARGE,
+            PROVIDER.OPENAI.MODEL.SMALL,
+            PROVIDER.OPENAI.MODEL.TINY,
+            PROVIDER.XAI.MODEL.DEFAULT,
+            PROVIDER.XAI.MODEL.LARGE,
+            PROVIDER.XAI.MODEL.SMALL,
+            PROVIDER.XAI.MODEL.TINY,
+        ]),
     ],
     LARGE: [
         PROVIDER.ANTHROPIC.MODEL.LARGE,
@@ -557,7 +559,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
  *
@@ -4149,6 +4151,7 @@ class RetryExecutor {
 const ERROR$1 = {
     BAD_FUNCTION_CALL: "Bad Function Call",
 };
+const MAX_CONSECUTIVE_TOOL_ERRORS = 6;
 //
 //
 // Helpers
@@ -4271,6 +4274,7 @@ class OperateLoop {
             }
         }
         return {
+            consecutiveToolErrors: 0,
             currentInput: processedInput.history,
             currentTurn: 0,
             formattedFormat,
@@ -4395,6 +4399,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
@@ -4436,6 +4442,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
@@ -4683,6 +4702,7 @@ class StreamLoop {
             ? this.adapter.formatTools(toolkit, formattedFormat)
             : undefined;
         return {
+            consecutiveToolErrors: 0,
             currentInput: processedInput.history,
             currentTurn: 0,
             formattedFormat,
@@ -4876,6 +4896,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,
@@ -4928,6 +4950,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
+                }
             }
         }
     }