diff --git a/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java b/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
index 38c1be35bd1..d3073e94874 100644
--- a/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
+++ b/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
@@ -53,6 +53,9 @@ public class IntelliJExtManager {
 
   private static final BoolExperiment LINTER = new BoolExperiment("use.intellij.ext.linter", false);
 
+  private static final BoolExperiment CODESEARCH =
+      new BoolExperiment("use.intellij.ext.codesearch", false);
+
   private static final BoolExperiment BUILD_SERVICE =
       new BoolExperiment("use.intellij.ext.buildservice", false);
 
@@ -137,6 +140,10 @@ public boolean isLinterEnabled() {
     return isEnabled() && LINTER.getValue();
   }
 
+  public boolean isCodeSearchEnabled() {
+    return isEnabled() && CODESEARCH.getValue();
+  }
+
   public boolean isBuildServiceEnabled() {
     return isEnabled() && BUILD_SERVICE.getValue();
   }
diff --git a/ext/BUILD b/ext/BUILD
index 722cf394bd1..a9787fed7e8 100644
--- a/ext/BUILD
+++ b/ext/BUILD
@@ -21,12 +21,10 @@ java_library(
     deps = [
         "//ext/proto:intellijext_java_grpc",
         "//ext/proto:intellijext_java_proto",
+        "//intellij_platform_sdk:plugin_api",
         "@com_google_guava_guava//jar",
         "@io_grpc_grpc_java//core",
         "@io_grpc_grpc_java//netty",
-        "@io_netty_netty_common//jar",
-        "@io_netty_netty_transport//jar",
-        "@io_netty_netty_transport_native_unix_common//jar",
     ] + select({
         "@platforms//os:macos": ["@io_netty_netty_transport_classes_kqueue//jar"],
         "//conditions:default": ["@io_netty_netty_transport_native_epoll//jar"],
diff --git a/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java b/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
index 84842b30992..06dfa7e08ab 100644
--- a/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
+++ b/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
@@ -19,6 +19,7 @@
 import com.google.idea.blaze.ext.BuildServiceGrpc.BuildServiceBlockingStub;
 import com.google.idea.blaze.ext.BuildServiceGrpc.BuildServiceFutureStub;
 import com.google.idea.blaze.ext.ChatBotModelGrpc.ChatBotModelBlockingStub;
+import com.google.idea.blaze.ext.CodeSearchGrpc.CodeSearchFutureStub;
 import com.google.idea.blaze.ext.DepServerGrpc.DepServerFutureStub;
 import com.google.idea.blaze.ext.ExperimentsServiceGrpc.ExperimentsServiceBlockingStub;
 import com.google.idea.blaze.ext.IntelliJExtGrpc.IntelliJExtBlockingStub;
@@ -111,4 +112,8 @@ public BuildCleanerServiceFutureStub getBuildCleanerService() {
   public DepServerFutureStub getDependencyService() {
     return DepServerGrpc.newFutureStub(channel);
   }
+
+  public CodeSearchFutureStub getCodeSearchService() {
+    return CodeSearchGrpc.newFutureStub(channel);
+  }
 }
diff --git a/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java b/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
index 62bf3d335c6..0224ec0a764 100644
--- a/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
+++ b/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
@@ -20,6 +20,7 @@
 import com.google.idea.blaze.ext.BuildServiceGrpc.BuildServiceBlockingStub;
 import com.google.idea.blaze.ext.BuildServiceGrpc.BuildServiceFutureStub;
 import com.google.idea.blaze.ext.ChatBotModelGrpc.ChatBotModelBlockingStub;
+import com.google.idea.blaze.ext.CodeSearchGrpc.CodeSearchFutureStub;
 import com.google.idea.blaze.ext.DepServerGrpc.DepServerFutureStub;
 import com.google.idea.blaze.ext.ExperimentsServiceGrpc.ExperimentsServiceBlockingStub;
 import com.google.idea.blaze.ext.IntelliJExtGrpc.IntelliJExtBlockingStub;
@@ -183,6 +184,11 @@ public LinterFutureStub getLinterService() throws IOException {
     return client.getLinterService();
   }
 
+  public CodeSearchFutureStub getCodeSearchService() throws IOException {
+    IntelliJExtBlockingStub unused = connect();
+    return client.getCodeSearchService();
+  }
+
   public BuildCleanerServiceFutureStub getBuildCleanerService() {
     try {
       IntelliJExtBlockingStub unused = connect();