dsh-vscode-mode 0.14.5 → 0.14.6

package/README.md

@@ -459,18 +459,18 @@ DSH 每次启动监听随机端口，`http://127.0.0.1:<port>` 就是浏览器 o
 
 官方 `dsh plugin` 方式，三选一。下面以 `web` profile 为例；Desktop 或其他命名
 profile 请替换为实际目标，不要把示例目录当成当前运行 profile。升级前可阅读
-[0.14.5 发布说明](docs/release-0.14.5.md)；从 0.14.2 或更旧版本升级还须阅读
+[0.14.6 发布说明](docs/release-0.14.6.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.14.5
+dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.14.6
 
 # ② npm 注册表（发布到 npm 后）
-dsh plugin --profile web add dsh-vscode-mode@0.14.5
+dsh plugin --profile web add dsh-vscode-mode@0.14.6
 
 # ③ GitHub Release tgz 直装（Release asset 可用后）
-dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.5/dsh-vscode-mode-0.14.5.tgz
+dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.6/dsh-vscode-mode-0.14.6.tgz
 ```
 
 > **DSH 0.2 兼容范围**：`0.14.1` 起精确放行 `0.2.0-rc.1`，`0.14.4` 再加入
@@ -806,6 +806,7 @@ Keep All / Undo All 却是亮的。修复：单文件 Keep / Undo 覆盖冲突
 完整变更见 [GitHub Releases](https://github.com/Lenonss/DSH_VsCodeMode/releases)。
 近期关键版本：
 
+- **v0.14.6**：**对话切换位置保持与共享查找**——同工作区切换对话时，在编辑器释放前保存实际模型的滚动、光标和选区等视图状态；只在模型重新绑定时恢复，显式行号导航仍优先。跨文件共享 Ctrl+F 查询、大小写/全词/正则与开关状态，不共享选区搜索范围或匹配序号，不抢焦点；工作区隔离并释放监听。验证范围与真实 GUI 验收缺口见 [0.14.6 发布说明](docs/release-0.14.6.md)。
 - **v0.14.5**：**计划模式接入与行内差异显示修复**——计划文件默认预览，当前会话新生成计划自动打开；官方计划及待审批计划可转入只读虚拟页签，审批仍由官方控件完成。行内增删与 Monaco diff 共用明暗色盘，删除代码按当前语言着色，旧行号仅在快照可验证时显示；修复纯删除的 BOM/CRLF 定位，清理过期异步结果与监听。验证及真实 GUI 冒烟边界见 [0.14.5 发布说明](docs/release-0.14.5.md)。
 - **v0.14.4**：**Desktop rc.2 兼容与 MCP 管理修复**——六项 DSH peer 精确纳入 `0.2.0-rc.2`；MCP 状态不再把配置启用或 ACTIVE 当成在线证据，只读快照轮询避免重复配置扫描，配置修改串行防止丢更新，跨全局/项目拒绝工具命名空间交叠并安全隐藏历史歧义工具。编辑器在没有待处理差异时隐藏底部操作条，其他文件的差异和冲突入口保留。验证范围、升级及回退注意事项见 [0.14.4 发布说明](docs/release-0.14.4.md)。
 - **v0.14.3**：**差异审查性能与持久化**——差异定位/行号与多块应用避免重复全文扫描/复制；归档从全量 JSON 改为每工作区 SQLite 事务追加，活跃记录由整份重写改为逐条更新，同库原子提交决策及 Undo 意图；归档列表按页加载、详情按批次读取。Web 实测单块 Keep RPC 17/22ms（样本值），旧归档 JSON 与迁移前活跃 JSON 保留；侧栏编辑器内的差异栏改为居中悬浮 banner。升级和回退注意事项见 [0.14.3 发布说明](docs/release-0.14.3.md)。

package/lib/client.js

@@ -9610,6 +9610,111 @@ window.__ModuleLoader__.load({
 			}
 		}
 		//#endregion
+		//#region src/client/state/editorFindState.ts
+		const snapshots = /* @__PURE__ */ new Map();
+		/** @private @author ddj 2026年10月09号 @param state Native find state. @returns Only fields safe to share across files. */
+		function snapshotOf(state) {
+			return {
+				searchString: state.searchString,
+				isRevealed: state.isRevealed,
+				matchCase: state.matchCase,
+				wholeWord: state.wholeWord,
+				isRegex: state.isRegex
+			};
+		}
+		/** @private @author ddj 2026年10月09号 @param editor Monaco editor. @returns Supported controller, or null for native-only fallback. */
+		function controllerOf(editor) {
+			try {
+				const controller = editor.getContribution("editor.contrib.findController");
+				const state = controller?.getState?.();
+				return state && typeof state.change === "function" && typeof state.onFindReplaceStateChange === "function" && typeof controller?.start === "function" ? controller : null;
+			} catch {
+				return null;
+			}
+		}
+		/** @private @author ddj 2026年10月09号 @param controller Optional native controller. @param listener State observer. @returns Disposable subscription, or null when the internal API is incompatible. */
+		function listenFind(controller, listener) {
+			try {
+				return controller?.getState().onFindReplaceStateChange(listener) ?? null;
+			} catch {
+				return null;
+			}
+		}
+		/** @private @author ddj 2026年10月09号 @param controller Native controller. @param saved Workspace snapshot. @returns Completion when revealing; never focuses or seeds from selection. */
+		function applyFind(controller, saved) {
+			const value = {
+				...saved,
+				searchScope: null
+			};
+			if (!saved.isRevealed) {
+				controller.getState().change(value, false);
+				return;
+			}
+			return controller.start({
+				forceRevealReplace: false,
+				seedSearchStringFromSelection: "none",
+				seedSearchStringFromNonEmptySelection: false,
+				seedSearchStringFromGlobalClipboard: false,
+				shouldFocus: 0,
+				shouldAnimate: false,
+				updateSearchScope: false,
+				loop: true
+			}, value);
+		}
+		/** @public @author ddj 2026年10月09号 @param editor Monaco editor. @returns Model-switch bridge; dispose releases the native listener. */
+		function createFindBridge(editor) {
+			const controller = controllerOf(editor);
+			let scope = null;
+			let paused = true;
+			let disposed = false;
+			/** @private @author ddj 2026年10月09号 Capture only user changes, not model-reset or restoration events. */
+			function capture() {
+				if (disposed || paused || !scope || !controller) return;
+				try {
+					const saved = snapshotOf(controller.getState());
+					snapshots.delete(scope);
+					snapshots.set(scope, saved);
+					if (snapshots.size > 20) snapshots.delete(snapshots.keys().next().value);
+				} catch {}
+			}
+			const listener = listenFind(controller, capture);
+			/** @public @author ddj 2026年10月09号 Save before setModel; suppress Monaco's per-model option resets. */
+			function pause() {
+				capture();
+				paused = true;
+			}
+			/** @public @author ddj 2026年10月09号 @param nextScope Workspace owning the bound model. Restore with moveCursor=false; no per-file range or match index. */
+			function resume(nextScope) {
+				if (disposed || !controller) return;
+				scope = nextScope;
+				const saved = snapshots.get(scope) ?? {
+					searchString: "",
+					isRevealed: false,
+					matchCase: false,
+					wholeWord: false,
+					isRegex: false
+				};
+				try {
+					applyFind(controller, saved)?.catch(() => {});
+				} catch {}
+				paused = false;
+			}
+			/** @public @author ddj 2026年10月09号 Save final query and remove listener before editor destruction. */
+			function dispose() {
+				if (disposed) return;
+				capture();
+				disposed = true;
+				try {
+					listener?.dispose();
+				} catch {}
+			}
+			return {
+				pause,
+				resume,
+				dispose
+			};
+		}
+		//#endregion
 		//#region src/client/paths.ts
 		/**
 		* dsh-vscode-mode client — 浏览器端缓存键/路径统一出口（PathConst）。
@@ -9753,6 +9858,57 @@ window.__ModuleLoader__.load({
 				window.localStorage.setItem(KEY_PREFIX$4 + String(scope), serializeViewStates(states));
 			} catch (error) {}
 		}
+		//#endregion
+		//#region src/client/state/editorViewState.ts
+		/** Model-owned view/find lifecycle; ddj 2026年10月09号. */
+		/** @public @author ddj 2026年10月09号 @param editor Monaco instance. @returns Keeper owning the model's scope/path, independent of React's active closure. */
+		function createViewKeeper(editor) {
+			const find = createFindBridge(editor);
+			let bound = null;
+			let disposed = false;
+			/** @public @author ddj 2026年10月09号 @param path Optional expected path; mismatches never write a snapshot under the wrong file. Persist viewport even if cursor never moved. */
+			function save(path) {
+				if (disposed || !bound || path && path !== bound.path) return;
+				try {
+					if (editor.getModel() !== bound.model) return;
+					const states = viewStatesLoad(bound.scope);
+					const next = upsertViewState(states, bound.path, editor.saveViewState());
+					if (next !== states) viewStatesSave(bound.scope, next);
+				} catch {}
+			}
+			/** @public @author ddj 2026年10月09号 @param scope Model workspace. @param path Cache path. @param model Ready text model. Restore only on identity change, before explicit navigation effects. */
+			function bind(scope, path, model) {
+				if (disposed || !path || !model) return;
+				if (bound?.scope === scope && bound.path === path && bound.model === model && editor.getModel() === model) return;
+				save();
+				find.pause();
+				if (editor.getModel() !== model) editor.setModel(model);
+				bound = {
+					scope,
+					path,
+					model
+				};
+				const state = viewStatesLoad(scope)[path];
+				if (state) try {
+					editor.restoreViewState(state);
+				} catch {}
+				find.resume(scope);
+			}
+			/** @public @author ddj 2026年10月09号 Save before dispose/ref clearing; repeated cleanup is a no-op. */
+			function dispose() {
+				if (disposed) return;
+				save();
+				find.dispose();
+				disposed = true;
+				bound = null;
+				editor.dispose();
+			}
+			return {
+				save,
+				bind,
+				dispose
+			};
+		}
 		/**
 		* 归一化预览态路径表：丢弃非字符串/空串、去重（保留首次出现顺序），超限截断。
 		* @author ddj 2026年09月28号
@@ -20550,7 +20706,7 @@ window.__ModuleLoader__.load({
 			const monacoRef = react.default.useRef(null);
 			const modelsRef = react.default.useRef(null);
 			if (!modelsRef.current) modelsRef.current = modelsForScope(scope);
-			const viewStatesRef = react.default.useRef({});
+			const viewKeeperRef = react.default.useRef(null);
 			const saveTimerRef = react.default.useRef(createSaveTimer());
 			const savingRef = react.default.useRef(/* @__PURE__ */ new Set());
 			const loadSeqRef = react.default.useRef(0);
@@ -20765,40 +20921,15 @@ window.__ModuleLoader__.load({
 				addTab(normalized, select, preview);
 				return normalized;
 			};
-			/**
-			* 保存当前活动文件的视图状态（光标/滚动/折叠）到工作区作用域缓存。
-			* @author ddj 2026年08月28号
-			* @param path 要保存的文件路径（缺省 = 当前 active）
-			*/
-			const saveViewState = (path) => {
-				const ed = editorRef.current;
-				const target = path ?? active;
-				if (!ed || !target) return;
-				try {
-					const state = ed.saveViewState();
-					if (!state) return;
-					viewStatesRef.current = upsertViewState(viewStatesRef.current, target, state);
-					viewStatesSave(scope, viewStatesRef.current);
-				} catch (e) {}
-			};
+			/** @private @author ddj 2026年10月09号 @param path 可选预期文件路径。按已绑定模型归属保存，避免新 active 覆盖旧文件状态。 */
+			const saveViewState = (path) => viewKeeperRef.current?.save(path);
 			saveViewStateRef.current = saveViewState;
-			/**
-			* 恢复指定文件的视图状态（内容就绪、setModel 后调用；恢复后即消费删除）。
-			* @author ddj 2026年08月28号
-			* @param path 文件路径
-			*/
-			const restoreViewState = (path) => {
-				const ed = editorRef.current;
-				if (!ed || !path) return;
-				const saved = viewStatesRef.current[path];
-				if (!saved) return;
-				const next = Object.assign({}, viewStatesRef.current);
-				delete next[path];
-				viewStatesRef.current = next;
-				try {
-					ed.restoreViewState(saved);
-				} catch (e) {}
-			};
+			/** @private @author ddj 2026年10月09号 ref 脱离与 effect 卸载共用：保存视图/查找后销毁，重复调用无副作用。 */
+			const disposeEditor = react.default.useCallback(() => {
+				viewKeeperRef.current?.dispose();
+				viewKeeperRef.current = null;
+				editorRef.current = null;
+			}, []);
 			/**
 			* 采集当前焦点条目：路径从编辑器 model 实时读取（避免空依赖闭包读到过期 active），
 			* 位置/viewState 从编辑器读取；编辑器或模型未就绪 → null。
@@ -21611,7 +21742,6 @@ window.__ModuleLoader__.load({
 				if (!sessionId || restoredScopeRef.current === scope) return;
 				restoredScopeRef.current = scope;
 				modelsRef.current = modelsForScope(scope);
-				viewStatesRef.current = viewStatesLoad(scope);
 				mdPreviewRef.current = mdPreviewLoad(String(scope));
 				try {
 					const raw = localStorage.getItem(CACHE_KEY.editor + String(scope)) ?? localStorage.getItem(CACHE_KEY.editorLegacy + String(scope));
@@ -22338,15 +22468,15 @@ window.__ModuleLoader__.load({
 				if (!monaco || !editorRef.current || !active || !contentReady) return;
 				const ed = editorRef.current;
 				const model = getModel(active, content);
-				if (ed.getModel() !== model) ed.setModel(model);
+				viewKeeperRef.current?.bind(String(scope), active, model);
 				syncTypeSuggest(ed, monaco);
-				restoreViewState(active);
 				setLoadStage((prev) => ({
 					progress: Math.max(96, prev.progress),
 					message: "创建编辑器视图…"
 				}));
 			}, [
 				monaco,
+				scope,
 				active,
 				content,
 				contentReady,
@@ -22419,10 +22549,7 @@ window.__ModuleLoader__.load({
 					navFlashTimerRef.current = null;
 				}
 				navFlashRef.current = [];
-				if (editorRef.current) {
-					editorRef.current.dispose();
-					editorRef.current = null;
-				}
+				disposeEditor();
 				for (const ctl of pdfCtlRef.current.values()) ctl.destroy();
 				pdfCtlRef.current.clear();
 				clearZoomMem();
@@ -22434,10 +22561,7 @@ window.__ModuleLoader__.load({
 			}, []);
 			const ensureEditor = react.default.useCallback((node) => {
 				if (!node) {
-					if (editorRef.current) {
-						editorRef.current.dispose();
-						editorRef.current = null;
-					}
+					disposeEditor();
 					return;
 				}
 				if (editorRef.current || !monacoRef.current) return;
@@ -22668,6 +22792,7 @@ window.__ModuleLoader__.load({
 				};
 				node.addEventListener("contextmenu", onBpCtxCapture, true);
 				editorRef.current = ed;
+				viewKeeperRef.current = createViewKeeper(ed);
 			}, []);
 			react.default.useEffect(() => {
 				const ed = editorRef.current;