dsh-diff-approval 0.10.0 → 0.12.0

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/PendingPanel.d.ts

@@ -1,9 +1,16 @@
 /** Sidebar-foot pending-edit review action and the split review panel it opens. */
+import type { SessionId } from '@deepseek-ai/dsh-client-connection/client';
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
+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 { highlightLines } from './highlight.ts';
 export declare function wrapInto(text: string, widthPx: number, measure: (t: string) => number, tabPx: number): string[];
 /** Full panel props composed by the sidebar footer-action slot. */
 export type PendingPanelProps = PropsRuntime<'sidebar.footer.action'> & InjectFace<PendingPanelFace> & PropsLocale<'diff-approval'>;
+/** Locale translator used by the panel and its rows. */
+type Translator = (key: DiffApprovalKey, params?: Record<string, unknown>) => string;
 /**
  * Open the DSH settings dialog and switch to this plugin's section. The
  * settings shell keeps its open state and the active section id as
@@ -14,5 +21,40 @@ export type PendingPanelProps = PropsRuntime<'sidebar.footer.action'> & InjectFa
  * @param sectionLabel - the nav label of this plugin's settings section.
  */
 export declare function openSettingsSection(sectionLabel: string): void;
+/** One file's synchronous view: diff rows and change blocks. */
+interface RowModel {
+    diff: ReturnType<typeof computeWholeFileDiff>;
+    /** Maximal runs of changed rows (inclusive row indices); one per modification. */
+    blocks: ChangeBlock[];
+}
+/** One file's deferred syntax-highlight runs, one entry per side. */
+interface HighlightRuns {
+    oldRuns: ReturnType<typeof highlightLines>;
+    newRuns: ReturnType<typeof highlightLines>;
+}
+/** One contiguous run of changed rows, treated as a single modification. */
+interface ChangeBlock {
+    start: number;
+    end: number;
+}
+/** 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 {
+    jump: (direction: -1 | 1) => void;
+    openSearch: () => void;
+}
+/** The two-column (side-by-side) whole-file diff view. */
+export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
+    file: PendingFileDiff;
+    model: RowModel;
+    runs: HighlightRuns | undefined;
+    langWrap: boolean;
+    tabWidthSpaces: number;
+    busy: boolean;
+    t: Translator;
+    onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+} & import("react").RefAttributes<SplitDiffHandle>>;
 /** 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, t, }: PendingPanelProps): import("react").JSX.Element;
+export {};

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

@@ -24,6 +24,8 @@ export declare const zh: {
     'panel.importUntrackedDesc': string;
     'panel.tabWidth': string;
     'panel.tabWidthDesc': string;
+    'panel.splitMode': string;
+    'panel.splitModeDesc': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': string;
@@ -95,6 +97,8 @@ export declare const en: {
     'panel.importUntrackedDesc': string;
     'panel.tabWidth': string;
     'panel.tabWidthDesc': string;
+    'panel.splitMode': string;
+    'panel.splitModeDesc': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': string;

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

@@ -36,3 +36,12 @@ export declare function setWrapEnabled(lang: string, value: boolean): void;
 export declare function tabWidth(): number;
 /** Persist the diff's tab width (in spaces). */
 export declare function setTabWidth(value: number): void;
+/**
+ * Whether the whole-file diff view uses the two-column (side-by-side) layout.
+ * Default off (single column): the unified diff. Only an explicit `'1'` enables
+ * split mode.
+ * @returns whether the split (two-column) diff view is used.
+ */
+export declare function splitMode(): boolean;
+/** Persist the split-view preference. */
+export declare function setSplitMode(value: boolean): void;

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

@@ -0,0 +1,51 @@
+/**
+ * Side-by-side (split) diff model: the unified whole-file diff rows are
+ * regrouped into line-aligned pairs for a two-column "before | current" view.
+ * Pure derivation; the view owns rendering. A context row becomes a pair with
+ * both sides, a deletion a left-only pair, an addition a right-only pair, and
+ * an adjacent deletion/addition run is paired line-by-line into a single
+ * replacement pair so the two columns line up.
+ * @module dsh-diff-approval/client/split-diff
+ */
+import type { WholeFileDiffRow } from './whole-file-diff.ts';
+/** One side of a split pair: text plus its 1-based line number (absent on a pure add). */
+export interface SplitSide {
+    /** The side's source line content, without the terminating newline. */
+    text: string;
+    /** 1-based line number on this side, or undefined. */
+    line: number | undefined;
+}
+/** One aligned left/right pair of the split view. */
+export interface SplitPair {
+    /** What the pair is: unchanged, deleted (left only), added (right only), or a replaced line. */
+    kind: 'context' | 'del' | 'add' | 'replace';
+    /** The old (left) side; absent on a pure addition. */
+    left: SplitSide | undefined;
+    /** The new (right) side; absent on a pure deletion. */
+    right: SplitSide | undefined;
+}
+/** The derived split view: aligned pairs plus the row→pair index map. */
+export interface SplitDiff {
+    /** Aligned pairs in file order. */
+    pairs: SplitPair[];
+    /** Original whole-file row index → pair index, so block ranges keep working. */
+    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.
+ * @param rows - the whole-file diff rows.
+ * @returns the split pairs plus the row→pair index map.
+ */
+export declare function computeSideBySideDiff(rows: readonly WholeFileDiffRow[]): 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
+ * highlights the whole pair on both columns and a single "current" pair is
+ * stepped through — not each individual left/right occurrence.
+ * @param pairs - the split pairs.
+ * @param query - the query text; an empty query matches nothing.
+ * @returns matching pair indices, in file order.
+ */
+export declare function searchPairs(pairs: readonly SplitPair[], query: string): number[];

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.12.0",
   "description": "DeepSeek Harness plugin: pending-edit review with whole-file diff and Keep/Revert",
   "packageManager": "pnpm@11.21.0",
   "author": "Wu Zhiwei",