dsh-vscode-mode 0.1.1

package/src/client/monaco/loader.ts

@@ -0,0 +1,71 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — Monaco 加载与语言映射（AMD 构建，离线随包分发）。
+ * 迁移自原 src/client/index.ts 的 MONACO_BASE/LANG_BY_EXT/langOf/loadMonaco，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+
+export const MONACO_BASE = '/edrv/vendor/monaco/vs'
+let monacoPromise = null
+
+/** 扩展名 → Monaco language id（常见语言；未知回退 plaintext）。 */
+export const LANG_BY_EXT = {
+  js: 'javascript', jsx: 'javascript', mjs: 'javascript', cjs: 'javascript',
+  ts: 'typescript', tsx: 'typescript', mts: 'typescript', cts: 'typescript',
+  json: 'json', jsonc: 'json', md: 'markdown', markdown: 'markdown', mdx: 'mdx',
+  css: 'css', scss: 'scss', less: 'less', html: 'html', htm: 'html', vue: 'html', xml: 'xml',
+  yaml: 'yaml', yml: 'yaml', toml: 'ini', ini: 'ini', cfg: 'ini',
+  py: 'python', sh: 'shell', bash: 'shell', zsh: 'shell', ps1: 'powershell',
+  lua: 'lua', java: 'java', c: 'c', h: 'c', cpp: 'cpp', cc: 'cpp', cxx: 'cpp', hpp: 'cpp',
+  cs: 'csharp', go: 'go', rs: 'rust', rb: 'ruby', php: 'php', sql: 'sql',
+  swift: 'swift', kt: 'kotlin', kts: 'kotlin', dart: 'dart', dockerfile: 'dockerfile'
+}
+
+/**
+ * 路径 → Monaco language id：取 basename 扩展名（dockerfile/Dockerfile 特判）。
+ * @author ddj 2026年08月20号
+ * @param path 文件路径
+ * @returns language id
+ */
+export function langOf(path) {
+  const base = String(path || '').split(/[\\/]/).pop() || ''
+  if (/^dockerfile$/i.test(base)) return 'dockerfile'
+  const dot = base.lastIndexOf('.')
+  if (dot <= 0) return 'plaintext'
+  return LANG_BY_EXT[base.slice(dot + 1).toLowerCase()] ?? 'plaintext'
+}
+
+/**
+ * 加载 Monaco Editor（AMD 构建，随插件包离线分发）：注入 loader.js → require.config → editor.main。
+ * @author ddj 2026年08月20号
+ * @returns Promise<object> window.monaco
+ */
+export function loadMonaco() {
+  if (!monacoPromise) {
+    monacoPromise = new Promise((resolve, reject) => {
+      const boot = () => {
+        try {
+          window.require.config({ paths: { vs: MONACO_BASE } })
+          window.require(['vs/editor/editor.main'], () => resolve(window.monaco), (err) => {
+            monacoPromise = null
+            reject(new Error('Monaco 模块加载失败：' + String(err)))
+          })
+        } catch (error) {
+          monacoPromise = null
+          reject(error)
+        }
+      }
+      const existing = document.querySelector('script[data-edrv-monaco-loader]')
+      if (existing) boot()
+      else {
+        const s = document.createElement('script')
+        s.src = MONACO_BASE + '/loader.js'
+        s.dataset.edrvMonacoLoader = '1'
+        s.onload = boot
+        s.onerror = () => { monacoPromise = null; reject(new Error('Monaco loader 加载失败')) }
+        document.head.appendChild(s)
+      }
+    })
+  }
+  return monacoPromise
+}

package/src/client/rpc.ts

@@ -0,0 +1,28 @@
+/**
+ * dsh-vscode-mode client — 类型化 RPC 包装 + 诊断日志。
+ * 迁移自原 src/client/index.ts 的 rpc/dbg，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+import { RPC_PATH } from '../shared/rpc.js'
+import type { RpcMethod, RpcRequestMap, RpcResult } from '../shared/rpc.js'
+
+/** 同源 RPC 调用（host /edrv/rpc 精确路由）。 */
+export function rpc<M extends RpcMethod>(method: M, args: RpcRequestMap[M]): Promise<RpcResult<M>> {
+  return fetch(RPC_PATH, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify({ method, args }),
+  }).then((res) => res.json()) as Promise<RpcResult<M>>
+}
+
+/**
+ * 诊断日志：统一走 host edrv.debug 落盘，避免 console 刷屏。
+ * @author ddj 2026年08月20号
+ * @param sessionId 会话 id
+ * @param text 日志文本
+ */
+export function dbg(sessionId: string | undefined, text: string): void {
+  try {
+    rpc('edrv.debug', { sessionId, text }).catch(() => {})
+  } catch (e) { /* 日志失败忽略 */ }
+}

