dsh-diff-approval 0.14.0 → 0.15.0

package/lib/index.js

@@ -424,6 +424,11 @@ function defaultOpenPath(path, action) {
 /** Cap on one VCS command's runtime; scans (git status, svn status) can be slow
 * on large trees but must not hang the import. */
 const VCS_COMMAND_TIMEOUT_MS = 6e4;
+/** Blobs up to this size are read straight off the executor's buffered stdout
+* (the small-blob path, no temp file); larger blobs go through the checkout-index
+* temp-file path because the executor cap truncates its stdout. Kept below the
+* cap so the small path never truncates. */
+const GIT_BLOB_STDOUT_SAFE = 6e4;
 /** Quote one argument for a POSIX-ish shell, so paths with spaces or special
 * characters survive interpolation into VCS command lines. */
 function shq(value) {
@@ -528,7 +533,24 @@ async function gitChanges(input) {
 		if (worktree !== "M" && worktree !== "D") continue;
 		let oldText = "";
 		try {
-			oldText = await runShell(shell, `git show :0:${shq(rel)}`, root, signal);
+			let size = 0;
+			try {
+				size = Number.parseInt((await runShell(shell, `git cat-file -s :0:${shq(rel)}`, root, signal)).trim(), 10);
+			} catch {
+				size = 0;
+			}
+			if (Number.isFinite(size) && size > 0 && size <= GIT_BLOB_STDOUT_SAFE) oldText = await runShell(shell, `git show :0:${shq(rel)}`, root, signal);
+			else {
+				const tempRel = (await runShell(shell, `git checkout-index --temp --force -- ${shq(rel)}`, root, signal)).trim().split(/\s+/)[0] ?? "";
+				if (tempRel !== "") {
+					const tempFile = resolve(root, tempRel);
+					try {
+						oldText = await readText(tempFile) ?? "";
+					} finally {
+						await rm(tempFile, { force: true }).catch(() => {});
+					}
+				}
+			}
 		} catch {
 			oldText = "";
 		}
@@ -912,7 +934,7 @@ function apply(ctx, config) {
 			sessionIds: [sessionId]
 		};
 		await ensureLoaded();
-		if (store.fold(entry)) await persistSession();
+		if (store.fold(entry)) persistSession();
 	}
 	/** The stable `FsError.code`, when the thrown value carries one. */
 	function fsErrorCodeOf(error) {
@@ -998,13 +1020,13 @@ function apply(ctx, config) {
 					entry: void 0,
 					fileText: void 0
 				});
-				await persistSession();
+				persistSession();
 				continue;
 			}
 			if (live.kind === "unavailable") {
 				store.remove(entry.path);
 				purgeForEntry(entry.path);
-				await persistSession();
+				persistSession();
 				continue;
 			}
 			const content = live.content;
@@ -1030,7 +1052,7 @@ function apply(ctx, config) {
 					},
 					fileText: content
 				});
