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

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,43 +72,65 @@ 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} 处匹配",
+			resultCount: "{n} 个结果",
+			scopeWhole: "包含更早内容",
+			scopePage: "已加载内容",
+			scopeToPage: "搜索当前会话中已加载的内容，并继续加载更早内容。点击改为仅搜索已加载内容",
+			scopeToWhole: "仅搜索当前会话中已加载的内容，不再加载更早内容。点击改为包含更早内容",
 			loading: "正在加载更早的历史… 已 {n} 页",
 			available: "已搜索当前可用历史；宿主未提供更早页，无法确认历史完整性",
-			capped: "历史尚未搜完：已到加载上限（{n} 页）",
+			capped: "搜索未完成：已到更早内容的加载上限（{n} 页），已保留找到的结果",
 			stopTip: "点击停止加载",
-			noService: "会话接口不可用，仅保留已显示的部分结果",
-			noTarget: "请先选择可见的会话，再打开查找",
+			noService: "搜索未完成：会话接口不可用，已保留找到的结果",
+			noTarget: "当前主会话没有可搜索的聊天正文",
 			noRoot: "当前会话的搜索范围不可用",
-			incomplete: "历史尚未搜完，保留部分结果",
-			find: "查找会话"
+			incomplete: "搜索未完成，已保留找到的结果",
+			find: "查找会话",
+			returnPosition: "返回搜索前位置", returning: "正在返回…", returned: "已返回搜索前位置",
+			returnAvailable: "已跳到匹配；可返回搜索前位置",
+			matchRevealFailed: "已找到匹配，但宿主未能展开并显示它。可手动展开后重试。",
+			jumpHint: "找到 {n} 个结果；按 Enter 或向下跳到第一个，按向上跳到最后一个。",
+			originUnavailable: "未能记录当前阅读位置；仍可查找，但无法返回",
+			returnCancelled: "已取消返回", returnFailed: "未能返回原位置。",
+			return_removed: "原内容已不再可用。", return_render: "原内容已加载，但宿主未能显示原段落。可展开原内容后重试。",
+			return_unavailable: "宿主无法提供所需内容或定位能力。", return_capped: "已达到历史加载上限，可重试。",
+			return_stalled: "等待内容时没有进展，可重试。", return_error: "读取原内容失败，可重试。",
+			return_position: "宿主未保持原段落可见。可先在正文内滚动，再重试。"
 		} : {
-			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",
+			resultCount: "{n} results",
+			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",
-			noTarget: "Select a visible conversation before opening find",
+			noService: "History search incomplete: session service unavailable; partial results retained",
+			noTarget: "No searchable chat content in the main conversation",
 			noRoot: "Search scope unavailable for this conversation",
 			incomplete: "History search incomplete; partial results retained",
-			find: "Find in conversation"
+			find: "Find in conversation",
+			returnPosition: "Return to reading position", returning: "Returning…", returned: "Returned to reading position",
+			returnAvailable: "Moved to a match; return to the reading position is available",
+			matchRevealFailed: "A match was found, but the host could not reveal and display it. Expand the section and retry.",
+			jumpHint: "{n} matches found; Enter or Next goes to the first, Previous goes to the last.",
+			originUnavailable: "The current reading position could not be saved; search remains available, but return is unavailable",
+			returnCancelled: "Return cancelled", returnFailed: "Could not return to the reading position.",
+			return_removed: "The original content is no longer available.", return_render: "The content is loaded, but the host could not display the original passage. Expand it and retry.",
+			return_unavailable: "The host cannot provide the required content or positioning capability.", return_capped: "History page limit reached. You can retry.",
+			return_stalled: "No progress while waiting for content. You can retry.", return_error: "Loading the original content failed. You can retry.",
+			return_position: "The host did not keep the original passage visible. Try scrolling in the conversation, then retrying."
 		};
 
 		//#region pure helpers (exported for tests)
