Merge diff

sourcegraph · Jan 31, 2024 · 623d90a · 623d90a
1 parent 19698e1
commit 623d90a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/com/sourcegraph/cody/agent/CodyAgentClient.java b/src/main/java/com/sourcegraph/cody/agent/CodyAgentClient.java
@@ -18,6 +18,7 @@ public class CodyAgentClient {
   private static final Logger logger = Logger.getInstance(CodyAgentClient.class);
   // Callback that is invoked when the agent sends a "chat/updateMessageInProgress" notification.
   @Nullable public Consumer<WebviewPostMessageParams> onNewMessage;
+  @Nullable public ConfigFeaturesObserver onSetConfigFeatures;
   @Nullable public Editor editor;
 
   /**
@@ -66,5 +67,10 @@ public void webviewPostMessage(WebviewPostMessageParams params) {
       logger.debug("onNewMessage is null or message type is not transcript");
       logger.debug(String.format("webview/postMessage %s: %s", params.getId(), extensionMessage));
     }
+    if (onSetConfigFeatures != null
+            && extensionMessage.getType().equals(ExtensionMessage.Type.SET_CONFIG_FEATURES)) {
+      ApplicationManager.getApplication()
+              .invokeLater(() -> onSetConfigFeatures.update(extensionMessage.getConfigFeatures()));
+    }
   }
 }
diff --git a/src/main/java/com/sourcegraph/cody/agent/WebviewPostMessageParams.kt b/src/main/java/com/sourcegraph/cody/agent/WebviewPostMessageParams.kt
@@ -38,6 +38,7 @@ data class ExtensionMessage(
   object Type {
     const val TRANSCRIPT = "transcript"
     const val ERRORS = "errors"
+    const val SET_CONFIG_FEATURES = "setConfigFeatures"
   }
 }
 

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt
@@ -1,6 +1,7 @@
 package com.sourcegraph.cody.agent
 
 import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
@@ -94,6 +95,7 @@ private constructor(
       try {
         val conn = startAgentProcess()
         val client = CodyAgentClient()
+        client.onSetConfigFeatures = project.service<CurrentConfigFeatures>()
         val launcher = startAgentLauncher(conn, client)
         val server = launcher.remoteProxy
         val listeningToJsonRpc = launcher.startListening()