@aituber-onair/chat 0.35.0 → 0.36.0

package/dist/umd/aituber-onair-chat.js

@@ -84,6 +84,7 @@ var AITuberOnAirChat = (() => {
     MODEL_CLAUDE_4_6_OPUS: () => MODEL_CLAUDE_4_6_OPUS,
     MODEL_CLAUDE_4_6_SONNET: () => MODEL_CLAUDE_4_6_SONNET,
     MODEL_CLAUDE_4_7_OPUS: () => MODEL_CLAUDE_4_7_OPUS,
+    MODEL_CLAUDE_4_8_OPUS: () => MODEL_CLAUDE_4_8_OPUS,
     MODEL_CLAUDE_4_OPUS: () => MODEL_CLAUDE_4_OPUS,
     MODEL_CLAUDE_4_SONNET: () => MODEL_CLAUDE_4_SONNET,
     MODEL_DEEPSEEK_CHAT: () => MODEL_DEEPSEEK_CHAT,
@@ -346,6 +347,7 @@ var AITuberOnAirChat = (() => {
   var MODEL_CLAUDE_4_6_SONNET = "claude-sonnet-4-6";
   var MODEL_CLAUDE_4_6_OPUS = "claude-opus-4-6";
   var MODEL_CLAUDE_4_7_OPUS = "claude-opus-4-7";
+  var MODEL_CLAUDE_4_8_OPUS = "claude-opus-4-8";
   var CLAUDE_VISION_SUPPORTED_MODELS = [
     MODEL_CLAUDE_3_HAIKU,
     MODEL_CLAUDE_4_SONNET,
@@ -355,7 +357,8 @@ var AITuberOnAirChat = (() => {
     MODEL_CLAUDE_4_5_OPUS,
     MODEL_CLAUDE_4_6_SONNET,
     MODEL_CLAUDE_4_6_OPUS,
-    MODEL_CLAUDE_4_7_OPUS
+    MODEL_CLAUDE_4_7_OPUS,
+    MODEL_CLAUDE_4_8_OPUS
   ];
 
   // src/constants/openrouter.ts
@@ -1247,6 +1250,94 @@ If it's in another language, summarize in that language.
     };
   }
 
+  // src/services/providers/claude/claudeMessageConverter.ts
+  function convertMessagesToClaudeFormat(messages) {
+    return messages.map((msg) => ({
+      role: mapRoleToClaude(msg.role),
+      content: msg.content
+    }));
+  }
+  function convertVisionMessagesToClaudeFormat(messages) {
+    return messages.map((msg) => {
+      if (typeof msg.content === "string") {
+        return {
+          role: mapRoleToClaude(msg.role),
+          content: [
+            {
+              type: "text",
+              text: msg.content
+            }
+          ]
+        };
+      }
+      if (Array.isArray(msg.content)) {
+        const content = msg.content.map((block) => {
+          if (block.type === "image_url") {
+            if (block.image_url.url.startsWith("data:")) {
+              const m = block.image_url.url.match(/^data:([^;]+);base64,(.+)$/);
+              if (m) {
+                return {
+                  type: "image",
+                  source: {
+                    type: "base64",
+                    media_type: m[1],
+                    data: m[2]
+                  }
+                };
+              }
+              return null;
+            }
+            return {
+              type: "image",
+              source: {
+                type: "url",
+                url: block.image_url.url,
+                media_type: getMimeTypeFromUrl(block.image_url.url)
+              }
+            };
+          }
+          return block;
+        }).filter((b) => b);
+        return {
+          role: mapRoleToClaude(msg.role),
+          content
+        };
+      }
+      return {
+        role: mapRoleToClaude(msg.role),
+        content: []
+      };
+    });
+  }
+  function mapRoleToClaude(role) {
+    switch (role) {
+      case "system":
+        return "system";
+      case "user":
+        return "user";
+      case "assistant":
+        return "assistant";
+      default:
+        return "user";
+    }
+  }
+  function getMimeTypeFromUrl(url) {
+    const extension = url.split(".").pop()?.toLowerCase();
+    switch (extension) {
+      case "jpg":
+      case "jpeg":
+        return "image/jpeg";
+      case "png":
+        return "image/png";
+      case "gif":
+        return "image/gif";
+      case "webp":
+        return "image/webp";
+      default:
+        return "image/jpeg";
+    }
+  }
+
   // src/services/providers/claude/ClaudeChatService.ts
   var ClaudeChatService = class {
     /**
@@ -1353,112 +1444,6 @@ If it's in another language, summarize in that language.
         toolErrorMessage: "processVisionChat received tool_calls. ChatProcessor must use chatOnce() loop when tools are enabled."
       });
     }
-    /**
-     * Convert AITuber OnAir messages to Claude format
-     * @param messages Array of messages
-     * @returns Claude formatted messages
-     */
-    convertMessagesToClaudeFormat(messages) {
-      return messages.map((msg) => {
-        return {
-          role: this.mapRoleToClaude(msg.role),
-          content: msg.content
-        };
-      });
-    }
-    /**
-     * Convert AITuber OnAir vision messages to Claude format
-     * @param messages Array of vision messages
-     * @returns Claude formatted vision messages
-     */
-    convertVisionMessagesToClaudeFormat(messages) {
-      return messages.map((msg) => {
-        if (typeof msg.content === "string") {
-          return {
-            role: this.mapRoleToClaude(msg.role),
-            content: [
-              {
-                type: "text",
-                text: msg.content
-              }
-            ]
-          };
-        }
-        if (Array.isArray(msg.content)) {
-          const content = msg.content.map((block) => {
-            if (block.type === "image_url") {
-              if (block.image_url.url.startsWith("data:")) {
-                const m = block.image_url.url.match(
-                  /^data:([^;]+);base64,(.+)$/
-                );
-                if (m) {
-                  return {
-                    type: "image",
-                    source: { type: "base64", media_type: m[1], data: m[2] }
-                  };
-                }
-                return null;
-              }
-              return {
-                type: "image",
-                source: {
-                  type: "url",
-                  url: block.image_url.url,
-                  media_type: this.getMimeTypeFromUrl(block.image_url.url)
-                }
-              };
-            }
-            return block;
-          }).filter((b) => b);
-          return {
-            role: this.mapRoleToClaude(msg.role),
-            content
-          };
-        }
-        return {
-          role: this.mapRoleToClaude(msg.role),
-          content: []
-        };
-      });
-    }
-    /**
-     * Map AITuber OnAir roles to Claude roles
-     * @param role AITuber OnAir role
-     * @returns Claude role
-     */
-    mapRoleToClaude(role) {
-      switch (role) {
-        case "system":
-          return "system";
-        case "user":
-          return "user";
-        case "assistant":
-          return "assistant";
-        default:
-          return "user";
-      }
-    }
-    /**
-     * Get MIME type from URL
-     * @param url Image URL
-     * @returns MIME type
-     */
-    getMimeTypeFromUrl(url) {
-      const extension = url.split(".").pop()?.toLowerCase();
-      switch (extension) {
-        case "jpg":
-        case "jpeg":
-          return "image/jpeg";
-        case "png":
-          return "image/png";
-        case "gif":
-          return "image/gif";
-        case "webp":
-          return "image/webp";
-        default:
-          return "image/jpeg";
-      }
-    }
     /**
      * Call Claude API
      * @param messages Array of messages to send
@@ -1478,9 +1463,7 @@ If it's in another language, summarize in that language.
       const body = {
         model,
         system,
-        messages: hasVision ? this.convertVisionMessagesToClaudeFormat(
-          content
-        ) : this.convertMessagesToClaudeFormat(content),
+        messages: hasVision ? convertVisionMessagesToClaudeFormat(content) : convertMessagesToClaudeFormat(content),
         stream,
         max_tokens: maxTokens !== void 0 ? maxTokens : getMaxTokensForResponseLength(this.responseLength)
       };
@@ -1743,6 +1726,7 @@ If it's in another language, summarize in that language.
         MODEL_CLAUDE_4_6_SONNET,
         MODEL_CLAUDE_4_6_OPUS,
         MODEL_CLAUDE_4_7_OPUS,
+        MODEL_CLAUDE_4_8_OPUS,
         MODEL_CLAUDE_3_HAIKU
       ];
     }
@@ -1934,7 +1918,49 @@ If it's in another language, summarize in that language.
     };
   }
 
-  // src/services/providers/openai/OpenAIChatService.ts
+  // src/services/providers/openai/openaiToolBuilder.ts
+  function buildOpenAIToolsDefinition({
+    tools,
+    mcpServers,
+    isResponsesAPI
+  }) {
+    const toolDefs = [];
+    if (tools.length > 0) {
+      toolDefs.push(
+        ...buildOpenAICompatibleTools(
+          tools,
+          isResponsesAPI ? "responses" : "chat-completions"
+        )
+      );
+    }
+    if (mcpServers.length > 0 && isResponsesAPI) {
+      toolDefs.push(...buildOpenAIMCPToolsDefinition(mcpServers));
+    }
+    return toolDefs;
+  }
+  function buildOpenAIMCPToolsDefinition(mcpServers) {
+    return mcpServers.map((server) => {
+      const mcpDef = {
+        type: "mcp",
+        server_label: server.name,
+        server_url: server.url
+      };
+      if (server.require_approval) {
+        mcpDef.require_approval = server.require_approval;
+      }
+      if (server.tool_configuration?.allowed_tools) {
+        mcpDef.allowed_tools = server.tool_configuration.allowed_tools;
+      }
+      if (server.authorization_token) {
+        mcpDef.headers = {
+          Authorization: `Bearer ${server.authorization_token}`
+        };
+      }
+      return mcpDef;
+    });
+  }
+
+  // src/services/providers/openai/openaiRequestBuilder.ts
   var GPT5_RESPONSE_LENGTH_MIN_TOKENS = {
     [CHAT_RESPONSE_LENGTH.VERY_SHORT]: 800,
     [CHAT_RESPONSE_LENGTH.SHORT]: 1200,
@@ -1956,6 +1982,177 @@ If it's in another language, summarize in that language.
     "deepseek",
     "mistral"
   ]);
+  function buildOpenAIRequestBody({
+    provider,
+    endpoint,
+    messages,
+    model,
+    stream,
+    tools,
+    mcpServers,
+    responseLength,
+    verbosity,
+    reasoning_effort,
+    enableReasoningSummary,
+    maxTokens
+  }) {
+    const isResponsesAPI = endpoint === ENDPOINT_OPENAI_RESPONSES_API;
+    validateMCPCompatibility(endpoint, mcpServers);
+    const body = {
+      model,
+      stream
+    };
+    const tokenLimit = resolveOpenAITokenLimit({
+      provider,
+      model,
+      responseLength,
+      reasoning_effort,
+      maxTokens
+    });
+    if (isResponsesAPI) {
+      if (tokenLimit !== void 0) {
+        body.max_output_tokens = tokenLimit;
+      }
+    } else {
+      if (tokenLimit !== void 0) {
+        if (usesCompatibleChatCompletions(provider)) {
+          body.max_tokens = tokenLimit;
+        } else {
+          body.max_completion_tokens = tokenLimit;
+        }
+      }
+    }
+    if (isResponsesAPI) {
+      body.input = cleanMessagesForResponsesAPI(messages);
+    } else {
+      body.messages = provider === "mistral" ? cleanMessagesForMistralChatCompletions(messages) : messages;
+    }
+    if (isGPT5Model(model)) {
+      if (isResponsesAPI) {
+        if (reasoning_effort) {
+          body.reasoning = {
+            ...body.reasoning,
+            effort: reasoning_effort
+          };
+          if (enableReasoningSummary) {
+            body.reasoning.summary = "auto";
+          }
+        }
+        if (verbosity) {
+          body.text = {
+            ...body.text,
+            format: { type: "text" },
+            verbosity
+          };
+        }
+      } else {
+        if (reasoning_effort) {
+          body.reasoning_effort = reasoning_effort;
+        }
+        if (verbosity) {
+          body.verbosity = verbosity;
+        }
+      }
+    }
+    if (provider === "mistral" && isMistralReasoningEffortModel(model) && reasoning_effort && isMistralReasoningEffort(reasoning_effort)) {
+      body.reasoning_effort = reasoning_effort;
+    }
+    const toolDefinitions = buildOpenAIToolsDefinition({
+      tools,
+      mcpServers,
+      isResponsesAPI
+    });
+    if (toolDefinitions.length > 0) {
+      body.tools = toolDefinitions;
+      if (!isResponsesAPI) {
+        body.tool_choice = "auto";
+      }
+    }
+    return body;
+  }
+  function resolveOpenAITokenLimit({
+    provider,
+    model,
+    responseLength,
+    reasoning_effort,
+    maxTokens
+  }) {
+    if (maxTokens !== void 0) {
+      return maxTokens;
+    }
+    const baseTokenLimit = usesCompatibleChatCompletions(provider) ? responseLength !== void 0 ? getMaxTokensForResponseLength(responseLength) : void 0 : getMaxTokensForResponseLength(responseLength);
+    if (provider !== "openai" || !isGPT5Model(model) || responseLength === void 0) {
+      return baseTokenLimit;
+    }
+    const effectiveReasoningEffort = reasoning_effort ?? getDefaultReasoningEffortForGPT5Model(model);
+    return Math.max(
+      baseTokenLimit ?? 0,
+      GPT5_RESPONSE_LENGTH_MIN_TOKENS[responseLength],
+      GPT5_REASONING_MIN_TOKENS[effectiveReasoningEffort]
+    );
+  }
+  function validateMCPCompatibility(endpoint, mcpServers) {
+    if (mcpServers.length > 0 && endpoint === ENDPOINT_OPENAI_CHAT_COMPLETIONS_API) {
+      throw new Error(
+        `MCP servers are not supported with Chat Completions API. Current endpoint: ${endpoint}. Please use OpenAI Responses API endpoint: ${ENDPOINT_OPENAI_RESPONSES_API}. MCP tools are only available in the Responses API endpoint.`
+      );
+    }
+  }
+  function cleanMessagesForResponsesAPI(messages) {
+    return messages.map((msg) => {
+      const role = msg.role === "tool" ? "user" : msg.role;
+      const cleanMsg = {
+        role
+      };
+      if (typeof msg.content === "string") {
+        cleanMsg.content = msg.content;
+      } else if (Array.isArray(msg.content)) {
+        cleanMsg.content = msg.content.map((block) => {
+          if (block.type === "text") {
+            return {
+              type: "input_text",
+              text: block.text
+            };
+          } else if (block.type === "image_url") {
+            return {
+              type: "input_image",
+              image_url: block.image_url.url
+            };
+          }
+          return block;
+        });
+      } else {
+        cleanMsg.content = msg.content;
+      }
+      return cleanMsg;
+    });
+  }
+  function cleanMessagesForMistralChatCompletions(messages) {
+    return messages.map((msg) => {
+      const cleanMsg = {
+        role: msg.role
+      };
+      if (!Array.isArray(msg.content)) {
+        cleanMsg.content = msg.content;
+        return cleanMsg;
+      }
+      cleanMsg.content = msg.content.map((block) => {
+        if (block.type === "image_url" && typeof block.image_url === "object" && typeof block.image_url?.url === "string") {
+          return {
+            type: "image_url",
+            image_url: block.image_url.url
+          };
+        }
+        return block;
+      });
+      return cleanMsg;
+    });
+  }
+  function usesCompatibleChatCompletions(provider) {
+    return OPENAI_COMPATIBLE_CHAT_COMPLETIONS_PROVIDERS.has(provider);
+  }
+
+  // src/services/providers/openai/OpenAIChatService.ts
   var OpenAIChatService = class {
     /**
      * Constructor
@@ -2108,7 +2305,20 @@ If it's in another language, summarize in that language.
       return stream ? this.parseStream(res, onPartialResponse) : this.parseOneShot(await res.json());
     }
     async callOpenAI(messages, model, stream = false, maxTokens) {
-      const body = this.buildRequestBody(messages, model, stream, maxTokens);
+      const body = buildOpenAIRequestBody({
+        provider: this.provider,
+        endpoint: this.endpoint,
+        messages,
+        model,
+        stream,
+        tools: this.tools,
+        mcpServers: this.mcpServers,
+        responseLength: this.responseLength,
+        verbosity: this.verbosity,
+        reasoning_effort: this.reasoning_effort,
+        enableReasoningSummary: this.enableReasoningSummary,
+        maxTokens
+      });
       const headers = {};
       const shouldSendAuthorization = this.provider !== "openai-compatible" || this.apiKey.trim() !== "";
       if (shouldSendAuthorization) {
@@ -2117,199 +2327,6 @@ If it's in another language, summarize in that language.
       const res = await ChatServiceHttpClient.post(this.endpoint, body, headers);
       return res;
     }
-    /**
-     * Build request body based on the endpoint type
-     */
-    buildRequestBody(messages, model, stream, maxTokens) {
-      const isResponsesAPI = this.endpoint === ENDPOINT_OPENAI_RESPONSES_API;
-      this.validateMCPCompatibility();
-      const body = {
-        model,
-        stream
-      };
-      const tokenLimit = this.resolveTokenLimit(model, maxTokens);
-      if (isResponsesAPI) {
-        if (tokenLimit !== void 0) {
-          body.max_output_tokens = tokenLimit;
-        }
-      } else {
-        if (tokenLimit !== void 0) {
-          if (this.usesCompatibleChatCompletions()) {
-            body.max_tokens = tokenLimit;
-          } else {
-            body.max_completion_tokens = tokenLimit;
-          }
-        }
-      }
-      if (isResponsesAPI) {
-        body.input = this.cleanMessagesForResponsesAPI(messages);
-      } else {
-        body.messages = this.provider === "mistral" ? this.cleanMessagesForMistralChatCompletions(messages) : messages;
-      }
-      if (isGPT5Model(model)) {
-        if (isResponsesAPI) {
-          if (this.reasoning_effort) {
-            body.reasoning = {
-              ...body.reasoning,
-              effort: this.reasoning_effort
-            };
-            if (this.enableReasoningSummary) {
-              body.reasoning.summary = "auto";
-            }
-          }
-          if (this.verbosity) {
-            body.text = {
-              ...body.text,
-              format: { type: "text" },
-              verbosity: this.verbosity
-            };
-          }
-        } else {
-          if (this.reasoning_effort) {
-            body.reasoning_effort = this.reasoning_effort;
-          }
-          if (this.verbosity) {
-            body.verbosity = this.verbosity;
-          }
-        }
-      }
-      if (this.provider === "mistral" && isMistralReasoningEffortModel(model) && this.reasoning_effort && isMistralReasoningEffort(this.reasoning_effort)) {
-        body.reasoning_effort = this.reasoning_effort;
-      }
-      const tools = this.buildToolsDefinition();
-      if (tools.length > 0) {
-        body.tools = tools;
-        if (!isResponsesAPI) {
-          body.tool_choice = "auto";
-        }
-      }
-      return body;
-    }
-    resolveTokenLimit(model, maxTokens) {
-      if (maxTokens !== void 0) {
-        return maxTokens;
-      }
-      const baseTokenLimit = this.usesCompatibleChatCompletions() ? this.responseLength !== void 0 ? getMaxTokensForResponseLength(this.responseLength) : void 0 : getMaxTokensForResponseLength(this.responseLength);
-      if (this.provider !== "openai" || !isGPT5Model(model) || this.responseLength === void 0) {
-        return baseTokenLimit;
-      }
-      const effectiveReasoningEffort = this.reasoning_effort ?? getDefaultReasoningEffortForGPT5Model(model);
-      return Math.max(
-        baseTokenLimit ?? 0,
-        GPT5_RESPONSE_LENGTH_MIN_TOKENS[this.responseLength],
-        GPT5_REASONING_MIN_TOKENS[effectiveReasoningEffort]
-      );
-    }
-    /**
-     * Validate MCP servers compatibility with the current endpoint
-     */
-    validateMCPCompatibility() {
-      if (this.mcpServers.length > 0 && this.endpoint === ENDPOINT_OPENAI_CHAT_COMPLETIONS_API) {
-        throw new Error(
-          `MCP servers are not supported with Chat Completions API. Current endpoint: ${this.endpoint}. Please use OpenAI Responses API endpoint: ${ENDPOINT_OPENAI_RESPONSES_API}. MCP tools are only available in the Responses API endpoint.`
-        );
-      }
-    }
-    /**
-     * Clean messages for Responses API (remove timestamp and other extra properties)
-     */
-    cleanMessagesForResponsesAPI(messages) {
-      return messages.map((msg) => {
-        const role = msg.role === "tool" ? "user" : msg.role;
-        const cleanMsg = {
-          role
-        };
-        if (typeof msg.content === "string") {
-          cleanMsg.content = msg.content;
-        } else if (Array.isArray(msg.content)) {
-          cleanMsg.content = msg.content.map((block) => {
-            if (block.type === "text") {
-              return {
-                type: "input_text",
-                text: block.text
-              };
-            } else if (block.type === "image_url") {
-              return {
-                type: "input_image",
-                image_url: block.image_url.url
-                // Extract the URL string directly
-              };
-            }
-            return block;
-          });
-        } else {
-          cleanMsg.content = msg.content;
-        }
-        return cleanMsg;
-      });
-    }
-    cleanMessagesForMistralChatCompletions(messages) {
-      return messages.map((msg) => {
-        const cleanMsg = {
-          role: msg.role
-        };
-        if (!Array.isArray(msg.content)) {
-          cleanMsg.content = msg.content;
-          return cleanMsg;
-        }
-        cleanMsg.content = msg.content.map((block) => {
-          if (block.type === "image_url" && typeof block.image_url === "object" && typeof block.image_url?.url === "string") {
-            return {
-              type: "image_url",
-              image_url: block.image_url.url
-            };
-          }
-          return block;
-        });
-        return cleanMsg;
-      });
-    }
-    /**
-     * Build tools definition based on the endpoint type
-     */
-    buildToolsDefinition() {
-      const isResponsesAPI = this.endpoint === ENDPOINT_OPENAI_RESPONSES_API;
-      const toolDefs = [];
-      if (this.tools.length > 0) {
-        toolDefs.push(
-          ...buildOpenAICompatibleTools(
-            this.tools,
-            isResponsesAPI ? "responses" : "chat-completions"
-          )
-        );
-      }
-      if (this.mcpServers.length > 0 && isResponsesAPI) {
-        toolDefs.push(...this.buildMCPToolsDefinition());
-      }
-      return toolDefs;
-    }
-    /**
-     * Build MCP tools definition for Responses API
-     */
-    buildMCPToolsDefinition() {
-      return this.mcpServers.map((server) => {
-        const mcpDef = {
-          type: "mcp",
-          // Using 'mcp' as indicated by the error message
-          server_label: server.name,
-          // Use server_label as required by API
-          server_url: server.url
-          // Use server_url instead of url
-        };
-        if (server.require_approval) {
-          mcpDef.require_approval = server.require_approval;
-        }
-        if (server.tool_configuration?.allowed_tools) {
-          mcpDef.allowed_tools = server.tool_configuration.allowed_tools;
-        }
-        if (server.authorization_token) {
-          mcpDef.headers = {
-            Authorization: `Bearer ${server.authorization_token}`
-          };
-        }
-        return mcpDef;
-      });
-    }
     async handleStream(res, onPartial) {
       return parseOpenAICompatibleTextStream(res, onPartial);
     }
@@ -2321,9 +2338,6 @@ If it's in another language, summarize in that language.
     parseOneShot(data) {
       return parseOpenAICompatibleOneShot(data);
     }
-    usesCompatibleChatCompletions() {
-      return OPENAI_COMPATIBLE_CHAT_COMPLETIONS_PROVIDERS.has(this.provider);
-    }
   };
 
   // src/services/providers/deepseek/DeepSeekChatService.ts
@@ -2495,6 +2509,221 @@ If it's in another language, summarize in that language.
     }
   };
 
+  // src/services/providers/gemini/geminiMessageConverter.ts
+  function mapRoleToGemini(role) {
+    switch (role) {
+      case "system":
+        return "model";
+      case "user":
+        return "user";
+      case "assistant":
+        return "model";
+      default:
+        return "user";
+    }
+  }
+  function convertMessagesToGeminiFormat(messages, options = {}) {
+    const gemini = [];
+    let currentRole = null;
+    let currentParts = [];
+    const pushCurrent = () => {
+      if (currentRole && currentParts.length) {
+        gemini.push({ role: currentRole, parts: [...currentParts] });
+        currentParts = [];
+      }
+    };
+    for (const msg of messages) {
+      const role = mapRoleToGemini(msg.role);
+      if (msg.tool_calls) {
+        pushCurrent();
+        for (const call of msg.tool_calls) {
+          options.callIdMap?.set(call.id, call.function.name);
+          gemini.push({
+            role: "model",
+            parts: [
+              {
+                functionCall: {
+                  name: call.function.name,
+                  args: JSON.parse(call.function.arguments || "{}")
+                }
+              }
+            ]
+          });
+        }
+        continue;
+      }
+      if (msg.role === "tool") {
+        pushCurrent();
+        const funcName = msg.name ?? options.callIdMap?.get(msg.tool_call_id) ?? "result";
+        gemini.push({
+          role: "user",
+          parts: [
+            {
+              functionResponse: {
+                name: funcName,
+                response: normalizeToolResult(safeJsonParse(msg.content))
+              }
+            }
+          ]
+        });
+        continue;
+      }
+      if (role !== currentRole) pushCurrent();
+      currentRole = role;
+      currentParts.push({ text: msg.content });
+    }
+    pushCurrent();
+    return gemini;
+  }
+  async function convertVisionMessagesToGeminiFormat(messages, options = {}) {
+    const imageFetcher = options.imageFetcher ?? ChatServiceHttpClient.get;
+    const encodeBlob = options.blobToBase64 ?? blobToBase64;
+    const geminiMessages = [];
+    let currentRole = null;
+    let currentParts = [];
+    for (const msg of messages) {
+      const role = mapRoleToGemini(msg.role);
+      if (msg.tool_calls) {
+        for (const call of msg.tool_calls) {
+          geminiMessages.push({
+            role: "model",
+            parts: [
+              {
+                functionCall: {
+                  name: call.function.name,
+                  args: JSON.parse(call.function.arguments || "{}")
+                }
+              }
+            ]
+          });
+        }
+        continue;
+      }
+      if (msg.role === "tool") {
+        const funcName = msg.name ?? options.callIdMap?.get(msg.tool_call_id) ?? "result";
+        geminiMessages.push({
+          role: "user",
+          parts: [
+            {
+              functionResponse: {
+                name: funcName,
+                response: normalizeToolResult(
+                  safeJsonParse(msg.content)
+                )
+              }
+            }
+          ]
+        });
+        continue;
+      }
+      if (role !== currentRole && currentParts.length > 0) {
+        geminiMessages.push({
+          role: currentRole,
+          parts: [...currentParts]
+        });
+        currentParts = [];
+      }
+      currentRole = role;
+      if (typeof msg.content === "string") {
+        currentParts.push({ text: msg.content });
+      } else if (Array.isArray(msg.content)) {
+        for (const block of msg.content) {
+          if (block.type === "text") {
+            currentParts.push({ text: block.text });
+          } else if (block.type === "image_url") {
+            try {
+              const imageResponse = await imageFetcher(block.image_url.url);
+              const imageBlob = await imageResponse.blob();
+              const base64Data = await encodeBlob(imageBlob);
+              currentParts.push({
+                inlineData: {
+                  mimeType: imageBlob.type || "image/jpeg",
+                  data: base64Data.split(",")[1]
+                }
+              });
+            } catch (error) {
+              console.error("Error processing image:", error);
+              throw new Error(`Failed to process image: ${error.message}`);
+            }
+          }
+        }
+      }
+    }
+    if (currentRole && currentParts.length > 0) {
+      geminiMessages.push({
+        role: currentRole,
+        parts: [...currentParts]
+      });
+    }
+    return geminiMessages;
+  }
+  function safeJsonParse(str) {
+    try {
+      return JSON.parse(str);
+    } catch {
+      return str;
+    }
+  }
+  function normalizeToolResult(val) {
+    if (val === null) return { content: null };
+    if (typeof val === "object") return val;
+    return { content: val };
+  }
+  function blobToBase64(blob) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onloadend = () => resolve(reader.result);
+      reader.onerror = reject;
+      reader.readAsDataURL(blob);
+    });
+  }
+
+  // src/services/providers/gemini/geminiToolAdapter.ts
+  function buildGeminiToolDeclarations(tools, mcpToolSchemas) {
+    return [...tools, ...mcpToolSchemas].map((tool) => ({
+      name: tool.name,
+      description: tool.description,
+      parameters: tool.parameters
+    }));
+  }
+  function buildGeminiToolConfig(tools, mcpToolSchemas) {
+    const functionDeclarations = buildGeminiToolDeclarations(
+      tools,
+      mcpToolSchemas
+    );
+    if (functionDeclarations.length === 0) {
+      return void 0;
+    }
+    return {
+      tools: [
+        {
+          functionDeclarations
+        }
+      ],
+      toolConfig: {
+        functionCallingConfig: {
+          mode: "AUTO"
+        }
+      }
+    };
+  }
+  function createFallbackMCPToolSchemas(servers) {
+    return servers.map((server) => ({
+      name: `mcp_${server.name}_search`,
+      description: `Search using ${server.name} MCP server (fallback)`,
+      parameters: {
+        type: "object",
+        properties: {
+          query: {
+            type: "string",
+            description: "Search query"
+          }
+        },
+        required: ["query"]
+      }
+    }));
+  }
+
   // src/services/providers/gemini/GeminiChatService.ts
   var GeminiChatService = class {
     /**
@@ -2524,21 +2753,6 @@ If it's in another language, summarize in that language.
       this.tools = tools;
       this.mcpServers = mcpServers;
     }
-    /* ────────────────────────────────── */
-    /*  Utilities                           */
-    /* ────────────────────────────────── */
-    safeJsonParse(str) {
-      try {
-        return JSON.parse(str);
-      } catch {
-        return str;
-      }
-    }
-    normalizeToolResult(val) {
-      if (val === null) return { content: null };
-      if (typeof val === "object") return val;
-      return { content: val };
-    }
     isGemma4Model(model) {
       return /^gemma-4-/.test(model);
     }
@@ -2642,20 +2856,7 @@ If it's in another language, summarize in that language.
         this.mcpSchemasInitialized = true;
       } catch (error) {
         console.warn("Failed to initialize MCP schemas, using fallback:", error);
-        this.mcpToolSchemas = this.mcpServers.map((server) => ({
-          name: `mcp_${server.name}_search`,
-          description: `Search using ${server.name} MCP server (fallback)`,
-          parameters: {
-            type: "object",
-            properties: {
-              query: {
-                type: "string",
-                description: "Search query"
-              }
-            },
-            required: ["query"]
-          }
-        }));
+        this.mcpToolSchemas = createFallbackMCPToolSchemas(this.mcpServers);
         this.mcpSchemasInitialized = true;
       }
     }
