feat(plan-parser): enhance markdown section status parsing #331

- Add support for section status markers at the start of the line.
- Improve regex to handle both start and end status markers.
- Update status mapping logic to use predefined sets for clarity.
- Add test case for error status in section titles.
- Refactor task status assignment for better readability.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/observer/plan/AgentPlan.kt

@@ -23,17 +23,22 @@ data class AgentPlan(
 ) {
     fun updateCompletionStatus() {
         if (tasks.isEmpty()) return
-        
+
+        if (this.status == TaskStatus.COMPLETED) {
+            completed = true
+            return
+        }
+
         completed = tasks.all { it.status == TaskStatus.COMPLETED }
-        
+
         status = when {
             tasks.all { it.status == TaskStatus.COMPLETED } -> TaskStatus.COMPLETED
             tasks.any { it.status == TaskStatus.FAILED } -> TaskStatus.FAILED
             tasks.any { it.status == TaskStatus.IN_PROGRESS } -> TaskStatus.IN_PROGRESS
             else -> TaskStatus.TODO
         }
     }
-    
+
     /**
      * 推进PDCA循环到下一阶段
      * @return 当前阶段
@@ -47,46 +52,49 @@ data class AgentPlan(
         }
         return phase
     }
-    
+
     /**
      * 设置PDCA循环的特定阶段
      * @param newPhase 要设置的新阶段
      */
     fun setPdcaPhase(newPhase: PlanPhase) {
         phase = newPhase
     }
-    
+
     /**
      * 获取当前PDCA阶段
      * @return 当前PDCA阶段
      */
     fun getPdcaPhase(): PlanPhase = phase
-    
+
     /**
      * 根据PDCA阶段更新计划和任务状态
      */
     fun processPdcaPhase() {
         when (phase) {
             PlanPhase.PLAN -> {
                 // 计划阶段：任务准备就绪但尚未开始
-                tasks.forEach { 
+                tasks.forEach {
                     if (it.status == TaskStatus.TODO) {
                         // 保持任务为TODO状态
                     }
                 }
             }
+
             PlanPhase.DO -> {
                 // 执行阶段：将任务状态更新为进行中
-                tasks.forEach { 
+                tasks.forEach {
                     if (it.status == TaskStatus.TODO) {
                         it.updateStatus(TaskStatus.IN_PROGRESS)
                     }
                 }
             }
+
             PlanPhase.CHECK -> {
                 // 检查阶段：评估任务执行情况
                 updateCompletionStatus()
             }
+
             PlanPhase.ACT -> {
                 // 行动阶段：基于检查结果采取行动
                 // 失败的任务可以在这里重置为TODO以便重试

core/src/main/kotlin/cc/unitmesh/devti/observer/plan/MarkdownPlanParser.kt

@@ -112,7 +112,7 @@ object MarkdownPlanParser {
 
                                 // Check for section status marker like "1. Section Title [✓]"
                                 val sectionStatusMatch =
-                                    "^(\\d+)\\.\\s*(.+?)(?:\\s*\\[(.)\\])?$".toRegex().find(listItemFirstLine)
+                                    "^(\\d+)\\.\\s*(?:\\[([xX!*✓]?)\\]\\s*)?(.+?)(?:\\s*\\[([xX!*✓]?)\\])?$".toRegex().find(listItemFirstLine)
 
                                 if (sectionStatusMatch != null) {
                                     // Save previous section if exists
@@ -133,16 +133,18 @@ object MarkdownPlanParser {
                                     }
 
                                     // Extract the title without any status marker
-                                    currentSectionTitle = sectionStatusMatch.groupValues[2].trim()
-
-                                    // Check for section status marker
-                                    val statusMarker = sectionStatusMatch.groupValues.getOrNull(3)
-                                    currentSectionCompleted =
-                                        statusMarker == "✓" || statusMarker == "x" || statusMarker == "X"
+                                    currentSectionTitle = sectionStatusMatch.groupValues[3].trim()
+
+                                    // Check for section status marker (either at start or end)
+                                    val startStatusMarker = sectionStatusMatch.groupValues[2]
+                                    val endStatusMarker = sectionStatusMatch.groupValues[4]
+                                    val statusMarker = if (startStatusMarker.isNotEmpty()) startStatusMarker else endStatusMarker
+                                    
+                                    currentSectionCompleted = statusMarker in GITHUB_TODO_COMPLETED
                                     currentSectionStatus = when (statusMarker) {
-                                        "✓", "x", "X" -> TaskStatus.COMPLETED
-                                        "!" -> TaskStatus.FAILED
-                                        "*" -> TaskStatus.IN_PROGRESS
+                                        in GITHUB_TODO_COMPLETED -> TaskStatus.COMPLETED
+                                        in GITHUB_TODO_FAILED -> TaskStatus.FAILED
+                                        in GITHUB_TODO_IN_PROGRESS -> TaskStatus.IN_PROGRESS
                                         else -> TaskStatus.TODO
                                     }
 
@@ -226,10 +228,10 @@ object MarkdownPlanParser {
                     val todoText = githubTodoMatch.groupValues[2].trim()
 
                     // Determine task status based on marker
-                    val task = when {
-                        checkState in GITHUB_TODO_COMPLETED -> PlanTask(todoText, true, TaskStatus.COMPLETED)
-                        checkState in GITHUB_TODO_FAILED -> PlanTask(todoText, false, TaskStatus.FAILED)
-                        checkState in GITHUB_TODO_IN_PROGRESS -> PlanTask(todoText, false, TaskStatus.IN_PROGRESS)
+                    val task = when (checkState) {
+                        in GITHUB_TODO_COMPLETED -> PlanTask(todoText, true, TaskStatus.COMPLETED)
+                        in GITHUB_TODO_FAILED -> PlanTask(todoText, false, TaskStatus.FAILED)
+                        in GITHUB_TODO_IN_PROGRESS -> PlanTask(todoText, false, TaskStatus.IN_PROGRESS)
                         else -> PlanTask(todoText, false, TaskStatus.TODO)
                     }
 

core/src/test/kotlin/cc/unitmesh/devti/observer/plan/MarkdownPlanParserTest.kt

@@ -1,10 +1,10 @@
 package cc.unitmesh.devti.observer.plan
 
+import junit.framework.TestCase.assertEquals
 import org.assertj.core.api.Assertions
 import org.junit.Test
 
 class MarkdownPlanParserTest {
-
     @Test
     fun should_parse_markdown_with_single_section_and_tasks() {
         // Given
@@ -74,7 +74,7 @@ class MarkdownPlanParserTest {
         // 添加调试信息以查看更多细节
         println("解析后的计划项数量: ${planItems.size}")
         planItems.forEachIndexed { index, item ->
-            println("第${index+1}项: $item")
+            println("第${index + 1}项: $item")
         }
 
         // 进行更宽松的测试断言，先确保基本功能可用
@@ -234,26 +234,26 @@ class MarkdownPlanParserTest {
     fun should_return_correct_items() {
         // Given
         val markdownContent = """
-1. **分析现有代码结构**：
-   - BlogService 中的 `deleteBlog` 方法目前只支持按 ID 删除
-   - BlogPost 实体类中的 author 字段类型为 String，但 DTO 中的 author 是 Author 对象类型，存在映射不一致
-   - Repository 层使用 CrudRepository 需要扩展自定义删除方法
-
-2. **数据库字段确认**：
-   - 需要确认 BlogPost 表实际存储的 author 字段类型（当前代码显示为 String 类型）
-
-3. **功能实现步骤**：
-   - [ ] 在 BlogRepository 添加按作者删除的方法
-   - [ ] 扩展 BlogService 添加 deleteByAuthor 方法
-   - [ ] 在 BlogController 添加新的 DELETE 端点
-   - [ ] 修复 DTO 与实体类的 author 字段类型一致性
-   - [ ] 添加 Swagger 接口文档注解
-   - [ ] 补充单元测试
-
-4. **异常处理**：
-   - 处理不存在的作者删除请求
-   - 添加事务管理注解
-   - 统一返回结果格式
+        1. **分析现有代码结构**：
+           - BlogService 中的 `deleteBlog` 方法目前只支持按 ID 删除
+           - BlogPost 实体类中的 author 字段类型为 String，但 DTO 中的 author 是 Author 对象类型，存在映射不一致
+           - Repository 层使用 CrudRepository 需要扩展自定义删除方法
+        
+        2. **数据库字段确认**：
+           - 需要确认 BlogPost 表实际存储的 author 字段类型（当前代码显示为 String 类型）
+        
+        3. **功能实现步骤**：
+           - [ ] 在 BlogRepository 添加按作者删除的方法
+           - [ ] 扩展 BlogService 添加 deleteByAuthor 方法
+           - [ ] 在 BlogController 添加新的 DELETE 端点
+           - [ ] 修复 DTO 与实体类的 author 字段类型一致性
+           - [ ] 添加 Swagger 接口文档注解
+           - [ ] 补充单元测试
+        
+        4. **异常处理**：
+           - 处理不存在的作者删除请求
+           - 添加事务管理注解
+           - 统一返回结果格式
         """.trimIndent()
 
         // When
@@ -320,10 +320,26 @@ class MarkdownPlanParserTest {
         Assertions.assertThat(secondTask.status).isEqualTo(TaskStatus.IN_PROGRESS)
 
         // 验证嵌套任务被正确解析
-        val nestedTasks = planItems[0].tasks.filter { it.step.contains("BlogController")
-                                                  || it.step.contains("BlogService")
-                                                  || it.step.contains("BlogRepository")
-                                                  || it.step.contains("BlogPost") }
+        val nestedTasks = planItems[0].tasks.filter {
+            it.step.contains("BlogController")
+                    || it.step.contains("BlogService")
+                    || it.step.contains("BlogRepository")
+                    || it.step.contains("BlogPost")
+        }
         Assertions.assertThat(nestedTasks).isNotEmpty()
     }
-}
+
+    @Test
+    fun should_support_error_status_in_section_title() {
+        val content = """
+        1. [✓] 数据库表结构确认
+            - `blog_post` 表已存在 `category` 字段
+        2. [*] 更新领域对象
+        """.trimIndent()
+        val plans = MarkdownPlanParser.parse(content)
+        assertEquals(2, plans.size)
+        assertEquals(TaskStatus.COMPLETED, plans[0].status)
+        assertEquals("数据库表结构确认", plans[0].title)
+        assertEquals(TaskStatus.IN_PROGRESS, plans[1].status)
+    }
+}