dsh-diff-approval 0.13.0 → 0.13.1

package/lib/client.js

@@ -652,11 +652,23 @@ window.__ModuleLoader__.load({
 		* @param newText - the file content after the pending change.
 		* @returns the complete row list with totals.
 		*/
+		/**
+		* Normalize content for equality: line endings → `\n`, and a single trailing
+		* newline is a terminator rather than a line. The result is the line bodies
+		* joined by `\n` with no trailing newline, so representation-only differences
+		* (EOL style, trailing-newline presence) compare equal.
+		* @param text - the content to normalize.
+		* @returns the normalized line bodies.
+		*/
+		function contentKey(text) {
+			const normalized = text.replace(/\r\n?/g, "\n");
+			return normalized.endsWith("\n") ? normalized.slice(0, -1) : normalized;
+		}
 		function computeWholeFileDiff(oldText, newText) {
-			oldText = oldText.replace(/\r\n?/g, "\n");
-			newText = newText.replace(/\r\n?/g, "\n");
-			if (oldText === newText) return {
-				rows: contentLines(oldText).map((text, index) => ({
+			const oldNorm = oldText.replace(/\r\n?/g, "\n");
+			const newNorm = newText.replace(/\r\n?/g, "\n");
+			if (contentKey(oldNorm) === contentKey(newNorm)) return {
+				rows: contentLines(oldNorm).map((text, index) => ({
 					kind: "context",
 					text,
 					oldLine: index + 1,
@@ -665,10 +677,9 @@ window.__ModuleLoader__.load({
 				removed: 0,
 				added: 0
 			};
-			const oldLines = contentLines(oldText);
-			const newLines = contentLines(newText);
-			const context = Math.max(1, oldLines.length, newLines.length);
-			const patch = structuredPatch("", "", oldText, newText, void 0, void 0, { context });
+			const oldLines = contentLines(oldNorm);
+			const newLines = contentLines(newNorm);
+			const patch = structuredPatch("", "", oldNorm, newNorm, void 0, void 0, { context: Math.max(1, oldLines.length, newLines.length) });
 			const rows = [];
 			let removed = 0;
 			let added = 0;
@@ -11921,115 +11932,115 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"kindHint": "F1KBNa_kindHint",
-			"searchBar": "F1KBNa_searchBar",
-			"diffPath": "F1KBNa_diffPath",
-			"flexSpacer": "F1KBNa_flexSpacer",
-			"splitRdel": "F1KBNa_splitRdel",
-			"settingsRowTitle": "F1KBNa_settingsRowTitle",
-			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
-			"group": "F1KBNa_group",
-			"iconAction": "F1KBNa_iconAction",
-			"blockFlash": "F1KBNa_blockFlash",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"row": "F1KBNa_row",
-			"close": "F1KBNa_close",
-			"settingsRowDesc": "F1KBNa_settingsRowDesc",
-			"states": "F1KBNa_states",
-			"code": "F1KBNa_code",
-			"kindTag": "F1KBNa_kindTag",
-			"badgeCount": "F1KBNa_badgeCount",
-			"badge": "F1KBNa_badge",
-			"emptyState": "F1KBNa_emptyState",
-			"rowPath": "F1KBNa_rowPath",
-			"notice": "F1KBNa_notice",
+			"title": "F1KBNa_title",
 			"diffBodyWrap": "F1KBNa_diffBodyWrap",
-			"missingHint": "F1KBNa_missingHint",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"splitRoot": "F1KBNa_splitRoot",
-			"expandExpanded": "F1KBNa_expandExpanded",
-			"splitLadd": "F1KBNa_splitLadd",
-			"settingsPage": "F1KBNa_settingsPage",
-			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
-			"layer": "F1KBNa_layer",
 			"settingsSelector": "F1KBNa_settingsSelector",
-			"readError": "F1KBNa_readError",
-			"importButton": "F1KBNa_importButton",
-			"addCount": "F1KBNa_addCount",
-			"context": "F1KBNa_context",
-			"header": "F1KBNa_header",
-			"gutter": "F1KBNa_gutter",
-			"confirmActions": "F1KBNa_confirmActions",
-			"searchInput": "F1KBNa_searchInput",
-			"importNote": "F1KBNa_importNote",
-			"noticeText": "F1KBNa_noticeText",
-			"wrap": "F1KBNa_wrap",
-			"splitHScrollRow": "F1KBNa_splitHScrollRow",
-			"blockActions": "F1KBNa_blockActions",
-			"splitHScroll": "F1KBNa_splitHScroll",
-			"splitHScrollFill": "F1KBNa_splitHScrollFill",
-			"fileListFloat": "F1KBNa_fileListFloat",
+			"confirmBackdrop": "F1KBNa_confirmBackdrop",
 			"noteCentered": "F1KBNa_noteCentered",
+			"actionError": "F1KBNa_actionError",
+			"rows": "F1KBNa_rows",
 			"diffActions": "F1KBNa_diffActions",
-			"searchCount": "F1KBNa_searchCount",
-			"add": "F1KBNa_add",
-			"diffStats": "F1KBNa_diffStats",
-			"langLabel": "F1KBNa_langLabel",
-			"detailEmpty": "F1KBNa_detailEmpty",
-			"actionPrimary": "F1KBNa_actionPrimary",
 			"diffBody": "F1KBNa_diffBody",
-			"rowMeta": "F1KBNa_rowMeta",
-			"diffHeader": "F1KBNa_diffHeader",
-			"blockPosition": "F1KBNa_blockPosition",
-			"subline": "F1KBNa_subline",
-			"splitCol": "F1KBNa_splitCol",
-			"missing": "F1KBNa_missing",
-			"splitDivider": "F1KBNa_splitDivider",
-			"rowFailed": "F1KBNa_rowFailed",
-			"listScroll": "F1KBNa_listScroll",
-			"actionError": "F1KBNa_actionError",
-			"headerActions": "F1KBNa_headerActions",
-			"confirmCard": "F1KBNa_confirmCard",
+			"note": "F1KBNa_note",
+			"diffFlash": "F1KBNa_diffFlash",
+			"overviewRuler": "F1KBNa_overviewRuler",
+			"iconAction": "F1KBNa_iconAction",
+			"context": "F1KBNa_context",
+			"panel": "F1KBNa_panel",
+			"langSelect": "F1KBNa_langSelect",
 			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
-			"markerDel": "F1KBNa_markerDel",
-			"bulkActions": "F1KBNa_bulkActions",
-			"divergedHint": "F1KBNa_divergedHint",
-			"lines": "F1KBNa_lines",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"detail": "F1KBNa_detail",
-			"splitRadd": "F1KBNa_splitRadd",
-			"footerButtons": "F1KBNa_footerButtons",
+			"wrapActive": "F1KBNa_wrapActive",
+			"settingsRowDesc": "F1KBNa_settingsRowDesc",
+			"confirmActions": "F1KBNa_confirmActions",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"rowFailed": "F1KBNa_rowFailed",
 			"expand": "F1KBNa_expand",
-			"overviewMarker": "F1KBNa_overviewMarker",
+			"blockPosition": "F1KBNa_blockPosition",
+			"vSpacer": "F1KBNa_vSpacer",
+			"rowPath": "F1KBNa_rowPath",
+			"wrap": "F1KBNa_wrap",
 			"markerAdd": "F1KBNa_markerAdd",
-			"hint": "F1KBNa_hint",
-			"line": "F1KBNa_line",
-			"wrapActive": "F1KBNa_wrapActive",
-			"diffBodySplit": "F1KBNa_diffBodySplit",
+			"splitHScroll": "F1KBNa_splitHScroll",
 			"delCount": "F1KBNa_delCount",
+			"subline": "F1KBNa_subline",
+			"detail": "F1KBNa_detail",
+			"footerButtons": "F1KBNa_footerButtons",
+			"splitRoot": "F1KBNa_splitRoot",
+			"splitCol": "F1KBNa_splitCol",
+			"splitHScrollFill": "F1KBNa_splitHScrollFill",
+			"splitLadd": "F1KBNa_splitLadd",
+			"code": "F1KBNa_code",
+			"splitRadd": "F1KBNa_splitRadd",
+			"settingsRowText": "F1KBNa_settingsRowText",
+			"split": "F1KBNa_split",
+			"action": "F1KBNa_action",
+			"kindHint": "F1KBNa_kindHint",
+			"layer": "F1KBNa_layer",
+			"badgeCount": "F1KBNa_badgeCount",
+			"diffHeader": "F1KBNa_diffHeader",
+			"diffStats": "F1KBNa_diffStats",
+			"addCount": "F1KBNa_addCount",
 			"confirmText": "F1KBNa_confirmText",
-			"note": "F1KBNa_note",
-			"rows": "F1KBNa_rows",
-			"settingsRow": "F1KBNa_settingsRow",
-			"diffFlash": "F1KBNa_diffFlash",
+			"settingsPage": "F1KBNa_settingsPage",
+			"searchBar": "F1KBNa_searchBar",
 			"del": "F1KBNa_del",
-			"title": "F1KBNa_title",
 			"statusAction": "F1KBNa_statusAction",
-			"panel": "F1KBNa_panel",
+			"splitHScrollRow": "F1KBNa_splitHScrollRow",
+			"splitLdel": "F1KBNa_splitLdel",
+			"flexSpacer": "F1KBNa_flexSpacer",
 			"fileList": "F1KBNa_fileList",
-			"splitCols": "F1KBNa_splitCols",
-			"settingsRowText": "F1KBNa_settingsRowText",
-			"diff": "F1KBNa_diff",
-			"confirmBackdrop": "F1KBNa_confirmBackdrop",
+			"notice": "F1KBNa_notice",
+			"bulkActions": "F1KBNa_bulkActions",
+			"missingHint": "F1KBNa_missingHint",
+			"group": "F1KBNa_group",
+			"markerDel": "F1KBNa_markerDel",
+			"readError": "F1KBNa_readError",
+			"diffPath": "F1KBNa_diffPath",
+			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
+			"overviewMarker": "F1KBNa_overviewMarker",
+			"add": "F1KBNa_add",
 			"statusBar": "F1KBNa_statusBar",
-			"splitLdel": "F1KBNa_splitLdel",
-			"split": "F1KBNa_split",
-			"langSelect": "F1KBNa_langSelect",
-			"rail": "F1KBNa_rail",
+			"emptyState": "F1KBNa_emptyState",
+			"hint": "F1KBNa_hint",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"close": "F1KBNa_close",
+			"searchInput": "F1KBNa_searchInput",
+			"lines": "F1KBNa_lines",
+			"badgeLabel": "F1KBNa_badgeLabel",
+			"noticeText": "F1KBNa_noticeText",
+			"resizeHandle": "F1KBNa_resizeHandle",
+			"blockActions": "F1KBNa_blockActions",
+			"langLabel": "F1KBNa_langLabel",
+			"noticeButton": "F1KBNa_noticeButton",
+			"confirmCard": "F1KBNa_confirmCard",
+			"headerActions": "F1KBNa_headerActions",
+			"settingsRow": "F1KBNa_settingsRow",
+			"importButton": "F1KBNa_importButton",
 			"rowHead": "F1KBNa_rowHead",
-			"action": "F1KBNa_action",
-			"vSpacer": "F1KBNa_vSpacer",
-			"noticeButton": "F1KBNa_noticeButton"
+			"searchCount": "F1KBNa_searchCount",
+			"diff": "F1KBNa_diff",
+			"row": "F1KBNa_row",
+			"line": "F1KBNa_line",
+			"gutter": "F1KBNa_gutter",
+			"splitCols": "F1KBNa_splitCols",
+			"importNote": "F1KBNa_importNote",
+			"splitDivider": "F1KBNa_splitDivider",
+			"listScroll": "F1KBNa_listScroll",
+			"rail": "F1KBNa_rail",
+			"missing": "F1KBNa_missing",
+			"rowMeta": "F1KBNa_rowMeta",
+			"fileListFloat": "F1KBNa_fileListFloat",
+			"badge": "F1KBNa_badge",
+			"divergedHint": "F1KBNa_divergedHint",
+			"diffBodySplit": "F1KBNa_diffBodySplit",
+			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
+			"header": "F1KBNa_header",
+			"kindTag": "F1KBNa_kindTag",
+			"settingsRowTitle": "F1KBNa_settingsRowTitle",
+			"blockFlash": "F1KBNa_blockFlash",
+			"detailEmpty": "F1KBNa_detailEmpty",
+			"states": "F1KBNa_states",
+			"splitRdel": "F1KBNa_splitRdel"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -15363,11 +15374,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				const snapshot = store.getSnapshot();
 				for (const file of snapshot.files) {
 					const previous = lastContent.get(file.path);
-					if (previous === void 0) lastContent.set(file.path, file.newText);
-					else if (previous !== file.newText) {
-						remap(file.path, previous, file.newText, snapshot.workspacePath);
-						lastContent.set(file.path, file.newText);
-					}
+					if (previous !== void 0 && contentKey(previous) !== contentKey(file.newText)) remap(file.path, previous, file.newText, snapshot.workspacePath);
+					lastContent.set(file.path, file.newText);
 				}
 				for (const path of [...lastContent.keys()]) if (!snapshot.files.some((file) => file.path === path)) lastContent.delete(path);
 			};

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

@@ -37,4 +37,13 @@ export interface WholeFileDiff {
  * @param newText - the file content after the pending change.
  * @returns the complete row list with totals.
  */
+/**
+ * Normalize content for equality: line endings → `\n`, and a single trailing
+ * newline is a terminator rather than a line. The result is the line bodies
+ * joined by `\n` with no trailing newline, so representation-only differences
+ * (EOL style, trailing-newline presence) compare equal.
+ * @param text - the content to normalize.
+ * @returns the normalized line bodies.
+ */
+export declare function contentKey(text: string): string;
 export declare function computeWholeFileDiff(oldText: string, newText: string): WholeFileDiff;

package/package.json

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