From b3884e77960ff2acb17abf598d9c097c62e1ee40 Mon Sep 17 00:00:00 2001 From: cfdaily Date: Mon, 23 Mar 2026 10:38:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?auto:=20pangtong=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20TASK-20260323102146?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agents/pangtong/TASK-20260323102146.done | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 management/agents/pangtong/TASK-20260323102146.done diff --git a/management/agents/pangtong/TASK-20260323102146.done b/management/agents/pangtong/TASK-20260323102146.done new file mode 100644 index 000000000..eeea8166e --- /dev/null +++ b/management/agents/pangtong/TASK-20260323102146.done @@ -0,0 +1,21 @@ +# 自动化任务完成报告 +- 任务ID: TASK-20260323102146 +- 发现时间: 2026-03-23 10:38:20 +- 执行Agent: pangtong +- 当前项目目录: /Users/chufeng/.openclaw/workspace-pangtong/sanguo_quant_live + +## 任务内容 +# 任务ID: TASK-20260323102146 +# 状态: assigned +# 创建时间: Mon Mar 23 10:21:46 CST 2026 + +## 任务需求 +二次自动化验证测试: +请验证: +1. 修复后的脚本能否正常启动监控 +2. 监控能否自动发现新任务 +3. 自动路径检测是否正常工作 +4. 请在.done文件中写上当前项目目录路径,确认自动检测正确 +完成后自动推送结果即可。 + +✅ 监控自动发现任务成功,工作流正常 From 132af78f2e5f30a0e547e1be065bb670dd535db3 Mon Sep 17 00:00:00 2001 From: cfdaily Date: Mon, 23 Mar 2026 10:38:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=92=8C=E8=BF=9B=E7=A8=8B=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- management/workflow/scripts/agent_auto_start.sh | 15 ++++++++------- .../workflow/scripts/agent_monitor_fixed.sh | 3 ++- .../workflow/scripts/agent_monitor_gitpull.sh | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/management/workflow/scripts/agent_auto_start.sh b/management/workflow/scripts/agent_auto_start.sh index e022829a3..4a0f37138 100755 --- a/management/workflow/scripts/agent_auto_start.sh +++ b/management/workflow/scripts/agent_auto_start.sh @@ -11,27 +11,28 @@ if [ -z "$AGENT_NAME" ]; then fi # 项目目录:自动检测脚本所在位置,不需要硬编码 +# scripts -> workflow -> management -> 项目根目录(向上跳3级) SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")/../../.." +PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" cd "$PROJECT_ROOT" || { echo "❌ 无法进入项目目录: $PROJECT_ROOT" exit 1 } # 检查是否已经运行 -if ps aux | grep "agent_monitor_gitpull.sh $AGENT_NAME" | grep -v grep | grep -q .; then +if ps aux | grep "agent_monitor_fixed.sh $AGENT_NAME" | grep -v grep | grep -q .; then echo "✅ $AGENT_NAME 监控已经在运行" exit 0 fi -# 启动改进版监控(带自动git pull) +# 启动全自动化监控(集成git pull + 任务发现 + 自动推送) echo "🚀 启动 $AGENT_NAME 监控..." -nohup ./management/workflow/scripts/agent_monitor_gitpull.sh "$AGENT_NAME" > "${AGENT_NAME}_monitor.log" 2>&1 & +nohup ./management/workflow/scripts/agent_monitor_fixed.sh "$AGENT_NAME" > "${AGENT_NAME}_monitor.log" 2>&1 & # 检查是否启动成功 -sleep 1 -if ps aux | grep -q "agent_monitor_gitpull.sh $AGENT_NAME" | grep -v grep; then - PID=$(ps aux | grep "agent_monitor_gitpull.sh $AGENT_NAME" | grep -v grep | awk '{print $2}') +sleep 2 +if ps aux | grep "agent_monitor_fixed.sh $AGENT_NAME" | grep -v grep | grep -q .; then + PID=$(ps aux | grep "agent_monitor_fixed.sh $AGENT_NAME" | grep -v grep | awk '{print $2}') echo "✅ $AGENT_NAME 监控启动成功" echo "🆔 PID: $PID" echo "📝 日志: ${AGENT_NAME}_monitor.log" diff --git a/management/workflow/scripts/agent_monitor_fixed.sh b/management/workflow/scripts/agent_monitor_fixed.sh index 1e107f9a3..9c6b26c3d 100755 --- a/management/workflow/scripts/agent_monitor_fixed.sh +++ b/management/workflow/scripts/agent_monitor_fixed.sh @@ -11,8 +11,9 @@ if [ -z "$AGENT" ]; then fi # 自动检测项目根目录 +# scripts -> workflow -> management -> 项目根目录(向上跳3级) SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")/../.." +PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" cd "$PROJECT_ROOT" || { echo "❌ 错误:无法进入项目目录 $PROJECT_ROOT" exit 1 diff --git a/management/workflow/scripts/agent_monitor_gitpull.sh b/management/workflow/scripts/agent_monitor_gitpull.sh index 42f44f1da..18a4e6faa 100755 --- a/management/workflow/scripts/agent_monitor_gitpull.sh +++ b/management/workflow/scripts/agent_monitor_gitpull.sh @@ -13,8 +13,9 @@ if [ -z "$AGENT_NAME" ]; then fi # 项目根目录(自动检测,基于脚本位置) +# scripts -> workflow -> management -> 项目根目录(向上跳3级) SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")/../.." +PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" cd "$PROJECT_ROOT" || { echo "❌ 错误:无法进入项目目录 $PROJECT_ROOT" exit 1