feat(plan): add subtask support and improve plan structure #331

- Added subtask support to `PlanTask` with nested task handling.
- Updated plan documentation to clarify task progress indicators and content rules.
- Enhanced `resetState` in `AgentStateService` to clear plan updates.

Author: phodal

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

@@ -14,10 +14,6 @@ import com.intellij.openapi.vcs.changes.Change
 class AgentStateService {
     var state: AgentState = AgentState()
 
-    fun resetState() {
-        state = AgentState()
-    }
-
     fun addTools(tools: List<BuiltinCommand>) {
         state.usedTools = tools.map {
             AgentTool(it.commandName, it.description, "")
@@ -62,6 +58,13 @@ class AgentStateService {
             .onPlanUpdate(items)
     }
 
+    fun resetState() {
+        state = AgentState()
+        ApplicationManager.getApplication().messageBus
+            .syncPublisher(PlanUpdateListener.TOPIC)
+            .onPlanUpdate(mutableListOf())
+    }
+
     fun getPlan(): MutableList<AgentPlan> {
         return state.plan
     }

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

@@ -7,12 +7,14 @@ import kotlinx.serialization.Serializable
  * @property step 任务描述
  * @property completed 任务是否已完成
  * @property status 任务状态（COMPLETED, FAILED, IN_PROGRESS, TODO）
+ * @property subtasks 子任务列表，用于支持嵌套任务结构
  */
 @Serializable
 class PlanTask(
     val step: String,
     var completed: Boolean = false,
-    var status: TaskStatus = TaskStatus.TODO
+    var status: TaskStatus = TaskStatus.TODO,
+    var subtasks: MutableList<PlanTask> = mutableListOf()
 ) {
     companion object {
         private val COMPLETED_PATTERN = Regex("^\\[(✓|x|X)\\]\\s*(.*)")
@@ -65,10 +67,54 @@ class PlanTask(
     /**
      * 更新任务状态
      * @param newStatus 新的任务状态
+     * @param updateSubtasks 是否同时更新所有子任务的状态
      */
-    fun updateStatus(newStatus: TaskStatus) {
+    fun updateStatus(newStatus: TaskStatus, updateSubtasks: Boolean = false) {
         status = newStatus
         completed = (status == TaskStatus.COMPLETED)
+        
+        if (updateSubtasks && subtasks.isNotEmpty()) {
+            subtasks.forEach { it.updateStatus(newStatus, true) }
+        }
+    }
+    
+    /**
+     * 添加子任务
+     * @param subtask 要添加的子任务
+     */
+    fun addSubtask(subtask: PlanTask) {
+        subtasks.add(subtask)
+    }
+    
+    /**
+     * 根据子任务状态更新当前任务状态
+     * 如果所有子任务都已完成，则当前任务也标记为完成
+     */
+    fun updateStatusFromSubtasks() {
+        if (subtasks.isEmpty()) {
+            return
+        }
+        
+        // 如果所有子任务都完成，则当前任务也完成
+        if (subtasks.all { it.status == TaskStatus.COMPLETED }) {
+            status = TaskStatus.COMPLETED
+            completed = true
+        }
+        // 如果有任何子任务失败，则当前任务也标记为失败
+        else if (subtasks.any { it.status == TaskStatus.FAILED }) {
+            status = TaskStatus.FAILED
+            completed = false
+        }
+        // 如果有任何子任务进行中，则当前任务也标记为进行中
+        else if (subtasks.any { it.status == TaskStatus.IN_PROGRESS }) {
+            status = TaskStatus.IN_PROGRESS
+            completed = false
+        }
+        // 否则任务仍然是 TODO 状态
+        else {
+            status = TaskStatus.TODO
+            completed = false
+        }
     }
 }
 
@@ -81,4 +127,4 @@ enum class TaskStatus {
     FAILED,
     IN_PROGRESS,
     TODO
-} 
+}

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

@@ -36,6 +36,8 @@ say 'I will edit your file'.
 5. Before calling each tool, first explain to the USER why you are calling it.
 </tool_calling>
 
+<plan>
+
 Here is the rule you should follow:
 
 1. Thoroughly review `<user.question>`. Create/update an initial plan that includes all the necessary steps to
@@ -52,11 +54,13 @@ Here is the rule you should follow:
 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).
+2. No code should be written inside the plan, just the task and steps summary.
 
 For example:
 
 ```plan
 1. xxx
+    - [✓] xxx
     - [ ] xxx
 2. xxx
 ```

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

@@ -53,18 +53,18 @@ Here is the rule you should follow:
 
 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).
+1. Updated plan with step progress indicators (`[✓]` for completed, `[!]` for failed, `[*]` for in-progress).
+2. No code should be written inside the plan, just the task and steps summary.
 
 For example:
 
 ```plan
 1. xxx
+    - [✓] xxx
     - [ ] xxx
 2. xxx
 ```
 
-</plan>
-
 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.