dsh-diff-approval 0.14.0 → 0.14.1

package/lib/client.js

@@ -11946,115 +11946,115 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"searchBar": "F1KBNa_searchBar",
-			"delCount": "F1KBNa_delCount",
-			"gutter": "F1KBNa_gutter",
-			"subline": "F1KBNa_subline",
-			"noteCentered": "F1KBNa_noteCentered",
-			"splitDivider": "F1KBNa_splitDivider",
-			"splitHScrollFill": "F1KBNa_splitHScrollFill",
-			"action": "F1KBNa_action",
-			"noticeText": "F1KBNa_noticeText",
-			"header": "F1KBNa_header",
-			"settingsRowTitle": "F1KBNa_settingsRowTitle",
-			"confirmCard": "F1KBNa_confirmCard",
-			"markerDel": "F1KBNa_markerDel",
-			"wrapActive": "F1KBNa_wrapActive",
-			"listScroll": "F1KBNa_listScroll",
-			"hint": "F1KBNa_hint",
-			"diffPath": "F1KBNa_diffPath",
-			"splitLadd": "F1KBNa_splitLadd",
-			"blockActions": "F1KBNa_blockActions",
+			"confirmBackdrop": "F1KBNa_confirmBackdrop",
+			"kindHint": "F1KBNa_kindHint",
+			"splitRdel": "F1KBNa_splitRdel",
 			"missingHint": "F1KBNa_missingHint",
-			"split": "F1KBNa_split",
-			"rowHead": "F1KBNa_rowHead",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"readError": "F1KBNa_readError",
+			"diffBody": "F1KBNa_diffBody",
+			"lines": "F1KBNa_lines",
 			"langLabel": "F1KBNa_langLabel",
-			"note": "F1KBNa_note",
+			"splitCol": "F1KBNa_splitCol",
 			"splitRadd": "F1KBNa_splitRadd",
-			"confirmText": "F1KBNa_confirmText",
-			"expandExpanded": "F1KBNa_expandExpanded",
+			"diffPath": "F1KBNa_diffPath",
+			"diffActions": "F1KBNa_diffActions",
+			"rowPath": "F1KBNa_rowPath",
+			"listScroll": "F1KBNa_listScroll",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"importButton": "F1KBNa_importButton",
+			"rows": "F1KBNa_rows",
+			"searchCount": "F1KBNa_searchCount",
+			"statusBar": "F1KBNa_statusBar",
+			"footerButtons": "F1KBNa_footerButtons",
+			"layer": "F1KBNa_layer",
+			"badgeLabel": "F1KBNa_badgeLabel",
 			"divergedHint": "F1KBNa_divergedHint",
-			"diffBody": "F1KBNa_diffBody",
+			"actionError": "F1KBNa_actionError",
+			"code": "F1KBNa_code",
+			"splitDivider": "F1KBNa_splitDivider",
+			"confirmCard": "F1KBNa_confirmCard",
+			"title": "F1KBNa_title",
+			"wrap": "F1KBNa_wrap",
+			"statusAction": "F1KBNa_statusAction",
+			"noticeButton": "F1KBNa_noticeButton",
+			"flexSpacer": "F1KBNa_flexSpacer",
+			"confirmActions": "F1KBNa_confirmActions",
+			"searchInput": "F1KBNa_searchInput",
+			"settingsRowText": "F1KBNa_settingsRowText",
+			"header": "F1KBNa_header",
+			"diffStats": "F1KBNa_diffStats",
+			"settingsRowTitle": "F1KBNa_settingsRowTitle",
+			"blockFlash": "F1KBNa_blockFlash",
+			"row": "F1KBNa_row",
+			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
 			"missing": "F1KBNa_missing",
+			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
+			"searchBar": "F1KBNa_searchBar",
+			"overviewRuler": "F1KBNa_overviewRuler",
+			"notice": "F1KBNa_notice",
+			"splitCols": "F1KBNa_splitCols",
 			"markerAdd": "F1KBNa_markerAdd",
