dsh-vscode-mode 0.20.1 → 0.20.2

package/README.md

@@ -468,18 +468,18 @@ DSH 每次启动监听随机端口，`http://127.0.0.1:<port>` 就是浏览器 o
 
 官方 `dsh plugin` 方式，三选一。下面以 `web` profile 为例；Desktop 或其他命名
 profile 请替换为实际目标，不要把示例目录当成当前运行 profile。升级前可阅读
-**v0.20.1** 恢复官方差异的文件内增删展示、块级/文件级 Keep 与有可信原始字节证据的安全 Undo，并恢复总文件数、Keep All / Undo All，修复五秒轮询闪动。升级后重启 DSH 并刷新页面；持久化与回退边界见 [0.20.0 发布说明](docs/release-0.20.0.md)；从 0.14.2 或更旧版本升级还须阅读
+**v0.20.2** 修复项目 MCP 状态查询暂停或暂不可用时的会话列表误告警；Keep All / Undo All 使用 DSH 原生确认弹窗。保留 v0.20.1 的文件内差异展示、块级/文件级安全审查和跨分页批量操作。升级后重启 DSH 并刷新页面；持久化与回退边界见 [0.20.0 发布说明](docs/release-0.20.0.md)；从 0.14.2 或更旧版本升级还须阅读
 [0.14.3 数据迁移与回退说明](docs/release-0.14.3.md)。
 
 ```bash
 # ① Git 安装（clone + prepare 构建；推荐打固定 tag）
-dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.20.1
+dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.20.2
 
 # ② npm 注册表（发布到 npm 后）
-dsh plugin --profile web add dsh-vscode-mode@0.20.1
+dsh plugin --profile web add dsh-vscode-mode@0.20.2
 
 # ③ GitHub Release tgz 直装（Release asset 可用后）
-dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.20.1/dsh-vscode-mode-0.20.1.tgz
+dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.20.2/dsh-vscode-mode-0.20.2.tgz
 ```
 
 > **DSH 版本政策（0.17.0 起）**：六项 DSH peer 仍统一声明为 `*`，另以
