myagent-ai 1.47.22 → 1.47.23

package/agents/main_agent.py

@@ -943,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:
@@ -982,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

package/package.json

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