dsh-vscode-mode 0.15.2 → 0.15.4

package/src/client/ui/SvnLogDialog.ts

@@ -26,6 +26,8 @@ import { SVN_LOG_ACTION_LABEL } from '../../shared/svn.js'
 import { orderLogEntries } from '../../svnLog.js'
 import { SVN_LOG_SHOW_ALL_LIMIT } from '../svnLog.js'
 import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
+import { inputOwnsKey } from '../state/floatingWindow.js'
 import { ContextMenu } from './ContextMenu.js'
 import type { ContextMenuEntry } from './ContextMenu.js'
 import { SvnLogStats } from './SvnLogStats.js'
@@ -886,9 +888,6 @@ export function SvnLogDialog(props) {
   const [sortKey, setSortKey] = React.useState(null)
   const [sortDir, setSortDir] = React.useState('desc')
   const [menu, setMenu] = React.useState(null)
-  const [dlgW, setDlgW] = React.useState(() => Math.min(DIALOG_W_DEFAULT, (typeof window !== 'undefined' ? window.innerWidth : 1280) - 24)) // P0-14：外框宽（拖拽受控）
-  const [dlgH, setDlgH] = React.useState(() => Math.min(DIALOG_H_DEFAULT, (typeof window !== 'undefined' ? window.innerHeight : 800) - 24)) // P0-14：外框高（拖拽受控）
-  const [anchor, setAnchor] = React.useState(null) // 八向拖拽锚点（null=flex 居中；非 null=absolute 定位于该视口坐标） @author ddj 2026年09月24号
   const [listH, setListH] = React.useState(LIST_H_DEFAULT) // P0-14：上段修订列表高（拖拽受控）
   const [msgH, setMsgH] = React.useState(MSG_H_DEFAULT) // P0-14：中段提交信息高（拖拽受控）
   const [statsOpen, setStatsOpen] = React.useState(false) // P1-10：统计窗开关
@@ -998,65 +997,6 @@ export function SvnLogDialog(props) {
     window.addEventListener('pointerup', up)
   }
 
-  // 八向（13-log-ui-polish 增量3）：pointerdown 取卡片视口 rect 起点并立即 absolute 锚定，
-  // 实现「拖哪边哪边动、对边固定」（flex 居中模型无法表达该语义）；clamp = 尺寸下限 680/480
-  // 与视口 12px 边距；每把手柄都以实际 rect 重锚 → CSS 截断/取整漂移自校正。
-  const startResize = (event, mode) => {
-    event.preventDefault()
-    event.stopPropagation()
-    const card = event.currentTarget.parentElement
-    const rect = card ? card.getBoundingClientRect() : null
-    if (!rect) return
-    const r0 = { left: rect.left, top: rect.top, width: rect.width, height: rect.height }
-    const startX = event.clientX
-    const startY = event.clientY
-    const moveL = mode === 'w' || mode === 'nw' || mode === 'sw'
-    const moveR = mode === 'e' || mode === 'ne' || mode === 'se'
-    const moveT = mode === 'n' || mode === 'nw' || mode === 'ne'
-    const moveB = mode === 's' || mode === 'sw' || mode === 'se'
-    const EDGE = 12 // 视口边距
-    const right0 = r0.left + r0.width
-    const bottom0 = r0.top + r0.height
-    // 起手锚定：切 absolute 到当前 rect（视觉零跳变）并同步 state=实际渲染尺寸
-    setAnchor({ left: r0.left, top: r0.top })
-    setDlgW(Math.round(r0.width))
-    setDlgH(Math.round(r0.height))
-    const move = (e) => {
-      const dx = e.clientX - startX
-      const dy = e.clientY - startY
-      let left = r0.left
-      let top = r0.top
-      let width = r0.width
-      let height = r0.height
-      if (moveR) width = Math.min(Math.max(DIALOG_W_MIN, r0.width + dx), window.innerWidth - EDGE - r0.left)
-      if (moveL) { left = Math.min(Math.max(EDGE, r0.left + dx), right0 - DIALOG_W_MIN); width = right0 - left }
-      if (moveB) height = Math.min(Math.max(DIALOG_H_MIN, r0.height + dy), window.innerHeight - EDGE - r0.top)
-      if (moveT) { top = Math.min(Math.max(EDGE, r0.top + dy), bottom0 - DIALOG_H_MIN); height = bottom0 - top }
-      const nextLeft = left
-      const nextTop = top
-      setAnchor((prev) => (prev && prev.left === nextLeft && prev.top === nextTop) ? prev : { left: nextLeft, top: nextTop })
-      setDlgW(Math.round(width))
-      setDlgH(Math.round(height))
-    }
-    const up = () => {
-      window.removeEventListener('pointermove', move)
-      window.removeEventListener('pointerup', up)
-      swallowNextClick()
-    }
-    window.addEventListener('pointermove', move)
-    window.addEventListener('pointerup', up)
-  }
-
-  /**
-   * 双击复位：清锚回 flex 居中 + 默认尺寸（视口 clamp 同初始，防小屏溢出）。
-   * @author ddj 2026年09月24号
-   */
-  const resetDlgSize = () => {
-    setAnchor(null)
-    setDlgW(Math.min(DIALOG_W_DEFAULT, window.innerWidth - 24))
-    setDlgH(Math.min(DIALOG_H_DEFAULT, window.innerHeight - 24))
-  }
-
   /** 上段修订列表高度拖拽（clamp：下限 200，上限 = body 高 - 信息区/路径区/分隔条保留空间）。 */
   const onListHDrag = (event) => startDrag(event, 'y', listH, (next) => {
     const total = bodyRef.current?.clientHeight ?? 0
@@ -1106,9 +1046,14 @@ export function SvnLogDialog(props) {
 
   // 初始/弹窗尺寸变化 fit（2026-09-24 用户反馈：固定高中段把下段变更文件区挤到 0）：
   // 挂载与 dlgH 变化时收敛一次；拖拽期间不介入（拖拽自带 clamp），双击复位经 fitHeights 显式收敛。
+  const fitRef = React.useRef(null)
+  fitRef.current = () => fitHeights(listH, msgH)
   React.useEffect(() => {
-    fitHeights(listH, msgH)
-  }, [dlgH])
+    const observer = new ResizeObserver(() => fitRef.current?.())
+    if (bodyRef.current) observer.observe(bodyRef.current)
+    fitRef.current?.()
+    return () => observer.disconnect()
+  }, [])
 
   // 勘误2（2026-09-24）：挂载 fit 量到的是数据到达前布局（终态差 ~4px → 保底 166）。
   // 初次数据到达以终态布局补 fit 一次收敛至 ≥170；单次门闩，之后刷新/加载更多/拖拽不介入。
@@ -1118,24 +1063,20 @@ export function SvnLogDialog(props) {
     fitHeights(listH, msgH)
   }, [list])
 
-  // 键盘：F5 刷新（防浏览器整页刷新）；↑↓ 在显示列表内移动选中（输入框内不劫持）
-  React.useEffect(() => {
-    const onKey = (event) => {
-      if (event.key === 'F5') { event.preventDefault(); onRefresh(); return }
-      if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
-      const tag = String(event.target?.tagName ?? '').toLowerCase()
-      if (tag === 'input' || tag === 'select' || tag === 'textarea') return
-      if (!sorted || !sorted.length) return
-      event.preventDefault()
-      const at = sorted.findIndex((item) => item.revision === selected[0]?.revision)
-      const next = at < 0 ? 0 : Math.min(sorted.length - 1, Math.max(0, at + (event.key === 'ArrowDown' ? 1 : -1)))
-      const hit = sorted[next]
-      setSelected([hit]) // ↑↓ 折叠为单选（官方同款），并重置 Shift 基准
-      setAnchorRev(hit.revision)
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [sorted, onRefresh, selected])
+  /** @private @author ddj 2026年10月14号 @param event 日志浮窗内按键。其他窗口及输入控件保留自己的键盘行为。 */
+  function onLogKey(event) {
+    if (rangeOpen || menu || inputOwnsKey(event.target)) return
+    if (event.key === 'F5') { event.preventDefault(); event.stopPropagation(); onRefresh(); return }
+    if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
+    if (!sorted || !sorted.length) return
+    event.preventDefault()
+    event.stopPropagation()
+    const at = sorted.findIndex((item) => item.revision === selected[0]?.revision)
+    const next = at < 0 ? 0 : Math.min(sorted.length - 1, Math.max(0, at + (event.key === 'ArrowDown' ? 1 : -1)))
+    const hit = sorted[next]
+    setSelected([hit])
+    setAnchorRev(hit.revision)
+  }
 
   /** 复制当前选中修订（P0-9；剪贴板不可用静默忽略）。 */
   const copyRevision = (entry) => {
@@ -1224,16 +1165,10 @@ export function SvnLogDialog(props) {
     React.createElement('div', { className: 'edrv-svnlog-pane edrv-svnlog-pathspane', ref: paneRef },
       React.createElement(LogPathsInner, { selected: visibleSelected, target, onlyAffected, onOpenFile, onOpenDiff, onPathMenu })))
 
-  return React.createElement(ModalShell, {
-    dialogClass: 'edrv-svnlog-dialog',
-    width: Math.round(dlgW) + 'px',
-    // 八向锚定（增量3）：anchor 非空时 absolute 定位于视口坐标（脱离 flex 居中，视觉零跳变）；
-    // border-box 令 rect==state（clamp/拖拽零换算）；maxHeight:none 消除 88vh 造成 state≠视觉的漂移。
-    cardStyle: Object.assign(
-      { height: Math.round(dlgH) + 'px', boxSizing: 'border-box', maxHeight: 'none' },
-      anchor ? { position: 'absolute', left: Math.round(anchor.left) + 'px', top: Math.round(anchor.top) + 'px' } : null,
-    ),
-    onClose,
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 日志', dialogClass: 'edrv-svnlog-dialog',
+    width: DIALOG_W_DEFAULT, height: DIALOG_H_DEFAULT,
+    onKeyDown: onLogKey, onClose,
   },
     React.createElement(LogHead, { target, onClose }),
     React.createElement(LogFilterBar, {
@@ -1249,15 +1184,6 @@ export function SvnLogDialog(props) {
       onExportCsv: () => onExport('csv'), onExportHtml: () => onExport('html'),
       rangeActive: rangeActive === true, onOpenRange: () => setRangeOpen(true), onRangeReset: () => onRangeReset?.(),
     }),
-    // 八向手柄（增量3）：四边先渲染、四角后渲染（角盖过相邻边 2px overlap）；双击复位统一走 resetDlgSize
-    React.createElement(Grip, { mode: 'n', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 's', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'w', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'e', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'nw', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'ne', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'sw', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'se', onDragStart: startResize, onReset: resetDlgSize }),
     (menu ? React.createElement(ContextMenu, { x: menu.x, y: menu.y, entries: menu.entries, onClose: () => setMenu(null) }) : null),
     (statsOpen ? React.createElement(SvnLogStats, { key: 'edrv-svnlog-stats', entries: sorted, onClose: () => setStatsOpen(false) }) : null),
     (rangeOpen ? React.createElement(ModalShell, {

package/src/client/ui/SvnLogStats.ts

@@ -10,7 +10,7 @@
  * 作者 ddj 2026年09月17号
  */
 import React from 'react'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 
 /** stacked 时间线展开的作者上限（其余并入「其他」）。 */
 const STACK_TOP = 5
@@ -205,11 +205,10 @@ export function SvnLogStats(props) {
   const [othersPct, setOthersPct] = React.useState(0)
   const [stacked, setStacked] = React.useState(false)
   const stats = React.useMemo(() => svnLogStatsOf(entries, { caseInsensitive: ci }), [entries, ci])
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 日志统计', height: 600,
     dialogClass: 'edrv-svnlog-stats',
-    width: 'min(680px, calc(100vw - 40px))',
-    zIndex: 192,
-    closeOnEsc: false,
+    width: 680,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svnlog-stats-head' },

package/src/client/ui/SvnPatchDialog.ts

@@ -9,7 +9,7 @@
  * 作者 ddj 2026年09月20号
  */
 import React from 'react'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { downloadText } from './svnExport.js'
 
 /**
@@ -40,10 +40,11 @@ export function SvnPatchDialog(props) {
     onNote?.(done ? '已保存 ' + fileName : '保存失败：浏览器下载能力不可用')
   }
 
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 补丁预览', height: 560,
     key: 'edrv-svn-patch',
     dialogClass: 'edrv-svn-patch-dialog',
-    width: 'min(760px, calc(100vw - 48px))',
+    width: 760,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svn-patch-head' },

package/src/client/ui/SvnSumDialog.ts

@@ -9,7 +9,7 @@
  */
 import React from 'react'
 import { SVN_SUM_LETTER } from '../../shared/svn.js'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { svnDiffSum } from '../svnStatus.js'
 
 /**
@@ -53,10 +53,11 @@ export function SvnSumDialog(props) {
       (entry.kind === 'dir' ? React.createElement('span', { className: 'edrv-svnlog-path-kind' }, '目录') : null)))
   }
 
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 目录对比', height: 560,
     key: 'edrv-svn-sum',
     dialogClass: 'edrv-svn-sum-dialog',
-    width: 'min(680px, calc(100vw - 48px))',
+    width: 680,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svn-patch-head' },

package/src/client/ui/SvnUpdateDialog.ts

@@ -9,7 +9,7 @@ import { rpc } from '../rpc.js'
 import { absoluteOf } from '../tabActions.js'
 import { ContextMenu } from './ContextMenu.js'
 import type { ContextMenuEntry } from './ContextMenu.js'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { nextConflict, nextUpdateSort, rowConflict, sortUpdateRows, updateActs, updateCloseMode, updateDone, updateLocked, updateParent, updateRange, updateReady, updateType } from './svnUpdateModel.js'
 import type { UpdateColumn, UpdateSort } from './svnUpdateModel.js'
 
@@ -564,10 +564,9 @@ export function SvnUpdateDialog(props: UpdateProps): React.ReactElement {
   const phase = pendingRows && processFinished ? '正在加载更新明细…'
     : state?.phase === 'completed' ? '更新完成' : state?.phase === 'failed' ? '更新失败'
     : state?.phase === 'cancelled' ? '更新已停止' : state?.phase === 'cancelling' ? '正在停止…' : '正在更新…'
-  return React.createElement(ModalShell, {
-    dialogClass: 'edrv-update-dialog', width: 'min(1320px, calc(100vw - 48px))',
-    cardStyle: { height: 'min(680px, calc(100vh - 48px))', boxSizing: 'border-box', maxHeight: 'none' },
-    closeOnEsc: closeMode.passive, closeOnMask: closeMode.passive, onClose: dismiss,
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 更新', dialogClass: 'edrv-update-dialog', width: 1320, height: 680,
+    closeOnEsc: closeMode.passive, onClose: dismiss,
   },
     updateHead(props, state, phase, closable, dismiss),
     updateTable(props, displayRows, view, selection, finished, sort, onSort, evidence.states),

package/src/rpc.ts

@@ -1034,6 +1034,7 @@ export function buildHandlers(
           maxResults: args.maxResults,
           include: args.include,
           exclude: args.exclude,
+          force: args.force,
         })
         return { ok: true, ...result }
       } catch (error) {

package/src/search/content.ts

@@ -45,6 +45,8 @@ export interface ContentSearchRequest {
   include?: string[]
   /** 排除 glob（这些文件不参与搜索）。 */
   exclude?: string[]
+  /** 强制绕过短期缓存：文件变更后的重搜必须看到最新磁盘内容，每次都跑真实 rg。 */
+  force?: boolean
 }
 
 type ContentSearchResponse = { matches: ContentMatch[]; truncated: boolean; warning?: string }
@@ -257,7 +259,8 @@ export class ContentSearcher {
     const includeKey = (request.include ?? []).join(',')
     const excludeKey = (request.exclude ?? []).join(',')
     const key = [rootKey, query, request.matchCase ? 'mc' : '', request.wholeWord ? 'ww' : '', request.regex ? 'rx' : '', includeKey, excludeKey, PROVIDER_VERSION].join('|')
-    const cached = this.cache.get(key)
+    // force（文件变更后的重搜）必须看到最新磁盘内容：跳过缓存读，见下方跳过缓存写。
+    const cached = request.force ? undefined : this.cache.get(key)
     if (cached) return { matches: cached.matches, truncated: cached.truncated, warning: cached.warning }
     this.inflight.get(root)?.abort()
     const controller = new AbortController()
@@ -278,7 +281,8 @@ export class ContentSearcher {
         root,
       })
       if (controller.signal.aborted) return { matches: [], truncated: false }
-      this.cache.set(key, result)
+      // force 结果不回填缓存：本次是「读最新」，不代表该键的稳定内容。
+      if (!request.force) this.cache.set(key, result)
       return { matches: result.matches, truncated: result.truncated, warning: result.warning }
     } catch (error) {
       if (controller.signal.aborted) return { matches: [], truncated: false }

package/src/shared/rpc.ts

@@ -377,7 +377,7 @@ export interface RpcRequestMap {
   'edrv.dlog.clear': { sessionId?: string; file?: string }
   'edrv.dlog.reveal': { sessionId?: string }
   'edrv.searchFiles': { sessionId?: string; query: string }
-  'edrv.searchContent': { sessionId?: string; query: string; matchCase?: boolean; wholeWord?: boolean; regex?: boolean; maxResults?: number; include?: string[]; exclude?: string[] }
+  'edrv.searchContent': { sessionId?: string; query: string; matchCase?: boolean; wholeWord?: boolean; regex?: boolean; maxResults?: number; include?: string[]; exclude?: string[]; force?: boolean }
   'edrv.listDir': { sessionId?: string; path: string; force?: boolean }
   'edrv.revealInExplorer': { sessionId?: string; path: string }
   'edrv.fsCreateFile': { sessionId?: string; path: string }