@caozeal/dsh-next-git 0.1.4 → 0.1.6

package/lib/client.js

@@ -64,6 +64,11 @@ window.__ModuleLoader__.load({
       'changes.unstageAll': '全部取消暂存',
       'changes.stage': '暂存',
       'changes.unstage': '取消暂存',
+      'changes.discard': '丢弃改动',
+      'changes.discardUntracked': '删除文件',
+      'changes.discardConfirm': '丢弃 {path} 的改动？此操作不可恢复。',
+      'changes.discardUntrackedConfirm': '删除未跟踪文件 {path}？此操作不可恢复。',
+      'changes.discardStagedConfirm': '丢弃 {path} 的暂存与工作区改动？此操作不可恢复。',
       'commit.title': '提交信息',
       'commit.placeholder': '填写提交信息，或先点「AI 生成信息」',
       'commit.hintPlaceholder': '给 AI 的补充说明（可选）',
@@ -75,6 +80,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 +124,12 @@ 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.aiModel': '由 {model} 生成',
       'status.aiFallback': '模型输出不可用，已生成降级文案',
       'toast.error': '失败',
@@ -131,6 +149,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 +201,11 @@ 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.',
       'commit.title': 'Commit message',
       'commit.placeholder': 'Write a commit message, or generate one with AI',
       'commit.hintPlaceholder': 'Optional hint for the AI',
@@ -186,6 +217,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 +261,12 @@ 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.aiModel': 'Generated by {model}',
       'status.aiFallback': 'Model output unusable; used a fallback message',
       'toast.error': 'Failed',
@@ -242,6 +286,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…',
@@ -277,6 +329,16 @@ window.__ModuleLoader__.load({
         --gm-blue-18: color-mix(in srgb, var(--gm-blue) 18%, transparent);
         --gm-blue-28: color-mix(in srgb, var(--gm-blue) 28%, transparent);
         --gm-blue-40: color-mix(in srgb, var(--gm-blue) 40%, transparent);
+        /* 提交图 lane 调色板：8 色，相邻不撞色；每条分支线跨行保持同色。
+           色相刻意错开（蓝/紫/青/绿/橙/粉/黄/灰），深浅色主题下都够辨识。 */
+        --gm-lane-0: #4d6bfe;
+        --gm-lane-1: #8b5cf6;
+        --gm-lane-2: #06b6d4;
+        --gm-lane-3: #22c55e;
+        --gm-lane-4: #f59e0b;
+        --gm-lane-5: #ec4899;
+        --gm-lane-6: #14b8a6;
+        --gm-lane-7: #a855f7;
         --gm-ok: var(--dsw-alias-state-success-primary);
         --gm-err: var(--dsw-alias-state-error-primary);
         --gm-warn: var(--dsw-alias-state-warn-primary);
@@ -414,10 +476,10 @@ window.__ModuleLoader__.load({
       .gm-glane { flex:none; overflow:hidden;
         -webkit-mask-image:linear-gradient(90deg, #000 88%, transparent 100%);
         mask-image:linear-gradient(90deg, #000 88%, transparent 100%); }
-      .gm-glane line { stroke:var(--gm-blue); stroke-width:1.6; stroke-linecap:round; opacity:.65; }
-      .gm-glane circle { fill:var(--gm-blue); stroke:var(--gm-bg); stroke-width:1.4; }
-      .gm-grow.active .gm-glane line, .gm-grow:hover .gm-glane line { opacity:.95; }
-      .gm-grow.active .gm-glane circle, .gm-grow:hover .gm-glane circle { fill:var(--gm-deep); }
+      .gm-glane line { stroke:var(--gm-blue); stroke-width:1.7; stroke-linecap:round; opacity:.78; }
+      .gm-glane circle { fill:var(--gm-blue); stroke:var(--gm-card); stroke-width:1.5; }
+      .gm-grow.active .gm-glane line, .gm-grow:hover .gm-glane line { opacity:1; }
+      .gm-grow.active .gm-glane circle { stroke:var(--gm-base); stroke-width:2; }
       .gm-hash { flex:none; font-size:10.5px; color:var(--gm-blue); opacity:.75; }
       .gm-subject { flex:1 1 auto; min-width:56px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-family:inherit; }
       .gm-meta { flex:none; max-width:145px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;
@@ -445,15 +507,23 @@ window.__ModuleLoader__.load({
         border:1px solid var(--gm-blue-18); display:inline-block; max-width:calc(100% - 24px);
         font-family:${mono}; font-size:10.5px; color:var(--gm-blue); white-space:pre-wrap; }
       .gm-dlines { font-family:${mono}; font-size:11.5px; line-height:1.62; margin:0 6px 6px; }
-      .gm-dline { display:flex; align-items:baseline; white-space:pre-wrap; word-break:break-all; border-radius:4px; }
-      .gm-dline.add { background:color-mix(in srgb, var(--gm-ok) 10%, transparent); }
-      .gm-dline.del { background:color-mix(in srgb, var(--gm-err) 10%, transparent); }
+      .gm-dline { display:flex; align-items:baseline; white-space:pre-wrap; word-break:break-word; border-radius:4px; }
+      /* 增删底色优先用平台自己的 diff 配色（--dsw-alias-file-diff-*），深浅色主题自动跟随；
+         主题未注入时退回原来的 color-mix 兜底。 */
+      .gm-dline.add { background:var(--dsw-alias-file-diff-added-bg, color-mix(in srgb, var(--gm-ok) 10%, transparent)); }
+      .gm-dline.del { background:var(--dsw-alias-file-diff-deleted-bg, color-mix(in srgb, var(--gm-err) 10%, transparent)); }
       .gm-ln { width:38px; flex:none; text-align:right; padding-right:8px; color:var(--gm-dim);
-        opacity:.6; user-select:none; font-variant-numeric:tabular-nums; }
+        opacity:.6; user-select:none; font-variant-numeric:tabular-nums; border-radius:3px; }
+      .gm-dline.add .gm-ln { background:var(--dsw-alias-file-diff-added-gutter, transparent); }
+      .gm-dline.del .gm-ln { background:var(--dsw-alias-file-diff-deleted-gutter, transparent); }
       .gm-sign { width:14px; flex:none; text-align:center; font-weight:700; }
-      .gm-dline.add .gm-sign { color:var(--gm-ok); }
-      .gm-dline.del .gm-sign { color:var(--gm-err); }
+      .gm-dline.add .gm-sign { color:var(--dsw-alias-file-diff-added-marker, var(--gm-ok)); }
+      .gm-dline.del .gm-sign { color:var(--dsw-alias-file-diff-deleted-marker, var(--gm-err)); }
       .gm-dtext { flex:1 1 auto; min-width:0; padding-right:10px; }
+      /* 词级高亮：只有真正变化的 token 才加深底色，一眼看出「改了哪个词」。 */
+      .gm-dword { border-radius:3px; padding:0 1px; }
+      .gm-dword.add { background:color-mix(in srgb, var(--dsw-alias-file-diff-added-marker, var(--gm-ok)) 34%, transparent); }
+      .gm-dword.del { background:color-mix(in srgb, var(--dsw-alias-file-diff-deleted-marker, var(--gm-err)) 34%, transparent); }
       .gm-meta-line { padding:2px 12px; color:var(--gm-dim); font-style:italic; }
 
       /* ---- commit card --------------------------------------------------- */
@@ -464,6 +534,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;
@@ -589,6 +664,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) {
@@ -772,6 +850,11 @@ window.__ModuleLoader__.load({
         newBranchOpen: false,
         newBranchName: '',
         newBranchFrom: '',
+        // 自定义 AI 提示词编辑态。promptDraft 是编辑中的草稿，
+        // 只有点保存才写回 git config，避免边打字边写盘。
+        promptOpen: false,
+        promptDraft: '',
+        stashMessage: '',
       })
       var toastTimer = null
       var loadToken = 0
@@ -891,6 +974,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) {
@@ -963,6 +1050,117 @@ 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()
+        }
+      }
+
       async function switchBranch(name) {
         var cwd = store.get().cwd
         if (!cwd || !name) return
@@ -1087,6 +1285,16 @@ 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,
         clearToast: clearToast,
       }
     }
@@ -1144,16 +1352,29 @@ 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' } },
+              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))
         }))
     }
 
@@ -1176,6 +1397,7 @@ 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) },
         })
       }
       var empty = !conflicted.length && !staged.length && !unstaged.length && !untracked.length
