diff --git a/src/renderer/src/pages/home/Inputbar/ThinkingButton.tsx b/src/renderer/src/pages/home/Inputbar/ThinkingButton.tsx
index 4acd2908a5..38ed94712a 100644
--- a/src/renderer/src/pages/home/Inputbar/ThinkingButton.tsx
+++ b/src/renderer/src/pages/home/Inputbar/ThinkingButton.tsx
@@ -84,11 +84,7 @@ const ThinkingButton: FC<Props> = ({ ref, model, assistant, ToolbarButton }): Re
     if (isDoubaoModel) return 'doubao'
     if (isDeepResearchModel) return 'openai_deep_research'
     return 'default'
-<<<<<<< HEAD
-  }, [isGeminiModel, isGrokModel, isQwenModel, isDoubaoModel, isDeepResearchModel])
-=======
-  }, [isGeminiModel, isGrokModel, isQwenModel, isDoubaoModel, isGeminiFlashModel])
->>>>>>> main
+  }, [isGeminiModel, isGrokModel, isQwenModel, isDoubaoModel, isDeepResearchModel, isGeminiFlashModel])
 
   // 获取当前模型支持的选项
   const supportedOptions = useMemo(() => {
diff --git a/src/renderer/src/services/messageStreaming/callbacks/toolCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/toolCallbacks.ts
index 8d89bd05dd..01f1078f64 100644
--- a/src/renderer/src/services/messageStreaming/callbacks/toolCallbacks.ts
+++ b/src/renderer/src/services/messageStreaming/callbacks/toolCallbacks.ts
@@ -19,9 +19,10 @@ export const createToolCallbacks = (deps: ToolCallbacksDependencies) => {
   return {
     onToolCallPending: (toolResponse: MCPToolResponse) => {
       if (blockManager.hasInitialPlaceholder) {
-        const changes = {
+        const changes: Partial<ToolMessageBlock> = {
           type: MessageBlockType.TOOL,
           status: MessageBlockStatus.PENDING,
+          toolId: toolResponse.id,
           toolName: toolResponse.tool.name,
           metadata: { rawMcpToolResponse: toolResponse }
         }
@@ -49,7 +50,7 @@ export const createToolCallbacks = (deps: ToolCallbacksDependencies) => {
       const targetBlockId = toolCallIdToBlockIdMap.get(toolResponse.id)
 
       if (targetBlockId && toolResponse.status === 'invoking') {
-        const changes = {
+        const changes: Partial<ToolMessageBlock> = {
           status: MessageBlockStatus.PROCESSING,
           metadata: { rawMcpToolResponse: toolResponse }
         }
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 633a17dd1d..4b284c5484 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -680,7 +680,7 @@ export interface GetMCPPromptResponse {
   messages: {
     role: string
     content: {
-      type: 'text' | 'image' | 'audio' | 'resource'
+      type: 'text' | 'image' | 'audio' | 'resource' | 'resource_link'
       text?: string
       data?: string
       mimeType?: string