@@ -2715,64 +2916,6 @@ If it's in another language, summarize in that language.
       }
     }
     /* ────────────────────────────────── */
-    /*  OpenAI → Gemini conversion         */
-    /* ────────────────────────────────── */
-    convertMessagesToGeminiFormat(messages) {
-      const gemini = [];
-      let currentRole = null;
-      let currentParts = [];
-      const pushCurrent = () => {
-        if (currentRole && currentParts.length) {
-          gemini.push({ role: currentRole, parts: [...currentParts] });
-          currentParts = [];
-        }
-      };
-      for (const msg of messages) {
-        const role = this.mapRoleToGemini(msg.role);
-        if (msg.tool_calls) {
-          pushCurrent();
-          for (const call of msg.tool_calls) {
-            this.callIdMap.set(call.id, call.function.name);
-            gemini.push({
-              role: "model",
-              parts: [
-                {
-                  functionCall: {
-                    name: call.function.name,
-                    args: JSON.parse(call.function.arguments || "{}")
-                  }
-                }
-              ]
-            });
-          }
-          continue;
-        }
-        if (msg.role === "tool") {
-          pushCurrent();
-          const funcName = msg.name ?? this.callIdMap.get(msg.tool_call_id) ?? "result";
-          gemini.push({
-            role: "user",
-            parts: [
-              {
-                functionResponse: {
-                  name: funcName,
-                  response: this.normalizeToolResult(
-                    this.safeJsonParse(msg.content)
-                  )
-                }
-              }
-            ]
-          });
-          continue;
-        }
-        if (role !== currentRole) pushCurrent();
-        currentRole = role;
-        currentParts.push({ text: msg.content });
-      }
-      pushCurrent();
-      return gemini;
-    }
-    /* ────────────────────────────────── */
     /*  HTTP call                           */
     /* ────────────────────────────────── */
     async callGemini(messages, model, stream = false, maxTokens) {
@@ -2781,9 +2924,14 @@ If it's in another language, summarize in that language.
           (b) => b?.type === "image_url" || b?.inlineData
         )
       );
