myagent-ai 1.15.89 → 1.15.90

package/package.json

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

package/web/api_server.py

@@ -5701,15 +5701,23 @@ class ApiServer:
         # 加载禁用技能列表
         self._load_disabled_skills()
 
-        # 恢复被中断的任务（将 running 状态的标记为 failed）
+        # 恢复被中断的任务：自动重新投递群聊任务
         try:
             tp = self._get_task_persistence()
-            recovered = tp.recover_interrupted_tasks()
-            if recovered:
-                logger.warning(
-                    f"检测到 {len(recovered)} 个上次未完成的任务，已标记为失败。"
-                    f"可在任务记录中查看并重试。"
-                )
+            interrupted = tp.get_all_tasks(status_filter=("running",))
+            if interrupted:
+                logger.warning(f"检测到 {len(interrupted)} 个上次未完成的任务，正在自动恢复...")
+                for task in interrupted:
+                    try:
+                        await self._retry_interrupted_task(tp, task)
+                    except Exception as e:
+                        logger.error(f"自动恢复任务失败 ({task.get('task_id', '')}): {e}")
+                        # 恢复失败则标记为 failed
+                        tp.update_task_status(
+                            task.get("task_id", ""), "failed",
+                            metadata={"interrupted": True, "interrupt_reason": "自动恢复失败"},
+                            last_message=task.get("description", ""),
+                        )
             # 清理超过 7 天的旧已完成任务
             tp.cleanup_old_tasks(days=7)
         except Exception as e:
@@ -5912,6 +5920,146 @@ class ApiServer:
         logger.info(f"任务已删除: {task_id}")
         return web.json_response({"ok": True, "task_id": task_id})
 
+    async def _retry_interrupted_task(self, tp, task: dict):
+        """
+        自动恢复被中断的群聊任务。
+        重新投递消息到群聊，让 agent 重新处理。
+        """
+        task_id = task.get("task_id", "")
+        group_id = task.get("group_id", "")
+        description = task.get("description", "")
+        metadata = task.get("metadata", {})
+
+        if not group_id:
+            logger.info(f"任务 {task_id} 无关联群聊，标记为 failed")
+            tp.update_task_status(task_id, "failed", metadata={"interrupted": True})
+            return
+
+        # 验证群聊仍然存在
+        mgr = self._get_group_manager()
+        group = mgr.get_group(group_id)
+        if not group:
+            logger.warning(f"任务 {task_id} 的群聊 {group_id} 已不存在，标记为 failed")
+            tp.update_task_status(task_id, "failed", metadata={"interrupted": True})
+            return
+
+        active_members = [m for m in group.members if not m.muted]
+        if not active_members:
+            logger.warning(f"任务 {task_id} 的群聊 {group_id} 无活跃成员，标记为 failed")
+            tp.update_task_status(task_id, "failed", metadata={"interrupted": True})
+            return
+
+        logger.info(f"正在恢复任务 {task_id}: 群聊[{group.name}] 描述[{description[:50]}...]")
+
+        # 保存恢复消息到群聊
+        from groups.manager import GroupMessage
+        import asyncio
+
+        recover_msg = GroupMessage(
+            group_id=group_id,
+            sender="user",
+            sender_name="系统（任务恢复）",
+            sender_avatar="🔄",
+            content=f"[自动恢复中断任务]\n{description}",
+        )
+        mgr.add_message(recover_msg)
+
+        # 并行投递到所有成员 agent
+        async def process_member(member):
+            try:
+                agent_path = member.agent_path
+                agent_cfg = self._read_agent_config(agent_path)
+                model_chain = self._build_model_chain(agent_cfg, agent_path)
+                session_id = f"group_{group_id}_{agent_path}"
+
+                _, agent_system_prompt = self._build_agent_chat_context(agent_path, agent_cfg, description)
+
+                # 构建群聊上下文
+                member_lines = []
+                for m in group.members:
+                    mc = self._read_agent_config(m.agent_path)
+                    m_name = mc.get("name", m.agent_path) if mc else m.agent_path
+                    m_desc = mc.get("description", "") if mc else ""
+                    role_label = {"owner": "群主", "admin": "管理员"}.get(m.role, "成员")
+                    line = f"  - {m_name} [{m.agent_path}] ({role_label})"
+                    if m_desc:
+                        line += f" — {m_desc}"
+                    member_lines.append(line)
+
+                my_name = agent_cfg.get("name", agent_path) if agent_cfg else agent_path
+                my_role = {"owner": "群主", "admin": "管理员"}.get(member.role, "成员")
+                my_desc = agent_cfg.get("description", "") if agent_cfg else ""
+
+                group_context = (
+                    f"## 群聊上下文\n"
+                    f"- 群名称: {group.name}\n"
+                    f"- 群ID: {group.id}\n"
+                    f"- 群描述: {group.description}\n"
+                    f"- 当前发言者: 系统（任务恢复）\n"
+                    f"- 你的身份: {my_name} ({my_role})"
+                    + (f" — {my_desc}" if my_desc else "")
+                    + f"\n- 群成员 ({len(group.members)}人):\n"
+                    + "\n".join(member_lines)
+                    + "\n\n注意：你只代表自己发言，回复时使用第一人称。"
+                    "如果消息不是跟你相关的，可以简短回复或不回复。"
+                )
+
+                if agent_system_prompt:
+                    agent_system_prompt += "\n\n" + group_context
+                else:
+                    agent_system_prompt = group_context
+
+                dept_context = self._build_dept_context(group_id, agent_path)
+                if dept_context:
+                    agent_system_prompt += "\n\n" + dept_context
+
+                if model_chain and self.core.llm:
+                    response = await self._try_model_chain(
+                        model_chain, description, session_id,
+                        agent_path=agent_path, agent_system_prompt=agent_system_prompt,
+                    )
+                else:
+                    response = await self.core.process_message(description, session_id)
+
+                avatar = "🤖"
+                display_name = agent_path
+                if agent_cfg:
+                    avatar = agent_cfg.get("avatar_emoji", "🤖") or "🤖"
+                    display_name = agent_cfg.get("name", agent_path)
+
+                agent_msg = GroupMessage(
+                    group_id=group_id,
+                    sender="agent",
+                    sender_name=display_name,
+                    sender_avatar=avatar,
+                    content=response,
+                    agent_path=agent_path,
+                )
+                mgr.add_message(agent_msg)
+                return {"ok": True, "agent_path": agent_path}
+            except Exception as e:
+                logger.error(f"恢复任务处理失败 ({member.agent_path}): {e}")
+                return {"ok": False, "agent_path": member.agent_path, "error": str(e)}
+
+        retry_tasks = [process_member(m) for m in active_members]
+        retry_results = await asyncio.gather(*retry_tasks, return_exceptions=True)
+
+        final_results = []
+        for r in retry_results:
+            if isinstance(r, Exception):
+                final_results.append({"ok": False, "agent_path": "unknown", "error": str(r)})
+            else:
+                final_results.append(r)
+
+        has_failure = any(not r.get("ok") for r in final_results)
+        tp.update_task_status(
+            task_id,
+            "failed" if has_failure else "completed",
+            metadata={"interrupted": True, "recovered": True},
+            last_message=description[:500],
+        )
+        logger.info(f"任务 {task_id} 恢复完成: {'成功' if not has_failure else '部分失败'}")
+
     # ── 部门上下文构建（部长角色注入） ──
 
     def _find_dept_by_group_id(self, tree, group_id):