dsh-vscode-mode 0.20.1 → 0.20.2

package/package.json

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

@@ -2,11 +2,16 @@
 import { rpc } from './rpc.js'
 import type { McpSessionStatus } from '../shared/mcp.js'
 
-export interface SessionMcpView { status?: McpSessionStatus; stale: boolean }
+export interface SessionMcpView {
+  status?: McpSessionStatus
+  stale: boolean
+  /** Query lifecycle only; never a connection failure classification. */
+  reason?: 'pending' | 'paused' | 'unavailable'
+  /** Browser receipt time of the last accepted snapshot, in epoch milliseconds. */
+  observedAt?: number
+}
 type Snapshot = { sessions: McpSessionStatus[]; sampledAt: number }
 type FetchStatus = (signal: AbortSignal) => Promise<Snapshot>
-const unavailable: SessionMcpView = { stale: true }
-const inactive: SessionMcpView = { stale: false }
 
 /** One poller for all mounted row/hover consumers; never retains or activates sessions. */
 export class McpSessionState {
@@ -15,14 +20,14 @@ export class McpSessionState {
   private timer?: ReturnType<typeof setTimeout>
   private request?: AbortController
   private epoch = 0
-  private stale = true
+  private fallback: SessionMcpView = { stale: true, reason: 'pending' }
   private disposed = false
 
   /** @public @author ddj 2026年10月20号 @param fetchStatus Authenticated read-only query. @param page Visibility boundary, omitted for server tests. */
   constructor(private readonly fetchStatus: FetchStatus, private readonly page?: Document) {}
 
   /** @public @author ddj 2026年10月20号 @param sessionId Row identity. @returns Stable view until the next observation. */
-  get(sessionId: string): SessionMcpView { return this.views.get(sessionId) ?? (this.stale ? unavailable : inactive) }
+  get(sessionId: string): SessionMcpView { return this.views.get(sessionId) ?? this.fallback }
 
   /** @public @author ddj 2026年10月20号 @param sessionId Row identity. @param listener React invalidation. @returns Idempotent unsubscribe; the last consumer stops polling. */
   subscribe(sessionId: string, listener: () => void): () => void {
@@ -33,7 +38,8 @@ export class McpSessionState {
     this.listeners.set(sessionId, listeners)
     if (first) {
       this.page?.addEventListener('visibilitychange', this.visibility)
-      void this.poll()
+      if (this.page?.hidden) this.markStale('paused')
+      else void this.poll()
     }
     return () => {
       listeners.delete(listener)
@@ -54,7 +60,7 @@ export class McpSessionState {
     clearTimeout(this.timer)
     this.timer = undefined
     this.request?.abort()
-    this.publish(undefined)
+    this.markStale('paused')
   }
 
   /** @private @author ddj 2026年10月20号 Cleans listener lifetime as well as timers. */
@@ -66,32 +72,53 @@ export class McpSessionState {
   /** @public @author ddj 2026年10月20号 Permanently disposes HMR-owned polling. */
   dispose(): void { this.disposed = true; this.pause(); this.listeners.clear(); this.views.clear() }
 
-  /** @private @author ddj 2026年10月20号 @param snapshot Fresh ledger, or undefined to mark all previous observations stale. */
-  private publish(snapshot?: Snapshot): void {
-    this.stale = snapshot === undefined
-    if (snapshot) this.views = new Map(snapshot.sessions.map((status) => [status.sessionId, { status, stale: false }]))
-    else for (const [id, view] of this.views) this.views.set(id, { ...view, stale: true })
+  /** @private @author ddj 2026年10月27号 @param snapshot Fresh ledger. Records browser receipt time without changing the host protocol. */
+  private publish(snapshot: Snapshot): void {
+    const observedAt = Date.now()
+    this.fallback = { stale: false, observedAt }
+    this.views = new Map(snapshot.sessions.map((status) => [status.sessionId, { status, stale: false, observedAt }]))
+    this.notify()
+  }
+
+  /** @private @author ddj 2026年10月27号 @param reason Query lifecycle, never a claim about connection health. Preserves stable references for unchanged observations. */
+  private markStale(reason: NonNullable<SessionMcpView['reason']>): void {
+    if (this.fallback.stale && this.fallback.reason === reason) return
+    this.fallback = { ...this.fallback, stale: true, reason }
+    for (const [id, view] of this.views) this.views.set(id, { ...view, stale: true, reason })
+    this.notify()
+  }
+
+  /** @private @author ddj 2026年10月27号 Notifies mounted row and hover consumers after an observation changes. */
+  private notify(): void {
     for (const listeners of this.listeners.values()) for (const listener of listeners) listener()
   }
 
   /** @private @author ddj 2026年10月20号 Queries once, with a 10-second deadline and a 2.5-second gap after settlement. */
   private async poll(): Promise<void> {
     if (this.disposed || this.request || !this.listeners.size || this.page?.hidden) return
+    clearTimeout(this.timer)
+    this.timer = undefined
+    if (this.fallback.reason === 'paused') this.markStale('pending')
+
     const request = new AbortController()
     const epoch = this.epoch
     this.request = request
     /** @author ddj 2026年10月20号 Marks overdue responses unusable even if a transport ignores cancellation. */
-    const expire = (): void => { request.abort(); if (epoch === this.epoch) this.publish(undefined) }
+    const expire = (): void => { request.abort(); if (epoch === this.epoch) this.markStale('unavailable') }
     const deadline = setTimeout(expire, 10000)
     try {
       const snapshot = await this.fetchStatus(request.signal)
       if (epoch === this.epoch && !request.signal.aborted) this.publish(snapshot)
     } catch {
-      if (epoch === this.epoch) this.publish(undefined)
+      if (epoch === this.epoch) this.markStale('unavailable')
     } finally {
       clearTimeout(deadline)
       this.request = undefined
-      if (!this.disposed && this.listeners.size && !this.page?.hidden) this.timer = setTimeout(() => { void this.poll() }, 2500)
+      // A visibility/subscription change resumes promptly, but only after the old transport settles.
+      if (!this.disposed && this.listeners.size && !this.page?.hidden) {
+        const delay = epoch === this.epoch ? 2500 : 0
+        this.timer = setTimeout(() => { void this.poll() }, delay)
+      }
     }
   }
 }

package/src/client/ui/EditorView.ts

@@ -24,6 +24,7 @@ import { dbg, isDebug, rpc } from '../rpc.js'
 import { refreshFeed, subscribeErrors, subscribeRecords } from '../state/recordsFeed.js'
 import { subscribeReview, refreshReview } from '../state/reviewFeed.js'
 import { runReviewBatch } from '../reviewBatch.js'
+import { ReviewAllConfirm } from './ReviewAllConfirm.js'
 import { reviewRegions } from '../../shared/reviewRegions.js'
 import { diffSummary, officialPath } from '../state/diffSummary.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
@@ -445,6 +446,7 @@ export function EditorView(props) {
   const hoverPanelRef = React.useRef(false) // 鼠标是否已进入 Keep/Undo 浮层
   const batchBusyRef = React.useRef(false) // 批量 Keep All/Undo All 防重入
   const [reviewBatchBusy, setReviewBatchBusy] = React.useState(false)
+  const [reviewAllPrompt, setReviewAllPrompt] = React.useState(null)
   const reviewLifeRef = React.useRef(null)
   React.useEffect(() => {
     const token = { live: true }
@@ -3272,9 +3274,7 @@ export function EditorView(props) {
   async function actReviewAll(reject) {
     if (batchBusyRef.current) return
     if (!review.page?.overview) { setError('官方待审列表尚未就绪，未执行批量操作'); return }
-    const count = sum.pendingFiles.length
-    if (!count) return
-    if (!window.confirm(`${reject ? 'Undo All' : 'Keep All'}：处理当前工作区全部 ${count} 个待审差异文件（含其他轮次）？${reject ? '\n撤销会改写磁盘；逐项安全校验，遇到冲突停止，已完成项不会自动恢复。' : '\n只标记待审修改为保留，不改写文件。'}`)) return
+    if (!sum.pendingFiles.length) return
     const token = reviewLifeRef.current
     const undoPath = activeRef.current
     const undoModel = editorRef.current?.getModel?.()
@@ -3301,8 +3301,28 @@ export function EditorView(props) {
     } catch (cause) { if (token?.live) setError(String(cause)) }
     finally { batchBusyRef.current = false; if (token?.live) setReviewBatchBusy(false) }
   }
-  const acceptAllFiles = () => actReviewAll(false)
-  const undoAllFiles = () => actReviewAll(true)
+  /** @private @author ddj 2026年10月27号 @param reject Whether to undo pending files. @description Open a DSH confirmation without starting any mutations. */
+  function askReviewAll(reject) {
+    if (batchBusyRef.current || !sum.pendingFiles.length) return
+    if (!review.page?.overview) { setError('官方待审列表尚未就绪，未执行批量操作'); return }
+    setReviewAllPrompt({ reject, count: sum.pendingFiles.length, token: reviewLifeRef.current })
+  }
+
+  /** @private @author ddj 2026年10月27号 @description Dismiss the pending confirmation without changing review state. */
+  function cancelReviewAll() {
+    setReviewAllPrompt(null)
+  }
+
+  /** @private @author ddj 2026年10月27号 @description Confirm only within the session lifetime that opened the modal. @returns The guarded batch operation, if still valid. */
+  function confirmReviewAll() {
+    const prompt = reviewAllPrompt
+    setReviewAllPrompt(null)
+    if (!prompt?.token?.live || prompt.token !== reviewLifeRef.current) return
+    return actReviewAll(prompt.reject)
+  }
+
+  const acceptAllFiles = () => askReviewAll(false)
+  const undoAllFiles = () => askReviewAll(true)
   const rollbackFile = () => {
     if (!active) return
     if (!window.confirm('回滚当前文件到修改前状态？（相关差异将归档）')) return
@@ -5015,5 +5035,11 @@ export function EditorView(props) {
         snippetPickerEl,
         dapBpMenuEl,
         dapBpEditEl)
-  return rootEl
+  const reviewAllEl = reviewAllPrompt?.token?.live && reviewAllPrompt.token === reviewLifeRef.current
+    ? React.createElement(ReviewAllConfirm, {
+        reject: reviewAllPrompt.reject, count: reviewAllPrompt.count,
+        onCancel: cancelReviewAll, onConfirm: confirmReviewAll,
+      })
+    : null
+  return React.createElement(React.Fragment, null, rootEl, reviewAllEl)
 }

package/src/client/ui/McpSessionStatus.ts

@@ -20,7 +20,7 @@ function useMcpView({ sessionId, store }: McpRowProps): SessionMcpView {
 
 /** @public @author ddj 2026年10月20号 @param view Current observation. @returns Accessible row label; steady states deliberately do not occupy the leading slot. */
 export function mcpRowLabel(view: SessionMcpView): string | undefined {
-  if (view.stale) return '项目 MCP 状态暂不可用（上次状态已过期）'
+  if (view.stale) return undefined
   if (!view.status || (!busy.has(view.status.phase) && view.status.phase !== 'error')) return undefined
   return '项目 MCP：' + labels[view.status.phase]
 }
@@ -30,7 +30,7 @@ export function McpSessionIcon(props: McpRowProps): React.ReactElement | null {
   const view = useMcpView(props)
   const label = mcpRowLabel(view)
   if (!label) return null
-  const warning = view.stale || view.status?.phase === 'error'
+  const warning = view.status?.phase === 'error'
   return React.createElement('span', {
     role: 'img', 'aria-label': label, title: label,
     style: { display: 'inline-flex', width: 16, height: 16, alignItems: 'center', justifyContent: 'center',
@@ -41,6 +41,13 @@ export function McpSessionIcon(props: McpRowProps): React.ReactElement | null {
 /** @private @author ddj 2026年10月20号 @param start Stage start. @param end Stage finish or local clock. @returns Human-readable elapsed time, without claiming a timeout. */
 function elapsed(start: number, end: number): string { return Math.max(0, (end - start) / 1000).toFixed(1) + ' 秒' }
 
+/** @private @author ddj 2026年10月27号 @param view Query observation. @returns Query-only explanation, separate from initialization health. */
+function queryMessage(view: SessionMcpView): string {
+  if (view.reason === 'paused') return '状态查询已暂停'
+  if (view.reason === 'pending') return '正在查询项目 MCP 状态'
+  return '状态查询暂不可用，不代表 MCP 初始化失败'
+}
+
 /** @public @author ddj 2026年10月20号 @param props Official hover sessionId and poller. @returns Project-only diagnostic detail, never transport credentials. */
 export function McpSessionDetail(props: McpRowProps): React.ReactElement {
   const view = useMcpView(props)
@@ -53,10 +60,18 @@ export function McpSessionDetail(props: McpRowProps): React.ReactElement {
   }, [status, view.stale])
 
   const children: React.ReactNode[] = [React.createElement('strong', { key: 'title' }, '项目 MCP')]
-  if (view.stale) children.push(React.createElement('div', { key: 'stale', role: 'status' }, '状态暂不可用；以下如有记录，为上次观测结果'))
-  if (!status) children.push(React.createElement('div', { key: 'empty' }, view.stale ? '等待状态查询' : '当前无活跃 MCP 实例'))
-  else {
-    const end = status.finishedAt ?? now
+  if (view.stale) {
+    children.push(React.createElement('div', { key: 'stale', role: 'status' }, queryMessage(view)))
+    if (status) children.push(React.createElement('div', { key: 'history' }, '以下为上次观测结果，不代表当前状态'))
+    if (view.observedAt !== undefined) children.push(React.createElement('div', { key: 'observed' },
+      '上次观测时间：' + new Date(view.observedAt).toLocaleString()))
+  }
+  if (!status && !view.stale) children.push(React.createElement('div', { key: 'empty' }, '当前无活跃 MCP 实例'))
+  if (status) {
+    // Unobserved time must not look like continued initialization, including per-server timing.
+    let observedNow = now
+    if (view.stale) observedNow = view.observedAt ?? status.phaseAt
+    const end = status.finishedAt ?? observedNow
     const completed = status.servers.filter((server) => server.phase === 'ready').length
     const slow = !view.stale && busy.has(status.phase) && now - status.phaseAt > 10000
     children.push(React.createElement('div', { key: 'phase' }, labels[status.phase], slow ? '（耗时较长，不代表失败）' : ''))
@@ -64,7 +79,7 @@ export function McpSessionDetail(props: McpRowProps): React.ReactElement {
     if (status.configMs !== undefined) children.push(React.createElement('div', { key: 'config' }, `配置准备 ${elapsed(0, status.configMs)}`))
     if (status.error) children.push(React.createElement('div', { key: 'error' }, status.error))
     for (const server of status.servers) children.push(React.createElement('div', { key: 'server:' + server.serverName },
-      `${server.serverName}：${labels[server.phase]}${server.reused ? ' · 复用已有连接' : ''}${server.phase === 'idle' ? '' : ' · ' + elapsed(server.startedAt, server.finishedAt ?? now)}`,
+      `${server.serverName}：${labels[server.phase]}${server.reused ? ' · 复用已有连接' : ''}${server.phase === 'idle' ? '' : ' · ' + elapsed(server.startedAt, server.finishedAt ?? observedNow)}`,
       server.queuedMs === undefined ? '' : ' · 排队 ' + elapsed(0, server.queuedMs),
       server.connectMs === undefined ? '' : ' · 初始化 ' + elapsed(0, server.connectMs),
       server.firstCallMs === undefined ? '' : ' · 首次工具执行 ' + elapsed(0, server.firstCallMs),

package/src/client/ui/ReviewAllConfirm.ts

@@ -0,0 +1,35 @@
+import React from 'react'
+import { Button, Modal } from '@deepseek-ai/dsh-client-ui-primitives'
+
+interface ReviewAllProps {
+  reject: boolean
+  count: number
+  onCancel: () => void
+  onConfirm: () => void
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月27号
+ * @description Confirm workspace-wide review through the DSH modal; dismissing never applies a decision.
+ * @param props Pending file count, action and explicit confirmation callbacks.
+ * @returns DSH-themed confirmation with distinct Keep and Undo safety descriptions.
+ */
+export function ReviewAllConfirm(props: ReviewAllProps): React.ReactElement {
+  const action = props.reject ? 'Undo All' : 'Keep All'
+  const warning = props.reject
+    ? '撤销会改写磁盘；逐项安全校验，遇到冲突停止，已完成项不会自动恢复。'
+    : '只标记待审修改为保留，不改写文件。'
+  const footer = React.createElement(React.Fragment, null,
+    React.createElement(Button, { variant: 'ghost', onClick: props.onCancel, autoFocus: true }, '取消'),
+    React.createElement(Button, { variant: 'primary', onClick: props.onConfirm }, '确认 ' + action))
+
+  return React.createElement(Modal, {
+    open: true,
+    title: action + ' 确认',
+    closeLabel: '取消',
+    onClose: props.onCancel,
+    description: `处理当前工作区全部 ${props.count} 个待审差异文件（含其他轮次）？`,
+    footer,
+  }, React.createElement('p', null, warning))
+}

package/src/client-primitives.d.ts

@@ -14,6 +14,18 @@ declare module '@deepseek-ai/dsh-client-ui-primitives' {
     icon?: import('react').ReactNode
   }>
 
+  /** Centered body-portaled dialog; mirrors official Modal.d.ts. @author ddj 2026年10月27号 */
+  export const Modal: import('react').ComponentType<{
+    open: boolean
+    onClose: () => void
+    title: string
+    description?: string
+    children?: import('react').ReactNode
+    footer?: import('react').ReactNode
+    className?: string
+    contentClassName?: string
+  } & ({ headless: true; closeLabel?: never } | { headless?: false; closeLabel: string })>
+
   /** Anchored selectable menu; mirrors the subset used from official Menu.d.ts. @author ddj 2026年10月27号 */
   export const Menu: import('react').ComponentType<{
     open: boolean