dsh-quote-followup 0.2.1 → 0.2.2

package/README.md

@@ -9,7 +9,7 @@ A Web-only [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) p
 - Select text inside the Web conversation transcript to reveal a floating **Quote** button.
 - Append the selection as a Markdown quote without replacing the existing draft.
 - Repeat the action to collect multiple excerpts before sending.
-- Keep the Lexical editor model and rendered composer in sync.
+- Dispatch DSH's live Lexical `PASTE_COMMAND` directly, keeping the editor model and rendered composer in sync across Chromium and Firefox.
 
 TUI is intentionally unsupported.
 
@@ -19,7 +19,7 @@ TUI is intentionally unsupported.
 dsh plugin --profile web add dsh-quote-followup
 ```
 
-Add `dsh-quote-followup` to the Web profile's `dsh.profile.bundles`, then restart `dsh web` so the server rebuilds its boot-time client bundle.
+Add `dsh-quote-followup` to the Web profile's `dsh.profile.bundles`, then restart `dsh web` so the server rebuilds its boot-time client bundle. Reload or reopen browser tabs that stayed open across the restart; their already-loaded JavaScript cannot update itself from a new server process.
 
 ## Use
 
@@ -34,7 +34,7 @@ Add `dsh-quote-followup` to the Web profile's `dsh.profile.bundles`, then restar
 npm test
 ```
 
-The regression harness models the Lexical boundary that caused the historical “first quote works, second quote disappears” bug: once the editor has a block, the caret must be inside its last block rather than after the block at the editor root.
+The regression harness covers repeated quotes, Firefox rejecting constructor-injected `clipboardData`, Lexical reconciliation of raw DOM fallbacks, and takeover from a stale client button/singleton after a hot swap.
 
 ## License
 

package/README.zh.md

@@ -9,7 +9,7 @@
 - 在 Web 对话区选中文本后显示浮动的 **❐ 引用** 按钮。
 - 以 Markdown 引用块追加到现有草稿，不覆盖已输入内容。
 - 可连续引用多段内容，再统一编辑并发送。
-- 通过 Lexical 的 paste 路径更新编辑器模型，避免只改 DOM。
+- 直接派发 DSH 当前 Lexical editor 的 `PASTE_COMMAND`，在 Chromium 与 Firefox 中同步更新编辑器模型和 DOM。
 
 本插件不再适配 TUI。
 
@@ -19,7 +19,7 @@
 dsh plugin --profile web add dsh-quote-followup
 ```
 
-将 `dsh-quote-followup` 加入 Web profile 的 `dsh.profile.bundles`，然后重启 `dsh web`，让服务端重新生成启动时缓存的 client bundle。仅刷新页面不会替换旧服务进程中的 bundle。
+将 `dsh-quote-followup` 加入 Web profile 的 `dsh.profile.bundles`，然后重启 `dsh web`，让服务端重新生成启动时缓存的 client bundle。重启后还需刷新或重新打开此前一直未关闭的浏览器页；旧页面已经加载的 JavaScript 不会从新服务进程自动更新。
 
 ## 使用
 
@@ -34,7 +34,7 @@ dsh plugin --profile web add dsh-quote-followup
 npm test
 ```
 
-回归测试覆盖历史问题：“第一次引用成功，第二次消失”。根因是编辑器已有段落后，caret 不能放在 Lexical root 的 block 之后，必须放进最后一个 block 内。
+回归测试覆盖连续引用、Firefox 丢弃构造参数中的 `clipboardData`、Lexical 回滚裸 DOM fallback，以及热替换后新版 client 接管旧按钮/单例状态。
 
 ## 许可证
 

package/lib/client.js

