myagent-ai 1.47.21 → 1.47.23

package/agents/main_agent.py

@@ -499,27 +499,6 @@ class MainAgent(BaseAgent):
             except Exception as e:
                 logger.debug(f"V2 SSE 事件发送失败 ({event_type}): {e}")
 
-    def _try_extract_partial_response(self, llm_raw: str) -> str:
-        """[v1.47.21] 从不完整的 LLM 输出中提取纯文本回复。
-
-        完全依赖原生 tool_calling，不再解析 XML 格式。
-        仅做简单的 XML 标签清理（兜底，防止模型意外输出 XML）。
-        """
-        if not llm_raw:
-            return ""
-
-        import re
-        # 去除所有 XML 标签
-        cleaned = re.sub(r"<[^>]+>", "", llm_raw).strip()
-        cleaned = re.sub(r"^(reasoning|assistant)\s*", "", cleaned, flags=re.IGNORECASE).strip()
-        # 跳过工具执行状态文本
-        if cleaned and len(cleaned) > 5 and not re.match(
-            r"^(执行工具|调用工具|Running tool|Calling tool)", cleaned, re.IGNORECASE
-        ):
-            return cleaned
-
-        return ""
-
     async def _merge_duplicate_memory(
         self,
         old_memory,
@@ -964,16 +943,77 @@ class MainAgent(BaseAgent):
                 _reasoning_parts.append(delta_text)
                 await self._emit_v2_event("v2_reasoning", {"content": delta_text}, stream_callback)
 
-            if stream_response and self.llm:
-                response = await self._call_llm_stream(
-                    messages,
-                    tools=tools if tools else None,
-                    text_delta_callback=text_delta_callback,
-                    reasoning_delta_callback=_reasoning_delta_cb,
-                    stream_response=stream_response,
-                )
-            else:
-                response = await self._call_llm(messages, tools=tools if tools else None)
+            # 可重试的 LLM 调用（最多 5 次）
+            _max_llm_retries = 5
+            _llm_retry_count = 0
+            response = None
+
+            while _llm_retry_count < _max_llm_retries:
+                try:
+                    if stream_response and self.llm:
+                        response = await self._call_llm_stream(
+                            messages,
+                            tools=tools if tools else None,
+                            text_delta_callback=text_delta_callback,
+                            reasoning_delta_callback=_reasoning_delta_cb,
+                            stream_response=stream_response,
+                        )
+                    else:
+                        response = await self._call_llm(messages, tools=tools if tools else None)
+                except Exception as _llm_exc:
+                    # 异常类错误 → 判断是否可重试
+                    _llm_exc_str = str(_llm_exc).lower()
+                    _is_retryable = any(kw in _llm_exc_str for kw in (
+                        "connection", "timeout", "timed out",
+                        "429", "500", "502", "503", "504",
+                        "rate_limit", "rate limit", "overloaded", "capacity",
+                        "network", "eof",
+                    ))
+                    _llm_retry_count += 1
+                    if _is_retryable and _llm_retry_count < _max_llm_retries:
+                        _delay = 2.0 * (2 ** (_llm_retry_count - 1))  # 2s, 4s, 8s, 16s
+                        logger.warning(
+                            f"[{task_id}] LLM 调用异常 (第 {_llm_retry_count}/{_max_llm_retries} 次)，"
+                            f"{_delay:.0f}s 后重试: {_llm_exc}"
+                        )
+                        await self._emit_v2_event("v2_reasoning", {
+                            "content": f"⏳ 网络不稳定，正在重试 ({_llm_retry_count}/{_max_llm_retries})..."
+                        }, stream_callback)
+                        await asyncio.sleep(_delay)
+                        continue
+                    else:
+                        # 不可重试 或 已达上限 → 包装为失败 response
+                        logger.error(f"[{task_id}] LLM 调用异常 (已重试 {_llm_retry_count} 次): {_llm_exc}")
+                        response = type("LLMResponse", (), {"success": False, "error": str(_llm_exc)})()
+                        break
+
+                # 没有异常 → 检查 response.success
+                if response.success:
+                    break  # 成功 → 跳出重试循环
+
+                # response.success == False 但没抛异常 → 判断错误是否可重试
+                _llm_error = (response.error or "").lower()
+                _is_retryable = any(kw in _llm_error for kw in (
+                    "connection", "timeout", "timed out",
+                    "429", "500", "502", "503", "504",
+                    "rate_limit", "rate limit", "overloaded", "capacity",
+                    "network", "eof",
+                ))
+                _llm_retry_count += 1
+                if _is_retryable and _llm_retry_count < _max_llm_retries:
+                    _delay = 2.0 * (2 ** (_llm_retry_count - 1))
+                    logger.warning(
+                        f"[{task_id}] LLM 返回失败 (第 {_llm_retry_count}/{_max_llm_retries} 次)，"
+                        f"{_delay:.0f}s 后重试: {response.error}"
+                    )
+                    await self._emit_v2_event("v2_reasoning", {
+                        "content": f"⏳ 网络不稳定，正在重试 ({_llm_retry_count}/{_max_llm_retries})..."
+                    }, stream_callback)
+                    await asyncio.sleep(_delay)
+                    continue
+                else:
+                    # 不可重试 或 已达上限 → 保持失败 response，退出循环
+                    break
 
             # LLM 调用失败处理
             if not response.success:
@@ -1003,8 +1043,8 @@ class MainAgent(BaseAgent):
                     await self._emit_v2_event("v2_reasoning", {"content": _vision_skip_msg}, stream_callback)
                     break
 
-                # 其他错误
-                error_msg = f"LLM 调用失败: {response.error}"
+                # 其他错误（含已耗尽重试次数的连接错误）
+                error_msg = f"LLM 调用失败 (已重试 {_llm_retry_count} 次): {_llm_error}"
                 context.working_memory["final_response"] = error_msg
                 await self._emit_v2_event("v2_reasoning", {"content": error_msg}, stream_callback)
                 break
@@ -1180,20 +1220,8 @@ class MainAgent(BaseAgent):
                 continue
 
             else:
-                # [v1.47.21] 没有原生工具调用 → 纯文本回复
-                # 完全依赖 tool_calling，不再解析 <output> XML
-                raw_content = (response.content or "").strip()
-
-                # 如果模型意外输出了 XML 标签，清理掉
-                import re as _re_clean
-                if raw_content.startswith("<") and "</" in raw_content:
-                    # 清除 XML 标签，提取纯文本
-                    cleaned = _re_clean.sub(r'<[^>]+>', '', raw_content).strip()
-                    if cleaned:
-                        raw_content = cleaned
-                        logger.info(f"[{task_id}] 清理了 LLM 输出中的 XML 标签")
-
-                reply_text = raw_content
+                # 没有原生工具调用 → 纯文本回复，完全依赖 tool_calling
+                reply_text = (response.content or "").strip()
                 logger.info(f"[{task_id}] 无工具调用，任务完成 (reply长度={len(reply_text)})")
 
                 if not reply_text:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.47.21",
+  "version": "1.47.23",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/ui/chat/chat_main.js

@@ -2999,11 +2999,7 @@ async function selectSession(id) {
       return m && (m.role === 'user' || m.role === 'assistant' || m.role === 'tool');
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
-      // [v1.47.21] 清理意外输出的 XML 标签（完全依赖 tool_calling）
       var mkey = (m.key || '').toLowerCase();
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
-        content = content.replace(/<[^>]+>/g, ' ').replace(/\s{2,}/g, ' ').trim();
-      }
       var mapped = {
         role: m.role || 'assistant',
         content: content,
@@ -3108,10 +3104,6 @@ async function loadMoreMessages() {
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
       var mkey = (m.key || '').toLowerCase();
-      // [v1.47.21] 清理意外输出的 XML 标签
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
-        content = content.replace(/<[^>]+>/g, ' ').replace(/\s{2,}/g, ' ').trim();
-      }
       var mapped = {
         role: m.role || 'assistant',
         content: content,

package/web/ui/chat/flow_engine.js

@@ -398,10 +398,6 @@ async function pollChatHistory() {
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
       var mkey = (m.key || '').toLowerCase();
-      // [v1.47.21] 清理意外输出的 XML 标签（完全依赖 tool_calling，不再解析 XML）
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
-        content = content.replace(/<[^>]+>/g, ' ').replace(/\s{2,}/g, ' ').trim();
-      }
       var mapped = {
         role: m.role || 'assistant',
         content: content,
@@ -416,7 +412,7 @@ async function pollChatHistory() {
       if (m._media && m._media.length > 0) mapped._media = m._media;
       return mapped;
     });
-    
+
     // 检测是否有新消息
     var newCount = loaded.length;
     if (newCount === _lastKnownMessageCount && !state.isGenerating) return; // 无变化且非生成中，跳过
@@ -472,10 +468,6 @@ async function forceRefreshHistory() {
     }).map(function(m) {
       var content = (m.content != null) ? String(m.content) : '';
       var mkey = (m.key || '').toLowerCase();
-      // [v1.47.21] 清理意外输出的 XML 标签
-      if (m.role === 'assistant' && content && content.trim().startsWith('<')) {
-        content = content.replace(/<[^>]+>/g, ' ').replace(/\s{2,}/g, ' ').trim();
-      }
       var mapped = {
         role: m.role || 'assistant',
         content: content,
@@ -1114,16 +1106,6 @@ function _showFinishNotification(text) {
   setTimeout(function() { if (overlay.parentNode) overlay.remove(); }, 5000);
 }
 
-/**
- * [v1.47.21] Strip XML tags from text — simple regex cleanup for accidental XML output.
- * No longer parses <output>/<reply>/<toolstocal> — fully relies on native tool_calling.
- */
-function _stripXmlTags(xml) {
-  if (!xml) return '';
-  return xml.replace(/<[^>]+>/g, ' ').replace(/&lt;/g, '<').replace(/&gt;/g, '>')
-    .replace(/&amp;/g, '&').replace(/\s{2,}/g, ' ').trim();
-}
-
 // ══════════════════════════════════════════════════════
 // ── V2 Content Assembler (V2 内容组装) ──
 // ══════════════════════════════════════════════════════
@@ -1148,14 +1130,7 @@ function _assembleV2Content(msg, msgParts) {
   if (msg._askUser && msg._askUser.trim()) {
     return msg._askUser.trim();
   }
-  // Priority 4: V2 raw XML stripped of tags (fallback when v2_reasoning not sent)
-  if (msg._v2RawXml && msg._v2RawXml.trim()) {
-    var strippedText = _stripXmlTags(msg._v2RawXml);
-    if (strippedText && strippedText.trim()) {
-      return strippedText.trim();
-    }
-  }
-  // Priority 5: raw content from message (server-stored response)
+  // Priority 4: raw content from message (server-stored response)
   if (msg.content && msg.content.trim() && msg.content !== '(无回复)') {
     return msg.content.trim();
   }