diff --git a/guanyu_monitor.log b/guanyu_monitor.log index a0bb2b235..f6b18e94c 100644 --- a/guanyu_monitor.log +++ b/guanyu_monitor.log @@ -10330,3 +10330,46 @@ Already up to date. [2026-03-23 23:37:20] ✅ git pull成功 [2026-03-23 23:37:20] ✅ git pull成功 [2026-03-23 23:37:20] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:37:51] ✅ git pull成功 +[2026-03-23 23:37:51] ✅ git pull成功 +[2026-03-23 23:37:51] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +error: cannot lock ref 'refs/remotes/origin/main': is at af2a3236dbc9aa51d6ad7bcf64f7eec52f4645e1 but expected f038e43e6c68f19a21427a1e2ffd1ae1f77ba7e9 + ! f038e43e..af2a3236 main -> origin/main (unable to update local ref) +[2026-03-23 23:38:22] ⚠️ git pull失败，继续检查 +[2026-03-23 23:38:22] ⚠️ git pull失败，继续检查 +[2026-03-23 23:38:22] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:38:53] ✅ git pull成功 +[2026-03-23 23:38:53] ✅ git pull成功 +[2026-03-23 23:38:53] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:24] ✅ git pull成功 +[2026-03-23 23:39:24] ✅ git pull成功 +[2026-03-23 23:39:24] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:55] ✅ git pull成功 +[2026-03-23 23:39:55] ✅ git pull成功 +[2026-03-23 23:39:55] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:40:26] ✅ git pull成功 +[2026-03-23 23:40:26] ✅ git pull成功 +[2026-03-23 23:40:26] guanyu 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:40:57] ✅ git pull成功 +[2026-03-23 23:40:57] ✅ git pull成功 +[2026-03-23 23:40:57] guanyu 无新任务 diff --git a/management/tasks/pending/TASK-20260323234126.md b/management/tasks/pending/TASK-20260323234126.md new file mode 100644 index 000000000..f471da51e --- /dev/null +++ b/management/tasks/pending/TASK-20260323234126.md @@ -0,0 +1,7 @@ +# 任务ID: TASK-20260323234126 +# 状态: pending +# 负责人: +# 创建时间: Mon Mar 23 23:41:26 CST 2026 + +## 任务需求 +任务：删除 TASK-20260323180045.done TASK-20260323180045.result.md diff --git a/management/workflow/scripts/agent_monitor_fixed.sh b/management/workflow/scripts/agent_monitor_fixed.sh index c4fa90f40..25a093f4d 100755 --- a/management/workflow/scripts/agent_monitor_fixed.sh +++ b/management/workflow/scripts/agent_monitor_fixed.sh @@ -86,10 +86,27 @@ while true; do echo "" >> "$DONE_FILE" echo "✅ 监控自动发现任务成功，工作流正常" >> "$DONE_FILE" - # 完成任务后删除.task文件 + # 解析任务内容，提取要删除的文件（格式：文件名包含在内容中，一行一个） + # 删除当前.task文件 rm "$TASK_FILE" # 把删除也加入Git - git rm "$TASK_FILE" >> "$LOG_FILE" 2>&1 + git rm "$TASK_FILE" >> "$LOG_FILE" >&1 + + # 提取任务内容中所有要删除的文件（匹配 *.task, *.done, *.md） + DELETE_FILES=$(echo "$TASK_FULL_CONTENT" | grep -E '\s+[A-Za-z0-9_/.-]+\.(task|done|md)\s*' | xargs echo) + if [ -n "$DELETE_FILES" ]; then + log_info "[$TIMESTAMP] 🗑️ 需要删除 $DELETE_FILES" + for DEL_FILE in $DELETE_FILES; do + # trim whitespace + DEL_FILE=$(echo "$DEL_FILE" | xargs echo) + if [ -f "$DEL_FILE" ]; then + git rm "$DEL_FILE" >> "$LOG_FILE" 2>&1 + log_info "[$TIMESTAMP] ✅ 删除 $DEL_FILE" + else + log_info "[$TIMESTAMP] ⚠️ 文件不存在 $DEL_FILE，跳过" + fi + done + fi log_info "[$TIMESTAMP] ✅ $AGENT 完成任务: $TASK_ID" log_info "[$TIMESTAMP] 📝 完成标记已创建: $DONE_FILE" @@ -97,8 +114,12 @@ while true; do # 自动推送完成结果 # 添加.done文件和已删除的.task文件 git add "$DONE_FILE" >> "$LOG_FILE" 2>&1 - UNCOMMITTED=$(git status --porcelain | grep -E "($DONE_FILE|$TASK_FILE)" || true) - if [ -n "$UNCOMMITTED" ]; then + # 添加所有删除操作 + git add . >> "$LOG_FILE" 2>&1 + + # 检查有没有需要commit的 + NEED_COMMIT=$(git status --porcelain | wc -l) + if [ "$NEED_COMMIT" -gt 0 ]; then log_info "[$TIMESTAMP] 📤 正在推送完成结果..." git commit -m "auto: $AGENT 完成任务 $TASK_ID" >> "$LOG_FILE" 2>&1 # 先push，如果失败，pull rebase再试一次 @@ -115,6 +136,8 @@ while true; do else log_info "[$TIMESTAMP] ✅ 推送成功！任务 $TASK_ID 完全完成" fi + else + log_info "[$TIMESTAMP] ✅ 没有需要commit的变更，任务完成" fi done else diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index b17dc75ee..29608ce65 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -9060,3 +9060,45 @@ Already up to date. [2026-03-23 23:37:23] ✅ git pull成功 [2026-03-23 23:37:23] ✅ git pull成功 [2026-03-23 23:37:23] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:37:54] ✅ git pull成功 +[2026-03-23 23:37:54] ✅ git pull成功 +[2026-03-23 23:37:54] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:38:25] ✅ git pull成功 +[2026-03-23 23:38:25] ✅ git pull成功 +[2026-03-23 23:38:25] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:38:56] ✅ git pull成功 +[2026-03-23 23:38:56] ✅ git pull成功 +[2026-03-23 23:38:56] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:27] ✅ git pull成功 +[2026-03-23 23:39:27] ✅ git pull成功 +[2026-03-23 23:39:27] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:58] ✅ git pull成功 +[2026-03-23 23:39:58] ✅ git pull成功 +[2026-03-23 23:39:58] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:40:29] ✅ git pull成功 +[2026-03-23 23:40:29] ✅ git pull成功 +[2026-03-23 23:40:29] zhangfei 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:41:00] ✅ git pull成功 +[2026-03-23 23:41:00] ✅ git pull成功 +[2026-03-23 23:41:00] zhangfei 无新任务 diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log index 18f5e8dd3..3b43fc818 100644 --- a/zhaoyun_monitor.log +++ b/zhaoyun_monitor.log @@ -8897,3 +8897,52 @@ Already up to date. [2026-03-23 23:37:20] ✅ git pull成功 [2026-03-23 23:37:20] ✅ git pull成功 [2026-03-23 23:37:20] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:37:51] ✅ git pull成功 +[2026-03-23 23:37:51] ✅ git pull成功 +[2026-03-23 23:37:51] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD + f038e43e..af2a3236 main -> origin/main +Updating f038e43e..af2a3236 +Fast-forward + management/agents/pangtong/TASK-20260323233732.done | 16 ++++++++++++++++ + management/agents/pangtong/TASK-20260323233732.task | 7 ------- + 2 files changed, 16 insertions(+), 7 deletions(-) + create mode 100644 management/agents/pangtong/TASK-20260323233732.done + delete mode 100644 management/agents/pangtong/TASK-20260323233732.task +[2026-03-23 23:38:22] ✅ git pull成功 +[2026-03-23 23:38:22] ✅ git pull成功 +[2026-03-23 23:38:22] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:38:53] ✅ git pull成功 +[2026-03-23 23:38:53] ✅ git pull成功 +[2026-03-23 23:38:53] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:24] ✅ git pull成功 +[2026-03-23 23:39:24] ✅ git pull成功 +[2026-03-23 23:39:24] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:39:55] ✅ git pull成功 +[2026-03-23 23:39:55] ✅ git pull成功 +[2026-03-23 23:39:55] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:40:26] ✅ git pull成功 +[2026-03-23 23:40:26] ✅ git pull成功 +[2026-03-23 23:40:26] zhaoyun 无新任务 +From gitee.com:cfdaily/sanguo_quant_live + * branch main -> FETCH_HEAD +Already up to date. +[2026-03-23 23:40:57] ✅ git pull成功 +[2026-03-23 23:40:57] ✅ git pull成功 +[2026-03-23 23:40:57] zhaoyun 无新任务