dsh-diff-approval 0.32.0 → 0.34.0

package/lib/index.js

@@ -3347,9 +3347,12 @@ function refusalText(refusal, path) {
 /**
 * The sentence a file that could not be listed is refused with.
 *
-* All three are the workspace's rules rather than the annotation's: the panel can only show what the
-* session's workspace contains and the file service can read, and naming which one failed is what lets
-* the agent pick another file, or stop annotating that one.
+* Both are the workspace's rules rather than the annotation's: there is either no workspace to hold a
+* list, or the file service could not read the file as text. Naming which one failed is what lets the
+* agent pick another file, or stop annotating that one.
+*
+* A path OUTSIDE the workspace is not in this list: the panel can hold such a file (an edit to one is
+* captured like any other), so it is listed and annotated rather than refused (see `resolveForListing`).
 *
 * @param kind - why listing failed.
 * @param path - the path the caller named.
@@ -3357,7 +3360,6 @@ function refusalText(refusal, path) {
 */
 function unlistedText(kind, path) {
 	switch (kind) {
-		case "outside": return `refused: "${path}" is not inside this session's workspace, so the review panel cannot list it. Annotate a file of the workspace the user is working in.`;
 		case "no-workspace": return `refused: this session has no workspace, so there is no file list to add "${path}" to.`;
 		default: return `refused: "${path}" could not be read as a text file, so there is nothing to annotate. Check the path (a workspace-relative path is fine) and try again.`;
 	}
@@ -4392,6 +4394,30 @@ function resolveInsideWorkspace(root, input) {
 	const absolute = isAbsolute(input) ? resolve(input) : resolve(root, input);
 	return workspaceRelativeOf(root, absolute) === void 0 ? void 0 : absolute;
 }
+/**
+* Resolve one caller-supplied path for LISTING, which an absolute path need not keep inside the workspace.
+*
+* A relative path is workspace-relative, exactly as before. An absolute one is taken as it is, wherever it
+* points: the fence `resolveInsideWorkspace` draws is the right one for a SUBTREE question — a scan of the
+* workspace's own VCS — and the wrong one for "show me this file".
+*
+* The panel can already hold a file outside the workspace: the tracked capture behind an `edit`/`write`/`
+* `str_replace_editor` has never had a workspace fence (`tools/result` folds `outcome.path` as the tool
+* spelled it), so a file the agent edited elsewhere is listed, kept and reverted like any other. Refusing
+* to READ one into the list therefore only made the plugin disagree with itself: a card could not hang on a
+* file the panel was already able to show. Both ways in — the agent's annotate call and the reader's own
+* "add this path" — go through this, so they agree.
+*
+* What is read is still the harness's file service, whose reads are not workspace-confined (only its
+* mutations are fenced, by the sandbox policy), so this adds no read the deployment does not already allow.
+*
+* @param root - the workspace root, for a relative path.
+* @param input - the caller's path (absolute anywhere, or workspace-relative).
+* @returns the absolute path to list.
+*/
+function resolveForListing(root, input) {
+	return isAbsolute(input) ? resolve(input) : resolve(root, input);
+}
 /** The workspace-relative parent of a relative directory path (`''` at the root). */
 /** Fold one path for comparison: absolute, `/`-separated, case-folded on Windows.
 *  Entries are keyed by the path spelling their capture carried (a tool's display
@@ -4610,8 +4636,8 @@ function apply(ctx, config) {
 	* already lands with — so the file opens at its own content and the card sits on the lines it names.
 	*
 	* It is deliberately that ROUTE and not a raw insert: a path already listed is answered from the list
-	* (so annotating twice never re-baselines a review in progress), a path outside the workspace is
-	* refused here rather than confined later, and what lands goes through the same fold + persist + undo
+	* (so annotating twice never re-baselines a review in progress), a path outside the workspace is listed
+	* like any other (see `resolveForListing`), and what lands goes through the same fold + persist + undo
 	* bookkeeping as every other admission.
 	*
 	* @param sessionId - the session whose list gains the file.
@@ -4623,8 +4649,7 @@ function apply(ctx, config) {
 		await ensureLoaded();
 		const workspace = workspaceOf(sessionId);
 		if (workspace === void 0) return { kind: "no-workspace" };
-		const absolute = resolveInsideWorkspace(workspace.path, asked);
-		if (absolute === void 0) return { kind: "outside" };
+		const absolute = resolveForListing(workspace.path, asked);
 		const listed = store.list(sessionId).find((entry) => pathIdentity(entry.path) === pathIdentity(absolute));
 		if (listed !== void 0) return {
 			kind: "listed",
@@ -6888,8 +6913,8 @@ function apply(ctx, config) {
 				if (target === void 0) return rpcError("sessionId and path must be non-empty strings");
 				const workspace = workspaceOf(target.sessionId);
 				if (workspace === void 0) return rpcError("add unavailable: the session has no workspace");
-				const absolute = resolveInsideWorkspace(workspace.path, target.path);
-				if (absolute === void 0) return {
+				const absolute = resolveForListing(workspace.path, target.path);
+				if (!target.exact && workspaceRelativeOf(workspace.path, absolute) === void 0) return {
 					ok: true,
 					value: {
 						outcome: "outside",
@@ -7316,7 +7341,7 @@ function commentAddOf(payload) {
 	if (typeof startLine !== "number" || !Number.isFinite(startLine)) return void 0;
 	if (typeof endLine !== "number" || !Number.isFinite(endLine)) return void 0;
 	if (typeof quote !== "string") return void 0;
-	if (typeof text !== "string" || text.trim().length === 0) return void 0;
+	if (typeof text !== "string") return void 0;
 	const id = body.id;
 	const quoteContext = body.quoteContext;
 	const quoteLines = [];

package/lib/types/annotate-tool.d.ts

@@ -168,8 +168,6 @@ export type ListFileOutcome = {
     kind: 'listed';
     entry: PendingEntry;
     added: boolean;
-} | {
-    kind: 'outside';
 } | {
     kind: 'missing';
 } | {
@@ -205,15 +203,18 @@ export interface AnnotateRunDeps {
 /**
  * The sentence a file that could not be listed is refused with.
  *
- * All three are the workspace's rules rather than the annotation's: the panel can only show what the
- * session's workspace contains and the file service can read, and naming which one failed is what lets
- * the agent pick another file, or stop annotating that one.
+ * Both are the workspace's rules rather than the annotation's: there is either no workspace to hold a
+ * list, or the file service could not read the file as text. Naming which one failed is what lets the
+ * agent pick another file, or stop annotating that one.
+ *
+ * A path OUTSIDE the workspace is not in this list: the panel can hold such a file (an edit to one is
+ * captured like any other), so it is listed and annotated rather than refused (see `resolveForListing`).
  *
  * @param kind - why listing failed.
  * @param path - the path the caller named.
  * @returns the sentence the caller reads.
  */
-export declare function unlistedText(kind: 'outside' | 'missing' | 'no-workspace', path: string): string;
+export declare function unlistedText(kind: 'missing' | 'no-workspace', path: string): string;
 /**
  * Build the body one tool call runs: resolve the file, apply the rule, store the record.
  *

package/lib/types/client/panel-memory.d.ts

@@ -15,6 +15,13 @@
  * @module dsh-diff-approval/client/panel-memory
  */
 import type { Discussion, DiscussionQuoteLine } from './discussion.ts';
+/** One place a deliberate jump left behind: the file, and how far down it was. */
+export interface PanelJumpPlace {
+    /** The pending entry the reader was in. */
+    fileId: string;
+    /** The code view's `scrollTop` there — what `rememberPanelView` keeps current as the reader scrolls. */
+    scrollTop: number;
+}
 /**
  * What the panel keeps about one thread that is NOT the host's to keep: what the reader is
  * typing, whether the block is folded, and the body height the panel last measured for it.
@@ -182,6 +189,29 @@ export declare function lastPanelFile(sessionId: string | undefined): string | u
  * @returns the remembered scrollTop, or undefined when there is none.
  */
 export declare function panelFileOffset(sessionId: string | undefined, fileId: string): number | undefined;
+/**
+ * Remember the place a deliberate jump is leaving, so the reader can come back to it.
+ *
+ * ONLY JUMPS PASS THROUGH HERE — never a scroll of the reader's own, which is the whole point. Their place
+ * is already kept per file (`rememberPanelView`), kept current by every scroll they make, so a back step
+ * has nothing to measure: it hands that same memory back. Reading it from there rather than from the DOM is
+ * also what makes this work in both views, one column and side by side, whose scrollers are different
+ * elements and only one of which is ever mounted.
+ *
+ * A jump that would push the place already on top is dropped: two entries for one place would cost the
+ * reader two presses of the back button to get anywhere.
+ *
+ * @param sessionId - the session the panel is reviewing; nothing is recorded without one.
+ * @param fileId - the entry being LEFT, not the one being jumped to.
+ */
+export declare function rememberJumpAway(sessionId: string | undefined, fileId: string | undefined): void;
+/**
+ * Take the last place a deliberate jump left, for a back step. Spent here, so a second press goes one step
+ * further back rather than landing where the reader already is.
+ * @param sessionId - the session, if any.
+ * @returns that place, or undefined when there is nothing to go back to.
+ */
+export declare function popJumpAway(sessionId: string | undefined): PanelJumpPlace | undefined;
 /**
  * Forget every session's record. A page reload does this by itself; a test calls
  * it to start from a clean page rather than inheriting the previous case's place.

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/lib/types/client/split-diff.d.ts

@@ -38,6 +38,11 @@ export interface SplitDiff {
  * alignment, each deletion pairs with its most-similar addition (order
  * preserved, threshold-bounded) so a mixed insert/delete block does not force a
  * wrong line together. A stray deletion or addition stays a one-sided pair.
+ *
+ * THE ORDER OF THE RESULT IS PART OF THE CONTRACT: going down `pairs`, neither
+ * column's line numbers ever go backwards. Alignment may therefore move a line
+ * onto the row opposite it, but never past a line of its own side — an unpaired
+ * line between two pairs is emitted where it belongs, not after them.
  * @param rows - the whole-file diff rows.
  * @param alignBySimilarity - align a change block by similarity instead of order.
  * @returns the split pairs plus the row→pair index map.

package/package.json

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