feat(plan): add task status indicators and UI enhancements

#331

- Introduced `PlanTask` class with status tracking (COMPLETED, FAILED, IN_PROGRESS, TODO).
- Updated UI to display task status with icons and context menu for status changes.
- Enhanced markdown parsing to support status indicators in plan tasks.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/observer/agent/PlanList.kt

@@ -8,21 +8,3 @@ data class PlanList(
     val planTasks: List<PlanTask>,
     val completed: Boolean = false
 )
-
-@Serializable
-data class PlanTask(val description: String, var completed: Boolean = false) {
-    companion object {
-        fun fromText(taskText: String): PlanTask {
-            val isCompleted = taskText.contains("✓") ||
-                    Regex("\\[\\s*([xX])\\s*\\]").containsMatchIn(taskText)
-
-            val cleanedDescription = taskText
-                .replace("✓", "")
-                .replace(Regex("\\[\\s*[xX]\\s*\\]"), "[ ]")
-                .replace(Regex("\\[\\s*\\]"), "")
-                .trim()
-
-            return PlanTask(cleanedDescription, isCompleted)
-        }
-    }
-}

core/src/main/kotlin/cc/unitmesh/devti/observer/agent/PlanTask.kt

@@ -0,0 +1,84 @@
+package cc.unitmesh.devti.observer.agent
+
+import kotlinx.serialization.Serializable
+
+/**
+ * 计划任务，描述了一个具体任务的细节和状态
+ * @property description 任务描述
+ * @property completed 任务是否已完成
+ * @property status 任务状态（COMPLETED, FAILED, IN_PROGRESS, TODO）
+ */
+@Serializable
+class PlanTask(
+    val description: String,
+    var completed: Boolean = false,
+    var status: TaskStatus = TaskStatus.TODO
+) {
+    companion object {
+        private val COMPLETED_PATTERN = Regex("^\\[(✓|x|X)\\]\\s*(.*)")
+        private val FAILED_PATTERN = Regex("^\\[!\\]\\s*(.*)")
+        private val IN_PROGRESS_PATTERN = Regex("^\\[\\*\\]\\s*(.*)")
+        private val TODO_PATTERN = Regex("^\\[\\s*\\]\\s*(.*)")
+
+        /**
+         * 从文本创建计划任务
+         * @param text 任务文本，可能包含状态标记如 [✓]、[!]、[*] 或 [ ]
+         * @return 创建的计划任务对象
+         */
+        fun fromText(text: String): PlanTask {
+            return when {
+                COMPLETED_PATTERN.matches(text) -> {
+                    val description = COMPLETED_PATTERN.find(text)?.groupValues?.get(2) ?: text
+                    PlanTask(description, true, TaskStatus.COMPLETED)
+                }
+                FAILED_PATTERN.matches(text) -> {
+                    val description = FAILED_PATTERN.find(text)?.groupValues?.get(1) ?: text
+                    PlanTask(description, false, TaskStatus.FAILED)
+                }
+                IN_PROGRESS_PATTERN.matches(text) -> {
+                    val description = IN_PROGRESS_PATTERN.find(text)?.groupValues?.get(1) ?: text
+                    PlanTask(description, false, TaskStatus.IN_PROGRESS)
+                }
+                TODO_PATTERN.matches(text) -> {
+                    val description = TODO_PATTERN.find(text)?.groupValues?.get(1) ?: text
+                    PlanTask(description, false, TaskStatus.TODO)
+                }
+                else -> PlanTask(text)
+            }
+        }
+    }
+    
+    /**
+     * 将任务转换为标准格式的文本表示
+     * @return 包含状态标记的文本，如 [✓] Task description
+     */
+    fun toText(): String {
+        val statusMarker = when (status) {
+            TaskStatus.COMPLETED -> "[✓]"
+            TaskStatus.FAILED -> "[!]"
+            TaskStatus.IN_PROGRESS -> "[*]"
+            TaskStatus.TODO -> "[ ]"
+        }
+        return "$statusMarker $description"
+    }
+    
+    /**
+     * 更新任务状态
+     * @param newStatus 新的任务状态
+     */
+    fun updateStatus(newStatus: TaskStatus) {
+        status = newStatus
+        completed = (status == TaskStatus.COMPLETED)
+    }
+}
+
+/**
+ * 任务状态枚举
+ */
+@Serializable
+enum class TaskStatus {
+    COMPLETED,
+    FAILED,
+    IN_PROGRESS,
+    TODO
+} 

