myagent-ai 1.14.1 → 1.15.1

package/agents/main_agent.py

@@ -6,6 +6,7 @@ agents/main_agent.py - 主 Agent
 from __future__ import annotations
 
 import asyncio
+import re
 from typing import Any, Callable, Dict, List, Optional
 
 from core.logger import get_logger
@@ -442,6 +443,8 @@ class MainAgent(BaseAgent):
         get_knowledge_content = ""
         # 追踪流式推送的 reasoning 文本（用于构建有意义的最终回复）
         _v2_reasoning_collected: List[str] = []
+        # XML 解析失败时的 LLM 修正重试计数
+        _xml_correction_retries: int = 0
 
         conversation_history = list(context.conversation_history or [])
 
@@ -587,31 +590,54 @@ class MainAgent(BaseAgent):
                     "finish": parsed.finish,
                     "finish_reason": truncate_str(parsed.finish_reason, 200),
                     "next_step": truncate_str(parsed.next_step, 200),
+                    "response": truncate_str(parsed.response, 500),
                     "parse_success": parsed.parse_success,
+                    "needs_correction": parsed.needs_correction,
                 }},
                 stream_callback,
             )
 
+            # Step 4.5: 解析失败处理 — 回退给 LLM 修正或提取周边文本
             if not parsed.parse_success:
-                logger.warning(f"[{task_id}] XML 解析失败，尝试提取周边文本")
-                before, after = extract_surrounding_text(llm_raw)
-                if before.strip() or after.strip():
-                    final_text = (before + "\n" + after).strip()
-                    context.working_memory["final_response"] = final_text
-                    await self._emit_v2_event("v2_reasoning", {"content": final_text}, stream_callback)
-                    if self.memory:
-                        self.memory.add_session(
-                            session_id=context.session_id,
-                            role="assistant",
-                            content=final_text,
-                        )
-                    break
+                if parsed.needs_correction and _xml_correction_retries < 1:
+                    # XML 完全无法解析，让 LLM 重新格式化输出
+                    _xml_correction_retries += 1
+                    logger.warning(
+                        f"[{task_id}] XML 解析完全失败，回退给 LLM 修正 "
+                        f"(重试 {_xml_correction_retries}/1)"
+                    )
+                    correction_prompt = (
+                        "你上一次的输出格式有误，XML解析器无法识别。"
+                        "请严格按照 <output>...</output> 格式重新输出你的回答。"
+                        "注意：不要在 <output> 标签前后输出任何其他文字。\n\n"
+                        f"你上一次的原始输出如下：\n{llm_raw}"
+                    )
+                    conversation_history.append(
+                        Message(role="assistant", content=llm_raw)
+                    )
+                    conversation_history.append(
+                        Message(role="user", content=correction_prompt)
+                    )
+                    await self._emit_v2_event(
+                        "v2_reasoning",
+                        {"content": "⚠️ 模型输出格式异常，正在自动修正..."},
+                        stream_callback,
+                    )
+                    continue  # 重新进入循环，让 LLM 重新生成
                 else:
-                    # XML 解析失败且无法提取文本，发送原始输出作为备选
-                    logger.warning(f"[{task_id}] 无法提取文本，发送原始 LLM 输出")
-                    final_text = llm_raw.strip() if llm_raw.strip() else "处理完毕。"
+                    # 已重试过或不需要修正，提取周边文本作为备选
+                    logger.warning(f"[{task_id}] XML 解析失败，提取周边文本作为备选")
+                    before, after = extract_surrounding_text(llm_raw)
+                    if before.strip() or after.strip():
+                        final_text = (before + "\n" + after).strip()
+                    else:
+                        # 清除残余 XML 标签后作为纯文本
+                        final_text = re.sub(r"<[^>]+>", "", llm_raw).strip()
+                        final_text = final_text if final_text else "处理完毕。"
                     context.working_memory["final_response"] = final_text
-                    await self._emit_v2_event("v2_reasoning", {"content": final_text}, stream_callback)
+                    await self._emit_v2_event(
+                        "v2_reasoning", {"content": final_text}, stream_callback
+                    )
                     if self.memory:
                         self.memory.add_session(
                             session_id=context.session_id,
@@ -809,6 +835,7 @@ class MainAgent(BaseAgent):
                     "v2_tool_start",
                     {"tool": {
                         "toolname": tool_name,
+                        "beforecalltext": before_call,
                         "parms": truncate_str(parms, 500),
                         "timeout": timeout,
                         "callback": should_callback,
@@ -1002,10 +1029,12 @@ class MainAgent(BaseAgent):
 
                 # 保存工具调用到会话记忆
                 if self.memory:
+                    # 构建工具调用记录，包含 beforecalltext 作为标题
+                    tool_call_title = before_call if before_call else f"调用工具: {tool_name}"
                     self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
-                        content=f"调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
+                        content=f"{tool_call_title}\n调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
                         key="tool_call",
                         importance=0.4,
                     )