@jaypie/llm 1.2.12 → 1.2.14

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

@@ -12,7 +12,7 @@ import { GeminiPart, GeminiRawResponse, GeminiRequest } from "../../providers/ge
  * specific to Gemini's generateContent API.
  */
 export declare class GeminiAdapter extends BaseProviderAdapter {
-    readonly name: "gemini";
+    readonly name: "google";
     readonly defaultModel: "gemini-3-pro-preview";
     buildRequest(request: OperateRequest): GeminiRequest;
     formatTools(toolkit: Toolkit, outputSchema?: JsonObject): ProviderToolDefinition[];

package/dist/esm/constants.d.ts

@@ -32,7 +32,7 @@ export declare const PROVIDER: {
             readonly TINY: "gemini-3-flash-preview";
         };
         readonly MODEL_MATCH_WORDS: readonly ["gemini", "google"];
-        readonly NAME: "gemini";
+        readonly NAME: "google";
         readonly ROLE: {
             readonly MODEL: "model";
             readonly USER: "user";

package/dist/esm/index.js

@@ -79,7 +79,7 @@ const PROVIDER = {
             TINY: FIRST_CLASS_PROVIDER.GEMINI.TINY,
         },
         MODEL_MATCH_WORDS: ["gemini", "google"],
-        NAME: "gemini",
+        NAME: "google",
         ROLE: {
             MODEL: "model",
             USER: "user",
@@ -194,7 +194,7 @@ function determineModelProvider(input) {
             provider: PROVIDER.ANTHROPIC.NAME,
         };
     }
-    if (input === PROVIDER.GEMINI.NAME) {
+    if (input === PROVIDER.GEMINI.NAME || input === "gemini") {
         return {
             model: PROVIDER.GEMINI.MODEL.DEFAULT,
             provider: PROVIDER.GEMINI.NAME,
@@ -2095,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;
             }
         }
@@ -5141,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 || "";
             }
         }
@@ -5516,6 +5537,10 @@ class Llm {
         const { fallback, model } = options;
         let finalProvider = providerName;
         let finalModel = model;
+        // Legacy: accept "gemini" but warn
+        if (providerName === "gemini") {
+            log$3.warn(`Provider "gemini" is deprecated, use "${PROVIDER.GEMINI.NAME}" instead`);
+        }
         if (model) {
             const modelDetermined = determineModelProvider(model);
             finalModel = modelDetermined.model;
@@ -5530,6 +5555,10 @@ class Llm {
                 throw new ConfigurationError(`Unable to determine provider from: ${providerName}`);
             }
             finalProvider = providerDetermined.provider;
+            // When providerName is actually a model name, extract the model (#213)
+            if (!finalModel && providerName !== providerDetermined.provider) {
+                finalModel = providerDetermined.model;
+            }
         }
         // Handle conflicts: if both providerName and model specify different providers
         if (model && providerName !== DEFAULT.PROVIDER.NAME) {