dsh-vscode-mode 0.16.0 → 0.18.0

package/src/registry.ts

@@ -5,7 +5,7 @@
  */
 import type { DiffRecord } from './shared/types.js'
 import type { Ctx, Session } from './store.js'
-import { loadBucket } from './store.js'
+import { cwdOfSession, loadBucket } from './store.js'
 
 /** cwd → 记录桶（内存缓存；随会话销毁清理）。 */
 export type Registry = Map<string, Map<string, DiffRecord>>
@@ -19,7 +19,20 @@ export function sessionOf(ctx: Ctx, sessionId?: string): Session | undefined {
   return live.length === 1 ? live[0] : undefined
 }
 
-/** 会话工作区 cwd。 */
+/**
+ * 会话工作区 cwd（跟随会话内 cd；服务缺失时回落 header.cwd）。
+ * 定义在 store.ts 以避免 registry ↔ store 循环依赖，此处仅转出为会话助手入口。
+ * @author ddj 2026年10月19号
+ */
+export { cwdOfSession }
+
+/**
+ * 会话头部的原始 cwd（不跟随 cd）。仅用于会话销毁等无上下文场景：
+ * 此时投影可能已随会话卸载，读 header 才能保证拿到建会话时的目录。
+ * @author ddj 2026年10月19号
+ * @param session 目标会话
+ * @returns 绝对路径或 null
+ */
 export function cwdOf(session: Session | undefined): string | null {
   return session?.header?.cwd ?? null
 }

package/src/rpc.ts

@@ -25,7 +25,7 @@ import { archiveEntryFor, markDecision, recordResolved, reconstructOriginal } fr
 import { clearRevertState, listArchives, pageArchives, readArchives, revertState, setRevertState, startReverts } from './archiveDb.js'
 import { log } from './log.js'
 import type { Registry } from './registry.js'
-import { bucketOf, cwdOf, sessionOf } from './registry.js'
+import { bucketOf, cwdOfSession, sessionOf } from './registry.js'
 import type { SearchOrchestrator } from './search/orchestrator.js'
 import { newSearcher } from './search/orchestrator.js'
 import type { ContentSearcher } from './search/content.js'
@@ -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'
@@ -100,7 +101,7 @@ async function requireSession(ctx: Ctx, sessionId: string | undefined): Promise<
 > {
   const session = sessionOf(ctx, sessionId)
   if (!session) return { err: SESSION_MISSING_ERROR }
-  const cwd = cwdOf(session)
+  const cwd = cwdOfSession(ctx, session)
   if (!cwd) return { err: SESSION_NO_WORKSPACE_ERROR }
   return { session, cwd }
 }
@@ -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/rules.ts

@@ -16,6 +16,7 @@ import { join, resolve } from 'node:path'
 import { dshHome } from './paths.js'
 import type { RuleInfo, RuleProject, RuleRefInput, RuleScope, RuleSaveInput, UserRuleOrigin } from './shared/rules.js'
 import type { Ctx } from './store.js'
+import { cwdOfSession } from './store.js'
 
 // --region 常量与目录定位
 /** 规则文件名白名单：字母数字开头，仅字母数字点横下划线，.mdc 后缀（天然拒绝路径分隔符）。 */
@@ -550,13 +551,17 @@ export function readUserRulesSync(dirs = userRuleDirs()): LoadedRule[] {
   return mergeUserRules(current, legacy, (rule) => rule.info.file)
 }
 
-/** 从装配上下文解析会话工作区 cwd（agent.id → sessions → header.cwd；缺链返回 null）。 */
+/**
+ * 从装配上下文解析会话工作区 cwd（agent.id → sessions → 当前目录；缺链返回 null）。
+ * @author ddj 2026年10月19号
+ * @param ctx DSH 上下文
+ * @param asm 装配上下文（含 agent.id）
+ * @returns 项目规则根的绝对路径或 null
+ */
 function cwdFromAssemble(ctx: Ctx, asm: { agent?: { id?: unknown } } | undefined): string | null {
   const id = asm?.agent?.id
   if (typeof id !== 'string' || !id) return null
-  const session = ctx.get('sessions')?.get?.(id)
-  const cwd = session?.header?.cwd
-  return typeof cwd === 'string' && cwd ? cwd : null
+  return cwdOfSession(ctx, ctx.get('sessions')?.get?.(id))
 }
 
 /**

package/src/search/fallback.ts

@@ -4,7 +4,7 @@
  * 作者 ddj 2026年08月24号
  */
 import type { Ctx, Session } from '../store.js'
-import { policyOf } from '../store.js'
+import { cwdOfSession, policyOf } from '../store.js'
 import { pathText, pathMatch, prepareQuery } from './query.js'
 import type { PreparedQuery, WorkspaceSearchInput, WorkspaceSearchProvider, WorkspaceSearchResult } from './types.js'
 
