dsh-vscode-mode 0.23.0 → 0.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "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/reviewBatch.ts

@@ -2,7 +2,7 @@
 import type { ReviewDetail, ReviewItem, ReviewPage, ReviewResult } from '../shared/review.js'
 
 export interface BatchPort {
-  list: (cursor?: number) => Promise<ReviewPage>
+  snapshot: () => Promise<ReviewPage>
   detail: (id: string) => Promise<ReviewDetail>
   decide: (detail: ReviewDetail, reject: boolean, operationId: string) => Promise<ReviewResult<{ revision: number }>>
   guard: () => void
@@ -10,27 +10,23 @@ export interface BatchPort {
 }
 export interface BatchResult { completed: number; total: number; paths: string[]; error: string }
 
-/** @public @author ddj 2026年10月27号 @param port Authenticated RPC adapter. @returns Frozen complete pending set; aborts before any decision if pagination shifts. @throws Incomplete or changing pages. */
-export async function loadPending(port: Pick<BatchPort, 'list'>): Promise<ReviewItem[]> {
-  const items: ReviewItem[] = []
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 取一次完整待审快照。分页计数只用于展示，批量写入必须一次取全，避免把页内数字当成总数。
+ * @param port 已鉴权的 RPC 适配器
+ * @returns 冻结的完整待审集；任何不一致都在首个写入前中止
+ * @throws 快照重复、版本已变或数量不完整
+ */
+export async function loadPending(port: Pick<BatchPort, 'snapshot'>): Promise<ReviewItem[]> {
+  const page = await port.snapshot()
   const seen = new Set<string>()
-  const cursors = new Set<number>()
-  let cursor: number | undefined
-  let expected: number | undefined
-  do {
-    const page = await port.list(cursor)
-    expected ??= page.pending
-    if (page.pending !== expected) throw new Error('待审记录在分页期间变化，请刷新后重试')
-    for (const item of page.items) {
-      if (seen.has(item.id) || !item.current || item.decision !== 'pending') throw new Error('待审分页发生重复或版本变化，请刷新后重试')
-      seen.add(item.id); items.push(item)
-    }
-    if (page.nextCursor === null) break
-    if (cursors.has(page.nextCursor) || page.items.length === 0) throw new Error('待审分页未完整返回，请刷新后重试')
-    cursor = page.nextCursor; cursors.add(cursor)
-  } while (true)
-  if (items.length !== expected) throw new Error('待审记录数量不完整，未执行批量操作')
-  return items
+  for (const item of page.items) {
+    if (seen.has(item.id) || !item.current || item.decision !== 'pending') throw new Error('待审快照发生重复或版本变化，请刷新后重试')
+    seen.add(item.id)
+  }
+  if (page.nextCursor !== null || page.items.length !== page.pending) throw new Error('待审记录数量不完整，未执行批量操作')
+  return page.items
 }
 
 /** @public @author ddj 2026年10月27号 @param port Guarded existing per-file decision adapter. @param reject Undo instead of Keep. @returns Precise partial result; Undo stops at first conflict, never claims atomic multi-file rollback. */

package/src/client/ui/EditorView.ts

@@ -3479,7 +3479,11 @@ export function EditorView(props) {
     setStatus(reject ? '正在检查并 Undo 全部待审记录…' : '正在 Keep 全部待审记录…')
     try {
       const result = await runReviewBatch({
-        list: async (cursor) => { const res = await rpc('edrv.review.list', { sessionId, cursor }); if (!res.ok) throw new Error(res.error); return res.page },
+        snapshot: async () => {
+          const res = await rpc('edrv.review.list', { sessionId, all: true })
+          if (!res.ok) throw new Error(res.error)
+          return res.page
+        },
         detail: async (id) => { const res = await rpc('edrv.review.detail', { sessionId, id }); if (!res.ok) throw new Error(res.error); return res.detail },
         decide: (detail, undo, operationId) => rpc('edrv.review.decide', { sessionId, id: detail.item.id, seq: detail.item.seq, revision: detail.item.revision, operationId, scope: 'file', decision: undo ? 'rejected' : 'accepted' }),
         guard: () => guardReviewAll(reject, token), operation: batchOperation,

package/src/reviewRpc.ts

@@ -1,5 +1,6 @@
 /** Session-scoped official review RPC. @author ddj 2026年10月26号 */
 import type { RpcHandlerMap } from './shared/rpc.js'
+import type { ReviewItem, ReviewPage } from './shared/review.js'
 import type { PendingPage } from './shared/pendingReview.js'
 import { decideReview, reviewDetail, reviewPage } from './reviewDb.js'
 import { undoReview } from './reviewUndo.js'
@@ -9,6 +10,41 @@ import { bucketOf, resolveScope, sessionOf } from './registry.js'
 import type { Registry } from './registry.js'
 import type { Ctx } from './store.js'
 
+/** 批量写入快照的硬上限：待审积压超过它说明状态异常，宁可拒绝也不做无界写循环。 */
+const BATCH_LIMIT = 2000
+
+/**
+ * @private
+ * @author ddj 2026年10月31号
+ * @description: 批量写入用的一次性完整快照。合并口径与列表一致（待审投影优先、同路径官方旧行让位），
+ * 但一次取全，且 items 与 pending 同源，客户端才能把它当成写前不变式。
+ * @param cwd 工作区
+ * @param pending 该会话可见的待审页
+ * @returns 完整快照；待审积压超过上限或分页期间数量漂移时返回错误
+ */
+function batchSnapshot(cwd: string, pending: PendingPage): { ok: true; page: ReviewPage } | { ok: false; error: string } {
+  const first = reviewPage(cwd)
+  if (first.pending > BATCH_LIMIT) return { ok: false, error: `待审记录过多（${first.pending} 条，上限 ${BATCH_LIMIT}），请先分批处理后重试` }
+
+  const official: ReviewItem[] = []
+  let page: ReviewPage | undefined = first
+  while (page) {
+    for (const item of page.items) if (item.current && item.decision === 'pending') official.push(item)
+    page = page.nextCursor === null ? undefined : reviewPage(cwd, page.nextCursor)
+  }
+  // 分页期间有记录被判定掉：数量对不上就不给客户端一份半截快照
+  if (official.length !== first.pending) return { ok: false, error: '待审记录数量不完整，未执行批量操作' }
+
+  // 待审投影已接管的路径，官方旧行必须让位，否则同一文件会被批量写两次
+  const live = pending.items.filter((item) => !item.settled)
+  const kept = official.filter((row) => !live.some((entry) => pendingSamePath(entry.path, row.currentPath) || pendingSamePath(entry.path, row.path)))
+  const items = [...live.map((entry) => pendingItemOf(entry, cwd)), ...kept]
+  return {
+    ok: true,
+    page: { items, pending: items.length, nextCursor: null, gaps: first.gaps, ...(first.overview ? { overview: first.overview } : {}) },
+  }
+}
+
 /**
  * @public
  * @author ddj 2026年10月26号 / 2026年10月28号
@@ -52,6 +88,10 @@ export function reviewHandlers(ctx: Ctx, registry: Registry): Partial<RpcHandler
   return {
     'edrv.review.list': async (args) => {
       const cwd = await workspace(args.sessionId)
+      // 批量通道要的是一次性完整快照：分页口径的 pending 只是页内展示计数，不能当完整性不变式
+      if (args.all && !args.history && args.path === undefined) {
+        return batchSnapshot(cwd, pendingPageOf(cwd, args.sessionId))
+      }
       const official = reviewPage(cwd, args.cursor, args.history, args.path)
       const pending = pendingPageOf(cwd, args.sessionId)
       // 历史快照只属于官方通道；待审条目没有轮次历史，混进去会造出假的「轮次 0」。

package/src/shared/rpc.ts

@@ -375,7 +375,7 @@ export interface UiStatePatchInput {
 
 /** 每个方法的请求参数（sessionId 为公共可选字段）。 */
 export interface RpcRequestMap {
-  'edrv.review.list': ReviewRequest & { cursor?: number; history?: boolean; path?: string }
+  'edrv.review.list': ReviewRequest & { cursor?: number; history?: boolean; path?: string; all?: boolean }
   'edrv.review.detail': ReviewRequest & { id: string }
   'edrv.review.decide': DecideReview
   'edrv.pending.list': PendingRequest