@muyichengshayu/promptx 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.2.3
+
+- 重构代码变更审查的 `git diff worker` 为带队列的 worker 池，避免单个大 diff 或超时请求拖住所有项目；同时补充更细的 worker 诊断信息，便于排查卡顿、超时和异常退出。
+- 优化代码变更弹窗首屏加载：工作区 / 任务范围优先返回轻量文件列表，整体增删统计与单文件 patch 改为按需加载，明显降低“刚打开代码变更就卡住”的概率。
+- 收紧单文件 diff 的降级策略：为 patch 生成补充源文件大小阈值、patch 行数阈值和命令超时控制；超大或过慢的文件不再拖垮整个弹窗，而是稳定降级为提示或摘要预览。
+- 为超长 diff 新增摘要预览：当完整 patch 过长时，PromptX 会保留文件头和前几个 hunk 的摘要内容，而不再只显示一行“太长无法展示”的空白提示。
+- 优化代码变更弹窗切文件手感：前端新增单文件 patch 请求复用与前几个可见文件的后台预取，常见文件切换更接近秒开，同时避免点击和预取重复发起相同请求。
+
 ## 0.2.2
 
 - 修复 `WeChat` 主题下删除任务等危险确认弹窗的按钮文字不可见问题：补齐 `tool-button-danger` 与各类 `subtle` 按钮在微信主题中的语义色覆盖，避免通用按钮样式把危险操作刷成白底白字。

package/apps/server/src/gitDiff.js

@@ -9,6 +9,11 @@ import { getTaskBySlug } from './repository.js'
 
 const MAX_SNAPSHOT_TEXT_BYTES = 220_000
 const MAX_PATCH_TEXT_BYTES = 260_000
+const MAX_INLINE_PATCH_SOURCE_BYTES = Math.max(48_000, Number(process.env.PROMPTX_GIT_DIFF_MAX_INLINE_FILE_BYTES) || 140_000)
+const MAX_PATCH_LINE_COUNT = Math.max(400, Number(process.env.PROMPTX_GIT_DIFF_MAX_PATCH_LINES) || 2200)
+const MAX_PATCH_PREVIEW_LINES = Math.max(80, Number(process.env.PROMPTX_GIT_DIFF_MAX_PATCH_PREVIEW_LINES) || 220)
+const MAX_PATCH_PREVIEW_HUNKS = Math.max(1, Number(process.env.PROMPTX_GIT_DIFF_MAX_PATCH_PREVIEW_HUNKS) || 5)
+const PATCH_COMMAND_TIMEOUT_MS = Math.max(1_000, Number(process.env.PROMPTX_GIT_DIFF_PATCH_COMMAND_TIMEOUT_MS) || 8000)
 const DIFF_REVIEW_CACHE_TTL_MS = 4000
 const DIFF_REVIEW_CACHE_MAX_ENTRIES = 80
 const FILE_DIFF_CACHE_TTL_MS = 8000
@@ -66,6 +71,9 @@ function runGit(repoRoot = '', args = [], options = {}) {
     status: typeof result.status === 'number' ? result.status : 1,
     stdout: String(result.stdout || ''),
     stderr: String(result.stderr || ''),
+    signal: String(result.signal || ''),
+    errorCode: String(result.error?.code || ''),
+    timedOut: String(result.error?.code || '') === 'ETIMEDOUT',
   }
 }
 
@@ -81,6 +89,9 @@ function runGitBuffer(repoRoot = '', args = [], options = {}) {
     status: typeof result.status === 'number' ? result.status : 1,
     stdout: Buffer.isBuffer(result.stdout) ? result.stdout : Buffer.from(result.stdout || ''),
     stderr: Buffer.isBuffer(result.stderr) ? result.stderr : Buffer.from(result.stderr || ''),
+    signal: String(result.signal || ''),
+    errorCode: String(result.error?.code || ''),
+    timedOut: String(result.error?.code || '') === 'ETIMEDOUT',
   }
 }
 
@@ -92,6 +103,80 @@ function createHash(value) {
   return crypto.createHash('sha1').update(value).digest('hex')
 }
 
