myagent-ai 1.15.37 → 1.15.38

package/agents/main_agent.py

@@ -1080,6 +1080,10 @@ class MainAgent(BaseAgent):
                         return out
                     return tr.get("error", "")
 
+                # 防御 tool_result 为 None（极端情况）
+                if tool_result is None:
+                    tool_result = {"success": False, "error": "工具返回了空结果", "timed_out": False}
+
                 tool_output_text = _extract_tool_output(tool_result)
 
                 await self._emit_v2_event(
@@ -1328,7 +1332,10 @@ class MainAgent(BaseAgent):
 
             elif self.skills:
                 exec_result = await self.skills.execute(tool_name, **params)
-                result = exec_result.to_dict()
+                if exec_result is None:
+                    result["error"] = f"技能 {tool_name} 返回了空结果"
+                else:
+                    result = exec_result.to_dict()
             else:
                 result["error"] = f"未知工具: {tool_name}"
 

package/package.json

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

package/skills/search_skill.py

@@ -118,20 +118,22 @@ class WebSearchSkill(Skill):
             import requests
             from bs4 import BeautifulSoup
 
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
 
             def _fetch():
-                url = "https://html.duckduckgo.com/html/"
+                r = None
                 try:
-                    r = requests.get(url, params={"q": query}, headers=_HEADERS, timeout=15)
+                    r = requests.get("https://html.duckduckgo.com/html/", params={"q": query}, headers=_HEADERS, timeout=15)
                     r.raise_for_status()
                 except requests.exceptions.SSLError:
                     logger.warning("DuckDuckGo SSL 验证失败，跳过证书验证重试")
-                    r = requests.get(url, params={"q": query}, headers=_HEADERS, timeout=15, verify=False)
+                    r = requests.get("https://html.duckduckgo.com/html/", params={"q": query}, headers=_HEADERS, timeout=15, verify=False)
                     r.raise_for_status()
-                return r.text
+                if r is not None:
+                    return r.text or ""
+                return ""
 
-            html = await loop.run_in_executor(None, _fetch)
+            html = await asyncio.wait_for(loop.run_in_executor(None, _fetch), timeout=30)
             soup = BeautifulSoup(html, "html.parser")
 
             results = []
@@ -170,31 +172,22 @@ class WebSearchSkill(Skill):
             import requests
             from bs4 import BeautifulSoup
 
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
 
             def _fetch():
-                url = "https://www.bing.com/search"
+                r = None
                 try:
-                    r = requests.get(
-                        url,
-                        params={"q": query, "count": num},
-                        headers=_HEADERS,
-                        timeout=15,
-                    )
+                    r = requests.get("https://www.bing.com/search", params={"q": query, "count": num}, headers=_HEADERS, timeout=15)
                     r.raise_for_status()
                 except requests.exceptions.SSLError:
                     logger.warning("Bing SSL 验证失败，跳过证书验证重试")
-                    r = requests.get(
-                        url,
-                        params={"q": query, "count": num},
-                        headers=_HEADERS,
-                        timeout=15,
-                        verify=False,
-                    )
+                    r = requests.get("https://www.bing.com/search", params={"q": query, "count": num}, headers=_HEADERS, timeout=15, verify=False)
                     r.raise_for_status()
-                return r.text
+                if r is not None:
+                    return r.text or ""
+                return ""
 
-            html = await loop.run_in_executor(None, _fetch)
+            html = await asyncio.wait_for(loop.run_in_executor(None, _fetch), timeout=30)
             soup = BeautifulSoup(html, "html.parser")
 
             results = []
@@ -250,22 +243,24 @@ class WebReadSkill(Skill):
     ]
 
     async def execute(self, url: str = "", extract_text: bool = True, **kwargs) -> SkillResult:
+        if not url or not isinstance(url, str) or not url.startswith("http"):
+            return SkillResult(success=False, error=f"无效的URL: {url!r}")
+
         # 确保搜索依赖已安装
         try:
-            import requests
-            from bs4 import BeautifulSoup
+            import requests  # noqa: F811
+            from bs4 import BeautifulSoup  # noqa: F811
         except ImportError as imp_err:
             logger.warning(f"网页读取依赖缺失: {imp_err}，尝试自动安装...")
             from core.deps_checker import ensure_skill_deps
             if not ensure_skill_deps("search"):
                 return SkillResult(success=False, error=f"依赖安装失败，请手动运行: pip install requests beautifulsoup4 lxml ({imp_err})")
-        try:
-            import requests  # noqa: F811
-            from bs4 import BeautifulSoup  # noqa: F811
 
-            loop = asyncio.get_event_loop()
+        try:
+            loop = asyncio.get_running_loop()
 
             def _fetch():
+                r = None
                 try:
                     r = requests.get(url, headers=_HEADERS, timeout=30)
                     r.raise_for_status()
@@ -273,10 +268,17 @@ class WebReadSkill(Skill):
                     logger.warning(f"web_read SSL 验证失败 ({url})，跳过证书验证重试")
                     r = requests.get(url, headers=_HEADERS, timeout=30, verify=False)
                     r.raise_for_status()
-                r.encoding = r.apparent_encoding
-                return r.text
+                if r is not None:
+                    r.encoding = r.apparent_encoding
+                    return r.text or ""
+                return ""
+
+            html = await asyncio.wait_for(
+                loop.run_in_executor(None, _fetch), timeout=60
+            )
 
-            html = await loop.run_in_executor(None, _fetch)
+            if not html or not isinstance(html, str):
+                return SkillResult(success=False, error="网页内容为空")
 
             soup = BeautifulSoup(html, "html.parser")
             title = soup.title.get_text(strip=True) if soup.title else ""
@@ -318,6 +320,8 @@ class WebReadSkill(Skill):
                 },
                 message=f"已读取: {title} ({len(content)} 字符)",
             )
+        except asyncio.TimeoutError:
+            return SkillResult(success=False, error=f"网页读取超时 (60s): {url}")
         except Exception as e:
             return SkillResult(success=False, error=f"网页读取失败: {e}")
 
@@ -337,6 +341,8 @@ class URLReadSkill(Skill):
 
     async def execute(self, url: str = "", method: str = "GET",
                       headers: dict = None, body: str = "", **kwargs) -> SkillResult:
+        if not url:
+            return SkillResult(success=False, error="缺少 URL 参数")
         # 确保依赖已安装
         try:
             import requests
@@ -349,9 +355,10 @@ class URLReadSkill(Skill):
             import requests  # noqa: F811
 
             headers = headers or {}
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
 
             def _request():
+                r = None
                 try:
                     r = requests.request(
                         method=method,
@@ -370,9 +377,11 @@ class URLReadSkill(Skill):
                         timeout=30,
                         verify=False,
                     )
-                return r
+                if r is not None:
+                    return r
+                raise requests.exceptions.ConnectionError(f"请求失败: {url}")
 
-            response = await loop.run_in_executor(None, _request)
+            response = await asyncio.wait_for(loop.run_in_executor(None, _request), timeout=60)
 
             try:
                 content = response.json()