core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/ThoughtPlanSketchProvider.kt

@@ -5,6 +5,8 @@ import cc.unitmesh.devti.gui.AutoDevToolWindowFactory
 import cc.unitmesh.devti.gui.chat.message.ChatActionType
 import cc.unitmesh.devti.observer.agent.AgentStateService
 import cc.unitmesh.devti.observer.agent.PlanList
+import cc.unitmesh.devti.observer.agent.PlanTask
+import cc.unitmesh.devti.observer.agent.TaskStatus
 import cc.unitmesh.devti.observer.plan.PlanBoard
 import cc.unitmesh.devti.sketch.ui.code.CodeHighlightSketch
 import cc.unitmesh.devti.sketch.ui.plan.MarkdownPlanParser
@@ -119,18 +121,34 @@ class PlanSketch(
                     border = JBUI.Borders.empty()
                 }
 
-                val checkbox = JBCheckBox().apply {
-                    isSelected = task.completed
-                    addActionListener {
-                        task.completed = isSelected
+                // First create task label with appropriate styling based on status
+                val taskLabel = createStyledTaskLabel(task)
+
+                // Create a custom status indicator based on task status
+                val statusIcon = when (task.status) {
+                    TaskStatus.COMPLETED -> JLabel(AllIcons.Actions.Checked)
+                    TaskStatus.FAILED -> JLabel(AllIcons.General.Error)
+                    TaskStatus.IN_PROGRESS -> JLabel(AllIcons.Actions.Execute) 
+                    TaskStatus.TODO -> JBCheckBox().apply {
+                        isSelected = task.completed
+                        addActionListener {
+                            task.completed = isSelected
+                            if (isSelected) {
+                                task.updateStatus(TaskStatus.COMPLETED)
+                            } else {
+                                task.updateStatus(TaskStatus.TODO)
+                            }
+                            updateTaskLabel(taskLabel, task)
+                        }
+                        isBorderPainted = false
+                        isContentAreaFilled = false
                     }
-                    isBorderPainted = false
-                    isContentAreaFilled = false
                 }
+                
+                taskPanel.add(statusIcon)
 
-                taskPanel.add(checkbox)
-
-                if (!task.completed) {
+                // Add execute button for incomplete tasks
+                if (task.status == TaskStatus.TODO || task.status == TaskStatus.IN_PROGRESS) {
                     val executeButton = JButton(AllIcons.Actions.Execute).apply {
                         border = BorderFactory.createEmptyBorder()
                         preferredSize = Dimension(24, 24)
@@ -145,23 +163,51 @@ class PlanSketch(
 
                     taskPanel.add(executeButton)
                 }
-
-                val taskLabel = JLabel(if (task.completed) 
-                    "<html><strike>${task.description}</strike></html>" 
-                    else task.description
-                ).apply {
-                    border = JBUI.Borders.emptyLeft(5)
+                
+                taskPanel.add(taskLabel)
+                
+                // Add context menu for changing task status
+                val taskPopupMenu = JPopupMenu()
+                val markCompletedItem = JMenuItem("Mark as Completed [✓]")
+                val markInProgressItem = JMenuItem("Mark as In Progress [*]")
+                val markFailedItem = JMenuItem("Mark as Failed [!]")
+                val markTodoItem = JMenuItem("Mark as Todo [ ]")
+                
+                markCompletedItem.addActionListener {
+                    task.updateStatus(TaskStatus.COMPLETED)
+                    updateTaskLabel(taskLabel, task)
+                    contentPanel.revalidate()
+                    contentPanel.repaint()
                 }
 
-                checkbox.addActionListener {
-                    taskLabel.text = if (checkbox.isSelected)
-                        "<html><strike>${task.description}</strike></html>"
-                    else
-                        task.description
+                markInProgressItem.addActionListener {
+                    task.updateStatus(TaskStatus.IN_PROGRESS)
+                    updateTaskLabel(taskLabel, task)
+                    contentPanel.revalidate()
+                    contentPanel.repaint()
                 }
 
-                taskPanel.add(taskLabel)
-
+                markFailedItem.addActionListener {
+                    task.updateStatus(TaskStatus.FAILED)
+                    updateTaskLabel(taskLabel, task)
+                    contentPanel.revalidate()
+                    contentPanel.repaint()
+                }
+                
+                markTodoItem.addActionListener {
+                    task.updateStatus(TaskStatus.TODO)
+                    updateTaskLabel(taskLabel, task)
+                    contentPanel.revalidate()
+                    contentPanel.repaint()
+                }
+                
+                taskPopupMenu.add(markCompletedItem)
+                taskPopupMenu.add(markInProgressItem)
+                taskPopupMenu.add(markFailedItem)
+                taskPopupMenu.add(markTodoItem)
+                
+                taskLabel.componentPopupMenu = taskPopupMenu
+                
                 contentPanel.add(taskPanel)
             }
 
@@ -171,6 +217,30 @@ class PlanSketch(
         }
     }
 
+    // Helper method to create a styled task label based on status
+    private fun createStyledTaskLabel(task: PlanTask): JLabel {
+        val labelText = when (task.status) {
+            TaskStatus.COMPLETED -> "<html><strike>${task.description}</strike></html>"
+            TaskStatus.FAILED -> "<html><span style='color:red'>${task.description}</span></html>"
+            TaskStatus.IN_PROGRESS -> "<html><span style='color:blue;font-style:italic'>${task.description}</span></html>"
+            TaskStatus.TODO -> task.description
+        }
+        
+        return JLabel(labelText).apply {
+            border = JBUI.Borders.emptyLeft(5)
+        }
+    }
+    
+    // Helper method to update the task label based on current status
+    private fun updateTaskLabel(label: JLabel, task: PlanTask) {
+        label.text = when (task.status) {
+            TaskStatus.COMPLETED -> "<html><strike>${task.description}</strike></html>"
+            TaskStatus.FAILED -> "<html><span style='color:red'>${task.description}</span></html>"
+            TaskStatus.IN_PROGRESS -> "<html><span style='color:blue;font-style:italic'>${task.description}</span></html>"
+            TaskStatus.TODO -> task.description
+        }
+    }
+
     override fun getExtensionName(): String = "ThoughtPlan"
 
     override fun getViewText(): String = content
@@ -186,11 +256,12 @@ class PlanSketch(
 
     fun updatePlan(newPlanItems: List<PlanList>) {
         if (newPlanItems.isNotEmpty()) {
-            val completionState = mutableMapOf<String, Boolean>()
+            // Save current states of all tasks
+            val taskStateMap = mutableMapOf<String, Pair<Boolean, TaskStatus>>()
 
             planLists.forEach { planItem ->
                 planItem.planTasks.forEach { task ->
-                    completionState[task.description] = task.completed
+                    taskStateMap[task.description] = Pair(task.completed, task.status)
                 }
             }
 
@@ -201,9 +272,10 @@ class PlanSketch(
                 planLists.add(newItem)
 
                 newItem.planTasks.forEach { task ->
-                    val savedCompletionState = completionState[task.description]
-                    if (savedCompletionState != null) {
-                        task.completed = savedCompletionState
+                    // Restore saved states if available
+                    taskStateMap[task.description]?.let { (completed, status) ->
+                        task.completed = completed
+                        task.status = status
                     }
                 }
             }

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

@@ -19,18 +19,22 @@ import org.intellij.markdown.parser.MarkdownParser
  *
  * ```markdown
  * 1. 领域模型重构：
- *   - 将BlogPost实体合并到Blog聚合根，建立完整的领域对象
- *   - 添加领域行为方法（发布、审核、评论等）
+ *   - [✓] 将BlogPost实体合并到Blog聚合根，建立完整的领域对象
+ *   - [*] 添加领域行为方法（发布、审核、评论等）
+ *   - [!] 修复数据模型冲突
+ *   - [ ] 实现新增的领域服务
  * 2. 分层结构调整：
- *   - 清理entity层冗余对象
+ *   - [ ] 清理entity层冗余对象
  * ```
 */
 object MarkdownPlanParser {
     private val LOG = logger<MarkdownPlanParser>()
     private val ROOT_ELEMENT_TYPE = IElementType("ROOT")
     private val CHECKMARK = "✓"
-    private val GITHUB_TODO_PATTERN = Regex("^\\s*-\\s*\\[\\s*([xX]?)\\s*\\]\\s*(.*)")
-    private val GITHUB_TODO_CHECKED = listOf("x", "X")
+    private val GITHUB_TODO_PATTERN = Regex("^\\s*-\\s*\\[\\s*([xX!*✓]?)\\s*\\]\\s*(.*)")
+    private val GITHUB_TODO_COMPLETED = listOf("x", "X", "✓")
+    private val GITHUB_TODO_FAILED = listOf("!")
+    private val GITHUB_TODO_IN_PROGRESS = listOf("*")
 
     /**
      * 解析markdown文本为计划项列表
@@ -199,13 +203,13 @@ object MarkdownPlanParser {
                     // Extract the task text and preserve the checkbox status
                     val checkState = githubTodoMatch.groupValues[1]
                     val todoText = githubTodoMatch.groupValues[2].trim()
-                    val isCompleted = checkState in GITHUB_TODO_CHECKED
 
-                    // Add the task with the proper completion marker
-                    val formattedTask = if (isCompleted) {
-                        "[$CHECKMARK] $todoText"
-                    } else {
-                        "[ ] $todoText"
+                    // Determine task status based on marker
+                    val formattedTask = when {
+                        checkState in GITHUB_TODO_COMPLETED -> "[✓] $todoText"
+                        checkState in GITHUB_TODO_FAILED -> "[!] $todoText"
+                        checkState in GITHUB_TODO_IN_PROGRESS -> "[*] $todoText"
+                        else -> "[ ] $todoText"
                     }
 
                     itemsList.add(PlanTask.fromText(formattedTask))

core/src/main/resources/genius/en/code/plan.devin

@@ -41,14 +41,25 @@ Here is the rule you should follow:
 1. Thoroughly review `<user.question>`. Create/update an initial plan that includes all the necessary steps to
  resolve `<user.question>`, using the recommended steps provided below,  and incorporating any requirements from
   the `<user.question>`. Place your plan inside code-fence block which language is `plan`.
-2. Review the project’s codebase, examining not only its structure but also the specific implementation details, to
+2. Plan should use a markdown ordered list to describe tasks and an unordered list to outline the steps for each task.
+3. Review the project’s codebase, examining not only its structure but also the specific implementation details, to
    identify all segments that may contribute to or help resolve the issue described in `<user.question>`.
-3. If `<user.question>` describes an error, create a script to reproduce it and run the script to confirm the error.
-4. Propose and explain the necessary code modifications to resolve `<user.question>`, ensuring that edge cases are
+4. If `<user.question>` describes an error, create a script to reproduce it and run the script to confirm the error.
+5. Propose and explain the necessary code modifications to resolve `<user.question>`, ensuring that edge cases are
    properly handled. Analyze these modifications before implementing them.
-5. use `<devin></devin>` command and code-fence block to Edit the source code in the repo to resolve `<user.question>`.
 6. You should alwasy think verify or auto-test your code to ensure it is correct and meets the requirements of `<user.question>`.
-7. Each plan should use a markdown ordered list to describe tasks and an unordered list to outline the steps for each task.
+
+For each step, document your reasoning process inside `plan` code block. Include:
+
+1. Updated plan with task progress indicators (`[✓]` for completed, `[!]` for failed, `[*]` for in-progress).
+
+For example:
+
+```plan
+1. xxx
+    - [ ] xxx
+2. xxx
+```
 
 If `<user.question>` directly contradicts any of these steps, follow the instructions from `<user.question>`
 first. Be thorough in your thinking process, so it's okay if it is lengthy.