dsh-diff-approval 0.9.0 → 0.11.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,6 +1,7 @@
 /** Sidebar-foot pending-edit review action and the split review panel it opens. */
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
 import type { PendingPanelFace } from './slots.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'>;
 /**

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

@@ -3,9 +3,10 @@ import type { PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots
 /** Full component props assembled by the Settings slot renderer. */
 export type DiffApprovalSettingsTabProps = PropsRuntime<'settings.section'> & PropsLocale<'diff-approval'>;
 /**
- * The plugin's preferences: auto-paste a copied reference into the input, and
- * whether importing workspace VCS changes includes untracked files. Each row
- * mirrors the harness's Agent-preset row (title + description on the left, a
- * pill picker on the right) with the two boolean states 打开 / 关闭.
+ * The plugin's preferences: auto-paste a copied reference into the input,
+ * whether importing workspace VCS changes includes untracked files, and the
+ * diff's tab width. Each row mirrors the harness's Agent-preset row (title +
+ * description on the left, a pill picker on the right); the tab-width row
+ * offers 2 / 4 / 8 spaces.
  */
 export declare function DiffApprovalSettingsTab({ t }: DiffApprovalSettingsTabProps): import("react").JSX.Element;

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

@@ -22,6 +22,8 @@ export declare const zh: {
     'panel.pasteOnCopyDesc': string;
     'panel.importUntracked': string;
     'panel.importUntrackedDesc': string;
+    'panel.tabWidth': string;
+    'panel.tabWidthDesc': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': string;
@@ -36,11 +38,14 @@ export declare const zh: {
     'action.busy': string;
     'action.prevDiff': string;
     'action.nextDiff': string;
+    'action.showFileList': string;
+    'action.hideFileList': string;
     'action.copyHint': string;
     'action.copied': string;
     'action.langAuto': string;
     'action.langAutoDetected': string;
     'action.langSelect': string;
+    'action.wrap': string;
     'action.toggleOn': string;
     'action.toggleOff': string;
     'action.importVcs': string;
@@ -88,6 +93,8 @@ export declare const en: {
     'panel.pasteOnCopyDesc': string;
     'panel.importUntracked': string;
     'panel.importUntrackedDesc': string;
+    'panel.tabWidth': string;
+    'panel.tabWidthDesc': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': string;
@@ -102,11 +109,14 @@ export declare const en: {
     'action.busy': string;
     'action.prevDiff': string;
     'action.nextDiff': string;
+    'action.showFileList': string;
+    'action.hideFileList': string;
     'action.copyHint': string;
     'action.copied': string;
     'action.langAuto': string;
     'action.langAutoDetected': string;
     'action.langSelect': string;
+    'action.wrap': string;
     'action.toggleOn': string;
     'action.toggleOff': string;
     'action.importVcs': string;

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

@@ -17,3 +17,22 @@ export declare function setPasteOnCopyEnabled(value: boolean): void;
 export declare function includeUntrackedEnabled(): boolean;
 /** Persist the import-untracked preference. */
 export declare function setIncludeUntrackedEnabled(value: boolean): void;
+/**
+ * Whether lines wrap (auto-wrap) in the diff for one highlight language.
+ * Defaults to off; only an explicit `'1'` enables it. Stored per language, so
+ * a language's preference never leaks into another's.
+ * @param lang - the highlight language (or `''` for the auto/default bucket).
+ * @returns whether lines wrap.
+ */
+export declare function wrapEnabled(lang: string): boolean;
+/** Persist the per-language auto-wrap preference. */
+export declare function setWrapEnabled(lang: string, value: boolean): void;
+/**
+ * The diff's tab width in spaces. Defaults to 4; the settings UI offers 2/4/8,
+ * but any positive integer is accepted. This drives both the rendered
+ * `tab-size` and the wrapped-line tab measurement, so they always agree.
+ * @returns the number of spaces one tab advances.
+ */
+export declare function tabWidth(): number;
+/** Persist the diff's tab width (in spaces). */
+export declare function setTabWidth(value: number): void;

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.9.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",