+function countTextLines(value = '') {
+  const text = String(value || '')
+  if (!text) {
+    return 0
+  }
+
+  let lines = 1
+  for (let index = 0; index < text.length; index += 1) {
+    if (text.charCodeAt(index) === 10) {
+      lines += 1
+    }
+  }
+  return lines
+}
+
+function buildPatchPreviewSummary(patch = '') {
+  const text = String(patch || '').trim()
+  if (!text) {
+    return ''
+  }
+
+  const lines = text.split('\n')
+  if (lines.length <= MAX_PATCH_PREVIEW_LINES) {
+    return text
+  }
+
+  const previewLines = []
+  let index = 0
+  let hunkCount = 0
+
+  while (index < lines.length && !lines[index].startsWith('@@ ')) {
+    if (previewLines.length >= MAX_PATCH_PREVIEW_LINES) {
+      break
+    }
+    previewLines.push(lines[index])
+    index += 1
+  }
+
+  while (index < lines.length && previewLines.length < MAX_PATCH_PREVIEW_LINES) {
+    const line = lines[index]
+    if (line.startsWith('@@ ')) {
+      if (hunkCount >= MAX_PATCH_PREVIEW_HUNKS) {
+        break
+      }
+      hunkCount += 1
+    }
+
+    previewLines.push(line)
+    index += 1
+  }
+
+  while (previewLines.length && !previewLines[previewLines.length - 1].startsWith('@@ ') && previewLines.length > MAX_PATCH_PREVIEW_LINES - 12) {
+    previewLines.pop()
+  }
+
+  const omittedLineCount = Math.max(0, lines.length - previewLines.length)
+  previewLines.push(`... 已截断，剩余 ${omittedLineCount} 行未展示 ...`)
+  return previewLines.join('\n').trim()
+}
+
+function createLongPatchPreviewPayload(stats = {}, patch = '', includeStats = true) {
+  const previewPatch = buildPatchPreviewSummary(patch)
+  return {
+    binary: false,
+    tooLarge: true,
+    patch: previewPatch,
+    patchLoaded: true,
+    additions: includeStats ? stats.additions : null,
+    deletions: includeStats ? stats.deletions : null,
+    statsLoaded: includeStats,
+    message: previewPatch ? 'diff 内容较长，当前仅展示摘要预览。' : 'diff 内容较长，暂不在页面内完整展示。',
+  }
+}
+
 function getCachedValue(cache, key, ttlMs, metricKey = '', options = {}) {
   const {
     channel = 'all',
@@ -857,7 +942,21 @@ function buildSubmoduleDiffPayload(repoRoot = '', filePath = '', options = {}) {
   }
   diffArgs.push('--', normalizedPath)
 
-  const result = runGit(repoRoot, diffArgs)
+  const result = runGit(repoRoot, diffArgs, {
+    timeout: includePatch ? PATCH_COMMAND_TIMEOUT_MS : undefined,
+  })
+  if (result.timedOut) {
+    return {
+      binary: false,
+      tooLarge: true,
+      patch: '',
+      patchLoaded: true,
+      additions: null,
+      deletions: null,
+      statsLoaded: false,
+      message: '该文件 diff 计算超时，暂不在线展示详细内容。',
+    }
+  }
   const patch = String(result.stdout || '').trim()
   const stats = includeStats ? parsePatchStats(patch) : { additions: null, deletions: null }
 
@@ -875,16 +974,11 @@ function buildSubmoduleDiffPayload(repoRoot = '', filePath = '', options = {}) {
   }
 
   if (patch.length > MAX_PATCH_TEXT_BYTES) {
-    return {
-      binary: false,
-      tooLarge: true,
-      patch: '',
-      patchLoaded: true,
-      additions: stats.additions,
-      deletions: stats.deletions,
-      statsLoaded: includeStats,
-      message: 'diff 内容较长，暂不在页面内完整展示。',
-    }
+    return createLongPatchPreviewPayload(stats, patch, includeStats)
+  }
+
+  if (countTextLines(patch) > MAX_PATCH_LINE_COUNT) {
+    return createLongPatchPreviewPayload(stats, patch, includeStats)
   }
 
   return {
@@ -1042,6 +1136,32 @@ function buildDiffPayloadForFile(filePath = '', previousState = null, nextState
     return payload
   }
 
+  if (includePatch && Math.max(
+    Math.max(0, Number(previousState?.size) || 0),
+    Math.max(0, Number(nextState?.size) || 0)
+  ) > MAX_INLINE_PATCH_SOURCE_BYTES) {
+    const payload = {
+      binary: false,
+      tooLarge: true,
+      patch: '',
+      patchLoaded: true,
+      additions: null,
+      deletions: null,
+      statsLoaded: false,
+      message: '文件内容较大，暂不展示具体 diff。',
+    }
+    setCachedValue(fileDiffCache, cacheKey, payload, FILE_DIFF_CACHE_MAX_ENTRIES, {
+      channel: 'file',
+      cacheName: 'file-diff',
+      debugMeta: {
+        path: String(filePath || '').trim(),
+        includePatch,
+        includeStats,
+      },
+    })
+    return payload
+  }
+
   if (!includeStats) {
     const payload = {
       binary: false,
@@ -1084,16 +1204,15 @@ function buildDiffPayloadForFile(filePath = '', previousState = null, nextState
       fs.writeFileSync(nextPath, nextState.text || '', 'utf8')
     }
 
-    const statsResult = runGit(tempDir, [
-      'diff',
-      '--no-index',
-      '--numstat',
-      previousState?.exists ? previousPath : nullPath,
-      nextState?.exists ? nextPath : nullPath,
-    ])
-    const numstat = parseNumstat(statsResult.stdout)
-
     if (!includePatch) {
+      const statsResult = runGit(tempDir, [
+        'diff',
+        '--no-index',
+        '--numstat',
+        previousState?.exists ? previousPath : nullPath,
+        nextState?.exists ? nextPath : nullPath,
+      ])
+      const numstat = parseNumstat(statsResult.stdout)
       const payload = {
         binary: false,
         tooLarge: false,
@@ -1123,7 +1242,31 @@ function buildDiffPayloadForFile(filePath = '', previousState = null, nextState
       '--unified=3',
       previousState?.exists ? previousPath : nullPath,
       nextState?.exists ? nextPath : nullPath,
-    ])
+    ], {
+      timeout: PATCH_COMMAND_TIMEOUT_MS,
+    })
+    if (result.timedOut) {
+      const payload = {
+        binary: false,
+        tooLarge: true,
+        patch: '',
+        patchLoaded: true,
+        additions: null,
+        deletions: null,
+        statsLoaded: false,
+        message: '该文件 diff 计算超时，暂不在线展示详细内容。',
+      }
+      setCachedValue(fileDiffCache, cacheKey, payload, FILE_DIFF_CACHE_MAX_ENTRIES, {
+        channel: 'file',
+        cacheName: 'file-diff',
+        debugMeta: {
+          path: String(filePath || '').trim(),
+          includePatch,
+          includeStats,
+        },
+      })
+      return payload
+    }
 
     let patch = String(result.stdout || '').trim()
     if (patch) {
@@ -1158,16 +1301,21 @@ function buildDiffPayloadForFile(filePath = '', previousState = null, nextState
     }
 
     if (patch.length > MAX_PATCH_TEXT_BYTES) {
-      const payload = {
-        binary: false,
-        tooLarge: true,
-        patch: '',
-        patchLoaded: true,
-        additions: stats.additions,
-        deletions: stats.deletions,
-        statsLoaded: true,
-        message: 'diff 内容较长，暂不在页面内完整展示。',
-      }
+      const payload = createLongPatchPreviewPayload(stats, patch, true)
+      setCachedValue(fileDiffCache, cacheKey, payload, FILE_DIFF_CACHE_MAX_ENTRIES, {
+        channel: 'file',
+        cacheName: 'file-diff',
+        debugMeta: {
+          path: String(filePath || '').trim(),
+          includePatch,
+          includeStats,
+        },
+      })
+      return payload
+    }
+
+    if (countTextLines(patch) > MAX_PATCH_LINE_COUNT) {
+      const payload = createLongPatchPreviewPayload(stats, patch, true)
       setCachedValue(fileDiffCache, cacheKey, payload, FILE_DIFF_CACHE_MAX_ENTRIES, {
         channel: 'file',
         cacheName: 'file-diff',
@@ -1340,6 +1488,21 @@ function createUnsupportedResult(reason = '', repoRoot = '', branch = '') {
   }
 }
 
+function createLightweightDiffFileEntry(filePath = '', status = 'M') {
+  return {
+    path: String(filePath || '').trim(),
+    status: normalizeDiffStatus(status),
+    additions: null,
+    deletions: null,
+    statsLoaded: false,
+    binary: false,
+    tooLarge: false,
+    patch: '',
+    patchLoaded: false,
+    message: '',
+  }
+}
+
 export function getWorkspaceGitDiffReviewByCwd(cwd = '', options = {}) {
   const repoRoot = resolveGitRepoRoot(cwd)
   if (!repoRoot) {
@@ -1350,8 +1513,8 @@ export function getWorkspaceGitDiffReviewByCwd(cwd = '', options = {}) {
   const workspaceStatusSignature = resolveWorkspaceStatusSignature(repoRoot)
   const currentHeadOid = resolveGitHeadOid(repoRoot)
   const targetFilePath = String(options.filePath || '').trim()
-  const includeFiles = targetFilePath || options.includeFiles !== false
-  const includeStats = targetFilePath || options.includeStats !== false
+  const includeFiles = Boolean(targetFilePath) || options.includeFiles !== false
+  const includeStats = Boolean(targetFilePath) || options.includeStats !== false
   const cacheKey = JSON.stringify([
     'workspace',
     repoRoot,
@@ -1379,6 +1542,44 @@ export function getWorkspaceGitDiffReviewByCwd(cwd = '', options = {}) {
   }
 
   const { headOid, entries: workingTreeEntries } = listGitChangeEntries(repoRoot)
+  if (!targetFilePath && !includeStats) {
+    const files = includeFiles
+      ? sortDiffFiles(
+        [...workingTreeEntries.values()].map((entry) => createLightweightDiffFileEntry(entry.path, entry.status))
+      )
+      : []
+
+    const payload = {
+      supported: true,
+      scope: 'workspace',
+      runId: '',
+      repoRoot,
+      branch,
+      baseline: null,
+      warnings: [],
+      baselineCreatedAt: '',
+      summary: {
+        fileCount: workingTreeEntries.size,
+        additions: null,
+        deletions: null,
+        statsComplete: false,
+      },
+      files,
+    }
+    setCachedValue(diffReviewCache, cacheKey, payload, DIFF_REVIEW_CACHE_MAX_ENTRIES, {
+      channel: 'review',
+      cacheName: 'diff-review',
+      debugMeta: {
+        scope: 'workspace',
+        repo: path.basename(repoRoot),
+        fileCount: workingTreeEntries.size,
+        includeFiles,
+        includeStats,
+      },
+    })
+    return payload
+  }
+
   const baselineStateForPath = createBaselineStateResolver(repoRoot, {
     headOid,
     entries: new Map(),
@@ -1516,12 +1717,14 @@ export function getTaskGitDiffReview(taskSlug = '', options = {}) {
       : 'workspace'
   const runId = String(options.runId || '').trim()
   const targetFilePath = String(options.filePath || '').trim()
-  const includeFiles = targetFilePath || options.includeFiles !== false
-  const includeStats = targetFilePath || options.includeStats !== false
+  const includeFiles = Boolean(targetFilePath) || options.includeFiles !== false
+  const includeStats = Boolean(targetFilePath) || options.includeStats !== false
 
   if (scope === 'workspace') {
     return getWorkspaceGitDiffReviewByCwd(resolveTaskRepoRoot(normalizedTaskSlug), {
       filePath: targetFilePath,
+      includeFiles,
+      includeStats,
     })
   }