dsh-quote-followup 0.2.8 → 0.2.10

package/README.md

@@ -23,6 +23,7 @@ A Web-only [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) p
 - Follow the active DSH locale for the floating action and serialized quote 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.
 
@@ -58,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, 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.
+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

@@ -23,6 +23,7 @@
 - 浮动按钮和发送时的引用框架跟随 DSH 当前语言。
 - 选区两端属于同一 DSH 聊天行时，序列化引用附带对话轮次编号；跨消息选区保留摘录，但不标注归属不明的角色与轮次。
 - 可连续引用多段内容；发送时由插件 codec 将各 chip 展开为模型可读的 Markdown 引用块。
+- 通过 DSH 0.1.7 的 UI 会话适配器确定当前会话，同时兼容旧版会话列表的选中态；未取得会话 binding 时不会把引用作为无会话归属的文本插入。
 - 旧版 DSH 缺少原生 chip 能力时，自动降级为纯文本引用。
 - 输入框缺失或暂不可编辑时显示本地化提示，恢复原选区，便于重试引用。
 
@@ -58,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

@@ -8,7 +8,7 @@
  * state and zero host-side privileges.
  *
  * Pure DOM (no React). The injected host services are DSH's
- * `inputTriggers` codec registry, `locale`, and `sessions`. Without the
+ * `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
@@ -37,7 +37,7 @@ window.__ModuleLoader__.load({
 		];
 		const BUTTON_ID = "dsh-quote-followup-btn";
 		const BUTTON_VERSION_ATTR = "data-dsh-quote-followup-version";
-		const CLIENT_VERSION = "0.2.8";
+		const CLIENT_VERSION = "0.2.10";
 		/** 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";
@@ -222,17 +222,51 @@ 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;
+		};
 		/**
 		 * 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 = (ctx, element, payload, t) => {
+		const selectedSessionScope = (ctx) => {
 			const sessions = ctx?.get?.("sessions");
-			const sessionId = sessions?.list?.getSnapshot?.()?.current;
-			const scope = sessionId === undefined ? null : sessions?.scope?.(sessionId);
-			const conversation = scope?.get?.("conversation");
-			if (scope === null || scope === undefined || typeof conversation?.input?.for !== "function")
+			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 {
@@ -263,8 +297,14 @@ window.__ModuleLoader__.load({
 				const inserted = input.insertReference(quoteInsert(payload, t), {
 					start: at, end: at, draftRev: current.draftRev
 				});
-				if (inserted)
-					element.focus();
+				if (inserted) {
+					// DOM focus can move a Lexical caret to the start. The session
+					// facade restores the selection left after the inserted chip.
+					if (typeof input.focus === "function")
+						input.focus();
+					else
+						element.focus();
+				}
 				return inserted ? true : null;
 			} catch (error) {
 				console.warn("[dsh-quote-followup] scoped reference insertion failed", error);
@@ -583,7 +623,10 @@ window.__ModuleLoader__.load({
 			document.getSelection()?.removeAllRanges();
 			const payload = quotePayload(quote.text, quote.role, quote.turn);
 			try {
-				const inserted = quoteSourceReady ? appendQuoteChip(clientContext, composer, payload, currentT) : false;
+				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) {
@@ -698,7 +741,7 @@ window.__ModuleLoader__.load({
 				ctx.effect(() => cleanup, "dsh-quote-followup: selection quote ui");
 		}
 		//#endregion
-		exports.inject = ["inputTriggers", "locale", "sessions"];
+		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.8",
+  "version": "0.2.10",
   "description": "Quote selected Web conversation text into the DeepSeek Harness composer for targeted follow-up turns.",
   "keywords": [
     "dsh",