dsh-split-view 0.2.0 → 0.2.1

package/README.md

@@ -1,61 +1,65 @@
-# dsh-split-view
+# dsh-split-view（分屏插件）
 
-把 DeepSeek Harness 主窗口变成终端式分屏，横竖随便拆，每一格都是一整个对话，分屏、关闭、最大化全程不重载。
+一个插件把 DeepSeek Harness 主窗口变成多个分屏，同时查看多个会话的状态。
 
-你有没有过这种经历。一个 agent 正在跑任务，你想同时在旁边再起一个，可官方 web 界面一个窗口只能放一个会话。开新标签页吧，两边各跑各的，切来切去心累；等任务跑完想回头看一眼，又得在一堆标签里翻。你希望它像终端，旁边拆一格，各干各的，抬眼全在。
+有过【同时跑多个任务】经历的同学应该能感受这种痛苦：多个标签切来切去，很心累。
 
-dsh-split-view 就是干这个的。装上之后主窗口变成一个可拖拽的分屏容器，每一格里跑一个完整的 DSH 客户端。
+dsh-split-view 分屏插件借鉴了终端分屏的思想。将 DSH 主窗口变成一个可拖拽的分屏容器，每个分屏里跑一个完整的 DSH 客户端。
 
 ## 长什么样
 
-截图待补，先说行为。
+![分屏实录](demo.gif)
 
-- 横竖任意嵌套分屏，可拖动调整大小
-- 每个面板一条标题栏，左边实时显示当前会话标题，右边五个按钮，向右分屏、向下分屏、放大还原、刷新、关闭
-- 一键复制「会话 id + 会话标题」
+上面是日常操作：向右分屏、向下分屏、拖动分割条调整大小、双击标题栏放大、关闭。
 
-## 安装
 
-npm 包还没发布，先从源码装。
+
+![两分屏](demo2.png)
+
+
+
+![三分屏](demo3.png)
+
+横竖任意嵌套。每个面板一条标题栏，左边实时显示当前会话标题，右边是向右分屏、向下分屏、放大还原、刷新、关闭五个按钮。点标题直接改名，双击放大，还能一键复制「会话 id + 会话标题」。
+
+## 安装
 
 ```sh
-dsh plugin --profile web add -w /path/to/dsh-split-view
+dsh plugin --profile web add dsh-split-view
 dsh web   # 重启生效
 ```
 
-`-w` 在第一次 add 时必须带。每个 profile 自带 `pnpm-workspace.yaml`，pnpm 会把它当成 workspace 根，裸加会报 `ERR_PNPM_ADDING_TO_ROOT`。
-
-发布之后一条命令就行，`dsh plugin --profile web add dsh-split-view`（CLI 安装要重启 dsh web 生效）。也可以在插件市场（dshmarket）里搜索 dsh-split-view 一键安装：市场会把插件热挂载进运行中的实例，不用重启，页面刷新一次即可。
+本地开发从源码装：`dsh plugin --profile web add -w /path/to/dsh-split-view`。
 
 卸载用 `dsh plugin --profile web remove dsh-split-view`，重启恢复单窗口。插件本身如果出问题，boot 会停下来报错，不会静默白屏，所以卸载也就是紧急恢复的办法。
 
-## 快捷键
+## 默认快捷键（支持在设置中自定义）
 
 | 键（macOS ⌘，Windows/Linux Ctrl） | 动作 |
 |---|---|
-| ⇧⌘H | 向右分屏 |
+| ⇧⌘D | 向右分屏 |
 | ⇧⌘V | 向下分屏 |
 | ⇧⌘X | 关闭聚焦面板 |
 | ⇧⌘Enter | 最大化 / 还原聚焦面板 |
 
-这几个组合是挑出来的，⌘W 关页、⌘D 书签、⌘V 粘贴这些浏览器保留键页面拦不住。关闭键原本用过 ⌘⇧Q，会把浏览器锁死；换 ⌘⇧W，又被飞书的全局热键占了；最后落在 X，就当它是 ✕。都是默认值，可以在设置里改（见下节）。
 
