fix: Fix /experiment to properly update tool spec

Author: kiran-garre

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

@@ -12,6 +12,7 @@ use crossterm::{
 };
 use dialoguer::Select;
 
+use crate::cli::chat::conversation::format_tool_spec;
 use crate::cli::chat::{
     ChatError,
     ChatSession,
@@ -140,11 +141,14 @@ async fn select_experiment(os: &mut Os, session: &mut ChatSession) -> Result<Opt
             .map_err(|e| ChatError::Custom(format!("Failed to update experiment setting: {e}").into()))?;
 
         // Reload tools to reflect the experiment change
-        let _ = session
+        let tools = session
             .conversation
             .tool_manager
             .load_tools(os, &mut session.stderr)
-            .await;
+            .await
+            .map_err(|e| ChatError::Custom(format!("Failed to update tool spec: {e}").into()))?;
+
+        session.conversation.tools = format_tool_spec(tools);
 
         let status_text = if new_state { "enabled" } else { "disabled" };
 

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

@@ -188,19 +188,7 @@ impl ConversationState {
             history: VecDeque::new(),
             valid_history_range: Default::default(),
             transcript: VecDeque::with_capacity(MAX_CONVERSATION_STATE_HISTORY_LEN),
-            tools: tool_config
-                .into_values()
-                .fold(HashMap::<ToolOrigin, Vec<Tool>>::new(), |mut acc, v| {
-                    let tool = Tool::ToolSpecification(ToolSpecification {
-                        name: v.name,
-                        description: v.description,
-                        input_schema: v.input_schema.into(),
-                    });
-                    acc.entry(v.tool_origin)
-                        .and_modify(|tools| tools.push(tool.clone()))
-                        .or_insert(vec![tool]);
-                    acc
-                }),
+            tools: format_tool_spec(tool_config),
             context_manager,
             tool_manager,
             context_message_length: None,
@@ -854,6 +842,22 @@ Return only the JSON configuration, no additional text.",
     }
 }
 
+pub fn format_tool_spec(tool_spec: HashMap<String, ToolSpec>) -> HashMap<ToolOrigin, Vec<Tool>> {
+    tool_spec
+        .into_values()
+        .fold(HashMap::<ToolOrigin, Vec<Tool>>::new(), |mut acc, v| {
+            let tool = Tool::ToolSpecification(ToolSpecification {
+                name: v.name,
+                description: v.description,
+                input_schema: v.input_schema.into(),
+            });
+            acc.entry(v.tool_origin)
+                .and_modify(|tools| tools.push(tool.clone()))
+                .or_insert(vec![tool]);
+            acc
+        })
+}
+
 /// Represents a conversation state that can be converted into a [FigConversationState] (the type
 /// used by the API client). Represents borrowed data, and reflects an exact [FigConversationState]
 /// that can be generated from [ConversationState] at any point in time.