@@ -140,6 +162,8 @@ window.__ModuleLoader__.load({
 		// Keyboard routing, isolated so tests can drive it with spies.
 		function createHandlers(ops) {
 			return function onKeydown(event) {
+				// Let actual modals and editors with their own find UI own their keys.
+				if (event.defaultPrevented || event.isComposing || (ops.ownsKeys && !ops.ownsKeys(event))) return;
 				var meta = event.metaKey || event.ctrlKey;
 				var key = event.key;
 				if (meta && (key === "f" || key === "F")) {
@@ -210,16 +234,23 @@ window.__ModuleLoader__.load({
 
 		function cssText() {
 			return "" +
-				"#" + BAR_ID + "{position:fixed;top:46px;right:16px;z-index:2147483000;align-items:center;gap:6px;padding:6px 8px;display:flex;background:var(--dsw-alias-bg-layer-3);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;box-shadow:var(--dsw-shadow-lv2)}" +
-				"#" + BAR_ID + " input{width:210px;height:28px;color:var(--dsw-alias-label-primary);font:13px/1 var(--dsw-font-family);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:6px;outline:none;padding:0 8px}" +
+				"#" + BAR_ID + "{--dsh-find-all-anchor-gap:4px;--dsh-find-all-panel-inset:16px;--dsh-find-all-max-width:760px;position:fixed;top:calc(var(--dsh-find-all-header-bottom) + var(--dsh-find-all-anchor-gap));right:calc(var(--dsh-find-all-panel-right-space) + var(--dsh-find-all-panel-inset));z-index:2147483000;visibility:hidden;isolation:isolate;box-sizing:border-box;align-items:stretch;gap:4px;padding:6px 8px;display:flex;flex-direction:column;width:min(var(--dsh-find-all-max-width),calc(var(--dsh-find-all-panel-width) - var(--dsh-find-all-panel-inset) - var(--dsh-find-all-panel-inset)));max-width:calc(100vw - var(--dsh-find-all-panel-inset) - var(--dsh-find-all-panel-inset));background:transparent;--dsw-elevation-stroke-color:var(--dsw-alias-border-l1);border:0;border-radius:var(--dsw-radius-md,8px);box-shadow:var(--dsw-elevation-panel,var(--dsw-shadow-lv2))}" +
+				"#" + BAR_ID + "[data-positioned]{visibility:visible}" +
+				"#" + BAR_ID + ":before{content:\"\";position:absolute;inset:0;z-index:-1;pointer-events:none;border-radius:inherit;background:var(--dsw-specific-menu,var(--dsw-alias-bg-layer-2));-webkit-backdrop-filter:var(--dsw-menu-backdrop-filter,blur(40px) saturate(150%));backdrop-filter:var(--dsw-menu-backdrop-filter,blur(40px) saturate(150%))}" +
+				"#" + BAR_ID + " .controls{display:flex;flex-wrap:wrap;align-items:center;gap:6px;min-width:0}" +
+				"#" + BAR_ID + " input{flex:1 1 210px;min-width:120px;width:auto;height:28px;color:var(--dsw-alias-label-primary);font:13px/1 var(--dsw-font-family);background:var(--dsw-alias-bg-base);border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-sm,6px);outline:none;padding:0 8px}" +
 				"#" + BAR_ID + " input:focus-visible{border-color:var(--dsw-alias-state-business-primary)}" +
 				"#" + BAR_ID + " .count{min-width:52px;color:var(--dsw-alias-label-tertiary);font:12px/1 var(--dsw-font-family);font-variant-numeric:tabular-nums;text-align:center}" +
-				"#" + BAR_ID + " .status{max-width:260px;color:var(--dsw-alias-label-tertiary);font:12px/1.2 var(--dsw-font-family);text-align:right;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}" +
+				"#" + BAR_ID + " .status{width:100%;min-height:15px;color:var(--dsw-alias-label-tertiary);font:12px/1.25 var(--dsw-font-family);text-align:left;white-space:normal;overflow-wrap:anywhere}" +
 				"#" + BAR_ID + " .status[data-busy]{cursor:pointer;color:var(--dsw-alias-state-business-primary)}" +
 				"#" + BAR_ID + " .scope{width:auto;padding:0 9px;color:var(--dsw-alias-label-secondary);font:12px/1 var(--dsw-font-family);background:0 0;border:1px solid var(--dsw-alias-border-l2);border-radius:999px}" +
 				"#" + BAR_ID + " .scope[data-whole]{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-state-business-primary)}" +
 				"#" + BAR_ID + " button{height:26px;min-width:26px;color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:6px;align-items:center;justify-content:center;display:inline-flex}" +
 				"#" + BAR_ID + " button:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}" +
+				"#" + BAR_ID + " button:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}" +
+				"#" + BAR_ID + " button:disabled{opacity:.5;cursor:default}" +
+				"#" + BAR_ID + " [data-find-all-return][hidden]{display:none}" +
+				"#" + BAR_ID + " [data-find-all-return]{padding:0 8px;white-space:nowrap}" +
 				"#" + BAR_ID + " svg{pointer-events:none}" +
 				"::highlight(" + HL_ALL + "){background-color:rgba(245,197,24,.42)}" +
 				"::highlight(" + HL_CUR + "){background-color:#f5a623;color:#141414}";
@@ -266,11 +297,68 @@ window.__ModuleLoader__.load({
 			return into;
 		}
 
+		// MessageIconActions is host chrome: copy/branch controls, Turn usage and
+		// the local clock. It must never change the conversation result set merely
+		// because hover/focus changes its opacity. Current hosts expose data-clock
+		// on that row. The structural fallback is limited to the four admitted
+		// pre-data-clock hosts, whose official MessageItem/TurnTailNodeView sources
+		// render the same icon-only copy action in the verified positions below.
+		function legacyMessageActionRows(root) {
+			var rows = new Set();
+			if (!root) return rows;
+			function includeRoot(selector, into) {
+				if (root.nodeType === 1 && root.matches && root.matches(selector)) into.push(root);
+				var descendants = root.querySelectorAll ? root.querySelectorAll(selector) : [];
+				for (var i = 0; i < descendants.length; i++) into.push(descendants[i]);
+				return into;
+			}
+			var markedSelector = '[data-clock="start"],[data-clock="end"]';
+			if ((root.nodeType === 1 && root.matches && root.matches(markedSelector)) ||
+				(root.querySelector && root.querySelector(markedSelector))) return rows;
+
+			function containsIconOnlyAction(element) {
+				if (!element || !element.querySelectorAll) return false;
+				var buttons = element.querySelectorAll('button[type="button"][aria-label]');
+				for (var j = 0; j < buttons.length; j++) {
+					if (buttons[j].querySelector("svg") && !(buttons[j].textContent || "").trim()) return true;
+				}
+				return false;
+			}
+
+			var tails = includeRoot("[data-turn-tail]", []);
+			for (var i = 0; i < tails.length; i++) {
+				var tailAction = tails[i].lastElementChild;
+				if (containsIconOnlyAction(tailAction)) rows.add(tailAction);
+			}
+
+			var flows = includeRoot('[data-chat-flow-kind="user"],[data-chat-flow-kind="steering"]', []);
+			for (i = 0; i < flows.length; i++) {
+				var buttons = flows[i].querySelectorAll('button[type="button"][aria-label]');
+				for (var j = 0; j < buttons.length; j++) {
+					if (!buttons[j].querySelector("svg") || (buttons[j].textContent || "").trim()) continue;
+					var candidate = null;
+					for (var node = buttons[j].parentElement; node && node !== flows[i]; node = node.parentElement) {
+						var parent = node.parentElement;
+						if (parent && parent !== flows[i] && parent.children.length === 2 &&
+							node === parent.lastElementChild && node.previousElementSibling) candidate = node;
+					}
+					if (candidate) { rows.add(candidate); break; }
+				}
+			}
+			return rows;
+		}
+
+		function messageActionRow(node, legacyRows) {
+			var clock = node.getAttribute && node.getAttribute("data-clock");
+			return clock === "start" || clock === "end" || legacyRows.has(node);
+		}
+
 		// Join inline Text nodes only within one structural block and DOM root.
 		// These snapshots live for one scan. Preserve every original code unit,
 		// including whitespace-only nodes and code newlines; never trim or pad.
 		function collectTextBlocks(root) {
 			var blocks = [];
+			var legacyActions = legacyMessageActionRows(root);
 			var text = "";
 			var segments = [];
 			function flush() {
@@ -287,7 +375,7 @@ window.__ModuleLoader__.load({
 					return;
 				}
 				if (node.nodeType !== 1 && node.nodeType !== 11) return;
-				if (SKIP_TAGS[node.tagName] || node.id === BAR_ID || node.tagName === "BR") {
+				if (SKIP_TAGS[node.tagName] || node.id === BAR_ID || messageActionRow(node, legacyActions) || node.tagName === "BR") {
 					// Excluded subtrees and br are hard boundaries, not empty text.
 					flush();
 					return;
@@ -336,9 +424,11 @@ window.__ModuleLoader__.load({
 		}
 
 		function scrollToRange(range) {
+			var viewport = readingViewport(state.target);
+			if (viewport && rangeRect(range, viewport)) return;
 			var el = range.startContainer.parentElement;
 			if (el && el.scrollIntoView) {
-				try { el.scrollIntoView({ block: "center", behavior: "smooth" }); } catch (error) {}
+				try { el.scrollIntoView({ block: "center", behavior: "instant" }); } catch (error) {}
 			}
 		}
 
@@ -369,6 +459,11 @@ window.__ModuleLoader__.load({
 			return null;
 		}
 
+		function nestedProcessFlow(flow, root) {
+			return flow.hasAttribute('data-step-process-content') && flow.closest('[data-chat-group-key]') &&
+				flow.parentElement.closest('[data-chat-flow]') && (!root || root.contains(flow));
+		}
+
 		function resolveScope(anchor, sessionId) {
 			if (!anchor || typeof sessionId !== "string" || !sessionId || !visible(anchor)) return null;
 			var panel = conversationPanel(anchor);
@@ -381,120 +476,76 @@ window.__ModuleLoader__.load({
 			// 0.1.6-alpha.2 has the content wrapper but no identity attribute.
 			// Identity still comes from the unique session-scoped header anchor.
 			if (content && content.hasAttribute('data-conversation-session') && content.getAttribute('data-conversation-session') !== sessionId) return null;
-			var flows = scrolls[0].querySelectorAll('[data-chat-flow]');
+			var flows = Array.prototype.filter.call(scrolls[0].querySelectorAll('[data-chat-flow]'), function (flow) {
+				return !nestedProcessFlow(flow);
+			});
 			if (flows.length !== 1 || !visible(flows[0])) return null;
 			return { panel: panel, root: flows[0] };
 		}
 
 		function createHostAdapter(ctx, changed) {
 			var entries = new Map();
+			var mainFrame = null;
 			var scopeUnavailable = false;
-			// Only a never-selected adapter may discover an initial neutral context.
-			// Explicit rejection or loss of a selection must never select a substitute.
-			var selectionState = "pristine";
-			function candidates() {
-				var out = [];
-				entries.forEach(function (id, anchor) {
-					// Keep unsupported/invisible instances in the identity roster. Dropping
-					// them before routing could silently choose a different valid session.
-					out.push({ id: id, anchor: anchor, panel: conversationPanel(anchor), scope: resolveScope(anchor, id) });
-				});
-				return out;
+			function shown(entry) {
+				return visible(entry.anchor) || visible(conversationPanel(entry.anchor) || entry.anchor.closest('[data-phase], [data-conversation-content]'));
 			}
 			function choose(entry) {
-				if (!entry) return null;
-				if (!entry.scope) { selectionState = "rejected"; scopeUnavailable = true; return null; }
-				selectionState = "selected";
-				return { id: entry.id, anchor: entry.anchor, panel: entry.scope.panel, root: entry.scope.root };
+				if (entry) mainFrame = { anchor: entry.anchor, panel: conversationPanel(entry.anchor) };
+				var scope = entry && resolveScope(entry.anchor, entry.id);
+				scopeUnavailable = !!entry && !scope;
+				return scope ? { id: entry.id, anchor: entry.anchor, panel: scope.panel,
+					root: scope.root, registration: entry } : null;
 			}
-
-			function visibleEntry(entry) {
-				var container = entry.panel || entry.anchor.closest('[data-phase], [data-conversation-content]');
-				return visible(entry.anchor) || visible(container);
-			}
-
-			function discoverInitial(all) {
-				var shown = all.filter(visibleEntry);
-				var nodes = Array.prototype.filter.call(document.querySelectorAll('[data-phase], [data-conversation-content], [data-conversation-scroll], [data-chat-flow]'), visible);
-				scopeUnavailable = false;
-				if (shown.length === 0) {
-					// An empty resident Hero is not a session choice. A known active
-					// or identified but unregistered view is unavailable, not pristine.
-					if (nodes.some(function (node) { return node.getAttribute('data-phase') === 'active' || node.getAttribute('data-content-phase') === 'active' || node.hasAttribute('data-conversation-session') || node.hasAttribute('data-chat-flow'); })) {
-						selectionState = "rejected"; scopeUnavailable = true;
-					}
-					return null;
+			function current(previous) {
+				// Header utilities are mounted by the main conversation frame. Embedded
+				// sidebars have no such utility: focus and page-wide container counts
+				// cannot turn them into a search target or poison the next shortcut.
+				previous = previous || mainFrame;
+				var same = previous && entries.get(previous.anchor);
+				if (!same && previous && visible(previous.panel)) {
+					var replacements = Array.from(entries.values()).filter(function (entry) {
+						return conversationPanel(entry.anchor) === previous.panel && shown(entry);
+					});
+					if (replacements.length === 1) same = replacements[0];
 				}
-				if (shown.length !== 1) { selectionState = "rejected"; return null; }
-				var entry = shown[0], scope = entry.scope;
-				if (!scope) return choose(entry);
-				var content = scope.root.closest('[data-conversation-content]');
-				var scroll = scope.root.closest('[data-conversation-scroll]');
-				// One main panel and its own content/scroll/flow count as one view.
-				// Any other visible known container, including a headerless embedded
-				// sidebar, makes neutral discovery ambiguous even if unsupported.
-				var other = nodes.some(function (node) {
-					if (node.hasAttribute('data-conversation-content') && node !== content) return true;
-					if (node.hasAttribute('data-conversation-scroll') && node !== scroll) return true;
-					if (node.hasAttribute('data-chat-flow') && node !== scope.root) return true;
-					return node.hasAttribute('data-phase') && conversationPanel(node) === node && node !== scope.panel;
-				});
-				if (other) { selectionState = "rejected"; return null; }
-				return choose(entry);
+				if (same && shown(same)) return choose(same);
+				// A surviving main frame with a missing utility is unavailable, not an
+				// invitation to select another frame. A real navigation may replace it.
+				if (previous && visible(previous.panel)) { scopeUnavailable = true; return null; }
+				var all = Array.from(entries.values()).filter(shown);
+				scopeUnavailable = all.length > 0;
+				return all.length === 1 ? choose(all[0]) : null;
 			}
-
-			function refresh(entry) {
-				if (!entry) return null;
-				// Passive checks and repeated shortcuts may only retain this exact
-				// registered instance and identity. They never discover a substitute.
-				if (entries.get(entry.anchor) !== entry.id) { selectionState = "rejected"; scopeUnavailable = true; return null; }
-				scopeUnavailable = false;
-				return choose({ id: entry.id, anchor: entry.anchor, scope: resolveScope(entry.anchor, entry.id) });
-			}
-
 			return {
-				mount: function (anchor, id) {
-					entries.set(anchor, id);
+				mount: function (anchor, id, nodes) {
+					// A new effect/store generation invalidates old async work even when
+					// the session id, DOM button and flow happen to be reused.
+					var entry = { anchor: anchor, id: id, nodes: nodes || null };
+					entries.set(anchor, entry);
 					changed();
-					return function () { entries.delete(anchor); changed(); };
+					return function () {
+						if (entries.get(anchor) === entry) entries.delete(anchor);
+						changed();
+					};
 				},
-				refresh: refresh,
-				select: function (target, previous, retainNeutral) {
-					var all = candidates();
-					if (!target || !target.nodeType) target = document.activeElement;
-					if (target && state.bar && state.bar.contains(target)) return refresh(previous);
-					if (retainNeutral && (target === document.body || target === document.documentElement)) {
-						if (previous || selectionState !== "pristine") return refresh(previous);
-						return discoverInitial(all);
-					}
-					scopeUnavailable = false;
-					var direct = all.filter(function (entry) { return target && entry.anchor.contains(target); });
-					if (direct.length === 1) return choose(direct[0]);
-					var content = target && target.closest ? target.closest('[data-conversation-content]') : null;
-					var panel = conversationPanel(target) || content;
-					var hit = all.filter(function (entry) { return panel && entry.panel === panel; });
-					if (hit.length === 1) {
-						if (content && hit[0].scope && hit[0].scope.root.closest('[data-conversation-content]') !== content) {
-							selectionState = "rejected"; scopeUnavailable = true; return null;
-						}
-						return choose(hit[0]);
-					}
-					if (panel) {
-						// Before any session is selected, focus in the resident unbound
-						// Hero/settling composer is not a rejected conversation choice.
-						var phase = panel.getAttribute('data-phase') || panel.getAttribute('data-content-phase');
-						var unbound = !panel.hasAttribute('data-conversation-session') && !panel.querySelector('[data-conversation-session]');
-						if (selectionState === "pristine" && !previous && unbound && !all.some(visibleEntry) && (phase === "hero" || phase === "settling")) return null;
-						selectionState = "rejected"; scopeUnavailable = true; return null;
-					}
-					if (previous) selectionState = "rejected";
-					return null;
+				nodes: function (entry) { return entry && entry.registration.nodes; },
+				refresh: current,
+				select: function (target, previous) {
+					// Explicit registered main-frame interaction disambiguates future
+					// hosts with multiple main utilities. Unregistered embedded content
+					// and unrelated UI never replace the current main frame.
+					var direct = Array.from(entries.values()).filter(function (entry) {
+						var panel = conversationPanel(entry.anchor);
+						return target && (entry.anchor.contains(target) || (panel && conversationPanel(target) === panel));
+					});
+					return direct.length === 1 ? choose(direct[0]) : current(previous);
 				},
 				scopeUnavailable: function () { return scopeUnavailable; },
 				valid: function (entry) {
-					if (!entry || entries.get(entry.anchor) !== entry.id) return false;
+					if (!entry || entries.get(entry.anchor) !== entry.registration) return false;
 					var scope = resolveScope(entry.anchor, entry.id);
-					return !!scope && scope.root === entry.root;
+					return !!scope && scope.panel === entry.panel && scope.root === entry.root;
 				},
 				face: function (entry) {
 					try {
@@ -504,10 +555,50 @@ window.__ModuleLoader__.load({
 						return face && typeof face.loadOlder === "function" ? face : null;
 					} catch (error) { return null; }
 				},
-				clear: function () { entries.clear(); }
+				clear: function () { entries.clear(); mainFrame = null; }
 			};
 		}
 
+		// RC2's rendered Turn controls call its navigation owner, including
+		// cancelling a retained paging anchor. Use that actual loaded UI action;
+		// never synthesize wheel/beforematch or import a private Chat controller.
+		function hostNavigationReady(target, face) {
+			var status = face && facePageState(face);
+			if (face && (!status || status.reason || pendingLoads.has(face))) return false;
+			// The snapshot can settle before React commits Chat's loadingOlder
+			// input. Its direct history control must also stop being disabled.
+			return !target.root.querySelector(':scope > div:not([data-chat-anchor-key]):not([data-chat-group-key]) > button:disabled');
+		}
+
+		function activateLoadedTurn(target, store, preferredTurn) {
+			if (!store) return false;
+			var list = target.root.parentElement, chat = list && list.parentElement, frame = chat && chat.parentElement;
+			if (!frame || !target.panel.contains(frame)) return false;
+			var navs = Array.prototype.filter.call(frame.querySelectorAll('nav'), function (nav) {
+				var label = nav.getAttribute('aria-label');
+				return !target.root.contains(nav) && (label === 'Turn navigation' || label === '轮次导航');
+			});
+			if (navs.length !== 1 || !visible(navs[0])) return false;
+			var loaded = new Set();
+			Array.prototype.forEach.call(target.root.querySelectorAll('[data-chat-anchor-key][data-chat-turn]'), function (row) {
+				var key = row.getAttribute('data-chat-node-key') || row.getAttribute('data-chat-anchor-key');
+				if (store.get(key)) loaded.add(row.getAttribute('data-chat-turn'));
+			});
+			var candidates = [];
+			Array.prototype.forEach.call(navs[0].querySelectorAll('button[data-index]'), function (button) {
+				// These exact loaded labels are locale-owned by the inspected host.
+				// The distinct "Load and jump" labels must never be activated here.
+				var match = /^(?:Jump to turn (\d+)|跳转到第 (\d+) 轮)$/.exec(button.getAttribute('aria-label') || '');
+				var turn = match && (match[1] || match[2]);
+				if (!turn || !loaded.has(turn) || button.disabled || button.getAttribute('aria-busy') === 'true' || !visible(button)) return;
+				candidates.push({ button: button, rank: turn === preferredTurn ? 0 : button.getAttribute('aria-current') === 'true' ? 1 : 2 });
+			});
+			candidates.sort(function (a, b) { return a.rank - b.rank; });
+			if (!candidates.length) return false;
+			candidates[0].button.click();
+			return true;
+		}
+
 		function domSignature(root) {
 			return root ? collectTextNodes(root, []).length : 0;
 		}
@@ -571,6 +662,412 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 
+		//#region one find session's reading origin
+		function readingViewport(target) {
+			var scroll = target && target.root.closest('[data-conversation-scroll]');
+			if (!scroll) return null;
+			var rect = scroll.getBoundingClientRect();
+			var bottom = Math.min(rect.bottom, window.innerHeight);
+			var composer = scroll.querySelector('[data-composer-seat]');
+			if (composer) {
+				var composerTop = composer.getBoundingClientRect().top;
+				if (composerTop > rect.top) bottom = Math.min(bottom, composerTop);
+			}
+			var top = Math.max(0, rect.top);
+			return bottom > top && rect.width > 0 ? { scroll: scroll, top: top, bottom: bottom, left: Math.max(0, rect.left), right: Math.min(window.innerWidth, rect.right) } : null;
+		}
+
+		function readingText(row) {
+			var text = '', segments = [];
+			var walker = document.createTreeWalker(row, NodeFilter.SHOW_TEXT), node;
+			while ((node = walker.nextNode()) !== null) {
+				var parent = node.parentElement;
+				if (!parent || parent.closest('script, style, noscript, button, input, textarea, select, [data-code-block-banner]')) continue;
+				if (parent.closest('[data-chat-anchor-key]') !== row) continue;
+				segments.push({ node: node, start: text.length, end: text.length + node.data.length });
+				text += node.data;
+			}
+			return { text: text, segments: segments };
+		}
+
+		function readingRange(snapshot, offset) {
+			for (var i = 0; i < snapshot.segments.length; i++) {
+				var segment = snapshot.segments[i];
+				if (offset < segment.start || offset >= segment.end) continue;
+				var start = offset - segment.start;
+				var range = document.createRange();
+				range.setStart(segment.node, start);
+				range.setEnd(segment.node, Math.min(segment.node.data.length, start + (segment.node.data.codePointAt(start) > 65535 ? 2 : 1)));
+				return range;
+			}
+			return null;
+		}
+
+		function clippedViewport(element, viewport) {
+			var top = viewport.top, bottom = viewport.bottom, left = viewport.left, right = viewport.right;
+			for (var parent = element; parent && parent !== viewport.scroll; parent = parent.parentElement) {
+				var style = window.getComputedStyle(parent);
+				var clipsY = /^(auto|scroll|hidden|clip)$/.test(style.overflowY), clipsX = /^(auto|scroll|hidden|clip)$/.test(style.overflowX);
+				if (!clipsX && !clipsY) continue;
+				var box = parent.getBoundingClientRect();
+				if (clipsY) { top = Math.max(top, box.top); bottom = Math.min(bottom, box.bottom); }
+				if (clipsX) { left = Math.max(left, box.left); right = Math.min(right, box.right); }
+			}
+			return { top: top, bottom: bottom, left: left, right: right };
+		}
+
+		function rangeRect(range, viewport) {
+			if (!range || !range.startContainer.isConnected || typeof range.getClientRects !== 'function') return null;
+			var clip = viewport && clippedViewport(range.startContainer.parentElement, viewport);
+			var rects = range.getClientRects();
+			for (var i = 0; i < rects.length; i++) {
+				var rect = rects[i];
+				if (rect.height > 0 && rect.width > 0 && (!viewport || (clip.bottom > clip.top && clip.right > clip.left && rect.bottom > clip.top && rect.top < clip.bottom && rect.right > clip.left && rect.left < clip.right))) return rect;
+			}
+			return null;
+		}
+
+		function captureReadingOrigin() {
+			var target = state.target, viewport = readingViewport(target);
+			var store = state.adapter && state.adapter.nodes(target);
+			if (!viewport || !store) return null;
+			var rows = target.root.querySelectorAll('[data-chat-anchor-key]');
+			var best = null;
+			for (var i = 0; i < rows.length; i++) {
+				var row = rows[i];
+				if (!visible(row) || row.hasAttribute('data-chat-group-key')) continue;
+				var anchorKey = row.getAttribute('data-chat-anchor-key');
+				var nodeKey = row.getAttribute('data-chat-node-key') || anchorKey;
+				var node = store.get(nodeKey);
+				if (!node || !Number.isFinite(node.anchorSeq)) continue;
+				var snapshot = readingText(row);
+				for (var j = 0; j < snapshot.segments.length; j++) {
+					var segment = snapshot.segments[j];
+					var whole = document.createRange(); whole.selectNodeContents(segment.node);
+					if (!rangeRect(whole, viewport)) continue;
+					// Text order follows the rendered line order inside one text node.
+					// The final geometry check rejects unsupported or non-visible runs.
+					var clipTop = clippedViewport(segment.node.parentElement, viewport).top;
+					var lo = segment.start, hi = segment.end - 1;
+					while (lo < hi) {
+						var mid = Math.floor((lo + hi) / 2);
+						var probe = rangeRect(readingRange(snapshot, mid));
+						if (probe && probe.bottom <= clipTop + 1) lo = mid + 1;
+						else hi = mid;
+					}
+					var rect = rangeRect(readingRange(snapshot, lo), viewport);
+					if (!rect) continue;
+					var distance = Math.abs(rect.top - viewport.top);
+					if (best && distance >= best.distance) continue;
+					var body = row.closest('[data-step-process-body]');
+					var group = body && body.closest('[data-chat-group-key]');
+					best = {
+						inner: group ? { key: group.getAttribute('data-chat-group-key'), top: rect.top - body.getBoundingClientRect().top } : null,
+						target: target, store: store, face: state.adapter.face(target), nodeKey: nodeKey, anchorKey: anchorKey,
+						seq: node.anchorSeq, text: snapshot.text, offset: lo, top: rect.top - viewport.top,
+						focus: document.activeElement, distance: distance, navigated: false
+					};
+				}
+			}
+			return best;
+		}
+
+		function originValid(origin) {
+			return !!origin && isOpen() && state.origin === origin && state.target === origin.target &&
+				state.adapter && state.adapter.valid(origin.target) && state.adapter.nodes(origin.target) === origin.store &&
+				state.adapter.face(origin.target) === origin.face;
+		}
+
+		function readingRow(origin) {
+			var rows = origin.target.root.querySelectorAll('[data-chat-anchor-key]'), found = null;
+			for (var i = 0; i < rows.length; i++) {
+				if (rows[i].getAttribute('data-chat-anchor-key') !== origin.anchorKey ||
+					(rows[i].getAttribute('data-chat-node-key') || origin.anchorKey) !== origin.nodeKey) continue;
+				if (found) return null;
+				found = rows[i];
+			}
+			return found;
+		}
+
+		function locateReading(origin, row) {
+			if (!row || !visible(row)) return null;
+			var snapshot = readingText(row), offset = origin.offset;
+			if (snapshot.text !== origin.text && !snapshot.text.startsWith(origin.text)) {
+				var from = Math.max(0, origin.offset - 64);
+				var quote = origin.text.slice(from, origin.offset + 65);
+				if (origin.text.indexOf(quote) !== from || origin.text.indexOf(quote, from + 1) >= 0) return null;
+				var index = snapshot.text.indexOf(quote);
+				if (index < 0 || snapshot.text.indexOf(quote, index + 1) >= 0) return null;
+				offset = index + origin.offset - from;
+			}
+			return readingRange(snapshot, offset);
+		}
+
+		function updateReturnButton() {
+			if (!state.returnBtn) return;
+			var available = originValid(state.origin) && state.origin.navigated;
+			state.returnBtn.hidden = !state.restoring && !available;
+			state.returnBtn.disabled = !!state.restoring;
+			state.returnBtn.textContent = state.restoring ? L.returning : L.returnPosition;
+			state.returnBtn.setAttribute('aria-label', state.returnBtn.textContent);
+			state.returnBtn.title = state.returnBtn.textContent;
+		}
+
+		function cancelNavigation() {
+			clearTimeout(state.navigationTimer);
+			state.navigationTimer = 0;
+			state.navigationToken += 1;
+		}
+
+		function cancelReturn(message) {
+			if (!state.restoring) return;
+			state.restoring = null;
+			if (state.settleCancel) state.settleCancel();
+			if (message) setStatus(message, false);
+			updateReturnButton();
+		}
+
+		function discardOrigin() {
+			cancelReturn();
+			cancelNavigation();
+			state.origin = null;
+			updateReturnButton();
+		}
+
+		function navigateToRange(range) {
+			cancelReturn(L.returnCancelled);
+			cancelNavigation();
+			var target = state.target, face = state.adapter && state.adapter.face(target);
+			if (target && state.adapter.valid(target) && hostNavigationReady(target, face)) {
+				var row = range.startContainer.parentElement.closest('[data-chat-turn]');
+				activateLoadedTurn(target, state.adapter.nodes(target), row && row.getAttribute('data-chat-turn'));
+				if (state.target !== target || !state.adapter.valid(target) || state.adapter.face(target) !== face) return;
+			}
+			var origin = state.origin, token = state.navigationToken, started = Date.now();
+			var activated = new Set(), scrolledRange = null;
+			function check() {
+				state.navigationTimer = 0;
+				if (token !== state.navigationToken || !originValid(origin)) return;
+				var viewport = readingViewport(origin.target);
+				var current = state.ranges[state.index];
+				var geometry = current && origin.target.root.contains(current.startContainer) && rangeRect(current);
+				if (current && !geometry) revealMatchRange(origin.target, current, activated);
+				if (geometry && scrolledRange !== current) {
+					scrollToRange(current);
+					scrolledRange = current;
+				}
+				if (viewport && current && origin.target.root.contains(current.startContainer) && rangeRect(current, viewport)) {
+					var firstNavigation = !origin.navigated;
+					origin.navigated = true;
+					updateReturnButton();
+					if (!firstNavigation && state.status && state.status.textContent === L.matchRevealFailed) setStatus("", false);
+					if (firstNavigation) {
+						if (state.jumpStatus !== null) {
+							var priorStatus = state.jumpStatus;
+							setStatus(priorStatus, false);
+						} else setStatus(L.returnAvailable, false);
+						if (state.announcement) state.announcement.textContent = L.returnAvailable;
+					}
+					return;
+				}
+				if (Date.now() - started < 1500) {
+					state.navigationTimer = setTimeout(check, 100);
+					return;
+				}
+				setStatus(L.matchRevealFailed, false);
+				if (state.announcement) state.announcement.textContent = L.matchRevealFailed;
+			}
+			check();
+		}
+
+		function focusWithoutScroll(element) {
+			if (!element || !element.isConnected || typeof element.focus !== "function") return;
+			try { element.focus({ preventScroll: true }); } catch (error) { element.focus(); }
+		}
+
+		function activateDisclosure(button, activated) {
+			if (!button || button.disabled || !visible(button) || activated.has(button)) return false;
+			activated.add(button);
+			// DSH's disclosure handlers focus their button. Pre-focus without
+			// scrolling, then restore the find control that initiated navigation.
+			var previous = document.activeElement;
+			focusWithoutScroll(button);
+			button.click();
+			if (previous !== button) focusWithoutScroll(previous);
+			return true;
+		}
+
+		function revealMatchRange(target, range, activated) {
+			if (!target || !range || !target.root.contains(range.startContainer)) return false;
+			var element = range.startContainer.nodeType === 1 ? range.startContainer : range.startContainer.parentElement;
+			if (!element) return false;
+			var changed = false;
+			// Native details participates in the platform ancestor-revealing
+			// algorithm. Opening it does not bypass application-owned state.
+			for (var node = element; node && target.root.contains(node); node = node.parentElement) {
+				if (node.tagName === "DETAILS" && !node.open) {
+					node.open = true;
+					changed = true;
+				}
+			}
+			var ancestors = [];
+			for (node = element; node && target.root.contains(node); node = node.parentElement) {
+				ancestors.push(node);
+			}
+
+			// DSH retains folded process content with hidden=until-found. Use its
+			// rendered disclosure controls so React and the navigation owner remain
+			// synchronized; never edit the hidden attribute or synthesize beforematch.
+			var row = element.closest('[data-chat-turn]');
+			var turn = row && row.getAttribute('data-chat-turn');
+			var buttons = target.root.querySelectorAll('button[data-turn-process][aria-expanded="false"]');
+			for (var i = 0; i < buttons.length; i++) {
+				var owner = buttons[i].closest('[data-chat-turn]');
+				if (turn && owner && owner.getAttribute('data-chat-turn') === turn && activateDisclosure(buttons[i], activated)) return true;
+			}
+			// Prefer the disclosure's semantic aria-controls relationship for
+			// nested groups. Walk outermost first because an inner control can itself
+			// still be inside a folded outer Turn.
+			buttons = target.root.querySelectorAll('button[aria-controls][aria-expanded="false"]');
+			for (var h = ancestors.length - 1; h >= 0; h--) {
+				if (!ancestors[h].id) continue;
+				for (i = 0; i < buttons.length; i++) {
+					if (buttons[i].getAttribute('aria-controls') === ancestors[h].id && activateDisclosure(buttons[i], activated)) return true;
+				}
+			}
+			// Older supported hosts expose the same group disclosure without
+			// aria-controls, but keep its stable group/activity markers.
+			var group = row && row.closest('[data-chat-group-key]');
+			var button = group && group.querySelector('button[data-process-activity][aria-expanded="false"]');
+			if (activateDisclosure(button, activated)) return true;
+			return changed;
+		}
+
+		function returnFailure(reason) {
+			return L.returnFailed + ' ' + (L['return_' + reason] || L.return_unavailable);
+		}
+
+		async function returnToOrigin() {
+			var origin = state.origin;
+			if (state.restoring || !originValid(origin) || !origin.navigated) return;
+			cancelPageIn(); cancelNavigation();
+			var task = { origin: origin };
+			state.restoring = task;
+			setStatus(L.returning, false); updateReturnButton();
+			function cancelled() { return state.restoring !== task || !originValid(origin); }
+			function finishFailure(reason) {
+				if (cancelled()) return;
+				state.restoring = null;
+				if (reason === 'removed') state.origin = null;
+				setStatus(returnFailure(reason), false); updateReturnButton();
+			}
+			function nodeState() {
+				if (origin.face && origin.face.getSnapshot().removed) return 'removed';
+				if (origin.store.get(origin.nodeKey)) return 'loaded';
+				var nodes = origin.store.values();
+				var first = nodes.reduce(function (min, node) { return Math.min(min, node.anchorSeq); }, Infinity);
+				// Materialized Chat nodes do not expose the event window's lower bound.
+				// Earlier missing content permits a bounded load attempt, not a deletion claim.
+				return first > origin.seq ? 'missing' : 'unavailable';
+			}
+			try {
+				var pages = 0;
+				while (!cancelled() && nodeState() === 'missing') {
+					if (!origin.face) { finishFailure('unavailable'); return; }
+					if (pages >= MAX_PAGES) { finishFailure('capped'); return; }
+					var ready = await waitForPage(function () {
+						if (pendingLoads.has(origin.face)) return null;
+						return facePageState(origin.face);
+					}, cancelled);
+					if (cancelled()) return;
+					if (ready.reason) { finishFailure(ready.reason); return; }
+					if (nodeState() !== 'missing') break;
+					if (ready.hasMore !== true) { finishFailure('unavailable'); return; }
+					var before = origin.store.values().map(function (node) { return node.key + ':' + node.anchorSeq; }).join('|');
+					var loaded = await loadPage(origin.face, cancelled);
+					if (cancelled()) return;
+					if (loaded.reason) { finishFailure(loaded.reason); return; }
+					var progress = await waitForPage(function () {
+						if (nodeState() !== 'missing') return {};
+						var after = origin.store.values().map(function (node) { return node.key + ':' + node.anchorSeq; }).join('|');
+						return before !== after ? {} : null;
+					}, cancelled);
+					if (cancelled()) return;
+					if (progress.reason) { finishFailure(progress.reason); return; }
+					pages += 1;
+				}
+				if (cancelled()) return;
+				if (nodeState() !== 'loaded') { finishFailure(nodeState()); return; }
+				var navigationReady = await waitForPage(function () {
+					var status = origin.face && facePageState(origin.face);
+					if (status && status.reason) return status;
+					return hostNavigationReady(origin.target, origin.face) ? {} : null;
+				}, cancelled);
+				if (cancelled()) return;
+				if (navigationReady.reason) { finishFailure(navigationReady.reason); return; }
+				var originalRow = readingRow(origin);
+				activateLoadedTurn(origin.target, origin.store, originalRow && originalRow.getAttribute('data-chat-turn'));
+				if (cancelled()) return;
+				var activated = new Set();
+				var rendered = await waitForPage(function () {
+					var row = readingRow(origin);
+					var range = locateReading(origin, row);
+					if (range && !rangeRect(range)) revealMatchRange(origin.target, range, activated);
+					return range && rangeRect(range) ? { row: row, range: range } : null;
+				}, cancelled);
+				if (cancelled()) return;
+				if (rendered.reason) { finishFailure('render'); return; }
+				var inner = rendered.row.closest('[data-step-process-body]');
+				if (inner && inner.scrollHeight > inner.clientHeight) {
+					var group = inner.closest('[data-chat-group-key]');
+					if (!group) { finishFailure('render'); return; }
+					var innerRect = rangeRect(rendered.range), innerBox = inner.getBoundingClientRect();
+					var sameGroup = origin.inner && group.getAttribute('data-chat-group-key') === origin.inner.key;
+					var innerOffset = Math.max(1 - innerRect.height, Math.min(sameGroup ? origin.inner.top : 0, inner.clientHeight - 1));
+					if (cancelled()) return;
+					inner.scrollTop += innerRect.top - innerBox.top - innerOffset;
+				}
+				var viewport = readingViewport(origin.target), rect = rangeRect(rendered.range);
+				if (!viewport || !rect || cancelled()) { finishFailure('unavailable'); return; }
+				var offset = Math.max(1 - rect.height, Math.min(origin.top, viewport.bottom - viewport.top - 1));
+				var desired = viewport.scroll.scrollTop + rect.top - viewport.top - offset;
+				var top = Math.max(0, Math.min(viewport.scroll.scrollHeight - viewport.scroll.clientHeight, desired));
+				var expectedOffset = offset + desired - top;
+				var initialHeight = viewport.scroll.scrollHeight, initialWidth = viewport.scroll.getBoundingClientRect().width;
+				// One instant landing, then observation. Never fight the host's own
+				// retained paging anchor with repeated scroll writes.
+				viewport.scroll.scrollTo({ top: top, behavior: 'instant' });
+				var started = Date.now(), stable = null;
+				var settled = await waitForPage(function () {
+					var live = locateReading(origin, readingRow(origin));
+					var bounds = readingViewport(origin.target), box = bounds && rangeRect(live, bounds);
+					if (!box) { stable = null; return Date.now() - started >= 1000 ? { reason: 'position' } : null; }
+					var current = box.top - bounds.top;
+					var layoutChanged = bounds.scroll.scrollHeight !== initialHeight || bounds.scroll.getBoundingClientRect().width !== initialWidth;
+					if (!layoutChanged && Math.abs(current - expectedOffset) > 3) return Date.now() - started >= 1000 ? { reason: 'position' } : null;
+					if (!stable || Math.abs(stable.top - current) > 2) stable = { top: current, since: Date.now() };
+					if (Date.now() - stable.since < 600) return null;
+					return { row: readingRow(origin), range: live };
+				}, cancelled);
+				if (cancelled()) return;
+				if (settled.reason) { finishFailure(settled.reason); return; }
+				if (!rangeRect(settled.range, readingViewport(origin.target))) { finishFailure('position'); return; }
+				state.restoring = null;
+				origin.navigated = false;
+				if (state.input) state.input.focus({ preventScroll: true });
+				setStatus(L.returned, false);
+				updateReturnButton();
+				if (state.announcement) state.announcement.textContent = L.returned;
+			} catch (error) { finishFailure('error'); }
+			finally {
+				if (state.restoring === task && !originValid(origin)) {
+					state.restoring = null; state.origin = null; updateReturnButton();
+					if (isOpen()) setStatus(returnFailure('unavailable'), false);
+				}
+			}
+		}
+		//#endregion
+
 		//#region bar UI + state
 
 		var state = {
@@ -597,9 +1094,71 @@ window.__ModuleLoader__.load({
 			pageToken: 0,
 			pages: 0,
 			sessionId: null,
-			sessionTimer: 0
+			sessionTimer: 0,
+			origin: null, restoring: null, returnBtn: null, announcement: null, navigationTimer: 0, navigationToken: 0,
+			jumpStatus: null,
+			positionObserver: null,
+			positionFrame: 0
 		};
 
+		function barAnchor(target) {
+			if (!target || !target.anchor || !target.panel || !target.anchor.closest) return null;
+			var header = target.anchor.closest('[data-conversation-header], header');
+			if (header && target.panel.contains(header)) return header;
+			// Older supported hosts may not expose the header data attribute. The
+			// registered utility still lives in the header's direct child of the panel.
+			var child = target.anchor;
+			while (child && child.parentElement && child.parentElement !== target.panel) child = child.parentElement;
+			return child && child.parentElement === target.panel ? child : null;
+		}
+
+		function positionBar() {
+			if (!isOpen() || !state.bar) return false;
+			if (!state.target) { state.bar.removeAttribute("data-positioned"); return false; }
+			var header = barAnchor(state.target);
+			if (!header || !header.isConnected || !state.target.panel.isConnected) {
+				state.bar.removeAttribute("data-positioned");
+				return false;
+			}
+			var headerRect = header.getBoundingClientRect();
+			var panelRect = state.target.panel.getBoundingClientRect();
+			var viewportWidth = document.documentElement.clientWidth || window.innerWidth;
+			var panelLeft = Math.max(0, panelRect.left);
+			var panelRight = Math.min(viewportWidth, panelRect.right);
+			var dpr = window.devicePixelRatio || 1;
+			function cssPixel(value) { return Math.round(value * dpr) / dpr + "px"; }
+			state.bar.style.setProperty("--dsh-find-all-header-bottom", cssPixel(headerRect.bottom));
+			state.bar.style.setProperty("--dsh-find-all-panel-right-space", cssPixel(Math.max(0, viewportWidth - panelRight)));
+			state.bar.style.setProperty("--dsh-find-all-panel-width", cssPixel(Math.max(0, panelRight - panelLeft)));
+			state.bar.setAttribute("data-positioned", "");
+			return true;
+		}
+
+		function scheduleBarPosition() {
+			if (!isOpen() || state.positionFrame) return;
+			if (typeof requestAnimationFrame !== "function") { positionBar(); return; }
+			state.positionFrame = requestAnimationFrame(function () {
+				state.positionFrame = 0;
+				positionBar();
+			});
+		}
+
+		function stopBarPositioning() {
+			if (state.positionObserver) { state.positionObserver.disconnect(); state.positionObserver = null; }
+			if (state.positionFrame && typeof cancelAnimationFrame === "function") cancelAnimationFrame(state.positionFrame);
+			state.positionFrame = 0;
+		}
+
+		function startBarPositioning() {
+			stopBarPositioning();
+			positionBar();
+			var header = barAnchor(state.target);
+			if (!header || typeof ResizeObserver === "undefined") return;
+			state.positionObserver = new ResizeObserver(scheduleBarPosition);
+			state.positionObserver.observe(header);
+			if (state.target.panel !== header) state.positionObserver.observe(state.target.panel);
+		}
+
 		function paint() {
 			if (!highlightsSupported()) return;
 			CSS.highlights.delete(HL_ALL);
@@ -617,11 +1176,17 @@ window.__ModuleLoader__.load({
 			var n = state.ranges.length;
 			if (!state.query) state.count.textContent = "";
 			else if (n === 0) state.count.textContent = state.paging ? "…" : "0/0";
+			else if (state.index < 0) state.count.textContent = L.resultCount.replace("{n}", String(n) + (state.capped ? "+" : ""));
 			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) {
 			if (!state.status) return;
+			state.jumpStatus = null;
 			state.status.textContent = text || "";
 			state.status.title = busy ? L.stopTip : (text || "");
 			if (busy) state.status.setAttribute("data-busy", "1");
@@ -629,6 +1194,11 @@ window.__ModuleLoader__.load({
 			updateCount();
 		}
 
+		function setJumpStatus(base) {
+			setStatus(L.jumpHint.replace("{n}", String(state.ranges.length)) + (base ? " " + base : ""), false);
+			state.jumpStatus = base || "";
+		}
+
 		function updateScopeButton() {
 			if (!state.scopeBtn) return;
 			var whole = state.scope === "whole";
@@ -738,6 +1308,7 @@ window.__ModuleLoader__.load({
 			var retained = keepIndex && valid ? retainedIndex(state.selection) : -1;
 			if (!state.ranges.length) state.index = -1;
 			else if (!keepIndex) state.index = 0;
+			else if (state.index < 0) state.index = -1;
 			else state.index = retained >= 0 ? retained : Math.max(0, Math.min(state.index, state.ranges.length - 1));
 			rememberSelection();
 			paint();
@@ -746,14 +1317,15 @@ window.__ModuleLoader__.load({
 		}
 
 		function goTo(delta) {
+			cancelReturn(L.returnCancelled);
 			if (!state.adapter || !state.adapter.valid(state.target)) { runSearch(false); return; }
 			var n = state.ranges.length;
 			if (n === 0) return;
-			state.index = ((state.index + delta) % n + n) % n;
+			state.index = state.index < 0 ? (delta < 0 ? n - 1 : 0) : ((state.index + delta) % n + n) % n;
 			rememberSelection();
 			paint();
 			updateCount();
-			scrollToRange(state.ranges[state.index]);
+			navigateToRange(state.ranges[state.index]);
 		}
 
 		function scheduleRescan() {
@@ -854,26 +1426,34 @@ window.__ModuleLoader__.load({
 				if (result.reason === "done" && (!terminal || terminal.reason || terminal.hasMore !== false || pendingLoads.has(face))) result.reason = "stalled";
 				state.paging = false;
 				state.pages = result.pages;
-				if (result.reason === "capped") setStatus(L.capped.replace("{n}", String(result.pages)), false);
-				else if (result.reason !== "done") setStatus(L.incomplete, false);
-				else setStatus(L.available, false);
 				runSearch(true);
+				if (!state.adapter || !state.adapter.valid(target)) return;
+				var message = result.reason === "capped" ? L.capped.replace("{n}", String(result.pages)) :
+					result.reason !== "done" ? L.incomplete : L.available;
+				if (state.ranges.length > 0 && originValid(state.origin) && !state.origin.navigated) setJumpStatus(message);
+				else setStatus(message, false);
 			});
 		}
 
-		function syncTarget(target, passive, retainNeutral) {
+		function syncTarget(target, passive) {
 			if (!state.adapter) return;
-			var selected = passive ? state.adapter.refresh(state.target) : state.adapter.select(target || document.activeElement, state.target, retainNeutral);
-			if (selected && state.target && selected.id === state.target.id && selected.anchor === state.target.anchor && selected.root === state.target.root) return;
+			var selected = passive ? state.adapter.refresh(state.target) : state.adapter.select(target || document.activeElement, state.target);
+			if (selected && state.target && selected.id === state.target.id && selected.anchor === state.target.anchor && selected.root === state.target.root && selected.panel === state.target.panel && selected.registration === state.target.registration) {
+				if (state.origin && !originValid(state.origin)) { discardOrigin(); setStatus(returnFailure('unavailable'), false); }
+				scheduleBarPosition();
+				return;
+			}
 			if (!selected && !state.target) {
 				if (isOpen()) runSearch(false);
 				return;
 			}
+			discardOrigin();
 			cancelPageIn();
 			stopObserver();
 			state.target = selected;
 			state.sessionId = selected ? selected.id : null;
 			if (!isOpen()) return;
+			startBarPositioning();
 			setStatus(selected ? "" : unavailableStatus(), false);
 			runSearch(false);
 			startObserver();
@@ -916,15 +1496,17 @@ window.__ModuleLoader__.load({
 		}
 
 		function onQueryInput(input) {
+			cancelReturn(L.returnCancelled); cancelNavigation();
 			state.query = input.value;
 			cancelPageIn();
 			setStatus("", false);
 			runSearch(false);
-			if (state.ranges.length > 0 && highlightsSupported()) scrollToRange(state.ranges[state.index]);
+			if (state.ranges.length > 0 && highlightsSupported()) navigateToRange(state.ranges[state.index]);
 			if (state.scope === "whole" && state.query) schedulePageIn();
 		}
 
 		function toggleScope() {
+			cancelReturn(L.returnCancelled);
 			state.scope = state.scope === "whole" ? "page" : "whole";
 			updateScopeButton();
 			if (state.scope === "page") {
@@ -940,6 +1522,8 @@ window.__ModuleLoader__.load({
 			var bar = document.createElement("div");
 			bar.id = BAR_ID;
 			bar.setAttribute("role", "search");
+			var controls = document.createElement("div");
+			controls.className = "controls";
 
 			var input = document.createElement("input");
 			input.type = "text";
@@ -954,10 +1538,15 @@ window.__ModuleLoader__.load({
 
 			var count = document.createElement("span");
 			count.className = "count";
+			count.setAttribute("role", "status");
 			count.setAttribute("aria-live", "polite");
+			count.setAttribute("aria-atomic", "true");
 
 			var status = document.createElement("span");
 			status.className = "status";
+			status.setAttribute("role", "status");
+			status.setAttribute("aria-live", "polite");
+			status.setAttribute("aria-atomic", "true");
 			status.title = L.stopTip;
 			status.addEventListener("click", function () {
 				if (!state.paging) return;
@@ -965,13 +1554,20 @@ window.__ModuleLoader__.load({
 				setStatus(L.incomplete, false);
 			});
 
-			bar.appendChild(input);
-			bar.appendChild(scopeBtn);
-			bar.appendChild(count);
-			bar.appendChild(button(L.prev, "m18 15-6-6-6 6", function () { goTo(-1); }));
-			bar.appendChild(button(L.next, "m6 9 6 6 6-6", function () { goTo(1); }));
+			controls.appendChild(input);
+			controls.appendChild(scopeBtn);
+			controls.appendChild(count);
+			controls.appendChild(button(L.prev, "m18 15-6-6-6 6", function () { goTo(-1); }));
+			controls.appendChild(button(L.next, "m6 9 6 6 6-6", function () { goTo(1); }));
+			var returnBtn = document.createElement('button');
+			returnBtn.type = 'button'; returnBtn.setAttribute('data-find-all-return', '');
+			returnBtn.hidden = true;
+			returnBtn.addEventListener('click', returnToOrigin);
+			state.returnBtn = returnBtn;
+			controls.appendChild(returnBtn);
+			controls.appendChild(button(L.close, "M18 6 6 18M6 6l12 12", close));
+			bar.appendChild(controls);
 			bar.appendChild(status);
-			bar.appendChild(button(L.close, "M18 6 6 18M6 6l12 12", close));
 
 			state.bar = bar;
 			state.input = input;
@@ -980,13 +1576,24 @@ window.__ModuleLoader__.load({
 			state.scopeBtn = scopeBtn;
 			updateScopeButton();
 			document.body.appendChild(bar);
+			var announcement = document.createElement('span');
+			announcement.setAttribute('role', 'status'); announcement.setAttribute('aria-live', 'polite');
+			announcement.setAttribute('aria-atomic', 'true');
+			announcement.style.cssText = 'position:fixed;width:1px;height:1px;overflow:hidden;clip-path:inset(50%)';
+			state.announcement = announcement;
+			document.body.appendChild(announcement);
 		}
 
 		function open(target) {
 			if (typeof document === "undefined" || document.body === null) return;
-			syncTarget(target || document.activeElement, false, true);
+			var wasOpen = isOpen();
+			syncTarget(target || document.activeElement, false);
+			if (!wasOpen) state.origin = captureReadingOrigin();
 			if (!state.bar) buildBar();
 			state.bar.style.display = "flex";
+			startBarPositioning();
+			updateReturnButton();
+			if (state.announcement) state.announcement.textContent = "";
 			var selection = "";
 			try { selection = String(window.getSelection()).trim(); } catch (error) {}
 			if (state.target && selection && selection.length <= 200 && selection !== state.query) {
@@ -996,15 +1603,20 @@ window.__ModuleLoader__.load({
 			state.input.focus();
 			state.input.select();
 			runSearch(false);
+			if (!state.query && state.target && state.adapter && state.adapter.valid(state.target) && !state.origin) {
+				setStatus(L.originUnavailable, false);
+			}
 			startObserver();
 			watchSession();
 			if (state.scope === "whole" && state.query) schedulePageIn();
 		}
 
 		function close() {
+			discardOrigin();
 			cancelPageIn();
 			stopWatchingSession();
-			if (state.bar) state.bar.style.display = "none";
+			stopBarPositioning();
+			if (state.bar) { state.bar.style.display = "none"; state.bar.removeAttribute("data-positioned"); }
 			state.ranges = [];
 			state.index = -1;
 			state.selection = null;
@@ -1020,21 +1632,29 @@ 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);
+				if (isOpen()) syncTarget(null, true);
 			});
 			function SessionFind(props) {
 				var anchor = react.useRef(null);
+				var nodes = typeof props.useChat === 'function' ? props.useChat(function (snapshot) { return snapshot.nodes; }) : null;
 				react.useEffect(function () {
 					if (!anchor.current || !props.sessionId) return;
-					return state.adapter.mount(anchor.current, props.sessionId);
-				}, [props.sessionId]);
-				return react.createElement("button", {
-					ref: anchor, type: "button", title: L.find, "aria-label": L.find,
+					// 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, nodes);
+				}, [props.sessionId, nodes]);
+				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);
@@ -1043,21 +1663,50 @@ window.__ModuleLoader__.load({
 				injectCss();
 				var handler = createHandlers({
 					open: open, close: close, goTo: goTo, isOpen: isOpen,
+					ownsKeys: function (event) {
+						var path = typeof event.composedPath === 'function' ? event.composedPath() : [event.target];
+						return !path.some(function (node) {
+							return node && node.closest && node.closest('dialog[open], [aria-modal="true"], .monaco-editor, .cm-editor, .CodeMirror');
+						});
+					},
 					isBarInput: function (target) { return target === state.input; }
 				});
 				function focus(event) {
 					if (!state.bar || !state.bar.contains(event.target)) syncTarget(event.target);
 				}
+				function readingFocus(event) {
+					// Reader activity may refresh the registered main frame, but cannot
+					// select an embedded sidebar or change the search scope.
+					if (event.isTrusted && event.target && event.target.closest && event.target.closest('[data-conversation-scroll]')) focus(event);
+				}
+				function interruptReading(event) {
+					if (!state.restoring || !state.target) return;
+					var viewport = readingViewport(state.target);
+					if (!viewport || !viewport.scroll.contains(event.target)) return;
+					if (event.type === 'keydown' && !/^(ArrowUp|ArrowDown|PageUp|PageDown|Home|End| )$/.test(event.key)) return;
+					if (event.target.closest('input, textarea, [contenteditable="true"]')) return;
+					cancelReturn(L.returnCancelled);
+				}
+				['wheel', 'touchstart', 'pointerdown', 'keydown'].forEach(function (type) { window.addEventListener(type, interruptReading, true); });
 				window.addEventListener("keydown", handler, true);
 				window.addEventListener("focusin", focus, true);
 				window.addEventListener("pointerdown", focus, true);
+				window.addEventListener("wheel", readingFocus, true);
+				window.addEventListener("resize", scheduleBarPosition);
+				window.addEventListener("scroll", scheduleBarPosition, true);
 				return function () {
+					['wheel', 'touchstart', 'pointerdown', 'keydown'].forEach(function (type) { window.removeEventListener(type, interruptReading, true); });
 					window.removeEventListener("keydown", handler, true);
 					window.removeEventListener("focusin", focus, true);
 					window.removeEventListener("pointerdown", focus, true);
+					window.removeEventListener("wheel", readingFocus, true);
+					window.removeEventListener("resize", scheduleBarPosition);
+					window.removeEventListener("scroll", scheduleBarPosition, true);
 					close();
 					state.query = "";
 					if (state.bar) state.bar.remove();
+					if (state.announcement) state.announcement.remove();
+					state.announcement = state.returnBtn = null;
 					var style = document.querySelector('style[data-plugin-css="dsh-find-all/bar.css"]');
 					if (style) style.remove();
 					state.bar = state.input = state.count = state.status = state.scopeBtn = null;