dsh-quote-followup 0.2.1 → 0.2.3

package/README.md

@@ -7,9 +7,10 @@ A Web-only [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) p
 ## Features
 
 - 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.
+- Append a native DSH conversation-reference chip without replacing the existing draft.
+- Reuse the same atomic `ReferenceChipNode`, conversation icon, and business color as `@file` / `@session`.
+- Quote multiple excerpts; on send, the plugin codec expands each chip into a model-readable Markdown blockquote.
+- Fall back to a plain-text quote when the host lacks native chip support.
 
 TUI is intentionally unsupported.
 
@@ -19,14 +20,14 @@ 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
 
 1. Select text in a conversation message.
 2. Click **❐ Quote**.
 3. Select and quote more excerpts if needed.
-4. Type the follow-up below the inserted quotes and send.
+4. Type the follow-up after the inserted chips and send.
 
 ## Development
 
@@ -34,7 +35,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 native quote chips, repeated quoting, spacing after an existing draft, codec serialization, the Firefox text fallback, and current-client takeover of stale singleton/button state after a hot swap.
 
 ## License
 

package/README.zh.md

@@ -7,9 +7,10 @@
 ## 功能
 
 - 在 Web 对话区选中文本后显示浮动的 **❐ 引用** 按钮。
-- 以 Markdown 引用块追加到现有草稿，不覆盖已输入内容。
-- 可连续引用多段内容，再统一编辑并发送。
-- 通过 Lexical 的 paste 路径更新编辑器模型，避免只改 DOM。
+- 以 DSH 原生对话引用 chip 追加到现有草稿，不覆盖已输入内容。
+- chip 使用与 `@文件` / `@对话` 相同的 `ReferenceChipNode`、对话图标和业务色，可整体删除。
+- 可连续引用多段内容；发送时由插件 codec 将各 chip 展开为模型可读的 Markdown 引用块。
+- 旧版 DSH 缺少原生 chip 能力时，自动降级为纯文本引用。
 
 本插件不再适配 TUI。
 
@@ -19,14 +20,14 @@
 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 不会从新服务进程自动更新。
 
 ## 使用
 
 1. 在对话消息中划选任意片段。
 2. 点击 **❐ 引用**。
 3. 如需补充，可继续选中并引用其他片段。
-4. 在引用块下输入追问并发送。
+4. 在引用 chip 后输入追问并发送。
 
 ## 开发验证
 
