@jaypie/llm 1.2.6 → 1.2.8

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

@@ -12,7 +12,7 @@ import { BaseProviderAdapter } from "./ProviderAdapter.interface.js";
  */
 export declare class OpenAiAdapter extends BaseProviderAdapter {
     readonly name: "openai";
-    readonly defaultModel: "gpt-5.1";
+    readonly defaultModel: "gpt-5.2";
     buildRequest(request: OperateRequest): unknown;
     formatTools(toolkit: Toolkit, _outputSchema?: JsonObject): ProviderToolDefinition[];
     formatOutputSchema(schema: JsonObject | NaturalSchema | z.ZodType): JsonObject;

package/dist/cjs/tools/Toolkit.class.d.ts

@@ -17,7 +17,7 @@ export declare class Toolkit {
     call({ name, arguments: args }: {
         name: string;
         arguments: string;
-    }): Promise<any>;
+    }): Promise<import("@jaypie/types").AnyValue>;
     extend(tools: LlmTool[], options?: {
         warn?: boolean;
         replace?: boolean;

package/dist/esm/constants.d.ts

@@ -1,19 +1,28 @@
 export declare const PROVIDER: {
-    readonly OPENROUTER: {
+    readonly ANTHROPIC: {
+        readonly MAX_TOKENS: {
+            readonly DEFAULT: 4096;
+        };
         readonly MODEL: {
-            readonly DEFAULT: "z-ai/glm-4.7";
-            readonly SMALL: "z-ai/glm-4.7";
-            readonly LARGE: "z-ai/glm-4.7";
-            readonly TINY: "z-ai/glm-4.7";
+            readonly DEFAULT: "claude-sonnet-4-5";
+            readonly LARGE: "claude-opus-4-5";
+            readonly SMALL: "claude-sonnet-4-5";
+            readonly TINY: "claude-haiku-4-5";
+        };
+        readonly MODEL_MATCH_WORDS: readonly ["anthropic", "claude", "haiku", "opus", "sonnet"];
+        readonly NAME: "anthropic";
+        readonly PROMPT: {
+            readonly AI: "\n\nAssistant:";
+            readonly HUMAN: "\n\nHuman:";
         };
-        readonly MODEL_MATCH_WORDS: readonly ["openrouter"];
-        readonly NAME: "openrouter";
         readonly ROLE: {
             readonly ASSISTANT: "assistant";
             readonly SYSTEM: "system";
-            readonly TOOL: "tool";
             readonly USER: "user";
         };
+        readonly TOOLS: {
+            readonly SCHEMA_VERSION: "v2";
+        };
     };
     readonly GEMINI: {
         readonly MODEL: {
@@ -29,65 +38,56 @@ export declare const PROVIDER: {
             readonly USER: "user";
         };
     };
-    readonly ANTHROPIC: {
+    readonly OPENAI: {
         readonly MODEL: {
-            readonly DEFAULT: "claude-sonnet-4-5";
-            readonly LARGE: "claude-opus-4-5";
-            readonly SMALL: "claude-sonnet-4-5";
-            readonly TINY: "claude-haiku-4-5";
+            readonly DEFAULT: "gpt-5.2";
+            readonly LARGE: "gpt-5.2-pro";
+            readonly SMALL: "gpt-5-mini";
+            readonly TINY: "gpt-5-nano";
         };
-        readonly MODEL_MATCH_WORDS: readonly ["anthropic", "claude", "haiku", "opus", "sonnet"];
-        readonly NAME: "anthropic";
-        readonly PROMPT: {
-            readonly AI: "\n\nAssistant:";
-            readonly HUMAN: "\n\nHuman:";
+        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 MODEL_MATCH_WORDS: readonly ["openrouter"];
+        readonly NAME: "openrouter";
         readonly ROLE: {
             readonly ASSISTANT: "assistant";
             readonly SYSTEM: "system";
+            readonly TOOL: "tool";
             readonly USER: "user";
         };
-        readonly MAX_TOKENS: {
-            readonly DEFAULT: 4096;
-        };
-        readonly TOOLS: {
-            readonly SCHEMA_VERSION: "v2";
-        };
-    };
-    readonly OPENAI: {
-        readonly MODEL: {
-            readonly DEFAULT: "gpt-5.1";
-            readonly LARGE: "gpt-5.1";
-            readonly SMALL: "gpt-5.1-mini";
-            readonly TINY: "gpt-5.1-nano";
-        };
-        readonly MODEL_MATCH_WORDS: readonly ["openai", "gpt", RegExp];
-        readonly NAME: "openai";
     };
 };
 export type LlmProviderName = typeof PROVIDER.ANTHROPIC.NAME | typeof PROVIDER.GEMINI.NAME | typeof PROVIDER.OPENAI.NAME | typeof PROVIDER.OPENROUTER.NAME;
 export declare const DEFAULT: {
     readonly MODEL: {
-        readonly BASE: "gpt-5.1";
-        readonly LARGE: "gpt-5.1";
-        readonly SMALL: "gpt-5.1-mini";
-        readonly TINY: "gpt-5.1-nano";
+        readonly BASE: "gpt-5.2";
+        readonly LARGE: "gpt-5.2-pro";
+        readonly SMALL: "gpt-5-mini";
+        readonly TINY: "gpt-5-nano";
     };
     readonly PROVIDER: {
         readonly MODEL: {
-            readonly DEFAULT: "gpt-5.1";
-            readonly LARGE: "gpt-5.1";
-            readonly SMALL: "gpt-5.1-mini";
-            readonly TINY: "gpt-5.1-nano";
+            readonly DEFAULT: "gpt-5.2";
+            readonly LARGE: "gpt-5.2-pro";
+            readonly SMALL: "gpt-5-mini";
+            readonly TINY: "gpt-5-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.1"];
-    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.1", "gpt-5.1", "gpt-5.1-mini", "gpt-5.1-nano"];
-    readonly LARGE: readonly ["claude-opus-4-5", "gemini-3-pro-preview", "gpt-5.1"];
-    readonly SMALL: readonly ["claude-sonnet-4-5", "gemini-3-flash-preview", "gpt-5.1-mini"];
-    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3-flash-preview", "gpt-5.1-nano"];
+    readonly BASE: readonly ["claude-sonnet-4-5", "gemini-3-pro-preview", "gpt-5.2"];
+    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"];
+    readonly LARGE: readonly ["claude-opus-4-5", "gemini-3-pro-preview", "gpt-5.2-pro"];
+    readonly SMALL: readonly ["claude-sonnet-4-5", "gemini-3-flash-preview", "gpt-5-mini"];
+    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3-flash-preview", "gpt-5-nano"];
 };

package/dist/esm/index.js

@@ -11,49 +11,43 @@ import { resolve } from 'path';
 import { getS3FileBuffer, getEnvSecret } from '@jaypie/aws';
 import { fetchWeatherApi } from 'openmeteo';
 
-const PROVIDER = {
-    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: "z-ai/glm-4.7",
-            SMALL: "z-ai/glm-4.7",
-            LARGE: "z-ai/glm-4.7",
-            TINY: "z-ai/glm-4.7",
-        },
-        MODEL_MATCH_WORDS: ["openrouter"],
-        NAME: "openrouter",
-        ROLE: {
-            ASSISTANT: "assistant",
-            SYSTEM: "system",
-            TOOL: "tool",
-            USER: "user",
-        },
+const FIRST_CLASS_PROVIDER = {
+    ANTHROPIC: {
+        DEFAULT: "claude-sonnet-4-5",
+        LARGE: "claude-opus-4-5",
+        SMALL: "claude-sonnet-4-5",
+        TINY: "claude-haiku-4-5",
     },
     GEMINI: {
-        // https://ai.google.dev/gemini-api/docs/models
-        MODEL: {
-            DEFAULT: "gemini-3-pro-preview",
-            LARGE: "gemini-3-pro-preview",
-            SMALL: "gemini-3-flash-preview",
-            TINY: "gemini-3-flash-preview",
-        },
-        MODEL_MATCH_WORDS: ["gemini", "google"],
-        NAME: "gemini",
-        ROLE: {
-            MODEL: "model",
-            USER: "user",
-        },
+        DEFAULT: "gemini-3-pro-preview",
+        LARGE: "gemini-3-pro-preview",
+        SMALL: "gemini-3-flash-preview",
+        TINY: "gemini-3-flash-preview",
+    },
+    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",
+    },
+};
+const PROVIDER = {
     ANTHROPIC: {
         // https://docs.anthropic.com/en/docs/about-claude/models/overview
+        MAX_TOKENS: {
+            DEFAULT: 4096,
+        },
         MODEL: {
-            DEFAULT: "claude-sonnet-4-5",
-            LARGE: "claude-opus-4-5",
-            SMALL: "claude-sonnet-4-5",
-            TINY: "claude-haiku-4-5",
+            DEFAULT: FIRST_CLASS_PROVIDER.ANTHROPIC.DEFAULT,
+            LARGE: FIRST_CLASS_PROVIDER.ANTHROPIC.LARGE,
+            SMALL: FIRST_CLASS_PROVIDER.ANTHROPIC.SMALL,
+            TINY: FIRST_CLASS_PROVIDER.ANTHROPIC.TINY,
         },
         MODEL_MATCH_WORDS: [
             "anthropic",
@@ -72,24 +66,56 @@ const PROVIDER = {
             SYSTEM: "system",
             USER: "user",
         },
-        MAX_TOKENS: {
-            DEFAULT: 4096,
-        },
         TOOLS: {
             SCHEMA_VERSION: "v2",
         },
     },
+    GEMINI: {
+        // https://ai.google.dev/gemini-api/docs/models
+        MODEL: {
+            DEFAULT: FIRST_CLASS_PROVIDER.GEMINI.DEFAULT,
+            LARGE: FIRST_CLASS_PROVIDER.GEMINI.LARGE,
+            SMALL: FIRST_CLASS_PROVIDER.GEMINI.SMALL,
+            TINY: FIRST_CLASS_PROVIDER.GEMINI.TINY,
+        },
+        MODEL_MATCH_WORDS: ["gemini", "google"],
+        NAME: "gemini",
+        ROLE: {
+            MODEL: "model",
+            USER: "user",
+        },
+    },
     OPENAI: {
         // https://platform.openai.com/docs/models
         MODEL: {
-            DEFAULT: "gpt-5.1",
-            LARGE: "gpt-5.1",
-            SMALL: "gpt-5.1-mini",
-            TINY: "gpt-5.1-nano",
+            DEFAULT: FIRST_CLASS_PROVIDER.OPENAI.DEFAULT,
+            LARGE: FIRST_CLASS_PROVIDER.OPENAI.LARGE,
+            SMALL: FIRST_CLASS_PROVIDER.OPENAI.SMALL,
+            TINY: FIRST_CLASS_PROVIDER.OPENAI.TINY,
         },
         MODEL_MATCH_WORDS: ["openai", "gpt", /^o\d/],
         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,
+        },
+        MODEL_MATCH_WORDS: ["openrouter"],
+        NAME: "openrouter",
+        ROLE: {
+            ASSISTANT: "assistant",
+            SYSTEM: "system",
+            TOOL: "tool",
+            USER: "user",
+        },
+    },
 };
 // Last: Defaults
 const DEFAULT = {
@@ -883,19 +909,51 @@ class AnthropicAdapter extends BaseProviderAdapter {
     //
     buildRequest(request) {
         // Convert messages to Anthropic format
-        // Filter out system messages - Anthropic only accepts system as a top-level field
-        const messages = request.messages
-            .filter((msg) => {
-            const role = msg.role;
-            return role !== "system";
-        })
-            .map((msg) => {
+        // Handle different message types: regular messages, function calls, and function outputs
+        const messages = [];
+        for (const msg of request.messages) {
             const typedMsg = msg;
-            return {
-                role: typedMsg.role,
-                content: convertContentToAnthropic(typedMsg.content),
-            };
-        });
+            // Skip system messages - Anthropic only accepts system as a top-level field
+            if (typedMsg.role === "system") {
+                continue;
+            }
+            // Handle FunctionCall messages - convert to assistant message with tool_use
+            if (typedMsg.type === LlmMessageType.FunctionCall) {
+                messages.push({
+                    role: "assistant",
+                    content: [
+                        {
+                            type: "tool_use",
+                            id: typedMsg.call_id || "",
+                            name: typedMsg.name || "",
+                            input: JSON.parse(typedMsg.arguments || "{}"),
+                        },
+                    ],
+                });
+                continue;
+            }
+            // Handle FunctionCallOutput messages - convert to user message with tool_result
+            if (typedMsg.type === LlmMessageType.FunctionCallOutput) {
+                messages.push({
+                    role: "user",
+                    content: [
+                        {
+                            type: "tool_result",
+                            tool_use_id: typedMsg.call_id || "",
+                            content: typedMsg.output || "",
+                        },
+                    ],
+                });
+                continue;
+            }
+            // Handle regular messages with role and content
+            if (typedMsg.role && typedMsg.content !== undefined) {
+                messages.push({
+                    role: typedMsg.role,
+                    content: convertContentToAnthropic(typedMsg.content),
+                });
+            }
+        }
         // Append instructions to last message if provided
         if (request.instructions && messages.length > 0) {
             const lastMsg = messages[messages.length - 1];
@@ -2883,6 +2941,31 @@ class OpenRouterAdapter extends BaseProviderAdapter {
                     });
                 }
             }
+            else if (message.type === LlmMessageType.FunctionCall) {
+                // Handle FunctionCall messages from StreamLoop (issue #165)
+                openRouterMessages.push({
+                    role: "assistant",
+                    content: null,
+                    toolCalls: [
+                        {
+                            id: message.call_id,
+                            type: "function",
+                            function: {
+                                name: message.name,
+                                arguments: message.arguments || "{}",
+                            },
+                        },
+                    ],
+                });
+            }
+            else if (message.type === LlmMessageType.FunctionCallOutput) {
+                // Handle FunctionCallOutput messages from StreamLoop (issue #165)
+                openRouterMessages.push({
+                    role: "tool",
+                    toolCallId: message.call_id,
+                    content: message.output || "",
+                });
+            }
         }
         return openRouterMessages;
     }