test: 最终冒烟测试 - 创建所有测试任务

management/workflow/scripts/assign_simple.sh

@@ -14,6 +14,9 @@ PENDING_FILE="management/tasks/pending/${TASK_ID}.md"
 ASSIGNED_FILE="management/tasks/assigned/${TASK_ID}.md"
 AGENT_FILE="management/agents/${AGENT}/${TASK_ID}.task"
 
+# 自动处理git冲突 - 先stash本地修改
+git stash push -q > /dev/null 2>&1
+
 # 确保Agent目录存在
 mkdir -p "management/agents/${AGENT}"
 
@@ -27,6 +30,13 @@ sed -i '' "s/# 负责人:.*/# 负责人: $AGENT/" "$ASSIGNED_FILE"
 # 创建.task文件通知Agent
 cp "$PENDING_FILE" "$AGENT_FILE"
 
+# 添加到git
+git add "$PENDING_FILE" "$ASSIGNED_FILE" "$AGENT_FILE" > /dev/null 2>&1
+git commit -m "feat: 分配任务 $TASK_ID 给 $AGENT" > /dev/null 2>&1
+
+# 恢复本地修改
+git stash pop -q > /dev/null 2>&1
+
 echo "✅ 任务已分配给 $AGENT"
 echo "📄 任务文件: $ASSIGNED_FILE"
 echo "📬 通知文件: $AGENT_FILE"

management/workflow/scripts/check_status.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
-# 系统状态检查脚本
+# 系统状态检查脚本 - 带git冲突处理
+
+# 自动处理git冲突，拉取最新状态
+git stash push -q > /dev/null 2>&1
+git pull origin main > /dev/null 2>&1
+git stash pop -q > /dev/null 2>&1
 
 echo "========================================="
 echo "📊 任务管理系统状态报告"
@@ -10,42 +15,38 @@ echo ""
 echo "📁 任务文件统计:"
 echo "  pending:   $(ls management/tasks/pending/*.md 2>/dev/null | wc -l | xargs) 个"
 echo "  assigned:  $(ls management/tasks/assigned/*.md 2>/dev/null | wc -l | xargs) 个"
-echo "  completed: $(ls management/tasks/completed/*.md 2>/dev/null | wc -l | xargs) 个"
-echo "  archived:  $(ls management/tasks/archived/*.md 2>/dev/null | wc -l | xargs) 个"
 echo ""
 
-echo "👥 Agent状态:"
+echo "👥 Agent 状态:"
 for AGENT in pangtong zhangfei guanyu zhaoyun jiangwei simayi; do
   # 检查任务文件
   TASK_COUNT=$(ls management/agents/${AGENT}/*.task 2>/dev/null | wc -l | xargs)
-  
-  # 检查日志文件
-  LOG_FILE="${AGENT}.log"
-  if [ -f "$LOG_FILE" ]; then
-    LAST_LOG=$(tail -1 "$LOG_FILE" 2>/dev/null | cut -c1-50)
-    LAST_TIME=$(echo "$LAST_LOG" | grep -o '\[[^]]*\]' | head -1)
-  else
-    LAST_LOG="无日志文件"
-    LAST_TIME=""
-  fi
+  DONE_COUNT=$(ls management/agents/${AGENT}/*.done 2>/dev/null | wc -l | xargs)
   
   # 检查进程
-  PROCESS_COUNT=$(ps aux | grep -c "agent_monitor.sh ${AGENT}")
-  if [ "$PROCESS_COUNT" -gt 1 ]; then
+  PROCESS_COUNT=$(ps aux | grep -c "agent_monitor_fixed.sh $AGENT")
+  if [ "$PROCESS_COUNT" -gt 0 ]; then
     PROCESS_STATUS="✅ 运行中"
   else
     PROCESS_STATUS="❌ 未运行"
   fi
   
-  echo "  $AGENT: $TASK_COUNT 个任务, $PROCESS_STATUS, 最后活动: $LAST_TIME"
+  # 列出未完成任务ID
+  echo "  $AGENT: $DONE_COUNT/$((DONE_COUNT + TASK_COUNT)) 完成, $PROCESS_STATUS"
+  if [ "$TASK_COUNT" -gt 0 ]; then
+    echo "  未完成任务:"
+    ls management/agents/${AGENT}/*.task 2>/dev/null | while read line; do
+      echo "    $line" | grep -o "TASK-[0-9]*"
+    done
+  fi
 done
 
 echo ""
-echo "🚀 快速命令:"
-echo "  创建任务: ./management/workflow/scripts/create_task_simple.sh \"任务描述\""
-echo "  分配任务: ./management/workflow/scripts/assign_task_simple.sh TASK-XXXX agent"
-echo "  启动监控: nohup ./management/workflow/scripts/agent_monitor.sh pangtong > pangtong.log 2>&1 &"
-echo "  查看日志: tail -f pangtong.log"
+echo "🚀 使用方法:"
+echo "  创建新任务: ./management/workflow/scripts/create_simple.sh \"任务描述\""
+echo "  分配任务: ./management/workflow/scripts/assign_simple.sh TASK-ID agent-name"
+echo "  检查状态: ./management/workflow/scripts/check_status.sh"
+echo "  查看日志: tail -f agent-name_monitor.log"
 echo ""
-echo "📁 Gitee仓库: https://gitee.com/cfdaily/sanguo_quant_live/tree/main/management"
-echo "========================================="
+echo "🌐 Gitee仓库: https://gitee.com/cfdaily/sanguo_quant_live"
+echo "========================================="

management/workflow/scripts/create_simple.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# 创建新任务脚本
+
 TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
 TASK_FILE="management/tasks/pending/${TASK_ID}.md"
 
@@ -9,5 +11,11 @@ echo "" >> "$TASK_FILE"
 echo "## 任务需求" >> "$TASK_FILE"
 echo "$1" >> "$TASK_FILE"
 
-echo "任务创建: $TASK_ID"
-echo "文件: $TASK_FILE"
+# 自动处理git冲突 - 先stash本地修改，创建完再恢复
+git stash push -q > /dev/null 2>&1
+git add "$TASK_FILE" > /dev/null 2>&1
+git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1
+git stash pop -q > /dev/null 2>&1
+
+echo "✅ 任务创建成功: $TASK_ID"
+echo "📄 文件: $TASK_FILE"