dsh-plugin-capabilities 0.3.8 → 0.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-capabilities",
-  "version": "0.3.8",
+  "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, 'profile')
+        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

@@ -33,8 +33,10 @@ export interface McpInjected {
   save(input: Record<string, unknown>): Promise<{ ok: boolean; id: string }>
   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
 }
@@ -59,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 }
@@ -230,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)
@@ -253,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') }
@@ -403,6 +413,33 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
     }
   }
 
+  /** 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 {
+      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)
+    }
+  }
+
   const doRestart = (): void => {
     setRestartConfirm(false)
     setRestarting(true)
@@ -494,8 +531,21 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
                 {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={() => setConfirmRow(row)}>{t('delete')}</Button>
@@ -658,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

@@ -94,9 +94,12 @@ export function apply(ctx: CapabilitiesClientContext): void {
     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?.()
@@ -113,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,
   }
 

package/src/client/locales.ts

@@ -77,6 +77,11 @@ export const zh = {
   scopeHint: '全局：写入 DSH_HOME/cordis.patch.yml，对本机所有 profile 生效；当前 profile：只影响本 profile。',
   shadowedByGlobal: '全局层存在同名 id，此行不生效',
   globalLayerError: '全局配置（DSH_HOME/cordis.patch.yml）读取失败，全局服务器暂未显示：',
+  checkLabel: '检查',
+  checkRunning: '检查中…',
+  checkOk: '检查通过',
+  checkFail: '检查未通过',
+  copyToOther: '复制到另一层',
   serverName: '服务器名（工具名前缀）',
   transport: '传输方式',
   transportStdio: 'stdio（本地命令）',
@@ -93,7 +98,7 @@ export const zh = {
   removeWarn: '将从配置中移除这一行，重启 dsh 后其工具不再出现。',
   emptyMcp: '还没有配置 MCP 服务器',
   importServers: '从其他 Agent 导入',
-  importIntro: '扫描 Claude Code（~/.claude.json）与 Codex（~/.codex/config.toml）的 MCP 服务器配置，勾选后导入为本 profile 的服务器行。',
+  importIntro: '扫描 Claude Code（~/.claude.json）、Codex（~/.codex/config.toml）、Cursor（~/.cursor/mcp.json）与 Gemini CLI（~/.gemini/settings.json）的 MCP 服务器配置，勾选后导入到所选范围。',
   importEmpty: '没有发现可导入的 MCP 服务器',
   importSelectAll: '全选',
   importExisting: '已存在',
@@ -119,7 +124,7 @@ export const zh = {
   marketSkills: '技能市场',
   marketMcp: 'MCP 市场',
   marketSkillsIntro: '安装技能仓库（GitHub 下载解包，实时进入扫描目录）；已安装的仓库可在「技能」页管理。',
-  marketMcpIntro: '添加 MCP 服务器行（与「MCP」页同一存储，添加后需重启生效）；需要密钥的服务在安装后于列表中补填环境变量。',
+  marketMcpIntro: '添加 MCP 服务器行（上方可选写入当前 profile 还是全局层，添加后需重启生效）；需要密钥的服务在安装后于列表中补填环境变量。',
   marketEmpty: '市场列表为空或不可用',
   marketOffline: '在线索引不可达，当前展示包内快照（可能与最新列表有差异）。',
   marketSkillCount: '{n} 个技能',
@@ -216,6 +221,11 @@ export const en = {
   scopeHint: 'Global writes DSH_HOME/cordis.patch.yml and applies to every profile on this machine; this profile writes the current profile only.',
   shadowedByGlobal: 'a global row with the same id wins — this row has no effect',
   globalLayerError: 'Failed to read the global layer (DSH_HOME/cordis.patch.yml); global servers are hidden:',
+  checkLabel: 'Check',
+  checkRunning: 'Checking…',
+  checkOk: 'OK',
+  checkFail: 'Failed',
+  copyToOther: 'Copy to other layer',
   serverName: 'Server name (tool name prefix)',
   transport: 'Transport',
   transportStdio: 'stdio (local command)',
@@ -232,7 +242,7 @@ export const en = {
   removeWarn: 'Removes the row from its configuration; its tools disappear after the next dsh restart.',
   emptyMcp: 'No MCP servers configured yet',
   importServers: 'Import from other agents',
-  importIntro: 'Scans Claude Code (~/.claude.json) and Codex (~/.codex/config.toml) MCP server configs; selected entries become server rows in this profile.',
+  importIntro: 'Scans the MCP server configs of Claude Code (~/.claude.json), Codex (~/.codex/config.toml), Cursor (~/.cursor/mcp.json), and Gemini CLI (~/.gemini/settings.json); selected entries land in the scope picked below.',
   importEmpty: 'No importable MCP servers found',
   importSelectAll: 'Select all',
   importExisting: 'already here',
@@ -258,7 +268,7 @@ export const en = {
   marketSkills: 'Skills market',
   marketMcp: 'MCP market',
   marketSkillsIntro: 'Installs skill repositories (GitHub download, live catalog); manage installed ones on the Skills tab.',
-  marketMcpIntro: 'Adds MCP server rows (same storage as the MCP tab; restart to apply). Servers needing keys get their environment filled in on the row after install.',
+  marketMcpIntro: 'Adds MCP server rows (pick the target layer — this profile or global — above; restart to apply). Servers needing keys get their environment filled in on the row after install.',
   marketEmpty: 'Market list is empty or unavailable',
   marketOffline: 'Online index unreachable — showing the bundled snapshot, which may lag behind.',
   marketSkillCount: '{n} skills',

package/src/mcp.test.ts

@@ -2,12 +2,15 @@ import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'nod
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterAll, describe, expect, it } from 'vitest'
-import { listMcp, listMcpScoped, mcpScopeDir, removeMcp, setMcpDisabled, upsertMcp, validateMcpInput, type McpInput } from './mcp.ts'
+import { checkMcpRow, listMcp, listMcpScoped, mcpRowToInput, mcpScopeDir, removeMcp, resolveCommandOnPath, setMcpDisabled, upsertMcp, validateMcpInput, type McpInput } from './mcp.ts'
 
 const root = mkdtempSync(join(tmpdir(), 'dsh-caps-mcp-'))
 const profile = join(root, 'profiles', 'web')
 const home = join(root, 'home')
-afterAll(() => rmSync(root, { recursive: true, force: true }))
+afterAll(() => {
+  rmSync(root, { recursive: true, force: true })
+  rmSync('dsh-caps-path-bin', { recursive: true, force: true })
+})
 
 const patch = () => join(profile, 'cordis.patch.yml')
 
@@ -214,3 +217,68 @@ describe('global patch layer (GitHub issue #2)', () => {
     expect(listMcp(profile).some(row => row.serverName === 'shared-tools')).toBe(false)
   })
 })
+
+describe('mcpRowToInput', () => {
+  it('rebuilds a create request carrying identity fields but not the id', () => {
+    const rows = listMcp(profile)
+    const source = rows[0]
+    const input = mcpRowToInput(source)
+    expect(input.id).toBe('')
+    expect(input.serverName).toBe(source.serverName)
+    expect(input.transport).toBe(source.transport)
+    expect(input.command).toBe(source.command)
+    expect(input.args).toEqual(source.args)
+    expect(input.env).toEqual(source.env)
+    expect(validateMcpInput(input)).toBeNull()
+  })
+})
+
+describe('command resolution + connectivity check', () => {
+  it('resolves bare commands across PATH entries, honoring Windows extensions and quotes', () => {
+    const bin = join(root, 'bin')
+    mkdirSync(bin, { recursive: true })
+    writeFileSync(join(bin, 'tool.cmd'), '@echo off\r\n')
+    writeFileSync(join(bin, 'plain'), '#!/bin/sh\n')
+
+    expect(resolveCommandOnPath('tool', `"${bin}"`, 'win32')).toBe(true)
+    expect(resolveCommandOnPath('tool', bin, 'win32')).toBe(true)
+    expect(resolveCommandOnPath('tool', bin, 'linux')).toBe(false)
+    expect(resolveCommandOnPath('plain', bin, 'win32')).toBe(true)
+    expect(resolveCommandOnPath('missing-thing', bin, 'win32')).toBe(false)
+    expect(resolveCommandOnPath('missing-thing', `${bin};`, 'win32')).toBe(false)
+    expect(resolveCommandOnPath(join(bin, 'tool.cmd'), '', 'win32')).toBe(true)
+    expect(resolveCommandOnPath(join(bin, 'nope'), '', 'win32')).toBe(false)
+
+    // The POSIX branch splits on ':'; a Windows temp path carries a drive
+    // letter, so exercise it through a colon-free relative entry instead.
+    mkdirSync('dsh-caps-path-bin', { recursive: true })
+    writeFileSync(join('dsh-caps-path-bin', 'plain'), '#!/bin/sh\n')
+    expect(resolveCommandOnPath('plain', 'dsh-caps-path-bin:/elsewhere', 'linux')).toBe(true)
+    expect(resolveCommandOnPath('tool', 'dsh-caps-path-bin:/elsewhere', 'linux')).toBe(false)
+  })
+
+  it('checks stdio rows against PATH without spawning anything', async () => {
+    const base = { id: 'mcp-x', serverName: 'x', disabled: false, scope: 'profile' as const }
+    const missing = await checkMcpRow({ ...base, transport: 'stdio', command: 'definitely-not-a-real-cmd-xyz' }, { pathEnv: '' })
+    expect(missing.ok).toBe(false)
+    expect(missing.detail).toContain('not found on PATH')
+
+    const bin = join(root, 'bin')
+    const found = await checkMcpRow({ ...base, transport: 'stdio', command: 'tool' }, { pathEnv: bin, platform: 'win32' })
+    expect(found.ok).toBe(true)
+
+    const empty = await checkMcpRow({ ...base, transport: 'stdio' }, {})
+    expect(empty.ok).toBe(false)
+  })
+
+  it('checks http rows with a bounded GET; refusal reads as unreachable', async () => {
+    const base = { id: 'mcp-y', serverName: 'y', disabled: false, scope: 'profile' as const }
+    // Port 1 has no listener: the connect fails fast (ECONNREFUSED), which is
+    // exactly the signal the check exists to surface.
+    const refused = await checkMcpRow({ ...base, transport: 'streamable-http', url: 'http://127.0.0.1:1/mcp' }, { timeoutMs: 1500 })
+    expect(refused.ok).toBe(false)
+
+    const broken = await checkMcpRow({ ...base, transport: 'streamable-http' }, {})
+    expect(broken.ok).toBe(false)
+  }, 10_000)
+})