dsh-ide-git 0.19.9 → 0.19.11

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.19.9",
+  "version": "0.19.11",
   "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.19.9",
+  "version": "0.19.11",
   "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

@@ -8201,13 +8201,19 @@ window.__ModuleLoader__.load({
         for (const child of node.dirs.values()) total += countOf(child)
         return total
       }
-      const sortedChildren = (node) => Array.from(node.dirs.values()).sort((a, b) => a.path[a.path.length - 1].localeCompare(b.path[b.path.length - 1]))
+      /* Compress at EVERY level, not just the roots (issue #18): the roots
+         were condensed into "a/b/c" chains, but renderFolder's recursion and
+         the fold-all id walk both read this function — which used to hand
+         back the raw single-child chains below the first level, so a deep
+         package path repeated its full prefix on every row. Each returned
+         child is the deepest node of its single-child, file-less chain. */
+      const sortedChildren = (node) => Array.from(node.dirs.values()).map(compress).sort((a, b) => a.path[a.path.length - 1].localeCompare(b.path[b.path.length - 1]))
       const ids = []
       const collect = (node) => {
         ids.push(groupKey + '|' + node.path.join('/'))
         for (const child of sortedChildren(node)) collect(child)
       }
-      const roots = sortedChildren(root).map((child) => compress(child))
+      const roots = sortedChildren(root)
       for (const node of roots) collect(node)
       return { roots: roots, rootFiles: root.files, ids: ids, countOf: countOf, sortedChildren: sortedChildren }
     }
@@ -11028,7 +11034,11 @@ window.__ModuleLoader__.load({
             return
           }
           const forest = buildDirForest(sorted, key)
-          const renderFolder = (node, depth) => {
+          /* The label is the chain THIS node adds below its parent (issue
+             #18): a compressed "java/cn/com/pxwk/base" node repeats only the
+             segments below "…/src/main", not the full path from the group
+             root — same convention as the IDE commit tree. */
+          const renderFolder = (node, depth, parentLen) => {
             const id = key + '|' + node.path.join('/')
             const open = foldedDirs[id] !== true
             out.push({
@@ -11040,13 +11050,13 @@ window.__ModuleLoader__.load({
               },
                 E('span', { className: 'dig-chevron' + (open ? ' dig-chevron-open' : '') }, E(Icon, { name: 'chevron', size: 10 })),
                 E('span', { className: 'dig-row-icon dig-tone-accent' }, E(Icon, { name: 'folder', size: 10 })),
-                E('span', { className: 'dig-folder-name' }, node.path.join('/')),
+                E('span', { className: 'dig-folder-name' }, node.path.slice(typeof parentLen === 'number' ? parentLen : 0).join('/')),
                 E('span', { className: 'dig-count' }, String(forest.countOf(node)))),
             })
             if (open === true) {
               /* VS Code order inside a folder: subfolders first (recursively,
                  each indented one more level), then this folder's own files. */
-              for (const child of forest.sortedChildren(node)) renderFolder(child, depth + 1)
+              for (const child of forest.sortedChildren(node)) renderFolder(child, depth + 1, node.path.length)
               for (const item of sortedOf(node.files)) out.push({ kind: 'row', key: key + ':' + item.path, h: ITEM_HEIGHTS.row, node: entryRow(key, item, depth) })
             }
           }
@@ -12075,6 +12085,7 @@ window.__ModuleLoader__.load({
       useMeasureLayoutEffect(() => {
         const node = hostRef.current
         const holder = node === null || typeof node.closest !== 'function' ? null : node.closest('.dig-conversation-seat[data-immersive="1"]')
+        if (gateNestedLoop() === false) return
         setImmersiveSeat(holder !== null)
       })
       const compact = size.width > 0 && size.width < COMPACT_MAX_WIDTH
@@ -12144,14 +12155,40 @@ window.__ModuleLoader__.load({
          apart read as a smooth resize in a low-fps screen recording. Later
          runs still track content arrival; the layout-phase cost is one
          querySelectorAll over the 3-4 panes the post-paint run already paid. */
+      /* ---------- measurement loop fuse (issue #17) ---------- */
+
+      /* Every effect below runs on EVERY render and feeds a state update.
+         In a steady UI the bail-out comparisons stop the chain, but when the
+         realized layout disagrees with the just-measured one — a float pane
+         being created/resized on the desktop client hit exactly this — each
+         render re-measures a DIFFERENT box, the update nests synchronously
+         and React aborts at depth 50 with #185, leaving the pane white
+         behind the host's slot boundary. The gate detects that nesting
+         directly: runs are counted in a 40 ms window and a nested render
+         loop (50 commits inside one task) trips it long before React's
+         limit, while legitimate per-event work (a pointermove drag renders
+         at most twice in 40 ms) never comes close. Skipping a measurement
+         during a pathological burst only freezes the affected number until
+         the next window — degraded ratios for a frame, never a white pane. */
+      const measureGate = useRef({ n: 0, at: 0 })
+      const gateNestedLoop = () => {
+        const slot = measureGate.current
+        const now = Date.now()
+        if (now - slot.at > 40) { slot.at = now; slot.n = 0 }
+        slot.n += 1
+        return slot.n <= 6
+      }
+
       useMeasureLayoutEffect(() => {
         const found = measurePanes()
+        if (gateNestedLoop() === false) return
         setPaneSizes((current) => (samePaneSizes(current, found) ? current : found))
       })
       useEffect(() => {
         const node = hostRef.current
         const holder = node === null || typeof node.closest !== 'function' ? null : node.closest('[data-dockkit-float]')
         const next = holder === null ? null : holder.getAttribute('data-dockkit-float')
+        if (gateNestedLoop() === false) return
         setFloatPaneId((current) => (current === next ? current : next))
       })
       const dock = props.dock === undefined ? null : props.dock