dsh-quote-followup 0.2.7 → 0.2.9

package/README.md

@@ -17,13 +17,15 @@ 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 a native DSH conversation-reference chip without replacing the existing draft.
+- Append a native DSH conversation-reference chip without replacing the existing draft, using the session-scoped composer input facade rather than Lexical's private node registry.
 - Reuse the same atomic `ReferenceChipNode`, conversation icon, and business color as `@file` / `@session`.
 - Keep each chip compact by showing only the excerpt; the bubble icon already conveys that it is a quote.
 - Follow the active DSH locale for the floating action and serialized quote frame.
-- Attach the conversation turn number to the serialized frame when the selection comes from a DSH chat row, so follow-ups like "revisit turn 3" stay resolvable. Selections without a turn marker keep the provenance-free frame.
+- Attach the conversation turn number to the serialized frame when both ends of the selection belong to the same DSH chat row. Selections spanning messages keep the excerpt but omit ambiguous role/turn provenance.
 - Quote multiple excerpts; on send, the plugin codec expands each chip into a model-readable Markdown blockquote.
+- Resolve the active session through the DSH 0.1.7 UI session adapter, while retaining the older session-list selection path; never paste an unscoped quote when no session binding is available.
 - Fall back to a plain-text quote when the host lacks native chip support.
+- Show a localized notice if the composer is missing or unavailable, restore the selection, and let you retry quoting the original text.
 
 TUI is intentionally unsupported.
 
@@ -57,7 +59,7 @@ Add `dsh-quote-followup` to the Web profile's `dsh.profile.bundles`, then restar
 npm test
 ```
 
-The regression harness covers compact native quote chips, locale switching, turn-number provenance with graceful degradation, 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.
+The regression harness covers modern and legacy session selection, absent selection/binding, compact native quote chips, locale switching, single-row versus cross-message provenance, missing/locked composer feedback and retry, 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.
 
 An opt-in [assembled DSH Web regression](https://github.com/tr1v3r/dsh-quote-followup/blob/master/test/integration/README.md) runs the plugin through a pinned, built DSH checkout with Chromium. It covers existing drafts, repeated quoting, undo/redo, session isolation, prompt serialization, and Host-driven unavailable input.
 

package/README.zh.md

@@ -17,13 +17,15 @@
 ## 功能
 
 - 在 Web 对话区选中文本后显示浮动的 **❐ 引用** 按钮。
-- 以 DSH 原生对话引用 chip 追加到现有草稿，不覆盖已输入内容。
+- 通过会话级输入接口将 DSH 原生对话引用 chip 追加到现有草稿，不覆盖已输入内容，也不直接读取 Lexical 私有节点注册表。
 - chip 使用与 `@文件` / `@对话` 相同的 `ReferenceChipNode`、对话图标和业务色，可整体删除。
 - chip 只展示摘录正文，引用语义由气泡图标表达，减少重复标签。
 - 浮动按钮和发送时的引用框架跟随 DSH 当前语言。
-- 选中内容来自 DSH 聊天行时，序列化引用会附带对话轮次编号，模型可定位"第 3 轮引用的内容"；无轮次标记时保持原有框架。
+- 选区两端属于同一 DSH 聊天行时，序列化引用附带对话轮次编号；跨消息选区保留摘录，但不标注归属不明的角色与轮次。
 - 可连续引用多段内容；发送时由插件 codec 将各 chip 展开为模型可读的 Markdown 引用块。
+- 通过 DSH 0.1.7 的 UI 会话适配器确定当前会话，同时兼容旧版会话列表的选中态；未取得会话 binding 时不会把引用作为无会话归属的文本插入。
 - 旧版 DSH 缺少原生 chip 能力时，自动降级为纯文本引用。
+- 输入框缺失或暂不可编辑时显示本地化提示，恢复原选区，便于重试引用。
 
 本插件不再适配 TUI。
 
@@ -57,7 +59,7 @@ dsh plugin --profile web add dsh-quote-followup
 npm test
 ```
 
