diff --git a/src/integrationTest/kotlin/com/sourcegraph/cody/util/CodyIntegrationTextFixture.kt b/src/integrationTest/kotlin/com/sourcegraph/cody/util/CodyIntegrationTextFixture.kt
index 8861c5a2ca..1670c0cdea 100644
--- a/src/integrationTest/kotlin/com/sourcegraph/cody/util/CodyIntegrationTextFixture.kt
+++ b/src/integrationTest/kotlin/com/sourcegraph/cody/util/CodyIntegrationTextFixture.kt
@@ -59,9 +59,10 @@ open class CodyIntegrationTextFixture : BasePlatformTestCase(), LensListener {
 
       val recordingsFuture = CompletableFuture<Void>()
       CodyAgentService.withAgent(project) { agent ->
-        val errors = agent.server.testingRequestErrors().get()
+        val errors = agent.server.testing_requestErrors(null).get()
         // We extract polly.js errors to notify users about the missing recordings, if any
-        val missingRecordings = errors.filter { it.error?.contains("`recordIfMissing` is") == true }
+        val missingRecordings =
+            errors.errors.filter { it.error?.contains("`recordIfMissing` is") == true }
         missingRecordings.forEach { missing ->
           logger.error(
               """Recording is missing: ${missing.error}
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
index 901a466797..0ee2a23e9f 100644
--- a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
@@ -2,8 +2,6 @@
 
 package com.sourcegraph.cody.agent
 
-import com.sourcegraph.cody.agent.protocol.IgnorePolicySpec
-import com.sourcegraph.cody.agent.protocol.NetworkRequest
 import com.sourcegraph.cody.agent.protocol.TelemetryEvent
 import com.sourcegraph.cody.agent.protocol_generated.AutocompleteParams
 import com.sourcegraph.cody.agent.protocol_generated.AutocompleteResult
@@ -16,6 +14,7 @@ import com.sourcegraph.cody.agent.protocol_generated.CodeActions_ProvideParams
 import com.sourcegraph.cody.agent.protocol_generated.CodeActions_ProvideResult
 import com.sourcegraph.cody.agent.protocol_generated.CodeActions_TriggerParams
 import com.sourcegraph.cody.agent.protocol_generated.Commands_CustomParams
+import com.sourcegraph.cody.agent.protocol_generated.ContextFilters
 import com.sourcegraph.cody.agent.protocol_generated.CurrentUserCodySubscription
 import com.sourcegraph.cody.agent.protocol_generated.CustomCommandResult
 import com.sourcegraph.cody.agent.protocol_generated.Diagnostics_PublishParams
@@ -35,6 +34,7 @@ import com.sourcegraph.cody.agent.protocol_generated.Null
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolAuthStatus
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolTextDocument
 import com.sourcegraph.cody.agent.protocol_generated.ServerInfo
+import com.sourcegraph.cody.agent.protocol_generated.Testing_RequestErrorsResult
 import com.sourcegraph.cody.agent.protocol_generated.TextDocument_DidFocusParams
 import com.sourcegraph.cody.agent.protocol_generated.Webview_DidDisposeNativeParams
 import com.sourcegraph.cody.agent.protocol_generated.Webview_ReceiveMessageStringEncodedParams
@@ -132,6 +132,12 @@ interface _SubsetGeneratedCodyAgentServer {
   @JsonRequest("ignore/test")
   fun ignore_test(params: Ignore_TestParams): CompletableFuture<Ignore_TestResult>
 
+  @JsonRequest("testing/ignore/overridePolicy")
+  fun testing_ignore_overridePolicy(params: ContextFilters?): CompletableFuture<Null?>
+
+  @JsonRequest("testing/requestErrors")
+  fun testing_requestErrors(params: Null?): CompletableFuture<Testing_RequestErrorsResult>
+
   //  // =============
   //  // Notifications
   //  // =============
@@ -182,10 +188,4 @@ interface _LegacyAgentServer {
 
   @JsonRequest("telemetry/recordEvent")
   fun recordEvent(event: TelemetryEvent): CompletableFuture<Void?>
-
-  @JsonRequest("testing/ignore/overridePolicy")
-  fun testingIgnoreOverridePolicy(params: IgnorePolicySpec?): CompletableFuture<Unit>
-
-  @JsonRequest("testing/requestErrors")
-  fun testingRequestErrors(): CompletableFuture<List<NetworkRequest>>
 }
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt
deleted file mode 100644
index 23a57026a9..0000000000
--- a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.sourcegraph.cody.agent.protocol
-
-data class IgnorePolicyPattern(val repoNamePattern: String, val filePathPatterns: List<String>?)
-
-data class IgnorePolicySpec(
-    val exclude: List<IgnorePolicyPattern>?,
-    val include: List<IgnorePolicyPattern>?,
-)
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/NetworkRequest.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/NetworkRequest.kt
deleted file mode 100644
index 5c287b6633..0000000000
--- a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/NetworkRequest.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.sourcegraph.cody.agent.protocol
-
-data class NetworkRequest(val url: String?, val body: String?, val error: String?)
diff --git a/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt b/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
index 609d444783..518a5fa9f1 100644
--- a/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
@@ -16,7 +16,7 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.rows
 import com.intellij.ui.dsl.builder.selected
 import com.sourcegraph.cody.agent.CodyAgentService
-import com.sourcegraph.cody.agent.protocol.IgnorePolicySpec
+import com.sourcegraph.cody.agent.protocol_generated.ContextFilters
 import javax.swing.JComponent
 
 data object IgnoreOverrideModel {
@@ -50,7 +50,7 @@ class IgnoreOverrideDialog(val project: Project) : DialogWrapper(project) {
             .bindText(IgnoreOverrideModel::policy)
             .validationOnInput { textArea ->
               try {
-                Gson().fromJson(textArea.text, IgnorePolicySpec::class.java)
+                Gson().fromJson(textArea.text, ContextFilters::class.java)
                 null
               } catch (e: JsonSyntaxException) {
                 ValidationInfo("JSON error: ${e.message}", textArea)
@@ -64,9 +64,9 @@ class IgnoreOverrideDialog(val project: Project) : DialogWrapper(project) {
   override fun doOKAction() {
     super.doOKAction()
     CodyAgentService.withAgent(project) { agent ->
-      agent.server.testingIgnoreOverridePolicy(
+      agent.server.testing_ignore_overridePolicy(
           if (IgnoreOverrideModel.enabled) {
-            Gson().fromJson(IgnoreOverrideModel.policy, IgnorePolicySpec::class.java)
+            Gson().fromJson(IgnoreOverrideModel.policy, ContextFilters::class.java)
           } else {
             null
           })