@@ -34,7 +35,7 @@ dsh plugin --profile web add dsh-quote-followup
 npm test
 ```
 
-回归测试覆盖历史问题：“第一次引用成功，第二次消失”。根因是编辑器已有段落后，caret 不能放在 Lexical root 的 block 之后，必须放进最后一个 block 内。
+回归测试覆盖原生引用 chip、连续引用、已有草稿后的间距、codec 序列化、Firefox 文本降级路径，以及热替换后新版 client 接管旧按钮/单例状态。
 
 ## 许可证
 

package/lib/client.js

@@ -32,6 +32,10 @@ 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.3";
+		/** Codec owner for native DSH reference chips. */
+		const QUOTE_SOURCE = "quote-followup";
 		/** Per-quote character cap for a bounded composer insertion. */
 		const QUOTE_MAX_CHARS = 1600;
 		//#endregion
@@ -71,17 +75,54 @@ window.__ModuleLoader__.load({
 			}
 			return null;
 		};
-		/** Markdown blockquote frame for one quoted fragment. */
-		const quoteFrame = (text, role) => {
+		const roleLabel = (role) => role === "user" ? "user" : role === "assistant" ? "assistant" : "对话";
+		/** Bound one quote before it becomes editor state. */
+		const quotePayload = (text, role) => {
 			let body = String(text ?? "");
 			let truncated = false;
 			if (body.length > QUOTE_MAX_CHARS) {
 				body = body.slice(0, QUOTE_MAX_CHARS);
 				truncated = true;
 			}
-			const who = role === "user" ? "user" : role === "assistant" ? "assistant" : "对话";
-			const lines = body.split("\n").map((line) => `> ${line}`.trimEnd());
-			return `> [引用 · ${who}${truncated ? "，已截断" : ""}]\n${lines.join("\n")}\n\n`;
+			return { text: body, role, truncated };
+		};
+		/** Model / clipboard projection. The composer shows a chip, not this frame. */
+		const quoteFrame = ({ text, role, truncated }) => {
+			const lines = text.split("\n").map((line) => `> ${line}`.trimEnd());
+			return `> [引用 · ${roleLabel(role)}${truncated ? "，已截断" : ""}]\n${lines.join("\n")}\n\n`;
+		};
+		const decodeQuote = (ref) => {
+			const value = JSON.parse(ref);
+			if (value === null || typeof value !== "object" || typeof value.text !== "string")
+				throw new Error("invalid quote-followup reference");
+			return {
+				text: value.text,
+				role: value.role === "user" || value.role === "assistant" ? value.role : null,
+				truncated: value.truncated === true
+			};
+		};
+		const quoteInsert = (payload) => {
+			const clipboardText = quoteFrame(payload);
+			const preview = payload.text.replace(/\s+/g, " ").trim();
+			return {
+				source: QUOTE_SOURCE,
+				ref: JSON.stringify(payload),
+				label: `引用 · ${roleLabel(payload.role)}: ${preview}${payload.truncated ? "…" : ""}`,
+				appearance: "session",
+				clipboardText
+			};
+		};
+		/** Codec-only source: it owns quote chips but intentionally adds no @ candidates. */
+		const QUOTE_TRIGGER_SOURCE = {
+			trigger: "@",
+			name: QUOTE_SOURCE,
+			order: 1000,
+			candidates: () => Promise.resolve([]),
+			onPick: () => void 0,
+			codec: {
+				clipboardText: (ref) => quoteFrame(decodeQuote(ref)),
+				serialize: (ref) => Promise.resolve(quoteFrame(decodeQuote(ref)))
+			}
 		};
 		const findComposer = () => {
 			for (const selector of COMPOSER_SELECTORS) {
@@ -91,7 +132,87 @@ window.__ModuleLoader__.load({
 			}
 			return null;
 		};
-		/** Dispatch a real paste path so stateful editors (Lexical) own the update. */
+		/**
+		 * Insert through DSH's registered ReferenceChipNode so the quote uses the
+		 * exact same atomic editor entity and visual treatment as @file/@session.
+		 * The node class is already registered on the live composer; no second
+		 * Lexical or React runtime is loaded by this plugin.
+		 */
+		const appendQuoteChip = (element, payload) => {
+			const editor = element.__lexicalEditor;
+			const registry = editor?._nodes;
+			const ChipNode = registry?.get?.("reference-chip")?.klass;
+			const TextNode = registry?.get?.("text")?.klass;
+			const ParagraphNode = registry?.get?.("paragraph")?.klass;
+			if (typeof editor?.update !== "function" || typeof ChipNode !== "function" || typeof TextNode !== "function" || typeof ParagraphNode !== "function")
+				return false;
+			try {
+				let inserted = false;
+				editor.update(() => {
+					const state = editor._pendingEditorState ?? editor._editorState;
+					const root = state?._nodeMap?.get?.("root");
+					if (root === void 0 || root === null || typeof root.append !== "function")
+						return;
+					let block = typeof root.getLastChild === "function" ? root.getLastChild() : null;
+					if (block === null || typeof block.append !== "function") {
+						block = new ParagraphNode();
+						root.append(block);
+					}
+					const nodes = [];
+					const tail = typeof block.getTextContent === "function" ? block.getTextContent().slice(-1) : "";
+					if (tail !== "" && !/\s/u.test(tail))
+						nodes.push(new TextNode(" "));
+					nodes.push(new ChipNode(quoteInsert(payload)));
+					const trailing = new TextNode(" ");
+					nodes.push(trailing);
+					block.append(...nodes);
+					if (typeof trailing.selectEnd === "function")
+						trailing.selectEnd();
+					inserted = true;
+				}, { discrete: true });
+				if (inserted)
+					element.focus();
+				return inserted;
+			} catch (error) {
+				console.warn("[dsh-quote-followup] native reference chip failed; using text fallback", error);
+				return false;
+			}
+		};
+		/**
+		 * 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 +270,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))
@@ -160,12 +283,15 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region floating button
 		let pendingQuote = null;
+		let quoteSourceReady = false;
 		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 = "引用选中内容到输入框（可多次引用，发送前可编辑）";
@@ -247,15 +373,29 @@ window.__ModuleLoader__.load({
 			// Clear the transcript range BEFORE focusing the composer. Clearing after
 			// insertion destroys Lexical's caret and makes the next quote unreliable.
 			document.getSelection()?.removeAllRanges();
-			appendToComposer(composer, quoteFrame(quote.text, quote.role));
+			const payload = quotePayload(quote.text, quote.role);
+			if (!(quoteSourceReady && appendQuoteChip(composer, payload)))
+				appendToComposer(composer, quoteFrame(payload));
 		};
 		//#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();
+			let unregisterSource = null;
+			try {
+				const inputTriggers = typeof ctx?.get === "function" ? ctx.get("inputTriggers") : null;
+				if (typeof inputTriggers?.registerSource === "function") {
+					unregisterSource = inputTriggers.registerSource(QUOTE_TRIGGER_SOURCE);
+					quoteSourceReady = true;
+				}
+			} catch (error) {
+				console.warn("[dsh-quote-followup] native reference codec unavailable; using text fallback", error);
+			}
 			const onScroll = () => hideButton();
 			const onKeyDown = (event) => {
 				if (event.key === "Escape")
@@ -265,24 +405,39 @@ 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;
+				quoteSourceReady = false;
+				if (typeof unregisterSource === "function")
+					unregisterSource();
 				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");
 		}
 		//#endregion
-		exports.inject = [];
+		exports.inject = ["inputTriggers"];
 		exports.apply = apply;
 		return module.exports;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-quote-followup",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Quote selected Web conversation text into the DeepSeek Harness composer for targeted follow-up turns.",
   "keywords": [
     "dsh",
@@ -44,13 +44,15 @@
   },
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.1-rc.1"
+      "dsh": ">=0.1.2-rc.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
     "client": {
-      "inject": [],
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-input-trigger"
+      ],
       "platform": "web"
     }
   }