dsh-vscode-mode 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 中央编辑器（文件页签/QuickOpen/状态栏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚），状态持久化到工作区旁车",
   "keywords": [
     "dsh",

package/src/client/styles/mcp.css

@@ -101,3 +101,12 @@
 .vsm-compat-item.warn .vsm-compat-name::before{content:"● ";color:var(--dsw-alias-state-warn-primary,#e5b93f)}
 .vsm-compat-name{font-weight:500;min-width:0}
 .vsm-compat-note{color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:12px;text-align:right;min-width:0}
+
+/* 开发形态开关 */
+.vsm-devform-note{display:block;margin-top:4px;font-size:11px;color:var(--dsw-alias-label-tertiary,#9aa5b1);word-break:break-all}
+.vsm-devform-actions{display:flex;flex-direction:column;align-items:flex-end;gap:6px;min-width:0}
+.vsm-devform-msg{color:var(--dsw-alias-state-warn-primary,#e5b93f);font-size:11px;text-align:right}
+.vsm-general-row button{border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;padding:6px 12px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;font-size:12px;white-space:nowrap}
+.vsm-general-row button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
+.vsm-general-row button:disabled{opacity:.55;cursor:default}
+.vsm-general-row button.vsm-devform-close{color:var(--dsw-alias-state-error-primary,#f07878);border-color:var(--dsw-alias-state-error-secondary,#d9534f55)}

package/src/client/ui/McpSettings.ts

@@ -119,11 +119,14 @@ function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
   return React.createElement('section', { className: 'vsm-project' }, head, body)
 }
 
-/** 通用设置：选择当前对话文件链接的打开器。 */
+/** 通用设置：选择当前对话文件链接的打开器 + 开发形态开关。 */
 function GeneralSettings({ registry }) {
   const [tool, setTool] = React.useState(AUTO_OPEN_TOOL)
   const [busy, setBusy] = React.useState(false)
   const [error, setError] = React.useState('')
+  const [devForm, setDevForm] = React.useState(null)
+  const [devBusy, setDevBusy] = React.useState(false)
+  const [devMessage, setDevMessage] = React.useState('')
   const settings = React.useContext(SettingsContext)
   const snapshot = settings?.getSnapshot?.()
   const loading = !snapshot || snapshot.status === 'loading'
@@ -137,19 +140,42 @@ function GeneralSettings({ registry }) {
     onChange()
     return settings?.subscribe?.(onChange)
   }, [settings])
+  React.useEffect(() => {
+    rpc('vscode.devFormGet', {}).then((result) => {
+      if (result.ok) setDevForm(result.devForm)
+    }).catch(() => { /* 开发形态查询失败静默 */ })
+  }, [])
   const save = (value) => {
     setTool(value); setBusy(true); setError('')
     if (!settings?.set) { setError('设置服务不可用'); setBusy(false); return }
     settings.set('fileOpenTool', value).catch((e) => setError(String(e))).finally(() => setBusy(false))
   }
+  const closeDevForm = () => {
+    if (!window.confirm('关闭开发形态：插件将切换为正式版安装（版本依赖 + 删除工作区链接），pnpm 装配后需重启 DSH 生效。确认关闭？')) return
+    setDevBusy(true)
+    setDevMessage('')
+    rpc('vscode.devFormSet', { enabled: false }).then((result) => {
+      if (!result.ok) { setDevMessage('关闭失败：' + String(result.error)); return }
+      setDevForm(result.devForm)
+      setDevMessage(result.restart ? '已切换为正式版，重启 DSH 后生效。' : '已关闭开发形态。')
+    }).catch((e) => setDevMessage('关闭失败：' + String(e))).finally(() => setDevBusy(false))
+  }
   const options = [{ id: AUTO_OPEN_TOOL, label: '自动选择', description: '按当前已注册工具自动选择' }, ...availableOpeners(registry).map((item) => ({ id: item.id, label: item.label, description: item.description }))]
   const currentOption = options.some((item) => item.id === tool) ? tool : AUTO_OPEN_TOOL
+  const devFormRow = devForm?.enabled ? React.createElement('div', { className: 'vsm-general-row' },
+    React.createElement('span', null, '开发形态', React.createElement('small', { className: 'vsm-devform-note' }, '工作区链接安装：' + devForm.path)),
+    React.createElement('div', { className: 'vsm-devform-actions' },
+      devMessage && React.createElement('small', { className: 'vsm-devform-msg' }, devMessage),
+      React.createElement('button', { className: 'vsm-devform-close', disabled: devBusy, onClick: closeDevForm }, devBusy ? '切换中…' : '关闭开发形态'),
+    ),
+  ) : null
   return React.createElement('section', { className: 'vsm-general-page' },
     React.createElement('h2', null, '通用'),
     React.createElement('p', null, '配置 DSH 对话中文件链接的打开工具。工具由当前运行时自动扫描。'),
     unavailable && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, '设置服务暂不可用，当前使用自动选择。'),
     error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
     React.createElement('label', { className: 'vsm-general-row' }, React.createElement('span', null, '文件链接使用工具'), React.createElement('select', { value: currentOption, disabled: loading || unavailable || notReady || busy || snapshot?.writable === false, onChange: (event) => save(event.target.value) }, options.map((item) => React.createElement('option', { key: item.id, value: item.id }, item.label))), loading && React.createElement('small', null, '读取中…')),
+    devFormRow,
   )
 }
 
@@ -171,10 +197,15 @@ function CompatSection({ getSummary }) {
     React.createElement('span', { className: 'vsm-compat-note' }, item.note ?? (item.active ? '正常' : '未生效')),
   ))
   const warnings = report?.warnings ?? []
+  const devForm = report?.devForm
   return React.createElement('section', { className: 'vsm-general-page' },
     React.createElement('h2', null, '兼容性'),
     React.createElement('p', null, '检测与其他插件 / DSH 版本的适配状态与已知问题。' + (report?.pluginVersion ? '（插件版本 ' + report.pluginVersion + '）' : '')),
     error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
+    devForm?.enabled && React.createElement(React.Fragment, null,
+      React.createElement('h3', { className: 'vsm-compat-h3' }, '开发形态'),
+      React.createElement('div', { className: 'vsm-compat-item ok' }, React.createElement('span', { className: 'vsm-compat-name' }, '开发形态开启（工作区链接安装）'), React.createElement('span', { className: 'vsm-compat-note' }, devForm.path)),
+    ),
     React.createElement('h3', { className: 'vsm-compat-h3' }, '外部插件与服务'),
     renderItems(report?.external),
     React.createElement('h3', { className: 'vsm-compat-h3' }, '客户端适配'),

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

@@ -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>>()
@@ -324,6 +325,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'
@@ -46,6 +46,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': {}
 }
 
@@ -76,6 +78,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 }
 }