diff --git a/llm_interface.py b/llm_interface.py
index 7cfe3a4..79dc568 100644
--- a/llm_interface.py
+++ b/llm_interface.py
@@ -252,7 +252,7 @@ class LLMInterface:
                 # Block with 10-minute timeout to prevent hangs
                 # Complex tasks (repo analysis, multi-step operations) can take 5-8 minutes
                 logger.info("[LLM] Waiting for Agent SDK response (timeout: 600s)...")
-                result = future.result(timeout=600)
+                result = future.result(timeout=1800)  # 30 min to allow long delegate tasks
                 logger.info("[LLM] Agent SDK response received successfully")
                 return result
             except TimeoutError:
@@ -263,7 +263,7 @@ class LLMInterface:
                 msg_count = getattr(self, '_last_message_count', 0)
                 tools_used = getattr(self, '_last_tool_names', [])
                 
-                error_parts = [f"Task timed out after 10 minutes ({msg_count} messages processed)"]
+                error_parts = [f"Task timed out after 30 minutes ({msg_count} messages processed)"]
                 
                 if tools_used:
                     unique = list(dict.fromkeys(tools_used))