@ryuu-64/dsh-find-all 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.7
+
+- Use the host-native icon button for the conversation search entry, including theme, hover and keyboard-focus styles.
+- Clarify that search covers loaded conversation content and can continue loading available earlier history; status text no longer implies complete history when the host cannot provide it.
+- Retain the current match during history loading when its identity can still be verified.
+
+The runtime code is unchanged from the accepted PR #17 merge (`f945fb9ccd581c808bc7f50128c3a7d7d2fca6da`). The existing 195 checks, release-artifact verification and RC2 Web acceptance passed; the user also confirmed their real-device test passed before this release. The exact supported host-version list is unchanged.
+
 ## 0.1.6
 
 Fix text matching, history feedback and search state after the 0.1.5 compatibility release.

package/README.md

@@ -13,8 +13,9 @@ DSH 桌面窗口是 Electron 壳，本身没有浏览器那种查找栏。而会
 ## 功能
 
 - **⌘F / Ctrl+F** 唤起查找栏，优先带入有效的选中文字；没有新选词时恢复上次关键词。关键词仅保留在当前插件实例内存中，禁用、刷新或重启后清空
-- **范围切换**：`整段`（默认）↔ `本页`，点那个胶囊按钮切换
-- **边搜边加载**：整段模式下自动分页加载历史，高亮与计数随加载实时更新
+- **范围切换**：`包含更早内容`（默认）↔ `已加载内容`，点那个胶囊按钮切换
+- **已加载内容**：只搜索当前会话中已经加载到页面的内容，包括滚动区域外的内容；不会继续加载历史，也不会移除先前已经加载的内容
+- **边搜边加载**：“包含更早内容”模式下自动分页加载历史，高亮与计数随加载实时更新
 - **进度可见**：显示「正在加载更早的历史… 已 3 页」，**点一下这段文字即可停止加载**
 - **安全上限**：最多加载 400 页（约 2 万条消息）；历史不再增长时会自行停止
 - **导航**：Enter / Shift+Enter 上下一个；⌘G（Ctrl+G）/ F3 下一个，加 Shift 反向；Esc 关闭查找栏并清除高亮
@@ -54,7 +55,7 @@ dsh plugin --profile desktop remove dsh-find-bar
 | 打开查找栏 | `⌘F` / `Ctrl+F` |
 | 下一个 / 上一个命中 | `Enter` / `Shift+Enter` |
 | 下一个 / 上一个命中（另一套） | `⌘G`（`Ctrl+G`）/ `F3`，加 `Shift` 反向 |
-| 切换范围 `整段` ↔ `本页` | 点查找栏上的胶囊按钮 |
+| 切换范围 `包含更早内容` ↔ `已加载内容` | 点查找栏上的胶囊按钮 |
 | 停止加载更早的历史 | 点「正在加载更早的历史…」那行文字 |
 | 关闭并清除高亮 | `Esc` |
 
@@ -63,9 +64,9 @@ dsh plugin --profile desktop remove dsh-find-bar
 ## 已知限制
 
 - 大小写不敏感，没有「区分大小写」开关
-- 单次搜索最多记 5000 个命中
+- 单次搜索仅显示前 5000 处匹配
 - 折叠起来的工具调用和思考块，正文不在页面里，搜不到——先展开再搜
-- 整段模式要真的翻历史，所以很长的会话首次搜索需要等几秒
+- “包含更早内容”模式要真的翻历史，所以很长的会话首次搜索需要等几秒
 - 宿主尚未就绪、公开报错、无进展或到达上限时，保留已找到的结果并提示未完成；再次打开查找或输入关键词可手动重试。停止、关闭、换词或切换会话会取消插件任务，但不会中断宿主已经发出的请求
 - “已搜索当前可用历史”不保证历史完整。宿主可能在正常末页和不连续页错误时都不再提供更早页；此时重新查找也不保证恢复缺失历史
 
@@ -82,7 +83,7 @@ dsh plugin --profile desktop add dsh-find-bar               # 想换回上游那
 
 ## 关于这个项目
 
