dsh-quote-followup 0.1.0 → 0.2.0

package/README.md

@@ -48,11 +48,22 @@ Add `dsh-quote-followup` to `dsh.profile.bundles` and restart. No grants file
 
 ### TUI
 
-1. Converse normally (messages enter the buffer).
-2. `Ctrl+Alt+Q` → picker lists recent messages (`#seq me/assistant · summary`,
-   arrows + Enter).
-3. The quote block lands in the input; press the combo again to append more.
-4. Type your question below the quotes and send.
+**Selection quoting (recommended — matches the Web face)**: in fullscreen,
+dsh-TUI's copy-on-select copies any mouse selection to the clipboard and
+clears the highlight. After selecting, press `Ctrl+Alt+Q` — the **first
+picker row is exactly the text you just selected** (`📋 划选/剪贴板 · …`);
+Enter quotes it.
+
+**Whole-message quoting**: `Ctrl+Alt+Q` → picker lists recent messages
+(`#seq me/assistant · summary`, arrows + Enter); mixes freely with the
+selection row and repeats.
+
+Type your question below the quote blocks and send.
+
+> Combo delivery note: the TUI enables the kitty keyboard protocol, so
+> `Ctrl+Alt+Q` arrives reliably as CSI-u on modern terminals (iTerm2 3.5+,
+> kitty, WezTerm, Ghostty, …). If your terminal does not deliver the combo,
+> remap `shortcut` in the row config to any ctrl/alt combo it does deliver.
 
 ### Web (dsh web GUI)
 
@@ -69,9 +80,11 @@ Patch rows replace the whole `config`, so restate every key when overriding:
 - id: quote-followup
   name: dsh-quote-followup
   config:
-    shortcut: ctrl+alt+q   # needs ctrl or alt; avoid reserved combos
-    pickerLimit: 30        # max messages listed
-    quoteMaxChars: 1600    # per-quote truncation bound (chars)
+    shortcut: ctrl+alt+q        # needs ctrl or alt; avoid reserved combos
+    pickerLimit: 30             # max messages listed
+    quoteMaxChars: 1600         # per-quote truncation bound (chars)
+    clipboardReadCommand: ''    # optional custom clipboard reader (/bin/sh -c;
+                                # default probes pbpaste / wl-paste / xclip / xsel)
 ```
 
 ## Known edges

package/README.zh.md

@@ -42,10 +42,18 @@ bundle 清单（`dsh.profile.bundles`）加上 `dsh-quote-followup` 后重启即
 
 ### TUI
 
-1. 正常对话（消息进入缓冲）。
-2. `Ctrl+Alt+Q` → 选择器列出最近消息（`#序号 我/助手 · 摘要`，方向键 + Enter）。
-3. 引用块落入输入框；可再次 `Ctrl+Alt+Q` 追加多条。
-4. 在引用块下方写下问题，正常发送。
+**划选引用（推荐，与 Web 面体验一致）**：dsh-TUI 全屏模式下鼠标划选文本会
+自动复制到剪贴板并清除高亮（copy-on-select）。划选后按 `Ctrl+Alt+Q`，
+选择器**第一行就是刚划选的内容**（`📋 划选/剪贴板 · …`），回车即引用。
+
+**整条消息引用**：`Ctrl+Alt+Q` → 选择器列出最近消息（`#序号 我/助手 · 摘要`，
+方向键 + Enter），可与划选行混用、多次追加。
+
+引用块落入输入框后在下方写下问题，正常发送。
+
+> 快捷键送达说明：TUI 启用了 kitty 键盘协议，现代终端（iTerm2 3.5+、kitty、
+> WezTerm、Ghostty 等）下 `Ctrl+Alt+Q` 以 CSI-u 编码可靠送达。若你的终端不发
+> 该组合，在行 config 里把 `shortcut` 换成任意可送达的 ctrl/alt 组合即可。
 
 ### Web（dsh web GUI）
 
@@ -61,9 +69,11 @@ bundle 清单（`dsh.profile.bundles`）加上 `dsh-quote-followup` 后重启即
 - id: quote-followup
   name: dsh-quote-followup
   config:
