dsh-vscode-mode 0.1.7 → 0.1.11

package/src/client/ui/McpSettings.ts

@@ -0,0 +1,233 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — VSCodeMode 设置区内的 MCP 管理。
+ * 子 Tab：我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）。
+ * 作者 ddj 2026年08月22号
+ */
+import React from 'react'
+import { rpc } from '../rpc.js'
+import type { MpcProject, MpcServer } from '../../shared/mcp.js'
+import '../styles/mcp.css'
+
+const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '' }
+
+/** 将表单草稿转换为 Host MCP 配置。 */
+function configOf(draft) {
+  const config = { serverName: draft.serverName.trim(), transport: draft.transport }
+  if (draft.transport === 'stdio') {
+    config.command = draft.command.trim()
+    config.args = draft.args.split(/\r?\n|\s+/).filter(Boolean)
+    if (draft.cwd.trim()) config.cwd = draft.cwd.trim()
+  } else {
+    config.url = draft.url.trim()
+    config.headers = parsePairs(draft.headers)
+  }
+  return config
+}
+
+/** 解析每行 key=value 的表单字段。 */
+function parsePairs(text) {
+  return Object.fromEntries(text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).map((line) => {
+    const idx = line.indexOf('=')
+    return idx > 0 ? [line.slice(0, idx).trim(), line.slice(idx + 1).trim()] : [line, '']
+  }))
+}
+
+/** 服务状态文案。 */
+function statusOf(server) {
+  return server.status === 'connected' ? '在线' : server.status === 'connecting' ? '连接中' : server.status === 'disabled' ? '已禁用' : '错误'
+}
+
+/** MCP 服务卡片（全局与项目共用）。 */
+function ServerCard({ server, onRefresh, onToggle, onRemove }) {
+  return React.createElement('article', { className: 'vsm-mcp-card' },
+    React.createElement('div', { className: 'vsm-mcp-card-head' },
+      React.createElement('div', { className: 'vsm-mcp-title' }, React.createElement('span', { className: 'vsm-mcp-dot ' + (server.enabled ? server.status : 'disabled') }), server.serverName),
+      React.createElement('div', { className: 'vsm-mcp-actions' },
+        React.createElement('button', { onClick: () => onRefresh(server.id), title: '刷新连接' }, '↻'),
+        React.createElement('button', { className: 'vsm-danger', onClick: () => onRemove(server.id), title: '删除 MCP' }, '⌫'),
+        React.createElement('button', { className: 'vsm-switch ' + (server.enabled ? 'on' : ''), onClick: () => onToggle(server), 'aria-label': server.enabled ? '禁用' : '启用' }, server.enabled ? '●' : '○'),
+      ),
+    ),
+    React.createElement('div', { className: 'vsm-mcp-meta' }, statusOf(server), ' · ', server.toolCount, ' 个工具 · ', server.transport),
+    server.error && React.createElement('div', { className: 'vsm-mcp-error' }, server.error),
+    React.createElement('div', { className: 'vsm-mcp-tools' }, server.tools.map((tool) => React.createElement('span', { key: tool.name, className: 'vsm-mcp-chip', title: tool.description || tool.name }, tool.name))),
+  )
+}
+
+/** 按项目标题或路径过滤，大小写不敏感。 */
+export function filterProjects(projects, query) {
+  const needle = String(query ?? '').trim().toLowerCase()
+  if (!needle) return projects
+  return projects.filter((project) => `${project.title} ${project.workspacePath}`.toLowerCase().includes(needle))
+}
+
+/** 带搜索的项目组合框。 */
+function ProjectPicker({ projects, value, onChange }) {
+  const [open, setOpen] = React.useState(false)
+  const [query, setQuery] = React.useState('')
+  const [highlight, setHighlight] = React.useState(0)
+  const rootRef = React.useRef(null)
+  const selected = projects.find((project) => project.workspacePath === value)
+  const filtered = React.useMemo(() => filterProjects(projects, query), [projects, query])
+
+  React.useEffect(() => {
+    const close = (event) => {
+      if (!rootRef.current?.contains(event.target)) setOpen(false)
+    }
+    document.addEventListener('mousedown', close)
+    return () => document.removeEventListener('mousedown', close)
+  }, [])
+
+  const choose = (project) => {
+    onChange(project.workspacePath)
+    setQuery('')
+    setOpen(false)
+  }
+  const move = (delta) => setHighlight((old) => Math.max(0, Math.min(Math.max(0, filtered.length - 1), old + delta)))
+  const keyDown = (event) => {
+    if (event.key === 'ArrowDown') { event.preventDefault(); move(1) }
+    else if (event.key === 'ArrowUp') { event.preventDefault(); move(-1) }
+    else if (event.key === 'Enter' && filtered[highlight]) { event.preventDefault(); choose(filtered[highlight]) }
+    else if (event.key === 'Escape') { event.preventDefault(); setOpen(false) }
+  }
+  return React.createElement('div', { className: 'vsm-project-picker', ref: rootRef },
+    React.createElement('button', { className: 'vsm-project-picker-trigger', role: 'combobox', 'aria-expanded': open, onClick: () => setOpen((old) => !old) },
+      React.createElement('span', { className: 'vsm-project-picker-label' }, selected?.title || '选择项目', selected && React.createElement('small', null, selected.workspacePath)),
+      React.createElement('span', { className: 'vsm-project-picker-arrow' }, open ? '⌃' : '⌄'),
+    ),
+    open && React.createElement('div', { className: 'vsm-project-picker-menu' },
+      React.createElement('input', { autoFocus: true, className: 'vsm-project-picker-search', value: query, placeholder: '搜索项目名称或路径…', onChange: (event) => { setQuery(event.target.value); setHighlight(0) }, onKeyDown: keyDown }),
+      React.createElement('div', { className: 'vsm-project-picker-options', role: 'listbox' }, filtered.length ? filtered.map((project, index) => React.createElement('button', { key: project.workspacePath, role: 'option', 'aria-selected': project.workspacePath === value, className: 'vsm-project-option ' + (index === highlight ? 'highlight' : '') + (project.workspacePath === value ? ' selected' : ''), onMouseEnter: () => setHighlight(index), onClick: () => choose(project) }, React.createElement('span', null, project.title), React.createElement('small', null, project.workspacePath, ' · ', project.servers.length, ' 个 MCP'))) : React.createElement('div', { className: 'vsm-project-picker-empty' }, '没有匹配的项目')),
+    ),
+  )
+}
+
+/** 单个项目的 MCP 分组。 */
+function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
+  const head = React.createElement('div', { className: 'vsm-project-head' },
+    React.createElement('div', { className: 'vsm-project-title' }, React.createElement('span', { className: 'vsm-project-icon' }, '▣'), React.createElement('div', null, React.createElement('span', { className: 'vsm-project-name' }, project.title), React.createElement('span', { className: 'vsm-project-path' }, project.workspacePath))),
+    React.createElement('button', { className: 'vsm-primary vsm-small', onClick: () => onAdd(project) }, '+ 添加 MCP'),
+  )
+  let body
+  if (project.missingDir) body = React.createElement('div', { className: 'vsm-project-empty' }, '项目目录已不存在，无法管理 MCP')
+  else if (project.fileError) body = React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, project.fileError)
+  else if (!project.servers.length) body = React.createElement('div', { className: 'vsm-project-empty' }, '此项目未配置 MCP')
+  else body = project.servers.map((server) => React.createElement(ServerCard, { key: server.serverName, server, onRefresh: (id) => onRefresh(project, server, id), onToggle: () => onToggle(project, server), onRemove: (id) => onRemove(project, server, id) }))
+  return React.createElement('section', { className: 'vsm-project' }, head, body)
+}
+
+/** MCP 管理主面板。 */
+export function McpSettings() {
+  const [servers, setServers] = React.useState<MpcServer[]>([])
+  const [projects, setProjects] = React.useState<MpcProject[]>([])
+  const [loading, setLoading] = React.useState(true)
+  const [busy, setBusy] = React.useState('')
+  const [error, setError] = React.useState('')
+  const [tab, setTab] = React.useState('mine')
+  const [draft, setDraft] = React.useState(EMPTY)
+  const [showForm, setShowForm] = React.useState(false)
+  const [projectForm, setProjectForm] = React.useState(null)
+  const [selectedPath, setSelectedPath] = React.useState('')
+
+  React.useEffect(() => {
+    if (!projects.length) {
+      setSelectedPath('')
+      return
+    }
+    if (!projects.some((project) => project.workspacePath === selectedPath)) setSelectedPath(projects[0].workspacePath)
+  }, [projects, selectedPath])
+
+  const loadAll = React.useCallback(() => {
+    setLoading(true)
+    setError('')
+    Promise.all([rpc('mcp.list', {}), rpc('mcp.projects', {})]).then(([list, prj]) => {
+      if (!list.ok) throw new Error(list.error)
+      if (!prj.ok) throw new Error(prj.error)
+      setServers(list.servers)
+      setProjects(prj.projects)
+    }).catch((e) => setError(String(e))).finally(() => setLoading(false))
+  }, [])
+
+  React.useEffect(loadAll, [loadAll])
+
+  const finish = (result) => {
+    if (!result.ok) throw new Error(result.error)
+    return result
+  }
+
+  const action = (label, id, method, args, patch) => {
+    setBusy(id)
+    setError('')
+    return rpc(method, args).then(finish).then((result) => {
+      if (patch) patch(result)
+    }).catch((e) => setError(String(e))).finally(() => setBusy('')).then(() => label)
+  }
+
+  const refreshGlobal = (id) => action('refresh', id, 'mcp.refresh', { id }, (r) => setServers((old) => old.map((s) => s.id === id ? r.server : s)))
+  const toggleGlobal = (s) => action('toggle', s.id, 'mcp.toggle', { id: s.id, enabled: !s.enabled }, (r) => setServers((old) => old.map((x) => x.id === s.id ? r.server : x)))
+  const removeGlobal = (s) => window.confirm('确认删除此 MCP 服务？') && action('remove', s.id, 'mcp.remove', { id: s.id }, (r) => setServers((old) => old.filter((x) => x.id !== s.id)))
+
+  const replaceProject = (workspacePath) => (result) => setProjects((old) => old.map((p) => p.workspacePath === workspacePath ? result.project : p))
+  const projectAction = (workspacePath, serverName, method, args, patch) => {
+    setBusy(workspacePath + ':' + serverName)
+    setError('')
+    return rpc(method, args).then(finish).then((result) => {
+      if (patch) patch(result)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const refreshProject = (p, s) => projectAction(p.workspacePath, s.serverName, 'mcp.projectRefresh', { workspacePath: p.workspacePath, serverName: s.serverName }, replaceProject(p.workspacePath))
+  const toggleProject = (p, s) => projectAction(p.workspacePath, s.serverName, 'mcp.projectToggle', { workspacePath: p.workspacePath, serverName: s.serverName, enabled: !s.enabled }, replaceProject(p.workspacePath))
+  const removeProject = (p, s) => window.confirm('确认删除此项目的 MCP「' + s.serverName + '」？') && projectAction(p.workspacePath, s.serverName, 'mcp.projectRemove', { workspacePath: p.workspacePath, serverName: s.serverName }, replaceProject(p.workspacePath))
+
+  const saveGlobal = () => {
+    setBusy('save')
+    setError('')
+    rpc('mcp.save', { config: configOf(draft) }).then(finish).then((result) => {
+      setServers((old) => old.some((s) => s.id === result.server.id) ? old.map((s) => s.id === result.server.id ? result.server : s) : old.concat(result.server))
+      setDraft(EMPTY)
+      setShowForm(false)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const saveProject = () => {
+    if (!projectForm) return
+    setBusy('project-save')
+    setError('')
+    const config = configOf(draft)
+    rpc('mcp.projectSave', { workspacePath: projectForm.workspacePath, serverName: config.serverName, config }).then(finish).then((result) => {
+      setProjects((old) => old.map((p) => p.workspacePath === projectForm.workspacePath ? result.project : p))
+      setDraft(EMPTY)
+      setProjectForm(null)
+    }).catch((e) => setError(String(e))).finally(() => setBusy(''))
+  }
+
+  const edit = (key, value) => setDraft((old) => ({ ...old, [key]: value }))
+  const marketBody = React.createElement('div', { className: 'vsm-mcp-empty' }, 'MCP 市场暂未接入')
+  const selectedProject = projects.find((project) => project.workspacePath === selectedPath)
+  const projectBody = projects.length ? React.createElement(React.Fragment, null,
+    React.createElement(ProjectPicker, { projects, value: selectedPath, onChange: setSelectedPath }),
+    selectedProject ? React.createElement(ProjectGroup, { project: selectedProject, busy, onAdd: (project) => { setDraft(EMPTY); setProjectForm({ workspacePath: project.workspacePath, title: project.title }) }, onRefresh: refreshProject, onToggle: toggleProject, onRemove: removeProject }) : React.createElement('div', { className: 'vsm-mcp-empty' }, '请选择项目'),
+  ) : React.createElement('div', { className: 'vsm-mcp-empty' }, '还没有项目')
+  let body
+  if (loading) body = React.createElement('div', { className: 'vsm-mcp-empty' }, '正在读取 MCP 服务…')
+  else if (tab === 'mine') body = React.createElement('div', null, servers.length ? servers.map((s) => React.createElement(ServerCard, { key: s.id, server: s, onRefresh: refreshGlobal, onToggle: toggleGlobal, onRemove: removeGlobal })) : React.createElement('div', { className: 'vsm-mcp-empty' }, '还没有配置全局 MCP'))
+  else if (tab === 'projects') body = projectBody
+  else body = marketBody
+  const form = showForm ? React.createElement(McpForm, { title: '添加全局 MCP', draft, busy, edit, save: saveGlobal, close: () => setShowForm(false) }) : projectForm ? React.createElement(McpForm, { title: '添加项目 MCP · ' + projectForm.title, draft, busy, edit, save: saveProject, close: () => setProjectForm(null) }) : null
+  return React.createElement('section', { className: 'vsm-mcp-page' },
+    React.createElement('header', { className: 'vsm-mcp-header' }, React.createElement('div', null, React.createElement('h2', null, 'VSCodeMode'), React.createElement('p', null, '管理当前 profile 与各项目的 Model Context Protocol 服务。')), React.createElement('button', { className: 'vsm-primary', onClick: () => { setDraft(EMPTY); setShowForm(true) } }, '+ 添加全局 MCP')),
+    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'mine' ? 'active' : '', onClick: () => setTab('mine') }, '我的 MCP'), React.createElement('button', { className: tab === 'projects' ? 'active' : '', onClick: () => setTab('projects') }, '项目 MCP'), React.createElement('button', { className: tab === 'market' ? 'active' : '', onClick: () => setTab('market') }, 'MCP 市场')),
+    error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
+    body,
+    form,
+  )
+}
+
+/** MCP 新增表单（全局/项目共用）。 */
+function McpForm({ title, draft, busy, edit, save, close }) {
+  const input = (key, placeholder) => React.createElement('input', { value: draft[key], onChange: (e) => edit(key, e.target.value), placeholder })
+  const fields = draft.transport === 'stdio' ? React.createElement(React.Fragment, null, React.createElement('label', null, '命令', input('command', 'npx')), React.createElement('label', null, '参数（空格或换行分隔）', React.createElement('textarea', { value: draft.args, onChange: (e) => edit('args', e.target.value) })), React.createElement('label', null, '工作目录（可选）', input('cwd', ''))) : React.createElement(React.Fragment, null, React.createElement('label', null, 'URL', input('url', 'http://localhost:3000/mcp')), React.createElement('label', null, '请求头（每行 key=value）', React.createElement('textarea', { value: draft.headers, onChange: (e) => edit('headers', e.target.value) })))
+  return React.createElement('div', { className: 'vsm-mcp-modal' }, React.createElement('div', { className: 'vsm-mcp-dialog' }, React.createElement('h3', null, title), React.createElement('label', null, '名称', input('serverName', '例如 codegraph')), React.createElement('label', null, '传输方式', React.createElement('select', { value: draft.transport, onChange: (e) => edit('transport', e.target.value) }, React.createElement('option', { value: 'stdio' }, 'stdio'), React.createElement('option', { value: 'streamable-http' }, 'streamable-http'))), fields, React.createElement('div', { className: 'vsm-mcp-dialog-actions' }, React.createElement('button', { onClick: close }, '取消'), React.createElement('button', { className: 'vsm-primary', disabled: busy === 'save' || busy === 'project-save', onClick: save }, '保存并连接'))))
+}

package/src/index.ts

@@ -8,13 +8,14 @@
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { handleRpc } from './rpc.js'
+import { installIsolation } from './mcpIsolation.js'
 import { dropFileIndex } from './workspace.js'
 import { cwdOf } from './registry.js'
 import type { Registry } from './registry.js'
 import type { Ctx } from './store.js'
 
 export const name = "dsh-vscode-mode"
-export const inject = ['sessions', 'fs', 'webServer']
+export const inject = ['sessions', 'fs', 'webServer', 'loader', 'tools', 'workspaceRegistry', 'agents']
 
 /**
  * 装配插件：挂事件监听、注册路由。
@@ -38,6 +39,7 @@ export function apply(ctx: Ctx, config?: unknown): void {
   })
 
   registerRoutes(ctx, config, (method, args) => handleRpc(ctx, registry, method, args))
+  installIsolation(ctx)
 
-  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪）')
+  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪，项目 MCP 隔离已启用）')
 }

package/src/mcp.ts

@@ -0,0 +1,123 @@
+/**
+ * dsh-vscode-mode host — MCP 运行时管理适配层。
+ * 只操作已装配的 @deepseek-ai/dsh-mcp-client loader entry，不在浏览器侧连接 MCP。
+ * 作者 ddj 2026年08月22号
+ */
+import type { MpcConfig, MpcServer, MpcTool } from './shared/mcp.js'
+import type { Ctx } from './store.js'
+
+const MCP_PACKAGE = '@deepseek-ai/dsh-mcp-client'
+/** 项目级 MCP 的 loader entry id 固定前缀（区分 profile 全局 MCP；注意 loader id 不能用 ':' 分隔，故用 '.'）。 */
+export const PROJECT_ENTRY_PREFIX = 'vsm-mcp.'
+const LEGACY_PROJECT_PREFIX = 'vsm-mcp:'
+
+/** 判断新旧格式项目 entry id，避免旧残留被显示为全局 MCP。 */
+export function isProjectEntryId(id: string): boolean {
+  return id.startsWith(PROJECT_ENTRY_PREFIX) || id.startsWith(LEGACY_PROJECT_PREFIX)
+}
+
+/** 列出当前 loader 中的 MCP entry。 */
+function entriesOf(ctx: Ctx): any[] {
+  const loader = ctx.get('loader')
+  if (!loader || typeof loader.entries !== 'function') return []
+  return [...loader.entries()].filter((entry) => entry?.options?.name === MCP_PACKAGE)
+}
+export { entriesOf }
+
+/** 脱敏配置并保留可编辑字段的存在性。 */
+export function publicConfig(config: Record<string, unknown>): MpcConfig {
+  const out = { ...config } as Record<string, unknown>
+  if (out.env && typeof out.env === 'object') out.env = Object.fromEntries(Object.keys(out.env as object).map((key) => [key, '••••••']))
+  if (out.headers && typeof out.headers === 'object') out.headers = Object.fromEntries(Object.keys(out.headers as object).map((key) => [key, '••••••']))
+  return out as unknown as MpcConfig
+}
+
+/** 从工具注册表读取服务器命名空间下的工具摘要。 */
+export function toolsOf(ctx: Ctx, serverName: string): MpcTool[] {
+  const tools = ctx.get('tools')
+  const view = tools?.view?.(void 0)
+  const visible = view?.visible
+  if (!(visible instanceof Map)) return []
+  const prefix = `mcp__${serverName}__`
+  return [...visible.entries()].filter(([name]) => String(name).startsWith(prefix)).map(([name, definition]) => ({
+    name: String(name).slice(prefix.length),
+    description: typeof definition?.description === 'string' ? definition.description : undefined,
+  }))
+}
+
+/** 将 loader entry 映射为设置页摘要。 */
+export function serverOf(ctx: Ctx, entry: any): MpcServer {
+  const config = (entry.options?.config ?? {}) as Record<string, unknown>
+  const serverName = typeof config.serverName === 'string' ? config.serverName : entry.options?.id ?? 'unknown'
+  const tools = toolsOf(ctx, serverName)
+  const state = entry.fiber?.state
+  return {
+    id: String(entry.id ?? entry.options?.id ?? serverName),
+    serverName,
+    enabled: entry.disabled !== true,
+    transport: config.transport === 'streamable-http' ? 'streamable-http' : 'stdio',
+    config: publicConfig(config),
+    status: state === 2 ? 'connected' : state === 1 ? 'connecting' : 'error',
+    toolCount: tools.length,
+    tools,
+    error: state === 3 ? 'MCP 插件未正常运行' : undefined,
+  }
+}
+
+/** 校验 MCP 配置。 */
+export function validateConfig(config: MpcConfig): void {
+  if (!/^[A-Za-z0-9_-]{1,32}$/.test(config.serverName)) throw new Error('serverName 只能包含字母、数字、下划线和连字符（最多 32 位）')
+  if (config.transport === 'stdio' && !config.command?.trim()) throw new Error('stdio MCP 必须填写 command')
+  if (config.transport === 'streamable-http' && !/^https?:\/\//.test(config.url ?? '')) throw new Error('HTTP MCP 必须填写 http(s) URL')
+}
+
+/** 列出全局（profile）MCP 服务，过滤掉新旧格式的项目级条目。 */
+export function listMcp(ctx: Ctx): { servers: MpcServer[] } {
+  return { servers: entriesOf(ctx).filter((entry) => !isProjectEntryId(String(entry.id ?? entry.options?.id ?? ''))).map((entry) => serverOf(ctx, entry)) }
+}
+
+/** 保存 MCP 服务配置并触发 loader 热更新。 */
+export async function saveMcp(ctx: Ctx, config: MpcConfig): Promise<MpcServer> {
+  validateConfig(config)
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const existing = entriesOf(ctx).find((entry) => !isProjectEntryId(String(entry.id ?? entry.options?.id ?? '')) && entry.options?.config?.serverName === config.serverName)
+  if (existing) {
+    await loader.update(existing.id, { config: { ...config } })
+    return serverOf(ctx, loader.resolve(existing.id))
+  }
+  const id = await loader.create({ name: MCP_PACKAGE, config: { ...config } })
+  return serverOf(ctx, loader.resolve(id))
+}
+
+/** 删除 MCP 服务。 */
+export async function removeMcp(ctx: Ctx, id: string): Promise<void> {
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id)
+  if (!entry) throw new Error('MCP 服务不存在')
+  await loader.remove(entry.id)
+}
+
+/** 切换 MCP 服务启用状态。 */
+export async function toggleMcp(ctx: Ctx, id: string, enabled: boolean): Promise<MpcServer> {
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id)
+  if (!entry) throw new Error('MCP 服务不存在')
+  await loader.update(entry.id, { disabled: !enabled })
+  return serverOf(ctx, loader.resolve(entry.id))
+}
+
+/** 重新加载 MCP 服务。 */
+export async function refreshMcp(ctx: Ctx, id: string): Promise<MpcServer> {
+  const loader = ctx.get('loader')
+  if (!loader) throw new Error('缺少 loader 服务')
+  const entry = entriesOf(ctx).find((candidate) => String(candidate.id) === id)
+  if (!entry) throw new Error('MCP 服务不存在')
+  await loader.update(entry.id, { config: { ...(entry.options?.config ?? {}) } })
+  return serverOf(ctx, loader.resolve(entry.id))
+}
+
+export type { MpcConfig, MpcServer }
+export const mcpPackageName = MCP_PACKAGE

package/src/mcpIsolation.ts

@@ -0,0 +1,160 @@
+/**
+ * dsh-vscode-mode host — 项目 MCP 的 agent 级隔离。
+ * 项目 MCP 连接仍由 Host 维护，但每个 agent 只继承当前 workspace 的项目工具；
+ * tools.restrict() 负责模型可见性，tools.guard() 负责执行层兜底拒绝。
+ * 作者 ddj 2026年08月22号
+ */
+import { PROJECT_ENTRY_PREFIX, entriesOf } from './mcp.js'
+import { hashWorkspace } from './mcpProject.js'
+import type { Ctx } from './store.js'
+
+const LEGACY_PREFIX = 'vsm-mcp:'
+const UNKNOWN_PROJECT = '__unknown_project__'
+
+type ToolProjects = Map<string, string>
+type AgentState = { dispose?: () => void; denyKey: string }
+
+/** 统一 workspace 路径，供 cwd 父路径匹配。 */
+export function normalizePath(path: string): string {
+  const value = String(path ?? '').replace(/\\/g, '/').replace(/\/+/g, '/')
+  return value.replace(/\/$/, '').toLowerCase()
+}
+
+/** 在已注册 workspace 中匹配 cwd，优先最长父路径。 */
+export function matchWorkspace(cwd: string | undefined, paths: string[]): string | undefined {
+  if (!cwd) return undefined
+  const target = normalizePath(cwd)
+  const matches = paths.filter((path) => {
+    const root = normalizePath(path)
+    return target === root || target.startsWith(root + '/')
+  })
+  matches.sort((a, b) => normalizePath(b).length - normalizePath(a).length)
+  return matches[0]
+}
+
+/** 根据 entry id 判断是否为新旧格式项目 MCP。 */
+export function isProjectEntry(id: string): boolean {
+  return id.startsWith(PROJECT_ENTRY_PREFIX) || id.startsWith(LEGACY_PREFIX)
+}
+
+/** 从项目 entry id 解析 workspace hash。 */
+function entryHash(id: string): string | undefined {
+  if (id.startsWith(PROJECT_ENTRY_PREFIX)) return id.slice(PROJECT_ENTRY_PREFIX.length).split('.')[0]
+  if (id.startsWith(LEGACY_PREFIX)) return id.slice(LEGACY_PREFIX.length).split(':')[0]
+  return undefined
+}
+
+/** 返回一个 agent 不应继承的项目工具名。 */
+export function denyTools(toolProjects: ToolProjects, currentPath: string | undefined): string[] {
+  return [...toolProjects.entries()].filter(([, owner]) => owner !== currentPath).map(([name]) => name).sort()
+}
+
+/** 从 loader entry 和工具注册表建立工具到项目路径的映射。 */
+function projectTools(ctx: Ctx): ToolProjects {
+  const result: ToolProjects = new Map()
+  const registry = ctx.get('workspaceRegistry')
+  const workspaces = registry?.list?.() ?? []
+  const byHash: Map<string, string> = new Map(workspaces.map((ws: { path: string }) => [hashWorkspace(ws.path), ws.path] as [string, string]))
+  const visible = ctx.get('tools')?.view?.(void 0)?.visible
+  if (!(visible instanceof Map)) return result
+  for (const entry of entriesOf(ctx)) {
+    const id = String(entry.id ?? entry.options?.id ?? '')
+    if (!isProjectEntry(id)) continue
+    const hash = entryHash(id)
+    const owner = hash ? byHash.get(hash) ?? UNKNOWN_PROJECT : UNKNOWN_PROJECT
+    const serverName = entry.options?.config?.serverName
+    if (typeof serverName !== 'string') continue
+    const prefix = `mcp__${serverName}__`
+    for (const name of visible.keys()) if (String(name).startsWith(prefix)) result.set(String(name), owner)
+  }
+  return result
+}
+
+/** 取得 agent 当前 cwd 所属 workspace。 */
+function agentWorkspace(ctx: Ctx, agent: any): string | undefined {
+  const cwd = agent?.session?.header?.cwd
+  const paths = (ctx.get('workspaceRegistry')?.list?.() ?? []).map((ws: { path: string }) => ws.path)
+  return matchWorkspace(cwd, paths)
+}
+
+/** 同步一个 agent 的项目工具 deny 列表。 */
+function syncAgent(ctx: Ctx, state: AgentState, agent: any, tools: ToolProjects): void {
+  const current = agentWorkspace(ctx, agent)
+  const denied = denyTools(tools, current)
+  const nextKey = denied.join('\n')
+  if (state.denyKey === nextKey) return
+  state.dispose?.()
+  state.dispose = undefined
+  if (denied.length > 0) {
+    try {
+      state.dispose = agent.ctx.tools.restrict({ deny: denied })
+    } catch (error) {
+      ctx.logger?.warn?.('[dsh-vscode-mode] MCP agent restriction failed: ' + String(error))
+      return
+    }
+  }
+  state.denyKey = nextKey
+}
+
+/** 为当前 Host 安装项目 MCP 的 agent restriction 与执行 guard。 */
+export function installIsolation(ctx: Ctx): void {
+  const tools = ctx.get('tools')
+  const agents = ctx.get('agents')
+  if (!tools || !agents) return
+  const states = new Map<any, AgentState>()
+  let toolProjects = projectTools(ctx)
+  let scheduled = false
+  let syncing = false
+
+  const syncAll = () => {
+    if (syncing) return
+    syncing = true
+    try {
+      toolProjects = projectTools(ctx)
+      for (const agent of agents.list?.() ?? []) {
+        const state = states.get(agent) ?? { denyKey: '' }
+        states.set(agent, state)
+        syncAgent(ctx, state, agent, toolProjects)
+      }
+    } finally {
+      syncing = false
+    }
+  }
+  const scheduleSync = () => {
+    if (scheduled) return
+    scheduled = true
+    queueMicrotask(() => {
+      scheduled = false
+      syncAll()
+    })
+  }
+  const onCreated = ctx.on('agent/created', ({ agent }: { agent: any }) => {
+    const state = { denyKey: '' }
+    states.set(agent, state)
+    syncAgent(ctx, state, agent, toolProjects)
+  })
+  const onDisposed = ctx.on('agent/disposed', ({ agent }: { agent: any }) => {
+    const state = states.get(agent)
+    state?.dispose?.()
+    states.delete(agent)
+  })
+  const onToolsChange = ctx.on('tools/change', scheduleSync)
+  const stopGuard = tools.guard((exec: any) => {
+    const owner = toolProjects.get(String(exec?.name ?? ''))
+    if (!owner) return undefined
+    const current = agentWorkspace(ctx, exec.agent)
+    if (owner === current) return undefined
+    return current === undefined
+      ? '项目 MCP 需要在已注册工作区的对话中使用'
+      : '已拒绝：当前对话工作区不能使用其他项目的 MCP'
+  })
+  syncAll()
+  ctx.effect(() => () => {
+    onCreated?.()
+    onDisposed?.()
+    onToolsChange?.()
+    stopGuard?.()
+    for (const state of states.values()) state.dispose?.()
+    states.clear()
+  }, 'vscode-mode:mcp-isolation')
+}