feat(commands): replace PATCH with EDIT_FILE command #408

Replace the PATCH command with a new EDIT_FILE command that provides structured file editing capabilities. The new command uses target_file, instructions, and code_edit parameters with clear context markers (// ... existing code ...) for precise modifications. Updates all related processors, factories, templates, and documentation to use the new edit_file syntax.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/bridge/BridgeToolProvider.kt

@@ -7,7 +7,7 @@ import cc.unitmesh.devti.provider.toolchain.ToolchainFunctionProvider
 import com.intellij.openapi.project.Project
 
 object BridgeToolProvider {
-    val Tools = setOf(STRUCTURE, RIPGREP_SEARCH, DATABASE, DIR, WRITE, PATCH, FILE)
+    val Tools = setOf(STRUCTURE, RIPGREP_SEARCH, DATABASE, DIR, WRITE, FILE, EDIT_FILE)
 
     suspend fun collect(project: Project): List<AgentTool> {
         val commonTools = Tools

core/src/main/kotlin/cc/unitmesh/devti/command/dataprovider/BuiltinCommand.kt

@@ -56,6 +56,12 @@ enum class BuiltinCommand(
         AllIcons.Vcs.Patch_file,
         false
     ),
+    EDIT_FILE(
+        "edit_file",
+        "Apply structured file edits using target_file, instructions, and code_edit parameters. Designed for precise code modifications with clear context markers. Use // ... existing code ... to represent unchanged sections. Ideal for targeted edits with explicit instructions.",
+        AllIcons.Actions.Edit,
+        false
+    ),
     RUN(
         "run",
         "Execute IntelliJ IDEA's built-in build and test commands. Use for running Gradle tasks, Maven goals, npm scripts, or test suites. Essential for validating code changes and ensuring project builds correctly. Returns execution output, exit codes, and error information.",

core/src/main/kotlin/cc/unitmesh/devti/sketch/AutoSketchMode.kt

@@ -89,7 +89,7 @@ class AutoSketchMode(val project: Project) {
         )
 
         of += setOf(
-            PATCH, DATABASE, WRITE
+            EDIT_FILE, DATABASE, WRITE
         )
 
         return of

core/src/main/resources/genius/en/code/bridge.vm

@@ -127,7 +127,7 @@ Here is an example output to the USER:
 根据您的项目结构，我建议您先使用  gogocode 迁移工具进行迁移，这是一个非常好的选择。先提供 gogocode 迁移方案，然后等待用户的回复。与此同时，
 我将更新项目的依赖信息：
 <devin>
-./gradlew :build --refresh-dependencies  [注释：需要，用户先打 patch，再刷新项目依赖]
+./gradlew :build --refresh-dependencies  [注释：需要，用户先编辑文件，再刷新项目依赖]
 </devin>
 
 </you.answer4>
@@ -138,8 +138,11 @@ Here is an example output to the USER:
 // ... 优先使用 DevIns 指令来修改代码和提供范例
 现在，我将读取 xx 文件，然后为您提供迁移示例：
 <devin>
-```patch
-//
+/edit_file:xx_file.java
+```
+target_file: "xx_file.java"
+instructions: "Migrate code structure"
+code_edit: "// migration code"
 ```
 </devin>
 </your.answer5>

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

@@ -132,28 +132,34 @@ have created a routes.py and main.js file, and updated the main.html file.
 
 根据我先前的计划，还有一些步骤需要完成。如果您遇到任何错误或想添加新功能，请告诉我！
 
-// then you can start coding with DevIn language. When you need to or patch, write execute the code, you should use the DevIn language
+// then you can start coding with DevIn language. When you need to edit files, you should use the DevIn language
 // If you need to create a new file, you should use `/write` command, then write the code in the code block
 <devin>
-/patch:src/main/route.py [注释：当确定文件不存在时，才能创建文件]
-```patch
-Index: src/main/route.py
-// the rest code
+/edit_file:src/main/route.py [注释：当确定文件不存在时，才能创建文件]
+```
+target_file: "src/main/route.py"
+instructions: "Create route.py file with upload and query endpoints"
+code_edit: "// the rest code"
 ```
 </devin>
-// patch to call tools for step 3 with DevIn language, should use `<devin />` tag with DevIn language
-// 如果要应用补丁，请使用 `/patch` 命令，然后在代码块中编写补丁，每个 patch 只能修改一个文件，并且使用独立的 `<devin />` 标签
+// edit_file to call tools for step 3 with DevIn language, should use `<devin />` tag with DevIn language
+// 如果要编辑文件，请使用 `/edit_file` 命令，然后在代码块中编写编辑内容，每个 edit_file 只能修改一个文件，并且使用独立的 `<devin />` 标签
 <devin>
-/patch:src/main/index.html
-```patch
-Index: src/main/index.html
-...
+/edit_file:src/main/index.html
+```
+target_file: "src/main/index.html"
+instructions: "Update index.html file"
+code_edit: "..."
 ```
 </devin>
 // step 4.1, call tools to create test code and run test code
 <devin>
-/patch:src/test/test_routes.py
-```patch
+/edit_file:src/test/test_routes.py
+```
+target_file: "src/test/test_routes.py"
+instructions: "Create test file for routes"
+code_edit: "// the rest code"
+```
 Index: src/test/test_routes.py
 // the rest code
 ```
@@ -219,10 +225,11 @@ feat: add delete blog functionality
 </devin>
 // 其它代码修改
 <devin>
-/patch:SketchRunContext.java
-```patch
-Index: SketchRunContext.java
-...
+/edit_file:SketchRunContext.java
+```
+target_file: "SketchRunContext.java"
+instructions: "Optimize SketchRunContext code structure"
+code_edit: "..."
 ```
 </devin>
 // 你需要根据上下文来生成启动命令，可以尽可能使用 bash 命令来启动应用程序

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

@@ -127,7 +127,7 @@ Here is an example output to the USER:
 根据您的项目结构，我建议您先使用  gogocode 迁移工具进行迁移，这是一个非常好的选择。先提供 gogocode 迁移方案，然后等待用户的回复。与此同时，
 我将更新项目的依赖信息：
 ```bash
-./gradlew :build --refresh-dependencies  [注释：需要，用户先打 patch，再刷新项目依赖]
+./gradlew :build --refresh-dependencies  [注释：需要，用户先编辑文件，再刷新项目依赖]
 ```
 
 </you.answer4>
@@ -138,8 +138,11 @@ Here is an example output to the USER:
 // ... 优先使用 DevIns 指令来修改代码和提供范例
 现在，我将读取 xx 文件，然后为您提供迁移示例：
 <devin>
-```patch
-//
+/edit_file:xx_file.java
+```
+target_file: "xx_file.java"
+instructions: "迁移代码结构"
+code_edit: "// 迁移代码"
 ```
 </devin>
 </your.answer5>

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

@@ -111,21 +111,23 @@ say 'I will edit your file'.
 # 第一步. 创建 routes.py
 我将创建了 routes.py 来定义 "/upload" 和 "/query" 端点。此外，我还添加了 "/" 作为 main.html 的端点。
 <devin>
-/patch:src/main/route.py [注释：当确定文件不存在时，才能创建文件]
-```patch
-Index: src/main/route.py
-// the rest code
+/edit_file:src/main/route.py [注释：当确定文件不存在时，才能创建文件]
+```
+target_file: "src/main/route.py"
+instructions: "Create route.py file with upload and query endpoints"
+code_edit: "// the rest code"
 ```
 </devin>
 # 第二步. 创建 main.js
 我将创建一个专用的 main.js 文件来存储所有的交互式前端代码。它定义了显示窗口和按钮的 UI 元素，并为这些按钮创建了事件监听器。
-   // patch to call tools for step 3 with DevIn language, should use `<devin />` tag with DevIn language
-// 如果要应用补丁，请使用 `/patch` 命令，然后在代码块中编写补丁，每个 patch 只能修改一个文件，并且使用独立的 `<devin />` 标签
+   // edit_file to call tools for step 3 with DevIn language, should use `<devin />` tag with DevIn language
+// 如果要编辑文件，请使用 `/edit_file` 命令，然后在代码块中编写编辑内容，每个 edit_file 只能修改一个文件，并且使用独立的 `<devin />` 标签
 <devin>
-/patch:src/main/index.html
-```patch
-Index: src/main/index.html
-...
+/edit_file:src/main/index.html
+```
+target_file: "src/main/index.html"
+instructions: "Update index.html file"
+code_edit: "..."
 ```
 </devin>
 
@@ -136,10 +138,11 @@ Index: src/main/index.html
 我将使用 Flask 的测试框架编写自动化测试用例，以确保应用程序的功能正常。
 // step 4.1, call tools to create test code and run test code
 <devin>
-/patch:src/test/test_routes.py
-```patch
-Index: src/test/test_routes.py
-// the rest code
+/edit_file:src/test/test_routes.py
+```
+target_file: "src/test/test_routes.py"
+instructions: "Create test file for routes"
+code_edit: "// the rest code"
 ```
 </devin>
 现在，你可以执行代码
@@ -207,10 +210,11 @@ feat: add delete blog functionality
 </devin>
 // 其它代码修改
 <devin>
-/patch:SketchRunContext.java
-```patch
-Index: SketchRunContext.java
-...
+/edit_file:SketchRunContext.java
+```
+target_file: "SketchRunContext.java"
+instructions: "Optimize SketchRunContext code structure"
+code_edit: "..."
 ```
 </devin>
 // 你需要根据上下文来生成启动命令，可以尽可能使用 bash 命令来启动应用程序

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

@@ -0,0 +1,191 @@
+package cc.unitmesh.devti.language.compiler.exec
+
+import cc.unitmesh.devti.AutoDevNotifications
+import cc.unitmesh.devti.command.InsCommand
+import cc.unitmesh.devti.command.dataprovider.BuiltinCommand
+import cc.unitmesh.devti.language.compiler.error.DEVINS_ERROR
+import cc.unitmesh.devti.language.utils.lookupFile
+import cc.unitmesh.devti.sketch.AutoSketchMode
+import cc.unitmesh.devti.sketch.ui.patch.readText
+import cc.unitmesh.devti.sketch.ui.patch.writeText
+import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
+import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.vfs.VirtualFile
+
+class EditFileInsCommand(val myProject: Project, val prop: String, val codeContent: String) : InsCommand {
+    override val commandName: BuiltinCommand = BuiltinCommand.EDIT_FILE
+
+    override suspend fun execute(): String? {
+        val editRequest = parseEditRequest(codeContent)
+        if (editRequest == null) {
+            val shouldShowNotification = shouldShowParseErrorNotification()
+            if (shouldShowNotification) {
+                AutoDevNotifications.warn(myProject, "Failed to parse edit_file request from content")
+            }
+            return "$DEVINS_ERROR: Failed to parse edit_file request"
+        }
+
+        val disposable = Disposer.newCheckedDisposable()
+        var result: String? = null
+
+        runInEdtAsync(disposable) {
+            val projectDir = myProject.guessProjectDir()
+            if (projectDir == null) {
+                result = "$DEVINS_ERROR: Project directory not found"
+                return@runInEdtAsync
+            }
+
+            val targetFile = findTargetFile(editRequest.targetFile, projectDir)
+            if (targetFile == null) {
+                result = "$DEVINS_ERROR: File not found: ${editRequest.targetFile}"
+                return@runInEdtAsync
+            }
+
+            try {
+                val originalContent = targetFile.readText()
+                val editedContent = applyEdit(originalContent, editRequest.codeEdit)
+                
+                targetFile.writeText(editedContent)
+                FileEditorManager.getInstance(myProject).openFile(targetFile, true)
+                
+                result = "File edited successfully: ${editRequest.targetFile}"
+            } catch (e: Exception) {
+                result = "$DEVINS_ERROR: Failed to apply edit to ${editRequest.targetFile}: ${e.message}"
+            }
+        }
+
+        if (AutoSketchMode.getInstance(myProject).isEnable) {
+            result = ""
+        }
+
+        return result
+    }
+
+    private fun findTargetFile(targetPath: String, projectDir: VirtualFile): VirtualFile? {
+        return runReadAction {
+            // Try relative path first
+            projectDir.findFileByRelativePath(targetPath) 
+                ?: myProject.lookupFile(targetPath)
+        }
+    }
+
+    private fun applyEdit(originalContent: String, codeEdit: String): String {
+        val originalLines = originalContent.lines()
+        val editLines = codeEdit.lines()
+
+        // Simple approach: replace the entire content with the edit
+        // The edit should contain the complete intended content with markers
+        val result = mutableListOf<String>()
+        var originalIndex = 0
+
+        for (editLine in editLines) {
+            val trimmedEditLine = editLine.trim()
+
+            // Check if this is an "existing code" marker
+            if (isExistingCodeMarker(trimmedEditLine)) {
+                // Find the next non-marker line in the edit to know where to stop copying
+                val nextEditLineIndex = findNextNonMarkerLine(editLines, editLines.indexOf(editLine) + 1)
+                val nextEditLine = if (nextEditLineIndex >= 0) editLines[nextEditLineIndex].trim() else null
+
+                // Copy original lines until we find the next edit line or reach the end
+                while (originalIndex < originalLines.size) {
+                    val originalLine = originalLines[originalIndex]
+                    result.add(originalLine)
+                    originalIndex++
+
+                    // If we found the next edit line in the original, stop copying
+                    if (nextEditLine != null && originalLine.trim() == nextEditLine) {
+                        originalIndex-- // Back up one so the next edit line replaces this one
+                        break
+                    }
+                }
+            } else {
+                // This is an actual edit line - add it and skip any matching original line
+                result.add(editLine)
+
+                // Skip the corresponding original line if it matches
+                if (originalIndex < originalLines.size &&
+                    originalLines[originalIndex].trim() == trimmedEditLine) {
+                    originalIndex++
+                }
+            }
+        }
+
+        return result.joinToString("\n")
+    }
+
+    private fun isExistingCodeMarker(line: String): Boolean {
+        return line.startsWith("//") &&
+               (line.contains("existing code") || line.contains("... existing code ..."))
+    }
+
+    private fun findNextNonMarkerLine(lines: List<String>, startIndex: Int): Int {
+        for (i in startIndex until lines.size) {
+            if (!isExistingCodeMarker(lines[i].trim())) {
+                return i
+            }
+        }
+        return -1
+    }
+
+    private fun parseEditRequest(content: String): EditRequest? {
+        return try {
+            // Parse the edit_file function call format - handle both JSON-like and function parameter formats
+            val targetFileRegex = """target_file["\s]*[:=]["\s]*["']([^"']+)["']""".toRegex()
+            val instructionsRegex = """instructions["\s]*[:=]["\s]*["']([^"']*?)["']""".toRegex(RegexOption.DOT_MATCHES_ALL)
+
+            // For code_edit, we need to handle multiline content more carefully
+            val codeEditPattern = """code_edit["\s]*[:=]["\s]*["'](.*?)["']""".toRegex(RegexOption.DOT_MATCHES_ALL)
+
+            val targetFileMatch = targetFileRegex.find(content)
+            val instructionsMatch = instructionsRegex.find(content)
+            val codeEditMatch = codeEditPattern.find(content)
+
+            if (targetFileMatch != null && codeEditMatch != null) {
+                val codeEditContent = codeEditMatch.groupValues[1]
+                    .replace("\\n", "\n")  // Handle escaped newlines
+                    .replace("\\\"", "\"") // Handle escaped quotes
+                    .replace("\\'", "'")   // Handle escaped single quotes
+
+                EditRequest(
+                    targetFile = targetFileMatch.groupValues[1],
+                    instructions = instructionsMatch?.groupValues?.get(1) ?: "",
+                    codeEdit = codeEditContent
+                )
+            } else {
+                null
+            }
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private fun shouldShowParseErrorNotification(): Boolean {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastErrorTime > ERROR_TIME_WINDOW_MS) {
+            parseErrorCount = 0
+            lastErrorTime = currentTime
+        }
+        
+        parseErrorCount++
+        
+        return parseErrorCount <= MAX_ERRORS_IN_WINDOW
+    }
+
+    companion object {
+        private const val MAX_ERRORS_IN_WINDOW = 3
+        private const val ERROR_TIME_WINDOW_MS = 60000L
+        private var parseErrorCount = 0
+        private var lastErrorTime = 0L
+    }
+}
+
+data class EditRequest(
+    val targetFile: String,
+    val instructions: String,
+    val codeEdit: String
+)