+			"splitRoot": "F1KBNa_splitRoot",
+			"blockPosition": "F1KBNa_blockPosition",
+			"overviewMarker": "F1KBNa_overviewMarker",
+			"noticeText": "F1KBNa_noticeText",
+			"iconAction": "F1KBNa_iconAction",
+			"splitHScrollRow": "F1KBNa_splitHScrollRow",
+			"delCount": "F1KBNa_delCount",
+			"splitLadd": "F1KBNa_splitLadd",
+			"hint": "F1KBNa_hint",
+			"splitHScroll": "F1KBNa_splitHScroll",
+			"note": "F1KBNa_note",
+			"settingsPage": "F1KBNa_settingsPage",
+			"splitLdel": "F1KBNa_splitLdel",
+			"rail": "F1KBNa_rail",
 			"del": "F1KBNa_del",
+			"noteCentered": "F1KBNa_noteCentered",
+			"line": "F1KBNa_line",
+			"action": "F1KBNa_action",
+			"fileList": "F1KBNa_fileList",
+			"rowMeta": "F1KBNa_rowMeta",
+			"diffFlash": "F1KBNa_diffFlash",
 			"add": "F1KBNa_add",
+			"settingsSelector": "F1KBNa_settingsSelector",
 			"detailEmpty": "F1KBNa_detailEmpty",
-			"badge": "F1KBNa_badge",
-			"title": "F1KBNa_title",
-			"blockPosition": "F1KBNa_blockPosition",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"headerActions": "F1KBNa_headerActions",
-			"panel": "F1KBNa_panel",
-			"group": "F1KBNa_group",
-			"blockFlash": "F1KBNa_blockFlash",
-			"settingsRow": "F1KBNa_settingsRow",
-			"importNote": "F1KBNa_importNote",
-			"diffFlash": "F1KBNa_diffFlash",
-			"notice": "F1KBNa_notice",
-			"rowPath": "F1KBNa_rowPath",
-			"readError": "F1KBNa_readError",
-			"settingsPage": "F1KBNa_settingsPage",
-			"settingsRowText": "F1KBNa_settingsRowText",
+			"langSelect": "F1KBNa_langSelect",
 			"fileListFloat": "F1KBNa_fileListFloat",
-			"bulkActions": "F1KBNa_bulkActions",
+			"emptyState": "F1KBNa_emptyState",
 			"kindTag": "F1KBNa_kindTag",
 			"rowFailed": "F1KBNa_rowFailed",
-			"layer": "F1KBNa_layer",
-			"states": "F1KBNa_states",
-			"diffBodyWrap": "F1KBNa_diffBodyWrap",
-			"emptyState": "F1KBNa_emptyState",
-			"flexSpacer": "F1KBNa_flexSpacer",
-			"splitLdel": "F1KBNa_splitLdel",
-			"diffActions": "F1KBNa_diffActions",
+			"addCount": "F1KBNa_addCount",
+			"wrapActive": "F1KBNa_wrapActive",
+			"close": "F1KBNa_close",
+			"diffHeader": "F1KBNa_diffHeader",
+			"badge": "F1KBNa_badge",
+			"bulkActions": "F1KBNa_bulkActions",
+			"expand": "F1KBNa_expand",
+			"group": "F1KBNa_group",
+			"rowHead": "F1KBNa_rowHead",
 			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
+			"settingsRow": "F1KBNa_settingsRow",
+			"panel": "F1KBNa_panel",
 			"detail": "F1KBNa_detail",
