diff --git a/src/approval/mod.rs b/src/approval/mod.rs
index 3b2b9a4f6..bffae728a 100644
--- a/src/approval/mod.rs
+++ b/src/approval/mod.rs
@@ -122,7 +122,7 @@ impl ApprovalManager {
         }
 
         // always_ask overrides everything.
-        if self.always_ask.contains(tool_name) {
+        if self.always_ask.contains("*") || self.always_ask.contains(tool_name) {
             return true;
         }
 
@@ -136,7 +136,7 @@ impl ApprovalManager {
         }
 
         // auto_approve skips the prompt.
-        if self.auto_approve.contains(tool_name) {
+        if self.auto_approve.contains("*") || self.auto_approve.contains(tool_name) {
             return false;
         }
 
diff --git a/src/providers/reliable.rs b/src/providers/reliable.rs
index d4bde3cf0..0f6bda44b 100644
--- a/src/providers/reliable.rs
+++ b/src/providers/reliable.rs
@@ -108,6 +108,7 @@ fn is_context_window_exceeded(err: &anyhow::Error) -> bool {
         "token limit exceeded",
         "prompt is too long",
         "input is too long",
+        "prompt exceeds max length",
     ];
 
     hints.iter().any(|hint| lower.contains(hint))