From d37cdd61fa8f20aa75f9983e9dbda371aec3b9b7 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 18 May 2026 18:31:21 -0400
Subject: [PATCH] fix(jetbrains): serialize history deletes

---
 .../ai/kilocode/client/session/history/HistoryController.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryController.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryController.kt
index d4b6165e4d5..81a386fda99 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryController.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/history/HistoryController.kt
@@ -37,6 +37,7 @@ class HistoryController(
     @Volatile
     private var resolved = false
     private val lock = Mutex()
+    private val deletes = Mutex()
 
     /** Whether to filter cloud history by the current repository. */
     var repoOnly: Boolean = false
@@ -94,7 +95,9 @@ class HistoryController(
             val dir = item.directory ?: workspace.directory
             cs.launch {
                 try {
-                    sessions.deleteSession(item.id, dir)
+                    deletes.withLock {
+                        sessions.deleteSession(item.id, dir)
+                    }
                     edt {
                         deleting.remove(item.id)
                         local.remove(item.id)