sanguo/sanguo_quant_live
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: accept remote fixes

Browse Source
This commit is contained in:
cfdaily
2026-03-23 15:10:23 +08:00
parent add8c709eb
commit 99f1bdf0c2
23 changed files with 5312 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+715
View File
@@ -119,3 +119,718 @@ From gitee.com:cfdaily/sanguo_quant_live
Already up to date.
[2026-03-23 14:02:56] ✅ git pull成功
[2026-03-23 14:02:56] zhangfei 无新任务
=========================================
=========================================
Agent监控启动 - zhangfei
Agent监控启动 - zhangfei
启动时间: 2026-03-23 14:22:16
启动时间: 2026-03-23 14:22:16
监控目录: 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 14:22:16] ✅ git pull成功
[2026-03-23 14:22:16] ✅ git pull成功
[2026-03-23 14:22:16] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:22:47] ✅ git pull成功
[2026-03-23 14:22:47] ✅ git pull成功
[2026-03-23 14:22:47] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:23:18] ✅ git pull成功
[2026-03-23 14:23:18] ✅ git pull成功
[2026-03-23 14:23:18] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:23:49] ✅ git pull成功
[2026-03-23 14:23:49] ✅ git pull成功
[2026-03-23 14:23:49] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:24:20] ✅ git pull成功
[2026-03-23 14:24:20] ✅ git pull成功
[2026-03-23 14:24:20] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:24:51] ✅ git pull成功
[2026-03-23 14:24:51] ✅ git pull成功
[2026-03-23 14:24:51] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
4dcd0aa..670b4d2 main -> origin/main
Updating 4dcd0aa..670b4d2
Fast-forward
management/agents/zhaoyun/TASK-20260323142455.task | 13 +++++++++++++
management/tasks/assigned/TASK-20260323142455.md | 13 +++++++++++++
management/tasks/pending/TASK-20260323142455.md | 13 +++++++++++++
3 files changed, 39 insertions(+)
create mode 100644 management/agents/zhaoyun/TASK-20260323142455.task
create mode 100644 management/tasks/assigned/TASK-20260323142455.md
create mode 100644 management/tasks/pending/TASK-20260323142455.md
[2026-03-23 14:25:22] ✅ git pull成功
[2026-03-23 14:25:22] ✅ git pull成功
[2026-03-23 14:25:22] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:25:53] ✅ git pull成功
[2026-03-23 14:25:53] ✅ git pull成功
[2026-03-23 14:25:53] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:26:23] ✅ git pull成功
[2026-03-23 14:26:23] ✅ git pull成功
[2026-03-23 14:26:23] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:26:54] ✅ git pull成功
[2026-03-23 14:26:54] ✅ git pull成功
[2026-03-23 14:26:54] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:27:25] ✅ git pull成功
[2026-03-23 14:27:25] ✅ git pull成功
[2026-03-23 14:27:25] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:27:56] ✅ git pull成功
[2026-03-23 14:27:56] ✅ git pull成功
[2026-03-23 14:27:56] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:28:27] ✅ git pull成功
[2026-03-23 14:28:27] ✅ git pull成功
[2026-03-23 14:28:27] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:28:58] ✅ git pull成功
[2026-03-23 14:28:58] ✅ git pull成功
[2026-03-23 14:28:58] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:29:29] ✅ git pull成功
[2026-03-23 14:29:29] ✅ git pull成功
[2026-03-23 14:29:29] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:30:00] ✅ git pull成功
[2026-03-23 14:30:00] ✅ git pull成功
[2026-03-23 14:30:00] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:30:31] ✅ git pull成功
[2026-03-23 14:30:31] ✅ git pull成功
[2026-03-23 14:30:31] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:31:02] ✅ git pull成功
[2026-03-23 14:31:02] ✅ git pull成功
[2026-03-23 14:31:02] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:31:33] ✅ git pull成功
[2026-03-23 14:31:33] ✅ git pull成功
[2026-03-23 14:31:33] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:32:04] ✅ git pull成功
[2026-03-23 14:32:04] ✅ git pull成功
[2026-03-23 14:32:04] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:32:35] ✅ git pull成功
[2026-03-23 14:32:35] ✅ git pull成功
[2026-03-23 14:32:35] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:33:06] ✅ git pull成功
[2026-03-23 14:33:06] ✅ git pull成功
[2026-03-23 14:33:06] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:33:37] ✅ git pull成功
[2026-03-23 14:33:37] ✅ git pull成功
[2026-03-23 14:33:37] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:34:07] ✅ git pull成功
[2026-03-23 14:34:07] ✅ git pull成功
[2026-03-23 14:34:07] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:34:38] ✅ git pull成功
[2026-03-23 14:34:38] ✅ git pull成功
[2026-03-23 14:34:38] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:35:09] ✅ git pull成功
[2026-03-23 14:35:09] ✅ git pull成功
[2026-03-23 14:35:09] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:35:40] ✅ git pull成功
[2026-03-23 14:35:40] ✅ git pull成功
[2026-03-23 14:35:40] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:36:11] ✅ git pull成功
[2026-03-23 14:36:11] ✅ git pull成功
[2026-03-23 14:36:11] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:36:42] ✅ git pull成功
[2026-03-23 14:36:42] ✅ git pull成功
[2026-03-23 14:36:42] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:37:13] ✅ git pull成功
[2026-03-23 14:37:13] ✅ git pull成功
[2026-03-23 14:37:13] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:37:44] ✅ git pull成功
[2026-03-23 14:37:44] ✅ git pull成功
[2026-03-23 14:37:44] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:38:15] ✅ git pull成功
[2026-03-23 14:38:15] ✅ git pull成功
[2026-03-23 14:38:15] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:38:46] ✅ git pull成功
[2026-03-23 14:38:46] ✅ git pull成功
[2026-03-23 14:38:46] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:39:17] ✅ git pull成功
[2026-03-23 14:39:17] ✅ git pull成功
[2026-03-23 14:39:17] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:39:47] ✅ git pull成功
[2026-03-23 14:39:47] ✅ git pull成功
[2026-03-23 14:39:47] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:40:18] ✅ git pull成功
[2026-03-23 14:40:18] ✅ git pull成功
[2026-03-23 14:40:18] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:40:49] ✅ git pull成功
[2026-03-23 14:40:49] ✅ git pull成功
[2026-03-23 14:40:49] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:41:20] ✅ git pull成功
[2026-03-23 14:41:20] ✅ git pull成功
[2026-03-23 14:41:20] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:41:51] ✅ git pull成功
[2026-03-23 14:41:51] ✅ git pull成功
[2026-03-23 14:41:51] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:42:22] ✅ git pull成功
[2026-03-23 14:42:22] ✅ git pull成功
[2026-03-23 14:42:22] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:42:53] ✅ git pull成功
[2026-03-23 14:42:53] ✅ git pull成功
[2026-03-23 14:42:53] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:43:24] ✅ git pull成功
[2026-03-23 14:43:24] ✅ git pull成功
[2026-03-23 14:43:24] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:43:55] ✅ git pull成功
[2026-03-23 14:43:55] ✅ git pull成功
[2026-03-23 14:43:55] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:44:26] ✅ git pull成功
[2026-03-23 14:44:26] ✅ git pull成功
[2026-03-23 14:44:26] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:44:57] ✅ git pull成功
[2026-03-23 14:44:57] ✅ git pull成功
[2026-03-23 14:44:57] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:45:28] ✅ git pull成功
[2026-03-23 14:45:28] ✅ git pull成功
[2026-03-23 14:45:28] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:45:59] ✅ git pull成功
[2026-03-23 14:45:59] ✅ git pull成功
[2026-03-23 14:45:59] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:46:29] ✅ git pull成功
[2026-03-23 14:46:29] ✅ git pull成功
[2026-03-23 14:46:29] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:47:00] ✅ git pull成功
[2026-03-23 14:47:00] ✅ git pull成功
[2026-03-23 14:47:00] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:47:31] ✅ git pull成功
[2026-03-23 14:47:31] ✅ git pull成功
[2026-03-23 14:47:31] zhangfei 无新任务
=========================================
=========================================
Agent监控启动 - zhangfei
Agent监控启动 - zhangfei
启动时间: 2026-03-23 14:47:53
启动时间: 2026-03-23 14:47:53
监控目录: 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 14:47:53] ✅ git pull成功
[2026-03-23 14:47:53] ✅ git pull成功
[2026-03-23 14:47:53] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:48:24] ✅ git pull成功
[2026-03-23 14:48:24] ✅ git pull成功
[2026-03-23 14:48:24] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:48:55] ✅ git pull成功
[2026-03-23 14:48:55] ✅ git pull成功
[2026-03-23 14:48:55] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:49:26] ✅ git pull成功
[2026-03-23 14:49:26] ✅ git pull成功
[2026-03-23 14:49:26] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:49:57] ✅ git pull成功
[2026-03-23 14:49:57] ✅ git pull成功
[2026-03-23 14:49:57] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:50:28] ✅ git pull成功
[2026-03-23 14:50:28] ✅ git pull成功
[2026-03-23 14:50:28] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:50:59] ✅ git pull成功
[2026-03-23 14:50:59] ✅ git pull成功
[2026-03-23 14:50:59] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:51:30] ✅ git pull成功
[2026-03-23 14:51:30] ✅ git pull成功
[2026-03-23 14:51:30] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:52:00] ✅ git pull成功
[2026-03-23 14:52:00] ✅ git pull成功
[2026-03-23 14:52:00] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:52:31] ✅ git pull成功
[2026-03-23 14:52:31] ✅ git pull成功
[2026-03-23 14:52:31] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:53:02] ✅ git pull成功
[2026-03-23 14:53:02] ✅ git pull成功
[2026-03-23 14:53:02] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:53:33] ✅ git pull成功
[2026-03-23 14:53:33] ✅ git pull成功
[2026-03-23 14:53:33] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:54:04] ✅ git pull成功
[2026-03-23 14:54:04] ✅ git pull成功
[2026-03-23 14:54:04] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:54:35] ✅ git pull成功
[2026-03-23 14:54:35] ✅ git pull成功
[2026-03-23 14:54:35] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:55:06] ✅ git pull成功
[2026-03-23 14:55:06] ✅ git pull成功
[2026-03-23 14:55:06] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:55:37] ✅ git pull成功
[2026-03-23 14:55:37] ✅ git pull成功
[2026-03-23 14:55:37] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:56:08] ✅ git pull成功
[2026-03-23 14:56:08] ✅ git pull成功
[2026-03-23 14:56:08] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 14:56:38] ✅ git pull成功
[2026-03-23 14:56:38] ✅ git pull成功
[2026-03-23 14:56:38] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:57:09] ⚠️ git pull失败，继续检查
[2026-03-23 14:57:09] ⚠️ git pull失败，继续检查
[2026-03-23 14:57:09] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:57:40] ⚠️ git pull失败，继续检查
[2026-03-23 14:57:40] ⚠️ git pull失败，继续检查
[2026-03-23 14:57:40] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:58:11] ⚠️ git pull失败，继续检查
[2026-03-23 14:58:11] ⚠️ git pull失败，继续检查
[2026-03-23 14:58:11] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:58:42] ⚠️ git pull失败，继续检查
[2026-03-23 14:58:42] ⚠️ git pull失败，继续检查
[2026-03-23 14:58:42] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:59:13] ⚠️ git pull失败，继续检查
[2026-03-23 14:59:13] ⚠️ git pull失败，继续检查
[2026-03-23 14:59:13] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 14:59:44] ⚠️ git pull失败，继续检查
[2026-03-23 14:59:44] ⚠️ git pull失败，继续检查
[2026-03-23 14:59:44] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:00:15] ⚠️ git pull失败，继续检查
[2026-03-23 15:00:15] ⚠️ git pull失败，继续检查
[2026-03-23 15:00:15] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:00:46] ⚠️ git pull失败，继续检查
[2026-03-23 15:00:46] ⚠️ git pull失败，继续检查
[2026-03-23 15:00:46] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:01:17] ⚠️ git pull失败，继续检查
[2026-03-23 15:01:17] ⚠️ git pull失败，继续检查
[2026-03-23 15:01:17] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:01:48] ⚠️ git pull失败，继续检查
[2026-03-23 15:01:48] ⚠️ git pull失败，继续检查
[2026-03-23 15:01:48] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:02:19] ⚠️ git pull失败，继续检查
[2026-03-23 15:02:19] ⚠️ git pull失败，继续检查
[2026-03-23 15:02:19] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:02:49] ⚠️ git pull失败，继续检查
[2026-03-23 15:02:49] ⚠️ git pull失败，继续检查
[2026-03-23 15:02:49] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:03:20] ⚠️ git pull失败，继续检查
[2026-03-23 15:03:20] ⚠️ git pull失败，继续检查
[2026-03-23 15:03:20] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:03:51] ⚠️ git pull失败，继续检查
[2026-03-23 15:03:51] ⚠️ git pull失败，继续检查
[2026-03-23 15:03:51] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:04:22] ⚠️ git pull失败，继续检查
[2026-03-23 15:04:22] ⚠️ git pull失败，继续检查
[2026-03-23 15:04:22] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:04:53] ⚠️ git pull失败，继续检查
[2026-03-23 15:04:53] ⚠️ git pull失败，继续检查
[2026-03-23 15:04:53] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:05:24] ⚠️ git pull失败，继续检查
[2026-03-23 15:05:24] ⚠️ git pull失败，继续检查
[2026-03-23 15:05:24] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:05:55] ⚠️ git pull失败，继续检查
[2026-03-23 15:05:55] ⚠️ git pull失败，继续检查
[2026-03-23 15:05:55] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:06:26] ⚠️ git pull失败，继续检查
[2026-03-23 15:06:26] ⚠️ git pull失败，继续检查
[2026-03-23 15:06:26] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:06:57] ⚠️ git pull失败，继续检查
[2026-03-23 15:06:57] ⚠️ git pull失败，继续检查
[2026-03-23 15:06:57] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:07:28] ⚠️ git pull失败，继续检查
[2026-03-23 15:07:28] ⚠️ git pull失败，继续检查
[2026-03-23 15:07:28] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:07:59] ⚠️ git pull失败，继续检查
[2026-03-23 15:07:59] ⚠️ git pull失败，继续检查
[2026-03-23 15:07:59] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:08:30] ⚠️ git pull失败，继续检查
[2026-03-23 15:08:30] ⚠️ git pull失败，继续检查
[2026-03-23 15:08:30] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:09:00] ⚠️ git pull失败，继续检查
[2026-03-23 15:09:00] ⚠️ git pull失败，继续检查
[2026-03-23 15:09:00] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:09:31] ⚠️ git pull失败，继续检查
[2026-03-23 15:09:31] ⚠️ git pull失败，继续检查
[2026-03-23 15:09:31] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
management/workflow/scripts/agent_monitor_fixed.sh
Please commit your changes or stash them before you merge.
Aborting
Updating 79f9058..add8c70
[2026-03-23 15:10:02] ⚠️ git pull失败，继续检查
[2026-03-23 15:10:02] ⚠️ git pull失败，继续检查
[2026-03-23 15:10:02] zhangfei 无新任务