-				await persistSession();
+				persistSession();
 				if (redoWasPresent) redoCleared = true;
 			}
 			const state = {
@@ -1135,14 +1157,47 @@ function apply(ctx, config) {
 	* file.
 	* @returns resolution after the write settles (successful or logged).
 	*/
-	async function persistSession() {
-		await ensureLoaded();
+	const PERSIST_THROTTLE_MS = 1e3;
+	let persistDirty = false;
+	let persistScheduled = false;
+	let lastPersistAt = 0;
+	let persistTimer;
+	/** Actually write the (dirty) store to disk; one coalesced write. */
+	async function flushPersist() {
+		if (!persistDirty) return;
+		persistDirty = false;
+		lastPersistAt = Date.now();
 		try {
+			await ensureLoaded();
 			await persistence.save(store.all());
 		} catch (error) {
 			ctx.logger.warn(`diff-approval: persisting pending changes failed: ${errorMessage(error)}`);
 		}
 	}
+	/** Mark the store dirty and schedule one throttled, coalesced write. Pass
+	* `force` to write immediately (user actions need durable, immediate results). */
+	function persistSession(force = false) {
+		persistDirty = true;
+		if (force) {
+			if (persistScheduled) {
+				clearTimeout(persistTimer);
+				persistScheduled = false;
+			}
+			flushPersist();
+			return;
+		}
+		if (persistScheduled) return;
+		const delay = PERSIST_THROTTLE_MS - (Date.now() - lastPersistAt);
+		if (delay <= 0) flushPersist();
+		else {
+			persistScheduled = true;
+			persistTimer = setTimeout(() => {
+				persistScheduled = false;
+				flushPersist();
+			}, delay);
+			persistTimer.unref?.();
+		}
+	}
 	ctx.on("tools/result", (exec, result) => {
 		if (exec.name === "str_replace_editor") {
 			captureEditorMutation(exec, result);
@@ -1201,7 +1256,7 @@ function apply(ctx, config) {
 					entry: void 0,
 					fileText: void 0
 				});
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: { outcome: "kept" }
@@ -1247,7 +1302,7 @@ function apply(ctx, config) {
 				}
 				store.remove(target.id);
 				if (undo !== void 0) pushUndo(target.sessionId, undo.before, undo.after);
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: { outcome: "reverted" }
@@ -1281,7 +1336,7 @@ function apply(ctx, config) {
 					entry: afterEntry,
 					fileText: void 0
 				});
-				await persistSession();
+				persistSession();
 				return {
 					ok: true,
 					value: updatedOld === entry.newText ? {
@@ -1334,7 +1389,7 @@ function apply(ctx, config) {
 					return rpcError(`block revert failed: ${errorMessage(error)}`);
 				}
 				if (undo !== void 0) pushUndo(blockTarget.sessionId, undo.before, undo.after);
-				await persistSession();
+				persistSession();
 				return {
 					ok: true,
 					value: normalizeEol(updatedNew) === normalizeEol(entry.oldText) ? {
@@ -1358,7 +1413,7 @@ function apply(ctx, config) {
 					return rpcError(`undo failed: ${errorMessage(error)}`);
 				}
 				redoStack.push(pair);
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: {
@@ -1382,7 +1437,7 @@ function apply(ctx, config) {
 					return rpcError(`redo failed: ${errorMessage(error)}`);
 				}
 				undoStack.push(pair);
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: {
@@ -1443,7 +1498,7 @@ function apply(ctx, config) {
 					}
 				}
 				if (imported > 0) {
-					await persistSession();
+					persistSession();
 					const after = new Map(store.list(sessionId).map((entry) => [entry.path, entry]));
 					const batchBefore = [];
 					const batchAfter = [];

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

@@ -5,6 +5,7 @@ import type { DiffApprovalBlockRange, PendingFileDiff } from '../types.ts';
 import type { PendingPanelFace } from './slots.ts';
 import type { DiffApprovalKey } from './locales.ts';
 import { computeWholeFileDiff } from './whole-file-diff.ts';
+import type { IntraRun } from './whole-file-diff.ts';
 import { highlightLines } from './highlight.ts';
 /** The dsh shell's sidebar auto-collapse breakpoint (ui-layout columns.ts):
  * below it the sidebar auto-collapses, and the file list floats on the same
@@ -30,6 +31,8 @@ interface RowModel {
     diff: ReturnType<typeof computeWholeFileDiff>;
     /** Maximal runs of changed rows (inclusive row indices); one per modification. */
     blocks: ChangeBlock[];
+    /** Intra-line runs keyed by row index, present only for annotated del/add rows. */
+    intra: Map<number, IntraRun[]>;
 }
 /** One file's deferred syntax-highlight runs, one entry per side. */
 interface HighlightRuns {
@@ -41,6 +44,14 @@ interface ChangeBlock {
     start: number;
     end: number;
 }
+/** One selected line range in row indices, normalized low-to-high. */
+interface RowRange {
+    start: number;
+    end: number;
+    /** Which file's lines a split selection references: 'old' (left column), 'new'
+     *  (right column); undefined in single column (always the new file). */
+    side?: 'old' | 'new';
+}
 /** Imperative surface the parent uses to drive block navigation from the
  *  shared toolbar/keyboard in split mode (its own `focus` is private here). */
 export interface SplitDiffHandle {
@@ -56,9 +67,19 @@ export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
     tabWidthSpaces: number;
     busy: boolean;
     t: Translator;
+    selection: RowRange | undefined;
+    leadRows: number;
     onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
 } & import("react").RefAttributes<SplitDiffHandle>>;
+/**
+ * Reconstruct the plain text of the current selection so auto-wrap's visual
+ * line breaks never leak into the clipboard. A wrapped row renders its code as
+ * several `.subline` block elements, and the browser's default copy inserts a
+ * newline between them; those segments form one logical line, so they are joined
+ * without a newline while the real newline between diff rows is kept.
+ */
+export declare function selectedPlainText(): string | undefined;
 /** Render the pending-edit review panel and its unified footer action. */
 export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, onAckRedoCleared, onAckJustResolved, collapseSidebar, t, }: PendingPanelProps): import("react").JSX.Element;
 export {};

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

@@ -17,7 +17,6 @@ export declare const zh: {
     'panel.missingHint': string;
     'panel.externalChanged': string;
     'panel.dismiss': string;
-    'panel.createHint': string;
     'panel.pasteOnCopy': string;
     'panel.pasteOnCopyDesc': string;
     'panel.importUntracked': string;
@@ -26,6 +25,8 @@ export declare const zh: {
     'panel.tabWidthDesc': string;
     'panel.splitMode': string;
     'panel.splitModeDesc': string;
+    'panel.navLeadRows': string;
+    'panel.navLeadRowsDesc': string;
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
@@ -37,6 +38,7 @@ export declare const zh: {
     'row.removed': string;
     'action.keep': string;
     'action.revert': string;
+    'action.delete': string;
     'action.keepAll': string;
     'action.revertAll': string;
     'action.openFile': string;
@@ -54,6 +56,8 @@ export declare const zh: {
     'action.wrap': string;
     'action.toggleOn': string;
     'action.toggleOff': string;
+    'action.decrease': string;
+    'action.increase': string;
     'action.importVcs': string;
     'action.importVcsBusy': string;
     'panel.importNone': string;
@@ -96,7 +100,6 @@ export declare const en: {
     'panel.missingHint': string;
     'panel.externalChanged': string;
     'panel.dismiss': string;
-    'panel.createHint': string;
     'panel.pasteOnCopy': string;
     'panel.pasteOnCopyDesc': string;
     'panel.importUntracked': string;
@@ -105,6 +108,8 @@ export declare const en: {
     'panel.tabWidthDesc': string;
     'panel.splitMode': string;
     'panel.splitModeDesc': string;
+    'panel.navLeadRows': string;
+    'panel.navLeadRowsDesc': string;
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
@@ -116,6 +121,7 @@ export declare const en: {
     'row.removed': string;
     'action.keep': string;
     'action.revert': string;
+    'action.delete': string;
     'action.keepAll': string;
     'action.revertAll': string;
     'action.openFile': string;
@@ -133,6 +139,8 @@ export declare const en: {
     'action.wrap': string;
     'action.toggleOn': string;
     'action.toggleOff': string;
+    'action.decrease': string;
+    'action.increase': string;
     'action.importVcs': string;
     'action.importVcsBusy': string;
     'panel.importNone': string;

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

@@ -1,4 +1,8 @@
 /** Client preferences for the review panel, persisted in localStorage. */
+/** Default lead rows above a jumped-to diff block (kept small and bounded). */
+export declare const NAV_LEAD_ROWS_DEFAULT = 2;
+export declare const NAV_LEAD_ROWS_MIN = 0;
+export declare const NAV_LEAD_ROWS_MAX = 10;
 /**
  * Whether copying a reference should also paste it into the chat input and
  * focus it. Defaults to on; only an explicit `'0'` disables it.
@@ -45,6 +49,15 @@ export declare function setTabWidth(value: number): void;
 export declare function splitMode(): boolean;
 /** Persist the split-view preference. */
 export declare function setSplitMode(value: boolean): void;
+/**
+ * How many rows of lead the diff block jump leaves above the jumped-to block,
+ * and how far the anchored navigation scans. Defaults to 2; an out-of-range or
+ * non-integer value falls back to the default.
+ * @returns the lead row count.
+ */
+export declare function navLeadRows(): number;
+/** Persist the block-jump lead row count. */
+export declare function setNavLeadRows(value: number): void;
 /** Default quick-summon chord (toggle the review panel open/closed). */
 export declare const DEFAULT_QUICK_SUMMON = "Ctrl+D";
 /**

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

@@ -32,13 +32,16 @@ export interface SplitDiff {
     pairOfRow: ReadonlyMap<number, number>;
 }
 /**
- * Regroup the whole-file rows into aligned split pairs, pairing a deletion run
- * with a following addition run line-by-line (so a replaced line is one pair),
- * and leaving a stray deletion or addition as a one-sided pair.
+ * Regroup the whole-file rows into aligned split pairs. By order, a deletion
+ * run pairs line-by-line with a following addition run; with similarity
+ * 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.
  * @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.
  */
-export declare function computeSideBySideDiff(rows: readonly WholeFileDiffRow[]): SplitDiff;
+export declare function computeSideBySideDiff(rows: readonly WholeFileDiffRow[], alignBySimilarity?: boolean): SplitDiff;
 /**
  * Pair indices whose left or right text contains the query (case-insensitive).
  * A pair counts once however many times the query appears, so split search

package/lib/types/client/whole-file-diff.d.ts

@@ -47,3 +47,61 @@ export interface WholeFileDiff {
  */
 export declare function contentKey(text: string): string;
 export declare function computeWholeFileDiff(oldText: string, newText: string): WholeFileDiff;
+/**
+ * One intra-line segment of a changed line, used to highlight which characters
+ * within a paired del/add line differ. A run is either unmarked context
+ * (`same`) or the characters that were removed (`del`) /
+ * added (`add`). Reassembling the runs of a del row in order yields the old
+ * line's text; the runs of the paired add row yield the new line's text.
+ */
+export interface IntraRun {
+    text: string;
+    kind: 'same' | 'del' | 'add';
+}
+/** One matched del→add row pair within a change block. */
+interface BlockPair {
+    delIndex: number;
+    addIndex: number;
+}
+/** The alignment of one del/add change block: matched pairs and excess sides. */
+export interface BlockAlignment {
+    /** Matched del→add pairs, in file order. */
+    pairs: BlockPair[];
+    /** Row indices of unmatched deletions (shown as del-only in the split view). */
+    delOnly: number[];
+    /** Row indices of unmatched additions (shown as add-only in the split view). */
+    addOnly: number[];
+    /** True when similarity matching actually ran. False for a by-order block or a
+     *  block too large to match — the caller then skips the intra-line highlight so
+     *  alignment and highlighting are all-or-nothing (either both or neither). */
+    usedSimilarity: boolean;
+}
+/**
+ * Align a del run with the following add run. By order (the baseline) pairs
+ * `del[i]`↔`add[i]`. With similarity alignment, an order-preserving best match
+ * pairs each del with the add that maximises total similarity, keeping a pair
+ * only when it clears the similarity threshold — so a lone insert or delete in
+ * a mixed block stays unaligned instead of being forced onto a wrong line.
+ * @param delRows - the run's del rows (index + text).
+ * @param addRows - the run's add rows (index + text).
+ * @param alignBySimilarity - whether to use the similarity-based matching.
+ * @returns the aligned pairs and the unmatched sides.
+ */
+export declare function alignChangedBlock(delRows: readonly {
+    index: number;
+    text: string;
+}[], addRows: readonly {
+    index: number;
+    text: string;
+}[], alignBySimilarity: boolean): BlockAlignment;
+/**
+ * Derive intra-line runs for a whole-file row list. Each del/add block is
+ * aligned (by order, or by similarity when `alignBySimilarity`), and each
+ * matched pair is compared by `intraRunsOf`. Returns a map keyed by the row's
+ * index in `rows`, present only for rows that carry a highlight.
+ * @param rows - the unified `WholeFileDiff` row list.
+ * @param alignBySimilarity - align blocks by similarity instead of by order.
+ * @returns per-row-index intra-line runs for annotated del/add rows.
+ */
+export declare function computeIntraLineDiff(rows: readonly WholeFileDiffRow[], alignBySimilarity?: boolean): Map<number, IntraRun[]>;
+export {};

package/package.json

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