Merge remote-tracking branch 'origin/master' into ji

# Conflicts:
#	.gitignore
#	frontend-web/src/components/workspace/input-box.tsx
#	frontend-web/src/core/threads/types.ts
#	frontend-web/src/pages/ChatPage.tsx

frontend-web/src/core/threads/hooks.ts

@@ -25,10 +25,13 @@ import { promptInputFilePartToFile, uploadFiles } from "../uploads";
 
 import type { AgentThread, AgentThreadState } from "./types";
 
-export type ToolEndEvent = {
-  name: string;
-  data: unknown;
-};
+export type ToolEndEvent = {
+  name: string;
+  data: unknown;
+  toolCallId?: string;
+};
+
+export type ToolStartEvent = ToolEndEvent;
 
 export type ThreadStreamOptions = {
   threadId?: string | null | undefined;
@@ -47,10 +50,11 @@ export type ThreadStreamOptions = {
   /** 额外写到新建 thread 的 metadata（与 agent_id 合并）。
    *  任务深链用 `{ taskId }` 把对话挂到任务下（1:N），列表按 metadata.taskId 过滤。 */
   threadMetadata?: Record<string, unknown>;
-  onStart?: (threadId: string) => void;
-  onFinish?: (state: AgentThreadState) => void;
-  onToolEnd?: (event: ToolEndEvent) => void;
-};
+  onStart?: (threadId: string) => void;
+  onFinish?: (state: AgentThreadState) => void;
+  onToolStart?: (event: ToolStartEvent) => void;
+  onToolEnd?: (event: ToolEndEvent) => void;
+};
 
 type SendMessageOptions = {
   additionalKwargs?: Record<string, unknown>;
@@ -447,10 +451,11 @@ export function useThreadStream({
   assistantId,
   runOptions,
   threadMetadata,
-  onStart,
-  onFinish,
-  onToolEnd,
-}: ThreadStreamOptions) {
+  onStart,
+  onFinish,
+  onToolStart,
+  onToolEnd,
+}: ThreadStreamOptions) {
   const { t } = useI18n();
   const [localSettings] = useLocalSettings();
   // Track the thread ID that is currently streaming to handle thread changes during streaming
@@ -466,16 +471,17 @@ export function useThreadStream({
     lastStreamActivityAtRef.current = Date.now();
   }, []);
 
-  const listeners = useRef({
-    onStart,
-    onFinish,
-    onToolEnd,
-  });
+  const listeners = useRef({
+    onStart,
+    onFinish,
+    onToolStart,
+    onToolEnd,
+  });
 
   // Keep listeners ref updated with latest callbacks
-  useEffect(() => {
-    listeners.current = { onStart, onFinish, onToolEnd };
-  }, [onStart, onFinish, onToolEnd]);
+  useEffect(() => {
+    listeners.current = { onStart, onFinish, onToolStart, onToolEnd };
+  }, [onStart, onFinish, onToolStart, onToolEnd]);
 
   useEffect(() => {
     const normalizedThreadId = threadId ?? null;
@@ -545,12 +551,6 @@ export function useThreadStream({
     },
     onLangChainEvent(event) {
       markStreamActivity();
-      if (event.event === "on_tool_end") {
-        listeners.current.onToolEnd?.({
-          name: event.name,
-          data: event.data,
-        });
-      }
       // 操作日志(Y-Log)：每一次大模型调用结束都各上报一条（一次 LLM 调用 = 一条），
       // 让问答日志尽量「多、全」——一个问答轮次里 lead agent / 子代理的每次模型调用
       // 都会落一条。门控与失败静默都在 writeYLog 内部处理，绝不影响问答。
@@ -572,8 +572,32 @@ export function useThreadStream({
         } catch {
           /* 上报绝不影响问答 */
         }
-      }
+      }
     },
+    // The SDK emits UI tool lifecycle events on the dedicated `tools` stream
+    // mode. `events` is a separate LangChain trace channel; using it for UI
+    // reactions can miss a tool that the conversation has already rendered.
+    onToolEvent:
+      onToolStart || onToolEnd
+        ? (event) => {
+            markStreamActivity();
+            if (event.event === "on_tool_start") {
+              listeners.current.onToolStart?.({
+                name: event.name,
+                data: event.input,
+                toolCallId: event.toolCallId,
+              });
+              return;
+            }
+            if (event.event === "on_tool_end") {
+              listeners.current.onToolEnd?.({
+                name: event.name,
+                data: event.output,
+                toolCallId: event.toolCallId,
+              });
+            }
+          }
+        : undefined,
     onUpdateEvent(data) {
       markStreamActivity();
       const updates: Array<Partial<AgentThreadState> | null> = Object.values(