Experiment manager enhancements (#3062)

* chore: Experiment Manager enhancements, centralizes commands configuration for experiments

* fix: Fixes import

---------

Co-authored-by: Kenneth S. <[email protected]>

Author: kensave

crates/chat-cli/src/cli/chat/prompt.rs

@@ -46,10 +46,7 @@ use super::tool_manager::{
     PromptQuery,
     PromptQueryResult,
 };
-use crate::cli::experiment::experiment_manager::{
-    ExperimentManager,
-    ExperimentName,
-};
+use crate::cli::experiment::experiment_manager::ExperimentManager;
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::directories::chat_cli_bash_history_path;
@@ -106,55 +103,7 @@ pub const COMMANDS: &[&str] = &[
 /// Generate dynamic command list including experiment-based commands when enabled
 pub fn get_available_commands(os: &Os) -> Vec<&'static str> {
     let mut commands = COMMANDS.to_vec();
-
-    // Add knowledge commands if Knowledge experiment is enabled
-    if ExperimentManager::is_enabled(os, ExperimentName::Knowledge) {
-        commands.extend_from_slice(&[
-            "/knowledge",
-            "/knowledge help",
-            "/knowledge show",
-            "/knowledge add",
-            "/knowledge remove",
-            "/knowledge clear",
-            "/knowledge search",
-            "/knowledge update",
-            "/knowledge status",
-            "/knowledge cancel",
-        ]);
-    }
-
-    // Add checkpoint commands if Checkpoint experiment is enabled
-    if ExperimentManager::is_enabled(os, ExperimentName::Checkpoint) {
-        commands.extend_from_slice(&[
-            "/checkpoint",
-            "/checkpoint help",
-            "/checkpoint init",
-            "/checkpoint list",
-            "/checkpoint restore",
-            "/checkpoint expand",
-            "/checkpoint diff",
-            "/checkpoint clean",
-        ]);
-    }
-
-    // Add todos commands if TodoList experiment is enabled
-    if ExperimentManager::is_enabled(os, ExperimentName::TodoList) {
-        commands.extend_from_slice(&[
-            "/todos",
-            "/todos help",
-            "/todos clear-finished",
-            "/todos resume",
-            "/todos view",
-            "/todos delete",
-            "/todos delete --all",
-        ]);
-    }
-
-    // Add tangent commands if TangentMode experiment is enabled
-    if ExperimentManager::is_enabled(os, ExperimentName::TangentMode) {
-        commands.extend_from_slice(&["/tangent", "/tangent tail"]);
-    }
-
+    commands.extend(ExperimentManager::get_commands(os));
     commands.sort();
     commands
 }
@@ -590,6 +539,7 @@ mod tests {
     use rustyline::history::DefaultHistory;
 
     use super::*;
+    use crate::cli::experiment::experiment_manager::ExperimentName;
 
     #[tokio::test]
     async fn test_chat_completer_command_completion() {

crates/chat-cli/src/cli/experiment/experiment_manager.rs

@@ -34,6 +34,7 @@ pub struct Experiment {
     pub description: &'static str,
     pub setting_key: Setting,
     pub enabled: bool,
+    pub commands: &'static [&'static str],
 }
 
 static AVAILABLE_EXPERIMENTS: &[Experiment] = &[
@@ -42,36 +43,70 @@ static AVAILABLE_EXPERIMENTS: &[Experiment] = &[
         description: "Enables persistent context storage and retrieval across chat sessions (/knowledge)",
         setting_key: Setting::EnabledKnowledge,
         enabled: true,
+        commands: &[
+            "/knowledge",
+            "/knowledge help",
+            "/knowledge show",
+            "/knowledge add",
+            "/knowledge remove",
+            "/knowledge clear",
+            "/knowledge search",
+            "/knowledge update",
+            "/knowledge status",
+            "/knowledge cancel",
+        ],
     },
     Experiment {
         experiment_name: ExperimentName::Thinking,
         description: "Enables complex reasoning with step-by-step thought processes",
         setting_key: Setting::EnabledThinking,
         enabled: true,
+        commands: &[],
     },
     Experiment {
         experiment_name: ExperimentName::TangentMode,
         description: "Enables entering into a temporary mode for sending isolated conversations (/tangent)",
         setting_key: Setting::EnabledTangentMode,
         enabled: true,
+        commands: &["/tangent", "/tangent tail"],
     },
     Experiment {
         experiment_name: ExperimentName::TodoList,
         description: "Enables Q to create todo lists that can be viewed and managed using /todos",
         setting_key: Setting::EnabledTodoList,
         enabled: true,
+        commands: &[
+            "/todos",
+            "/todos help",
+            "/todos clear-finished",
+            "/todos resume",
+            "/todos view",
+            "/todos delete",
+            "/todos delete --all",
+        ],
     },
     Experiment {
         experiment_name: ExperimentName::Checkpoint,
         description: "Enables workspace checkpoints to snapshot, list, expand, diff, and restore files (/checkpoint)\nNote: Cannot be used in tangent mode (to avoid mixing up conversation history)",
         setting_key: Setting::EnabledCheckpoint,
         enabled: true,
+        commands: &[
+            "/checkpoint",
+            "/checkpoint help",
+            "/checkpoint init",
+            "/checkpoint list",
+            "/checkpoint restore",
+            "/checkpoint expand",
+            "/checkpoint diff",
+            "/checkpoint clean",
+        ],
     },
     Experiment {
         experiment_name: ExperimentName::ContextUsageIndicator,
         description: "Shows context usage percentage in the prompt (e.g., [rust-agent] 6% >)",
         setting_key: Setting::EnabledContextUsageIndicator,
         enabled: true,
+        commands: &[],
     },
 ];
 
@@ -123,4 +158,14 @@ impl ExperimentManager {
     pub fn get_experiments() -> Vec<&'static Experiment> {
         AVAILABLE_EXPERIMENTS.iter().filter(|exp| exp.enabled).collect()
     }
+
+    /// Returns all commands from enabled experiments
+    pub fn get_commands(os: &Os) -> Vec<&'static str> {
+        AVAILABLE_EXPERIMENTS
+            .iter()
+            .filter(|exp| exp.enabled && Self::is_enabled(os, exp.experiment_name))
+            .flat_map(|exp| exp.commands.iter())
+            .copied()
+            .collect()
+    }
 }