dsh-vscode-workbench 0.1.2 → 0.1.3

package/README.en.md

@@ -48,8 +48,10 @@ 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`.
+The terminal remains an independent plugin. This workbench only owns the shortcuts and invokes it through `registerBottomPanel()` and the `terminal.new` command.
 
 
 ## Security

package/README.md

@@ -46,8 +46,10 @@ 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` 命令调用它。
 
 
 ## 安全

package/lib/client.js

@@ -4794,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,
@@ -4825,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,
@@ -4841,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"
 					})
 				]
 			});
@@ -4889,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 }) {
@@ -6028,6 +6052,21 @@ 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 }) => {
 			const sessionId = useSessions((state) => state.current);
@@ -6086,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) {