dsh-mcp 1.2.0 → 1.4.0

package/src/client/mcp-store.ts

@@ -6,21 +6,9 @@
  */
 import { defineStore, type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'
 import type {
-  McpEnvVarInput, McpProbeView, McpServerId, McpServerInput, McpServerView, McpTransportKind,
+  McpProbeView, McpServerId, McpServerInput, McpServerView, McpTransportKind,
 } from './types.ts'
 
-/** One env row in the editor. */
-export interface McpEnvRowDraft {
-  /** Stable row key for React lists. */
-  readonly key: string
-  readonly name: string
-  readonly secret: boolean
-  /** Editor text; a blank secret value keeps the stored one on save. */
-  readonly value: string
-  /** Whether a stored value exists (secret rows render write-only). */
-  readonly configured: boolean
-}
-
 /** One server being edited. */
 export interface McpDraft {
   /** Existing server id; null creates a new server. */
@@ -35,7 +23,6 @@ export interface McpDraft {
   readonly url: string
   /** Headers as "Name: value" lines. */
   readonly headersText: string
-  readonly env: readonly McpEnvRowDraft[]
   /** Timeout as editor text; blank falls back to the default. */
   readonly toolCallTimeoutMs: string
   readonly failOnStartupError: boolean
@@ -75,19 +62,6 @@ type McpManagerActions = {
 /** Default tool-call timeout when the editor leaves it blank (ms). */
 export const DEFAULT_TOOL_CALL_TIMEOUT_MS = 60_000
 
-let envRowSeq = 0
-
-/** A fresh env row key for React identity. */
-function nextEnvRowKey(): string {
-  envRowSeq += 1
-  return `env-${envRowSeq}`
-}
-
-/** A fresh empty env row for the editor. */
-export function createEnvRowDraft(): McpEnvRowDraft {
-  return { key: nextEnvRowKey(), name: '', secret: false, value: '', configured: false }
-}
-
 /** Build an empty create draft. */
 export function emptyDraft(): McpDraft {
   return {
@@ -100,7 +74,6 @@ export function emptyDraft(): McpDraft {
     cwd: '',
     url: '',
     headersText: '',
-    env: [],
     toolCallTimeoutMs: String(DEFAULT_TOOL_CALL_TIMEOUT_MS),
     // Reject the mount by default when the startup connection fails, so a
     // broken server never registers stale tools.
@@ -120,13 +93,6 @@ export function draftFromServer(server: McpServerView): McpDraft {
     cwd: server.cwd,
     url: server.url,
     headersText: server.headers.map(header => `${header.name}: ${header.value}`).join('\n'),
-    env: server.env.map(entry => ({
-      key: nextEnvRowKey(),
-      name: entry.name,
-      secret: entry.secret,
-      value: '',
-      configured: entry.configured,
-    })),
     toolCallTimeoutMs: String(server.toolCallTimeoutMs),
     failOnStartupError: server.failOnStartupError,
   }
@@ -159,12 +125,12 @@ function parseTimeout(text: string): number {
 /** The Remote submission derived from the current draft. */
 export interface McpSubmission {
   readonly server: McpServerInput
-  readonly env: readonly McpEnvVarInput[]
 }
 
 /**
- * Convert the editing draft into the Remote upsert/test payload. A blank
- * secret value submits no value, which keeps the stored secret on upsert.
+ * Convert the editing draft into the Remote upsert/test payload. The form no
+ * longer edits env rows (process-level env vars are managed separately), so
+ * no env is submitted and the host keeps the stored env untouched.
  */
 export function draftToSubmission(draft: McpDraft): McpSubmission {
   return {
@@ -180,22 +146,6 @@ export function draftToSubmission(draft: McpDraft): McpSubmission {
       toolCallTimeoutMs: parseTimeout(draft.toolCallTimeoutMs),
       failOnStartupError: draft.failOnStartupError,
     },
-    env: draft.env.map(row => ({
-      name: row.name.trim(),
-      secret: row.secret,
-      ...row.secret && row.value.trim().length === 0 ? {} : { value: row.value },
-    })),
-  }
-}
-
-/** Map a Remote failure code to a locale key for user-facing copy. */
-export function failureLocaleKey(code: string): string {
-  switch (code) {
-    case 'MCP_SERVER_NAME_CONFLICT': return 'serverNameConflict'
-    case 'MCP_SERVER_NOT_FOUND': return 'notFound'
-    case 'MCP_INVALID_SPEC': return 'invalidSpec'
-    case 'MCP_MOUNT_FAILED': return 'mountFailed'
-    default: return 'failureTitle'
   }
 }
 

package/src/client/remote-contribution.js

@@ -32,6 +32,7 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_list_result$schema = z.object({
   'name': z.string().readonly(),
   'secret': z.boolean().readonly(),
   'configured': z.boolean().readonly(),
+  'value': z.string().readonly().optional(),
 })).readonly(),
   'toolCallTimeoutMs': z.number().readonly(),
   'failOnStartupError': z.boolean().readonly(),
@@ -63,7 +64,7 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_test_parameter_0$schema = z.object
   'name': z.string().readonly(),
   'secret': z.boolean().readonly(),
   'value': z.string().readonly().optional(),
-})).readonly(),
+})).readonly().optional(),
 })
 const _deepseek_ai_dsh_mcp_manager_mcpManager_test_result$schema = z.object({
   'ok': z.literal(true).readonly(),
@@ -100,7 +101,7 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_upsert_parameter_0$schema = z.obje
   'name': z.string().readonly(),
   'secret': z.boolean().readonly(),
   'value': z.string().readonly().optional(),
-})).readonly(),
+})).readonly().optional(),
 })
 const _deepseek_ai_dsh_mcp_manager_mcpManager_upsert_result$schema = z.union([z.object({
   'ok': z.literal(true).readonly(),
@@ -121,6 +122,7 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_upsert_result$schema = z.union([z.
   'name': z.string().readonly(),
   'secret': z.boolean().readonly(),
   'configured': z.boolean().readonly(),
+  'value': z.string().readonly().optional(),
 })).readonly(),
   'toolCallTimeoutMs': z.number().readonly(),
   'failOnStartupError': z.boolean().readonly(),
@@ -137,6 +139,69 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_upsert_result$schema = z.union([z.
   'message': z.string().readonly(),
 }).readonly(),
 })])
