dsh-mcp-connector 0.2.72 → 0.2.73

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)；首个公开版本从 `0.1.0` 开始。
 
+## [0.2.73] - 2026-10-15
+
+### Fixed
+
+- 兼容 DSH 0.2.1-alpha.1 起的 webStartup 服务，同时保留旧宿主 webRuntime 支持，修复面板正文及 API 路由未挂载导致的空白（#151）。两种服务并存时优先使用 webStartup 的可信主机配置，服务卸载时清理路由。
+- 将插件 API 请求失败与 npm 版本查询失败区分提示，不再把路由不可用统一报告为 npm 网络错误。
+
 ## [0.2.72] - 2026-10-14
 
 ### Fixed

package/README.en.md

@@ -215,7 +215,7 @@ npm run dev:ui
 
 Every Registry merge regenerates `catalog-stats.json`; an hourly workflow in this repository synchronizes the Chinese and English product copy plus a local stats snapshot. The static npm README updates with package releases, while the live badges above read the Registry directly and therefore stay current without another npm release.
 
-The current public version is [`dsh-mcp-connector@0.2.72`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.72](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.72).
+The current public version is [`dsh-mcp-connector@0.2.73`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.73](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.73).
 
 See [CHANGELOG.md](CHANGELOG.md) for version history and [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md) for the Desktop release checklist.
 

package/README.md

@@ -210,7 +210,7 @@ npm run dev:ui
 
 公共 Registry 每次合并后会生成 `catalog-stats.json`；本仓库的定时工作流每小时同步中英文介绍和统计快照。npm 页面中的静态正文随版本发布更新，上方动态统计徽标则直接读取 Registry，可在不发布新 npm 版本时保持实时数量一致。
 
-当前公开版本为 [`dsh-mcp-connector@0.2.72`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.72](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.72)。
+当前公开版本为 [`dsh-mcp-connector@0.2.73`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.73](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.73)。
 
 版本能力与变更记录见 [CHANGELOG.md](CHANGELOG.md)。
 Desktop 发版回归见 [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md)。

package/lib/client.js

