dsh-vscode-mode 0.1.16 → 0.1.19

package/src/compat.ts

@@ -11,6 +11,7 @@ import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { entriesOf } from './mcp.js'
 import { loadSettingsDeps } from './fileOpenSettings.js'
+import { readDevForm } from './devForm.js'
 import type { CompatAdapter, CompatReport } from './shared/compat.js'
 import type { Ctx } from './store.js'
 
@@ -36,7 +37,7 @@ export function entryHash(id: string): string | undefined {
 }
 
 /** 读取随包 package.json 版本号（缺失/解析失败降级为空串）。 */
-function pluginVersionOf(): string {
+export function pluginVersionOf(): string {
   try {
     const file = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json')
     const pkg = JSON.parse(readFileSync(file, 'utf8')) as { version?: unknown }
@@ -142,5 +143,5 @@ export async function buildReport(
   for (const guard of guards) {
     if (!guard.active && guard.note) warnings.push(guard.note)
   }
-  return { pluginVersion: options?.version ?? pluginVersionOf(), external, guards, warnings }
+  return { pluginVersion: options?.version ?? pluginVersionOf(), external, guards, warnings, devForm: readDevForm() }
 }

package/src/devForm.ts

@@ -0,0 +1,133 @@
+/**
+ * dsh-vscode-mode host — 开发形态管理（安装形态切换）。
+ * 开发形态 = profile 中以 link: 依赖 + junction 指向工作区的安装（用于插件开发）；
+ * 关闭 = 改回版本依赖 + 删 junction + pnpm install 装配正式版。
+ * 切换后需重启 DSH 生效（运行中的代码仍是旧形态）。
+ * 与 compat.ts 存在模块环（devForm 用 pluginVersionOf、compat 用 readDevForm），
+ * 双方仅在函数体内交叉使用，模块求值期无依赖，ESM 安全。
+ * 作者 ddj 2026-08-24
+ */
+import { existsSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { homedir } from 'node:os'
+import { PLUGIN_NAME, pluginVersionOf } from './compat.js'
+import type { DevFormInfo } from './shared/compat.js'
+import type { Ctx } from './store.js'
+
+/** 扫描 $DSH_HOME/profiles 找到依赖本插件的 profile 目录（无 env 依赖，多 profile 安全）。 */
+export function findProfileDir(): string | undefined {
+  const home = process.env.DSH_HOME ?? join(homedir(), '.dsh')
+  try {
+    for (const name of readdirSync(join(home, 'profiles'))) {
+      const pkgFile = join(home, 'profiles', name, 'package.json')
+      if (!existsSync(pkgFile)) continue
+      try {
+        const pkg = JSON.parse(readFileSync(pkgFile, 'utf8')) as { dependencies?: Record<string, unknown> } | undefined
+        if (pkg?.dependencies?.[PLUGIN_NAME]) return dirname(pkgFile)
+      } catch {
+        /* 坏 manifest 跳过该 profile */
+      }
+    }
+  } catch {
+    /* profiles 目录不存在时放弃 */
+  }
+  return undefined
+}
+
+/**
+ * 读取当前开发形态（manifest link: 判定）。
+ * @author ddj 2026年08月24号
+ * @returns 开发形态状态
+ */
+export function readDevForm(): DevFormInfo {
+  const profileDir = findProfileDir()
+  if (!profileDir) return { enabled: false }
+  try {
+    const text = readFileSync(join(profileDir, 'package.json'), 'utf8').replace(/^\uFEFF/, '')
+    const pkg = JSON.parse(text) as { dependencies?: Record<string, unknown> } | undefined
+    const spec = pkg?.dependencies?.[PLUGIN_NAME]
+    if (typeof spec === 'string' && spec.startsWith('link:')) {
+      return { enabled: true, path: spec.slice('link:'.length) }
+    }
+  } catch {
+    /* manifest 不可读视为非开发形态 */
+  }
+  return { enabled: false }
+}
+
+/**
+ * 规划切换后的 manifest 文本（纯函数，可单测；非法 JSON 抛错）。
+ * @author ddj 2026年08月24号
+ * @param text 原 manifest 文本
+ * @param enabled 目标形态（true=link:，false=版本）
+ * @param path 工作区路径（开启时必填）
+ * @param version 版本号（关闭时使用，写入 ^<version>）
+ * @returns 新 manifest 文本（无 BOM，2 空格缩进）
+ */
+export function planManifest(text: string, enabled: boolean, path: string, version: string): string {
+  const data = JSON.parse(text.replace(/^\uFEFF/, '')) as { dependencies?: Record<string, unknown> }
+  if (!data.dependencies || typeof data.dependencies !== 'object') {
+    throw new Error('profile package.json 缺少 dependencies 字段')
+  }
+  data.dependencies[PLUGIN_NAME] = enabled ? 'link:' + path.replace(/\\/g, '/') : '^' + version
+  return JSON.stringify(data, null, 2) + '\n'
+}
+
+/** 建立或移除 node_modules 下的开发 junction（目标不存在时开启失败）。 */
+function applyJunction(profileDir: string, enabled: boolean, target: string): void {
+  const linkDir = join(profileDir, 'node_modules', PLUGIN_NAME)
+  if (existsSync(linkDir)) rmSync(linkDir, { recursive: true, force: true })
+  if (!enabled) return
+  if (!existsSync(target)) throw new Error('工作区路径不存在：' + target)
+  symlinkSync(target, linkDir, 'junction')
+}
+
+/**
+ * 切换开发形态：改 manifest → 建/删 junction → pnpm install（subprocess）。
+ * @author ddj 2026年08月24号
+ * @param ctx DSH host 上下文（subprocess 服务）
+ * @param enabled 目标形态
+ * @param path 工作区绝对路径（开启时必填）
+ * @returns 切换结果（restart=true 表示需重启 DSH 生效）
+ */
+export async function setDevForm(ctx: Ctx, enabled: boolean, path?: string): Promise<{ ok: boolean; error?: string; restart: boolean }> {
+  const profileDir = findProfileDir()
+  if (!profileDir) return { ok: false, error: '未找到依赖本插件的 profile（检查 DSH_HOME/profiles）', restart: false }
+  const current = readDevForm()
+  const target = (path ?? current.path ?? '').replace(/\\/g, '/')
+  if (enabled && !target) return { ok: false, error: '开启开发形态需要提供工作区路径（path 参数）', restart: false }
+  if (enabled === current.enabled && (!enabled || target === current.path)) {
+    return { ok: true, restart: false }
+  }
+  try {
+    const pkgFile = join(profileDir, 'package.json')
+    const version = pluginVersionOf()
+    if (!version) return { ok: false, error: '读取插件版本失败，无法写入版本依赖', restart: false }
+    const next = planManifest(readFileSync(pkgFile, 'utf8').replace(/^\uFEFF/, ''), enabled, target, version)
+    writeFileSync(pkgFile, next, 'utf8')
+    applyJunction(profileDir, enabled, target)
+    const installError = await runPnpmInstall(ctx, profileDir)
+    return { ok: !installError, error: installError, restart: true }
+  } catch (error) {
+    return { ok: false, error: String(error), restart: false }
+  }
+}
+
+/** 在 profile 目录执行 pnpm install（subprocess 契约：spawn({argv,cwd,stdio,graceMs})）。 */
+async function runPnpmInstall(ctx: Ctx, profileDir: string): Promise<string | undefined> {
+  const sub = ctx.get('subprocess')
+  if (!sub || typeof sub.spawn !== 'function') return 'manifest/junction 已更新，但缺少 subprocess：请手动在 profile 目录运行 pnpm install'
+  const handle = sub.spawn({
+    argv: ['pnpm', 'install'],
+    cwd: profileDir,
+    stdio: { stdout: { maxBytes: 1 << 16 }, stderr: { maxBytes: 1 << 16 }, stdin: 'ignore' },
+    graceMs: 120000,
+  })
+  const outcome = await handle.done
+  const code = outcome?.exitCode ?? outcome?.code
+  if (code !== 0) {
+    const stderr = handle.collected?.stderr?.readFrom(0).text ?? ''
+    return 'pnpm install 失败（exit ' + code + '）：' + stderr.slice(0, 500)
+  }
+  return undefined
+}

package/src/rpc.ts

@@ -4,7 +4,7 @@
  * 新功能 = shared/rpc.ts 加方法 + 这里加一个 handler，不改其他模块。
  * 作者 ddj 2026-08-20
  */
-import type { RpcHandlerMap, RpcMethod, RpcRequestMap, RpcResult } from './shared/rpc.js'
+import type { DecideItem, DecideResult, RpcHandlerMap, RpcMethod, RpcRequestMap, RpcResult, RpcScope } from './shared/rpc.js'
 import type { DiffRecord, RecordView } from './shared/types.js'
 import type { Ctx, Session } from './store.js'
 import {
@@ -28,6 +28,7 @@ import { listMcp, refreshMcp, removeMcp, saveMcp, toggleMcp } from './mcp.js'
 import { listProjects, projectRefresh, projectRemove, projectSave, projectToggle } from './mcpProject.js'
 import { normalizeFileOpenTool, FILE_OPEN_DEFAULT, FILE_OPEN_SETTINGS_NS } from './fileOpenSettings.js'
 import { buildReport } from './compat.js'
+import { readDevForm, setDevForm } from './devForm.js'
 
 /** cwd → Promise 链：串行化 debug 日志追加（fs read+write 非原子，避免并发丢行）。 */
 const debugWriteQueues = new Map<string, Promise<void>>()
@@ -65,6 +66,52 @@ async function requireSession(ctx: Ctx, sessionId: string | undefined): Promise<
   return { session, cwd }
 }
 
+/**
+ * 批量决策核心：一次会话/桶解析 + 逐项处理 + 统一落盘（accept/reject 单条与 decideBatch 共用）。
+ * rejected 项先做回滚，失败记入该项 error 且不改决策；本批次新增"已解决"记录一次性归档，
+ * 有任何成功项则整桶只写盘一次，避免逐条读写整个 sidecar。
+ * @author ddj 2026年08月25号
+ * @param items 决策项（按数组顺序处理，rejected 的先后即回滚顺序）
+ * @returns 逐项结果（ok 项含更新后的记录视图）
+ */
+async function applyDecisions(
+  ctx: Ctx,
+  session: Session,
+  cwd: string,
+  bucket: Map<string, DiffRecord>,
+  items: DecideItem[],
+): Promise<DecideResult[]> {
+  const results: DecideResult[] = []
+  const resolved: DiffRecord[] = []
+  let changed = false
+  for (const item of items) {
+    const record = bucket.get(item.callId)
+    if (!record) {
+      results.push({ callId: item.callId, ok: false, error: '记录不存在' })
+      continue
+    }
+    if (item.decision === 'rejected') {
+      const scope: RpcScope = item.scope ?? 'call'
+      const outcome = scope === 'hunk' ? await revertHunk(ctx, session, record, item.hunkIndex ?? -1) : await revertCall(ctx, session, record)
+      if (!outcome.ok) {
+        results.push({ callId: item.callId, ok: false, error: outcome.error })
+        continue
+      }
+    }
+    const wasResolved = recordResolved(record)
+    markDecision(record, item.scope ?? 'call', item.hunkIndex, item.decision)
+    changed = true
+    if (!wasResolved && recordResolved(record)) resolved.push(record)
+    results.push({ callId: item.callId, ok: true, record: recView(record) })
+  }
+  if (resolved.length) {
+    const reason = items.some((item) => item.decision === 'rejected') ? '已处理（回滚）' : '已处理'
+    await archiveRecords(ctx, session, cwd, bucket, resolved, reason, { deferSave: true })
+  }
+  if (changed) await saveBucket(ctx, cwd, bucket, session)
+  return results
+}
+
 /** 各方法 handler 表（类型由 shared/rpc 的 RpcHandlerMap 约束）。 */
 export function buildHandlers(ctx: Ctx, registry: Registry, searcher = newSearcher(ctx)): RpcHandlerMap {
   return {
@@ -73,7 +120,7 @@ export function buildHandlers(ctx: Ctx, registry: Registry, searcher = newSearch
       if ('err' in sc) return { ok: false, error: sc.err }
       const bucket = await bucketOf(registry, ctx, sc.cwd)
       const want = Array.isArray(args.callIds) ? new Set(args.callIds) : null
-      if (!want) await autoArchiveStale(ctx, sc.session, sc.cwd, bucket) // 全量轮询时自动清理 stale 幽灵差异
+      if (!want && args.skipStale !== true) await autoArchiveStale(ctx, sc.session, sc.cwd, bucket) // 全量轮询时自动清理 stale 幽灵差异（批量决策后的即时刷新可 skipStale 跳过）
       const out: RecordView[] = []
       for (const rec of bucket.values()) {
         // 面板全量查询过滤已归档；聊天条按 callId 查询保留（状态徽章仍需正确显示）
@@ -88,27 +135,26 @@ export function buildHandlers(ctx: Ctx, registry: Registry, searcher = newSearch
       const sc = await requireSession(ctx, args.sessionId)
       if ('err' in sc) return { ok: false, error: sc.err }
       const bucket = await bucketOf(registry, ctx, sc.cwd)
-      const record = bucket.get(args.callId)
-      if (!record) return { ok: false, error: '记录不存在' }
-      markDecision(record, args.scope ?? 'call', args.hunkIndex, 'accepted')
-      if (recordResolved(record)) await archiveRecords(ctx, sc.session, sc.cwd, bucket, [record], '已处理')
-      else await saveBucket(ctx, sc.cwd, bucket, sc.session)
-      return { ok: true, record: recView(record) }
+      const results = await applyDecisions(ctx, sc.session, sc.cwd, bucket, [{ callId: args.callId, scope: args.scope, hunkIndex: args.hunkIndex, decision: 'accepted' }])
+      const item = results[0]
+      if (!item?.ok) return { ok: false, error: item?.error ?? '操作失败' }
+      return { ok: true, record: item.record! }
     },
     'edrv.reject': async (args) => {
       const sc = await requireSession(ctx, args.sessionId)
       if ('err' in sc) return { ok: false, error: sc.err }
       const bucket = await bucketOf(registry, ctx, sc.cwd)
-      const record = bucket.get(args.callId)
-      if (!record) return { ok: false, error: '记录不存在' }
-      const scope = args.scope ?? 'call'
-      const outcome = scope === 'hunk' ? await revertHunk(ctx, sc.session, record, args.hunkIndex ?? -1) : await revertCall(ctx, sc.session, record)
-      if (!outcome.ok) return { ok: false, error: outcome.error }
-      markDecision(record, scope, args.hunkIndex, 'rejected')
-      record.at = new Date().toISOString()
-      if (recordResolved(record)) await archiveRecords(ctx, sc.session, sc.cwd, bucket, [record], '已处理（回滚）')
-      else await saveBucket(ctx, sc.cwd, bucket, sc.session)
-      return { ok: true, record: recView(record) }
+      const results = await applyDecisions(ctx, sc.session, sc.cwd, bucket, [{ callId: args.callId, scope: args.scope, hunkIndex: args.hunkIndex, decision: 'rejected' }])
+      const item = results[0]
+      if (!item?.ok) return { ok: false, error: item?.error ?? '操作失败' }
+      return { ok: true, record: item.record! }
+    },
+    'edrv.decideBatch': async (args) => {
+      const sc = await requireSession(ctx, args.sessionId)
+      if ('err' in sc) return { ok: false, error: sc.err }
+      const bucket = await bucketOf(registry, ctx, sc.cwd)
+      const results = await applyDecisions(ctx, sc.session, sc.cwd, bucket, Array.isArray(args.items) ? args.items : [])
+      return { ok: true, results }
     },
     'edrv.read': async (args) => {
       const sc = await requireSession(ctx, args.sessionId)
@@ -324,6 +370,16 @@ export function buildHandlers(ctx: Ctx, registry: Registry, searcher = newSearch
       }
     },
     'compat': async () => ({ ok: true, report: await buildReport(ctx) }),
+    'vscode.devFormGet': async () => ({ ok: true, devForm: readDevForm() }),
+    'vscode.devFormSet': async (args) => {
+      try {
+        const result = await setDevForm(ctx, args.enabled === true, args.path)
+        if (!result.ok) return { ok: false, error: result.error ?? '切换开发形态失败' }
+        return { ok: true, devForm: readDevForm(), restart: result.restart }
+      } catch (error) {
+        return { ok: false, error: String(error) }
+      }
+    },
   }
 }
 

package/src/shared/compat.ts

@@ -11,10 +11,17 @@ export interface CompatAdapter {
   note?: string
 }
 
+/** 开发形态信息：profile 中以 link: 依赖 + junction 指向工作区的安装形态。 */
+export interface DevFormInfo {
+  enabled: boolean
+  path?: string
+}
+
 /** 兼容性报告：host 侧构建（RPC edrv.compat 返回），client 侧补充本地适配项后展示。 */
 export interface CompatReport {
   pluginVersion: string
   external: CompatAdapter[]
   guards: CompatAdapter[]
   warnings: string[]
+  devForm?: DevFormInfo
 }

package/src/shared/rpc.ts

@@ -13,7 +13,7 @@ import type {
   StaleHunk,
 } from './types.js'
 import type { MpcConfig, MpcProject, MpcProjectSaveInput, MpcServer } from './mcp.js'
-import type { CompatReport } from './compat.js'
+import type { CompatReport, DevFormInfo } from './compat.js'
 
 /** webServer 精确路由。 */
 export const RPC_PATH = '/edrv/rpc'
@@ -21,11 +21,28 @@ export const RPC_PATH = '/edrv/rpc'
 /** 决策作用域：call=整条记录，hunk=单个差异块。 */
 export type RpcScope = 'call' | 'hunk'
 
+/** 一条批量决策项（decideBatch 的 items 元素，与 accept/reject 单条参数同构）。 */
+export interface DecideItem {
+  callId: string
+  scope?: RpcScope
+  hunkIndex?: number
+  decision: 'accepted' | 'rejected'
+}
+
+/** 批量决策逐项结果。 */
+export interface DecideResult {
+  callId: string
+  ok: boolean
+  error?: string
+  record?: RecordView
+}
+
 /** 每个方法的请求参数（sessionId 为公共可选字段）。 */
 export interface RpcRequestMap {
-  'edrv.list': { sessionId?: string; callIds?: string[] }
+  'edrv.list': { sessionId?: string; callIds?: string[]; skipStale?: boolean }
   'edrv.accept': { sessionId?: string; callId: string; scope?: RpcScope; hunkIndex?: number }
   'edrv.reject': { sessionId?: string; callId: string; scope?: RpcScope; hunkIndex?: number }
+  'edrv.decideBatch': { sessionId?: string; items: DecideItem[] }
   'edrv.read': { sessionId?: string; path: string }
   'edrv.original': { sessionId?: string; path: string }
   'edrv.save': { sessionId?: string; path: string; content: string }
@@ -46,6 +63,8 @@ export interface RpcRequestMap {
   'mcp.projectRefresh': { workspacePath: string; serverName: string }
   'vscode.fileOpenSettingsGet': {}
   'vscode.fileOpenSettingsUpdate': { fileOpenTool: string; expectedRevision?: number }
+  'vscode.devFormGet': {}
+  'vscode.devFormSet': { enabled: boolean; path?: string }
   'compat': {}
 }
 
@@ -56,6 +75,7 @@ export interface RpcOkMap {
   'edrv.list': { records: RecordView[] }
   'edrv.accept': { record: RecordView }
   'edrv.reject': { record: RecordView }
+  'edrv.decideBatch': { results: DecideResult[] }
   'edrv.read': { content: string; size: number }
   'edrv.original': { content: string; size: number; stale: StaleHunk[]; fallback: boolean }
   'edrv.save': object
@@ -76,6 +96,8 @@ export interface RpcOkMap {
   'mcp.projectRefresh': { project: MpcProject }
   'vscode.fileOpenSettingsGet': { fileOpenTool: string; revision?: number }
   'vscode.fileOpenSettingsUpdate': { fileOpenTool: string; revision?: number }
+  'vscode.devFormGet': { devForm: DevFormInfo }
+  'vscode.devFormSet': { devForm: DevFormInfo; restart: boolean }
   'compat': { report: CompatReport }
 }
 

package/src/store.ts

@@ -223,7 +223,10 @@ export async function appendArchiveEntries(ctx: Ctx, cwd: string, entries: Array
   }
 }
 
-/** 归档记录：标记 archived、按批次写入归档、落盘工作区桶。 */
+/**
+ * 归档记录：标记 archived、按批次写入归档、落盘工作区桶。
+ * @param opts.deferSave 为 true 时只写归档、不落盘桶（由批量调用方统一 saveBucket 一次）
+ */
 export async function archiveRecords(
   ctx: Ctx,
   session: Session,
@@ -231,6 +234,7 @@ export async function archiveRecords(
   bucket: Map<string, DiffRecord>,
   recs: DiffRecord[],
   reason: string,
+  opts?: { deferSave?: boolean },
 ): Promise<void> {
   if (!recs.length) return
   const fresh = recs.filter((r) => !r.archived)
@@ -238,5 +242,5 @@ export async function archiveRecords(
   const entries: Array<ReturnType<typeof archiveEntryFor>> = []
   for (const list of groupByBatch(recs).values()) entries.push(archiveEntryFor(list, cwd, reason))
   await appendArchiveEntries(ctx, cwd, entries, session)
-  if (fresh.length) await saveBucket(ctx, cwd, bucket, session)
+  if (fresh.length && !opts?.deferSave) await saveBucket(ctx, cwd, bucket, session)
 }