+const _deepseek_ai_dsh_mcp_manager_mcpManager_upsertJson_parameter_0$schema = z.object({
+  'servers': z.array(z.object({
+  'server': z.object({
+  'serverName': z.string().readonly(),
+  'transport': z.union([z.literal("stdio"), z.literal("streamable-http")]).readonly(),
+  'enabled': z.boolean().readonly().optional(),
+  'command': z.string().readonly().optional(),
+  'args': z.array(z.string()).readonly().optional(),
+  'cwd': z.string().readonly().optional(),
+  'url': z.string().readonly().optional(),
+  'headers': z.union([z.record(z.string(), z.string()), z.array(z.object({
+  'name': z.string().readonly(),
+  'value': z.string().readonly(),
+})).readonly()]).readonly().optional(),
+  'toolCallTimeoutMs': z.number().readonly().optional(),
+  'failOnStartupError': z.boolean().readonly().optional(),
+}).readonly(),
+  'env': z.array(z.object({
+  'name': z.string().readonly(),
+  'secret': z.boolean().readonly().optional(),
+  'value': z.string().readonly().optional(),
+})).readonly().optional(),
+})).readonly(),
+})
+const _deepseek_ai_dsh_mcp_manager_mcpManager_upsertJson_result$schema = z.union([z.object({
+  'ok': z.literal(true).readonly(),
+  'added': z.number().readonly(),
+  'updated': z.number().readonly(),
+  'removed': z.number().readonly(),
+  'servers': z.array(z.object({
+  'id': z.intersection(z.string(), z.unknown()).readonly(),
+  'serverName': z.string().readonly(),
+  'transport': z.union([z.literal("stdio"), z.literal("streamable-http")]).readonly(),
+  'enabled': z.boolean().readonly(),
+  'command': z.string().readonly(),
+  'args': z.array(z.string()).readonly(),
+  'cwd': z.string().readonly(),
+  'url': z.string().readonly(),
+  'headers': z.array(z.object({
+  'name': z.string().readonly(),
+  'value': z.string().readonly(),
+})).readonly(),
+  'env': z.array(z.object({
+  'name': z.string().readonly(),
+  'secret': z.boolean().readonly(),
+  'configured': z.boolean().readonly(),
+  'value': z.string().readonly().optional(),
+})).readonly(),
+  'toolCallTimeoutMs': z.number().readonly(),
+  'failOnStartupError': z.boolean().readonly(),
+  'status': z.object({
+  'phase': z.union([z.literal("failed"), z.literal("stopped"), z.literal("mounting"), z.literal("live")]).readonly(),
+  'tools': z.array(z.string()).readonly(),
+  'error': z.string().readonly().optional(),
+}).readonly(),
+})).readonly(),
+}), z.object({
+  'ok': z.literal(false).readonly(),
+  'error': z.object({
+  'code': z.union([z.literal("MCP_SERVER_NOT_FOUND"), z.literal("MCP_SERVER_NAME_CONFLICT"), z.literal("MCP_INVALID_SPEC"), z.literal("MCP_MOUNT_FAILED")]).readonly(),
+  'message': z.string().readonly(),
+}).readonly(),
+})])
 const _deepseek_ai_dsh_mcp_manager_mcpManager_toolsList_result$schema = z.object({
   'ok': z.literal(true).readonly(),
   'tools': z.array(z.object({
@@ -174,6 +239,37 @@ const _deepseek_ai_dsh_mcp_manager_mcpManager_toolsMode_result$schema = z.union(
   'message': z.string().readonly(),
 }).readonly(),
 })])
