dsh-vscode-mode 0.1.46 → 0.1.47

package/lib/client.js

@@ -5804,8 +5804,8 @@ window.__ModuleLoader__.load({
 			hint: "优先使用已安装 EmmyLua；未安装时回退 LuaLS 或 PATH 中的 lua-language-server"
 		}, {
 			id: "csharp",
-			label: "C#（Roslyn / OmniSharp）",
-			hint: "需 dotnet + ms-dotnettools.csharp 的 .roslyn 服务器，或手动指定"
+			label: "C#（Roslyn / DotRush / OmniSharp）",
+			hint: "优先自动发现 ms-dotnettools.csharp / DotRush 扩展（DotRush 需 .NET 10 运行时）；也可手动指定"
 		}];
 		const PHASE_LABEL = {
 			idle: "未启动",
@@ -5839,8 +5839,17 @@ window.__ModuleLoader__.load({
 				label: "更新"
 			}
 		];
-		/** 语言卡片：状态 + 启用开关 + 命令/路径配置 + 重新检测。 */
-		function LangCard({ lang, config, status, busy, onToggle, onSave, onRedetect }) {
+		/** 环境安装按钮文案（按安装进行态）。 */
+		function envButtonLabel(req, envStates) {
+			const state = (envStates ?? []).find((s) => s.id === req.id);
+			if (state?.phase === "downloading") return "下载中…";
+			if (state?.phase === "extracting") return "安装中…";
+			if (state?.phase === "done") return "已完成";
+			if (state?.phase === "failed") return "重试";
+			return "一键安装";
+		}
+		/** 语言卡片：状态 + 缺失环境提示（一键安装/官网下载） + 启用开关 + 命令/路径配置 + 重新检测。 */
+		function LangCard({ lang, config, status, busy, envStates, onInstallEnv, onToggle, onSave, onRedetect }) {
 			const [pathDraft, setPathDraft] = react.default.useState(config?.path ?? "");
 			const [commandDraft, setCommandDraft] = react.default.useState(config?.command ?? "");
 			react.default.useEffect(() => {
@@ -5852,7 +5861,23 @@ 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, 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, 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", {
+				className: "vsm-primary vsm-small",
+				disabled: busy === "env:" + req.id,
+				onClick: () => onInstallEnv(lang.id, req)
+			}, envButtonLabel(req, envStates)) : null, req.manualUrl ? react.default.createElement("a", {
+				href: req.manualUrl,
+				target: "_blank",
+				rel: "noreferrer",
+				style: {
+					color: "inherit",
+					textDecoration: "underline",
+					alignSelf: "center"
+				}
+			}, req.manualLabel ?? "官网下载") : null))) : 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)
@@ -5908,6 +5933,8 @@ window.__ModuleLoader__.load({
 			const [busy, setBusy] = react.default.useState("");
 			const [error, setError] = react.default.useState("");
 			const [loading, setLoading] = react.default.useState(true);
+			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]) => {
 					if (cfg?.ok) setConfig(cfg.config ?? {});
@@ -5922,6 +5949,12 @@ window.__ModuleLoader__.load({
 					setError("");
 				}).catch((e) => setError(String(e)));
 			}, []);
+			const refreshEnvStates = react.default.useCallback(() => {
+				return rpc("edrv.lsp.envState", {}).then((res) => {
+					if (res?.ok) setEnvStates(res.states ?? []);
+					return res?.states ?? [];
+				}).catch(() => []);
+			}, []);
 			const refresh = react.default.useCallback(() => {
 				setLoading(true);
 				Promise.all([refreshServers(), refreshExt()]).finally(() => setLoading(false));
@@ -5941,9 +5974,56 @@ window.__ModuleLoader__.load({
 				setServers((prev) => Array.isArray(list) ? [...prev.filter((s) => s.languageId !== languageId), ...list] : prev);
 			};
 			/** 重检测后通知编辑器：与 host 重新同步已打开的模型（触发重新 acquire）。 */
-			const notifyResync = (languageId) => {
+			const notifyResync = react.default.useCallback((languageId) => {
 				window.dispatchEvent(new CustomEvent("edrv:lsp-redetect", { detail: { languageId } }));
+			}, []);
+			/** 一键安装缺失环境：启动内置安装器（成功后进入轮询，完成自动重同步）。 */
+			const installEnv = (languageId, req) => {
+				const key = "env:" + req.id;
+				setBusy(key);
+				setError("");
+				setEnvLang(languageId);
+				rpc("edrv.lsp.envInstall", {
+					languageId,
+					id: req.id
+				}).then((res) => {
+					if (!res?.ok) {
+						setError(res?.error ?? "无法启动安装");
+						return;
+					}
+					refreshEnvStates();
+					refreshServers();
+				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
 			};
+			react.default.useEffect(() => {
+				if (!(envStates ?? []).some((s) => s.phase === "downloading" || s.phase === "extracting")) return;
+				const timer = setInterval(() => {
+					refreshEnvStates();
+					refreshServers();
+				}, 2e3);
+				return () => clearInterval(timer);
+			}, [
+				envStates,
+				refreshEnvStates,
+				refreshServers
+			]);
+			const prevEnvPhases = react.default.useRef({});
+			react.default.useEffect(() => {
+				const states = envStates ?? [];
+				for (const s of states) {
+					const prev = prevEnvPhases.current[s.id];
+					if (prev && prev !== "done" && s.phase === "done" && envLang) {
+						refreshServers();
+						notifyResync(envLang);
+					}
+					prevEnvPhases.current[s.id] = s.phase;
+				}
+			}, [
+				envStates,
+				envLang,
+				refreshServers,
+				notifyResync
+			]);
 			const saveLang = (languageId, path, command) => {
 				setBusy(languageId);
 				setError("");
@@ -6064,6 +6144,8 @@ window.__ModuleLoader__.load({
 				config: config[lang.id] ?? {},
 				status: servers.find((s) => s.languageId === lang.id),
 				busy,
+				envStates,
+				onInstallEnv: installEnv,
 				onToggle: toggleLang,
 				onSave: saveLang,
 				onRedetect: redetectLang