feat: proxyai agent

Author: carlrobertoh

build.gradle.kts

@@ -37,6 +37,7 @@ plugins {
     id("org.jetbrains.intellij.platform")
     alias(libs.plugins.changelog)
     alias(libs.plugins.protobuf)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 group = properties("pluginGroup").get()
@@ -72,26 +73,37 @@ dependencies {
     implementation(project(":codegpt-telemetry"))
     implementation(project(":codegpt-treesitter"))
 
+    implementation(platform(libs.okhttp.bom))
+    implementation(platform(libs.slf4j.bom))
     implementation(platform(libs.jackson.bom))
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation(platform(libs.mcp.sdk.bom))
+
+    implementation(libs.jackson.datatype.jdk8)
+    implementation(libs.jackson.datatype.jsr310)
+    implementation(libs.jackson.module.kotlin)
+
     implementation(libs.flexmark.all) {
         // vulnerable transitive dependency
         exclude(group = "org.jsoup", module = "jsoup")
     }
-    implementation(kotlin("stdlib"))
-    implementation(kotlin("reflect"))
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.koog.agents) {
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
+    }
     implementation(libs.jsoup)
     implementation(libs.commons.text)
     implementation(libs.jtokkit)
+
     implementation(libs.grpc.protobuf)
     implementation(libs.grpc.stub)
     implementation(libs.grpc.netty.shaded)
     implementation(libs.protobuf.runtime)
-    implementation(platform(libs.mcp.sdk.bom))
+
     implementation(libs.mcp.sdk)
-    testImplementation("junit:junit:4.13.2")
+
+    testImplementation(libs.junit4)
     testImplementation(kotlin("test"))
 }
 

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

@@ -35,6 +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")

gradle/libs.versions.toml

@@ -13,8 +13,12 @@ jsoup = "1.21.2"
 jtokkit = "1.1.0"
 junit = "5.13.4"
 kotlin = "2.2.10"
-llm-client = "0.8.56"
+kotlinx-serialization = "1.6.3"
+llm-client = "0.8.58"
+koog = "0.6.0"
+okhttp = "4.12.0"
 okio = "3.15.0"
+slf4j = "2.0.17"
 tree-sitter = "0.24.5"
 grpc = "1.73.0"
 protobuf = "3.25.1"
@@ -28,14 +32,24 @@ flexmark-all = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "fl
 gradle-intellij-plugin = { module = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin", version.ref = "gradle-intellij-plugin-version" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" }
+jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }
+jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
+jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 mcp-sdk = { module = "io.modelcontextprotocol.sdk:mcp", version.ref = "mcp" }
 mcp-sdk-bom = { module = "io.modelcontextprotocol.sdk:mcp-bom", version.ref = "mcp" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 jtokkit = { module = "com.knuddels:jtokkit", version.ref = "jtokkit" }
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit4 = { module = "junit:junit", version = "4.13.2" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+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" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
@@ -46,4 +60,5 @@ protobuf-runtime = { module = "com.google.protobuf:protobuf-java", version.ref =
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }

src/main/java/ee/carlrobert/codegpt/completions/ToolwindowChatCompletionRequestHandler.java

@@ -128,8 +128,8 @@ private EventSource startCall(ChatCompletionParameters callParameters) {
       }
     } catch (Throwable ex) {
       handleCallException(ex);
-      throw ex;
     }
+    return null;
   }
 
   private void handleCallException(Throwable ex) {

src/main/java/ee/carlrobert/codegpt/settings/service/FeatureType.java

@@ -1,6 +1,7 @@
 package ee.carlrobert.codegpt.settings.service;
 
 public enum FeatureType {
+  AGENT,
   CHAT,
   CODE_COMPLETION,
   AUTO_APPLY,

src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanel.java

@@ -14,6 +14,7 @@
 import com.intellij.util.concurrency.AppExecutorUtil;
 import com.intellij.util.ui.JBUI;
 import ee.carlrobert.codegpt.CodeGPTKeys;
+import ee.carlrobert.codegpt.CodeGPTBundle;
 import ee.carlrobert.codegpt.EncodingManager;
 import ee.carlrobert.codegpt.ReferencedFile;
 import ee.carlrobert.codegpt.actions.ActionType;
@@ -38,6 +39,7 @@
 import ee.carlrobert.codegpt.toolwindow.chat.structure.data.PsiStructureRepository;
 import ee.carlrobert.codegpt.toolwindow.chat.structure.data.PsiStructureState;
 import ee.carlrobert.codegpt.toolwindow.chat.ui.ChatMessageResponseBody;
+import ee.carlrobert.codegpt.toolwindow.chat.editor.header.LoadingPanel;
 import ee.carlrobert.codegpt.toolwindow.chat.ui.ChatToolWindowScrollablePanel;
 import ee.carlrobert.codegpt.toolwindow.chat.ui.textarea.TotalTokensDetails;
 import ee.carlrobert.codegpt.toolwindow.chat.ui.textarea.TotalTokensPanel;
@@ -57,10 +59,10 @@
 import ee.carlrobert.codegpt.ui.textarea.header.tag.TagManager;
 import ee.carlrobert.codegpt.util.EditorUtil;
 import ee.carlrobert.codegpt.util.coroutines.CoroutineDispatchers;
+import ee.carlrobert.llm.client.openai.completion.ErrorDetails;
 import git4idea.GitCommit;
 import java.awt.BorderLayout;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -93,6 +95,8 @@ public class ChatToolWindowTabPanel implements Disposable {
   private final TagManager tagManager;
   private final JPanel mcpApprovalContainer;
   private @Nullable ToolwindowChatCompletionRequestHandler requestHandler;
+  private LoadingPanel inputLoadingPanel;
+  private final JPanel queuedMessageContainer;
 
   public ChatToolWindowTabPanel(@NotNull Project project, @NotNull Conversation conversation) {
     this.project = project;
@@ -130,6 +134,11 @@ public ChatToolWindowTabPanel(@NotNull Project project, @NotNull Conversation co
     mcpApprovalContainer.setBorder(JBUI.Borders.empty());
     mcpApprovalContainer.setOpaque(false);
 
+    queuedMessageContainer = new JPanel();
+    queuedMessageContainer.setLayout(new BoxLayout(queuedMessageContainer, BoxLayout.Y_AXIS));
+    queuedMessageContainer.setBorder(JBUI.Borders.empty());
+    queuedMessageContainer.setOpaque(false);
+
     rootPanel = createRootPanel();
 
     if (conversation.getMessages().isEmpty()) {
@@ -414,7 +423,7 @@ private ResponseMessagePanel createResponseMessagePanel(ChatCompletionParameters
         false,
         message.isWebSearchIncluded(),
         fileContextIncluded || message.getDocumentationDetails() != null,
-        true,
+        false,
         this));
     return panel;
   }
@@ -481,6 +490,7 @@ private void call(
     }
 
     userInputPanel.setSubmitEnabled(false);
+    userInputPanel.setStopEnabled(true);
     userMessagePanel.disableActions(List.of("RELOAD", "DELETE"));
     responseMessagePanel.disableActions(List.of("COPY"));
 
@@ -493,13 +503,37 @@ private void call(
             totalTokensPanel,
             userInputPanel) {
           @Override
+          public void handleRequestOpen() {
+            super.handleRequestOpen();
+            showInputLoading(CodeGPTBundle.get("toolwindow.chat.loading"));
+          }
+
+          @Override
+          public void handleCompleted(String fullMessage, ChatCompletionParameters callParameters) {
+            try {
+              super.handleCompleted(fullMessage, callParameters);
+            } finally {
+              hideInputLoading();
+            }
+          }
+
+          @Override
+          public void handleError(ErrorDetails error, Throwable ex) {
+            try {
+              super.handleError(error, ex);
+            } finally {
+              hideInputLoading();
+            }
+          }
+          @Override
           public void handleTokensExceededPolicyAccepted() {
             call(callParameters, responseMessagePanel, userMessagePanel);
           }
         },
         this);
 
     requestHandler.setResponseMessagePanel(responseMessagePanel);
+    showInputLoading(CodeGPTBundle.get("toolwindow.chat.loading"));
     requestHandler.call(callParameters);
   }
 
@@ -520,7 +554,7 @@ private Unit handleSubmit(String text) {
           .filter(TagDetails::getSelected)
           .collect(Collectors.toList());
 
-      var messageBuilder = new MessageBuilder(project, text).withInlays(appliedTags);
+      var messageBuilder = new MessageBuilder(project, text).withTags(appliedTags);
 
       List<ReferencedFile> referencedFiles = getReferencedFiles(appliedTags);
       if (!referencedFiles.isEmpty()) {
@@ -547,27 +581,15 @@ private Unit handleSubmit(String text) {
   private Unit handleCancel() {
     if (requestHandler != null) {
       requestHandler.cancel();
+      ApplicationManager.getApplication().invokeLater(() -> {
+        mcpApprovalContainer.removeAll();
+        updateUserPromptPanel();
+        hideInputLoading();
+        userInputPanel.setSubmitEnabled(true);
+        CompletionProgressNotifier.update(project, false);
+        requestHandler = null;
+      });
     }
-    ApplicationManager.getApplication().invokeLater(() -> {
-      mcpApprovalContainer.removeAll();
-      updateUserPromptPanel();
-      var lastComponent = toolWindowScrollablePanel.getLastComponent();
-      if (lastComponent != null) {
-        Arrays.stream(lastComponent.getComponents())
-            .filter(ResponseMessagePanel.class::isInstance)
-            .findFirst()
-            .ifPresent(panel -> {
-              ResponseMessagePanel responsePanel = (ResponseMessagePanel) panel;
-              var responseComponent = responsePanel.getResponseComponent();
-              if (responseComponent != null) {
-                responseComponent.stopLoading();
-              }
-            });
-      }
-      userInputPanel.setSubmitEnabled(true);
-      CompletionProgressNotifier.update(project, false);
-    });
-    requestHandler = null;
     return Unit.INSTANCE;
   }
 
@@ -581,6 +603,16 @@ private JPanel createUserPromptPanel() {
     topContainer.setLayout(new BoxLayout(topContainer, BoxLayout.Y_AXIS));
     topContainer.setOpaque(false);
 
+    inputLoadingPanel = new LoadingPanel(CodeGPTBundle.get("toolwindow.chat.loading"), null, null);
+    inputLoadingPanel.setAlignmentX(JComponent.LEFT_ALIGNMENT);
+    inputLoadingPanel.setVisible(false);
+    topContainer.add(inputLoadingPanel);
+
+    if (queuedMessageContainer.getComponentCount() > 0) {
+      queuedMessageContainer.setAlignmentX(JComponent.LEFT_ALIGNMENT);
+      topContainer.add(queuedMessageContainer);
+    }
+
     if (mcpApprovalContainer.getComponentCount() > 0) {
       mcpApprovalContainer.setAlignmentX(JComponent.LEFT_ALIGNMENT);
       topContainer.add(mcpApprovalContainer);
@@ -596,6 +628,23 @@ private JPanel createUserPromptPanel() {
     return panel;
   }
 
+  private void showInputLoading(String text) {
+    if (inputLoadingPanel != null) {
+      inputLoadingPanel.setText(text);
+      inputLoadingPanel.setVisible(true);
+      inputLoadingPanel.revalidate();
+      inputLoadingPanel.repaint();
+    }
+  }
+
+  private void hideInputLoading() {
+    if (inputLoadingPanel != null) {
+      inputLoadingPanel.setVisible(false);
+      inputLoadingPanel.revalidate();
+      inputLoadingPanel.repaint();
+    }
+  }
+
   private JComponent getLandingView() {
     return new ChatToolWindowLandingPanel((action, locationOnScreen) -> {
       var editor = EditorUtil.getSelectedEditor(project);

src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ToolWindowCompletionResponseEventListener.java

@@ -35,7 +35,7 @@ abstract class ToolWindowCompletionResponseEventListener implements
   private final UserMessagePanel userMessagePanel;
   private ChatMessageResponseBody responseContainer;
   private final TotalTokensPanel totalTokensPanel;
-  private final UserInputPanel textArea;
+  private final UserInputPanel userInputPanel;
 
   private final Timer updateTimer = new Timer(UPDATE_INTERVAL_MS, e -> processBufferedMessages());
   private final ConcurrentLinkedQueue<String> messageBuffer = new ConcurrentLinkedQueue<>();
@@ -47,13 +47,13 @@ public ToolWindowCompletionResponseEventListener(
       UserMessagePanel userMessagePanel,
       ResponseMessagePanel responsePanel,
       TotalTokensPanel totalTokensPanel,
-      UserInputPanel textArea) {
+      UserInputPanel userInputPanel) {
     this.encodingManager = EncodingManager.getInstance();
     this.project = project;
     this.userMessagePanel = userMessagePanel;
     this.responsePanel = responsePanel;
     this.totalTokensPanel = totalTokensPanel;
-    this.textArea = textArea;
+    this.userInputPanel = userInputPanel;
   }
 
   public abstract void handleTokensExceededPolicyAccepted();
@@ -146,7 +146,7 @@ public void handleCompleted(String fullMessage, ChatCompletionParameters callPar
             container.withResponse(fullMessage);
           }
         }
-        totalTokensPanel.updateUserPromptTokens(textArea.getText());
+        totalTokensPanel.updateUserPromptTokens(userInputPanel.getText());
         totalTokensPanel.updateConversationTokens(callParameters.getConversation());
       } finally {
         stopStreaming(responseContainer);
@@ -184,11 +184,11 @@ private void processBufferedMessages() {
 
   private void stopStreaming(ChatMessageResponseBody responseContainer) {
     stopped = true;
-    textArea.setSubmitEnabled(true);
+    userInputPanel.setSubmitEnabled(true);
+    userInputPanel.setStopEnabled(false);
     userMessagePanel.enableAllActions(true);
     responsePanel.enableAllActions(true);
     if (responseContainer != null) {
-      responseContainer.stopLoading();
       responseContainer.hideCaret();
       responseContainer.finishThinking();
     }