diff --git a/apps/api/src/services/chat_manager.py b/apps/api/src/services/chat_manager.py
index e1a5749a..e12c1e1f 100644
--- a/apps/api/src/services/chat_manager.py
+++ b/apps/api/src/services/chat_manager.py
@@ -166,16 +166,16 @@ class ChatManager:
             )
         )
 
-        # OpenClaw 最多等 30s，NemoClaw 最多等 50s
+        # OpenClaw 最多等 40s（含 context 取得時間），NemoClaw 最多等 60s
         try:
-            openclaw_raw = await asyncio.wait_for(asyncio.shield(openclaw_task), timeout=30.0)
+            openclaw_raw = await asyncio.wait_for(asyncio.shield(openclaw_task), timeout=40.0)
         except asyncio.TimeoutError:
             openclaw_raw = None
 
         openclaw_block = f"🦞 <b>OpenClaw:</b>\n{openclaw_raw or '🔴 無響應'}"
 
         try:
-            nemo_raw = await asyncio.wait_for(nemo_task, timeout=50.0)
+            nemo_raw = await asyncio.wait_for(nemo_task, timeout=60.0)
         except asyncio.TimeoutError:
             nemo_raw = None