dsh-ide-git 0.24.0 → 0.25.0

package/README.md

@@ -95,6 +95,7 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 | 区域 | 能力 |
 |---|---|
 | 动作条 | IDEA 式左侧竖排(底部工作台)/ 顶栏下一行横排(右侧栏):刷新、新建分支、签出、删除、比较、显示差异、贮藏、新建标签、收藏、抓取、拉取、推送。**按可用空间自动决定放几个**,放不下的收进 `⋯ 更多`;末尾 `⚙ 设置` 可拖动排序、逐项显隐(存 `dsh-ide-git.rail.v1`)。每个按钮按当前状态点亮/置灰(没有其他分支就不能删除/签出/比较,没有远程就不能抓取/推送,没有上游就不能拉取,没有变更就没有差异可看) |
+| 悬停提示 | 鼠标停在图标按钮上 120ms,指针旁弹出它的操作名——竖排动作条里在图标右侧(跟着该行垂直居中,贴窗口右缘时翻到左侧),其余在下方;置灰的动作连原因一起给出(如 `隐藏 · 当前状态不可用`)。提示卡挂在窗口层,底部工作台裁不到;扫过一排图标不闪,按住鼠标拖拽 / 滚动 / 缩放时立即收起 |
 | 状态行 | 当前分支、上游、`↑ahead ↓behind`、stash 数量、忙碌指示 |
 | 输入框状态条 | 宿主输入框工具条里的仓库/分支胶囊(着色 ±未提交 / ↓可拉取 / ↑待推送),点击切换仓库与分支,与面板双向联动;单仓库只切分支,多仓库两边都切;设置可关(默认开) |
 | 分支树 | `HEAD / 本地 / 远程 / 标签` 分组(可折叠)、过滤框、星标当前分支、ahead/behind 角标、worktree 占用标记;本地蓝 / 远程紫 / 标签黄 / HEAD 绿 |

package/README_EN.md