-			"actionError": "F1KBNa_actionError",
-			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
-			"searchInput": "F1KBNa_searchInput",
-			"searchCount": "F1KBNa_searchCount",
-			"vSpacer": "F1KBNa_vSpacer",
-			"code": "F1KBNa_code",
-			"iconAction": "F1KBNa_iconAction",
-			"kindHint": "F1KBNa_kindHint",
-			"splitHScroll": "F1KBNa_splitHScroll",
-			"overviewMarker": "F1KBNa_overviewMarker",
-			"rail": "F1KBNa_rail",
-			"wrap": "F1KBNa_wrap",
-			"splitRdel": "F1KBNa_splitRdel",
-			"close": "F1KBNa_close",
-			"rows": "F1KBNa_rows",
+			"split": "F1KBNa_split",
+			"importNote": "F1KBNa_importNote",
 			"resizeHandle": "F1KBNa_resizeHandle",
-			"importButton": "F1KBNa_importButton",
-			"fileList": "F1KBNa_fileList",
-			"expand": "F1KBNa_expand",
-			"langSelect": "F1KBNa_langSelect",
-			"addCount": "F1KBNa_addCount",
-			"splitHScrollRow": "F1KBNa_splitHScrollRow",
-			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
-			"splitCol": "F1KBNa_splitCol",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"settingsSelector": "F1KBNa_settingsSelector",
-			"badgeCount": "F1KBNa_badgeCount",
-			"confirmActions": "F1KBNa_confirmActions",
-			"row": "F1KBNa_row",
-			"rowMeta": "F1KBNa_rowMeta",
-			"settingsRowDesc": "F1KBNa_settingsRowDesc",
-			"diffStats": "F1KBNa_diffStats",
-			"splitRoot": "F1KBNa_splitRoot",
-			"actionPrimary": "F1KBNa_actionPrimary",
-			"lines": "F1KBNa_lines",
+			"diff": "F1KBNa_diff",
+			"blockActions": "F1KBNa_blockActions",
+			"confirmText": "F1KBNa_confirmText",
+			"vSpacer": "F1KBNa_vSpacer",
+			"gutter": "F1KBNa_gutter",
+			"states": "F1KBNa_states",
+			"markerDel": "F1KBNa_markerDel",
 			"context": "F1KBNa_context",
-			"footerButtons": "F1KBNa_footerButtons",
-			"confirmBackdrop": "F1KBNa_confirmBackdrop",
 			"diffBodySplit": "F1KBNa_diffBodySplit",
-			"diff": "F1KBNa_diff",
-			"diffHeader": "F1KBNa_diffHeader",
-			"splitCols": "F1KBNa_splitCols",
-			"line": "F1KBNa_line",
-			"statusAction": "F1KBNa_statusAction",
-			"statusBar": "F1KBNa_statusBar",
-			"noticeButton": "F1KBNa_noticeButton"
+			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"subline": "F1KBNa_subline",
+			"splitHScrollFill": "F1KBNa_splitHScrollFill",
+			"settingsRowDesc": "F1KBNa_settingsRowDesc",
+			"headerActions": "F1KBNa_headerActions",
+			"badgeCount": "F1KBNa_badgeCount"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -12080,7 +12080,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		/** Interactive composer/approval cards; clicking these keeps the panel open.
 		Deliberately the cards themselves, not the seat: the approval frame's wide
 		side gutters are blank space, so a click there must still close. */
-		const KEEP_OPEN_SELECTOR = "[data-composer-card],[data-question-key] > *,[data-plan-review-key] > *";
+		const KEEP_OPEN_SELECTOR = "[data-composer-card],[data-question-key] > *,[data-plan-review-key] > *,[data-approval-key] > *";
 		/** Seat counts as docked when its bottom is this close to the window bottom. */
 		const DOCKED_TOLERANCE_PX = 48;
 		/** File-list pane width bounds for the manual split drag, in px. */
@@ -12473,7 +12473,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			});
 		}
 		/** The two-column (side-by-side) whole-file diff view. */
