dsh-vscode-mode 0.17.0 → 0.18.0

package/src/client/ui/EditorView.ts

@@ -68,6 +68,7 @@ import { mdPreviewLoad, mdPreviewSave } from '../state/mdPreviewCache.js'
 import { onUiStateReady, reportUiStateEvent, uiStateSettled } from '../state/uiStatePersist.js'
 import { migrateScopedKeys, workspaceScopeOf } from '../state/scopeStore.js'
 import { modelsForScope, rememberModel, retainModels } from '../state/modelCache.js'
+import { clearModelWarmer, setModelWarmer } from '../state/modelWarmer.js'
 import { navFlashRangeOf } from '../navHighlight.js'
 import { chordOf, useKeybindingsVersion } from '../keybindings.js'
 import { getSidebarMinWidth } from '../sidebarMin.js'
@@ -260,6 +261,8 @@ export function EditorView(props) {
   const planActiveRef = React.useRef(null)
   planActiveRef.current = planActive
   const planHostRef = React.useRef(null)
+  // 进入只读计划预览前的磁盘选中页签，关闭该计划页签时恢复，避免跳到第一个页签。
+  const planReturnRef = React.useRef(null)
   React.useEffect(() => { setPlanTabs([]); setPlanActive(null) }, [sessionId, cwd])
   /** @private @author ddj 2026年10月08号 @param path Disk tab selection. Leave read-only plan mode before any disk navigation. */
   function setActive(path) {
@@ -271,6 +274,10 @@ export function EditorView(props) {
   const [layoutScope, setLayoutScope] = React.useState(null)
   const benchRef = React.useRef(workbench)
   benchRef.current = workbench
+  // 页签行归属的分组：焦点落在浮窗时行仍留在页面主组上（浮窗自带标题栏），与 renderGroup 同一判据。
+  // 行节点会随焦点在分组间迁移，绑定滚轮/滚入视野的 effect 必须跟着这个归属重跑。
+  const rowOnFloat = workbench.floats.some((item) => item.group === workbench.focused)
+  const rowOwner = rowOnFloat ? MAIN_GROUP : workbench.focused
   const [dragPreview, setDragPreview] = React.useState(null)
   const dragRef = React.useRef(null)
   const benchOps = React.useRef(null)
@@ -1853,11 +1860,11 @@ export function EditorView(props) {
     const right = left + el.offsetWidth
     if (left < host.scrollLeft) host.scrollLeft = left
     else if (right > host.scrollLeft + host.clientWidth) host.scrollLeft = right - host.clientWidth
-  }, [active, tabs.length])
+  }, [active, planActive, planTabs.length, tabs.length, rowOwner])
 
   // 页签栏滚轮横向滚动（需求 3）：页签栏溢出时，鼠标滚轮（含触控板纵向手势）横滚页签栏，
   // 不溢出时不接管（保持页面垂直滚动）；Shift+滚轮交由浏览器原生横滚。详见 horizontalWheel.ts。
-  React.useEffect(() => attachHorizontalWheel(tabsHostRef.current), [])
+  React.useEffect(() => attachHorizontalWheel(tabsHostRef.current), [rowOwner])
 
   // 鼠标侧键后退/前进：Logitech 官方默认「后退/前进」= XButton 鼠标事件（button 3/4），不产生键盘事件。
   // pointerdown 触发导航（preventDefault 后兼容 mousedown 可能不再触发，避免双触发）；
@@ -2065,6 +2072,42 @@ export function EditorView(props) {
     return model
   }
 