-    shortcut: ctrl+alt+q   # 需带 ctrl 或 alt；避开保留组合
-    pickerLimit: 30        # 选择器列出的消息数上限
-    quoteMaxChars: 1600    # 单条引用的截断上限（字符）
+    shortcut: ctrl+alt+q        # 需带 ctrl 或 alt；避开保留组合
+    pickerLimit: 30             # 选择器列出的消息数上限
+    quoteMaxChars: 1600         # 单条引用的截断上限（字符）
+    clipboardReadCommand: ''    # 可选：自定义剪贴板读取命令（/bin/sh -c；
+                                # 默认 pbpaste / wl-paste / xclip / xsel 探测）
 ```
 
 ## 已知边界

package/lib/client.js

@@ -91,10 +91,36 @@ window.__ModuleLoader__.load({
 			}
 			return null;
 		};
+		/** Dispatch a real paste path so stateful editors (Lexical) own the update. */
+		const pasteIntoEditor = (element, text) => {
+			let clipboardData = null;
+			try {
+				clipboardData = new DataTransfer();
+				clipboardData.setData("text/plain", text);
+			} catch {}
+			let event;
+			try {
+				event = new ClipboardEvent("paste", {
+					bubbles: true,
+					cancelable: true,
+					clipboardData
+				});
+			} catch {
+				event = new Event("paste", { bubbles: true, cancelable: true });
+			}
+			if (clipboardData !== null && event.clipboardData == null) {
+				try {
+					Object.defineProperty(event, "clipboardData", { value: clipboardData });
+				} catch {}
+			}
+			element.dispatchEvent(event);
+			return event.defaultPrevented;
+		};
 		/**
 		 * Append the quote at the END of the composer text (classic quote-reply
 		 * reading order) and leave the caret on the blank line for the question.
-		 * React-controlled inputs need the native setter + input event.
+		 * Textareas use their native setter; stateful contenteditables receive a
+		 * paste event so Lexical/other editors update their model, not only the DOM.
 		 */
 		const appendToComposer = (element, insertText) => {
 			element.focus();
@@ -117,6 +143,10 @@ window.__ModuleLoader__.load({
 			range.collapse(false);
 			selection?.removeAllRanges();
 			selection?.addRange(range);
+			if (pasteIntoEditor(element, insertText))
+				return;
+			if (typeof document.execCommand === "function" && document.execCommand("insertText", false, insertText))
+				return;
 			range.insertNode(document.createTextNode(insertText));
 			range.collapse(false);
 			element.dispatchEvent(new InputEvent("input", { bubbles: true, inputType: "insertText", data: insertText }));
@@ -208,9 +238,10 @@ window.__ModuleLoader__.load({
 				console.warn("[dsh-quote-followup] composer input not found — quote dropped");
 				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();
 			appendToComposer(composer, quoteFrame(quote.text, quote.role));
-			const selection = document.getSelection();
-			selection?.removeAllRanges();
 		};
 		//#endregion
 		//#region apply

package/lib/index.d.ts

@@ -4,10 +4,10 @@
  */
 import type { Context } from '@deepseek-ai/cordis';
 
-/** One quoted message. */
+/** One quoted message (`seq: null` marks a mouse-selection/clipboard quote). */
 export interface QuoteEntry {
-    seq: number;
-    role: 'user' | 'assistant';
+    seq: number | null;
+    role: 'user' | 'assistant' | '划选';
     text: string;
 }
 
@@ -19,6 +19,9 @@ export interface QuoteFollowupConfig {
     pickerLimit?: number;
     /** Per-quote character cap. Default 1600. */
     quoteMaxChars?: number;
+    /** Custom clipboard reader (`/bin/sh -c`; defaults to pbpaste / wl-paste /
+     *  xclip / xsel probing). */
+    clipboardReadCommand?: string;
 }
 
 /** Clip a string to `max` cells with an ellipsis marker. */
@@ -34,6 +37,9 @@ export declare function extractMessage(session: { id: string } | null, event: {
 /** Compose the quote block appended into the prompt input. */
 export declare function frameQuotes(quotes: QuoteEntry[], quoteMaxChars?: number): string;
 
+/** Read the system clipboard ('' on failure / unsupported platform). */
+export declare function readClipboard(overrideCommand?: string): Promise<string>;
+
 export declare const name: string;
 export declare const inject: string[];
 

package/lib/index.js

@@ -24,6 +24,7 @@
  * @module dsh-quote-followup
  */
 import { createConnection } from 'node:net';
+import { execFile } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -45,6 +46,10 @@ const DEFAULT_QUOTE_MAX_CHARS = 1600;
 const PICKER_TIMEOUT_MS = 180000;
 /** How long to wait for sibling TUI services before going inert (ms). */
 const SERVICE_WAIT_MS = 3000;
+/** Picker row id for the clipboard quote (dsh-TUI copies mouse selections to
+ *  the clipboard automatically — copy-on-select — so the freshest mouse
+ *  selection is always quotable through this row). */
+const CLIPBOARD_ROW_ID = '__clipboard__';
 /** Injection-channel discovery file (see dsh-tui's inject-channel module). */
 const INJECT_SERVERS_FILE = join(homedir(), '.dsh-tui', 'inject', 'servers.json');
 
@@ -106,7 +111,8 @@ function quoteBlock(entry, index, total, quoteMaxChars) {
         body = body.slice(0, quoteMaxChars);
         truncated = true;
     }
-    const header = `> [引用 ${index}/${total} · ${entry.role}#${entry.seq}${truncated ? '，已截断' : ''}]`;
+    const tail = entry.seq === null || entry.seq === undefined ? '' : `#${entry.seq}`;
+    const header = `> [引用 ${index}/${total} · ${entry.role}${tail}${truncated ? '，已截断' : ''}]`;
     const lines = body.split('\n').map(line => `> ${line}`.trimEnd());
     return `${header}\n${lines.join('\n')}`;
 }
