dsh-vscode-mode 0.1.35 → 0.1.42

package/src/lsp/rpc.ts

@@ -6,10 +6,11 @@
 import type { Ctx } from '../store.js'
 import { searchRoot } from '../search/ripgrep.js'
 import { sessionOf, cwdOf } from '../registry.js'
-import { resolveProviderSpec, langOfPath, configFromPlugin, configFromSettings, LSP_SETTINGS_NS, type LspConfig } from './config.js'
+import { resolveProviderSpec, langOfPath, configFromPlugin, configFromSettings, LSP_LANGUAGES, LSP_SETTINGS_NS, type LspConfig } from './config.js'
+import { clearProviderCache } from './providers.js'
 import type { LspManager } from './manager.js'
 import type { RpcHandlerMap } from '../shared/rpc.js'
-import type { LspLocation } from '../shared/lsp.js'
+import type { LspLocation, LspServerStatus } from '../shared/lsp.js'
 import { installFromMarket, installVsixFile, listInstalled, marketGet, marketSearch, uninstall, updateExtension, type ExtInfo } from './extmgr.js'
 
 export interface LspRpcDeps {
@@ -85,6 +86,21 @@ function createDocTracker() {
       sessionDocs.delete(sessionId)
       return [...toRelease]
     },
+    /** 清除指定语言的文档归属，让当前客户端重新同步时重新 acquire。 */
+    resetLanguage(languageId: string): void {
+      for (const [docKey, owners] of openDocs) {
+        if (!docKey.includes('|' + languageId + '|')) continue
+        for (const sessionId of owners) forgetDoc(sessionId, docKey)
+        openDocs.delete(docKey)
+      }
+      for (const key of [...rootLangRefs.keys()]) if (key.endsWith('|' + languageId)) rootLangRefs.delete(key)
+    },
+    /** 返回指定会话已打开的文档路径，用于重检测后恢复同步。 */
+    pathsFor(sessionId: string, languageId: string): string[] {
+      const docs = sessionDocs.get(sessionId)
+      if (!docs) return []
+      return [...docs].filter((key) => key.includes('|' + languageId + '|')).map((key) => key.slice(key.lastIndexOf('|') + 1))
+    },
   }
 }
 
@@ -122,6 +138,41 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
   const rootLocations = (locations: LspLocation[], root: string): LspLocation[] =>
     locations.map((location) => ({ ...location, root }))
 
+  /** 当前 provider 检测结论 → 设置页 idle 状态（不启动 server）。 */
+  const detectedStatus = (languageId: string, root?: string): LspServerStatus => {
+    const spec = resolveProviderSpec(ctx, pluginConfig, languageId)
+    return {
+      languageId,
+      source: spec.kind,
+      phase: 'idle',
+      reason: spec.ready ? undefined : spec.reason,
+      version: spec.version,
+      providerName: spec.providerName,
+      root,
+    }
+  }
+
+  /**
+   * 清发现缓存并重置旧 server（保留 tracker 文档记录）；
+   * 下一次模型同步会按最新配置重新 acquire，已打开文档无需重开。
+   * 作者 ddj 2026年09月02号
+   * @param languageId 语言 id
+   * @param sessionId 会话语境（缺省重置全部工作区该语言）
+   * @returns 检测后的 idle 状态列表
+   */
+  const redetectLanguage = async (languageId: string, sessionId?: string): Promise<LspServerStatus[]> => {
+    clearProviderCache()
+    if (sessionId) {
+      const sc = await rootOf(sessionId)
+      if ('err' in sc) return []
+      manager.reset(sc.root, languageId)
+      return [detectedStatus(languageId, sc.root)]
+    }
+    const roots = [...new Set(manager.statusAll().filter((s) => s.languageId === languageId).map((s) => s.root))]
+    manager.resetLanguage(languageId)
+    return roots.length ? roots.map((root) => detectedStatus(languageId, root)) : [detectedStatus(languageId)]
+  }
+
   const disposeSession = (sessionId: string): void => {
     for (const rl of tracker.closeSession(sessionId)) {
       const sep = rl.lastIndexOf('|')
@@ -160,10 +211,12 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
         const settings = ctx.get('settings')
         if (!settings?.update) return { ok: false, error: '设置服务不可用' }
         await settings.update(LSP_SETTINGS_NS, { [lang]: target })
+        // 保存/切换后立即重新检测：清缓存 + 重置旧 server，旧状态不残留
+        const servers = await redetectLanguage(lang)
         const descriptor = settings.describe?.({ redactSecrets: true })?.find((item: { ns?: string }) => item.ns === LSP_SETTINGS_NS)
         const stored = descriptor?.value as Record<string, unknown> | undefined
         const merged: LspConfig = { ...configFromPlugin(pluginConfig), ...(stored as LspConfig) }
-        return { ok: true, config: merged as unknown as Record<string, unknown> }
+        return { ok: true, config: merged as unknown as Record<string, unknown>, servers }
       } catch (error) {
         return { ok: false, error: '配置保存失败：' + String(error) }
       }
@@ -274,6 +327,31 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
       }
     },
 
