dsh-vscode-mode 0.1.51 → 0.1.52

package/package.json

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

package/src/index.ts

@@ -20,7 +20,6 @@ import { sweepTreeCache } from './paths.js'
 import { PLUGIN_NAME, buildReport } from './compat.js'
 import { createLspManager } from './lsp/manager.js'
 import { createLspRpc } from './lsp/rpc.js'
-import { installLspSettingsSection } from './lsp/settings.js'
 import { disposeAllServers } from './lsp/transport.js'
 import { installRulesSection } from './rules.js'
 import type { RpcHandlerMap } from './shared/rpc.js'
@@ -45,7 +44,7 @@ export function apply(ctx: Ctx, config?: unknown): void {
   /** 兼容性警告收集（route 护栏等写入，启动日志一并输出）。 */
   const warnings: string[] = []
   setupOpenSettings(ctx, config, () => {})
-  void installLspSettingsSection(ctx, {})
+  /** LSP 配置为配置值模式：插件组合配置 + 会话内运行时覆盖（原 settings section 命名空间不合法，见 lsp/config.ts）。 */
   /** 规则注入 section（~/.dsh/rules 与 <工作区>/.dsh/rules；旧版 DSH 无 systemPrompt 时静默降级）。 */
   const rulesInstalled = installRulesSection(ctx)
   if (!rulesInstalled) ctx.logger?.warn?.('[' + name + '] 未检测到 systemPrompt 服务，规则仅可管理不注入')

package/src/lsp/config.ts

@@ -1,9 +1,11 @@
 /**
  * dsh-vscode-mode host — LSP 配置读取与 provider 解析装配。
- * 配置来源优先级：settings 持久化（ns dsh-vscode-mode.languageServers）> 插件组合配置 > 默认。
- * 作者 ddj 2026-08-27
+ * 配置来源优先级：运行时覆盖（设置页保存，重启失效）> 插件组合配置 > 默认。
+ * 原 settings section（ns dsh-vscode-mode.languageServers）命名空间不合法
+ * （DSH settings 仅允许 /^[a-z][a-z0-9-]*$/，点号命名空间永久不可注册），
+ * 已降级为配置值（插件组合配置 + 会话内运行时覆盖），不再尝试 settings 安装。
+ * 作者 ddj 2026-08-27 / 2026-09-02
  */
-import type { Ctx } from '../store.js'
 import { PROVIDER_RESOLVERS, type LspProviderSpec } from './providers.js'
 import { provisionRuntime } from './dotnetProvision.js'
 
@@ -21,10 +23,10 @@ export interface LspConfig {
   [languageId: string]: LspLangConfig | undefined
 }
 
-export const LSP_SETTINGS_NS = 'dsh-vscode-mode.languageServers'
 export const LSP_LANGUAGES = ['lua', 'csharp'] as const
 
-function sanitizeLang(raw: unknown): LspLangConfig | undefined {
+/** 清洗单语言配置：仅保留合法字段并剥离 undefined（稀疏覆盖语义，清空字段即回落组合配置）。 */
+export function sanitizeLang(raw: unknown): LspLangConfig | undefined {
   if (!raw || typeof raw !== 'object') return undefined
   const obj = raw as Record<string, unknown>
   const out: LspLangConfig = {}
@@ -46,25 +48,7 @@ export function configFromPlugin(config: unknown): LspConfig {
   return out
 }
 
-/** 从 settings 描述符读取（无 settings 服务/无该 section → {}）。 */
-export function configFromSettings(ctx: Ctx): LspConfig {
-  try {
-    const settings = ctx.get('settings')
-    const descriptor = settings?.describe?.({ redactSecrets: true })?.find((item: { ns?: string }) => item.ns === LSP_SETTINGS_NS)
-    const value = descriptor?.value
-    if (!value || typeof value !== 'object') return {}
-    const out: LspConfig = {}
-    for (const lang of LSP_LANGUAGES) {
-      const v = sanitizeLang((value as Record<string, unknown>)[lang])
-      if (v) out[lang] = v
-    }
-    return out
-  } catch (error) {
-    return {}
-  }
-}
-
-/** 合并配置：settings 覆盖插件配置。 */
+/** 合并配置：上层（运行时覆盖/settings）覆盖插件组合配置。 */
 export function mergeConfig(a: LspConfig, b: LspConfig): LspConfig {
   const out: LspConfig = { ...a }
   for (const lang of LSP_LANGUAGES) {
@@ -77,17 +61,17 @@ export function mergeConfig(a: LspConfig, b: LspConfig): LspConfig {
 }
 
 /**
- * 解析某语言的 provider spec（合并配置后）。
- * @author ddj 2026年08月27号
- * @param ctx DSH 上下文
+ * 解析某语言的 provider spec（插件组合配置 + 运行时覆盖层合并后）。
+ * @author ddj 2026年08月27号 / 2026年09月02号
  * @param pluginConfig 插件组合配置
  * @param languageId 语言 id
+ * @param override 运行时覆盖层（设置页保存值，重启失效；缺省为空）
  * @returns provider 规格
  */
-export function resolveProviderSpec(ctx: Ctx, pluginConfig: unknown, languageId: string): LspProviderSpec {
+export function resolveProviderSpec(pluginConfig: unknown, languageId: string, override?: LspConfig): LspProviderSpec {
   const resolver = PROVIDER_RESOLVERS[languageId]
   if (!resolver) return { languageId, kind: 'none', argv: [], ready: false, reason: '不支持的语言：' + languageId }
-  const merged = mergeConfig(configFromPlugin(pluginConfig), configFromSettings(ctx))
+  const merged = mergeConfig(configFromPlugin(pluginConfig), override ?? {})
   const lang = merged[languageId]
   if (lang && lang.enabled === false) {
     return { languageId, kind: 'none', argv: [], ready: false, reason: '已在设置中禁用' }

package/src/lsp/rpc.ts

@@ -1,12 +1,14 @@
 /**
  * dsh-vscode-mode host — edrv.lsp.* RPC handlers。
  * 文档跟踪（openDocs 集合 + root|lang 引用计数）→ 懒启动服务器、用完释放。
- * 作者 ddj 2026-08-27
+ * LSP 配置降级为配置值：插件组合配置 + 会话内运行时覆盖层（原 settings section
+ * 命名空间不合法，永久不可注册，见 lsp/config.ts 头注释）。
+ * 作者 ddj 2026-08-27 / 2026-09-02
  */
 import type { Ctx } from '../store.js'
 import { searchRoot } from '../search/ripgrep.js'
 import { sessionOf, cwdOf } from '../registry.js'
-import { resolveProviderSpec, langOfPath, configFromPlugin, configFromSettings, LSP_LANGUAGES, LSP_SETTINGS_NS, type LspConfig } from './config.js'
+import { resolveProviderSpec, langOfPath, configFromPlugin, mergeConfig, sanitizeLang, LSP_LANGUAGES, type LspConfig, type LspLangConfig } from './config.js'
 import { clearProviderCache, candidatesFor } from './providers.js'
 import { onRuntimeProvisioned, envInstallStates } from './dotnetProvision.js'
 import { envRequirementsFor, installRequirement } from './envRequirements.js'
@@ -116,6 +118,8 @@ function createDocTracker() {
 export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMap>; disposeSession: (sessionId: string) => void } {
   const { ctx, pluginConfig, manager } = deps
   const tracker = createDocTracker()
+  /** 运行时覆盖层：设置页保存值（内存态，重启回落组合配置值；每 apply 新建，插件重载自动复位）。 */
+  const runtimeConfig: LspConfig = {}
 
   // 运行时自动配置成功：清 provider 缓存并重置 C# 服务器，下一次文档同步即用新运行时重启
   onRuntimeProvisioned(() => {
@@ -139,7 +143,7 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
   }
 
   const acquireServer = (root: string, lang: string) =>
-    manager.acquire(root, lang, (languageId: string) => resolveProviderSpec(ctx, pluginConfig, languageId))
+    manager.acquire(root, lang, (languageId: string) => resolveProviderSpec(pluginConfig, languageId, runtimeConfig))
 
   const serverOf = (root: string, lang: string) =>
     manager.peek(root, lang)
@@ -149,7 +153,7 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
 
   /** 当前 provider 检测结论 → 设置页 idle 状态（不启动 server）；附带未满足的环境需求与候选服务器。 */
   const detectedStatus = (languageId: string, root?: string): LspServerStatus => {
-    const spec = resolveProviderSpec(ctx, pluginConfig, languageId)
+    const spec = resolveProviderSpec(pluginConfig, languageId, runtimeConfig)
     const missingEnv = envRequirementsFor(languageId, dshHome())
     const candidates = candidatesFor(languageId, spec)
     return {
@@ -207,10 +211,8 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
     },
 
     'edrv.lsp.configGet': async () => {
-      const settings = configFromSettings(ctx)
-      const plugin = configFromPlugin(pluginConfig)
-      const merged: LspConfig = { ...plugin }
-      for (const lang of Object.keys(settings)) merged[lang] = { ...plugin[lang], ...settings[lang] }
+      // 配置值降级：插件组合配置 + 运行时覆盖层（原 settings section 已废弃）
+      const merged = mergeConfig(configFromPlugin(pluginConfig), runtimeConfig)
       return { ok: true, config: merged as unknown as Record<string, unknown> }
     },
 
@@ -219,21 +221,16 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
       if (!lang || !(LSP_LANGUAGES as readonly string[]).includes(lang)) {
         return { ok: false, error: '不支持的语言：' + lang }
       }
-      const current = configFromSettings(ctx)
-      const next: LspConfig = { ...current, [lang]: { ...(current[lang] ?? {}) } }
-      const target = next[lang]!
+      // 覆盖层基于当前运行时值增量修改；清空字段剥离 undefined → 回落组合配置
+      const target: LspLangConfig = { ...(runtimeConfig[lang] ?? {}) }
       if (args.enabled !== undefined) target.enabled = args.enabled
       if (args.command !== undefined) target.command = args.command || undefined
       if (args.path !== undefined) target.path = args.path || undefined
+      runtimeConfig[lang] = sanitizeLang(target) ?? {}
       try {
-        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) }
+        const merged = mergeConfig(configFromPlugin(pluginConfig), runtimeConfig)
         return { ok: true, config: merged as unknown as Record<string, unknown>, servers }
       } catch (error) {
         return { ok: false, error: '配置保存失败：' + String(error) }

package/src/lsp/settings.ts

@@ -1,50 +0,0 @@
-/**
- * dsh-vscode-mode host — LSP 配置设置 section 安装（版本自适应；缺失/失败不抛错）。
- * ns：dsh-vscode-mode.languageServers；每语言 { enabled, command, path }。
- * 安装策略分派见 fileOpenSettings.runSettingsInstall（rc 线 legacy / alpha 线服务方法）。
- * 作者 ddj 2026-08-27 / 2026-09-02
- */
-import type { Ctx } from '../store.js'
-import { LSP_LANGUAGES, LSP_SETTINGS_NS, type LspConfig } from './config.js'
-import { loadSettingsDeps, runSettingsInstall, type SettingsDeps } from '../fileOpenSettings.js'
-
-/**
- * 安装 LSP 设置 section。
- * @author ddj 2026年08月27号
- * @param ctx DSH 上下文
- * @param entry 初始配置
- * @returns 是否成功安装
- */
-export async function installLspSettingsSection(ctx: Ctx, entry: LspConfig): Promise<boolean> {
-  let deps: SettingsDeps | null = null
-  try {
-    deps = await loadSettingsDeps()
-  } catch {
-    /* 装载失败按缺失处理 */
-  }
-  if (!deps) return false
-  try {
-    // schemastery 无 .optional()，对象字段默认即可选；.default 必给避免 undefined 覆盖
-    const z = deps.z
-    const langShape: Record<string, unknown> = {}
-    for (const lang of LSP_LANGUAGES) {
-      langShape[lang] = z.object({
-        enabled: z.boolean(),
-        command: z.string(),
-        path: z.string(),
-      }).default({})
-    }
-    const schema = z.object(langShape).default({})
-    const strategy = await runSettingsInstall(ctx, LSP_SETTINGS_NS, schema, entry, {
-      setSource: () => {},
-      onChange: () => {},
-    })
-    return strategy === 'legacy' || strategy === 'service'
-  } catch (error) {
-    // 设置 section 安装失败不致命：降级为无设置 UI，LSP 核心功能不受影响
-    console.error('[dsh-vscode-mode] LSP 设置 section 安装失败：' + String(error))
-    return false
-  }
-}
-
-export type { SettingsDeps }