dsh-diff-approval 0.10.0 → 0.11.0

package/lib/client.js

@@ -643,15 +643,21 @@ window.__ModuleLoader__.load({
 		* Compute the whole-file view between two contents. The context budget is the
 		* side lengths, so every hunk covers the file and unchanged lines survive as
 		* context rows; the `` patch marker is annotation
-		* and never becomes a row.
+		* and never becomes a row. Both sides are line-ending normalized (`\r\n?` →
+		* `\n`) first, so a repo baseline stored with one EOL and a worktree with
+		* another never show as a whole-file delete+add — the diff is about approved
+		* content, not line-ending noise.
 		* @param oldText - the file content before the pending change.
 		* @param newText - the file content after the pending change.
 		* @returns the complete row list with totals.
 		*/
 		function computeWholeFileDiff(oldText, newText) {
+			oldText = oldText.replace(/\r\n?/g, "\n");
+			newText = newText.replace(/\r\n?/g, "\n");
 			const oldLines = contentLines(oldText);
 			const newLines = contentLines(newText);
-			const patch = structuredPatch("", "", oldText, newText, void 0, void 0, { context: Math.max(1, oldLines.length, newLines.length) });
+			const context = Math.max(1, oldLines.length, newLines.length);
+			const patch = structuredPatch("", "", oldText, newText, void 0, void 0, { context });
 			const rows = [];
 			let removed = 0;
 			let added = 0;
@@ -11692,99 +11698,99 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"badge": "F1KBNa_badge",
-			"panel": "F1KBNa_panel",
-			"settingsRow": "F1KBNa_settingsRow",
-			"searchBar": "F1KBNa_searchBar",
+			"divergedHint": "F1KBNa_divergedHint",
 			"detail": "F1KBNa_detail",
-			"diffActions": "F1KBNa_diffActions",
+			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
+			"diffBody": "F1KBNa_diffBody",
+			"langSelect": "F1KBNa_langSelect",
+			"note": "F1KBNa_note",
+			"code": "F1KBNa_code",
+			"diffHeader": "F1KBNa_diffHeader",
+			"overviewRuler": "F1KBNa_overviewRuler",
+			"readError": "F1KBNa_readError",
+			"gutter": "F1KBNa_gutter",
 			"markerAdd": "F1KBNa_markerAdd",
+			"del": "F1KBNa_del",
+			"fileList": "F1KBNa_fileList",
+			"delCount": "F1KBNa_delCount",
+			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"blockFlash": "F1KBNa_blockFlash",
+			"context": "F1KBNa_context",
+			"fileListFloat": "F1KBNa_fileListFloat",
 			"diff": "F1KBNa_diff",
-			"gutter": "F1KBNa_gutter",
+			"rowMeta": "F1KBNa_rowMeta",
+			"panel": "F1KBNa_panel",
+			"title": "F1KBNa_title",
+			"expand": "F1KBNa_expand",
+			"lines": "F1KBNa_lines",
 			"missingHint": "F1KBNa_missingHint",
+			"headerActions": "F1KBNa_headerActions",
+			"settingsRowDesc": "F1KBNa_settingsRowDesc",
+			"close": "F1KBNa_close",
+			"iconAction": "F1KBNa_iconAction",
+			"rail": "F1KBNa_rail",
 			"wrap": "F1KBNa_wrap",
-			"diffHeader": "F1KBNa_diffHeader",
-			"context": "F1KBNa_context",
+			"diffPath": "F1KBNa_diffPath",
 			"importNote": "F1KBNa_importNote",
-			"divergedHint": "F1KBNa_divergedHint",
-			"listScroll": "F1KBNa_listScroll",
-			"statusBar": "F1KBNa_statusBar",
-			"readError": "F1KBNa_readError",
-			"settingsRowDesc": "F1KBNa_settingsRowDesc",
-			"settingsRowText": "F1KBNa_settingsRowText",
+			"missing": "F1KBNa_missing",
+			"footerButtons": "F1KBNa_footerButtons",
+			"resizeHandle": "F1KBNa_resizeHandle",
+			"line": "F1KBNa_line",
+			"kindTag": "F1KBNa_kindTag",
+			"bulkActions": "F1KBNa_bulkActions",
+			"vSpacer": "F1KBNa_vSpacer",
 			"emptyState": "F1KBNa_emptyState",
-			"langLabel": "F1KBNa_langLabel",
-			"expandExpanded": "F1KBNa_expandExpanded",
-			"noticeText": "F1KBNa_noticeText",
-			"addCount": "F1KBNa_addCount",
-			"subline": "F1KBNa_subline",
+			"badgeLabel": "F1KBNa_badgeLabel",
+			"rowFailed": "F1KBNa_rowFailed",
+			"layer": "F1KBNa_layer",
 			"badgeCount": "F1KBNa_badgeCount",
-			"line": "F1KBNa_line",
+			"noteCentered": "F1KBNa_noteCentered",
+			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
+			"importButton": "F1KBNa_importButton",
 			"header": "F1KBNa_header",
-			"close": "F1KBNa_close",
-			"blockActions": "F1KBNa_blockActions",
+			"action": "F1KBNa_action",
 			"actionError": "F1KBNa_actionError",
-			"rows": "F1KBNa_rows",
-			"actionPrimary": "F1KBNa_actionPrimary",
-			"searchCount": "F1KBNa_searchCount",
-			"wrapActive": "F1KBNa_wrapActive",
-			"rail": "F1KBNa_rail",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"diffBody": "F1KBNa_diffBody",
-			"vSpacer": "F1KBNa_vSpacer",
-			"title": "F1KBNa_title",
-			"rowMeta": "F1KBNa_rowMeta",
-			"diffStats": "F1KBNa_diffStats",
+			"flexSpacer": "F1KBNa_flexSpacer",
+			"settingsRowText": "F1KBNa_settingsRowText",
+			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
+			"blockActions": "F1KBNa_blockActions",
+			"listScroll": "F1KBNa_listScroll",
+			"hint": "F1KBNa_hint",
+			"kindHint": "F1KBNa_kindHint",
+			"diffActions": "F1KBNa_diffActions",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"settingsRow": "F1KBNa_settingsRow",
 			"blockPosition": "F1KBNa_blockPosition",
+			"statusAction": "F1KBNa_statusAction",
+			"searchBar": "F1KBNa_searchBar",
 			"searchInput": "F1KBNa_searchInput",
-			"bulkActions": "F1KBNa_bulkActions",
-			"noteCentered": "F1KBNa_noteCentered",
-			"blockFlash": "F1KBNa_blockFlash",
-			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
-			"code": "F1KBNa_code",
-			"langSelect": "F1KBNa_langSelect",
-			"kindTag": "F1KBNa_kindTag",
-			"diffFlash": "F1KBNa_diffFlash",
-			"footerButtons": "F1KBNa_footerButtons",
-			"missing": "F1KBNa_missing",
-			"layer": "F1KBNa_layer",
-			"noticeButton": "F1KBNa_noticeButton",
-			"fileList": "F1KBNa_fileList",
-			"add": "F1KBNa_add",
-			"split": "F1KBNa_split",
+			"rows": "F1KBNa_rows",
+			"statusBar": "F1KBNa_statusBar",
+			"settingsPage": "F1KBNa_settingsPage",
 			"overviewMarker": "F1KBNa_overviewMarker",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"settingsSelector": "F1KBNa_settingsSelector",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"fileListFloat": "F1KBNa_fileListFloat",
-			"expand": "F1KBNa_expand",
-			"diffBodyWrap": "F1KBNa_diffBodyWrap",
-			"lines": "F1KBNa_lines",
-			"action": "F1KBNa_action",
-			"statusAction": "F1KBNa_statusAction",
+			"add": "F1KBNa_add",
+			"langLabel": "F1KBNa_langLabel",
 			"notice": "F1KBNa_notice",
-			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
-			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
-			"delCount": "F1KBNa_delCount",
-			"flexSpacer": "F1KBNa_flexSpacer",
-			"markerDel": "F1KBNa_markerDel",
-			"note": "F1KBNa_note",
 			"states": "F1KBNa_states",
-			"rowFailed": "F1KBNa_rowFailed",
-			"settingsPage": "F1KBNa_settingsPage",
-			"rowHead": "F1KBNa_rowHead",
-			"headerActions": "F1KBNa_headerActions",
-			"group": "F1KBNa_group",
-			"settingsRowTitle": "F1KBNa_settingsRowTitle",
 			"rowPath": "F1KBNa_rowPath",
+			"searchCount": "F1KBNa_searchCount",
+			"diffStats": "F1KBNa_diffStats",
+			"badge": "F1KBNa_badge",
+			"markerDel": "F1KBNa_markerDel",
+			"addCount": "F1KBNa_addCount",
+			"settingsSelector": "F1KBNa_settingsSelector",
+			"diffFlash": "F1KBNa_diffFlash",
+			"subline": "F1KBNa_subline",
+			"split": "F1KBNa_split",
 			"detailEmpty": "F1KBNa_detailEmpty",
-			"iconAction": "F1KBNa_iconAction",
-			"kindHint": "F1KBNa_kindHint",
-			"hint": "F1KBNa_hint",
-			"importButton": "F1KBNa_importButton",
-			"del": "F1KBNa_del",
-			"diffPath": "F1KBNa_diffPath",
-			"row": "F1KBNa_row"
+			"noticeButton": "F1KBNa_noticeButton",
+			"row": "F1KBNa_row",
+			"wrapActive": "F1KBNa_wrapActive",
+			"settingsRowTitle": "F1KBNa_settingsRowTitle",
+			"group": "F1KBNa_group",
+			"rowHead": "F1KBNa_rowHead",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"noticeText": "F1KBNa_noticeText"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -14284,10 +14290,64 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"sessions"
 		];
 		/**
+		* The dsh web-react renderer gives `div[data-slot="sidebar.footer.action"]` an
+		* inline `display: contents`, so every plugin's footer entry root participates
+		* directly in the `.footerActions` flex row — several plugins (e.g. this one
+		* plus a file-browser) get crammed into one row and a full-width badge
+		* overflows. Stack the slot entries vertically instead (the same fix the
+		* dsh-footer-order plugin injects), so each plugin gets its own row.
+		*
+		* We defer to the dedicated dsh-footer-order plugin when it is present, so the
+		* two never fight.
+		*
+		* Why we detect it by its injected stylesheet's `--dsh-footer-order-gap` custom
+		* property rather than by `ctx.slots.entriesOfSlot('settings.plugin.item')`
+		* (where footer-order registers its settings card, id `footer-order`): that slot
+		* key is not in our SlotMap type (would need a cast) and, more importantly, it
+		* may not be an active slot in this dsh version at all — footer-order targets a
+		* newer dsh settings API, so the detection could miss footer-order and we would
+		* then both inject, fighting over the same `!important` rule. The CSS marker is
+		* footer-order's own, and its presence is exactly "footer-order's rule is really
+		* applied", which is what decides the layout. So only when the marker is absent
+		* do we inject our own rule.
+		*/
+		function injectFooterStackStyle() {
+			if (typeof document === "undefined") return;
+			if (document.querySelector("style[data-diff-approval-footer-stack]") !== null) return;
+			const CSS = "div[data-slot=\"sidebar.footer.action\"]{display:flex!important;flex-direction:column!important;flex:1 1 auto!important;align-items:stretch!important;}";
+			const footerOrderInstalled = () => {
+				for (const style of document.querySelectorAll("style")) if ((style.textContent ?? "").includes("--dsh-footer-order-gap")) return true;
+				return false;
+			};
+			const inject = () => {
+				if (document.querySelector("style[data-diff-approval-footer-stack]") !== null) return;
+				if (footerOrderInstalled()) return;
+				const style = document.createElement("style");
+				style.setAttribute("data-diff-approval-footer-stack", "");
+				style.textContent = CSS;
+				document.head.appendChild(style);
+			};
+			if (document.querySelector("div[data-slot=\"sidebar.footer.action\"]") !== null) {
+				inject();
+				return;
+			}
+			const observer = new MutationObserver(() => {
+				if (document.querySelector("div[data-slot=\"sidebar.footer.action\"]") !== null) {
+					observer.disconnect();
+					inject();
+				}
+			});
+			observer.observe(document.documentElement, {
+				childList: true,
+				subtree: true
+			});
+		}
+		/**
 		* Mount the pending-edit review panel.
 		* @param ctx - Client Cordis context carrying the wire and slot services.
 		*/
 		function apply(ctx) {
+			injectFooterStackStyle();
 			ctx.effect(() => ctx.locale.register(NS, {
 				zh,
 				en

package/lib/index.js

@@ -694,6 +694,35 @@ const inject = [
 ];
 /** The connection RPC channel this plugin serves. */
 const DIFF_APPROVAL_CHANNEL = "/diff-approval";
+/** The dominant line ending of `text`: CRLF when `\r\n` meets or beats lone
+* `\n`, else LF; a text with no line breaks falls back to LF.
+* @param text - the content to inspect.
+* @returns the dominant line-ending sequence.
+*/
+function detectEol(text) {
+	let crlf = 0;
+	let lf = 0;
+	for (let i = 0; i < text.length; i++) {
+		const c = text.charCodeAt(i);
+		if (c === 13) {
+			if (i + 1 < text.length && text.charCodeAt(i + 1) === 10) {
+				crlf++;
+				i++;
+			}
+		} else if (c === 10) lf++;
+	}
+	if (crlf === 0 && lf === 0) return "\n";
+	return crlf >= lf ? "\r\n" : "\n";
+}
+/** Normalize any line ending (`\r\n`, `\r`) to `\n`. */
+function normalizeEol(text) {
+	return text.replace(/\r\n?/g, "\n");
+}
+/** Re-encode `text`'s line endings to `eol` (its content is unchanged). */
+function reencodeEol(text, eol) {
+	const normalized = normalizeEol(text);
+	return eol === "\n" ? normalized : normalized.replace(/\n/g, "\r\n");
+}
 /**
 * Narrow a successful `edit` result value to an operation outcome. The edit
 * tool's output schema declares exactly `{ path, before, after }`; anything
@@ -1275,7 +1304,8 @@ function apply(ctx, config) {
 					if (entry.kind === "create") await rm(ctx.fs.processPath(resolved), { force: true });
 					else {
 						const preWrite = await ctx.fs.readText(resolved, void 0) ?? entry.newText;
-						await writeRevert(resolved, entry.oldText, target.sessionId, signal);
+						const content = reencodeEol(entry.oldText, detectEol(entry.newText));
+						await writeRevert(resolved, content, target.sessionId, signal);
 						undo = {
 							before: {
 								id: entry.id,
@@ -1287,7 +1317,7 @@ function apply(ctx, config) {
 								id: entry.id,
 								path: entry.path,
 								entry: void 0,
-								fileText: entry.oldText
+								fileText: content
 							}
 						};
 					}
@@ -1353,25 +1383,26 @@ function apply(ctx, config) {
 				};
 				const restored = contentRangeOf(entry.oldText, blockTarget.block.oldStart, blockTarget.block.oldEnd);
 				const updatedNew = replaceContentLines(entry.newText, blockTarget.block.newStart, blockTarget.block.newEnd, restored);
+				const content = reencodeEol(updatedNew, detectEol(entry.newText));
 				let afterEntry;
-				if (updatedNew === entry.oldText) {
+				if (normalizeEol(updatedNew) === normalizeEol(entry.oldText)) {
 					store.remove(blockTarget.sessionId, blockTarget.id);
 					afterEntry = void 0;
 				} else {
-					store.update(blockTarget.sessionId, blockTarget.id, { newText: updatedNew });
+					store.update(blockTarget.sessionId, blockTarget.id, { newText: content });
 					afterEntry = {
 						...entry,
-						newText: updatedNew,
+						newText: content,
 						updatedAt: Date.now()
 					};
 				}
 				let undo;
 				try {
 					const resolved = await ctx.fs.resolve(entry.path, { signal });
-					if (entry.kind === "create" && updatedNew === "") await rm(ctx.fs.processPath(resolved), { force: true });
+					if (entry.kind === "create" && content === "") await rm(ctx.fs.processPath(resolved), { force: true });
 					else {
 						const preWrite = await ctx.fs.readText(resolved, void 0) ?? entry.newText;
-						await writeRevert(resolved, updatedNew, blockTarget.sessionId, signal);
+						await writeRevert(resolved, content, blockTarget.sessionId, signal);
 						undo = {
 							before: {
 								id: entry.id,
@@ -1383,7 +1414,7 @@ function apply(ctx, config) {
 								id: entry.id,
 								path: entry.path,
 								entry: afterEntry,
-								fileText: updatedNew
+								fileText: content
 							}
 						};
 					}

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

@@ -29,7 +29,10 @@ export interface WholeFileDiff {
  * Compute the whole-file view between two contents. The context budget is the
  * side lengths, so every hunk covers the file and unchanged lines survive as
  * context rows; the `` patch marker is annotation
- * and never becomes a row.
+ * and never becomes a row. Both sides are line-ending normalized (`\r\n?` →
+ * `\n`) first, so a repo baseline stored with one EOL and a worktree with
+ * another never show as a whole-file delete+add — the diff is about approved
+ * content, not line-ending noise.
  * @param oldText - the file content before the pending change.
  * @param newText - the file content after the pending change.
  * @returns the complete row list with totals.

package/package.json

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