Merge pull request #5349 from continuedev/nate/agent-jetbrains

Agent fixes in JetBrains

Author: sestinj

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/IdeProtocolClient.kt

@@ -432,6 +432,25 @@ class IdeProtocolClient(
                         }
                     }
 
+                    "acceptDiff" -> {
+                        val params = Gson().fromJson(
+                            dataElement.toString(),
+                            AcceptDiffParams::class.java
+                        )
+                        val filepath = params.filepath;
+
+                        acceptOrRejectDiff(filepath, true)
+                    }
+
+                    "rejectDiff" -> {
+                        val params = Gson().fromJson(
+                            dataElement.toString(),
+                            RejectDiffParams::class.java
+                        )
+                        val filepath = params.filepath;
+                        acceptOrRejectDiff(filepath, false)
+                    }
+
                     "applyToFile" -> {
                         val params = Gson().fromJson(
                             dataElement.toString(),
@@ -648,6 +667,29 @@ class IdeProtocolClient(
         continuePluginService.sendToWebview("acceptRejectDiff", AcceptRejectDiff(accepted, stepIndex), uuid())
     }
 
+    fun acceptOrRejectDiff(filepath: String, accepted: Boolean) {
+        val virtualFile = VirtualFileManager.getInstance().findFileByUrl(filepath)
+
+        if (virtualFile != null) {
+            ApplicationManager.getApplication().invokeAndWait {
+                val openedEditor =
+                    FileEditorManager.getInstance(project).openFile(virtualFile, true)?.first()
+                if (openedEditor != null) {
+                    val editor: Editor? = FileEditorManager.getInstance(project).selectedTextEditor
+
+                    if (editor != null) {
+                        val diffStreamService = project.service<DiffStreamService>()
+                        if (accepted) {
+                            diffStreamService.accept(editor)
+                        } else {
+                            diffStreamService.reject(editor)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     fun deleteAtIndex(index: Int) {
         continuePluginService.sendToWebview("deleteAtIndex", DeleteAtIndex(index), uuid())
     }

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/IntelliJIde.kt

@@ -192,6 +192,7 @@ class IntelliJIDE(
 
     override suspend fun writeFile(path: String, contents: String) {
         val file = File(URI(path))
+        file.parentFile?.mkdirs()
         file.writeText(contents)
     }
 
@@ -207,7 +208,13 @@ class IntelliJIDE(
     }
 
     override suspend fun openFile(path: String) {
-        val file = LocalFileSystem.getInstance().findFileByPath(URI(path).path)
+        // Convert URI path to absolute file path
+        val filePath = File(URI(path)).absolutePath
+        // Find the file using the absolute path
+        val file = withContext(Dispatchers.IO) {
+            LocalFileSystem.getInstance().refreshAndFindFileByPath(filePath)
+        }
+
         file?.let {
             ApplicationManager.getApplication().invokeLater {
                 FileEditorManager.getInstance(project).openFile(it, true)

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/protocol/ideWebview.kt

@@ -15,6 +15,16 @@ data class ApplyToFileParams(
     val toolCallId: String?
 )
 
+data class AcceptDiffParams(
+    val filepath: String,
+    val streamId: String
+)
+
+data class RejectDiffParams(
+    val filepath: String,
+    val streamId: String
+)
+
 data class InsertAtCursorParams(
     val text: String
 )