feat(agent): add rich content support and refactor tool execution types

- Rename ToolExecutionResult to AgentToolExecutionResult for clarity
- Add richContent field to tool execution results for enhanced output rendering
- Move ToolExecutionContext to shared types for better code organization
- Update toolRegistry reference to toolManager for consistency
- Enhance RichContentRenderer with fullscreen image modal using portal
- Add image expansion functionality with smooth animations and backdrop blur
- Remove unused language parameter from getPromptTemplatePreview function
- Update all imports and type references across agent core modules
- Improve tool result handling to preserve and propagate rich content metadata

Author: adnaan-worker

src/renderer/agent/core/index.ts

@@ -15,5 +15,5 @@ export type {
   LLMCallResult,
   LoopCheckResult,
   CompressionStats,
-  ToolExecutionResult,
+  AgentToolExecutionResult,
 } from './types'

src/renderer/agent/core/tools.ts

@@ -12,15 +12,15 @@
 import { api } from '@/renderer/services/electronAPI'
 import { logger } from '@utils/Logger'
 import { useAgentStore } from '../store/AgentStore'
-import { toolRegistry } from '../tools/registry'
+import { toolManager } from '../tools/providers'
 import { getToolApprovalType, isFileEditTool } from '@/shared/config/tools'
 import { pathStartsWith, joinPath } from '@shared/utils/pathUtils'
 import { useStore } from '@store'
 import { EventBus } from './EventBus'
 import { truncateToolResult } from '@/renderer/utils/partialJson'
 import { getAgentConfig } from '../utils/AgentConfig'
 import type { ToolCall } from '@/shared/types'
-import type { ToolExecutionContext, ToolExecutionResult } from './types'
+import type { ToolExecutionContext, AgentToolExecutionResult } from './types'
 
 // ===== 审批服务 =====
 
