dsh-vscode-workbench 0.1.1 → 0.1.3

package/README.en.md

@@ -34,13 +34,6 @@ The workbench mounts through the official `sidebar.footer.action` and `shell.ove
 
 ## Installation
 
-Install the aggregate package for the complete workbench with terminal integration:
-
-```bash
-dsh plugin --profile web add dsh-vscode-plugin
-```
-
-Install only the workbench and its extension API:
 
 ```bash
 dsh plugin --profile web add dsh-vscode-workbench
@@ -55,12 +48,11 @@ dsh plugin --profile web add dsh-vscode-workbench
 | `Ctrl+Shift+G` | Open Source Control |
 | `Ctrl+S` | Save the active file |
 | `Ctrl+Alt+B` | Toggle the DSH conversation panel |
+| `Ctrl+\`` | Toggle the registered terminal panel |
+| `Ctrl+Shift+\`` | Create a terminal and show its panel |
 
-Terminal shortcuts are registered by `dsh-vscode-plugin`.
-
-## Extension API
+The terminal remains an independent plugin. This workbench only owns the shortcuts and invokes it through `registerBottomPanel()` and the `terminal.new` command.
 
-The browser exposes a `vscodeWorkbench` service for registering bottom panels and commands and controlling workbench visibility. `dsh-vscode-plugin` uses this API to mount `@xterm/xterm`.
 
 ## Security
 

package/README.md

@@ -33,14 +33,6 @@
 
 ## 安装
 
-推荐安装包含终端适配器的聚合包：
-
-```bash
-dsh plugin --profile web add dsh-vscode-plugin
-```
-
-仅使用工作台和扩展 API：
-
 ```bash
 dsh plugin --profile web add dsh-vscode-workbench
 ```
@@ -54,12 +46,11 @@ dsh plugin --profile web add dsh-vscode-workbench
 | `Ctrl+Shift+G` | 打开源代码管理 |
 | `Ctrl+S` | 保存当前文件 |
 | `Ctrl+Alt+B` | 显示或隐藏 DSH 对话栏 |
+| `Ctrl+\`` | 显示或隐藏已注册的终端面板 |
+| `Ctrl+Shift+\`` | 新建终端并显示终端面板 |
 
-终端快捷键由 `dsh-vscode-plugin` 注册。
-
-## 扩展
+终端仍由独立插件提供；本工作台只注册快捷键，并通过 `registerBottomPanel()` 和 `terminal.new` 命令调用它。
 
-浏览器端提供 `vscodeWorkbench` 服务，可注册底部面板和命令，并控制工作台与面板显隐。`dsh-vscode-plugin` 使用该接口挂载 `@xterm/xterm`。
 
 ## 安全
 

package/lib/client.js

@@ -4191,6 +4191,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 		//#endregion
 		//#region src/client/MonacoEditor.tsx
 		let loading;
+		/** Monaco chrome used by both editors so only the narrow native scrollbar remains. */
+		const WORKBENCH_EDITOR_CHROME = {
+			minimap: { enabled: false },
+			renderOverviewRuler: false,
+			overviewRulerLanes: 0,
+			hideCursorInOverviewRuler: true,
+			scrollbar: {
+				verticalScrollbarSize: 10,
+				horizontalScrollbarSize: 10
+			}
+		};
 		function loadMonaco() {
 			loading ??= new Promise((resolve, reject) => {
 				const start = () => {
@@ -4233,9 +4244,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 						renderSideBySide: props.mode === "split",
 						theme: props.theme === "dark" ? "vs-dark" : "vs",
 						fontSize: 14,
-						minimap: { enabled: false },
+						...WORKBENCH_EDITOR_CHROME,
 						originalEditable: false,
-						renderOverviewRuler: true,
 						ignoreTrimWhitespace: false
 					});
 					instance.setModel({
@@ -4300,7 +4310,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 						automaticLayout: true,
 						theme: props.theme === "dark" ? "vs-dark" : "vs",
 						fontSize: 14,
-						minimap: { enabled: true },
+						...WORKBENCH_EDITOR_CHROME,
 						wordWrap: "off"
 					});
 					editor.current = instance;
@@ -4427,6 +4437,37 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 			});
 		}
 		//#endregion