-		const SplitDiff = (0, react.forwardRef)(function SplitDiff({ file, model, runs, langWrap, tabWidthSpaces, busy, t, onBlockKeep, onBlockRevert }, ref) {
+		const SplitDiff = (0, react.forwardRef)(function SplitDiff({ file, model, runs, langWrap, tabWidthSpaces, busy, t, selection, onBlockKeep, onBlockRevert }, ref) {
 			const { pairs, pairOfRow } = (0, react.useMemo)(() => computeSideBySideDiff(model.diff.rows), [model]);
 			const pairCount = pairs.length;
 			const bodyRef = (0, react.useRef)(null);
@@ -12661,8 +12661,12 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				return lo;
 			};
 			const viewport = viewportH > 0 ? viewportH : totalHeight;
-			const start = Math.max(0, pairAtY(scrollTop) - OVERSCAN_ROWS);
-			const end = Math.min(pairCount, pairAtY(scrollTop + viewport) + OVERSCAN_ROWS);
+			let start = Math.max(0, pairAtY(scrollTop) - OVERSCAN_ROWS);
+			let end = Math.min(pairCount, pairAtY(scrollTop + viewport) + OVERSCAN_ROWS);
+			if (selection !== void 0) {
+				start = Math.min(start, selection.start);
+				end = Math.max(end, selection.end + 1);
+			}
 			const visiblePairs = pairs.slice(start, end);
 			const jump = (direction) => {
 				if (blockOfPair.length === 0) return;
@@ -13360,8 +13364,12 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				return lo;
 			};
 			const viewport = viewportHeight > 0 ? viewportHeight : totalHeight;
-			const start = Math.max(0, rowAtY(scrollTop) - OVERSCAN_ROWS);
-			const end = Math.min(rowCount, rowAtY(scrollTop + viewport) + OVERSCAN_ROWS);
+			let start = Math.max(0, rowAtY(scrollTop) - OVERSCAN_ROWS);
+			let end = Math.min(rowCount, rowAtY(scrollTop + viewport) + OVERSCAN_ROWS);
+			if (selection !== void 0) {
+				start = Math.min(start, selection.start);
+				end = Math.max(end, selection.end + 1);
+			}
 			const visibleRows = rows.slice(start, end);
 			const blockEnd = hoveredBlock === void 0 ? void 0 : model.blocks[hoveredBlock]?.end;
 			const blockActionsTop = blockEnd === void 0 ? 0 : Math.min(offsetOf(blockEnd + 1), Math.max(0, totalHeight - BLOCK_ACTIONS_FRAME_PX));
@@ -13743,6 +13751,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						tabWidthSpaces,
 						busy,
 						t,
+						selection,
 						onBlockKeep,
 						onBlockRevert
 					}) : (0, react_jsx_runtime.jsxs)("div", {

package/lib/index.js

@@ -912,7 +912,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 +998,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 +1030,7 @@ function apply(ctx, config) {
 					},
 					fileText: content
 				});
-				await persistSession();
+				persistSession();
 				if (redoWasPresent) redoCleared = true;
 			}
 			const state = {
@@ -1135,14 +1135,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 +1234,7 @@ function apply(ctx, config) {
 					entry: void 0,
 					fileText: void 0
 				});
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: { outcome: "kept" }
@@ -1247,7 +1280,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 +1314,7 @@ function apply(ctx, config) {
 					entry: afterEntry,
 					fileText: void 0
 				});
-				await persistSession();
+				persistSession();
 				return {
 					ok: true,
 					value: updatedOld === entry.newText ? {
@@ -1334,7 +1367,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 +1391,7 @@ function apply(ctx, config) {
 					return rpcError(`undo failed: ${errorMessage(error)}`);
 				}
 				redoStack.push(pair);
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: {
@@ -1382,7 +1415,7 @@ function apply(ctx, config) {
 					return rpcError(`redo failed: ${errorMessage(error)}`);
 				}
 				undoStack.push(pair);
-				await persistSession();
+				persistSession(true);
 				return {
 					ok: true,
 					value: {
@@ -1443,7 +1476,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

@@ -41,6 +41,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,6 +64,7 @@ export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
     tabWidthSpaces: number;
     busy: boolean;
     t: Translator;
+    selection: RowRange | undefined;
     onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
 } & import("react").RefAttributes<SplitDiffHandle>>;

package/package.json

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