@caozeal/dsh-next-git 0.1.7 → 0.1.8

package/README.md

@@ -4,7 +4,7 @@
 >
 > 原名 `dsh-plugin-git-manager`，2026-10 起包名改为 `@caozeal/dsh-next-git`（目录仍为 `dsh-next-git/`，功能不变）。
 
-## 41 秒介绍片
+## 45 秒介绍片
 
 https://github.com/user-attachments/assets/c57169b4-df00-450d-b4f0-7a2c64db03b6
 

package/lib/client.js

@@ -115,6 +115,10 @@ window.__ModuleLoader__.load({
       'diff.deletions': '-{n}',
       'diff.staged': '暂存区',
       'diff.worktree': '工作区',
+      'diff.conflict': '冲突差异 · 当前分支 ↔ 合入分支',
+      'diff.conflictSame': '两边内容完全一致',
+      'diff.conflictDeleted': '该文件在合并的某一侧被删除',
+      'diff.conflictDeletedHint': '点右上角「解决冲突」决定保留还是删除',
       'diff.commit': '提交 {hash}',
       'diff.untracked': '新文件',
       'status.loading': '加载中…',
@@ -272,6 +276,10 @@ window.__ModuleLoader__.load({
       'diff.deletions': '-{n}',
       'diff.staged': 'Staged',
       'diff.worktree': 'Working tree',
+      'diff.conflict': 'Conflict · ours ↔ theirs',
+      'diff.conflictSame': 'Both sides are identical',
+      'diff.conflictDeleted': 'The file was deleted on one side of the merge',
+      'diff.conflictDeletedHint': 'Use "Resolve conflict" to keep or delete it',
       'diff.commit': 'Commit {hash}',
       'diff.untracked': 'New file',
       'status.loading': 'Loading…',
@@ -1960,9 +1968,11 @@ window.__ModuleLoader__.load({
       var diff = state.diff
       if (state.diffLoading) return h(EmptyState, { spinner: true, title: tr('status.loading') })
       if (!diff) return h(EmptyState, { title: tr('diff.empty') })
-      var title = diff.mode === 'commit'
-        ? tr('diff.commit', { hash: state.selected && state.selected.hash ? state.selected.hash.slice(0, 8) : '' })
-        : diff.mode === 'staged' ? tr('diff.staged') : diff.mode === 'untracked' ? tr('diff.untracked') : tr('diff.worktree')
+      var title = diff.conflict
+        ? tr('diff.conflict')
+        : diff.mode === 'commit'
+          ? tr('diff.commit', { hash: state.selected && state.selected.hash ? state.selected.hash.slice(0, 8) : '' })
+          : diff.mode === 'staged' ? tr('diff.staged') : diff.mode === 'untracked' ? tr('diff.untracked') : tr('diff.worktree')
       return h('div', { className: 'gm-scroll' },
         h('div', { className: 'gm-content-inner gm-diff' },
           h('div', { className: 'gm-diff-head' },
@@ -1971,11 +1981,22 @@ window.__ModuleLoader__.load({
             h('span', { className: 'gm-spacer' }),
             h('span', { className: 'gm-badge ok' }, '+' + diff.additions),
             h('span', { className: 'gm-badge err' }, '-' + diff.deletions),
-            diff.truncated ? h('span', { className: 'gm-badge warn' }, tr('diff.truncatedShort')) : null),
-          diff.binary
-            ? h(EmptyState, { title: tr('diff.binary') })
-            : diff.hunks.length === 0
-              ? h(EmptyState, { title: tr('diff.noText') })
+            diff.truncated ? h('span', { className: 'gm-badge warn' }, tr('diff.truncatedShort')) : null,
+            diff.conflict
+              ? h(Btn, {
+                label: tr('conflict.resolve'),
+                icon: 'ai',
+                small: true,
+                variant: 'primary',
+                onClick: function () { props.actions.openResolution({ path: diff.path }) },
+              })
+              : null),
+          diff.conflict && (!diff.oursExists || !diff.theirsExists)
+            ? h(EmptyState, { title: tr('diff.conflictDeleted'), hint: tr('diff.conflictDeletedHint') })
+            : diff.binary
+              ? h(EmptyState, { title: tr('diff.binary') })
+              : diff.hunks.length === 0
+                ? h(EmptyState, { title: diff.conflict ? tr('diff.conflictSame') : tr('diff.noText') })
               : diff.hunks.map(function (hunk, hunkIndex) {
                 return h('div', { key: 'h:' + hunkIndex },
                   h('div', { className: 'gm-hunk' }, hunk.header),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caozeal/dsh-next-git",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "DSH Git 管理插件：分支切换、变更暂存、提交/推送/拉取、AI 提交信息、提交图与 diff 查看",
   "type": "module",
   "main": "index.js",

package/src/operations.js

@@ -289,6 +289,14 @@ export function createOperations(deps) {
     }
     const path = typeof params.path === 'string' && params.path !== '' ? params.path : ''
     const safePath = path !== '' && path.startsWith('-') ? `./${path}` : path
+    // 未合并的文件不能走普通 git diff：它给的是 combined diff（diff --cc / @@@ / ++ 前缀），
+    // 不是 unified diff，解析器读不出 hunk，面板会是空的。改成 diff 两个 stage 的 blob。
+    if (mode === 'worktree' && safePath !== '') {
+      const stages = await conflictStages(root, safePath, signal)
+      if (Object.keys(stages).length > 0) {
+        return await conflictDiff(root, safePath, stages, signal)
+      }
+    }
     /** @type {string[]} */
     let args
     if (mode === 'worktree') {
@@ -594,6 +602,49 @@ export function createOperations(deps) {
     return res.code === 0 ? res.stdout : null
   }
 
+  /**
+   * 冲突文件的差异视图：当前分支（:2:）↔ 合入分支（:3:）。
+   * 直接 `git diff <blob> <blob>` 是合法的，拿到的是普通 unified diff，行级高亮照样能用。
+   * 某一侧没有这个文件（删除/改名冲突）时没有可比的两份内容，只回元数据让面板说明情况。
+   */
+  async function conflictDiff(root, path, stages, signal) {
+    const oursHash = stages[2]
+    const theirsHash = stages[3]
+    const base = {
+      mode: 'conflict',
+      path,
+      conflict: true,
+      oursExists: Boolean(oursHash),
+      theirsExists: Boolean(theirsHash),
+      binary: false,
+      additions: 0,
+      deletions: 0,
+      hunks: [],
+      truncated: false,
+      raw: '',
+    }
+    if (!oursHash || !theirsHash) return base
+    const args = ['diff', '--no-color', oursHash, theirsHash]
+    const result = await runGit(args, { cwd: root, signal, allowFailure: true })
+    if (result.code !== 0 && result.code !== 1) throw gitFailure(['git', ...args], result)
+    let raw = result.stdout
+    let truncated = false
+    if (raw.length > DIFF_MAX_CHARS) {
+      raw = raw.slice(0, DIFF_MAX_CHARS)
+      truncated = true
+    }
+    const parsed = parseUnifiedDiff(raw)
+    return {
+      ...base,
+      binary: parsed.binary,
+      additions: parsed.additions,
+      deletions: parsed.deletions,
+      hunks: parsed.hunks,
+      truncated,
+      raw,
+    }
+  }
+
   /** 还剩几个未解决冲突（applyConflict / takeSide 之后用它回执）。 */
   async function unmergedCount(root, signal) {
     const res = await runGit(['diff', '--name-only', '--diff-filter=U', '-z'], {