+		//#region src/client/workspaceState.ts
+		/** Remove editor state that belongs to the previous workspace. */
+		function resetWorkspaceDocuments() {
+			return {
+				tabs: [],
+				active: void 0,
+				error: void 0
+			};
+		}
+		/** Identifies responses that still belong to the active workspace request. */
+		var WorkspaceRequestScope = class {
+			epoch = 0;
+			/** Begin loading another workspace and invalidate earlier work. */
+			begin() {
+				this.epoch += 1;
+				return this.epoch;
+			}
+			/** Return the active workspace request identifier. */
+			current() {
+				return this.epoch;
+			}
+			/** Invalidate an active request while preserving any newer request. */
+			invalidate(epoch) {
+				if (this.epoch === epoch) this.epoch += 1;
+			}
+			/** Return whether a response may update the current workspace. */
+			isCurrent(epoch) {
+				return epoch === this.epoch;
+			}
+		};
+		//#endregion
 		//#region src/client/Workbench.tsx
 		/** Return the basename shown in a tab while preserving its full internal path. */
 		function tabLabel(tab) {
@@ -4753,20 +4794,33 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 		}
 		function graphRows(commits) {
 			const visible = new Set(commits.map((commit) => commit.hash));
-			let lanes = commits[0] ? [commits[0].hash] : [];
+			let nextColor = 0;
+			let lanes = commits[0] ? [{
+				hash: commits[0].hash,
+				color: nextColor++
+			}] : [];
 			return commits.map((commit) => {
-				let lane = lanes.indexOf(commit.hash);
+				let lane = lanes.findIndex((track) => track.hash === commit.hash);
 				if (lane < 0) {
-					lanes = [commit.hash, ...lanes];
+					lanes = [{
+						hash: commit.hash,
+						color: nextColor++
+					}, ...lanes];
 					lane = 0;
 				}
 				const before = [...lanes];
-				const after = before.filter((hash) => hash !== commit.hash);
+				const current = before[lane];
+				const after = before.filter((track) => track.hash !== commit.hash);
 				const parents = commit.parents.filter((parent) => visible.has(parent));
 				parents.forEach((parent, index) => {
-					if (!after.includes(parent)) after.splice(Math.min(lane + index, after.length), 0, parent);
+					if (after.some((track) => track.hash === parent)) return;
+					const color = index === 0 ? current.color : nextColor++;
+					after.splice(Math.min(lane + index, after.length), 0, {
+						hash: parent,
+						color
+					});
 				});
-				const parentLanes = parents.map((parent) => after.indexOf(parent)).filter((index) => index >= 0);
+				const parentLanes = parents.map((parent) => after.findIndex((track) => track.hash === parent)).filter((index) => index >= 0);
 				lanes = after;
 				return {
 					commit,
@@ -4784,15 +4838,23 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 			"#d9a441",
 			"#9b7bea"
 		];
-		function graphColor(lane) {
-			return GRAPH_COLORS[lane % GRAPH_COLORS.length];
+		function graphColor(color) {
+			return GRAPH_COLORS[color % GRAPH_COLORS.length];
 		}
 		function graphWidth(row) {
 			return Math.max(row.before.length, row.after.length, row.lane + 1, 1) * 14 + 8;
 		}
+		/** Draw a fixed-radius, orthogonal transition between two graph lanes. */
+		function graphTrackPath(from, to, startY, endY, bendY) {
+			if (from === to) return `M ${from} ${startY} V ${endY}`;
+			const direction = Math.sign(to - from);
+			const radius = Math.min(5, Math.abs(to - from) / 2, Math.abs(bendY - startY), Math.abs(endY - bendY));
+			return `M ${from} ${startY} V ${bendY - radius} Q ${from} ${bendY} ${from + direction * radius} ${bendY} H ${to - direction * radius} Q ${to} ${bendY} ${to} ${bendY + radius} V ${endY}`;
+		}
 		function GraphTracks({ row }) {
 			const width = graphWidth(row);
 			const x = row.lane * 14 + 8;
+			const current = row.before[row.lane];
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
 				className: "dvw-graph-svg",
 				width,
@@ -4800,41 +4862,44 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 				viewBox: `0 0 ${width} 38`,
 				"aria-hidden": "true",
 				children: [
-					row.before.map((hash, lane) => {
-						if (hash === row.commit.hash) return null;
-						const target = row.after.indexOf(hash);
+					row.before.map((track, lane) => {
+						if (track.hash === row.commit.hash) return null;
+						const target = row.after.findIndex((next) => next.hash === track.hash);
 						const nextLane = target >= 0 ? target : lane;
-						const next = nextLane * 14 + 8;
-						const start = lane * 14 + 8;
 						return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
-							d: `M ${start} 0 C ${start} 14 ${next} 24 ${next} 38`,
+							d: graphTrackPath(lane * 14 + 8, nextLane * 14 + 8, 0, 38, 19),
 							fill: "none",
-							stroke: graphColor(nextLane),
-							strokeWidth: "2"
-						}, `continue-${hash}`);
+							stroke: graphColor(track.color),
+							strokeWidth: "2",
+							vectorEffect: "non-scaling-stroke"
+						}, `continue-${track.hash}`);
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
 						d: `M ${x} 0 V 19`,
 						fill: "none",
-						stroke: graphColor(row.lane),
-						strokeWidth: "2"
+						stroke: graphColor(current.color),
+						strokeWidth: "2",
+						vectorEffect: "non-scaling-stroke"
 					}),
 					row.parentLanes.map((parent, index) => {
 						const target = parent * 14 + 8;
+						const track = row.after[parent];
 						return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
-							d: `M ${x} 19 C ${x} 27 ${target} 30 ${target} 38`,
+							d: graphTrackPath(x, target, 19, 38, 29),
 							fill: "none",
-							stroke: graphColor(parent),
-							strokeWidth: "2"
-						}, `parent-${parent}-${index}`);
+							stroke: graphColor(track.color),
+							strokeWidth: "2",
+							vectorEffect: "non-scaling-stroke"
+						}, `parent-${track.hash}-${index}`);
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("circle", {
 						cx: x,
 						cy: "19",
 						r: "5",
 						fill: "var(--dvw-surface-1)",
-						stroke: graphColor(row.lane),
-						strokeWidth: "2"
+						stroke: graphColor(current.color),
+						strokeWidth: "2",
+						vectorEffect: "non-scaling-stroke"
 					})
 				]
 			});
