@yuhufe/wtool-vdiff 0.0.6 → 0.0.8

package/src/DiffViewer/utils/autoHeight.ts

@@ -1,14 +1,75 @@
+import { diffLines } from 'diff'
 import type { WtoolDiffViewerProps } from '@/types'
-import { parseHunks } from './patch2Pair'
+import { HEIGHT_CODE_LINE, HEIGHT_HIDDEN_REGION, HEIGHT_HORIZONTAL_SCROLLBAR } from '../const'
+import { patch2PairWithLayout } from './patch2Pair'
 
-const LINE_HEIGHT = 18
-const GAP_HEIGHT = 24
+interface HeightCache {
+  patch?: string
+  origContent?: string | null
+  modContent?: string | null
+  minPx: number
+  maxPx: number
+  unchangedCtxLineNum: number
+  unchangedMinLineNum: number
+  heights: Partial<Record<'visible' | 'hidden', number>>
+}
+
+const heightMap = new Map<string, HeightCache>()
 
 interface CommonParams {
   minPx: number
   maxPx: number
   unchangedVisiable: boolean
   unchangedCtxLineNum: number
+  unchangedMinLineNum: number
+}
+
+interface ChangedLineBlock {
+  start: number
+  end: number
+}
+
+interface ChangedLineInfo {
+  blocks: ChangedLineBlock[]
+  totalLines: number
+}
+
+function getChangedLineInfo(origContent: string, modContent: string): ChangedLineInfo {
+  const changes = diffLines(origContent, modContent)
+  const blocks: ChangedLineBlock[] = []
+  let row = 1
+  let removed = 0
+  let added = 0
+
+  const flush = () => {
+    const len = Math.max(removed, added)
+    if (len > 0) {
+      blocks.push({ start: row, end: row + len - 1 })
+      row += len
+      removed = 0
+      added = 0
+    }
+  }
+
+  for (const part of changes) {
+    const count = part.count ?? 0
+
+    if (part.removed) {
+      removed += count
+    } else if (part.added) {
+      added += count
+    } else {
+      flush()
+      row += count
+    }
+  }
+
+  flush()
+
+  return {
+    blocks,
+    totalLines: Math.max(0, row - 1),
+  }
 }
 
 /**
@@ -16,15 +77,17 @@ interface CommonParams {
  * 区间必须按 start 升序喂入，每次 feed 后可读取 maxReached 判断是否达到像素上限。
  * @param totalLines 文件总行数，用于 clamp context 窗口上界及判断尾部是否有折叠 widget
  * @param ctx        每个变更块上下保留的 context 行数，对应 Monaco contextLineCount
+ * @param minHidden  Monaco minimumLineCount，小于此值的未变更区不折叠
  * @param maxPx      像素上限，达到后 maxReached 为 true，调用方应立即停止 feed
  */
