diff --git a/build.gradle.kts b/build.gradle.kts
index 2450485aa8..f257c81542 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -476,8 +476,7 @@ tasks {
               "${layout.buildDirectory.asFile.get()}/sourcegraph/cody-agent-trace.json",
           "cody-agent.directory" to buildCodyDir.parent,
           "sourcegraph.verbose-logging" to "true",
-          "cody-agent.panic-when-out-of-sync" to
-              (System.getProperty("cody-agent.panic-when-out-of-sync") ?: "true"),
+          "cody-agent.is-dev-mode" to (System.getProperty("cody-agent.is-dev-mode") ?: "true"),
           "cody-agent.fullDocumentSyncEnabled" to
               (System.getProperty("cody-agent.fullDocumentSyncEnabled") ?: "false"),
           "cody.autocomplete.enableFormatting" to
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ProtocolTextDocument.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ProtocolTextDocument.kt
index 0a238aaaba..5a43453f78 100644
--- a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ProtocolTextDocument.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ProtocolTextDocument.kt
@@ -15,6 +15,7 @@ import com.sourcegraph.cody.agent.protocol_generated.ProtocolTextDocument
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolTextDocumentContentChangeEvent
 import com.sourcegraph.cody.agent.protocol_generated.Range
 import com.sourcegraph.cody.agent.protocol_generated.TestingParams
+import com.sourcegraph.config.ConfigUtil
 import java.awt.Point
 import java.nio.file.FileSystems
 import java.util.Locale
@@ -28,17 +29,18 @@ object ProtocolTextDocumentExt {
       selection: Range? = null,
       selectedText: String? = null
   ): TestingParams? {
-    if (!TestingParamsExt.doIncludeTestingParam) {
-      return null
+    if (ConfigUtil.isDevMode()) {
+      return TestingParams(
+          selectedText = selectedText,
+          sourceOfTruthDocument =
+              ProtocolTextDocument(
+                  uri = uri,
+                  content = content,
+                  selection = selection,
+              ))
     }
-    return TestingParams(
-        selectedText = selectedText,
-        sourceOfTruthDocument =
-            ProtocolTextDocument(
-                uri = uri,
-                content = content,
-                selection = selection,
-            ))
+
+    return null
   }
 
   @RequiresEdt
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/TestingParamsExt.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/TestingParamsExt.kt
deleted file mode 100644
index 7f97f709a5..0000000000
--- a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/TestingParamsExt.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.sourcegraph.cody.agent.protocol_extensions
-
-object TestingParamsExt {
-  val doIncludeTestingParam =
-      "true" == System.getProperty("cody-agent.panic-when-out-of-sync", "false")
-}
diff --git a/src/main/kotlin/com/sourcegraph/cody/error/CodyConsole.kt b/src/main/kotlin/com/sourcegraph/cody/error/CodyConsole.kt
index c4cfa9178e..dd920f9d46 100644
--- a/src/main/kotlin/com/sourcegraph/cody/error/CodyConsole.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/error/CodyConsole.kt
@@ -31,8 +31,12 @@ class CodyConsole(project: Project) {
         logger.info(messageText)
       }
 
-      if (ConfigUtil.isCodyDebugEnabled()) {
-        toolWindow?.contentManager?.getReady(this)?.doWhenDone { toolWindow.show() }
+      if (ConfigUtil.isCodyDebugEnabled() && ConfigUtil.isDevMode()) {
+        toolWindow?.contentManager?.getReady(this)?.doWhenDone {
+          if (!toolWindow.isVisible) {
+            toolWindow.show()
+          }
+        }
       }
     }
   }
diff --git a/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt b/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt
index 6903d7de1e..077d310908 100644
--- a/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt
+++ b/src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt
@@ -178,6 +178,8 @@ object ConfigUtil {
 
   @JvmStatic fun isCodyDebugEnabled(): Boolean = CodyApplicationSettings.instance.isCodyDebugEnabled
 
+  @JvmStatic fun isDevMode(): Boolean = System.getProperty("cody-agent.is-dev-mode") == "true"
+
   @JvmStatic
   fun isCodyUIHintsEnabled(): Boolean = CodyApplicationSettings.instance.isCodyUIHintsEnabled