JOJO
72a49a7c8d
- 新增 server/work_timer.py，在对话真正空闲（无前台任务、无后台子智能体/后台命令/压缩）时持久化 work_timer，并同步内存副本，解决刷新后计时器回退问题。 - server/chat_flow_task_main.py / chat_flow.py / tasks/models.py 在任务结束/取消时按空闲判定决定是否持久化。 - 前端 lifecycle.ts 在仍有后台任务时不提前停止计时器。 - 子智能体工具（create/terminate/get_status）渲染美化，task 参数放在顶部元信息区。 - 子智能体状态查询支持返回「已完成」「已终止」「不存在」；修复 wait_for_completion 在 final_result 就绪前返回导致的「ID 被占用」误报。 - 统一后台完成通知池 poll_completion_notifications，合并子智能体与后台 run_command 两路轮询，避免逐条触发工作循环与单工作区互斥冲突。 - 删除本次新增的各类 debug_log / notify_pool_log 调用及辅助脚本。
248 lines
11 KiB
Python
248 lines
11 KiB
Python
from __future__ import annotations
|
||
|
||
from typing import Any, Dict, List, Optional, Tuple
|
||
from utils.tool_result_formatter.common import (
|
||
_format_failure, _preview_text, _summarize_output_block, _summarize_todo_tasks
|
||
)
|
||
|
||
def _format_conversation_search(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("conversation_search", result_data)
|
||
results = result_data.get("results") or []
|
||
header = f"找到 {len(results)} 个当前工作区内的历史对话"
|
||
filters: List[str] = []
|
||
keywords = result_data.get("keywords")
|
||
if isinstance(keywords, list):
|
||
normalized_keywords = [str(item).strip() for item in keywords if str(item or "").strip()]
|
||
else:
|
||
normalized_keywords = []
|
||
if normalized_keywords:
|
||
filters.append(f"关键词：{' / '.join(normalized_keywords)}")
|
||
elif result_data.get("query"):
|
||
filters.append(f"关键词：{result_data.get('query')}")
|
||
if result_data.get("start_date") or result_data.get("end_date"):
|
||
filters.append(f"日期：{result_data.get('start_date') or '不限'} ~ {result_data.get('end_date') or '不限'}")
|
||
if result_data.get("excluded_conversation_id"):
|
||
filters.append("已排除当前对话")
|
||
if filters:
|
||
header += "（" + "；".join(filters) + "）"
|
||
if not results:
|
||
return header + "\n未找到匹配对话。"
|
||
lines = [header]
|
||
for idx, item in enumerate(results, start=1):
|
||
lines.append(f"{idx}. {item.get('id')}")
|
||
lines.append(f" 标题：{item.get('title') or '未命名对话'}")
|
||
if item.get("total_messages") is not None or item.get("total_tools") is not None:
|
||
lines.append(
|
||
f" 规模：{int(item.get('total_messages') or 0)} 条消息，{int(item.get('total_tools') or 0)} 个工具"
|
||
)
|
||
if item.get("first_user_message"):
|
||
lines.append(f" 首条用户消息：{item.get('first_user_message')}")
|
||
if item.get("created_at"):
|
||
lines.append(f" 创建时间：{item.get('created_at')}")
|
||
if item.get("updated_at"):
|
||
lines.append(f" 更新时间：{item.get('updated_at')}")
|
||
return "\n".join(lines)
|
||
|
||
def _format_conversation_review(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("conversation_review", result_data)
|
||
if result_data.get("mode") == "read" and result_data.get("content"):
|
||
lines = ["对话回顾内容："]
|
||
if result_data.get("title"):
|
||
lines.append(f"标题：{result_data.get('title')}")
|
||
if result_data.get("char_count") is not None:
|
||
lines.append(f"字符数：{result_data.get('char_count')}")
|
||
lines.append("")
|
||
lines.append(str(result_data.get("content") or ""))
|
||
return "\n".join(lines)
|
||
path = result_data.get("path") or ""
|
||
if result_data.get("too_long"):
|
||
lines = [
|
||
f"对话回顾内容太长（{result_data.get('char_count')} 字符），已保存到文件：",
|
||
str(path),
|
||
"请使用 read_file 分段或查找阅读该文件。",
|
||
]
|
||
if result_data.get("title"):
|
||
lines.insert(1, f"标题：{result_data.get('title')}")
|
||
return "\n".join(lines)
|
||
lines = [
|
||
"已生成对话回顾文件：",
|
||
str(path),
|
||
]
|
||
if result_data.get("title"):
|
||
lines.append(f"标题：{result_data.get('title')}")
|
||
if result_data.get("char_count") is not None:
|
||
lines.append(f"字符数：{result_data.get('char_count')}")
|
||
lines.append("请使用 read_file 读取该文件。")
|
||
return "\n".join(lines)
|
||
|
||
def _format_todo_create(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("todo_create", result_data)
|
||
todo = (result_data.get("todo_list") or {}).copy()
|
||
overview = todo.get("overview") or "未命名任务"
|
||
total = len(todo.get("tasks") or [])
|
||
return f"已创建 TODO：{overview}（共 {total} 项）"
|
||
|
||
def _format_todo_update_task(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("todo_update_task", result_data)
|
||
message = result_data.get("message") or "任务状态已更新"
|
||
todo = result_data.get("todo_list") or {}
|
||
tasks = todo.get("tasks") or []
|
||
total = len(tasks)
|
||
done = sum(1 for t in tasks if t.get("status") == "done")
|
||
progress_note = f"进度 {done}/{total}" if total else ""
|
||
return f"{message}；{progress_note}".strip("；")
|
||
|
||
def _format_update_memory(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("update_memory", result_data)
|
||
operation = result_data.get("operation") or "write"
|
||
idx = result_data.get("index")
|
||
count = result_data.get("count")
|
||
if operation == "append":
|
||
suffix = f"（共 {count} 条）" if count is not None else ""
|
||
return f"记忆已追加新条目{suffix}"
|
||
if operation == "replace":
|
||
return f"记忆第 {idx} 条已替换。"
|
||
if operation == "delete":
|
||
suffix = f"（剩余 {count} 条）" if count is not None else ""
|
||
return f"记忆第 {idx} 条已删除{suffix}"
|
||
return f"记忆已更新。"
|
||
|
||
def _format_sub_agent_stats(stats: Optional[Dict[str, Any]]) -> str:
|
||
if not isinstance(stats, dict):
|
||
return ""
|
||
|
||
def _to_int(value: Any) -> int:
|
||
try:
|
||
return max(0, int(value))
|
||
except (TypeError, ValueError):
|
||
return 0
|
||
|
||
api_calls = _to_int(stats.get("api_calls") or stats.get("api_call_count") or stats.get("turn_count"))
|
||
files_read = _to_int(stats.get("files_read"))
|
||
edit_files = _to_int(stats.get("edit_files"))
|
||
searches = _to_int(stats.get("searches"))
|
||
web_pages = _to_int(stats.get("web_pages"))
|
||
commands = _to_int(stats.get("commands"))
|
||
lines = [
|
||
f"调用了{api_calls}次",
|
||
f"阅读了{files_read}次文件",
|
||
f"编辑了{edit_files}次文件",
|
||
f"搜索了{searches}次内容",
|
||
f"查看了{web_pages}个网页",
|
||
f"运行了{commands}个指令",
|
||
]
|
||
return "\n".join(lines)
|
||
|
||
def _format_create_sub_agent(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("create_sub_agent", result_data)
|
||
agent_id = result_data.get("agent_id")
|
||
task_id = result_data.get("task_id")
|
||
status = result_data.get("status")
|
||
refs = result_data.get("copied_references") or []
|
||
ref_note = f"，附带 {len(refs)} 份参考文件" if refs else ""
|
||
deliver_dir = result_data.get("deliverables_dir")
|
||
deliver_note = f"，交付目录: {deliver_dir}" if deliver_dir else ""
|
||
header = f"子智能体 #{agent_id} 已创建（task_id={task_id}，状态 {status}{ref_note}{deliver_note}）。"
|
||
stats_text = _format_sub_agent_stats(
|
||
result_data.get("stats") or (result_data.get("final_result") or {}).get("stats")
|
||
)
|
||
summary = result_data.get("message") or result_data.get("summary")
|
||
elapsed_seconds = result_data.get("runtime_seconds")
|
||
if elapsed_seconds is None:
|
||
elapsed_seconds = result_data.get("elapsed_seconds")
|
||
lines = [header]
|
||
if stats_text:
|
||
lines.append(stats_text)
|
||
if status == "completed" and isinstance(elapsed_seconds, (int, float)):
|
||
lines.append(f"运行了{int(round(elapsed_seconds))}秒")
|
||
if summary and status in {"completed", "failed", "timeout", "terminated"}:
|
||
lines.append(str(summary))
|
||
return "\n".join(lines)
|
||
|
||
def _format_wait_sub_agent(result_data: Dict[str, Any]) -> str:
|
||
task_id = result_data.get("task_id")
|
||
agent_id = result_data.get("agent_id")
|
||
status = result_data.get("status")
|
||
stats_value = result_data.get("stats")
|
||
if not isinstance(stats_value, dict) and status == "timeout":
|
||
stats_value = {}
|
||
stats_text = _format_sub_agent_stats(stats_value)
|
||
elapsed_seconds = result_data.get("runtime_seconds")
|
||
if elapsed_seconds is None:
|
||
elapsed_seconds = result_data.get("elapsed_seconds")
|
||
if result_data.get("success"):
|
||
copied_path = result_data.get("copied_path") or result_data.get("deliverables_path")
|
||
message = result_data.get("message") or "子智能体任务已完成。"
|
||
deliver_note = f"交付已复制到 {copied_path}" if copied_path else "交付目录已生成"
|
||
lines = [f"子智能体 #{agent_id}/{task_id} 完成"]
|
||
if stats_text:
|
||
lines.append(stats_text)
|
||
if isinstance(elapsed_seconds, (int, float)):
|
||
lines.append(f"运行了{int(round(elapsed_seconds))}秒")
|
||
lines.append(message)
|
||
lines.append(deliver_note)
|
||
return "\n".join(lines)
|
||
message = result_data.get("message") or result_data.get("error") or "子智能体任务失败"
|
||
lines = [f"⚠️ 子智能体 #{agent_id}/{task_id} 状态 {status}"]
|
||
if stats_text:
|
||
lines.append(stats_text)
|
||
lines.append(message)
|
||
return "\n".join(lines)
|
||
|
||
def _format_get_sub_agent_status(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("get_sub_agent_status", result_data)
|
||
results = result_data.get("results") or []
|
||
if not results:
|
||
return "未找到子智能体状态。"
|
||
blocks = []
|
||
for item in results:
|
||
agent_id = item.get("agent_id")
|
||
if not item.get("found"):
|
||
blocks.append(f"子智能体 #{agent_id} 不存在。")
|
||
continue
|
||
status = item.get("status")
|
||
summary = None
|
||
final_result = item.get("final_result") or {}
|
||
elapsed_seconds = None
|
||
if isinstance(final_result, dict):
|
||
summary = final_result.get("message") or final_result.get("summary")
|
||
elapsed_seconds = final_result.get("runtime_seconds")
|
||
if elapsed_seconds is None:
|
||
elapsed_seconds = final_result.get("elapsed_seconds")
|
||
if not summary:
|
||
summary = item.get("summary") or ""
|
||
stats_text = _format_sub_agent_stats(item.get("stats"))
|
||
|
||
if status == "completed":
|
||
lines = [f"子智能体 #{agent_id} 已完成"]
|
||
elif status == "terminated":
|
||
lines = [f"子智能体 #{agent_id} 已终止"]
|
||
elif status in {"failed", "timeout"}:
|
||
lines = [f"⚠️ 子智能体 #{agent_id} 状态 {status}"]
|
||
else:
|
||
lines = [f"子智能体 #{agent_id} 状态: {status}"]
|
||
if stats_text:
|
||
lines.append(stats_text)
|
||
if status == "completed" and isinstance(elapsed_seconds, (int, float)):
|
||
lines.append(f"运行了{int(round(elapsed_seconds))}秒")
|
||
if summary:
|
||
lines.append(str(summary))
|
||
blocks.append("\n".join(lines))
|
||
return "\n\n".join(blocks)
|
||
|
||
def _format_close_sub_agent(result_data: Dict[str, Any]) -> str:
|
||
if not result_data.get("success"):
|
||
return _format_failure("close_sub_agent", result_data)
|
||
message = result_data.get("message") or "子智能体已关闭。"
|
||
task_id = result_data.get("task_id")
|
||
status = result_data.get("status")
|
||
status_note = f"（状态 {status}）" if status else ""
|
||
return f"{message}{status_note}（task_id={task_id}）"
|