package/src/client/state/records.ts

@@ -0,0 +1,90 @@
+/**
+ * dsh-vscode-mode client — 记录/差异状态纯函数（可单测）。
+ * 迁移自原 src/client/index.ts 前段，语义一字不改。
+ * 作者 ddj 2026-08-20
+ */
+import type { CallHunk, Hunk, RecordView } from '../../shared/types.js'
+
+/** 差异决策状态。 */
+export const ST = { PENDING: 'pending', ACCEPTED: 'accepted', REJECTED: 'rejected' } as const
+export type Status = 'pending' | 'accepted' | 'rejected'
+
+/** 记录视图摘要（按文件分组）。 */
+export interface FileSummary {
+  path: string
+  recs: RecordView[]
+  pending: number
+}
+export interface Summary {
+  files: FileSummary[]
+  pendingFiles: FileSummary[]
+  totalFiles: number
+}
+
+/** hunk 的 DOM 定位 key（callId:idx）。 */
+export function callIdAttr(callId: string, idx: number): string {
+  return String(callId) + ':' + String(idx)
+}
+
+/** 某 hunk 的当前决策状态（缺省 pending）。 */
+export function statusAt(rec: RecordView | undefined, idx: number): Status {
+  if (!rec) return ST.PENDING
+  if (Array.isArray(rec.decisions?.perHunk) && rec.decisions.perHunk[idx] !== undefined) return rec.decisions.perHunk[idx] as Status
+  return (rec.decisions?.call as Status) ?? ST.PENDING
+}
+
+/** hunk 是否为空差异（old===new，无实际内容变化，不可操作）。create 记录不视为空差异。 */
+export function noopHunk(rec: RecordView | undefined, h: Hunk | CallHunk | null | undefined): boolean {
+  if (!rec || rec.create === true) return false
+  const precise = rec.toolName === 'edit' && rec.callHunk ? rec.callHunk : h
+  const oldText = precise?.oldText ?? null
+  const newText = precise?.newText ?? null
+  return oldText !== null && oldText === newText
+}
+
+/** 记录是否仍有待处理差异（superseded / 全部已决策 = false）。 */
+export function isRecPending(rec: RecordView): boolean {
+  if (!rec || rec.superseded === true) return false
+  const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : []
+  if (perHunk.length) {
+    // 只认存在至少一个"非空差异且未决策"的 hunk
+    for (let i = 0; i < perHunk.length; i++) {
+      if (perHunk[i] !== 'accepted' && perHunk[i] !== 'rejected' && !noopHunk(rec, (rec.hunks || [])[i])) return true
+    }
+    return false
+  }
+  return rec.decisions.call === 'pending' || rec.decisions.call === undefined
+}
+
+/** 记录待处理差异"处"数（按 hunk，跳过空差异）。 */
+export function pendingCount(recs: RecordView[]): number {
+  let n = 0
+  for (const rec of recs) {
+    if (!isRecPending(rec)) continue
+    const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : []
+    if (perHunk.length) {
+      for (let i = 0; i < perHunk.length; i++) {
+        if (perHunk[i] === 'pending' && !noopHunk(rec, (rec.hunks || [])[i])) n++
+      }
+    } else {
+      const hunks = Array.isArray(rec.hunks) ? rec.hunks : []
+      for (const h of hunks) if (!noopHunk(rec, h)) n++
+      if (!hunks.length && !noopHunk(rec, rec.callHunk)) n = Math.max(n, 1)
+    }
+  }
+  return n
+}
+
+/** 按文件分组的差异摘要（角标/Launcher 用）。 */
+export function summarize(records: RecordView[]): Summary {
+  const byPath = new Map<string, RecordView[]>()
+  for (const r of records) {
+    if (!byPath.has(r.path)) byPath.set(r.path, [])
+    byPath.get(r.path)!.push(r)
+  }
+  const files: FileSummary[] = []
+  for (const [path, recs] of byPath) files.push({ path, recs, pending: pendingCount(recs) })
+  files.sort((a, b) => (a.path < b.path ? -1 : 1))
+  const pendingFiles = files.filter((f) => f.pending > 0)
+  return { files, pendingFiles, totalFiles: pendingFiles.length }
+}

package/src/client/state/regions.ts

