@jaypie/llm 1.2.37 → 1.2.39

package/dist/cjs/constants.d.ts

@@ -1,3 +1,17 @@
+export declare const MODEL: {
+    OPUS: string;
+    SONNET: string;
+    HAIKU: string;
+    FABLE: string;
+    MYTHOS: string;
+    GEMINI_FLASH: string;
+    GEMINI_FLASH_LITE: string;
+    GEMINI_PRO: string;
+    GPT: string;
+    GPT_MINI: string;
+    GPT_NANO: string;
+    GROK: string;
+};
 export declare const PROVIDER: {
     readonly BEDROCK: {
         readonly MODEL: {
@@ -35,12 +49,27 @@ export declare const PROVIDER: {
             readonly SCHEMA_VERSION: "v2";
         };
     };
+    /** @deprecated Use PROVIDER.GOOGLE — "Google" is the provider; Gemini is the model family */
     readonly GEMINI: {
         readonly MODEL: {
             readonly DEFAULT: "gemini-3.1-pro-preview";
             readonly LARGE: "gemini-3.1-pro-preview";
             readonly SMALL: "gemini-3.5-flash";
-            readonly TINY: "gemini-3.5-flash";
+            readonly TINY: "gemini-3.1-flash-lite";
+        };
+        readonly MODEL_MATCH_WORDS: readonly ["gemini", "google"];
+        readonly NAME: "google";
+        readonly ROLE: {
+            readonly MODEL: "model";
+            readonly USER: "user";
+        };
+    };
+    readonly GOOGLE: {
+        readonly MODEL: {
+            readonly DEFAULT: "gemini-3.1-pro-preview";
+            readonly LARGE: "gemini-3.1-pro-preview";
+            readonly SMALL: "gemini-3.5-flash";
+            readonly TINY: "gemini-3.1-flash-lite";
         };
         readonly MODEL_MATCH_WORDS: readonly ["gemini", "google"];
         readonly NAME: "google";
@@ -88,7 +117,7 @@ export declare const PROVIDER: {
         readonly NAME: "xai";
     };
 };
-export type LlmProviderName = typeof PROVIDER.ANTHROPIC.NAME | typeof PROVIDER.BEDROCK.NAME | typeof PROVIDER.GEMINI.NAME | typeof PROVIDER.OPENAI.NAME | typeof PROVIDER.OPENROUTER.NAME | typeof PROVIDER.XAI.NAME;
+export type LlmProviderName = typeof PROVIDER.ANTHROPIC.NAME | typeof PROVIDER.BEDROCK.NAME | typeof PROVIDER.GOOGLE.NAME | typeof PROVIDER.OPENAI.NAME | typeof PROVIDER.OPENROUTER.NAME | typeof PROVIDER.XAI.NAME;
 export declare const DEFAULT: {
     readonly MODEL: {
         readonly BASE: "gpt-5.4";
@@ -109,8 +138,8 @@ export declare const DEFAULT: {
 };
 export declare const ALL: {
     readonly BASE: readonly ["claude-sonnet-4-6", "gemini-3.1-pro-preview", "gpt-5.4", "grok-latest"];
-    readonly COMBINED: readonly ("claude-sonnet-4-6" | "claude-opus-4-8" | "claude-haiku-4-5" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gpt-5.4" | "gpt-5.5" | "gpt-5.4-mini" | "gpt-5.4-nano" | "grok-latest" | "grok-4.3-latest" | "grok-4-1-fast-reasoning" | "grok-4-1-fast-non-reasoning")[];
+    readonly COMBINED: readonly ("claude-sonnet-4-6" | "claude-opus-4-8" | "claude-haiku-4-5" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.1-flash-lite" | "gpt-5.4" | "gpt-5.5" | "gpt-5.4-mini" | "gpt-5.4-nano" | "grok-latest" | "grok-4.3-latest" | "grok-4-1-fast-reasoning" | "grok-4-1-fast-non-reasoning")[];
     readonly LARGE: readonly ["claude-opus-4-8", "gemini-3.1-pro-preview", "gpt-5.5", "grok-4.3-latest"];
     readonly SMALL: readonly ["claude-sonnet-4-6", "gemini-3.5-flash", "gpt-5.4-mini", "grok-4-1-fast-reasoning"];
-    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3.5-flash", "gpt-5.4-nano", "grok-4-1-fast-non-reasoning"];
+    readonly TINY: readonly ["claude-haiku-4-5", "gemini-3.1-flash-lite", "gpt-5.4-nano", "grok-4-1-fast-non-reasoning"];
 };

package/dist/cjs/index.cjs

@@ -22,11 +22,11 @@ const FIRST_CLASS_PROVIDER = {
         TINY: "claude-haiku-4-5",
     },
     // https://ai.google.dev/gemini-api/docs/models
-    GEMINI: {
+    GOOGLE: {
         DEFAULT: "gemini-3.1-pro-preview",
         LARGE: "gemini-3.1-pro-preview",
         SMALL: "gemini-3.5-flash",
-        TINY: "gemini-3.5-flash",
+        TINY: "gemini-3.1-flash-lite",
     },
     // https://developers.openai.com/api/docs/models
     OPENAI: {
@@ -43,6 +43,39 @@ const FIRST_CLASS_PROVIDER = {
         TINY: "grok-4-1-fast-non-reasoning",
     },
 };
+const MODEL = {
+    // Anthropic
+    OPUS: "claude-opus-4-8",
+    SONNET: "claude-sonnet-4-6",
+    HAIKU: "claude-haiku-4-5",
+    FABLE: "claude-fable-5",
+    MYTHOS: "claude-mythos-5",
+    // Google
+    GEMINI_FLASH: "gemini-3.5-flash",
+    GEMINI_FLASH_LITE: "gemini-3.1-flash-lite",
+    GEMINI_PRO: "gemini-3.1-pro-preview",
+    // OpenAI
+    GPT: "gpt-5.5",
+    GPT_MINI: "gpt-5.4-mini",
+    GPT_NANO: "gpt-5.4-nano",
+    // xAI
+    GROK: "grok-latest",
+};
+const GOOGLE_PROVIDER = {
+    // https://ai.google.dev/gemini-api/docs/models
+    MODEL: {
+        DEFAULT: FIRST_CLASS_PROVIDER.GOOGLE.DEFAULT,
+        LARGE: FIRST_CLASS_PROVIDER.GOOGLE.LARGE,
+        SMALL: FIRST_CLASS_PROVIDER.GOOGLE.SMALL,
+        TINY: FIRST_CLASS_PROVIDER.GOOGLE.TINY,
+    },
+    MODEL_MATCH_WORDS: ["gemini", "google"],
+    NAME: "google",
+    ROLE: {
+        MODEL: "model",
+        USER: "user",
+    },
+};
 const PROVIDER = {
     // https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html
     BEDROCK: {
@@ -96,21 +129,9 @@ const PROVIDER = {
             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: "google",
-        ROLE: {
-            MODEL: "model",
-            USER: "user",
-        },
-    },
+    /** @deprecated Use PROVIDER.GOOGLE — "Google" is the provider; Gemini is the model family */
+    GEMINI: GOOGLE_PROVIDER,
+    GOOGLE: GOOGLE_PROVIDER,
     OPENAI: {
         // https://platform.openai.com/docs/models
         MODEL: {
@@ -166,7 +187,7 @@ const DEFAULT = {
 const ALL = {
     BASE: [
         PROVIDER.ANTHROPIC.MODEL.DEFAULT,
-        PROVIDER.GEMINI.MODEL.DEFAULT,
+        PROVIDER.GOOGLE.MODEL.DEFAULT,
         PROVIDER.OPENAI.MODEL.DEFAULT,
         PROVIDER.XAI.MODEL.DEFAULT,
     ],
@@ -176,10 +197,10 @@ const ALL = {
             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.GOOGLE.MODEL.DEFAULT,
+            PROVIDER.GOOGLE.MODEL.LARGE,
+            PROVIDER.GOOGLE.MODEL.SMALL,
+            PROVIDER.GOOGLE.MODEL.TINY,
             PROVIDER.OPENAI.MODEL.DEFAULT,
             PROVIDER.OPENAI.MODEL.LARGE,
             PROVIDER.OPENAI.MODEL.SMALL,
@@ -192,19 +213,19 @@ const ALL = {
     ],
     LARGE: [
         PROVIDER.ANTHROPIC.MODEL.LARGE,
-        PROVIDER.GEMINI.MODEL.LARGE,
+        PROVIDER.GOOGLE.MODEL.LARGE,
         PROVIDER.OPENAI.MODEL.LARGE,
         PROVIDER.XAI.MODEL.LARGE,
     ],
     SMALL: [
         PROVIDER.ANTHROPIC.MODEL.SMALL,
-        PROVIDER.GEMINI.MODEL.SMALL,
+        PROVIDER.GOOGLE.MODEL.SMALL,
         PROVIDER.OPENAI.MODEL.SMALL,
         PROVIDER.XAI.MODEL.SMALL,
     ],
     TINY: [
         PROVIDER.ANTHROPIC.MODEL.TINY,
-        PROVIDER.GEMINI.MODEL.TINY,
+        PROVIDER.GOOGLE.MODEL.TINY,
         PROVIDER.OPENAI.MODEL.TINY,
         PROVIDER.XAI.MODEL.TINY,
     ],
@@ -214,6 +235,7 @@ var constants = /*#__PURE__*/Object.freeze({
     __proto__: null,
     ALL: ALL,
     DEFAULT: DEFAULT,
+    MODEL: MODEL,
     PROVIDER: PROVIDER
 });
 
@@ -253,10 +275,10 @@ function determineModelProvider(input) {
             provider: PROVIDER.ANTHROPIC.NAME,
         };
     }
-    if (input === PROVIDER.GEMINI.NAME || input === "gemini") {
+    if (input === PROVIDER.GOOGLE.NAME || input === "gemini") {
         return {
-            model: PROVIDER.GEMINI.MODEL.DEFAULT,
-            provider: PROVIDER.GEMINI.NAME,
+            model: PROVIDER.GOOGLE.MODEL.DEFAULT,
+            provider: PROVIDER.GOOGLE.NAME,
         };
     }
     if (input === PROVIDER.OPENAI.NAME) {
@@ -287,11 +309,11 @@ function determineModelProvider(input) {
         }
     }
     // Check if input matches a Gemini model exactly
-    for (const [, modelValue] of Object.entries(PROVIDER.GEMINI.MODEL)) {
+    for (const [, modelValue] of Object.entries(PROVIDER.GOOGLE.MODEL)) {
         if (input === modelValue) {
             return {
                 model: input,
-                provider: PROVIDER.GEMINI.NAME,
+                provider: PROVIDER.GOOGLE.NAME,
             };
         }
     }
@@ -350,11 +372,11 @@ function determineModelProvider(input) {
         }
     }
     // Check Gemini match words
-    for (const matchWord of PROVIDER.GEMINI.MODEL_MATCH_WORDS) {
+    for (const matchWord of PROVIDER.GOOGLE.MODEL_MATCH_WORDS) {
         if (lowerInput.includes(matchWord)) {
             return {
                 model: input,
-                provider: PROVIDER.GEMINI.NAME,
+                provider: PROVIDER.GOOGLE.NAME,
             };
         }
     }
@@ -2048,8 +2070,7 @@ class BedrockAdapter extends BaseProviderAdapter {
         if (request.system) {
             bedrockRequest.system = [{ text: request.system }];
         }
-        if (request.temperature !== undefined &&
-            this.supportsTemperature(model)) {
+        if (request.temperature !== undefined && this.supportsTemperature(model)) {
             bedrockRequest.inferenceConfig = {
                 ...bedrockRequest.inferenceConfig,
                 temperature: request.temperature,
@@ -2190,10 +2211,7 @@ class BedrockAdapter extends BaseProviderAdapter {
         return {
             ...rest,
             toolConfig: {
-                tools: [
-                    ...(rest.toolConfig?.tools ?? []),
-                    fakeTool,
-                ],
+                tools: [...(rest.toolConfig?.tools ?? []), fakeTool],
             },
         };
     }
@@ -2417,7 +2435,8 @@ class BedrockAdapter extends BaseProviderAdapter {
             return this.extractStructuredOutput(response) !== undefined;
         }
         // Fake-tool path: last content block is a structured_output toolUse
-        const content = (bedrockResponse.output?.message?.content ?? []);
+        const content = (bedrockResponse.output?.message?.content ??
+            []);
         const last = content[content.length - 1];
         return (!!last &&
             "toolUse" in last &&
@@ -2426,14 +2445,16 @@ class BedrockAdapter extends BaseProviderAdapter {
     extractStructuredOutput(response) {
         const bedrockResponse = response;
         if (bedrockResponse.__jaypieStructuredOutput) {
-            const content = (bedrockResponse.output?.message?.content ?? []);
+            const content = (bedrockResponse.output?.message?.content ??
+                []);
             const textBlock = content.find((b) => "text" in b);
             if (!textBlock)
                 return undefined;
             return extractJson(textBlock.text);
         }
         // Fake-tool path
-        const content = (bedrockResponse.output?.message?.content ?? []);
+        const content = (bedrockResponse.output?.message?.content ??
+            []);
         const last = content[content.length - 1];
         if (last &&
             "toolUse" in last &&
@@ -2510,15 +2531,15 @@ const NOT_RETRYABLE_STATUS_CODES = [
 // Main
 //
 /**
- * GeminiAdapter implements the ProviderAdapter interface for Google's Gemini API.
+ * GoogleAdapter implements the ProviderAdapter interface for Google's Gemini API.
  * It handles request building, response parsing, and error classification
  * specific to Gemini's generateContent API.
  */
-class GeminiAdapter extends BaseProviderAdapter {
+class GoogleAdapter extends BaseProviderAdapter {
     constructor() {
         super(...arguments);
-        this.name = PROVIDER.GEMINI.NAME;
-        this.defaultModel = PROVIDER.GEMINI.MODEL.DEFAULT;
+        this.name = PROVIDER.GOOGLE.NAME;
+        this.defaultModel = PROVIDER.GOOGLE.MODEL.DEFAULT;
         // Session-level cache of Gemini 3 models observed to reject the native
         // `responseJsonSchema` + tools combo. When a model is in this set,
         // buildRequest engages the legacy fake-tool path instead.
@@ -2573,7 +2594,7 @@ class GeminiAdapter extends BaseProviderAdapter {
             ? [...request.tools]
             : [];
         if (request.format && hasUserTools && !useNativeCombo) {
-            log$1.warn(`[GeminiAdapter] Using legacy structured_output tool fallback for model ${geminiRequest.model}; native responseJsonSchema + tools combo is only available on Gemini 3.`);
+            log$1.warn(`[GoogleAdapter] Using legacy structured_output tool fallback for model ${geminiRequest.model}; native responseJsonSchema + tools combo is only available on Gemini 3.`);
             allTools.push({
                 name: STRUCTURED_OUTPUT_TOOL_NAME$1,
                 description: "Output a structured JSON object, " +
@@ -2704,7 +2725,7 @@ class GeminiAdapter extends BaseProviderAdapter {
             if (wantsNativeCombo && isStructuredOutputComboUnsupportedError(error)) {
                 const model = geminiRequest.model;
                 this.rememberModelRejectsStructuredOutputCombo(model);
-                log$1.warn(`[GeminiAdapter] Model ${model} rejected native responseJsonSchema + tools combo; falling back to legacy structured_output tool emulation.`);
+                log$1.warn(`[GoogleAdapter] Model ${model} rejected native responseJsonSchema + tools combo; falling back to legacy structured_output tool emulation.`);
                 const fallbackRequest = this.toFallbackStructuredOutputRequest(geminiRequest);
                 const response = await genAI.models.generateContent({
                     model: fallbackRequest.model,
@@ -3286,7 +3307,7 @@ class GeminiAdapter extends BaseProviderAdapter {
     }
 }
 // Export singleton instance
-const geminiAdapter = new GeminiAdapter();
+const googleAdapter = new GoogleAdapter();
 
 // Patterns for OpenAI reasoning models that support extended thinking
 const REASONING_MODEL_PATTERNS = [
@@ -6837,8 +6858,8 @@ function prepareMessages$2(message, { data, placeholders } = {}) {
     return { messages, systemInstruction: undefined };
 }
 
-class GeminiProvider {
-    constructor(model = PROVIDER.GEMINI.MODEL.DEFAULT, { apiKey } = {}) {
+class GoogleProvider {
+    constructor(model = PROVIDER.GOOGLE.MODEL.DEFAULT, { apiKey } = {}) {
         this.log = getLogger$3();
         this.conversationHistory = [];
         this.model = model;
@@ -6857,7 +6878,7 @@ class GeminiProvider {
         }
         const client = await this.getClient();
         this._operateLoop = createOperateLoop({
-            adapter: geminiAdapter,
+            adapter: googleAdapter,
             client,
         });
         return this._operateLoop;
@@ -6868,7 +6889,7 @@ class GeminiProvider {
         }
         const client = await this.getClient();
         this._streamLoop = createStreamLoop({
-            adapter: geminiAdapter,
+            adapter: googleAdapter,
             client,
         });
         return this._streamLoop;
@@ -7393,7 +7414,7 @@ class Llm {
         let finalModel = model;
         // Legacy: accept "gemini" but warn
         if (providerName === "gemini") {
-            log$1.warn(`Provider "gemini" is deprecated, use "${PROVIDER.GEMINI.NAME}" instead`);
+            log$1.warn(`Provider "gemini" is deprecated, use "${PROVIDER.GOOGLE.NAME}" instead`);
         }
         if (model) {
             const modelDetermined = determineModelProvider(model);
@@ -7437,8 +7458,8 @@ class Llm {
                 return new AnthropicProvider(model || PROVIDER.ANTHROPIC.MODEL.DEFAULT, { apiKey });
             case PROVIDER.BEDROCK.NAME:
                 return new BedrockProvider(model || PROVIDER.BEDROCK.MODEL.DEFAULT);
-            case PROVIDER.GEMINI.NAME:
-                return new GeminiProvider(model || PROVIDER.GEMINI.MODEL.DEFAULT, {
+            case PROVIDER.GOOGLE.NAME:
+                return new GoogleProvider(model || PROVIDER.GOOGLE.MODEL.DEFAULT, {
                     apiKey,
                 });
             case PROVIDER.OPENAI.NAME:
@@ -7895,7 +7916,8 @@ const toolkit = new JaypieToolkit(tools);
 });
 
 exports.BedrockProvider = BedrockProvider;
-exports.GeminiProvider = GeminiProvider;
+exports.GeminiProvider = GoogleProvider;
+exports.GoogleProvider = GoogleProvider;
 exports.JaypieToolkit = JaypieToolkit;
 exports.LLM = constants;
 exports.Llm = Llm;