+  const warmRef = React.useRef(null)
+  /**
+   * 让目标文件的 Monaco model 存在（预热入口，供 Ctrl+hover 定义链接预览）。
+   *
+   * 为什么需要：Monaco 在渲染定义链接的源码预览时对目标 uri 调 `createModelReference`
+   * 后只挂 then、没有 catch；本插件的定义目标是自造 `edrv://` uri，目标文件若从未打开过
+   * 就没有已注册 model，会 reject("Model not found") 成为未捕获异常（见 state/modelWarmer.ts）。
+   * 已缓存的路径直接返回成功：模型已在 Monaco 注册表里，无需再读盘。
+   * 预热出的 model 走 modelsRef 常规 LRU（40 条、未附着超限被 dispose）；正式打开该文件时
+   * 由 loadContent 的 cached-model 分支 + checkCached 后台校验接管，不会显示陈旧内容。
+   * @private
+   * @author ddj 2026年10月20号
+   * @param path 工作区相对路径
+   * @returns 模型是否已存在/成功建出（失败一律 false，绝不抛）
+   */
+  warmRef.current = (path) => {
+    if (!path) return Promise.resolve(false)
+    if (modelsRef.current.get(path)) return Promise.resolve(true)
+    // 图片/PDF 不建文本 model（各自走预览控件），预热对它们没有意义
+    if (isImagePath(path) || isPdfPath(path)) return Promise.resolve(false)
+    const sid = sessionId
+    if (!sid) return Promise.resolve(false)
+
+    return rpc('edrv.read', { sessionId: sid, path }).then((res) => {
+      if (!res?.ok || typeof res.content !== 'string') return false
+      getModel(path, res.content)
+      return true
+    }).catch(() => false)
+  }
+  // 预热实现随挂载安装、卸载移除：编辑器未挂载时 warmModelFor 直接返回 false（退化为修复前行为）
+  React.useEffect(() => {
+    const warmImpl = (path) => warmRef.current?.(path) ?? Promise.resolve(false)
+    setModelWarmer(warmImpl)
+    return () => clearModelWarmer(warmImpl)
+  }, [])
+
   /**
    * 提交待执行的防抖保存（**真正执行保存**，不是取消）。
    * 语义与缺陷背景见 saveDebounce.ts：`schedule` 的返回值是只 clearTimeout 的 disposer，
@@ -3595,6 +3638,7 @@ export function EditorView(props) {
     if (!document) return
     flushSave()
     saveViewState(active)
+    if (!planActiveRef.current) planReturnRef.current = active
     setDiskActive(null)
     setPlanTabs((prev) => [...prev.filter((item) => item.address !== document.address), document].slice(-32))
     setPlanActive(document.address)
@@ -3605,7 +3649,10 @@ export function EditorView(props) {
   function closePlan(address, event) {
     event?.stopPropagation()
     setPlanTabs((prev) => prev.filter((item) => item.address !== address))
-    if (planActiveRef.current === address) setActive(tabsRef.current[0]?.path ?? null)
+    if (planActiveRef.current !== address) return
+    const previous = planReturnRef.current
+    planReturnRef.current = null
+    setActive(tabsRef.current.some((tab) => tab.path === previous) ? previous : (tabsRef.current[0]?.path ?? null))
   }
   /** @private @author ddj 2026年10月08号 @param request Claimed disk or virtual open. Flushes saves without replacing dirty models. */
   function openReceiptFile(request) {
@@ -3916,11 +3963,17 @@ export function EditorView(props) {
     setWorkbench((current) => ({ ...current, tree: replace(current.tree) }))
   }
   /** @private @author ddj 2026年10月14号 @param id Leaf id. @returns Tabs and either focused full-feature editor or independent passive view. */
-  function renderGroup(id) {
+  function renderGroup(id, floating) {
     const group = workbench.groups.find((item) => item.id === id)
     if (!group) return null
     const focused = id === workbench.focused
-    return React.createElement(EditorPane, { key: id, group, focused, dirty: dirtyMap, onSelect: selectGroup, onClose: closeTab, onMenu: paneMenu, onDrag: dragTab, consumeClick: consumeDrag },
+    // 同一行：计划预览页签并入该组自己的页签行（extras），与磁盘页签共用一条滚动区，
+    // 页面工具列固定在行尾（滚动区之外，横滚不带走）。焦点落在浮窗时，这一行仍留在页面分组上，
+    // 避免整条工具栏跟着搬进浮窗；页签缓存 ref 只认页面上的这条行。
+    const chrome = !floating && id === rowOwner
+    // 计划预览占用的正文只会在焦点组里；承载页签行的组同时收起磁盘选中态，保证整屏只有计划页签一条下划线。
+    const hideDiskActive = Boolean(planActive) && (chrome || focused)
+    return React.createElement(EditorPane, { key: id, group, focused, dirty: dirtyMap, suppressActive: hideDiskActive, tabsRef: chrome ? tabsHostRef : undefined, extras: chrome ? planTabExtras : undefined, tools: chrome ? rowTools : undefined, onSelect: selectGroup, onClose: closeTab, onMenu: paneMenu, onDrag: dragTab, consumeClick: consumeDrag },
       focused ? React.createElement('div', { className: 'edrv-full-slot', ref: mountFull }) : React.createElement(React.Fragment, null,
         React.createElement(GroupPathbar, { path: group.active, onFocus: () => selectGroup(id) }),
         React.createElement(PassiveEditor, { key: String(scope) + ':' + group.active, path: group.active, groupId: id, mount: passiveMount })))
@@ -3932,15 +3985,18 @@ export function EditorView(props) {
   }
   // --endregion
 
-  const tabsEl = React.createElement('div', { className: 'edrv-tabs', ref: tabsHostRef, style: { flex: '1 1 auto', minWidth: 0 } },
-    planTabs.map((plan) => React.createElement('div', {
-      key: plan.address, className: 'edrv-tab' + (plan.address === planActive ? ' edrv-tab-active' : ''),
+  // 计划预览页签不再是独立一行的工具条：它作为焦点分组页签行的尾部内容（EditorPane 的 extras）渲染，
+  // 与磁盘页签同处一条滚动区，因此整块工作台只有一行页签。
+  const planTabExtras = planTabs.length
+    ? planTabs.map((plan) => React.createElement('div', {
+      key: plan.address, className: 'edrv-tab edrv-tab-plan' + (plan.address === planActive ? ' edrv-tab-active' : ''),
       title: plan.title + '（计划预览 · 只读）', onClick: () => openPlanDoc(plan),
-    }, React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', maxWidth: 180 } }, plan.title),
-    React.createElement('span', { className: 'edrv-tab-x', title: '关闭', onClick: (event) => closePlan(plan.address, event) }, '×'))),
-    (openInput
-      ? React.createElement('input', { className: 'edrv-path-input', autoFocus: true, placeholder: '输入工作区相对/绝对路径，回车打开', value: pathDraft, onChange: (e) => setPathDraft(e.target.value), onKeyDown: (e) => { if (e.key === 'Enter') openPath(); if (e.key === 'Escape') setOpenInput(false) } })
-      : React.createElement('button', { className: 'edrv-tab-add', title: '打开文件（输入路径）', onClick: () => setOpenInput(true) }, '+')))
+    }, React.createElement('span', { className: 'edrv-group-tab-name' }, plan.title),
+    React.createElement('span', { className: 'edrv-tab-x', title: '关闭', onClick: (event) => closePlan(plan.address, event) }, '×')))
+    : null
+  const openControl = openInput
+    ? React.createElement('input', { className: 'edrv-path-input', autoFocus: true, placeholder: '输入工作区相对/绝对路径，回车打开', value: pathDraft, onChange: (e) => setPathDraft(e.target.value), onKeyDown: (e) => { if (e.key === 'Enter') openPath(); if (e.key === 'Escape') setOpenInput(false) } })
+    : React.createElement('button', { className: 'edrv-tab-add', title: '打开文件（输入路径）', onClick: () => setOpenInput(true) }, '+')
 
   const activePlan = planTabs.find((plan) => plan.address === planActive)
   const pathBar = activePlan ? React.createElement('div', { className: 'edrv-pathbar', title: activePlan.address },
@@ -4022,8 +4078,9 @@ export function EditorView(props) {
   const navBackTarget = navRef.current.peekBack()
   const navForwardTarget = navRef.current.peekForward()
   const navNameOf = (entry) => (entry && entry.path ? String(entry.path).split(/[\\/]/).pop() : '')
-  const tabRow = React.createElement('div', { style: { display: 'flex', alignItems: 'center', background: 'var(--dsw-alias-bg-layer-1,transparent)', flexShrink: 0 } },
-    tabsEl,
+  // 行尾固定工具列：位于焦点分组页签行的滚动区右侧，横滚页签时不跟着滚走。
+  const rowTools = React.createElement('div', { className: 'edrv-tabs-tools' },
+    openControl,
     (sum.totalFiles > 0
       ? React.createElement('button', { className: 'edrv-diffchip', title: '打开差异总览/归档', onClick: () => setLauncherOpen((o) => !o) }, '⚠ 差异 ' + sum.totalFiles + ' 文件')
       : null),
@@ -4441,7 +4498,8 @@ export function EditorView(props) {
         'data-edrv-diff-dock-shell': '1',
       }, React.createElement(DiffBox, { ...dockSnapshot, dock: true }))
     : null
-  // 主编辑列（侧边栏右侧）：pathBar + tabRow + 编辑/差异区。
+  // 编辑区容器：pathBar 和页签行现在都由焦点分组自己渲染，这里只放编辑正文与各种浮层。
+
   const editorArea = React.createElement('div', { className: 'edrv-editor-area' },
     dapBar,
     addCfgBtn,
@@ -4466,11 +4524,11 @@ export function EditorView(props) {
     : null
   // 底部状态栏共用一整条：挂在 mainCol 层级（所有分组之下），不随焦点分组搬家（ddj 2026-10-16）
   const fullView = createPortal(React.createElement(React.Fragment, null, pathBar, sideHintEl, diskBanner(), editorArea), fullHost, 'edrv-full-editor')
+  // 页签行已并入焦点分组自身（EditorPane 内一行），不再有独立的顶部工具条。
   const mainCol = React.createElement('div', { className: 'edrv-main-col edrv-workbench', style: { flex: 1, minWidth: 0, minHeight: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden' } },
-    React.createElement('div', { className: 'edrv-workbench-tools' }, tabRow),
     renderTree(workbench.tree), fullView,
     statusBar,
-    workbench.floats.map((item, layer) => React.createElement(FloatingEditor, { key: item.group, owner: String(scope), group: item.group, rect: item, layer, focused: item.group === workbench.focused, onBounds: floatBounds, onFocus: selectGroup, onReturn: returnPane }, renderGroup(item.group))),
+    workbench.floats.map((item, layer) => React.createElement(FloatingEditor, { key: item.group, owner: String(scope), group: item.group, rect: item, layer, focused: item.group === workbench.focused, onBounds: floatBounds, onFocus: selectGroup, onReturn: returnPane }, renderGroup(item.group, true))),
     dragPreview ? createPortal(React.createElement(React.Fragment, null,
       dragPreview.rect ? React.createElement('div', { className: 'edrv-drag-overlay', style: dragPreview.rect }, React.createElement('span', { className: 'edrv-drop-label' }, dragPreview.label)) : null,
       React.createElement('div', { className: 'edrv-drag-ghost', style: { left: dragPreview.point.x + 12, top: dragPreview.point.y + 12 } }, baseNameOf(dragPreview.path) + ' · ' + dragPreview.label)), document.body) : null)

package/src/client/ui/McpSessionStatus.ts

@@ -0,0 +1,75 @@
+/** Official session-row slots; no DOM patching or session activation. @author ddj 2026年10月20号 */
+import React, { useCallback, useEffect, useState, useSyncExternalStore } from 'react'
+import type { McpPhase } from '../../shared/mcp.js'
+import { McpSessionState, type SessionMcpView } from '../mcpSessionState.js'
+
+const labels: Record<McpPhase, string> = {
+  idle: '待使用，尚未启动', preparing: '读取项目配置', queued: '等待 MCP 启动名额', loading: '加载 MCP 插件模块',
+  starting: '等待 MCP 插件启动', stopping: '释放旧 MCP 实例', ready: '初始化完成，连接健康未验证',
+  error: '初始化异常', none: '无需加载项目 MCP',
+}
+const busy = new Set<McpPhase>(['preparing', 'queued', 'loading', 'starting', 'stopping'])
+export interface McpRowProps { sessionId: string; store: McpSessionState }
+
+/** @private @author ddj 2026年10月20号 @param props Root row identity and shared poller. @returns Stable per-session observation. */
+function useMcpView({ sessionId, store }: McpRowProps): SessionMcpView {
+  const subscribe = useCallback((notify: () => void) => store.subscribe(sessionId, notify), [store, sessionId])
+  const snapshot = useCallback(() => store.get(sessionId), [store, sessionId])
+  return useSyncExternalStore(subscribe, snapshot, snapshot)
+}
+
+/** @public @author ddj 2026年10月20号 @param view Current observation. @returns Accessible row label; steady states deliberately do not occupy the leading slot. */
+export function mcpRowLabel(view: SessionMcpView): string | undefined {
+  if (view.stale) return '项目 MCP 状态暂不可用（上次状态已过期）'
+  if (!view.status || (!busy.has(view.status.phase) && view.status.phase !== 'error')) return undefined
+  return '项目 MCP：' + labels[view.status.phase]
+}
+
+/** @public @author ddj 2026年10月20号 @param props Official row sessionId and poller. @returns 16px loading/error marker; official running/approval states retain precedence. */
+export function McpSessionIcon(props: McpRowProps): React.ReactElement | null {
+  const view = useMcpView(props)
+  const label = mcpRowLabel(view)
+  if (!label) return null
+  const warning = view.stale || view.status?.phase === 'error'
+  return React.createElement('span', {
+    role: 'img', 'aria-label': label, title: label,
+    style: { display: 'inline-flex', width: 16, height: 16, alignItems: 'center', justifyContent: 'center',
+      color: warning ? 'var(--color-warning, #b7791f)' : 'var(--color-text-secondary, currentColor)', fontSize: 13 },
+  }, warning ? '⚠' : '◌')
+}
+
+/** @private @author ddj 2026年10月20号 @param start Stage start. @param end Stage finish or local clock. @returns Human-readable elapsed time, without claiming a timeout. */
+function elapsed(start: number, end: number): string { return Math.max(0, (end - start) / 1000).toFixed(1) + ' 秒' }
+
+/** @public @author ddj 2026年10月20号 @param props Official hover sessionId and poller. @returns Project-only diagnostic detail, never transport credentials. */
+export function McpSessionDetail(props: McpRowProps): React.ReactElement {
+  const view = useMcpView(props)
+  const [now, setNow] = useState(Date.now)
+  const status = view.status
+  useEffect(() => {
+    if (!status || view.stale || !busy.has(status.phase)) return
+    const tick = setInterval(() => setNow(Date.now()), 1000)
+    return () => clearInterval(tick)
+  }, [status, view.stale])
+
+  const children: React.ReactNode[] = [React.createElement('strong', { key: 'title' }, '项目 MCP')]
+  if (view.stale) children.push(React.createElement('div', { key: 'stale', role: 'status' }, '状态暂不可用；以下如有记录，为上次观测结果'))
+  if (!status) children.push(React.createElement('div', { key: 'empty' }, view.stale ? '等待状态查询' : '当前无活跃 MCP 实例'))
+  else {
+    const end = status.finishedAt ?? now
+    const completed = status.servers.filter((server) => server.phase === 'ready').length
+    const slow = !view.stale && busy.has(status.phase) && now - status.phaseAt > 10000
+    children.push(React.createElement('div', { key: 'phase' }, labels[status.phase], slow ? '（耗时较长，不代表失败）' : ''))
+    children.push(React.createElement('div', { key: 'time' }, `${completed}/${status.servers.length} 已初始化 · 总耗时 ${elapsed(status.startedAt, end)} · 当前阶段 ${elapsed(status.phaseAt, end)}`))
+    if (status.configMs !== undefined) children.push(React.createElement('div', { key: 'config' }, `配置准备 ${elapsed(0, status.configMs)}`))
+    if (status.error) children.push(React.createElement('div', { key: 'error' }, status.error))
+    for (const server of status.servers) children.push(React.createElement('div', { key: 'server:' + server.serverName },
+      `${server.serverName}：${labels[server.phase]}${server.reused ? ' · 复用已有连接' : ''}${server.phase === 'idle' ? '' : ' · ' + elapsed(server.startedAt, server.finishedAt ?? now)}`,
+      server.queuedMs === undefined ? '' : ' · 排队 ' + elapsed(0, server.queuedMs),
+      server.connectMs === undefined ? '' : ' · 初始化 ' + elapsed(0, server.connectMs),
+      server.firstCallMs === undefined ? '' : ' · 首次工具执行 ' + elapsed(0, server.firstCallMs),
+      server.error ? ' · ' + server.error : ''))
+  }
+  children.push(React.createElement('small', { key: 'scope' }, '仅 VSCodeMode 管理的项目 MCP；不含全局或 preset MCP。'))
+  return React.createElement('section', { 'aria-label': '项目 MCP 状态', style: { display: 'grid', gap: 4, maxWidth: 320, overflowWrap: 'anywhere', fontSize: 12 } }, children)
+}

package/src/client/ui/McpSettings.ts

@@ -10,6 +10,7 @@ import React from 'react'
 import { rpc } from '../rpc.js'
 import type { MpcProject, MpcServer } from '../../shared/mcp.js'
 import { configOf } from '../mcpForm.js'
+import { parseMcpPolicy } from '../../shared/mcp.js'
 import { McpState } from '../mcpState.js'
 import { statusOf, statusTone } from '../../shared/mcpStatus.js'
 import '../styles/mcp.css'
@@ -25,10 +26,10 @@ import { PerfSettings } from './PerfSettings.js'
 import { IntegrationSettings } from './IntegrationSettings.js'
 import { AiSettings } from './AiSettings.js'
 
-const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '' }
+const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '', startup: 'on-demand', sharing: 'agent', startupTimeoutMs: 60000 }
 
 /** @private @author ddj 2026年10月08号 @param props Server snapshot, page-wide busy state and actions. @returns Lifecycle-evidence card; enabled does not imply online. */
-function ServerCard({ server, busy, onRefresh, onToggle, onRemove }) {
+function ServerCard({ server, busy, onRefresh, onToggle, onRemove, onConnect, onPolicy }) {
   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 ' + statusTone(server) }), server.serverName),
@@ -39,12 +40,33 @@ function ServerCard({ server, busy, onRefresh, onToggle, onRemove }) {
       ),
     ),
     React.createElement('div', { className: 'vsm-mcp-meta' }, statusOf(server), ' · ', server.toolCount, ' 个工具 · ', server.transport,
-      server.instanceCount !== undefined ? ' · ' + server.instanceCount + ' 个会话实例（各自连接）' : ''),
+      server.instanceCount !== undefined ? ' · ' + server.instanceCount + ' 个连接实例' : '',
+      server.sessionCount !== undefined ? ' · ' + server.sessionCount + ' 个会话使用' : ''),
+    server.policy && React.createElement(ProjectPolicy, { server, busy, onConnect, onPolicy }),
     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))),
   )
 }
 
+/** @private @author ddj 2026年10月20号 @param props Project policy and locked actions. @returns Explicit strategy controls and sharing risk notice. */
+function ProjectPolicy({ server, busy, onConnect, onPolicy }) {
+  /** @author ddj 2026年10月20号 @param event Strategy selection. Saves only an explicit user change. */
+  const startup = (event) => onPolicy?.(server, { ...server.policy, startup: event.target.value })
+  /** @author ddj 2026年10月20号 @param event Sharing selection. Requires acknowledgement before state sharing. */
+  const sharing = (event) => {
+    const mode = event.target.value
+    if (mode === 'workspace' && !window.confirm('同一工作区的会话将共享此 MCP 的连接和内部状态；工具串行不等于业务状态隔离。确认服务适合共享？')) return
+    onPolicy?.(server, { ...server.policy, sharing: mode })
+  }
+  return React.createElement('div', { className: 'vsm-mcp-meta' },
+    React.createElement('label', null, '启动 ', React.createElement('select', { disabled: !!busy, value: server.policy.startup, onChange: startup },
+      React.createElement('option', { value: 'on-demand' }, '按需启动'), React.createElement('option', { value: 'background' }, '后台预热'))),
+    React.createElement('label', null, ' 连接 ', React.createElement('select', { disabled: !!busy, value: server.policy.sharing, onChange: sharing },
+      React.createElement('option', { value: 'agent' }, '逐会话隔离'), React.createElement('option', { value: 'workspace' }, '工作区共享（共享状态）'))),
+    React.createElement('button', { disabled: !!busy || !server.enabled, onClick: onConnect }, '连接当前活跃会话'),
+    React.createElement('small', null, '默认按需启动，不阻塞新对话；首次使用仍需等待。共享仅显式启用。'))
+}
+
 /** 按项目标题或路径过滤，大小写不敏感。 */
 export function filterProjects(projects, query) {
   const needle = String(query ?? '').trim().toLowerCase()
@@ -94,7 +116,7 @@ function ProjectPicker({ projects, value, onChange }) {
 }
 
 /** @private @author ddj 2026年10月08号 @param props Project view, shared busy lock and actions. @returns Project cards with actions disabled for any active mutation. */
-function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
+function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove, onConnect, onPolicy }) {
   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', disabled: !!busy, onClick: () => onAdd(project) }, '+ 添加 MCP'),
@@ -103,7 +125,7 @@ function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
   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, busy, onRefresh: (id) => onRefresh(project, server, id), onToggle: () => onToggle(project, server), onRemove: (id) => onRemove(project, server, id) }))
+  else body = project.servers.map((server) => React.createElement(ServerCard, { key: server.serverName, server, busy, onConnect: () => onConnect(project, server), onPolicy: (server, policy) => onPolicy(project, server, policy), 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)
 }
 
@@ -513,7 +535,7 @@ function McpManagePanel(props) {
   const form = showForm
     ? React.createElement(McpForm, { title: '添加全局 MCP', draft, busy, edit, save: () => saveGlobal(closeGlobalForm), close: closeGlobalForm })
     : projectForm
-      ? React.createElement(McpForm, { title: '添加项目 MCP · ' + projectForm.title, draft, busy, edit, save: () => saveProject(projectForm.workspacePath, closeProjectForm), close: closeProjectForm })
+      ? React.createElement(McpForm, { project: true, title: '添加项目 MCP · ' + projectForm.title, draft, busy, edit, save: () => saveProject(projectForm.workspacePath, closeProjectForm), close: closeProjectForm })
       : null
   return React.createElement(React.Fragment, null,
     React.createElement('div', { className: 'vsm-mcp-subhead' },
@@ -538,7 +560,7 @@ function manageBody(props, tab, path, select, add) {
   const project = projects.find((item) => item.workspacePath === path)
   return React.createElement(React.Fragment, null,
     React.createElement(ProjectPicker, { projects, value: path, onChange: select }),
-    project ? React.createElement(ProjectGroup, { project, busy, onAdd: add, onRefresh: refreshProject, onToggle: toggleProject, onRemove: removeProject }) : React.createElement('div', { className: 'vsm-mcp-empty' }, '请选择项目'),
+    project ? React.createElement(ProjectGroup, { project, busy, onAdd: add, onRefresh: refreshProject, onToggle: toggleProject, onRemove: removeProject, onConnect: props.connectProject, onPolicy: props.policyProject }) : React.createElement('div', { className: 'vsm-mcp-empty' }, '请选择项目'),
   )
 }
 
@@ -593,7 +615,7 @@ function projectAction(state, path, name, method, extra = {}) {
 }
 
 /** @private @author ddj 2026年10月08号 @param ref Mounted controller reference. @returns Global/project card actions sharing a synchronous lock. */
-function cardActions(ref) {
+function cardActions(ref, getSession) {
   /** @author ddj 2026年10月08号 @param id Global identity. @returns Locked refresh. */
   const refreshGlobal = (id) => globalAction(ref.current, id, 'mcp.refresh', { id })
   /** @author ddj 2026年10月08号 @param server Current configuration. @returns Locked enable change. */
@@ -606,7 +628,15 @@ function cardActions(ref) {
   const toggleProject = (project, server) => projectAction(ref.current, project.workspacePath, server.serverName, 'mcp.projectToggle', { enabled: !server.enabled })
   /** @author ddj 2026年10月08号 @param project Project. @param server Configuration. @returns Confirmed locked deletion. */
   const removeProject = (project, server) => !ref.current?.view.busy && window.confirm('确认删除此项目的 MCP「' + server.serverName + '」？') && projectAction(ref.current, project.workspacePath, server.serverName, 'mcp.projectRemove')
-  return { refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject }
+  /** @author ddj 2026年10月20号 @param project Owner workspace. @param server Enabled service. @returns Explicit connection for an already-active current session. */
+  const connectProject = (project, server) => {
+    const sessionId = getSession?.()
+    if (!sessionId) return ref.current?.mutate('connect', async () => ({ ok: false, error: '请先打开此项目的活跃会话' }), () => undefined)
+    return projectAction(ref.current, project.workspacePath, server.serverName, 'mcp.projectConnect', { sessionId })
+  }
+  /** @author ddj 2026年10月20号 @param project Owner. @param server Masked editable config. @param policy Explicit user strategy. @returns Serialized strategy persistence. */
+  const policyProject = (project, server, policy) => projectAction(ref.current, project.workspacePath, server.serverName, 'mcp.projectSave', { config: server.config, policy })
+  return { refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject, connectProject, policyProject }
 }
 
 /** @private @author ddj 2026年10月08号 @param state Controller. @param draft Editable fields. @param setDraft Draft setter. @param path Optional project target. @param close Success-only close callback. @returns Locked save, validation included. */
@@ -614,7 +644,7 @@ function saveDraft(state, draft, setDraft, path, close) {
   /** @author ddj 2026年10月08号 @returns Validated save result. @throws Malformed arguments/headers. */
   const request = () => {
     const config = configOf(draft)
-    return path === null ? rpc('mcp.save', { config }) : rpc('mcp.projectSave', { workspacePath: path, serverName: config.serverName, config })
+    return path === null ? rpc('mcp.save', { config }) : rpc('mcp.projectSave', { workspacePath: path, serverName: config.serverName, config, policy: parseMcpPolicy({ startup: draft.startup, sharing: draft.sharing, startupTimeoutMs: Number(draft.startupTimeoutMs) }) })
   }
   /** @author ddj 2026年10月08号 @param result Save result. @description Update current view and only then reset/close the form. */
   const commit = (result) => {
@@ -649,7 +679,7 @@ export function McpSettings(props) {
     return cleanup
   }
   React.useEffect(selectTab, [tab])
-  const { refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject } = cardActions(ref)
+  const { refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject, connectProject, policyProject } = cardActions(ref, props?.getMcpSession)
   /** @author ddj 2026年10月08号 @param close Success-only close callback. @returns Global save completion. */
   const saveGlobal = (close) => saveDraft(ref.current, draft, setDraft, null, close)
   /** @author ddj 2026年10月08号 @param path Target project. @param close Success-only close callback. @returns Project save completion. */
@@ -662,7 +692,7 @@ export function McpSettings(props) {
   if (loading) body = React.createElement('div', { className: 'vsm-mcp-empty' }, '正在读取 MCP 服务…')
   else if (tab === 'general') body = React.createElement(GeneralSettings, { registry: openerRegistry, getShortcuts })
   else if (tab === 'mcp') body = React.createElement(McpManagePanel, { servers, projects, busy, draft, edit, resetDraft,
-    saveGlobal, saveProject,
+    saveGlobal, saveProject, connectProject, policyProject,
     refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject })
   else if (tab === 'compat') body = React.createElement(CompatSection, { getSummary: compatSummary })
   else if (tab === 'lsp') body = React.createElement(LspSettings, null)
@@ -677,7 +707,7 @@ export function McpSettings(props) {
 }
 
 /** @private @author ddj 2026年10月08号 @param props Draft, shared busy lock, edit/save/close callbacks. @returns Lossless argument/header form; failed save stays open. */
-function McpForm({ title, draft, busy, edit, save, close }) {
+function McpForm({ title, draft, busy, edit, save, close, project }) {
   /** @author ddj 2026年10月08号 @param key Draft field. @returns Short input change callback. */
   const change = (key) => (event) => edit(key, event.target.value)
   /** @author ddj 2026年10月08号 @param key Draft field. @param placeholder Input hint. @returns Disabled-while-busy input. */
@@ -697,6 +727,10 @@ function McpForm({ title, draft, busy, edit, save, close }) {
     React.createElement('label', null, '名称', input('serverName', '例如 codegraph')),
     React.createElement('label', null, '传输方式', React.createElement('select', { disabled: !!busy, value: draft.transport, onChange: change('transport') }, React.createElement('option', { value: 'stdio' }, 'stdio'), React.createElement('option', { value: 'streamable-http' }, 'streamable-http'))),
     fields,
+    project && React.createElement('label', null, '启动策略', React.createElement('select', { disabled: !!busy, value: draft.startup, onChange: change('startup') }, React.createElement('option', { value: 'on-demand' }, '按需启动（默认）'), React.createElement('option', { value: 'background' }, '后台预热'))),
+    project && React.createElement('label', null, '连接模式', React.createElement('select', { disabled: !!busy, value: draft.sharing, onChange: change('sharing') }, React.createElement('option', { value: 'agent' }, '逐会话隔离（默认）'), React.createElement('option', { value: 'workspace' }, '工作区共享（共享服务内部状态）'))),
+    project && React.createElement('label', null, '初始化预算（毫秒，1000–300000）', input('startupTimeoutMs', '60000')),
+    project && React.createElement('small', null, '新对话不等待连接。共享必须确认服务适合共享状态；不为 CodeGraph 自动启用。'),
     React.createElement('div', { className: 'vsm-mcp-dialog-actions' }, React.createElement('button', { disabled: !!busy, onClick: close }, '取消'), React.createElement('button', { className: 'vsm-primary', disabled: !!busy, onClick: save }, '保存配置')),
   ))
 }

package/src/mcp.ts

@@ -218,6 +218,7 @@ export async function saveMcp(ctx: Ctx, config: MpcConfig): Promise<MpcServer> {
 
 /** @private @author ddj 2026年10月08号 @param ctx Host services. @param config Configuration. @returns Saved status; validation failures do not write. */
 async function saveGlobal(ctx: Ctx, config: MpcConfig): Promise<MpcServer> {
+  if (config && 'vscodeMode' in config) throw new Error('vscodeMode 启动和共享策略仅适用于项目 MCP')
   validateConfig(config)
   await checkMcpName(ctx, config.serverName)
   const loader = ctx.get('loader')

package/src/mcpBridge.ts

@@ -0,0 +1,163 @@
+/** Private official-MCP registrations, never a global provider. @author ddj 2026年10月20号 */
+import { loadHostModule } from './hostImport.js'
+import type { Ctx } from './store.js'
+import type { McpPool, PoolEntry } from './mcpPool.js'
+
+export interface BridgeScope {
+  ctx: any
+  dispose(): Promise<void>
+}
+export interface McpSection {
+  name: string
+  order: number
+  interpolate?: boolean
+  text: string | ((context?: any) => string)
+}
+export interface McpProvider {
+  request(request: any, execution: any): Promise<any>
+}
+export type ScopeMaker = (ctx: any, key: object) => BridgeScope
+
+/** Per-agent public surface; original definitions still run inside the normal registry pipeline. */
+export class McpBinding {
+  private readonly removals: Array<() => void> = []
+  private unsubscribe?: () => void
+  private closed = false
+
+  /** @public @author ddj 2026年10月20号 @param agent Public scope. @param pool Connection owner. @param entry Exact generation. @param valid Authorization recheck. */
+  constructor(private readonly agent: any, private readonly pool: McpPool, private readonly entry: PoolEntry, private readonly valid: () => boolean, private readonly called?: (elapsed: number) => void) {}
+
+  /** @private @author ddj 2026年10月20号 @param execution Registry caller. @throws Stale generation or foreign caller. */
+  private check(execution?: any): void {
+    if (this.closed || !this.valid() || !this.entry.live || (execution && execution.agent !== this.agent)) throw new Error('项目 MCP 作用域或配置已失效')
+  }
+
+  /** @public @author ddj 2026年10月20号 Reconciles exact definitions after official tool-list updates. */
+  sync(): void {
+    this.check()
+    const bridge = this.entry.bridge
+    if (!bridge) return
+    // Resources and instructions can change independently of tool names; replace the whole small scoped surface.
+    this.clear()
+    for (const [name, definition] of bridge.tools) {
+      /** @author ddj 2026年10月20号 @param args Registry-validated arguments. @param execution Unmodified caller context. @returns Official canonical output. */
+      const execute = async (args: unknown, execution: any): Promise<unknown> => {
+        this.check(execution)
+        return this.pool.run(this.entry, async () => {
+          this.check(execution)
+          if (bridge.tools.get(name) !== definition) throw new Error('MCP 工具定义已更新，请重新发现')
+          const startedAt = Date.now()
+          const result = await definition.execute(args, execution)
+          this.called?.(Date.now() - startedAt)
+          return result
+        }, execution.signal)
+      }
+      this.removals.push(this.agent.ctx.get('tools').register({ ...definition, execute }))
+    }
+    // Resource ownership stays with the runtime's single lazy provider, avoiding duplicate namespace registration.
+    for (const section of bridge.sections.values()) {
+      /** @author ddj 2026年10月20号 @param context Actual prompt assembly. @returns Only valid-generation instructions. */
+      const text = (context: any): string => {
+        if (!this.valid() || this.closed) return ''
+        if (typeof section.text === 'function') return section.text(context)
+        return section.text
+      }
+      this.removals.push(this.agent.ctx.get('systemPrompt').section({ ...section, text }))
+    }
+    /** @author ddj 2026年10月20号 Reconciles dynamic official registrations only for a live subscriber. */
+    const update = (): void => { if (!this.closed && this.valid() && this.entry.live) this.sync() }
+    if (!this.unsubscribe) this.unsubscribe = bridge.subscribe(update)
+  }
+
+  /** @private @author ddj 2026年10月20号 Removes only this binding's exact scoped registrations. */
+  private clear(): void {
+    for (const remove of this.removals.splice(0).reverse()) remove()
+  }
+
+  /** @public @author ddj 2026年10月20号 Revokes proxies synchronously before releasing a lease. */
+  dispose(): void {
+    this.closed = true
+    this.unsubscribe?.()
+    this.unsubscribe = undefined
+    this.clear()
+  }
+}
+
+/** A connection's private surface. Public consumers register scoped proxies, not this scope. */
+export class McpBridge {
+  readonly tools = new Map<string, any>()
+  readonly resources = new Map<string, McpProvider>()
+  readonly sections = new Map<string, McpSection>()
+  private readonly listeners = new Set<() => void>()
+  private closed = false
+  private closing?: Promise<void>
+
+  /** @private @author ddj 2026年10月20号 @param scope Private lifetime and registration context. */
+  private constructor(readonly scope: BridgeScope) {}
+
+  /** @public @author ddj 2026年10月20号 @param ctx Host owner. @param make Optional real scope factory for installed-host tests. @returns Isolated registration adapter. */
+  static async create(ctx: Ctx, make?: ScopeMaker): Promise<McpBridge> {
+    const factory = make ?? (await loadHostModule('@deepseek-ai/dsh-scope') as { createScope: ScopeMaker }).createScope
+    const scope = factory(ctx, {})
+    // Providers must be installed after the backing scope's initial activation transaction.
+    await scope.ctx.fiber?.await?.()
+    const bridge = new McpBridge(scope)
+    bridge.install()
+    return bridge
+  }
+
+  /** @private @author ddj 2026年10月20号 Installs only private services; no project registration reaches the root. */
+  private install(): void {
+    const privateCtx = this.scope.ctx.isolate('tools').isolate('mcpResources').isolate('systemPrompt')
+    privateCtx.provide('tools', { register: (definition: any) => this.register(this.tools, definition.name, definition) })
+    privateCtx.provide('mcpResources', { register: (name: string, provider: McpProvider) => this.register(this.resources, name, provider) })
+    privateCtx.provide('systemPrompt', {
+      getSectionOrder: () => 3100,
+      section: (section: McpSection) => this.register(this.sections, section.name, section),
+    })
+    this.scope.ctx = privateCtx
+  }
+
+  /** @private @author ddj 2026年10月20号 @param registry Private generation map. @param name Stable registration name. @param entry Exact value. @returns Exact-entry removal, safe after replacement. */
+  private register<T>(registry: Map<string, T>, name: string, entry: T): () => void {
+    if (this.closed) throw new Error('MCP bridge is disposed')
+    if (registry.has(name)) throw new Error('Duplicate private MCP registration: ' + name)
+    registry.set(name, entry)
+    this.changed()
+
+    return () => {
+      if (registry.get(name) !== entry) return
+      registry.delete(name)
+      this.changed()
+    }
+  }
+
+  /** @public @author ddj 2026年10月20号 @param listener Surface change subscriber. @returns Subscription disposer. */
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener)
+    return () => { this.listeners.delete(listener) }
+  }
+
+  /** @private @author ddj 2026年10月20号 Notifies consumers; observer errors cannot corrupt the official sync transaction. */
+  private changed(): void {
+    for (const listener of this.listeners) {
+      try { listener() } catch { /* Runtime owns diagnostics for its subscriber. */ }
+    }
+  }
+
+  /** @public @author ddj 2026年10月20号 @returns Quiescent private-scope teardown. */
+  dispose(): Promise<void> {
+    this.closed = true
+    return this.closing ??= this.closeScope()
+  }
+
+  /** @private @author ddj 2026年10月20号 @returns Exact scope closure before forgetting registrations. */
+  private async closeScope(): Promise<void> {
+    await this.scope.dispose()
+    this.tools.clear()
+    this.resources.clear()
+    this.sections.clear()
+    this.changed()
+    this.listeners.clear()
+  }
+}