dsh-vscode-mode 0.1.36 → 0.1.43

package/lib/client.js

@@ -385,6 +385,523 @@ window.__ModuleLoader__.load({
 			window.dispatchEvent(new CustomEvent("edrv:show-launcher", { detail: { tab } }));
 		}
 		//#endregion
+		//#region src/client/monaco/theme.ts
+		/**
+		* dsh-vscode-mode client — Monaco 语法分色主题（rich token 配色）。
+		* 编辑器原先硬编码 'vs'（内置基础主题），token 分色层次少；
+		* 这里定义 edrv-dark / edrv-light 两套完整 token 配色（对齐 VSCode Dark+ 语义分层），
+		* 并随 DSH 明暗主题自动切换（跟随文档根 data 主题属性 / prefers-color-scheme）。
+		* 作者 ddj 2026-08-28
+		*/
+		const EDRV_DARK = "edrv-dark";
+		const EDRV_LIGHT = "edrv-light";
+		/** 语法分色（语义分层：关键字/字符串/数字/注释/函数/变量/类型/运算符/正则/标签/属性…）。 */
+		const DARK_RULES = [
+			{
+				token: "",
+				foreground: "d4d4d4",
+				background: "1e1e1e"
+			},
+			{
+				token: "comment",
+				foreground: "6a9955",
+				fontStyle: "italic"
+			},
+			{
+				token: "comment.doc",
+				foreground: "7ca97c",
+				fontStyle: "italic"
+			},
+			{
+				token: "keyword",
+				foreground: "c586c0"
+			},
+			{
+				token: "keyword.control",
+				foreground: "c586c0"
+			},
+			{
+				token: "keyword.operator",
+				foreground: "d4d4d4"
+			},
+			{
+				token: "keyword.json",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "string",
+				foreground: "ce9178"
+			},
+			{
+				token: "string.escape",
+				foreground: "d7ba7d"
+			},
+			{
+				token: "string.key.json",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "string.value.json",
+				foreground: "ce9178"
+			},
+			{
+				token: "string.yaml",
+				foreground: "ce9178"
+			},
+			{
+				token: "number",
+				foreground: "b5cea8"
+			},
+			{
+				token: "number.hex",
+				foreground: "b5cea8"
+			},
+			{
+				token: "regexp",
+				foreground: "d16969"
+			},
+			{
+				token: "type",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "type.identifier",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "identifier",
+				foreground: "d4d4d4"
+			},
+			{
+				token: "variable",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "variable.global",
+				foreground: "ff6699"
+			},
+			{
+				token: "variable.local",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "variable.mutable",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "variable.predefined",
+				foreground: "4fc1ff"
+			},
+			{
+				token: "variable.parameter",
+				foreground: "00bfae"
+			},
+			{
+				token: "parameter",
+				foreground: "00bfae"
+			},
+			{
+				token: "function",
+				foreground: "dcdcaa"
+			},
+			{
+				token: "method",
+				foreground: "dcdcaa"
+			},
+			{
+				token: "property",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "function.identifier",
+				foreground: "dcdcaa"
+			},
+			{
+				token: "member",
+				foreground: "dcdcaa"
+			},
+			{
+				token: "constant",
+				foreground: "4fc1ff"
+			},
+			{
+				token: "constant.numeric",
+				foreground: "b5cea8"
+			},
+			{
+				token: "constant.language",
+				foreground: "569cd6"
+			},
+			{
+				token: "tag",
+				foreground: "569cd6"
+			},
+			{
+				token: "tag.xml",
+				foreground: "569cd6"
+			},
+			{
+				token: "metatag",
+				foreground: "808080"
+			},
+			{
+				token: "attribute.name",
+				foreground: "9cdcfe"
+			},
+			{
+				token: "attribute.value",
+				foreground: "ce9178"
+			},
+			{
+				token: "delimiter",
+				foreground: "d4d4d4"
+			},
+			{
+				token: "delimiter.bracket",
+				foreground: "ffd700"
+			},
+			{
+				token: "delimiter.html",
+				foreground: "808080"
+			},
+			{
+				token: "operator",
+				foreground: "d4d4d4"
+			},
+			{
+				token: "namespace",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "class",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "interface",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "enum",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "struct",
+				foreground: "4ec9b0"
+			},
+			{
+				token: "annotation",
+				foreground: "dcdcaa"
+			},
+			{
+				token: "punctuation",
+				foreground: "d4d4d4"
+			},
+			{
+				token: "invalid",
+				foreground: "f44747"
+			}
+		];
+		const LIGHT_RULES = [
+			{
+				token: "",
+				foreground: "1e1e1e",
+				background: "ffffff"
+			},
+			{
+				token: "comment",
+				foreground: "008000",
+				fontStyle: "italic"
+			},
+			{
+				token: "comment.doc",
+				foreground: "2e7d32",
+				fontStyle: "italic"
+			},
+			{
+				token: "keyword",
+				foreground: "0000ff"
+			},
+			{
+				token: "keyword.control",
+				foreground: "af00db"
+			},
+			{
+				token: "keyword.operator",
+				foreground: "1e1e1e"
+			},
+			{
+				token: "keyword.json",
+				foreground: "0451a5"
+			},
+			{
+				token: "string",
+				foreground: "a31515"
+			},
+			{
+				token: "string.escape",
+				foreground: "ee0000"
+			},
+			{
+				token: "string.key.json",
+				foreground: "0451a5"
+			},
+			{
+				token: "string.value.json",
+				foreground: "a31515"
+			},
+			{
+				token: "string.yaml",
+				foreground: "a31515"
+			},
+			{
+				token: "number",
+				foreground: "098658"
+			},
+			{
+				token: "number.hex",
+				foreground: "098658"
+			},
+			{
+				token: "regexp",
+				foreground: "811f3f"
+			},
+			{
+				token: "type",
+				foreground: "267f99"
+			},
+			{
+				token: "type.identifier",
+				foreground: "267f99"
+			},
+			{
+				token: "identifier",
+				foreground: "1e1e1e"
+			},
+			{
+				token: "variable",
+				foreground: "001080"
+			},
+			{
+				token: "variable.global",
+				foreground: "c2185b"
+			},
+			{
+				token: "variable.local",
+				foreground: "001080"
+			},
+			{
+				token: "variable.mutable",
+				foreground: "001080"
+			},
+			{
+				token: "variable.predefined",
+				foreground: "001080"
+			},
+			{
+				token: "variable.parameter",
+				foreground: "008577"
+			},
+			{
+				token: "parameter",
+				foreground: "008577"
+			},
+			{
+				token: "function",
+				foreground: "795e26"
+			},
+			{
+				token: "method",
+				foreground: "795e26"
+			},
+			{
+				token: "function.identifier",
+				foreground: "795e26"
+			},
+			{
+				token: "member",
+				foreground: "795e26"
+			},
+			{
+				token: "property",
+				foreground: "001080"
+			},
+			{
+				token: "constant",
+				foreground: "0070c1"
+			},
+			{
+				token: "constant.numeric",
+				foreground: "098658"
+			},
+			{
+				token: "constant.language",
+				foreground: "0000ff"
+			},
+			{
+				token: "tag",
+				foreground: "800000"
+			},
+			{
+				token: "tag.xml",
+				foreground: "800000"
+			},
+			{
+				token: "metatag",
+				foreground: "6b6b6b"
+			},
+			{
+				token: "attribute.name",
+				foreground: "e50000"
+			},
+			{
+				token: "attribute.value",
+				foreground: "0451a5"
+			},
+			{
+				token: "delimiter",
+				foreground: "1e1e1e"
+			},
+			{
+				token: "delimiter.bracket",
+				foreground: "b46400"
+			},
+			{
+				token: "delimiter.html",
+				foreground: "800000"
+			},
+			{
+				token: "operator",
+				foreground: "1e1e1e"
+			},
+			{
+				token: "namespace",
+				foreground: "267f99"
+			},
+			{
+				token: "class",
+				foreground: "267f99"
+			},
+			{
+				token: "interface",
+				foreground: "267f99"
+			},
+			{
+				token: "enum",
+				foreground: "267f99"
+			},
+			{
+				token: "struct",
+				foreground: "267f99"
+			},
+			{
+				token: "annotation",
+				foreground: "795e26"
+			},
+			{
+				token: "punctuation",
+				foreground: "1e1e1e"
+			},
+			{
+				token: "invalid",
+				foreground: "cd3131"
+			}
+		];
+		/** 编辑器 UI 配色（与语法配色同套，保证 gutter/minimap/selection 一致）。 */
+		const DARK_COLORS = {
+			"editor.background": "#1e1e1e",
+			"editor.foreground": "#d4d4d4",
+			"editorLineNumber.foreground": "#6e7681",
+			"editorLineNumber.activeForeground": "#c6c6c6",
+			"editor.selectionBackground": "#264f78",
+			"editor.inactiveSelectionBackground": "#3a3d41",
+			"editor.lineHighlightBackground": "#2a2d2e",
+			"editorCursor.foreground": "#aeafad",
+			"editorIndentGuide.background1": "#404040",
+			"editorIndentGuide.activeBackground1": "#707070",
+			"editorWidget.background": "#252526",
+			"editorHoverWidget.background": "#252526",
+			"editorGutter.background": "#1e1e1e",
+			"minimap.background": "#1e1e1e",
+			"scrollbarSlider.background": "#79797966",
+			"scrollbarSlider.hoverBackground": "#646464b3",
+			"scrollbarSlider.activeBackground": "#bfbfbf66"
+		};
+		const LIGHT_COLORS = {
+			"editor.background": "#ffffff",
+			"editor.foreground": "#1e1e1e",
+			"editorLineNumber.foreground": "#6c6c6c",
+			"editorLineNumber.activeForeground": "#171184",
+			"editor.selectionBackground": "#add6ff",
+			"editor.inactiveSelectionBackground": "#e5ebf1",
+			"editor.lineHighlightBackground": "#f0f0f0",
+			"editorCursor.foreground": "#000000",
+			"editorIndentGuide.background1": "#d3d3d3",
+			"editorIndentGuide.activeBackground1": "#939393",
+			"editorWidget.background": "#f3f3f3",
+			"editorHoverWidget.background": "#f3f3f3",
+			"editorGutter.background": "#ffffff",
+			"minimap.background": "#ffffff",
+			"scrollbarSlider.background": "#64646466",
+			"scrollbarSlider.hoverBackground": "#646464b3",
+			"scrollbarSlider.activeBackground": "#00000099"
+		};
+		/**
+		* 注册 edrv 双套主题（幂等；Monaco 未加载时静默跳过）。
+		* @author ddj 2026年08月28号
+		* @param monaco Monaco 实例（window.monaco）
+		*/
+		function registerThemes(monaco) {
+			if (!monaco?.editor?.defineTheme) return;
+			try {
+				monaco.editor.defineTheme(EDRV_DARK, {
+					base: "vs-dark",
+					inherit: true,
+					rules: DARK_RULES,
+					colors: DARK_COLORS
+				});
+				monaco.editor.defineTheme(EDRV_LIGHT, {
+					base: "vs",
+					inherit: true,
+					rules: LIGHT_RULES,
+					colors: LIGHT_COLORS
+				});
+			} catch (error) {}
+		}
+		/**
+		* 探测当前 DSH 明暗（文档根 data 主题属性 → prefers-color-scheme → 暗）。
+		* @author ddj 2026年08月28号
+		* @returns 'dark' | 'light'
+		*/
+		function detectColorScheme() {
+			try {
+				const attr = document.documentElement?.getAttribute?.("data-theme") ?? document.body?.getAttribute?.("data-theme");
+				const value = String(attr ?? "").toLowerCase();
+				if (value.includes("light") || value.includes("catppuccin-latte")) return "light";
+				if (value.includes("dark") || value.includes("frappe") || value.includes("macchiato") || value.includes("mocha")) return "dark";
+				if (typeof window.matchMedia === "function") return window.matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark";
+			} catch (error) {}
+			return "dark";
+		}
+		/**
+		* 主题名：按当前明暗返回已注册主题（未注册回落 vs）。
+		* @author ddj 2026年08月28号
+		* @returns 主题 id
+		*/
+		function themeNameOf() {
+			return detectColorScheme() === "light" ? EDRV_LIGHT : EDRV_DARK;
+		}
+		/**
+		* 应用主题到 Monaco（全局切换；新建编辑器也用该主题）。
+		* @author ddj 2026年08月28号
+		* @param monaco Monaco 实例
+		*/
+		function applyTheme(monaco) {
+			if (!monaco?.editor?.setTheme) return;
+			try {
+				monaco.editor.setTheme(themeNameOf());
+			} catch (error) {}
+		}
+		//#endregion
 		//#region src/client/monaco/loader.ts
 		/**
 		* dsh-vscode-mode client — Monaco 加载与语言映射（AMD 构建，离线随包分发）。
@@ -500,7 +1017,20 @@ window.__ModuleLoader__.load({
 			kt: "kotlin",
 			kts: "kotlin",
 			dart: "dart",
-			dockerfile: "dockerfile"
+			dockerfile: "dockerfile",
+			csproj: "xml",
+			props: "xml",
+			targets: "xml",
+			plist: "xml",
+			lua51: "lua",
+			luac: "lua",
+			gitattributes: "ini",
+			editorconfig: "ini",
+			env: "ini",
+			properties: "ini",
+			json5: "jsonc",
+			log: "plaintext",
+			txt: "plaintext"
 		};
 		/**
 		* 路径 → Monaco language id：取 basename 扩展名（dockerfile/Dockerfile 特判）。
@@ -536,6 +1066,10 @@ window.__ModuleLoader__.load({
 							publishStage("core", MONACO_STAGES.core.progress, MONACO_STAGES.core.message);
 							window.require(["vs/editor/editor.main"], () => {
 								publishStage("ready", MONACO_STAGES.ready.progress, MONACO_STAGES.ready.message);
+								try {
+									registerThemes(window.monaco);
+									applyTheme(window.monaco);
+								} catch (error) {}
 								resolve(window.monaco);
 							}, (err) => fail(/* @__PURE__ */ new Error("Monaco 模块加载失败：" + String(err))));
 						} catch (error) {
@@ -1971,6 +2505,48 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/shared/lsp.ts
+		/** LSP semantic token 标准类型（host 归一化后，client 与 Monaco 共用）。 */
+		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"
+		];
+		/** LSP semantic token 标准修饰符（host 归一化后，client 与 Monaco 共用）。 */
+		const LSP_SEMANTIC_TOKEN_MODIFIERS = [
+			"declaration",
+			"definition",
+			"readonly",
+			"static",
+			"deprecated",
+			"abstract",
+			"async",
+			"modification",
+			"documentation",
+			"defaultLibrary",
+			"global",
+			"local",
+			"mutable"
+		];
 		/**
 		* Monaco 位置（1-based lineNumber/column）→ LSP Position（0-based）。
 		* @author ddj 2026年08月27号
@@ -2113,6 +2689,16 @@ window.__ModuleLoader__.load({
 			if (!res || !res.ok) return null;
 			return res.hover || null;
 		}
+		/** 查询当前文档的 semantic tokens（host 已归一化 legend 与 delta data）。 */
+		async function fetchSemanticTokens(path, text) {
+			await syncDoc(path, text, true);
+			const res = await rpc("edrv.lsp.semanticTokens", {
+				sessionId,
+				path
+			}).catch(() => null);
+			if (!res || !res.ok || !res.tokens || !Array.isArray(res.tokens.data)) return null;
+			return res.tokens;
+		}
 		/** 拉取服务器状态（带 5s 缓存）。 */
 		async function refreshStatus(force = false) {
 			if (!force && Date.now() - statusCache.at < 1500) return statusCache.servers;
@@ -2132,7 +2718,10 @@ window.__ModuleLoader__.load({
 			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))
+				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)),
+				lspUri: loc.uri,
+				lspRoot: loc.root,
+				lspRange: loc.range
 			};
 		}
 		/** file:// URI（或裸路径）→ edrv:// 相对路径（去掉盘符/根，与编辑器模型路径一致）。 */
