dsh-ide-git 0.16.2 → 0.16.4

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "main": "./src/index.js",
   "description": "IDE 级 Git 操作面板:分支树 + 提交图谱 + 变更/暂存/提交 + 提交详情。装了 dsh-better-sidebar 时挂成它的原生 tab(右侧栏 + 底部工作台);没装时直接挂 DSH 原生右侧栏,单独安装即可用。JetBrains 风格 Git 工具窗口 for DeepSeek Harness.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ide-git",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "description": "DSH plugin: an IDE-grade Git tool window as a native dsh-better-sidebar tab — branch tree, commit graph, changes, commit details, JetBrains-style actions, in the right sidebar and the bottom panel. | DSH 插件:IDE 级 Git 工具窗口,以 dsh-better-sidebar 原生 Tab 挂载——分支树 / 提交图谱 / 变更与提交详情 / JetBrains 风格操作,右侧栏与底部面板双布局自适应。",
   "type": "module",
   "repository": {

package/src/client.js

@@ -9578,11 +9578,12 @@ window.__ModuleLoader__.load({
         for (const item of changeItems) sums.push(sums[sums.length - 1] + item.h)
         return sums
       }, [changeItems])
+      /* Virtual window, VSCode-style (ListView.getVisibleRange): both ends are
+         pixel→index conversions over the same prefix-sum array, so no "row
+         count" ever enters the math (issue #12 — the old winLimit computed a
+         row count while the loop accumulated pixels, stalling at 2 entries). */
       const winFirst = Math.max(0, windowStart(changeOffsets, changesViewport.scrollTop) - WINDOW_OVERSCAN)
-      const winLimit = Math.ceil(changesViewport.viewH / ITEM_HEIGHTS.row) + WINDOW_OVERSCAN * 3
-      let winLast = winFirst
-      let used = 0
-      while (winLast < changeItems.length && used < winLimit) { used += changeItems[winLast].h; winLast += 1 }
+      const winLast = Math.min(changeItems.length, windowStart(changeOffsets, changesViewport.scrollTop + changesViewport.viewH) + 1 + WINDOW_OVERSCAN)
       const visibleItems = changeItems.slice(winFirst, winLast)
       const aiConfirmDialog = aiAsk !== true ? null : E(ConfirmDialog, {
         t: t,
@@ -9673,7 +9674,7 @@ window.__ModuleLoader__.load({
           title: t('toolbar.more'),
           'data-action': 'more',
           onClick: (event) => props.onMoreMenu(event),
-        }, E(Icon, { name: 'more', size: 16 })))
+        }, E(Icon, { name: 'more', size: 18 })))
       return E('div', { className: 'dig-changes' },
         aiConfirmDialog,
         head,
@@ -11579,7 +11580,7 @@ window.__ModuleLoader__.load({
           title: action.disabled === true ? action.label + ' · ' + reason : action.label,
           disabled: action.disabled === true,
           onClick: action.run,
-        }, E(Icon, { name: action.icon, size: 16 })))
+        }, E(Icon, { name: action.icon, size: 18 })))
         if (overflow === true) {
           children.push(E('button', {
             key: 'more',
@@ -11596,7 +11597,7 @@ window.__ModuleLoader__.load({
               reason: reason,
               run: (inner) => action.run(inner === undefined ? event : inner),
             }))),
-          }, E(Icon, { name: 'more', size: 16 })))
+          }, E(Icon, { name: 'more', size: 18 })))
         }
         children.push(E('span', { key: 'gap', className: vertical ? 'dig-rail-gap' : 'dig-rail-gap-x' }))
         children.push(E('button', {
@@ -11613,7 +11614,7 @@ window.__ModuleLoader__.load({
             if (target === 'page') { openSettingsPage(); return }
             setRailSettings(true)
           },
-        }, E(Icon, { name: 'settings', size: 16 })))
+        }, E(Icon, { name: 'settings', size: 18 })))
         return E('div', { className: vertical ? 'dig-rail' : 'dig-rail-row', ref: railHostRef }, children)
       }
 

