feat(plan): add execute button for incomplete tasks and update plan handling #331

- Add an execute button for incomplete tasks in the ThoughtPlanSketchProvider to allow task execution.
- Update plan handling logic to fetch plans from AgentStateService and refresh the PlanBoard UI.
- Modify plan templates and documentation to improve clarity and structure.
- Add new message bundle entries for task execution prompts.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/llms/custom/CustomLLMProvider.kt

@@ -121,11 +121,11 @@ class CustomLLMProvider(val project: Project, var llmConfig: LlmConfig = LlmConf
      */
     private fun CustomLLMProvider.tryUpdateModelForPlan(systemPrompt: String): LlmConfig {
         val canBePlanLength = 3
-        return if (messages.size == canBePlanLength && LlmConfig.hasPlanModel()) {
-            if (messages.size == canBePlanLength) {
-                messages[0] = Message("system", systemPrompt)
-            }
+        if (messages.size == canBePlanLength) {
+            messages[0] = Message("system", systemPrompt)
+        }
 
+        return if (messages.size == canBePlanLength && LlmConfig.hasPlanModel()) {
             backupLlmConfigForPlan = llmConfig
             LlmConfig.load(ModelType.Plan).first()
         } else {

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

@@ -59,4 +59,8 @@ class AgentStateService {
             .syncPublisher(PlanUpdateListener.TOPIC)
             .onPlanUpdate(items)
     }
+
+    fun getPlan(): MutableList<PlanList> {
+        return state.planLists
+    }
 }

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

@@ -1,5 +1,6 @@
 package cc.unitmesh.devti.observer.plan
 
+import cc.unitmesh.devti.observer.agent.AgentStateService
 import cc.unitmesh.devti.observer.agent.PlanList
 import cc.unitmesh.devti.observer.agent.PlanUpdateListener
 import cc.unitmesh.devti.sketch.ui.PlanSketch
@@ -50,15 +51,18 @@ class PlanBoard(private val project: Project) : Disposable {
         return popup
     }
 
-    fun show(content: String, planLists: MutableList<PlanList>) {
+    fun updateShow() {
+        val planLists = project.getService(AgentStateService::class.java).getPlan()
         planSketch.updatePlan(planLists)
+
         if (popup?.isVisible == true) return
 
         try {
             if (popup?.isDisposed == true) {
                 createPopup()
             }
 
+            popup?.content?.updateUI()
             popup?.showInFocusCenter()
         } catch (e: Exception) {
             logger<PlanBoard>().error("Failed to show popup", e)

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

@@ -1,10 +1,13 @@
 package cc.unitmesh.devti.sketch.ui
 
+import cc.unitmesh.devti.AutoDevBundle
+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.sketch.ui.code.CodeHighlightSketch
-import cc.unitmesh.devti.sketch.ui.plan.MarkdownPlanParser
 import cc.unitmesh.devti.observer.agent.PlanList
 import cc.unitmesh.devti.observer.plan.PlanBoard
+import cc.unitmesh.devti.sketch.ui.code.CodeHighlightSketch
+import cc.unitmesh.devti.sketch.ui.plan.MarkdownPlanParser
 import com.intellij.icons.AllIcons
 import com.intellij.lang.Language
 import com.intellij.openapi.actionSystem.ActionManager
@@ -20,12 +23,9 @@ import com.intellij.util.ui.JBEmptyBorder
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import java.awt.BorderLayout
+import java.awt.Dimension
 import java.awt.FlowLayout
-import javax.swing.Box
-import javax.swing.BoxLayout
-import javax.swing.JComponent
-import javax.swing.JLabel
-import javax.swing.JPanel
+import javax.swing.*
 
 class ThoughtPlanSketchProvider : LanguageSketchProvider {
     override fun isSupported(lang: String): Boolean = lang == "plan"
@@ -89,7 +89,8 @@ class PlanSketch(
             override fun displayTextInToolbar(): Boolean = true
 
             override fun actionPerformed(e: AnActionEvent) {
-                project.getService(PlanBoard::class.java).show(content, planLists)
+                project.getService(AgentStateService::class.java).updatePlan(planLists)
+                project.getService(PlanBoard::class.java).updateShow()
             }
         }
 
@@ -126,6 +127,23 @@ class PlanSketch(
                 }
 
                 taskPanel.add(checkbox)
+
+                if (!task.completed) {
+                    val executeButton = JButton(AllIcons.Actions.Execute).apply {
+                        border = BorderFactory.createEmptyBorder()
+                        preferredSize = Dimension(32, 32)
+                        toolTipText = "Execute"
+
+                        addActionListener {
+                            AutoDevToolWindowFactory.sendToSketchToolWindow(project, ChatActionType.SKETCH) { ui, _ ->
+                                ui.sendInput(AutoDevBundle.message("sketch.plan.finish.task") + task.description)
+                            }
+                        }
+                    }
+
+                    taskPanel.add(executeButton)
+                }
+
                 contentPanel.add(taskPanel)
             }
 

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

@@ -41,14 +41,21 @@ 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 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.

core/src/main/resources/genius/zh/code/sketch.vm

@@ -72,6 +72,18 @@ have created a routes.py and main.js file, and updated the main.html file.
 </devin>
 </you.answer.step2>
 // ... If you provide a plan to the user, you should update it using a Markdown to-do list as you receive more contextual information.
+// ```plan
+// 1. 创建 routes.py
+// - [x] 定义 "/upload" 和 "/query" 端点
+// - [x] 添加 "/" 作为 main.html 的端点。
+// 2. 创建 main.js。存储所有的交互式前端代码
+// - [ ] 创建并定义 UI 元素
+// 3. 更新 index.html
+// 4. 自动化测试与验证
+// - [ ] 使用 Flask 的测试框架编写自动化测试用例
+// 5. 运行应用程序，测试和验证
+// - [ ] 运行应用程序
+// ```
 <you.answer.stepN>
 // In this step 2, You should first explain to the user how to solve the problem, and then use the DevIn language
 // 并且不要在 explain 阶段编写代码，只在编码步骤生成代码
@@ -93,7 +105,7 @@ have created a routes.py and main.js file, and updated the main.html file.
 看看是否一切正常。
 
 # 总结
-如是，我已经完成了您的需求，您可以继续测试和验证应用程序。如下是更新后的计划：
+如是，我已经完成了您的需求，您可以继续测试和验证应用程序。如下是根据上下文信息，更新后的计划，添加了更多的步骤：
 
 ```plan
 1. 创建 routes.py
@@ -227,11 +239,10 @@ It is EXTREMELY important that your generated code can be run immediately by the
 It is crucial to proceed step-by-step, waiting for the user's message after each tool use before moving forward with the task.
 This approach allows you to:
 
-1. Confirm the success of each step before proceeding.
-2. Address any issues or errors that arise immediately.
-3. Adapt your approach based on new information or unexpected results.
-4. Ensure that each action builds correctly on the previous ones.
-5. Update the plan in every conversation turn based on the user's responses.
+1. 以最开始的计划为基础，当发现问题时；调整计划时，需要更新到原来的计划，确保最后的计划是最新的。
+2. 在每一步操作之前，确保上一步操作的成功。
+3. 立即解决任何出现的问题或错误。
+4. 根据新信息或意外结果调整你的方法、步骤、计划，更新到原来的计划中。
 
 By waiting for and carefully considering the user's response after each tool use, you can react
 accordingly and make informed decisions about how to proceed with the task. This iterative process helps ensure

core/src/main/resources/messages/AutoDevBundle_en.properties

@@ -226,3 +226,4 @@ autodev.run.action=Run this file
 #llm.error.url.scheme=请配置好您的模型，参考文档：https://ide.unitmesh.cc/quick-start
 llm.error.url.scheme=Please, Please, Please configure your model, refer to the document: https://ide.unitmesh.cc/quick-start
 counit.mcp.services.placeholder=MCP Servers
+sketch.plan.finish.task=Please help me finish task:

core/src/main/resources/messages/AutoDevBundle_zh.properties

@@ -229,3 +229,4 @@ sketch.compile.devins=收集上下文中（即转译 AutoDev DevIns 指令）
 autodev.run.action=Run this file
 llm.error.url.scheme=请请请先配置好您的模型，参考文档：https://ide.unitmesh.cc/quick-start
 counit.mcp.services.placeholder=MCP Servers
+sketch.plan.finish.task=Please help me finish task:

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/exec/WriteInsCommand.kt

@@ -102,6 +102,9 @@ class WriteInsCommand(val myProject: Project, val argument: String, val content:
 
         runInEdt {
             FileEditorManager.getInstance(myProject).openFile(newFile, true)
+        }
+
+        ApplicationManager.getApplication().invokeLater {
             document.setText(content)
         }