@caozeal/dsh-next-git 0.1.5 → 0.1.7

package/lib/client.js

@@ -64,6 +64,26 @@ window.__ModuleLoader__.load({
       'changes.unstageAll': '全部取消暂存',
       'changes.stage': '暂存',
       'changes.unstage': '取消暂存',
+      'changes.discard': '丢弃改动',
+      'changes.discardUntracked': '删除文件',
+      '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 的补充说明（可选）',
@@ -75,6 +95,13 @@ window.__ModuleLoader__.load({
       'commit.push': '提交并推送',
       'commit.messageRequired': '请先填写提交信息',
       'commit.empty': '没有可提交的暂存变更',
+      'commit.prompt': 'AI 提示词',
+      'commit.promptTitle': '自定义 AI 提交提示词',
+      'commit.promptHint': '留空使用默认提示词。这里只改「怎么写」，diff 与文件列表始终会传给模型。',
+      'commit.promptSave': '保存',
+      'commit.promptReset': '恢复默认',
+      'commit.promptCancel': '取消',
+      'commit.promptCustom': '自定义提示词',
       'tabs.changes': '变更',
       'tabs.graph': '提交图',
       'tabs.branches': '分支',
@@ -112,6 +139,17 @@ window.__ModuleLoader__.load({
       'status.branchCreated': '已创建分支 {branch}',
       'status.branchDeleted': '已删除分支 {branch}',
       'status.deleteConfirm': '确定删除分支 {branch}？',
+      'status.discardOk': '已丢弃 {path}',
+      'status.stashSaveOk': '已 stash 当前改动',
+      'status.stashPopOk': '已恢复 stash@{n}',
+      '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': '失败',
@@ -131,6 +169,14 @@ window.__ModuleLoader__.load({
       'status.aiModelEdit': '由 {model} 生成，可继续编辑',
       'status.ready': '就绪',
       'changes.stagedCount': '已暂存 {n}',
+      'stash.title': 'Stash',
+      'stash.empty': '没有 stash 记录',
+      'stash.placeholder': 'stash 说明（可选）',
+      'stash.save': '暂存改动',
+      'stash.pop': '恢复',
+      'stash.drop': '删除',
+      'stash.popConfirm': '恢复 stash@{n} 并从列表移除？',
+      'stash.dropConfirm': '删除 stash@{n}？此操作不可恢复。',
       'changes.conflictBanner': '存在 {n} 个冲突文件，解决后再提交',
       'branch.selectTitle': '切换分支',
       'header.refreshing': '刷新中…',
@@ -175,6 +221,26 @@ window.__ModuleLoader__.load({
       'changes.unstageAll': 'Unstage all',
       'changes.stage': 'Stage',
       'changes.unstage': 'Unstage',
+      'changes.discard': 'Discard changes',
+      'changes.discardUntracked': 'Delete file',
+      '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',
@@ -186,6 +252,13 @@ window.__ModuleLoader__.load({
       'commit.push': 'Commit & push',
       'commit.messageRequired': 'Commit message is required',
       'commit.empty': 'Nothing staged to commit',
+      'commit.prompt': 'AI prompt',
+      'commit.promptTitle': 'Custom AI commit prompt',
+      'commit.promptHint': 'Leave empty to use the default. This only changes how it writes; the diff and file list are always sent.',
+      'commit.promptSave': 'Save',
+      'commit.promptReset': 'Reset to default',
+      'commit.promptCancel': 'Cancel',
+      'commit.promptCustom': 'Custom prompt',
       'tabs.changes': 'Changes',
       'tabs.graph': 'Graph',
       'tabs.branches': 'Branches',
@@ -223,6 +296,17 @@ window.__ModuleLoader__.load({
       'status.branchCreated': 'Created branch {branch}',
       'status.branchDeleted': 'Deleted branch {branch}',
       'status.deleteConfirm': 'Delete branch {branch}?',
+      'status.discardOk': 'Discarded {path}',
+      'status.stashSaveOk': 'Stashed current changes',
+      'status.stashPopOk': 'Restored stash@{n}',
+      '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',
@@ -242,6 +326,14 @@ window.__ModuleLoader__.load({
       'status.aiModelEdit': 'Generated by {model}; edit as needed',
       'status.ready': 'Ready',
       'changes.stagedCount': '{n} staged',
+      'stash.title': 'Stash',
+      'stash.empty': 'No stash entries',
+      'stash.placeholder': 'Stash message (optional)',
+      'stash.save': 'Stash changes',
+      'stash.pop': 'Restore',
+      'stash.drop': 'Drop',
+      'stash.popConfirm': 'Restore stash@{n} and remove it from the list?',
+      'stash.dropConfirm': 'Drop stash@{n}? This cannot be undone.',
       'changes.conflictBanner': '{n} conflicted file(s); resolve them before committing',
       'branch.selectTitle': 'Switch branch',
       'header.refreshing': 'Refreshing…',
@@ -411,6 +503,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); }
@@ -482,6 +588,11 @@ window.__ModuleLoader__.load({
       .gm-commit::before { content:''; position:absolute; top:0; left:0; right:0; height:3px;
         background:linear-gradient(90deg, var(--gm-cyan), var(--gm-blue) 45%, transparent 90%); }
       .gm-commit-head { display:flex; align-items:center; gap:6px; }
+      .gm-prompt { display:flex; flex-direction:column; gap:5px; padding:8px; border-radius:10px;
+        background:var(--gm-blue-06); border:1px solid var(--gm-blue-12); }
+      .gm-prompt .gm-section { padding:0; }
+      .gm-prompt-text { min-height:96px; max-height:180px; font-size:11px;
+        font-family:ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; }
       .gm-commit-title { font-size:10.5px; font-weight:700; letter-spacing:.05em; text-transform:uppercase;
         color:var(--gm-blue); }
       .gm-textarea { width:100%; min-height:46px; max-height:140px; padding:7px 9px; border-radius:10px;
@@ -607,6 +718,9 @@ window.__ModuleLoader__.load({
       commit: ['M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16z', 'M8.5 12l2.5 2.5L16 9.5'],
       file: ['M6 3h8l4 4v14H6z', 'M14 3v5h5'],
       branch: ['M6 4v9', 'M6 17m-2 0a2 2 0 1 0 4 0a2 2 0 1 0-4 0', 'M18 6m-2 0a2 2 0 1 0 4 0a2 2 0 1 0-4 0', 'M18 8v1a6 6 0 0 1-6 6H8'],
+      trash: ['M4 7h16', 'M9 7V4h6v3', 'M6 7l1 14h10l1-14', 'M10 11v6', 'M14 11v6'],
+      gear: ['M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6z', 'M19.4 15a1.7 1.7 0 0 0 .3 1.9l.1.1a2 2 0 1 1-2.8 2.8l-.1-.1a1.7 1.7 0 0 0-1.9-.3 1.7 1.7 0 0 0-1 1.5V21a2 2 0 1 1-4 0v-.1A1.7 1.7 0 0 0 9 19.4a1.7 1.7 0 0 0-1.9.3l-.1.1a2 2 0 1 1-2.8-2.8l.1-.1a1.7 1.7 0 0 0 .3-1.9 1.7 1.7 0 0 0-1.5-1H3a2 2 0 1 1 0-4h.1A1.7 1.7 0 0 0 4.6 9a1.7 1.7 0 0 0-.3-1.9l-.1-.1a2 2 0 1 1 2.8-2.8l.1.1a1.7 1.7 0 0 0 1.9.3H9a1.7 1.7 0 0 0 1-1.5V3a2 2 0 1 1 4 0v.1a1.7 1.7 0 0 0 1 1.5 1.7 1.7 0 0 0 1.9-.3l.1-.1a2 2 0 1 1 2.8 2.8l-.1.1a1.7 1.7 0 0 0-.3 1.9V9a1.7 1.7 0 0 0 1.5 1H21a2 2 0 1 1 0 4h-.1a1.7 1.7 0 0 0-1.5 1z'],
+      stash: ['M4 5h16v4H4z', 'M6 9v10h12V9', 'M10 13h4'],
     }
 
     function Icon(props) {
@@ -790,6 +904,15 @@ window.__ModuleLoader__.load({
         newBranchOpen: false,
         newBranchName: '',
         newBranchFrom: '',
+        // 自定义 AI 提示词编辑态。promptDraft 是编辑中的草稿，
+        // 只有点保存才写回 git config，避免边打字边写盘。
+        promptOpen: false,
+        promptDraft: '',
+        stashMessage: '',
+        // 冲突解决：resolution 非空时「差异」页切到解决视图。
+        // suggested 为 null 表示还没生成，用户可以先选边或让 AI 生成。
+        resolution: null,
+        conflictHint: '',
       })
       var toastTimer = null
       var loadToken = 0
@@ -909,6 +1032,10 @@ window.__ModuleLoader__.load({
       }
 
       function setNewBranchName(value) { set({ newBranchName: value }) }
+      function setStashMessage(value) {
+        set({ stashMessage: String(value || '') })
+      }
+
       function setNewBranchFrom(value) { set({ newBranchFrom: value }) }
 
       async function runBusy(label, operation) {
@@ -981,6 +1108,181 @@ window.__ModuleLoader__.load({
         }
       }
 
+      /**
+       * 丢弃改动。分组的语义决定用哪个后端模式：
+       *   unstaged → worktree（只回退工作区）
+       *   untracked → untracked（删除文件）
+       *   staged → all（连暂存区一起回退）
+       * 三种都不可恢复，所以一律先 window.confirm。
+       */
+      async function discard(group, entry) {
+        var cwd = store.get().cwd
+        if (!cwd || !entry || !entry.path) return
+        var mode = group === 'untracked' ? 'untracked' : group === 'staged' ? 'all' : 'worktree'
+        var key = group === 'untracked'
+          ? 'changes.discardUntrackedConfirm'
+          : group === 'staged' ? 'changes.discardStagedConfirm' : 'changes.discardConfirm'
+        if (typeof window !== 'undefined' && typeof window.confirm === 'function') {
+          if (!window.confirm(tr(key, { path: entry.path }))) return
+        }
+        var result = await runBusy('discard', function () {
+          return rpc('discard', { cwd: cwd, paths: [entry.path], mode: mode })
+        })
+        if (result !== null) {
+          toast('ok', tr('status.discardOk', { path: entry.path }), result.output)
+          set({ selected: null, diff: null })
+          await refresh()
+        }
+      }
+
+      async function stashSave() {
+        var state = store.get()
+        var cwd = state.cwd
+        if (!cwd) return
+        var params = { cwd: cwd }
+        var message = String(state.stashMessage || '').trim()
+        if (message !== '') params.message = message
+        // 未跟踪文件默认不进 stash；有未跟踪改动时一并存起来，否则用户会以为「全存了」
+        var status = state.snapshot && state.snapshot.status ? state.snapshot.status : null
+        if (status && status.untracked && status.untracked.length > 0) params.includeUntracked = true
+        var result = await runBusy('stash', function () { return rpc('stashPush', params) })
+        if (result !== null) {
+          set({ stashMessage: '' })
+          toast('ok', tr('status.stashSaveOk'), result.output)
+          await refresh()
+        }
+      }
+
+      async function stashPop(index) {
+        var cwd = store.get().cwd
+        if (!cwd) return
+        if (typeof window !== 'undefined' && typeof window.confirm === 'function') {
+          if (!window.confirm(tr('stash.popConfirm', { n: index }))) return
+        }
+        var result = await runBusy('stash', function () { return rpc('stashPop', { cwd: cwd, index: index }) })
+        if (result !== null) {
+          toast('ok', tr('status.stashPopOk', { n: index }), result.output)
+          await refresh()
+        }
+      }
+
+      async function stashDrop(index) {
+        var cwd = store.get().cwd
+        if (!cwd) return
+        if (typeof window !== 'undefined' && typeof window.confirm === 'function') {
+          if (!window.confirm(tr('stash.dropConfirm', { n: index }))) return
+        }
+        var result = await runBusy('stash', function () { return rpc('stashDrop', { cwd: cwd, index: index }) })
+        if (result !== null) {
+          toast('ok', tr('status.stashDropOk', { n: index }), result.output)
+          await refresh()
+        }
+      }
+
+      function openPrompt() {
+        var snapshot = store.get().snapshot
+        set({ promptOpen: true, promptDraft: snapshot && snapshot.commitPrompt ? snapshot.commitPrompt : '' })
+      }
+
+      function closePrompt() {
+        set({ promptOpen: false, promptDraft: '' })
+      }
+
+      function setPromptDraft(value) {
+        set({ promptDraft: String(value || '') })
+      }
+
+      async function savePrompt() {
+        var state = store.get()
+        var cwd = state.cwd
+        if (!cwd) return
+        var result = await runBusy('prompt', function () {
+          return rpc('setCommitPrompt', { cwd: cwd, prompt: String(state.promptDraft || '') })
+        })
+        if (result !== null) {
+          set({ promptOpen: false, promptDraft: '' })
+          toast('ok', tr('status.promptSaved'))
+          await refresh()
+        }
+      }
+
+      async function resetPrompt() {
+        var cwd = store.get().cwd
+        if (!cwd) return
+        var result = await runBusy('prompt', function () {
+          return rpc('setCommitPrompt', { cwd: cwd, prompt: '' })
+        })
+        if (result !== null) {
+          set({ promptOpen: false, promptDraft: '' })
+          toast('ok', tr('status.promptReset'))
+          await refresh()
+        }
+      }
+
+      // ------------------------------------------------------------ 冲突解决
+
+      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
@@ -1105,6 +1407,22 @@ window.__ModuleLoader__.load({
         setNewBranch: setNewBranch,
         setNewBranchName: setNewBranchName,
         setNewBranchFrom: setNewBranchFrom,
+        discard: discard,
+        stashSave: stashSave,
+        stashPop: stashPop,
+        stashDrop: stashDrop,
+        setStashMessage: setStashMessage,
+        openPrompt: openPrompt,
+        closePrompt: closePrompt,
+        setPromptDraft: setPromptDraft,
+        savePrompt: savePrompt,
+        resetPrompt: resetPrompt,
+        openResolution: openResolution,
+        closeResolution: closeResolution,
+        setConflictHint: setConflictHint,
+        aiResolve: aiResolve,
+        applyResolution: applyResolution,
+        takeConflictSide: takeConflictSide,
         clearToast: clearToast,
       }
     }
@@ -1162,16 +1480,41 @@ window.__ModuleLoader__.load({
             h('span', { className: 'gm-fpath' },
               parts.dir ? h('span', { className: 'gm-dir' }, parts.dir) : null,
               parts.base),
-            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 })))
+            h('span', { className: 'gm-row', style: { gap: '2px' } },
+              // 冲突文件不给「暂存」：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', {
+                  type: 'button',
+                  className: 'gm-btn icon sm ghost gm-act',
+                  title: props.group === 'untracked' ? tr('changes.discardUntracked') : tr('changes.discard'),
+                  onClick: function (event) {
+                    event.stopPropagation()
+                    props.onDiscard(entry)
+                  },
+                }, h(Icon, { name: 'trash', size: 12 }))
+                : null))
         }))
     }
 
@@ -1194,6 +1537,8 @@ window.__ModuleLoader__.load({
           onSelect: function (entry) { props.actions.selectFile(group, entry) },
           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
@@ -1226,6 +1571,29 @@ window.__ModuleLoader__.load({
         }
       }
       return h('div', { className: 'gm-commit' },
+        state.promptOpen
+          ? h('div', { className: 'gm-prompt' },
+            h('div', { className: 'gm-section' },
+              h('span', null, tr('commit.promptTitle')),
+              h('span', { className: 'gm-spacer' }),
+              h('button', {
+                type: 'button',
+                className: 'gm-btn icon sm ghost',
+                title: tr('commit.promptCancel'),
+                onClick: props.onClosePrompt,
+              }, h(Icon, { name: 'close', size: 12 }))),
+            h('textarea', {
+              className: 'gm-textarea gm-prompt-text',
+              value: state.promptDraft,
+              placeholder: tr('commit.promptHint'),
+              onChange: function (event) { props.onPromptDraft(event.target.value) },
+            }),
+            h('div', { className: 'gm-hint' }, tr('commit.promptHint')),
+            h('div', { className: 'gm-actions' },
+              h(Btn, { label: tr('commit.promptReset'), small: true, ghost: true, disabled: !!busy, onClick: props.onResetPrompt }),
+              h('span', { className: 'gm-spacer' }),
+              h(Btn, { label: tr('commit.promptSave'), small: true, variant: 'primary', disabled: !!busy, onClick: props.onSavePrompt })))
+          : null,
         h('div', { className: 'gm-commit-head' },
           h(WhaleGlyph, { size: 22 }),
           h('span', { className: 'gm-commit-title' }, tr('commit.title')),
@@ -1254,8 +1622,17 @@ window.__ModuleLoader__.load({
             className: busy === 'ai' ? 'gm-ai-busy' : undefined,
             disabled: !!busy || !state.cwd,
             onClick: props.onGenerate,
+          }),
+          h(Btn, {
+            icon: 'gear',
+            title: tr('commit.prompt'),
+            disabled: !!busy || !state.cwd,
+            onClick: props.onOpenPrompt,
           })),
         h('div', { className: 'gm-actions' },
+          state.snapshot && state.snapshot.commitPrompt
+            ? h('span', { className: 'gm-badge brand', title: state.snapshot.commitPrompt }, tr('commit.promptCustom'))
+            : null,
           state.aiModel
             ? h('span', { className: 'gm-ai-line gm-hint', title: tr('status.aiModel', { model: state.aiModel }) },
               state.aiFallback ? tr('status.aiFallback') : tr('status.aiModelEdit', { model: state.aiModel }))
@@ -1498,8 +1875,88 @@ 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') })
@@ -1539,6 +1996,7 @@ window.__ModuleLoader__.load({
       var branches = state.snapshot && state.snapshot.branches ? state.snapshot.branches : []
       var locals = branches.filter(function (branch) { return branch.kind === 'local' })
       var remotes = branches.filter(function (branch) { return branch.kind === 'remote' })
+      var stashes = state.snapshot && state.snapshot.stashes ? state.snapshot.stashes : []
       function group(title, items, allowDelete) {
         if (items.length === 0) return null
         return h('div', null,
@@ -1564,13 +2022,42 @@ window.__ModuleLoader__.load({
                   : null))
           }))
       }
+      // stash 放在分支页：它和分支一样是「当前工作放哪儿」的操作，
+      // 而不是某次提交的内容。后端 snapshot 早就解析了 stashes，这里才真正用上。
+      function stashSection() {
+        return h('div', null,
+          h('div', { className: 'gm-section' },
+            h('span', null, tr('stash.title')),
+            h('span', { className: 'gm-section-count' }, String(stashes.length))),
+          h('div', { className: 'gm-row', style: { padding: '0 10px 6px' } },
+            h('input', {
+              className: 'gm-input',
+              value: state.stashMessage,
+              placeholder: tr('stash.placeholder'),
+              onChange: function (event) { props.onStashMessage(event.target.value) },
+              onKeyDown: function (event) { if (event.key === 'Enter') props.onStashSave() },
+            }),
+            h(Btn, { label: tr('stash.save'), small: true, disabled: !!state.busy, onClick: props.onStashSave })),
+          stashes.length === 0
+            ? h('div', { className: 'gm-hint', style: { padding: '0 12px 8px' } }, tr('stash.empty'))
+            : stashes.map(function (item) {
+              return h('div', { key: 'stash:' + item.index, className: 'gm-branch' },
+                h(Icon, { name: 'stash', size: 12 }),
+                h('span', { className: 'gm-badge' }, 'stash@{' + item.index + '}'),
+                h('span', { className: 'gm-bmeta' }, item.message || ''),
+                h('span', { className: 'gm-row gm-act', style: { gap: '4px', flex: 'none' } },
+                  h(Btn, { label: tr('stash.pop'), small: true, disabled: !!state.busy, onClick: function () { props.onStashPop(item.index) } }),
+                  h(Btn, { label: tr('stash.drop'), small: true, ghost: true, disabled: !!state.busy, onClick: function () { props.onStashDrop(item.index) } })))
+            }))
+      }
       return h('div', { className: 'gm-scroll' },
         h('div', { className: 'gm-content-inner' },
           group(tr('branch.local'), locals, true),
           group(tr('branch.remote'), remotes, false),
           locals.length === 0 && remotes.length === 0
             ? h(EmptyState, { title: tr('branch.empty') })
-            : null))
+            : null,
+          stashSection()))
     }
 
     function StatusBar(props) {
@@ -1629,8 +2116,16 @@ window.__ModuleLoader__.load({
       var content
       if (state.activeTab === 'changes') content = h(ChangesPane, { state: state, actions: props.actions })
       else if (state.activeTab === 'graph') content = h(GraphView, { state: state, onSelectCommit: props.actions.selectCommit })
-      else if (state.activeTab === 'branches') content = h(BranchesView, { state: state, onSwitch: props.actions.switchBranch, onDelete: props.actions.deleteBranch })
-      else content = h(DiffView, { state: state })
+      else if (state.activeTab === 'branches') content = h(BranchesView, {
+        state: state,
+        onSwitch: props.actions.switchBranch,
+        onDelete: props.actions.deleteBranch,
+        onStashSave: props.actions.stashSave,
+        onStashPop: props.actions.stashPop,
+        onStashDrop: props.actions.stashDrop,
+        onStashMessage: props.actions.setStashMessage,
+      })
+      else content = h(DiffView, { state: state, actions: props.actions })
       return h('div', { className: 'gm-root' },
         panelStyle(),
         h(CompactTopBar, {
@@ -1665,6 +2160,11 @@ window.__ModuleLoader__.load({
             onHint: props.actions.setAiHint,
             onGenerate: props.actions.generateMessage,
             onCommit: function (andPush) { props.actions.commit(andPush) },
+            onOpenPrompt: props.actions.openPrompt,
+            onClosePrompt: props.actions.closePrompt,
+            onPromptDraft: props.actions.setPromptDraft,
+            onSavePrompt: props.actions.savePrompt,
+            onResetPrompt: props.actions.resetPrompt,
           })
           : null)
     }