dsh-mcp 1.2.0 → 1.4.0

package/src/client/ServerForm.module.css

@@ -110,23 +110,6 @@ button:disabled {
   box-shadow: 0 0 0 2px color-mix(in srgb, var(--dsw-alias-brand-primary) 18%, transparent);
 }
 
-.envBlock {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 10px;
-  padding: 10px 12px 12px;
-  margin: 0;
-}
-
-.envBlock legend {
-  padding: 0 4px;
-  font-size: 13px;
-  line-height: 20px;
-  font-weight: 600;
-}
-
 .hint,
 .muted {
   margin: 0;
@@ -135,36 +118,6 @@ button:disabled {
   color: var(--dsw-alias-label-tertiary);
 }
 
-.envRow {
-  display: grid;
-  grid-template-columns: minmax(0, 1.2fr) minmax(0, 1.6fr) auto auto;
-  align-items: center;
-  gap: 8px;
-}
-
-.envRow input {
-  box-sizing: border-box;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 6px;
-  padding: 5px 8px;
-  outline: none;
-  background: var(--dsw-alias-bg-layer-1);
-  color: var(--dsw-alias-label-primary);
-  font: inherit;
-  font-size: 13px;
-}
-
-.secretToggle {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  color: var(--dsw-alias-label-secondary);
-  font-size: 12px;
-  line-height: 18px;
-  white-space: nowrap;
-  cursor: pointer;
-}
-
 .checkRow {
   display: inline-flex;
   align-items: center;

package/src/client/ServerForm.tsx

@@ -1,16 +1,15 @@
 import { useState, type ReactNode } from 'react'
-import type { McpServerId, McpServerView } from './types.ts'
+import type { McpManagerFailure, McpServerId, McpServerView } from './types.ts'
 import type {
-  McpDraft, McpEnvRowDraft, McpTestOutcome,
+  McpDraft, McpTestOutcome,
 } from './mcp-store.ts'
-import { createEnvRowDraft, failureLocaleKey } from './mcp-store.ts'
 import type { McpSettingsLocaleKey } from './locales.ts'
 import css from './ServerForm.module.css'
 
 /** The Remote verbs the editor needs; structurally the section's inject face. */
 export interface McpServerFormRemote {
-  save: (draft: McpDraft) => Promise<{ message: string } | null>
-  remove: (id: McpServerId) => Promise<{ message: string } | null>
+  save: (draft: McpDraft) => Promise<McpManagerFailure | null>
+  remove: (id: McpServerId) => Promise<McpManagerFailure | null>
   test: (draft: McpDraft) => Promise<McpTestOutcome>
   list: () => Promise<readonly McpServerView[]>
 }
@@ -48,25 +47,18 @@ export function McpServerForm(props: McpServerFormProps): ReactNode {
     actions.updateDraft(patch)
   }
 
-  const updateEnvRow = (key: string, patch: Partial<McpEnvRowDraft>): void => {
-    update({ env: draft.env.map(row => row.key === key ? { ...row, ...patch } : row) })
-  }
-
-  const removeEnvRow = (key: string): void => {
-    update({ env: draft.env.filter(row => row.key !== key) })
-  }
-
-  const addEnvRow = (): void => {
-    update({ env: [...draft.env, createEnvRowDraft()] })
-  }
+  const errorText = (error: unknown): string =>
+    error instanceof Error ? error.message : String(error)
 
   const runTest = async (): Promise<void> => {
     setSaveError(null)
     actions.setTestRunning(true)
     try {
       actions.setTest(await injected.test(draft))
-    } catch {
+    } catch (error) {
+      console.error('[dsh-mcp] test failed:', error)
       actions.setTest(null)
+      setSaveError(errorText(error))
     } finally {
       actions.setTestRunning(false)
     }
@@ -78,14 +70,15 @@ export function McpServerForm(props: McpServerFormProps): ReactNode {
     try {
       const failure = await injected.save(draft)
       if (failure !== null) {
-        setSaveError(t(failureLocaleKey(failure.code)))
+        setSaveError(`${failure.code}: ${failure.message}`)
         return
       }
-      await refresh()
+      if (!await refresh()) return
       actions.cancelEdit()
       onSaved?.()
-    } catch {
-      setSaveError(t('failureTitle'))
+    } catch (error) {
+      console.error('[dsh-mcp] save failed:', error)
+      setSaveError(errorText(error))
     } finally {
       actions.setBusy(null)
     }
@@ -98,24 +91,27 @@ export function McpServerForm(props: McpServerFormProps): ReactNode {
     try {
       const failure = await injected.remove(draft.id)
       if (failure !== null) {
-        setSaveError(failure.message)
+        setSaveError(`${failure.code}: ${failure.message}`)
         return
       }
-      await refresh()
+      if (!await refresh()) return
       actions.cancelEdit()
-    } catch {
-      setSaveError(t('failureTitle'))
+    } catch (error) {
+      console.error('[dsh-mcp] remove failed:', error)
+      setSaveError(errorText(error))
     } finally {
       actions.setBusy(null)
     }
   }
 
-  const refresh = async (): Promise<void> => {
+  const refresh = async (): Promise<boolean> => {
     try {
       actions.setServers(await injected.list())
-    } catch {
-      // The save/remove outcome is the actionable one; a failed refresh is
-      // re-run on the next page visit.
+      return true
+    } catch (error) {
+      console.error('[dsh-mcp] refresh failed:', error)
+      setSaveError(errorText(error))
+      return false
     }
   }
 
@@ -211,47 +207,6 @@ export function McpServerForm(props: McpServerFormProps): ReactNode {
         </>
       )}
 
-      {stdio ? (
-        <fieldset className={css.envBlock}>
-          <legend>{t('envVars')}</legend>
-          <p className={css.hint}>{t('envHint')}</p>
-          {draft.env.length === 0 ? <p className={css.muted}>{t('envVars')}: 0</p> : null}
-          {draft.env.map(row => (
-            <div key={row.key} className={css.envRow}>
-              <input
-                type="text"
-                className={css.envName}
-                value={row.name}
-                placeholder={t('envName')}
-                aria-label={t('envName')}
-                onChange={(event) => updateEnvRow(row.key, { name: event.currentTarget.value })}
-              />
-              <input
-                type={row.secret ? 'password' : 'text'}
-                className={css.envValue}
-                value={row.value}
-                placeholder={row.secret && row.configured ? '••••••••' : t('envValue')}
-                aria-label={t('envValue')}
-                onChange={(event) => updateEnvRow(row.key, { value: event.currentTarget.value })}
-              />
-              <label className={css.secretToggle}>
-                <input
-                  type="checkbox"
-                  checked={row.secret}
-                  title={t('envSecretHint')}
-                  onChange={(event) => updateEnvRow(row.key, { secret: event.currentTarget.checked })}
-                />
-                {t('envSecret')}
-              </label>
-              <button type="button" className={css.danger} aria-label={t('removeEnvVar')} onClick={() => removeEnvRow(row.key)}>
-                ✕
-              </button>
-            </div>
-          ))}
-          <button type="button" onClick={addEnvRow}>{t('addEnvVar')}</button>
-        </fieldset>
-      ) : null}
-
       <label className={css.field}>
         <span>{t('toolCallTimeoutMs')}</span>
         <input

package/src/client/ServersJsonEditor.module.css

@@ -0,0 +1,90 @@
+.panel {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 10px;
+  padding: 10px 14px;
+  background: var(--dsw-alias-bg-layer-3);
+}
+
+.editor {
+  width: 100%;
+  box-sizing: border-box;
+  min-height: 260px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 8px;
+  padding: 8px 10px;
+  outline: none;
+  background: var(--dsw-alias-bg-layer-1);
+  color: var(--dsw-alias-label-primary);
+  font: inherit;
+  font-size: 12px;
+  line-height: 18px;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  resize: vertical;
+}
+
+.editor:focus-visible {
+  border-color: var(--dsw-alias-brand-primary);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--dsw-alias-brand-primary) 18%, transparent);
+}
+
+.hint {
+  margin: 0;
+  color: var(--dsw-alias-label-tertiary);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.error {
+  margin: 0;
+  color: var(--dsw-alias-state-error-primary);
+  font-size: 12px;
+  line-height: 18px;
+  word-break: break-all;
+}
+
+.notice {
+  margin: 0;
+  color: var(--dsw-alias-state-success-primary);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.actions button {
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  padding: 5px 12px;
+  background: transparent;
+  color: var(--dsw-alias-label-primary);
+  font: inherit;
+  font-size: 13px;
+  line-height: 20px;
+  cursor: pointer;
+}
+
+.actions button:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+.actions button:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+}
+
+.actions .primary {
+  border-color: var(--dsw-alias-button-primary-fill);
+  background: var(--dsw-alias-button-primary-fill);
+  color: var(--dsw-alias-label-primary-foreground);
+}
+
+.actions .primary:hover {
+  background: var(--dsw-alias-button-primary-hover);
+}

package/src/client/ServersJsonEditor.tsx

@@ -0,0 +1,226 @@
+/**
+ * JSON server-config editor: view and edit the whole MCP server list as one
+ * JSON document. The document is an array of server definitions (the same
+ * shape the add/edit form submits); applying it replaces the whole list —
+ * listed servers are created or updated, existing servers absent from the
+ * document are removed. Secret env values are never exported (a `configured`
+ * flag marks them) and a blank secret value keeps the stored one.
+ *
+ *   [
+ *     {
+ *       "serverName": "feishu-mcp",
+ *       "transport": "streamable-http",
+ *       "enabled": true,
+ *       "url": "https://.../mcp",
+ *       "headers": { "Authorization": "Bearer ..." },
+ *       "toolCallTimeoutMs": 60000,
+ *       "failOnStartupError": true,
+ *       "env": []
+ *     }
+ *   ]
+ * @module dsh-mcp/client/ServersJsonEditor
+ */
+
+import { useEffect, useRef, useState, type ReactNode } from 'react'
+import type { McpServerView } from './types.ts'
+import type { McpSettingsLocaleKey } from './locales.ts'
+import css from './ServersJsonEditor.module.css'
+
+/** One { server, env } entry submitted to the Host's upsertJson. */
+export interface ServersJsonEntry {
+  readonly server: Record<string, unknown>
+  readonly env: readonly unknown[]
+}
+
+/** Host Remote face required by the JSON editor. */
+export interface ServersJsonRemote {
+  /** Read the current server list. */
+  list: () => Promise<readonly McpServerView[]>
+  /** Replace the whole server list; returns change counts. */
+  upsertJson: (servers: readonly ServersJsonEntry[]) => Promise<{ added: number; updated: number; removed: number }>
+}
+
+/** Props for the JSON editor panel. */
+export interface ServersJsonEditorProps {
+  readonly injected: ServersJsonRemote
+  readonly t: (key: McpSettingsLocaleKey) => string
+  /** Called after a successful apply; the parent refreshes the page. */
+  readonly onApplied: () => void
+}
+
+/** Serialize the current server list into the JSON document text. */
+export function serversToJsonText(servers: readonly McpServerView[]): string {
+  const document = servers.map((server) => {
+    const entry: Record<string, unknown> = {
+      serverName: server.serverName,
+      transport: server.transport,
+      enabled: server.enabled,
+    }
+    if (server.transport === 'stdio') {
+      entry.command = server.command
+      entry.args = [...server.args]
+      if (server.cwd.length > 0) entry.cwd = server.cwd
+    } else {
+      entry.url = server.url
+    }
+    if (server.headers.length > 0) {
+      entry.headers = Object.fromEntries(server.headers.map(header => [header.name, header.value]))
+    }
+    entry.toolCallTimeoutMs = server.toolCallTimeoutMs
+    entry.failOnStartupError = server.failOnStartupError
+    entry.env = server.env.map(row => row.secret
+      ? { name: row.name, secret: true, configured: row.configured }
+      : { name: row.name, secret: false, ...(row.value !== undefined && row.value.length > 0 ? { value: row.value } : {}) })
+    return entry
+  })
+  return `${JSON.stringify(document, null, 2)}\n`
+}
+
+/** Structural validation; deep validation (paths, URLs) happens on the Host. */
+export function parseServersJson(text: string): { ok: true; servers: readonly ServersJsonEntry[] } | { ok: false; error: string } {
+  let value: unknown
+  try {
+    value = JSON.parse(text)
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : String(error) }
+  }
+  if (!Array.isArray(value)) {
+    return { ok: false, error: 'JSON 顶层必须是服务器配置数组：[ { serverName, transport, ... }, ... ]' }
+  }
+  if (value.length === 0) {
+    return { ok: false, error: '配置列表不能为空' }
+  }
+  const servers: ServersJsonEntry[] = []
+  const seen = new Set<string>()
+  for (const item of value) {
+    if (item === null || typeof item !== 'object' || Array.isArray(item)) {
+      return { ok: false, error: '每个条目必须是对象：{ serverName, transport, ... }' }
+    }
+    const server = item as Record<string, unknown>
+    const serverName = typeof server.serverName === 'string' ? server.serverName.trim() : ''
+    if (serverName.length === 0) return { ok: false, error: 'serverName 不能为空' }
+    if (seen.has(serverName)) return { ok: false, error: `serverName "${serverName}" 重复` }
+    seen.add(serverName)
+    const transport = server.transport
+    if (transport !== 'stdio' && transport !== 'streamable-http') {
+      return { ok: false, error: `服务器 "${serverName}" 的 transport 必须是 stdio 或 streamable-http` }
+    }
+    if (transport === 'stdio' && (typeof server.command !== 'string' || server.command.trim().length === 0)) {
+      return { ok: false, error: `服务器 "${serverName}"（stdio）缺少 command` }
+    }
+    if (transport === 'streamable-http' && typeof server.url !== 'string') {
+      return { ok: false, error: `服务器 "${serverName}"（streamable-http）缺少 url` }
+    }
+    if (server.headers !== undefined) {
+      const headers = server.headers as unknown
+      const okHeaders = (headers !== null && typeof headers === 'object' && !Array.isArray(headers))
+        || (Array.isArray(headers) && headers.every(h => h !== null && typeof h === 'object' && typeof (h as { name?: unknown }).name === 'string'))
+      if (!okHeaders) return { ok: false, error: `服务器 "${serverName}" 的 headers 必须是 { "名称": "值" } 对象或 { name, value } 数组` }
+    }
+    const envValue = server.env
+    const env: unknown[] = Array.isArray(envValue) ? envValue : []
+    for (const row of env) {
+      const r = row as Record<string, unknown> | null
+      if (r === null || typeof r !== 'object' || typeof r.name !== 'string' || r.name.trim().length === 0) {
+        return { ok: false, error: `服务器 "${serverName}" 的 env 条目缺少合法的 name` }
+      }
+      if (r.secret !== undefined && typeof r.secret !== 'boolean') {
+        return { ok: false, error: `服务器 "${serverName}" 的 env 条目 "${r.name}" 的 secret 必须是布尔值` }
+      }
+      if (r.value !== undefined && typeof r.value !== 'string') {
+        return { ok: false, error: `服务器 "${serverName}" 的 env 条目 "${r.name}" 的 value 必须是字符串` }
+      }
+    }
+    servers.push({ server, env })
+  }
+  return { ok: true, servers }
+}
+
+/** Render the JSON server-config editor panel. */
+export function ServersJsonEditor({ injected, t, onApplied }: ServersJsonEditorProps): ReactNode {
+  const [text, setText] = useState('')
+  const [error, setError] = useState<string | null>(null)
+  const [notice, setNotice] = useState<string | null>(null)
+  const [busy, setBusy] = useState(false)
+  const [loaded, setLoaded] = useState(false)
+  const seqRef = useRef(0)
+
+  // Seed the document once with the current server list.
+  useEffect(() => {
+    if (loaded) return
+    let current = true
+    void injected.list().then(
+      (servers) => {
+        if (!current) return
+        setText(serversToJsonText(servers))
+        setLoaded(true)
+        setError(null)
+      },
+      () => { if (current) setError('无法读取服务器列表') },
+    )
+    return () => { current = false }
+  }, [injected, loaded])
+
+  const reseed = (): void => {
+    const seq = ++seqRef.current
+    setBusy(true)
+    setNotice(null)
+    void injected.list().then(
+      (servers) => {
+        if (seq !== seqRef.current) return
+        setText(serversToJsonText(servers))
+        setError(null)
+      },
+      () => { if (seq === seqRef.current) setError('无法读取服务器列表') },
+    ).finally(() => {
+      if (seq === seqRef.current) setBusy(false)
+    })
+  }
+
+  const apply = (): void => {
+    const parsed = parseServersJson(text)
+    if (!parsed.ok) {
+      setError(parsed.error)
+      return
+    }
+    const seq = ++seqRef.current
+    setBusy(true)
+    setError(null)
+    setNotice(null)
+    void injected.upsertJson(parsed.servers).then(
+      (result) => {
+        if (seq !== seqRef.current) return
+        setNotice(`${t('serversJsonDone')}: +${result.added} / ~${result.updated} / -${result.removed}`)
+        onApplied()
+      },
+      (error: unknown) => {
+        if (seq !== seqRef.current) return
+        setError(error instanceof Error ? error.message : String(error))
+      },
+    ).finally(() => {
+      if (seq === seqRef.current) setBusy(false)
+    })
+  }
+
+  return (
+    <div className={css.panel}>
+      <textarea
+        className={css.editor}
+        rows={16}
+        spellCheck={false}
+        aria-label={t('serversJsonLabel')}
+        value={text}
+        onChange={(event) => setText(event.currentTarget.value)}
+      />
+      <p className={css.hint}>{t('serversJsonHint')}</p>
+      {error !== null ? <p className={css.error} role="alert">{error}</p> : null}
+      {notice !== null ? <p className={css.notice} role="status">{notice}</p> : null}
+      <div className={css.actions}>
+        <button type="button" disabled={busy} onClick={reseed}>{t('serversJsonReseed')}</button>
+        <button type="button" className={css.primary} disabled={busy} onClick={apply}>
+          {busy ? t('serversJsonSaving') : t('serversJsonApply')}
+        </button>
+      </div>
+    </div>
+  )
+}

package/src/client/index.ts

@@ -29,6 +29,12 @@ interface McpManagerRemote {
     readonly env: readonly unknown[]
   }): Promise<McpRemoteResult<{ readonly server: McpServerView }>>
   delete(request: { readonly id: McpServerId }): Promise<McpRemoteResult<unknown>>
+  upsertJson(request: { readonly servers: readonly unknown[] }): Promise<McpRemoteResult<{
+    readonly added: number
+    readonly updated: number
+    readonly removed: number
+    readonly servers: readonly McpServerView[]
+  }>>
   test(request: {
     readonly id?: McpServerId
     readonly server: unknown
@@ -37,11 +43,13 @@ interface McpManagerRemote {
   toolsList(): Promise<McpRemoteResult<{ readonly tools: readonly unknown[]; readonly mode: unknown; readonly hotSize: number }>>
   toolsSet(request: { readonly name: string; readonly enabled: boolean }): Promise<McpRemoteResult<{ readonly ok: boolean }>>
   toolsMode(request: { readonly mode: unknown }): Promise<McpRemoteResult<{ readonly ok: boolean }>>
+  envList(): Promise<McpRemoteResult<{ readonly vars: readonly unknown[] }>>
+  envSet(request: { readonly vars: readonly unknown[] }): Promise<McpRemoteResult<{ readonly vars: readonly unknown[] }>>
 }
 
 export type { McpSettingsSectionProps, McpManagerInjected } from './McpSettingsSection.tsx'
 export type { McpServerFormProps } from './ServerForm.tsx'
-export type { McpDraft, McpEnvRowDraft, McpTestOutcome } from './mcp-store.ts'
+export type { McpDraft, McpTestOutcome } from './mcp-store.ts'
 export type { McpSettingsLocaleKey } from './locales.ts'
 
 declare module '@deepseek-ai/dsh-client-ui-slots' {
@@ -113,7 +121,6 @@ export async function apply(ctx: ClientContext): Promise<void> {
       const result = await manager.upsert({
         ...draft.id === null ? {} : { id: draft.id },
         server: submission.server,
-        env: submission.env,
       })
       if (result.ok) return null
       return failureOf(result.error)
@@ -123,12 +130,15 @@ export async function apply(ctx: ClientContext): Promise<void> {
       if (result.ok) return null
       return failureOf(result.error)
     },
+    upsertJson: async (servers) => {
+      const result = await unwrap(() => manager.upsertJson({ servers }))
+      return { added: result.added, updated: result.updated, removed: result.removed, servers: result.servers }
+    },
     test: async (draft) => {
       const submission = draftToSubmission(draft)
       const result = await unwrap(() => manager.test({
         ...draft.id === null ? {} : { id: draft.id },
         server: submission.server,
-        env: submission.env,
       }))
       return { probe: result.probe, elapsedMs: result.elapsedMs }
     },
@@ -146,6 +156,14 @@ export async function apply(ctx: ClientContext): Promise<void> {
       const result = await unwrap(() => manager.toolsMode({ mode: request.mode }))
       return { ok: result.ok }
     },
+    envList: async () => {
+      const result = await unwrap(() => manager.envList())
+      return { vars: result.vars }
+    },
+    envSet: async (vars) => {
+      const result = await unwrap(() => manager.envSet({ vars }))
+      return { vars: result.vars }
+    },
   })
 
   ctx.slots.inject('settings.section', () => ctx.slots.register({

package/src/client/locales.ts

@@ -24,9 +24,9 @@ export const zh = {
   url: '服务器 URL',
   urlPlaceholder: '例如 http://localhost:3000/mcp',
   headers: '请求头',
-  headersPlaceholder: '每行一个 "名称: 值"',
+  headersPlaceholder: '每行一个 "名称: 值"；值支持 ${ENV} 环境变量替换',
   envVars: '环境变量',
-  envHint: '注入到 stdio 子进程；标记为 secret 的值写入凭据文档，不在此明文保存',
+  envHint: 'stdio：注入子进程；HTTP：供请求头 ${变量} 替换（如 Authorization: Bearer ${TOKEN}）。标记为 secret 的值写入凭据文档，不在此明文保存',
   envName: '变量名',
   envValue: '值',
   envSecret: 'secret',
@@ -73,6 +73,31 @@ export const zh = {
   refreshing: '刷新中…',
   toolsExpand: '展开工具',
   toolsCollapse: '收起工具',
+  serversJson: 'JSON 维护配置',
+  serversJsonLabel: '服务器配置 JSON',
+  serversJsonHint: '整个 MCP 服务器配置列表（数组）：应用后将按此列表替换——已列出的服务器创建/更新，未列出的将被删除；secret 环境变量值不会导出（configured 标记），留空则保留原值。',
+  serversJsonReseed: '重新导出',
+  serversJsonApply: '应用',
+  serversJsonSaving: '应用中…',
+  serversJsonDone: '已应用',
+  globalEnv: '进程环境变量',
+  globalEnvHint: '进程级环境变量，供所有 MCP 服务器的请求头替换引用（headers 值写 ${变量名} 或直接写变量名）。secret 值写入凭据文档，不在此明文显示；留空保留原值。',
+  globalEnvName: '变量名',
+  globalEnvValue: '值',
+  globalEnvSecret: 'secret',
+  globalEnvSecretHint: '值只写，保存后不可见；留空表示保留原值',
+  globalEnvAdd: '添加变量',
+  globalEnvBulk: '批量添加',
+  globalEnvBulkPrompt: '每行一个变量，格式 NAME=value；只填 NAME 的行将作为仅变量名行添加。',
+  globalEnvBulkOk: '添加',
+  globalEnvSave: '保存',
+  globalEnvSaving: '保存中…',
+  globalEnvRemove: '移除该变量',
+  globalEnvEmpty: '（暂无进程环境变量）',
+  globalEnvLoadFailed: '读取环境变量失败',
+  globalEnvRetry: '重试',
+  globalEnvDone: '已保存',
+  configTitle: 'MCP 配置',
 } satisfies Record<string, string>
 
 /** MCP settings locale key union. */
@@ -102,9 +127,9 @@ export const en = {
   url: 'Server URL',
   urlPlaceholder: 'e.g. http://localhost:3000/mcp',
   headers: 'Headers',
-  headersPlaceholder: 'One "Name: value" per line',
+  headersPlaceholder: 'One "Name: value" per line; values support ${ENV} substitution',
   envVars: 'Environment variables',
-  envHint: 'Injected into the stdio child; secret values are stored in the credentials document, never shown here',
+  envHint: 'stdio: injected into the child process; HTTP: used for ${VAR} substitution in headers (e.g. Authorization: Bearer ${TOKEN}). Secret values are stored in the credentials document, never shown here',
   envName: 'Name',
   envValue: 'Value',
   envSecret: 'secret',
@@ -151,4 +176,29 @@ export const en = {
   refreshing: 'Refreshing…',
   toolsExpand: 'Expand tools',
   toolsCollapse: 'Collapse tools',
+  serversJson: 'JSON config editor',
+  serversJsonLabel: 'Server-config JSON',
+  serversJsonHint: 'The whole MCP server list (array): applying replaces the list — listed servers are created/updated, existing servers absent from the document are removed; secret env values are never exported (a configured flag marks them), a blank value keeps the stored one.',
+  serversJsonReseed: 'Re-export',
+  serversJsonApply: 'Apply',
+  serversJsonSaving: 'Applying…',
+  serversJsonDone: 'Applied',
+  globalEnv: 'Process env vars',
+  globalEnvHint: 'Process-level environment variables referenced by every server\'s header substitution (write ${NAME} or a bare name in a header value). Secret values are stored in the credentials document, never shown here; blank keeps the stored value.',
+  globalEnvName: 'Name',
+  globalEnvValue: 'Value',
+  globalEnvSecret: 'secret',
+  globalEnvSecretHint: 'Write-only; a blank value keeps the stored one',
+  globalEnvAdd: 'Add variable',
+  globalEnvBulk: 'Add many',
+  globalEnvBulkPrompt: 'One variable per line, as NAME=value; a bare NAME adds a name-only row.',
+  globalEnvBulkOk: 'Add',
+  globalEnvSave: 'Save',
+  globalEnvSaving: 'Saving…',
+  globalEnvRemove: 'Remove this variable',
+  globalEnvEmpty: '(no process env vars)',
+  globalEnvLoadFailed: 'Failed to read environment variables',
+  globalEnvRetry: 'Retry',
+  globalEnvDone: 'Saved',
+  configTitle: 'MCP config',
 } satisfies Record<McpSettingsLocaleKey, string>