feat(agent): enhance DevIns agent context handling #379

Extend CustomAgentContext with filePath and initVariables to support file-based execution. Refactor DevInsPromptProcessor to handle both direct text and file-based compilation, improving flexibility in agent execution. Also optimize message handling in CustomAgentExecutor.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/agent/custom/CustomAgentChatProcessor.kt

@@ -29,7 +29,7 @@ class CustomAgentChatProcessor(val project: Project) {
 
     fun handleChat(prompter: ContextPrompter, ui: NormalChatCodingPanel, llmProvider: LLMProvider): String? {
         val originPrompt = prompter.requestPrompt()
-        ui.addMessage(originPrompt, true, originPrompt)
+        val displayMessage = originPrompt
 
         val request = originPrompt.trim()
         val selectedAgent: CustomAgentConfig = ui.getSelectedCustomAgent()
@@ -42,6 +42,8 @@ class CustomAgentChatProcessor(val project: Project) {
             return null
         }
 
+        ui.addMessage(originPrompt, true, displayMessage)
+
         var llmResponse = ""
         selectedAgent.state = CustomAgentState.FINISHED
 

core/src/main/kotlin/cc/unitmesh/devti/agent/custom/CustomAgentExecutor.kt

@@ -33,21 +33,25 @@ class CustomAgentExecutor(val project: Project) : CustomSSEProcessor(project) {
     override var responseFormat: String = ""
 
     fun execute(promptText: String, agent: CustomAgentConfig): Flow<String>? {
-        messages.add(Message("user", promptText))
-
         var prompt = promptText
 
         if (agent.isFromDevIns) {
             val devin = LanguageProcessor.devin()!!
             val file = project.baseDir.findFileByRelativePath(agent.devinScriptPath)!!
-            val content = file.readText().replace("${'$'}input", promptText)
             prompt = runBlocking {
-                devin.execute(project, CustomAgentContext(agent, content))
+                val context = CustomAgentContext(
+                    agent, "", filePath = file,
+                    initVariables = mapOf("input" to promptText)
+                )
+                devin.execute(project, context)
             }
 
+            messages.add(Message("user", prompt))
             return LlmFactory.create(project).stream(prompt, "")
         }
 
+        messages.add(Message("user", promptText))
+
         this.requestFormat = agent.connector?.requestFormat ?: this.requestFormat
         this.responseFormat = agent.connector?.responseFormat ?: this.responseFormat
 
@@ -69,12 +73,14 @@ class CustomAgentExecutor(val project: Project) : CustomSSEProcessor(project) {
                 builder.addHeader("Authorization", "Bearer ${auth.token}")
                 builder.addHeader("Content-Type", "application/json")
             }
+
             null -> {
                 logger.info("No auth type found for agent ${agent.name}")
             }
         }
 
-        client = client.newBuilder().connectTimeout(agent.defaultTimeout, TimeUnit.SECONDS).readTimeout(agent.defaultTimeout, TimeUnit.SECONDS).build()
+        client = client.newBuilder().connectTimeout(agent.defaultTimeout, TimeUnit.SECONDS)
+            .readTimeout(agent.defaultTimeout, TimeUnit.SECONDS).build()
         val call = client.newCall(builder.url(agent.url).post(body).build())
 
         return when (agent.responseAction) {
@@ -97,7 +103,7 @@ class CustomAgentExecutor(val project: Project) : CustomSSEProcessor(project) {
          */
         fun replacePlaceholders(request: String, promptText: String): String {
             var result = request
-            
+
             // Replace simple content placeholder
             if (result.contains(SIMPLE_CONTENT_PLACEHOLDER)) {
                 result = result.replace(SIMPLE_CONTENT_PLACEHOLDER, "\"content\": \"$promptText\"")
@@ -109,7 +115,7 @@ class CustomAgentExecutor(val project: Project) : CustomSSEProcessor(project) {
             if (result.contains(regex)) {
                 result = regex.replace(result, ": \"$promptText\"")
             }
-            
+
             return result
         }
     }

core/src/main/kotlin/cc/unitmesh/devti/provider/devins/LanguageProcessor.kt

@@ -4,12 +4,15 @@ import cc.unitmesh.devti.agent.custom.model.CustomAgentConfig
 import cc.unitmesh.devti.command.dataprovider.BuiltinCommand
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 
 data class CustomAgentContext(
     val config: CustomAgentConfig,
-    val response: String
+    val response: String,
+    val filePath: VirtualFile? = null,
+    var initVariables: Map<String, String> = mapOf()
 )
 
 /**

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/provider/DevInsPromptProcessor.kt

@@ -5,43 +5,58 @@ import cc.unitmesh.devti.command.dataprovider.BuiltinCommand
 import cc.unitmesh.devti.language.DevInLanguage
 import cc.unitmesh.devti.language.compiler.DevInsCompiler
 import cc.unitmesh.devti.language.psi.DevInFile
+import cc.unitmesh.devti.language.run.runner.ShireRunner
 import cc.unitmesh.devti.provider.devins.CustomAgentContext
 import cc.unitmesh.devti.provider.devins.LanguageProcessor
 import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiUtilBase
 
-
 class DevInsPromptProcessor : LanguageProcessor {
     override val name: String = DevInLanguage.displayName
 
     override suspend fun execute(project: Project, context: CustomAgentContext): String {
         var text = context.response
-        // re-check the language of the code
+
         CodeFence.parse(text).let {
             if (it.language == DevInLanguage.INSTANCE) {
                 text = it.text
             }
         }
 
-        val devInsCompiler = createCompiler(project, text)
-        val result = devInsCompiler.compile()
-        AutoDevNotifications.notify(project, result.output)
+        var compileResult: String? = null
+        if (context.filePath != null) {
+            val psiFile = runReadAction { PsiManager.getInstance(project).findFile(context.filePath!!) as? DevInFile }
+            if (psiFile != null) {
+                compileResult = ShireRunner.compileOnly(project, psiFile, context.initVariables).finalPrompt
+            }
+        }
+
+        if (compileResult == null) {
+            val devInsCompiler = createCompiler(project, text)
+            val result = devInsCompiler.compile()
+            compileResult = result.output
+
+            if (result.nextJob != null) {
+                AutoDevNotifications.notify(project, compileResult)
 
-        if (result.nextJob != null) {
-            val nextJob = result.nextJob!!
-            val nextResult = createCompiler(project, nextJob).compile()
-            AutoDevNotifications.notify(project, nextResult.output)
-            return nextResult.output
+                val nextJob = result.nextJob!!
+                val nextResult = createCompiler(project, nextJob).compile()
+                AutoDevNotifications.notify(project, nextResult.output)
+                return nextResult.output
+            }
         }
 
-        return result.output
+        AutoDevNotifications.notify(project, compileResult)
+        return compileResult
     }
 
     override suspend fun compile(project: Project, text: String): String {