dsh-vscode-mode 0.14.11 → 0.14.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.11",
+  "version": "0.14.13",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/sidebar/panels/FileExplorer.ts

@@ -24,6 +24,7 @@ import { Button } from '@deepseek-ai/dsh-client-ui-primitives'
 import { emitRefresh } from '../../events.js'
 import { svnOverlayEl, viewOverlayOf } from '../../ui/SvnOverlay.js'
 import { useExplorerSvn } from './useExplorerSvn.js'
+import { useExplorerReveal, treeRevealPath } from './useExplorerReveal.js'
 import type { SidebarCtx } from '../types.js'
 
 const DIR_CAP = 4000
@@ -31,10 +32,6 @@ const SAVE_DEBOUNCE_MS = 300
 const FOLLOW_INTERVAL_MS = 10_000
 const PREFETCH_MAX = 4
 const PREFETCH_EXCLUDED = new Set(['node_modules', '.git', '.hg', '.svn', '.pnpm', '.pnpm-store'])
-/** 「在资源管理器视图中显示」高亮时长与定位重试上限（目录懒加载需等待行渲染）。 */
-const REVEAL_HIGHLIGHT_MS = 2000
-const REVEAL_RETRY_MAX = 6
-const REVEAL_RETRY_MS = 120
 /** 外部文件变化重列去抖：一轮外部批量写入（如 agent 连写多文件）合并为一次重列。 */
 const FILE_CHANGE_DEBOUNCE_MS = 400
 
@@ -97,16 +94,6 @@ function rowView(props) {
 }
 const ExplorerRow = React.memo(rowView)
 
