koishi-plugin-chatluna-google-gemini-adapter 1.3.4 → 1.3.6

package/lib/index.cjs

@@ -23,14 +23,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.schema.yml
 var require_zh_CN_schema = __commonJS({
   "src/locales/zh-CN.schema.yml"(exports2, module2) {
-    module2.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。" }] };
+    module2.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
   }
 });
 
 // src/locales/en-US.schema.yml
 var require_en_US_schema = __commonJS({
   "src/locales/en-US.schema.yml"(exports2, module2) {
-    module2.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured." }] };
+    module2.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
   }
 });
 
@@ -46,7 +46,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_chat = require("koishi-plugin-chatluna/services/chat");
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 
 // src/client.ts
 var import_client = require("koishi-plugin-chatluna/llm-core/platform/client");
@@ -67,6 +67,7 @@ var import_v1_shared_adapter = require("@chatluna/v1-shared-adapter");
 var import_string = require("koishi-plugin-chatluna/utils/string");
 var import_types = require("@langchain/core/utils/types");
 var import_zod_openapi = require("@anatine/zod-openapi");
+var import_koishi = require("koishi");
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -264,11 +265,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     urlContext = false;
   }
   if (googleSearch) {
-    if (model.includes("gemini-2")) {
-      result.push({
-        google_search: {}
-      });
-    } else {
+    if (model.includes("gemini-1")) {
       result.push({
         google_search_retrieval: {
           dynamic_retrieval_config: {
@@ -277,6 +274,10 @@ function formatToolsToGeminiAITools(tools, config, model) {
           }
         }
       });
+    } else {
+      result.push({
+        google_search: {}
+      });
     }
   }
   if (codeExecution) {
@@ -322,6 +323,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
+  let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -332,35 +334,53 @@ function prepareModelConfig(params, pluginConfig) {
   } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
     thinkingBudget = 128;
   }
+  if (model.includes("-thinking") && model.includes("gemini-3.0")) {
+    enabledThinking = true;
+    const match = model.match(/-(low|medium|high)-thinking/);
+    if (match) {
+      thinkingLevel = match[1];
+      model = model.replace(`-${match[1]}-thinking`, "");
+    } else {
+      thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
+      model = model.replace("-thinking", "");
+    }
+    thinkingBudget = void 0;
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
   }
-  return { model, enabledThinking, thinkingBudget, imageGeneration };
+  return {
+    model,
+    enabledThinking,
+    thinkingBudget,
+    imageGeneration,
+    thinkingLevel
+  };
 }
 __name(prepareModelConfig, "prepareModelConfig");
 function createSafetySettings(model) {
-  const isGemini2 = model.includes("gemini-2");
+  const isNonGemini1 = !model.includes("gemini-1");
   return [
     {
       category: "HARM_CATEGORY_HARASSMENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_HATE_SPEECH",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     }
   ];
 }
@@ -372,10 +392,14 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
     maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
     topP: params.topP,
     responseModalities: modelConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
-    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? {
-      thinkingBudget: modelConfig.thinkingBudget,
-      includeThoughts: pluginConfig.includeThoughts
-    } : void 0
+    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? (0, import_koishi.filterKeys)(
+      {
+        thinkingBudget: modelConfig.thinkingBudget,
+        thinkingLevel: modelConfig.thinkingLevel,
+        includeThoughts: pluginConfig.includeThoughts
+      },
+      (k, v) => v != null
+    ) : void 0
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
@@ -386,6 +410,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
+  const systemInstructionKey = pluginConfig.useCamelCaseSystemInstruction ? "systemInstruction" : "system_instruction";
   return {
     contents: modelMessages,
     safetySettings: createSafetySettings(params.model),
@@ -394,7 +419,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
       modelConfig,
       pluginConfig
     ),
-    system_instruction: systemInstruction != null ? systemInstruction : void 0,
+    [systemInstructionKey]: systemInstruction != null ? systemInstruction : void 0,
     tools: params.tools != null || pluginConfig.googleSearch || pluginConfig.codeExecution || pluginConfig.urlContext ? formatToolsToGeminiAITools(
       params.tools ?? [],
       pluginConfig,
@@ -980,11 +1005,8 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
             import_types2.ModelCapabilities.ToolCall
           ]
         };