@@ -61,7 +61,7 @@ export async function searchFallback(input: WorkspaceSearchInput): Promise<Works
   const fs = input.ctx.get('fs') as SearchFs | undefined
   if (!fs) throw new Error('缺少 fs')
   const policy = policyOf(input.ctx, input.session)
-  const cwd = input.session?.header?.cwd
+  const cwd = cwdOfSession(input.ctx, input.session)
   const rootTarget = await fs.resolve(policy?.workspaceRoot ?? '.', cwd ? { cwd, signal: input.signal } : { signal: input.signal })
   const signal = input.signal ?? new AbortController().signal
   const files: string[] = []

package/src/search/ripgrep.ts

@@ -7,7 +7,7 @@ import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { createRequire } from 'node:module'
 import type { Ctx, Session } from '../store.js'
-import { policyOf } from '../store.js'
+import { cwdOfSession, policyOf } from '../store.js'
 import { prepareQuery, pathText } from './query.js'
 import type { WorkspaceSearchInput, WorkspaceSearchProvider, WorkspaceSearchResult } from './types.js'
 
@@ -127,7 +127,7 @@ export async function searchRoot(ctx: Ctx, session: Session): Promise<string> {
   const fs = ctx.get('fs')
   if (!fs) throw new Error('缺少 fs')
   const policy = policyOf(ctx, session)
-  const cwd = session?.header?.cwd
+  const cwd = cwdOfSession(ctx, session)
   const rootTarget = await fs.resolve(policy?.workspaceRoot ?? '.', cwd ? { cwd } : {})
   return fs.processPath(rootTarget)
 }

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 }

package/src/store.ts

@@ -33,10 +33,35 @@ export function policyOf(ctx: Ctx, session: Session | undefined): any {
   return session ? svc.resolve({ session }) : svc.resolve()
 }
 
+/**
+ * 读取会话当前工作目录：优先 workingDirectory 投影（DSH 0.2.1 起支持会话内 cd），
+ * 服务缺失或投影未就绪时回落到 header.cwd（会话创建时的原始目录）。
+ * 服务一律可选探测：不得写入模块 inject，否则旧版 DSH 会停等一个不存在的服务。
+ * @author ddj 2026年10月19号
+ * @param ctx DSH 上下文（用于可选探测 workingDirectory 服务）
+ * @param session 目标会话
+ * @returns 绝对路径；无法确定时 null
+ */
+export function cwdOfSession(ctx: Ctx, session: Session | undefined): string | null {
+  const headerCwd = session?.header?.cwd
+  const fallback = typeof headerCwd === 'string' && headerCwd ? headerCwd : null
+  if (!session) return null
+
+  const service = ctx?.get?.('workingDirectory')
+  if (!service || typeof service.get !== 'function') return fallback
+  try {
+    const current = service.get(session)
+    return typeof current === 'string' && current ? current : fallback
+  } catch {
+    // 会话已销毁或投影缺失：回落原始目录，不让新能力变成新的故障点
+    return fallback
+  }
+}
+
 /** 按会话 cwd 解析目标路径。 */
 export async function resolveTarget(ctx: Ctx, session: Session | undefined, path: string): Promise<string> {
   const fs = ctx.get('fs')
-  const cwd = session?.header?.cwd
+  const cwd = cwdOfSession(ctx, session)
   return fs.resolve(path, cwd ? { cwd } : {})
 }
 

package/src/svn.ts

@@ -10,7 +10,7 @@ import { readdir, stat } from 'node:fs/promises'
 import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path'
 import { tmpdir } from 'node:os'
 import type { Ctx, Session } from './store.js'
-import { cwdOf, sessionOf } from './registry.js'
+import { cwdOfSession, sessionOf } from './registry.js'
 import type { SvnAction, SvnAiPlan, SvnChangeEntry, SvnConflictArtifact, SvnFeature, SvnIgnoreItem, SvnItemStatus, SvnLogEntry, SvnRemoteOutdatedEntry, SvnStatusPayload, SvnSumEntry } from './shared/svn.js'
 import { SESSION_MISSING_ERROR, SESSION_NO_WORKSPACE_ERROR } from './shared/rpc.js'
 import { AI_PLAN_DIFF_CAP, AI_PLAN_PATHS_CAP, BATCH_PATHS_CAP, FILE_SIZES_CAP, SVN_CLI_DEFAULT, TORTOISE_EXE, contentGuardOf, normalizeAiPlan, svnChangelistNameErrorOf, tortoiseLaunchArgv } from './shared/svn.js'
@@ -463,7 +463,7 @@ async function requireSvnSession(
 ): Promise<{ cwd: string } | { err: string }> {
   const session: Session | undefined = sessionOf(ctx, sessionId)
   if (!session) return { err: SESSION_MISSING_ERROR }
-  const cwd = cwdOf(session)
+  const cwd = cwdOfSession(ctx, session)
   if (!cwd) return { err: SESSION_NO_WORKSPACE_ERROR }
   return { cwd }
 }