@@ -2144,30 +2733,68 @@ window.__ModuleLoader__.load({
 		}
 		/** 将 LSP 目标解析为当前工作区相对路径（跨文件跳转与 model URI 对齐）。 */
 		function targetOpenPath(loc) {
-			return relativeLspPath(loc?.uri, loc?.root);
+			return relativeLspPath(loc?.lspUri ?? loc?.uri, loc?.lspRoot ?? loc?.root);
 		}
-		/** file URI/裸路径 → root 下的 / 分隔相对路径；root 不匹配时保留规范化绝对路径。 */
-		function relativeLspPath(uri, root) {
+		/**
+		* 归一化 Location 的 uri → 工作区路径（剥离 scheme，不补盘符）。
+		* 三种输入形态（缺一即导致 scheme 泄漏进文件路径 → 跳转"文件不存在"）：
+		* - Monaco Uri 对象（toClientLocation 产物，scheme=edrv）→ 取 .path（已是工作区相对路径）
+		* - 'edrv:///x' 字符串 → 取路径部分
+		* - 'file:///D:/x' → 去 authority 空段保留盘符
+		* @author ddj 2026年08月28号
+		* @param uri Monaco Uri 对象 / file:// 或 edrv:// URI / 裸路径
+		* @returns / 分隔的路径（edrv 相对路径 或 带盘符绝对路径）
+		*/
+		function lspUriToAbs(uri) {
 			if (!uri) return "";
-			let path = String(uri);
-			if (path.startsWith("file://")) try {
-				path = decodeURIComponent(path.replace(/^file:\/\//, ""));
+			const isObject = typeof uri === "object";
+			const raw = isObject && typeof uri.path === "string" ? uri.path : String(uri);
+			let path = raw;
+			if (path.startsWith("file://")) {
+				try {
+					path = decodeURIComponent(path.replace(/^file:\/\/\/?/, ""));
+				} catch (error) {
+					path = path.replace(/^file:\/\/\/?/, "");
+				}
+				return path.replace(/\\/g, "/").replace(/^\/([A-Za-z]:)/, "$1");
+			}
+			if (path.startsWith("edrv://")) try {
+				path = decodeURIComponent(path.replace(/^edrv:\/\/\/?/, ""));
 			} catch (error) {
-				path = path.replace(/^file:\/\//, "");
+				path = path.replace(/^edrv:\/\/\/?/, "");
 			}
-			path = path.replace(/\\/g, "/").replace(/^\/([A-Za-z]:)/, "$1");
+			if (isObject ? uri.scheme === "edrv" : raw.startsWith("edrv://")) return path.replace(/\\/g, "/").replace(/^\/+/, "");
+			return path.replace(/\\/g, "/").replace(/^\/([A-Za-z]:)/, "$1");
+		}
+		/**
+		* file URI/裸路径 → root 下的 / 分隔相对路径。
+		* root 匹配返回工作区相对路径；root 不匹配返回完整绝对路径（保留盘符），
+		* 供 edrv.read 按绝对路径解析（原先错误剥掉首个 / 导致跳转"文件不存在"）。
+		* @author ddj 2026年08月28号
+		* @param uri file:// URI 或裸路径
+		* @param root 工作区根（可选）
+		* @returns 可 edrv.read 的路径
+		*/
+		function relativeLspPath(uri, root) {
+			if (!uri) return "";
+			const path = lspUriToAbs(uri);
 			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(/^\/+/, "");
+			return path;
 		}
 		/** 目标行/列（0-based LSP → 1-based Monaco）。 */
 		function targetMonoPosition(loc) {
-			const start = (loc.range || {}).start || {};
+			const lspRange = loc?.lspRange;
+			if (lspRange?.start) return {
+				line: Math.max(1, (lspRange.start.line ?? 0) + 1),
+				column: Math.max(1, (lspRange.start.character ?? 0) + 1)
+			};
+			const range = loc?.range ?? {};
 			return {
-				line: Math.max(1, (start.line ?? 0) + 1),
-				column: Math.max(1, (start.character ?? 0) + 1)
+				line: Math.max(1, range.startLineNumber ?? 1),
+				column: Math.max(1, range.startColumn ?? 1)
 			};
 		}
 		//#endregion
@@ -2180,6 +2807,10 @@ window.__ModuleLoader__.load({
 		* 作者 ddj 2026-08-27
 		*/
 		const LSP_LANGS = ["lua", "csharp"];
+		const SEMANTIC_LEGEND = {
+			tokenTypes: [...LSP_SEMANTIC_TOKEN_TYPES],
+			tokenModifiers: [...LSP_SEMANTIC_TOKEN_MODIFIERS]
+		};
 		let registered = false;
 		const disposables = [];
 		let overlayEl = null;
@@ -2214,6 +2845,19 @@ window.__ModuleLoader__.load({
 			};
 			disposables.push(monaco.editor.onDidCreateModel(attachModel));
 			for (const model of monaco.editor.getModels()) attachModel(model);
+			const onRedetect = (event) => {
+				const languageId = event?.detail?.languageId;
+				if (!languageId) return;
+				for (const model of monaco.editor.getModels()) {
+					const path = pathOfModel(model);
+					if (!path) continue;
+					if (model.getLanguageId && model.getLanguageId() !== languageId) continue;
+					syncDoc(path, model.getValue(), true);
+				}
+				refreshStatus(true);
+			};
+			window.addEventListener("edrv:lsp-redetect", onRedetect);
+			disposables.push(() => window.removeEventListener("edrv:lsp-redetect", onRedetect));
 			disposables.push(monaco.languages.registerDefinitionProvider(LSP_LANGS, { provideDefinition: (model, position, token) => {
 				const path = pathOfModel(model);
 				if (!path) return [];
@@ -2236,7 +2880,17 @@ window.__ModuleLoader__.load({
 					contents: hover.contents.map((text) => ({ value: text })),
 					range: range || void 0
 				};
-			} }));
+			} }), monaco.languages.registerDocumentSemanticTokensProvider(LSP_LANGS, {
+				getLegend: () => SEMANTIC_LEGEND,
+				provideDocumentSemanticTokens: async (model, token) => {
+					const path = pathOfModel(model);
+					if (!path || token?.isCancellationRequested) return { data: /* @__PURE__ */ new Uint32Array() };
+					const result = await fetchSemanticTokens(path, model.getValue());
+					if (!result || token?.isCancellationRequested) return { data: /* @__PURE__ */ new Uint32Array() };
+					return { data: Uint32Array.from(result.data) };
+				},
+				releaseDocumentSemanticTokens: () => {}
+			}));
 		}
 		/** LSP SymbolInfo（host 归一化后）→ Monaco DocumentSymbol。 */
 		function toMonacoSymbol(symbol) {
@@ -2625,7 +3279,8 @@ window.__ModuleLoader__.load({
 						}));
 						setStatus("已加载");
 					} else {
-						const message = res?.error ? String(res.error) : "读取失败";
+						const base = res?.error ? String(res.error) : "读取失败";
+						const message = res?.resolvedPath ? base + "：" + String(res.resolvedPath) : base;
 						setLoadError(message);
 						setError(message);
 						setStatus("读取失败");
@@ -2892,6 +3547,20 @@ window.__ModuleLoader__.load({
 					alive = false;
 				};
 			}, [monaco, monacoErr]);
+			react.default.useEffect(() => {
+				if (!monaco) return;
+				registerThemes(monaco);
+				applyTheme(monaco);
+				if (typeof window.matchMedia !== "function") return;
+				const query = window.matchMedia("(prefers-color-scheme: dark)");
+				const onChange = () => applyTheme(monaco);
+				if (typeof query.addEventListener === "function") {
+					query.addEventListener("change", onChange);
+					return () => query.removeEventListener("change", onChange);
+				}
+				query.addListener(onChange);
+				return () => query.removeListener(onChange);
+			}, [monaco]);
 			monacoRef.current = monaco;
 			const getModel = (path, text) => {
 				const cache = modelsRef.current;
@@ -3005,7 +3674,7 @@ window.__ModuleLoader__.load({
 				const ed = m.editor.create(node, {
 					value: "",
 					language: "plaintext",
-					theme: "vs",
+					theme: themeNameOf(),
 					fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)",
 					fontSize: 13,
 					lineHeight: 20,
@@ -4639,8 +5308,8 @@ window.__ModuleLoader__.load({
 		*/
 		const LANGUAGES = [{
 			id: "lua",
-			label: "Lua（LuaLS）",
-			hint: "lua-language-server，EmmyLua 注解原生支持"
+			label: "Lua（EmmyLua / LuaLS）",
+			hint: "优先使用已安装 EmmyLua；未安装时回退 LuaLS 或 PATH 中的 lua-language-server"
 		}, {
 			id: "csharp",
 			label: "C#（Roslyn / OmniSharp）",
@@ -4678,8 +5347,8 @@ window.__ModuleLoader__.load({
 				label: "更新"
 			}
 		];
-		/** 语言卡片：状态 + 启用开关 + 命令/路径配置。 */
-		function LangCard({ lang, config, status, busy, onToggle, onSave }) {
+		/** 语言卡片：状态 + 启用开关 + 命令/路径配置 + 重新检测。 */
+		function LangCard({ lang, config, status, busy, onToggle, onSave, onRedetect }) {
 			const [pathDraft, setPathDraft] = react.default.useState(config?.path ?? "");
 			const [commandDraft, setCommandDraft] = react.default.useState(config?.command ?? "");
 			react.default.useEffect(() => {
@@ -4691,7 +5360,7 @@ window.__ModuleLoader__.load({
 				className: "vsm-switch " + (config?.enabled !== false ? "on" : ""),
 				onClick: () => onToggle(lang.id, config?.enabled !== false ? false : true),
 				"aria-label": "启用/禁用"
-			}, config?.enabled !== false ? "●" : "○"))), react.default.createElement("div", { className: "vsm-mcp-meta" }, PHASE_LABEL[phase] ?? phase, " · ", SOURCE_LABEL[status?.source] ?? status?.source, phase === "ready" && status?.root ? " · " + String(status.root).split(/[\\/]/).pop() : ""), status?.reason ? react.default.createElement("div", { className: "vsm-mcp-error" }, status.reason) : null, react.default.createElement("div", { className: "vsm-lsp-form" }, react.default.createElement("label", null, react.default.createElement("span", null, "可执行文件路径（绝对路径，优先）"), react.default.createElement("input", {
+			}, config?.enabled !== false ? "●" : "○"))), react.default.createElement("div", { className: "vsm-mcp-meta" }, PHASE_LABEL[phase] ?? phase, " · ", SOURCE_LABEL[status?.source] ?? status?.source, status?.providerName ? " · " + status.providerName : "", status?.version ? " · v" + status.version : "", phase === "ready" && status?.root ? " · " + String(status.root).split(/[\\/]/).pop() : ""), status?.reason ? react.default.createElement("div", { className: "vsm-mcp-error" }, status.reason) : null, react.default.createElement("div", { className: "vsm-lsp-form" }, react.default.createElement("label", null, react.default.createElement("span", null, "可执行文件路径（绝对路径，优先）"), react.default.createElement("input", {
 				value: pathDraft,
 				placeholder: "如 C:/.../lua-language-server.exe",
 				onChange: (e) => setPathDraft(e.target.value)
@@ -4703,7 +5372,12 @@ window.__ModuleLoader__.load({
 				className: "vsm-primary",
 				disabled: busy === lang.id,
 				onClick: () => onSave(lang.id, pathDraft, commandDraft)
-			}, busy === lang.id ? "保存中…" : "保存配置")), react.default.createElement("div", { className: "vsm-lsp-hint" }, lang.hint));
+			}, busy === lang.id ? "保存中…" : "保存配置"), react.default.createElement("button", {
+				className: "vsm-primary vsm-small",
+				disabled: busy === lang.id,
+				onClick: () => onRedetect(lang.id),
+				title: "清缓存并重新选择语言服务器（EmmyLua / LuaLS）"
+			}, busy === lang.id ? "检测中…" : "重新检测")), react.default.createElement("div", { className: "vsm-lsp-hint" }, lang.hint));
 		}
 		/** 已装扩展卡片：清单 + 卸载/更新。 */
 		function InstalledCard({ ext, busy, onUninstall, onUpdate }) {
@@ -4770,6 +5444,14 @@ window.__ModuleLoader__.load({
 				if (next === "installed" || next === "updates") refreshExt();
 				if (next === "servers") refreshServers();
 			};
+			/** 合并 redetect/configUpdate 返回的服务器状态：只替换该语言条目。 */
+			const mergeServers = (languageId, list) => {
+				setServers((prev) => Array.isArray(list) ? [...prev.filter((s) => s.languageId !== languageId), ...list] : prev);
+			};
+			/** 重检测后通知编辑器：与 host 重新同步已打开的模型（触发重新 acquire）。 */
+			const notifyResync = (languageId) => {
+				window.dispatchEvent(new CustomEvent("edrv:lsp-redetect", { detail: { languageId } }));
+			};
 			const saveLang = (languageId, path, command) => {
 				setBusy(languageId);
 				setError("");
@@ -4783,6 +5465,8 @@ window.__ModuleLoader__.load({
 						return;
 					}
 					setConfig(res.config ?? {});
+					mergeServers(languageId, res.servers);
+					notifyResync(languageId);
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			const toggleLang = (languageId, enabled) => {
@@ -4791,10 +5475,25 @@ window.__ModuleLoader__.load({
 					languageId,
 					enabled
 				}).then((res) => {
-					if (res?.ok) {
-						setConfig(res.config ?? {});
-						refreshServers();
-					} else setError(res?.error ?? "切换失败");
+					if (!res?.ok) {
+						setError(res?.error ?? "切换失败");
+						return;
+					}
+					setConfig(res.config ?? {});
+					mergeServers(languageId, res.servers);
+					notifyResync(languageId);
+				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
+			};
+			const redetectLang = (languageId) => {
+				setBusy(languageId);
+				setError("");
+				rpc("edrv.lsp.redetect", { languageId }).then((res) => {
+					if (!res?.ok) {
+						setError(res?.error ?? "重新检测失败");
+						return;
+					}
+					mergeServers(languageId, res.servers);
+					notifyResync(languageId);
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			const searchMarket = () => {
@@ -4874,7 +5573,8 @@ window.__ModuleLoader__.load({
 				status: servers.find((s) => s.languageId === lang.id),
 				busy,
 				onToggle: toggleLang,
-				onSave: saveLang
+				onSave: saveLang,
+				onRedetect: redetectLang
 			})), react.default.createElement("div", { className: "vsm-lsp-hint" }, "提示：打开 Lua/C# 文件即自动（惰性）启动对应语言服务器；未配置时编辑器功能不受影响，大纲回退内置解析。")));
 			else if (tab === "installed") body = panel("已安装扩展", react.default.createElement(react.default.Fragment, null, react.default.createElement("div", { className: "vsm-lsp-hint" }, "已安装的语言服务器扩展（存于 ~/.dsh/dsh-vscode-mode/extensions/）。语言服务器被自动发现为「扩展」源。"), installed.length ? installed.map((ext) => react.default.createElement(InstalledCard, {
 				key: ext.id,
@@ -5592,7 +6292,8 @@ window.__ModuleLoader__.load({
 			const group = (title, children) => react.default.createElement("section", { className: "vsm-panel" }, react.default.createElement("h3", { className: "vsm-panel-title" }, title), react.default.createElement("div", { className: "vsm-panel-body" }, children));
 			const warnings = report?.warnings ?? [];
 			const devForm = report?.devForm;
-			return react.default.createElement("section", { className: "vsm-general-page" }, react.default.createElement("h2", null, "兼容性"), react.default.createElement("p", null, "检测与其他插件 / DSH 版本的适配状态与已知问题。" + (report?.pluginVersion ? "（插件版本 " + report.pluginVersion + "）" : "")), error && react.default.createElement("div", { className: "vsm-mcp-error vsm-mcp-banner" }, error), devForm?.enabled && group("开发形态", react.default.createElement("div", { className: "vsm-compat-item ok" }, react.default.createElement("span", { className: "vsm-compat-name" }, "开发形态开启（工作区链接安装）"), react.default.createElement("span", { className: "vsm-compat-note" }, devForm.path))), group("外部插件与服务", renderItems(report?.external)), group("客户端适配", renderItems(getSummary?.() ?? [])), group("护栏", renderItems(report?.guards)), group("警告", warnings.length ? warnings.map((w, index) => react.default.createElement("div", {
+			const versionText = report?.dshVersion ? "（DSH " + report.dshVersion + " · 插件 " + (report?.pluginVersion ?? "") + "）" : report?.pluginVersion ? "（插件版本 " + report.pluginVersion + "）" : "";
+			return react.default.createElement("section", { className: "vsm-general-page" }, react.default.createElement("h2", null, "兼容性"), react.default.createElement("p", null, "检测与其他插件 / DSH 版本的适配状态与已知问题。" + versionText), error && react.default.createElement("div", { className: "vsm-mcp-error vsm-mcp-banner" }, error), devForm?.enabled && group("开发形态", react.default.createElement("div", { className: "vsm-compat-item ok" }, react.default.createElement("span", { className: "vsm-compat-name" }, "开发形态开启（工作区链接安装）"), react.default.createElement("span", { className: "vsm-compat-note" }, devForm.path))), group("版本适配", renderItems(report?.adapters)), group("外部插件与服务", renderItems(report?.external)), group("客户端适配", renderItems(getSummary?.() ?? [])), group("护栏", renderItems(report?.guards)), group("警告", warnings.length ? warnings.map((w, index) => react.default.createElement("div", {
 				key: index,
 				className: "vsm-mcp-error vsm-mcp-banner"
 			}, w)) : react.default.createElement("div", { className: "vsm-compat-item ok" }, react.default.createElement("span", { className: "vsm-compat-name" }, "未检测到兼容性问题"), react.default.createElement("span", { className: "vsm-compat-note" }, ""))));