Merge pull request #214 from devchat-ai/log_completion

feat: Update workflow installation, optimize caching, and refactor folded content handling

Author: kagami-l

gui

@@ -31,7 +31,9 @@ import com.intellij.psi.SmartPsiElementPointer
 
 
 object IDEUtils {
-    private const val MAX_CACHE_SIZE = 1000
+    private const val MAX_CACHE_SIZE = 100
+    private const val MAX_FOLD_CACHE_SIZE = 100 // 可以根据需要调整
+
     private data class CacheEntry(val filePath: String, val offset: Int, val element: SoftReference<SymbolTypeDeclaration>)
 
     private val variableCache = object : LinkedHashMap<String, CacheEntry>(MAX_CACHE_SIZE, 0.75f, true) {
@@ -48,8 +50,11 @@ object IDEUtils {
         val elementHash: Int
     )
 
-    private val foldCache = ConcurrentHashMap<String, SoftReference<FoldCacheEntry>>()
-
+    private val foldCache = object : LinkedHashMap<String, SoftReference<FoldCacheEntry>>(MAX_FOLD_CACHE_SIZE, 0.75f, true) {
+        override fun removeEldestEntry(eldest: Map.Entry<String, SoftReference<FoldCacheEntry>>): Boolean {
+            return size > MAX_FOLD_CACHE_SIZE
+        }
+    }
 
     fun <T> runInEdtAndGet(block: () -> T): T {
         val app = ApplicationManager.getApplication()

src/main/kotlin/ai/devchat/common/IDEUtils.kt

@@ -209,10 +209,12 @@ private suspend fun setupPython(envManager: PythonEnvManager, devChatService: De
 private suspend fun installWorkflows() {
     Log.info("Start checking and copying workflows files")
     val workflowMericoDir = File(PathUtils.workflowMericoPath)
+    var update_public_workflows = CONFIG["update_public_workflow"]
+    val overwrite = devChatVersion != DevChatState.instance.lastVersion
 
-    if (!workflowMericoDir.exists() || !workflowMericoDir.isDirectory || workflowMericoDir.listFiles()?.isEmpty() == true) {
+    if ((overwrite && update_public_workflows == false) || !workflowMericoDir.exists() || !workflowMericoDir.isDirectory || workflowMericoDir.listFiles()?.isEmpty() == true) {
         Log.info("Workflow Merico directory is missing or empty. Creating and populating it.")
-        PathUtils.copyResourceDirToPath("/workflows", PathUtils.workflowPath)
+        PathUtils.copyResourceDirToPath("/workflows", PathUtils.workflowPath, true)
     } else {
         Log.info("Workflow Merico directory exists and is not empty. Skipping copy.")
     }

src/main/kotlin/ai/devchat/plugin/DevChatToolWindowFactory.kt

@@ -80,7 +80,7 @@ class Agent(val scope: CoroutineScope) {
     @SerializedName("llm_time") val llmRequestElapse: Long,
     @SerializedName("model") val model: String? = null,
     @SerializedName("cache_hit") val cacheHit: Boolean = false,
-    @SerializedName("is_manual_trigger") var isManualTrigger: Boolean = false
+    @SerializedName("is_manual_trigger") val isManualTrigger: Boolean = false,
   ) {
     enum class EventType {
       @SerializedName("view") VIEW,
@@ -340,8 +340,11 @@ private fun requestDevChatAPI(prompt: String): Flow<CodeCompletionChunk> = flow
       "command" to "logEvent",
       "id" to logEventRequest.completionId,
       "language" to logEventRequest.language,
-      "name" to logEventRequest.type,
-      "value" to logEventRequest
+      "name" to when(logEventRequest.type) {
+        LogEventRequest.EventType.VIEW -> "view"
+        LogEventRequest.EventType.SELECT -> "select"
+      },
+      "value" to gson.toJson(logEventRequest)
     )
 
     // 使用 Browser 类的 sendToWebView 方法发送消息

src/main/kotlin/ai/devchat/plugin/completion/agent/Agent.kt

@@ -80,7 +80,13 @@ data class CodeSnippet (
 
 class ContextBuilder(val file: PsiFile, val offset: Int) {
     private val CURSOR_MARKER = "<<<CURSOR>>>"
-    private val foldedContentCache = ConcurrentHashMap<Int, Pair<String, Int>>()
+    private val MAX_FOLDED_CONTENT_CACHE_SIZE = 10 // 可以根据需要调整
+
+    private val foldedContentCache = object : LinkedHashMap<Int, Pair<String, Int>>(MAX_FOLDED_CONTENT_CACHE_SIZE, 0.75f, true) {
+        override fun removeEldestEntry(eldest: Map.Entry<Int, Pair<String, Int>>): Boolean {
+            return size > MAX_FOLDED_CONTENT_CACHE_SIZE
+        }
+    }
     private val foldCounter = AtomicInteger(0)
 
     val filepath: String = file.virtualFile.path