dsh-mcp-skills 0.2.1 → 0.2.3

package/lib/index.js

@@ -7,6 +7,7 @@
 // @deepseek-ai packages so out-of-tree resolution stays reliable (the modlens
 // precedent); `yaml` and `fflate` are runtime dependencies, and the MCP SDK is
 // an optional peer the host installation already provides (see loadMcpSdk).
+import { existsSync } from 'node:fs'
 import { access, copyFile, mkdir, readdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { dirname, isAbsolute, join, relative, resolve } from 'node:path'
@@ -19,7 +20,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.1'
+const PLUGIN_VERSION = '0.2.3'
 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. */
@@ -406,13 +407,32 @@ async function writeMcpServers(ctx, servers) {
   await syncMcpProfilePatch(ctx, servers)
 }
 
+/** Executable directories a GUI-launched harness commonly lacks. */
+const EXTRA_PATH_DIRS = ['/usr/local/bin', '/opt/homebrew/bin', '/usr/bin', '/bin']
+
+/**
+ * The environment one stdio server is spawned with.
+ *
+ * MCP servers are spawned by `@deepseek-ai/dsh-mcp-client` from the harness
+ * process environment, and a harness launched from a desktop icon inherits a
+ * minimal PATH (macOS gives just `/usr/bin:/bin:/usr/sbin:/sbin`). A configured
+ * `npx` / `uvx` then fails with ENOENT even though the user's shell resolves it,
+ * so the well-known executable directories are prepended when they exist.
+ * An explicit `PATH` in the server config still wins.
+ */
+function serverEnv(env) {
+  const current = (process.env.PATH ?? '').split(':').filter((entry) => entry !== '')
+  const missing = EXTRA_PATH_DIRS.filter((dir) => existsSync(dir) && !current.includes(dir))
+  return { ...(missing.length > 0 ? { PATH: [...missing, ...current].join(':') } : {}), ...env }
+}
+
 /**
  * The transport-shaped fields of one managed server, shared by the generated
  * patch row and the connection smoke test so both always agree.
  */
 function serverConnection(server) {
   return server.transport === 'stdio'
-    ? { command: server.command, args: server.args ?? [], env: server.env ?? {}, cwd: server.cwd || process.cwd() }
+    ? { command: server.command, args: server.args ?? [], env: serverEnv(server.env ?? {}), cwd: server.cwd || process.cwd() }
     : { url: server.url, headers: server.headers ?? {} }
 }
 
@@ -520,28 +540,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.1",
+  "version": "0.2.3",
   "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
     }