From 00c590d7a684b01ef21c2c3bb5370fbb9fbcdc7d Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 16:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=80=E7=BB=88=E4=BF=AE=E5=A4=8D=20-?=
 =?UTF-8?q?=20=E5=85=88stash=E5=86=8D=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=96=B0=E6=96=87=E4=BB=B6=E8=A2=AB?=
 =?UTF-8?q?stash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 management/workflow/scripts/assign_simple.sh |  6 ++++--
 management/workflow/scripts/create_simple.sh | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/management/workflow/scripts/assign_simple.sh b/management/workflow/scripts/assign_simple.sh
index fbdb910dd..bd45069d1 100755
--- a/management/workflow/scripts/assign_simple.sh
+++ b/management/workflow/scripts/assign_simple.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# 极简分配脚本 - 修复版
+# 极简分配脚本 - 最终修复版
+# 修复：先stash再创建文件，避免新文件被stash
 
 if [ $# -lt 2 ]; then
   echo "使用方法: ./assign_simple.sh <任务ID> <负责人>"
@@ -14,11 +15,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"
 
-# 自动处理git冲突 - 先stash本地修改
+# 自动处理git冲突 - 先stash本地未提交的修改
 git stash push -q > /dev/null 2>&1
 
 # 确保Agent目录存在
 mkdir -p "management/agents/${AGENT}"
+mkdir -p management/tasks/assigned
 
 # 复制任务文件
 cp "$PENDING_FILE" "$ASSIGNED_FILE"
diff --git a/management/workflow/scripts/create_simple.sh b/management/workflow/scripts/create_simple.sh
index ff290d1e6..996006e7d 100755
--- a/management/workflow/scripts/create_simple.sh
+++ b/management/workflow/scripts/create_simple.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
-# 创建新任务脚本 - 修复版
+# 创建新任务脚本 - 最终修复版
+# 修复：先stash再创建文件，避免新文件被stash
+
+# 自动处理git冲突 - 先stash本地未提交的修改
+git stash push -q > /dev/null 2>&1
 
 TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
 TASK_FILE="management/tasks/pending/${TASK_ID}.md"
 
+mkdir -p management/tasks/pending
 echo "# 任务ID: $TASK_ID" > "$TASK_FILE"
 echo "# 状态: pending" >> "$TASK_FILE"
 echo "# 创建时间: $(date)" >> "$TASK_FILE"
@@ -11,11 +16,11 @@ echo "" >> "$TASK_FILE"
 echo "## 任务需求" >> "$TASK_FILE"
 echo "$1" >> "$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 push origin main > /dev/null 2>&1
+
+# 恢复本地修改，如果失败就丢弃stash
 git stash pop -q > /dev/null 2>&1 || git stash drop -q > /dev/null 2>&1
 
 echo "✅ 任务创建成功: $TASK_ID"