fix format

Author: somarsai

crates/q_chat/src/lib.rs

@@ -3463,18 +3463,6 @@ fn create_stream(model_responses: serde_json::Value) -> StreamingClient {
     StreamingClient::mock(mock)
 }
 
-/// Returns all tools supported by Q chat.
-pub fn load_tools() -> Result<HashMap<String, ToolSpec>> {
-    let mut tools: HashMap<String, ToolSpec> = serde_json::from_str(include_str!("tools/tool_index.json"))?;
-
-    // Only include the think tool if the feature is enabled
-    if !tools::think::Think::should_include_in_tools() {
-        tools.remove("think");
-    }
-
-    Ok(tools)
-}
-
 #[cfg(test)]
 mod tests {
     use bstr::ByteSlice;

crates/q_chat/src/tools/think.rs

@@ -18,8 +18,8 @@ use super::{
 /// It provides a dedicated space for the model to process information from tool call results,
 /// navigate complex decision trees, and improve the quality of responses in multi-step scenarios.
 ///
-/// This is a beta feature that must be enabled via settings:
-/// `q settings enable_thinking true`
+/// This is a beta feature that can be enabled/disabled via settings:
+/// `q settings chat.enableThinking true`
 #[derive(Debug, Clone, Deserialize)]
 pub struct Think {
     /// The thought content that the model wants to process
@@ -28,23 +28,15 @@ pub struct Think {
 
 impl Think {
     /// Checks if the thinking feature is enabled in settings
-    fn is_enabled() -> bool {
+    pub fn is_think_tool_enabled() -> bool {
         // Default to enabled if setting doesn't exist or can't be read
-        settings::get_value("chat.enableThinking")
-            .map(|val| val.and_then(|v| v.as_bool()).unwrap_or(true))
-            .unwrap_or(true)
-    }
-
-    /// Checks if the think tool should be included in the tool list
-    /// This allows us to completely exclude the tool when the feature is disabled
-    pub fn should_include_in_tools() -> bool {
-        Self::is_enabled()
+        settings::get_bool_or("chat.enableThinking", true)
     }
 
     /// Queues up a description of the think tool for the user
     pub fn queue_description(think: &Think, updates: &mut impl Write) -> Result<()> {
-        // Only show a description if the feature is enabled and there's actual thought content
-        if Self::is_enabled() && !think.thought.trim().is_empty() {
+        // Only show a description if there's actual thought content
+        if !think.thought.trim().is_empty() {
             // Show a preview of the thought that will be displayed
             queue!(
                 updates,
@@ -61,23 +53,15 @@ impl Think {
     /// Invokes the think tool. This doesn't actually perform any system operations,
     /// it's purely for the model's internal reasoning process.
     pub async fn invoke(&self, _updates: &mut impl Write) -> Result<InvokeOutput> {
-        // Only process non-empty thoughts if the feature is enabled
-        if Self::is_enabled() && !self.thought.trim().is_empty() {
-            // We've already shown the thought in queue_description
-            // Just return an empty output to avoid duplication
-            return Ok(InvokeOutput {
-                output: OutputKind::Text(String::new()),
-            });
-        }
-
-        // If disabled or empty thought, return empty output
+        // The think tool always returns an empty output because:
+        // 1. When enabled with content: We've already shown the thought in queue_description
+        // 2. When disabled or empty: Nothing should be shown
         Ok(InvokeOutput {
             output: OutputKind::Text(String::new()),
         })
     }
 
     /// Validates the thought - accepts empty thoughts
-    /// Also checks if the thinking feature is enabled in settings
     pub async fn validate(&mut self, _ctx: &fig_os_shim::Context) -> Result<()> {
         // We accept empty thoughts - they'll just be ignored
         // This makes the tool more robust and prevents errors from blocking the model