dsh-vscode-mode 0.23.4 → 0.23.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/state/diffSummary.ts

@@ -44,7 +44,11 @@ function pendingRowsOf(page: ReviewPage | null): { rows: DiffFile[]; covered: Se
   for (const item of page?.items ?? []) {
     if (!item.id.startsWith(PENDING_PREFIX)) continue
     const path = item.currentPath || item.path
+    // 待审条目的 path 取自写入时的原始写法（agent 常用工作区相对路径），官方导航用的却是绝对身份：
+    // 只按 path 建覆盖集时，同一文件的官方汇总行不会被压掉，差异栏把 3 个文件算成 6 条。
+    // 身份（id 去掉待审前缀）与官方 identity 同源，必须一起入集。
     covered.add(diffPathKey(path))
+    covered.add(diffPathKey(item.id.slice(PENDING_PREFIX.length)))
     rows.push({
       path,
       label: item.display || path,

package/src/pending/decide.ts

@@ -206,8 +206,15 @@ export function capabilityOf(entry: PendingEntry, flags: PendingFlags): { keep:
  * @author ddj 2026年10月29号
  * @description: 供详情接口复用的差异构造。
  * @param entry 待审条目
+ * @param baselineEmpty 基线置空：文件由本次会话新建，旧基线只是会话自己的中间产物
  * @returns 官方差异
  */
-export function diffOf(entry: PendingEntry): OfficialDiff {
-  return textDiff(entry.path, entry.path, entry.oldText, entry.newText)
+export function diffOf(entry: PendingEntry, baselineEmpty = false): OfficialDiff {
+  if (!baselineEmpty) return textDiff(entry.path, entry.path, entry.oldText, entry.newText)
+  // 空基线在按行切分时会留下一个空行，差异里会多出一条「删空行」；新增文件应当只有新增行，
+  // 与官方整文件新增块（oldLines=0、全是 + 行）保持同一形状。
+  if (entry.newText === '') return textDiff(entry.path, entry.path, '', '')
+  const diff = textDiff(entry.path, entry.path, '', entry.newText)
+  if (diff.kind !== 'text') return diff
+  return { ...diff, hunks: diff.hunks.map((hunk) => ({ ...hunk, oldLines: 0, lines: hunk.lines.filter((line) => line !== '-') })) }
 }

package/src/pending/store.ts

@@ -25,10 +25,11 @@ import {
  * @author ddj 2026年10月29号
  * @description: 统计一次差异的增删行数；非文本差异统一记 0/0。
  * @param entry 待审条目
+ * @param baselineEmpty 基线置空（新建文件按全量新增计）
  * @returns 增删行数
  */
-function countsOf(entry: PendingEntry): { added: number; deleted: number } {
-  const diff = diffOf(entry)
+function countsOf(entry: PendingEntry, baselineEmpty = false): { added: number; deleted: number } {
+  const diff = diffOf(entry, baselineEmpty)
   if (diff.kind !== 'text') return { added: 0, deleted: 0 }
   let added = 0
   let deleted = 0
@@ -93,11 +94,12 @@ export function foldWrite(stored: StoredEntry | undefined, write: PendingWrite):
  * @author ddj 2026年10月29号
  * @description: 条目转列表投影，已解决条目仍保留但不可再决定。
  * @param stored 条目与标记
+ * @param baselineEmpty 基线置空（新建文件按全量新增计）
  * @returns 列表项
  */
-export function itemOf(stored: StoredEntry): PendingItem {
+export function itemOf(stored: StoredEntry, baselineEmpty = false): PendingItem {
   const { entry, flags } = stored
-  const counts = countsOf(entry)
+  const counts = countsOf(entry, baselineEmpty)
   const item: PendingItem = {
     id: entry.id,
     path: entry.path,
@@ -123,12 +125,13 @@ export function itemOf(stored: StoredEntry): PendingItem {
  * @description: 读一页待审条目，按更新时间升序；会话过滤走血缘集合。
  * @param cwd 工作区
  * @param sessionId 当前会话
+ * @param wholeAdd 本次会话新建的文件身份集合，命中时基线置空
  * @returns 列表
  */
-export function loadPage(cwd: string, sessionId?: string): PendingPage {
+export function loadPage(cwd: string, sessionId?: string, wholeAdd?: ReadonlySet<string>): PendingPage {
   const all = loadEntries(cwd)
   const visible = sessionId ? all.filter((stored) => stored.entry.sessionIds.includes(sessionId)) : all
-  const items = visible.map(itemOf)
+  const items = visible.map((stored) => itemOf(stored, wholeAdd?.has(stored.entry.id) === true))
   const gaps: string[] = []
   for (const stored of visible) {
     if (stored.flags.oversized) gaps.push(`${stored.entry.path}: 文本超出上限，仅保留标记`)
@@ -141,14 +144,15 @@ export function loadPage(cwd: string, sessionId?: string): PendingPage {
  * @description: 读单条详情，包含可交给现有面板渲染的差异与块决定。
  * @param cwd 工作区
  * @param id 条目身份
+ * @param baselineEmpty 基线置空（新建文件按全量新增渲染）
  * @returns 详情，条目不存在时 null
  */
-export function loadDetail(cwd: string, id: string): PendingDetail | null {
+export function loadDetail(cwd: string, id: string, baselineEmpty = false): PendingDetail | null {
   const stored = loadEntries(cwd).find((item) => item.entry.id === id)
   if (!stored) return null
-  const diff = diffOf(stored.entry)
+  const diff = diffOf(stored.entry, baselineEmpty)
   return {
-    item: itemOf(stored),
+    item: itemOf(stored, baselineEmpty),
     diff,
     blocks: blockStatesOf(stored.entry),
     capability: capabilityOf(stored.entry, stored.flags),

package/src/pendingCompat.ts

@@ -171,7 +171,13 @@ export function pendingCovers(cwd: string, path: string): boolean {
  * @returns 合并后的页
  */
 export function mergedPage(official: ReviewPage, pending: PendingPage, cwd?: string): ReviewPage {
-  const covered = new Set(pending.items.map((item) => pathKey(item.path)))
+  const covered = new Set<string>()
+  for (const item of pending.items) {
+    // 待审条目的 path 是写入时的原始写法（常为工作区相对路径），官方条目用绝对身份：
+    // 只按 path 建覆盖集时同一文件会同时留下待审行与官方行，差异栏把一份改动算成两条。
+    covered.add(pathKey(item.path))
+    covered.add(pathKey(item.id))
+  }
   const kept = official.items.filter((item) => !covered.has(pathKey(item.currentPath)) && !covered.has(pathKey(item.path)))
   const items = [...pending.items.map((item) => pendingItemOf(item, cwd)), ...kept]
   return {

package/src/pendingRpc.ts

@@ -8,6 +8,7 @@ import { readText } from './pending/capture.js'
 import { pendingRawId, trackPendingCover } from './pendingCompat.js'
 import { loadEntries, saveEntry } from './pending/persist.js'
 import { applyDecide, importFromVcs, itemOf, loadDetail, loadPage, refreshed, removeEntry, undoDecide } from './pending/store.js'
+import { addedFiles } from './reviewDb.js'
 import type { ShellLike } from './pending/vcs.js'
 import type { Ctx } from './store.js'
 import { policyOf } from './store.js'
@@ -82,14 +83,16 @@ function readHandlers(kit: ScopeKit): Partial<RpcHandlerMap> {
   return {
     'edrv.pending.list': async (args: PendingRequest) => {
       const cwd = await kit.read(args.sessionId)
-      const page = loadPage(cwd, args.sessionId)
+      // 与官方入口同口径：本会话新建的文件基线置空，列表里的增删行数才等于整文件行数
+      const page = loadPage(cwd, args.sessionId, addedFiles(cwd, args.sessionId))
       // 列表即登记接管关系；旧写入口守卫之后只读内存集合，不再产生数据库读
       for (const item of page.items) trackPendingCover(cwd, item.path, true)
       return { ok: true, page }
     },
     'edrv.pending.detail': async (args: PendingRequest & { id: string }) => {
       const cwd = await kit.read(args.sessionId)
-      const detail = loadDetail(cwd, pendingRawId(args.id))
+      const rawId = pendingRawId(args.id)
+      const detail = loadDetail(cwd, rawId, addedFiles(cwd, args.sessionId).has(rawId))
       return detail ? { ok: true, detail } : { ok: false, error: '待审条目不存在' }
     },
   }

package/src/reviewDb.ts

@@ -205,6 +205,31 @@ export function reviewPage(cwd: string, cursor = 0, history = false, path?: stri
 
 }
 
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 该会话里由官方记录判为「整文件新增」的文件身份集合。待审条目命中时基线要置空：
+ * 文件是本会话新建的，累计基线只是会话自己的中间产物，拿它做旧侧会把新增文件渲染成一堆修改块。
+ * @param cwd 迁移后的工作区
+ * @param sessionId 会话
+ * @returns 整文件新增的文件身份集合
+ */
+export function addedFiles(cwd: string, sessionId: string): Set<string> {
+  try {
+    const db = dbFor(cwd)
+    if (!db.prepare("SELECT 1 FROM sqlite_master WHERE name='review_files' AND type='table'").get()) return new Set()
+    // 先按会话收窄再取每个文件最早的那条官方记录：首个块是整文件新增（before=false）才说明文件
+    // 由本次会话创建，后续修改块不能反过来把新建成改写成「有旧基线的修改」。
+    const rows = db.prepare(`SELECT identity FROM (SELECT identity,
+      json_extract(diff,'$.before') AS before, ROW_NUMBER() OVER (PARTITION BY identity ORDER BY turn, seq) AS rank
+      FROM review_files WHERE session_id=?) WHERE rank=1 AND before=0`).all(sessionId) as Row[]
+    return new Set(rows.map((row) => String(row.identity)))
+  } catch {
+    // 判定失败只退回旧的累计基线口径，不影响列表与详情可用
+    return new Set()
+  }
+}
+
 /**
  * @public
  * @author ddj 2026年10月31号

package/src/reviewRpc.ts

@@ -2,7 +2,7 @@
 import type { RpcHandlerMap } from './shared/rpc.js'
 import type { ReviewDetail, ReviewItem, ReviewPage } from './shared/review.js'
 import type { PendingPage } from './shared/pendingReview.js'
-import { decideReview, reviewDetail, reviewPage } from './reviewDb.js'
+import { addedFiles, decideReview, reviewDetail, reviewPage } from './reviewDb.js'
 import { undoReview } from './reviewUndo.js'
 import { applyDecide, loadDetail, loadPage } from './pending/store.js'
 import { PENDING_PREFIX, mergedPage, pendingDetailOf, pendingItemOf, pendingSamePath } from './pendingCompat.js'
@@ -153,7 +153,9 @@ export function reviewHandlers(ctx: Ctx, registry: Registry): Partial<RpcHandler
    */
   function pendingPageOf(cwd: string, sessionId: string): PendingPage {
     try {
-      const page = loadPage(cwd, sessionId)
+      // 本会话新建的文件由官方首个块判为整文件新增，待审基线必须跟着置空：
+      // 否则同一次新建会同时存在「官方说全加 516 行」与「待审说改 8 处」两套相反口径。
+      const page = loadPage(cwd, sessionId, addedFiles(cwd, sessionId))
       // 已结算（老文本与新文本一致）的投影没有净变化可审：留着会顶掉同路径的官方待审记录，
       // 让差异栏选中一条 Keep 不可用的条目，表现为「按钮亮着却点不动」。
       return page.items.some((item) => item.settled === true)
@@ -192,7 +194,9 @@ export function reviewHandlers(ctx: Ctx, registry: Registry): Partial<RpcHandler
       const scope = await scopeOf(args.sessionId)
       const cwd = scope.cwd
       if (args.id.startsWith(PENDING_PREFIX)) {
-        const detail = loadDetail(cwd, args.id.slice(PENDING_PREFIX.length))
+        const entryId = args.id.slice(PENDING_PREFIX.length)
+        // 详情侧与列表侧必须同一口径：整文件新增的文件用空基线渲染，差异块才是全绿一整块
+        const detail = loadDetail(cwd, entryId, addedFiles(cwd, args.sessionId).has(entryId))
         if (!detail) return { ok: false, error: '待审条目不存在' }
 
         const mapped = pendingDetailOf(detail, new Date(detail.item.updatedAt).toISOString(), cwd)