fix: Agent 对话历史里出现的文件路径解析和预览失效的问题

ErlichLiu · ErlichLiu · commit 7991a7b8c866 · 2026-05-07T22:17:35.000+08:00
diff --git a/apps/electron/package.json b/apps/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@proma/electron",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "Proma next gen ai software with general agents - Electron App",
   "main": "dist/main.cjs",
   "author": {
diff --git a/apps/electron/src/main/lib/file-preview-service.ts b/apps/electron/src/main/lib/file-preview-service.ts
@@ -1455,22 +1455,81 @@ function watchExternalChange(previewWindow: BrowserWindow, state: PreviewWindowS
   }
 }
 
+/**
+ * 在目录中递归搜索指定文件名（用于路径失效时的 fallback）
+ * 限制搜索深度和目录数量，避免阻塞主进程
+ */
+function searchFileInDir(dir: string, targetName: string, maxDepth = 8): string | null {
+  const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', '.next', '__pycache__', '.venv', 'build', '.cache', 'target'])
+  let scanned = 0
+  const MAX_SCANNED = 500
+
+  function walk(current: string, depth: number): string | null {
+    if (depth > maxDepth || scanned > MAX_SCANNED) return null
+    try {
+      const entries = require('fs').readdirSync(current, { withFileTypes: true }) as import('fs').Dirent[]
+      for (const entry of entries) {
+        if (entry.isFile() && entry.name === targetName) {
+          return join(current, entry.name)
+        }
+      }
+      for (const entry of entries) {
+        if (entry.isDirectory() && !SKIP_DIRS.has(entry.name) && !entry.name.startsWith('.')) {
+          scanned++
+          const found = walk(join(current, entry.name), depth + 1)
+          if (found) return found
+        }
+      }
+    } catch { /* permission denied etc */ }
+    return null
+  }
+
+  return walk(dir, 0)
+}
+
 /**
  * 解析待预览的文件路径
- * - 绝对路径：直接 resolve
- * - 相对路径：依次尝试 basePaths，返回第一个存在的；都不存在则返回基于第一个 base 的拼接结果
- *   （让后续 statSync 抛出更明确的错误，而不是被相对 process.cwd 误导）
+ * - 绝对路径：直接 resolve，不存在时 fallback 搜索
+ * - 相对路径：依次尝试 basePaths，返回第一个存在的；都不存在则 fallback 搜索
  */
 function resolveTargetPath(filePath: string, basePaths?: string[]): string {
+  // 直接解析
   if (filePath.startsWith('/') || /^[A-Za-z]:[\\/]/.test(filePath)) {
-    return resolve(filePath)
+    const direct = resolve(filePath)
+    if (existsSync(direct)) return direct
+    // fallback: 用文件名在 basePaths 中搜索
+    const name = basename(direct)
+    if (basePaths) {
+      for (const base of basePaths) {
+        if (!base) continue
+        const found = searchFileInDir(base, name)
+        if (found) return found
+      }
+    }
+    // 从路径中提取 agent-workspaces 根目录作为搜索范围
+    const awIdx = filePath.indexOf('agent-workspaces')
+    if (awIdx !== -1) {
+      const wsRoot = filePath.slice(0, awIdx + 'agent-workspaces'.length)
+      if (existsSync(wsRoot)) {
+        const found = searchFileInDir(wsRoot, name)
+        if (found) return found
+      }
+    }
+    return direct
   }
   if (basePaths && basePaths.length > 0) {
     for (const base of basePaths) {
       if (!base) continue
       const candidate = resolve(base, filePath)
       if (existsSync(candidate)) return candidate
     }
+    // fallback: 用文件名搜索
+    const name = basename(filePath)
+    for (const base of basePaths) {
+      if (!base) continue
+      const found = searchFileInDir(base, name)
+      if (found) return found
+    }
     return resolve(basePaths[0]!, filePath)
   }
   return resolve(filePath)
@@ -1489,17 +1548,29 @@ export function openFilePreview(filePath: string, basePaths?: string[]): void {
   const ext = extname(safePath).toLowerCase()
   const previewType = getPreviewType(safePath, ext)
 
+  if (!existsSync(safePath)) {
+    dialog.showErrorBox('文件不存在', `找不到文件：\n${safePath}\n\n原始路径：${filePath}`)
+    return
+  }
+
   // 不支持的类型，直接用系统默认应用打开
   if (previewType === 'unsupported') {
-    shell.openPath(safePath)
+    shell.openPath(safePath).then(err => { if (err) console.error('[文件预览] 系统打开失败:', err) })
     return
   }
 
   // 检查文件大小
-  const stat = statSync(safePath)
+  let stat: ReturnType<typeof statSync>
+  try {
+    stat = statSync(safePath)
+  } catch (err) {
+    console.error('[文件预览] 读取文件信息失败:', err)
+    shell.openPath(safePath).then(e => { if (e) console.error('[文件预览] 系统打开失败:', e) })
+    return
+  }
   if (stat.size > MAX_FILE_SIZE) {
     console.warn(`[文件预览] 文件过大 (${(stat.size / 1024 / 1024).toFixed(1)}MB)，使用系统应用打开`)
-    shell.openPath(safePath)
+    shell.openPath(safePath).then(err => { if (err) console.error('[文件预览] 系统打开失败:', err) })
     return
   }
 
diff --git a/apps/electron/src/renderer/components/agent/tool-result-renderers/write-result.tsx b/apps/electron/src/renderer/components/agent/tool-result-renderers/write-result.tsx
@@ -4,6 +4,7 @@
 
 import * as React from 'react'
 import { cn } from '@/lib/utils'
+import { FilePathChip } from '@/components/ai-elements/file-path-chip'
 
 interface WriteResultRendererProps {
   result: string
@@ -24,10 +25,9 @@ export function WriteResultRenderer({ result, isError, input }: WriteResultRende
 
   if (!content) {
     const filePath = typeof input.file_path === 'string' ? input.file_path : ''
-    const filename = filePath.split(/[/\\]/).pop() ?? filePath
     return (
-      <div className="text-[12px] text-muted-foreground">
-        已写入 <span className="font-mono text-foreground/70">{filename || '文件'}</span>
+      <div className="text-[12px] text-muted-foreground flex items-center gap-1">
+        已写入 {filePath ? <FilePathChip filePath={filePath} /> : <span className="font-mono text-foreground/70">文件</span>}
       </div>
     )
   }
diff --git a/apps/electron/src/renderer/components/ai-elements/file-path-chip.tsx b/apps/electron/src/renderer/components/ai-elements/file-path-chip.tsx
@@ -7,8 +7,8 @@
  */
 
 import * as React from 'react'
-import { FileText, FileImage, FileVideo, FileCode } from 'lucide-react'
 import { cn } from '@/lib/utils'
+import { FileTypeIcon } from '@/components/file-browser/FileTypeIcon'
 
 /** 图片扩展名 */
 const IMAGE_EXTS = new Set(['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg', 'bmp'])
@@ -52,17 +52,20 @@ function getExtension(filename: string): string {
   return filename.slice(dot + 1).toLowerCase()
 }
 
-/** 根据扩展名获取文件图标 */
-function getFileIcon(ext: string): React.ReactElement {
-  const iconClass = 'size-3 shrink-0'
-  if (IMAGE_EXTS.has(ext)) return <FileImage className={iconClass} />
-  if (VIDEO_EXTS.has(ext)) return <FileVideo className={iconClass} />
-  if (CODE_EXTS.has(ext)) return <FileCode className={iconClass} />
-  return <FileText className={iconClass} />
+/**
+ * 从路径中剥离末尾的行号/列号后缀（如 :42 或 :42:15）
+ * Agent 模式下模型常输出 file_path:line_number 格式
+ */
+function stripLineCol(filePath: string): { path: string; suffix: string } {
+  const m = filePath.match(/^(.+?)(:\d+(?::\d+)?)$/)
+  if (m && !m[1]!.endsWith(':')) {
+    return { path: m[1]!, suffix: m[2]! }
+  }
+  return { path: filePath, suffix: '' }
 }
 
 interface FilePathChipProps {
-  /** 文件路径（绝对或相对） */
+  /** 文件路径（绝对或相对，可能带行号后缀） */
   filePath: string
   /** 基础目录路径（向后兼容，单值） */
   basePath?: string
@@ -73,11 +76,12 @@ interface FilePathChipProps {
 
 /** 文件路径芯片 — 可点击，触发文件预览 */
 export function FilePathChip({ filePath, basePath, basePaths, className }: FilePathChipProps): React.ReactElement {
-  const filename = getFileName(filePath)
-  const ext = getExtension(filename)
-
   const trimmedPath = filePath.trim()
-  const isAbsolute = trimmedPath.startsWith('/') || /^[A-Z]:\\/.test(trimmedPath)
+  const { path: cleanPath, suffix: lineColSuffix } = stripLineCol(trimmedPath)
+
+  const filename = getFileName(cleanPath)
+
+  const isAbsolute = cleanPath.startsWith('/') || /^[A-Z]:\\/.test(cleanPath)
 
   // 候选基础目录列表：优先使用 basePaths；否则退化到 basePath 单值
   const candidateBases = React.useMemo<string[]>(() => {
@@ -91,19 +95,17 @@ export function FilePathChip({ filePath, basePath, basePaths, className }: FileP
     if (isAbsolute) return trimmedPath
     if (candidateBases.length > 0) {
       const base = candidateBases[0]!
-      return base.endsWith('/') ? `${base}${trimmedPath}` : `${base}/${trimmedPath}`
+      return base.endsWith('/') ? `${base}${cleanPath}` : `${base}/${cleanPath}`
     }
     return trimmedPath
-  }, [trimmedPath, isAbsolute, candidateBases])
+  }, [trimmedPath, cleanPath, isAbsolute, candidateBases])
 
   const handleClick = React.useCallback(() => {
-    // 绝对路径直接预览；相对路径把候选 basePaths 交给主进程依次尝试
-    const target = isAbsolute ? trimmedPath : trimmedPath
-    const bases = isAbsolute ? undefined : (candidateBases.length > 0 ? candidateBases : undefined)
-    window.electronAPI.previewFile(target, bases).catch((error: unknown) => {
+    const bases = candidateBases.length > 0 ? candidateBases : undefined
+    window.electronAPI.previewFile(cleanPath, bases).catch((error: unknown) => {
       console.error('[FilePathChip] 预览文件失败:', error)
     })
-  }, [trimmedPath, isAbsolute, candidateBases])
+  }, [cleanPath, candidateBases])
 
   return (
     <button
@@ -118,8 +120,8 @@ export function FilePathChip({ filePath, basePath, basePaths, className }: FileP
         className
       )}
     >
-      {getFileIcon(ext)}
-      <span className="truncate max-w-[240px]">{filename}</span>
+      <FileTypeIcon name={filename} isDirectory={false} size={14} />
+      <span className="truncate max-w-[240px]">{filename}{lineColSuffix}</span>
     </button>
   )
 }
@@ -135,15 +137,18 @@ export function isAbsoluteFilePath(text: string): boolean {
   const trimmed = text.trim()
   if (trimmed.length < 2) return false
 
+  // 剥离末尾行号后缀再检测
+  const { path: clean } = stripLineCol(trimmed)
+
   // macOS/Linux 绝对路径：以 / 开头，至少两级
-  if (trimmed.startsWith('/') && /^\/[^\n]+\/[^\n]+$/.test(trimmed)) {
+  if (clean.startsWith('/') && /^\/[^\n]+\/[^\n]+$/.test(clean)) {
     // 排除常见的非路径模式（如 /regex/ 模式）
-    if (trimmed.endsWith('/') && !trimmed.includes('.')) return false
+    if (clean.endsWith('/') && !clean.includes('.')) return false
     return true
   }
 
   // Windows 绝对路径
-  if (/^[A-Z]:\\/.test(trimmed)) return true
+  if (/^[A-Z]:\\/.test(clean)) return true
 
   return false
 }
@@ -160,16 +165,19 @@ export function isRelativeFilePath(text: string): boolean {
   const trimmed = text.trim()
   if (trimmed.length < 3) return false
 
+  // 剥离末尾行号后缀再检测
+  const { path: clean } = stripLineCol(trimmed)
+
   // 提取扩展名
-  const ext = getExtension(trimmed)
+  const ext = getExtension(clean)
   if (!ext || !ALL_PREVIEWABLE_EXTS.has(ext)) return false
 
   // 必须看起来像文件路径：允许 字母数字、点、横线、下划线、斜杠
   // 排除含空格或特殊字符的（太可能是其他内容）
-  if (!/^[\w./@-]+$/.test(trimmed)) return false
+  if (!/^[\w./@-]+$/.test(clean)) return false
 
   // 排除以点开头的隐藏文件（如 .gitignore），但保留含子路径的目录相对路径（如 .context/file.md）
-  if (trimmed.startsWith('.') && !trimmed.startsWith('./') && !trimmed.includes('/')) return false
+  if (clean.startsWith('.') && !clean.startsWith('./') && !clean.includes('/')) return false
 
   return true
 }
diff --git a/apps/electron/src/renderer/components/ai-elements/message.tsx b/apps/electron/src/renderer/components/ai-elements/message.tsx
@@ -471,10 +471,7 @@ const MarkdownInlineCode = React.memo(function MarkdownInlineCode({
   const text = typeof codeChildren === 'string' ? codeChildren : ''
 
   if (text) {
-    if (isAbsoluteFilePath(text)) {
-      return <FilePathChip filePath={text.trim()} />
-    }
-    // 相对路径：合并 basePath（主 cwd）+ basePaths（props 或 context 提供的附加目录）作为候选
+    // 合并 basePath（主 cwd）+ basePaths（props 或 context 提供的附加目录）作为候选
     const merged: string[] = []
     if (basePath) merged.push(basePath)
     const allExtra = basePaths || ctxBasePaths
@@ -483,6 +480,9 @@ const MarkdownInlineCode = React.memo(function MarkdownInlineCode({
         if (p && !merged.includes(p)) merged.push(p)
       }
     }
+    if (isAbsoluteFilePath(text)) {
+      return <FilePathChip filePath={text.trim()} basePaths={merged.length > 0 ? merged : undefined} />
+    }
     if (merged.length > 0 && isRelativeFilePath(text)) {
       return <FilePathChip filePath={text.trim()} basePaths={merged} />
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@proma/electron",`
`3`		`- "version": "0.9.20",`
	`3`	`+ "version": "0.9.21",`
`4`	`4`	`"description": "Proma next gen ai software with general agents - Electron App",`
`5`	`5`	`"main": "dist/main.cjs",`
`6`	`6`	`"author": {`