+    'edrv.lsp.semanticTokens': async (args) => {
+      const lang = langOfPath(args.path)
+      if (!lang) return { ok: true, tokens: undefined }
+      const sc = await rootOf(args.sessionId)
+      if ('err' in sc) return { ok: false, error: sc.err }
+      try {
+        const server = serverOf(sc.root, lang)
+        if (!server) return { ok: true, tokens: undefined }
+        return { ok: true, tokens: (await server.semanticTokens(args.path)) ?? undefined }
+      } catch (error) {
+        return { ok: false, error: 'LSP 语义分色查询失败：' + String(error) }
+      }
+    },
+
+    'edrv.lsp.redetect': async (args) => {
+      if (!(LSP_LANGUAGES as readonly string[]).includes(args.languageId)) {
+        return { ok: false, error: '不支持的语言：' + args.languageId }
+      }
+      try {
+        return { ok: true, servers: await redetectLanguage(args.languageId) }
+      } catch (error) {
+        return { ok: false, error: '重新检测失败：' + String(error) }
+      }
+    },
+
     // --region 扩展管理（edrv.lsp.ext.*：已装/市场/安装/卸载/更新）
     'edrv.lsp.ext.list': async () => ({ ok: true, extensions: listInstalled() }),
 
@@ -292,6 +370,7 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
         if (args.vsixPath) info = await installVsixFile(args.vsixPath)
         else if (args.namespace && args.name) info = await installFromMarket(args.namespace, args.name, args.version)
         else return { ok: false, error: '缺少安装源（vsixPath 或 namespace+name）' }
+        clearProviderCache() // 新扩展可能成为 Lua provider，立即丢弃旧发现结果
         return { ok: true, extension: info }
       } catch (error) {
         return { ok: false, error: '安装失败：' + String(error) }
@@ -299,7 +378,9 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
     },
 
     'edrv.lsp.ext.uninstall': async (args) => {
-      return uninstall(args.id) ? { ok: true } : { ok: false, error: '扩展未安装：' + args.id }
+      const ok = uninstall(args.id)
+      if (ok) clearProviderCache()
+      return ok ? { ok: true } : { ok: false, error: '扩展未安装：' + args.id }
     },
 
     'edrv.lsp.ext.update': async (args) => {
@@ -309,6 +390,7 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
           const current = listInstalled().find((e) => e.id === args.id)
           return current ? { ok: true, extension: current, updated: false } : { ok: false, error: '扩展未安装：' + args.id }
         }
