From 4cd17dcc551623315e8db312e9a7d95acb683cf5 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 18 May 2026 17:37:40 -0400
Subject: [PATCH] fix(jetbrains): ignore stale workspace reloads

---
 .../ai/kilocode/backend/workspace/KiloBackendWorkspace.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
index 3d5977e1055..f5b41711f3e 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
@@ -90,6 +90,7 @@ class KiloBackendWorkspace(
                 coroutineScope {
                     launch {
                         val result = fetchWithRetry("providers") { fetchProviders() }
+                        ensureActive()
                         if (result.value != null) {
                             prov = result.value
                             progress.updateAndGet { it.copy(providers = true) }
@@ -102,6 +103,7 @@ class KiloBackendWorkspace(
                     }
                     launch {
                         val result = fetchWithRetry("agents") { fetchAgents() }
+                        ensureActive()
                         if (result.value != null) {
                             ag = result.value
                             progress.updateAndGet { it.copy(agents = true) }
@@ -114,6 +116,7 @@ class KiloBackendWorkspace(
                     }
                     launch {
                         val result = fetchWithRetry("commands") { fetchCommands() }
+                        ensureActive()
                         if (result.value != null) {
                             cmd = result.value
                             progress.updateAndGet { it.copy(commands = true) }
@@ -126,6 +129,7 @@ class KiloBackendWorkspace(
                     }
                     launch {
                         val result = fetchWithRetry("skills") { fetchSkills() }
+                        ensureActive()
                         if (result.value != null) {
                             sk = result.value
                             progress.updateAndGet { it.copy(skills = true) }
@@ -138,6 +142,7 @@ class KiloBackendWorkspace(
                     }
                 }
 
+                ensureActive()
                 _state.value = KiloWorkspaceState.Ready(
                     providers = prov!!,
                     agents = ag!!,
@@ -145,7 +150,6 @@ class KiloBackendWorkspace(
                     skills = sk!!,
                 )
                 log.info("Workspace data loaded for $directory")
-                ensureActive()
                 startWatchingGlobalSseEvents()
             } catch (e: CancellationException) {
                 throw e