1.3.6 (#142)

* 1.3.6

* Update AutoDevAction.kt

Author: acharneski

build.gradle.kts

@@ -26,7 +26,7 @@ repositories {
 val kotlin_version = "1.9.21"
 val jetty_version = "11.0.18"
 val slf4j_version = "2.0.9"
-val skyenet_version = "1.0.56"
+val skyenet_version = "1.0.57"
 val remoterobot_version = "0.11.21"
 dependencies {
 

gradle.properties

@@ -1,6 +1,6 @@
 pluginName=intellij-aicoder
 pluginRepositoryUrl=https://github.com/SimiaCryptus/intellij-aicoder
-pluginVersion=1.3.5
+pluginVersion=1.3.6
 
 jvmArgs=-Xmx8g
 org.gradle.jvmargs=-Xmx8g

src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/AnalogueFileAction.kt

@@ -165,15 +165,5 @@ class AnalogueFileAction : FileContextAction<AnalogueFileAction.Settings>() {
       scheduledPool.schedule(function, 100, TimeUnit.MILLISECONDS)
     }
 
-    fun getModuleRootForFile(file: File): File {
-      var current = file
-      while (current.parentFile != null) {
-        if (current.resolve(".git").exists()) {
-          return current
-        }
-        current = current.parentFile
-      }
-      return file
-    }
   }
 }

src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/AutoDevAction.kt

@@ -139,6 +139,7 @@ class AutoDevAction : BaseAction() {
 
           ### scripts/filename.js
           ```diff
+ import com.simiacryptus.skyenet.webui.components.CheckboxTab
           - const b = 2;
           + const a = 1;
           ```
@@ -150,7 +151,8 @@ class AutoDevAction : BaseAction() {
     ),
     val event: AnActionEvent,
   ) : ActorSystem<AutoDevAgent.ActorTypes>(
-    actorMap.map { it.key.name to it.value }.toMap(), dataStorage, user, session) {
+    actorMap.map { it.key.name to it.value }.toMap(), dataStorage, user, session
+  ) {
     enum class ActorTypes {
       DesignActor,
       TaskCodingActor,
@@ -183,17 +185,19 @@ class AutoDevAction : BaseAction() {
         userMessage = userMessage,
         initialResponse = { it: String -> designActor.answer(toInput(it), api = api) },
         outputFn = { design: ParsedResponse<TaskList> ->
-    //          renderMarkdown("${design.text}\n\n```json\n${JsonUtil.toJson(design.obj).indent("  ")}\n```")
-              AgentPatterns.displayMapInTabs(mapOf(
-                "Text" to renderMarkdown(design.text),
-                "JSON" to renderMarkdown("```json\n${toJson(design.obj).indent("  ")}\n```"),
-                )
-              )
-            },
+          //          renderMarkdown("${design.text}\n\n```json\n${JsonUtil.toJson(design.obj).indent("  ")}\n```")
+          AgentPatterns.displayMapInTabs(
+            mapOf(
+              "Text" to renderMarkdown(design.text),
+              "JSON" to renderMarkdown("```json\n${toJson(design.obj).indent("  ")}\n```"),
+            )
+          )
+        },
         ui = ui,
         reviseResponse = { userMessages: List<Pair<String, Role>> ->
           designActor.respond(
-            messages = (userMessages.map { ApiModel.ChatMessage(it.second, it.first.toContentList()) }.toTypedArray<ApiModel.ChatMessage>()),
+            messages = (userMessages.map { ApiModel.ChatMessage(it.second, it.first.toContentList()) }
+              .toTypedArray<ApiModel.ChatMessage>()),
             input = toInput(userMessage),
             api = api
           )
@@ -205,7 +209,7 @@ class AutoDevAction : BaseAction() {
 
       try {
         architectureResponse.obj.tasks.forEach { (paths, description) ->
-          task.complete(ui.hrefLink(renderMarkdown("Task: $description")){
+          task.complete(ui.hrefLink(renderMarkdown("Task: $description")) {
             val task = ui.newTask()
             task.header("Task: $description")
             val process = { it: StringBuilder ->
@@ -226,12 +230,15 @@ class AutoDevAction : BaseAction() {
                             """.trimMargin()
               }
               ui.socketManager.addApplyDiffLinks2(
+                root = root,
                 code = codeFiles,
                 response = taskActor.answer(listOf(
                   codeSummary(),
                   userMessage,
                   filter.entries.joinToString("\n\n") {
-                    "# ${it.key}\n```${it.key.split('.').last()?.let { escapeHtml4(it).indent("  ") }}\n${it.value.indent("  ")}\n```"
+                    "# ${it.key}\n```${
+                      it.key.split('.').last()?.let { escapeHtml4(it).indent("  ") }
+                    }\n${it.value.indent("  ")}\n```"
                   },
                   architectureResponse.text,
                   "Provide a change for ${paths?.joinToString(",") { it } ?: ""} ($description)"
@@ -266,6 +273,8 @@ class AutoDevAction : BaseAction() {
     }
   }
 
+  val taskStates = mutableMapOf<String, TaskState>()
+
   companion object {
     private val log = LoggerFactory.getLogger(AutoDevAction::class.java)
     private val agents = mutableMapOf<Session, AutoDevApp>()
@@ -306,4 +315,9 @@ class AutoDevAction : BaseAction() {
     }
 
   }
+  enum class TaskState {
+    Pending,
+    InProgress,
+    Completed
+  }
 }

src/main/kotlin/com/github/simiacryptus/aicoder/actions/generic/MultiDiffChatAction.kt

@@ -6,26 +6,26 @@ import com.github.simiacryptus.aicoder.actions.dev.AppServer
 import com.github.simiacryptus.aicoder.config.AppSettingsState
 import com.github.simiacryptus.aicoder.config.AppSettingsState.Companion.chatModel
 import com.github.simiacryptus.aicoder.util.ComputerLanguage
+import com.github.simiacryptus.aicoder.util.UITools
 import com.github.simiacryptus.aicoder.util.addApplyDiffLinks2
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.fileEditor.FileDocumentManager
-import com.simiacryptus.skyenet.core.actors.CodingActor.Companion.indent
 import com.simiacryptus.skyenet.core.platform.ApplicationServices
 import com.simiacryptus.skyenet.core.platform.Session
 import com.simiacryptus.skyenet.core.platform.StorageInterface
 import com.simiacryptus.skyenet.core.platform.User
+import com.simiacryptus.skyenet.webui.application.ApplicationInterface
 import com.simiacryptus.skyenet.webui.application.ApplicationServer
 import com.simiacryptus.skyenet.webui.chat.ChatServer
 import com.simiacryptus.skyenet.webui.chat.ChatSocketManager
 import com.simiacryptus.skyenet.webui.session.SessionTask
 import com.simiacryptus.skyenet.webui.session.SocketManager
-import org.apache.commons.text.StringEscapeUtils.escapeHtml4
+import com.simiacryptus.skyenet.webui.util.MarkdownUtil.renderMarkdown
 import org.slf4j.LoggerFactory
 import java.awt.Desktop
 import java.io.File
-import java.nio.file.Path
 
 class MultiDiffChatAction : BaseAction() {
 
@@ -39,10 +39,18 @@ class MultiDiffChatAction : BaseAction() {
       virtualFiles?.associate { it to ComputerLanguage.findByExtension(it.extension ?: "")?.name } ?: mapOf()
     val virtualFileMap = virtualFiles?.associate { it.toNioPath() to it } ?: mapOf()
     val codeFiles = mutableMapOf<String, String>()
-    val root = virtualFiles?.map { file ->
-      file.toNioPath()
-    }?.toTypedArray()?.commonRoot()!!
-    val paths = virtualFiles.associate { file ->
+    val folder = UITools.getSelectedFolder(e)
+    val root = if (null != folder) {
+      folder.toFile.toPath()
+    } else {
+      getModuleRootForFile(UITools.getSelectedFile(e)?.parent?.toFile ?: throw RuntimeException("")).toPath()
+    }
+
+//    val root = virtualFiles?.map { file ->
+//      file.toNioPath()
+//    }?.toTypedArray()?.commonRoot()!!
+
+    virtualFiles?.associate { file ->
       val relative = root.relativize(file.toNioPath())
       val path = relative.toString()
       val language = languages[file] ?: "plaintext"
@@ -53,26 +61,27 @@ class MultiDiffChatAction : BaseAction() {
 
     fun codeSummary() = codeFiles.entries.joinToString("\n\n") { (path, code) ->
       "# $path\n```${
-        path.split('.').lastOrNull()?.let { escapeHtml4(it).indent("  ") }
-      }\n${code?.let { escapeHtml4(it).indent("  ") }}\n```"
+        path.split('.').lastOrNull()?.let { /*escapeHtml4*/(it)/*.indent("  ")*/ }
+      }\n${code?.let { /*escapeHtml4*/(it)/*.indent("  ")*/ }}\n```"
     }
     val session = StorageInterface.newGlobalID()
     //DataStorage.sessionPaths[session] = root.toFile()
 
+    val codeSummary = codeSummary()
     agents[session] = object : ChatSocketManager(
       session = session,
       model = AppSettingsState.instance.smartModel.chatModel(),
       userInterfacePrompt = """
         |
-        |${escapeHtml4(codeSummary())}
+        |$codeSummary
         |
         """.trimMargin().trim(),
       systemPrompt = """
         You are a helpful AI that helps people with coding.
         
         You will be answering questions about the following code:
         
-        ${codeSummary()}
+        $codeSummary
         
         Response should use one or more code patches in diff format within ```diff code blocks.
         Each diff should be preceded by a header that identifies the file being modified.
@@ -97,7 +106,10 @@ class MultiDiffChatAction : BaseAction() {
     ) {
       override fun renderResponse(response: String, task: SessionTask): String {
         val html = addApplyDiffLinks2(
-          code = codeFiles, response = response, handle = { newCodeMap ->
+          root = root,
+          code = codeFiles,
+          response = response,
+          handle = { newCodeMap ->
           newCodeMap.map { (path, newCode) ->
             val prev = codeFiles[path]
             if (prev != newCode) {
@@ -117,8 +129,8 @@ class MultiDiffChatAction : BaseAction() {
               ""
             }
           }
-        }, task = task, ui = null,)
-        return """<div>$html</div>"""
+        }, task = task, ui = ApplicationInterface(this),)
+        return """<div>${renderMarkdown(html)}</div>"""
       }
     }
 
@@ -155,28 +167,3 @@ class MultiDiffChatAction : BaseAction() {
 
   }
 }
-
-fun Array<Path>.commonRoot() : Path = when {
-  isEmpty() -> error("No paths")
-  size == 1 && first().toFile().isFile -> first().parent
-  size == 1 -> first()
-  else -> this.reduce { a, b ->
-    when {
-      a.startsWith(b) -> b
-      b.startsWith(a) -> a
-      else -> when (val common = a.commonPrefixWith(b)) {
-        a -> a
-        b -> b
-        else -> common.toAbsolutePath()
-      }
-    }
-  }
-}
-private fun Path.commonPrefixWith(b: Path): Path {
-  val a = this
-  val aParts = a.toAbsolutePath().toString().split(File.separator)
-  val bParts = b.toAbsolutePath().toString().split(File.separator)
-  val common = aParts.zip(bParts).takeWhile { (a, b) -> a == b }.map { it.first }
-  return File(File.separator + common.joinToString(File.separator)).toPath()
-}
-