fix: improve Mimo thinking mode parsing and refactor forwarder tool calls handling

Author: xiaoY233

src/main/proxy/adapters/mimo.ts

@@ -202,8 +202,16 @@ function stripCitationsWithBuffer(text: string, buffer: { value: string }): stri
 
 function stripThinkTags(text: string): string {
   text = text.replace(/\u0000/g, '')
+  // Remove opening think tag (including partial ones at the beginning)
   text = text.replace(/^<think[^>]*>/, '')
+  // Remove &gt; entity which might be part of a broken tag
   text = text.replace(/^&gt;/, '')
+  // Also handle cases where only part of the tag is present
+  text = text.replace(/^hink>/, '')
+  text = text.replace(/^ink>/, '')
+  text = text.replace(/^nk>/, '')
+  text = text.replace(/^k>/, '')
+  text = text.replace(/^>/, '')
   return text
 }
 
@@ -385,9 +393,14 @@ export class MimoStreamHandler {
 
     let buffer = ''
     let currentEvent = ''
+    
+    // Track state and content
     let state: 'init' | 'thinking' | 'content' = 'init'
-    let thinkContent = ''
-    let normalContent = ''
+    let totalContent = ''
+    let lastProcessedIndex = 0
+    let thinkEndTagFound = false
+    const thinkEndTag1 = '</think>'
+    const thinkEndTag2 = '</thinkgt;'
 
     for await (const chunk of stream) {
       buffer += chunk.toString()
@@ -406,57 +419,72 @@ export class MimoStreamHandler {
             const mimoChunk: MimoChunk = { type: currentEvent as any, ...data }
 
             if ((mimoChunk.type === 'message' || mimoChunk.type === 'text') && mimoChunk.content) {
-              const text = (mimoChunk.content ?? '').replace(/\u0000/g, '')
-              this.content += text
+              const newText = (mimoChunk.content ?? '').replace(/\u0000/g, '')
+              totalContent += newText
 
               if (state === 'init') {
-                const thinkStartIdx = this.content.indexOf('<think')
+                const thinkStartIdx = totalContent.indexOf('<think')
                 if (thinkStartIdx !== -1) {
                   state = 'thinking'
+                  // Skip any content before <think tag
+                  lastProcessedIndex = thinkStartIdx
                 } else {
                   state = 'content'
                 }
               }
 
               if (state === 'thinking') {
-                const thinkEndIdx = this.content.indexOf('</think>')
-                const thinkEndIdx2 = this.content.indexOf('</thinkgt;')
-                const actualThinkEndIdx = thinkEndIdx !== -1 ? thinkEndIdx : thinkEndIdx2
-
-                if (actualThinkEndIdx !== -1) {
-                  const thinkPart = this.content.slice(0, actualThinkEndIdx)
-                  const newThink = stripThinkTags(thinkPart)
-                  const deltaThink = newThink.slice(thinkContent.length)
-                  if (deltaThink && this.thinkingMode === 'separate') {
-                    yield this.formatOpenAIChunk(id, created, { reasoning_content: stripCitationsWithBuffer(deltaThink, this.thinkingCitationBuffer) })
+                if (!thinkEndTagFound) {
+                  // Look for think end tag
+                  let thinkEndIdx = totalContent.indexOf(thinkEndTag1, lastProcessedIndex)
+                  let actualEndTag = thinkEndTag1
+                  
+                  if (thinkEndIdx === -1) {
+                    thinkEndIdx = totalContent.indexOf(thinkEndTag2, lastProcessedIndex)
+                    actualEndTag = thinkEndTag2
                   }
-                  thinkContent = newThink
 
-                  state = 'content'
-                  const rest = this.content.slice(actualThinkEndIdx + (thinkEndIdx !== -1 ? 8 : 10))
-                  if (rest.trim()) {
-                    const newNormal = stripCitationsWithBuffer(rest, this.citationBuffer)
-                    const deltaNormal = newNormal.slice(normalContent.length)
-                    if (deltaNormal) {
-                      yield this.formatOpenAIChunk(id, created, { content: deltaNormal })
+                  if (thinkEndIdx !== -1) {
+                    // Found the end of thinking
+                    thinkEndTagFound = true
+                    
+                    // Extract the thinking content between lastProcessedIndex and thinkEndIdx
+                    const thinkContent = totalContent.slice(lastProcessedIndex, thinkEndIdx)
+                    const cleanedThink = stripThinkTags(thinkContent)
+                    const cleanedThinkWithCitations = stripCitationsWithBuffer(cleanedThink, this.thinkingCitationBuffer)
+                    
+                    if (cleanedThinkWithCitations && this.thinkingMode === 'separate') {
+                      yield this.formatOpenAIChunk(id, created, { reasoning_content: cleanedThinkWithCitations })
                     }
-                    normalContent = newNormal
-                  }
-                } else {
-                  const newThink = stripThinkTags(this.content)
-                  const deltaThink = newThink.slice(thinkContent.length)
-                  if (deltaThink && this.thinkingMode === 'separate') {
-                    yield this.formatOpenAIChunk(id, created, { reasoning_content: stripCitationsWithBuffer(deltaThink, this.thinkingCitationBuffer) })
+                    
+                    // Move past the end tag
+                    lastProcessedIndex = thinkEndIdx + actualEndTag.length
+                    state = 'content'
+                  } else {
+                    // Still in thinking, process new content
+                    const thinkContent = totalContent.slice(lastProcessedIndex)
+                    const cleanedThink = stripThinkTags(thinkContent)
+                    const cleanedThinkWithCitations = stripCitationsWithBuffer(cleanedThink, this.thinkingCitationBuffer)
+                    
+                    if (cleanedThinkWithCitations && this.thinkingMode === 'separate') {
+                      yield this.formatOpenAIChunk(id, created, { reasoning_content: cleanedThinkWithCitations })
+                    }
+                    
+                    lastProcessedIndex = totalContent.length
                   }
-                  thinkContent = newThink
                 }
-              } else if (state === 'content') {
-                const newNormal = stripCitationsWithBuffer(this.content, this.citationBuffer)
-                const deltaNormal = newNormal.slice(normalContent.length)
-                if (deltaNormal) {
-                  yield this.formatOpenAIChunk(id, created, { content: deltaNormal })
+              }
+              
+              if (state === 'content' && lastProcessedIndex < totalContent.length) {
+                // Process content after thinking
+                const contentPart = totalContent.slice(lastProcessedIndex)
+                const cleanedContent = stripCitationsWithBuffer(contentPart, this.citationBuffer)
+                
+                if (cleanedContent) {
+                  yield this.formatOpenAIChunk(id, created, { content: cleanedContent })
                 }
-                normalContent = newNormal
+                
+                lastProcessedIndex = totalContent.length
               }
             } else if (mimoChunk.type === 'usage' && mimoChunk.usage) {
               this.usage = mimoChunk.usage

src/main/proxy/forwarder.ts

@@ -90,10 +90,23 @@ export class RequestForwarder {
     return null
   }
 
-  /**
-   * Check if messages contain MCP-style tool definitions
-   * MCP tools are defined in system message using <tools><tool> XML format
-   */
+  private applyToolCallsToResponse(
+    result: any,
+    model: string,
+    tools: any[] | undefined
+  ): void {
+    if (tools && tools.length > 0 && !isNativeFunctionCallingModel(model)) {
+      const content = result?.choices?.[0]?.message?.content || ''
+      const toolCalls = this.parseToolCallsFromContent(content)
+      
+      if (toolCalls && toolCalls.length > 0) {
+        result.choices[0].message.tool_calls = toolCalls
+        result.choices[0].message.content = null
+        result.choices[0].finish_reason = 'tool_calls'
+      }
+    }
+  }
+
   private hasMCPToolDefinitions(messages: any[]): boolean {
     for (const msg of messages) {
       if (msg.role === 'system' && typeof msg.content === 'string') {
@@ -636,20 +649,8 @@ CRITICAL RULES:
       // Non-streaming requests need to collect stream data and convert
       const result = await handler.handleNonStream(response.data)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          // Found tool calls in response, add them to the response
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
-      // Delete session after non-streaming request ends
       if (deleteSessionCallback) {
         await deleteSessionCallback()
       }
@@ -757,19 +758,8 @@ CRITICAL RULES:
 
       const result = await handler.handleNonStream(response.data)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
-      // Delete session after non-stream response
       if (shouldDeleteSession()) {
         const convId = handler.getConversationId()
         if (convId) {
@@ -860,19 +850,8 @@ CRITICAL RULES:
 
       const result = await handler.handleNonStream(response.data)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
-      // Delete conversation if needed
       if (shouldDeleteSession()) {
         const realChatId = handler.getConversationId()
         if (realChatId && realChatId.startsWith('kimi-') === false) {
@@ -967,17 +946,7 @@ CRITICAL RULES:
 
       const result = await handler.handleNonStream(response.data, response)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
       const sid = handler.getSessionId()
       if (deleteSessionCallback && sid) {
@@ -1066,17 +1035,7 @@ CRITICAL RULES:
 
       const result = await handler.handleNonStream(response.data)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
       if (deleteChatCallback) {
         await deleteChatCallback(chatId)
@@ -1167,17 +1126,7 @@ CRITICAL RULES:
 
       const result = await handler.handleNonStream(response.data)
 
-      // Parse tool calls from response content if using prompt-based tool calling
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
       if (deleteChatCallback) {
         await deleteChatCallback(chatId)
@@ -1273,19 +1222,8 @@ CRITICAL RULES:
       }
 
       if (response) {
-        // Parse tool calls from response content if using prompt-based tool calling
-        if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-          const content = response.data?.choices?.[0]?.message?.content || ''
-          const toolCalls = this.parseToolCallsFromContent(content)
-          
-          if (toolCalls && toolCalls.length > 0) {
-            response.data.choices[0].message.tool_calls = toolCalls
-            response.data.choices[0].message.content = null
-            response.data.choices[0].finish_reason = 'tool_calls'
-          }
-        }
+        this.applyToolCallsToResponse(response.data, request.model, request.tools)
 
-        // Response is already formatted as OpenAI-compatible format
         if (deleteChatCallback) {
           await deleteChatCallback(chatId)
         }
@@ -1454,19 +1392,8 @@ CRITICAL RULES:
       const handler = new PerplexityStreamHandler(actualModel, sessionId, undefined, adapter)
       const result = await handler.handleNonStream(stream)
 
-      // Parse tool calls from response content if tools were provided
-      if (request.tools && request.tools.length > 0 && !isNativeFunctionCallingModel(request.model)) {
-        const content = result?.choices?.[0]?.message?.content || ''
-        const toolCalls = this.parseToolCallsFromContent(content)
-        
-        if (toolCalls && toolCalls.length > 0) {
-          result.choices[0].message.tool_calls = toolCalls
-          result.choices[0].message.content = null
-          result.choices[0].finish_reason = 'tool_calls'
-        }
-      }
+      this.applyToolCallsToResponse(result, request.model, request.tools)
 
-      // Delete session after non-stream response
       if (shouldDeleteSession()) {
         await adapter.deleteSession(sessionId)
       }

src/renderer/src/components/logs/RequestLogList.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useCallback, useMemo, type ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
-import { List } from 'react-window'
+import { List, type RowComponentProps } from 'react-window'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
@@ -165,15 +165,15 @@ export function RequestLogList() {
   }, [])
 
   const RowComponent = useCallback(
-    ({ index, style }: { index: number; style: React.CSSProperties }): ReactElement | null => {
-      const log = logs[index]
+    ({ index, style, logs: rowLogs, onSelectLog }: RowComponentProps<RowProps>): ReactElement | null => {
+      const log = rowLogs[index]
       if (!log) return null
 
       return (
         <div
           style={style}
           className="px-2 pb-2"
-          onClick={() => handleSelectLog(log)}
+          onClick={() => onSelectLog(log)}
         >
           <div className="flex items-center gap-3 p-3 rounded-lg bg-muted/30 hover:bg-muted/50 cursor-pointer transition-colors h-[68px]">
             <Badge variant="outline" className={getStatusColor(log.status, log.statusCode)}>
@@ -206,7 +206,7 @@ export function RequestLogList() {
         </div>
       )
     },
-    [logs, handleSelectLog]
+    []
   )
 
   const rowProps = useMemo<RowProps>(() => ({

src/renderer/src/components/providers/AddAccountDialog.tsx

@@ -90,13 +90,21 @@ function mapOAuthCredentials(providerId: string | undefined, credentials: Record
   // For Mimo, map all three tokens
   if (providerId === 'mimo') {
     const result: Record<string, string> = {}
-    if (credentials['serviceToken']) {
+    // OAuth already returns credentials in correct format (service_token, user_id, ph_token)
+    // Check for final format first
+    if (credentials['service_token']) {
+      result['service_token'] = credentials['service_token']
+    } else if (credentials['serviceToken']) {
       result['service_token'] = credentials['serviceToken']
     }
-    if (credentials['userId']) {
+    if (credentials['user_id']) {
+      result['user_id'] = credentials['user_id']
+    } else if (credentials['userId']) {
       result['user_id'] = credentials['userId']
     }
-    if (credentials['xiaomichatbot_ph']) {
+    if (credentials['ph_token']) {
+      result['ph_token'] = credentials['ph_token']
+    } else if (credentials['xiaomichatbot_ph']) {
       result['ph_token'] = credentials['xiaomichatbot_ph']
     }
     return result