package/src/index.js

@@ -239,7 +239,11 @@ function cwdOf(payload) {
 /* ============================== git reads ============================== */
 
 async function repoRootOf(cwd, payload) {
-  if (payload !== undefined && payload.repoRoot !== undefined) return requireAbsolute(payload.repoRoot, 'repoRoot')
+  /* Normalize the separator: `rev-parse --show-toplevel` spells drive paths
+     with forward slashes on Windows while path.join produces backslashes, so
+     the untracked-diff fence (root + path.sep prefix check) rejected every
+     in-repo path there. macOS/Linux are byte-identical no-ops. */
+  if (payload !== undefined && payload.repoRoot !== undefined) return path.normalize(requireAbsolute(payload.repoRoot, 'repoRoot'))
   const result = await runGit(cwd, ['rev-parse', '--show-toplevel'])
   if (result.code !== 0) {
     // A workspace that is not a repository is a normal state, not a failure:
@@ -247,7 +251,7 @@ async function repoRootOf(cwd, payload) {
     throw new PanelError('not-a-repo', 'not a git repository: ' + cwd, 409)
   }
   const top = result.stdout.trim()
-  return top === '' ? cwd : top
+  return path.normalize(top === '' ? cwd : top)
 }
 
 async function currentBranchOf(root) {
@@ -800,7 +804,12 @@ async function diff(payload) {
     /* --no-index reads the file for real, so unlike the plain `git diff --`
        form an absolute path must NOT be allowed to escape the repository. */
     if (absolute !== root && !absolute.startsWith(root + path.sep)) throw badRequest('path must stay inside the repository')
-    const result = await runGit(root, ['diff', '--no-color', '--no-ext-diff', '-U3', '--no-index', '--', '/dev/null', absolute])
+    /* git quotes and C-escapes backslash paths inside the diff header (and
+       git ≥2.55 spells the a/ side with the real path instead of /dev/null);
+       passing forward slashes keeps the header unquoted, so the rewrite below
+       can match it verbatim. POSIX is a no-op. */
+    const headerPath = absolute.split(path.sep).join('/')
+    const result = await runGit(root, ['diff', '--no-color', '--no-ext-diff', '-U3', '--no-index', '--', '/dev/null', headerPath])
     if (result.code !== 0 && result.code !== 1) {
       const detail = result.stderr.trim() === '' ? result.stdout.trim() : result.stderr.trim()
       throw new PanelError('git-failed', 'git diff --no-index failed: ' + (detail === '' ? 'exit ' + result.code : detail), 409)
@@ -809,12 +818,12 @@ async function diff(payload) {
        the header lines back to the repository-relative spelling so the preview
        reads like every other patch (body lines are left untouched). */
     let out = result.stdout
-    if (out.indexOf(absolute) >= 0 && out.indexOf('\n') !== -1) {
+    if (out.indexOf(headerPath) >= 0 && out.indexOf('\n') !== -1) {
       out = out.split('\n').map((line) => {
-        if (line.startsWith('diff --git ') && line.indexOf(absolute) >= 0) return 'diff --git a/' + rel + ' b/' + rel
-        /* the b/ side of --no-index carries the absolute path verbatim (its
-           leading slash merged into the separator): match '+++ b' + absolute. */
-        if (line.startsWith('+++ b' + absolute)) return '+++ b/' + rel
+        if (line.startsWith('diff --git ') && line.indexOf(headerPath) >= 0) return 'diff --git a/' + rel + ' b/' + rel
+        /* git ≥2.55 quotes the header and spells the a/ side with the real
+           path instead of /dev/null, so match on the path, not the prefix. */
+        if (line.startsWith('+++ ') && line.indexOf(headerPath) >= 0) return '+++ b/' + rel
         return line
       }).join('\n')
     }