@@ -144,7 +144,7 @@ function analyzeToolDependencies(toolCalls: ToolCall[]): Map<string, Set<string>
 async function executeSingle(
   toolCall: ToolCall,
   context: ToolExecutionContext
-): Promise<ToolExecutionResult> {
+): Promise<AgentToolExecutionResult> {
   const store = useAgentStore.getState()
   const mainStore = useStore.getState()
   const { currentAssistantId, workspacePath } = context
@@ -164,7 +164,7 @@ async function executeSingle(
   })
 
   try {
-    const result = await toolRegistry.execute(
+    const result = await toolManager.execute(
       toolCall.name,
       toolCall.arguments,
       { workspacePath: workspacePath ?? null, currentAssistantId: currentAssistantId ?? null }
@@ -194,6 +194,7 @@ async function executeSingle(
     })
 
     const meta = result.meta || {}
+    const richContent = result.richContent
 
     // 更新状态，并将 meta 数据合并到 arguments._meta
     if (currentAssistantId) {
@@ -205,16 +206,17 @@ async function executeSingle(
         status: result.success ? 'success' : 'error',
         result: content,
         arguments: updatedArguments,
+        richContent,
       })
       store.addToolResult(toolCall.id, toolCall.name, content, result.success ? 'success' : 'tool_error')
     }
     EventBus.emit({
       type: result.success ? 'tool:completed' : 'tool:error',
       id: toolCall.id,
-      ...(result.success ? { result: content, meta } : { error: content }),
+      ...(result.success ? { result: content, meta, richContent } : { error: content }),
     } as any)
 
-    return { toolCall, result: { content, meta } }
+    return { toolCall, result: { content, meta, richContent } }
   } catch (error) {
     const duration = Date.now() - startTime
     const errorMsg = error instanceof Error ? error.message : String(error)
@@ -251,9 +253,9 @@ export async function executeTools(
   toolCalls: ToolCall[],
   context: ToolExecutionContext,
   abortSignal?: AbortSignal
-): Promise<{ results: ToolExecutionResult[]; userRejected: boolean }> {
+): Promise<{ results: AgentToolExecutionResult[]; userRejected: boolean }> {
   const store = useAgentStore.getState()
-  const results: ToolExecutionResult[] = []
+  const results: AgentToolExecutionResult[] = []
   let userRejected = false
 
   if (toolCalls.length === 0) {

src/renderer/agent/core/types.ts

@@ -21,12 +21,9 @@ export interface ExecutionContext {
   abortSignal?: AbortSignal
 }
 
-// ===== 工具执行上下文 =====
+// ===== 工具执行上下文（重新导出 shared 定义） =====
 
-export interface ToolExecutionContext {
-  workspacePath: string | null
-  currentAssistantId: string | null
-}
+export type { ToolExecutionContext } from '@/shared/types'
 
 // ===== LLM 调用结果 =====
 
@@ -49,13 +46,14 @@ export interface LoopCheckResult {
 
 export type { CompressionStats, CompressionLevel } from '../context/CompressionManager'
 
-// ===== 工具执行结果 =====
+// ===== 工具执行结果（Agent 内部使用，包含 toolCall 信息） =====
 
-export interface ToolExecutionResult {
+export interface AgentToolExecutionResult {
   toolCall: ToolCall
   result: {
     content: string
     meta?: Record<string, unknown>
+    richContent?: import('@/shared/types').ToolRichContent[]
   }
 }
 

src/renderer/agent/prompts/promptTemplates.ts

@@ -568,7 +568,7 @@ import { buildSystemPrompt, type PromptContext } from './PromptBuilder'
  * @param templateId 模板 ID
  * @param language 语言，'zh' 为中文，其他为英文
  */
-export function getPromptTemplatePreview(templateId: string, language?: string): string {
+export function getPromptTemplatePreview(templateId: string): string {
   const template = getPromptTemplateById(templateId)
   if (!template) return 'Template not found'
 

src/renderer/components/agent/RichContentRenderer.tsx

@@ -4,6 +4,7 @@
  */
 
 import { useState, useMemo, memo } from 'react'
+import { createPortal } from 'react-dom'
 import {
   Image as ImageIcon, Code, FileText, Link as LinkIcon,
   Table, Copy, Check, ExternalLink, Maximize2, X
@@ -95,6 +96,40 @@ function ImageContent({ item }: { item: ToolRichContent }) {
 
   if (!imageSrc) return null
 
+  const modal = isExpanded ? createPortal(
+    <AnimatePresence>
+      <motion.div 
+        initial={{ opacity: 0 }} 
+        animate={{ opacity: 1 }} 
+        exit={{ opacity: 0 }} 
+        className="fixed inset-0 z-[99999] flex items-center justify-center bg-black/95 backdrop-blur-lg p-8" 
+        onClick={() => setIsExpanded(false)}
+        style={{ position: 'fixed', top: 0, left: 0, right: 0, bottom: 0 }}
+      >
+        <motion.div
+          initial={{ scale: 0.9, opacity: 0 }} 
+          animate={{ scale: 1, opacity: 1 }} 
+          exit={{ scale: 0.9, opacity: 0 }}
+          className="relative max-w-[90vw] max-h-[90vh] flex items-center justify-center"
+          onClick={(e) => e.stopPropagation()}
+        >
+          <img 
+            src={imageSrc} 
+            alt={item.title || 'Image'}
+            className="max-w-full max-h-[90vh] object-contain rounded-xl shadow-2xl"
+          />
+        </motion.div>
+        <button 
+          onClick={() => setIsExpanded(false)}
+          className="absolute top-6 right-6 p-3 rounded-full bg-white/10 text-white hover:bg-white/20 transition-all z-[100000]"
+        >
+          <X className="w-5 h-5" />
+        </button>
+      </motion.div>
+    </AnimatePresence>,
+    document.body
+  ) : null
+
   return (
     <>
       <ContentCard 
@@ -103,28 +138,35 @@ function ImageContent({ item }: { item: ToolRichContent }) {
         noPadding
         actions={
           <>
-            <button onClick={() => { navigator.clipboard.writeText(imageSrc); setCopied(true); setTimeout(() => setCopied(false), 2000); }} className="p-1.5 rounded-lg hover:bg-white/10 text-text-muted transition-colors">
+            <button 
+              onClick={() => { 
+                navigator.clipboard.writeText(imageSrc); 
+                setCopied(true); 
+                setTimeout(() => setCopied(false), 2000); 
+              }} 
+              className="p-1.5 rounded-lg hover:bg-white/10 text-text-muted transition-colors"
+            >
               {copied ? <Check className="w-3.5 h-3.5 text-emerald-400" /> : <Copy className="w-3.5 h-3.5" />}
             </button>
-            <button onClick={() => setIsExpanded(true)} className="p-1.5 rounded-lg hover:bg-white/10 text-text-muted transition-colors">
+            <button 
+              onClick={() => setIsExpanded(true)} 
+              className="p-1.5 rounded-lg hover:bg-white/10 text-text-muted transition-colors"
+            >
               <Maximize2 className="w-3.5 h-3.5" />
             </button>
           </>
         }
       >
         <div className="flex justify-center bg-black/40 group relative">
-          <img src={imageSrc} className="max-w-full max-h-80 object-contain cursor-zoom-in" onClick={() => setIsExpanded(true)} />
+          <img 
+            src={imageSrc} 
+            alt={item.title || 'Image'}
+            className="max-w-full max-h-80 object-contain cursor-zoom-in" 
+            onClick={() => setIsExpanded(true)} 
+          />
         </div>
       </ContentCard>
-
-      <AnimatePresence>
-        {isExpanded && (
-          <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0 }} className="fixed inset-0 z-[100] flex items-center justify-center bg-black/90 backdrop-blur-md p-8" onClick={() => setIsExpanded(false)}>
-            <motion.img initial={{ scale: 0.9 }} animate={{ scale: 1 }} src={imageSrc} className="max-w-full max-h-full rounded-xl shadow-2xl" />
-            <button className="absolute top-6 right-6 p-3 rounded-full bg-white/10 text-white hover:bg-white/20 transition-all"><X /></button>
-          </motion.div>
-        )}
-      </AnimatePresence>
+      {modal}
     </>
   )
 }

src/renderer/components/settings/tabs/PromptPreviewModal.tsx

@@ -11,7 +11,7 @@ import { PromptPreviewModalProps } from '../types'
 
 export function PromptPreviewModal({ templateId, language, onClose }: PromptPreviewModalProps) {
     const template = getPromptTemplateById(templateId)
-    const previewContent = template ? getPromptTemplatePreview(templateId, language) : ''
+    const previewContent = template ? getPromptTemplatePreview(templateId) : ''
     const [searchQuery, setSearchQuery] = useState('')
     const [activeSection, setActiveSection] = useState<string | null>(null)
     const [copied, setCopied] = useState(false)

src/renderer/types/electron.d.ts

@@ -260,6 +260,8 @@ export interface ElectronAPI {
   killTerminal: (id?: string) => void
   getAvailableShells: () => Promise<{ label: string; path: string }[]>
   onTerminalData: (callback: (event: { id: string; data: string }) => void) => () => void
+  onTerminalExit: (callback: (event: { id: string; exitCode: number; signal?: number }) => void) => () => void
+  onTerminalError: (callback: (event: { id: string; error: string }) => void) => () => void
 
   // Shell
   executeBackground: (params: { command: string; cwd?: string; timeout?: number; shell?: string }) => Promise<{

src/shared/types/llm.ts

@@ -229,8 +229,6 @@ export interface ToolRichContent {
     }
     /** 链接 URL（type 为 link 时使用） */
     url?: string
-    /** 附加属性 */
-    attributes?: Record<string, unknown>
 }
 
 export interface ToolExecutionContext {

src/shared/utils/index.ts

@@ -25,7 +25,6 @@ export {
   validatePath,
   hasPathTraversal,
   isSensitivePath,
-  type PathValidationResult,
 } from './pathUtils'
 
 // JSON 工具函数