@@ -4848,15 +4913,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 				viewBox: `0 0 ${width} 100`,
 				preserveAspectRatio: "none",
 				"aria-hidden": "true",
-				children: row.after.map((hash, lane) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("line", {
+				children: row.after.map((track, lane) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("line", {
 					x1: lane * 14 + 8,
 					y1: "0",
 					x2: lane * 14 + 8,
 					y2: "100",
-					stroke: graphColor(lane),
+					stroke: graphColor(track.color),
 					strokeWidth: "2",
 					vectorEffect: "non-scaling-stroke"
-				}, hash))
+				}, track.hash))
 			});
 		}
 		function CommitGraph({ commits, expanded, files, onToggle, onOpenFile }) {
@@ -5234,6 +5299,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 			const [chatWidth, setChatWidth] = (0, react.useState)(() => Math.max(400, Math.min(720, Math.round(Number(localStorage.getItem("dvw:dsh-chat-width")) || 420))));
 			const [chatVisible, setChatVisible] = (0, react.useState)(() => localStorage.getItem("dvw:dsh-chat-visible") !== "closed");
 			const [outlineVisible, setOutlineVisible] = (0, react.useState)(() => localStorage.getItem("dvw:outline") !== "closed");
+			const tabsRef = (0, react.useRef)(tabs);
+			tabsRef.current = tabs;
+			const workspaceRequests = (0, react.useRef)(new WorkspaceRequestScope());
 			const dshDark = useDshDarkTheme();
 			const [theme, setTheme] = (0, react.useState)(() => {
 				const saved = localStorage.getItem("dvw:theme");
@@ -5256,9 +5324,69 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 				window.addEventListener("keydown", onKey, true);
 				return () => window.removeEventListener("keydown", onKey, true);
 			}, [snapshot.visible]);
+			const openForWorkspace = async (targetSessionId, epoch, path, line, column) => {
+				if (!workspaceRequests.current.isCurrent(epoch)) return;
+				if (tabsRef.current.find((tab) => tab.path === path)) {
+					setActive(path);
+					setTabs((rows) => rows.map((tab) => tab.path === path ? {
+						...tab,
+						line,
+						column
+					} : tab));
+					return;
+				}
+				if (/\.(?:avif|bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(path)) {
+					const imageUrl = `/dsh-vscode/file?sessionId=${encodeURIComponent(targetSessionId)}&path=${encodeURIComponent(path)}`;
+					if (!workspaceRequests.current.isCurrent(epoch)) return;
+					setTabs((rows) => workspaceRequests.current.isCurrent(epoch) ? [...rows.filter((tab) => tab.path !== path), {
+						path,
+						content: "",
+						draft: "",
+						revision: "",
+						size: 0,
+						binary: false,
+						tooLarge: false,
+						dirty: false,
+						imageUrl
+					}] : rows);
+					setActive(path);
+					return;
+				}
+				try {
+					const doc = await api("fs.read", {
+						sessionId: targetSessionId,
+						path
+					});
+					if (!workspaceRequests.current.isCurrent(epoch)) return;
+					if (doc.binary || doc.tooLarge) {
+						setError(doc.binary ? "二进制文件不能在文本编辑器中打开" : `文件超过 5 MiB：${path}`);
+						return;
+					}
+					setTabs((rows) => workspaceRequests.current.isCurrent(epoch) ? [...rows.filter((tab) => tab.path !== path), {
+						...doc,
+						draft: doc.content,
+						dirty: false,
+						line,
+						column,
+						preview: /\.md$/i.test(path)
+					}] : rows);
+					setActive(path);
+				} catch (error) {
+					if (workspaceRequests.current.isCurrent(epoch)) setError(String(error));
+				}
+			};
 			(0, react.useEffect)(() => {
 				if (!snapshot.visible || sessionId === void 0) return;
-				api("workspace", { sessionId }).then((value) => {
+				const epoch = workspaceRequests.current.begin();
+				const cleared = resetWorkspaceDocuments();
+				setWorkspace(void 0);
+				setTabs(cleared.tabs);
+				tabsRef.current = cleared.tabs;
+				setActive(cleared.active);
+				setError(cleared.error);
+				const controller = new AbortController();
+				api("workspace", { sessionId }, controller.signal).then((value) => {
+					if (!workspaceRequests.current.isCurrent(epoch)) return;
 					setWorkspace(value);
 					const saved = localStorage.getItem(`dvw:${value.cwd}`);
 					if (saved) try {
@@ -5266,9 +5394,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 						if (parsed.view) service.show(parsed.view);
 						if (typeof parsed.panelHeight === "number") setPanelHeight(parsed.panelHeight);
 						if (typeof parsed.sideWidth === "number") setSideWidth(Math.max(210, Math.min(640, Math.round(parsed.sideWidth))));
-						for (const path of parsed.paths ?? []) open(path);
+						for (const path of parsed.paths ?? []) openForWorkspace(sessionId, epoch, path);
 					} catch {}
-				}).catch((error) => setError(String(error)));
+				}).catch((error) => {
+					if (!controller.signal.aborted && workspaceRequests.current.isCurrent(epoch)) setError(String(error));
+				});
+				return () => {
+					controller.abort();
+					workspaceRequests.current.invalidate(epoch);
+				};
 			}, [snapshot.visible, sessionId]);
 			(0, react.useEffect)(() => {
 				if (workspace) localStorage.setItem(`dvw:${workspace.cwd}`, JSON.stringify({
@@ -5299,52 +5433,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 			}, [snapshot.visible, sessionId]);
 			const open = async (path, line, column) => {
 				if (sessionId === void 0) return;
-				if (tabs.find((t) => t.path === path)) {
-					setActive(path);
-					setTabs((rows) => rows.map((t) => t.path === path ? {
-						...t,
-						line,
-						column
-					} : t));
-					return;
-				}
-				if (/\.(?:avif|bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(path)) {
-					const imageUrl = `/dsh-vscode/file?sessionId=${encodeURIComponent(sessionId)}&path=${encodeURIComponent(path)}`;
-					setTabs((rows) => [...rows, {
-						path,
-						content: "",
-						draft: "",
-						revision: "",
-						size: 0,
-						binary: false,
-						tooLarge: false,
-						dirty: false,
-						imageUrl
-					}]);
-					setActive(path);
-					return;
-				}
-				try {
-					const doc = await api("fs.read", {
-						sessionId,
-						path
-					});
-					if (doc.binary || doc.tooLarge) {
-						setError(doc.binary ? "二进制文件不能在文本编辑器中打开" : `文件超过 5 MiB：${path}`);
-						return;
-					}
-					setTabs((rows) => [...rows, {
-						...doc,
-						draft: doc.content,
-						dirty: false,
-						line,
-						column,
-						preview: /\.md$/i.test(path)
-					}]);
-					setActive(path);
-				} catch (error) {
-					setError(String(error));
-				}
+				await openForWorkspace(sessionId, workspaceRequests.current.current(), path, line, column);
 			};
 			(0, react.useEffect)(() => {
 				const listener = (event) => void open(event.detail);
@@ -5963,11 +6052,29 @@ body[data-ds-dark-theme] .dvw-overlay,.dvw-overlay[data-dvw-theme=dark]{color-sc
 			};
 		}
 		//#endregion
+		//#region src/client/shortcuts.ts
+		/** Handle terminal shortcuts through contributions registered by a terminal adapter. */
+		function handleTerminalShortcut(event, workbench) {
+			if (event.isComposing || !event.ctrlKey || event.altKey || event.code !== "Backquote") return false;
+			if (!workbench.getPanels().some((panel) => panel.id === "terminal")) return false;
+			event.preventDefault();
+			event.stopImmediatePropagation();
+			workbench.show();
+			if (event.shiftKey) {
+				if (workbench.getSnapshot().bottomPanel !== "terminal") workbench.toggleBottomPanel("terminal");
+				queueMicrotask(() => workbench.runCommand("terminal.new"));
+			} else workbench.toggleBottomPanel("terminal");
+			return true;
+		}
+		//#endregion
 		//#region src/client/index.tsx
-		const Overlay = ({ service, useSessions }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Workbench, {
-			service,
-			useSessions
-		});
+		const Overlay = ({ service, useSessions }) => {
+			const sessionId = useSessions((state) => state.current);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Workbench, {
+				service,
+				useSessions
+			}, sessionId ?? "no-session");
+		};
 		const Footer = ({ service, wide }) => {
 			const marker = (0, react.useRef)(null);
 			const [target, setTarget] = (0, react.useState)();
@@ -6018,6 +6125,7 @@ body[data-ds-dark-theme] .dvw-overlay,.dvw-overlay[data-dvw-theme=dark]{color-sc
 			}, Overlay));
 			ctx.effect(() => {
 				const onKey = (event) => {
+					if (handleTerminalShortcut(event, service)) return;
 					if (event.isComposing || !event.ctrlKey || event.altKey) return;
 					const view = event.shiftKey && event.code === "KeyE" ? "explorer" : event.shiftKey && event.code === "KeyF" ? "search" : event.shiftKey && event.code === "KeyG" ? "git" : void 0;
 					if (view !== void 0) {