+        clearProviderCache()
         return { ok: true, extension: updated, updated: true }
       } catch (error) {
         return { ok: false, error: '更新失败：' + String(error) }

package/src/lsp/server.ts

@@ -8,8 +8,10 @@ import { spawnServer, type Transport } from './transport.js'
 import { createLspClient, type LspClient } from './client.js'
 import { pathToFileUri } from './uri.js'
 import type { LspProviderSpec } from './providers.js'
+import { LSP_SEMANTIC_TOKEN_MODIFIERS, LSP_SEMANTIC_TOKEN_TYPES } from '../shared/lsp.js'
 import type {
   LspLocation,
+  LspSemanticTokens,
   LspServerCapabilities,
   LspServerPhase,
   LspServerStatus,
@@ -31,6 +33,7 @@ export interface LspServer {
   documentSymbol(path: string): Promise<LspSymbol[]>
   workspaceSymbol(query: string): Promise<LspSymbol[]>
   hover(path: string, line: number, character: number): Promise<{ contents: string[] } | null>
+  semanticTokens(path: string): Promise<LspSemanticTokens | null>
   dispose(): Promise<void>
 }
 
@@ -59,18 +62,39 @@ export function createLspServer(spec: LspProviderSpec, root: string, languageId:
   let phase: LspServerPhase = 'idle'
   let transport: Transport | null = null
   let client: LspClient | null = null
-  let capabilities: LspServerCapabilities = { definition: false, references: false, documentSymbol: false, workspaceSymbol: false, hover: false }
+  let capabilities: LspServerCapabilities = {
+    definition: false,
+    references: false,
+    documentSymbol: false,
+    workspaceSymbol: false,
+    hover: false,
+    semanticTokens: false,
+    semanticTokenTypes: [...LSP_SEMANTIC_TOKEN_TYPES],
+    semanticTokenModifiers: [...LSP_SEMANTIC_TOKEN_MODIFIERS],
+  }
   let disposed = false
   let readyWait: Promise<boolean> = Promise.resolve(false)
   let resolveReady: ((ready: boolean) => void) | null = null
   let lastProgress: { value?: number; message?: string } = {}
-  let lastStatus: LspServerStatus = { languageId, source: spec.kind, phase: 'idle', reason: spec.ready ? undefined : spec.reason, root }
+  let lastStatus: LspServerStatus = {
+    languageId,
+    source: spec.kind,
+    phase: 'idle',
+    reason: spec.ready ? undefined : spec.reason,
+    root,
+    version: spec.version,
+    providerName: spec.providerName ?? (spec.version ? '语言服务器扩展' : undefined),
+  }
 
   const log = (line: string): void => logger?.('[' + languageId + '@' + root + '] ' + line)
+  const providerInfo = {
+    version: spec.version,
+    providerName: spec.providerName ?? (spec.version ? 'EmmyLua' : undefined),
+  }
 
   const setPhase = (next: LspServerPhase, reason?: string): void => {
     phase = next
-    lastStatus = { languageId, source: spec.kind, phase: next, reason, root, ...progressFields() }
+    lastStatus = { languageId, source: spec.kind, phase: next, reason, root, ...providerInfo, ...progressFields() }
     server.onStateChange?.(lastStatus)
   }
 
@@ -254,6 +278,25 @@ export function createLspServer(spec: LspProviderSpec, root: string, languageId:
       return { contents: stringifyHoverContents(result.contents) }
     },
 
+    /** 查询全文 semantic tokens，并将服务器 legend 归一到插件固定 legend。 */
+    async semanticTokens(path: string): Promise<LspSemanticTokens | null> {
+      const doc = docs.get(path)
+      if (!doc || !(await readyWait) || !capabilities.semanticTokens) return null
+      const result = await ensureClient().request<{ data?: unknown; resultId?: unknown } | null>(
+        'textDocument/semanticTokens/full',
+        { textDocument: { uri: doc.uri } },
+      )
+      if (!result || !Array.isArray(result.data)) return null
+      return {
+        data: normalizeSemanticData(
+          result.data,
+          capabilities.semanticTokenTypes ?? [],
+          capabilities.semanticTokenModifiers ?? [],
+        ),
+        resultId: typeof result.resultId === 'string' ? result.resultId : undefined,
+      }
+    },
+
     async dispose(): Promise<void> {
       disposed = true
       resolveReady?.(false)
@@ -344,3 +387,37 @@ function toInt(value: unknown): number {
   const n = Number(value)
   return Number.isFinite(n) ? Math.max(0, Math.floor(n)) : 0
 }
+
+/** 把服务器 legend 下的 5 元组流转换为插件固定 legend 下的 5 元组流。 */
+function normalizeSemanticData(data: unknown[], types: string[], modifiers: string[]): number[] {
+  const out: number[] = []
+  let previousLine = 0
+  let previousCharacter = 0
+  let outputLine = 0
+  let outputCharacter = 0
+  for (let i = 0; i + 4 < data.length; i += 5) {
+    const deltaLine = toInt(data[i])
+    const deltaCharacter = toInt(data[i + 1])
+    const length = toInt(data[i + 2])
+    const sourceType = types[toInt(data[i + 3])] ?? 'variable'
+    const sourceModifiers = toInt(data[i + 4])
+    const line = previousLine + deltaLine
+    const character = deltaLine === 0 ? previousCharacter + deltaCharacter : deltaCharacter
+    const typeIndex = Math.max(0, LSP_SEMANTIC_TOKEN_TYPES.indexOf(sourceType as never))
+    let modifierBits = 0
+    for (let bit = 0; bit < modifiers.length; bit++) {
+      if ((sourceModifiers & (1 << bit)) === 0) continue
+      const modifier = modifiers[bit]
+      const targetBit = LSP_SEMANTIC_TOKEN_MODIFIERS.indexOf(modifier as never)
+      if (targetBit >= 0) modifierBits |= 1 << targetBit
+    }
+    const outputDeltaLine = line - outputLine
+    const outputDeltaCharacter = outputDeltaLine === 0 ? character - outputCharacter : character
+    out.push(outputDeltaLine, outputDeltaCharacter, length, typeIndex, modifierBits)
+    previousLine = line
+    previousCharacter = character
+    outputLine = line
+    outputCharacter = character
+  }
+  return out
+}

package/src/paths.ts

@@ -25,6 +25,8 @@ export const DSH_DIR_NAME = '.dsh'
 export const DSH_HOME_ENV = 'DSH_HOME'
 /** 树缓存 schema 版本（文件名携带；版本递增即触发旧版清理）。 */
 export const TREE_CACHE_SCHEMA = 1
+/** LSP provider 发现缓存 schema 版本（格式变更即递增，旧文件自动失效）。 */
+export const LSP_SPEC_CACHE_SCHEMA = 4
 /** 树缓存保留期：超期文件视为废弃（工作区搬迁/废弃残留）。 */
 export const TREE_RETENTION_MS = 30 * 24 * 60 * 60 * 1000
 /** 插件缓存目录总预算：超限按 mtime 从旧到新删文件，防任意增长撑爆磁盘（最后兜底）。 */
@@ -141,6 +143,11 @@ export function userCacheDir(home = dshHome()): string {
   return join(pluginCacheRoot(home), 'user')
 }
 
+/** LSP provider 发现结果缓存文件（用户级：user/lsp-specs.v<schema>.json，跨会话/跨重启共享）。 */
+export function lspSpecCacheFile(home = dshHome(), schema = LSP_SPEC_CACHE_SCHEMA): string {
+  return join(userCacheDir(home), 'lsp-specs.v' + schema + '.json')
+}
+
 /** 插件日志根（~/.dsh/dsh-vscode-mode/logs，用户级）。 */
 export function pluginLogRoot(home = dshHome()): string {
   return join(home, PLUGIN_ID, 'logs')

package/src/rpc.ts

@@ -284,7 +284,10 @@ export function buildHandlers(
       try {
         const target = await resolveTarget(ctx, sc.session, args.path)
         const info = await fs.stat(target)
-        if (!info || info.type !== 'file') return { ok: false, error: '文件不存在' }
+        if (!info || info.type !== 'file') {
+          // 带上解析后的真实路径：跳转失败时可直接看出是路径解析错还是目标本身不存在
+          return { ok: false, error: '文件不存在', resolvedPath: fs.processPath(target) }
+        }
         if ((info.size ?? 0) > READ_CAP) return { ok: false, error: '文件过大（>8MB），不支持整文件预览' }
         const content = await fs.readText(target)
         return { ok: true, content, size: content.length }

package/src/shared/lsp.ts

@@ -49,6 +49,26 @@ export interface LspHover {
   range?: LspRange
 }
 
+/** LSP semantic token 标准类型（host 归一化后，client 与 Monaco 共用）。 */
+export const LSP_SEMANTIC_TOKEN_TYPES = [
+  'namespace', 'type', 'class', 'enum', 'interface', 'struct', 'typeParameter',
+  'parameter', 'variable', 'property', 'enumMember', 'event', 'function', 'method',
+  'macro', 'label', 'comment', 'string', 'keyword', 'number', 'regexp', 'operator',
+  'decorator',
+] as const
+
+/** LSP semantic token 标准修饰符（host 归一化后，client 与 Monaco 共用）。 */
+export const LSP_SEMANTIC_TOKEN_MODIFIERS = [
+  'declaration', 'definition', 'readonly', 'static', 'deprecated', 'abstract',
+  'async', 'modification', 'documentation', 'defaultLibrary', 'global', 'local', 'mutable',
+] as const
+
+/** 归一化后的 LSP semanticTokens/full 结果（data 使用 LSP delta 编码）。 */
+export interface LspSemanticTokens {
+  data: number[]
+  resultId?: string
+}
+
 /** LSP 服务器能力子集：本插件会用到的方法。 */
 export interface LspServerCapabilities {
   definition: boolean
@@ -56,6 +76,9 @@ export interface LspServerCapabilities {
   documentSymbol: boolean
   workspaceSymbol: boolean
   hover: boolean
+  semanticTokens: boolean
+  semanticTokenTypes?: string[]
+  semanticTokenModifiers?: string[]
 }
 
 /** 服务器进程/会话状态。 */
@@ -77,6 +100,7 @@ export interface LspServerStatus {
   progress?: number // LSP 工作区解析进度（0–100，未知时省略）
   progressMessage?: string
   root?: string     // 绑定工作区根（相对显示）
+  providerName?: string // provider 名称（如 EmmyLua / LuaLS）
 }
 
 /**

package/src/shared/rpc.ts

@@ -14,7 +14,7 @@ import type {
 } from './types.js'
 import type { MpcConfig, MpcProject, MpcProjectSaveInput, MpcServer } from './mcp.js'
 import type { CompatReport, DevFormInfo } from './compat.js'
-import type { LspExtInfo, LspExtUpdate, LspHover, LspLocation, LspMarketItem, LspPosition, LspServerStatus, LspSymbol } from './lsp.js'
+import type { LspExtInfo, LspExtUpdate, LspHover, LspLocation, LspMarketItem, LspPosition, LspSemanticTokens, LspServerStatus, LspSymbol } from './lsp.js'
 
 /** webServer 精确路由。 */
 export const RPC_PATH = '/edrv/rpc'
@@ -143,6 +143,8 @@ export interface RpcRequestMap {
   'edrv.lsp.documentSymbol': { sessionId?: string; path: string }
   'edrv.lsp.workspaceSymbol': { sessionId?: string; query: string }
   'edrv.lsp.hover': { sessionId?: string; path: string; position: LspPosition }
+  'edrv.lsp.semanticTokens': { sessionId?: string; path: string }
+  'edrv.lsp.redetect': { languageId: string }
   'edrv.lsp.configGet': {}
   'edrv.lsp.configUpdate': { languageId: string; enabled?: boolean; command?: string; path?: string }
   'edrv.lsp.ext.list': {}
@@ -205,8 +207,10 @@ export interface RpcOkMap {
   'edrv.lsp.documentSymbol': { symbols: LspSymbol[] }
   'edrv.lsp.workspaceSymbol': { symbols: LspSymbol[]; truncated?: boolean }
   'edrv.lsp.hover': { hover?: LspHover }
+  'edrv.lsp.semanticTokens': { tokens?: LspSemanticTokens }
+  'edrv.lsp.redetect': { servers: LspServerStatus[] }
   'edrv.lsp.configGet': { config: Record<string, unknown> }
-  'edrv.lsp.configUpdate': { config: Record<string, unknown> }
+  'edrv.lsp.configUpdate': { config: Record<string, unknown>; servers?: LspServerStatus[] }
   'edrv.lsp.ext.list': { extensions: LspExtInfo[] }
   'edrv.lsp.ext.install': { extension: LspExtInfo; updated?: boolean }
   'edrv.lsp.ext.uninstall': object