@@ -165,6 +171,40 @@ function injectAppend(socketPath, text) {
     });
 }
 
+/**
+ * Read the system clipboard. dsh-TUI's copy-on-select already places every
+ * mouse selection there, so this is the bridge between terminal text
+ * selection and the quote picker. `overrideCommand` (row config
+ * `clipboardReadCommand`) runs via /bin/sh — mainly a deterministic seam
+ * for tests and exotic setups. Resolves '' on any failure.
+ */
+export function readClipboard(overrideCommand) {
+    const run = (file, args) => new Promise(resolve => {
+        try {
+            execFile(file, args, { timeout: 1200, maxBuffer: 4 * 1024 * 1024, encoding: 'utf8' }, (error, stdout) => {
+                resolve(error === null ? String(stdout ?? '') : '');
+            });
+        }
+        catch {
+            resolve('');
+        }
+    });
+    return (async () => {
+        if (typeof overrideCommand === 'string' && overrideCommand.trim() !== '')
+            return run('/bin/sh', ['-c', overrideCommand]);
+        if (process.platform === 'darwin')
+            return run('pbpaste', []);
+        if (process.platform === 'linux') {
+            for (const probe of [['wl-paste', []], ['xclip', ['-selection', 'clipboard', '-o']], ['xsel', ['--clipboard', '--output']]]) {
+                const text = await run(probe[0], probe[1]);
+                if (text !== '')
+                    return text;
+            }
+        }
+        return '';
+    })();
+}
+
 /**
  * Apply: wire the TUI face when (and only when) the TUI extension seams are
  * mounted. Every registration is scoped with ctx.effect so a profile that
@@ -180,6 +220,9 @@ export function apply(ctx, config) {
     const quoteMaxChars = Number.isInteger(config?.quoteMaxChars) && config.quoteMaxChars > 0
         ? config.quoteMaxChars
         : DEFAULT_QUOTE_MAX_CHARS;
+    const clipboardCommand = typeof config?.clipboardReadCommand === 'string'
+        ? config.clipboardReadCommand
+        : undefined;
 
     /** Per-session ring buffer of observed messages. */
     const buffers = new Map();
@@ -242,15 +285,27 @@ export function apply(ctx, config) {
         let list = [];
         if (currentSessionId !== null)
             list = buffers.get(currentSessionId) ?? [];
-        if (list.length === 0) {
-            toast('本会话还没有可引用的消息');
-            return;
+        // dsh-TUI copies every mouse selection to the clipboard (copy-on-select,
+        // then clears the highlight), so the clipboard holds exactly what the
+        // user just selected. Offer it as the FIRST picker row.
+        const clipboardText = await readClipboard(clipboardCommand);
+        const options = [];
+        if (clipboardText.trim() !== '') {
+            options.push({
+                id: CLIPBOARD_ROW_ID,
+                label: `📋 划选/剪贴板 · ${clip(clipboardText, 40)}`,
+                description: clip(clipboardText, 160),
+            });
         }
-        const options = list.slice(-pickerLimit).reverse().map(message => ({
+        options.push(...list.slice(-pickerLimit).reverse().map(message => ({
             id: String(message.seq),
             label: `#${message.seq} ${message.role === 'user' ? '我' : '助手'} · ${clip(message.text, 44)}`,
             description: clip(message.text, 160),
-        }));
+        })));
+        if (options.length === 0) {
+            toast('没有可引用内容：划选一段文本（自动复制）或先对话后重试');
+            return;
+        }
         const title = '选择要引用的对话内容（可多次引用，Esc 取消）';
         let picked;
         try {
@@ -261,7 +316,9 @@ export function apply(ctx, config) {
         }
         if (picked === undefined)
             return;
-        const entry = list.find(message => String(message.seq) === picked);
+        const entry = picked === CLIPBOARD_ROW_ID
+            ? { seq: null, role: '划选', text: clipboardText }
+            : list.find(message => String(message.seq) === picked);
         if (entry === undefined)
             return;
         const record = readInjectServers().find(server => server.pid === process.pid);
@@ -271,7 +328,9 @@ export function apply(ctx, config) {
         }
         const delivered = await injectAppend(record.socketPath, frameQuotes([entry], quoteMaxChars));
         toast(delivered
-            ? `已引用 #${entry.seq} → 输入框（可继续 ${shortcut} 追加，编辑后发送）`
+            ? entry.seq === null
+                ? '已引用划选内容 → 输入框（可继续追加，编辑后发送）'
+                : `已引用 #${entry.seq} → 输入框（可继续 ${shortcut} 追加，编辑后发送）`
             : '引用写入输入框失败');
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-quote-followup",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Quote selected conversation content into a targeted follow-up turn for DeepSeek Harness — a TUI face (message picker + next-input rewrite via the official plugin seams) and a Web face (text-selection quoting into the composer).",
   "keywords": [
     "dsh",