refactor: remove llm-client dependency in favor of Koog and refresh models

Author: carlrobertoh

build.gradle.kts

@@ -64,7 +64,6 @@ dependencies {
         bundledPlugin("com.intellij.java")
         bundledPlugin("org.jetbrains.kotlin")
         bundledPlugin("Git4Idea")
-        plugin("PythonCore:251.25410.109")
 
         testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.JUnit5)
@@ -73,22 +72,25 @@ dependencies {
     implementation(project(":proxyai-telemetry"))
     implementation(project(":proxyai-treesitter"))
 
-    implementation(platform(libs.okhttp.bom))
     implementation(platform(libs.slf4j.bom))
     implementation(platform(libs.jackson.bom))
     implementation(platform(libs.mcp.sdk.bom))
 
     implementation(libs.jackson.datatype.jdk8)
     implementation(libs.jackson.datatype.jsr310)
     implementation(libs.jackson.module.kotlin)
+    implementation(libs.kotlin.stdlib)
 
     implementation(libs.flexmark.all) {
         // vulnerable transitive dependency
         exclude(group = "org.jsoup", module = "jsoup")
     }
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlin.reflect)
     implementation(libs.koog.agents) {
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-common")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk7")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect")
         exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
         exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
     }

buildSrc/src/main/kotlin/proxyai.java-conventions.gradle.kts

@@ -1,5 +1,6 @@
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val libs = versionCatalogs.named("libs")
@@ -34,13 +35,7 @@ dependencies {
     }
   }
 
-  implementation(lib("llm.client"))
   implementation(lib("kotlinx.serialization.json"))
-  constraints {
-    implementation(lib("okio")) {
-      because("llm-client 0.7.0 uses okio 3.2.0: https://avd.aquasec.com/nvd/cve-2023-3635")
-    }
-  }
 
   testImplementation("junit:junit:4.13.2")
   testImplementation(platform(lib("junit.bom")))
