koishi-plugin-chatluna-google-gemini-adapter 1.3.14 → 1.3.16

package/lib/index.cjs

@@ -348,11 +348,11 @@ function prepareModelConfig(params, pluginConfig) {
   if (model.includes("gemini-3")) {
     enabledThinking = true;
     thinkingBudget = void 0;
-    const match = model.match(/-(low|medium|high|tiny)-thinking/);
+    const match = model.match(/-(low|medium|high|tiny|minimal)-thinking/);
     if (match && match[1]) {
       const level = match[1];
       model = model.replace(`-${level}-thinking`, "");
-      if (level === "tiny") {
+      if (level === "minimal" && model.includes("3-pro")) {
         thinkingLevel = void 0;
         thinkingBudget = 128;
       } else {
@@ -371,7 +371,7 @@ function prepareModelConfig(params, pluginConfig) {
   }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
-    imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("image");
+    imageGeneration = model.includes("gemini-2.0-flash-exp") || model.includes("image");
     thinkingBudget = void 0;
     thinkingLevel = void 0;
   }
@@ -1028,68 +1028,73 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
   }
   async refreshModels(config) {
     const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
-    const thinkingLevelModel = ["gemini-3-pro"];
+    const thinkingLevelModel = ["gemini-3-pro", "gemini-3-flash"];
     const imageResolutionModel = ["gemini-3-pro-image"];
+    const includesAny = /* @__PURE__ */ __name((needles, haystack) => needles.some((name2) => haystack.includes(name2)), "includesAny");
+    const pushExpanded = /* @__PURE__ */ __name((out, base, suffixes) => {
+      for (const suffix of suffixes) {
+        out.push({ ...base, name: base.name + suffix });
+      }
+      out.push(base);
+    }, "pushExpanded");
+    const models = [];
+    let rawModels = [];
     try {
-      const rawModels = await this._requester.getModels(config);
-      if (!rawModels.length) {
+      rawModels = await this._requester.getModels(config);
+      if (rawModels.length === 0) {
         throw new import_error2.ChatLunaError(
           import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      const models = [];
-      for (const model of rawModels) {
-        const modelNameLower = model.name.toLowerCase();
-        const info = {
-          name: model.name,
-          maxTokens: model.inputTokenLimit,
-          type: model.name.includes("embedding") ? import_types2.ModelType.embeddings : import_types2.ModelType.llm,
-          capabilities: [
-            import_types2.ModelCapabilities.ImageInput,
-            import_types2.ModelCapabilities.ToolCall
-          ]
-        };
-        if (imageResolutionModel.some(
-          (name2) => modelNameLower.includes(name2)
-        )) {
-          models.push(
-            { ...info, name: model.name + "-2K" },
-            { ...info, name: model.name + "-4K" },
-            info
-          );
-        } else if (thinkingModel.some(
-          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
-        )) {
-          if (!model.name.includes("-thinking")) {
-            models.push(
-              { ...info, name: model.name + "-non-thinking" },
-              { ...info, name: model.name + "-thinking" },
-              info
-            );
-          } else {
-            models.push(info);
-          }
-        } else if (thinkingLevelModel.some(
-          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
-        )) {
-          models.push(
-            { ...info, name: model.name + "-low-thinking" },
-            { ...info, name: model.name + "-high-thinking" },
-            { ...info, name: model.name + "-tiny-thinking" },
-            info
-          );
-        } else {
-          models.push(info);
-        }
-      }
-      return models;
     } catch (e) {
       if (e instanceof import_error2.ChatLunaError) {
         throw e;
       }
       throw new import_error2.ChatLunaError(import_error2.ChatLunaErrorCode.MODEL_INIT_ERROR, e);
     }
+    for (const model of rawModels) {
+      const modelNameLower = model.name.toLowerCase();
+      const baseInfo = {
+        name: model.name,
+        maxTokens: model.inputTokenLimit,
+        type: modelNameLower.includes("embedding") ? import_types2.ModelType.embeddings : import_types2.ModelType.llm,
+        capabilities: modelNameLower.includes("embedding") ? [] : [import_types2.ModelCapabilities.ImageInput, import_types2.ModelCapabilities.ToolCall]
+      };
+      const isImageResolution = includesAny(
+        imageResolutionModel,
+        modelNameLower
+      );
+      const isThinking = includesAny(thinkingModel, modelNameLower) && !modelNameLower.includes("image");
+      const isThinkingLevel = includesAny(thinkingLevelModel, modelNameLower) && !modelNameLower.includes("image");
+      if (isImageResolution) {
+        pushExpanded(models, baseInfo, ["-2K", "-4K"]);
+        continue;
+      }
+      if (isThinking) {
+        if (modelNameLower.includes("-thinking")) {
+          models.push(baseInfo);
+        } else {
+          pushExpanded(models, baseInfo, [
+            "-non-thinking",
+            "-thinking"
+          ]);
+        }
+        continue;
+      }
+      if (isThinkingLevel) {
+        const suffixes = modelNameLower.includes("3-pro") ? ["-low-thinking", "-high-thinking", "-minimal-thinking"] : [
+          "-low-thinking",
+          "-high-thinking",
+          "-minimal-thinking",
+          "-medium-thinking"
+        ];
+        pushExpanded(models, baseInfo, suffixes);
+        continue;
+      }
+      models.push(baseInfo);
+    }
+    return models;
   }
   _createModel(model) {
     const info = this._modelInfos[model];

package/lib/index.mjs

@@ -345,11 +345,11 @@ function prepareModelConfig(params, pluginConfig) {
   if (model.includes("gemini-3")) {
     enabledThinking = true;
     thinkingBudget = void 0;
-    const match = model.match(/-(low|medium|high|tiny)-thinking/);
+    const match = model.match(/-(low|medium|high|tiny|minimal)-thinking/);
     if (match && match[1]) {
       const level = match[1];
       model = model.replace(`-${level}-thinking`, "");
-      if (level === "tiny") {
+      if (level === "minimal" && model.includes("3-pro")) {
         thinkingLevel = void 0;
         thinkingBudget = 128;
       } else {
@@ -368,7 +368,7 @@ function prepareModelConfig(params, pluginConfig) {
   }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
-    imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("image");
+    imageGeneration = model.includes("gemini-2.0-flash-exp") || model.includes("image");
     thinkingBudget = void 0;
     thinkingLevel = void 0;
   }
@@ -1025,68 +1025,73 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
   }
   async refreshModels(config) {
     const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
-    const thinkingLevelModel = ["gemini-3-pro"];
+    const thinkingLevelModel = ["gemini-3-pro", "gemini-3-flash"];
     const imageResolutionModel = ["gemini-3-pro-image"];
+    const includesAny = /* @__PURE__ */ __name((needles, haystack) => needles.some((name2) => haystack.includes(name2)), "includesAny");
+    const pushExpanded = /* @__PURE__ */ __name((out, base, suffixes) => {
+      for (const suffix of suffixes) {
+        out.push({ ...base, name: base.name + suffix });
+      }
+      out.push(base);
+    }, "pushExpanded");
+    const models = [];
+    let rawModels = [];
     try {
-      const rawModels = await this._requester.getModels(config);
-      if (!rawModels.length) {
+      rawModels = await this._requester.getModels(config);
+      if (rawModels.length === 0) {
         throw new ChatLunaError2(
           ChatLunaErrorCode2.MODEL_INIT_ERROR,
           new Error("No model found")
         );
       }
-      const models = [];
-      for (const model of rawModels) {
-        const modelNameLower = model.name.toLowerCase();
-        const info = {
-          name: model.name,
-          maxTokens: model.inputTokenLimit,
-          type: model.name.includes("embedding") ? ModelType.embeddings : ModelType.llm,
-          capabilities: [
-            ModelCapabilities.ImageInput,
-            ModelCapabilities.ToolCall
-          ]
-        };
-        if (imageResolutionModel.some(
-          (name2) => modelNameLower.includes(name2)
-        )) {
-          models.push(
-            { ...info, name: model.name + "-2K" },
-            { ...info, name: model.name + "-4K" },
-            info
-          );
-        } else if (thinkingModel.some(
-          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
-        )) {
-          if (!model.name.includes("-thinking")) {
-            models.push(
-              { ...info, name: model.name + "-non-thinking" },
-              { ...info, name: model.name + "-thinking" },
-              info
-            );
-          } else {
-            models.push(info);
-          }
-        } else if (thinkingLevelModel.some(
-          (name2) => modelNameLower.includes(name2) && !modelNameLower.includes("image")
-        )) {
-          models.push(
-            { ...info, name: model.name + "-low-thinking" },
-            { ...info, name: model.name + "-high-thinking" },
-            { ...info, name: model.name + "-tiny-thinking" },
-            info
-          );
-        } else {
-          models.push(info);
-        }
-      }
-      return models;
     } catch (e) {
       if (e instanceof ChatLunaError2) {
         throw e;
       }
       throw new ChatLunaError2(ChatLunaErrorCode2.MODEL_INIT_ERROR, e);
     }
+    for (const model of rawModels) {
+      const modelNameLower = model.name.toLowerCase();
+      const baseInfo = {
+        name: model.name,
+        maxTokens: model.inputTokenLimit,
+        type: modelNameLower.includes("embedding") ? ModelType.embeddings : ModelType.llm,
+        capabilities: modelNameLower.includes("embedding") ? [] : [ModelCapabilities.ImageInput, ModelCapabilities.ToolCall]
+      };
+      const isImageResolution = includesAny(
+        imageResolutionModel,
+        modelNameLower
+      );
+      const isThinking = includesAny(thinkingModel, modelNameLower) && !modelNameLower.includes("image");
+      const isThinkingLevel = includesAny(thinkingLevelModel, modelNameLower) && !modelNameLower.includes("image");
+      if (isImageResolution) {
+        pushExpanded(models, baseInfo, ["-2K", "-4K"]);
+        continue;
+      }
+      if (isThinking) {
+        if (modelNameLower.includes("-thinking")) {
+          models.push(baseInfo);
+        } else {
+          pushExpanded(models, baseInfo, [
+            "-non-thinking",
+            "-thinking"
+          ]);
+        }
+        continue;
+      }
+      if (isThinkingLevel) {
+        const suffixes = modelNameLower.includes("3-pro") ? ["-low-thinking", "-high-thinking", "-minimal-thinking"] : [
+          "-low-thinking",
+          "-high-thinking",
+          "-minimal-thinking",
+          "-medium-thinking"
+        ];
+        pushExpanded(models, baseInfo, suffixes);
+        continue;
+      }
+      models.push(baseInfo);
+    }
+    return models;
   }
   _createModel(model) {
     const info = this._modelInfos[model];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -75,7 +75,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-chatluna": "^1.3.4",
+    "koishi-plugin-chatluna": "^1.3.6",
     "koishi-plugin-chatluna-storage-service": "^0.0.11"
   },
   "peerDependenciesMeta": {