dsh-diff-approval 0.32.0 → 0.33.0

package/lib/client.js

@@ -19810,16 +19810,27 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		*   `[data-produced-files-row] button`    0.1.5's produced-file card       `title` = the path
 		*   `[data-presented-files-row] button`   0.1.7's presented-file card      `title` = the path
 		*   `[data-changed-files] button`         0.1.7's changed-files row        `aria-describedby` = the path
-		*   `button[title]`                       a message's file LINK (0.1.7)    `title` = the path
 		*   `button[data-ref-chip]`               a `@file` chip in a message      `title` = the token
-		*   `a[href]`                             any other link naming a file     `href`  = the path
-		*
-		* Everything else is left entirely alone: a link to a URL, an in-page anchor, a chip naming something
-		* that is not a file, a file LINK whose file this panel does not hold, a modified press (Ctrl/Cmd/Shift/
-		* Alt, or a middle click — gestures the harness may give its own meaning later), and any press inside this
-		* plugin's own surface, whose buttons carry paths too and belong to the panel that is already showing
-		* the file. A file-list ROW is the one press taken over whether or not the panel holds its file (see
-		* `ROW_SELECTOR`); "we do not hold it" then decides what the menu offers, not whether it appears.
+		*   `button._fileLink_…` / `._fileMention_…`  a message's file LINK         `title` = the path
+		*
+		* A PRESS IS ADMITTED BY THE SHELL'S OWN MARK, NEVER BY THE SHAPE OF ITS TEXT. The link row's classes are
+		* the shell's CSS-module names — measured on the live shell as `_fileMention_1ypvv_85 _fileLink_1ypvv_59`,
+		* carrying `title="src/client/produced-diff.ts"` — and that name survives the hash and line suffix the
+		* module adds per build, so the marker is the `_fileLink_` / `_fileMention_` substring rather than the
+		* whole class.
+		*
+		* This replaced two blanket rules, `button[title]` and every `a[href]`, which admitted a press by how its
+		* text was spelled and were measured wrong twice on 2026-10-09: a model picker's button carries a tooltip
+		* naming the model, and a version-like name (`…v3.2`) ends in the ".extension" the text filter accepted, so
+		* pressing 修改模型 raised this menu over the shell's own control; an in-app route link (`/settings`) holds a
+		* separator and was admitted the same way. A file press is one the shell marks as one.
+		*
+		* Everything else is left entirely alone: a link to a URL, an in-page anchor, a button whose tooltip names
+		* something that is not a file, a file LINK whose file this panel does not hold, a modified press
+		* (Ctrl/Cmd/Shift/Alt, or a middle click — gestures the harness may give its own meaning later), and any
+		* press inside this plugin's own surface, whose buttons carry paths too and belong to the panel that is
+		* already showing the file. A file-list ROW is the one press taken over whether or not the panel holds its
+		* file (see `ROW_SELECTOR`); "we do not hold it" then decides what the menu offers, not whether it appears.
 		*
 		* The name of the module (and of the event it raises) dates from when the produced-file card was the
 		* only press of this kind; `data-presented-files-row` is that same list under 0.1.7's name for it.
@@ -19862,13 +19873,24 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		*
 		* A press this list misses is not a crash — it is one menu the reader does not get.
 		*/
