myagent-ai 1.15.46 → 1.15.48

package/agents/main_agent.py

@@ -585,7 +585,24 @@ class MainAgent(BaseAgent):
                 response = await self._call_llm(messages)
 
             if not response.success:
-                logger.error(f"[{task_id}] LLM 调用失败: {response.error}")
+                _llm_error = response.error or ""
+                logger.error(f"[{task_id}] LLM 调用失败: {_llm_error}")
+
+                # 特殊处理审查拦截 (451 censorship_blocked)
+                if "451" in _llm_error or "censorship" in _llm_error.lower() or "blocked" in _llm_error.lower():
+                    _censor_msg = "抱歉，当前对话内容触发了安全审查，无法继续处理。请尝试修改您的请求内容后重试。"
+                    logger.warning(f"[{task_id}] 内容审查拦截，终止当前请求")
+                    context.working_memory["final_response"] = _censor_msg
+                    await self._emit_v2_event("v2_reasoning", {"content": _censor_msg}, stream_callback)
+                    if self.memory:
+                        self.memory.add_session(
+                            session_id=context.session_id,
+                            role="assistant",
+                            content=_censor_msg,
+                        )
+                    break
+
+                # 其他 LLM 错误
                 error_msg = f"LLM 调用失败: {response.error}"
                 context.working_memory["final_response"] = error_msg
                 await self._emit_v2_event("v2_reasoning", {"content": error_msg}, stream_callback)
@@ -1147,10 +1164,12 @@ class MainAgent(BaseAgent):
                     _max_output = 6000
                 else:
                     _max_output = 3000
+                # 超时工具明确标注状态，让 LLM 清楚知道哪个工具超时了
+                _status = "超时" if is_timeout else ('成功' if tool_result.get('success') else '失败')
                 tool_outputs_parts.append(
                     f"### {before_call}\n"
                     f"**工具**: {tool_name}\n"
-                    f"**结果**: {'成功' if tool_result.get('success') else '失败'}\n"
+                    f"**结果**: {_status}\n"
                     f"{truncate_str(output_str, _max_output)}\n"
                 )
 
@@ -1160,7 +1179,7 @@ class MainAgent(BaseAgent):
                 ))
                 conversation_history.append(Message(
                     role="user",
-                    content=f"[工具 {tool_name} 执行完成] {'成功' if tool_result.get('success') else '失败'}",
+                    content=f"[工具 {tool_name} {'超时' if is_timeout else '执行完成'}] {_status}",
                 ))
 
                 # 保存工具调用到会话记忆
@@ -1177,13 +1196,25 @@ class MainAgent(BaseAgent):
                     self.memory.add_session(
                         session_id=context.session_id,
                         role="tool",
-                        content=f"[{tool_name}] {'成功' if tool_result.get('success') else '失败'}\n{truncate_str(output_str, 5000)}",
+                        content=f"[{tool_name}] {_status}\n{truncate_str(output_str, 5000)}",
                         key="tool_result",
                         importance=0.4,
                     )
 
-                # 任一工具超时 → 立即停止执行剩余工具，用已收集的结果回调 LLM
+                # 任一工具超时 → 立即停止执行剩余工具
                 if _has_timeout:
+                    # 收集当前工具之后未执行的工具，一并写入回调数据
+                    _current_idx = parsed.tools_to_call.index(tool_info)
+                    _skipped_tools = []
+                    for _remaining in parsed.tools_to_call[_current_idx + 1:]:
+                        _rname = _remaining.get("toolname", "").strip()
+                        if _rname:
+                            _skipped_tools.append(_rname)
+                    if _skipped_tools:
+                        tool_outputs_parts.append(
+                            f"**注意**: 工具 {tool_name} 执行超时 ({timeout}s)，"
+                            f"以下工具未执行: {', '.join(_skipped_tools)}"
+                        )
                     break
 
             all_tool_outputs = "\n".join(tool_outputs_parts)

package/package.json

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