-回归测试覆盖精简的原生引用 chip、中英文 locale 切换、轮次溯源与降级、连续引用、已有草稿后的间距、codec 序列化、Firefox 文本降级路径，以及热替换后新版 client 接管旧按钮/单例状态。
+回归测试覆盖新版与旧版会话选中态、无选中会话或 binding、精简的原生引用 chip、中英文 locale 切换、同消息与跨消息的来源判定、输入框缺失/不可编辑时的提示与重试、连续引用、已有草稿后的间距、codec 序列化、Firefox 文本降级路径，以及热替换后新版 client 接管旧按钮/单例状态。
 
 可选的[真实 DSH Web 集成回归](https://github.com/tr1v3r/dsh-quote-followup/blob/master/test/integration/README.md)通过固定版本、已构建的 DSH 和 Chromium 加载插件，验证已有草稿、连续引用、撤销重做、会话隔离、发送序列化及 Host 驱动的不可写输入状态。
 

package/lib/client.js

@@ -7,9 +7,10 @@
  * can edit before sending — a visible, targeted follow-up with zero hidden
  * state and zero host-side privileges.
  *
- * Pure DOM (no React). The only injected host services are DSH's
- * `inputTriggers` codec registry and `locale` (both optional — the module
- * degrades to English text fallbacks when either is absent). Mounted by the
+ * Pure DOM (no React). The injected host services are DSH's
+ * `inputTriggers` codec registry, `locale`, `uiSession`, and `sessions`. Without the
+ * optional codec, quotes degrade to plain text; without locale, copy is English.
+ * Session scoping is needed for native reference insertion. Mounted by the
  * web client runtime through the package's `dsh.client` declaration
  * (`platform: "web"`).
  *
@@ -26,6 +27,7 @@ window.__ModuleLoader__.load({
 		const TRANSCRIPT_SELECTOR = '[data-slot="conversation.session"]';
 		/** Composer input candidates, most specific first (official slot → legacy hints). */
 		const COMPOSER_SELECTORS = [
+			'[data-composer-input]',
 			'[data-slot="conversation.composer"] textarea',
 			'[data-slot="conversation.composer"] [contenteditable="true"]',
 			'textarea[data-phase]',
@@ -35,11 +37,13 @@ window.__ModuleLoader__.load({
 		];
 		const BUTTON_ID = "dsh-quote-followup-btn";
 		const BUTTON_VERSION_ATTR = "data-dsh-quote-followup-version";
-		const CLIENT_VERSION = "0.2.7";
+		const CLIENT_VERSION = "0.2.9";
 		/** Shared <style> element; versioned like the button so hot-swaps replace it. */
 		const STYLE_ID = "dsh-quote-followup-style";
 		const STYLE_VERSION_ATTR = "data-dsh-quote-followup-style-version";
 		const BUTTON_CLASS = "dsh-qf-btn";
+		const NOTICE_ID = "dsh-quote-followup-notice";
+		const NOTICE_CLASS = "dsh-qf-notice";
 		/** Codec owner for native DSH reference chips. */
 		const QUOTE_SOURCE = "quote-followup";
 		const LOCALE_NS = "quote-followup";
@@ -53,7 +57,10 @@ window.__ModuleLoader__.load({
 				"conversation.role.user": "用户",
 				"conversation.role.assistant": "助手",
 				"quote.turn": "第 {n} 轮",
-				"quote.truncated": "已截断"
+				"quote.truncated": "已截断",
+				"notice.composer-missing": "未找到输入框；摘录已保留，请选中原文重试。",
+				"notice.composer-locked": "输入框暂不可编辑；摘录已保留，请选中原文重试。",
+				"notice.insert-failed": "引用未能插入；摘录已保留，请选中原文重试。"
 			},
 			en: {
 				"button.label": "❐ Quote",
@@ -63,7 +70,10 @@ window.__ModuleLoader__.load({
 				"conversation.role.user": "user",
 				"conversation.role.assistant": "assistant",
 				"quote.turn": "turn {n}",
-				"quote.truncated": "truncated"
+				"quote.truncated": "truncated",
+				"notice.composer-missing": "Composer not found; excerpt saved. Select the original text to retry.",
+				"notice.composer-locked": "Composer is unavailable; excerpt saved. Select the original text to retry.",
+				"notice.insert-failed": "Quote could not be inserted; excerpt saved. Select the original text to retry."
 			}
 		};
 		const fallbackT = (key) => LOCALE_DICT.en[key] ?? key;
@@ -99,6 +109,9 @@ window.__ModuleLoader__.load({
 				return null;
 			return anchor;
 		};
+		/** Only assign provenance when both ends belong to the same marked chat row. */
+		const messageRowOf = (node, transcript) =>
+			walkAncestors(node, transcript, (element) => element.hasAttribute?.("data-chat-turn") ? element : undefined);
 		/**
 		 * Best-effort role for the quoted fragment: walk up from the range start
 		 * looking for role markers (data attributes, then class-name hints).
@@ -209,50 +222,87 @@ window.__ModuleLoader__.load({
 			}
 			return null;
 		};
+		/** The UI adapter owns selection in 0.1.7; older hosts expose list.current. */
+		const selectedSessionId = (ctx, sessions) => {
+			let uiSession;
+			try {
+				uiSession = ctx?.get?.("uiSession");
+			} catch {
+				// Older hosts do not provide the UI session adapter.
+			}
+			const current = uiSession?.adapter?.current;
+			if (typeof current?.getSnapshot === "function") {
+				try {
+					return current.getSnapshot()?.key;
+				} catch {
+					return undefined;
+				}
+			}
+			return sessions?.list?.getSnapshot?.()?.current;
+		};
 		/**
-		 * 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.
+		 * The per-session input facade owns chip creation, editor transactions and
+		 * phase/revision guards. Append at its published draft end (detect-text
+		 * offsets differ from clipboard-text lengths when a draft contains chips).
 		 */
-		const appendQuoteChip = (element, payload, t) => {
-			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")
+		const selectedSessionScope = (ctx) => {
+			const sessions = ctx?.get?.("sessions");
+			if (sessions === null || sessions === undefined)
+				return null;
+			const sessionId = selectedSessionId(ctx, sessions);
+			// No selected session is not a missing composer capability. Never paste
+			// unscoped text into a composer that may belong to another session.
+			if (sessionId === undefined || sessionId === null)
+				return null;
+			// A binding is borrowed only for this synchronous edit; never retain it
+			// across a promise or a subsequent click after its generation may release.
+			// DSH 0.1.7 returns a SessionBinding wrapper whose scoped Cordis context
+			// lives at `.ctx`; older hosts returned that context from sessions.scope().
+			if (typeof sessions.binding === "function") {
+				const binding = sessions.binding(sessionId);
+				return binding?.ctx ?? null;
+			}
+			return sessions.scope?.(sessionId);
+		};
+		const appendQuoteChip = (scope, element, payload, t) => {
+			const conversation = scope.get?.("conversation");
+			if (typeof conversation?.input?.for !== "function")
 				return false;
+			let input;
 			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, t)));
-					const trailing = new TextNode(" ");
-					nodes.push(trailing);
-					block.append(...nodes);
-					if (typeof trailing.selectEnd === "function")
-						trailing.selectEnd();
-					inserted = true;
-				}, { discrete: true });
+				input = conversation.input.for(scope);
+			} catch (error) {
+				console.warn("[dsh-quote-followup] scoped composer unavailable", error);
+				return false;
+			}
+			const state = input?.state?.getSnapshot?.();
+			if (state === undefined || typeof state.draftRev !== "number" || typeof input.insertReference !== "function")
+				return false;
+			// This is a rejected edit, not a missing feature: never bypass the
+			// facade's admission guard with an unguarded text fallback.
+			if (state.phase !== "plain" && state.phase !== "claimed")
+				return null;
+			const end = state.draft.length - (state.occurrences ?? []).reduce((extra, occurrence) =>
+				extra + Math.max(0, occurrence.length - 1), 0);
+			if (!Number.isSafeInteger(end) || end < 0)
+				return null;
+			const lead = end > 0 && !/\s/u.test(state.draft.slice(-1)) ? " " : "";
+			try {
+				if (lead !== "" && input.insertText(lead, { start: end, end, draftRev: state.draftRev }) !== true)
+					return null;
+				const current = input.state.getSnapshot();
+				if (current.draftRev !== state.draftRev + lead.length)
+					return null;
+				const at = end + lead.length;
+				const inserted = input.insertReference(quoteInsert(payload, t), {
+					start: at, end: at, draftRev: current.draftRev
+				});
 				if (inserted)
 					element.focus();
-				return inserted;
+				return inserted ? true : null;
 			} catch (error) {
-				console.warn("[dsh-quote-followup] native reference chip failed; using text fallback", error);
-				return false;
+				console.warn("[dsh-quote-followup] scoped reference insertion failed", error);
+				return null;
 			}
 		};
 		/**
@@ -362,6 +412,34 @@ window.__ModuleLoader__.load({
 		let pendingQuote = null;
 		let quoteSourceReady = false;
 		let currentT = fallbackT;
+		let clientContext = null;
+		let noticeTimer = null;
+		const clearNotice = () => {
+			if (noticeTimer !== null)
+				clearTimeout(noticeTimer);
+			noticeTimer = null;
+			document.getElementById(NOTICE_ID)?.remove();
+		};
+		const showNotice = (key) => {
+			clearNotice();
+			const notice = document.createElement("div");
+			notice.id = NOTICE_ID;
+			notice.className = NOTICE_CLASS;
+			notice.setAttribute("role", "status");
+			notice.setAttribute("data-message-key", key);
+			notice.textContent = currentT(key);
+			document.body.appendChild(notice);
+			noticeTimer = setTimeout(clearNotice, 4000);
+		};
+		const restoreSelection = (range) => {
+			if (range === null)
+				return;
+			try {
+				const selection = document.getSelection();
+				selection?.removeAllRanges();
+				selection?.addRange(range);
+			} catch {}
+		};
 		/**
 		 * Inject the button stylesheet once per client version. Visuals follow
 		 * the dsh-annotation convention: a single idempotent <style> element
@@ -414,6 +492,21 @@ window.__ModuleLoader__.load({
 				"  outline: 2px solid var(--dsw-alias-text-accent, #4c9aff);",
 				"  outline-offset: 1px;",
 				"}",
+				`.${NOTICE_CLASS} {`,
+				"  position: fixed;",
+				"  z-index: 2147483600;",
+				"  left: 50%;",
+				"  bottom: 24px;",
+				"  transform: translateX(-50%);",
+				"  max-width: min(90vw, 480px);",
+				"  padding: 8px 12px;",
+				"  border-radius: 8px;",
+				"  background: var(--dsw-alias-button-primary-fill, rgba(56, 56, 62, .94));",
+				"  color: var(--dsw-alias-label-primary-foreground, #f5f5f7);",
+				"  font-family: var(--dsw-font-family, system-ui);",
+				"  font-size: 12px;",
+				"  pointer-events: none;",
+				"}",
 				"@keyframes dsh-qf-pop {",
 				"  from { opacity: 0; transform: translateY(3px); }",
 				"  to { opacity: 1; transform: none; }",
@@ -469,29 +562,36 @@ window.__ModuleLoader__.load({
 			if (button !== null)
 				button.style.display = "none";
 		};
+		const dismissQuote = () => {
+			pendingQuote = null;
+			hideButton();
+		};
 		const onSelectionChange = () => {
 			const selection = document.getSelection();
 			const transcript = selectionInTranscript(selection);
 			if (transcript === null) {
-				pendingQuote = null;
-				hideButton();
+				dismissQuote();
 				return;
 			}
 			const text = selection.toString();
 			if (text === null || text.trim() === "") {
-				pendingQuote = null;
-				hideButton();
+				dismissQuote();
 				return;
 			}
-			const rect = selection.getRangeAt(0).getBoundingClientRect();
+			const range = selection.getRangeAt(0);
+			const rect = range.getBoundingClientRect();
 			if (rect.width === 0 && rect.height === 0) {
-				hideButton();
+				dismissQuote();
 				return;
 			}
+			const startRow = messageRowOf(range.startContainer, transcript);
+			const endRow = messageRowOf(range.endContainer, transcript);
+			const sameRow = startRow !== null && startRow === endRow;
 			pendingQuote = {
 				text: text.trim(),
-				role: detectRole(selection.getRangeAt(0), transcript),
-				turn: detectTurn(selection.getRangeAt(0), transcript)
+				role: sameRow ? detectRole(range, transcript) : null,
+				turn: sameRow ? detectTurn(range, transcript) : null,
+				range: range.cloneRange()
 			};
 			placeButton(ensureButton(), rect);
 		};
@@ -499,19 +599,42 @@ window.__ModuleLoader__.load({
 			if (pendingQuote === null)
 				return;
 			const quote = pendingQuote;
-			pendingQuote = null;
 			hideButton();
 			const composer = findComposer();
 			if (composer === null) {
-				console.warn("[dsh-quote-followup] composer input not found — quote dropped");
+				restoreSelection(quote.range);
+				showNotice("notice.composer-missing");
+				return;
+			}
+			if (composer.disabled || composer.readOnly || composer.getAttribute("contenteditable") === "false" ||
+				(composer.isContentEditable === false && composer.tagName !== "TEXTAREA" && composer.tagName !== "INPUT")) {
+				restoreSelection(quote.range);
+				showNotice("notice.composer-locked");
 				return;
 			}
 			// Clear the transcript range BEFORE focusing the composer. Clearing after
 			// insertion destroys Lexical's caret and makes the next quote unreliable.
 			document.getSelection()?.removeAllRanges();
 			const payload = quotePayload(quote.text, quote.role, quote.turn);
-			if (!(quoteSourceReady && appendQuoteChip(composer, payload, currentT)))
-				appendToComposer(composer, quoteFrame(payload, currentT));
+			try {
+				const scope = selectedSessionScope(clientContext);
+				const inserted = scope === null || scope === undefined
+					? null
+					: quoteSourceReady ? appendQuoteChip(scope, composer, payload, currentT) : false;
+				if (inserted === false)
+					appendToComposer(composer, quoteFrame(payload, currentT));
+				if (inserted === null) {
+					restoreSelection(quote.range);
+					showNotice("notice.insert-failed");
+					return;
+				}
+				pendingQuote = null;
+				clearNotice();
+			} catch (error) {
+				console.warn("[dsh-quote-followup] quote insertion failed", error);
+				restoreSelection(quote.range);
+				showNotice("notice.insert-failed");
+			}
 		};
 		//#endregion
 		//#region apply
@@ -522,6 +645,7 @@ window.__ModuleLoader__.load({
 				return;
 			if (typeof previous?.dispose === "function")
 				previous.dispose();
+			clientContext = ctx;
 			let unregisterSource = null;
 			let unregisterLocale = null;
 			let unsubscribeLocale = null;
@@ -531,6 +655,9 @@ window.__ModuleLoader__.load({
 					button.textContent = currentT("button.label");
 					button.title = currentT("button.title");
 				}
+				const notice = document.getElementById(NOTICE_ID);
+				if (notice !== null)
+					notice.textContent = currentT(notice.getAttribute("data-message-key"));
 			};
 			try {
 				const locale = typeof ctx?.get === "function" ? ctx.get("locale") : null;
@@ -556,14 +683,14 @@ window.__ModuleLoader__.load({
 			} catch (error) {
 				console.warn("[dsh-quote-followup] native reference codec unavailable; using text fallback", error);
 			}
-			const onScroll = () => hideButton();
+			const onScroll = () => dismissQuote();
 			const onKeyDown = (event) => {
 				if (event.key === "Escape")
-					hideButton();
+					dismissQuote();
 			};
 			const onMouseDown = (event) => {
 				if (event.target instanceof Element && event.target.id !== BUTTON_ID)
-					hideButton();
+					dismissQuote();
 			};
 			let disposed = false;
 			let state;
@@ -571,6 +698,9 @@ window.__ModuleLoader__.load({
 				if (disposed)
 					return;
 				disposed = true;
+				clientContext = null;
+				dismissQuote();
+				clearNotice();
 				quoteSourceReady = false;
 				if (typeof unsubscribeLocale === "function")
 					unsubscribeLocale();
@@ -605,7 +735,7 @@ window.__ModuleLoader__.load({
 				ctx.effect(() => cleanup, "dsh-quote-followup: selection quote ui");
 		}
 		//#endregion
-		exports.inject = ["inputTriggers", "locale"];
+		exports.inject = ["inputTriggers", "locale", "sessions", "uiSession"];
 		exports.apply = apply;
 		return module.exports;
 	}

package/package.json

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