+		/**
+		* The shell's OWN mark on a file link, as the name part of its CSS-module classes: measured on the live
+		* shell as `class="_fileMention_1ypvv_85 _fileLink_1ypvv_59"` on the `<button title="src/client/
+		* produced-diff.ts">` a message draws for a file. The hash and the line number after the name are per
+		* build, so the marker is the `_name_` substring and not the whole class.
+		*
+		* A CSS-module class name is the shell telling this module what the element IS, which is why this replaced
+		* the text-shape rules (see the module doc). It is a name, not an API: if the shell ever renames or
+		* minifies these classes, this marker stops matching and file links fall back to the shell's own press —
+		* fewer menus, never a menu over the wrong control, which is the direction a wrong guess must fail in.
+		*/
+		const MARKED_LINK_SELECTOR = "[class*=\"_fileLink_\"], [class*=\"_fileMention_\"]";
 		const PRESS_SELECTOR = [
 			"[data-produced-files-row] button",
 			"[data-presented-files-row] button",
 			"[data-changed-files] button",
-			"button[title]",
 			"button[data-ref-chip]",
-			"a[href]"
+			MARKED_LINK_SELECTOR
 		].join(", ");
 		/**
 		* A shell press that looks like one of the above and is NOT one: the review pane's file picker.
@@ -19912,41 +19934,65 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			return stripSuffix(text.replace(/^@/, "").replace(/^"|"$/g, "").trim());
 		}
 		/**
-		* Whether this text names a file, rather than a URL, an in-page anchor or a plain label.
+		* Whether this text is spelled as something that is not a file at all: an in-page anchor, a query, or
+		* another scheme's URL. A Windows drive letter is a file despite the colon it starts with.
+		*
+		* @param value - the candidate text.
+		* @returns whether it is spelled as a non-file.
+		*/
+		function isNonFileSpelling(value) {
+			if (value === "" || value.startsWith("#") || value.startsWith("?")) return true;
+			return /^[A-Za-z][A-Za-z0-9+.-]*:/.test(value) && !/^[A-Za-z]:[\\/]/.test(value);
+		}
+		/**
+		* Whether this text has the SHAPE of a path: a `.extension` tail or a separator.
 		*
-		* A shell tooltip lives in `title` too, so "the element has a title" is not enough: a URL scheme is not
-		* a file (a Windows drive letter is), and a label with neither a separator nor an extension is a label.
-		* This is a filter, not a decision — `isPending` is what decides — so it errs towards letting a press
-		* through untouched rather than towards taking one over.
+		* Only a press the shell did NOT mark is held to this, because its text is all there is to go on. A marked
+		* press is a file link by the shell's own word, so its value is taken as written and an extension-less path
+		* (`Makefile`) is read as the file it is instead of being dismissed as a label.
 		*
 		* @param value - the candidate text.
 		* @returns whether it could name a file.
 		*/
 		function looksLikePath(value) {
-			if (value === "" || value.startsWith("#") || value.startsWith("?")) return false;
-			if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(value) && !/^[A-Za-z]:[\\/]/.test(value)) return false;
+			if (isNonFileSpelling(value)) return false;
 			return /\.[A-Za-z0-9]{1,8}$/.test(value) || value.includes("/") || value.includes("\\");
 		}
+		/** Whether the shell itself marked this press as one of its file links (see `MARKED_LINK_SELECTOR`). */
+		function isMarkedFileLink(press) {
+			return press.matches(MARKED_LINK_SELECTOR);
+		}
 		/**
 		* The path a press names, or undefined when it names no file.
 		*
+		* Every shape is read from the same three places — `title`, the text its `aria-describedby` points at, an
+		* anchor's `href` — and what differs is the test the value must pass: a press the shell marked must only
+		* not be spelled as a non-file, while one it did not mark must ALSO have the shape of a path.
+		*
 		* @param press - the element the reader pressed.
 		* @returns the path, as the shell spelled it (the panel matches it against its own spelling).
 		*/
 		function pressPathOf(press) {
+			const marked = isMarkedFileLink(press);
+			const accept = (value) => {
+				const path = pathOfReference(value);
+				if (path === "") return void 0;
+				if (marked) return isNonFileSpelling(path) ? void 0 : path;
+				return looksLikePath(path) ? path : void 0;
+			};
 			const title = press.getAttribute("title")?.trim();
 			if (title !== void 0) {
-				const path = pathOfReference(title);
-				if (looksLikePath(path)) return path;
+				const path = accept(title);
+				if (path !== void 0) return path;
 			}
 			const describedBy = press.getAttribute("aria-describedby");
 			if (describedBy !== null) {
-				const path = press.ownerDocument.getElementById(describedBy)?.textContent?.trim() ?? "";
-				if (looksLikePath(path)) return path;
+				const path = accept(press.ownerDocument.getElementById(describedBy)?.textContent?.trim() ?? "");
+				if (path !== void 0) return path;
 			}
 			if (press instanceof HTMLAnchorElement) {
-				const path = stripSuffix(press.getAttribute("href")?.trim() ?? "");
-				if (looksLikePath(path)) return path;
+				const path = accept(stripSuffix(press.getAttribute("href")?.trim() ?? ""));
+				if (path !== void 0) return path;
 			}
 		}
 		/** The press `replayFilePress` is replaying, if any: that press is the shell's, not the menu's. */