-      const contents = hasVision ? await this.convertVisionMessagesToGeminiFormat(
-        messages
-      ) : this.convertMessagesToGeminiFormat(messages);
+      const contents = hasVision ? await convertVisionMessagesToGeminiFormat(
+        messages,
+        {
+          callIdMap: this.callIdMap
+        }
+      ) : convertMessagesToGeminiFormat(messages, {
+        callIdMap: this.callIdMap
+      });
       const body = {
         contents,
         generationConfig: {
@@ -2796,37 +2944,18 @@ If it's in another language, summarize in that language.
           thinkingLevel: "MINIMAL"
         };
       }
-      const allToolDeclarations = [];
-      if (this.tools.length > 0) {
-        allToolDeclarations.push(
-          ...this.tools.map((t) => ({
-            name: t.name,
-            description: t.description,
-            parameters: t.parameters
-          }))
-        );
-      }
+      let activeMCPToolSchemas = [];
       if (this.mcpServers.length > 0) {
         try {
           await this.initializeMCPSchemas();
-          allToolDeclarations.push(
-            ...this.mcpToolSchemas.map((t) => ({
-              name: t.name,
-              description: t.description,
-              parameters: t.parameters
-            }))
-          );
+          activeMCPToolSchemas = this.mcpToolSchemas;
         } catch (error) {
           console.warn("MCP initialization failed, skipping MCP tools:", error);
         }
       }