@@ -820,6 +820,7 @@ Keep All / Undo All 却是亮的。修复：单文件 Keep / Undo 覆盖冲突
 完整变更见 [GitHub Releases](https://github.com/Lenonss/DSH_VsCodeMode/releases)。
 近期关键版本：
 
+- **v0.20.2**：区分项目 MCP 的等待查询、查询暂停与暂不可用状态；过期观测不再让所有会话显示警告，悬浮详情保留上次观测时间并冻结历史耗时，只有新鲜的初始化错误继续告警。页面恢复可见后串行恢复查询，避免取消中的请求重叠。Keep All / Undo All 改用随 DSH 主题的原生确认弹窗，默认聚焦取消；确认前校验打开弹窗的会话生命周期，取消不执行批量修改。
 - **v0.20.1**：恢复官方差异文件内增删、差异导航和块级/文件级 Keep / Undo；Undo 仅在可信原始字节、差异覆盖及文件版本校验通过时写回，无证据或冲突不覆盖。恢复工作区差异文件总数及跨分页、跨轮次 Keep All / Undo All，批量撤销先检查能力、遇冲突停止并报告部分完成。工具栏明确区分全局与当前文件；相同元数据轮询不再重复发布，同文件刷新保留差异直到新详情就绪，消除五秒闪动。升级后需重启 DSH 并刷新页面。
 - **v0.20.0**：**官方净差异持久化与现有审查入口整合**——采集官方轮次摘要及差异块，SQLite 保存并保留跨轮次 pending；复用现有列表、角标和文件导航，不新增独立审查栏。支持标记已审和编辑当前文件，保存不自动已审；没有可信历史全文及原始字节时禁止拒绝写回。修复路径身份和冷启动历史补采，无法恢复的旧摘要明确显示缺口；修正浅色主题操作栏文字对比度。详见 [0.20.0 发布说明](docs/release-0.20.0.md)。
 

package/lib/client.js

@@ -1652,7 +1652,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/ui/LargeTextView.ts
-		const Button$2 = _deepseek_ai_dsh_client_ui_primitives.Button;
+		const Button$3 = _deepseek_ai_dsh_client_ui_primitives.Button;
 		/**
 		* Read-only paged text surface: never creates a Monaco model or exposes a save action.
 		* @public @author ddj 2026年10月22号
@@ -1727,7 +1727,7 @@ window.__ModuleLoader__.load({
 			return react.default.createElement("section", {
 				className: "edrv-large-text",
 				"aria-label": "大文件只读预览"
-			}, react.default.createElement("div", { className: "edrv-large-text-toolbar" }, react.default.createElement("span", { role: "status" }, status), react.default.createElement(Button$2, {
+			}, react.default.createElement("div", { className: "edrv-large-text-toolbar" }, react.default.createElement("span", { role: "status" }, status), react.default.createElement(Button$3, {
 				onClick: loadNext,
 				disabled: !state || state.loading || state.eof || state.capped
 			}, state?.loading ? "加载中…" : state?.error ? "重试本段" : "加载下一段")), react.default.createElement("pre", {
@@ -3580,6 +3580,35 @@ window.__ModuleLoader__.load({
 			return result;
 		}
 		//#endregion
+		//#region src/client/ui/ReviewAllConfirm.ts
+		/**
+		* @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.
+		*/
+		function ReviewAllConfirm(props) {
+			const action = props.reject ? "Undo All" : "Keep All";
+			const warning = props.reject ? "撤销会改写磁盘；逐项安全校验，遇到冲突停止，已完成项不会自动恢复。" : "只标记待审修改为保留，不改写文件。";
+			const footer = react.default.createElement(react.default.Fragment, null, react.default.createElement(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				variant: "ghost",
+				onClick: props.onCancel,
+				autoFocus: true
+			}, "取消"), react.default.createElement(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				variant: "primary",
+				onClick: props.onConfirm
+			}, "确认 " + action));
+			return react.default.createElement(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				open: true,
+				title: action + " 确认",
+				closeLabel: "取消",
+				onClose: props.onCancel,
+				description: `处理当前工作区全部 ${props.count} 个待审差异文件（含其他轮次）？`,
+				footer
+			}, react.default.createElement("p", null, warning));
+		}
+		//#endregion
 		//#region src/shared/reviewRegions.ts
 		/** @public @author ddj 2026年10月27号 @param diff Immutable official patch. @returns Contiguous change runs with stable source-coordinate identities. */
 		function reviewBlocks(diff) {
@@ -23878,6 +23907,7 @@ window.__ModuleLoader__.load({
 			const hoverPanelRef = react.default.useRef(false);
 			const batchBusyRef = react.default.useRef(false);
 			const [reviewBatchBusy, setReviewBatchBusy] = react.default.useState(false);
+			const [reviewAllPrompt, setReviewAllPrompt] = react.default.useState(null);
 			const reviewLifeRef = react.default.useRef(null);
 			react.default.useEffect(() => {
 				const token = { live: true };
@@ -26936,9 +26966,7 @@ window.__ModuleLoader__.load({
 					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?.();
@@ -27001,8 +27029,32 @@ window.__ModuleLoader__.load({
 					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;
@@ -29090,7 +29142,7 @@ window.__ModuleLoader__.load({
 				}))
 			}) : null;
 			const dapBpEditEl = null;
-			return layout === "side" ? react.default.createElement("div", {
+			const rootEl = layout === "side" ? react.default.createElement("div", {
 				ref: viewRootRef,
 				"data-edrv-view": "1",
 				"data-edrv-layout": "side",
@@ -29104,6 +29156,13 @@ window.__ModuleLoader__.load({
 					maxHeight: "var(--edrv-editor-height, 100%)"
 				})
 			}, editorRow, tabMenuEl, paletteEl, svnLogEl, svnUpdateEl, svnDiffEl, patchDialogEl, sumDialogEl, dlogEl, snippetPickerEl, dapBpMenuEl, dapBpEditEl);
+			const reviewAllEl = reviewAllPrompt?.token?.live && reviewAllPrompt.token === reviewLifeRef.current ? react.default.createElement(ReviewAllConfirm, {
+				reject: reviewAllPrompt.reject,
+				count: reviewAllPrompt.count,
+				onCancel: cancelReviewAll,
+				onConfirm: confirmReviewAll
+			}) : null;
+			return react.default.createElement(react.default.Fragment, null, rootEl, reviewAllEl);
 		}
 		//#endregion
 		//#region src/client/ui/DiffBadge.ts
@@ -32473,8 +32532,6 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/mcpSessionState.ts
 		/** Shared, read-only sidebar MCP polling. @author ddj 2026年10月20号 */
-		const unavailable = { stale: true };
-		const inactive = { stale: false };
 		/** One poller for all mounted row/hover consumers; never retains or activates sessions. */
 		var McpSessionState = class {
 			fetchStatus;
@@ -32484,7 +32541,10 @@ window.__ModuleLoader__.load({
 			timer;
 			request;
 			epoch = 0;
-			stale = true;
+			fallback = {
+				stale: true,
+				reason: "pending"
+			};
 			disposed = false;
 			/** @public @author ddj 2026年10月20号 @param fetchStatus Authenticated read-only query. @param page Visibility boundary, omitted for server tests. */
 			constructor(fetchStatus, page) {
@@ -32493,7 +32553,7 @@ window.__ModuleLoader__.load({
 			}
 			/** @public @author ddj 2026年10月20号 @param sessionId Row identity. @returns Stable view until the next observation. */
 			get(sessionId) {
-				return this.views.get(sessionId) ?? (this.stale ? unavailable : inactive);
+				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, listener) {
@@ -32504,7 +32564,8 @@ window.__ModuleLoader__.load({
 				this.listeners.set(sessionId, listeners);
 				if (first) {
 					this.page?.addEventListener("visibilitychange", this.visibility);
-					this.poll();
+					if (this.page?.hidden) this.markStale("paused");
+					else this.poll();
 				}
 				return () => {
 					listeners.delete(listener);
@@ -32523,7 +32584,7 @@ window.__ModuleLoader__.load({
 				clearTimeout(this.timer);
 				this.timer = void 0;
 				this.request?.abort();
-				this.publish(void 0);
+				this.markStale("paused");
 			}
 			/** @private @author ddj 2026年10月20号 Cleans listener lifetime as well as timers. */
 			pause() {
@@ -32537,42 +32598,68 @@ window.__ModuleLoader__.load({
 				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 @author ddj 2026年10月27号 @param snapshot Fresh ledger. Records browser receipt time without changing the host protocol. */
 			publish(snapshot) {
-				this.stale = snapshot === void 0;
-				if (snapshot) this.views = new Map(snapshot.sessions.map((status) => [status.sessionId, {
+				const observedAt = Date.now();
+				this.fallback = {
+					stale: false,
+					observedAt
+				};
+				this.views = new Map(snapshot.sessions.map((status) => [status.sessionId, {
 					status,
-					stale: false
+					stale: false,
+					observedAt
 				}]));
-				else for (const [id, view] of this.views) this.views.set(id, {
+				this.notify();
+			}
+			/** @private @author ddj 2026年10月27号 @param reason Query lifecycle, never a claim about connection health. Preserves stable references for unchanged observations. */
+			markStale(reason) {
+				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
+					stale: true,
+					reason
 				});
+				this.notify();
+			}
+			/** @private @author ddj 2026年10月27号 Notifies mounted row and hover consumers after an observation changes. */
+			notify() {
 				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. */
 			async poll() {
 				if (this.disposed || this.request || !this.listeners.size || this.page?.hidden) return;
+				clearTimeout(this.timer);
+				this.timer = void 0;
+				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 = () => {
 					request.abort();
-					if (epoch === this.epoch) this.publish(void 0);
+					if (epoch === this.epoch) this.markStale("unavailable");
 				};
 				const deadline = setTimeout(expire, 1e4);
 				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(void 0);
+					if (epoch === this.epoch) this.markStale("unavailable");
 				} finally {
 					clearTimeout(deadline);
 					this.request = void 0;
-					if (!this.disposed && this.listeners.size && !this.page?.hidden) this.timer = setTimeout(() => {
-						this.poll();
-					}, 2500);
+					if (!this.disposed && this.listeners.size && !this.page?.hidden) {
+						const delay = epoch === this.epoch ? 2500 : 0;
+						this.timer = setTimeout(() => {
+							this.poll();
+						}, delay);
+					}
 				}
 			}
 		};
@@ -32615,7 +32702,7 @@ window.__ModuleLoader__.load({
 		}
 		/** @public @author ddj 2026年10月20号 @param view Current observation. @returns Accessible row label; steady states deliberately do not occupy the leading slot. */
 		function mcpRowLabel(view) {
-			if (view.stale) return "项目 MCP 状态暂不可用（上次状态已过期）";
+			if (view.stale) return void 0;
 			if (!view.status || !busy.has(view.status.phase) && view.status.phase !== "error") return void 0;
 			return "项目 MCP：" + labels[view.status.phase];
 		}
@@ -32624,7 +32711,7 @@ window.__ModuleLoader__.load({
 			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.default.createElement("span", {
 				role: "img",
 				"aria-label": label,
@@ -32644,6 +32731,12 @@ window.__ModuleLoader__.load({
 		function elapsed(start, end) {
 			return Math.max(0, (end - start) / 1e3).toFixed(1) + " 秒";
 		}
+		/** @private @author ddj 2026年10月27号 @param view Query observation. @returns Query-only explanation, separate from initialization health. */
+		function queryMessage(view) {
+			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. */
 		function McpSessionDetail(props) {
 			const view = useMcpView(props);
@@ -32655,20 +32748,26 @@ window.__ModuleLoader__.load({
 				return () => clearInterval(tick);
 			}, [status, view.stale]);
 			const children = [react.default.createElement("strong", { key: "title" }, "项目 MCP")];
-			if (view.stale) children.push(react.default.createElement("div", {
-				key: "stale",
-				role: "status"
-			}, "状态暂不可用；以下如有记录，为上次观测结果"));
-			if (!status) children.push(react.default.createElement("div", { key: "empty" }, view.stale ? "等待状态查询" : "当前无活跃 MCP 实例"));
-			else {
-				const end = status.finishedAt ?? now;
+			if (view.stale) {
+				children.push(react.default.createElement("div", {
+					key: "stale",
+					role: "status"
+				}, queryMessage(view)));
+				if (status) children.push(react.default.createElement("div", { key: "history" }, "以下为上次观测结果，不代表当前状态"));
+				if (view.observedAt !== void 0) children.push(react.default.createElement("div", { key: "observed" }, "上次观测时间：" + new Date(view.observedAt).toLocaleString()));
+			}
+			if (!status && !view.stale) children.push(react.default.createElement("div", { key: "empty" }, "当前无活跃 MCP 实例"));
+			if (status) {
+				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 > 1e4;
 				children.push(react.default.createElement("div", { key: "phase" }, labels[status.phase], slow ? "（耗时较长，不代表失败）" : ""));
 				children.push(react.default.createElement("div", { key: "time" }, `${completed}/${status.servers.length} 已初始化 · 总耗时 ${elapsed(status.startedAt, end)} · 当前阶段 ${elapsed(status.phaseAt, end)}`));
 				if (status.configMs !== void 0) children.push(react.default.createElement("div", { key: "config" }, `配置准备 ${elapsed(0, status.configMs)}`));
 				if (status.error) children.push(react.default.createElement("div", { key: "error" }, status.error));
-				for (const server of status.servers) children.push(react.default.createElement("div", { key: "server:" + server.serverName }, `${server.serverName}：${labels[server.phase]}${server.reused ? " · 复用已有连接" : ""}${server.phase === "idle" ? "" : " · " + elapsed(server.startedAt, server.finishedAt ?? now)}`, server.queuedMs === void 0 ? "" : " · 排队 " + elapsed(0, server.queuedMs), server.connectMs === void 0 ? "" : " · 初始化 " + elapsed(0, server.connectMs), server.firstCallMs === void 0 ? "" : " · 首次工具执行 " + elapsed(0, server.firstCallMs), server.error ? " · " + server.error : ""));
+				for (const server of status.servers) children.push(react.default.createElement("div", { key: "server:" + server.serverName }, `${server.serverName}：${labels[server.phase]}${server.reused ? " · 复用已有连接" : ""}${server.phase === "idle" ? "" : " · " + elapsed(server.startedAt, server.finishedAt ?? observedNow)}`, server.queuedMs === void 0 ? "" : " · 排队 " + elapsed(0, server.queuedMs), server.connectMs === void 0 ? "" : " · 初始化 " + elapsed(0, server.connectMs), server.firstCallMs === void 0 ? "" : " · 首次工具执行 " + elapsed(0, server.firstCallMs), server.error ? " · " + server.error : ""));
 			}
 			children.push(react.default.createElement("small", { key: "scope" }, "仅 VSCodeMode 管理的项目 MCP；不含全局或 preset MCP。"));
 			return react.default.createElement("section", {