@@ -1208,6 +1430,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')),
@@ -1236,8 +1481,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 }))
@@ -1360,6 +1614,7 @@ window.__ModuleLoader__.load({
                   prev: index > 0 ? (lines[index - 1].graph || '') : '',
                   next: index + 1 < lines.length ? (lines[index + 1].graph || '') : '',
                   cols: graphCols,
+                  colors: line.colors || [],
                 }))
             }
             var selected = state.selected && state.selected.kind === 'commit' && state.selected.hash === line.full
@@ -1374,13 +1629,21 @@ window.__ModuleLoader__.load({
                 prev: index > 0 ? (lines[index - 1].graph || '') : '',
                 next: index + 1 < lines.length ? (lines[index + 1].graph || '') : '',
                 cols: graphCols,
+                colors: line.colors || [],
               }),
               h('span', { className: 'gm-hash' }, line.hash),
               line.refs && line.refs.length > 0
                 ? h('span', { className: 'gm-row', style: { gap: '4px', flex: 'none' } }, line.refs.map(function (ref, refIndex) {
+                  var isHead = ref.indexOf('HEAD') === 0
+                  // HEAD 用渐变主色强调；其余 ref 用分支自己的 lane 色，和左侧线条同色。
                   return h('span', {
                     key: 'r:' + refIndex,
-                    className: 'gm-badge gm-ref' + (ref.indexOf('HEAD') === 0 ? ' brand' : ''),
+                    className: 'gm-badge gm-ref' + (isHead ? ' brand' : ''),
+                    style: isHead ? undefined : {
+                      color: 'var(--gm-lane-' + (line.refColor !== undefined ? line.refColor : 0) + ')',
+                      borderColor: 'color-mix(in srgb, var(--gm-lane-' + (line.refColor !== undefined ? line.refColor : 0) + ') 42%, transparent)',
+                      background: 'color-mix(in srgb, var(--gm-lane-' + (line.refColor !== undefined ? line.refColor : 0) + ') 12%, transparent)',
+                    },
                   }, ref)
                 }))
                 : null,