-      if (allToolDeclarations.length > 0) {
-        body.tools = [
-          {
-            functionDeclarations: allToolDeclarations
-          }
-        ];
-        body.toolConfig = { functionCallingConfig: { mode: "AUTO" } };
+      const toolConfig = buildGeminiToolConfig(this.tools, activeMCPToolSchemas);
+      if (toolConfig) {
+        Object.assign(body, toolConfig);
       }
       const fetchOnce = async (ver, payload) => {
         const fn = stream ? "streamGenerateContent" : "generateContent";
@@ -2863,125 +2992,6 @@ If it's in another language, summarize in that language.
         throw error;
       }
     }
-    /**
-     * Convert AITuber OnAir vision messages to Gemini format
-     * @param messages Array of vision messages
-     * @returns Gemini formatted vision messages
-     */
-    async convertVisionMessagesToGeminiFormat(messages) {
-      const geminiMessages = [];
-      let currentRole = null;
-      let currentParts = [];
-      for (const msg of messages) {
-        const role = this.mapRoleToGemini(msg.role);
-        if (msg.tool_calls) {
-          for (const call of msg.tool_calls) {
-            geminiMessages.push({
-              role: "model",
-              parts: [
-                {
-                  functionCall: {
-                    name: call.function.name,
-                    args: JSON.parse(call.function.arguments || "{}")
-                  }
-                }
-              ]
-            });
-          }
-          continue;
-        }
-        if (msg.role === "tool") {
-          const funcName = msg.name ?? this.callIdMap.get(msg.tool_call_id) ?? "result";
-          geminiMessages.push({
-            role: "user",
-            parts: [
-              {
-                functionResponse: {
-                  name: funcName,
-                  response: this.normalizeToolResult(
-                    this.safeJsonParse(msg.content)
-                  )
-                }
-              }
-            ]
-          });
-          continue;
-        }
-        if (role !== currentRole && currentParts.length > 0) {
-          geminiMessages.push({
-            role: currentRole,
-            parts: [...currentParts]
-          });
-          currentParts = [];
-        }
-        currentRole = role;
-        if (typeof msg.content === "string") {
-          currentParts.push({ text: msg.content });
-        } else if (Array.isArray(msg.content)) {
-          for (const block of msg.content) {
-            if (block.type === "text") {
-              currentParts.push({ text: block.text });
-            } else if (block.type === "image_url") {
-              try {
-                const imageResponse = await ChatServiceHttpClient.get(
-                  block.image_url.url
-                );
-                const imageBlob = await imageResponse.blob();
-                const base64Data = await this.blobToBase64(imageBlob);
-                currentParts.push({
-                  inlineData: {
-                    mimeType: imageBlob.type || "image/jpeg",
-                    data: base64Data.split(",")[1]
-                    // Remove the "data:image/jpeg;base64," prefix
-                  }
-                });
-              } catch (error) {
-                console.error("Error processing image:", error);
-                throw new Error(`Failed to process image: ${error.message}`);
-              }
-            }
-          }
-        }
-      }
-      if (currentRole && currentParts.length > 0) {
-        geminiMessages.push({
-          role: currentRole,
-          parts: [...currentParts]
-        });
-      }
-      return geminiMessages;
-    }
-    /**
-     * Convert Blob to Base64 string
-     * @param blob Image blob
-     * @returns Promise with base64 encoded string
-     */
-    blobToBase64(blob) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onloadend = () => resolve(reader.result);
-        reader.onerror = reject;
-        reader.readAsDataURL(blob);
-      });
-    }
-    /**
-     * Map AITuber OnAir roles to Gemini roles
-     * @param role AITuber OnAir role
-     * @returns Gemini role
-     */
-    mapRoleToGemini(role) {
-      switch (role) {
-        case "system":
-          return "model";
-        // Gemini uses 'model' for system messages
-        case "user":
-          return "user";
-        case "assistant":
-          return "model";
-        default:
-          return "user";
-      }
-    }
     /* ────────────────────────────────────────────────────────── */
     /*  Convert NDJSON stream to common format             */
     /* ────────────────────────────────────────────────────────── */