dsh-mcp-skills 0.2.0 → 0.2.2

package/README.md

@@ -67,16 +67,14 @@ dsh plugin --profile web remove dsh-mcp-skills
 发布到npm
 
 ```shell
-# 1. 补 package.json 元数据 + 新增 LICENSE 文件
+# 1. 用官方 registry 重新登录（务必带 --registry，否则会登到镜像站）
+npm login --registry=https://registry.npmjs.org --auth-type=web
 # 2. 确认包名可用
 npm view dsh-mcp-skills version
 # 3. 检查 tarball（务必含 cordis.patch.yml）
 npm pack --dry-run
 # 4. 发布（稳定版，不要 prerelease）
 npm publish
-# 5. 安装并重启
-dsh plugin --profile web add dsh-mcp-skills
-dsh web
 ```
 
 

package/lib/client.js

@@ -14,6 +14,22 @@ window.__ModuleLoader__.load({
     let react = require('react')
     let _deepseek_ai_dsh_client_ui_primitives = require('@deepseek-ai/dsh-client-ui-primitives')
 
+    // Icon exports were renamed across host releases: older builds spell them
+    // `Icon<Name>Outline16`, current ones `Icon<Name>OutlineRegular`. Resolve
+    // each once so one bundle renders on either host (an undefined component
+    // type is React error #130).
+    var manageIcon = (name) =>
+      _deepseek_ai_dsh_client_ui_primitives['Icon' + name + 'OutlineRegular'] ||
+      _deepseek_ai_dsh_client_ui_primitives['Icon' + name + 'Outline16']
+    var ManageIcons = {
+      edit: manageIcon('Edit'),
+      loading: manageIcon('Loading'),
+      play: manageIcon('Play'),
+      plus: manageIcon('Plus'),
+      refresh: manageIcon('Refresh'),
+      trash: manageIcon('Trash'),
+    }
+
     // ── styles ────────────────────────────────────────────────────────────────
     var manageStylesId = 'dsh-mcp-skills/manage.module.css'
     var manageCss =
@@ -56,6 +72,35 @@ window.__ModuleLoader__.load({
       return error instanceof Error ? error.message : String(error)
     }
 
+    /** Render a section failure on screen instead of leaving a blank pane. */
+    function manageFailure(error) {
+      return react_jsx_runtime.jsx('div', {
+        className: manageStyles.error,
+        children: 'mcp-skills: ' + manageMessageOf(error),
+      })
+    }
+
+    /**
+     * Keeps one section's render failure visible. The host retires a
+     * registration whose component throws (its entry-error supervision
+     * channel), which shows up as an empty pane with no console error.
+     */
+    class ManageBoundary extends react.Component {
+      constructor(props) {
+        super(props)
+        this.state = { error: null }
+      }
+
+      static getDerivedStateFromError(error) {
+        return { error: error }
+      }
+
+      render() {
+        if (this.state.error !== null) return manageFailure(this.state.error)
+        return this.props.children
+      }
+    }
+
     /** One labeled field row inside a management form. */
     function ManageField({ label, children }) {
       return react_jsx_runtime.jsxs('label', {
@@ -316,7 +361,7 @@ window.__ModuleLoader__.load({
                   react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                     variant: 'ghost',
                     size: 'sm',
-                    icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconRefreshOutline16, { size: 14 }),
+                    icon: react_jsx_runtime.jsx(ManageIcons.refresh, { size: 14 }),
                     disabled: busy,
                     onClick: () => {
                       load()
@@ -326,7 +371,7 @@ window.__ModuleLoader__.load({
                   react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                     variant: 'primary',
                     size: 'sm',
-                    icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 14 }),
+                    icon: react_jsx_runtime.jsx(ManageIcons.plus, { size: 14 }),
                     disabled: busy,
                     onClick: () => {
                       if (fileInputRef.current !== null) fileInputRef.current.click()
@@ -387,7 +432,7 @@ window.__ModuleLoader__.load({
                                     react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                                       variant: 'ghost',
                                       size: 'sm',
-                                      icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, { size: 14 }),
+                                      icon: react_jsx_runtime.jsx(ManageIcons.trash, { size: 14 }),
                                       disabled: busy,
                                       onClick: () => {
                                         remove(skill.name)
@@ -558,7 +603,7 @@ window.__ModuleLoader__.load({
                   react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                     variant: 'ghost',
                     size: 'sm',
-                    icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconRefreshOutline16, { size: 14 }),
+                    icon: react_jsx_runtime.jsx(ManageIcons.refresh, { size: 14 }),
                     disabled: busy,
                     onClick: () => {
                       load()
@@ -568,7 +613,7 @@ window.__ModuleLoader__.load({
                   react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                     variant: 'primary',
                     size: 'sm',
-                    icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 14 }),
+                    icon: react_jsx_runtime.jsx(ManageIcons.plus, { size: 14 }),
                     onClick: () => {
                       openForm(null)
                     },
@@ -808,8 +853,8 @@ window.__ModuleLoader__.load({
                                       size: 'sm',
                                       icon:
                                         testing === server.name
-                                          ? react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconLoadingOutline16, { size: 14 })
-                                          : react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconPlayOutline16, { size: 14 }),
+                                          ? react_jsx_runtime.jsx(ManageIcons.loading, { size: 14 })
+                                          : react_jsx_runtime.jsx(ManageIcons.play, { size: 14 }),
                                       disabled: busy || testing !== null,
                                       onClick: () => {
                                         test(server.name)
@@ -819,7 +864,7 @@ window.__ModuleLoader__.load({
                                     react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                                       variant: 'ghost',
                                       size: 'sm',
-                                      icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, { size: 14 }),
+                                      icon: react_jsx_runtime.jsx(ManageIcons.edit, { size: 14 }),
                                       disabled: busy || testing !== null,
                                       onClick: () => {
                                         openForm(server)
@@ -829,7 +874,7 @@ window.__ModuleLoader__.load({
                                     react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.Button, {
                                       variant: 'ghost',
                                       size: 'sm',
-                                      icon: react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, { size: 14 }),
+                                      icon: react_jsx_runtime.jsx(ManageIcons.trash, { size: 14 }),
                                       disabled: busy || testing !== null,
                                       onClick: () => {
                                         remove(server.name)
@@ -979,7 +1024,17 @@ window.__ModuleLoader__.load({
       )
       var t = ctx.locale.bind(MANAGE_NS)
       var api = buildManageApi()
-      var injected = () => ({ api, t })
+      /**
+       * Hand each section its api and locale through the closure: a
+       * registration's `inject` result is spread into props by the host, that
+       * delivery has differed between host releases, and a registration whose
+       * injected value cannot be built is retired without a console error (an
+       * empty pane sitting next to a working nav entry).
+       */
+      var deliver = (Component) => (props) =>
+        react_jsx_runtime.jsx(ManageBoundary, {
+          children: react_jsx_runtime.jsx(Component, { api: api, t: t, close: props !== null && typeof props === 'object' ? props.close : undefined }),
+        })
       ctx.slots.inject(
         'settings.section',
         () =>
@@ -990,9 +1045,8 @@ window.__ModuleLoader__.load({
               order: 30,
               label: () => t('skills.nav'),
               locale: MANAGE_NS,
-              inject: injected,
             },
-            SkillsSection,
+            deliver(SkillsSection),
           ),
       )
       ctx.slots.inject(
@@ -1005,9 +1059,8 @@ window.__ModuleLoader__.load({
               order: 40,
               label: () => t('mcp.nav'),
               locale: MANAGE_NS,
-              inject: injected,
             },
-            McpSection,
+            deliver(McpSection),
           ),
       )
     }

package/lib/index.js

@@ -19,7 +19,7 @@ export const inject = []
 
 const SKILL_NAME = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
 /** Kept in step with package.json (the smoke test reports it to the server). */
-const PLUGIN_VERSION = '0.2.0'
+const PLUGIN_VERSION = '0.2.2'
 const MCP_CONFIG_FILENAME = 'mcp-servers.yaml'
 const MCP_PROFILE_ROW_PREFIX = 'mcp-'
 /** Same grammar as @deepseek-ai/dsh-mcp-client's SERVER_NAME_PATTERN. */
@@ -520,28 +520,50 @@ function scrubbedParentEnv() {
  * The MCP SDK is an optional peer dependency the host installation provides,
  * loaded on demand so a missing copy disables only the connection smoke test
  * instead of breaking the whole plugin at import time.
+ *
+ * The package was renamed across host releases, so both spellings are tried:
+ * `@modelcontextprotocol/client` (current) and `@modelcontextprotocol/sdk`
+ * (older). Both expose the same Client/transport API.
  */
 let mcpSdkPromise
 function loadMcpSdk() {
   if (mcpSdkPromise === undefined) {
-    mcpSdkPromise = Promise.all([
-      import('@modelcontextprotocol/sdk/client/index.js'),
-      import('@modelcontextprotocol/sdk/client/stdio.js'),
-      import('@modelcontextprotocol/sdk/client/streamableHttp.js'),
-    ])
-      .then(([index, stdio, streamableHttp]) => ({
-        Client: index.Client,
-        StdioClientTransport: stdio.StdioClientTransport,
-        StreamableHTTPClientTransport: streamableHttp.StreamableHTTPClientTransport,
-      }))
-      .catch((error) => {
+    mcpSdkPromise = loadCurrentMcpSdk().catch((currentError) =>
+      loadLegacyMcpSdk().catch((legacyError) => {
         mcpSdkPromise = undefined // let a later call retry after a transient failure
-        throw new ManageError('mcp-sdk-unavailable', `no MCP SDK in this installation: ${error instanceof Error ? error.message : String(error)}`)
-      })
+        const reason = legacyError instanceof Error ? legacyError.message : String(legacyError)
+        const current = currentError instanceof Error ? currentError.message : String(currentError)
+        throw new ManageError('mcp-sdk-unavailable', `no MCP SDK in this installation (tried @modelcontextprotocol/client: ${current}; @modelcontextprotocol/sdk: ${reason})`)
+      }),
+    )
   }
   return mcpSdkPromise
 }
 
+/** The current `@modelcontextprotocol/client` spelling. */
+async function loadCurrentMcpSdk() {
+  const [main, stdio] = await Promise.all([import('@modelcontextprotocol/client'), import('@modelcontextprotocol/client/stdio')])
+  return {
+    Client: main.Client,
+    StdioClientTransport: stdio.StdioClientTransport,
+    StreamableHTTPClientTransport: main.StreamableHTTPClientTransport,
+  }
+}
+
+/** The older `@modelcontextprotocol/sdk` spelling. */
+async function loadLegacyMcpSdk() {
+  const [index, stdio, streamableHttp] = await Promise.all([
+    import('@modelcontextprotocol/sdk/client/index.js'),
+    import('@modelcontextprotocol/sdk/client/stdio.js'),
+    import('@modelcontextprotocol/sdk/client/streamableHttp.js'),
+  ])
+  return {
+    Client: index.Client,
+    StdioClientTransport: stdio.StdioClientTransport,
+    StreamableHTTPClientTransport: streamableHttp.StreamableHTTPClientTransport,
+  }
+}
+
 /** Connect to a server and list its tools (connection smoke test). */
 async function testMcpConnection(server) {
   const { Client, StdioClientTransport, StreamableHTTPClientTransport } = await loadMcpSdk()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-skills",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "DeepSeek Harness web plugin: settings pages for managing user skills and MCP servers",
   "type": "module",
   "repository": {
@@ -41,9 +41,13 @@
     "yaml": "^2.4.0"
   },
   "peerDependencies": {
+    "@modelcontextprotocol/client": "^2.0.0",
     "@modelcontextprotocol/sdk": "^1.30.0"
   },
   "peerDependenciesMeta": {
+    "@modelcontextprotocol/client": {
+      "optional": true
+    },
     "@modelcontextprotocol/sdk": {
       "optional": true
     }