fix(GmailTools): enhance Gmail compose with retry logic and fallback extraction

Author: tonyhu-012

entrypoints/content/components/GmailTools/GmailComposeCard.vue

@@ -183,6 +183,7 @@ import { useLogger } from '@/composables/useLogger'
 import { useToast } from '@/composables/useToast'
 import { fromError } from '@/utils/error'
 import { useI18n } from '@/utils/i18n'
+import { extractValueOfKeyByPattern } from '@/utils/json/parser/pattern-extractor'
 import type { LanguageCode } from '@/utils/language/detect'
 import { getLanguageName, SUPPORTED_LANGUAGES } from '@/utils/language/detect'
 import { useOllamaStatusStore } from '@/utils/pinia-store/store'
@@ -459,8 +460,11 @@ const start = async () => {
 
     logger.debug('Gmail compose prompt:', { systemPrompt, userPrompt })
 
-    const retry = 0
+    let retry = 0
+    let text = ''
     do {
+      text = ''
+      retry += 1
       logger.debug(`Gmail compose attempt #${retry + 1}`)
       const iter = streamObjectInBackground({
         prompt: userPrompt,
@@ -470,14 +474,26 @@ const start = async () => {
       })
 
       for await (const part of iter) {
-        // Extract the structured result
         if (part.type === 'object') {
           runningStatus.value = 'streaming'
           optimizedSubject.value = part.object.subject || ''
           optimizedBody.value = part.object.body || ''
         }
+        else if (part.type === 'text-delta') {
+          text += part.textDelta
+        }
       }
-    } while ((!optimizedSubject.value || !optimizedBody.value) && retry < 3)
+    } while ((!optimizedSubject.value || !optimizedBody.value) && retry < 2)
+
+    // Fallback: try to extract from raw text if structured extraction failed
+    if (!optimizedSubject.value) {
+      const extractSubjectMatch = extractValueOfKeyByPattern(text, 'subject')
+      if (extractSubjectMatch) optimizedSubject.value = extractSubjectMatch
+    }
+    if (!optimizedBody.value) {
+      const extractBodyMatch = extractValueOfKeyByPattern(text, 'body')
+      if (extractBodyMatch) optimizedBody.value = extractBodyMatch
+    }
 
     logger.debug('Gmail compose structured response:', {
       subject: optimizedSubject.value,

entrypoints/content/utils/page-injection/gmail-tools.ts

@@ -3,7 +3,7 @@ import { useI18n } from 'vue-i18n'
 
 import LogoSvg from '@/assets/icons/logo-custom-color.svg?raw'
 import { useDocumentLoaded } from '@/composables/useDocumentLoaded'
-import { useLogger } from '@/composables/useLogger'
+import Logger from '@/utils/logger'
 import { c2bRpc } from '@/utils/rpc'
 import { toggleContainer } from '@/utils/rpc/content-main-world-fns'
 import { sleep } from '@/utils/sleep'
@@ -12,7 +12,7 @@ import { getUserConfig } from '@/utils/user-config'
 import { useGmailDetector } from '../../composables/useGmailDetector'
 import { EmailExtractor } from '../gmail/email-extractor'
 
-const logger = useLogger()
+const logger = Logger.child('gmail-tools')
 const NATIVEMIND_GMAIL_SUMMARY_BUTTON_CLASS = 'nativemind-gmail-summary-btn'
 const NATIVEMIND_GMAIL_REPLY_BUTTON_CLASS = 'nativemind-gmail-reply-btn'
 const NATIVEMIND_GMAIL_COMPOSE_BUTTON_CLASS = 'nativemind-gmail-compose-btn'

utils/json/parser/pattern-extractor.ts

@@ -0,0 +1,15 @@
+export function extractValueOfKeyByPattern(json: string, key: string): string | null {
+  const regex = new RegExp(`"${key}"\\s*:\\s*("(.*?)"|\\d+|true|false|null)`, 'is')
+
+  const match = json.match(regex)
+  if (match && match[1]) {
+    let value = match[1].trim()
+    if (value.startsWith('"') && value.endsWith('"')) {
+      value = value.slice(1, -1)
+      const unescapedValue = value.replace(/\\"/g, '"').replace(/\\\\/g, '\\').replace(/\\n/g, '\n')
+      return unescapedValue
+    }
+    return value
+  }
+  return null
+}