From 7115a4b5eebd18f53bed90f740753e2621e8f840 Mon Sep 17 00:00:00 2001
From: kirillk <kirillk@kilocode.ai>
Date: Mon, 13 Apr 2026 10:07:46 -0400
Subject: [PATCH] moving things

---
 .idea/gradle.xml                              | 12 ++++++++
 .../kilocode/backend/{ => app}/CliServer.kt   |  2 +-
 .../backend/{ => app}/KiloAppState.kt         |  2 +-
 .../{ => app}/KiloBackendAppService.kt        | 30 +++++++++++--------
 .../{ => app}/KiloBackendCliManager.kt        |  6 ++--
 .../{ => app}/KiloBackendConnectionService.kt | 13 ++++----
 .../kilocode/backend/rpc/KiloAppRpcApiImpl.kt | 10 +++----
 .../ai/kilocode/backend/{ => util}/KiloLog.kt |  2 +-
 .../ai/kilocode/backend/KiloAppStateTest.kt   | 21 +++++++++----
 .../backend/KiloBackendAppServiceTest.kt      |  2 ++
 .../backend/KiloConnectionServiceTest.kt      | 10 ++++++-
 .../kilocode/backend/testing/FakeCliServer.kt |  2 +-
 .../ai/kilocode/backend/testing/TestLog.kt    |  2 +-
 13 files changed, 79 insertions(+), 35 deletions(-)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => app}/CliServer.kt (94%)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => app}/KiloAppState.kt (98%)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => app}/KiloBackendAppService.kt (94%)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => app}/KiloBackendCliManager.kt (98%)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => app}/KiloBackendConnectionService.kt (97%)
 rename packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/{ => util}/KiloLog.kt (94%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f9fe116bbd..86dbccdc02 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,12 +4,24 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/packages/kilo-jetbrains/build-tasks" name="build-tasks">
+                <projects>
+                  <project path="$PROJECT_DIR$/packages/kilo-jetbrains/build-tasks" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$/packages/kilo-jetbrains" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/packages/kilo-jetbrains" />
             <option value="$PROJECT_DIR$/packages/kilo-jetbrains/backend" />
+            <option value="$PROJECT_DIR$/packages/kilo-jetbrains/build-tasks" />
             <option value="$PROJECT_DIR$/packages/kilo-jetbrains/frontend" />
             <option value="$PROJECT_DIR$/packages/kilo-jetbrains/shared" />
           </set>
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/CliServer.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/CliServer.kt
similarity index 94%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/CliServer.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/CliServer.kt
index 8e803f4557..959f81e259 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/CliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/CliServer.kt
@@ -1,4 +1,4 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.app
 
 /**
  * Abstraction over the CLI process lifecycle.
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloAppState.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
similarity index 98%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloAppState.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
index c1ab27d487..220c11c9b9 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloAppState.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloAppState.kt
@@ -1,4 +1,4 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.app
 
 import ai.kilocode.jetbrains.api.model.Config
 import ai.kilocode.jetbrains.api.model.KiloNotifications200ResponseInner
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendAppService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
similarity index 94%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendAppService.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
index 6a2864a2e1..93fcb6f104 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendAppService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
@@ -1,7 +1,11 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.app
 
+import ai.kilocode.backend.util.IntellijLog
+import ai.kilocode.backend.util.KiloLog
 import ai.kilocode.jetbrains.api.client.DefaultApi
+import ai.kilocode.jetbrains.api.infrastructure.ClientError
 import ai.kilocode.jetbrains.api.infrastructure.ClientException
+import ai.kilocode.jetbrains.api.infrastructure.ServerError
 import ai.kilocode.jetbrains.api.infrastructure.ServerException
 import ai.kilocode.jetbrains.api.model.Config
 import ai.kilocode.jetbrains.api.model.KiloNotifications200ResponseInner
@@ -21,6 +25,8 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import java.net.ConnectException
+import java.net.SocketTimeoutException
 import java.util.concurrent.atomic.AtomicReference
 
 /**
@@ -41,16 +47,16 @@ import java.util.concurrent.atomic.AtomicReference
  */
 @Service(Service.Level.APP)
 class KiloBackendAppService private constructor(
-    private val cs: CoroutineScope,
-    private val server: CliServer,
-    private val log: KiloLog,
+  private val cs: CoroutineScope,
+  private val server: CliServer,
+  private val log: KiloLog,
 ) : Disposable {
 
     /** IntelliJ service injection entry point. */
     constructor(cs: CoroutineScope) : this(
         cs,
         KiloBackendCliManager(),
-        IntellijLog(KiloBackendAppService::class.java),
+      IntellijLog(KiloBackendAppService::class.java),
     )
 
     companion object {
@@ -59,9 +65,9 @@ class KiloBackendAppService private constructor(
 
         /** Test factory — no IntelliJ deps needed. */
         internal fun create(
-            cs: CoroutineScope,
-            server: CliServer,
-            log: KiloLog,
+          cs: CoroutineScope,
+          server: CliServer,
+          log: KiloLog,
         ) = KiloBackendAppService(cs, server, log)
     }
 
@@ -280,8 +286,8 @@ class KiloBackendAppService private constructor(
      */
     private fun logResponseBody(resource: String, e: Exception) {
         val body = when (e) {
-            is ClientException -> (e.response as? ai.kilocode.jetbrains.api.infrastructure.ClientError<*>)?.body
-            is ServerException -> (e.response as? ai.kilocode.jetbrains.api.infrastructure.ServerError<*>)?.body
+            is ClientException -> (e.response as? ClientError<*>)?.body
+            is ServerException -> (e.response as? ServerError<*>)?.body
             else -> null
         }
         if (body != null) {
@@ -376,8 +382,8 @@ private data class FetchResult<T>(val value: T?, val error: LoadError?) {
             when (e) {
                 is ClientException -> "HTTP ${e.statusCode}: ${e.message}"
                 is ServerException -> "HTTP ${e.statusCode}: ${e.message}"
-                is java.net.ConnectException -> "Connection refused: ${e.message}"
-                is java.net.SocketTimeoutException -> "Timeout: ${e.message}"
+                is ConnectException -> "Connection refused: ${e.message}"
+                is SocketTimeoutException -> "Timeout: ${e.message}"
                 else -> e.message
             }
     }
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendCliManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendCliManager.kt
similarity index 98%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendCliManager.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendCliManager.kt
index b171a68841..83890ed30c 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendCliManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendCliManager.kt
@@ -1,5 +1,7 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.app
 
+import ai.kilocode.backend.util.IntellijLog
+import ai.kilocode.backend.util.KiloLog
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.util.system.CpuArch
@@ -16,7 +18,7 @@ import java.util.concurrent.TimeUnit
  * Manages the Kilo CLI binary lifecycle.
  *
  * Extracts the bundled CLI from JAR resources into IntelliJ's system directory,
- * spawns `kilo serve --port 0`, and exposes the result as [CliServer.State].
+ * spawns `kilo serve --port 0`, and exposes the result as [State].
  *
  * Concurrency is handled by the owning [KiloBackendAppService] — all public
  * methods are called under its mutex so no internal synchronization is needed.
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendConnectionService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
similarity index 97%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendConnectionService.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
index a0242dfc1d..23bd1bc10d 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloBackendConnectionService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendConnectionService.kt
@@ -1,5 +1,8 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.app
 
+import ai.kilocode.backend.util.IntellijLog
+import ai.kilocode.backend.KiloBackendHttpClients
+import ai.kilocode.backend.util.KiloLog
 import ai.kilocode.jetbrains.api.client.DefaultApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -50,10 +53,10 @@ data class SseEvent(val type: String, val data: String)
  * Not a service — owned and instantiated by [KiloBackendAppService].
  */
 class KiloConnectionService(
-    private val cs: CoroutineScope,
-    private val server: CliServer,
-    private val onReconnect: () -> Unit,
-    private val log: KiloLog = IntellijLog(KiloConnectionService::class.java),
+  private val cs: CoroutineScope,
+  private val server: CliServer,
+  private val onReconnect: () -> Unit,
+  private val log: KiloLog = IntellijLog(KiloConnectionService::class.java),
 ) {
 
     companion object {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
index 12817fccc8..00280d4793 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAppRpcApiImpl.kt
@@ -2,11 +2,11 @@
 
 package ai.kilocode.backend.rpc
 
-import ai.kilocode.backend.KiloAppState
-import ai.kilocode.backend.KiloBackendAppService
-import ai.kilocode.backend.LoadError
-import ai.kilocode.backend.LoadProgress
-import ai.kilocode.backend.ProfileResult
+import ai.kilocode.backend.app.KiloAppState
+import ai.kilocode.backend.app.KiloBackendAppService
+import ai.kilocode.backend.app.LoadError
+import ai.kilocode.backend.app.LoadProgress
+import ai.kilocode.backend.app.ProfileResult
 import ai.kilocode.rpc.KiloAppRpcApi
 import ai.kilocode.rpc.dto.HealthDto
 import ai.kilocode.rpc.dto.KiloAppStateDto
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloLog.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/util/KiloLog.kt
similarity index 94%
rename from packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloLog.kt
rename to packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/util/KiloLog.kt
index 2dd39579fa..db86201641 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/KiloLog.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/util/KiloLog.kt
@@ -1,4 +1,4 @@
-package ai.kilocode.backend
+package ai.kilocode.backend.util
 
 import com.intellij.openapi.diagnostic.Logger
 
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloAppStateTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloAppStateTest.kt
index c83de8e568..fb1392adac 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloAppStateTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloAppStateTest.kt
@@ -1,5 +1,10 @@
 package ai.kilocode.backend
 
+import ai.kilocode.backend.app.AppData
+import ai.kilocode.backend.app.KiloAppState
+import ai.kilocode.backend.app.LoadError
+import ai.kilocode.backend.app.LoadProgress
+import ai.kilocode.backend.app.ProfileResult
 import ai.kilocode.jetbrains.api.model.Config
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -42,8 +47,8 @@ class KiloAppStateTest {
     @Test
     fun `KiloAppState Error with errors list`() {
         val errors = listOf(
-            LoadError("config", status = 500, detail = "server error"),
-            LoadError("notifications", detail = "timeout"),
+          LoadError("config", status = 500, detail = "server error"),
+          LoadError("notifications", detail = "timeout"),
         )
         val state = KiloAppState.Error("Failed", errors = errors)
         assertEquals(2, state.errors.size)
@@ -55,7 +60,8 @@ class KiloAppStateTest {
     @Test
     fun `AppData construction`() {
         val cfg = Config(model = "test")
-        val data = AppData(profile = null, config = cfg, notifications = emptyList())
+        val data =
+          AppData(profile = null, config = cfg, notifications = emptyList())
         assertNull(data.profile)
         assertEquals(cfg, data.config)
         assertTrue(data.notifications.isEmpty())
@@ -63,7 +69,11 @@ class KiloAppStateTest {
 
     @Test
     fun `LoadError with all fields`() {
-        val err = LoadError(resource = "config", status = 503, detail = "Service Unavailable")
+        val err = LoadError(
+          resource = "config",
+          status = 503,
+          detail = "Service Unavailable"
+        )
         assertEquals("config", err.resource)
         assertEquals(503, err.status)
         assertEquals("Service Unavailable", err.detail)
@@ -79,7 +89,8 @@ class KiloAppStateTest {
     @Test
     fun `ProfileResult enum values`() {
         assertEquals(3, ProfileResult.entries.size)
-        assertTrue(ProfileResult.entries.containsAll(
+        assertTrue(
+          ProfileResult.entries.containsAll(
             listOf(ProfileResult.PENDING, ProfileResult.LOADED, ProfileResult.NOT_LOGGED_IN)
         ))
     }
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloBackendAppServiceTest.kt
index ae74e41b75..23c09ec448 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloBackendAppServiceTest.kt
@@ -1,5 +1,7 @@
 package ai.kilocode.backend
 
+import ai.kilocode.backend.app.KiloAppState
+import ai.kilocode.backend.app.KiloBackendAppService
 import ai.kilocode.backend.testing.FakeCliServer
 import ai.kilocode.backend.testing.MockCliServer
 import ai.kilocode.backend.testing.TestLog
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloConnectionServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloConnectionServiceTest.kt
index 9ebfb29d99..9f51fa364f 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloConnectionServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/KiloConnectionServiceTest.kt
@@ -1,5 +1,8 @@
 package ai.kilocode.backend
 
+import ai.kilocode.backend.app.CliServer
+import ai.kilocode.backend.app.ConnectionState
+import ai.kilocode.backend.app.KiloConnectionService
 import ai.kilocode.backend.testing.FakeCliServer
 import ai.kilocode.backend.testing.MockCliServer
 import ai.kilocode.backend.testing.TestLog
@@ -35,7 +38,12 @@ class KiloConnectionServiceTest {
     @Test
     fun `connect transitions to Connected`() = runBlocking {
         val reconnects = AtomicInteger(0)
-        val svc = KiloConnectionService(scope, fake, { reconnects.incrementAndGet() }, log)
+        val svc = KiloConnectionService(
+          scope,
+          fake,
+          { reconnects.incrementAndGet() },
+          log
+        )
 
         svc.connect()
 
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
index 8e1a4df406..0659cf80b5 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/FakeCliServer.kt
@@ -1,6 +1,6 @@
 package ai.kilocode.backend.testing
 
-import ai.kilocode.backend.CliServer
+import ai.kilocode.backend.app.CliServer
 
 /**
  * Fake [CliServer] that delegates to a [MockCliServer] instead of
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/TestLog.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/TestLog.kt
index 9f91b0add1..35f1bc9256 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/TestLog.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/TestLog.kt
@@ -1,6 +1,6 @@
 package ai.kilocode.backend.testing
 
-import ai.kilocode.backend.KiloLog
+import ai.kilocode.backend.util.KiloLog
 
 /**
  * Test logger that captures messages for assertions and prints to stdout.