addresses comments

Author: dingfeli

.gitignore

@@ -8,10 +8,6 @@ xcuserdata/
 .DS_Store
 node_modules/
 .eslintcache
-
-# Conversation/data files
-/delegate
-/delegatetool
 yarn-error.log
 yarn.lock
 package-lock.json

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

@@ -2,18 +2,19 @@ use std::collections::HashMap;
 use std::io::Write;
 use std::path::PathBuf;
 
+use crossterm::queue;
 use eyre::Result;
 use serde::{
     Deserialize,
     Serialize,
 };
 
 use crate::cli::DEFAULT_AGENT_NAME;
-use crate::cli::chat::tools::delegate::agent::subagents_dir;
 use crate::cli::chat::tools::delegate::{
     AgentExecution,
     AgentStatus,
     launch_agent,
+    subagents_dir,
 };
 use crate::cli::chat::{
     ChatError,
@@ -141,10 +142,10 @@ impl DelegateArgs {
 
         match result {
             Ok(output) => {
-                crossterm::queue!(session.stderr, crossterm::style::Print(format!("{}\n", output)))?;
+                queue!(session.stderr, crossterm::style::Print(format!("{}\n", output)))?;
             },
             Err(e) => {
-                crossterm::queue!(session.stderr, crossterm::style::Print(format!("Error: {}\n", e)))?;
+                queue!(session.stderr, crossterm::style::Print(format!("Error: {}\n", e)))?;
             },
         }
 

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

@@ -106,7 +106,7 @@ use tool_manager::{
     ToolManager,
     ToolManagerBuilder,
 };
-use tools::delegate::execution::status_all_agents;
+use tools::delegate::status_all_agents;
 use tools::gh_issue::GhIssueContext;
 use tools::{
     NATIVE_TOOLS,

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

@@ -46,7 +46,10 @@ use super::tool_manager::{
     PromptQuery,
     PromptQueryResult,
 };
-use crate::cli::experiment::experiment_manager::ExperimentManager;
+use crate::cli::experiment::experiment_manager::{
+    ExperimentManager,
+    ExperimentName,
+};
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::directories::chat_cli_bash_history_path;
@@ -503,15 +506,16 @@ pub fn rl(
     }
 
     // Add custom keybinding for Ctrl+D to open delegate command (configurable)
-    let delegate_key_char = match os.database.settings.get_string(Setting::DelegateModeKey) {
-        Some(key) if key.len() == 1 => key.chars().next().unwrap_or('d'),
-        _ => 'd', // Default to 'd' if setting is missing or invalid
-    };
-
-    rl.bind_sequence(
-        KeyEvent(KeyCode::Char(delegate_key_char), Modifiers::CTRL),
-        EventHandler::Simple(Cmd::Insert(1, "/delegate ".to_string())),
-    );
+    if ExperimentManager::is_enabled(os, ExperimentName::Delegate) {
+        if let Some(key) = os.database.settings.get_string(Setting::DelegateModeKey) {
+            if key.len() == 1 {
+                rl.bind_sequence(
+                    KeyEvent(KeyCode::Char(key.chars().next().unwrap()), Modifiers::CTRL),
+                    EventHandler::Simple(Cmd::Insert(1, "/delegate ".to_string())),
+                );
+            }
+        };
+    }
 
     // Add custom keybinding for Alt+Enter to insert a newline
     rl.bind_sequence(