dsh-vscode-mode 0.17.0 → 0.18.0

package/src/rpc.ts

@@ -33,6 +33,7 @@ import { newContentSearcher } from './search/content.js'
 import { restoreFile, revertCall, revertHunk, revertHunks, type Result } from './revert.js'
 import { rulesList, rulesRead, rulesRemove, rulesSave, rulesToggle } from './rules.js'
 import { isSnippetFilePath, snippetsEntries, snippetsList, snippetsRead, snippetsRemove, snippetsSave } from './snippets.js'
+import { runtimeOf } from './mcpRuntime.js'
 import { listMcp, refreshMcp, removeMcp, saveMcp, toggleMcp } from './mcp.js'
 import { listProjects, projectRefresh, projectRemove, projectSave, projectToggle, mcpSnapshot } from './mcpProject.js'
 import { normalizeFileOpenTool, FILE_OPEN_DEFAULT, FILE_OPEN_SETTINGS_NS, sectionOf, updateSection } from './fileOpenSettings.js'
@@ -1170,6 +1171,7 @@ export function buildHandlers(
     },
     'mcp.list': async () => ({ ok: true, ...listMcp(ctx) }),
     'mcp.snapshot': async () => ({ ok: true, ...mcpSnapshot(ctx) }),
+    'mcp.sessionSnapshot': async () => ({ ok: true, ...runtimeOf(ctx).sessionSnapshot() }),
     'mcp.save': async (args) => {
       try { return { ok: true, server: await saveMcp(ctx, args.config) } }
       catch (error) { return { ok: false, error: String(error) } }
@@ -1190,8 +1192,18 @@ export function buildHandlers(
       try { return { ok: true, ...await listProjects(ctx) } }
       catch (error) { return { ok: false, error: String(error) } }
     },
+    'mcp.projectConnect': async (args) => {
+      const runtime = runtimeOf(ctx)
+      const agent = [...runtime.agents.keys()].find((owner) => owner.session?.id === args.sessionId)
+      if (!agent || runtime.workspace(agent) !== args.workspacePath) return { ok: false, error: '请先打开此项目的活跃会话；不会激活历史会话' }
+      try {
+        await runtime.connect(agent, args.serverName)
+        const project = mcpSnapshot(ctx).projects.find((item) => item.workspacePath === args.workspacePath)!
+        return { ok: true, project }
+      } catch { return { ok: false, error: '项目 MCP 连接失败，请查看会话状态和 Host 日志' } }
+    },
     'mcp.projectSave': async (args) => {
-      try { return { ok: true, project: await projectSave(ctx, args.workspacePath, args.serverName, args.config) } }
+      try { return { ok: true, project: await projectSave(ctx, args.workspacePath, args.serverName, args.config, args.policy) } }
       catch (error) { return { ok: false, error: String(error) } }
     },
     'mcp.projectRemove': async (args) => {

package/src/shared/mcp.ts

@@ -1,6 +1,50 @@
 /** dsh-vscode-mode MCP 管理共享数据契约。作者 ddj 2026年08月22号 */
 
 export type MpcTransport = 'stdio' | 'streamable-http'
+/** Project initialization only; ready does not establish transport health. */
+export type McpPhase = 'preparing' | 'idle' | 'queued' | 'loading' | 'starting' | 'stopping' | 'ready' | 'error' | 'none'
+
+export interface McpPolicy {
+  startup: 'on-demand' | 'background'
+  sharing: 'agent' | 'workspace'
+  startupTimeoutMs: number
+}
+
+/** @public @author ddj 2026年10月20号 @param input Project-only policy. @returns Validated defaults. @throws Invalid explicit policy. */
+export function parseMcpPolicy(input?: unknown): McpPolicy {
+  if (input !== undefined && (!input || typeof input !== 'object' || Array.isArray(input))) throw new Error('vscodeMode 必须是对象')
+  const policy = (input ?? {}) as Partial<McpPolicy>
+  const startup = policy.startup ?? 'on-demand'
+  const sharing = policy.sharing ?? 'agent'
+  const startupTimeoutMs = policy.startupTimeoutMs ?? 60000
+  if (!['on-demand', 'background'].includes(startup)) throw new Error('不支持的 MCP startup')
+  if (!['agent', 'workspace'].includes(sharing)) throw new Error('不支持的 MCP sharing')
+  if (!Number.isInteger(startupTimeoutMs) || startupTimeoutMs < 1000 || startupTimeoutMs > 300000) throw new Error('MCP startupTimeoutMs 必须为 1000–300000 的整数')
+  return { startup, sharing, startupTimeoutMs }
+}
+export interface McpSessionServer {
+  queuedMs?: number
+  connectMs?: number
+  firstCallMs?: number
+  reused?: boolean
+  serverName: string
+  phase: McpPhase
+  startedAt: number
+  phaseAt: number
+  finishedAt?: number
+  error?: string
+}
+export interface McpSessionStatus {
+  configMs?: number
+  sessionId: string
+  phase: McpPhase
+  startedAt: number
+  phaseAt: number
+  finishedAt?: number
+  error?: string
+  servers: McpSessionServer[]
+}
+
 export type MpcStatus = 'connected' | 'connecting' | 'error' | 'disabled' | 'configured' | 'unverified'
 
 export interface MpcTool {
@@ -32,6 +76,8 @@ export interface MpcServer {
   status: MpcStatus
   /** Mounted official plugin fibers, not verified live connections. */
   instanceCount?: number
+  sessionCount?: number
+  policy?: McpPolicy
   toolCount: number
   tools: MpcTool[]
   error?: string
@@ -50,6 +96,7 @@ export interface MpcProject {
 
 /** 项目级 MCP 保存入参：config 为该 serverName 的传输配置（不含归属信息）。 */
 export interface MpcProjectSaveInput {
+  policy?: McpPolicy
   workspacePath: string
   serverName: string
   config: MpcConfig

package/src/shared/rpc.ts

@@ -12,7 +12,7 @@ import type {
   RecordView,
   StaleHunk,
 } from './types.js'
-import type { MpcConfig, MpcProject, MpcProjectSaveInput, MpcServer } from './mcp.js'
+import type { McpSessionStatus, MpcConfig, MpcProject, MpcProjectSaveInput, MpcServer } from './mcp.js'
 import type { CompatReport, DevFormInfo } from './compat.js'
 import type { ShellIntegrationStatus, UnityListPayload, UnityProjectEntry } from './integration.js'
 import type { RuleInfo, RuleProject, RuleRefInput, RuleSaveInput } from './rules.js'
@@ -399,11 +399,13 @@ export interface RpcRequestMap {
   'edrv.fsMove': { sessionId?: string; from: string; toDir: string }
   'mcp.list': {}
   'mcp.snapshot': {}
+  'mcp.sessionSnapshot': {}
   'mcp.save': { config: MpcConfig }
   'mcp.remove': { id: string }
   'mcp.toggle': { id: string; enabled: boolean }
   'mcp.refresh': { id: string }
   'mcp.projects': {}
+  'mcp.projectConnect': { sessionId: string; serverName: string; workspacePath: string }
   'mcp.projectSave': MpcProjectSaveInput
   'mcp.projectRemove': { workspacePath: string; serverName: string }
   'mcp.projectToggle': { workspacePath: string; serverName: string; enabled: boolean }
@@ -565,11 +567,13 @@ export interface RpcOkMap {
   'edrv.fsMove': { from: string; to: string }
   'mcp.list': { servers: MpcServer[] }
   'mcp.snapshot': { servers: MpcServer[]; projects: MpcProject[] }
+  'mcp.sessionSnapshot': { sessions: McpSessionStatus[]; sampledAt: number }
   'mcp.save': { server: MpcServer }
   'mcp.remove': object
   'mcp.toggle': { server: MpcServer }
   'mcp.refresh': { server: MpcServer }
   'mcp.projects': { projects: MpcProject[] }
+  'mcp.projectConnect': { project: MpcProject }
   'mcp.projectSave': { project: MpcProject }
   'mcp.projectRemove': { project: MpcProject }
   'mcp.projectToggle': { project: MpcProject }