@@ -32,6 +32,8 @@ window.__ModuleLoader__.load({
 			'[data-input-scroll] textarea'
 		];
 		const BUTTON_ID = "dsh-quote-followup-btn";
+		const BUTTON_VERSION_ATTR = "data-dsh-quote-followup-version";
+		const CLIENT_VERSION = "0.2.2";
 		/** Per-quote character cap for a bounded composer insertion. */
 		const QUOTE_MAX_CHARS = 1600;
 		//#endregion
@@ -91,7 +93,41 @@ window.__ModuleLoader__.load({
 			}
 			return null;
 		};
-		/** Dispatch a real paste path so stateful editors (Lexical) own the update. */
+		/**
+		 * Use the live Lexical command table when DSH exposes its editor on the root.
+		 * This bypasses browser security differences around synthetic clipboardData
+		 * while still entering through DSH's own PASTE_COMMAND → keyboard.paste path.
+		 */
+		const pasteViaLexical = (element, text) => {
+			const editor = element.__lexicalEditor;
+			if (editor === null || typeof editor !== "object" || typeof editor.dispatchCommand !== "function")
+				return false;
+			const commands = editor._commands;
+			if (commands === null || typeof commands !== "object" || typeof commands.keys !== "function")
+				return false;
+			const command = [...commands.keys()].find((candidate) => candidate?.type === "PASTE_COMMAND");
+			if (command === undefined)
+				return false;
+			const clipboardData = {
+				files: [],
+				items: [],
+				types: ["text/plain"],
+				getData: (type) => type === "text/plain" ? text : ""
+			};
+			const event = {
+				clipboardData,
+				defaultPrevented: false,
+				preventDefault() { this.defaultPrevented = true; },
+				stopPropagation() {}
+			};
+			try {
+				return editor.dispatchCommand(command, event) === true;
+			} catch (error) {
+				console.warn("[dsh-quote-followup] Lexical paste command failed; using DOM event fallback", error);
+				return false;
+			}
+		};
+		/** Dispatch a DOM paste fallback for non-DSH stateful editors. */
 		const pasteIntoEditor = (element, text) => {
 			let clipboardData = null;
 			try {
@@ -149,6 +185,8 @@ window.__ModuleLoader__.load({
 			range.collapse(false);
 			selection?.removeAllRanges();
 			selection?.addRange(range);
+			if (pasteViaLexical(element, insertText))
+				return;
 			if (pasteIntoEditor(element, insertText))
 				return;
 			if (typeof document.execCommand === "function" && document.execCommand("insertText", false, insertText))
@@ -162,10 +200,12 @@ window.__ModuleLoader__.load({
 		let pendingQuote = null;
 		const ensureButton = () => {
 			const existing = document.getElementById(BUTTON_ID);
-			if (existing !== null)
+			if (existing?.getAttribute(BUTTON_VERSION_ATTR) === CLIENT_VERSION)
 				return existing;
+			existing?.remove();
 			const button = document.createElement("button");
 			button.id = BUTTON_ID;
+			button.setAttribute(BUTTON_VERSION_ATTR, CLIENT_VERSION);
 			button.type = "button";
 			button.textContent = "❐ 引用";
 			button.title = "引用选中内容到输入框（可多次引用，发送前可编辑）";
@@ -251,11 +291,13 @@ window.__ModuleLoader__.load({
 		};
 		//#endregion
 		//#region apply
-		const MOUNTED = Symbol.for("dsh-quote-followup.mounted");
+		const STATE = Symbol.for("dsh-quote-followup.state");
 		function apply(ctx) {
-			if (globalThis[MOUNTED] === true)
+			const previous = globalThis[STATE];
+			if (previous?.version === CLIENT_VERSION)
 				return;
-			globalThis[MOUNTED] = true;
+			if (typeof previous?.dispose === "function")
+				previous.dispose();
 			const onScroll = () => hideButton();
 			const onKeyDown = (event) => {
 				if (event.key === "Escape")
@@ -265,19 +307,31 @@ window.__ModuleLoader__.load({
 				if (event.target instanceof Element && event.target.id !== BUTTON_ID)
 					hideButton();
 			};
-			document.addEventListener("selectionchange", onSelectionChange);
-			window.addEventListener("scroll", onScroll, true);
-			document.addEventListener("keydown", onKeyDown, true);
-			document.addEventListener("mousedown", onMouseDown, true);
+			let disposed = false;
+			let state;
 			const cleanup = () => {
-				globalThis[MOUNTED] = false;
+				if (disposed)
+					return;
+				disposed = true;
 				document.removeEventListener("selectionchange", onSelectionChange);
 				window.removeEventListener("scroll", onScroll, true);
 				document.removeEventListener("keydown", onKeyDown, true);
 				document.removeEventListener("mousedown", onMouseDown, true);
-				hideButton();
-				document.getElementById(BUTTON_ID)?.remove();
+				const button = document.getElementById(BUTTON_ID);
+				if (button?.getAttribute(BUTTON_VERSION_ATTR) === CLIENT_VERSION)
+					button.remove();
+				if (globalThis[STATE] === state)
+					delete globalThis[STATE];
 			};
+			state = { version: CLIENT_VERSION, dispose: cleanup };
+			globalThis[STATE] = state;
+			document.addEventListener("selectionchange", onSelectionChange);
+			window.addEventListener("scroll", onScroll, true);
+			document.addEventListener("keydown", onKeyDown, true);
+			document.addEventListener("mousedown", onMouseDown, true);
+			// Claim the shared id immediately so an older listener in a long-lived tab
+			// cannot keep its obsolete click handler after a client hot-swap.
+			ensureButton();
 			if (ctx !== undefined && typeof ctx.effect === "function")
 				ctx.effect(() => cleanup, "dsh-quote-followup: selection quote ui");
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-quote-followup",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Quote selected Web conversation text into the DeepSeek Harness composer for targeted follow-up turns.",
   "keywords": [
     "dsh",