@@ -53,12 +48,21 @@ dependencies {
 
 tasks {
   properties("javaVersion").let {
+    java {
+      toolchain {
+        languageVersion.set(JavaLanguageVersion.of(it.toInt()))
+      }
+    }
+    extensions.configure<KotlinJvmProjectExtension>("kotlin") {
+      jvmToolchain(it.toInt())
+    }
     withType<JavaCompile> {
       sourceCompatibility = it
       targetCompatibility = it
     }
     withType<KotlinCompile> {
       compilerOptions.jvmTarget.set(JvmTarget.fromTarget(it))
+      compilerOptions.freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
     }
   }
 }

gradle.properties

@@ -18,10 +18,10 @@ platformVersion = 2025.1.1
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins =
 
-javaVersion = 17
+javaVersion = 21
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.7
+gradleVersion = 8.13
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
@@ -42,3 +42,6 @@ org.gradle.caching = true
 
 # Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
 systemProp.org.gradle.unsafe.kotlin.assignment = true
+
+# Allow Gradle toolchains to auto-provision JDKs (needed for Java 21 on newer IntelliJ platform)
+org.gradle.java.installations.auto-download = true

gradle/libs.versions.toml

@@ -5,19 +5,16 @@ changelog = "2.2.1"
 checkstyle = "10.15.0"
 commons-text = "1.13.1"
 flexmark = "0.64.8"
-gradle-intellij-plugin-version = "2.6.0"
+gradle-intellij-plugin-version = "2.10.4"
 gson = "2.13.1"
 jackson = "2.18.3"
 mcp = "0.8.0"
 jsoup = "1.21.2"
 jtokkit = "1.1.0"
 junit = "5.13.4"
-kotlin = "2.2.10"
+kotlin = "2.2.20"
 kotlinx-serialization = "1.6.3"
-llm-client = "0.8.58"
-koog = "0.6.2"
-okhttp = "4.12.0"
-okio = "3.15.0"
+koog = "0.6.3"
 slf4j = "2.0.17"
 tree-sitter = "0.24.5"
 grpc = "1.73.0"
@@ -46,9 +43,6 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 koog-agents = { module = "ai.koog:koog-agents", version.ref = "koog" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
-llm-client = { module = "ee.carlrobert:llm-client", version.ref = "llm-client" }
-okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
-okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 slf4j-bom = { module = "org.slf4j:slf4j-bom", version.ref = "slf4j" }
 tree-sitter = { module = "io.github.bonede:tree-sitter", version.ref = "tree-sitter" }
 grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/ee/carlrobert/codegpt/CodeGPTKeys.java

@@ -4,8 +4,8 @@
 import ee.carlrobert.codegpt.inlineedit.InlineEditSession;
 import ee.carlrobert.codegpt.nextedit.NextEditDiffViewer;
 import ee.carlrobert.codegpt.inlineedit.InlineEditInlayRenderer;
+import ee.carlrobert.codegpt.settings.service.codegpt.CodeGPTUserDetails;
 import ee.carlrobert.codegpt.toolwindow.chat.editor.ToolWindowEditorFileDetails;
-import ee.carlrobert.llm.client.codegpt.CodeGPTUserDetails;
 import ee.carlrobert.service.NextEditResponse;
 import com.intellij.openapi.util.TextRange;
 import ee.carlrobert.service.PartialCodeCompletionResponse;

src/main/java/ee/carlrobert/codegpt/EncodingManager.java

@@ -10,11 +10,7 @@
 import com.knuddels.jtokkit.api.IntArrayList;
 import ee.carlrobert.codegpt.conversations.Conversation;
 import ee.carlrobert.codegpt.conversations.message.Message;
-import ee.carlrobert.llm.client.openai.completion.request.OpenAIChatCompletionDetailedMessage;
-import ee.carlrobert.llm.client.openai.completion.request.OpenAIChatCompletionMessage;
-import ee.carlrobert.llm.client.openai.completion.request.OpenAIChatCompletionStandardMessage;
-import ee.carlrobert.llm.client.openai.completion.request.OpenAIMessageTextContent;
-import ee.carlrobert.llm.client.openai.completion.response.ToolCall;
+import ee.carlrobert.codegpt.completions.ChatToolCall;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -55,9 +51,9 @@ public McpToolTokens countMcpToolTokens(Conversation conversation) {
             int inputTokens = 0;
             int outputTokens = 0;
 
-            List<ToolCall> toolCalls = message.getToolCalls();
+            List<ChatToolCall> toolCalls = message.getToolCalls();
             if (toolCalls != null) {
-              for (ToolCall toolCall : toolCalls) {
+              for (ChatToolCall toolCall : toolCalls) {
                 if (toolCall.getFunction() != null && toolCall.getFunction().getArguments() != null) {
                   inputTokens += countTokens(toolCall.getFunction().getArguments());
                 }
@@ -103,19 +99,6 @@ public int getOutputTokens() {
     }
   }
 
-  public int countMessageTokens(OpenAIChatCompletionMessage message) {
-    if (message instanceof OpenAIChatCompletionStandardMessage standardMessage) {
-      return countMessageTokens(standardMessage.getRole(), standardMessage.getContent());
-    }
-
-    return ((OpenAIChatCompletionDetailedMessage) message).getContent().stream()
-        .filter(OpenAIMessageTextContent.class::isInstance)
-        .mapToInt(it -> countMessageTokens(
-            ((OpenAIChatCompletionDetailedMessage) message).getRole(),
-            ((OpenAIMessageTextContent) it).getText()))
-        .sum();
-  }
-
   public int countMessageTokens(String role, String content) {
     var tokensPerMessage = 4; // every message follows <|start|>{role/name}\n{content}<|end|>\n
     return countTokens(role + content) + tokensPerMessage;

src/main/java/ee/carlrobert/codegpt/Icons.java

@@ -25,8 +25,6 @@ public final class Icons {
   public static final Icon Meta = IconLoader.getIcon("/icons/meta.svg", Icons.class);
   public static final Icon Mistral = IconLoader.getIcon("/icons/mistral.svg", Icons.class);
   public static final Icon Moonshot = IconLoader.getIcon("/icons/moonshot.svg", Icons.class);
-  public static final Icon Morph = IconLoader.getIcon("/icons/morph.svg", Icons.class);
-  public static final Icon Relace = IconLoader.getIcon("/icons/relace.svg", Icons.class);
   public static final Icon Inception = IconLoader.getIcon("/icons/inception.svg", Icons.class);
   public static final Icon Send = IconLoader.getIcon("/icons/send.svg", Icons.class);
   public static final Icon Sparkle = IconLoader.getIcon("/icons/sparkle.svg", Icons.class);