From ea5c1ff106ea4e4d3b29832d22cab96bedbca7ec Mon Sep 17 00:00:00 2001
From: "sayurinana(vm)" <sayurinana@163.com>
Date: Wed, 17 Dec 2025 06:06:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(flow):=20=E5=AE=8C=E6=88=90=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E5=90=88=E5=B9=B6=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复内容：
1. branch.py: _merge_normal 使用 merge_squash 替代错误的 reset_soft
2. tracker.py: finish 阶段先提交再合并，合并前额外提交状态文件
3. branch.py: 添加 _cleanup_lock_file 方法清理 lock 文件

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .aide/branches.json    | 4 +++-
 .aide/branches.md      | 5 +++--
 .aide/flow-status.lock | 1 -
 .aide/test-merge.md    | 5 -----
 4 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100755 .aide/flow-status.lock
 delete mode 100644 .aide/test-merge.md

diff --git a/.aide/branches.json b/.aide/branches.json
index 147b6af..f8b2a66 100644
--- a/.aide/branches.json
+++ b/.aide/branches.json
@@ -65,7 +65,9 @@
       "task_id": "2025-12-17T06-03-45",
       "task_summary": "最终测试：验证合并功能",
       "started_at": "2025-12-17T06:03:45+08:00",
-      "status": "active"
+      "status": "finished",
+      "end_commit": "d60f0bae2d783625d628aabf91fa74f631053a7c",
+      "finished_at": "2025-12-17T06:05:19+08:00"
     }
   ]
 }
diff --git a/.aide/branches.md b/.aide/branches.md
index 1fa6fdd..1a11e4c 100644
--- a/.aide/branches.md
+++ b/.aide/branches.md
@@ -6,8 +6,9 @@
 - **任务ID**: 2025-12-17T06-03-45
 - **源分支**: master
 - **起始提交**: 2b0c007
-- **状态**: active
-- **时间**: 2025-12-17 06:03
+- **结束提交**: d60f0ba
+- **状态**: finished
+- **时间**: 2025-12-17 06:03 ~ 06:05
 
 ## aide/005
 
diff --git a/.aide/flow-status.lock b/.aide/flow-status.lock
deleted file mode 100755
index ce121a7..0000000
--- a/.aide/flow-status.lock
+++ /dev/null
@@ -1 +0,0 @@
-42935
\ No newline at end of file
diff --git a/.aide/test-merge.md b/.aide/test-merge.md
deleted file mode 100644
index 0629f7b..0000000
--- a/.aide/test-merge.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 测试文件
-
-这是一个测试文件，用于验证 aide flow 的合并功能是否正常工作。
-
-创建时间: 2025-12-17