-function makeVisibleLineCounter(totalLines: number, ctx: number, maxPx: number) {
-  let visible = 0       // 已 commit 的确定可见行数（不含当前 pending 块）
-  let gaps = 0          // gap widget 数量（每个折叠区域占 GAP_HEIGHT，非 LINE_HEIGHT）
+function makeVisibleLineCounter(totalLines: number, ctx: number, minHidden: number, maxPx: number) {
+  let visible = 0 // 已 commit 的确定可见行数（不含当前 pending 块）
+  let gaps = 0 // gap widget 数量（每个折叠区域占固定高度，非代码行高）
   let pendingStart = -1 // 当前待合并窗口的起始行（-1 表示无 pending）
-  let pendingEnd = -1   // 当前待合并窗口的结束行
+  let pendingEnd = -1 // 当前待合并窗口的结束行
 
-  const usedPx = () => visible * LINE_HEIGHT + gaps * GAP_HEIGHT
+  const usedPx = () =>
+    visible * HEIGHT_CODE_LINE + gaps * HEIGHT_HIDDEN_REGION + HEIGHT_HORIZONTAL_SCROLLBAR
 
   const commitPending = () => {
     if (pendingStart === -1) return
@@ -36,10 +99,18 @@ function makeVisibleLineCounter(totalLines: number, ctx: number, maxPx: number)
 
   return {
     feed(s: number, e: number) {
-      const winStart = Math.max(1, s - ctx)
+      let winStart = Math.max(1, s - ctx)
       const winEnd = Math.min(totalLines, e + ctx)
-      if (pendingEnd === -1 || winStart > pendingEnd + 1) {
-        commitPending()          // 新窗口与 pending 有间隙：先提交 pending，再开新窗口
+      if (pendingEnd === -1) {
+        if (winStart - 1 < minHidden) winStart = 1
+        pendingStart = winStart
+        pendingEnd = winEnd
+        return
+      }
+
+      const hiddenLineCount = winStart - pendingEnd - 1
+      if (hiddenLineCount > 0 && hiddenLineCount >= minHidden) {
+        commitPending() // 新窗口与 pending 有间隙：先提交 pending，再开新窗口
         pendingStart = winStart
         pendingEnd = winEnd
       } else {
@@ -49,7 +120,14 @@ function makeVisibleLineCounter(totalLines: number, ctx: number, maxPx: number)
     flush() {
       const lastEnd = pendingEnd
       commitPending()
-      if (visible > 0 && lastEnd !== totalLines) gaps += 1
+      const trailingLineCount = totalLines - lastEnd
+      if (visible > 0 && trailingLineCount > 0) {
+        if (trailingLineCount >= minHidden) {
+          gaps += 1
+        } else {
+          visible += trailingLineCount
+        }
+      }
       return usedPx()
     },
     get usedPx() {
@@ -69,26 +147,20 @@ const autoHeightPatch = function ({
   minPx,
   maxPx,
   unchangedCtxLineNum,
+  unchangedMinLineNum,
 }: {
   patch: string
 } & CommonParams): number {
-  const { hunks } = parseHunks(patch)
-  if (hunks.length === 0) return minPx
-
-  const lastHunk = hunks[hunks.length - 1]
-  const totalLines = Math.max(
-    lastHunk.origStart + lastHunk.origCount - 1,
-    lastHunk.modStart + lastHunk.modCount - 1,
-  )
-  const counter = makeVisibleLineCounter(totalLines, unchangedCtxLineNum, maxPx)
-
-  for (const h of hunks) {
-    const hunkEnd = Math.max(h.origStart + h.origCount - 1, h.modStart + h.modCount - 1)
-    counter.feed(h.origStart, hunkEnd)
+  const { changedLineBlocks, totalLines } = patch2PairWithLayout(patch)
+  if (changedLineBlocks.length === 0) return minPx
+
+  const counter = makeVisibleLineCounter(totalLines, unchangedCtxLineNum, unchangedMinLineNum, maxPx)
+  for (const block of changedLineBlocks) {
+    counter.feed(block.start, block.end)
     if (counter.maxReached) return maxPx
   }
 
-  return Math.max(minPx, counter.flush())
+  return Math.min(maxPx, Math.max(minPx, counter.flush()))
 }
 
 const autoHeightPair = function ({
@@ -97,35 +169,40 @@ const autoHeightPair = function ({
   maxPx,
   unchangedVisiable,
   unchangedCtxLineNum,
+  unchangedMinLineNum,
 }: {
   pair: WtoolDiffViewerProps['diffPair']
 } & CommonParams): number {
   if (!pair || pair.length < 2) return minPx
 
-  const origLines = pair[0].content?.split('\n') ?? []
-  const modLines = pair[1].content?.split('\n') ?? []
+  const origContent = pair[0].content ?? ''
+  const modContent = pair[1].content ?? ''
+  const origLines = origContent.split('\n')
+  const modLines = modContent.split('\n')
   const totalLines = Math.max(origLines.length, modLines.length)
 
   if (unchangedVisiable) {
-    return Math.max(minPx, Math.min(totalLines * LINE_HEIGHT, maxPx))
+    const contentHeight = totalLines * HEIGHT_CODE_LINE + HEIGHT_HORIZONTAL_SCROLLBAR
+    return Math.max(minPx, Math.min(contentHeight, maxPx))
   }
 
-  // 剥前缀相同行
-  let lo = 0
-  while (lo < origLines.length && lo < modLines.length && origLines[lo] === modLines[lo]) lo++
+  const { blocks, totalLines: diffTotalLines } = getChangedLineInfo(origContent, modContent)
+  if (blocks.length === 0) return minPx
 
-  // 剥后缀相同行
-  let origHi = origLines.length, modHi = modLines.length
-  while (origHi > lo && modHi > lo && origLines[origHi - 1] === modLines[modHi - 1]) { origHi--; modHi-- }
+  const counter = makeVisibleLineCounter(diffTotalLines, unchangedCtxLineNum, unchangedMinLineNum, maxPx)
+  for (const block of blocks) {
+    counter.feed(block.start, block.end)
+    if (counter.maxReached) return maxPx
+  }
 
-  if (origHi <= lo && modHi <= lo) return minPx
+  let result = counter.flush()
+  result = Math.max(minPx, result)
+  result = Math.min(maxPx, result)
 
-  const counter = makeVisibleLineCounter(totalLines, unchangedCtxLineNum, maxPx)
-  counter.feed(lo + 1, Math.max(origHi, modHi))
-  return Math.max(minPx, counter.flush())
+  return result
 }
 
-const height2Num = (heightStr: string): number => {
+export const height2Num = (heightStr: string): number => {
   if (heightStr.endsWith('vh')) {
     const vh = parseFloat(heightStr)
     return Math.round((vh / 100) * document.documentElement.clientHeight)
@@ -134,23 +211,62 @@ const height2Num = (heightStr: string): number => {
 }
 
 export const autoHeight = function ({
+  id,
   patch,
   pair,
   maxHeight,
   minHeight,
   unchangedVisiable,
   unchangedCtxLineNum,
+  unchangedMinLineNum = 1,
 }: {
+  id: string
   patch?: string
   pair?: WtoolDiffViewerProps['diffPair']
   maxHeight: string
   minHeight: string
   unchangedVisiable: boolean
   unchangedCtxLineNum: number
+  unchangedMinLineNum?: number
 }): number {
+  const cacheKey = unchangedVisiable ? 'visible' : 'hidden'
   const [minPx, maxPx] = [minHeight, maxHeight].map(height2Num)
-  const commonParams: CommonParams = { minPx, maxPx, unchangedVisiable, unchangedCtxLineNum }
+  const origContent = pair?.[0]?.content
+  const modContent = pair?.[1]?.content
+  const cache = heightMap.get(id)
+  const cacheMatched =
+    cache?.patch === patch &&
+    cache?.origContent === origContent &&
+    cache?.modContent === modContent &&
+    cache?.minPx === minPx &&
+    cache?.maxPx === maxPx &&
+    cache?.unchangedCtxLineNum === unchangedCtxLineNum &&
+    cache?.unchangedMinLineNum === unchangedMinLineNum
+  const cachedHeight = cacheMatched ? cache.heights[cacheKey] : undefined
+  if (cachedHeight !== undefined) return cachedHeight
+
+  const commonParams: CommonParams = {
+    minPx,
+    maxPx,
+    unchangedVisiable,
+    unchangedCtxLineNum,
+    unchangedMinLineNum,
+  }
+  const height = patch ? autoHeightPatch({ patch, ...commonParams }) : autoHeightPair({ pair, ...commonParams })
+
+  heightMap.set(id, {
+    patch,
+    origContent,
+    modContent,
+    minPx,
+    maxPx,
+    unchangedCtxLineNum,
+    unchangedMinLineNum,
+    heights: {
+      ...(cacheMatched ? cache.heights : {}),
+      [cacheKey]: height,
+    },
+  })
 
-  if (patch) return autoHeightPatch({ patch, ...commonParams })
-  return autoHeightPair({ pair, ...commonParams })
+  return height
 }

package/src/DiffViewer/utils/patch2Pair.ts

@@ -1,56 +1,19 @@
+import { parsePatchFilenames, parsePatchHunks } from '@/utils/patch'
+
 export interface FilePair {
   filename: string
   content: string
 }
 
-export interface Hunk {
-  origStart: number  // original 起始行号（1-based）
-  origCount: number  // original 行数
-  modStart: number   // modified 起始行号（1-based）
-  modCount: number   // modified 行数
-  lines: string[]    // hunk 原始行（含前缀字符）
+export interface PatchChangedLineBlock {
+  start: number
+  end: number
 }
 
-/**
- * 解析 unified diff patch，提取文件名与所有 hunk
- */
-export function parseHunks(patch: string): { origFilename: string; modFilename: string; hunks: Hunk[] } {
-  const lines = patch.split('\n')
-
-  let origFilename = ''
-  let modFilename = ''
-  const hunks: Hunk[] = []
-  let currentHunk: Hunk | null = null
-
-  for (const line of lines) {
-    if (line.startsWith('--- ')) {
-      origFilename = line.slice(4).trim()
-      continue
-    }
-    if (line.startsWith('+++ ')) {
-      modFilename = line.slice(4).trim()
-      continue
-    }
-    // @@ -origStart,origCount +modStart,modCount @@
-    const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/)
-    if (hunkMatch) {
-      currentHunk = {
-        origStart: parseInt(hunkMatch[1], 10),
-        origCount: hunkMatch[2] !== undefined ? parseInt(hunkMatch[2], 10) : 1,
-        modStart: parseInt(hunkMatch[3], 10),
-        modCount: hunkMatch[4] !== undefined ? parseInt(hunkMatch[4], 10) : 1,
-        lines: [],
-      }
-      hunks.push(currentHunk)
-      continue
-    }
-    if (currentHunk) {
-      if (line.startsWith('\\')) continue // ""
-      currentHunk.lines.push(line)
-    }
-  }
-
-  return { origFilename, modFilename, hunks }
+export interface PatchPairLayout {
+  pair: FilePair[]
+  changedLineBlocks: PatchChangedLineBlock[]
+  totalLines: number
 }
 
 /**
@@ -63,24 +26,34 @@ export function parseHunks(patch: string): { origFilename: string; modFilename:
  *   - 连续的删除（'-'）/ 新增（'+'）块：收集后成对对齐写入，
  *     行数较少的一侧补空行，使 Monaco 能在同一视觉行渲染替换关系
  */
-export const patch2Pair = function (patch: string): FilePair[] {
+export const patch2PairWithLayout = function (patch: string): PatchPairLayout {
   if (!patch) {
-    return [
-      { filename: '', content: '' },
-      { filename: '', content: '' },
-    ]
+    return {
+      pair: [
+        { filename: '', content: '' },
+        { filename: '', content: '' },
+      ],
+      changedLineBlocks: [],
+      totalLines: 1,
+    }
   }
 
-  const { origFilename, modFilename, hunks } = parseHunks(patch)
+  const { origFilename, modFilename } = parsePatchFilenames(patch)
+  const hunks = parsePatchHunks(patch)
 
   const origLines: string[] = []
   const modLines: string[] = []
+  const changedLineBlocks: PatchChangedLineBlock[] = []
 
   const pendingDel: string[] = []
   const pendingAdd: string[] = []
 
   const flushPending = () => {
     const maxLen = Math.max(pendingDel.length, pendingAdd.length)
+    if (maxLen > 0) {
+      const start = Math.max(origLines.length, modLines.length) + 1
+      changedLineBlocks.push({ start, end: start + maxLen - 1 })
+    }
     for (let i = 0; i < maxLen; i++) {
       origLines.push(pendingDel[i] ?? '')
       modLines.push(pendingAdd[i] ?? '')
@@ -125,8 +98,16 @@ export const patch2Pair = function (patch: string): FilePair[] {
     flushPending()
   }
 
-  return [
-    { filename: origFilename, content: origLines.join('\n') },
-    { filename: modFilename, content: modLines.join('\n') },
-  ]
+  return {
+    pair: [
+      { filename: origFilename, content: origLines.join('\n') },
+      { filename: modFilename, content: modLines.join('\n') },
+    ],
+    changedLineBlocks,
+    totalLines: Math.max(origLines.length, modLines.length),
+  }
+}
+
+export const patch2Pair = function (patch: string): FilePair[] {
+  return patch2PairWithLayout(patch).pair
 }

package/src/assets/file.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 3L13.7071 2.29289C13.5196 2.10536 13.2652 2 13 2V3ZM19 9H20C20 8.73478 19.8946 8.48043 19.7071 8.29289L19 9ZM13.109 8.45399L14 8V8L13.109 8.45399ZM13.546 8.89101L14 8L13.546 8.89101ZM10 13C10 12.4477 9.55228 12 9 12C8.44772 12 8 12.4477 8 13H10ZM8 16C8 16.5523 8.44772 17 9 17C9.55228 17 10 16.5523 10 16H8ZM8.5 9C7.94772 9 7.5 9.44772 7.5 10C7.5 10.5523 7.94772 11 8.5 11V9ZM9.5 11C10.0523 11 10.5 10.5523 10.5 10C10.5 9.44772 10.0523 9 9.5 9V11ZM8.5 6C7.94772 6 7.5 6.44772 7.5 7C7.5 7.55228 7.94772 8 8.5 8V6ZM9.5 8C10.0523 8 10.5 7.55228 10.5 7C10.5 6.44772 10.0523 6 9.5 6V8ZM17.908 20.782L17.454 19.891L17.454 19.891L17.908 20.782ZM18.782 19.908L19.673 20.362L18.782 19.908ZM5.21799 19.908L4.32698 20.362H4.32698L5.21799 19.908ZM6.09202 20.782L6.54601 19.891L6.54601 19.891L6.09202 20.782ZM6.09202 3.21799L5.63803 2.32698L5.63803 2.32698L6.09202 3.21799ZM5.21799 4.09202L4.32698 3.63803L4.32698 3.63803L5.21799 4.09202ZM12 3V7.4H14V3H12ZM14.6 10H19V8H14.6V10ZM12 7.4C12 7.66353 11.9992 7.92131 12.0169 8.13823C12.0356 8.36682 12.0797 8.63656 12.218 8.90798L14 8C14.0293 8.05751 14.0189 8.08028 14.0103 7.97537C14.0008 7.85878 14 7.69653 14 7.4H12ZM14.6 8C14.3035 8 14.1412 7.99922 14.0246 7.9897C13.9197 7.98113 13.9425 7.9707 14 8L13.092 9.78201C13.3634 9.92031 13.6332 9.96438 13.8618 9.98305C14.0787 10.0008 14.3365 10 14.6 10V8ZM12.218 8.90798C12.4097 9.2843 12.7157 9.59027 13.092 9.78201L14 8V8L12.218 8.90798ZM8 13V16H10V13H8ZM8.5 11H9.5V9H8.5V11ZM8.5 8H9.5V6H8.5V8ZM13 2H8.2V4H13V2ZM4 6.2V17.8H6V6.2H4ZM8.2 22H15.8V20H8.2V22ZM20 17.8V9H18V17.8H20ZM19.7071 8.29289L13.7071 2.29289L12.2929 3.70711L18.2929 9.70711L19.7071 8.29289ZM15.8 22C16.3436 22 16.8114 22.0008 17.195 21.9694C17.5904 21.9371 17.9836 21.8658 18.362 21.673L17.454 19.891C17.4045 19.9162 17.3038 19.9539 17.0322 19.9761C16.7488 19.9992 16.3766 20 15.8 20V22ZM18 17.8C18 18.3766 17.9992 18.7488 17.9761 19.0322C17.9539 19.3038 17.9162 19.4045 17.891 19.454L19.673 20.362C19.8658 19.9836 19.9371 19.5904 19.9694 19.195C20.0008 18.8114 20 18.3436 20 17.8H18ZM18.362 21.673C18.9265 21.3854 19.3854 20.9265 19.673 20.362L17.891 19.454C17.7951 19.6422 17.6422 19.7951 17.454 19.891L18.362 21.673ZM4 17.8C4 18.3436 3.99922 18.8114 4.03057 19.195C4.06287 19.5904 4.13419 19.9836 4.32698 20.362L6.10899 19.454C6.0838 19.4045 6.04612 19.3038 6.02393 19.0322C6.00078 18.7488 6 18.3766 6 17.8H4ZM8.2 20C7.62345 20 7.25117 19.9992 6.96784 19.9761C6.69617 19.9539 6.59545 19.9162 6.54601 19.891L5.63803 21.673C6.01641 21.8658 6.40963 21.9371 6.80497 21.9694C7.18864 22.0008 7.65645 22 8.2 22V20ZM4.32698 20.362C4.6146 20.9265 5.07354 21.3854 5.63803 21.673L6.54601 19.891C6.35785 19.7951 6.20487 19.6422 6.10899 19.454L4.32698 20.362ZM8.2 2C7.65645 2 7.18864 1.99922 6.80497 2.03057C6.40963 2.06287 6.01641 2.13419 5.63803 2.32698L6.54601 4.10899C6.59545 4.0838 6.69617 4.04612 6.96784 4.02393C7.25117 4.00078 7.62345 4 8.2 4V2ZM6 6.2C6 5.62345 6.00078 5.25117 6.02393 4.96784C6.04612 4.69617 6.0838 4.59545 6.10899 4.54601L4.32698 3.63803C4.13419 4.01641 4.06287 4.40963 4.03057 4.80497C3.99922 5.18864 4 5.65645 4 6.2H6ZM5.63803 2.32698C5.07354 2.6146 4.6146 3.07354 4.32698 3.63803L6.10899 4.54601C6.20487 4.35785 6.35785 4.20487 6.54601 4.10899L5.63803 2.32698Z" fill="#000000"/>
+</svg>

package/src/assets/folder.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 1H6L9 4H16V14H0V1Z" fill="#54aeff"/>
+</svg>

package/src/index.ts

@@ -1,2 +1,3 @@
 export * from './DiffViewer'
+export * from './DiffFiles'
 export { default as loader } from '@monaco-editor/loader'

package/src/types.ts

@@ -4,6 +4,7 @@ export type DiffEditorOptions = Monaco.editor.IStandaloneDiffEditorConstructionO
 export type ModelOptions = Monaco.editor.ITextModelUpdateOptions
 
 export interface WtoolDiffViewerProps {
+  fileId?: string
   diffPair?: { filename: string; content: string | null }[]
   diffPatch?: string
   language?: string
@@ -17,4 +18,22 @@ export interface WtoolDiffViewerStyle {
   height?: string
   minHeight?: string
   maxHeight?: string
+  viewed?: boolean
+  rawed?: boolean
+}
+
+export interface DiffFile {
+  fullPath?: string
+  diffPair?: WtoolDiffViewerProps['diffPair']
+  diffPatch?: string
+  viewerStyle?: WtoolDiffViewerStyle
+}
+
+/** @deprecated Use DiffFile. Nested directory input is no longer supported. */
+export type FileTree = DiffFile
+
+export interface WtoolDiffFilesProps {
+  diffFiles?: DiffFile[]
+  fileOverScan?: number
+  viewerStyle?: WtoolDiffViewerStyle
 }

package/src/utils/patch.ts

@@ -0,0 +1,74 @@
+export interface Hunk {
+  origStart: number // original 起始行号（1-based）
+  origCount: number // original 行数
+  modStart: number // modified 起始行号（1-based）
+  modCount: number // modified 行数
+  lines: string[] // hunk 原始行（含前缀字符）
+}
+
+export interface PatchFilenames {
+  origFilename: string
+  modFilename: string
+}
+
+/**
+ * 从 unified diff patch 解析 --- / +++ 行中的文件名。
+ * 文件名位于 patch 头部，遇到首个 @@ hunk 或已解析到两侧文件名后即停止扫描。
+ */
+export function parsePatchFilenames(patch: string): PatchFilenames {
+  let origFilename = ''
+  let modFilename = ''
+
+  let start = 0
+  while (start < patch.length) {
+    const nl = patch.indexOf('\n', start)
+    const line = nl === -1 ? patch.slice(start) : patch.slice(start, nl)
+    start = nl === -1 ? patch.length : nl + 1
+
+    if (line.startsWith('--- ')) {
+      origFilename = line.slice(4).trim()
+      if (origFilename && modFilename) break
+      continue
+    }
+    if (line.startsWith('+++ ')) {
+      modFilename = line.slice(4).trim()
+      if (origFilename && modFilename) break
+      continue
+    }
+    if (line.startsWith('@@')) break
+  }
+
+  return { origFilename, modFilename }
+}
+
+/**
+ * 从 unified diff patch 解析所有 hunk（@@ 块）
+ */
+export function parsePatchHunks(patch: string): Hunk[] {
+  const lines = patch.split('\n')
+
+  const hunks: Hunk[] = []
+  let currentHunk: Hunk | null = null
+
+  for (const line of lines) {
+    // @@ -origStart,origCount +modStart,modCount @@
+    const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/)
+    if (hunkMatch) {
+      currentHunk = {
+        origStart: parseInt(hunkMatch[1], 10),
+        origCount: hunkMatch[2] !== undefined ? parseInt(hunkMatch[2], 10) : 1,
+        modStart: parseInt(hunkMatch[3], 10),
+        modCount: hunkMatch[4] !== undefined ? parseInt(hunkMatch[4], 10) : 1,
+        lines: [],
+      }
+      hunks.push(currentHunk)
+      continue
+    }
+    if (currentHunk) {
+      if (line.startsWith('\\')) continue // ""
+      currentHunk.lines.push(line)
+    }
+  }
+
+  return hunks
+}