@@ -83,6 +83,7 @@ The panel never guesses: it measures itself with a `ResizeObserver` (width ≥ 6
 ## Features
 
 - Action rail: the JetBrains-style vertical strip in the bottom workbench (and one horizontal row under the header in the right sidebar) with refresh, new branch, checkout, delete, compare, show diff, stash, new tag, favorite, fetch, pull and push. **It shows as many buttons as fit**, folds the rest into a `⋯ more` menu, and pins a `⚙ settings` button that lets you reorder actions and toggle each of them (stored in `dsh-ide-git.rail.v1`). Every action lights up or greys out with the current state (no other branch → delete / checkout / compare off, no remote → fetch / push off, no upstream → pull off, no changes → diff off).
+- Hover hints: rest the pointer on an icon button for 120ms and its action name appears beside it — to the RIGHT of a vertical rail icon (centred on that row, flipping to the left when the window's right edge is in the way) and below everywhere else; greyed-out actions explain themselves too (e.g. `Hide · Not available in the current state`). The hint card lives on the window layer, so the bottom workbench cannot clip it — sweeping across a row of icons does not flash, and a pressed pointer / scroll / resize drops it immediately.
 - Status line: branch, upstream, ahead/behind, stash count, busy indicator.
 - Composer status pill: repository/branch capsule in the host input-bar tool row (colored uncommitted / pullable / to-push counters), click to switch repo and branch — kept in sync with the panel both ways; single-repo workspaces switch branches only, multi-repo workspaces switch both. Off-switch in the settings (on by default). Sessions are pre-warmed on switch so the panel opens instantly.
 - Branch tree: HEAD / Local / Remote / Tags groups, filter box, ahead/behind badges, worktree marker; local blue / remote violet / tag amber / HEAD green.

package/dsh.plugin.json

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

@@ -14849,7 +14849,12 @@ window.__ModuleLoader__.load({
       const diffPane = patch === '' && patchLoading === false ? null : E('div', { className: 'dig-diff-pane', 'data-pane': 'diff', style: paneStyle('diff'), onContextMenu: onDiffPaneContextMenu },
         E('div', { className: 'dig-diff-head' },
           E('span', { className: 'dig-mono dig-diff-path' }, selectedPath === null ? '' : selectedPath),
-          E('button', { type: 'button', className: 'dig-icon-btn', onClick: () => { setPatch(''); setSelectedPath(null); setDiffContext(null) } }, E(Icon, { name: 'close', size: 12 }))),
+          E('button', {
+            type: 'button',
+            className: 'dig-icon-btn',
+            title: t('toast.close'),
+            onClick: () => { setPatch(''); setSelectedPath(null); setDiffContext(null) },
+          }, E(Icon, { name: 'close', size: 12 }))),
         E(DiffBody, { patch: patch, loading: patchLoading, t: t }))
 
       /* ---------- rail (IDE-style left action strip) ---------- */
@@ -16422,6 +16427,13 @@ window.__ModuleLoader__.load({
       '.dig-wt-label{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:500}',
       '.dig-wt-error{padding:6px 8px;margin-bottom:8px;border-radius:var(--dsw-radius-sm,8px);background:rgba(220,38,38,.12);color:var(--dsw-alias-state-error-primary);font-size:11px;line-height:16px;word-break:break-word}',
       'body[data-ds-dark-theme] .dig-wt-error{background:rgba(248,113,113,.16)}',
+      /* ---- icon tooltip ---- */
+      /* A body child, not a panel child: the bottom workbench declares
+         `contain: layout style`, so a fixed element inside it would take the
+         panel box as its containing block and land off-screen (invariant 13).
+         Styled from the same menu tokens so it reads as part of the product. */
+      '.dig-tip{position:fixed;z-index:9999;display:none;box-sizing:border-box;max-width:280px;padding:5px 8px;border-radius:var(--dsw-radius-sm,8px);background:var(--dsw-specific-menu,var(--dsw-alias-bg-layer-2,var(--dsw-alias-bg-layer-1)));color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-elevation-prominent,0 8px 22px rgba(0,0,0,.32));font-family:var(--dsw-font-family,system-ui,sans-serif);font-size:calc(11px + var(--dsh-content-font-delta-secondary,0px));font-weight:500;line-height:1.45;text-align:left;white-space:normal;overflow-wrap:anywhere;pointer-events:none}',
+      '.dig-tip[data-show="true"]{display:block}',
     ].concat(LANE_TRACE_RULES).join('\n')
 
     /* ============================== plugin ============================== */
@@ -17518,6 +17530,193 @@ window.__ModuleLoader__.load({
               }))))
     }
 
