dsh-vscode-mode 0.14.12 → 0.14.13

package/README.md

@@ -464,13 +464,13 @@ profile 请替换为实际目标，不要把示例目录当成当前运行 profi
 
 ```bash
 # ① Git 安装（clone + prepare 构建；推荐打固定 tag）
-dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.14.12
+dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.14.13
 
 # ② npm 注册表（发布到 npm 后）
-dsh plugin --profile web add dsh-vscode-mode@0.14.12
+dsh plugin --profile web add dsh-vscode-mode@0.14.13
 
 # ③ GitHub Release tgz 直装（Release asset 可用后）
-dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.12/dsh-vscode-mode-0.14.12.tgz
+dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.13/dsh-vscode-mode-0.14.13.tgz
 ```
 
 > **DSH 版本政策（0.14.10 起）**：六项 DSH peer 统一声明为 `*`，不再维护逐版
@@ -808,6 +808,8 @@ Keep All / Undo All 却是亮的。修复：单文件 Keep / Undo 覆盖冲突
 完整变更见 [GitHub Releases](https://github.com/Lenonss/DSH_VsCodeMode/releases)。
 近期关键版本：
 
+- **v0.14.13**：**资源管理器跟随活动文件**——打开或切换编辑文件时自动展开祖先并滚动定位；资源管理器隐藏期间保留最新活动文件，切回后定位。慢目录加载不再受短重试窗口限制，仅滚动资源树、不抢输入焦点，保留手动定位。用户已确认本地功能验收通过，详见 [0.14.13 发布说明](docs/release-0.14.13.md)。
+
 - **v0.14.12**：**搜索框全选与模糊文件搜索**——工作区搜索打开/再次聚焦时在输入更新后全选旧词或编辑器选区种子，便于直接改写；Ctrl+P 支持大小写不敏感的文件名有序非连续匹配（如 `bn` → `BaseNavigationManager.cs`、`ISTSD` → `ISTaskSystemData.lua`），保留带目录的连续路径查询与 DAP 文件定位规则。更新后需重启 DSH Host；真实 GUI 行为、主题/滚动和 Console 尚未验收，发布不代表现场验收完成。
 
 - **v0.14.11**：**编辑快捷键文案与动作验证**——注释菜单不再写死默认键位，避免自定义绑定后显示误导；明确编辑器本地 Ctrl+D 向下复制、不使用剪贴板；加强原生动作转发与幂等清理断言。默认键位与编辑算法不变，详见 [0.14.11 发布说明](docs/release-0.14.11.md)。

package/lib/client.js

@@ -30357,6 +30357,102 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/sidebar/panels/useExplorerReveal.ts
+		/** @private @author ddj 2026年10月14号 @param path Editor path. @returns Safe normalized tree path, or null. */
+		function treeRevealPath(path) {
+			if (!path || !isTreeRevealable(path)) return null;
+			return path.replace(/\\/g, "/").replace(/^\.\//, "");
+		}
+		/** @private @author ddj 2026年10月14号 @param host Tree scroll container. @param path Exact row path. @returns Whether a visible row was located. Only scrolls the tree. */
+		function revealTreeRow(host, path) {
+			if (!host || host.clientHeight <= 0) return false;
+			const escaped = path.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+			const row = host.querySelector("[data-edrv-path=\"" + escaped + "\"]");
+			if (!row) return false;
+			const viewport = host.getBoundingClientRect();
+			const bounds = row.getBoundingClientRect();
+			const top = viewport.top + host.clientTop;
+			if (bounds.top < top || bounds.bottom > top + host.clientHeight) host.scrollTop += bounds.top - top - (host.clientHeight - bounds.height) / 2;
+			return true;
+		}
+		/** @private @author ddj 2026年10月14号 @param options Current workspace, active editor and tree preparation. @returns Highlight and manual request callback. Waits for committed rows without polling; unmount cancels highlight cleanup. */
+		function useExplorerReveal(options) {
+			const { scope, activePath, treeRef } = options;
+			const [target, setTarget] = react.default.useState(null);
+			const [revealPath, setRevealPath] = react.default.useState(null);
+			const pending = react.default.useRef(null);
+			const timer = react.default.useRef(null);
+			const latest = react.default.useRef(options);
+			latest.current = options;
+			/** @private @author ddj 2026年10月14号 Clears only this hook's highlight timer. */
+			function clearHighlight() {
+				if (timer.current !== null) clearTimeout(timer.current);
+				timer.current = null;
+			}
+			/** @private @author ddj 2026年10月14号 @param path Requested tree path. Expands ancestors and replaces any previous pending target. */
+			function requestReveal(path) {
+				clearHighlight();
+				setRevealPath(null);
+				const normalized = treeRevealPath(path);
+				const current = latest.current;
+				const next = normalized ? {
+					scope: current.scope,
+					path: normalized,
+					active: current.activePath
+				} : null;
+				pending.current = next;
+				setTarget(next);
+				if (next) current.prepare(next.path);
+			}
+			/** @private @author ddj 2026年10月14号 Attempts the latest target after row commit or container resize. Consumes only a successful, current request. */
+			function tryReveal() {
+				const next = pending.current;
+				const current = latest.current;
+				if (!next || next.scope !== current.scope || next.active !== current.activePath) return;
+				if (!revealTreeRow(current.treeRef.current, next.path)) return;
+				pending.current = null;
+				setRevealPath(next.path);
+				clearHighlight();
+				timer.current = setTimeout(endHighlight, 2e3);
+			}
+			/** @private @author ddj 2026年10月14号 Ends transient reveal styling without changing the active editor row. */
+			function endHighlight() {
+				timer.current = null;
+				setRevealPath(null);
+			}
+			/** @private @author ddj 2026年10月14号 Establishes the latest editor target after workspace tree restoration. */
+			function followActive() {
+				requestReveal(activePath);
+			}
+			react.default.useEffect(followActive, [scope, activePath]);
+			react.default.useLayoutEffect(tryReveal);
+			/** @private @author ddj 2026年10月14号 @returns Cleanup for manual events, resize observation and highlight timer. */
+			function listenReveal() {
+				/** @private @author ddj 2026年10月14号 @param event Existing explicit reveal request. */
+				function onReveal(event) {
+					const detail = event.detail;
+					if (detail?.scope && detail.scope !== latest.current.scope) return;
+					if (typeof detail?.path === "string") requestReveal(detail.path);
+				}
+				const observer = typeof ResizeObserver === "function" ? new ResizeObserver(tryReveal) : null;
+				if (treeRef.current) observer?.observe(treeRef.current);
+				window.addEventListener("edrv:reveal-path", onReveal);
+				/** @private @author ddj 2026年10月14号 Cancels callbacks owned by this mounted tree. */
+				function cleanup() {
+					observer?.disconnect();
+					window.removeEventListener("edrv:reveal-path", onReveal);
+					pending.current = null;
+					clearHighlight();
+				}
+				return cleanup;
+			}
+			react.default.useEffect(listenReveal, [treeRef]);
+			return {
+				revealPath,
+				requestReveal
+			};
+		}
+		//#endregion
 		//#region src/client/sidebar/panels/FileExplorer.ts
 		/**
 		* dsh-vscode-mode client — 侧边栏「文件管理」面板（懒加载目录树 + SWR 缓存）。
@@ -30381,10 +30477,6 @@ window.__ModuleLoader__.load({
 			".pnpm",
 			".pnpm-store"
 		]);
-		/** 「在资源管理器视图中显示」高亮时长与定位重试上限（目录懒加载需等待行渲染）。 */
-		const REVEAL_HIGHLIGHT_MS = 2e3;
-		const REVEAL_RETRY_MAX = 6;
-		const REVEAL_RETRY_MS = 120;
 		/** 外部文件变化重列去抖：一轮外部批量写入（如 agent 连写多文件）合并为一次重列。 */
 		const FILE_CHANGE_DEBOUNCE_MS = 400;
 		/**
@@ -30443,15 +30535,6 @@ window.__ModuleLoader__.load({
 		}
 		const ExplorerRow = react.default.memo(rowView);
 		/**
-		* 转义 CSS 属性选择器的值（路径含引号/反斜杠时避免选择器语法错误）。
-		* @author ddj 2026年09月11号
-		* @param value 原始值
-		* @returns 可安全嵌入 `[attr="…"]` 的字符串
-		*/
-		function cssEscape(value) {
-			return String(value ?? "").replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
-		}
-		/**
 		* 目录树面板主体（SWR：有缓存先渲染，无缓存才显示加载态；加载总在后台）。
 		* @param props.ctx 面板共享上下文（sessionId/openFile/activePath/pendingByPath/fileMenuItems/notify）
 		*/
@@ -30470,7 +30553,6 @@ window.__ModuleLoader__.load({
 			const [loading, setLoading] = react.default.useState({});
 			const [errors, setErrors] = react.default.useState({});
 			const [menu, setMenu] = react.default.useState(null);
-			const [revealPath, setRevealPath] = react.default.useState(null);
 			const tokensRef = react.default.useRef({});
 			const expandedRef = react.default.useRef({});
 			expandedRef.current = expanded;
@@ -30481,9 +30563,6 @@ window.__ModuleLoader__.load({
 			const saveTimerRef = react.default.useRef(null);
 			const loadDirRef = react.default.useRef(null);
 			const refreshRef = react.default.useRef(null);
-			const revealTimerRef = react.default.useRef(null);
-			const revealTryRef = react.default.useRef(0);
-			const revealInTreeRef = react.default.useRef(null);
 			const treeRef = react.default.useRef(null);
 			const reloadDirRef = react.default.useRef(null);
 			const changedTimerRef = react.default.useRef(null);
@@ -30511,8 +30590,10 @@ window.__ModuleLoader__.load({
 				const force = opts?.force === true;
 				const doPrefetch = opts?.prefetch === true;
 				if (!force && loadingRef.current[rel]) return;
-				const token = (tokensRef.current[rel] || 0) + 1;
-				tokensRef.current[rel] = token;
+				const tokens = tokensRef.current;
+				const token = (tokens[rel] || 0) + 1;
+				tokens[rel] = token;
+				loadingRef.current = Object.assign({}, loadingRef.current, { [rel]: true });
 				setLoading((prev) => Object.assign({}, prev, { [rel]: true }));
 				setErrors((prev) => {
 					const next = Object.assign({}, prev);
@@ -30525,7 +30606,7 @@ window.__ModuleLoader__.load({
 				};
 				if (force) args.force = true;
 				rpc("edrv.listDir", args).then((res) => {
-					if (tokensRef.current[rel] !== token) return;
+					if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return;
 					if (res && res.ok && Array.isArray(res.entries)) {
 						setDirs((prev) => Object.assign({}, prev, { [rel]: res.entries }));
 						if (res.root) setRoot((prev) => prev || res.root);
@@ -30533,10 +30614,10 @@ window.__ModuleLoader__.load({
 						if (doPrefetch) prefetchDirs(rel, res.entries);
 					} else if (!entriesOf(rel)) setErrors((prev) => Object.assign({}, prev, { [rel]: res?.error ? String(res.error) : "读取目录失败" }));
 				}).catch((e) => {
-					if (tokensRef.current[rel] !== token) return;
+					if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return;
 					if (!entriesOf(rel)) setErrors((prev) => Object.assign({}, prev, { [rel]: "读取目录异常:" + String(e) }));
 				}).finally(() => {
-					if (tokensRef.current[rel] !== token) return;
+					if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return;
 					setLoading((prev) => {
 						const next = Object.assign({}, prev);
 						delete next[rel];
@@ -30553,45 +30634,21 @@ window.__ModuleLoader__.load({
 				setExpanded((prev) => Object.assign({}, prev, { [rel]: true }));
 				loadDir(rel, { prefetch: true });
 			};
-			/**
-			* 尝试把目标行滚入可见并高亮；行尚未渲染（祖先目录仍在加载）时按上限重试。
-			* @author ddj 2026年09月11号
-			* @param path 目标相对路径
-			*/
-			const tryReveal = (path) => {
-				const row = treeRef.current?.querySelector?.("[data-edrv-path=\"" + cssEscape(path) + "\"]");
-				if (!row) {
-					revealTryRef.current += 1;
-					if (revealTryRef.current < REVEAL_RETRY_MAX) window.setTimeout(() => tryReveal(path), REVEAL_RETRY_MS);
-					return;
-				}
-				row.scrollIntoView?.({ block: "center" });
-				setRevealPath(path);
-				if (revealTimerRef.current) clearTimeout(revealTimerRef.current);
-				revealTimerRef.current = window.setTimeout(() => {
-					revealTimerRef.current = null;
-					setRevealPath(null);
-				}, REVEAL_HIGHLIGHT_MS);
-			};
-			/**
-			* 在资源管理器视图中显示：展开全部祖先目录并定位高亮目标文件。
-			* 目录条目懒加载，故先展开祖先并触发加载，再由 tryReveal 轮询等行渲染。
-			* @author ddj 2026年09月11号
-			* @param path 目标相对路径
-			*/
-			const revealInTree = (path) => {
-				if (!path) return;
+			/** @private @author ddj 2026年10月14号 @param path Safe relative file path. Expands only the ancestor chain and reuses available directory entries. */
+			function prepareReveal(path) {
 				const ancestors = ancestorDirsOf(path);
-				revealTryRef.current = 0;
-				setExpanded((prev) => {
+				setExpanded(expandParents);
+				for (const dir of ["", ...ancestors]) {
+					if (entriesOf(dir)) continue;
+					loadDir(dir, { prefetch: false });
+				}
+				/** @private @author ddj 2026年10月14号 @param prev Current expansion map. @returns Expanded ancestor map. */
+				function expandParents(prev) {
 					const next = Object.assign({}, prev);
 					for (const dir of ancestors) next[dir] = true;
 					return next;
-				});
-				for (const dir of ancestors) loadDir(dir, { prefetch: false });
-				tryReveal(path);
-			};
-			revealInTreeRef.current = revealInTree;
+				}
+			}
 			const refresh = (event) => {
 				if (event?.detail?.scope && event.detail.scope !== scope) return;
 				if (event?.detail?.paths?.length) {
@@ -30600,6 +30657,7 @@ window.__ModuleLoader__.load({
 				}
 				const keep = Object.keys(expandedRef.current).filter((k) => expandedRef.current[k] === true);
 				tokensRef.current = {};
+				loadingRef.current = {};
 				setMenu(null);
 				setErrors({});
 				setLoading({});
@@ -30664,13 +30722,13 @@ window.__ModuleLoader__.load({
 			}, []);
 			react.default.useEffect(() => {
 				tokensRef.current = {};
+				loadingRef.current = {};
 				setDirs({});
 				setExpanded({});
 				setLoading({});
 				setErrors({});
 				setMenu(null);
 				setRoot(null);
-				setRevealPath(null);
 				const cached = scope ? explorerLoad(scope) : null;
 				const restored = cached?.expanded ?? [];
 				if (cached?.root) setRoot(cached.root);
@@ -30712,20 +30770,13 @@ window.__ModuleLoader__.load({
 				window.addEventListener("edrv:refresh", onRefresh);
 				return () => window.removeEventListener("edrv:refresh", onRefresh);
 			}, []);
-			react.default.useEffect(() => {
-				const onReveal = (event) => {
-					const path = event?.detail?.path;
-					if (typeof path === "string" && path) revealInTreeRef.current?.(path);
-				};
-				window.addEventListener("edrv:reveal-path", onReveal);
-				return () => {
-					window.removeEventListener("edrv:reveal-path", onReveal);
-					if (revealTimerRef.current) {
-						clearTimeout(revealTimerRef.current);
-						revealTimerRef.current = null;
-					}
-				};
-			}, []);
+			const { revealPath } = useExplorerReveal({
+				scope,
+				activePath,
+				treeRef,
+				prepare: prepareReveal
+			});
+			const activeTreePath = treeRevealPath(activePath);
 			react.default.useEffect(() => {
 				if (!scope) return;
 				const timer = setInterval(() => {
@@ -30824,7 +30875,7 @@ window.__ModuleLoader__.load({
 					isDir,
 					isOpen,
 					pending: isDir ? 0 : pendingByPath[e.path] ?? 0,
-					active: !isDir && e.path === activePath,
+					active: !isDir && e.path === activeTreePath,
 					context: Boolean(menu && menuEntries.length && menu.target.path === e.path),
 					reveal: revealPath === e.path,
 					mark: svn.local?.get(e.path),