+const _deepseek_ai_dsh_mcp_manager_mcpManager_envList_result$schema = z.object({
+  'ok': z.literal(true).readonly(),
+  'vars': z.array(z.object({
+  'name': z.string().readonly(),
+  'secret': z.boolean().readonly(),
+  'configured': z.boolean().readonly(),
+  'value': z.string().readonly().optional(),
+})).readonly(),
+})
+const _deepseek_ai_dsh_mcp_manager_mcpManager_envSet_parameter_0$schema = z.object({
+  'vars': z.array(z.object({
+  'name': z.string().readonly(),
+  'secret': z.boolean().readonly().optional(),
+  'value': z.string().readonly().optional(),
+})).readonly(),
+})
+const _deepseek_ai_dsh_mcp_manager_mcpManager_envSet_result$schema = z.union([z.object({
+  'ok': z.literal(true).readonly(),
+  'vars': z.array(z.object({
+  'name': z.string().readonly(),
+  'secret': z.boolean().readonly(),
+  'configured': z.boolean().readonly(),
+  'value': z.string().readonly().optional(),
+})).readonly(),
+}), z.object({
+  'ok': z.literal(false).readonly(),
+  'error': z.object({
+  'code': z.union([z.literal("MCP_INVALID_SPEC")]).readonly(),
+  'message': z.string().readonly(),
+}).readonly(),
+})])
 
 export const TYPERT_REMOTE = {
   package: '@deepseek-ai/dsh-mcp-manager',
@@ -268,6 +364,31 @@ export const TYPERT_REMOTE = {
       },
       sourceLocation: {"file":"packages/mcp/mcp-manager/src/index.ts","line":329,"column":9},
     },
+    {
+      id: '@deepseek-ai/dsh-mcp-manager#mcpManager/upsertJson',
+      service: 'mcpManager',
+      namespace: 'mcpManager',
+      method: 'upsertJson',
+      invocation: { kind: 'direct' },
+      parameters: [
+        {
+          name: 'request',
+          wire: 'request',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@deepseek-ai/dsh-mcp-manager/types#McpManagerUpsertJsonRequest',
+            schema: _deepseek_ai_dsh_mcp_manager_mcpManager_upsertJson_parameter_0$schema,
+          },
+        },
+      ],
+      result: {
+        mode: 'strict',
+        typeSymbol: '@deepseek-ai/dsh-mcp-manager/types#McpManagerUpsertJsonResult',
+        schema: _deepseek_ai_dsh_mcp_manager_mcpManager_upsertJson_result$schema,
+      },
+      sourceLocation: {"file":"lib/index.js"},
+    },
     {
       id: '@deepseek-ai/dsh-mcp-manager#mcpManager/toolsList',
       service: 'mcpManager',
@@ -333,6 +454,46 @@ export const TYPERT_REMOTE = {
       },
       sourceLocation: {"file":"lib/index.js"},
     },
+    {
+      id: '@deepseek-ai/dsh-mcp-manager#mcpManager/envList',
+      service: 'mcpManager',
+      namespace: 'mcpManager',
+      method: 'envList',
+      invocation: { kind: 'direct' },
+      parameters: [
+      ],
+      result: {
+        mode: 'strict',
+        typeSymbol: '@deepseek-ai/dsh-mcp-manager/types#McpManagerEnvListResult',
+        schema: _deepseek_ai_dsh_mcp_manager_mcpManager_envList_result$schema,
+      },
+      sourceLocation: {"file":"lib/index.js"},
+    },
+    {
+      id: '@deepseek-ai/dsh-mcp-manager#mcpManager/envSet',
+      service: 'mcpManager',
+      namespace: 'mcpManager',
+      method: 'envSet',
+      invocation: { kind: 'direct' },
+      parameters: [
+        {
+          name: 'request',
+          wire: 'request',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@deepseek-ai/dsh-mcp-manager/types#McpManagerEnvSetRequest',
+            schema: _deepseek_ai_dsh_mcp_manager_mcpManager_envSet_parameter_0$schema,
+          },
+        },
+      ],
+      result: {
+        mode: 'strict',
+        typeSymbol: '@deepseek-ai/dsh-mcp-manager/types#McpManagerEnvSetResult',
+        schema: _deepseek_ai_dsh_mcp_manager_mcpManager_envSet_result$schema,
+      },
+      sourceLocation: {"file":"lib/index.js"},
+    },
   ],
 }
 

package/src/client/types.ts

@@ -52,6 +52,8 @@ export interface McpEnvVarView {
   readonly name: string
   readonly secret: boolean
   readonly configured: boolean
+  /** Plain-text value of a non-secret env var (secret values never leave the Host). */
+  readonly value?: string
 }
 
 /** Lifecycle phase of one managed server's live mount. */