diff --git a/engine/core/duplex_pipeline.py b/engine/core/duplex_pipeline.py
index 3bc4163..e575bab 100644
--- a/engine/core/duplex_pipeline.py
+++ b/engine/core/duplex_pipeline.py
@@ -64,7 +64,7 @@ class DuplexPipeline:
     _SENTENCE_TRAILING_CHARS = frozenset({"。", "！", "？", ".", "!", "?", "…", "~", "～", "\n"})
     _SENTENCE_CLOSERS = frozenset({'"', "'", "”", "’", ")", "]", "}", "）", "】", "」", "』", "》"})
     _MIN_SPLIT_SPOKEN_CHARS = 6
-    _TOOL_WAIT_TIMEOUT_SECONDS = 15.0
+    _TOOL_WAIT_TIMEOUT_SECONDS = 60.0
     _SERVER_TOOL_TIMEOUT_SECONDS = 15.0
     TRACK_AUDIO_IN = "audio_in"
     TRACK_AUDIO_OUT = "audio_out"
diff --git a/web/pages/Assistants.tsx b/web/pages/Assistants.tsx
index 6cf8fe6..08d80af 100644
--- a/web/pages/Assistants.tsx
+++ b/web/pages/Assistants.tsx
@@ -3070,7 +3070,7 @@ export const DebugDrawer: React.FC<{
 
         if (type === 'assistant.tool_call') {
           const toolCall = payload?.tool_call || {};
-          const toolCallId = String(toolCall?.id || '').trim();
+          const toolCallId = String(payload?.tool_call_id || toolCall?.id || '').trim();
           const toolName = String(toolCall?.function?.name || toolCall?.name || 'unknown_tool');
           const toolDisplayName = String(payload?.tool_display_name || toolCall?.displayName || toolName);
           const executor = String(toolCall?.executor || 'server').toLowerCase();