dsh-vscode-mode 0.1.27 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 dsh-better-sidebar 侧边栏与对话同屏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚），状态持久化到工作区旁车",
   "keywords": [
     "dsh",

package/src/client/compat.ts

@@ -11,7 +11,7 @@ export const SIDEBAR_PLUGIN = 'dsh-better-sidebar'
 
 /** 设置 scope 的跨组件上下文形状（与官方 settingsScope 绑定的最小面）。 */
 export interface SettingsScopeLike {
-  getSnapshot: () => { status?: string; value?: { fileOpenTool?: unknown }; writable?: boolean }
+  getSnapshot: () => { status?: string; value?: { fileOpenTool?: unknown; keybindings?: Record<string, string> }; writable?: boolean }
   subscribe: (listener: () => void) => () => void
   set: (field: string, value: unknown) => Promise<void>
 }
@@ -54,17 +54,20 @@ export interface SlotSpec {
  * @param ctx 客户端上下文（slots 服务）
  * @param spec slot 描述
  * @param render 渲染函数
+ * @returns 注销函数（未注册返回 null；形态切换时用于卸载旧 slot）
  */
-export function registerSlotSafely(ctx: { slots?: { inject?: (name: string, register: () => unknown) => unknown; register?: (...args: unknown[]) => unknown } }, spec: SlotSpec, render: (props: unknown) => unknown): void {
+export function registerSlotSafely(ctx: { slots?: { inject?: (name: string, register: () => unknown) => unknown; register?: (...args: unknown[]) => unknown } }, spec: SlotSpec, render: (props: unknown) => unknown): (() => void) | null {
   const slots = ctx?.slots as { inject: (name: string, register: () => unknown) => unknown; register: (...args: unknown[]) => unknown } | undefined
   if (!slots || typeof slots.inject !== 'function' || typeof slots.register !== 'function') {
     console.warn('[' + PLUGIN_NAME + '] slots 服务不可用，跳过 slot ' + spec.name)
-    return
+    return null
   }
   try {
-    slots.inject(spec.name, () => slots.register(spec, render))
+    const disposer = slots.inject(spec.name, () => slots.register(spec, render))
+    return typeof disposer === 'function' ? disposer as () => void : null
   } catch (error) {
     console.warn('[' + PLUGIN_NAME + '] slot ' + spec.name + ' 注册失败（' + String(error) + '），已跳过')
+    return null
   }
 }
 

package/src/client/index.ts

@@ -31,10 +31,12 @@ import { SideEditorTab } from './ui/SideEditorTab.js'
 import { createAddToConversation } from './addToConversation.js'
 import { createSidebarPanelRegistry } from './sidebar/registry.js'
 import { createFilePanel } from './sidebar/panels/index.js'
+import { createSearchPanel } from './sidebar/panels/index.js'
 import { createTreeMenuRegistry } from './sidebar/contextMenu.js'
 import { createDefaultFileMenuItems } from './sidebar/menuItems.js'
 import { createOutlinePanel } from './outline/index.js'
 import { createOutlineSourceRegistry, registerBuiltinOutlineSources } from './outline/sources.js'
+import { keybindingsApply } from './keybindings.js'
 import type { CompatAdapter } from '../shared/compat.js'
 
 // ⚠️ inject 只列必需服务：webUiSettings 是 @linxin666/dsh-client-ui-web-ui-settings 提供的
@@ -79,7 +81,7 @@ export function apply(ctx: any): void {
   const settings = binder.scope
   let selected = autoValue('auto')
   /** 可选探测 betterSidebar 服务（不进 inject：缺失会让插件停靠等待，杀死回退路径）。 */
-  const sideService = detectSidebarService(ctx)
+  let sideService = detectSidebarService(ctx)
   /** 「添加到对话」动作集：编辑区/Tab 右键菜单注入文件引用与代码块（conversation 服务缺失时各动作安全降级）。 */
   const addToConversation = createAddToConversation(ctx)
 
@@ -98,6 +100,8 @@ export function apply(ctx: any): void {
   const sidebarPanels = createSidebarPanelRegistry()
   ctx.provide('edrvSidebarPanels', sidebarPanels)
   ctx.effect(() => sidebarPanels.register(createFilePanel()), 'vscode-mode: sidebar panel')
+  // 搜索面板：活动栏「搜索」页签（Ctrl+Shift+F 唤起，VSCode 搜索视图形态）
+  ctx.effect(() => sidebarPanels.register(createSearchPanel()), 'vscode-mode: sidebar panel search')
   // 文件右键菜单项注册表（对外 provide，供本插件/第三方注册；内置「在文件浏览器中打开」）
   const fileMenuItems = createTreeMenuRegistry()
   ctx.provide('edrvFileContextMenuItems', fileMenuItems)
@@ -128,6 +132,17 @@ export function apply(ctx: any): void {
     sync()
     return settings.subscribe(sync)
   }, 'vscode-mode: file opener setting sync')
+  // 快捷键配置同步：设置提交后立即刷新键位匹配（编辑器/QuickOpen 按事件时读取）
+  ctx.effect(() => {
+    if (!settings) return undefined
+    const sync = (): void => {
+      const snapshot = settings.getSnapshot()
+      if (snapshot.status === 'loading') return
+      keybindingsApply(snapshot.value?.keybindings)
+    }
+    sync()
+    return settings.subscribe(sync)
+  }, 'vscode-mode: keybindings setting sync')
   if (workspaces?.openPath) {
     ctx.effect(() => installOpenPathRouter({
       workspaces,
@@ -145,8 +160,8 @@ export function apply(ctx: any): void {
 
   // 中央「文件编辑」页签（旧形态回退）：类 VSCode 编辑器；侧边栏形态可用时编辑器住 betterSidebar Tab，
   // 本页签不注册（避免双实例：Monaco×2 + diff dock 每会话单源抢占）。
-  const registerLegacyTab = (): void => {
-    registerSlotSafely(ctx, {
+  const registerLegacyTab = (): (() => void) | null => {
+    return registerSlotSafely(ctx, {
       name: 'conversation.view',
       id: 'edrv-editor',
       order: 5,
@@ -155,23 +170,52 @@ export function apply(ctx: any): void {
     }, (props: unknown) => React.createElement(EditorView, Object.assign({}, props, { layout: 'tab', sideHint: SIDEBAR_INSTALL_CMD, schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })))
   }
 
-  if (sideService) {
-    // 侧边栏形态：注册「文件编辑」Tab（单实例、可按会话持久化、内容打开自动展开面板）
-    ctx.effect(() => installSideEditor({
-      service: sideService,
-      renderTab: (props: Record<string, unknown>) => React.createElement(SideEditorTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })),
-      activeSession: () => {
-        const snapshot = sessions?.list?.getSnapshot?.() as { current?: string; byId?: Record<string, { cwd?: string }> } | undefined
-        const sessionId = snapshot?.current
-        if (!sessionId) return undefined
-        return { sessionId, cwd: snapshot?.byId?.[sessionId]?.cwd }
-      },
-      registerLegacyFallback: registerLegacyTab,
-    }), 'vscode-mode: sidebar editor tab')
-  } else {
-    setEnsureSideEditor(null)
-    registerLegacyTab()
+  // 侧边栏/中央页签两形态互斥切换：sideDisposer（侧边栏 Tab）与 legacyDisposer（中央页签）只保留其一。
+  // ⚠️ betterSidebar 服务由 dsh-better-sidebar 的 client bundle（1MB+）在页面加载时提供，本插件
+  // bundle 较小往往先执行完启动检测——一次性探测会误报「未检测到」并永久停在中央页签形态（实测
+  // 竞态：better-sidebar 已装，但「文件编辑」Tab 未注册）。故启动后按 2s 间隔重试（窗口 ~30s），
+  // 命中即自动切换侧边栏形态；始终未命中则保持中央页签回退。
+  let sideDisposer: (() => void) | null = null
+  let legacyDisposer: (() => void) | null = null
+  const applySideForm = (): void => {
+    if (sideService) {
+      if (sideDisposer !== null) return
+      if (legacyDisposer !== null) { legacyDisposer(); legacyDisposer = null }
+      sideDisposer = ctx.effect(() => installSideEditor({
+        service: sideService as NonNullable<typeof sideService>,
+        renderTab: (props: Record<string, unknown>) => React.createElement(SideEditorTab, Object.assign({}, props, { schedule, addToConversation, sidebarPanels, outlineSources, fileMenuItems })),
+        activeSession: () => {
+          const snapshot = sessions?.list?.getSnapshot?.() as { current?: string; byId?: Record<string, { cwd?: string }> } | undefined
+          const sessionId = snapshot?.current
+          if (!sessionId) return undefined
+          return { sessionId, cwd: snapshot?.byId?.[sessionId]?.cwd }
+        },
+        registerLegacyFallback: registerLegacyTab,
+      }), 'vscode-mode: sidebar editor tab')
+    } else {
+      if (legacyDisposer !== null) return
+      if (sideDisposer !== null) { sideDisposer(); sideDisposer = null }
+      setEnsureSideEditor(null)
+      legacyDisposer = registerLegacyTab()
+    }
+  }
+  applySideForm()
+  let sideRetries = 0
+  const retrySideService = (): void => {
+    if (sideService !== undefined || sideRetries >= 15) return
+    sideRetries += 1
+    schedule(() => {
+      if (sideService !== undefined) return
+      sideService = detectSidebarService(ctx)
+      if (sideService !== undefined) {
+        console.info('[dsh-vscode-mode] 检测到 ' + SIDEBAR_PLUGIN + '，切换侧边栏编辑形态')
+        applySideForm()
+      } else {
+        retrySideService()
+      }
+    }, 2000)
   }
+  retrySideService()
 
   // 对话输入框上方差异 dock：普通对话显示单文案按钮，文件编辑页由 EditorView 隐藏
   registerSlotSafely(ctx, {

package/src/client/keybindings.ts

@@ -0,0 +1,169 @@
+/**
+ * dsh-vscode-mode client — 快捷键配置模块（解析/匹配/状态同步）。
+ * 纯逻辑（parseChord/formatChord/matchEvent/chordFromEvent/normalizeKey）不依赖 DOM，可单测；
+ * 模块状态由 settings 订阅驱动（client/index.ts 调 keybindingsApply）。
+ * 键位语义：Ctrl 与 Cmd 互认（延续现有 Ctrl+P/Ctrl+B 捕获行为）。
+ * 作者 ddj 2026年08月26号
+ */
+import React from 'react'
+import { KEYBINDING_DEFAULTS, normalizeKeybindings } from '../shared/keybindings.js'
+
+/** 解析后的键位（修饰符 + 规范化主键）。 */
+export interface Binding {
+  ctrl: boolean
+  shift: boolean
+  alt: boolean
+  meta: boolean
+  key: string
+}
+
+/** 命令目录（设置页展示标签；执行按目录序先匹配先执行，冲突键位确定性）。 */
+export const COMMANDS: Array<{ id: string; label: string }> = [
+  { id: 'edrv.save', label: '保存文件' },
+  { id: 'edrv.quickOpen', label: '快速打开文件' },
+  { id: 'edrv.toggleSidebar', label: '切换侧边栏' },
+  { id: 'edrv.searchInFiles', label: '在工作区中搜索' },
+]
+
+const MODIFIERS: Record<string, 'ctrl' | 'shift' | 'alt' | 'meta'> = {
+  ctrl: 'ctrl', cmd: 'meta', meta: 'meta', shift: 'shift', alt: 'alt',
+}
+
+let current: Record<string, string> = { ...KEYBINDING_DEFAULTS }
+let parsed: Record<string, Binding | null> = {}
+const listeners = new Set<() => void>()
+
+/**
+ * 应用设置快照（与默认值合并；未知 id 丢弃；空对象 = 全部默认）。
+ * @author ddj 2026年08月26号
+ * @param raw 设置 scope 的 keybindings 字段
+ */
+export function keybindingsApply(raw: unknown): void {
+  current = { ...KEYBINDING_DEFAULTS, ...normalizeKeybindings(raw) }
+  parsed = {}
+  for (const id of Object.keys(current)) parsed[id] = parseChord(current[id])
+  for (const listener of listeners) {
+    try { listener() } catch { /* 监听器异常不影响其他订阅 */ }
+  }
+}
+
+/**
+ * 订阅键位配置变化。
+ * @author ddj 2026年08月26号
+ * @param listener 变化回调
+ * @returns 取消订阅函数
+ */
+export function subscribeKeybindings(listener: () => void): () => void {
+  listeners.add(listener)
+  return () => listeners.delete(listener)
+}
+
+/**
+ * 当前键位弦（未绑定/空 → null）。
+ * @author ddj 2026年08月26号
+ * @param id 命令 id
+ * @returns 键位弦或 null
+ */
+export function chordOf(id: string): string | null {
+  const chord = current[id]
+  return typeof chord === 'string' && chord.trim() !== '' ? chord : null
+}
+
+/**
+ * 当前命令的解析键位（未绑定/非法 → null）。
+ * @author ddj 2026年08月26号
+ * @param id 命令 id
+ * @returns 解析键位或 null
+ */
+export function bindingOf(id: string): Binding | null {
+  return parsed[id] ?? null
+}
+
+/**
+ * 主键规范化：小写字母大写、空格归一为 Space，其余原样（与事件 e.key 对照）。
+ * @author ddj 2026年08月26号
+ * @param key 事件主键
+ * @returns 规范化主键
+ */
+export function normalizeKey(key: string): string {
+  const value = String(key ?? '')
+  if (value === ' ') return 'Space'
+  if (value.length === 1 && value >= 'a' && value <= 'z') return value.toUpperCase()
+  return value
+}
+
+/**
+ * 解析键位弦（如 `Ctrl+Shift+F`；纯修饰键/重复主键/空 → null）。
+ * @author ddj 2026年08月26号
+ * @param chord 键位弦
+ * @returns 解析键位或 null
+ */
+export function parseChord(chord: string): Binding | null {
+  const parts = String(chord ?? '').split('+').map((part) => part.trim()).filter(Boolean)
+  if (!parts.length) return null
+  const binding: Binding = { ctrl: false, shift: false, alt: false, meta: false, key: '' }
+  for (const part of parts) {
+    const modifier = MODIFIERS[part.toLocaleLowerCase('en-US')]
+    if (modifier) {
+      binding[modifier] = true
+      continue
+    }
+    if (binding.key) return null
+    binding.key = normalizeKey(part)
+  }
+  return binding.key ? binding : null
+}
+
+/**
+ * 格式化键位（Ctrl/Cmd/Shift/Alt + 主键；meta 显示 Cmd）。
+ * @author ddj 2026年08月26号
+ * @param binding 解析键位
+ * @returns 键位弦
+ */
+export function formatChord(binding: Binding): string {
+  const parts: string[] = []
+  if (binding.ctrl) parts.push('Ctrl')
+  if (binding.meta) parts.push('Cmd')
+  if (binding.shift) parts.push('Shift')
+  if (binding.alt) parts.push('Alt')
+  parts.push(binding.key)
+  return parts.join('+')
+}
+
+/**
+ * 事件是否命中键位（Ctrl 与 Cmd 互认）。
+ * @author ddj 2026年08月26号
+ * @param e 键盘事件（鸭子类型，便于单测）
+ * @param binding 解析键位（null = 未绑定，永不命中）
+ * @returns 是否命中
+ */
+export function matchEvent(e: { ctrlKey?: boolean; metaKey?: boolean; shiftKey?: boolean; altKey?: boolean; key?: string }, binding: Binding | null): boolean {
+  if (!binding) return false
+  if ((e.ctrlKey || e.metaKey) !== (binding.ctrl || binding.meta)) return false
+  if (Boolean(e.shiftKey) !== binding.shift) return false
+  if (Boolean(e.altKey) !== binding.alt) return false
+  return normalizeKey(e.key ?? '') === binding.key
+}
+
+/**
+ * 从键盘事件构造键位弦（纯修饰键 → null，供设置页录制）。
+ * @author ddj 2026年08月26号
+ * @param e 键盘事件
+ * @returns 键位弦或 null
+ */
+export function chordFromEvent(e: { ctrlKey?: boolean; metaKey?: boolean; shiftKey?: boolean; altKey?: boolean; key?: string }): string | null {
+  const key = normalizeKey(e.key ?? '')
+  if (!key || key === 'Control' || key === 'Shift' || key === 'Alt' || key === 'Meta') return null
+  return formatChord({ ctrl: Boolean(e.ctrlKey), shift: Boolean(e.shiftKey), alt: Boolean(e.altKey), meta: Boolean(e.metaKey), key })
+}
+
+/**
+ * 键位版本 hook：配置变化时返回新版本（tooltip/占位文案随键位刷新）。
+ * @author ddj 2026年08月26号
+ * @returns 当前版本号
+ */
+export function useKeybindingsVersion(): number {
+  const [version, setVersion] = React.useState(0)
+  React.useEffect(() => subscribeKeybindings(() => setVersion((v) => v + 1)), [])
+  return version
+}

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

@@ -0,0 +1,294 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — 侧边栏「搜索」面板（VSCode 搜索视图形态）。
+ * 内容搜索：edrv.searchContent RPC；结果按文件分组展示命中行（行号 + 高亮 + 文件计数），
+ * 点击经 ctx.openFileAt 打开文件并跳转行列。
+ * 选项：大小写/全词/正则；折叠区（⚙ 齿轮展开）：包含的文件（📖 toggle = 仅当前打开文件）
+ * 与排除的文件（⚙ toggle = 启用排除），模式为逗号分隔 rg glob；无搜索按钮，防抖 + 回车触发。
+ * 作者 ddj 2026-08-26
+ */
+import React from 'react'
+import { rpc } from '../../rpc.js'
+import type { SidebarCtx } from '../types.js'
+
+const DEBOUNCE_MS = 250
+const INCLUDE_PLACEHOLDER = '例如 *.ts, src/**/include'
+
+/**
+ * 逗号切分 glob 列表（trim + 去空）。
+ * @param text 用户输入的逗号分隔模式
+ * @returns glob 数组
+ */
+export function splitGlobs(text) {
+  return String(text ?? '').split(',').map((item) => item.trim()).filter(Boolean)
+}
+
+/**
+ * 命中行文本三段切分（before/命中/after，列为 1-based UTF-16）。
+ * @param text 行文本
+ * @param start 起始列
+ * @param end 结束列
+ * @returns 三段文本
+ */
+function splitHit(text, start, end) {
+  const s = Math.max(0, (start | 0) - 1)
+  const e = Math.max(s, end | 0)
+  return { before: String(text).slice(0, s), hit: String(text).slice(s, e), after: String(text).slice(e) }
+}
+
+/**
+ * 搜索面板主体。
+ * @param props.ctx 面板共享上下文（sessionId/openFileAt/activePath）
+ */
+export function SearchPanel(props) {
+  const ctx = props?.ctx
+  const sessionId = ctx?.sessionId
+  const openFileAt = ctx?.openFileAt ?? (() => {})
+  const activePath = ctx?.activePath ?? null
+  const [query, setQuery] = React.useState('')
+  const [matchCase, setMatchCase] = React.useState(false)
+  const [wholeWord, setWholeWord] = React.useState(false)
+  const [regex, setRegex] = React.useState(false)
+  const [includeText, setIncludeText] = React.useState('')
+  const [excludeText, setExcludeText] = React.useState('')
+  const [onlyActive, setOnlyActive] = React.useState(false)
+  const [excludeOn, setExcludeOn] = React.useState(false)
+  const [sectionOpen, setSectionOpen] = React.useState(false)
+  const [status, setStatus] = React.useState('idle') // idle | searching | done | error
+  const [error, setError] = React.useState('')
+  const [matches, setMatches] = React.useState(null)
+  const [truncated, setTruncated] = React.useState(false)
+  const [collapsed, setCollapsed] = React.useState({})
+  const seqRef = React.useRef(0)
+  const timerRef = React.useRef(null)
+  const inputRef = React.useRef(null)
+  const queryRef = React.useRef('')
+  queryRef.current = query
+  const activePathRef = React.useRef(activePath)
+  activePathRef.current = activePath
+  // 请求参数 ref：防抖/立即重搜闭包统一读最新值，避免陈旧选项
+  const requestRef = React.useRef({ matchCase, wholeWord, regex, include: [], exclude: [] })
+  requestRef.current = {
+    matchCase, wholeWord, regex,
+    include: onlyActive ? (activePath ? [activePath] : []) : splitGlobs(includeText),
+    exclude: excludeOn ? splitGlobs(excludeText) : [],
+  }
+
+  // 按会话恢复上次查询、选项与过滤模式（VSCode 记忆搜索词）
+  React.useEffect(() => {
+    if (!sessionId) return
+    try {
+      const saved = JSON.parse(localStorage.getItem('edrv.search.v1.' + String(sessionId)) || 'null')
+      if (saved && typeof saved === 'object') {
+        if (typeof saved.query === 'string') setQuery(saved.query)
+        if (typeof saved.matchCase === 'boolean') setMatchCase(saved.matchCase)
+        if (typeof saved.wholeWord === 'boolean') setWholeWord(saved.wholeWord)
+        if (typeof saved.regex === 'boolean') setRegex(saved.regex)
+        if (typeof saved.includeText === 'string') setIncludeText(saved.includeText)
+        if (typeof saved.excludeText === 'string') setExcludeText(saved.excludeText)
+        if (typeof saved.onlyActive === 'boolean') setOnlyActive(saved.onlyActive)
+        if (typeof saved.excludeOn === 'boolean') setExcludeOn(saved.excludeOn)
+        if (typeof saved.sectionOpen === 'boolean') setSectionOpen(saved.sectionOpen)
+      }
+    } catch (e) { /* 损坏忽略 */ }
+  }, [sessionId])
+
+  // 查询/选项/过滤变化 → 持久化
+  React.useEffect(() => {
+    if (!sessionId) return
+    try {
+      localStorage.setItem('edrv.search.v1.' + String(sessionId), JSON.stringify({
+        query, matchCase, wholeWord, regex, includeText, excludeText, onlyActive, excludeOn, sectionOpen,
+      }))
+    } catch (e) { /* 忽略 */ }
+  }, [sessionId, query, matchCase, wholeWord, regex, includeText, excludeText, onlyActive, excludeOn, sectionOpen])
+
+  /**
+   * 执行内容搜索（请求参数从 ref 读最新值）。
+   * @param text 搜索词
+   */
+  const runSearch = (text) => {
+    const s = ++seqRef.current
+    const clean = String(text ?? '').trim()
+    if (clean.length < 2) { setMatches(null); setStatus('idle'); return }
+    const req = requestRef.current
+    setStatus('searching')
+    setError('')
+    rpc('edrv.searchContent', {
+      sessionId, query: clean,
+      matchCase: req.matchCase, wholeWord: req.wholeWord, regex: req.regex,
+      include: req.include, exclude: req.exclude,
+    }).then((res) => {
+      if (s !== seqRef.current) return
+      if (res && res.ok) {
+        setMatches(Array.isArray(res.matches) ? res.matches : [])
+        setTruncated(res.truncated === true)
+        setStatus('done')
+      } else {
+        setError(res?.error ? String(res.error) : '搜索失败')
+        setMatches(null)
+        setStatus('error')
+      }
+    }).catch((e) => {
+      if (s !== seqRef.current) return
+      setError('搜索异常:' + String(e))
+      setMatches(null)
+      setStatus('error')
+    })
+  }
+
+  /**
+   * 输入变化：防抖触发搜索。
+   * @param value 新输入
+   */
+  const onChange = (value) => {
+    setQuery(value)
+    if (timerRef.current) clearTimeout(timerRef.current)
+    timerRef.current = setTimeout(() => runSearch(value), DEBOUNCE_MS)
+  }
+
+  /**
+   * 输入框通用防抖重搜（包含/排除模式输入）。
+   * @param setter 状态写入函数
+   * @param value 新值
+   */
+  const onChangeDebounced = (setter, value) => {
+    setter(value)
+    if (timerRef.current) clearTimeout(timerRef.current)
+    timerRef.current = setTimeout(() => runSearch(queryRef.current), DEBOUNCE_MS)
+  }
+
+  /**
+   * 立即重搜（查询 ≥2 字符时）；先同步 ref 避免本次调用读到旧请求参数。
+   * @param next 新的请求参数字段
+   */
+  const rerun = (next) => {
+    requestRef.current = Object.assign({}, requestRef.current, next)
+    if (timerRef.current) clearTimeout(timerRef.current)
+    if (String(queryRef.current).trim().length >= 2) runSearch(queryRef.current)
+  }
+
+  /** 选项开关切换（大小写/全词/正则/书本/设置）：更新状态 + 立即重搜。 */
+  const toggleOpt = (key, value) => {
+    if (key === 'matchCase') setMatchCase(value)
+    if (key === 'wholeWord') setWholeWord(value)
+    if (key === 'regex') setRegex(value)
+    if (key === 'onlyActive') setOnlyActive(value)
+    if (key === 'excludeOn') setExcludeOn(value)
+    const base = { matchCase, wholeWord, regex, onlyActive, excludeOn }
+    base[key] = value
+    rerun({
+      matchCase: base.matchCase, wholeWord: base.wholeWord, regex: base.regex,
+      include: base.onlyActive ? (activePathRef.current ? [activePathRef.current] : []) : splitGlobs(includeText),
+      exclude: base.excludeOn ? splitGlobs(excludeText) : [],
+    })
+  }
+
+  // Ctrl+Shift+F 重复触发时聚焦输入框（EditorView 派发 edrv:search-focus）
+  React.useEffect(() => {
+    const onFocus = () => inputRef.current?.focus?.()
+    window.addEventListener('edrv:search-focus', onFocus)
+    return () => window.removeEventListener('edrv:search-focus', onFocus)
+  }, [])
+
+  // 结果按文件分组（保持 rg 输出顺序）
+  const groups = React.useMemo(() => {
+    if (!Array.isArray(matches)) return []
+    const map = new Map()
+    for (const m of matches) {
+      let list = map.get(m.path)
+      if (!list) { list = []; map.set(m.path, list) }
+      list.push(m)
+    }
+    return [...map.entries()].map(([path, list]) => ({ path, count: list.length, matches: list }))
+  }, [matches])
+
+  const totalFiles = groups.length
+  const totalMatches = Array.isArray(matches) ? matches.length : 0
+  const toggleGroup = (path) => setCollapsed((prev) => Object.assign({}, prev, { [path]: prev[path] === true ? false : true }))
+
+  const optsBar = React.createElement('div', { className: 'edrv-search-opts' },
+    React.createElement('button', { className: 'edrv-search-opt' + (matchCase ? ' on' : ''), title: '区分大小写', 'aria-pressed': matchCase, onClick: () => toggleOpt('matchCase', !matchCase) }, 'Aa'),
+    React.createElement('button', { className: 'edrv-search-opt' + (wholeWord ? ' on' : ''), title: '全字匹配', 'aria-pressed': wholeWord, onClick: () => toggleOpt('wholeWord', !wholeWord) }, 'Ab'),
+    React.createElement('button', { className: 'edrv-search-opt' + (regex ? ' on' : ''), title: '使用正则表达式', 'aria-pressed': regex, onClick: () => toggleOpt('regex', !regex) }, '.*'),
+    React.createElement('span', { className: 'edrv-search-spacer' }),
+    React.createElement('button', { className: 'edrv-search-opt' + (sectionOpen ? ' on' : ''), title: sectionOpen ? '收起文件过滤' : '文件过滤（包含/排除）', 'aria-pressed': sectionOpen, onClick: () => setSectionOpen((v) => !v) }, '⚙'))
+
+  const filterRows = sectionOpen
+    ? React.createElement('div', { className: 'edrv-search-rows' },
+        React.createElement('div', { className: 'edrv-search-row' },
+          React.createElement('input', {
+            className: 'edrv-search-field' + (onlyActive ? ' dim' : ''), placeholder: INCLUDE_PLACEHOLDER,
+            value: includeText, disabled: onlyActive,
+            title: onlyActive ? '已启用「仅当前打开文件」，忽略此输入' : '',
+            onChange: (e) => onChangeDebounced(setIncludeText, e.target.value),
+          }),
+          React.createElement('button', {
+            className: 'edrv-search-toggle' + (onlyActive ? ' on' : ''), title: activePath ? '仅在当前打开的文件中搜索' : '无打开的文件（需先打开文件）',
+            'aria-pressed': onlyActive, disabled: !activePath,
+            onClick: () => toggleOpt('onlyActive', !onlyActive),
+          }, '📖')),
+        React.createElement('div', { className: 'edrv-search-row' },
+          React.createElement('input', {
+            className: 'edrv-search-field' + (excludeOn ? '' : ' dim'), placeholder: INCLUDE_PLACEHOLDER,
+            value: excludeText, disabled: !excludeOn,
+            title: excludeOn ? '' : '排除功能未启用，先点击右侧按钮开启',
+            onChange: (e) => onChangeDebounced(setExcludeText, e.target.value),
+          }),
+          React.createElement('button', {
+            className: 'edrv-search-toggle' + (excludeOn ? ' on' : ''), title: '启用排除文件（忽略下方模式的命中）',
+            'aria-pressed': excludeOn,
+            onClick: () => toggleOpt('excludeOn', !excludeOn),
+          }, '⚙')))
+    : null
+
+  const summary = status === 'done'
+    ? React.createElement('div', { className: 'edrv-search-summary' },
+        totalFiles > 0
+          ? totalFiles + ' 个文件 · ' + totalMatches + ' 处匹配' + (truncated ? '（已截断）' : '')
+          : '无匹配结果')
+    : null
+
+  const body = (() => {
+    if (status === 'searching') return React.createElement('div', { className: 'edrv-search-empty' }, '搜索中…')
+    if (status === 'error') return React.createElement('div', { className: 'edrv-search-error' }, error)
+    if (status === 'done' && !groups.length) return React.createElement('div', { className: 'edrv-search-empty' }, '无匹配结果')
+    if (status !== 'done') return React.createElement('div', { className: 'edrv-search-empty' }, '输入至少 2 个字符开始搜索')
+    return React.createElement('div', { className: 'edrv-search-results' },
+      groups.map((group) => {
+        const open = collapsed[group.path] !== true
+        return React.createElement('div', { key: group.path, className: 'edrv-search-group' },
+          React.createElement('div', { className: 'edrv-search-file', title: group.path, onClick: () => toggleGroup(group.path) },
+            React.createElement('span', { className: 'edrv-search-chev' }, open ? '▾' : '▸'),
+            React.createElement('span', { className: 'edrv-search-fname' }, String(group.path).split(/[\\/]/).pop() || group.path),
+            React.createElement('span', { className: 'edrv-search-fdir' }, String(group.path).split(/[\\/]/).slice(0, -1).join('/')),
+            React.createElement('span', { className: 'edrv-search-fcount' }, group.count)),
+          open ? group.matches.map((m, i) => {
+            const parts = splitHit(m.text, m.startColumn, m.endColumn)
+            return React.createElement('div', { key: m.path + ':' + m.line + ':' + i, className: 'edrv-search-line' + (i % 2 ? ' alt' : ''), title: group.path + ':' + m.line, onClick: () => openFileAt(m.path, m.line, m.startColumn) },
+              React.createElement('span', { className: 'edrv-search-ln' }, m.line),
+              React.createElement('span', { className: 'edrv-search-text' },
+                React.createElement('span', null, parts.before),
+                React.createElement('mark', { className: 'edrv-search-hit' }, parts.hit),
+                React.createElement('span', null, parts.after)))
+          }) : null)
+      }))
+  })()
+
+  return React.createElement('div', { className: 'edrv-search-panel' },
+    React.createElement('div', { className: 'edrv-search-qrow' },
+      React.createElement('input', {
+        ref: inputRef, className: 'edrv-search-input', autoFocus: true, autoComplete: 'off', spellCheck: false,
+        placeholder: '搜索',
+        value: query,
+        onChange: (e) => onChange(e.target.value),
+        onKeyDown: (e) => {
+          if (e.key === 'Enter') { if (timerRef.current) clearTimeout(timerRef.current); runSearch(queryRef.current) }
+          if (e.key === 'Escape') inputRef.current?.blur?.()
+        },
+      })),
+    optsBar,
+    filterRows,
+    summary,
+    body)
+}

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

@@ -1,10 +1,11 @@
 // @ts-nocheck
 /**
- * dsh-vscode-mode client — 「文件管理」面板定义（注册表一项）。
- * 作者 ddj 2026-08-26
+ * dsh-vscode-mode client — 侧边栏面板定义（文件管理 + 搜索）。
+ * 作者 ddj 2026-08-26 / 2026-08-26
  */
 import React from 'react'
 import { FileExplorer } from './FileExplorer.js'
+import { SearchPanel } from './SearchPanel.js'
 import type { SidebarPanelDef, SidebarCtx } from '../types.js'
 
 /**
@@ -22,3 +23,18 @@ export function createFilePanel(): SidebarPanelDef {
     render: (ctx: SidebarCtx) => React.createElement(FileExplorer, { ctx }),
   }
 }
+
+/**
+ * 构造搜索面板定义。
+ * @author ddj 2026年08月30号
+ * @returns 面板定义（无徽标；活动栏图标 🔍）
+ */
+export function createSearchPanel(): SidebarPanelDef {
+  return {
+    id: 'search',
+    title: '搜索',
+    icon: '🔍',
+    order: 15,
+    render: (ctx: SidebarCtx) => React.createElement(SearchPanel, { ctx }),
+  }
+}