dsh-vscode-mode 0.21.4 → 0.23.0

package/src/client/ui/DiffLauncher.ts

@@ -106,7 +106,7 @@ export function DiffLauncher(props) {
   }, [tab, sessionId, source])
 
   let body
-  const legacyFiles = sum.pendingFiles.filter((file) => file.sourceKind !== 'official')
+  const legacyFiles = sum.pendingFiles.filter((file) => file.sourceKind === 'legacy')
   if (source === 'official') {
     body = React.createElement(React.Fragment, null,
       React.createElement('div', { className: 'edrv-search-empty' }, '官方轮次净差异 · 原始历史只读；编辑按钮打开当前文件，保存不代表已审。'),

package/src/client/ui/EditorView.ts

@@ -26,6 +26,7 @@ import { subscribeReview, refreshReview } from '../state/reviewFeed.js'
 import { runReviewBatch } from '../reviewBatch.js'
 import { ReviewAllConfirm } from './ReviewAllConfirm.js'
 import { reviewRegions } from '../../shared/reviewRegions.js'
+import { PENDING_PREFIX } from '../../shared/pendingReview.js'
 import { diffSummary, officialPath } from '../state/diffSummary.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
@@ -579,7 +580,15 @@ export function EditorView(props) {
   }, [sessionId, active, selectedReview])
   React.useEffect(() => {
     const controller = new AbortController()
-    if (!active || !review.page?.overview?.coveredPaths.some((path) => sameFile(path, active))) {
+    // 待审条目也走同一条行内差异通道：它由累计基线投影而来，形状与官方条目一致，
+    // 因此编辑器里天然就能画行内差异与 Keep/Undo 药丸，不必另开一个窄面板。
+    const pendingPath = (review.page?.items ?? [])
+      .filter((item) => String(item.id).startsWith(PENDING_PREFIX))
+      .map((item) => item.currentPath || item.path)
+      .find((path) => sameFile(path, active))
+    const coveredPath = review.page?.overview?.coveredPaths.find((path) => sameFile(path, active))
+    const reviewPath = coveredPath ?? pendingPath
+    if (!active || !reviewPath) {
       setOfficialDetail(null)
       setOfficialRecords([])
       return () => controller.abort()
@@ -588,7 +597,6 @@ export function EditorView(props) {
     async function loadReview() {
       try {
         // Tabs use workspace-relative paths; the metadata index owns the backend identity.
-        const reviewPath = review.page?.overview?.coveredPaths.find((path) => sameFile(path, active)) ?? active
         const page = await rpc('edrv.review.list', { sessionId, path: reviewPath }, controller.signal)
         if (controller.signal.aborted) return
         if (!page.ok) throw new Error(page.error)

package/src/client/ui/OfficialDiffBar.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import { Button, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { ReviewDetail, ReviewItem, ReviewPage } from '../../shared/review.js'
-import { ReviewLedger } from './OfficialReview.js'
 import { reviewBarView } from '../reviewBar.js'
 import { ReviewAllRow } from './reviewAllRow.js'
 
@@ -55,11 +54,9 @@ export function barIcon(mark: Mark): React.ReactElement {
 /** @public @author ddj 2026年10月27号 @param props Existing review callbacks and immutable record metadata. @returns Responsive review toolbar; no disk or decision side effects until an explicit action. */
 export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
   const { official, pendingRegions = [], staleRegions = [], diffIdx = 0 } = props
-  const [expanded, setExpanded] = React.useState(false)
-  const [menu, setMenu] = React.useState<'records' | 'more' | null>(null)
+  const [menu, setMenu] = React.useState<'more' | null>(null)
   const name = String(props.activePath || '').split(/[\\/]/).pop() || '当前文件'
   const detail = official.detail
-  const records = official.records ?? []
   const count = pendingRegions.length
   const view = reviewBarView({ jumps: count, stale: staleRegions.length, index: diffIdx, ready: props.contentReady === true,
     pendingRecords: official.pending, canKeep: detail?.capability.keep === true,
@@ -67,8 +64,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
 
   /** @private @author ddj 2026年10月27号 @returns Close current popup without changing selection. */
   function closeMenu(): void { setMenu(null) }
-  /** @private @author ddj 2026年10月27号 @param id Immutable record ID. @returns Select record and dismiss popup. */
-  function selectRecord(id: string): void { official.onSelect(id); closeMenu() }
   /** @private @author ddj 2026年10月27号 @param tab Existing launcher tab. @returns Open existing overview, never create another review entry. */
   function openOverview(tab: string): void { props.onOpenLauncher(tab); closeMenu() }
   /** @private @author ddj 2026年10月27号 @param mark Navigation icon. @param label Accessible action. @param action Existing callback. @param disabled Whether navigation is unavailable. @param title Hover reason, defaults to the label. @returns Compact keyboard-focusable navigation control. */
@@ -76,9 +71,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
     return <Button size="sm" variant="ghost" className="edrv-review-icon" aria-label={label} title={title || label} disabled={disabled} onClick={action}>{barIcon(mark)}</Button>
   }
 
-  const recordTrigger = <Button size="sm" variant="ghost" className="edrv-review-record" aria-label="选择官方差异记录" aria-haspopup="menu" aria-expanded={menu === 'records'} disabled={!records.length} onClick={() => setMenu(menu === 'records' ? null : 'records')}>
-    {detail ? `轮次 ${detail.item.turn}` : '选择记录'}{barIcon('down')}
-  </Button>
   const moreTrigger = <Button size="sm" variant="ghost" className="edrv-review-icon" aria-label="更多审查操作" title="更多审查操作" aria-haspopup="menu" aria-expanded={menu === 'more'} onClick={() => setMenu(menu === 'more' ? null : 'more')}>{barIcon('more')}</Button>
 
   return <div className="edrv-diffbar edrv-diffbar-dock edrv-reviewbar" data-edrv-diffbox="1" data-edrv-diff-source="official" role="region" aria-label="文件差异审查">
@@ -99,7 +91,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
       <span className="edrv-review-filemark">{barIcon('file')}</span>
       <span className="edrv-review-filename" title={props.activePath}>{name}</span>
       <span className="edrv-review-pending" title={view.pendingTitle}>待审 <strong>{official.pending}</strong></span>
-      <Menu open={menu === 'records'} anchor={recordTrigger} items={records.map((item) => ({ id: item.id, label: `轮次 ${item.turn} / 事件 ${item.seq}` }))} selectedId={detail?.item.id} onSelect={selectRecord} onClose={closeMenu} side="top" align="end" portal compact autoFocus />
     </div>
     <div className="edrv-review-tools">
       <div className="edrv-review-nav" role="group" aria-label="文件导航">
@@ -114,12 +105,10 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
       <div className="edrv-review-actions">
         <Button size="sm" variant="ghost" className="edrv-review-undo" icon={barIcon('undo')} onClick={props.onUndoFile} disabled={props.reviewBatchBusy || !detail?.capability.undo} title={detail?.capability.reason}>Undo</Button>
         <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={props.reviewBatchBusy || !detail?.capability.keep} title={detail?.capability.keep ? view.keepHint : detail?.capability.reason}>Keep</Button>
-        <Button size="sm" variant="ghost" className="edrv-review-details" onClick={() => setExpanded(!expanded)} aria-expanded={expanded} aria-label={expanded ? '收起差异' : '展开差异'} title={expanded ? '收起差异' : '展开差异'}>详情{barIcon(expanded ? 'up' : 'down')}</Button>
         <Menu open={menu === 'more'} anchor={moreTrigger} items={[{ id: 'pending', label: '差异总览' }, { id: 'archive', label: '归档 / 历史' }]} onSelect={openOverview} onClose={closeMenu} side="top" align="end" portal compact autoFocus />
       </div>
     </div>
     {detail && view.notice ? <div className={view.noticeTone === 'warn' ? 'edrv-review-notice edrv-review-notice-warn' : 'edrv-review-notice'} role="status">{view.notice}</div> : null}
     {props.reviewError ? <div className={props.reviewErrorTone === 'info' ? 'edrv-review-notice' : 'edrv-review-notice edrv-review-error'} role={props.reviewErrorTone === 'info' ? 'status' : 'alert'}>{props.reviewError}</div> : null}
-    {expanded ? <div className="edrv-review-body"><ReviewLedger key={`${official.sessionId}:${official.path}`} sessionId={official.sessionId} first={official.page} path={official.path} /></div> : null}
   </div>
 }

package/src/client/ui/OfficialReview.ts

@@ -3,6 +3,7 @@ import React from 'react'
 import { rpc } from '../rpc.js'
 import { openEditorView } from '../events.js'
 import { refreshReview } from '../state/reviewFeed.js'
+import { PENDING_PREFIX } from '../../shared/pendingReview.js'
 import type { ReviewDetail, ReviewItem, ReviewPage } from '../../shared/review.js'
 const h = React.createElement
 /** @private @author ddj 2026年10月26号 @param props Latest first-page metadata. @returns Paginated rows independent of expanded historical patch. */
@@ -37,18 +38,27 @@ export function ReviewLedger(props: { sessionId: string; first: ReviewPage | nul
       else setError(result.error)
     } catch (cause) { if (!controller.signal.aborted) setError(String(cause)) }
   }
+  const gaps = page?.gaps ?? []
   return h('div', { style: { marginTop: 8 } },
     h('label', null, h('input', { type: 'checkbox', checked: history, onChange: () => { setHistory(!history); setCursor(0) } }), '显示已处理及被替换的历史'),
-    page?.gaps.map((gap) => h('div', { key: `${gap.sessionId}:${gap.seq}`, role: 'status' }, `轮次 ${gap.turn} 采集不完整：${gap.error}`)),
     error ? h('div', { role: 'alert' }, error) : null,
     !page ? h('p', { role: 'status' }, '正在读取官方审查记录…') : null,
     page && !page.items.length ? h('p', null, history ? '暂无已落盘历史。' : '没有待处理的官方记录；可切换查看历史。') : null,
     h('div', { style: { maxHeight: 210, overflow: 'auto' } }, page?.items.map((item) => h('button', {
       key: item.id, type: 'button', onClick: () => { void select(item) },
-      style: { display: 'block', width: '100%', textAlign: 'left', padding: '6px 4px' },
-    }, `轮次 ${item.turn} · ${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.current ? '' : '（已被同轮新版本替换）'}`))),
+      title: item.currentPath || item.path,
+      style: { display: 'block', width: '100%', textAlign: 'left', padding: '6px 4px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' },
+    }, item.id.startsWith(PENDING_PREFIX)
+      ? `【待审】${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.kind === 'oversized' ? ' · 过大' : ''}`
+      : `轮次 ${item.turn} · ${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.current ? '' : '（已被同轮新版本替换）'}`))),
     cursor > 0 ? h('button', { type: 'button', onClick: () => setCursor(Math.max(0, cursor - 50)) }, '上一页') : null,
     page?.nextCursor !== null && page?.nextCursor !== undefined ? h('button', { type: 'button', onClick: () => setCursor(page.nextCursor!) }, '下一页') : null,
+    // 采集缺口是诊断信息，排在条目之后折叠起来：放最前面会把真正要点的待审条目挤出可视区。
+    gaps.length
+      ? h('details', { key: 'gaps', style: { marginTop: 6 } },
+        h('summary', { style: { cursor: 'pointer', fontSize: 11 } }, `采集不完整 ${gaps.length} 条（诊断信息）`),
+        gaps.map((gap) => h('div', { key: `${gap.sessionId}:${gap.seq}`, role: 'status', style: { fontSize: 11 } }, `轮次 ${gap.turn} 采集不完整：${gap.error}`)))
+      : null,
     detail ? h(PatchDetail, { key: detail.item.id, sessionId: props.sessionId, detail, onChanged: () => { setDetail(null); refreshReview(props.sessionId) } }) : null)
 }