@@ -0,0 +1,81 @@
+/**
+ * dsh-vscode-mode client — 差异区域计算纯函数（可单测）。
+ * 迁移自原 src/client/index.ts 的 diffRegions/trimCommonLines/countLinesBefore，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+import type { Hunk, RecordView } from '../../shared/types.js'
+import { ST, noopHunk, statusAt } from './records.js'
+import type { Status } from './records.js'
+
+/** 差异区域（文件内一段待处理/已处理的变更）。 */
+export interface Region {
+  callId: string
+  idx: number
+  start?: number
+  end?: number
+  oldLines: string[]
+  newLines: string[]
+  whole?: boolean
+  status: Status
+  create: boolean
+  rec: RecordView
+  superseded: boolean
+  stale?: boolean
+}
+
+/** 统计 index 之前（不含）的换行数 → 0 基行号。 */
+export function countLinesBefore(text: string, index: number): number {
+  let n = 0
+  for (let i = 0; i < index; i++) if (text.charCodeAt(i) === 10) n++
+  return n
+}
+
+/**
+ * 行级公共前缀/后缀裁剪：old/new 首尾相同的行视为未变化（上下文），只保留真正变更的中间段。
+ * @author ddj 2026年08月20号
+ * @param oldLines 替换前内容按行拆分
+ * @param newLines 替换后内容按行拆分
+ * @returns 裁剪后的变更段与公共前缀行数
+ */
+export function trimCommonLines(oldLines: string[], newLines: string[]): { oldLines: string[]; newLines: string[]; shift: number } {
+  let prefix = 0
+  const maxPrefix = Math.min(oldLines.length, newLines.length)
+  while (prefix < maxPrefix && oldLines[prefix] === newLines[prefix]) prefix++
+  let suffix = 0
+  const maxSuffix = Math.min(oldLines.length - prefix, newLines.length - prefix)
+  while (suffix < maxSuffix && oldLines[oldLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]) suffix++
+  return { oldLines: oldLines.slice(prefix, oldLines.length - suffix), newLines: newLines.slice(prefix, newLines.length - suffix), shift: prefix }
+}
+
+/** 计算文件内各差异区域（行范围 + old/new + 状态），用于行内绿标注与 DiffBox。 */
+export function diffRegions(records: RecordView[], content: string | null): Region[] {
+  const regions: Region[] = []
+  if (content === null) return regions
+  const lines = content.split('\n')
+  for (const rec of records) {
+    for (let i = 0; i < rec.hunks.length; i++) {
+      const h: Hunk = rec.hunks[i]
+      if (noopHunk(rec, h)) continue // 空差异（old===new）无实际变化，跳过
+      const status = statusAt(rec, i)
+      if (rec.create) {
+        regions.push({ callId: rec.callId, idx: i, start: 1, end: lines.length, oldLines: [], newLines: lines.slice(), whole: true, status, create: true, rec, superseded: rec.superseded === true })
+        continue
+      }
+      const precise = rec.toolName === 'edit' && rec.callHunk ? rec.callHunk : h
+      const newText = precise.newText ?? ''
+      const at = content.indexOf(newText)
+      if (at < 0) {
+        regions.push({ callId: rec.callId, idx: i, stale: true, status, create: false, oldLines: [], newLines: [], rec, superseded: rec.superseded === true })
+        continue
+      }
+      const start = countLinesBefore(content, at) + 1
+      const oldLines = precise.oldText === null ? [] : precise.oldText.split('\n')
+      const newLines = newText.split('\n')
+      const trimmed = trimCommonLines(oldLines, newLines)
+      const regionStart = start + trimmed.shift
+      regions.push({ callId: rec.callId, idx: i, start: regionStart, end: regionStart + trimmed.newLines.length, oldLines: trimmed.oldLines, newLines: trimmed.newLines, status, create: false, rec, superseded: rec.superseded === true })
+    }
+  }
+  regions.sort((a, b) => (a.start ?? Infinity) - (b.start ?? Infinity))
+  return regions
+}

package/src/client/styles/css.d.ts

@@ -0,0 +1,2 @@
+/** tsdown CSS-inline 插件识别的纯 CSS 导入声明。 */
+declare module '*.css'

package/src/client/styles/editor.css