-焦点在 iframe 里时快捷键照样有效，面板内的 agent 捕获后转发给顶层。标题栏按钮做的是同一批动作，tooltip 里的写法按平台来，macOS 显示 ⌘⇧，其余显示 Ctrl+Shift+。点标题栏任意位置就是聚焦那个面板。面板超过 4 秒没就绪会挂一个「⚠ 未就绪 · 重载」角标，点一下单独重载它。
 
 ## 设置
 
-在任意面板里打开设置，左侧导航有一项「分屏」。四组设置：
+在任意面板里打开设置，左侧导航有一项「分屏」。
 
-- **快捷键**：点某个动作的组合键进入录制，按新组合完成改绑，Esc 取消。录制时会拦掉不安全的组合——不带 ⌘/Ctrl 的、单个字母不带 Shift/Alt 的（浏览器保留区）、⌘⇧W/Q/T/N 这类有前科或被系统占用的、以及和别的动作撞车的，都会给出提示并拒绝。
+四组设置：
+
+- **快捷键**：点某个动作的组合键进入录制，按新组合完成改绑，Esc 取消。绑什么由你决定：被浏览器或系统占用的组合、和别的动作撞车的组合照样能绑，只会给出提示；唯一的硬性要求是得带 ⌘/Ctrl。
 - **选中高亮色**：聚焦面板的描边和标题栏染色。预设色板、自定义取色器，外加「跟随主题」——跟随当前皮肤的品牌色 token，换皮肤自动跟着变。
 - **标题栏**：一个开关，隐藏所有面板的标题栏。注意标题栏上有复制会话信息、分屏、最大化、刷新、关闭按钮，双击放大、点标题重命名也走标题栏，隐藏后这些动作只能靠快捷键；点面板聚焦不受影响。
 - **恢复默认**：一键把上面全部还原，点之前会弹确认。
 
-设置的存储边界和布局一致：真源在顶层窗口的 localStorage（键 `dsh-split:prefs`），因为画标题栏、描边、分屏容器的都是顶层。面板里的设置面板改完通过 postMessage 交给顶层校验、落盘，再广播回所有面板——跨 origin 的面板也走这条路，启动时还会拉一次全量。所以不管在哪个面板里改、改完立刻全局生效，刷新也不丢。
+
 
 ## 供其它插件调用
 
-分屏能力整体暴露成了一个 Cordis 服务：面板操作、面板×会话操作（加载指定会话、发消息、改名、换模型、取消回合）、查询与订阅。面向集成方的完整契约——服务 API、URL 契约（给做原生壳的人）与已知限制——见 [api.md](./api.md)。
+分屏能力整体暴露成了一个 Cordis 服务：面板操作、面板×会话操作（加载指定会话、发消息、改名、换模型、取消回合）、查询与订阅。面向集成方的服务 API 见 [api.md](./api.md)。
 
 ## 协议
 

package/lib/client.js