@@ -23084,14 +23130,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				const body = bodyRef.current;
 				if (body === null) return;
 				if (body.clientHeight <= 0) return;
-				const viewTop = body.scrollTop;
-				const viewBottom = viewTop + body.clientHeight;
-				const pairTop = off(pairIndex);
-				const pairBottom = pairTop + ROW_HEIGHT_PX;
-				let target;
-				if (pairTop < viewTop) target = pairTop;
-				else if (pairBottom > viewBottom) target = pairBottom - body.clientHeight;
-				if (target === void 0) return;
+				const target = off(pairIndex) + ROW_HEIGHT_PX / 2 - body.clientHeight / 2;
 				const clamped = Math.max(0, Math.min(target, body.scrollHeight - body.clientHeight));
 				if (body.scrollTop !== clamped) body.scrollTop = clamped;
 				setScrollTop(clamped);
@@ -24964,25 +25003,17 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				applyPreviewFrames();
 			};
 			/**
-			* Bring one preview search occurrence into view. The code view's search rule is
-			* reused: a hit that is already fully visible is left alone (a search must not
-			* yank the pane off what the user can see), one above the viewport lands with
-			* the lead rows above it — the block-jump rule — and one below lands at the
-			* bottom edge. The settled offset is mirrored into the frames, as for a jump.
+			* Put one preview search occurrence in the middle of the pane. Its only caller is the search JUMP — the
+			* bar's next / previous, Enter, F3 — and the point of that jump is to read the occurrence it landed on,
+			* which is the rule the code view and the side-by-side view now follow too. The settled offset is
+			* mirrored into the frames, as for a jump.
 			* @param hit - the highlighted occurrence to reveal.
 			*/
 			const scrollPreviewHitIntoView = (hit) => {
 				const body = mdPreviewBodyRef.current;
 				if (body === null) return;
 				const bodyRect = body.getBoundingClientRect();
-				const hitTop = hit.getBoundingClientRect().top - bodyRect.top + body.scrollTop;
-				const hitBottom = hit.getBoundingClientRect().bottom - bodyRect.top + body.scrollTop;
-				const viewTop = body.scrollTop;
-				const viewBottom = viewTop + body.clientHeight;
-				let target;
-				if (hitTop - leadRows * ROW_HEIGHT_PX < viewTop) target = hitTop - leadRows * ROW_HEIGHT_PX;
-				else if (hitBottom > viewBottom) target = hitBottom - body.clientHeight;
-				if (target === void 0) return;
+				const target = (hit.getBoundingClientRect().top - bodyRect.top + body.scrollTop + (hit.getBoundingClientRect().bottom - bodyRect.top + body.scrollTop)) / 2 - body.clientHeight / 2;
 				const maxTop = Math.max(0, body.scrollHeight - body.clientHeight);
 				const clamped = Math.max(0, Math.min(target, maxTop));
 				if (body.scrollTop !== clamped) body.scrollTop = clamped;
@@ -25078,9 +25109,13 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				}
 				if (searchMatches.length === 0) return;
 				if (cursorPosRef.current !== void 0) {
+					centerSearchRef.current = true;
+					setSearchJump((jump) => jump + 1);
 					setSearchIndex(startIndexFor(searchQuery));
 					return;
 				}
