@wenaixi/dsh-prompt-history 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ## [Unreleased]
 
+## [2.2.1] - 2026-10-06
+
+### 修复
+
+- **双击 Esc 关闭时 Esc 让位宿主**：`doubleEsc=false` 时连按 Esc 不再被插件消费，宿主自行关闭其浮层/菜单。
+- **宽屏历史面板右侧完整预览**：窗口 ≥1000px 时在列表右侧显示高亮条目的完整内容（最多 6 行，超出显示 `… +N more lines`），对齐 Claude Code `HistorySearchDialog` 的 preview。
+
 ## [2.2.0] - 2026-10-06
 
 ### 变更
@@ -257,7 +264,8 @@
 
 - 选中即复制（任意选中方式）。
 
-[Unreleased]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.2.1...HEAD
+[2.2.1]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/Wenaixi/dsh-prompt-history/compare/v2.0.1...v2.0.2

package/lib/client.js

@@ -285,6 +285,7 @@ window.__ModuleLoader__.load({
 		let historyPanel = null;
 		let historyList = null;
 		let historyFoot = null;
+		let historyPreview = null;
 		let historyRefs = null;
 		/** Remove the history list panel and detach its outside-click listener (idempotent). */
 		function hideHistoryPanel() {
@@ -295,6 +296,7 @@ window.__ModuleLoader__.load({
 			}
 			historyList = null;
 			historyFoot = null;
+			historyPreview = null;
 			historyRefs = null;
 		}
 		/** Close the panel when a pointer lands outside both it and the composer. */
@@ -343,12 +345,16 @@ window.__ModuleLoader__.load({
 		const ROW_ACTIVE_CSS = "background:var(--dsw-specific-menu-hover);color:var(--dsw-alias-label-primary);border-left-color:var(--dsw-static-blue-500);";
 		const AGE_CSS = `flex:none;font:11px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;min-width:${AGE_WIDTH}ch;text-align:right;color:var(--dsw-alias-label-tertiary);`;
 		const ROW_TEXT_CSS = "min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;";
+		/** 宽屏阈值：Claude Code 终端列数 ≥100，web 用像素近似。 */
+		const WIDE_MIN_PX = 1e3;
+		/** 预览最多行数，对齐 Claude Code PREVIEW_ROWS=6。 */
+		const PREVIEW_ROWS = 6;
 		/**
 		* Open the history list above the composer card.
 		*
 		* 只做渲染与鼠标交互：键盘（过滤、移动、回填、关闭）在 InputHistory.tsx 里处理，
 		* 因为焦点必须留在输入框，宿主 Menu 的方向键行走（依赖真实焦点）用不上。
-		* 列表按最新在顶渲染（Claude Code direction='up' 的视觉反向近似：最新贴输入框）。
+		* 列表按最新在顶渲染；宽屏（≥1000px）时右侧显示高亮条目的完整内容预览。
 		*
 		* @param view - 命中文本、相对时间、高亮位置与计数。
 		* @param refs - 提交与关闭回调。
@@ -359,25 +365,34 @@ window.__ModuleLoader__.load({
 				el.className = HISTORY_CLASS;
 				el.style.cssText = PANEL_CSS;
 				el.setAttribute("role", "listbox");
+				const body = document.createElement("div");
+				body.style.cssText = "display:flex;align-items:stretch;";
 				const list = document.createElement("div");
-				list.style.cssText = "max-height:240px;overflow-y:auto;overscroll-behavior:contain;";
+				list.style.cssText = "flex:1 1 0;min-width:0;max-height:240px;overflow-y:auto;overscroll-behavior:contain;";
 				list.setAttribute("role", "presentation");
+				const preview = document.createElement("div");
+				preview.className = "dsh-ph-history-preview";
+				preview.style.cssText = "display:none;flex:1 1 0;min-width:0;max-height:240px;overflow-y:auto;padding:7px 12px;border-left:1px solid var(--dsw-alias-border-l2);font:12.5px/1.6 inherit;color:var(--dsw-alias-label-secondary);white-space:pre-wrap;word-break:break-word;";
+				body.append(list, preview);
 				const foot = document.createElement("div");
 				foot.style.cssText = "padding:5px 12px;font:11px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;color:var(--dsw-alias-label-tertiary);border-top:1px solid var(--dsw-alias-border-l2);";
-				el.append(list, foot);
+				el.append(body, foot);
 				document.body.appendChild(el);
 				historyPanel = el;
 				historyList = list;
 				historyFoot = foot;
+				historyPreview = preview;
 				document.addEventListener("pointerdown", onHistoryOutsidePointer, true);
 			}
 			const el = historyPanel;
 			const list = historyList;
 			const foot = historyFoot;
-			if (el === null || list === null || foot === null) return;
+			const preview = historyPreview;
+			if (el === null || list === null || foot === null || preview === null) return;
 			historyRefs = refs;
 			list.replaceChildren();
-			view.texts.slice(0, HISTORY_MAX_ROWS).forEach((text, i) => {
+			const rows = view.texts.slice(0, HISTORY_MAX_ROWS);
+			rows.forEach((text, i) => {
 				const row = document.createElement("button");
 				row.type = "button";
 				row.id = `${HISTORY_CLASS}-row-${i}`;
@@ -404,6 +419,13 @@ window.__ModuleLoader__.load({
 			if (view.highlight >= 0) el.setAttribute("aria-activedescendant", `${HISTORY_CLASS}-row-${view.highlight}`);
 			else el.removeAttribute("aria-activedescendant");
 			foot.textContent = view.shown === 0 ? T("history.noMatch") : `${view.shown} / ${view.total}　${T("history.hint")}`;
+			preview.style.display = window.innerWidth >= WIDE_MIN_PX ? "block" : "none";
+			preview.replaceChildren();
+			if (view.highlight >= 0 && view.highlight < rows.length) {
+				const lines = (rows[view.highlight] ?? "").split("\n");
+				preview.textContent = lines.slice(0, PREVIEW_ROWS).join("\n");
+				if (lines.length > PREVIEW_ROWS) preview.append(`\n… +${lines.length - PREVIEW_ROWS} ${T("history.moreLines")}`);
+			}
 			placeHistoryPanel(el);
 			const active = list.querySelector(`#${HISTORY_CLASS}-row-${view.highlight}`);
 			if (active instanceof HTMLElement) active.scrollIntoView({ block: "nearest" });
@@ -1154,8 +1176,10 @@ window.__ModuleLoader__.load({
 						return;
 					}
 					if (e.key !== "Escape") lastEscapeRef.current = 0;
-					else if (!prefs.doubleEsc) lastEscapeRef.current = 0;
-					else {
+					else if (!prefs.doubleEsc) {
+						lastEscapeRef.current = 0;
+						return;
+					} else {
 						const now = performance.now();
 						const doubled = isDoubleEscape(lastEscapeRef.current, now);
 						if (live.draft !== "") {

package/lib/types/client/feedback.d.ts

@@ -37,7 +37,7 @@ export declare function hideHistoryPanel(): void;
  *
  * 只做渲染与鼠标交互：键盘（过滤、移动、回填、关闭）在 InputHistory.tsx 里处理，
  * 因为焦点必须留在输入框，宿主 Menu 的方向键行走（依赖真实焦点）用不上。
- * 列表按最新在顶渲染（Claude Code direction='up' 的视觉反向近似：最新贴输入框）。
+ * 列表按最新在顶渲染；宽屏（≥1000px）时右侧显示高亮条目的完整内容预览。
  *
  * @param view - 命中文本、相对时间、高亮位置与计数。
  * @param refs - 提交与关闭回调。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenaixi/dsh-prompt-history",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Terminal-style prompt history, selection copy/quote and right-click paste for the DSH composer (zh/en).",
   "keywords": [
     "dsh",

package/src/client/InputHistory.tsx

@@ -459,7 +459,10 @@ export function InputHistory(props: InputHistoryProps) {
       if (e.key !== 'Escape') {
         lastEscapeRef.current = 0
       } else if (!prefs.doubleEsc) {
+        // 双击 Esc 关闭：Esc 完全交还宿主（不提示、
+        // 不消费）。宿主会自行关闭其浮层/菜单。
         lastEscapeRef.current = 0
+        return
       } else {
         const now = performance.now()
         const doubled = isDoubleEscape(lastEscapeRef.current, now)

package/src/client/feedback.ts

@@ -145,6 +145,7 @@ interface HistoryPanelRefs {
 let historyPanel: HTMLDivElement | null = null
 let historyList: HTMLDivElement | null = null
 let historyFoot: HTMLDivElement | null = null
+let historyPreview: HTMLDivElement | null = null
 let historyRefs: HistoryPanelRefs | null = null
 
 /** Remove the history list panel and detach its outside-click listener (idempotent). */
@@ -156,6 +157,7 @@ export function hideHistoryPanel(): void {
   }
   historyList = null
   historyFoot = null
+  historyPreview = null
   historyRefs = null
 }
 
@@ -222,12 +224,17 @@ const AGE_CSS = 'flex:none;font:11px/1.5 ui-monospace,SFMono-Regular,Consolas,mo
 
 const ROW_TEXT_CSS = 'min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;'
 
+/** 宽屏阈值：Claude Code 终端列数 ≥100，web 用像素近似。 */
+const WIDE_MIN_PX = 1000
+/** 预览最多行数，对齐 Claude Code PREVIEW_ROWS=6。 */
+const PREVIEW_ROWS = 6
+
 /**
  * Open the history list above the composer card.
  *
  * 只做渲染与鼠标交互：键盘（过滤、移动、回填、关闭）在 InputHistory.tsx 里处理，
  * 因为焦点必须留在输入框，宿主 Menu 的方向键行走（依赖真实焦点）用不上。
- * 列表按最新在顶渲染（Claude Code direction='up' 的视觉反向近似：最新贴输入框）。
+ * 列表按最新在顶渲染；宽屏（≥1000px）时右侧显示高亮条目的完整内容预览。
  *
  * @param view - 命中文本、相对时间、高亮位置与计数。
  * @param refs - 提交与关闭回调。
@@ -238,23 +245,34 @@ export function showHistoryPanel(view: HistoryPanelView, refs: HistoryPanelRefs)
     el.className = HISTORY_CLASS
     el.style.cssText = PANEL_CSS
     el.setAttribute('role', 'listbox')
+    const body = document.createElement('div')
+    body.style.cssText = 'display:flex;align-items:stretch;'
     const list = document.createElement('div')
-    list.style.cssText = 'max-height:240px;overflow-y:auto;overscroll-behavior:contain;'
+    list.style.cssText = 'flex:1 1 0;min-width:0;max-height:240px;overflow-y:auto;overscroll-behavior:contain;'
     list.setAttribute('role', 'presentation')
+    const preview = document.createElement('div')
+    preview.className = 'dsh-ph-history-preview'
+    preview.style.cssText = 'display:none;flex:1 1 0;min-width:0;max-height:240px;overflow-y:auto;' +
+      'padding:7px 12px;border-left:1px solid var(--dsw-alias-border-l2);' +
+      'font:12.5px/1.6 inherit;color:var(--dsw-alias-label-secondary);white-space:pre-wrap;' +
+      'word-break:break-word;'
+    body.append(list, preview)
     const foot = document.createElement('div')
     foot.style.cssText = 'padding:5px 12px;font:11px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;' +
       'color:var(--dsw-alias-label-tertiary);border-top:1px solid var(--dsw-alias-border-l2);'
-    el.append(list, foot)
+    el.append(body, foot)
     document.body.appendChild(el)
     historyPanel = el
     historyList = list
     historyFoot = foot
+    historyPreview = preview
     document.addEventListener('pointerdown', onHistoryOutsidePointer, true)
   }
   const el = historyPanel
   const list = historyList
   const foot = historyFoot
-  if (el === null || list === null || foot === null) return
+  const preview = historyPreview
+  if (el === null || list === null || foot === null || preview === null) return
   historyRefs = refs
 
   list.replaceChildren()
@@ -288,6 +306,19 @@ export function showHistoryPanel(view: HistoryPanelView, refs: HistoryPanelRefs)
     ? T('history.noMatch')
     : `${view.shown} / ${view.total}　${T('history.hint')}`
 
+  // 宽屏右侧预览：显示高亮条目的完整文本，超过 6 行截断 + 「… +N more lines」。
+  preview.style.display = window.innerWidth >= WIDE_MIN_PX ? 'block' : 'none'
+  preview.replaceChildren()
+  if (view.highlight >= 0 && view.highlight < rows.length) {
+    const text = rows[view.highlight] ?? ''
+    const lines = text.split('\n')
+    const shown = lines.slice(0, PREVIEW_ROWS)
+    preview.textContent = shown.join('\n')
+    if (lines.length > PREVIEW_ROWS) {
+      preview.append(`\n… +${lines.length - PREVIEW_ROWS} ${T('history.moreLines')}`)
+    }
+  }
+
   placeHistoryPanel(el)
   // 高亮项滚进可视区，但不抢焦点。
   const active = list.querySelector(`#${HISTORY_CLASS}-row-${view.highlight}`)