@huyooo/ai-chat-frontend-react 0.2.12 → 0.2.14

package/src/hooks/useChat.ts

@@ -12,7 +12,7 @@
 import { useState, useCallback, useRef, useMemo, useEffect } from 'react'
 import type {
   ChatAdapter,
-  ChatEvent,
+  ChatEvent as BridgeChatEvent,
   ChatMode,
   SessionRecord,
   MessageRecord,
@@ -25,11 +25,96 @@ import type {
   ThinkingPart,
   SearchPart,
   ToolCallPart,
-  ToolResultPart,
   ErrorPart,
   SearchResult,
 } from '../types'
 
+// 扩展事件类型：允许 bridge 端新增事件时前端不被类型卡死
+type ChatEvent = Omit<BridgeChatEvent, 'type'> & {
+  type: BridgeChatEvent['type'] | 'tool_call_output'
+}
+
+// ==================== @ 上下文（文件引用） ====================
+// 约定：AtFilePicker 插入的格式为单行 "@<path>"，通常以换行分隔
+const AT_LINE_RE = /^\s*@\s*(.+?)\s*$/
+const MAX_FILE_CHARS = 20_000
+
+function stripAtContextLines(text: string): string {
+  return text
+    .split('\n')
+    .filter((line) => !AT_LINE_RE.test(line))
+    .join('\n')
+    .trim()
+}
+
+function extractAtContextRefs(text: string): { refs: string[]; cleanedText: string } {
+  const refs: string[] = []
+  const kept: string[] = []
+
+  for (const line of text.split('\n')) {
+    const m = line.match(AT_LINE_RE)
+    if (m?.[1]) {
+      refs.push(m[1])
+    } else {
+      kept.push(line)
+    }
+  }
+
+  return {
+    refs: Array.from(new Set(refs.map((r) => r.trim()).filter(Boolean))),
+    cleanedText: kept.join('\n').trim(),
+  }
+}
+
+async function buildPromptWithAtContext(adapter: ChatAdapter, text: string): Promise<string> {
+  const { refs, cleanedText } = extractAtContextRefs(text)
+  if (refs.length === 0) return text
+
+  const blocks: string[] = []
+
+  for (const ref of refs) {
+    const resolved = (await adapter.resolvePath?.(ref)) || ref
+
+    try {
+      const stat = await adapter.stat?.(resolved)
+      if (stat?.isDirectory) {
+        const items = await adapter.listDir?.(resolved)
+        const listing = (items || [])
+          .slice(0, 200)
+          .map((f) => `${f.isDirectory ? 'DIR ' : 'FILE'} ${f.path}`)
+          .join('\n')
+        blocks.push(
+          `【目录】${resolved}\n` +
+          '```text\n' +
+          (listing || '(空目录/无法列出)') +
+          '\n```'
+        )
+        continue
+      }
+
+      const content = await adapter.readFile?.(resolved)
+      if (typeof content === 'string') {
+        const truncated = content.length > MAX_FILE_CHARS
+          ? content.slice(0, MAX_FILE_CHARS) + `\n\n... (已截断，原始长度 ${content.length})`
+          : content
+        blocks.push(
+          `【文件】${resolved}\n` +
+          '```text\n' +
+          truncated +
+          '\n```'
+        )
+      } else {
+        blocks.push(`【引用】${resolved}\n（无法读取文件内容）`)
+      }
+    } catch (error) {
+      blocks.push(`【引用】${resolved}\n（读取失败：${error instanceof Error ? error.message : String(error)}）`)
+    }
+  }
+
+  const question = cleanedText || stripAtContextLines(text) || text
+  return `以下是用户通过 @ 引用提供的上下文：\n\n${blocks.join('\n\n')}\n\n用户问题：\n${question}`
+}
+
 /** 生成唯一 ID */
 function generateId(): string {
   return Date.now().toString(36) + Math.random().toString(36).substr(2)
@@ -43,6 +128,18 @@ function extractTextContent(parts: ContentPart[]): string {
     .join('')
 }
 
+/** 判断事件是否需要保存到数据库 */
+function shouldSaveEvent(event: ChatEvent): boolean {
+  return (
+    event.type === 'thinking_end' ||
+    event.type === 'tool_call_result' ||
+    event.type === 'text_delta' ||
+    event.type === 'done' ||
+    event.type === 'error' ||
+    event.type === 'abort'
+  )
+}
+
 /** 解析工具调用结果 */
 function parseToolResult(result: unknown): unknown | null {
   if (result === undefined || result === null) return null
@@ -58,6 +155,11 @@ function parseToolResult(result: unknown): unknown | null {
 
 /** 转换存储的消息为显示格式 */
 function convertToMessage(record: MessageRecord): ChatMessage {
+  // timestamp 统一为 number（毫秒时间戳），不受 JSON 序列化影响
+  // 如果收到非 number 类型，说明数据异常，直接使用 0
+  const timestamp = typeof record.timestamp === 'number' && Number.isFinite(record.timestamp)
+    ? record.timestamp
+    : 0
   let parts: ContentPart[] = []
   
   if (record.steps) {
@@ -86,6 +188,7 @@ function convertToMessage(record: MessageRecord): ChatMessage {
             args: step.args,
             result: parseToolResult(step.result),
             status: step.status || 'done',
+            output: step.output,
           })
         } else if (step.type === 'text') {
           parts.push({
@@ -117,12 +220,13 @@ function convertToMessage(record: MessageRecord): ChatMessage {
     id: record.id,
     role: record.role,
     parts,
+    images: record.images ?? [],
     model: record.model || undefined,
     mode: record.mode || undefined,
     webSearchEnabled: record.webSearchEnabled ?? undefined,
     thinkingEnabled: record.thinkingEnabled ?? undefined,
     loading: false,
-    timestamp: record.timestamp,
+    timestamp,
   }
 }
 
@@ -131,6 +235,8 @@ interface SessionState {
   messages: ChatMessage[]
   isLoading: boolean
   abortController: AbortController | null
+  /** 当前进行中的 assistant 消息 ID（用于取消/落地状态，避免依赖 message.loading 的不稳定性） */
+  activeAssistantMessageId: string | null
 }
 
 /** 副作用定义 */
@@ -181,6 +287,15 @@ export function useChat(options: UseChatOptions) {
   const sessionStatesRef = useRef(new Map<string, SessionState>())
   const [stateVersion, setStateVersion] = useState(0)
 
+  // ==================== 工具开关配置（从数据库读取） ====================
+  /** 启用的工具名称列表（undefined 表示全部启用） */
+  const [enabledTools, setEnabledTools] = useState<string[] | undefined>(undefined)
+  const enabledToolsRef = useRef<string[] | undefined>(enabledTools)
+  enabledToolsRef.current = enabledTools
+
+  /** 所有可用工具列表（用于设置面板） */
+  const [allTools, setAllTools] = useState<Array<{ name: string; description: string }>>([])
+
   // ==================== 自动运行配置（从数据库读取） ====================
   // 默认配置
   const DEFAULT_AUTO_RUN_CONFIG: AutoRunConfig = {
@@ -222,10 +337,70 @@ export function useChat(options: UseChatOptions) {
     }
   }, [adapter])
 
+  /** 从数据库加载工具开关配置 */
+  const loadEnabledTools = useCallback(async () => {
+    if (!adapter.getAllSettings) return
+
+    try {
+      const settings = await adapter.getAllSettings()
+      const toolsJson = settings['enabledTools']
+      if (!toolsJson) {
+        setEnabledTools(undefined)
+        return
+      }
+
+      const parsed = JSON.parse(toolsJson) as unknown
+      if (Array.isArray(parsed) && parsed.every((x) => typeof x === 'string')) {
+        setEnabledTools(parsed)
+      } else {
+        setEnabledTools(undefined)
+      }
+    } catch (error) {
+      console.error('[useChat] 加载 enabledTools 失败:', error)
+    }
+  }, [adapter])
+
+  /** 保存工具开关配置到数据库 */
+  const saveEnabledTools = useCallback(async (tools: string[] | undefined) => {
+    if (!adapter.setSetting) return
+
+    try {
+      if (tools === undefined) {
+        // 全部启用：删除配置（使用默认行为）
+        await adapter.deleteSetting?.('enabledTools')
+        setEnabledTools(undefined)
+        return
+      }
+
+      await adapter.setSetting('enabledTools', JSON.stringify(tools))
+      setEnabledTools(tools)
+    } catch (error) {
+      console.error('[useChat] 保存 enabledTools 失败:', error)
+      throw error
+    }
+  }, [adapter])
+
+  /** 加载所有工具列表 */
+  const loadAllTools = useCallback(async () => {
+    if (!adapter.getAllTools) {
+      console.warn('[useChat] adapter.getAllTools 不存在')
+      return
+    }
+
+    try {
+      const tools = await adapter.getAllTools()
+      setAllTools(tools)
+    } catch (error) {
+      console.error('[useChat] 加载工具列表失败:', error)
+    }
+  }, [adapter])
+
   // 初始化时加载配置
   useEffect(() => {
     loadAutoRunConfig()
-  }, [loadAutoRunConfig])
+    loadEnabledTools()
+    loadAllTools()
+  }, [loadAutoRunConfig, loadEnabledTools, loadAllTools])
 
   // 强制重新渲染
   const forceUpdate = useCallback(() => setStateVersion(v => v + 1), [])
@@ -237,6 +412,7 @@ export function useChat(options: UseChatOptions) {
         messages: [],
         isLoading: false,
         abortController: null,
+        activeAssistantMessageId: null,
       })
     }
     return sessionStatesRef.current.get(sessionId)!
@@ -291,19 +467,21 @@ export function useChat(options: UseChatOptions) {
       const list = await adapter.getSessions()
       setSessions(list)
       if (list.length > 0 && !currentSessionIdRef.current) {
-        setCurrentSessionId(list[0].id)
+        // 选择第一个未隐藏的会话，如果都隐藏了则选第一个
+        const firstVisible = list.find(s => !s.hidden) || list[0]
+        setCurrentSessionId(firstVisible.id)
         // 加载消息
-        const state = getSessionState(list[0].id)
+        const state = getSessionState(firstVisible.id)
         if (state.messages.length === 0) {
-          const savedMessages = await adapter.getMessages(list[0].id)
+          const savedMessages = await adapter.getMessages(firstVisible.id)
           state.messages = savedMessages.map(convertToMessage)
           forceUpdate()
         }
         // 同步配置
-        setModeState(list[0].mode)
-        setModelState(list[0].model)
-        setWebSearchState(list[0].webSearchEnabled)
-        setThinkingState(list[0].thinkingEnabled)
+        setModeState(firstVisible.mode)
+        setModelState(firstVisible.model)
+        setWebSearchState(firstVisible.webSearchEnabled)
+        setThinkingState(firstVisible.thinkingEnabled)
       }
     } catch (error) {
       console.error('加载会话失败:', error)
@@ -356,6 +534,7 @@ export function useChat(options: UseChatOptions) {
         messages: [],
         isLoading: false,
         abortController: null,
+        activeAssistantMessageId: null,
       })
       
       setCurrentSessionId(session.id)
@@ -496,15 +675,17 @@ export function useChat(options: UseChatOptions) {
 
       case 'thinking_delta': {
         const data = event.data as { content: string }
+        // 查找最后一个 running 状态的 thinking part
         const lastThinkingIndex = parts.findLastIndex(
           p => p.type === 'thinking' && p.status === 'running'
         )
         if (lastThinkingIndex >= 0) {
+          // 追加到现有的 running thinking part
           const part = parts[lastThinkingIndex] as ThinkingPart
           parts[lastThinkingIndex] = { ...part, text: part.text + data.content }
-        } else {
-          parts.push({ type: 'thinking', text: data.content, status: 'running' })
         }
+        // ⚠️ 关键修复：如果没有 running 的 thinking part，忽略此事件（不创建新的）
+        // thinking_start 事件负责创建，thinking_delta 只负责追加
         break
       }
 
@@ -526,7 +707,17 @@ export function useChat(options: UseChatOptions) {
 
       case 'search_start': {
         const data = event.data as { query?: string }
-        parts.push({ type: 'search', query: data.query, status: 'running' })
+        const searchPart: SearchPart = { type: 'search', query: data.query, status: 'running' }
+
+        // UX：搜索结果事件可能在 text_delta 之后才到达（Provider 侧以 annotation/结果到达为准）
+        // 若直接 push，会导致"搜索卡片"显示在回答之后。
+        // 这里优先插入到第一个 text part 之前（通常在 thinking 后面），保持视觉顺序符合用户预期。
+        const firstTextIndex = parts.findIndex(p => p.type === 'text')
+        if (firstTextIndex >= 0) {
+          parts.splice(firstTextIndex, 0, searchPart)
+        } else {
+          parts.push(searchPart)
+        }
         break
       }
 
@@ -562,13 +753,13 @@ export function useChat(options: UseChatOptions) {
         }
         
         // manual 模式：创建 pending 状态等待用户确认
-        const existingIndex = parts.findLastIndex(
+        const existingIndex = parts.findIndex(
           p => p.type === 'tool_call' && (p as ToolCallPart).id === data.id
         )
         if (existingIndex >= 0) {
           // 更新现有 part 为 pending
           const part = parts[existingIndex] as ToolCallPart
-          parts[existingIndex] = { ...part, status: 'pending', result: null }
+          parts[existingIndex] = { ...part, status: 'pending' }
         } else {
           // 创建新的 pending part
           parts.push({
@@ -577,7 +768,6 @@ export function useChat(options: UseChatOptions) {
             name: data.name,
             args: data.args,
             status: 'pending',
-            result: null,
           })
         }
         break
@@ -586,13 +776,13 @@ export function useChat(options: UseChatOptions) {
       case 'tool_call_start': {
         const data = event.data as { id: string; name: string; args: Record<string, unknown> }
         // 检查是否已存在 pending 状态的 part
-        const existingIndex = parts.findLastIndex(
+        const existingIndex = parts.findIndex(
           p => p.type === 'tool_call' && (p as ToolCallPart).id === data.id
         )
         if (existingIndex >= 0) {
           // 更新现有 part 为 running
           const part = parts[existingIndex] as ToolCallPart
-          parts[existingIndex] = { ...part, status: 'running', result: null }
+          parts[existingIndex] = { ...part, status: 'running' }
         } else {
           // 创建新的 running part
           parts.push({
@@ -601,14 +791,19 @@ export function useChat(options: UseChatOptions) {
             name: data.name,
             args: data.args,
             status: 'running',
-            result: null,
           })
         }
         break
       }
 
       case 'tool_call_result': {
-        const data = event.data as { id: string; name: string; result: string; success: boolean }
+        const data = event.data as { 
+          id: string
+          name: string
+          result: string
+          success: boolean
+          resultType?: string  // 结果类型（用于生成具体类型的 Part）
+        }
         
         let parsedResult: unknown = data.result
         try {
@@ -625,37 +820,55 @@ export function useChat(options: UseChatOptions) {
         const status: 'done' | 'error' | 'cancelled' | 'skipped' = 
           isSkipped ? 'skipped' : (isCancelled ? 'cancelled' : (data.success ? 'done' : 'error'))
 
-        // 查找对应的 tool_call
+        // 查找对应的 tool_call 并更新状态
         const toolCallIndex = parts.findIndex(
           p => p.type === 'tool_call' && (p as ToolCallPart).id === data.id
         )
         
         if (toolCallIndex >= 0) {
-          // 更新 tool_call，添加 result，而不是转换为 tool_result
+          // 更新 tool_call 状态（不再包含 result 字段）
           const toolCall = parts[toolCallIndex] as ToolCallPart
           parts[toolCallIndex] = {
             ...toolCall,
-            result: parsedResult,
             status,
           }
         } else {
-          // 如果没有对应的 tool_call，创建一个新的 tool_call（而不是 tool_result）
+          // 如果没有对应的 tool_call，创建一个新的
           parts.push({
             type: 'tool_call',
             id: data.id,
             name: data.name,
             args: {},
-            result: parsedResult,
             status,
           })
         }
-        
-        // 移除可能存在的独立 tool_result（如果有的话）
-        const existingResultIndex = parts.findIndex(
-          p => p.type === 'tool_result' && (p as ToolResultPart).id === data.id
-        )
-        if (existingResultIndex >= 0) {
-          parts.splice(existingResultIndex, 1)
+
+        // 如果工具定义了 resultType 且执行成功，生成对应类型的 Part
+        if (data.resultType && data.success && typeof parsedResult === 'object' && parsedResult !== null) {
+          // 找到 tool_call 的位置，在其后插入结果 Part
+          const updatedToolCallIndex = parts.findIndex(
+            p => p.type === 'tool_call' && (p as ToolCallPart).id === data.id
+          )
+          
+          // 创建具体类型的 Part（如 { type: 'weather', city: '北京', ... }）
+          const resultPart = {
+            type: data.resultType,
+            ...parsedResult as Record<string, unknown>,
+          }
+          
+          // 检查是否已存在同类型的结果 Part（避免重复）
+          const existingResultIndex = parts.findIndex(
+            (p, i) => i > updatedToolCallIndex && p.type === data.resultType
+          )
+          
+          if (existingResultIndex >= 0) {
+            // 更新现有的结果 Part
+            parts[existingResultIndex] = resultPart
+          } else {
+            // 插到对应 tool_call 之后
+            const insertAt = updatedToolCallIndex >= 0 ? updatedToolCallIndex + 1 : parts.length
+            parts.splice(insertAt, 0, resultPart)
+          }
         }
 
         if (onToolComplete) {
@@ -670,6 +883,30 @@ export function useChat(options: UseChatOptions) {
         break
       }
 
+      case 'tool_call_output': {
+        const data = event.data as { id: string; name: string; stream: 'stdout' | 'stderr'; chunk: string }
+        const toolCallIndex = parts.findIndex(
+          p => p.type === 'tool_call' && (p as ToolCallPart).id === data.id
+        )
+        if (toolCallIndex >= 0) {
+          const toolCall = parts[toolCallIndex] as ToolCallPart
+          const prevStdout = toolCall.output?.stdout ?? ''
+          const prevStderr = toolCall.output?.stderr ?? ''
+          const MAX = 120_000
+
+          const nextOutput =
+            data.stream === 'stdout'
+              ? { stdout: (prevStdout + (data.chunk || '')).slice(-MAX), stderr: prevStderr }
+              : { stdout: prevStdout, stderr: (prevStderr + (data.chunk || '')).slice(-MAX) }
+
+          parts[toolCallIndex] = {
+            ...toolCall,
+            output: nextOutput,
+          }
+        }
+        break
+      }
+
       case 'text_delta': {
         const data = event.data as { content: string }
         
@@ -682,12 +919,14 @@ export function useChat(options: UseChatOptions) {
         // 查找最后一个 text part
         const lastTextIndex = parts.findLastIndex(p => p.type === 'text')
         
-        // 检查最后一个 part 是否是已完成的工具调用/搜索/思考
+        // 检查最后一个 part 是否是已完成的工具调用/思考
         // 如果是，说明这是新一轮的文本输出，应该创建新的 text part
+        //
+        // 注意：search 结果可能会在文本输出过程中到达（甚至夹在 text_delta 中间），
+        // 如果把 search(done) 也作为“新一轮文本”的边界，会导致文本被拆成多个 TextPart。
         const lastPart = parts[parts.length - 1]
         const shouldCreateNew = lastPart && (
           (lastPart.type === 'tool_call' && ['done', 'error', 'skipped', 'cancelled'].includes((lastPart as ToolCallPart).status)) ||
-          (lastPart.type === 'search' && (lastPart as SearchPart).status === 'done') ||
           (lastPart.type === 'thinking' && (lastPart as ThinkingPart).status === 'done')
         )
         
@@ -747,9 +986,56 @@ export function useChat(options: UseChatOptions) {
     forceUpdate()
   }, [onToolComplete, forceUpdate])
 
+  /**
+   * 保存消息到数据库
+   */
+  const saveMessageToDb = useCallback(async (
+    sessionId: string,
+    messageIndex: number,
+    messageId: string
+  ) => {
+    const state = sessionStatesRef.current.get(sessionId)
+    if (!state) return
+    
+    const msg = state.messages[messageIndex]
+    if (!msg) return
+    
+    try {
+      await adapter.updateMessage?.({
+        id: messageId,
+        content: extractTextContent(msg.parts),
+        steps: JSON.stringify(msg.parts),
+      })
+    } catch (error) {
+      console.error('[useChat/react] 保存消息失败:', error)
+    }
+  }, [adapter])
+
+  /**
+   * 统一的事件处理函数：更新UI并保存到数据库
+   * 保证UI更新和DB保存的原子性
+   */
+  const handleEvent = useCallback(async (
+    sessionId: string,
+    messageIndex: number,
+    event: ChatEvent,
+    messageId: string,
+    options: { saveToDb: boolean } = { saveToDb: false }
+  ) => {
+    // 1. 先更新UI
+    updateSessionMessage(sessionId, messageIndex, event)
+    
+    // 2. 如果需要保存，立即保存（保证UI和DB一致）
+    if (options.saveToDb && shouldSaveEvent(event)) {
+      await saveMessageToDb(sessionId, messageIndex, messageId)
+    }
+  }, [updateSessionMessage, saveMessageToDb])
+
   // ==================== 发送消息 ====================
   const sendMessage = useCallback(async (text: string, images?: string[]) => {
-    if (!text.trim()) return
+    // 允许只发送图片（text 为空但有图片）
+    const hasContent = text.trim() || (images && images.length > 0)
+    if (!hasContent) return
     
     let sessionId = currentSessionIdRef.current
     
@@ -773,6 +1059,7 @@ export function useChat(options: UseChatOptions) {
           messages: [],
           isLoading: false,
           abortController: null,
+          activeAssistantMessageId: null,
         })
         setCurrentSessionId(session.id)
         sessionId = session.id
@@ -789,20 +1076,25 @@ export function useChat(options: UseChatOptions) {
       role: 'user',
       parts: [{ type: 'text', text }],
       images,
-      timestamp: new Date(),
+      timestamp: Date.now(),
     }
     state.messages = [...state.messages, userMsg]
     forceUpdate()
 
     try {
+      // 关键：传入 userMsg.id，确保"重新发送/分叉"能用同一个 id 做锚点更新/删除
       await adapter.saveMessage({
+        id: userMsg.id,
         sessionId,
         role: 'user',
         content: text,
+        images: images || [],
       })
 
       if (state.messages.length === 1) {
-        const title = text.slice(0, 20) + (text.length > 20 ? '...' : '')
+        const title = text.trim() 
+          ? text.slice(0, 20) + (text.length > 20 ? '...' : '')
+          : (images && images.length > 0 ? '图片消息' : '新对话')
         await adapter.updateSession(sessionId, { title })
         setSessions(prev => prev.map((s) =>
           s.id === sessionId ? { ...s, title } : s
@@ -823,7 +1115,7 @@ export function useChat(options: UseChatOptions) {
       webSearchEnabled: webSearchRef.current,
       thinkingEnabled: thinkingRef.current,
       loading: true,
-      timestamp: new Date(),
+      timestamp: Date.now(),
     }
     state.messages = [...state.messages, assistantMsg]
     
@@ -831,12 +1123,14 @@ export function useChat(options: UseChatOptions) {
     const requestAbortController = new AbortController()
     state.isLoading = true
     state.abortController = requestAbortController
+    state.activeAssistantMessageId = assistantMsgId
     forceUpdate()
     
     const sendModel = modelRef.current
     const sendMode = modeRef.current
     const sendWebSearch = webSearchRef.current
     const sendThinking = thinkingRef.current
+    const sendEnabledTools = enabledToolsRef.current
 
     // 【关键】立即保存助手消息到数据库（初始状态）
     try {
@@ -874,17 +1168,22 @@ export function useChat(options: UseChatOptions) {
       // 构建历史消息（不包括刚添加的用户消息和助手占位消息）
       const history = state.messages.slice(0, -2).map(msg => ({
         role: msg.role as 'user' | 'assistant' | 'system' | 'tool',
-        content: extractTextContent(msg.parts),
+        // history 中去掉 @ 引用行（避免后续轮次出现“空引用”干扰）
+        content: stripAtContextLines(extractTextContent(msg.parts)),
       }))
       
+      const cleanAutoRunConfig: AutoRunConfig = { ...autoRunConfigRef.current }
+      const promptMessage = await buildPromptWithAtContext(adapter, text)
+
       for await (const event of adapter.sendMessage(
-        text,
+        promptMessage,
         {
           mode: sendMode,
           model: sendModel,
           enableWebSearch: sendWebSearch,
           thinkingMode: sendThinking ? 'enabled' : 'disabled',
-          autoRunConfig,
+          enabledTools: sendEnabledTools,
+          autoRunConfig: cleanAutoRunConfig,
           history, // 传递历史消息
         },
         images,
@@ -893,20 +1192,10 @@ export function useChat(options: UseChatOptions) {
         // 使用本次请求专用的 abortController 检查（避免被新请求覆盖）
         if (requestAbortController.signal.aborted) break
 
-        updateSessionMessage(sessionId, assistantMsgIndex, event)
-
-        // 【关键】在重要事件后增量保存到数据库
-        const shouldSave = 
-          event.type === 'thinking_end' ||
-          event.type === 'tool_call_result' ||
-          event.type === 'text_delta' ||
-          event.type === 'done' ||
-          event.type === 'error' ||
-          event.type === 'abort'
-        
-        if (shouldSave) {
-          await saveMessageProgress()
-        }
+        // 统一处理事件：更新UI并保存到数据库
+        await handleEvent(sessionId, assistantMsgIndex, event, assistantMsgId, {
+          saveToDb: true, // 重要事件需要保存
+        })
 
         if (event.type === 'done' || event.type === 'error') {
           break
@@ -914,10 +1203,16 @@ export function useChat(options: UseChatOptions) {
       }
     } catch (error) {
       console.error('发送消息失败:', error)
-      updateSessionMessage(sessionId, assistantMsgIndex, {
-        type: 'error',
-        data: { message: error instanceof Error ? error.message : String(error) },
-      })
+      await handleEvent(
+        sessionId,
+        assistantMsgIndex,
+        {
+          type: 'error',
+          data: { message: error instanceof Error ? error.message : String(error) },
+        },
+        assistantMsgId,
+        { saveToDb: true }
+      )
     } finally {
       state.isLoading = false
       
@@ -928,24 +1223,64 @@ export function useChat(options: UseChatOptions) {
       }
 
       // 【关键】最终保存一次，确保所有内容都被持久化
-      await saveMessageProgress()
+      await saveMessageToDb(sessionId, assistantMsgIndex, assistantMsgId)
 
       state.abortController = null
+      state.activeAssistantMessageId = null
       forceUpdate()
     }
-  }, [adapter, getSessionState, updateSessionMessage, forceUpdate])
+  }, [adapter, getSessionState, handleEvent, saveMessageToDb, forceUpdate])
 
   // ==================== 其他方法 ====================
+  const patchPartsAsAborted = useCallback((parts: ContentPart[]): ContentPart[] => {
+    return parts.map((p) => {
+      if (p.type === 'thinking' && (p as ThinkingPart).status === 'running') {
+        return { ...(p as ThinkingPart), status: 'done' as const }
+      }
+      if (p.type === 'search' && (p as SearchPart).status === 'running') {
+        return { ...(p as SearchPart), status: 'done' as const }
+      }
+      if (p.type === 'tool_call') {
+        const tool = p as ToolCallPart
+        if (tool.status === 'running' || tool.status === 'pending') {
+          return { ...tool, status: 'cancelled' as const }
+        }
+      }
+      return p
+    })
+  }, [])
+
+  const cancelActiveAssistantMessage = useCallback((sessionId: string) => {
+    const state = sessionStatesRef.current.get(sessionId)
+    if (!state) return
+    if (!state.activeAssistantMessageId) return
+    const idx = state.messages.findIndex((m) => m.id === state.activeAssistantMessageId)
+    if (idx < 0) return
+    const msg = state.messages[idx]
+    state.messages = [...state.messages]
+    state.messages[idx] = {
+      ...msg,
+      loading: false,
+      aborted: true,
+      parts: patchPartsAsAborted(msg.parts),
+    }
+  }, [patchPartsAsAborted])
+
   const cancelRequest = useCallback(() => {
     if (!currentSessionIdRef.current) return
-    const state = sessionStatesRef.current.get(currentSessionIdRef.current)
+    const sessionId = currentSessionIdRef.current
+    const state = sessionStatesRef.current.get(sessionId)
+
+    // 先做 UI 即时落地：精准命中本轮 assistant 消息
+    cancelActiveAssistantMessage(sessionId)
     if (state) {
       state.abortController?.abort()
       state.isLoading = false
+      state.activeAssistantMessageId = null
       forceUpdate()
     }
     adapter.cancel()
-  }, [adapter, forceUpdate])
+  }, [adapter, forceUpdate, cancelActiveAssistantMessage])
 
   const copyMessage = useCallback(async (messageId: string) => {
     if (!currentSessionIdRef.current) return
@@ -978,30 +1313,178 @@ export function useChat(options: UseChatOptions) {
     }
   }, [forceUpdate])
 
-  const regenerateMessage = useCallback((messageIndex: number) => {
+  /** 从指定索引重新发送消息（编辑后重发，分叉：删除其后的所有消息并重新生成） */
+  const resendFromIndex = useCallback(async (index: number, text: string) => {
     if (!currentSessionIdRef.current) return
-    const state = sessionStatesRef.current.get(currentSessionIdRef.current)
+    const sessionId = currentSessionIdRef.current
+    const state = sessionStatesRef.current.get(sessionId)
     if (!state) return
 
-    if (messageIndex > 0 && state.messages[messageIndex - 1]?.role === 'user') {
-      const userMsg = state.messages[messageIndex - 1]
-      const userText = extractTextContent(userMsg.parts)
-      state.messages = state.messages.slice(0, messageIndex - 1)
-      forceUpdate()
-      sendMessage(userText, userMsg.images)
+    const targetMsg = state.messages[index]
+    if (!targetMsg || targetMsg.role !== 'user') {
+      // 容错：如果传入的不是 user 消息索引，退化为普通发送
+      sendMessage(text)
+      return
+    }
+
+    // 如果当前会话正在生成，先取消，避免并发造成状态错乱
+    if (state.isLoading) {
+      state.abortController?.abort()
+      adapter.cancel()
+      state.isLoading = false
+      state.abortController = null
+    }
+
+    // 1) UI：保留该条 user 消息，并更新文本；删除其后的所有消息（分叉）
+    const updatedUserMsg: ChatMessage = {
+      ...targetMsg,
+      parts: [{ type: 'text', text }],
+    }
+    state.messages = [...state.messages.slice(0, index), updatedUserMsg]
+    forceUpdate()
+
+    // 2) DB：删除该 user 消息之后的所有消息（用于分叉）
+    // 新架构：只使用 messageId 作为锚点（更稳定），后端用 messageId 查 timestamp 再删除
+    try {
+      await adapter.deleteMessagesAfterMessageId(sessionId, updatedUserMsg.id)
+    } catch (error) {
+      console.error('[useChat/react] deleteMessagesAfterMessageId 失败:', error)
+    }
+
+    // 3) DB：更新该条 user 消息内容（需要保证 saveMessage 使用同一个 id）
+    try {
+      await adapter.updateMessage?.({
+        id: updatedUserMsg.id,
+        content: text,
+      })
+    } catch (error) {
+      console.warn('[useChat/react] updateMessage(user) 失败，已忽略:', error)
+    }
+
+    // 4) 从该 user 消息继续生成 assistant（不再新建 user 消息）
+    const assistantMsgIndex = state.messages.length
+    const assistantMsgId = generateId()
+    const assistantMsg: ChatMessage = {
+      id: assistantMsgId,
+      role: 'assistant',
+      parts: [],
+      model: modelRef.current,
+      mode: modeRef.current,
+      webSearchEnabled: webSearchRef.current,
+      thinkingEnabled: thinkingRef.current,
+      loading: true,
+      timestamp: Date.now(),
     }
-  }, [sendMessage, forceUpdate])
+    state.messages = [...state.messages, assistantMsg]
+
+    const requestAbortController = new AbortController()
+    state.isLoading = true
+    state.abortController = requestAbortController
+    state.activeAssistantMessageId = assistantMsgId
+    forceUpdate()
 
-  /** 从指定索引重新发送消息（编辑后重发） */
-  const resendFromIndex = useCallback((index: number, text: string) => {
+    // 保存当前配置快照
+    const sendModel = modelRef.current
+    const sendMode = modeRef.current
+    const sendWebSearch = webSearchRef.current
+    const sendThinking = thinkingRef.current
+    const sendEnabledTools = enabledToolsRef.current
+
+    // 立即保存助手消息到数据库（初始状态）
+    try {
+      await adapter.saveMessage({
+        id: assistantMsgId,
+        sessionId,
+        role: 'assistant',
+        content: '',
+        model: sendModel,
+        mode: sendMode,
+        webSearchEnabled: sendWebSearch,
+        thinkingEnabled: sendThinking,
+        steps: '[]',
+      })
+    } catch (error) {
+      console.error('[useChat/react] 创建 assistant 消息失败:', error)
+    }
+
+    // 使用统一的事件处理函数
+
+    try {
+      // history：取该 user 消息之前的消息（不包含当前 user）
+      const history = state.messages.slice(0, index).map(msg => ({
+        role: msg.role as 'user' | 'assistant' | 'system' | 'tool',
+        content: stripAtContextLines(extractTextContent(msg.parts)),
+      }))
+
+      const cleanAutoRunConfig: AutoRunConfig = { ...autoRunConfigRef.current }
+      const images = updatedUserMsg.images
+      const promptMessage = await buildPromptWithAtContext(adapter, text)
+
+      for await (const event of adapter.sendMessage(
+        promptMessage,
+        {
+          mode: sendMode,
+          model: sendModel,
+          enableWebSearch: sendWebSearch,
+          thinkingMode: sendThinking ? 'enabled' : 'disabled',
+          enabledTools: sendEnabledTools,
+          autoRunConfig: cleanAutoRunConfig,
+          history,
+        },
+        images,
+        sessionId
+      )) {
+        if (requestAbortController.signal.aborted) break
+        
+        // 统一处理事件：更新UI并保存到数据库
+        await handleEvent(sessionId, assistantMsgIndex, event, assistantMsgId, {
+          saveToDb: true, // 重要事件需要保存
+        })
+        
+        if (event.type === 'done' || event.type === 'error') break
+      }
+    } catch (error) {
+      console.error('[useChat/react] 分叉重发失败:', error)
+      await handleEvent(
+        sessionId,
+        assistantMsgIndex,
+        {
+          type: 'error',
+          data: { message: error instanceof Error ? error.message : String(error) },
+        },
+        assistantMsgId,
+        { saveToDb: true }
+      )
+    } finally {
+      // 收尾：取消 loading 状态
+      const s = sessionStatesRef.current.get(sessionId)
+      if (s) {
+        s.isLoading = false
+        s.abortController = null
+        s.activeAssistantMessageId = null
+        const finalMsg = s.messages[assistantMsgIndex]
+        if (finalMsg) {
+          s.messages[assistantMsgIndex] = { ...finalMsg, loading: false }
+        }
+        forceUpdate()
+      }
+      // 【关键】最终保存一次，确保所有内容都被持久化
+      await saveMessageToDb(sessionId, assistantMsgIndex, assistantMsgId)
+    }
+  }, [adapter, forceUpdate, sendMessage, handleEvent, saveMessageToDb])
+
+  const regenerateMessage = useCallback((messageIndex: number) => {
     if (!currentSessionIdRef.current) return
     const state = sessionStatesRef.current.get(currentSessionIdRef.current)
     if (!state) return
 
-    state.messages = state.messages.slice(0, index)
-    forceUpdate()
-    sendMessage(text)
-  }, [sendMessage, forceUpdate])
+    if (messageIndex > 0 && state.messages[messageIndex - 1]?.role === 'user') {
+      const userIndex = messageIndex - 1
+      const userMsg = state.messages[userIndex]
+      const userText = extractTextContent(userMsg.parts)
+      void resendFromIndex(userIndex, userText)
+    }
+  }, [resendFromIndex])
 
   const setWorkingDirectory = useCallback((dir: string) => {
     if (adapter.setCwd) {
@@ -1077,5 +1560,10 @@ export function useChat(options: UseChatOptions) {
     autoRunConfig,
     loadAutoRunConfig,
     saveAutoRunConfig,
+
+    // 工具管理
+    enabledTools,
+    allTools,
+    saveEnabledTools,
   }
 }