+    /* ---- icon tooltips ----
+       Every icon action already carries its name in `title` (the rail adds the
+       disabled reason; the toolbar / mini / pill buttons carry the action
+       verb). Native title bubbles are the wrong surface for this product: the
+       bottom workbench is a dense horizontal strip, the bubble needs a full
+       second of rest, it is drawn in the browser's own styling, and over a
+       DISABLED rail button it never appears at all. Draw one themed card
+       instead, shared by every seat (panel, composer pill, diff preview) and
+       hung off <body> — see the `.dig-tip` note in CSS for why it can't live
+       inside the panel. The card mirrors the anchor's own `title`, which is
+       removed while the card is up so the native bubble never doubles it. */
+    const TIP_ID = 'dsh-ide-git-tip'
+    const TIP_DELAY_MS = 120
+    const TIP_GAP = 6
+    /* Only this plugin's own surfaces explain themselves. `.dig-root` is the
+       panel (native and better-sidebar seats alike), `.dig-cs-root` the
+       composer status pill, `.dig-preview-root` the external diff seat. */
+    const TIP_ROOTS = '.dig-root, .dig-cs-root, .dig-preview-root'
+
+    function installHoverTips() {
+      /* The SSR self-check drives apply() with a minimal document stub: it has
+         no body, no id lookup and no event targets. Those environments get the
+         no-op installer rather than a throw during plugin activation. */
+      if (typeof document === 'undefined' || document.body == null
+        || typeof document.createElement !== 'function'
+        || typeof document.getElementById !== 'function'
+        || typeof document.addEventListener !== 'function'
+        || typeof window === 'undefined'
+        || typeof window.addEventListener !== 'function') return () => {}
+      /* HMR / re-apply: never stack two cards (or two listener sets on one). */
+      const stale = document.getElementById(TIP_ID)
+      if (stale !== null) stale.remove()
+      const card = document.createElement('div')
+      card.id = TIP_ID
+      card.className = 'dig-tip'
+      card.setAttribute('data-dsh-ide-git', '')
+      card.setAttribute('role', 'tooltip')
+      card.setAttribute('aria-hidden', 'true')
+      document.body.appendChild(card)
+
+      /* `anchor` is the button the pointer is on (or about to rest on, while
+         `timer` runs); `shown` is the one whose title the card has taken. */
+      let anchor = null
+      let shown = null
+      let takenTitle = null
+      let timer = null
+
+      const restore = () => {
+        if (shown === null) return
+        /* React may have rewritten the attribute while the card was up (toggle
+           buttons swap their copy): only put the taken text back when nothing
+           else has claimed the slot, so a fresh label is never clobbered. */
+        try {
+          if (shown.getAttribute('title') === null && takenTitle !== null) shown.setAttribute('title', takenTitle)
+        } catch (error) { void error }
+        shown = null
+        takenTitle = null
+      }
+
+      const hide = () => {
+        if (timer !== null) { clearTimeout(timer); timer = null }
+        anchor = null
+        restore()
+        card.removeAttribute('data-show')
+        card.setAttribute('aria-hidden', 'true')
+        card.textContent = ''
+      }
+
+      /* Viewport coordinates on a body child: no panel containment to fight. */
+      const place = () => {
+        const rect = anchor.getBoundingClientRect()
+        const width = card.offsetWidth
+        const height = card.offsetHeight
+        const viewportW = window.innerWidth || document.documentElement.clientWidth || 0
+        const viewportH = window.innerHeight || document.documentElement.clientHeight || 0
+        /* The vertical action rail is a 24px column on the panel's left edge:
+           a card under an icon there would cover the icons below it, so this one
+           sits to its right and follows the row. (The horizontal rail uses
+           `.dig-rail-row`, so the `closest` query only matches the vertical
+           seat — top rows keep the below-the-button placement.) */
+        if (anchor.closest('.dig-rail') !== null) {
+          let left = rect.left + rect.width + TIP_GAP
+          if (left + width > viewportW - 4) left = rect.left - TIP_GAP - width
+          if (left < 4) left = 4
+          let top = rect.top + (rect.height - height) / 2
+          if (top + height > viewportH - 4) top = viewportH - height - 4
+          if (top < 4) top = 4
+          card.style.left = Math.round(left) + 'px'
+          card.style.top = Math.round(top) + 'px'
+          return
+        }
+        /* Below the anchor; flip above when the bottom edge would clip. */
+        let top = rect.bottom + TIP_GAP
+        if (top + height > viewportH - 4) top = rect.top - height - TIP_GAP
+        if (top < 4) top = 4
+        let left = rect.left + (rect.width - width) / 2
+        if (left + width > viewportW - 4) left = viewportW - width - 4
+        if (left < 4) left = 4
+        card.style.left = Math.round(left) + 'px'
+        card.style.top = Math.round(top) + 'px'
+      }
+
+      const reveal = () => {
+        timer = null
+        if (anchor === null) return
+        const label = anchor.getAttribute('title')
+        if (label === null || label === '') { hide(); return }
+        takenTitle = label
+        try { anchor.removeAttribute('title') } catch (error) { void error }
+        shown = anchor
+        card.textContent = label
+        card.setAttribute('data-show', 'true')
+        card.removeAttribute('aria-hidden')
+        place()
+      }
+
+      /* Whatever sits under the pointer, not whatever received the event: a
+         disabled button still hit-tests (rail icons), and the SVG glyph inside
+         the button is usually the element under the cursor. `closest` walks up
+         to the button. The label is read here, but the anchor's own copy is
+         already taken while its card is up — so the shown button answers from
+         the saved text, otherwise it would stop counting as a candidate the
+         moment the card opened. */
+      const buttonAt = (x, y) => {
+        if (typeof document.elementFromPoint !== 'function') return null
+        let hit = null
+        try { hit = document.elementFromPoint(x, y) } catch (error) { void error; return null }
+        if (hit === null || hit === undefined || typeof hit.closest !== 'function') return null
+        if (hit.closest(TIP_ROOTS) === null) return null
+        return hit.closest('button, [role="button"]')
+      }
+
+      const labelOf = (button) => {
+        if (button === shown) return takenTitle
+        const label = button.getAttribute('title')
+        return label === null || label === '' ? null : label
+      }
+
+      const onPointerMove = (event) => {
+        if (event !== null && event !== undefined && event.pointerType === 'touch') return
+        /* A drag is not a hover: reordering rail actions, dragging a divider or
+           selecting rows all sweep across buttons with a pressed pointer, and
+           no card should pop up under the drag. */
+        if (event !== null && event !== undefined && typeof event.buttons === 'number' && event.buttons !== 0) {
+          if (anchor !== null || timer !== null || shown !== null) hide()
+          return
+        }
+        const button = buttonAt(event === null || event === undefined ? 0 : event.clientX, event === null || event === undefined ? 0 : event.clientY)
+        if (button === null || labelOf(button) === null) {
+          if (anchor !== null || timer !== null || shown !== null) hide()
+          return
+        }
+        if (button === anchor) return
+        /* Another button: the old card (and the title it took) goes now, the
+           new one waits out the grace period — sweeping the rail must not
+           flash a card per icon. */
+        if (timer !== null) { clearTimeout(timer); timer = null }
+        restore()
+        card.removeAttribute('data-show')
+        anchor = button
+        timer = setTimeout(reveal, TIP_DELAY_MS)
+      }
+
+      document.addEventListener('pointermove', onPointerMove, { passive: true })
+      document.addEventListener('pointerdown', hide, true)
+      document.addEventListener('pointerleave', hide)
+      document.addEventListener('wheel', hide, { passive: true, capture: true })
+      /* Scroll and resize move the anchor under a card that cannot follow it:
+         the card would lie about where the button is. Drop it and let the next
+         pointer move re-open it. */
+      window.addEventListener('scroll', hide, true)
+      window.addEventListener('resize', hide)
+      window.addEventListener('blur', hide)
+
+      return () => {
+        hide()
+        document.removeEventListener('pointermove', onPointerMove)
+        document.removeEventListener('pointerdown', hide, true)
+        document.removeEventListener('pointerleave', hide)
+        document.removeEventListener('wheel', hide, { capture: true })
+        window.removeEventListener('scroll', hide, true)
+        window.removeEventListener('resize', hide)
+        window.removeEventListener('blur', hide)
+        card.remove()
+      }
+    }
+
     function apply(ctx) {
       const style = document.createElement('style')
       style.setAttribute('data-dsh-ide-git', '')
@@ -17525,6 +17724,11 @@ window.__ModuleLoader__.load({
       document.head.appendChild(style)
       ctx.effect(() => () => { style.remove() }, 'dsh-ide-git: panel styles')
 
+      /* Icon affordances explain themselves on hover wherever this plugin
+         draws one — the panel in any seat, the composer pill, the diff
+         preview. One document-level card covers them all. */
+      ctx.effect(() => installHoverTips(), 'dsh-ide-git: icon tooltips')
+
       const t = translatorOf(ctx)
 
       /* DSH's own locale registry: bind this plugin's namespace so host-side