-本插件 fork 自 [secyborg/dsh-find-bar](https://github.com/secyborg/dsh-find-bar)（作者 secyborg，MIT），在上游的基础上加了「整段会话」搜索。上游原有的查找条界面、高亮、`n/N` 计数和键盘导航都保留了下来。
+本插件 fork 自 [secyborg/dsh-find-bar](https://github.com/secyborg/dsh-find-bar)（作者 secyborg，MIT），在上游的基础上加了自动加载更早内容的会话搜索。上游原有的查找条界面、高亮、`n/N` 计数和键盘导航都保留了下来。
 
 版权与许可为 MIT 双署名：`Copyright (c) 2026 secyborg` 与 `Copyright (c) 2026 Ryuu-64`。上游 README 原样保存在 `README.fork-origin.md`，改动清单与致谢见 `NOTICE.md`。
 

package/lib/client.js

@@ -17,7 +17,7 @@
 // nothing, even though the conversation demonstrably contains it.
 //
 // What this plugin adds:
-//   * A scope toggle in the bar: 「整段 / Whole」 (default) and 「本页 / Page」.
+//   * A scope toggle in the bar: 「包含更早内容 / Include earlier content」 (default) and 「已加载内容 / Loaded content」.
 //   * In whole-conversation mode a search pages the older history in through
 //     the session service (ctx.sessions.binding(id).session.loadOlder()),
 //     re-running the match pass after every page — so the count and the
@@ -72,39 +72,39 @@ window.__ModuleLoader__.load({
 
 		var ZH = typeof navigator !== "undefined" && /^zh/i.test(navigator.language || "");
 		var L = ZH ? {
-			placeholder: "查找整段会话…",
+			placeholder: "在此会话中查找…",
 			prev: "上一个匹配",
 			next: "下一个匹配",
 			close: "关闭查找",
-			cap: "已达匹配上限，仅显示前 {n} 条",
-			scopeWhole: "整段",
-			scopePage: "本页",
-			scopeToPage: "搜索范围：整段会话。点击改为只搜当前页面",
-			scopeToWhole: "搜索范围：仅当前页面。点击改为搜索整段会话",
+			cap: "仅显示前 {n} 处匹配",
+			scopeWhole: "包含更早内容",
+			scopePage: "已加载内容",
+			scopeToPage: "搜索当前会话中已加载的内容，并继续加载更早内容。点击改为仅搜索已加载内容",
+			scopeToWhole: "仅搜索当前会话中已加载的内容，不再加载更早内容。点击改为包含更早内容",
 			loading: "正在加载更早的历史… 已 {n} 页",
 			available: "已搜索当前可用历史；宿主未提供更早页，无法确认历史完整性",
-			capped: "历史尚未搜完：已到加载上限（{n} 页）",
+			capped: "搜索未完成：已到更早内容的加载上限（{n} 页），已保留找到的结果",
 			stopTip: "点击停止加载",
-			noService: "会话接口不可用，仅保留已显示的部分结果",
+			noService: "搜索未完成：会话接口不可用，已保留找到的结果",
 			noTarget: "请先选择可见的会话，再打开查找",
 			noRoot: "当前会话的搜索范围不可用",
-			incomplete: "历史尚未搜完，保留部分结果",
+			incomplete: "搜索未完成，已保留找到的结果",
 			find: "查找会话"
 		} : {
-			placeholder: "Find in conversation…",
+			placeholder: "Find in this conversation…",
 			prev: "Previous match",
 			next: "Next match",
 			close: "Close find",
-			cap: "Match limit reached, showing first {n}",
-			scopeWhole: "Whole",
-			scopePage: "Page",
-			scopeToPage: "Scope: the whole conversation. Click to search only the rendered page",
-			scopeToWhole: "Scope: the rendered page only. Click to search the whole conversation",
+			cap: "Showing only the first {n} matches",
+			scopeWhole: "Include earlier content",
+			scopePage: "Loaded content",
+			scopeToPage: "Search loaded content in this conversation and load earlier content. Click to search loaded content only",
+			scopeToWhole: "Search only content already loaded in this conversation, without loading more. Click to include earlier content",
 			loading: "Loading earlier history… {n} pages",
 			available: "Searched currently available history; the host offers no earlier pages, so completeness cannot be confirmed",
-			capped: "History search incomplete: page cap reached ({n})",
+			capped: "History search incomplete: loading limit reached ({n} pages); partial results retained",
 			stopTip: "Click to stop loading",
-			noService: "Session service unavailable; rendered results only",
+			noService: "History search incomplete: session service unavailable; partial results retained",
 			noTarget: "Select a visible conversation before opening find",
 			noRoot: "Search scope unavailable for this conversation",
 			incomplete: "History search incomplete; partial results retained",
@@ -618,6 +618,10 @@ window.__ModuleLoader__.load({
 			if (!state.query) state.count.textContent = "";
 			else if (n === 0) state.count.textContent = state.paging ? "…" : "0/0";
 			else state.count.textContent = (state.index + 1) + "/" + n + (state.capped ? "+" : "");
+			var cap = state.query && n > 0 && state.capped ? L.cap.replace("{n}", String(MAX_MATCHES)) : "";
+			state.count.title = cap;
+			if (cap) state.count.setAttribute("aria-label", state.count.textContent + "; " + cap);
+			else state.count.removeAttribute("aria-label");
 		}
 
 		function setStatus(text, busy) {
@@ -954,6 +958,7 @@ window.__ModuleLoader__.load({
 
 			var count = document.createElement("span");
 			count.className = "count";
+			count.setAttribute("role", "status");
 			count.setAttribute("aria-live", "polite");
 
 			var status = document.createElement("span");
@@ -1020,6 +1025,8 @@ window.__ModuleLoader__.load({
 
 		function apply(ctx) {
 			var react = require("react");
+			var ui = require("@deepseek-ai/dsh-client-ui-primitives");
+			var SearchIcon = ui.IconSearchOutlineRegular || ui.IconSearchOutline16;
 			state.ctx = ctx;
 			state.adapter = createHostAdapter(ctx, function () {
 				syncTarget(null, true);
@@ -1028,13 +1035,18 @@ window.__ModuleLoader__.load({
 				var anchor = react.useRef(null);
 				react.useEffect(function () {
 					if (!anchor.current || !props.sessionId) return;
-					return state.adapter.mount(anchor.current, props.sessionId);
+					// Older supported Button exports do not forward refs. Always
+					// register the real button rather than the sizing-neutral wrapper.
+					var button = anchor.current.querySelector("button[data-find-all-session]");
+					if (button) return state.adapter.mount(button, props.sessionId);
 				}, [props.sessionId]);
-				return react.createElement("button", {
-					ref: anchor, type: "button", title: L.find, "aria-label": L.find,
+				return react.createElement("span", { ref: anchor, style: { display: "inline-flex", flex: "none" } },
+					react.createElement(ui.Button, {
+					type: "button", size: "sm", variant: "ghost", title: L.find, "aria-label": L.find,
+					style: { flex: "none", width: 28, padding: 0, color: "var(--dsw-alias-label-secondary)" },
 					"data-find-all-session": props.sessionId,
 					onClick: function (event) { open(event.currentTarget); }
-				}, "⌕");
+				}, react.createElement(SearchIcon, { size: 15 })));
 			}
 			ctx.slots.inject("conversation.session.header.utilities", function () {
 				return ctx.slots.register({ name: "conversation.session.header.utilities", id: "dsh-find-all" }, SessionFind);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryuu-64/dsh-find-all",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Ctrl+F find bar for the DSH desktop app: it searches the whole conversation, not just the messages already on screen.",
   "type": "module",
   "license": "MIT",
@@ -38,7 +38,8 @@
   "peerDependencies": {
     "@deepseek-ai/dsh-api-session-controller": "0.1.5-rc.2 || 0.1.5-rc.3 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1 || 0.1.7-alpha.2 || 0.1.7-rc.1 || 0.1.7-rc.2 || 0.2.0-rc.1 || 0.2.0-rc.2",
     "@deepseek-ai/dsh-client-ui-chat": "0.1.5-rc.2 || 0.1.5-rc.3 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1 || 0.1.7-alpha.2 || 0.1.7-rc.1 || 0.1.7-rc.2 || 0.2.0-rc.1 || 0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.2 || 0.1.5-rc.3 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1 || 0.1.7-alpha.2 || 0.1.7-rc.1 || 0.1.7-rc.2 || 0.2.0-rc.1 || 0.2.0-rc.2"
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.2 || 0.1.5-rc.3 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1 || 0.1.7-alpha.2 || 0.1.7-rc.1 || 0.1.7-rc.2 || 0.2.0-rc.1 || 0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.2 || 0.1.5-rc.3 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1 || 0.1.7-alpha.2 || 0.1.7-rc.1 || 0.1.7-rc.2 || 0.2.0-rc.1 || 0.2.0-rc.2"
   },
   "scripts": {
     "test": "node --test \"test/**/*.test.mjs\"",