-/**
- * 转义 CSS 属性选择器的值（路径含引号/反斜杠时避免选择器语法错误）。
- * @author ddj 2026年09月11号
- * @param value 原始值
- * @returns 可安全嵌入 `[attr="…"]` 的字符串
- */
-function cssEscape(value) {
-  return String(value ?? '').replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-}
-
 /**
  * 目录树面板主体（SWR：有缓存先渲染，无缓存才显示加载态；加载总在后台）。
  * @param props.ctx 面板共享上下文（sessionId/openFile/activePath/pendingByPath/fileMenuItems/notify）
@@ -127,7 +114,6 @@ export function FileExplorer(props) {
   const [loading, setLoading] = React.useState({})
   const [errors, setErrors] = React.useState({}) // rel → 错误文案（仅无任何数据时展示）
   const [menu, setMenu] = React.useState(null) // 右键菜单 { x, y, target }
-  const [revealPath, setRevealPath] = React.useState(null) // 高亮的相对路径（「在资源管理器视图中显示」）
   // 各状态 ref 镜像：定时器/监听用最新闭包
   const tokensRef = React.useRef({})
   const expandedRef = React.useRef({})
@@ -139,9 +125,6 @@ export function FileExplorer(props) {
   const saveTimerRef = React.useRef(null)
   const loadDirRef = React.useRef(null)
   const refreshRef = React.useRef(null)
-  const revealTimerRef = React.useRef(null) // 高亮清除计时器
-  const revealTryRef = React.useRef(0) // 当前定位的重试计数（行渲染需等目录加载）
-  const revealInTreeRef = React.useRef(null) // 定位动作最新闭包（窗口监听读取）
   const treeRef = React.useRef(null) // 目录树容器（定位时按 data-edrv-path 查行）
   const reloadDirRef = React.useRef(null) // loadDir 最新闭包（文件变化监听读取，防陈旧闭包）
   const changedTimerRef = React.useRef(null) // 文件变化合并去抖计时器
@@ -172,8 +155,10 @@ export function FileExplorer(props) {
     const force = opts?.force === true
     const doPrefetch = opts?.prefetch === true
     if (!force && loadingRef.current[rel]) return
-    const token = (tokensRef.current[rel] || 0) + 1
-    tokensRef.current[rel] = token
+    const tokens = tokensRef.current
+    const token = (tokens[rel] || 0) + 1
+    tokens[rel] = token
+    loadingRef.current = Object.assign({}, loadingRef.current, { [rel]: true })
     setLoading((prev) => Object.assign({}, prev, { [rel]: true }))
     setErrors((prev) => {
       const next = Object.assign({}, prev)
@@ -183,7 +168,7 @@ export function FileExplorer(props) {
     const args = { sessionId, path: rel }
     if (force) args.force = true
     rpc('edrv.listDir', args).then((res) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (res && res.ok && Array.isArray(res.entries)) {
         setDirs((prev) => Object.assign({}, prev, { [rel]: res.entries }))
         if (res.root) setRoot((prev) => prev || res.root)
@@ -196,12 +181,12 @@ export function FileExplorer(props) {
         }
       }
     }).catch((e) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (!entriesOf(rel)) {
         setErrors((prev) => Object.assign({}, prev, { [rel]: '读取目录异常:' + String(e) }))
       }
     }).finally(() => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       setLoading((prev) => {
         const next = Object.assign({}, prev)
         delete next[rel]
@@ -220,55 +205,28 @@ export function FileExplorer(props) {
     void loadDir(rel, { prefetch: true })
   }
 
-  /**
-   * 尝试把目标行滚入可见并高亮；行尚未渲染（祖先目录仍在加载）时按上限重试。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const tryReveal = (path) => {
-    const host = treeRef.current
-    const row = host?.querySelector?.('[data-edrv-path="' + cssEscape(path) + '"]')
-    if (!row) {
-      revealTryRef.current += 1
-      if (revealTryRef.current < REVEAL_RETRY_MAX) {
-        window.setTimeout(() => tryReveal(path), REVEAL_RETRY_MS)
-      }
-      return
-    }
-    row.scrollIntoView?.({ block: 'center' })
-    setRevealPath(path)
-    if (revealTimerRef.current) clearTimeout(revealTimerRef.current)
-    revealTimerRef.current = window.setTimeout(() => {
-      revealTimerRef.current = null
-      setRevealPath(null)
-    }, REVEAL_HIGHLIGHT_MS)
-  }
-
-  /**
-   * 在资源管理器视图中显示：展开全部祖先目录并定位高亮目标文件。
-   * 目录条目懒加载，故先展开祖先并触发加载，再由 tryReveal 轮询等行渲染。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const revealInTree = (path) => {
-    if (!path) return
+  /** @private @author ddj 2026年10月14号 @param path Safe relative file path. Expands only the ancestor chain and reuses available directory entries. */
+  function prepareReveal(path) {
     const ancestors = ancestorDirsOf(path)
-    revealTryRef.current = 0
-    setExpanded((prev) => {
+    setExpanded(expandParents)
+    for (const dir of ['', ...ancestors]) {
+      if (entriesOf(dir)) continue
+      void loadDir(dir, { prefetch: false })
+    }
+    /** @private @author ddj 2026年10月14号 @param prev Current expansion map. @returns Expanded ancestor map. */
+    function expandParents(prev) {
       const next = Object.assign({}, prev)
       for (const dir of ancestors) next[dir] = true
       return next
-    })
-    for (const dir of ancestors) void loadDir(dir, { prefetch: false })
-    tryReveal(path)
+    }
   }
