From 6ab7bfcfb89077c18baa31b49205dd45bb80c1cc Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 16:49:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgit=20stash=20pop?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?git=20push=E7=A1=AE=E4=BF=9D=E6=8E=A8=E9=80=81=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/management/workflow/scripts/assign_simple.sh b/management/workflow/scripts/assign_simple.sh
index 4cda2c63b..fbdb910dd 100755
--- a/management/workflow/scripts/assign_simple.sh
+++ b/management/workflow/scripts/assign_simple.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 极简分配脚本
+# 极简分配脚本 - 修复版
 
 if [ $# -lt 2 ]; then
   echo "使用方法: ./assign_simple.sh <任务ID> <负责人>"
@@ -30,13 +30,15 @@ sed -i '' "s/# 负责人:.*/# 负责人: $AGENT/" "$ASSIGNED_FILE"
 # 创建.task文件通知Agent
 cp "$PENDING_FILE" "$AGENT_FILE"
 
-# 添加到git
+# 添加到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 push origin main > /dev/null 2>&1
 
-# 恢复本地修改
-git stash pop -q > /dev/null 2>&1
+# 恢复本地修改，如果失败就丢弃stash
+git stash pop -q > /dev/null 2>&1 || git stash drop -q > /dev/null 2>&1
 
 echo "✅ 任务已分配给 $AGENT"
 echo "📄 任务文件: $ASSIGNED_FILE"
-echo "📬 通知文件: $AGENT_FILE"
\ No newline at end of file
+echo "📬 通知文件: $AGENT_FILE"
+echo "🌐 已推送到 Gitee"
\ No newline at end of file
diff --git a/management/workflow/scripts/create_simple.sh b/management/workflow/scripts/create_simple.sh
index 66b93753e..ff290d1e6 100755
--- a/management/workflow/scripts/create_simple.sh
+++ b/management/workflow/scripts/create_simple.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 创建新任务脚本
+# 创建新任务脚本 - 修复版
 
 TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
 TASK_FILE="management/tasks/pending/${TASK_ID}.md"
@@ -15,7 +15,9 @@ echo "$1" >> "$TASK_FILE"
 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
+git push origin main > /dev/null 2>&1
+git stash pop -q > /dev/null 2>&1 || git stash drop -q > /dev/null 2>&1
 
 echo "✅ 任务创建成功: $TASK_ID"
-echo "📄 文件: $TASK_FILE"
\ No newline at end of file
+echo "📄 文件: $TASK_FILE"
+echo "🌐 已推送到 Gitee"
\ No newline at end of file