dsh-vscode-mode 0.1.50 → 0.1.51

package/lib/client.js

@@ -6035,18 +6035,40 @@ window.__ModuleLoader__.load({
 		/**
 		* dsh-vscode-mode client — 「语言服务器」设置子 Tab。
 		* 四视图：服务器（状态 + 每语言启用/命令/路径）｜已安装（卸载/更新）｜市场（Open VSX 搜索/安装 + 本地 vsix）｜更新。
-		* 状态经 edrv.lsp.status，配置经 edrv.lsp.configGet/Update，扩展经 edrv.lsp.ext.*。
-		* 作者 ddj 2026-08-27
+		* 状态经 edrv.lsp.detect（检测结果驱动卡片动态显示），配置经 edrv.lsp.configGet/Update，扩展经 edrv.lsp.ext.*。
+		* 作者 ddj 2026-08-27 / 2026-09-03
 		*/
-		const LANGUAGES = [{
-			id: "lua",
-			label: "Lua（EmmyLua / LuaLS）",
-			hint: "优先使用已安装 EmmyLua；未安装时回退 LuaLS 或 PATH 中的 lua-language-server"
-		}, {
-			id: "csharp",
-			label: "C#（Roslyn / DotRush / OmniSharp）",
-			hint: "优先自动发现 ms-dotnettools.csharp / DotRush 扩展（DotRush 需 .NET 10 运行时）；也可手动指定"
-		}];
+		/** 支持语言的展示元数据（卡片显示由检测结果驱动；未知 id 走 langMeta 兜底）。 */
+		const LANG_META = {
+			lua: {
+				label: "Lua（EmmyLua / LuaLS）",
+				hint: "优先使用已安装 EmmyLua；未安装时回退 LuaLS 或 PATH 中的 lua-language-server"
+			},
+			csharp: {
+				label: "C#（Roslyn / DotRush / OmniSharp）",
+				hint: "优先自动发现 ms-dotnettools.csharp / DotRush 扩展（DotRush 需 .NET 10 运行时）；也可手动指定"
+			}
+		};
+		/** 语言展示元数据（含未知 id 兜底）。 */
+		function langMeta(id) {
+			return LANG_META[id] || {
+				label: id + "（语言服务器）",
+				hint: ""
+			};
+		}
+		/** 该语言是否已存配置（禁用开关或手动命令/路径）。 */
+		function hasStoredConfig(cfg) {
+			if (!cfg || typeof cfg !== "object") return false;
+			if (cfg.enabled === false) return true;
+			return Boolean(cfg.command && cfg.command.trim() || cfg.path && cfg.path.trim());
+		}
+		/** 该语言是否显示卡片：检测到可用 LSP、已存配置、或存在待安装的缺失环境。 */
+		function langVisible(status, config) {
+			if (!status) return false;
+			if (status.source && status.source !== "none") return true;
+			if (hasStoredConfig(config[status.languageId])) return true;
+			return Array.isArray(status.missingEnv) && status.missingEnv.length > 0;
+		}
 		const PHASE_LABEL = {
 			idle: "未启动",
 			starting: "启动中",
@@ -6101,7 +6123,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, 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, Array.isArray(status?.missingEnv) && status.missingEnv.length ? react.default.createElement("div", { className: "vsm-lsp-hint" }, "缺少运行环境（一键安装后自动生效）：", status.missingEnv.map((req) => react.default.createElement("div", {
+			}, 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, Array.isArray(status?.candidates) && status.candidates.length > 1 ? react.default.createElement("div", { className: "vsm-lsp-hint" }, "候选（" + status.candidates.length + "）：" + status.candidates.map((c) => c.name + (c.version ? " v" + c.version : "") + (c.chosen ? "（当前）" : "")).join(" · ")) : null, Array.isArray(status?.missingEnv) && status.missingEnv.length ? react.default.createElement("div", { className: "vsm-lsp-hint" }, "缺少运行环境（一键安装后自动生效）：", status.missingEnv.map((req) => react.default.createElement("div", {
 				key: req.id,
 				className: "vsm-mcp-actions"
 			}, react.default.createElement("span", null, req.label, req.detail ? "（" + req.detail + "）" : ""), req.installable ? react.default.createElement("button", {
@@ -6176,9 +6198,9 @@ window.__ModuleLoader__.load({
 			const [envStates, setEnvStates] = react.default.useState([]);
 			const [envLang, setEnvLang] = react.default.useState("");
 			const refreshServers = react.default.useCallback(() => {
-				Promise.all([rpc("edrv.lsp.configGet", {}), rpc("edrv.lsp.status", {})]).then(([cfg, st]) => {
+				Promise.all([rpc("edrv.lsp.configGet", {}), rpc("edrv.lsp.detect", {})]).then(([cfg, det]) => {
 					if (cfg?.ok) setConfig(cfg.config ?? {});
-					if (st?.ok) setServers(st.servers ?? []);
+					if (det?.ok) setServers(det.servers ?? []);
 					setError("");
 				}).catch((e) => setError(String(e)));
 			}, []);
@@ -6332,6 +6354,7 @@ window.__ModuleLoader__.load({
 						return;
 					}
 					refreshExt();
+					refreshServers();
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			const installLocal = () => {
@@ -6345,6 +6368,7 @@ window.__ModuleLoader__.load({
 					}
 					setVsixPath("");
 					refreshExt();
+					refreshServers();
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			const uninstallExt = (ext) => {
@@ -6354,6 +6378,7 @@ window.__ModuleLoader__.load({
 				rpc("edrv.lsp.ext.uninstall", { id: ext.id }).then((res) => {
 					if (!res?.ok) setError(res?.error ?? "卸载失败");
 					refreshExt();
+					refreshServers();
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			const updateExt = (ext) => {
@@ -6362,6 +6387,7 @@ window.__ModuleLoader__.load({
 				rpc("edrv.lsp.ext.update", { id: ext.id }).then((res) => {
 					if (!res?.ok) setError(res?.error ?? "更新失败");
 					refreshExt();
+					refreshServers();
 				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
 			if (loading) return react.default.createElement("div", { className: "vsm-mcp-empty" }, "正在读取语言服务器状态…");
@@ -6378,19 +6404,30 @@ window.__ModuleLoader__.load({
 			/** 线框面板容器：标题 + 内容体。 */
 			const panel = (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));
 			let body = null;
-			if (tab === "servers") body = panel("语言服务器", react.default.createElement(react.default.Fragment, null, LANGUAGES.map((lang) => react.default.createElement(LangCard, {
-				key: lang.id,
-				lang,
-				config: config[lang.id] ?? {},
-				status: servers.find((s) => s.languageId === lang.id),
-				busy,
-				envStates,
-				onInstallEnv: installEnv,
-				onToggle: toggleLang,
-				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, {
+			if (tab === "servers") {
+				const detected = Array.isArray(servers) ? servers : [];
+				const visible = detected.filter((s) => langVisible(s, config));
+				const hidden = detected.filter((s) => !visible.includes(s));
+				body = panel("语言服务器", react.default.createElement(react.default.Fragment, null, visible.length ? visible.map((status) => {
+					const meta = langMeta(status.languageId);
+					return react.default.createElement(LangCard, {
+						key: status.languageId,
+						lang: {
+							id: status.languageId,
+							label: meta.label,
+							hint: meta.hint
+						},
+						config: config[status.languageId] ?? {},
+						status,
+						busy,
+						envStates,
+						onInstallEnv: installEnv,
+						onToggle: toggleLang,
+						onSave: saveLang,
+						onRedetect: redetectLang
+					});
+				}) : react.default.createElement("div", { className: "vsm-mcp-empty" }, "未检测到已安装的语言服务器；可切换到「市场」搜索安装（如 sumneko.lua），或安装本地 .vsix 后刷新。"), hidden.length ? react.default.createElement("div", { className: "vsm-lsp-hint" }, "未检测到：" + hidden.map((s) => langMeta(s.languageId).label).join("、") + " —— 可在「市场」安装后刷新。") : null, react.default.createElement("div", { className: "vsm-lsp-hint" }, "提示：打开对应语言的文件即自动（惰性）启动语言服务器；未配置时编辑器功能不受影响，大纲回退内置解析。")));
+			} 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,
 				ext,
 				busy,