dsh-vscode-mode 0.14.8 → 0.14.9

package/README.md

@@ -459,18 +459,18 @@ DSH 每次启动监听随机端口，`http://127.0.0.1:<port>` 就是浏览器 o
 
 官方 `dsh plugin` 方式，三选一。下面以 `web` profile 为例；Desktop 或其他命名
 profile 请替换为实际目标，不要把示例目录当成当前运行 profile。升级前可阅读
-[0.14.8 发布说明](docs/release-0.14.8.md)；从 0.14.2 或更旧版本升级还须阅读
+[0.14.9 发布说明](docs/release-0.14.9.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.8
+dsh plugin --profile web add github:Lenonss/DSH_VsCodeMode#v0.14.9
 
 # ② npm 注册表（发布到 npm 后）
-dsh plugin --profile web add dsh-vscode-mode@0.14.8
+dsh plugin --profile web add dsh-vscode-mode@0.14.9
 
 # ③ GitHub Release tgz 直装（Release asset 可用后）
-dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.8/dsh-vscode-mode-0.14.8.tgz
+dsh plugin --profile web add https://github.com/Lenonss/DSH_VsCodeMode/releases/download/v0.14.9/dsh-vscode-mode-0.14.9.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.9**：**编辑快捷键与桌面安全刷新**——`Ctrl+/` 保留官方快捷键入口，行注释改为 `Ctrl+Alt+/`（Web Linux 默认不绑定）；编辑器本地 `Ctrl+D` 调用 Monaco 原生向下复制行，块注释不变。桌面 `Ctrl+Shift+R` 刷新当前界面、不重启 Host；未保存代码/PDF、待保存、保存中或外部冲突时拒绝刷新，界面状态镜像失败/超时也不刷新。真实 GUI 按键和状态恢复尚未验收，详见 [0.14.9 发布说明](docs/release-0.14.9.md)。
 - **v0.14.8**：**Unity 打开目标选择与桌面端打开修复**——Unity 外部脚本编辑器 `com.dsh.editor` 0.3.1 新增「打开目标」选择（自动/DSH Web/DSH 桌面端），桌面端按 profile bridge 定位、缺失明确报错；桌面 profile 开机自动准备独立 bridge，无需先注册 OS 菜单。修复桌面端 sessions 服务面缺 `.open`/`.create` 导致的「编辑器打开失败或取消」（改走 `materializeScope → manager.select` 多面切换与 `newDraftSession` 回落）。验证范围与真实 GUI 验收缺口见 [0.14.8 发布说明](docs/release-0.14.8.md)。
 - **v0.14.7**：**SVN 资源管理器状态图标与编辑过程自抵消自动归档**——文件树叠加 SVN 状态图标（含目录子树聚合、远程状态、冲突/缺失等标记与矢量叠加），有界快照单飞投影、流式状态解析与写操作后定向刷新；新增后再还原的编辑过程自抵消记录自动归档跳过审查，先保存再独立归档、事务失败回滚内存标志。修复 DAP 帧源码路径按语言过滤候选、不回落错误语言文件；刷新事件携带 scope/paths 细化。验证范围与真实 GUI 验收缺口见 [0.14.7 发布说明](docs/release-0.14.7.md)。
 - **v0.14.6**：**对话切换位置保持与共享查找**——同工作区切换对话时，在编辑器释放前保存实际模型的滚动、光标和选区等视图状态；只在模型重新绑定时恢复，显式行号导航仍优先。跨文件共享 Ctrl+F 查询、大小写/全词/正则与开关状态，不共享选区搜索范围或匹配序号，不抢焦点；工作区隔离并释放监听。验证范围与真实 GUI 验收缺口见 [0.14.6 发布说明](docs/release-0.14.6.md)。

package/lib/client.js

@@ -2736,6 +2736,144 @@ window.__ModuleLoader__.load({
 			return monacoPromise.finally(unsubscribe);
 		}
 		//#endregion
+		//#region src/client/monaco/editActions.ts
+		/** @public @author ddj 2026年10月12号 @param editor Target editor. @param monaco Monaco API. @param action Native action. @returns Whether a writable model accepted the action. @sideEffects Restores focus and runs an undoable native edit. */
+		function runEditAction(editor, monaco, action) {
+			if (!editor?.getModel() || !monaco || editor.getOption(monaco.editor.EditorOption.readOnly)) return false;
+			editor.focus();
+			editor.trigger("edrv-edit", action, null);
+			return true;
+		}
+		/** @public @author ddj 2026年10月12号 @param editor Plugin editor. @param monaco Monaco API. @returns Idempotent disposer. @sideEffects Overrides only plugin-local bindings and menu entries until editor disposal. */
+		function bindEditActions(editor, monaco) {
+			const local = editor.createContextKey("edrvLocalEdit", true);
+			const focus = "edrvLocalEdit && editorTextFocus";
+			const writable = focus + " && !editorReadonly";
+			const rules = monaco.editor.addKeybindingRules([{
+				keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Slash,
+				command: "",
+				when: focus
+			}, {
+				keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyD,
+				command: "editor.action.copyLinesDownAction",
+				when: writable
+			}]);
+			/** @private @author ddj 2026年10月12号 Runs the native language-aware comment action. */
+			const comment = () => {
+				runEditAction(editor, monaco, "editor.action.commentLine");
+			};
+			/** @private @author ddj 2026年10月12号 Runs the native multi-selection line-copy action. */
+			const duplicate = () => {
+				runEditAction(editor, monaco, "editor.action.copyLinesDownAction");
+			};
+			const actions = [editor.addAction({
+				id: "edrv.toggleComment",
+				label: "切换行注释（Ctrl+Alt+/）",
+				precondition: writable,
+				contextMenuGroupId: "1_edrv",
+				run: comment
+			}), editor.addAction({
+				id: "edrv.duplicateLine",
+				label: "向下复制行（Ctrl+D，编辑器本地）",
+				precondition: writable,
+				contextMenuGroupId: "1_edrv",
+				run: duplicate
+			})];
+			let disposed = false;
+			/** @private @author ddj 2026年10月12号 Releases global rule contributions owned by this instance. */
+			const dispose = () => {
+				if (disposed) return;
+				disposed = true;
+				rules.dispose();
+				for (const action of actions) action.dispose();
+				local.reset();
+				lifetime.dispose();
+			};
+			const lifetime = editor.onDidDispose(dispose);
+			return dispose;
+		}
+		//#endregion
+		//#region src/client/pageReload.ts
+		const guards = /* @__PURE__ */ new Set();
+		/** @public @author ddj 2026年10月12号 @param guard Live editor checks and view-state capture. @returns Unregister function. */
+		function addReloadGuard(guard) {
+			guards.add(guard);
+			return () => {
+				guards.delete(guard);
+			};
+		}
+		/** @private @author ddj 2026年10月12号 @param checks Current editor guards. @returns First unsafe state, or null. */
+		function reloadBlock(checks) {
+			for (const guard of checks) {
+				const reason = guard.check();
+				if (reason) return reason;
+			}
+			return null;
+		}
+		/** @public @author ddj 2026年10月12号 @param deps Page operations. @param checks Live editor guards. @returns Serialized request and cancellation. @sideEffects Flushes view state then reloads only when still safe. */
+		function createPageReload(deps, checks = guards) {
+			let busy = false;
+			let disposed = false;
+			/** @private @author ddj 2026年10月12号 @returns Completion of one guarded reload attempt. */
+			async function request() {
+				if (busy || disposed) return;
+				busy = true;
+				let timer;
+				try {
+					const reason = reloadBlock(checks);
+					if (reason) {
+						deps.notify("未刷新：" + reason);
+						return;
+					}
+					for (const guard of checks) guard.prepare();
+					const timeout = new Promise((_, reject) => {
+						timer = setTimeout(() => reject(/* @__PURE__ */ new Error("界面状态保存超时")), deps.timeoutMs ?? 5e3);
+					});
+					await Promise.race([deps.flush(), timeout]);
+					if (disposed) return;
+					const changed = reloadBlock(checks);
+					if (changed) {
+						deps.notify("未刷新：" + changed);
+						return;
+					}
+					deps.reload();
+				} catch (error) {
+					if (!disposed) deps.notify("未刷新：" + String(error));
+				} finally {
+					clearTimeout(timer);
+					busy = false;
+				}
+			}
+			return {
+				request,
+				dispose: () => {
+					disposed = true;
+				}
+			};
+		}
+		/** @public @author ddj 2026年10月12号 @returns Whether no live modal blocks page commands. */
+		function pageKeysAllowed() {
+			if (typeof document === "undefined") return true;
+			return document.querySelector("[role=\"dialog\"], [aria-modal=\"true\"]") === null;
+		}
+		/** @public @author ddj 2026年10月12号 @param flush Durable UI-state flush. @param notify User-visible failure sink. @returns Root-scope listener disposer. */
+		function installPageReload(flush, notify) {
+			const controller = createPageReload({
+				flush,
+				notify,
+				reload: () => window.location.reload()
+			});
+			/** @private @author ddj 2026年10月12号 Ignores modal-blocked commands even from programmatic callers. */
+			const onReload = () => {
+				if (pageKeysAllowed()) controller.request();
+			};
+			window.addEventListener("edrv.command.reloadWindow", onReload);
+			return () => {
+				controller.dispose();
+				window.removeEventListener("edrv.command.reloadWindow", onReload);
+			};
+		}
+		//#endregion
 		//#region src/client/imagePreview.ts
 		/**
 		* dsh-vscode-mode client — 图片文件判定、data URL 组装与缩放纯逻辑（编辑区图片预览面板用）。
@@ -5356,6 +5494,16 @@ window.__ModuleLoader__.load({
 		//#region src/client/editorModelState.ts
 		/** Monaco 编辑器实例选择器（限定在插件编辑器行内，排除官方预览等其它 Monaco）。 */
 		const EDITOR_MODEL_SELECTOR = ".edrv-editor-row .monaco-editor";
+		/** @public @author ddj 2026年10月12号 @param target Optional shortcut target. @returns Whether focus belongs to plugin code input, excluding widgets and read-only editors. */
+		function hasCodeFocus(target) {
+			if (typeof document === "undefined") return false;
+			const node = target ?? document.activeElement;
+			if (!(node instanceof Element)) return false;
+			const editor = node.closest(EDITOR_MODEL_SELECTOR);
+			if (!editor || editor.classList.contains("readonly")) return false;
+			if (node.closest(".find-widget, .suggest-widget, .rename-box, .monaco-inputbox")) return false;
+			return (typeof window === "undefined" ? null : window)?.monaco?.editor?.getEditors?.().some((item) => item.getDomNode() === editor && item.hasTextFocus() && Boolean(item.getModel())) ?? false;
+		}
 		/**
 		* 已打开文件页签选择器（页签栏在编辑器行内；空态时无此节点）。
 		* 判据同样不依赖 Monaco：图片/PDF 页签没有 Monaco 实例，但仍是「有页签可关」。
@@ -7632,6 +7780,30 @@ window.__ModuleLoader__.load({
 		* @author ddj 2026年09月10号 / 2026年10月
 		*/
 		const EDITOR_COMMANDS = [
+			{
+				id: "edrv.toggleComment",
+				label: "切换行注释",
+				category: "编辑",
+				order: 20,
+				available: needsModel,
+				run: () => emit$1("toggleComment")
+			},
+			{
+				id: "edrv.duplicateLine",
+				label: "向下复制行（Ctrl+D，编辑器本地）",
+				category: "编辑",
+				order: 30,
+				available: needsModel,
+				run: () => emit$1("duplicateLine")
+			},
+			{
+				id: "edrv.reloadWindow",
+				label: "刷新当前界面（不重启 Host）",
+				category: "视图",
+				order: 40,
+				available: pageKeysAllowed,
+				run: () => emit$1("reloadWindow")
+			},
 			{
 				id: "edrv.save",
 				label: "保存文件",
@@ -10315,6 +10487,17 @@ window.__ModuleLoader__.load({
 				inflight = run.then(() => {}, () => {});
 				return run;
 			}
+			/** @private @author ddj 2026年10月12号 @returns Durable refresh snapshot. @throws When state is unreadable, unsettled or rejected by Host. @sideEffects Resends current local state after waiting for inflight writes. */
+			async function flushStrict() {
+				if (!settleDone || !installed) throw new Error("界面状态镜像尚未就绪");
+				if (inflight) await inflight;
+				for (let index = 0; index < storage.length; index++) {
+					const key = storage.key(index);
+					if (key && isMirroredKey(key)) queue(key, storage.getItem(key));
+				}
+				const lost = await flush();
+				if (lost > 0) throw new Error("界面状态保存失败（" + lost + " 个键）：" + lastError);
+			}
 			/** 回填本地缺失键（本地已有值一律保留）。 */
 			function applyHydration(snapshot) {
 				let filled = 0;
@@ -10436,6 +10619,7 @@ window.__ModuleLoader__.load({
 				},
 				hydrate,
 				flush,
+				flushStrict,
 				hydrated() {
 					return done;
 				},
@@ -10596,6 +10780,11 @@ window.__ModuleLoader__.load({
 		async function flushUiState() {
 			if (singleton) await singleton.flush();
 		}
+		/** @public @author ddj 2026年10月12号 @returns Durable page state. @throws If the mirror is unavailable or cannot persist. */
+		async function flushPageState() {
+			if (!singleton) throw new Error("界面状态镜像不可用");
+			await singleton.flushStrict();
+		}
 		//#endregion
 		//#region src/client/state/scopeStore.ts
 		/**
@@ -20963,6 +21152,24 @@ window.__ModuleLoader__.load({
 			/** @private @author ddj 2026年10月09号 @param path 可选预期文件路径。按已绑定模型归属保存，避免新 active 覆盖旧文件状态。 */
 			const saveViewState = (path) => viewKeeperRef.current?.save(path);
 			saveViewStateRef.current = saveViewState;
+			react.default.useEffect(() => {
+				/** @private @author ddj 2026年10月12号 @returns Unsafe editor state without saving or discarding file content. */
+				function checkReload() {
+					if (Object.values(dirtyRef.current).some(Boolean)) return "存在未保存文件";
+					if (saveTimerRef.current.isPending() || savingRef.current.size) return "文件正在等待保存或保存中";
+					for (const ctl of pdfCtlRef.current.values()) if (ctl.isDirty?.()) return "存在未保存 PDF";
+					for (const path of tabPathsRef.current) if (readSync(scope, path)) return "存在外部文件冲突";
+					return null;
+				}
+				/** @private @author ddj 2026年10月12号 Captures view state only; never flushes file auto-save. */
+				function prepareReload() {
+					saveViewStateRef.current?.();
+				}
+				return addReloadGuard({
+					check: checkReload,
+					prepare: prepareReload
+				});
+			}, [scope]);
 			/** @private @author ddj 2026年10月09号 ref 脱离与 effect 卸载共用：保存视图/查找后销毁，重复调用无副作用。 */
 			const disposeEditor = react.default.useCallback(() => {
 				viewKeeperRef.current?.dispose();
@@ -22150,6 +22357,9 @@ window.__ModuleLoader__.load({
 					["edrv.command.svnTortoiseDiff", () => runSvnTortoise("diff", activeRef.current)],
 					["edrv.command.svnTortoiseBlame", () => runSvnTortoise("blame", activeRef.current)],
 					["edrv.command.svnTortoiseRevert", () => runSvnTortoise("revert", activeRef.current)],
+					["edrv:reload-status", (event) => setStatus(event.detail)],
+					["edrv.command.toggleComment", () => runEditAction(editorRef.current, monacoRef.current, "editor.action.commentLine")],
+					["edrv.command.duplicateLine", () => runEditAction(editorRef.current, monacoRef.current, "editor.action.copyLinesDownAction")],
 					["edrv.command.goToLine", () => {
 						const ed = editorRef.current;
 						if (ed?.getModel?.()) ed.trigger("edrv-goto", "editor.action.gotoLine", null);
@@ -22164,7 +22374,7 @@ window.__ModuleLoader__.load({
 					const action = byName.get(event.type);
 					if (!action) return;
 					try {
-						action();
+						action(event);
 					} catch (error) {
 						dbg(sessionId, "指令 " + event.type + " 失败：" + String(error));
 					}
@@ -22641,6 +22851,7 @@ window.__ModuleLoader__.load({
 					padding: { top: side ? 6 : 8 },
 					inlineSuggest: { enabled: true }
 				});
+				bindEditActions(ed, m);
 				ed.onDidChangeModelContent(() => {
 					if (!ed.getModel() || programmaticRef.current) return;
 					syncTypeSuggest(ed, m);
@@ -25641,6 +25852,9 @@ window.__ModuleLoader__.load({
 		/** 命令 id → 默认键位（可为多候选）。命令目录以此为准，新增命令只需加一项。 */
 		const KEYBINDING_DEFAULTS = {
 			"edrv.save": "Ctrl+S",
+			"edrv.toggleComment": "Ctrl+Alt+/",
+			"edrv.duplicateLine": "",
+			"edrv.reloadWindow": "",
 			"edrv.quickOpen": "Ctrl+P",
 			"edrv.toggleSidebar": "Ctrl+B",
 			"edrv.searchInFiles": "Ctrl+Shift+F",
@@ -25834,6 +26048,19 @@ window.__ModuleLoader__.load({
 		*/
 		const SHORTCUT_PROFILES = {
 			"edrv.toggleSidebar": {},
+			"edrv.duplicateLine": {},
+			"edrv.toggleComment": {
+				"desktop:macos": bind("Slash", ["primary", "alt"]),
+				"desktop:windows": bind("Slash", ["primary", "alt"]),
+				"desktop:linux": bind("Slash", ["primary", "alt"]),
+				"web:macos": bind("Slash", ["primary", "alt"]),
+				"web:windows": bind("Slash", ["primary", "alt"])
+			},
+			"edrv.reloadWindow": {
+				"desktop:macos": bind("KeyR", ["primary", "shift"]),
+				"desktop:windows": bind("KeyR", ["primary", "shift"]),
+				"desktop:linux": bind("KeyR", ["primary", "shift"])
+			},
 			"edrv.save": {
 				"desktop:macos": bind("KeyS", ["primary"]),
 				"desktop:windows": bind("KeyS", ["primary"]),
@@ -25969,6 +26196,12 @@ window.__ModuleLoader__.load({
 		* 设置一次性迁移进官方存储。
 		* 作者 ddj 2026年10月
 		*/
+		/** @private @author ddj 2026年10月12号 @param id Command id. @param target Shortcut target. @returns Whether new page commands can safely run from this context. */
+		function shortcutAllowed(id, target) {
+			if (id === "edrv.toggleComment" || id === "edrv.duplicateLine") return pageKeysAllowed() && hasCodeFocus(target);
+			if (id === "edrv.reloadWindow") return pageKeysAllowed();
+			return true;
+		}
 		const bridgeLog$1 = log.child("shortcuts-official");
 		/** 迁移比对用的默认键位表副本（模块态，避免每次调用重建）。 */
 		const KEYBINDING_DEFAULTS_OF = defaultKeybindings();
@@ -26057,6 +26290,7 @@ window.__ModuleLoader__.load({
 			const onKey = (event) => {
 				if (disposed) return;
 				const key = event;
+				if (key.isComposing || key.keyCode === 229 || key.defaultPrevented) return;
 				const current = chords();
 				for (const def of defs) {
 					const chord = current[def.id];
@@ -26066,7 +26300,8 @@ window.__ModuleLoader__.load({
 						bindings = parseChords(chord);
 						cache.set(chord, bindings);
 					}
-					if (!matchEvent(key, bindings) || !runner.isAvailable(def.id)) continue;
+					if (def.id === "edrv.duplicateLine") continue;
+					if (!matchEvent(key, bindings) || !shortcutAllowed(def.id, key.target) || !runner.isAvailable(def.id)) continue;
 					key.preventDefault();
 					key.stopPropagation();
 					runner.run(def.id);
@@ -26097,8 +26332,8 @@ window.__ModuleLoader__.load({
 				defaults: void 0,
 				regions: ["page", "editable"],
 				modals: [],
-				resolve: () => {
-					if (!runner.isAvailable(def.id)) return { status: "pass" };
+				resolve: (context) => {
+					if (context.modal !== null || !shortcutAllowed(def.id, context.target) || !runner.isAvailable(def.id)) return { status: "pass" };
 					return {
 						status: "handled",
 						run: () => {
@@ -35811,6 +36046,13 @@ window.__ModuleLoader__.load({
 				};
 			}, "vscode-mode: settings document editor route");
 			const commands = setupCommands(ctx);
+			/** @private @author ddj 2026年10月12号 @param message Refresh refusal; surfaced in mounted editor status and diagnostic log. */
+			const notifyReload = (message) => {
+				log.warn(message);
+				window.dispatchEvent(new CustomEvent("edrv:reload-status", { detail: message }));
+				window.alert(message);
+			};
+			ctx.effect(() => installPageReload(flushPageState, notifyReload), "vscode-mode: guarded page reload");
 			const registry = createFileOpenerRegistry();
 			const workspaces = ctx.get("workspaces");
 			const sessions = ctx.get("sessions");