@@ -427,13 +427,16 @@ function collectSyncedStorage() {
 		// tab, ⌘D bookmark, ⌘V paste…); ⌘⇧Q locked the browser and ⌘⇧W is
 		// taken by Feishu's global hotkey — X reads as ✕. Mod+Shift+letter is
 		// the space a page can actually capture. ⌘⇧Enter keeps maximize/restore.
+		// split-right sits on D so the whole chord is a one-left-hand press;
+		// note ⌘⇧D is reserved by some browsers ("bookmark all tabs") but is
+		// capturable in chrome-less shells such as the native WKWebView app.
 		/** localStorage key holding user preferences (persisted by the top window). */
 		const PREFS_KEY = "dsh-split:prefs";
 		/** Locale namespace of the settings section and its rows. */
 		const SETTINGS_NS = "settings.splitView";
 		const ACTION_IDS = ["split-right", "split-down", "close", "maximize"];
 		const DEFAULT_SHORTCUTS = Object.freeze({
-			"split-right": "Mod+Shift+H",
+			"split-right": "Mod+Shift+D",
 			"split-down": "Mod+Shift+V",
 			"close": "Mod+Shift+X",
 			"maximize": "Mod+Shift+Enter"
@@ -456,7 +459,7 @@ function collectSyncedStorage() {
 			return event.key.toLowerCase();
 		}
 
-		/** Parse a serialized combo ("Mod+Shift+H"). Mod (matched as ⌘ OR Ctrl on
+		/** Parse a serialized combo ("Mod+Shift+D"). Mod (matched as ⌘ OR Ctrl on
 		 * every platform — the same unification the original fixed map used) is
 		 * mandatory; returns {shift, alt, key} or null. */
 		function parseCombo(text) {
@@ -502,7 +505,7 @@ function collectSyncedStorage() {
 			return null;
 		}
 
-		/** Platform-aware label for tooltips and the settings row (⌘⇧H / Ctrl+Shift+H). */
+		/** Platform-aware label for tooltips and the settings row (⌘⇧D / Ctrl+Shift+D). */
 		function comboLabel(text) {
 			const parsed = parseCombo(text);
 			if (!parsed) return "—";
@@ -511,19 +514,22 @@ function collectSyncedStorage() {
 			return "Ctrl+" + (parsed.shift ? "Shift+" : "") + (parsed.alt ? "Alt+" : "") + key;
 		}
 
-		/** Recording-time validation. Returns a locale error key (resolved under
-		 * "shortcuts.*" by the caller) or null when the combo is safe to bind. */
-		function validateRecorded(parsed, map, actionId) {
-			// Bare ⌘/Ctrl+letter is browser-reserved territory (⌘W closes the
-			// tab, ⌘D bookmarks…) — the page never sees those events.
-			if (parsed.key.length === 1 && !parsed.shift && !parsed.alt) return "err.letter";
+		/** Recording-time advisory. Returns a locale warning key (resolved under
+		 * "shortcuts.*" by the caller) or null. Every combo is bindable — the
+		 * caller always binds — the warning only tells the user the binding may
+		 * be shadowed by the browser, the OS, or another action; the choice is
+		 * theirs. */
+		function recordedWarning(parsed, map, actionId) {
+			// Bare ⌘/Ctrl+letter is usually browser-reserved (⌘W closes the
+			// tab, ⌘D bookmarks…) — the page may never see those events.
+			if (parsed.key.length === 1 && !parsed.shift && !parsed.alt) return "warn.letter";
 			// Combinations with a painful history or a browser/system reservation
 			// (⌘⇧Q locked the browser, ⌘⇧W closes all windows / is Feishu's
 			// global hotkey, ⌘⇧T reopens tabs, ⌘⇧N opens private windows).
-			if (parsed.shift && !parsed.alt && (parsed.key === "w" || parsed.key === "q" || parsed.key === "t" || parsed.key === "n")) return "err.danger";
+			if (parsed.shift && !parsed.alt && (parsed.key === "w" || parsed.key === "q" || parsed.key === "t" || parsed.key === "n")) return "warn.danger";
 			for (const other of ACTION_IDS) {
 				if (other === actionId) continue;
-				if (combosEqual(parseCombo(map[other]), parsed)) return "err.dup";
+				if (combosEqual(parseCombo(map[other]), parsed)) return "warn.dup";
 			}
 			return null;
 		}
@@ -534,12 +540,10 @@ function collectSyncedStorage() {
 			const source = raw && typeof raw === "object" ? raw : {};
 			const rawShortcuts = source.shortcuts && typeof source.shortcuts === "object" ? source.shortcuts : {};
 			const shortcuts = {};
-			const claimed = [];
 			for (const cmd of ACTION_IDS) {
 				let parsed = parseCombo(rawShortcuts[cmd]);
-				if (!parsed || claimed.some((c) => combosEqual(c, parsed))) parsed = parseCombo(DEFAULT_SHORTCUTS[cmd]);
+				if (!parsed) parsed = parseCombo(DEFAULT_SHORTCUTS[cmd]);
 				shortcuts[cmd] = comboToText(parsed);
-				claimed.push(parsed);
 			}
 			let focusColor = DEFAULT_PREFS.focusColor;
 			if (source.focusColor === "theme") focusColor = "theme";
@@ -568,8 +572,6 @@ function collectSyncedStorage() {
 					if (text === undefined) continue;
 					const parsed = parseCombo(text);
 					if (!parsed) continue;
-					const collides = ACTION_IDS.some((other) => other !== cmd && combosEqual(parseCombo(next.shortcuts[other]), parsed));
-					if (collides) continue;
 					const nextText = comboToText(parsed);
 					if (next.shortcuts[cmd] !== nextText) {
 						next.shortcuts[cmd] = nextText;
@@ -610,11 +612,10 @@ function collectSyncedStorage() {
 			"shortcuts.record": "按新的组合键…",
 			"shortcuts.recordHint": "按 Esc 取消",
 			"shortcuts.reset": "恢复默认",
-			"shortcuts.hint": "组合键需包含 ⌘/Ctrl；单个字母或数字需搭配 Shift 或 Alt，否则会被浏览器保留。个别组合可能仍被浏览器或系统全局热键占用，遇到无效换一个即可。",
 			"shortcuts.err.noMod": "组合键需包含 ⌘ 或 Ctrl",
-			"shortcuts.err.letter": "字母/数字键需搭配 Shift 或 Alt，否则会被浏览器保留",
-			"shortcuts.err.danger": "该组合被浏览器或系统保留（例如会关掉所有窗口），请换一个",
-			"shortcuts.err.dup": "该组合已被其他动作使用",
+			"shortcuts.warn.letter": "已绑定。单个字母/数字不带 Shift 或 Alt 的组合（如 ⌘D）通常被浏览器保留，页面可能捕捉不到",
+			"shortcuts.warn.danger": "已绑定。该组合可能被浏览器或系统全局热键占用（如 ⌘⇧W 会关掉所有窗口），没反应就换一个",
+			"shortcuts.warn.dup": "已绑定。该组合与另一个动作的快捷键相同，按下时列表里靠前的动作响应",
 			"color.title": "选中高亮色",
 			"color.theme": "跟随主题",
 			"color.pick": "自定义…",
@@ -639,11 +640,10 @@ function collectSyncedStorage() {
 			"shortcuts.record": "Press a new combo…",
 			"shortcuts.recordHint": "Esc to cancel",
 			"shortcuts.reset": "Reset to defaults",
-			"shortcuts.hint": "Combos need ⌘/Ctrl; a bare letter or digit also needs Shift or Alt, otherwise the browser keeps it. A few combos may still be taken by the browser or global hotkeys — pick another if one does nothing.",
 			"shortcuts.err.noMod": "The combo needs ⌘ or Ctrl",
-			"shortcuts.err.letter": "Letters/digits need Shift or Alt, otherwise the browser keeps them",
-			"shortcuts.err.danger": "That combo is reserved by the browser or the OS (it would e.g. close all windows) — pick another",
-			"shortcuts.err.dup": "That combo is already bound to another action",
+			"shortcuts.warn.letter": "Bound. A bare letter/digit without Shift or Alt (e.g. ⌘D) is usually kept by the browser, so the page may never see it",
+			"shortcuts.warn.danger": "Bound. This combo may be taken by the browser or an OS global hotkey (e.g. ⌘⇧W closes all windows) — switch if it does nothing",
+			"shortcuts.warn.dup": "Bound. This combo is shared with another action; the action listed earlier responds on keypress",
 			"color.title": "Focus Highlight Color",
 			"color.theme": "Follow theme",
 			"color.pick": "Custom…",
@@ -995,6 +995,7 @@ function collectSyncedStorage() {
 			title: { color: "var(--dsw-alias-label-primary)", fontSize: "14px", fontWeight: 400, lineHeight: "22px" },
 			hint: { color: "var(--dsw-alias-label-tertiary)", fontSize: "12px", lineHeight: "18px" },
 			error: { color: "var(--dsw-alias-state-error-primary,#e5484d)", fontSize: "12px", lineHeight: "18px" },
+			warning: { color: "var(--dsw-alias-state-warning-primary,#b8860b)", fontSize: "12px", lineHeight: "18px" },
 			actionRow: { display: "flex", alignItems: "center", gap: "10px", flexWrap: "wrap" },
 			kvRow: { display: "flex", alignItems: "center", gap: "10px" },
 			kvLabel: { color: "var(--dsw-alias-label-secondary)", fontSize: "13px", lineHeight: "20px" },
@@ -1109,12 +1110,16 @@ function collectSyncedStorage() {
 		}
 
 		/** Shortcut row: one recording chip per action. Click a chip, press the
-		 * new combination (Esc cancels); reserved/duplicate combos are rejected
-		 * with an inline error instead of binding. */
+		 * new combination (Esc cancels). Every combo is bindable; combos that
+		 * the browser/OS is likely to keep, or that collide with another
+		 * action, are accepted with an inline warning instead of rejected.
+		 * Only a missing ⌘/Ctrl stays a hard error (the runtime never fires
+		 * without it). */
 		function ShortcutsRow({ t, useStore, setShortcut }) {
 			const prefs = useStore((s) => s.prefs);
 			const [recording, setRecording] = React.useState(null);
 			const [error, setError] = React.useState(null);
+			const [warning, setWarning] = React.useState(null);
 			const prefsRef = React.useRef(prefs);
 			prefsRef.current = prefs;
 			React.useEffect(() => {
@@ -1134,14 +1139,11 @@ function collectSyncedStorage() {
 						return;
 					}
 					const parsed = { shift: event.shiftKey, alt: event.altKey, key };
-					const errKey = validateRecorded(parsed, prefsRef.current.shortcuts, recording);
-					if (errKey !== null) {
-						setError(t("shortcuts." + errKey));
-						return;
-					}
 					setShortcut(recording, comboToText(parsed));
 					setRecording(null);
 					setError(null);
+					const warnKey = recordedWarning(parsed, prefsRef.current.shortcuts, recording);
+					setWarning(warnKey === null ? null : t("shortcuts." + warnKey));
 				};
 				window.addEventListener("keydown", onKey, true);
 				return () => window.removeEventListener("keydown", onKey, true);
@@ -1159,15 +1161,17 @@ function collectSyncedStorage() {
 						"aria-pressed": recording === cmd ? "true" : undefined,
 						onClick: () => {
 							setError(null);
+							setWarning(null);
 							setRecording(recording === cmd ? null : cmd);
 						}
 					}, recording === cmd ? t("shortcuts.record") : comboLabel(prefs.shortcuts[cmd]))
 				)),
 				React.createElement("div", { style: settingsStyles.actionRow },
-					error !== null ? React.createElement("span", { style: settingsStyles.error }, error) : null,
+					error !== null
+						? React.createElement("span", { style: settingsStyles.error }, error)
+						: warning !== null && recording === null ? React.createElement("span", { style: settingsStyles.warning }, warning) : null,
 					recording !== null ? React.createElement("span", { style: settingsStyles.hint }, t("shortcuts.recordHint")) : null
-				),
-				React.createElement("div", { style: settingsStyles.hint }, t("shortcuts.hint"))
+				)
 			);
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-split-view",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Multi-session split view for the DeepSeek Harness web GUI: the top window shadows the root slot with a resizable split container; each pane is an iframe running a full DSH client pinned to its own session, with per-pane title bars, LRU hibernation and a dual-loopback origin pool.",
   "license": "MIT",
   "type": "module",