@caozeal/dsh-next-git 0.1.6 → 0.1.8

package/README.md

@@ -4,11 +4,11 @@
 >
 > 原名 `dsh-plugin-git-manager`，2026-10 起包名改为 `@caozeal/dsh-next-git`（目录仍为 `dsh-next-git/`，功能不变）。
 
-## 38 秒介绍片
+## 45 秒介绍片
 
 https://github.com/user-attachments/assets/c57169b4-df00-450d-b4f0-7a2c64db03b6
 
-*全片界面为渲染示意，不含真实会话；[完整播放页](https://dsh-next-git.1017835747.workers.dev/) 另有下载版。*
+*全片界面为渲染示意，不含真实会话；[完整播放页](https://dsh.caozeal.cn/next-git/) 另有下载版。*
 
 **不想先装再看？** [在线 Demo](https://dsh.caozeal.cn/next-git/demo/) 可以直接点——
 它加载的是发布包里同一份 `lib/client.js`，只补了一个最小假宿主和一份真实仓库的录制快照
@@ -26,6 +26,10 @@ https://github.com/user-attachments/assets/c57169b4-df00-450d-b4f0-7a2c64db03b6
   冲突文件不给丢弃——那等于放弃冲突解决状态，容易误伤。
 - **Stash**：分支页底部可直接 stash 当前改动（有未跟踪文件时自动带 `-u`），
   列出全部 stash，一键恢复（pop）或删除（drop）。
+- **AI 解决冲突**：冲突文件点「解决」，AI 读索引里的 base / ours / theirs 三份版本，
+  给出一份合并后的完整文件——**只生成建议，确认后才写盘**；确认时再校验一遍有没有
+  残留 `<<<<<<<` 才 `git add`。机械场景可以直接「取当前分支 / 取对方分支」。
+  冲突文件刻意不提供「暂存」按钮：`git add` 会把带冲突标记的文件直接标记为已解决。
 - **提交 / 推送 / 拉取**：Fetch、Pull、Push 按钮，提交信息输入框，
   支持「提交」「提交并推送」；无 upstream 时自动 `push -u origin <branch>`。
 - **AI 提交信息**：读取已暂存 diff + 最近提交风格，调用当前默认模型生成
@@ -197,5 +201,6 @@ op 一览：`snapshot` `graph` `diff` `stage` `unstage` `switchBranch` `deleteBr
 - 大仓库的 graph 默认取 80 条（上限 300）；diff 超过 400k 字符会截断。
 - 会话的工作目录被删除/不可访问时，面板显示「工作目录不存在或无法访问」空态
   （Host 返回 `cwd-unavailable`），不会展示原始 spawn 错误。
-- 冲突只做展示（conflicted 分组 + 横幅提示），不提供 accept ours/theirs 之类的解决 UI。
+- AI 解决冲突按「单个文件」处理，不提供「一次性解决全部冲突」的批量操作；
+  多个文件仍要逐个确认（这是有意的，批量自动落盘风险太高）。
 - 网络操作超时 180s；无凭据的私有仓库会失败并把 git stderr 显示出来。

package/lib/client.js

@@ -69,6 +69,21 @@ window.__ModuleLoader__.load({
       'changes.discardConfirm': '丢弃 {path} 的改动？此操作不可恢复。',
       'changes.discardUntrackedConfirm': '删除未跟踪文件 {path}？此操作不可恢复。',
       'changes.discardStagedConfirm': '丢弃 {path} 的暂存与工作区改动？此操作不可恢复。',
+      'conflict.resolve': '解决冲突',
+      'conflict.title': '冲突解决',
+      'conflict.hintPlaceholder': '补充说明（可选），例如「版本号取上游」',
+      'conflict.ai': 'AI 生成解决建议',
+      'conflict.regenerate': '重新生成',
+      'conflict.takeOurs': '取当前分支',
+      'conflict.takeTheirs': '取对方分支',
+      'conflict.apply': '应用并标记已解决',
+      'conflict.discard': '放弃',
+      'conflict.empty': '先生成建议，或直接取某一侧；生成过程不会改动文件',
+      'conflict.generating': '正在生成解决建议…',
+      'conflict.preview': 'AI 建议的解决结果 · 确认后才会写入文件',
+      'conflict.model': '由 {model} 生成',
+      'conflict.remaining': '还剩 {n} 个冲突文件',
+      'conflict.noBase': 'add/add 冲突，没有共同祖先版本',
       'commit.title': '提交信息',
       'commit.placeholder': '填写提交信息，或先点「AI 生成信息」',
       'commit.hintPlaceholder': '给 AI 的补充说明（可选）',
@@ -100,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': '加载中…',
@@ -130,6 +149,11 @@ window.__ModuleLoader__.load({
       'status.stashDropOk': '已删除 stash@{n}',
       'status.promptSaved': '提示词已保存',
       'status.promptReset': '已恢复默认提示词',
+      'status.resolveOk': '已解决 {path}',
+      'status.resolveAllOk': '全部冲突已解决，可以提交了',
+      'status.takeOursOk': '已取当前分支版本',
+      'status.takeTheirsOk': '已取对方分支版本',
+      'status.conflictApplied': '已应用解决结果',
       'status.aiModel': '由 {model} 生成',
       'status.aiFallback': '模型输出不可用，已生成降级文案',
       'toast.error': '失败',
@@ -206,6 +230,21 @@ window.__ModuleLoader__.load({
       'changes.discardConfirm': 'Discard changes to {path}? This cannot be undone.',
       'changes.discardUntrackedConfirm': 'Delete untracked file {path}? This cannot be undone.',
       'changes.discardStagedConfirm': 'Discard staged and working-tree changes to {path}? This cannot be undone.',
+      'conflict.resolve': 'Resolve conflict',
+      'conflict.title': 'Resolve conflict',
+      'conflict.hintPlaceholder': 'Optional hint, e.g. "take the upstream version"',
+      'conflict.ai': 'Generate a resolution',
+      'conflict.regenerate': 'Regenerate',
+      'conflict.takeOurs': 'Take ours',
+      'conflict.takeTheirs': 'Take theirs',
+      'conflict.apply': 'Apply and mark resolved',
+      'conflict.discard': 'Discard',
+      'conflict.empty': 'Generate a suggestion, or take one side; generating never touches the file',
+      'conflict.generating': 'Generating a resolution…',
+      'conflict.preview': 'AI suggestion · nothing is written until you apply',
+      'conflict.model': 'Generated by {model}',
+      'conflict.remaining': '{n} conflicted file(s) left',
+      'conflict.noBase': 'add/add conflict; no common ancestor',
       'commit.title': 'Commit message',
       'commit.placeholder': 'Write a commit message, or generate one with AI',
       'commit.hintPlaceholder': 'Optional hint for the AI',
@@ -237,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…',
@@ -267,6 +310,11 @@ window.__ModuleLoader__.load({
       'status.stashDropOk': 'Dropped stash@{n}',
       'status.promptSaved': 'Prompt saved',
       'status.promptReset': 'Restored the default prompt',
+      'status.resolveOk': 'Resolved {path}',
+      'status.resolveAllOk': 'All conflicts resolved; ready to commit',
+      'status.takeOursOk': 'Took the ours side',
+      'status.takeTheirsOk': 'Took the theirs side',
+      'status.conflictApplied': 'Resolution applied',
       'status.aiModel': 'Generated by {model}',
       'status.aiFallback': 'Model output unusable; used a fallback message',
       'toast.error': 'Failed',
@@ -463,6 +511,20 @@ window.__ModuleLoader__.load({
       .gm-file:hover .gm-act, .gm-file:focus-within .gm-act, .gm-branch:hover .gm-act { opacity:1; }
       .gm-act:hover { transform:scale(1.12); }
       @media (hover:none) { .gm-act { opacity:1; } }
+      .gm-resolution { display:flex; flex-direction:column; gap:7px; padding:10px 12px 14px; }
+      .gm-res-head { display:flex; align-items:center; gap:6px; color:var(--gm-blue); }
+      .gm-res-title { font-size:11px; font-weight:700; letter-spacing:.04em; text-transform:uppercase; }
+      .gm-res-path { font: 600 12px ui-monospace, SFMono-Regular, Menlo, monospace; color:var(--gm-fg);
+        padding:2px 0; word-break:break-all; }
+      .gm-res-note { font-size:11px; color:var(--gm-dim); line-height:1.6; }
+      /* .gm-input 默认 flex:1 1 100px，在纵向 flex 里会被拉成 100px 高，这里压回去 */
+      .gm-resolution .gm-input { flex:none; width:100%; height:28px; }
+      .gm-res-code { margin-top:4px; border-radius:10px; background:var(--gm-blue-06);
+        border:1px solid var(--gm-blue-12); padding:6px 0; overflow:auto; max-height:46vh; }
+      .gm-res-line { display:flex; gap:8px; font: 11.5px/1.65 ui-monospace, SFMono-Regular, Menlo, monospace;
+        white-space:pre; padding:0 8px; }
+      .gm-res-line .no { width:34px; text-align:right; color:var(--gm-dim); flex:none; user-select:none; }
+      .gm-res-line .tx { color:var(--gm-fg); }
       .gm-conflict-bar { margin:9px 10px 2px; padding:6px 10px; border-radius:10px; font-size:11px; font-weight:600;
         color:var(--gm-err); background:color-mix(in srgb, var(--gm-err) 8%, transparent);
         border:1px solid color-mix(in srgb, var(--gm-err) 28%, transparent); }
@@ -855,6 +917,10 @@ window.__ModuleLoader__.load({
         promptOpen: false,
         promptDraft: '',
         stashMessage: '',
+        // 冲突解决：resolution 非空时「差异」页切到解决视图。
+        // suggested 为 null 表示还没生成，用户可以先选边或让 AI 生成。
+        resolution: null,
+        conflictHint: '',
       })
       var toastTimer = null
       var loadToken = 0
@@ -1161,6 +1227,70 @@ window.__ModuleLoader__.load({
         }
       }
 
+      // ------------------------------------------------------------ 冲突解决
+
+      function openResolution(entry) {
+        if (!entry || !entry.path) return
+        set({
+          resolution: { path: entry.path, suggested: null, model: null, loading: false, hasBase: true },
+          conflictHint: '',
+          activeTab: 'diff',
+          selected: { kind: 'file', group: 'conflicted', path: entry.path },
+        })
+      }
+
+      function closeResolution() {
+        set({ resolution: null, conflictHint: '' })
+      }
+
+      function setConflictHint(value) {
+        set({ conflictHint: String(value || '') })
+      }
+
+      async function aiResolve() {
+        var state = store.get()
+        var resolution = state.resolution
+        if (!state.cwd || !resolution || resolution.loading) return
+        set({ resolution: { path: resolution.path, suggested: resolution.suggested, model: resolution.model, loading: true, hasBase: resolution.hasBase } })
+        var result = await runBusy('aiConflict', function () {
+          return rpc('aiConflict', { cwd: state.cwd, path: resolution.path, hint: String(state.conflictHint || '').trim() })
+        })
+        if (result !== null) {
+          set({ resolution: { path: resolution.path, suggested: result.suggested, model: result.model, loading: false, hasBase: result.hasBase } })
+        } else {
+          set({ resolution: { path: resolution.path, suggested: resolution.suggested, model: resolution.model, loading: false, hasBase: resolution.hasBase } })
+        }
+      }
+
+      async function applyResolution() {
+        var state = store.get()
+        var resolution = state.resolution
+        if (!state.cwd || !resolution || !resolution.suggested) return
+        var result = await runBusy('applyConflict', function () {
+          return rpc('applyConflict', { cwd: state.cwd, path: resolution.path, content: resolution.suggested })
+        })
+        if (result !== null) {
+          set({ resolution: null, conflictHint: '' })
+          toast('ok', result.unmerged === 0 ? tr('status.resolveAllOk') : tr('status.conflictApplied'), result.output)
+          await refresh()
+        }
+      }
+
+      async function takeConflictSide(side) {
+        var state = store.get()
+        var resolution = state.resolution
+        if (!state.cwd || !resolution) return
+        var result = await runBusy('takeSide', function () {
+          return rpc('takeSide', { cwd: state.cwd, path: resolution.path, side: side })
+        })
+        if (result !== null) {
+          set({ resolution: null, conflictHint: '' })
+          var label = side === 'ours' ? tr('status.takeOursOk') : tr('status.takeTheirsOk')
+          toast('ok', result.unmerged === 0 ? tr('status.resolveAllOk') : label, result.output)
+          await refresh()
+        }
+      }
+
       async function switchBranch(name) {
         var cwd = store.get().cwd
         if (!cwd || !name) return
@@ -1295,6 +1425,12 @@ window.__ModuleLoader__.load({
         setPromptDraft: setPromptDraft,
         savePrompt: savePrompt,
         resetPrompt: resetPrompt,
+        openResolution: openResolution,
+        closeResolution: closeResolution,
+        setConflictHint: setConflictHint,
+        aiResolve: aiResolve,
+        applyResolution: applyResolution,
+        takeConflictSide: takeConflictSide,
         clearToast: clearToast,
       }
     }
@@ -1353,16 +1489,28 @@ window.__ModuleLoader__.load({
               parts.dir ? h('span', { className: 'gm-dir' }, parts.dir) : null,
               parts.base),
             h('span', { className: 'gm-row', style: { gap: '2px' } },
-              h('button', {
-                type: 'button',
-                className: 'gm-btn icon sm ghost gm-act',
-                title: staged ? tr('changes.unstage') : tr('changes.stage'),
-                onClick: function (event) {
-                  event.stopPropagation()
-                  if (staged) props.onUnstage(entry)
-                  else props.onStage(entry)
-                },
-              }, h(Icon, { name: staged ? 'minus' : 'plus', size: 12 })),
+              // 冲突文件不给「暂存」：git add 会把带 <<<<<<< 的文件直接标记为已解决。
+              // 唯一入口是「解决」，由 applyConflict / takeSide 负责清掉冲突标记。
+              props.group === 'conflicted'
+                ? h('button', {
+                  type: 'button',
+                  className: 'gm-btn icon sm ghost gm-act',
+                  title: tr('conflict.resolve'),
+                  onClick: function (event) {
+                    event.stopPropagation()
+                    props.onResolve(entry)
+                  },
+                }, h(Icon, { name: 'ai', size: 12 }))
+                : h('button', {
+                  type: 'button',
+                  className: 'gm-btn icon sm ghost gm-act',
+                  title: staged ? tr('changes.unstage') : tr('changes.stage'),
+                  onClick: function (event) {
+                    event.stopPropagation()
+                    if (staged) props.onUnstage(entry)
+                    else props.onStage(entry)
+                  },
+                }, h(Icon, { name: staged ? 'minus' : 'plus', size: 12 })),
               // 冲突文件不给「丢弃」：那等于放弃冲突解决状态，语义上容易误伤
               props.onDiscard && props.group !== 'conflicted'
                 ? h('button', {
@@ -1398,6 +1546,7 @@ window.__ModuleLoader__.load({
           onStage: function (entry) { props.actions.stage(group, entry) },
           onUnstage: function (entry) { props.actions.unstage(group, entry) },
           onDiscard: function (entry) { props.actions.discard(group, entry) },
+          onResolve: function (entry) { props.actions.openResolution(entry) },
         })
       }
       var empty = !conflicted.length && !staged.length && !unstaged.length && !untracked.length
@@ -1734,14 +1883,96 @@ window.__ModuleLoader__.load({
       })
     }
 
+    /**
+     * 冲突解决视图。
+     * 生成阶段完全不碰磁盘，只有点「应用」才写文件 —— 模型给错了最多白看一次。
+     */
+    function ResolutionView(props) {
+      var state = props.state
+      var resolution = state.resolution
+      var busy = !!state.busy
+      var suggested = resolution.suggested
+      var lines = suggested ? suggested.replace(/\n$/, '').split('\n') : []
+      var visible = lines.slice(0, 400)
+      var actions = props.actions
+      return h('div', { className: 'gm-scroll' },
+        h('div', { className: 'gm-content-inner gm-resolution' },
+          h('div', { className: 'gm-res-head' },
+            h(Icon, { name: 'ai', size: 14 }),
+            h('span', { className: 'gm-res-title' }, tr('conflict.title')),
+            h('span', { className: 'gm-spacer' }),
+            h('button', {
+              type: 'button',
+              className: 'gm-btn icon sm ghost',
+              title: tr('conflict.discard'),
+              onClick: function () { actions.closeResolution() },
+            }, h(Icon, { name: 'close', size: 12 }))),
+          h('div', { className: 'gm-res-path' }, resolution.path),
+          resolution.loading
+            ? h('div', { className: 'gm-res-note' }, tr('conflict.generating'))
+            : suggested
+              ? h('div', { className: 'gm-res-note' },
+                tr('conflict.preview'),
+                resolution.model ? ' · ' + tr('conflict.model', { model: resolution.model }) : '')
+              : h('div', { className: 'gm-res-note' }, tr('conflict.empty')),
+          h('input', {
+            className: 'gm-input',
+            value: state.conflictHint,
+            placeholder: tr('conflict.hintPlaceholder'),
+            disabled: busy,
+            onChange: function (event) { actions.setConflictHint(event.target.value) },
+            onKeyDown: function (event) { if (event.key === 'Enter') actions.aiResolve() },
+          }),
+          h('div', { className: 'gm-actions' },
+            h(Btn, {
+              icon: 'ai',
+              label: suggested ? tr('conflict.regenerate') : tr('conflict.ai'),
+              small: true,
+              variant: 'primary',
+              disabled: busy || resolution.loading,
+              onClick: actions.aiResolve,
+            }),
+            h(Btn, {
+              label: tr('conflict.takeOurs'),
+              small: true,
+              disabled: busy || resolution.loading,
+              onClick: function () { actions.takeConflictSide('ours') },
+            }),
+            h(Btn, {
+              label: tr('conflict.takeTheirs'),
+              small: true,
+              disabled: busy || resolution.loading,
+              onClick: function () { actions.takeConflictSide('theirs') },
+            })),
+          suggested
+            ? h('div', { className: 'gm-actions' },
+              h(Btn, { label: tr('conflict.apply'), small: true, variant: 'primary', disabled: busy, onClick: actions.applyResolution }),
+              h(Btn, { label: tr('conflict.discard'), small: true, ghost: true, disabled: busy, onClick: function () { actions.closeResolution() } }))
+            : null,
+          suggested
+            ? h('div', { className: 'gm-res-code' }, visible.map(function (line, index) {
+              return h('div', { key: 'rl:' + index, className: 'gm-res-line' },
+                h('span', { className: 'no' }, String(index + 1)),
+                h('span', { className: 'tx' }, line === '' ? ' ' : line))
+            }))
+            : null,
+          suggested && lines.length > visible.length
+            ? h('div', { className: 'gm-res-note' }, tr('diff.truncated'))
+            : null))
+    }
+
     function DiffView(props) {
       var state = props.state
+      // 解决视图优先：它是「差异」页的一个特殊态，不额外占一个 tab。
+      if (state.resolution) return h(ResolutionView, { state: state, actions: props.actions })
       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' },
@@ -1750,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),
@@ -1904,7 +2146,7 @@ window.__ModuleLoader__.load({
         onStashDrop: props.actions.stashDrop,
         onStashMessage: props.actions.setStashMessage,
       })
-      else content = h(DiffView, { state: state })
+      else content = h(DiffView, { state: state, actions: props.actions })
       return h('div', { className: 'gm-root' },
         panelStyle(),
         h(CompactTopBar, {

package/package.json

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

package/src/ai-conflict.js

@@ -0,0 +1,159 @@
+/**
+ * git-manager — AI 冲突解决。
+ *
+ * 冲突文件有三份 stage：共同祖先（:1:）、当前分支（:2:）、合入分支（:3:）。
+ * 这里把它们装配成 prompt，让模型输出「解决后的完整文件」。
+ *
+ * 本模块只做清理与校验，**不写盘**：真正的写入由 operations 的 applyConflict 完成，
+ * 而且写之前会再校验一次是否残留冲突标记。这样即使模型胡说，也不会把
+ * `<<<<<<<` 直接 stage 进仓库。
+ */
+import { GitError } from './git.js'
+
+/** 单份版本最多送给模型多少字符；再大就不是「看懂了再合」，而是碰运气。 */
+export const MAX_SIDE_CHARS = 40000
+const MAX_OUTPUT_TOKENS = 1600
+
+export const DEFAULT_SYSTEM_PROMPT = [
+  '你是一个 Git 合并冲突解决器。',
+  '用户会给出冲突文件的三份内容：base（共同祖先）、ours（当前分支）、theirs（合入分支）。',
+  '请输出解决冲突后的完整文件内容，遵守：',
+  '- 保留双方各自有价值的改动；同一处语义等价的重复只保留一份。',
+  '- 版本号、依赖版本这类冲突取更新/更高的一方，并与文件其余部分保持一致。',
+  '- 只输出文件内容本身：不要解释、不要 Markdown 围栏、不要行号、不要「以下是」这类开场白。',
+  '- 输出必须能直接编译或解析：括号、缩进、import 与文件其余部分自洽。',
+  '- 拿不准时选择让整个文件保持自洽的一侧，不要把两边拼贴成互相矛盾的代码。',
+  '- 不要臆造两边都没有的新逻辑。',
+].join('\n')
+
+/** 冲突标记只认行首的 7 个 < 或 >（`=======` 可能合法出现在 Markdown 里，不查）。 */
+export function hasConflictMarkers(text) {
+  return String(text ?? '')
+    .split('\n')
+    .some((line) => /^(<{7}|>{7})(\s|$)/.test(line))
+}
+
+/** 取最长的围栏代码块；模型常常在代码块前后加一句解释。 */
+export function extractFenced(text) {
+  const source = String(text ?? '')
+  const re = /^[ \t]*```[^\n]*\n([\s\S]*?)^[ \t]*```[ \t]*$/gm
+  let match
+  let best = null
+  while ((match = re.exec(source)) !== null) {
+    const block = match[1]
+    if (best === null || block.length > best.length) best = block
+  }
+  return best
+}
+
+/**
+ * 清理模型输出为文件内容。
+ * 只剥围栏和首尾空行，绝不逐行 trim —— 缩进就是语义。
+ * @param {string} text
+ * @returns {string}
+ */
+export function sanitizeResolution(text) {
+  const fenced = extractFenced(text)
+  let value = fenced !== null ? fenced : String(text ?? '')
+  value = value.replace(/\r\n/g, '\n')
+  if (fenced === null) {
+    // 没有围栏时，模型可能仍写了整行 ``` 围栏
+    value = value.replace(/^[ \t]*```[a-zA-Z0-9_-]*[ \t]*$/gm, '')
+  }
+  return value.replace(/\n{0,2}$/, '\n')
+}
+
+/**
+ * 校验模型给出的解决结果。不合格就抛错，**不要**用一个坏结果去覆盖用户文件。
+ * @param {string} suggested
+ */
+export function validateResolution(suggested) {
+  if (typeof suggested !== 'string') {
+    throw new GitError('模型没有返回内容', { code: 'ai-unavailable' })
+  }
+  if (suggested.trim() === '') {
+    throw new GitError('模型返回了空文件，未采用', { code: 'ai-unavailable' })
+  }
+  if (hasConflictMarkers(suggested)) {
+    throw new GitError('模型输出仍包含冲突标记，未采用', { code: 'ai-unavailable' })
+  }
+}
+
+function capSide(label, text) {
+  const value = String(text ?? '')
+  if (value.length <= MAX_SIDE_CHARS) return value
+  return value.slice(0, MAX_SIDE_CHARS) + `\n…（${label} 超过 ${MAX_SIDE_CHARS} 字符，已截断）`
+}
+
+/** 构造 user prompt。 */
+export function buildConflictPrompt({ path, base, ours, theirs, branch, incoming, hint }) {
+  const parts = ['文件：' + path]
+  if (branch) parts.push('当前分支（ours）：' + branch)
+  if (incoming) parts.push('合入分支（theirs）：' + incoming)
+  if (hint) parts.push('用户补充说明：' + hint)
+  parts.push('')
+  if (base !== null && base !== undefined) {
+    parts.push('=== base（共同祖先）===', capSide('base', base), '')
+  } else {
+    parts.push('=== base ===', '（这个文件没有共同祖先版本，是 add/add 冲突）', '')
+  }
+  parts.push('=== ours（当前分支）===', capSide('ours', ours), '')
+  parts.push('=== theirs（合入分支）===', capSide('theirs', theirs))
+  return parts.join('\n')
+}
+
+/**
+ * 让模型给出一份解决结果。
+ * @param {{
+ *   path: string, base: string|null, ours: string, theirs: string,
+ *   branch?: string|null, incoming?: string|null, hint?: string,
+ *   llm?: unknown, selection?: {provider?: string, model?: string, reasoningEffort?: string},
+ *   signal?: AbortSignal, systemPrompt?: string,
+ * }} options
+ * @returns {Promise<{suggested: string, model: string}>}
+ */
+export async function resolveConflict(options) {
+  const { llm, selection, signal } = options
+  if (!llm || !selection || !selection.provider || !selection.model) {
+    throw new GitError('没有可用的默认模型，无法生成解决建议', { code: 'ai-unavailable' })
+  }
+  const model = selection.provider + '/' + selection.model
+  const systemPrompt = typeof options.systemPrompt === 'string' && options.systemPrompt.trim() !== ''
+    ? options.systemPrompt.trim().slice(0, 4000)
+    : DEFAULT_SYSTEM_PROMPT
+  const prompt = buildConflictPrompt(options)
+
+  let text = ''
+  try {
+    const stream = llm.stream({
+      provider: selection.provider,
+      model: selection.model,
+      reasoningEffort: selection.reasoningEffort,
+      system: systemPrompt,
+      messages: [{ role: 'user', content: [{ type: 'text', text: prompt }] }],
+      maxTokens: MAX_OUTPUT_TOKENS,
+      temperature: 0.1,
+      signal,
+    })
+    for await (const chunk of stream) {
+      if (chunk.type === 'text-delta') text += chunk.text
+      if (chunk.type === 'finish') {
+        const kind = chunk.reason && chunk.reason.kind
+        if (kind === 'error' || kind === 'aborted') {
+          const failure = chunk.reason.failure
+          throw new GitError('模型生成失败：' + (failure && failure.message ? failure.message : kind), {
+            code: 'ai-unavailable',
+          })
+        }
+      }
+    }
+  } catch (error) {
+    if (error instanceof GitError) throw error
+    const message = error && error.message ? error.message : String(error)
+    throw new GitError('模型生成失败：' + message, { code: 'ai-unavailable' })
+  }
+
+  const suggested = sanitizeResolution(text)
+  validateResolution(suggested)
+  return { suggested, model }
+}

package/src/operations.js

@@ -2,9 +2,12 @@
  * git-manager — RPC 操作实现。
  *
  * 每个操作都是一次独立的请求：解析 cwd → 找到仓库根 → 读写 git → 返回纯 JSON。
- * `exec` 由 Host 入口注入（真实子进程或单测的假实现），因此本文件没有 I/O 依赖。
+ * `exec` 由 Host 入口注入（真实子进程或单测的假实现），因此本文件没有 git 之外的 I/O；
+ * 唯一的例外是 applyConflict 要把解决结果写回工作区，那一步用 `writeFile`
+ *（可通过 deps.fileIO 注入假实现，单测不必碰磁盘）。
  */
-import { isAbsolute } from 'node:path'
+import { isAbsolute, join } from 'node:path'
+import { writeFile } from 'node:fs/promises'
 import {
   GitError,
   classifyEntries,
@@ -18,6 +21,7 @@ import {
   parseUnifiedDiff,
 } from './git.js'
 import { generateCommitMessage } from './ai-commit.js'
+import { hasConflictMarkers, resolveConflict } from './ai-conflict.js'
 
 const READ_TIMEOUT = 30000
 const WRITE_TIMEOUT = 30000
@@ -30,6 +34,7 @@ const OPS = [
   'snapshot', 'graph', 'diff', 'stage', 'unstage', 'discard', 'switchBranch', 'deleteBranch',
   'commit', 'fetch', 'pull', 'push', 'aiCommit',
   'stashPush', 'stashPop', 'stashDrop', 'setCommitPrompt',
+  'conflictInfo', 'aiConflict', 'applyConflict', 'takeSide',
 ]
 
 /** 自定义提交提示词在 git config 里的键。用 git config 而不是新增工作区文件：
@@ -67,6 +72,28 @@ function assertPaths(paths) {
   })
 }
 
+/**
+ * 只接受仓库内的相对路径。
+ * applyConflict 会把内容写到 `join(root, path)`，这里必须挡住
+ * 绝对路径与 `..`，否则一个构造过的 path 就能写到仓库外。
+ */
+function assertRelPath(value) {
+  if (typeof value !== 'string' || value.trim() === '' || value.includes('\0')) {
+    throw new GitError('path 非法', { code: 'invalid-params' })
+  }
+  if (isAbsolute(value)) {
+    throw new GitError(`path 必须是仓库内相对路径：${value}`, { code: 'invalid-params' })
+  }
+  const segments = value.split('/').filter((segment) => segment !== '' && segment !== '.')
+  if (segments.includes('..')) {
+    throw new GitError(`path 不能包含 ..：${value}`, { code: 'invalid-params' })
+  }
+  if (segments.length === 0) {
+    throw new GitError('path 非法', { code: 'invalid-params' })
+  }
+  return segments.join('/')
+}
+
 function assertRef(value, label) {
   if (typeof value !== 'string' || value.trim() === '') {
     throw new GitError(`缺少 ${label} 参数`, { code: 'invalid-params' })
@@ -99,6 +126,7 @@ export function createOperations(deps) {
   const { exec } = deps
   const ai = deps.ai ?? (() => null)
   const generate = deps.generateCommitMessage ?? generateCommitMessage
+  const writeFileImpl = (deps.fileIO && deps.fileIO.writeFile) ?? writeFile
   const timeouts = {
     read: READ_TIMEOUT,
     write: WRITE_TIMEOUT,
@@ -261,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') {
@@ -538,6 +574,247 @@ export function createOperations(deps) {
     return { prompt: read.code === 0 ? read.stdout.trim() : '' }
   }
 
+  // ---------------------------------------------------------------- 冲突解决
+
+  /** 列出某个冲突文件在索引里的三份 stage（1=base 2=ours 3=theirs）。 */
+  async function conflictStages(root, path, signal) {
+    const res = await runGit(['ls-files', '-u', '-z', '--', path], {
+      cwd: root, signal, allowFailure: true,
+    })
+    const stages = {}
+    for (const chunk of String(res.stdout || '').split('\0')) {
+      if (chunk === '') continue
+      const tab = chunk.indexOf('\t')
+      if (tab < 0) continue
+      // 格式：<mode> <hash> <stage>\t<path>
+      const meta = chunk.slice(0, tab).split(' ')
+      const hash = meta[1]
+      const stage = Number(meta[2])
+      if (!hash || !Number.isInteger(stage) || stage < 1 || stage > 3) continue
+      stages[stage] = hash
+    }
+    return stages
+  }
+
+  async function readBlob(root, hash, signal) {
+    if (!hash) return null
+    const res = await runGit(['cat-file', '-p', hash], { cwd: root, signal, allowFailure: true })
+    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'], {
+      cwd: root, signal, allowFailure: true,
+    })
+    return String(res.stdout || '').split('\0').filter(Boolean).length
+  }
+
+  /** 合入侧的 ref 名：merge 看 MERGE_HEAD，rebase 看 REBASE_HEAD。 */
+  async function incomingRef(root, signal) {
+    for (const ref of ['MERGE_HEAD', 'REBASE_HEAD']) {
+      const exists = await runGit(['rev-parse', '--verify', '-q', ref], {
+        cwd: root, signal, allowFailure: true,
+      })
+      if (exists.code !== 0) continue
+      const name = await runGit(['name-rev', '--name-only', ref], {
+        cwd: root, signal, allowFailure: true,
+      })
+      if (name.code === 0 && name.stdout.trim() !== '') return name.stdout.trim()
+      const subject = await runGit(['log', '-1', '--pretty=%s', ref], {
+        cwd: root, signal, allowFailure: true,
+      })
+      if (subject.code === 0 && subject.stdout.trim() !== '') return subject.stdout.trim()
+    }
+    return null
+  }
+
+  /** 读一个冲突文件的三份版本；不是冲突文件就报 invalid-params。 */
+  async function loadConflict(root, path, signal) {
+    const stages = await conflictStages(root, path, signal)
+    if (Object.keys(stages).length === 0) {
+      throw new GitError(`该文件没有未解决的冲突：${path}`, { code: 'invalid-params' })
+    }
+    const [base, ours, theirs] = await Promise.all([
+      readBlob(root, stages[1], signal),
+      readBlob(root, stages[2], signal),
+      readBlob(root, stages[3], signal),
+    ])
+    return { stages, base, ours: ours ?? '', theirs: theirs ?? '' }
+  }
+
+  async function conflictInfo(params, signal) {
+    const cwd = assertCwd(params.cwd)
+    const resolved = await repoRoot(cwd, signal)
+    const root = resolved.root
+    if (!root) {
+      throw new GitError(`当前目录不是 Git 仓库：${cwd}${resolved.error ? `（${resolved.error}）` : ''}`, { code: 'not-a-repo' })
+    }
+    const path = assertRelPath(params.path)
+    const info = await loadConflict(root, path, signal)
+    const branch = await currentBranch(root, signal)
+    const incoming = await incomingRef(root, signal)
+    return {
+      path,
+      branch,
+      incoming,
+      hasBase: info.base !== null,
+      oursExists: Boolean(info.stages[2]),
+      theirsExists: Boolean(info.stages[3]),
+      ours: info.ours.slice(0, DIFF_MAX_CHARS),
+      theirs: info.theirs.slice(0, DIFF_MAX_CHARS),
+      base: (info.base ?? '').slice(0, DIFF_MAX_CHARS),
+    }
+  }
+
+  /**
+   * 生成解决建议。**不写盘** —— 用户确认后走 applyConflict。
+   * 这样模型给出坏结果时最多是白看一次，不会把工作区改脏。
+   */
+  async function aiConflict(params, signal) {
+    const cwd = assertCwd(params.cwd)
+    const resolved = await repoRoot(cwd, signal)
+    const root = resolved.root
+    if (!root) {
+      throw new GitError(`当前目录不是 Git 仓库：${cwd}${resolved.error ? `（${resolved.error}）` : ''}`, { code: 'not-a-repo' })
+    }
+    const path = assertRelPath(params.path)
+    const hint = typeof params.hint === 'string' ? params.hint.slice(0, 500) : ''
+    const info = await loadConflict(root, path, signal)
+    const total = info.ours.length + info.theirs.length + (info.base ? info.base.length : 0)
+    if (total > 240000) {
+      throw new GitError(`冲突文件过大（三份共 ${total} 字符），请手动解决`, { code: 'invalid-params' })
+    }
+    const context = ai() ?? {}
+    const branch = await currentBranch(root, signal)
+    const incoming = await incomingRef(root, signal)
+    const result = await resolveConflict({
+      path,
+      base: info.base,
+      ours: info.ours,
+      theirs: info.theirs,
+      branch,
+      incoming,
+      hint,
+      signal,
+      llm: context.llm,
+      selection: context.selection,
+    })
+    return {
+      path,
+      suggested: result.suggested,
+      model: result.model,
+      hasBase: info.base !== null,
+    }
+  }
+
+  /** 把解决结果写回工作区并标记为已解决。写入前再挡一次冲突标记。 */
+  async function applyConflict(params, signal) {
+    const cwd = assertCwd(params.cwd)
+    const resolved = await repoRoot(cwd, signal)
+    const root = resolved.root
+    if (!root) {
+      throw new GitError(`当前目录不是 Git 仓库：${cwd}${resolved.error ? `（${resolved.error}）` : ''}`, { code: 'not-a-repo' })
+    }
+    const path = assertRelPath(params.path)
+    const content = params.content
+    if (typeof content !== 'string' || content.trim() === '') {
+      throw new GitError('content 不能为空', { code: 'invalid-params' })
+    }
+    if (content.length > DIFF_MAX_CHARS) {
+      throw new GitError(`content 过长（${content.length} 字符）`, { code: 'invalid-params' })
+    }
+    if (hasConflictMarkers(content)) {
+      throw new GitError('解决结果仍包含冲突标记，拒绝写入', { code: 'invalid-params' })
+    }
+    // 必须是当前真实的冲突文件，避免用这个接口去改任意文件
+    await loadConflict(root, path, signal)
+    const abs = join(root, path)
+    if (abs !== root && !abs.startsWith(root + '/')) {
+      throw new GitError('path 超出仓库范围', { code: 'invalid-params' })
+    }
+    await writeFileImpl(abs, content, 'utf8')
+    await runGit(['add', '--', path], { cwd: root, signal, timeoutMs: timeouts.write })
+    const unmerged = await unmergedCount(root, signal)
+    return { path, resolved: true, unmerged }
+  }
+
+  /**
+   * 直接取某一侧（ours / theirs）。
+   * 该侧没有这个文件时（被删除或改名）语义就是「删除」，用 git rm 收掉冲突条目。
+   */
+  async function takeSide(params, signal) {
+    const cwd = assertCwd(params.cwd)
+    const resolved = await repoRoot(cwd, signal)
+    const root = resolved.root
+    if (!root) {
+      throw new GitError(`当前目录不是 Git 仓库：${cwd}${resolved.error ? `（${resolved.error}）` : ''}`, { code: 'not-a-repo' })
+    }
+    const path = assertRelPath(params.path)
+    const side = params.side
+    if (side !== 'ours' && side !== 'theirs') {
+      throw new GitError(`side 只能是 ours 或 theirs：${String(side)}`, { code: 'invalid-params' })
+    }
+    const info = await loadConflict(root, path, signal)
+    const stage = side === 'ours' ? 2 : 3
+    const deleted = !info.stages[stage]
+    if (deleted) {
+      await runGit(['rm', '-f', '--ignore-unmatch', '--', path], {
+        cwd: root, signal, timeoutMs: timeouts.write, allowFailure: true,
+      })
+    } else {
+      await runGit(['checkout', side === 'ours' ? '--ours' : '--theirs', '--', path], {
+        cwd: root, signal, timeoutMs: timeouts.write,
+      })
+      await runGit(['add', '--', path], { cwd: root, signal, timeoutMs: timeouts.write })
+    }
+    const unmerged = await unmergedCount(root, signal)
+    return { path, side, deleted, resolved: true, unmerged }
+  }
+
   async function aiCommit(params, signal) {
     const cwd = assertCwd(params.cwd)
     const resolved = await repoRoot(cwd, signal)
@@ -583,6 +860,10 @@ export function createOperations(deps) {
     stashPop,
     stashDrop,
     setCommitPrompt,
+    conflictInfo,
+    aiConflict,
+    applyConflict,
+    takeSide,
   }
 
   /**
@@ -598,7 +879,7 @@ export function createOperations(deps) {
     if (params === null || typeof params !== 'object') {
       throw new GitError('参数必须是 JSON 对象', { code: 'invalid-params' })
     }
-    const timeout = op === 'aiCommit'
+    const timeout = op === 'aiCommit' || op === 'aiConflict'
       ? timeouts.ai
       : op === 'fetch' || op === 'pull' || op === 'push'
         ? timeouts.network