-        const thinkingModel = [
-          "gemini-2.5-pro",
-          "gemini-2.5-flash",
-          "gemini-3.0-pro"
-        ];
+        const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
+        const thinkingLevelModel = ["gemini-3.0-pro"];
         if (thinkingModel.some(
           (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
         )) {
@@ -997,6 +1019,13 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
           } else {
             models.push(info);
           }
+        } else if (thinkingLevelModel.some(
+          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        )) {
+          models.push(
+            { ...info, name: model.name + "-low-thinking" },
+            info
+          );
         } else {
           models.push(info);
         }
@@ -1065,32 +1094,33 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-var Config4 = import_koishi.Schema.intersect([
+var Config4 = import_koishi2.Schema.intersect([
   import_chat.ChatLunaPlugin.Config,
-  import_koishi.Schema.object({
-    platform: import_koishi.Schema.string().default("gemini"),
-    apiKeys: import_koishi.Schema.array(
-      import_koishi.Schema.tuple([
-        import_koishi.Schema.string().role("secret").default(""),
-        import_koishi.Schema.string().default(
+  import_koishi2.Schema.object({
+    platform: import_koishi2.Schema.string().default("gemini"),
+    apiKeys: import_koishi2.Schema.array(
+      import_koishi2.Schema.tuple([
+        import_koishi2.Schema.string().role("secret").default(""),
+        import_koishi2.Schema.string().default(
           "https://generativelanguage.googleapis.com/v1beta"
         ),
-        import_koishi.Schema.boolean().default(true)
+        import_koishi2.Schema.boolean().default(true)
       ])
     ).default([[]]).role("table")
   }),
-  import_koishi.Schema.object({
-    maxContextRatio: import_koishi.Schema.number().min(0).max(1).step(1e-4).role("slider").default(0.35),
-    temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(1),
-    googleSearch: import_koishi.Schema.boolean().default(false),
-    codeExecution: import_koishi.Schema.boolean().default(false),
-    urlContext: import_koishi.Schema.boolean().default(false),
-    thinkingBudget: import_koishi.Schema.number().min(-1).max(24576).default(-1),
-    includeThoughts: import_koishi.Schema.boolean().default(false),
-    nonStreaming: import_koishi.Schema.boolean().default(false),
-    imageGeneration: import_koishi.Schema.boolean().default(false),
-    groundingContentDisplay: import_koishi.Schema.boolean().default(false),
-    searchThreshold: import_koishi.Schema.number().min(0).max(1).step(0.1).default(0.5)
+  import_koishi2.Schema.object({
+    maxContextRatio: import_koishi2.Schema.number().min(0).max(1).step(1e-4).role("slider").default(0.35),
+    temperature: import_koishi2.Schema.percent().min(0).max(2).step(0.1).default(1),
+    googleSearch: import_koishi2.Schema.boolean().default(false),
+    codeExecution: import_koishi2.Schema.boolean().default(false),
+    urlContext: import_koishi2.Schema.boolean().default(false),
+    thinkingBudget: import_koishi2.Schema.number().min(-1).max(24576).default(-1),
+    includeThoughts: import_koishi2.Schema.boolean().default(false),
+    nonStreaming: import_koishi2.Schema.boolean().default(false),
+    imageGeneration: import_koishi2.Schema.boolean().default(false),
+    groundingContentDisplay: import_koishi2.Schema.boolean().default(false),
+    searchThreshold: import_koishi2.Schema.number().min(0).max(1).step(0.1).default(0.5),
+    useCamelCaseSystemInstruction: import_koishi2.Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/index.d.ts

@@ -17,6 +17,7 @@ export interface Config extends ChatLunaPlugin.Config {
     imageGeneration: boolean;
     thinkingBudget: number;
     includeThoughts: boolean;
+    useCamelCaseSystemInstruction: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: {

package/lib/index.mjs

@@ -8,14 +8,14 @@ var __commonJS = (cb, mod) => function __require() {
 // src/locales/zh-CN.schema.yml
 var require_zh_CN_schema = __commonJS({
   "src/locales/zh-CN.schema.yml"(exports, module) {
-    module.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。" }] };
+    module.exports = { $inner: [{}, { $desc: "请求选项", platform: "适配器的平台名。（不懂请不要修改）", apiKeys: { $inner: ["Gemini API Key", "Gemini API 请求地址", "是否启用此配置"], $desc: "Gemini 的 API Key 和请求地址列表。" } }, { $desc: "模型配置", maxContextRatio: "最大上下文使用比例（0~1），控制可用的模型上下文窗口大小的最大百分比。例如 0.35 表示最多使用模型上下文的 35%。", temperature: "回复的随机性程度，数值越高，回复越随机（范围：0~2）。", googleSearch: "为模型启用谷歌搜索。", thinkingBudget: "思考预算，范围：(-1~24576)，设置的数值越大，思考时花费的 Token 越多,-1 为动态思考。目前仅支持 gemini 2.5 系列模型。", groundingContentDisplay: "是否显示谷歌搜索结果。", imageGeneration: "为模型启用图像生成。目前仅支持 `gemini-2.0-flash-exp` 和 `gemini-2.5-flash-image-preview` 模型。", searchThreshold: "搜索的[置信度阈值](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval)，范围：0~1，设置的数值越低，则越倾向于使用谷歌搜索。（仅支持 `gemini-1.5` 系列模型。gemini 2.0 模型起使用动态的工具调用）", includeThoughts: "是否获取模型的思考内容。", codeExecution: "为模型启用代码执行工具。", urlContext: "为模型启用 URL 内容获取工具。", nonStreaming: "强制不启用流式返回。开启后，将总是以非流式发起请求，即便配置了 stream 参数。", useCamelCaseSystemInstruction: "使用大写的 systemInstruction 而不是小写的 system_instruction" }] };
   }
 });
 
 // src/locales/en-US.schema.yml
 var require_en_US_schema = __commonJS({
   "src/locales/en-US.schema.yml"(exports, module) {
-    module.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured." }] };
+    module.exports = { $inner: [{}, { $desc: "API Configuration", platform: "Adapter platform name. (Do not modify if you do not understand)", apiKeys: { $inner: ["Gemini API Key", "Gemini API Endpoint (optional)", "Enabled"], $desc: "Gemini API access credentials" } }, { $desc: "Model Parameters", maxContextRatio: "Maximum context usage ratio (0-1). Controls the maximum percentage of model context window available for use. For example, 0.35 means at most 35% of the model context can be used.", temperature: "Sampling temperature (0-2). Higher: more random, Lower: more deterministic", googleSearch: "Enable Google search", thinkingBudget: "Thinking budget (-1-24576). (0: dynamic thinking) Higher: more tokens spent on thinking. Currently only supports `gemini-2.5` series models.", groundingContentDisplay: "Enable display of search results", imageGeneration: "Enable image generation (only for `gemini-2.0-flash-exp` and `gemini-2.5-flash-image-preview` model)", searchThreshold: "Search confidence [threshold](https://ai.google.dev/gemini-api/docs/grounding?lang=rest#dynamic-retrieval) (0-1). Lower: more likely to use Google search", includeThoughts: "Enable retrieval of model thoughts", codeExecution: "Enable code execution tool", urlContext: "Enable URL context retrieval tool", nonStreaming: "Force disable streaming response. When enabled, requests will always be made in non-streaming mode, even if the stream parameter is configured.", useCamelCaseSystemInstruction: "Use camelCase systemInstruction instead of snake_case system_instruction" }] };
   }
 });
 
@@ -64,6 +64,7 @@ import {
 } from "koishi-plugin-chatluna/utils/string";
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
 import { generateSchema } from "@anatine/zod-openapi";
+import { filterKeys } from "koishi";
 async function langchainMessageToGeminiMessage(messages, plugin, model) {
   return Promise.all(
     messages.map(async (message) => {
@@ -261,11 +262,7 @@ function formatToolsToGeminiAITools(tools, config, model) {
     urlContext = false;
   }
   if (googleSearch) {
-    if (model.includes("gemini-2")) {
-      result.push({
-        google_search: {}
-      });
-    } else {
+    if (model.includes("gemini-1")) {
       result.push({
         google_search_retrieval: {
           dynamic_retrieval_config: {
@@ -274,6 +271,10 @@ function formatToolsToGeminiAITools(tools, config, model) {
           }
         }
       });
+    } else {
+      result.push({
+        google_search: {}
+      });
     }
   }
   if (codeExecution) {
@@ -319,6 +320,7 @@ __name(messageTypeToGeminiRole, "messageTypeToGeminiRole");
 function prepareModelConfig(params, pluginConfig) {
   let model = params.model;
   let enabledThinking = null;
+  let thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
   if (model.includes("-thinking") && model.includes("gemini-2.5")) {
     enabledThinking = !model.includes("-non-thinking");
     model = model.replace("-non-thinking", "").replace("-thinking", "");
@@ -329,35 +331,53 @@ function prepareModelConfig(params, pluginConfig) {
   } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
     thinkingBudget = 128;
   }
+  if (model.includes("-thinking") && model.includes("gemini-3.0")) {
+    enabledThinking = true;
+    const match = model.match(/-(low|medium|high)-thinking/);
+    if (match) {
+      thinkingLevel = match[1];
+      model = model.replace(`-${match[1]}-thinking`, "");
+    } else {
+      thinkingLevel = "THINKING_LEVEL_UNSPECIFIED";
+      model = model.replace("-thinking", "");
+    }
+    thinkingBudget = void 0;
+  }
   let imageGeneration = pluginConfig.imageGeneration ?? false;
   if (imageGeneration) {
     imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
   }
-  return { model, enabledThinking, thinkingBudget, imageGeneration };
+  return {
+    model,
+    enabledThinking,
+    thinkingBudget,
+    imageGeneration,
+    thinkingLevel
+  };
 }
 __name(prepareModelConfig, "prepareModelConfig");
 function createSafetySettings(model) {
-  const isGemini2 = model.includes("gemini-2");
+  const isNonGemini1 = !model.includes("gemini-1");
   return [
     {
       category: "HARM_CATEGORY_HARASSMENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_HATE_SPEECH",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_DANGEROUS_CONTENT",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     },
     {
       category: "HARM_CATEGORY_CIVIC_INTEGRITY",
-      threshold: isGemini2 ? "OFF" : "BLOCK_NONE"
+      threshold: isNonGemini1 ? "OFF" : "BLOCK_NONE"
     }
   ];
 }
@@ -369,10 +389,14 @@ function createGenerationConfig(params, modelConfig, pluginConfig) {
     maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
     topP: params.topP,
     responseModalities: modelConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
-    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? {
-      thinkingBudget: modelConfig.thinkingBudget,
-      includeThoughts: pluginConfig.includeThoughts
-    } : void 0
+    thinkingConfig: modelConfig.enabledThinking != null || pluginConfig.includeThoughts ? filterKeys(
+      {
+        thinkingBudget: modelConfig.thinkingBudget,
+        thinkingLevel: modelConfig.thinkingLevel,
+        includeThoughts: pluginConfig.includeThoughts
+      },
+      (k, v) => v != null
+    ) : void 0
   };
 }
 __name(createGenerationConfig, "createGenerationConfig");
@@ -383,6 +407,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
     modelConfig.model
   );
   const [systemInstruction, modelMessages] = extractSystemMessages(geminiMessages);
+  const systemInstructionKey = pluginConfig.useCamelCaseSystemInstruction ? "systemInstruction" : "system_instruction";
   return {
     contents: modelMessages,
     safetySettings: createSafetySettings(params.model),
@@ -391,7 +416,7 @@ async function createChatGenerationParams(params, plugin, modelConfig, pluginCon
       modelConfig,
       pluginConfig
     ),
-    system_instruction: systemInstruction != null ? systemInstruction : void 0,
+    [systemInstructionKey]: systemInstruction != null ? systemInstruction : void 0,
     tools: params.tools != null || pluginConfig.googleSearch || pluginConfig.codeExecution || pluginConfig.urlContext ? formatToolsToGeminiAITools(
       params.tools ?? [],
       pluginConfig,
@@ -977,11 +1002,8 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
             ModelCapabilities.ToolCall
           ]
         };
-        const thinkingModel = [
-          "gemini-2.5-pro",
-          "gemini-2.5-flash",
-          "gemini-3.0-pro"
-        ];
+        const thinkingModel = ["gemini-2.5-pro", "gemini-2.5-flash"];
+        const thinkingLevelModel = ["gemini-3.0-pro"];
         if (thinkingModel.some(
           (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
         )) {
@@ -994,6 +1016,13 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
           } else {
             models.push(info);
           }
+        } else if (thinkingLevelModel.some(
+          (name2) => model.name.toLowerCase().includes(name2) && !model.name.toLowerCase().includes("image")
+        )) {
+          models.push(
+            { ...info, name: model.name + "-low-thinking" },
+            info
+          );
         } else {
           models.push(info);
         }
@@ -1087,7 +1116,8 @@ var Config4 = Schema.intersect([
     nonStreaming: Schema.boolean().default(false),
     imageGeneration: Schema.boolean().default(false),
     groundingContentDisplay: Schema.boolean().default(false),
-    searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5)
+    searchThreshold: Schema.number().min(0).max(1).step(0.1).default(0.5),
+    useCamelCaseSystemInstruction: Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/utils.d.ts

@@ -16,6 +16,7 @@ export declare function prepareModelConfig(params: ModelRequestParams, pluginCon
     enabledThinking: boolean;
     thinkingBudget: number;
     imageGeneration: boolean;
+    thinkingLevel: string;
 };
 export declare function createSafetySettings(model: string): {
     category: string;
@@ -27,12 +28,20 @@ export declare function createGenerationConfig(params: ModelRequestParams, model
     maxOutputTokens: number;
     topP: number;
     responseModalities: string[];
-    thinkingConfig: {
-        thinkingBudget: number;
-        includeThoughts: boolean;
-    };
+    thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
 };
 export declare function createChatGenerationParams(params: ModelRequestParams, plugin: ChatLunaPlugin, modelConfig: ReturnType<typeof prepareModelConfig>, pluginConfig: Config): Promise<{
+    [x: string]: {
+        stopSequences: string | string[];
+        temperature: number;
+        maxOutputTokens: number;
+        topP: number;
+        responseModalities: string[];
+        thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
+    } | ChatCompletionResponseMessage | ChatCompletionResponseMessage[] | {
+        category: string;
+        threshold: string;
+    }[] | Record<string, any>;
     contents: ChatCompletionResponseMessage[];
     safetySettings: {
         category: string;
@@ -44,12 +53,8 @@ export declare function createChatGenerationParams(params: ModelRequestParams, p
         maxOutputTokens: number;
         topP: number;
         responseModalities: string[];
-        thinkingConfig: {
-            thinkingBudget: number;
-            includeThoughts: boolean;
-        };
+        thinkingConfig: import("cosmokit").Dict<string | number | boolean, "thinkingBudget" | "thinkingLevel" | "includeThoughts">;
     };
-    system_instruction: ChatCompletionResponseMessage;
     tools: Record<string, any>;
 }>;
 export declare function isChatResponse(response: any): response is ChatResponse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",