-  revealInTreeRef.current = revealInTree
 
   const refresh = (event) => {
     if (event?.detail?.scope && event.detail.scope !== scope) return
     if (event?.detail?.paths?.length) { for (const path of event.detail.paths) onFileChanged(path); return }
     const keep = Object.keys(expandedRef.current).filter((k) => expandedRef.current[k] === true)
     tokensRef.current = {}
+    loadingRef.current = {}
     setMenu(null)
     setErrors({})
     // SWR：保留旧条目不清空，后台强制重列（force 跳过索引）
@@ -334,13 +292,13 @@ export function FileExplorer(props) {
 
   React.useEffect(() => {
     tokensRef.current = {}
+    loadingRef.current = {}
     setDirs({})
     setExpanded({})
     setLoading({})
     setErrors({})
     setMenu(null)
     setRoot(null)
-    setRevealPath(null)
     // 恢复上次展开状态（对齐 VSCode：持久化展开路径，条目缓存即时渲染、后台刷新）
     const cached = scope ? explorerLoad(scope) : null
     const restored = cached?.expanded ?? []
@@ -379,19 +337,9 @@ export function FileExplorer(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  // 在资源管理器视图中显示（页签右键菜单）：展开祖先目录并定位高亮
-  React.useEffect(() => {
-    const onReveal = (event) => {
-      const path = event?.detail?.path
-      if (typeof path === 'string' && path) revealInTreeRef.current?.(path)
-    }
-    window.addEventListener('edrv:reveal-path', onReveal)
-    return () => {
-      window.removeEventListener('edrv:reveal-path', onReveal)
-      if (revealTimerRef.current) { clearTimeout(revealTimerRef.current); revealTimerRef.current = null }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  // 在恢复工作区展开状态之后跟随活动文件；隐藏期间目标由编辑器保留，重新挂载时兑现。
+  const { revealPath } = useExplorerReveal({ scope, activePath, treeRef, prepare: prepareReveal })
+  const activeTreePath = treeRevealPath(activePath)
 
   // 10s 轻量跟随：已展开目录后台刷新（命中 host 索引，近零成本），树跟随 agent 写入
   React.useEffect(() => {
@@ -446,7 +394,7 @@ export function FileExplorer(props) {
     if (!row.e) return React.createElement('div', { key: row.key, className: 'edrv-tree-loading', style: { paddingLeft: 6 + row.depth * 14 } }, row.text)
     const { e, depth, isDir, isOpen } = row
     return React.createElement(ExplorerRow, { key: e.path, path: e.path, name: e.name, type: e.type, depth, isDir, isOpen,
-      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activePath,
+      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activeTreePath,
       context: Boolean(menu && menuEntries.length && menu.target.path === e.path), reveal: revealPath === e.path,
       mark: svn.local?.get(e.path), remote: svn.remote?.get(e.path) ?? 0, onSelect, onContext })
   }

package/src/client/sidebar/panels/SearchPanel.ts

@@ -98,6 +98,7 @@ export function SearchPanel(props) {
   const seqRef = React.useRef(0)
   const timerRef = React.useRef(null)
   const inputRef = React.useRef(null)
+  const [focusTick, setFocusTick] = React.useState(0)
   const queryRef = React.useRef('')
   queryRef.current = query
   const activePathRef = React.useRef(activePath)
@@ -261,7 +262,6 @@ export function SearchPanel(props) {
     queryRef.current = seed
     setQuery(seed)
     runSearch(seed)
-    inputRef.current?.select?.()
     return true
   }
 
@@ -289,19 +289,27 @@ export function SearchPanel(props) {
   // 事件无人接收，故必须由挂载路径兜底。
   // ⚠️ 声明在「按作用域恢复」effect 之后：React 按声明序执行 effect，恢复值先落地，
   // 种子再覆盖，避免被记忆的旧查询词盖掉用户刚选中的内容。
-  React.useEffect(() => { applyScopeSeed(); applySeed() }, [])
+  React.useEffect(() => { applyScopeSeed(); applySeed(); setFocusTick((tick) => tick + 1) }, [])
 
-  // Ctrl+Shift+F / 「在文件夹中查找…」重复触发：消费种子（有则填入）并聚焦输入框（EditorView 派发 edrv:search-focus）
+  // Ctrl+Shift+F / 「在文件夹中查找…」：先提交恢复值/种子，再全选新内容。
   React.useEffect(() => {
+    /** @private @author ddj 2026年10月14号 @description 消费种子并请求提交后聚焦全选；不额外发起搜索。 */
     const onFocus = () => {
       applyScopeSeed()
       applySeed()
-      inputRef.current?.focus?.()
+      setFocusTick((tick) => tick + 1)
     }
     window.addEventListener('edrv:search-focus', onFocus)
     return () => window.removeEventListener('edrv:search-focus', onFocus)
   }, [])
 
+  // 一次意图对应一次提交后选区；无需定时回调，卸载后不会抢焦点。
+  React.useLayoutEffect(() => {
+    if (!focusTick) return
+    inputRef.current?.focus?.()
+    inputRef.current?.select?.()
+  }, [focusTick])
+
   // 结果按文件分组（保持 rg 输出顺序）
   const groups = React.useMemo(() => {
     if (!Array.isArray(matches)) return []

package/src/client/sidebar/panels/useExplorerReveal.ts

@@ -0,0 +1,109 @@
+import React from 'react'
+import { isTreeRevealable } from '../../tabActions.js'
+
+/** @private @author ddj 2026年10月14号 @param path Editor path. @returns Safe normalized tree path, or null. */
+export function treeRevealPath(path: string | null): string | null {
+  if (!path || !isTreeRevealable(path)) return null
+  return path.replace(/\\/g, '/').replace(/^\.\//, '')
+}
+
+/** @private @author ddj 2026年10月14号 @param host Tree scroll container. @param path Exact row path. @returns Whether a visible row was located. Only scrolls the tree. */
+export function revealTreeRow(host: HTMLElement | null, path: string): boolean {
+  if (!host || host.clientHeight <= 0) return false
+  const escaped = path.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  const row = host.querySelector<HTMLElement>('[data-edrv-path="' + escaped + '"]')
+  if (!row) return false
+  const viewport = host.getBoundingClientRect()
+  const bounds = row.getBoundingClientRect()
+  const top = viewport.top + host.clientTop
+  if (bounds.top < top || bounds.bottom > top + host.clientHeight) {
+    host.scrollTop += bounds.top - top - (host.clientHeight - bounds.height) / 2
+  }
+  return true
+}
+
+interface RevealOptions {
+  scope: string
+  activePath: string | null
+  treeRef: React.RefObject<HTMLElement>
+  prepare: (path: string) => void
+}
+interface RevealTarget {
+  scope: string
+  path: string
+  active: string | null
+}
+
+/** @private @author ddj 2026年10月14号 @param options Current workspace, active editor and tree preparation. @returns Highlight and manual request callback. Waits for committed rows without polling; unmount cancels highlight cleanup. */
+export function useExplorerReveal(options: RevealOptions) {
+  const { scope, activePath, treeRef } = options
+  const [target, setTarget] = React.useState<RevealTarget | null>(null)
+  const [revealPath, setRevealPath] = React.useState<string | null>(null)
+  const pending = React.useRef<RevealTarget | null>(null)
+  const timer = React.useRef<ReturnType<typeof setTimeout> | null>(null)
+  const latest = React.useRef(options)
+  latest.current = options
+
+  /** @private @author ddj 2026年10月14号 Clears only this hook's highlight timer. */
+  function clearHighlight(): void {
+    if (timer.current !== null) clearTimeout(timer.current)
+    timer.current = null
+  }
+  /** @private @author ddj 2026年10月14号 @param path Requested tree path. Expands ancestors and replaces any previous pending target. */
+  function requestReveal(path: string | null): void {
+    clearHighlight()
+    setRevealPath(null)
+    const normalized = treeRevealPath(path)
+    const current = latest.current
+    const next = normalized ? { scope: current.scope, path: normalized, active: current.activePath } : null
+    pending.current = next
+    setTarget(next)
+    if (next) current.prepare(next.path)
+  }
+  /** @private @author ddj 2026年10月14号 Attempts the latest target after row commit or container resize. Consumes only a successful, current request. */
+  function tryReveal(): void {
+    const next = pending.current
+    const current = latest.current
+    if (!next || next.scope !== current.scope || next.active !== current.activePath) return
+    if (!revealTreeRow(current.treeRef.current, next.path)) return
+    pending.current = null
+    setRevealPath(next.path)
+    clearHighlight()
+    timer.current = setTimeout(endHighlight, 2000)
+  }
+  /** @private @author ddj 2026年10月14号 Ends transient reveal styling without changing the active editor row. */
+  function endHighlight(): void {
+    timer.current = null
+    setRevealPath(null)
+  }
+
+  /** @private @author ddj 2026年10月14号 Establishes the latest editor target after workspace tree restoration. */
+  function followActive(): void { requestReveal(activePath) }
+  React.useEffect(followActive, [scope, activePath])
+  React.useLayoutEffect(tryReveal)
+
+  /** @private @author ddj 2026年10月14号 @returns Cleanup for manual events, resize observation and highlight timer. */
+  function listenReveal(): () => void {
+    /** @private @author ddj 2026年10月14号 @param event Existing explicit reveal request. */
+    function onReveal(event: Event): void {
+      const detail = (event as CustomEvent<{ path?: string; scope?: string }>).detail
+      if (detail?.scope && detail.scope !== latest.current.scope) return
+      if (typeof detail?.path === 'string') requestReveal(detail.path)
+    }
+    const observer = typeof ResizeObserver === 'function' ? new ResizeObserver(tryReveal) : null
+    if (treeRef.current) observer?.observe(treeRef.current)
+    window.addEventListener('edrv:reveal-path', onReveal)
+    /** @private @author ddj 2026年10月14号 Cancels callbacks owned by this mounted tree. */
+    function cleanup(): void {
+      observer?.disconnect()
+      window.removeEventListener('edrv:reveal-path', onReveal)
+      pending.current = null
+      clearHighlight()
+    }
+    return cleanup
+  }
+  React.useEffect(listenReveal, [treeRef])
+  // Keep the request state as a render trigger when an already-open tree is revealed manually.
+  void target
+  return { revealPath, requestReveal }
+}

package/src/search/fallback.ts

@@ -5,9 +5,8 @@
  */
 import type { Ctx, Session } from '../store.js'
 import { policyOf } from '../store.js'
-import { pathText, pathMatch } from './query.js'
-import { searchRoot } from './ripgrep.js'
-import type { WorkspaceSearchInput, WorkspaceSearchProvider, WorkspaceSearchResult } from './types.js'
+import { pathText, pathMatch, prepareQuery } from './query.js'
+import type { PreparedQuery, WorkspaceSearchInput, WorkspaceSearchProvider, WorkspaceSearchResult } from './types.js'
 
 interface FsTarget { displayPath?: string }
 interface FsEntry { name: string; type: 'file' | 'directory' | 'other'; target: FsTarget }
@@ -21,27 +20,31 @@ const EXCLUDED = new Set(['node_modules', '.git', '.tmp', '.cache', 'dist', 'bui
 
 /**
  * 在一个目录树中递归查找匹配文件。
- * @author ddj 2026年08月24号
+ * @private
+ * @author ddj 2026年10月14号
  * @param fs 文件系统能力
  * @param target 当前目录目标
  * @param input 搜索输入
  * @param files 已保留候选
  * @param signal 取消信号
+ * @param query 已规范化查询
+ * @param prefix 当前目录相对于搜索根的路径
  * @returns 是否因达到上限而截断
  */
-async function walk(fs: SearchFs, target: FsTarget, input: WorkspaceSearchInput, files: string[], signal: AbortSignal): Promise<boolean> {
+async function walk(fs: SearchFs, target: FsTarget, input: WorkspaceSearchInput, files: string[], signal: AbortSignal, query: PreparedQuery, prefix = ''): Promise<boolean> {
   if (signal.aborted) throw new DOMException('搜索已取消', 'AbortError')
   const entries = await fs.listDir(target, signal)
   for (const entry of entries) {
     if (signal.aborted) throw new DOMException('搜索已取消', 'AbortError')
+    const relative = prefix + entry.name
     if (entry.type === 'directory') {
       if (EXCLUDED.has(entry.name)) continue
-      if (await walk(fs, entry.target, input, files, signal)) return true
+      if (await walk(fs, entry.target, input, files, signal, query, relative + '/')) return true
       continue
     }
     if (entry.type !== 'file') continue
-    const path = pathText(entry.target.displayPath ?? entry.name)
-    if (!pathMatch(path, { raw: input.query, text: pathText(input.query).toLocaleLowerCase('en-US') })) continue
+    const path = pathText(entry.target.displayPath ?? relative)
+    if (!pathMatch(relative, query)) continue
     files.push(path)
     if (files.length >= Math.min(input.maxResults, RESULT_CAP)) return true
   }
@@ -62,7 +65,7 @@ export async function searchFallback(input: WorkspaceSearchInput): Promise<Works
   const rootTarget = await fs.resolve(policy?.workspaceRoot ?? '.', cwd ? { cwd, signal: input.signal } : { signal: input.signal })
   const signal = input.signal ?? new AbortController().signal
   const files: string[] = []
-  const truncated = await walk(fs, rootTarget, input, files, signal)
+  const truncated = await walk(fs, rootTarget, input, files, signal, prepareQuery(input.query))
   return { files, truncated, complete: !truncated, source: 'fallback' }
 }
 

package/src/search/orchestrator.ts

@@ -15,7 +15,7 @@ import type { CandidateRanker, SearchCandidate, WorkspaceSearchProvider, Workspa
 const CACHE_TTL = 60_000
 const CACHE_LIMIT = 100
 const RESULT_LIMIT = 50
-const PROVIDER_VERSION = 'ripgrep-v1'
+const PROVIDER_VERSION = 'ripgrep-fuzzy-v2'
 const POLICY_VERSION = 'search-policy-v1'
 
 type CacheEntry<T> = { at: number; result: T }

package/src/search/query.ts

@@ -1,6 +1,6 @@
 /**
  * dsh-vscode-mode host — 搜索 query 与路径规范化。
- * 查询只按字面连续片段比较，不解释为正则或 shell 语句。
+ * 文件名支持有序子序列；带目录的查询保持连续片段，不解释为正则或 shell 语句。
  * 作者 ddj 2026年08月24号
  */
 import { isAbsolute, resolve } from 'node:path'
@@ -51,12 +51,36 @@ export function displayPath(value: string, root: string): string {
 }
 
 /**
- * 判断路径是否包含连续 query。
- * @author ddj 2026年08月24号
- * @param value 文件路径
+ * @public
+ * @author ddj 2026年10月14号
+ * @description 按顺序匹配不连续字符；每个位置最多消费一次。
+ * @param value 已归一化候选文本
+ * @param text 已归一化查询文本
+ * @returns 是否完整匹配所有查询字符
+ */
+export function subsequence(value: string, text: string): boolean {
+  let offset = 0
+  for (const char of text) {
+    const index = value.indexOf(char, offset)
+    if (index < 0) return false
+    offset = index + char.length
+  }
+  return true
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月14号
+ * @description 连续匹配相对路径，或对无目录查询模糊匹配文件名。
+ * @param value 文件路径（调用方移除工作区根前缀）
  * @param query 已规范化 query
- * @returns 是否命中
+ * @returns 是否命中；空查询不命中
  */
 export function pathMatch(value: string, query: PreparedQuery): boolean {
-  return pathText(value).toLocaleLowerCase('en-US').includes(query.text)
+  if (!query.text) return false
+  const path = pathText(value).toLocaleLowerCase('en-US')
+  if (path.includes(query.text)) return true
+  if (query.text.includes('/')) return false
+  const basename = path.slice(path.lastIndexOf('/') + 1)
+  return subsequence(basename, query.text)
 }

package/src/search/ranker.ts

@@ -1,6 +1,6 @@
 /**
- * dsh-vscode-mode host — 可替换的连续匹配排序器。
- * 第一版保持 basename 优先和稳定路径序，后续可接 fuzzy scorer。
+ * dsh-vscode-mode host — 文件名优先的连续/模糊匹配排序器。
+ * 每个候选仅计算一次匹配等级与模糊代价，平分按稳定路径序。
  * 作者 ddj 2026年08月24号
  */
 import type { CandidateRanker, PreparedQuery, SearchCandidate } from './types.js'
@@ -20,22 +20,61 @@ export function candidateOf(path: string, source: SearchCandidate['source']): Se
 }
 
 /**
- * 对连续匹配候选进行排序。
- * @author ddj 2026年08月24号
+ * @private
+ * @author ddj 2026年10月14号
+ * @description 贪心匹配文件名，优先词/驼峰边界，其次紧凑程度；不枚举组合。
+ * @param name 原始大小写文件名
+ * @param text 已规范化查询
+ * @returns 边界漏命中数与跨度代价；无匹配返回 null
+ */
+function fuzzyCost(name: string, text: string): number[] | null {
+  const base = name.toLocaleLowerCase('en-US')
+  let offset = 0
+  let first = -1
+  let misses = 0
+  for (const char of text) {
+    const index = base.indexOf(char, offset)
+    if (index < 0) return null
+    if (first < 0) first = index
+    const boundary = index === 0 || /[\s_.\-]/.test(name[index - 1]) || /[a-z0-9]/.test(name[index - 1]) && /[A-Z]/.test(name[index])
+    if (!boundary) misses++
+    offset = index + char.length
+  }
+  return [misses, offset - first - text.length]
+}
+
+/**
+ * @private
+ * @author ddj 2026年10月14号
+ * @description 计算完全/前缀/连续/模糊/路径命中的排序等级。
+ * @param candidate 文件候选
+ * @param text 已规范化查询
+ * @returns 等级、边界与跨度代价
+ */
+function rankKey(candidate: SearchCandidate, text: string): number[] {
+  const base = candidate.basename.toLocaleLowerCase('en-US')
+  if (base === text) return [0, 0, 0]
+  if (base.startsWith(text)) return [1, 0, 0]
+  if (base.includes(text)) return [2, 0, 0]
+  const cost = text.includes('/') ? null : fuzzyCost(candidate.basename, text)
+  if (cost) return [3, ...cost]
+  return [candidate.normalizedPath.includes(text) ? 4 : 5, 0, 0]
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月14号
+ * @description 每个候选只评分一次，排序不修改调用方数组。
  * @param candidates 候选列表
  * @param query 已规范化 query
  * @returns 排序后的候选
  */
 export function rankCandidates(candidates: SearchCandidate[], query: PreparedQuery): SearchCandidate[] {
-  const text = query.text
-  const score = (candidate: SearchCandidate): number => {
-    const base = candidate.basename.toLocaleLowerCase('en-US')
-    if (base.startsWith(text)) return 0
-    if (base.includes(text)) return 1
-    if (candidate.normalizedPath.includes(text)) return 2
-    return 3
-  }
-  return [...candidates].sort((left, right) => score(left) - score(right) || left.normalizedPath.localeCompare(right.normalizedPath, 'en-US'))
+  const ranked = candidates.map((candidate) => ({ candidate, key: rankKey(candidate, query.text) }))
+  ranked.sort((left, right) => left.key[0] - right.key[0] || left.key[1] - right.key[1] || left.key[2] - right.key[2]
+    || left.candidate.normalizedPath.localeCompare(right.candidate.normalizedPath, 'en-US')
+    || left.candidate.path.localeCompare(right.candidate.path, 'en-US'))
+  return ranked.map((item) => item.candidate)
 }
 
 /**

package/src/search/ripgrep.ts

@@ -70,19 +70,34 @@ interface SearchSubprocess {
  * @returns 安全 glob
  */
 export function queryGlob(query: string): string {
+  return '**/*' + Array.from(pathText(query), globChar).join('') + '*'
+}
+
+/**
+ * @private
+ * @author ddj 2026年10月14号
+ * @description 将字面字符转为安全且大小写不敏感的 glob 片段。
+ * @param char 单个 Unicode 字符
+ * @returns 转义字符或大小写字符类
+ */
+function globChar(char: string): string {
+  const lower = char.toLowerCase()
+  const upper = char.toUpperCase()
+  if (lower !== upper && lower.length === 1 && upper.length === 1) return '[' + lower + upper + ']'
+  return /[\*?\[\]{}!]/.test(char) ? '\\' + char : char
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月14号
+ * @description 构造仅匹配文件名的有序子序列 glob，不让星号跨目录。
+ * @param query 无目录的字面查询文本
+ * @returns 模糊 glob；空查询或带目录时返回 null
+ */
+export function fuzzyGlob(query: string): string | null {
   const value = pathText(query)
-  let body = ''
-  for (const char of value) {
-    const lower = char.toLowerCase()
-    const upper = char.toUpperCase()
-    // 有大小写之分的字符（单字符映射，避开 ß→SS 这类长度变化）→ 字符类
-    if (lower !== upper && lower.length === 1 && upper.length === 1) {
-      body += '[' + lower + upper + ']'
-      continue
-    }
-    body += /[\*?\[\]{}!]/.test(char) ? '\\' + char : char
-  }
-  return '**/*' + body + '*'
+  if (!value || value.includes('/')) return null
+  return '**/*' + Array.from(value, globChar).join('*') + '*'
 }
 
 /**
@@ -193,6 +208,8 @@ export function rgExitFailure(code: number | null | undefined, stderrText: strin
  */
 export function filesArgv(binary: string, root: string, query: string): string[] {
   const argv = [binary, '--no-config', '--files', '--hidden', '--no-ignore', '--glob', queryGlob(query)]
+  const fuzzy = fuzzyGlob(query)
+  if (fuzzy) argv.push('--glob', fuzzy)
   for (const excluded of EXCLUDES) argv.push('--glob', '!**/' + excluded + '/**')
   for (const excluded of FILE_EXCLUDES) argv.push('--glob', '!' + excluded)
   argv.push('--', root)