From 1522f3ead00b343780d2132043d3eabaa613ef36 Mon Sep 17 00:00:00 2001 From: cfdaily Date: Mon, 23 Mar 2026 17:31:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgit=E5=AE=B9=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- guanyu_monitor.log | 243 ++++++++++++++++++ jiangwei_monitor.log | 190 ++++++++++++++ .../workflow/scripts/agent_monitor_fixed.sh | 2 +- management/workflow/scripts/assign_simple.sh | 35 ++- management/workflow/scripts/create_simple.sh | 27 +- pangtong_monitor.log | 211 +++++++++++++++ simayi_monitor.log | 194 ++++++++++++++ start_all_agents.sh | 6 +- zhangfei_monitor.log | 234 +++++++++++++++++ zhaoyun_monitor.log | 188 ++++++++++++++ 10 files changed, 1313 insertions(+), 17 deletions(-) diff --git a/guanyu_monitor.log b/guanyu_monitor.log index 760eb0bbb..8883e8a6d 100644 --- a/guanyu_monitor.log +++ b/guanyu_monitor.log @@ -3289,3 +3289,246 @@ From gitee.com:cfdaily/sanguo_quant_live Already up to date. [2026-03-23 17:20:09] ✅ git pull成功 [2026-03-23 17:20:09] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:20:40] ✅ git pull成功 +[2026-03-23 17:20:40] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD + 8c9715f..73478ef main -> origin/main +Merge made by the 'ort' strategy. + management/agents/pangtong/TASK-20260323171335.task | 6 ------ + 1 file changed, 6 deletions(-) + delete mode 100644 management/agents/pangtong/TASK-20260323171335.task +[2026-03-23 17:21:11] ✅ git pull成功 +[2026-03-23 17:21:11] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:21:42] ✅ git pull成功 +[2026-03-23 17:21:42] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:22:13] ✅ git pull成功 +[2026-03-23 17:22:13] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:22:44] ✅ git pull成功 +[2026-03-23 17:22:44] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:23:15] ✅ git pull成功 +[2026-03-23 17:23:15] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD + c1712b3..d23acc5 main -> origin/main +Updating c1712b3..d23acc5 +Fast-forward + management/agents/pangtong/TASK-20260323171335.task | 6 ------ + management/agents/simayi/TASK-20260323171425.task | 6 ------ + 2 files changed, 12 deletions(-) + delete mode 100644 management/agents/pangtong/TASK-20260323171335.task + delete mode 100644 management/agents/simayi/TASK-20260323171425.task +[2026-03-23 17:23:46] ✅ git pull成功 +[2026-03-23 17:23:46] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:24:17] ✅ git pull成功 +[2026-03-23 17:24:17] guanyu 无新任务 +========================================= +========================================= +Agent监控启动 - guanyu +Agent监控启动 - guanyu +启动时间: 2026-03-23 17:25:06 +启动时间: 2026-03-23 17:25:06 +监控目录: management/agents/guanyu +监控目录: management/agents/guanyu +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 guanyu Agent监控器启动 +📊 监控目录: management/agents/guanyu +📝 日志文件: guanyu_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:06] ✅ git pull成功 +[2026-03-23 17:25:06] ✅ git pull成功 +[2026-03-23 17:25:06] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:36] ✅ git pull成功 +[2026-03-23 17:25:36] ✅ git pull成功 +[2026-03-23 17:25:36] guanyu 无新任务 +========================================= +========================================= +Agent监控启动 - guanyu +Agent监控启动 - guanyu +启动时间: 2026-03-23 17:25:41 +启动时间: 2026-03-23 17:25:41 +监控目录: management/agents/guanyu +监控目录: management/agents/guanyu +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 guanyu Agent监控器启动 +📊 监控目录: management/agents/guanyu +📝 日志文件: guanyu_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:41] ✅ git pull成功 +[2026-03-23 17:25:41] ✅ git pull成功 +[2026-03-23 17:25:41] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:07] ✅ git pull成功 +[2026-03-23 17:26:07] ✅ git pull成功 +[2026-03-23 17:26:07] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:12] ✅ git pull成功 +[2026-03-23 17:26:12] ✅ git pull成功 +[2026-03-23 17:26:12] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:38] ✅ git pull成功 +[2026-03-23 17:26:38] ✅ git pull成功 +[2026-03-23 17:26:38] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:43] ✅ git pull成功 +[2026-03-23 17:26:43] ✅ git pull成功 +[2026-03-23 17:26:43] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:09] ✅ git pull成功 +[2026-03-23 17:27:09] ✅ git pull成功 +[2026-03-23 17:27:09] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:14] ✅ git pull成功 +[2026-03-23 17:27:14] ✅ git pull成功 +[2026-03-23 17:27:14] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:40] ✅ git pull成功 +[2026-03-23 17:27:40] ✅ git pull成功 +[2026-03-23 17:27:40] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:45] ✅ git pull成功 +[2026-03-23 17:27:45] ✅ git pull成功 +[2026-03-23 17:27:45] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:11] ✅ git pull成功 +[2026-03-23 17:28:11] ✅ git pull成功 +[2026-03-23 17:28:11] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:16] ✅ git pull成功 +[2026-03-23 17:28:16] ✅ git pull成功 +[2026-03-23 17:28:16] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:42] ✅ git pull成功 +[2026-03-23 17:28:42] ✅ git pull成功 +[2026-03-23 17:28:42] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:47] ✅ git pull成功 +[2026-03-23 17:28:47] ✅ git pull成功 +[2026-03-23 17:28:47] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:13] ✅ git pull成功 +[2026-03-23 17:29:13] ✅ git pull成功 +[2026-03-23 17:29:13] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:17] ✅ git pull成功 +[2026-03-23 17:29:17] ✅ git pull成功 +[2026-03-23 17:29:17] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:44] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:44] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:44] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:48] ✅ git pull成功 +[2026-03-23 17:29:48] ✅ git pull成功 +[2026-03-23 17:29:48] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:15] ✅ git pull成功 +[2026-03-23 17:30:15] ✅ git pull成功 +[2026-03-23 17:30:15] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:19] ✅ git pull成功 +[2026-03-23 17:30:19] ✅ git pull成功 +[2026-03-23 17:30:19] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:46] ✅ git pull成功 +[2026-03-23 17:30:46] ✅ git pull成功 +[2026-03-23 17:30:46] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:50] ✅ git pull成功 +[2026-03-23 17:30:50] ✅ git pull成功 +[2026-03-23 17:30:50] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:31:17] ⚠️ git pull失败，继续检查 +[2026-03-23 17:31:17] ⚠️ git pull失败，继续检查 +[2026-03-23 17:31:17] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:21] ✅ git pull成功 +[2026-03-23 17:31:21] ✅ git pull成功 +[2026-03-23 17:31:21] guanyu 无新任务 diff --git a/jiangwei_monitor.log b/jiangwei_monitor.log index 5b8b1125a..18c55d213 100644 --- a/jiangwei_monitor.log +++ b/jiangwei_monitor.log @@ -1835,3 +1835,193 @@ hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. [2026-03-23 16:08:51] ⚠️ git pull失败，继续检查 [2026-03-23 16:08:51] jiangwei 无新任务 +========================================= +========================================= +Agent监控启动 - jiangwei +Agent监控启动 - jiangwei +启动时间: 2026-03-23 17:25:09 +启动时间: 2026-03-23 17:25:09 +监控目录: management/agents/jiangwei +监控目录: management/agents/jiangwei +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 jiangwei Agent监控器启动 +📊 监控目录: management/agents/jiangwei +📝 日志文件: jiangwei_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:09] ✅ git pull成功 +[2026-03-23 17:25:09] ✅ git pull成功 +[2026-03-23 17:25:09] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:40] ✅ git pull成功 +[2026-03-23 17:25:40] ✅ git pull成功 +[2026-03-23 17:25:40] jiangwei 无新任务 +========================================= +========================================= +Agent监控启动 - jiangwei +Agent监控启动 - jiangwei +启动时间: 2026-03-23 17:25:45 +启动时间: 2026-03-23 17:25:45 +监控目录: management/agents/jiangwei +监控目录: management/agents/jiangwei +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 jiangwei Agent监控器启动 +📊 监控目录: management/agents/jiangwei +📝 日志文件: jiangwei_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:45] ✅ git pull成功 +[2026-03-23 17:25:45] ✅ git pull成功 +[2026-03-23 17:25:45] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:11] ✅ git pull成功 +[2026-03-23 17:26:11] ✅ git pull成功 +[2026-03-23 17:26:11] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:16] ✅ git pull成功 +[2026-03-23 17:26:16] ✅ git pull成功 +[2026-03-23 17:26:16] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:42] ✅ git pull成功 +[2026-03-23 17:26:42] ✅ git pull成功 +[2026-03-23 17:26:42] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:47] ✅ git pull成功 +[2026-03-23 17:26:47] ✅ git pull成功 +[2026-03-23 17:26:47] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:12] ✅ git pull成功 +[2026-03-23 17:27:12] ✅ git pull成功 +[2026-03-23 17:27:12] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:17] ✅ git pull成功 +[2026-03-23 17:27:17] ✅ git pull成功 +[2026-03-23 17:27:17] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:43] ✅ git pull成功 +[2026-03-23 17:27:43] ✅ git pull成功 +[2026-03-23 17:27:43] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:48] ✅ git pull成功 +[2026-03-23 17:27:48] ✅ git pull成功 +[2026-03-23 17:27:48] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:14] ✅ git pull成功 +[2026-03-23 17:28:14] ✅ git pull成功 +[2026-03-23 17:28:14] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:19] ✅ git pull成功 +[2026-03-23 17:28:19] ✅ git pull成功 +[2026-03-23 17:28:19] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:45] ✅ git pull成功 +[2026-03-23 17:28:45] ✅ git pull成功 +[2026-03-23 17:28:45] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:50] ✅ git pull成功 +[2026-03-23 17:28:50] ✅ git pull成功 +[2026-03-23 17:28:50] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:16] ✅ git pull成功 +[2026-03-23 17:29:16] ✅ git pull成功 +[2026-03-23 17:29:16] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:21] ✅ git pull成功 +[2026-03-23 17:29:21] ✅ git pull成功 +[2026-03-23 17:29:21] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:47] ✅ git pull成功 +[2026-03-23 17:29:47] ✅ git pull成功 +[2026-03-23 17:29:47] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:52] ✅ git pull成功 +[2026-03-23 17:29:52] ✅ git pull成功 +[2026-03-23 17:29:52] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:30:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:18] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:23] ✅ git pull成功 +[2026-03-23 17:30:23] ✅ git pull成功 +[2026-03-23 17:30:23] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:49] ✅ git pull成功 +[2026-03-23 17:30:49] ✅ git pull成功 +[2026-03-23 17:30:49] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:54] ✅ git pull成功 +[2026-03-23 17:30:54] ✅ git pull成功 +[2026-03-23 17:30:54] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:20] ✅ git pull成功 +[2026-03-23 17:31:20] ✅ git pull成功 +[2026-03-23 17:31:20] jiangwei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:25] ✅ git pull成功 +[2026-03-23 17:31:25] ✅ git pull成功 +[2026-03-23 17:31:25] jiangwei 无新任务 diff --git a/management/workflow/scripts/agent_monitor_fixed.sh b/management/workflow/scripts/agent_monitor_fixed.sh index 8e9f11658..c4fa90f40 100755 --- a/management/workflow/scripts/agent_monitor_fixed.sh +++ b/management/workflow/scripts/agent_monitor_fixed.sh @@ -96,7 +96,7 @@ while true; do # 自动推送完成结果 # 添加.done文件和已删除的.task文件 - git add "$DONE_FILE" "$TASK_FILE" >> "$LOG_FILE" 2>&1 + git add "$DONE_FILE" >> "$LOG_FILE" 2>&1 UNCOMMITTED=$(git status --porcelain | grep -E "($DONE_FILE|$TASK_FILE)" || true) if [ -n "$UNCOMMITTED" ]; then log_info "[$TIMESTAMP] 📤 正在推送完成结果..." diff --git a/management/workflow/scripts/assign_simple.sh b/management/workflow/scripts/assign_simple.sh index 1fc8e754d..32c9b3879 100755 --- a/management/workflow/scripts/assign_simple.sh +++ b/management/workflow/scripts/assign_simple.sh @@ -1,5 +1,5 @@ #!/bin/bash -# 极简分配脚本 - 彻底修复，简单直接方案 +# 极简分配脚本 - 带git容错处理 if [ $# -lt 2 ]; then echo "使用方法: ./assign_simple.sh <任务ID> <负责人>" @@ -14,6 +14,12 @@ PENDING_FILE="management/tasks/pending/${TASK_ID}.md" ASSIGNED_FILE="management/tasks/assigned/${TASK_ID}.md" AGENT_FILE="management/agents/${AGENT}/${TASK_ID}.task" +# 检查任务文件是否存在 +if [ ! -f "$PENDING_FILE" ]; then + echo "❌ 错误：任务文件不存在 $PENDING_FILE" + exit 1 +fi + # 确保Agent目录存在 mkdir -p "management/agents/${AGENT}" mkdir -p management/tasks/assigned @@ -28,13 +34,28 @@ sed -i '' "s/# 负责人:.*/# 负责人: $AGENT/" "$ASSIGNED_FILE" # 创建.task文件通知Agent cp "$PENDING_FILE" "$AGENT_FILE" -# 简单直接处理：pull，add，commit，push -git pull --rebase origin main > /dev/null 2>&1 -git add "$PENDING_FILE" "$ASSIGNED_FILE" "$AGENT_FILE" > /dev/null 2>&1 -git commit -m "feat: 分配任务 $TASK_ID 给 $AGENT" > /dev/null 2>&1 -git push origin main > /dev/null 2>&1 +# Git处理，带容错 +echo "🔄 正在拉取最新代码..." +git pull --rebase origin main +if [ $? -ne 0 ]; then + echo "⚠️ git pull 失败，请先解决冲突后再试" + exit 1 +fi + +git add "$PENDING_FILE" "$ASSIGNED_FILE" "$AGENT_FILE" +git commit -m "feat: 分配任务 $TASK_ID 给 $AGENT" +if [ $? -ne 0 ]; then + echo "⚠️ git commit 失败" + exit 1 +fi + +git push origin main +if [ $? -ne 0 ]; then + echo "⚠️ git push 失败" + exit 1 +fi echo "✅ 任务已分配给 $AGENT" echo "📄 任务文件: $ASSIGNED_FILE" echo "📬 通知文件: $AGENT_FILE" -echo "🌐 已推送到 Gitee" \ No newline at end of file +echo "🌐 已推送到 Gitee" diff --git a/management/workflow/scripts/create_simple.sh b/management/workflow/scripts/create_simple.sh index 9d1836bb3..e2520a467 100755 --- a/management/workflow/scripts/create_simple.sh +++ b/management/workflow/scripts/create_simple.sh @@ -1,5 +1,5 @@ #!/bin/bash -# 创建新任务脚本 - 彻底修复，简单直接方案 +# 创建新任务脚本 - 带git容错处理 TASK_ID="TASK-$(date +%Y%m%d%H%M%S)" TASK_FILE="management/tasks/pending/${TASK_ID}.md" @@ -12,11 +12,26 @@ echo "" >> "$TASK_FILE" echo "## 任务需求" >> "$TASK_FILE" echo "$1" >> "$TASK_FILE" -# 简单直接处理：pull，add，commit，push -git pull --rebase origin main > /dev/null 2>&1 -git add "$TASK_FILE" > /dev/null 2>&1 -git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1 -git push origin main > /dev/null 2>&1 +# Git处理，带容错 +echo "🔄 正在拉取最新代码..." +git pull --rebase origin main +if [ $? -ne 0 ]; then + echo "⚠️ git pull 失败，请先解决冲突后再试" + exit 1 +fi + +git add "$TASK_FILE" +git commit -m "feat: 创建新任务 $TASK_ID" +if [ $? -ne 0 ]; then + echo "⚠️ git commit 失败" + exit 1 +fi + +git push origin main +if [ $? -ne 0 ]; then + echo "⚠️ git push 失败" + exit 1 +fi echo "✅ 任务创建成功: $TASK_ID" echo "📄 文件: $TASK_FILE" diff --git a/pangtong_monitor.log b/pangtong_monitor.log index 91d5cd301..44c59d339 100644 --- a/pangtong_monitor.log +++ b/pangtong_monitor.log @@ -3137,3 +3137,214 @@ hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. [2026-03-23 16:08:47] ⚠️ git pull失败，继续检查 [2026-03-23 16:08:47] pangtong 无新任务 +========================================= +========================================= +Agent监控启动 - pangtong +Agent监控启动 - pangtong +启动时间: 2026-03-23 17:25:03 +启动时间: 2026-03-23 17:25:03 +监控目录: management/agents/pangtong +监控目录: management/agents/pangtong +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 pangtong Agent监控器启动 +📊 监控目录: management/agents/pangtong +📝 日志文件: pangtong_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD + 20f8995..d8e6529 main -> origin/main +Updating 20f8995..d8e6529 +Fast-forward + management/agents/jiangwei/TASK-20260323171415.task | 6 ------ + 1 file changed, 6 deletions(-) + delete mode 100644 management/agents/jiangwei/TASK-20260323171415.task +[2026-03-23 17:25:03] ✅ git pull成功 +[2026-03-23 17:25:03] ✅ git pull成功 +[2026-03-23 17:25:03] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:34] ✅ git pull成功 +[2026-03-23 17:25:34] ✅ git pull成功 +[2026-03-23 17:25:34] pangtong 无新任务 +========================================= +========================================= +Agent监控启动 - pangtong +Agent监控启动 - pangtong +启动时间: 2026-03-23 17:25:39 +启动时间: 2026-03-23 17:25:39 +监控目录: management/agents/pangtong +监控目录: management/agents/pangtong +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 pangtong Agent监控器启动 +📊 监控目录: management/agents/pangtong +📝 日志文件: pangtong_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:25:39] ⚠️ git pull失败，继续检查 +[2026-03-23 17:25:39] ⚠️ git pull失败，继续检查 +[2026-03-23 17:25:39] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:05] ✅ git pull成功 +[2026-03-23 17:26:05] ✅ git pull成功 +[2026-03-23 17:26:05] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:10] ✅ git pull成功 +[2026-03-23 17:26:10] ✅ git pull成功 +[2026-03-23 17:26:10] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:26:36] ⚠️ git pull失败，继续检查 +[2026-03-23 17:26:36] ⚠️ git pull失败，继续检查 +[2026-03-23 17:26:36] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:26:41] ⚠️ git pull失败，继续检查 +[2026-03-23 17:26:41] ⚠️ git pull失败，继续检查 +[2026-03-23 17:26:41] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:07] ✅ git pull成功 +[2026-03-23 17:27:07] ✅ git pull成功 +[2026-03-23 17:27:07] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:27:12] ⚠️ git pull失败，继续检查 +[2026-03-23 17:27:12] ⚠️ git pull失败，继续检查 +[2026-03-23 17:27:12] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:38] ✅ git pull成功 +[2026-03-23 17:27:38] ✅ git pull成功 +[2026-03-23 17:27:38] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:43] ✅ git pull成功 +[2026-03-23 17:27:43] ✅ git pull成功 +[2026-03-23 17:27:43] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:28:09] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:09] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:09] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:14] ✅ git pull成功 +[2026-03-23 17:28:14] ✅ git pull成功 +[2026-03-23 17:28:14] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:28:40] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:40] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:40] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:45] ✅ git pull成功 +[2026-03-23 17:28:45] ✅ git pull成功 +[2026-03-23 17:28:45] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:11] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:11] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:11] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:16] ✅ git pull成功 +[2026-03-23 17:29:16] ✅ git pull成功 +[2026-03-23 17:29:16] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:42] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:42] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:42] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:46] ✅ git pull成功 +[2026-03-23 17:29:46] ✅ git pull成功 +[2026-03-23 17:29:46] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:30:13] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:13] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:13] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:17] ✅ git pull成功 +[2026-03-23 17:30:17] ✅ git pull成功 +[2026-03-23 17:30:17] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:43] ✅ git pull成功 +[2026-03-23 17:30:43] ✅ git pull成功 +[2026-03-23 17:30:43] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:48] ✅ git pull成功 +[2026-03-23 17:30:48] ✅ git pull成功 +[2026-03-23 17:30:48] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:15] ✅ git pull成功 +[2026-03-23 17:31:15] ✅ git pull成功 +[2026-03-23 17:31:15] pangtong 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:19] ✅ git pull成功 +[2026-03-23 17:31:19] ✅ git pull成功 +[2026-03-23 17:31:19] pangtong 无新任务 diff --git a/simayi_monitor.log b/simayi_monitor.log index 847067e8e..f7130efa7 100644 --- a/simayi_monitor.log +++ b/simayi_monitor.log @@ -1198,3 +1198,197 @@ hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. [2026-03-23 16:08:40] ⚠️ git pull失败，继续检查 [2026-03-23 16:08:40] simayi 无新任务 +========================================= +========================================= +Agent监控启动 - simayi +Agent监控启动 - simayi +启动时间: 2026-03-23 17:25:08 +启动时间: 2026-03-23 17:25:08 +监控目录: management/agents/simayi +监控目录: management/agents/simayi +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 simayi Agent监控器启动 +📊 监控目录: management/agents/simayi +📝 日志文件: simayi_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:08] ✅ git pull成功 +[2026-03-23 17:25:08] ✅ git pull成功 +[2026-03-23 17:25:08] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:39] ✅ git pull成功 +[2026-03-23 17:25:39] ✅ git pull成功 +[2026-03-23 17:25:39] simayi 无新任务 +========================================= +========================================= +Agent监控启动 - simayi +Agent监控启动 - simayi +启动时间: 2026-03-23 17:25:44 +启动时间: 2026-03-23 17:25:44 +监控目录: management/agents/simayi +监控目录: management/agents/simayi +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 simayi Agent监控器启动 +📊 监控目录: management/agents/simayi +📝 日志文件: simayi_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:44] ✅ git pull成功 +[2026-03-23 17:25:44] ✅ git pull成功 +[2026-03-23 17:25:44] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:09] ✅ git pull成功 +[2026-03-23 17:26:09] ✅ git pull成功 +[2026-03-23 17:26:09] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:15] ✅ git pull成功 +[2026-03-23 17:26:15] ✅ git pull成功 +[2026-03-23 17:26:15] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:40] ✅ git pull成功 +[2026-03-23 17:26:40] ✅ git pull成功 +[2026-03-23 17:26:40] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:46] ✅ git pull成功 +[2026-03-23 17:26:46] ✅ git pull成功 +[2026-03-23 17:26:46] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:11] ✅ git pull成功 +[2026-03-23 17:27:11] ✅ git pull成功 +[2026-03-23 17:27:11] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:16] ✅ git pull成功 +[2026-03-23 17:27:16] ✅ git pull成功 +[2026-03-23 17:27:16] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:42] ✅ git pull成功 +[2026-03-23 17:27:42] ✅ git pull成功 +[2026-03-23 17:27:42] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:47] ✅ git pull成功 +[2026-03-23 17:27:47] ✅ git pull成功 +[2026-03-23 17:27:47] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:13] ✅ git pull成功 +[2026-03-23 17:28:13] ✅ git pull成功 +[2026-03-23 17:28:13] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:28:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:28:18] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:44] ✅ git pull成功 +[2026-03-23 17:28:44] ✅ git pull成功 +[2026-03-23 17:28:44] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:49] ✅ git pull成功 +[2026-03-23 17:28:49] ✅ git pull成功 +[2026-03-23 17:28:49] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:15] ✅ git pull成功 +[2026-03-23 17:29:15] ✅ git pull成功 +[2026-03-23 17:29:15] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:20] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:20] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:20] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:46] ✅ git pull成功 +[2026-03-23 17:29:46] ✅ git pull成功 +[2026-03-23 17:29:46] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:51] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:51] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:51] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:17] ✅ git pull成功 +[2026-03-23 17:30:17] ✅ git pull成功 +[2026-03-23 17:30:17] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:22] ✅ git pull成功 +[2026-03-23 17:30:22] ✅ git pull成功 +[2026-03-23 17:30:22] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:48] ✅ git pull成功 +[2026-03-23 17:30:48] ✅ git pull成功 +[2026-03-23 17:30:48] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:53] ✅ git pull成功 +[2026-03-23 17:30:53] ✅ git pull成功 +[2026-03-23 17:30:53] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:19] ✅ git pull成功 +[2026-03-23 17:31:19] ✅ git pull成功 +[2026-03-23 17:31:19] simayi 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:24] ✅ git pull成功 +[2026-03-23 17:31:24] ✅ git pull成功 +[2026-03-23 17:31:24] simayi 无新任务 diff --git a/start_all_agents.sh b/start_all_agents.sh index b4aeb4e86..0a3d7d08e 100755 --- a/start_all_agents.sh +++ b/start_all_agents.sh @@ -36,20 +36,20 @@ for agent in $AGENTS; do echo -n "🔄 正在启动 $agent... " # 检查是否已经运行 - if ps aux | grep -q "agent_monitor_fixed.sh $agent" | grep -v grep; then + if ps aux | grep "agent_monitor_fixed.sh $agent" | grep -v grep | grep -q .; then echo -e "${YELLOW}⚠️ $agent 已经在运行，跳过${NC}" STARTED=$((STARTED + 1)) continue fi # 启动Agent - nohup ./management/workflow/scripts/agent_monitor_fixed.sh "$agent" > "${agent}_monitor.log 2>&1 & + nohup ./management/workflow/scripts/agent_monitor_fixed.sh "$agent" >> "${agent}_monitor.log" 2>&1 & # 等待一下 sleep 1 # 检查是否启动成功 - if ps aux | grep -q "agent_monitor_fixed.sh $agent" | grep -v grep; then + if ps aux | grep "agent_monitor_fixed.sh $agent" | grep -v grep | grep -q .; then echo -e "${GREEN}✅ $agent 启动成功${NC}" STARTED=$((STARTED + 1)) else diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index 6fc3d9f8d..3b9b3485d 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -2718,3 +2718,237 @@ From gitee.com:cfdaily/sanguo_quant_live Already up to date. [2026-03-23 17:20:27] ✅ git pull成功 [2026-03-23 17:20:27] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:20:58] ✅ git pull成功 +[2026-03-23 17:20:58] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD + 87720dd..80c4965 main -> origin/main +Updating 87720dd..80c4965 +Fast-forward + management/agents/jiangwei/TASK-20260323171415.task | 6 ------ + 1 file changed, 6 deletions(-) + delete mode 100644 management/agents/jiangwei/TASK-20260323171415.task +[2026-03-23 17:21:29] ✅ git pull成功 +[2026-03-23 17:21:29] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:22:00] ✅ git pull成功 +[2026-03-23 17:22:00] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:22:30] ✅ git pull成功 +[2026-03-23 17:22:30] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:23:01] ✅ git pull成功 +[2026-03-23 17:23:01] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:23:32] ✅ git pull成功 +[2026-03-23 17:23:32] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:24:03] ✅ git pull成功 +[2026-03-23 17:24:03] zhangfei 无新任务 +========================================= +========================================= +Agent监控启动 - zhangfei +Agent监控启动 - zhangfei +启动时间: 2026-03-23 17:25:04 +启动时间: 2026-03-23 17:25:04 +监控目录: management/agents/zhangfei +监控目录: management/agents/zhangfei +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 zhangfei Agent监控器启动 +📊 监控目录: management/agents/zhangfei +📝 日志文件: zhangfei_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:04] ✅ git pull成功 +[2026-03-23 17:25:04] ✅ git pull成功 +[2026-03-23 17:25:04] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:35] ✅ git pull成功 +[2026-03-23 17:25:35] ✅ git pull成功 +[2026-03-23 17:25:35] zhangfei 无新任务 +========================================= +========================================= +Agent监控启动 - zhangfei +Agent监控启动 - zhangfei +启动时间: 2026-03-23 17:25:40 +启动时间: 2026-03-23 17:25:40 +监控目录: management/agents/zhangfei +监控目录: management/agents/zhangfei +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 zhangfei Agent监控器启动 +📊 监控目录: management/agents/zhangfei +📝 日志文件: zhangfei_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:40] ✅ git pull成功 +[2026-03-23 17:25:40] ✅ git pull成功 +[2026-03-23 17:25:40] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:06] ✅ git pull成功 +[2026-03-23 17:26:06] ✅ git pull成功 +[2026-03-23 17:26:06] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:11] ✅ git pull成功 +[2026-03-23 17:26:11] ✅ git pull成功 +[2026-03-23 17:26:11] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:37] ✅ git pull成功 +[2026-03-23 17:26:37] ✅ git pull成功 +[2026-03-23 17:26:37] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:42] ✅ git pull成功 +[2026-03-23 17:26:42] ✅ git pull成功 +[2026-03-23 17:26:42] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:08] ✅ git pull成功 +[2026-03-23 17:27:08] ✅ git pull成功 +[2026-03-23 17:27:08] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:13] ✅ git pull成功 +[2026-03-23 17:27:13] ✅ git pull成功 +[2026-03-23 17:27:13] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:39] ✅ git pull成功 +[2026-03-23 17:27:39] ✅ git pull成功 +[2026-03-23 17:27:39] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:44] ✅ git pull成功 +[2026-03-23 17:27:44] ✅ git pull成功 +[2026-03-23 17:27:44] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:10] ✅ git pull成功 +[2026-03-23 17:28:10] ✅ git pull成功 +[2026-03-23 17:28:10] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:15] ✅ git pull成功 +[2026-03-23 17:28:15] ✅ git pull成功 +[2026-03-23 17:28:15] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:41] ✅ git pull成功 +[2026-03-23 17:28:41] ✅ git pull成功 +[2026-03-23 17:28:41] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:46] ✅ git pull成功 +[2026-03-23 17:28:46] ✅ git pull成功 +[2026-03-23 17:28:46] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:12] ✅ git pull成功 +[2026-03-23 17:29:12] ✅ git pull成功 +[2026-03-23 17:29:12] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:17] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:17] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:17] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:42] ✅ git pull成功 +[2026-03-23 17:29:42] ✅ git pull成功 +[2026-03-23 17:29:42] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:29:48] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:48] ⚠️ git pull失败，继续检查 +[2026-03-23 17:29:48] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:13] ✅ git pull成功 +[2026-03-23 17:30:13] ✅ git pull成功 +[2026-03-23 17:30:13] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +There are no candidates for merging among the refs that you just fetched. +Generally this means that you provided a wildcard refspec which had no +matches on the remote end. +[2026-03-23 17:30:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:18] ⚠️ git pull失败，继续检查 +[2026-03-23 17:30:18] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:44] ✅ git pull成功 +[2026-03-23 17:30:44] ✅ git pull成功 +[2026-03-23 17:30:44] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:49] ✅ git pull成功 +[2026-03-23 17:30:49] ✅ git pull成功 +[2026-03-23 17:30:49] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:15] ✅ git pull成功 +[2026-03-23 17:31:15] ✅ git pull成功 +[2026-03-23 17:31:15] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:20] ✅ git pull成功 +[2026-03-23 17:31:20] ✅ git pull成功 +[2026-03-23 17:31:20] zhangfei 无新任务 diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log index 05a921117..edc9dbe4e 100644 --- a/zhaoyun_monitor.log +++ b/zhaoyun_monitor.log @@ -2626,3 +2626,191 @@ hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. [2026-03-23 16:08:38] ⚠️ git pull失败，继续检查 [2026-03-23 16:08:38] zhaoyun 无新任务 +========================================= +========================================= +Agent监控启动 - zhaoyun +Agent监控启动 - zhaoyun +启动时间: 2026-03-23 17:25:07 +启动时间: 2026-03-23 17:25:07 +监控目录: management/agents/zhaoyun +监控目录: management/agents/zhaoyun +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 zhaoyun Agent监控器启动 +📊 监控目录: management/agents/zhaoyun +📝 日志文件: zhaoyun_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:07] ✅ git pull成功 +[2026-03-23 17:25:07] ✅ git pull成功 +[2026-03-23 17:25:07] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:38] ✅ git pull成功 +[2026-03-23 17:25:38] ✅ git pull成功 +[2026-03-23 17:25:38] zhaoyun 无新任务 +========================================= +========================================= +Agent监控启动 - zhaoyun +Agent监控启动 - zhaoyun +启动时间: 2026-03-23 17:25:42 +启动时间: 2026-03-23 17:25:42 +监控目录: management/agents/zhaoyun +监控目录: management/agents/zhaoyun +检查间隔: 30秒 +检查间隔: 30秒 +自动git pull: 每次检查前自动拉取 +自动git pull: 每次检查前自动拉取 +========================================= +========================================= +🚀 zhaoyun Agent监控器启动 +📊 监控目录: management/agents/zhaoyun +📝 日志文件: zhaoyun_monitor.log +⏰ 检查间隔: 30秒 +🔄 自动git pull: 每次检查前自动拉取 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:25:42] ✅ git pull成功 +[2026-03-23 17:25:42] ✅ git pull成功 +[2026-03-23 17:25:42] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:08] ✅ git pull成功 +[2026-03-23 17:26:08] ✅ git pull成功 +[2026-03-23 17:26:08] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:13] ✅ git pull成功 +[2026-03-23 17:26:13] ✅ git pull成功 +[2026-03-23 17:26:13] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:39] ✅ git pull成功 +[2026-03-23 17:26:39] ✅ git pull成功 +[2026-03-23 17:26:39] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:26:44] ✅ git pull成功 +[2026-03-23 17:26:44] ✅ git pull成功 +[2026-03-23 17:26:44] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:10] ✅ git pull成功 +[2026-03-23 17:27:10] ✅ git pull成功 +[2026-03-23 17:27:10] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:15] ✅ git pull成功 +[2026-03-23 17:27:15] ✅ git pull成功 +[2026-03-23 17:27:15] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:41] ✅ git pull成功 +[2026-03-23 17:27:41] ✅ git pull成功 +[2026-03-23 17:27:41] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:27:46] ✅ git pull成功 +[2026-03-23 17:27:46] ✅ git pull成功 +[2026-03-23 17:27:46] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:12] ✅ git pull成功 +[2026-03-23 17:28:12] ✅ git pull成功 +[2026-03-23 17:28:12] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:17] ✅ git pull成功 +[2026-03-23 17:28:17] ✅ git pull成功 +[2026-03-23 17:28:17] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:43] ✅ git pull成功 +[2026-03-23 17:28:43] ✅ git pull成功 +[2026-03-23 17:28:43] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:28:48] ✅ git pull成功 +[2026-03-23 17:28:48] ✅ git pull成功 +[2026-03-23 17:28:48] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:14] ✅ git pull成功 +[2026-03-23 17:29:14] ✅ git pull成功 +[2026-03-23 17:29:14] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:19] ✅ git pull成功 +[2026-03-23 17:29:19] ✅ git pull成功 +[2026-03-23 17:29:19] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:45] ✅ git pull成功 +[2026-03-23 17:29:45] ✅ git pull成功 +[2026-03-23 17:29:45] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:29:50] ✅ git pull成功 +[2026-03-23 17:29:50] ✅ git pull成功 +[2026-03-23 17:29:50] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:16] ✅ git pull成功 +[2026-03-23 17:30:16] ✅ git pull成功 +[2026-03-23 17:30:16] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:21] ✅ git pull成功 +[2026-03-23 17:30:21] ✅ git pull成功 +[2026-03-23 17:30:21] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:46] ✅ git pull成功 +[2026-03-23 17:30:46] ✅ git pull成功 +[2026-03-23 17:30:46] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:30:51] ✅ git pull成功 +[2026-03-23 17:30:51] ✅ git pull成功 +[2026-03-23 17:30:51] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:17] ✅ git pull成功 +[2026-03-23 17:31:17] ✅ git pull成功 +[2026-03-23 17:31:17] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 17:31:22] ✅ git pull成功 +[2026-03-23 17:31:22] ✅ git pull成功 +[2026-03-23 17:31:22] zhaoyun 无新任务