+				centerSearchRef.current = true;
+				setSearchJump((jump) => jump + 1);
 				setSearchIndex((current) => (current + direction + searchMatches.length) % searchMatches.length);
 			};
 			/**
@@ -25102,6 +25137,11 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				return at === -1 ? 0 : at;
 			};
 			const cursorPosRef = (0, react.useRef)(void 0);
+			/** Set by a search JUMP: the next match is centred, where a typed query only brings it into view. */
+			const centerSearchRef = (0, react.useRef)(false);
+			/** Bumped by every JUMP, so the centring effect runs even when the match itself does not change (a single
+			*  hit, or a wrap back onto the same row). */
+			const [searchJump, setSearchJump] = (0, react.useState)(0);
 			const lastRecordedCursorRef = (0, react.useRef)(void 0);
 			const openSearchWithSelection = () => {
 				if (searchOpen) {
@@ -25168,18 +25208,25 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				const body = bodyRef.current;
 				if (body === null) return;
 				if (body.clientHeight <= 0) return;
+				const centring = centerSearchRef.current;
+				centerSearchRef.current = false;
 				const viewTop = body.scrollTop;
 				const viewBottom = viewTop + body.clientHeight;
 				const rowTop = offsetOf(row);
 				const rowBottom = rowTop + extentOf(row, row);
 				let target;
-				if (rowTop < viewTop) target = rowTop;
+				if (centring) target = (rowTop + rowBottom) / 2 - body.clientHeight / 2;
+				else if (rowTop < viewTop) target = rowTop;
 				else if (rowBottom > viewBottom) target = rowBottom - body.clientHeight;
 				if (target === void 0) return;
 				const clamped = Math.max(0, Math.min(target, body.scrollHeight - body.clientHeight));
 				if (body.scrollTop !== clamped) body.scrollTop = clamped;
 				setScrollTop(clamped);
-			}, [currentSearchRow, searchMatches]);
+			}, [
+				currentSearchRow,
+				searchMatches,
+				searchJump
+			]);
 			const blockIndexByRow = (0, react.useMemo)(() => {
 				const map = /* @__PURE__ */ new Map();
 				model.blocks.forEach((block, blockIndex) => {

package/lib/types/client/produced-diff.d.ts

@@ -8,16 +8,27 @@
  *   `[data-produced-files-row] button`    0.1.5's produced-file card       `title` = the path
  *   `[data-presented-files-row] button`   0.1.7's presented-file card      `title` = the path
  *   `[data-changed-files] button`         0.1.7's changed-files row        `aria-describedby` = the path
- *   `button[title]`                       a message's file LINK (0.1.7)    `title` = the path
  *   `button[data-ref-chip]`               a `@file` chip in a message      `title` = the token
- *   `a[href]`                             any other link naming a file     `href`  = the path
+ *   `button._fileLink_…` / `._fileMention_…`  a message's file LINK         `title` = the path
  *
- * Everything else is left entirely alone: a link to a URL, an in-page anchor, a chip naming something
- * that is not a file, a file LINK whose file this panel does not hold, a modified press (Ctrl/Cmd/Shift/
- * Alt, or a middle click — gestures the harness may give its own meaning later), and any press inside this
- * plugin's own surface, whose buttons carry paths too and belong to the panel that is already showing
- * the file. A file-list ROW is the one press taken over whether or not the panel holds its file (see
- * `ROW_SELECTOR`); "we do not hold it" then decides what the menu offers, not whether it appears.
+ * A PRESS IS ADMITTED BY THE SHELL'S OWN MARK, NEVER BY THE SHAPE OF ITS TEXT. The link row's classes are
+ * the shell's CSS-module names — measured on the live shell as `_fileMention_1ypvv_85 _fileLink_1ypvv_59`,
+ * carrying `title="src/client/produced-diff.ts"` — and that name survives the hash and line suffix the
+ * module adds per build, so the marker is the `_fileLink_` / `_fileMention_` substring rather than the
+ * whole class.
+ *
+ * This replaced two blanket rules, `button[title]` and every `a[href]`, which admitted a press by how its
+ * text was spelled and were measured wrong twice on 2026-10-09: a model picker's button carries a tooltip
+ * naming the model, and a version-like name (`…v3.2`) ends in the ".extension" the text filter accepted, so
+ * pressing 修改模型 raised this menu over the shell's own control; an in-app route link (`/settings`) holds a
+ * separator and was admitted the same way. A file press is one the shell marks as one.
+ *
+ * Everything else is left entirely alone: a link to a URL, an in-page anchor, a button whose tooltip names
+ * something that is not a file, a file LINK whose file this panel does not hold, a modified press
+ * (Ctrl/Cmd/Shift/Alt, or a middle click — gestures the harness may give its own meaning later), and any
+ * press inside this plugin's own surface, whose buttons carry paths too and belong to the panel that is
+ * already showing the file. A file-list ROW is the one press taken over whether or not the panel holds its
+ * file (see `ROW_SELECTOR`); "we do not hold it" then decides what the menu offers, not whether it appears.
  *
  * The name of the module (and of the event it raises) dates from when the produced-file card was the
  * only press of this kind; `data-presented-files-row` is that same list under 0.1.7's name for it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-diff-approval",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "DeepSeek Harness plugin: pending-edit review with whole-file diff and Keep/Revert",
   "packageManager": "pnpm@11.21.0",
   "author": "Wu Zhiwei",