update enable hook func names, add serde default

Author: hayemaxi

crates/q_cli/src/cli/chat/context.rs

@@ -28,6 +28,7 @@ pub const AMAZONQ_FILENAME: &str = "AmazonQ.md";
 
 /// Configuration for context files, containing paths to include in the context.
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
 pub struct ContextConfig {
     /// List of file paths or glob patterns to include in the context.
     pub paths: Vec<String>,
@@ -503,11 +504,10 @@ impl ContextManager {
         self.save_config(global).await
     }
 
-    /// Sets the "disabled" field on any [`Hook`] with the given name to be true or false
+    /// Sets the "disabled" field on any [`Hook`] with the given name
     /// # Arguments
-    /// * `enable` - If true, the "disabled" field are is to false. If false, the "disabled" field
-    ///   is set to true
-    pub async fn enable_hook(&mut self, name: &str, global: bool, enable: bool) -> Result<()> {
+    /// * `disable` - Set "disabled" field to this value
+    pub async fn set_hook_disabled(&mut self, name: &str, global: bool, disable: bool) -> Result<()> {
         let config = self.get_config_mut(global);
 
         config
@@ -516,24 +516,23 @@ impl ContextManager {
             .iter_mut()
             .chain(config.hooks.per_prompt.iter_mut())
             .filter(|h| h.name == name)
-            .for_each(|h| h.disabled = !enable);
+            .for_each(|h| h.disabled = disable);
 
         self.save_config(global).await
     }
 
-    /// Sets the "disabled" field on all [`Hook`]s to be true or false
+    /// Sets the "disabled" field on all [`Hook`]s
     /// # Arguments
-    /// * `enable` - If true, all "disabled" fields are set to false. If false, all "disabled"
-    ///   fields are set to true
-    pub async fn enable_all_hooks(&mut self, global: bool, enable: bool) -> Result<()> {
+    /// * `disable` - Set all "disabled" fields to this value
+    pub async fn set_all_hooks_disabled(&mut self, global: bool, disable: bool) -> Result<()> {
         let config = self.get_config_mut(global);
 
         config
             .hooks
             .conversation_start
             .iter_mut()
             .chain(config.hooks.per_prompt.iter_mut())
-            .for_each(|h| h.disabled = !enable);
+            .for_each(|h| h.disabled = disable);
 
         self.save_config(global).await
     }

crates/q_cli/src/cli/chat/hooks.rs

@@ -95,6 +95,7 @@ pub enum HookType {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
 pub struct HookConfig {
     pub conversation_start: Vec<Hook>,
     pub per_prompt: Vec<Hook>,
@@ -233,15 +234,15 @@ impl HookExecutor {
         let timeout = Duration::from_millis(hook.timeout_ms);
 
         // Run with timeout
-        match tokio::time::timeout(timeout, command_future).await? {
-            Ok(result) => match result.exit_status.unwrap_or(0) {
-                0 => Ok(result.stdout),
-                code => Err(eyre!("command returned non-zero exit code: {}", code)),
+        match tokio::time::timeout(timeout, command_future).await {
+            Ok(result) => {
+                let result = result?;
+                match result.exit_status.unwrap_or(0) {
+                    0 => Ok(result.stdout),
+                    code => Err(eyre!("command returned non-zero exit code: {}", code)),
+                }
             },
-            Err(_) => Err(eyre!(
-                "command failed to start or timed out after {} ms",
-                timeout.as_millis()
-            )),
+            Err(_) => Err(eyre!("command timed out after {} ms", timeout.as_millis())),
         }
     }