dsh-plugin-capabilities 0.3.7 → 0.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-capabilities",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "Manage skills and MCP servers from the Web UI Settings. 在设置页管理 dsh 的技能与 MCP 服务器。",
   "type": "module",
   "main": "lib/index.js",

package/src/agents.test.ts

@@ -2,7 +2,7 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterAll, describe, expect, it } from 'vitest'
-import { agentSkillRoots, scanAllMcp, scanClaudeMcp, scanCodexMcp } from './agents.ts'
+import { agentSkillRoots, scanAllMcp, scanClaudeMcp, scanCodexMcp, scanCursorMcp, scanGeminiMcp } from './agents.ts'
 
 const home = mkdtempSync(join(tmpdir(), 'dsh-caps-agents-'))
 afterAll(() => rmSync(home, { recursive: true, force: true }))
@@ -88,6 +88,52 @@ describe('scanCodexMcp', () => {
   })
 })
 
+describe('scanCursorMcp', () => {
+  it('reads ~/.cursor/mcp.json (mcpServers, Claude-shaped; SSE skipped)', () => {
+    mkdirSync(join(home, '.cursor'), { recursive: true })
+    writeFileSync(join(home, '.cursor', 'mcp.json'), JSON.stringify({
+      mcpServers: {
+        context7: { command: 'npx', args: ['-y', '@upstash/context7-mcp'] },
+        'web-remote': { type: 'http', url: 'https://example.com/mcp' },
+        'legacy-sse': { type: 'sse', url: 'https://example.com/sse' },
+      },
+    }))
+    const servers = scanCursorMcp(home)
+    expect(servers).toHaveLength(2)
+    expect(servers.find(server => server.name === 'context7')).toMatchObject({ agent: 'cursor', transport: 'stdio', command: 'npx' })
+    expect(servers.find(server => server.name === 'web-remote')).toMatchObject({ agent: 'cursor', transport: 'streamable-http', url: 'https://example.com/mcp' })
+    expect(servers.find(server => server.name === 'legacy-sse')).toBeUndefined()
+  })
+  it('returns empty for missing or malformed files', () => {
+    expect(scanCursorMcp(join(home, 'empty'))).toEqual([])
+    writeFileSync(join(home, '.cursor', 'mcp.json'), '{ broken json')
+    expect(scanCursorMcp(home)).toEqual([])
+  })
+})
+
+describe('scanGeminiMcp', () => {
+  it('maps command entries and httpUrl, skips SSE url entries', () => {
+    mkdirSync(join(home, '.gemini'), { recursive: true })
+    writeFileSync(join(home, '.gemini', 'settings.json'), JSON.stringify({
+      mcpServers: {
+        context7: { command: 'npx', args: ['-y', '@upstash/context7-mcp'], env: { A: 'b' } },
+        remote: { httpUrl: 'https://example.com/mcp' },
+        sseOnly: { url: 'https://example.com/sse' },
+      },
+    }))
+    const servers = scanGeminiMcp(home)
+    expect(servers).toHaveLength(2)
+    expect(servers.find(server => server.name === 'context7')).toMatchObject({ agent: 'gemini', transport: 'stdio', command: 'npx' })
+    expect(servers.find(server => server.name === 'remote')).toMatchObject({ agent: 'gemini', transport: 'streamable-http', url: 'https://example.com/mcp' })
+    expect(servers.find(server => server.name === 'sseOnly')).toBeUndefined()
+  })
+  it('returns empty for missing or malformed files', () => {
+    expect(scanGeminiMcp(join(home, 'empty'))).toEqual([])
+    writeFileSync(join(home, '.gemini', 'settings.json'), '{ broken json')
+    expect(scanGeminiMcp(home)).toEqual([])
+  })
+})
+
 describe('scanAllMcp + agentSkillRoots', () => {
   it('dedupes by (agent, name) and keeps both agents', () => {
     writeFileSync(join(home, '.claude.json'), JSON.stringify(CLAUDE_JSON))

package/src/agents.ts

@@ -1,6 +1,7 @@
 /**
  * Foreign-agent config readers: MCP servers from Claude Code (~/.claude.json,
- * ~/.claude/settings.json) and Codex (~/.codex/config.toml). Pure reads of
+ * ~/.claude/settings.json), Codex (~/.codex/config.toml), Cursor
+ * (~/.cursor/mcp.json) and Gemini CLI (~/.gemini/settings.json). Pure reads of
  * well-known paths; anything missing or malformed yields an empty list.
  */
 
@@ -12,7 +13,7 @@ import type { McpTransport } from './mcp.ts'
 
 /** One MCP server discovered in a foreign agent's config. */
 export interface ImportedServer {
-  agent: 'claude-code' | 'codex'
+  agent: 'claude-code' | 'codex' | 'cursor' | 'gemini'
   name: string
   transport: McpTransport
   command?: string
@@ -38,15 +39,15 @@ function stringArray(value: unknown): string[] | undefined {
   return out.length > 0 ? out : undefined
 }
 
-/** Map one Claude mcpServers entry; returns null for unsupported shapes (sse). */
-function mapClaudeEntry(name: string, entry: unknown): ImportedServer | null {
+/** Map one mcpServers entry (Claude / Cursor share the shape); null for unsupported shapes (sse). */
+function mapMcpServersEntry(agent: ImportedServer['agent'], name: string, entry: unknown): ImportedServer | null {
   if (typeof entry !== 'object' || entry === null) return null
   const record = entry as Record<string, unknown>
   const type = typeof record.type === 'string' ? record.type : 'stdio'
   if (type === 'stdio' || (type === 'stdio' && record.command !== undefined)) {
     if (typeof record.command !== 'string' || record.command === '') return null
     return {
-      agent: 'claude-code', name, transport: 'stdio',
+      agent, name, transport: 'stdio',
       command: record.command,
       args: stringArray(record.args),
       env: stringEntries(record.env),
@@ -55,7 +56,7 @@ function mapClaudeEntry(name: string, entry: unknown): ImportedServer | null {
   if (type === 'http' || type === 'streamable-http') {
     if (typeof record.url !== 'string' || record.url === '') return null
     return {
-      agent: 'claude-code', name, transport: 'streamable-http',
+      agent, name, transport: 'streamable-http',
       url: record.url,
       headers: stringEntries(record.headers),
     }
@@ -80,12 +81,62 @@ export function scanClaudeMcp(home: string = homedir()): ImportedServer[] {
   }
   const out: ImportedServer[] = []
   for (const [name, entry] of Object.entries(merged)) {
-    const mapped = mapClaudeEntry(name, entry)
+    const mapped = mapMcpServersEntry('claude-code', name, entry)
     if (mapped !== null) out.push(mapped)
   }
   return out
 }
 
+/** MCP servers from Cursor's ~/.cursor/mcp.json (mcpServers, Claude-shaped). */
+export function scanCursorMcp(home: string = homedir()): ImportedServer[] {
+  const file = join(home, '.cursor', 'mcp.json')
+  if (!existsSync(file)) return []
+  let parsed: { mcpServers?: unknown }
+  try {
+    parsed = JSON.parse(readFileSync(file, 'utf8')) as { mcpServers?: unknown }
+  } catch {
+    return []
+  }
+  if (typeof parsed.mcpServers !== 'object' || parsed.mcpServers === null) return []
+  const out: ImportedServer[] = []
+  for (const [name, entry] of Object.entries(parsed.mcpServers)) {
+    const mapped = mapMcpServersEntry('cursor', name, entry)
+    if (mapped !== null) out.push(mapped)
+  }
+  return out
+}
+
+/** MCP servers from Gemini CLI's ~/.gemini/settings.json (mcpServers; httpUrl
+ *  keys map to streamable-http, plain `url` marks SSE and is skipped). */
+export function scanGeminiMcp(home: string = homedir()): ImportedServer[] {
+  const file = join(home, '.gemini', 'settings.json')
+  if (!existsSync(file)) return []
+  let parsed: { mcpServers?: unknown }
+  try {
+    parsed = JSON.parse(readFileSync(file, 'utf8')) as { mcpServers?: unknown }
+  } catch {
+    return []
+  }
+  if (typeof parsed.mcpServers !== 'object' || parsed.mcpServers === null) return []
+  const out: ImportedServer[] = []
+  for (const [name, entry] of Object.entries(parsed.mcpServers)) {
+    if (typeof entry !== 'object' || entry === null) continue
+    const record = entry as Record<string, unknown>
+    if (typeof record.command === 'string' && record.command !== '') {
+      out.push({
+        agent: 'gemini', name, transport: 'stdio',
+        command: record.command,
+        args: stringArray(record.args),
+        env: stringEntries(record.env),
+      })
+    } else if (typeof record.httpUrl === 'string' && record.httpUrl !== '') {
+      out.push({ agent: 'gemini', name, transport: 'streamable-http', url: record.httpUrl })
+    }
+    // `url`-only entries are SSE endpoints, which dsh's client cannot speak.
+  }
+  return out
+}
+
 /** MCP servers from Codex's config.toml ([mcp_servers.<name>] tables). */
 export function scanCodexMcp(home: string = homedir()): ImportedServer[] {
   const file = join(home, '.codex', 'config.toml')
@@ -119,7 +170,7 @@ export function scanCodexMcp(home: string = homedir()): ImportedServer[] {
 /** All foreign-agent MCP servers, deduplicated by (agent, name). */
 export function scanAllMcp(home: string = homedir()): ImportedServer[] {
   const seen = new Set<string>()
-  return [...scanClaudeMcp(home), ...scanCodexMcp(home)]
+  return [...scanClaudeMcp(home), ...scanCodexMcp(home), ...scanCursorMcp(home), ...scanGeminiMcp(home)]
     .filter(server => {
       const key = `${server.agent}/${server.name}`
       if (seen.has(key)) return false

package/src/client/MarketTab.tsx

@@ -9,7 +9,7 @@ import type { ReactElement } from 'react'
 import { Button, IconRefreshOutline14, Modal, StateDot } from '@deepseek-ai/dsh-client-ui-primitives'
 import { CSS } from './css.ts'
 import type { MarketRepoView, MarketServerView, Translate } from './index.ts'
-import type { McpInjected } from './McpTab.tsx'
+import type { McpInjected, McpScope } from './McpTab.tsx'
 
 /** One registered skill repository as the roots route reports it. */
 export interface RootRowView {
@@ -30,7 +30,7 @@ export interface MarketInjected {
   skillsIndex(): Promise<{ source: 'remote' | 'bundled'; repos: Array<MarketRepoView & { installedId: string | null }> }>
   mcpIndex(): Promise<{ source: 'remote' | 'bundled'; servers: Array<MarketServerView & { installed: boolean }> }>
   installSkillRepo(url: string): Promise<{ ok: boolean; root: RootRowView }>
-  installMcp(id: string): Promise<{ ok: boolean; id: string }>
+  installMcp(id: string, scope: McpScope): Promise<{ ok: boolean; id: string }>
   removeRoot(id: string): Promise<{ ok: boolean }>
 }
 
@@ -46,8 +46,9 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
   const [servers, setServers] = useState<Array<MarketServerView & { installed: boolean }> | null>(null)
   const [source, setSource] = useState<'remote' | 'bundled'>('remote')
   const [busyId, setBusyId] = useState<string | null>(null)
+  const [mcpScope, setMcpScope] = useState<McpScope>('profile')
   const [outcome, setOutcome] = useState<{ ok: boolean; text: string } | null>(null)
-  const [confirmUninstall, setConfirmUninstall] = useState<{ kind: 'root' | 'mcp'; id: string; name: string } | null>(null)
+  const [confirmUninstall, setConfirmUninstall] = useState<{ kind: 'root'; id: string; name: string } | { kind: 'mcp'; id: string; name: string; scope: McpScope } | null>(null)
   const [detail, setDetail] = useState<{ kind: Segment; id: string } | null>(null)
   const [reload, setReload] = useState(0)
 
@@ -93,7 +94,7 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
     setBusyId(server.id)
     setOutcome(null)
     try {
-      await market.installMcp(server.id)
+      await market.installMcp(server.id, mcpScope)
       setOutcome({ ok: true, text: t('restartNeeded') })
       refreshMcp()
     } catch (error) {
@@ -114,7 +115,7 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
         setOutcome({ ok: true, text: t('rootRemoved') })
         refreshSkills()
       } else {
-        await mcp.remove(target.id)
+        await mcp.remove(target.id, target.scope)
         setOutcome({ ok: true, text: t('restartNeeded') })
         refreshMcp()
       }
@@ -213,6 +214,21 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
       {segment === 'mcp' && (
         <>
           <p className="dpc-intro">{t('marketMcpIntro')}</p>
+          <div className="dpc-cardRow">
+            <label style={{ display: 'inline-flex', alignItems: 'center', gap: 8 }}>
+              <span>{t('scopeLabel')}</span>
+              <select
+                className="dpc-select"
+                style={{ width: 'auto' }}
+                value={mcpScope}
+                disabled={busyId !== null}
+                onChange={(event) => setMcpScope(event.target.value as McpScope)}
+              >
+                <option value="profile">{t('scopeProfile')}</option>
+                <option value="global">{t('scopeGlobal')}</option>
+              </select>
+            </label>
+          </div>
           {servers === null && <p className="dpc-empty">{t('loading')}</p>}
           {servers !== null && servers.length === 0 && <p className="dpc-empty">{t('marketEmpty')}</p>}
           {servers !== null && servers.length > 0 && (
@@ -237,7 +253,7 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
                       <Button variant="ghost" size="sm" disabled={busyId !== null} onClick={(event) => { event.stopPropagation(); void mcp.list().then(
                         (body) => {
                           const row = body.servers.find(item => item.serverName === server.id)
-                          if (row !== undefined) setConfirmUninstall({ kind: 'mcp', id: row.id, name: server.id })
+                          if (row !== undefined) setConfirmUninstall({ kind: 'mcp', id: row.id, name: server.id, scope: row.scope })
                         },
                         (error: Error) => setOutcome({ ok: false, text: `${t('failed')}: ${String(error.message ?? error)}` }),
                       ) }}>
@@ -285,7 +301,7 @@ export function MarketTab(props: { t: Translate; market: MarketInjected; mcp: Mc
               <Button variant="ghost" disabled={busyId !== null} onClick={() => void mcp.list().then(
                 (body) => {
                   const row = body.servers.find(item => item.serverName === detailServer.id)
-                  if (row !== undefined) { setConfirmUninstall({ kind: 'mcp', id: row.id, name: title(detailServer) }); setDetail(null) }
+                  if (row !== undefined) { setConfirmUninstall({ kind: 'mcp', id: row.id, name: title(detailServer), scope: row.scope }); setDetail(null) }
                 },
                 (error: Error) => setOutcome({ ok: false, text: `${t('failed')}: ${String(error.message ?? error)}` }),
               )}>

package/src/client/McpTab.tsx

@@ -1,6 +1,7 @@
-/** Settings → Plugins “MCP” tab: manage the profile's mcp-client rows.
- * Mutations rewrite the profile patch and need a dsh restart — the banner
- * hands the restart to the desktop shell when one is present. */
+/** Settings → Plugins “MCP” tab: manage the mcp-client rows in both patch
+ * layers (profile + global). Mutations rewrite the target patch and need a
+ * dsh restart — the banner hands the restart to the desktop shell when one
+ * is present. */
 
 import { useEffect, useState } from 'react'
 import type { ReactElement } from 'react'
@@ -8,11 +9,17 @@ import { Button, IconApiOutline14, IconRefreshOutline14, Modal, StateDot } from
 import { CSS } from './css.ts'
 import type { ImportedServerView, Translate } from './index.ts'
 
+/** Which patch layer a row lives in. */
+export type McpScope = 'global' | 'profile'
+
 export interface McpRow {
   id: string
   serverName: string
   transport: 'stdio' | 'streamable-http'
   disabled: boolean
+  scope: McpScope
+  /** Profile rows only: a global row with the same id composes after this one and wins. */
+  shadowed?: boolean
   command?: string
   args?: string[]
   env?: Record<string, string>
@@ -22,12 +29,14 @@ export interface McpRow {
 }
 
 export interface McpInjected {
-  list(): Promise<{ servers: McpRow[] }>
+  list(): Promise<{ servers: McpRow[]; globalError?: string }>
   save(input: Record<string, unknown>): Promise<{ ok: boolean; id: string }>
-  toggle(id: string, disabled: boolean): Promise<{ ok: boolean }>
-  remove(id: string): Promise<{ ok: boolean }>
+  toggle(id: string, disabled: boolean, scope: McpScope): Promise<{ ok: boolean }>
+  remove(id: string, scope: McpScope): Promise<{ ok: boolean }>
+  check(id: string, scope: McpScope): Promise<{ ok: boolean; detail?: string }>
+  copy(id: string, scope: McpScope, toScope: McpScope): Promise<{ ok: boolean; id: string }>
   scanImport(): Promise<{ servers: ImportedServerView[]; existing: string[] }>
-  applyImport(items: Array<{ agent: string; name: string }>): Promise<{ ok: boolean; results: Array<{ name: string; ok: boolean; error?: string }> }>
+  applyImport(items: Array<{ agent: string; name: string }>, scope: McpScope): Promise<{ ok: boolean; results: Array<{ name: string; ok: boolean; error?: string }> }>
   restart(): Promise<void>
   desktop: boolean
 }
@@ -35,6 +44,8 @@ export interface McpInjected {
 /** Editor dialog state; null when closed. Textareas hold line-based values. */
 interface EditorState {
   id: string
+  /** Fixed after create: a row is edited in the layer that holds it. */
+  scope: McpScope
   serverName: string
   transport: 'stdio' | 'streamable-http'
   command: string
@@ -50,8 +61,13 @@ type ImportItem = { server: ImportedServerView; existing: boolean; checked: bool
 
 /** Group import candidates by source agent, known agents first. */
 export function importGroups(items: ImportItem[]): Array<{ agent: string; label: string; items: Array<{ item: ImportItem; index: number }> }> {
-  const label = (agent: string) => agent === 'claude-code' ? 'Claude Code' : agent === 'codex' ? 'Codex' : agent
-  const order = ['claude-code', 'codex']
+  const label = (agent: string) =>
+    agent === 'claude-code' ? 'Claude Code'
+    : agent === 'codex' ? 'Codex'
+    : agent === 'cursor' ? 'Cursor'
+    : agent === 'gemini' ? 'Gemini CLI'
+    : agent
+  const order = ['claude-code', 'codex', 'cursor', 'gemini']
   const agents = [...new Set(items.map(item => item.server.agent))]
     .sort((a, b) => {
       const rank = (agent: string) => { const at = order.indexOf(agent); return at === -1 ? order.length : at }
@@ -208,7 +224,8 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
   const { t, injected } = props
   const [servers, setServers] = useState<McpRow[] | null>(null)
   const [editor, setEditor] = useState<EditorState | null>(null)
-  const [confirmId, setConfirmId] = useState<string | null>(null)
+  const [confirmRow, setConfirmRow] = useState<McpRow | null>(null)
+  const [globalError, setGlobalError] = useState<string | null>(null)
   const [importOpen, setImportOpen] = useState(false)
   const [importItems, setImportItems] = useState<Array<{ server: ImportedServerView; existing: boolean; checked: boolean }> | null>(null)
   const [busy, setBusy] = useState(false)
@@ -220,6 +237,9 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
   const [reload, setReload] = useState(0)
   const [pasteJson, setPasteJson] = useState('')
   const [pasteError, setPasteError] = useState<string | null>(null)
+  /** Connectivity probes keyed by `${scope}/${id}`; absent = never checked. */
+  const [checks, setChecks] = useState<Record<string, { ok: boolean; detail?: string } | 'busy'>>({})
+  const [importScope, setImportScope] = useState<McpScope>('profile')
 
   const openImport = async (): Promise<void> => {
     setImportOpen(true)
@@ -243,7 +263,7 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
     const items = importItems.filter(item => item.checked && !item.existing).map(item => ({ agent: item.server.agent, name: item.server.name }))
     setBusy(true)
     try {
-      const body = await injected.applyImport(items)
+      const body = await injected.applyImport(items, importScope)
       const failed = body.results.filter(item => !item.ok)
       setOutcome(failed.length === 0
         ? { ok: true, text: t('restartNeeded') }
@@ -266,7 +286,11 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
   useEffect(() => {
     let current = true
     void injected.list().then(
-      (body) => { if (current) setServers(body.servers) },
+      (body) => {
+        if (!current) return
+        setServers(body.servers)
+        setGlobalError(body.globalError ?? null)
+      },
       (error: Error) => { if (current) { setServers([]); setOutcome({ ok: false, text: `${t('failed')}: ${String(error.message ?? error)}` }) } },
     )
     return () => { current = false }
@@ -276,7 +300,7 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
     setFormError(null)
     setPasteError(null)
     setPasteJson('')
-    setEditor({ id: '', serverName: '', transport: 'stdio', command: '', args: '', env: '', url: '', headers: '' })
+    setEditor({ id: '', scope: 'profile', serverName: '', transport: 'stdio', command: '', args: '', env: '', url: '', headers: '' })
   }
 
   const openEdit = (row: McpRow): void => {
@@ -285,6 +309,7 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
     setPasteJson('')
     setEditor({
       id: row.id,
+      scope: row.scope,
       serverName: row.serverName,
       transport: row.transport,
       command: row.command ?? '',
@@ -336,6 +361,7 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
     try {
       await injected.save({
         id: editor.id,
+        scope: editor.scope,
         serverName: editor.serverName.trim(),
         transport: editor.transport,
         ...(editor.transport === 'stdio'
@@ -362,7 +388,7 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
   const doToggle = async (row: McpRow): Promise<void> => {
     setBusy(true)
     try {
-      await injected.toggle(row.id, !row.disabled)
+      await injected.toggle(row.id, !row.disabled, row.scope)
       setOutcome({ ok: true, text: t('restartNeeded') })
       reloadList(true)
     } catch (error) {
@@ -373,17 +399,44 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
   }
 
   const doRemove = async (): Promise<void> => {
-    if (confirmId === null) return
+    if (confirmRow === null) return
+    setBusy(true)
+    try {
+      await injected.remove(confirmRow.id, confirmRow.scope)
+      setOutcome({ ok: true, text: t('restartNeeded') })
+      reloadList(true)
+    } catch (error) {
+      setOutcome({ ok: false, text: `${t('failed')}: ${String(error instanceof Error ? error.message : error)}` })
+    } finally {
+      setBusy(false)
+      setConfirmRow(null)
+    }
+  }
+
+  /** Probe one row (PATH lookup for stdio, short GET for http); result kept per row. */
+  const doCheck = async (row: McpRow): Promise<void> => {
+    const key = `${row.scope}/${row.id}`
+    setChecks(current => ({ ...current, [key]: 'busy' }))
+    try {
+      const result = await injected.check(row.id, row.scope)
+      setChecks(current => ({ ...current, [key]: result }))
+    } catch (error) {
+      setChecks(current => ({ ...current, [key]: { ok: false, detail: String(error instanceof Error ? error.message : error) } }))
+    }
+  }
+
+  /** Duplicate the row into the other patch layer (ids dedupe server-side). */
+  const doCopy = async (row: McpRow): Promise<void> => {
     setBusy(true)
     try {
-      await injected.remove(confirmId)
+      const toScope: McpScope = row.scope === 'global' ? 'profile' : 'global'
+      await injected.copy(row.id, row.scope, toScope)
       setOutcome({ ok: true, text: t('restartNeeded') })
       reloadList(true)
     } catch (error) {
       setOutcome({ ok: false, text: `${t('failed')}: ${String(error instanceof Error ? error.message : error)}` })
     } finally {
       setBusy(false)
-      setConfirmId(null)
     }
   }
 
@@ -442,6 +495,15 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
           <div className="dpc-bannerBody"><span>{outcome.text}</span></div>
         </div>
       )}
+      {globalError !== null && (
+        <div className="dpc-banner" data-kind="error" role="alert">
+          <StateDot state="error" size={10} />
+          <div className="dpc-bannerBody">
+            <span>{t('globalLayerError')}</span>
+            <span className="dpc-bannerHint">{globalError}</span>
+          </div>
+        </div>
+      )}
       {(pending || restarting) && restartBanner}
 
       <div className="dpc-listHead">
@@ -458,20 +520,35 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
       {servers !== null && servers.length > 0 && (
         <ul className="dpc-cards">
           {servers.map((row) => (
-            <li className="dpc-card" key={row.id}>
+            <li className="dpc-card" key={`${row.scope}/${row.id}`}>
               <div className="dpc-cardTop">
                 <strong className="dpc-cardTitle" title={row.id}>{row.serverName}</strong>
+                <span className="dpc-tag" data-kind={row.scope === 'global' ? 'source' : undefined}>{row.scope === 'global' ? t('scopeGlobal') : t('scopeProfile')}</span>
                 <span className="dpc-tag">{row.transport}</span>
                 <span className="dpc-tag" data-kind={row.disabled ? 'off' : undefined}>{row.disabled ? t('disabled') : t('enabled')}</span>
               </div>
               <p className="dpc-cardDesc">
                 {row.transport === 'stdio' ? `${row.command ?? ''} ${(row.args ?? []).join(' ')}` : row.url ?? ''}
               </p>
+              {row.shadowed === true && <p className="dpc-formError">{t('shadowedByGlobal')}</p>}
+              {(() => {
+                const check = checks[`${row.scope}/${row.id}`]
+                if (check === undefined) return null
+                if (check === 'busy') return <p className="dpc-cardDesc">{t('checkRunning')}</p>
+                return (
+                  <p className={check.ok ? 'dpc-cardDesc' : 'dpc-formError'}>
+                    {check.ok ? `✓ ${t('checkOk')}` : `✗ ${t('checkFail')}`}
+                    {check.detail !== undefined && ` · ${check.detail}`}
+                  </p>
+                )
+              })()}
               <div className="dpc-cardRow">
                 <span className="dpc-spacer" />
+                <Button variant="ghost" size="sm" disabled={busy} onClick={() => void doCheck(row)}>{t('checkLabel')}</Button>
+                <Button variant="ghost" size="sm" disabled={busy} onClick={() => void doCopy(row)}>{t('copyToOther')}</Button>
                 <Button variant="ghost" size="sm" disabled={busy} onClick={() => void doToggle(row)}>{t('toggle')}</Button>
                 <Button variant="ghost" size="sm" disabled={busy} onClick={() => openEdit(row)}>{t('edit')}</Button>
-                <Button variant="ghost" size="sm" disabled={busy} onClick={() => setConfirmId(row.id)}>{t('delete')}</Button>
+                <Button variant="ghost" size="sm" disabled={busy} onClick={() => setConfirmRow(row)}>{t('delete')}</Button>
               </div>
             </li>
           ))}
@@ -487,6 +564,19 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
       >
         {editor !== null && (
           <div className="dpc-form">
+            <label className="dpc-label">
+              <span>{t('scopeLabel')}</span>
+              <select
+                className="dpc-select"
+                value={editor.scope}
+                disabled={editor.id !== ''}
+                onChange={(event) => setEditor({ ...editor, scope: event.target.value as McpScope })}
+              >
+                <option value="profile">{t('scopeProfile')}</option>
+                <option value="global">{t('scopeGlobal')}</option>
+              </select>
+              <span className="dpc-formatHint">{t('scopeHint')}</span>
+            </label>
             <label className="dpc-label">
               <span>{t('serverName')}</span>
               <input
@@ -582,13 +672,13 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
       </Modal>
 
       <Modal
-        open={confirmId !== null}
-        onClose={() => setConfirmId(null)}
+        open={confirmRow !== null}
+        onClose={() => setConfirmRow(null)}
         title={t('confirmRemove')}
-        description={confirmId ?? undefined}
+        description={confirmRow?.serverName ?? undefined}
         footer={
           <>
-            <Button variant="ghost" onClick={() => setConfirmId(null)}>{t('cancel')}</Button>
+            <Button variant="ghost" onClick={() => setConfirmRow(null)}>{t('cancel')}</Button>
             <Button variant="primary" disabled={busy} onClick={() => void doRemove()}>{t('delete')}</Button>
           </>
         }
@@ -618,6 +708,21 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
       >
         <div className="dpc-form">
           <p className="dpc-intro" style={{ margin: 0 }}>{t('importIntro')}</p>
+          <div className="dpc-cardRow">
+            <label style={{ display: 'inline-flex', alignItems: 'center', gap: 8 }}>
+              <span>{t('scopeLabel')}</span>
+              <select
+                className="dpc-select"
+                style={{ width: 'auto' }}
+                value={importScope}
+                disabled={busy}
+                onChange={(event) => setImportScope(event.target.value as McpScope)}
+              >
+                <option value="profile">{t('scopeProfile')}</option>
+                <option value="global">{t('scopeGlobal')}</option>
+              </select>
+            </label>
+          </div>
           {importItems === null && <p className="dpc-empty">{t('loading')}</p>}
           {importItems !== null && importItems.length === 0 && <p className="dpc-empty">{t('importEmpty')}</p>}
           {importItems !== null && importItems.length > 0 && (

package/src/client/index.ts

@@ -4,7 +4,7 @@
 
 import { createElement as h } from 'react'
 import { CapabilitiesSection } from './CapabilitiesSection.tsx'
-import type { McpInjected, McpRow } from './McpTab.tsx'
+import type { McpInjected, McpRow, McpScope } from './McpTab.tsx'
 import type { MarketInjected, RootRowView } from './MarketTab.tsx'
 import type { SkillsInjected, SkillRowView } from './SkillsTab.tsx'
 import { zh, en } from './locales.ts'
@@ -89,13 +89,17 @@ export function apply(ctx: CapabilitiesClientContext): void {
   }
 
   const mcpInjected: McpInjected = {
-    list: () => fetchJson<{ servers: McpRow[] }>('/dsh-plugin-capabilities/mcp'),
+    list: () => fetchJson<{ servers: McpRow[]; globalError?: string }>('/dsh-plugin-capabilities/mcp'),
     save: (input: unknown) => post('/dsh-plugin-capabilities/mcp/save', input) as Promise<{ ok: boolean; id: string }>,
-    toggle: (id: string, disabled: boolean) => post('/dsh-plugin-capabilities/mcp/toggle', { id, disabled }) as Promise<{ ok: boolean }>,
-    remove: (id: string) => post('/dsh-plugin-capabilities/mcp/remove', { id }) as Promise<{ ok: boolean }>,
+    toggle: (id: string, disabled: boolean, scope: McpScope) =>
+      post('/dsh-plugin-capabilities/mcp/toggle', { id, disabled, scope }) as Promise<{ ok: boolean }>,
+    remove: (id: string, scope: McpScope) => post('/dsh-plugin-capabilities/mcp/remove', { id, scope }) as Promise<{ ok: boolean }>,
+    check: (id: string, scope: McpScope) => post('/dsh-plugin-capabilities/mcp/check', { id, scope }) as Promise<{ ok: boolean; detail?: string }>,
+    copy: (id: string, scope: McpScope, toScope: McpScope) =>
+      post('/dsh-plugin-capabilities/mcp/copy', { id, scope, toScope }) as Promise<{ ok: boolean; id: string }>,
     scanImport: () => fetchJson<{ servers: ImportedServerView[]; existing: string[] }>('/dsh-plugin-capabilities/import/scan'),
-    applyImport: (items: Array<{ agent: string; name: string }>) =>
-      post('/dsh-plugin-capabilities/import/apply', { items }) as Promise<{ ok: boolean; results: Array<{ name: string; ok: boolean; error?: string }> }>,
+    applyImport: (items: Array<{ agent: string; name: string }>, scope: McpScope) =>
+      post('/dsh-plugin-capabilities/import/apply', { items, scope }) as Promise<{ ok: boolean; results: Array<{ name: string; ok: boolean; error?: string }> }>,
     restart: async (): Promise<void> => {
       if (window.dshDesktop !== undefined) {
         window.dshDesktop.restartSidecar?.()
@@ -112,8 +116,8 @@ export function apply(ctx: CapabilitiesClientContext): void {
     mcpIndex: () => fetchJson<{ source: 'remote' | 'bundled'; servers: Array<MarketServerView & { installed: boolean }> }>('/dsh-plugin-capabilities/market/mcp'),
     installSkillRepo: (url: string) =>
       post('/dsh-plugin-capabilities/market/skills/install', { url }) as Promise<{ ok: boolean; root: RootRowView }>,
-    installMcp: (id: string) =>
-      post('/dsh-plugin-capabilities/market/mcp/install', { id }) as Promise<{ ok: boolean; id: string }>,
+    installMcp: (id: string, scope: McpScope) =>
+      post('/dsh-plugin-capabilities/market/mcp/install', { id, scope }) as Promise<{ ok: boolean; id: string }>,
     removeRoot: skillsInjected.removeRoot,
   }