dsh-mcp-connector 0.2.59 → 0.2.60

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ## [Unreleased]
 
+## [0.2.60] - 2026-09-29
+
+### Fixed
+
+- 放宽 `@deepseek-ai/dsh-mcp-client` peer 范围以支持 DSH `0.2.x`，避免插件在组合阶段被整体跳过、全部 MCP Server 消失（#101）。
+- 忽略工具 Schema 读取或 restriction 更新期间同步触发的嵌套 `tools/change`，阻断与工具重注册插件组合时的永久重扫和 100% CPU 死循环（#99）。
+- 连接范围选择器列出全部可用 Workspace；没有当前会话时仍可显式选择目标项目，不再只能保存为 profile 全局（#100）。
+
+### Verification
+
+- 新增治理与作用域控制器的同步重入回归、无当前会话的 Workspace 列表回归，以及 DSH `0.2.x` peer 范围门禁。
+
 ## [0.2.59] - 2026-09-25
 
 ### Fixed

package/README.en.md

@@ -198,7 +198,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.59`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.59](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.59).
+The current public version is [`dsh-mcp-connector@0.2.60`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.60](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.60).
 
 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

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

package/docs/CONNECTION-SCOPES.md

@@ -13,9 +13,9 @@
 
 Desktop 和 Web 使用同一个 Host API：
 
-1. 市场从父级 DSH 客户端读取当前 Workspace；
+1. 市场从父级 DSH 客户端和 Host Workspace Registry 读取当前 Workspace 及可用 Workspace 列表；
 2. OAuth、免密、Bearer/API Key、JSON 导入和 URL 安装都会在提交前显示目标范围；
-3. 已选择 Workspace 时页面默认为“当前项目”，也可显式选择“所有项目（全局）”；
+3. 已选择 Workspace 时页面默认为“当前项目”；没有当前会话时仍可从列表显式选择任一 Workspace，或选择“所有项目（全局）”；
 4. 项目范围只在 Host 支持最终执行 Guard，且目标 Workspace 仍存在时才能保存。
 
 对话工具的 `scope` 可传 `project` 或 `global`；`project` 同时要求 `workspaceId`。旧版客户端未传作用域时，新连接按兼容规则归为当前 profile 全局。

package/lib/client.js

@@ -1013,6 +1013,20 @@ window.__ModuleLoader__.load({
 			};
 		}
 
+		function availableWorkspaceContexts(ctx) {
+			const items = ctx.workspaces.list.getSnapshot()?.items;
+			if (!Array.isArray(items)) return [];
+			const workspaces = new Map();
+			for (const item of items) {
+				if (typeof item?.workspaceId !== "string" || item.workspaceId === "") continue;
+				workspaces.set(item.workspaceId, {
+					workspaceId: item.workspaceId,
+					title: item.title ?? String(item.workspaceId)
+				});
+			}
+			return [...workspaces.values()];
+		}
+
 		async function startPromptSession(ctx, promptText) {
 			if (typeof promptText !== "string" || promptText.trim() === "") {
 				throw new Error("Prompt 不能为空");
@@ -1054,7 +1068,8 @@ window.__ModuleLoader__.load({
 				useStore,
 				actions,
 				startPromptSession: launchPromptSession,
-				workspaceContext = () => null
+				workspaceContext = () => null,
+				workspaceOptions = () => []
 			} = props;
 			const open = useStore((state) => state.open);
 			const detailOpen = useStore((state) => state.detailOpen);
@@ -1078,7 +1093,8 @@ window.__ModuleLoader__.load({
 				const sendWorkspaceContext = () => {
 					frameRef.current?.contentWindow?.postMessage({
 						type: WORKSPACE_CONTEXT_RESULT_TYPE,
-						workspace: workspaceContext()
+						workspace: workspaceContext(),
+						workspaces: workspaceOptions()
 					}, window.location.origin);
 				};
 				const onMessage = (event) => {
@@ -1726,7 +1742,8 @@ window.__ModuleLoader__.load({
 						store: marketView,
 						inject: () => ({
 							startPromptSession: (promptText) => startPromptSession(ctx, promptText),
-							workspaceContext: () => currentWorkspaceContext(ctx)
+							workspaceContext: () => currentWorkspaceContext(ctx),
+							workspaceOptions: () => availableWorkspaceContexts(ctx)
 						})
 					}, MarketOverlay);
 				});

package/lib/connection-scopes.js

@@ -313,13 +313,13 @@ export function createHostScopeController(ctx, {
   }
 
   let syncing = false;
-  let pending = false;
   function refresh() {
     if (disposed || !agentsMounted) return;
-    if (syncing) {
-      pending = true;
-      return;
-    }
+    // Reading lazy Host schemas or replacing a restriction may synchronously
+    // emit tools/change. Ignore that nested notification: replaying it scans
+    // the same single-threaded state and can otherwise keep the event loop in
+    // a permanent tools/change cycle with plugins that re-register tools.
+    if (syncing) return;
     syncing = true;
     try {
       const live = new Set(mountedAgentCtx?.agents?.list?.() ?? []);
@@ -327,10 +327,6 @@ export function createHostScopeController(ctx, {
       for (const agent of restrictions.keys()) if (!live.has(agent)) restrictions.delete(agent);
     } finally {
       syncing = false;
-      if (pending) {
-        pending = false;
-        refresh();
-      }
     }
   }
 

package/lib/governance.js

@@ -336,13 +336,14 @@ export function createHostGovernanceController(ctx, { getRules, getRecords, logg
   }
 
   let syncing = false;
-  let pendingSync = false;
   function syncRestrictions() {
     if (disposed || !agentsMounted) return;
-    if (syncing) {
-      pendingSync = true;
-      return;
-    }
+    // schemas()/restrict() may synchronously cause another tools/change while
+    // Host plugins materialize lazy schemas or re-register equivalent tools.
+    // JavaScript cannot interleave an unrelated external change in this stack,
+    // so replaying that nested event only scans the same state again and can
+    // form an endless tools/change -> schemas -> tools/change loop.
+    if (syncing) return;
     syncing = true;
     try {
       const denied = deniedObservedNames();
@@ -353,10 +354,6 @@ export function createHostGovernanceController(ctx, { getRules, getRecords, logg
       }
     } finally {
       syncing = false;
-      if (pendingSync) {
-        pendingSync = false;
-        syncRestrictions();
-      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-connector",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "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",
@@ -142,7 +142,7 @@
   "peerDependencies": {
     "@deepseek-ai/dsh-client-ui-conversation": "*",
     "@deepseek-ai/dsh-client-ui-layout": "*",
-    "@deepseek-ai/dsh-mcp-client": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-mcp-client": "^0.1.1-rc.2 || >=0.2.0-rc.1 <0.3.0-0",
     "@deepseek-ai/dsh-storage-domain": "*",
     "@deepseek-ai/schemastery": "^3.18.1",
     "@deepseek-ai/cordis": "^4.0.1",

package/ui/index.html

@@ -590,6 +590,7 @@
   let communityCtaEligible = false;
   let communityCtaDismissed = false;
   let currentWorkspace = null;
+  let availableWorkspaces = [];
   let scopeRevision = 0;
   let scopeRollbackRevision = null;
   let pendingScopeKey = null;
@@ -660,15 +661,34 @@
     showToast(message || (ok ? '已带入新会话' : '打开新会话失败，请重试'), ok);
   }
 
+  function normalizeWorkspaceOptions(input) {
+    const byId = new Map();
+    for (const item of Array.isArray(input) ? input : []) {
+      const workspaceId = typeof item?.workspaceId === 'string' ? item.workspaceId : typeof item?.id === 'string' ? item.id : '';
+      if (!workspaceId) continue;
+      byId.set(workspaceId, { workspaceId, title: String(item.title || workspaceId) });
+    }
+    if (currentWorkspace && !byId.has(currentWorkspace.workspaceId)) {
+      byId.set(currentWorkspace.workspaceId, currentWorkspace);
+    }
+    return [...byId.values()];
+  }
+
+  function updateAvailableWorkspaces(input) {
+    availableWorkspaces = normalizeWorkspaceOptions(input);
+  }
+
   window.addEventListener('message', (event) => {
     if (event.origin !== window.location.origin || event.source !== window.parent) return;
     if (event.data?.type === WORKSPACE_CONTEXT_RESULT_TYPE) {
       const workspace = event.data.workspace;
       const previousWorkspaceId = currentWorkspace?.workspaceId ?? null;
+      const previousWorkspaceOptions = JSON.stringify(availableWorkspaces);
       currentWorkspace = workspace && typeof workspace.workspaceId === 'string'
         ? { workspaceId: workspace.workspaceId, title: String(workspace.title || workspace.workspaceId) }
         : null;
-      if ((currentWorkspace?.workspaceId ?? null) !== previousWorkspaceId) {
+      updateAvailableWorkspaces(event.data.workspaces);
+      if ((currentWorkspace?.workspaceId ?? null) !== previousWorkspaceId || JSON.stringify(availableWorkspaces) !== previousWorkspaceOptions) {
         explorerSequence++; explorerDetailSequence++;
         explorerData = null; explorerOffset = 0;
         explorerFilter = { connectionKey: '', serverName: '', status: '' };
@@ -689,16 +709,25 @@
   }
 
   function scopeFieldHtml({ id = 'cfg-scope', selected } = {}) {
-    const projectAvailable = currentWorkspace !== null;
-    const value = selected || (projectAvailable ? 'project' : 'global');
-    return `<label for="${esc(id)}">连接范围</label><select id="${esc(id)}"><option value="project" ${value === 'project' ? 'selected' : ''} ${projectAvailable ? '' : 'disabled'}>${projectAvailable ? `当前项目：${esc(currentWorkspace.title)}` : '当前项目（请先选择 Workspace）'}</option><option value="global" ${value === 'global' ? 'selected' : ''}>所有项目（全局）</option></select><div class="field-help">项目范围只在当前 Workspace 的 Agent 中可见；全局范围由所有 Workspace 继承。范围绑定不保存或复制凭据。</div>`;
+    const defaultValue = currentWorkspace ? `project:${currentWorkspace.workspaceId}` : 'global';
+    const value = selected === 'project'
+      ? defaultValue
+      : selected || defaultValue;
+    const projectOptions = availableWorkspaces.map((workspace) => {
+      const optionValue = `project:${workspace.workspaceId}`;
+      const prefix = workspace.workspaceId === currentWorkspace?.workspaceId ? '当前项目' : '项目';
+      return `<option value="${esc(optionValue)}" ${value === optionValue ? 'selected' : ''}>${prefix}：${esc(workspace.title)}</option>`;
+    }).join('');
+    const unavailable = projectOptions ? '' : '<option value="" disabled>暂无可用 Workspace</option>';
+    return `<label for="${esc(id)}">连接范围</label><select id="${esc(id)}">${projectOptions}${unavailable}<option value="global" ${value === 'global' ? 'selected' : ''}>所有项目（全局）</option></select><div class="field-help">可选择任一 Workspace；项目范围只在该 Workspace 的 Agent 中可见。全局范围由所有 Workspace 继承，范围绑定不保存或复制凭据。</div>`;
   }
 
   function selectedScopeParams(id = 'cfg-scope') {
-    const scope = $(`#${id}`)?.value || 'global';
-    if (scope === 'project') {
-      if (!currentWorkspace) throw new Error('请先选择一个 Workspace，再使用项目范围');
-      return { scope, workspaceId: currentWorkspace.workspaceId };
+    const value = $(`#${id}`)?.value || 'global';
+    if (value.startsWith('project:')) {
+      const workspaceId = value.slice('project:'.length);
+      if (!workspaceId) throw new Error('请选择一个 Workspace，再使用项目范围');
+      return { scope: 'project', workspaceId };
     }
     return { scope: 'global' };
   }