@@ -0,0 +1,87 @@
+/* dsh-vscode-mode 编辑区样式（原 ensureEdrvStyles 字符串，落盘为真 .css，由 tsdown CSS-inline 注入） */
+/* 浅色主题（对齐参考图：#f8f8f8 近白底 + 薄荷绿药丸 + 青绿文字 + 三文鱼 undo + 浅灰边框）：
+   在 [data-edrv-view] 作用域内重定义 --dsw-alias-*，级联命中组件内联样式与 CSS。 */
+[data-edrv-view] { --edrv-tab-h: 34px; --dsw-alias-bg-base: #f8f8f8; --dsw-alias-bg-layer-1: #ffffff; --dsw-alias-bg-layer-2: #f0f4f4; --dsw-alias-bg-overlay: #ffffff; --dsw-alias-label-primary: #1f2933; --dsw-alias-label-secondary: #52606d; --dsw-alias-label-tertiary: #9aa5b1; --dsw-alias-border-l1: #e0e6e8; --dsw-alias-border-l2: #cbd2d9; --dsw-alias-brand-primary: #0f9d58; --dsw-alias-state-success-primary: #0f9d58; --dsw-alias-state-error-primary: #d9534f; --dsw-alias-state-warn-primary: #d97706; --dsw-alias-interactive-bg-hover: rgba(15,157,88,.08); }
+
+[data-edrv-view] .edrv-tabs { display: flex; align-items: center; gap: 2px; padding: 2px 8px 0; background: var(--dsw-alias-bg-layer-1, transparent); overflow-x: auto; scrollbar-width: thin; flex-shrink: 0; }
+[data-edrv-view] .edrv-tab { display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 12px; border: none; border-radius: 6px 6px 0 0; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 12px; cursor: pointer; white-space: nowrap; flex-shrink: 0; }
+[data-edrv-view] .edrv-tab:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
+[data-edrv-view] .edrv-tab.edrv-tab-active { background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); box-shadow: inset 0 -2px 0 var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-tab .edrv-tab-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--dsw-alias-brand-primary, #4f8cff); flex-shrink: 0; }
+[data-edrv-view] .edrv-tab .edrv-tab-x { display: inline-flex; align-items: center; justify-content: center; width: 16px; height: 16px; border-radius: 4px; color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; }
+[data-edrv-view] .edrv-tab .edrv-tab-x:hover { background: rgba(255,255,255,.12); color: var(--dsw-alias-label-primary, #eee); }
+[data-edrv-view] .edrv-tab-add { display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; margin-left: 2px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 14px; cursor: pointer; flex-shrink: 0; }
+[data-edrv-view] .edrv-tab-add:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
+[data-edrv-view] .edrv-pathbar { display: flex; align-items: center; gap: 8px; height: 26px; padding: 0 10px; background: var(--dsw-alias-bg-layer-1, #ffffff); border-bottom: 1px solid var(--dsw-alias-border-l1, #e0e6e8); font-size: 12px; flex-shrink: 0; overflow: hidden; }
+[data-edrv-view] .edrv-pathbar .edrv-pb-name { font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); white-space: nowrap; }
+[data-edrv-view] .edrv-pathbar .edrv-pb-full { flex: 1; min-width: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; direction: rtl; text-align: left; }
+[data-edrv-view] .edrv-path-input { flex: 1; min-width: 140px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }
+[data-edrv-view] .edrv-search-wrap { position: relative; flex-shrink: 0; display: flex; align-items: center; padding: 2px 8px 2px 4px; }
+[data-edrv-view] .edrv-search { width: 190px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }
+[data-edrv-view] .edrv-search:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-search-pop { position: absolute; top: calc(100% + 4px); right: 8px; width: min(460px, calc(100vw - 24px)); max-height: 300px; overflow: auto; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 10px; box-shadow: 0 6px 20px rgba(0,0,0,.4); z-index: 60; padding: 4px; }
+[data-edrv-view] .edrv-search-item { display: flex; flex-direction: column; gap: 1px; padding: 5px 8px; border-radius: 6px; cursor: pointer; }
+[data-edrv-view] .edrv-search-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.07)); }
+[data-edrv-view] .edrv-search-item .n { color: var(--dsw-alias-label-primary, #eee); font-size: 12px; word-break: break-all; }
+[data-edrv-view] .edrv-search-item .d { color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-search-empty { padding: 8px; font-size: 12px; color: var(--dsw-alias-label-tertiary, #888); }
+[data-edrv-view] .edrv-btn-mini { font-size: 11px; padding: 2px 9px; border: none; border-radius: 999px; cursor: pointer; color: #fff; font-weight: 600; white-space: nowrap; }
+[data-edrv-view] .edrv-btn-keep { background: var(--dsw-alias-state-success-primary, #2e9e44); }
+[data-edrv-view] .edrv-btn-undo { background: var(--dsw-alias-state-warn-primary, #d97706); }
+[data-edrv-view] .edrv-btn-mini:disabled { opacity: .45; cursor: default; }
+[data-edrv-view] .edrv-statusbar { display: flex; align-items: center; gap: 10px; padding: 3px 10px; border-top: 1px solid var(--dsw-alias-border-l1, #333); background: var(--dsw-alias-bg-layer-1, transparent); font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); flex-shrink: 0; white-space: nowrap; overflow: hidden; }
+[data-edrv-view] .edrv-statusbar .edrv-sp-path { flex: 1; overflow: hidden; text-overflow: ellipsis; }
+[data-edrv-view] .edrv-diffchip { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-state-warn-primary, #b7791f); cursor: pointer; white-space: nowrap; flex-shrink: 0; }
+[data-edrv-view] .edrv-chip-btn { font-size: 12px; padding: 2px 6px; border: none; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; border-radius: 4px; flex-shrink: 0; }
+[data-edrv-view] .edrv-chip-btn:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
+[data-edrv-view] .edrv-mn-add-line { background: rgba(15,157,88,.10); }
+[data-edrv-view] .edrv-mn-gutter-add { color: #0f9d58 !important; font-weight: 700; display: flex !important; align-items: center; justify-content: center; }
+[data-edrv-view] .edrv-mn-gutter-add::before { content: "+"; }
+[data-edrv-view] .edrv-del-zone { background: #fdeaea; border-top: 1px solid rgba(217,83,79,.35); border-bottom: 1px solid rgba(217,83,79,.35); box-shadow: inset 0 0 0 1px rgba(217,83,79,.12); }
+[data-edrv-view] .edrv-del-row { white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 12.5px; line-height: 20px; color: #c0392b; }
+[data-edrv-view] .edrv-del-text { display: inline-block; white-space: pre; }
+[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; pointer-events: none; z-index: 6; }
+[data-edrv-view] .edrv-minus-item { position: absolute; width: 16px; text-align: center; color: #d9534f; font-weight: 700; font-size: 12.5px; line-height: 20px; }
+[data-edrv-view] .edrv-monaco-host { flex: 1; min-height: 0; position: relative; }
+[data-edrv-view] .edrv-monaco-host > div { position: absolute; inset: 0; }
+[data-edrv-view] .edrv-empty { display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 10px; height: 100%; color: var(--dsw-alias-label-tertiary, #777); font-size: 13px; }
+[data-edrv-view] .edrv-diffbar { position: absolute; left: 0; right: 0; bottom: 10px; margin: 0 auto; z-index: 25; width: fit-content; max-width: calc(100% - 20px); border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 16px rgba(31,41,51,.12); overflow: visible; display: flex; flex-direction: column; }
+[data-edrv-view] .edrv-diffbar-row { display: flex; align-items: center; gap: 6px; height: 34px; padding: 0 8px; flex-wrap: nowrap; }
+[data-edrv-view] .edrv-diffbar-count { font-size: 12px; font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); min-width: 42px; text-align: center; white-space: nowrap; cursor: pointer; }
+[data-edrv-view] .edrv-diffbar-count.edrv-count-file { min-width: 64px; cursor: default; }
+[data-edrv-view] .edrv-diffbar-file { flex: 1; min-width: 0; font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-pill { font-size: 11px; padding: 3px 10px; border: none; border-radius: 999px; cursor: pointer; white-space: nowrap; font-weight: 600; }
+[data-edrv-view] .edrv-pill-keep { background: #e8f8e8; color: #0f7a45; border: 1px solid rgba(15,157,88,.4); }
+[data-edrv-view] .edrv-pill-undo { background: #fdeaea; color: #c0392b; border: 1px solid rgba(217,83,79,.4); }
+[data-edrv-view] .edrv-pill-ghost { background: #ffffff; color: var(--dsw-alias-label-secondary, #52606d); border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] .edrv-pill:disabled { opacity: .45; cursor: default; }
+[data-edrv-view] .edrv-diffbar-menu { position: absolute; right: 8px; bottom: calc(100% + 6px); z-index: 45; min-width: 160px; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 6px 20px rgba(31,41,51,.16); padding: 4px; display: flex; flex-direction: column; gap: 2px; }
+[data-edrv-view] .edrv-diffmenu-item { display: flex; align-items: center; gap: 8px; font-size: 12px; padding: 6px 10px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; text-align: left; }
+[data-edrv-view] .edrv-diffmenu-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-diffmenu-item.danger { color: var(--dsw-alias-state-error-primary, #d9534f); }
+[data-edrv-view] .edrv-diffmenu-sep { height: 1px; margin: 2px 4px; background: var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] .edrv-diffbar-body { max-height: 130px; max-width: min(560px, calc(100vw - 40px)); overflow: auto; padding: 4px 8px 8px; display: flex; flex-direction: column; gap: 4px; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] .edrv-diffrow { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 6px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); cursor: pointer; flex-wrap: wrap; }
+[data-edrv-view] .edrv-diffrow:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-diffrow-l { font-size: 11px; color: var(--dsw-alias-label-primary, #1f2933); min-width: 74px; font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-diffrow-o { font-size: 11px; color: var(--dsw-alias-state-error-primary, #d9534f); font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-diffrow-n { font-size: 11px; color: var(--dsw-alias-state-success-primary, #0f9d58); font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-diffrow-tag { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); }
+[data-edrv-view] .edrv-diffrow-stale { border-color: rgba(217,119,6,.5); cursor: default; }
+[data-edrv-view] .edrv-diffbox-others { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; padding: 4px 2px 0; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); margin-top: 2px; }
+[data-edrv-view] .edrv-diffrow-file { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); color: var(--dsw-alias-label-secondary, #52606d); cursor: pointer; white-space: nowrap; max-width: 200px; overflow: hidden; text-overflow: ellipsis; }
+[data-edrv-view] .edrv-diffrow-file:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); color: var(--dsw-alias-label-primary, #1f2933); }
+/* 编辑区 hover 差异块的 Keep/Undo 浮层 */
+[data-edrv-view] .edrv-hoveract { position: absolute; z-index: 30; display: flex; align-items: center; gap: 4px; padding: 2px 6px; border-radius: 8px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 14px rgba(31,41,51,.14); }
+[data-edrv-view] .edrv-launch { position: absolute; left: 12px; right: 12px; bottom: 12px; z-index: 40; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); box-shadow: 0 6px 24px rgba(0,0,0,.5); display: flex; flex-direction: column; max-height: 60%; overflow: hidden; }
+[data-edrv-view] .edrv-launch-head { display: flex; align-items: center; gap: 6px; padding: 6px 8px; border-bottom: 1px solid var(--dsw-alias-border-l1, #333); }
+[data-edrv-view] .edrv-launch-tab { font-size: 12px; padding: 3px 12px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; }
+[data-edrv-view] .edrv-launch-tab.on { background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-label-primary, #eee); font-weight: 600; }
+[data-edrv-view] .edrv-launch-body { flex: 1; min-height: 0; overflow: auto; padding: 6px 8px; display: flex; flex-direction: column; gap: 4px; }
+[data-edrv-view] .edrv-launch-row { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 6px; cursor: pointer; flex-wrap: wrap; }
+[data-edrv-view] .edrv-launch-row:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
+[data-edrv-view] .edrv-launch-path { flex: 1; min-width: 0; font-size: 12px; color: var(--dsw-alias-label-primary, #eee); word-break: break-all; }
+[data-edrv-view] .edrv-launch-cnt { font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); white-space: nowrap; }
+[data-edrv-view] .edrv-launch-arch { display: flex; flex-direction: column; gap: 6px; }
+[data-edrv-view] .monaco-editor, [data-edrv-view] .monaco-editor .margin, [data-edrv-view] .monaco-editor-background { background: transparent !important; }
+[data-edrv-view] .monaco-editor .scrollbar .slider { background: rgba(128,128,128,.3) !important; }

package/src/client/ui/DiffBadge.ts

@@ -0,0 +1,51 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — DiffBadge：header 差异角标（仅工作区有差异时显示）。
+ * 迁移自原 src/client/index.ts 的 DiffBadge，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+import React from 'react'
+import { rpc } from '../rpc.js'
+import { openEditorView, emitShowLauncher } from '../events.js'
+import { summarize } from '../state/records.js'
+
+/**
+ * 会话 header 差异角标：5s 轮询 edrv.list，有差异时显示数字徽章，点击打开编辑区并拉起 DiffLauncher。
+ */
+export function DiffBadge(props) {
+  const sessionId = props?.sessionId
+  const [n, setN] = React.useState(0)
+  const seq = React.useRef(0)
+
+  const load = React.useCallback(() => {
+    if (!sessionId) return
+    const s = ++seq.current
+    rpc('edrv.list', { sessionId }).then((res) => {
+      if (s !== seq.current || !res || !res.ok || !Array.isArray(res.records)) return
+      setN(summarize(res.records).totalFiles)
+    }).catch(() => {})
+  }, [sessionId])
+
+  React.useEffect(() => {
+    load()
+    const t = setInterval(load, 5000)
+    const onRefresh = () => load()
+    window.addEventListener('edrv:refresh', onRefresh)
+    return () => { clearInterval(t); window.removeEventListener('edrv:refresh', onRefresh) }
+  }, [load])
+
+  if (!n) return null
+
+  const click = () => {
+    openEditorView(null)
+    setTimeout(() => { emitShowLauncher() }, 120)
+  }
+
+  return React.createElement('button', {
+    onClick: click,
+    title: n + ' 个文件有差异，点击在编辑区查看',
+    style: { position: 'relative', display: 'inline-flex', alignItems: 'center', justifyContent: 'center', width: 30, height: 30, padding: 0, background: 'transparent', border: 'none', borderRadius: 6, cursor: 'pointer' },
+  },
+    React.createElement('img', { src: '/edrv/assets/compare-select.png', alt: '差异', style: { width: 22, height: 22, display: 'block' } }),
+    React.createElement('span', { style: { position: 'absolute', top: 1, right: 0, minWidth: 15, height: 15, padding: '0 3px', borderRadius: 8, background: 'var(--dsw-alias-state-warn-primary,#d97706)', color: '#fff', fontSize: 10, lineHeight: '15px', textAlign: 'center', fontWeight: 700, boxSizing: 'border-box' } }, String(n)))
+}

package/src/client/ui/DiffBarEmpty.ts

@@ -0,0 +1,37 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — DiffBarEmpty：无文件打开 / 当前文件无差异但有差异文件时的空态浮窗。
+ * 迁移自原 src/client/index.ts 的 DiffBarEmpty，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+import React from 'react'
+
+/**
+ * 空态差异条：提示当前状态 + 查看下一个差异文件 + ⋮（总览/归档/刷新）。
+ */
+export function DiffBarEmpty(props) {
+  const { sum, active, staleCount, onNextFile, onOpenLauncher, onRefresh } = props
+  const [menuOpen, setMenuOpen] = React.useState(false)
+  const n = sum?.totalFiles ?? 0
+  const tip = active
+    ? (staleCount > 0 ? '当前文件有 ' + staleCount + ' 处差异无法定位（可能已被后续修改影响）' : '当前文件无待处理差异')
+    : '未打开文件'
+
+  const menu = menuOpen
+    ? React.createElement(React.Fragment, null,
+        React.createElement('div', { style: { position: 'fixed', inset: 0, zIndex: 44 }, onClick: () => setMenuOpen(false) }),
+        React.createElement('div', { className: 'edrv-diffbar-menu' },
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onOpenLauncher('pending'); setMenuOpen(false) } }, '🗂 差异总览'),
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onOpenLauncher('archive'); setMenuOpen(false) } }, '📁 归档'),
+          React.createElement('div', { className: 'edrv-diffmenu-sep' }),
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onRefresh(); setMenuOpen(false) } }, '⟳ 刷新')))
+    : null
+
+  return React.createElement('div', { className: 'edrv-diffbar', 'data-edrv-diffbox': '1' },
+    React.createElement('div', { className: 'edrv-diffbar-row' },
+      React.createElement('span', { className: 'edrv-diffbar-count' }, '⚠ 差异 ' + n + ' 文件'),
+      React.createElement('span', { className: 'edrv-diffbar-file' }, tip),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-keep', title: '打开并跳转到下一个差异文件', onClick: onNextFile }, '查看下一个差异文件'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '更多操作', onClick: () => setMenuOpen((v) => !v) }, '⋮')),
+    menu)
+}

package/src/client/ui/DiffBox.ts

@@ -0,0 +1,79 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — DiffBox：每个文件底部紧凑差异条（per-file hunk + ⋮ 二级菜单）。
+ * 迁移自原 src/client/index.ts 的 DiffBox，语义不改。
+ * 作者 ddj 2026-08-20
+ */
+import React from 'react'
+import { callIdAttr } from '../state/records.js'
+import { badgeOf } from './shared.js'
+
+/**
+ * 差异条：当前文件内 diff 导航（↑↓←→）、Keep/Undo、展开 hunk 列表、⋮ 二级菜单
+ * （Keep All / Undo All / 差异总览 / 归档 / 回滚 / 刷新）+ 其他差异文件小节。
+ */
+export function DiffBox(props) {
+  const {
+    pendingRegions, staleRegions, onAct, onAcceptFile, onUndoFile, onAcceptAllFiles, onUndoAllFiles,
+    allPendingCount, onRollback, onJump, otherFiles, onOpenOther, onOpenLauncher, onRefresh, activePath,
+    diffIdx, diffTotal, fileIdx, fileTotal, onPrevDiff, onNextDiff, onPrevFile, onNextFile,
+  } = props
+  const [expanded, setExpanded] = React.useState(false)
+  const [menuOpen, setMenuOpen] = React.useState(false)
+  const canAct = pendingRegions.length > 0
+
+  const base = String(activePath || '').split(/[\\/]/).pop() || ''
+
+  let bodyEl = null
+  if (expanded) {
+    const rows = pendingRegions.map((r) => {
+      const key = callIdAttr(r.callId, r.idx)
+      return React.createElement('div', { key, className: 'edrv-diffrow', 'data-edrv-hunk': key, title: '跳转到 L' + (r.start ?? '?'), onClick: () => onJump(r) },
+        React.createElement('span', { className: 'edrv-diffrow-l' }, 'L' + (r.start ?? '?') + '-' + (r.end ?? '?')),
+        (r.oldLines.length ? React.createElement('span', { className: 'edrv-diffrow-o' }, '-' + r.oldLines.length) : null),
+        (r.newLines.length ? React.createElement('span', { className: 'edrv-diffrow-n' }, '+' + r.newLines.length) : null),
+        (r.create ? React.createElement('span', { className: 'edrv-diffrow-tag' }, '新建') : null),
+        React.createElement('span', { style: { flex: 1 } }))
+    })
+    const stale = staleRegions.map((r) => React.createElement('div', { key: 'stale' + callIdAttr(r.callId, r.idx), className: 'edrv-diffrow edrv-diffrow-stale', title: '差异无法定位（文件可能已被手动修改）' },
+      React.createElement('span', { className: 'edrv-diffrow-l' }, 'L' + (r.start ?? '?') + ' 无法定位'),
+      React.createElement('span', { className: 'edrv-diffrow-tag' }, badgeOf(r.status))))
+    let othersEl = null
+    if (otherFiles.length) {
+      othersEl = React.createElement('div', { className: 'edrv-diffbox-others' },
+        React.createElement('span', { className: 'edrv-diffrow-tag' }, '其他差异文件 (' + otherFiles.length + '):'),
+        otherFiles.map((f) => React.createElement('button', { key: f.path, className: 'edrv-diffrow-file', title: f.path, onClick: () => onOpenOther(f.path) },
+          String(f.path).split(/[\\/]/).pop() + ' (' + f.pending + ')')))
+    }
+    bodyEl = React.createElement('div', { className: 'edrv-diffbar-body' }, ...rows, ...stale, othersEl)
+  }
+
+  const menu = menuOpen
+    ? React.createElement(React.Fragment, null,
+        React.createElement('div', { style: { position: 'fixed', inset: 0, zIndex: 44 }, onClick: () => setMenuOpen(false) }),
+        React.createElement('div', { className: 'edrv-diffbar-menu' },
+          React.createElement('button', { className: 'edrv-diffmenu-item', disabled: !allPendingCount, onClick: () => { onAcceptAllFiles(); setMenuOpen(false) } }, '✓ Keep All（全部文件采纳）'),
+          React.createElement('button', { className: 'edrv-diffmenu-item danger', disabled: !allPendingCount, onClick: () => { onUndoAllFiles(); setMenuOpen(false) } }, '↩ Undo All（全部文件不采纳）'),
+          React.createElement('div', { className: 'edrv-diffmenu-sep' }),
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onOpenLauncher('pending'); setMenuOpen(false) } }, '🗂 差异总览'),
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onOpenLauncher('archive'); setMenuOpen(false) } }, '📁 归档'),
+          React.createElement('div', { className: 'edrv-diffmenu-sep' }),
+          React.createElement('button', { className: 'edrv-diffmenu-item', disabled: !canAct, onClick: () => { onRollback(); setMenuOpen(false) } }, '⟲ 回滚文件'),
+          React.createElement('button', { className: 'edrv-diffmenu-item', onClick: () => { onRefresh(); setMenuOpen(false) } }, '⟳ 刷新')))
+    : null
+
+  return React.createElement('div', { className: 'edrv-diffbar', 'data-edrv-diffbox': '1' },
+    React.createElement('div', { className: 'edrv-diffbar-row' },
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '上一个差异', disabled: !canAct, onClick: onPrevDiff }, '↑'),
+      React.createElement('span', { className: 'edrv-diffbar-count', title: '当前文件内差异位置（点击展开/收起差异列表）', onClick: () => setExpanded((v) => !v) }, diffTotal ? (diffIdx + 1) + '/' + diffTotal : '0/0'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '下一个差异', disabled: !canAct, onClick: onNextDiff }, '↓'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '上一个差异文件', disabled: !fileTotal, onClick: onPrevFile }, '←'),
+      React.createElement('span', { className: 'edrv-diffbar-count edrv-count-file', title: '差异文件位置' }, fileTotal ? (fileIdx + 1) + '/' + fileTotal + ' 文件' : '0/0 文件'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '下一个差异文件', disabled: !fileTotal, onClick: onNextFile }, '→'),
+      React.createElement('span', { className: 'edrv-diffbar-file', title: activePath || '' }, base),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-keep', title: '采纳当前文件的全部差异', disabled: !canAct, onClick: onAcceptFile }, '✓ Keep'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-undo', title: '不采纳当前文件的全部差异（回滚）', disabled: !canAct, onClick: onUndoFile }, '↩ Undo'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '更多操作', onClick: () => setMenuOpen((v) => !v) }, '⋮')),
+    bodyEl,
+    menu)
+}