dsh-vscode-mode 0.1.32 → 0.1.35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.1.32",
-  "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 dsh-better-sidebar 侧边栏与对话同屏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚），状态持久化到工作区旁车",
+  "version": "0.1.35",
+  "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 dsh-better-sidebar 侧边栏与对话同屏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车",
   "keywords": [
     "dsh",
     "dsh-plugin",

package/src/client/events.ts

@@ -59,6 +59,17 @@ export function emitOpenEditor(path: string): void {
   window.dispatchEvent(new CustomEvent('edrv:open-editor', { detail: { path } }))
 }
 
+/**
+ * 打开指定路径并定位到行列（LSP 跳转目标）。
+ * @author ddj 2026年08月27号
+ * @param path 目标路径
+ * @param line 目标行（1-based，可空）
+ * @param column 目标列（1-based，可空）
+ */
+export function emitOpenAt(path: string, line?: number, column?: number): void {
+  window.dispatchEvent(new CustomEvent('edrv:open-editor', { detail: { path, line, column } }))
+}
+
 /**
  * 拉起 DiffLauncher。
  * @author ddj 2026年08月26号

package/src/client/index.ts

@@ -37,7 +37,9 @@ 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 { createLspOutlineSource } from './outline/lspSource.js'
 import { keybindingsApply } from './keybindings.js'
+import { setupLsp, setSession } from './monaco/lsp/index.js'
 import type { CompatAdapter } from '../shared/compat.js'
 
 // ⚠️ inject 只列必需服务：webUiSettings 是 @linxin666/dsh-client-ui-web-ui-settings 提供的
@@ -66,17 +68,26 @@ export function apply(ctx: any): void {
   if (typeof window !== 'undefined' && monacoList && typeof monacoList.subscribe === 'function') {
     const list = monacoList as { getSnapshot: () => { current?: unknown }; subscribe: (listener: () => void) => () => void }
     const schedulePreload = () => {
-      const preload = () => loadMonaco(() => {}).catch(() => {})
+      const preload = () => loadMonaco(() => {}).then((m: unknown) => setupLsp(m)).catch(() => {})
       if (typeof window.requestIdleCallback === 'function') window.requestIdleCallback(preload, { timeout: 2000 })
       else schedule(preload, 300)
     }
     const onSessionEnter = () => {
-      if (!list.getSnapshot()?.current) return
+      const current = list.getSnapshot()?.current
+      if (!current) return
+      setSession(current)
       schedulePreload()
     }
     ctx.effect(() => list.subscribe(onSessionEnter), 'vscode-mode: monaco session trigger')
     onSessionEnter()
   }
+  // 会话切换 → LSP 文档归属更新 + 状态刷新
+  if (monacoList && typeof monacoList.subscribe === 'function') {
+    const list = monacoList as { getSnapshot: () => { current?: string }; subscribe: (listener: () => void) => () => void }
+    ctx.effect(() => list.subscribe(() => {
+      setSession(list.getSnapshot()?.current)
+    }), 'vscode-mode: lsp session sync')
+  }
   const originalOpenPath = workspaces?.openPath
   const binder = pickSettingsBinder(ctx)
   const settings = binder.scope
@@ -113,6 +124,8 @@ export function apply(ctx: any): void {
   const outlineSources = createOutlineSourceRegistry()
   ctx.provide('edrvOutlineSources', outlineSources)
   ctx.effect(() => registerBuiltinOutlineSources(outlineSources), 'vscode-mode: outline sources')
+  // LSP 大纲源（priority 60）：lua/csharp 有 host 服务器时优先生效，否则自动落入 fallback
+  ctx.effect(() => outlineSources.register(createLspOutlineSource()), 'vscode-mode: outline lsp source')
   ctx.effect(() => sidebarPanels.register(createOutlinePanel()), 'vscode-mode: sidebar panel outline')
   ctx.effect(() => registry.register({
     id: 'system', label: '系统默认应用', priority: 0,

package/src/client/monaco/lsp/index.ts

@@ -0,0 +1,30 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — LSP 装配编排。
+ * setupLsp(monaco)：注册 Monaco provider 与文档跟踪（幂等）；调用方在 Monaco 加载后调用。
+ * setSession(id)：会话切换时同步（provider 与文档同步共用）。
+ * 作者 ddj 2026-08-27
+ */
+import { registerLspProviders, hideReferencesOverlay } from './providers.js'
+import { setLspSession, refreshStatus, lspStatusFor, onLspProgress } from './lspClient.js'
+
+let monacoRef = null
+
+/** Monaco 加载后装配（幂等；重复调用仅刷新会话）。 */
+export function setupLsp(monaco) {
+  monacoRef = monaco
+  registerLspProviders(monaco)
+}
+
+/** 会话切换：更新 host 侧文档归属 + 刷新状态。 */
+export function setSession(sessionId) {
+  setLspSession(sessionId)
+  void refreshStatus(true)
+}
+
+/** 编辑器卸载时清理浮动面板。 */
+export function disposeLspOverlay() {
+  hideReferencesOverlay()
+}
+
+export { lspStatusFor, refreshStatus, onLspProgress }

package/src/client/monaco/lsp/lspClient.ts

@@ -0,0 +1,192 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — LSP 会话与文档同步（模块级单例）。
+ * 跟踪当前会话 + Monaco 打开文档（model 事件驱动），去抖推送 edrv.lsp.sync；
+ * 并提供 definition/references/documentSymbol/hover/status 的 RPC 薄封装。
+ * 作者 ddj 2026-08-27
+ */
+import { rpc } from '../../rpc.js'
+import { monoToLsp } from '../../../shared/lsp.js'
+
+/** edrv:// 模型 URI → 工作区相对/绝对路径（与 host 侧 path 对齐）。 */
+export function pathOfModel(model) {
+  if (!model || !model.uri) return null
+  const uri = model.uri
+  if (uri.scheme !== 'edrv') return null
+  const raw = uri.path ?? ''
+  try {
+    const decoded = decodeURIComponent(String(raw).replace(/^\//, ''))
+    return decoded || null
+  } catch (error) {
+    return String(raw).replace(/^\//, '') || null
+  }
+}
+
+const SYNC_DEBOUNCE_MS = 250
+
+let sessionId
+const syncTimers = new Map()
+let statusCache = { servers: [], at: 0 }
+let progressListeners = new Set()
+let ready = false
+
+/** 设置当前会话（切换会话时清理旧文档跟踪由 host 端 session/disposed 兜底）。 */
+export function setLspSession(id) {
+  if (sessionId === id) return
+  sessionId = id
+  void refreshStatus()
+}
+
+export function lspSessionId() {
+  return sessionId
+}
+
+/** 订阅 LSP 状态变化（服务器进度/启动状态）。 */
+export function onLspProgress(listener) {
+  if (typeof listener !== 'function') return () => {}
+  progressListeners.add(listener)
+  return () => progressListeners.delete(listener)
+}
+
+/** 发布当前 server 状态给编辑器底部状态区。 */
+function publishProgress() {
+  for (const listener of progressListeners) {
+    try { listener(statusCache.servers) } catch (error) { /* UI listener failure ignored */ }
+  }
+}
+
+/** 立即同步某文档到 host（首次打开/查询前保证服务器已认识该文档）。 */
+export async function syncDoc(path, text, immediate = false) {
+  if (!path || typeof text !== 'string') return
+  if (immediate) {
+    clearPending(path)
+    await rpc('edrv.lsp.sync', { sessionId, path, text, version: Date.now() }).catch(() => {})
+    return
+  }
+  clearPending(path)
+  syncTimers.set(path, setTimeout(() => {
+    syncTimers.delete(path)
+    rpc('edrv.lsp.sync', { sessionId, path, text, version: Date.now() }).catch(() => {})
+  }, SYNC_DEBOUNCE_MS))
+}
+
+function clearPending(path) {
+  const timer = syncTimers.get(path)
+  if (timer) { clearTimeout(timer); syncTimers.delete(path) }
+}
+
+/** 文档关闭：停止去抖并通知 host。 */
+export function closeDoc(path) {
+  clearPending(path)
+  void rpc('edrv.lsp.close', { sessionId, path }).catch(() => {})
+}
+
+/** 立即推送 + 查询定义；返回 [{ uri, range }]（uri 已转 edrv://）。 */
+export async function findDefinition(path, text, position) {
+  await syncDoc(path, text, true)
+  const res = await rpc('edrv.lsp.definition', { sessionId, path, position: monoToLsp(position.lineNumber, position.column) }).catch(() => null)
+  if (!res || !res.ok || !Array.isArray(res.locations)) return []
+  return res.locations.map(toClientLocation)
+}
+
+/** 立即推送 + 查询引用。 */
+export async function findReferences(path, text, position, includeDeclaration = false) {
+  await syncDoc(path, text, true)
+  const res = await rpc('edrv.lsp.references', { sessionId, path, position: monoToLsp(position.lineNumber, position.column), includeDeclaration }).catch(() => null)
+  if (!res || !res.ok || !Array.isArray(res.locations)) return []
+  return res.locations.map(toClientLocation)
+}
+
+/** 查询大纲符号（documentSymbol）。 */
+export async function fetchDocumentSymbols(path, text) {
+  await syncDoc(path, text, true)
+  const res = await rpc('edrv.lsp.documentSymbol', { sessionId, path }).catch(() => null)
+  if (!res || !res.ok || !Array.isArray(res.symbols)) return []
+  return res.symbols
+}
+
+/** 查询 hover 内容。 */
+export async function fetchHover(path, text, position) {
+  await syncDoc(path, text, true)
+  const res = await rpc('edrv.lsp.hover', { sessionId, path, position: monoToLsp(position.lineNumber, position.column) }).catch(() => null)
+  if (!res || !res.ok) return null
+  return res.hover || null
+}
+
+/** 拉取服务器状态（带 5s 缓存）。 */
+export async function refreshStatus(force = false) {
+  if (!force && Date.now() - statusCache.at < 1500) return statusCache.servers
+  const res = await rpc('edrv.lsp.status', { sessionId }).catch(() => null)
+  const servers = res && res.ok && Array.isArray(res.servers) ? res.servers : []
+  statusCache = { servers, at: Date.now() }
+  ready = true
+  publishProgress()
+  return servers
+}
+
+export function lspReady() {
+  return ready
+}
+
+/** 当前会话某语言服务器状态（就绪/索引中/不可用）。 */
+export function lspStatusFor(languageId) {
+  const servers = statusCache.servers
+  const match = servers.find((s) => s.languageId === languageId && s.root)
+  return match || servers.find((s) => s.languageId === languageId)
+}
+
+/** file:// 或已转 edrv:// 的 LSP location → Monaco Location（edrv:// uri + 1-based range）。 */
+function toClientLocation(loc) {
+  const range = loc.range || {}
+  const start = range.start || {}
+  const end = range.end || {}
+  return {
+    uri: window.monaco.Uri.parse(toEdrvUri(loc.uri, loc.root)),
+    range: new window.monaco.Range(
+      Math.max(1, (start.line ?? 0) + 1),
+      Math.max(1, (start.character ?? 0) + 1),
+      Math.max(1, (end.line ?? 0) + 1),
+      Math.max(1, (end.character ?? 0) + 1),
+    ),
+  }
+}
+
+/** file:// URI（或裸路径）→ edrv:// 相对路径（去掉盘符/根，与编辑器模型路径一致）。 */
+export function toEdrvUri(uri, root) {
+  if (!uri) return ''
+  if (uri.startsWith('edrv://')) return uri
+  const path = relativeLspPath(uri, root)
+  return 'edrv:///' + encodeURI(path)
+}
+
+/** 将 LSP 目标解析为当前工作区相对路径（跨文件跳转与 model URI 对齐）。 */
+export function targetOpenPath(loc) {
+  return relativeLspPath(loc?.uri, loc?.root)
+}
+
+/** file URI/裸路径 → root 下的 / 分隔相对路径；root 不匹配时保留规范化绝对路径。 */
+function relativeLspPath(uri, root) {
+  if (!uri) return ''
+  let path = String(uri)
+  if (path.startsWith('file://')) {
+    try { path = decodeURIComponent(path.replace(/^file:\/\//, '')) } catch (error) { path = path.replace(/^file:\/\//, '') }
+  }
+  path = path.replace(/\\/g, '/').replace(/^\/([A-Za-z]:)/, '$1')
+  const normalizedRoot = root ? String(root).replace(/\\/g, '/').replace(/^\/([A-Za-z]:)/, '$1').replace(/\/+$/, '') : ''
+  const lowerPath = path.toLowerCase()
+  const lowerRoot = normalizedRoot.toLowerCase()
+  if (normalizedRoot && (lowerPath === lowerRoot || lowerPath.startsWith(lowerRoot + '/'))) {
+    return path.slice(normalizedRoot.length).replace(/^\/+/, '')
+  }
+  return path.replace(/^\/+/, '')
+}
+
+/** 目标行/列（0-based LSP → 1-based Monaco）。 */
+export function targetMonoPosition(loc) {
+  const range = loc.range || {}
+  const start = range.start || {}
+  return {
+    line: Math.max(1, (start.line ?? 0) + 1),
+    column: Math.max(1, (start.character ?? 0) + 1),
+  }
+}

package/src/client/monaco/lsp/providers.ts

@@ -0,0 +1,229 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — Monaco LSP provider 注册 + 跳转/引用命令。
+ * 数据层：Definition/Reference/DocumentSymbol/Hover provider（同一文件内跳转 Monaco 原生可用）。
+ * 交互层：edrv.goToDefinition（F12）/ edrv.findReferences（Shift+F12 / 右键），跨文件跳转自研
+ * （target 经 openFileAt 打开并定位），引用结果用轻量浮动面板展示（点击跳转）。
+ * 作者 ddj 2026-08-27
+ */
+import {
+  pathOfModel, syncDoc, closeDoc, findDefinition, findReferences,
+  fetchDocumentSymbols, fetchHover, targetOpenPath, targetMonoPosition, lspStatusFor,
+} from './lspClient.js'
+
+const LSP_LANGS = ['lua', 'csharp']
+let registered = false
+const disposables = []
+let overlayEl = null
+
+/** 目标文件打开并定位（复用现有 openFileAt 的 edrv:open-editor 事件通道）。 */
+function openAt(path, line, column) {
+  window.dispatchEvent(new CustomEvent('edrv:open-editor', { detail: { path, line, column } }))
+}
+
+function jumpToLocation(loc) {
+  const path = targetOpenPath(loc)
+  const pos = targetMonoPosition(loc)
+  openAt(path, pos.line, pos.column)
+}
+
+/** 注册全部 Monaco LSP provider 与文档跟踪（幂等）。 */
+export function registerLspProviders(monaco) {
+  if (registered) return
+  registered = true
+
+  // —— 文档跟踪：model 生命周期 → host 文档同步（含未保存编辑）——
+  const attachModel = (model) => {
+    if (!model || model.uri.scheme !== 'edrv') return
+    const path = pathOfModel(model)
+    if (!path) return
+    const contentDisposer = model.onDidChangeContent(() => syncDoc(path, model.getValue()))
+    const disposeDisposer = model.onWillDispose(() => {
+      closeDoc(path)
+      contentDisposer.dispose()
+    })
+    disposables.push(contentDisposer, disposeDisposer)
+    syncDoc(path, model.getValue(), true)
+  }
+  disposables.push(monaco.editor.onDidCreateModel(attachModel))
+  for (const model of monaco.editor.getModels()) attachModel(model)
+
+  // —— 数据 provider ——
+  disposables.push(
+    monaco.languages.registerDefinitionProvider(LSP_LANGS, {
+      provideDefinition: (model, position, token) => {
+        const path = pathOfModel(model)
+        if (!path) return []
+        return findDefinition(path, model.getValue(), position)
+      },
+    }),
+    monaco.languages.registerReferenceProvider(LSP_LANGS, {
+      provideReferences: (model, position, context, token) => {
+        const path = pathOfModel(model)
+        if (!path) return []
+        return findReferences(path, model.getValue(), position, Boolean(context?.includeDeclaration))
+      },
+    }),
+    monaco.languages.registerDocumentSymbolProvider(LSP_LANGS, {
+      provideDocumentSymbols: async (model, token) => {
+        const path = pathOfModel(model)
+        if (!path) return []
+        const symbols = await fetchDocumentSymbols(path, model.getValue())
+        return symbols.map(toMonacoSymbol)
+      },
+    }),
+    monaco.languages.registerHoverProvider(LSP_LANGS, {
+      provideHover: async (model, position, token) => {
+        const path = pathOfModel(model)
+        if (!path) return null
+        const hover = await fetchHover(path, model.getValue(), position)
+        if (!hover || !hover.contents || !hover.contents.length) return null
+        const range = hover.range
+          ? new monaco.Range(hover.range.start.line + 1, hover.range.start.character + 1, hover.range.end.line + 1, hover.range.end.character + 1)
+          : null
+        return {
+          contents: hover.contents.map((text) => ({ value: text })),
+          range: range || undefined,
+        }
+      },
+    }),
+  )
+}
+
+/** LSP SymbolInfo（host 归一化后）→ Monaco DocumentSymbol。 */
+function toMonacoSymbol(symbol) {
+  const range = symbol.range || {}
+  const sel = symbol.selectionRange || range
+  const s = (p) => ({ lineNumber: Math.max(1, (p.line ?? 0) + 1), column: Math.max(1, (p.character ?? 0) + 1) })
+  const out = {
+    name: symbol.name,
+    detail: symbol.detail || '',
+    kind: symbol.kind ?? 0,
+    tags: [],
+    range: new window.monaco.Range(s(range.start).lineNumber, s(range.start).column, s(range.end).lineNumber, s(range.end).column),
+    selectionRange: new window.monaco.Range(s(sel.start).lineNumber, s(sel.start).column, s(sel.end).lineNumber, s(sel.end).column),
+  }
+  if (Array.isArray(symbol.children) && symbol.children.length) {
+    out.children = symbol.children.map(toMonacoSymbol)
+  }
+  return out
+}
+
+/** 定义查询并跳转；nativeReveal 仅供 F12 保留 Monaco 原生 reveal。 */
+async function goToDefinition(ed, position, nativeReveal = false) {
+  const model = ed.getModel()
+  const path = pathOfModel(model)
+  if (!path || !position) return
+  const locations = await findDefinition(path, model.getValue(), position)
+  if (!locations.length) {
+    setStatus('未找到定义')
+    return
+  }
+  const first = locations[0]
+  if (nativeReveal && targetOpenPath(first) === path) {
+    const action = ed.getAction('editor.action.revealDefinition')
+    if (action) {
+      await action.run()
+      return
+    }
+  }
+  jumpToLocation(first)
+}
+
+/** F12 / 右键「转到定义」：查询定义并跳转（首个目标）。 */
+export async function runGoToDefinition(ed) {
+  await goToDefinition(ed, ed.getPosition(), true)
+}
+
+/** Ctrl+鼠标点击定义：使用点击位置查询，避免依赖当前光标位置。 */
+export async function gotoDefinitionAt(ed, position) {
+  await goToDefinition(ed, position)
+}
+
+/** 给一个 Monaco 编辑器绑定 Ctrl/Cmd+鼠标定义跳转（幂等）。 */
+export function bindLspEditor(ed) {
+  if (!ed || ed.__edrvLspClick) return
+  ed.__edrvLspClick = true
+  const disposable = ed.onMouseDown((event) => {
+    const native = event?.event
+    const position = event?.target?.position
+    const button = native?.button ?? event?.button
+    const ctrl = native?.ctrlKey ?? event?.ctrlKey
+    const meta = native?.metaKey ?? event?.metaKey
+    const isLeftButton = button === 0 || native?.leftButton === true
+    if (!native || !position || !isLeftButton || (!ctrl && !meta)) return
+    native.preventDefault?.()
+    native.stopPropagation?.()
+    void gotoDefinitionAt(ed, position)
+  })
+  disposables.push(disposable)
+}
+
+/** Shift+F12 / 右键「查找所有引用」：查询引用并展示浮动面板。 */
+export async function runFindReferences(ed) {
+  const model = ed.getModel()
+  const path = pathOfModel(model)
+  const position = ed.getPosition()
+  if (!path || !position) return
+  const locations = await findReferences(path, model.getValue(), position, false)
+  showReferencesOverlay(ed, path, position, locations)
+}
+
+/** 引用结果浮动面板（轻量 DOM，点击跳转；Esc/失焦关闭）。 */
+function showReferencesOverlay(ed, path, position, locations) {
+  hideReferencesOverlay()
+  if (!locations.length) {
+    setStatus('未找到引用')
+    return
+  }
+  const root = ed.getDomNode()
+  if (!root) return
+  const el = document.createElement('div')
+  el.className = 'edrv-refs'
+  const header = document.createElement('div')
+  header.className = 'edrv-refs-head'
+  header.textContent = '引用 ' + locations.length + ' 处'
+  el.appendChild(header)
+  const list = document.createElement('div')
+  list.className = 'edrv-refs-list'
+  for (const loc of locations) {
+    const row = document.createElement('div')
+    row.className = 'edrv-refs-row'
+    const pos = targetMonoPosition(loc)
+    const rel = targetOpenPath(loc)
+    const name = String(rel).split('/').pop() || rel
+    row.textContent = name + ':' + pos.line + ':' + pos.column
+    row.title = rel + ':' + pos.line
+    row.addEventListener('click', () => {
+      hideReferencesOverlay()
+      jumpToLocation(loc)
+    })
+    list.appendChild(row)
+  }
+  el.appendChild(list)
+  root.appendChild(el)
+  overlayEl = el
+  const onKey = (e) => { if (e.key === 'Escape') hideReferencesOverlay() }
+  window.addEventListener('keydown', onKey)
+  el.addEventListener('click', (e) => { if (e.target === el) hideReferencesOverlay() })
+  el._onKey = onKey
+}
+
+export function hideReferencesOverlay() {
+  if (overlayEl) {
+    window.removeEventListener('keydown', overlayEl._onKey)
+    overlayEl.remove()
+    overlayEl = null
+  }
+}
+
+/** 编辑器状态栏提示（复用 EditorView 的 status 通道）。 */
+function setStatus(text) {
+  window.dispatchEvent(new CustomEvent('edrv:status', { detail: { text } }))
+}
+
+/** 当前会话与语言就绪状态（供编辑器状态点）。 */
+export function lspStatusDot(languageId) {
+  const status = lspStatusFor(languageId)
+  return status ? status.phase : 'none'
+}

package/src/client/outline/OutlinePanel.tsx

@@ -65,7 +65,7 @@ export function OutlinePanel(props) {
     const sources = sourcesRef.current
     if (!sources) { setSymbols([]); setError(null); return }
     setError(null)
-    resolveOutline(sources, { languageId: model.getLanguageId(), model, editor: ed, monaco: window.monaco })
+    resolveOutline(sources, { languageId: model.getLanguageId(), path: modelPath, model, editor: ed, monaco: window.monaco })
       .then((list) => { if (seq === seqRef.current) setSymbols(list || []) })
       .catch((e) => { if (seq === seqRef.current) { setError(String(e?.message ?? e)); setSymbols(null) } })
   }, [])

package/src/client/outline/lspSource.ts

@@ -0,0 +1,49 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — 大纲「lsp」源：经 host LSP documentSymbol 解析（优先于 monaco/fallback）。
+ * LSP 服务器未就绪时返回 [] → resolveOutline 自动落入下一优先级（fallback 兜底），不阻塞面板。
+ * 作者 ddj 2026-08-27
+ */
+import type { OutlineSource, OutlineSourceInput, OutlineSymbol } from './types.js'
+import { fetchDocumentSymbols } from '../monaco/lsp/lspClient.js'
+
+export const LSP_OUTLINE_PRIORITY = 60
+
+/** LSP 大纲源：lua/csharp 等有 host 服务器能力的语言。 */
+export function createLspOutlineSource(): OutlineSource {
+  return {
+    id: 'lsp',
+    priority: LSP_OUTLINE_PRIORITY,
+    provides: (languageId: string) => languageId === 'lua' || languageId === 'csharp',
+    async get(input: OutlineSourceInput): Promise<OutlineSymbol[]> {
+      const model = input.model
+      if (!model || typeof model.getValue !== 'function') return []
+      const path = input.path || (model.uri && model.uri.path ? decodeURIComponent(String(model.uri.path).replace(/^\//, '')) : null)
+      if (!path) return []
+      const symbols = await fetchDocumentSymbols(path, model.getValue())
+      return (Array.isArray(symbols) ? symbols : []).map(toOutline).filter(Boolean)
+    },
+  }
+}
+
+/** LSP SymbolInfo（host 归一化，0-based range）→ 大纲 OutlineSymbol（1-based）。 */
+function toOutline(symbol) {
+  if (!symbol || typeof symbol.name !== 'string') return null
+  const range = symbol.range || {}
+  const sel = symbol.selectionRange || range
+  const start = range.start || {}
+  const select = sel.start || {}
+  const out = {
+    name: symbol.name,
+    kind: typeof symbol.kind === 'number' ? symbol.kind : 0,
+    startLine: Math.max(1, (start.line ?? 0) + 1),
+    endLine: Math.max(1, ((range.end?.line ?? start.line) ?? 0) + 1),
+    selectLine: Math.max(1, (select.line ?? start.line ?? 0) + 1),
+  }
+  if (typeof symbol.detail === 'string' && symbol.detail) out.detail = symbol.detail
+  if (Array.isArray(symbol.children) && symbol.children.length) {
+    const kids = symbol.children.map(toOutline).filter(Boolean)
+    if (kids.length) out.children = kids
+  }
+  return out
+}

package/src/client/outline/parse.ts

@@ -129,12 +129,42 @@ function parsePwsh(text: string): OutlineSymbol[] {
   return out
 }
 
-/** Lua：`function Foo:bar` / `M.bar = class|function`。 */
+/** Lua：`function Foo:bar` / `M.bar = class|function` + EmmyLua 注解（---@class/@alias/@enum/@field）。 */
 function parseLua(text: string): OutlineSymbol[] {
   const out: OutlineSymbol[] = []
   const lines = text.split('\n')
+  /** 当前注解类（收拢紧随的 ---@field 为字段子节点）。 */
+  let pendingClass: OutlineSymbol | null = null
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i]
+    // EmmyLua 注解（---@）：class/alias/enum 进大纲根，field 收给当前类
+    const am = /^[ \t]*---@(class|alias|enum|field|type)\s+([^\r\n]+)/.exec(line)
+    if (am) {
+      const tag = am[1]
+      const rest = am[2].trim()
+      const name = (rest.match(/^([A-Za-z_][\w]*)/) || [])[1] ?? ''
+      if (tag === 'class') {
+        if (name) {
+          const item = mk(i, name, SK.Class, line)
+          item.children = []
+          out.push(item)
+          pendingClass = item
+        } else pendingClass = null
+      } else if (tag === 'alias') {
+        if (name) out.push(mk(i, name, SK.TypeParameter, line))
+        pendingClass = null
+      } else if (tag === 'enum') {
+        if (name) out.push(mk(i, name, SK.Enum, line))
+        pendingClass = null
+      } else if (tag === 'field') {
+        if (name && pendingClass) {
+          pendingClass.children!.push(mk(i, name, SK.Field, line))
+        }
+      } else if (tag === 'type') {
+        pendingClass = null
+      }
+      continue
+    }
     if (/^\s*--/.test(line)) continue
     const fm = /^[ \t]*(?:local[ \t]+)?function[ \t]+([A-Za-z_][\w.:]*)/.exec(line)
     if (fm) { out.push(mk(i, fm[1], SK.Function, line)); continue }

package/src/client/outline/types.ts

@@ -24,6 +24,8 @@ export interface OutlineSymbol {
 /** 大纲数据源输入（面板解析时注入当前快照；字段均为弱类型，源自行 duck-typing）。 */
 export interface OutlineSourceInput {
   languageId: string
+  /** 活动文件路径（工作区相对，可空；LSP 等源用）。 */
+  path?: string
   /** Monaco 文本模型（源可用 model.getValue() 自行解析）。 */
   model?: unknown
   /** 当前 Monaco 编辑器实例（供 _commandService 等内部调用）。 */

package/src/client/styles/editor.css

@@ -33,6 +33,13 @@
 [data-edrv-view] .edrv-btn-mini:disabled { opacity: .45; cursor: default; }
 [data-edrv-view] .edrv-statusbar { display: flex; align-items: center; gap: 10px; padding: 3px 10px; border-top: 1px solid var(--dsw-alias-border-l1, #333); background: var(--dsw-alias-bg-layer-1, transparent); font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); flex-shrink: 0; white-space: nowrap; overflow: hidden; }
 [data-edrv-view] .edrv-statusbar .edrv-sp-path { flex: 1; overflow: hidden; text-overflow: ellipsis; }
+[data-edrv-view] .edrv-statusbar .edrv-sp-lsp { flex: 0 1 auto; overflow: hidden; text-overflow: ellipsis; }
+[data-edrv-view] .edrv-statusbar .edrv-sp-progress-message { flex: 1 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; color: var(--dsw-alias-label-secondary, #52606d); }
+[data-edrv-view] .edrv-statusbar .edrv-sp-progress { flex: 0 0 auto; min-width: 36px; text-align: right; font-variant-numeric: tabular-nums; color: var(--dsw-alias-label-secondary, #52606d); }
+[data-edrv-view] .edrv-lsp-status-dot { width: 7px; height: 7px; border-radius: 50%; flex: 0 0 auto; background: var(--dsw-alias-label-tertiary, #9aa5b1); }
+[data-edrv-view] .edrv-lsp-status-dot.ready { background: var(--dsw-alias-state-success-primary, #0f9d58); }
+[data-edrv-view] .edrv-lsp-status-dot.busy { background: var(--dsw-alias-state-warn-primary, #d97706); animation: edrv-lsp-pulse 1.2s ease-in-out infinite; }
+@keyframes edrv-lsp-pulse { 50% { opacity: .45; } }
 [data-edrv-view] .edrv-diffchip { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-state-warn-primary, #b7791f); cursor: pointer; white-space: nowrap; flex-shrink: 0; }
 [data-edrv-view] .edrv-chip-btn { font-size: 12px; padding: 2px 6px; border: none; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; border-radius: 4px; flex-shrink: 0; }
 [data-edrv-view] .edrv-chip-btn:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
@@ -284,3 +291,11 @@
 [data-edrv-view] .edrv-search-toggle.on { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); color: var(--dsw-alias-label-primary, #1f2933); border-color: var(--dsw-alias-brand-primary, #0f9d58); }
 [data-edrv-view] .edrv-search-toggle:disabled { opacity: .4; cursor: default; }
 
+/* LSP 引用结果浮动面板（Shift+F12 / 右键「查找所有引用」） */
+[data-edrv-view] .edrv-refs { position: absolute; right: 12px; top: 40px; z-index: 60; width: 360px; max-height: 60%; display: flex; flex-direction: column; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 8px; background: var(--dsw-alias-bg-panel, #161b22); box-shadow: 0 6px 24px rgba(0,0,0,.4); overflow: hidden; font-size: 12px; }
+[data-edrv-view] .edrv-refs-head { padding: 6px 10px; font-weight: 600; color: var(--dsw-alias-label-primary, #eee); border-bottom: 1px solid var(--dsw-alias-border-l2, #333); background: var(--dsw-alias-bg-layer-1, transparent); }
+[data-edrv-view] .edrv-refs-list { overflow-y: auto; }
+[data-edrv-view] .edrv-refs-row { padding: 4px 10px; cursor: pointer; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--dsw-alias-label-secondary, #c0c8d0); font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-refs-row:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.10)); color: var(--dsw-alias-label-primary, #fff); }
+
+