From 2eb7a2ff3e6b37d96320b70c5fb462e9b65e29e5 Mon Sep 17 00:00:00 2001
From: "kilo-maintainer[bot]"
 <260744684+kilo-maintainer[bot]@users.noreply.github.com>
Date: Wed, 2 Sep 2026 13:03:20 +0000
Subject: [PATCH 1/3] chore(jetbrains): bump CLI pin to v7.5.9

---
 packages/kilo-jetbrains/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kilo-jetbrains/package.json b/packages/kilo-jetbrains/package.json
index 132b905a0aa..5e496392c40 100644
--- a/packages/kilo-jetbrains/package.json
+++ b/packages/kilo-jetbrains/package.json
@@ -8,7 +8,7 @@
     "test": "./gradlew test",
     "test:ci": "bun script/test-ci.ts"
   },
-  "version": "7.5.5",
+  "version": "7.5.9",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}

From f9cde251e5e9810729332615f60b5a23ea3dc099 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Wed, 2 Sep 2026 09:57:01 -0400
Subject: [PATCH 2/3] chore(jetbrains): sync bun.lock with the 7.5.9 CLI pin

The pin bump changed packages/kilo-jetbrains/package.json without regenerating
the lockfile, leaving bun.lock recording the old 7.5.5 workspace version.
---
 bun.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bun.lock b/bun.lock
index e71895d58fe..5ec7c94cafb 100644
--- a/bun.lock
+++ b/bun.lock
@@ -357,7 +357,7 @@
     },
     "packages/kilo-jetbrains": {
       "name": "@kilocode/kilo-jetbrains",
-      "version": "7.5.5",
+      "version": "7.5.9",
     },
     "packages/kilo-memory": {
       "name": "@kilocode/kilo-memory",

From 6c8efa4a9bde718a4e798697fbf070f523c971d0 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Wed, 2 Sep 2026 09:57:11 -0400
Subject: [PATCH 3/3] test(jetbrains): drop stale branch lookups from dock
 assertions

SessionUiTestBase builds a SessionUi in setUp and never settles, so that UI's
branch refresh is still queued when a test swaps in a FakeWorktreeRpcApi. The
coroutine resolves KiloWorktreeService from inside the launch, so once the shared
single-thread dispatcher reaches it after the swap it records a lookup on the
fake -- with the GitHub flag read before the test changed the setting.

That made the two branch-dock lookup tests fail intermittently in CI with an
extra leading (/test, true) entry. Drain and discard those pre-swap lookups in
the dock() helper so the assertions only see the UI under test.

Verified by blocking the test dispatcher in setUp, which reproduces the exact CI
failure without the fix and passes with it.
---
 .../ai/kilocode/client/session/SessionUiLayoutTest.kt       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
index 7768726d352..4123437f62b 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionUiLayoutTest.kt
@@ -1237,6 +1237,12 @@ class SessionUiLayoutTest : SessionUiTestBase() {
         worktree = fake
         ApplicationManager.getApplication()
             .replaceService(KiloWorktreeService::class.java, KiloWorktreeService(scope, fake), testRootDisposable)
+        // The UI built in setUp launched its own branch lookup before this fake existed, and it
+        // resolves the service inside the coroutine — so it lands on the fake whenever the shared
+        // dispatcher gets to it after the swap. Drain it here and drop what it recorded so the
+        // assertions below only see the lookup made by the UI under test.
+        settle()
+        fake.branchCalls.clear()
         ui = newUi(manager = object : SessionManager {
             override fun newSession() {}
             override fun showHistory(back: (() -> Unit)?) {}