dsh-vscode-mode 0.1.50 → 0.1.52

package/lib/index.js

@@ -7537,7 +7537,13 @@ function candidateEmmyLua(home = dshHome()) {
 	candidates.sort((a, b) => (b.version ?? "").localeCompare(a.version ?? "", void 0, { numeric: true }) || a.path.localeCompare(b.path));
 	return candidates[0] ?? null;
 }
-/** LuaLS 自动发现候选（VSCode 扩展目录 + extmgr 目录下 sumneko.lua-* 的 server/bin 可执行）。 */
+/**
+* LuaLS 自动发现候选（VSCode 扩展目录 + extmgr 目录下 sumneko.lua-* 的 server/bin 可执行）。
+* 多版本并存时按清单版本降序、路径升序排序（与 EmmyLua/DotRush 发现的排序策略一致）。
+* @author ddj 2026年09月03号
+* @param home DSH home（缺省真实；测试可注入临时目录）
+* @returns 排序后的候选列表（首个为建议选用者）
+*/
 function candidateLuaServers(home = dshHome()) {
 	const plat = platformServerDir();
 	const suffix = exeSuffix();
@@ -7546,40 +7552,62 @@ function candidateLuaServers(home = dshHome()) {
 		const binDir = join(extDir, "server", "bin");
 		const binName = "lua-language-server" + suffix;
 		const bin = existsSync(join(binDir, binName)) ? join(binDir, binName) : join(binDir, plat, binName);
-		if (existsSync(bin) && !out.includes(bin)) out.push(bin);
+		if (existsSync(bin) && !out.some((c) => c.path === bin)) out.push({
+			path: bin,
+			version: manifestVersionOf(extDir)
+		});
 	}
-	return out;
+	return out.sort((a, b) => (b.version ?? "").localeCompare(a.version ?? "", void 0, { numeric: true }) || a.path.localeCompare(b.path));
 }
 /**
 * C# 自动发现候选：ms-dotnettools.csharp 的 Roslyn dll（需 dotnet）/ OmniSharp 可执行，
 * 以及 DotRush 扩展自带服务器（extension/bin/LanguageServer/DotRush.dll，需对应 .NET 运行时）。
+* 同类多版本并存时取清单版本最高者（与 EmmyLua/DotRush 发现的排序策略一致）。
 * @author ddj 2026年09月03号
 * @param home DSH home（缺省真实；测试可注入临时目录）
 * @returns 发现结果
 */
 function candidateCSharpServers(home = dshHome()) {
 	const out = {};
+	/** 命中收集 → 清单版本降序取最高（平级按路径稳定排序）。 */
+	const bestOf = (hits) => hits.sort((a, b) => (b.version ?? "").localeCompare(a.version ?? "", void 0, { numeric: true }) || a.entry.localeCompare(b.entry))[0] ?? null;
+	const roslynHits = [];
+	const omniHits = [];
 	const dotrushHits = [];
 	for (const dir of vscodeExtensionsDirs(home)) {
 		for (const extDir of listMatchingDirs(dir, "ms-dotnettools.csharp-")) {
+			const version = manifestVersionOf(extDir);
 			const roslyn = join(extDir, ".roslyn", "Microsoft.CodeAnalysis.LanguageServer.dll");
-			if (!out.roslynDll && existsSync(roslyn)) out.roslynDll = roslyn;
+			if (existsSync(roslyn)) roslynHits.push({
+				entry: roslyn,
+				version
+			});
 			const omni = join(extDir, ".omnisharp", "OmniSharp" + exeSuffix());
-			if (!out.omnisharpExe && existsSync(omni)) out.omnisharpExe = omni;
+			if (existsSync(omni)) omniHits.push({
+				entry: omni,
+				version
+			});
 		}
 		for (const extDir of listMatchingDirs(dir, "nromanov.dotrush-")) {
 			const dll = join(extDir, "extension", "bin", "LanguageServer", "DotRush.dll");
 			if (!existsSync(dll)) continue;
 			dotrushHits.push({
-				dll,
+				entry: dll,
 				version: manifestVersionOf(extDir)
 			});
 		}
 	}
-	const best = dotrushHits.sort((a, b) => (b.version ?? "").localeCompare(a.version ?? "", void 0, { numeric: true }) || a.dll.localeCompare(b.dll))[0];
-	if (best) {
-		out.dotrushDll = best.dll;
-		out.dotrushVersion = best.version;
+	const roslynBest = bestOf(roslynHits);
+	if (roslynBest) {
+		out.roslynDll = roslynBest.entry;
+		out.roslynVersion = roslynBest.version;
+	}
+	const omniBest = bestOf(omniHits);
+	if (omniBest) out.omnisharpExe = omniBest.entry;
+	const dotrushBest = bestOf(dotrushHits);
+	if (dotrushBest) {
+		out.dotrushDll = dotrushBest.entry;
+		out.dotrushVersion = dotrushBest.version;
 	}
 	const dotnet = findDotnet();
 	if (dotnet) out.dotnet = dotnet;
@@ -7683,13 +7711,15 @@ function resolveLuaProvider(manual, home = dshHome()) {
 			version: emmy.version,
 			providerName: "EmmyLua"
 		};
-		const candidates = candidateLuaServers(h);
-		if (candidates.length) return {
+		const best = candidateLuaServers(h)[0];
+		if (best) return {
 			...base,
 			kind: "discover",
-			argv: [candidates[0]],
+			argv: [best.path],
 			cwd: void 0,
-			ready: true
+			ready: true,
+			version: best.version,
+			providerName: "LuaLS"
 		};
 		const inPath = findInPath("lua-language-server" + exeSuffix());
 		if (inPath) return {
@@ -7785,6 +7815,67 @@ const PROVIDER_RESOLVERS = {
 	lua: resolveLuaProvider,
 	csharp: resolveCSharpProvider
 };
+/**
+* 汇总某语言当前检测到的候选服务器（每类服务器一条、取该类最高版本；设置页展示用）。
+* chosen 以候选路径命中 spec.argv 判定；未选用（kind=none/manual 不匹配）时不标记。
+* @author ddj 2026年09月03号
+* @param languageId 语言 id
+* @param spec 已解析的 provider 规格
+* @param home DSH home（缺省真实；测试可注入临时目录）
+* @returns 候选列表（不支持的语言/检测异常返回空）
+*/
+function candidatesFor(languageId, spec, home = dshHome()) {
+	/** 候选路径命中 spec.argv 时补 chosen 标记。 */
+	const markChosen = (candidate) => spec.ready && candidate.path && spec.argv.includes(candidate.path) ? {
+		...candidate,
+		chosen: true
+	} : candidate;
+	try {
+		if (languageId === "lua") {
+			const out = [];
+			const emmy = candidateEmmyLua(home);
+			if (emmy) out.push(markChosen({
+				name: "EmmyLua",
+				version: emmy.version,
+				path: emmy.path
+			}));
+			const lua = candidateLuaServers(home)[0];
+			if (lua) out.push(markChosen({
+				name: "LuaLS（sumneko.lua）",
+				version: lua.version,
+				path: lua.path
+			}));
+			const inPath = findInPath("lua-language-server" + exeSuffix());
+			if (inPath) out.push(markChosen({
+				name: "lua-language-server（PATH）",
+				path: inPath
+			}));
+			return out;
+		}
+		if (languageId === "csharp") {
+			const out = [];
+			const found = candidateCSharpServers(home);
+			if (found.roslynDll) out.push(markChosen({
+				name: "Roslyn（ms-dotnettools.csharp）",
+				version: found.roslynVersion,
+				path: found.roslynDll
+			}));
+			if (found.dotrushDll) out.push(markChosen({
+				name: "DotRush",
+				version: found.dotrushVersion,
+				path: found.dotrushDll
+			}));
+			if (found.omnisharpExe) out.push(markChosen({
+				name: "OmniSharp",
+				path: found.omnisharpExe
+			}));
+			return out;
+		}
+		return [];
+	} catch (error) {
+		return [];
+	}
+}
 /** 进程级缓存（home|languageId → 条目），同一 DSH home 的不同会话共享。 */
 const specCache = /* @__PURE__ */ new Map();
 /** 磁盘缓存是否已载入本进程（home → loaded），不同 profile 不串缓存。 */
@@ -8098,8 +8189,16 @@ async function extractTo(buf, dir) {
 }
 //#endregion
 //#region src/lsp/config.ts
-const LSP_SETTINGS_NS = "dsh-vscode-mode.languageServers";
+/**
+* dsh-vscode-mode host — LSP 配置读取与 provider 解析装配。
+* 配置来源优先级：运行时覆盖（设置页保存，重启失效）> 插件组合配置 > 默认。
+* 原 settings section（ns dsh-vscode-mode.languageServers）命名空间不合法
+* （DSH settings 仅允许 /^[a-z][a-z0-9-]*$/，点号命名空间永久不可注册），
+* 已降级为配置值（插件组合配置 + 会话内运行时覆盖），不再尝试 settings 安装。
+* 作者 ddj 2026-08-27 / 2026-09-02
+*/
 const LSP_LANGUAGES = ["lua", "csharp"];
+/** 清洗单语言配置：仅保留合法字段并剥离 undefined（稀疏覆盖语义，清空字段即回落组合配置）。 */
 function sanitizeLang(raw) {
 	if (!raw || typeof raw !== "object") return void 0;
 	const obj = raw;
@@ -8120,22 +8219,7 @@ function configFromPlugin(config) {
 	}
 	return out;
 }
-/** 从 settings 描述符读取（无 settings 服务/无该 section → {}）。 */
-function configFromSettings(ctx) {
-	try {
-		const value = (ctx.get("settings")?.describe?.({ redactSecrets: true })?.find((item) => item.ns === LSP_SETTINGS_NS))?.value;
-		if (!value || typeof value !== "object") return {};
-		const out = {};
-		for (const lang of LSP_LANGUAGES) {
-			const v = sanitizeLang(value[lang]);
-			if (v) out[lang] = v;
-		}
-		return out;
-	} catch (error) {
-		return {};
-	}
-}
-/** 合并配置：settings 覆盖插件配置。 */
+/** 合并配置：上层（运行时覆盖/settings）覆盖插件组合配置。 */
 function mergeConfig(a, b) {
 	const out = { ...a };
 	for (const lang of LSP_LANGUAGES) {
@@ -8150,14 +8234,14 @@ function mergeConfig(a, b) {
 	return out;
 }
 /**
-* 解析某语言的 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 规格
 */
-function resolveProviderSpec(ctx, pluginConfig, languageId) {
+function resolveProviderSpec(pluginConfig, languageId, override) {
 	const resolver = PROVIDER_RESOLVERS[languageId];
 	if (!resolver) return {
 		languageId,
@@ -8166,7 +8250,7 @@ function resolveProviderSpec(ctx, pluginConfig, languageId) {
 		ready: false,
 		reason: "不支持的语言：" + languageId
 	};
-	const lang = mergeConfig(configFromPlugin(pluginConfig), configFromSettings(ctx))[languageId];
+	const lang = mergeConfig(configFromPlugin(pluginConfig), override ?? {})[languageId];
 	if (lang && lang.enabled === false) return {
 		languageId,
 		kind: "none",
@@ -8364,6 +8448,8 @@ function createDocTracker() {
 function createLspRpc(deps) {
 	const { ctx, pluginConfig, manager } = deps;
 	const tracker = createDocTracker();
+	/** 运行时覆盖层：设置页保存值（内存态，重启回落组合配置值；每 apply 新建，插件重载自动复位）。 */
+	const runtimeConfig = {};
 	onRuntimeProvisioned(() => {
 		clearProviderCache();
 		manager.resetLanguage("csharp");
@@ -8382,16 +8468,17 @@ function createLspRpc(deps) {
 			return { err: String(error) };
 		}
 	};
-	const acquireServer = (root, lang) => manager.acquire(root, lang, (languageId) => resolveProviderSpec(ctx, pluginConfig, languageId));
+	const acquireServer = (root, lang) => manager.acquire(root, lang, (languageId) => resolveProviderSpec(pluginConfig, languageId, runtimeConfig));
 	const serverOf = (root, lang) => manager.peek(root, lang);
 	const rootLocations = (locations, root) => locations.map((location) => ({
 		...location,
 		root
 	}));
-	/** 当前 provider 检测结论 → 设置页 idle 状态（不启动 server）；附带未满足的环境需求。 */
+	/** 当前 provider 检测结论 → 设置页 idle 状态（不启动 server）；附带未满足的环境需求与候选服务器。 */
 	const detectedStatus = (languageId, root) => {
-		const spec = resolveProviderSpec(ctx, pluginConfig, languageId);
+		const spec = resolveProviderSpec(pluginConfig, languageId, runtimeConfig);
 		const missingEnv = envRequirementsFor(languageId, dshHome());
+		const candidates = candidatesFor(languageId, spec);
 		return {
 			languageId,
 			source: spec.kind,
@@ -8400,7 +8487,8 @@ function createLspRpc(deps) {
 			version: spec.version,
 			providerName: spec.providerName,
 			root,
-			missingEnv: missingEnv.length ? missingEnv : void 0
+			missingEnv: missingEnv.length ? missingEnv : void 0,
+			candidates: candidates.length ? candidates : void 0
 		};
 	};
 	/**
@@ -8446,48 +8534,34 @@ function createLspRpc(deps) {
 					servers: manager.statusAll().filter((status) => status.root === sc.root)
 				};
 			},
-			"edrv.lsp.configGet": async () => {
-				const settings = configFromSettings(ctx);
-				const plugin = configFromPlugin(pluginConfig);
-				const merged = { ...plugin };
-				for (const lang of Object.keys(settings)) merged[lang] = {
-					...plugin[lang],
-					...settings[lang]
+			"edrv.lsp.detect": async () => {
+				return {
+					ok: true,
+					servers: LSP_LANGUAGES.map((lang) => detectedStatus(lang))
 				};
+			},
+			"edrv.lsp.configGet": async () => {
 				return {
 					ok: true,
-					config: merged
+					config: mergeConfig(configFromPlugin(pluginConfig), runtimeConfig)
 				};
 			},
 			"edrv.lsp.configUpdate": async (args) => {
 				const lang = args.languageId;
-				if (!lang || !resolveProviderSpec(ctx, pluginConfig, lang).languageId) return {
+				if (!lang || !LSP_LANGUAGES.includes(lang)) return {
 					ok: false,
 					error: "不支持的语言：" + lang
 				};
-				const current = configFromSettings(ctx);
-				const target = {
-					...current,
-					[lang]: { ...current[lang] ?? {} }
-				}[lang];
+				const target = { ...runtimeConfig[lang] ?? {} };
 				if (args.enabled !== void 0) target.enabled = args.enabled;
 				if (args.command !== void 0) target.command = args.command || void 0;
 				if (args.path !== void 0) target.path = args.path || void 0;
+				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 });
 					const servers = await redetectLanguage(lang);
-					const stored = (settings.describe?.({ redactSecrets: true })?.find((item) => item.ns === LSP_SETTINGS_NS))?.value;
 					return {
 						ok: true,
-						config: {
-							...configFromPlugin(pluginConfig),
-							...stored
-						},
+						config: mergeConfig(configFromPlugin(pluginConfig), runtimeConfig),
 						servers
 					};
 				} catch (error) {
@@ -8827,40 +8901,6 @@ function createLspRpc(deps) {
 	};
 }
 //#endregion
-//#region src/lsp/settings.ts
-/**
-* 安装 LSP 设置 section。
-* @author ddj 2026年08月27号
-* @param ctx DSH 上下文
-* @param entry 初始配置
-* @returns 是否成功安装
-*/
-async function installLspSettingsSection(ctx, entry) {
-	let deps = null;
-	try {
-		deps = await loadSettingsDeps();
-	} catch {}
-	if (!deps) return false;
-	try {
-		const z = deps.z;
-		const langShape = {};
-		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) {
-		console.error("[dsh-vscode-mode] LSP 设置 section 安装失败：" + String(error));
-		return false;
-	}
-}
-//#endregion
 //#region src/index.ts
 /**
 * @dsh-external 生态 → dsh-vscode-mode：DSH 上的类 VSCode 编码体验（Host 半入口）。
@@ -8895,7 +8935,7 @@ function apply(ctx, config) {
 	/** 兼容性警告收集（route 护栏等写入，启动日志一并输出）。 */
 	const warnings = [];
 	setupOpenSettings(ctx, config, () => {});
-	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 服务，规则仅可管理不注入");