@@ -1133,7 +1162,10 @@
     syncMarketNav();
     main.innerHTML = '<div class="empty">加载中…</div>';
     const [r, status] = await Promise.all([call('catalog', workspaceParams()), call('status', workspaceParams())]);
-    if (status.ok) setTabCount('installed', (status.detail?.items ?? []).length);
+    if (status.ok) {
+      updateAvailableWorkspaces(status.detail?.scope?.workspaces);
+      setTabCount('installed', (status.detail?.items ?? []).length);
+    }
     if (!r.ok) { main.innerHTML = `<div class="empty">${esc(r.message)}</div>`; return; }
     const items = r.detail?.items ?? [];
     setTabCount('market', items.length);
@@ -1284,6 +1316,7 @@
     main.innerHTML = '<div class="empty">加载中…</div>';
     const [r, migration] = await Promise.all([call('status', workspaceParams()), call('migrationPreview', { scanStored: false })]);
     if (!r.ok) { main.innerHTML = `<div class="empty">${esc(r.message)}</div>`; return; }
+    updateAvailableWorkspaces(r.detail?.scope?.workspaces);
     const items = r.detail?.items ?? [];
     installedItems = items;
     scopeRevision = Number.isInteger(r.detail?.scope?.revision) ? r.detail.scope.revision : 0;