@@ -1418,6 +1681,12 @@ window.__ModuleLoader__.load({
      * Draws one row of the commit graph as vector lanes, so vertical lines stay
      * continuous across rows (ASCII glyphs leave gaps at 20px row heights).
      */
+    /** lane 色号 → CSS 变量名；-1（该格无连接）返回 undefined 让样式回退。 */
+    function laneVar(color) {
+      if (color === undefined || color === null || color < 0) return undefined
+      return 'var(--gm-lane-' + color + ')'
+    }
+
     function GraphLane(props) {
       var graph = props.graph || ''
       var prev = props.prev || ''
@@ -1425,22 +1694,26 @@ window.__ModuleLoader__.load({
       var cols = props.cols
       var cell = GRAPH_CELL
       var row = GRAPH_ROW
+      var colors = props.colors || []
       var parts = []
       for (var i = 0; i < cols; i += 1) {
         var ch = laneChar(graph, i)
         var cx = (i + 0.5) * cell
+        // 同一条分支线跨行保持同色：颜色由 Host 端 assignGraphColors 沿线段流动算出。
+        var stroke = { stroke: laneVar(colors[i]) }
         if (ch === '|') {
-          parts.push(h('line', { key: 'v' + i, x1: cx, y1: 0, x2: cx, y2: row }))
+          parts.push(h('line', { key: 'v' + i, x1: cx, y1: 0, x2: cx, y2: row, style: stroke }))
         } else if (ch === '/') {
-          parts.push(h('line', { key: 's' + i, x1: cx, y1: 0, x2: cx - cell, y2: row }))
+          parts.push(h('line', { key: 's' + i, x1: cx, y1: 0, x2: cx - cell, y2: row, style: stroke }))
         } else if (ch === '\\') {
-          parts.push(h('line', { key: 'b' + i, x1: cx - cell, y1: 0, x2: cx, y2: row }))
+          parts.push(h('line', { key: 'b' + i, x1: cx - cell, y1: 0, x2: cx, y2: row, style: stroke }))
         } else if (ch === '_') {
-          parts.push(h('line', { key: 'h' + i, x1: cx, y1: row - 1, x2: cx + cell, y2: row - 1 }))
+          parts.push(h('line', { key: 'h' + i, x1: cx, y1: row - 1, x2: cx + cell, y2: row - 1, style: stroke }))
         } else if (ch === '*') {
-          if (laneFromAbove(prev, i)) parts.push(h('line', { key: 'u' + i, x1: cx, y1: 0, x2: cx, y2: row / 2 }))
-          if (laneToBelow(next, i)) parts.push(h('line', { key: 'd' + i, x1: cx, y1: row / 2, x2: cx, y2: row }))
-          parts.push(h('circle', { key: 'c' + i, cx: cx, cy: row / 2, r: 3.2 }))
+          if (laneFromAbove(prev, i)) parts.push(h('line', { key: 'u' + i, x1: cx, y1: 0, x2: cx, y2: row / 2, style: stroke }))
+          if (laneToBelow(next, i)) parts.push(h('line', { key: 'd' + i, x1: cx, y1: row / 2, x2: cx, y2: row, style: stroke }))
+          parts.push(h('circle', { key: 'c' + i, cx: cx, cy: row / 2, r: 3.4,
+            style: { fill: laneVar(colors[i]) } }))
         }
       }
       return h('svg', {
@@ -1449,6 +1722,18 @@ window.__ModuleLoader__.load({
       }, parts)
     }
 
+    /**
+     * 渲染一行的文本部分；Host 在解析 diff 时已算好词级片段（line.inline），
+     * 有就只把变化的片段包成 span，没有就退回整段纯文本。
+     */
+    function inlineSpans(line) {
+      if (!line.inline || line.inline.length === 0) return line.text
+      return line.inline.map(function (part, index) {
+        if (!part.changed) return part.text
+        return h('span', { key: 'i:' + index, className: 'gm-dword' + (line.kind === 'del' ? ' del' : ' add') }, part.text)
+      })
+    }
+
     function DiffView(props) {
       var state = props.state
       var diff = state.diff
@@ -1480,7 +1765,7 @@ window.__ModuleLoader__.load({
                       h('span', { className: 'gm-ln' }, line.old === undefined ? '' : String(line.old)),
                       h('span', { className: 'gm-ln' }, line.new === undefined ? '' : String(line.new)),
                       h('span', { className: 'gm-sign' }, sign),
-                      h('span', { className: 'gm-dtext' }, line.text))
+                      h('span', { className: 'gm-dtext' }, inlineSpans(line)))
                   })))
               })))
     }
@@ -1490,6 +1775,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,
@@ -1515,13 +1801,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) {
@@ -1580,7 +1895,15 @@ 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 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 })
       return h('div', { className: 'gm-root' },
         panelStyle(),
@@ -1616,6 +1939,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)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caozeal/dsh-next-git",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "DSH Git 管理插件：分支切换、变更暂存、提交/推送/拉取、AI 提交信息、提交图与 diff 查看",
   "type": "module",
   "main": "index.js",
@@ -16,6 +16,8 @@
     "src",
     "lib/client.js",
     "cordis.patch.yml",
+    "screenshots.json",
+    "assets/screenshots",
     "locale/*.json",
     "icon.svg",
     "icon.png"

package/screenshots.json

@@ -0,0 +1,8 @@
+[
+  "assets/screenshots/01-changes.png",
+  "assets/screenshots/02-commit-graph.png",
+  "assets/screenshots/03-word-level-diff.png",
+  "assets/screenshots/04-branches.png",
+  "assets/screenshots/05-graph-multibranch.png",
+  "assets/screenshots/06-fullscreen.png"
+]