@@ -1193,7 +1193,7 @@ window.__ModuleLoader__.load({
 						if (disposed) return;
 						setVersionStatus(status);
 						setVersionCheckBusy(status.checking === true);
-						setVersionCheckFailed(!status.checking && status.sources?.npm?.ok !== true);
+						setVersionCheckFailed(!status.checking && status.sources?.npm?.ok !== true ? "npm" : false);
 						if (status.checking) {
 							schedule(1e3);
 							return;
@@ -1207,7 +1207,7 @@ window.__ModuleLoader__.load({
 						console.warn("[mcp-connector] plugin update check failed:", error);
 						if (!disposed) {
 							setVersionCheckBusy(false);
-							setVersionCheckFailed(true);
+							setVersionCheckFailed("api");
 							schedule(VERSION_CHECK_RETRY_MS);
 						}
 					});
@@ -1668,7 +1668,7 @@ window.__ModuleLoader__.load({
 											versionCheckFailed && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "mcpConnectorUpdateStatus",
 												"data-tone": "error",
-												children: "暂时无法确认 npm 最新版本，请重试"
+												children: versionCheckFailed === "api" ? "插件 API 不可用，请检查 DSH 宿主兼容性或服务日志" : "暂时无法确认 npm 最新版本，请重试"
 											}),
 											versionStatus?.releasePending && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "mcpConnectorVersion",

package/lib/index.js

@@ -40,7 +40,7 @@ import { provision, disable, remove, entryIdFor } from './mcp-provision.js';
 import { classifyConnectionError, validateConnectionRecords } from './mcp-validation.js';
 import { listMcpTools, McpHttpError } from './mcp-http.js';
 import { registerTools } from './tools.js';
-import { mountWebRoutes } from './web.js';
+import { injectWebRoutes } from './web.js';
 import { createVersionStatusService } from './version-status.js';
 import { assertSafeUrl, normalizeConnectionDisplayName } from './util.js';
 import { readLegacyGrantCandidates, planLegacyMigration, toConnectorGrant, toConnectionRecords } from './migration.js';
@@ -3445,17 +3445,13 @@ export async function apply(ctx, config) {
   const disposeTools = registerTools(ctx, observableApi);
 
   /* ───────────────────────── web 半区（图形化市场）──────────────────────── */
-  // webServer / webRuntime 仅存在于 web 部署；无此服务时静默跳过（纯对话工具场景仍可用）。
-  let disposeWeb = null;
+  // webServer + 新版 webStartup 或旧版 webRuntime；纯对话部署不挂载 HTTP 路由。
   if (typeof ctx.inject === 'function') {
     try {
-      ctx.inject(['webServer', 'webRuntime'], (wctx) => {
-        disposeWeb = mountWebRoutes(wctx, observableApi, {
-          logger,
-          eventHub: statusEvents,
-          frameAncestors: config.frameAncestors,
-        });
-        logger.info('mcp-connector web UI mounted at /mcp-connector/ui/');
+      injectWebRoutes(ctx, observableApi, {
+        logger,
+        eventHub: statusEvents,
+        frameAncestors: config.frameAncestors,
       });
     } catch (error) {
       logger.warn(`mcp-connector web UI not mounted (webServer unavailable): ${error.message}`);
@@ -3467,7 +3463,6 @@ export async function apply(ctx, config) {
     clearTimeout(discoveryTimer);
     clearInterval(discoveryInterval);
     disposeTools();
-    disposeWeb?.();
     hostGovernance.dispose();
     hostScopes.dispose();
     hostSessionInjection.dispose();

package/lib/web.js

@@ -7,7 +7,7 @@
  *   - GET  /mcp-connector/events 无敏感数据的实时状态 SSE
  *
  * 所有路由都过浏览器信任 fence（loopback + 同源），与 better-sidebar 同一策略。
- * 本模块只依赖 ctx.webServer / ctx.webRuntime；在非 web 部署（无这两个服务）时
+ * 本模块依赖 ctx.webServer 及 webStartup（新版）或 webRuntime（旧版）；非 web 部署时
  * 调用方应跳过挂载，保证插件仍可用于纯对话工具场景。
  *
  * 静态资源响应的 `Content-Security-Policy` 由 `buildCsp()` 生成；其中
@@ -264,13 +264,47 @@ export function buildCsp(frameAncestors) {
 
 /* ───────────────────────── 路由挂载 ───────────────────────── */
 
+/** Alternative dependencies, not an AND: alpha.1 removed webRuntime.
+ * Keep each mount owned by its injection context; prefer webStartup when both exist.
+ */
+export function injectWebRoutes(ctx, api, options = {}) {
+  const candidates = new Map();
+  let active;
+  let dispose;
+  const reconcile = () => {
+    const next = candidates.get('webStartup') ?? candidates.get('webRuntime');
+    if (next === active) return;
+    dispose?.();
+    dispose = undefined;
+    active = next;
+    if (next) {
+      dispose = mountWebRoutes(next.ctx, api, {
+        ...options, trustedHosts: next.trustedHosts,
+      });
+      options.logger?.info?.('mcp-connector web UI mounted at /mcp-connector/ui/');
+    }
+  };
+  for (const name of ['webStartup', 'webRuntime']) {
+    ctx.inject(['webServer', name], (wctx) => {
+      wctx.effect(() => {
+        const candidate = { ctx: wctx, trustedHosts: wctx[name].trustedHosts ?? [] };
+        candidates.set(name, candidate);
+        reconcile();
+        return () => {
+          if (candidates.get(name) === candidate) candidates.delete(name);
+          reconcile();
+        };
+      });
+    });
+  }
+}
+
 /**
- * 挂载 web 路由。`wctx` 为已注入 webServer/webRuntime 的子上下文。
+ * 挂载 web 路由。`wctx` 为已注入 webServer 和对应信任服务的子上下文。
  * `frameAncestors` 为面板可嵌入白名单（缺省 = `['self']`，只有同源页面能内嵌；
  * 桌面壳场景由调用方显式追加外壳源）。返回 disposer（卸载三条 prefix 路由）。
  */
-export function mountWebRoutes(wctx, api, { logger, eventHub, frameAncestors } = {}) {
-  const trustedHosts = wctx.webRuntime?.trustedHosts ?? [];
+export function mountWebRoutes(wctx, api, { logger, eventHub, frameAncestors, trustedHosts = wctx.webStartup?.trustedHosts ?? wctx.webRuntime?.trustedHosts ?? [] } = {}) {
   const fence = (req) => isTrustedWebRequest(req, trustedHosts);
   const csp = buildCsp(frameAncestors);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-connector",
-  "version": "0.2.72",
+  "version": "0.2.73",
   "description": "DeepSeek Harness MCP Connector: connect servers, search tools across active connections, and troubleshoot discovery. Includes a continuously updated catalog; supports OAuth 2.0 PKCE, API keys, Streamable HTTP/stdio, and mcpServers JSON import.",
   "type": "module",
   "main": "lib/index.js",