dsh-diff-approval 0.17.0 → 0.18.0

package/lib/index.js

@@ -1325,9 +1325,25 @@ function apply(ctx, config) {
 					fileText: void 0
 				});
 				persistSession();
+				const fullyResolved = updatedOld === entry.newText;
+				if (fullyResolved && blockTarget.removeWhenResolved === true) {
+					store.remove(blockTarget.id);
+					pushUndo(blockTarget.sessionId, {
+						id: entry.id,
+						path: entry.path,
+						entry: afterEntry,
+						fileText: void 0
+					}, {
+						id: entry.id,
+						path: entry.path,
+						entry: void 0,
+						fileText: void 0
+					});
+					persistSession(true);
+				}
 				return {
 					ok: true,
-					value: updatedOld === entry.newText ? {
+					value: fullyResolved ? {
 						outcome: "kept",
 						resolved: true
 					} : { outcome: "kept" }
@@ -1378,9 +1394,25 @@ function apply(ctx, config) {
 				}
 				if (undo !== void 0) pushUndo(blockTarget.sessionId, undo.before, undo.after);
 				persistSession();
+				const fullyResolved = normalizeEol(updatedNew) === normalizeEol(entry.oldText);
+				if (fullyResolved && blockTarget.removeWhenResolved === true) {
+					store.remove(blockTarget.id);
+					pushUndo(blockTarget.sessionId, {
+						id: entry.id,
+						path: entry.path,
+						entry: afterEntry,
+						fileText: void 0
+					}, {
+						id: entry.id,
+						path: entry.path,
+						entry: void 0,
+						fileText: void 0
+					});
+					persistSession(true);
+				}
 				return {
 					ok: true,
-					value: normalizeEol(updatedNew) === normalizeEol(entry.oldText) ? {
+					value: fullyResolved ? {
 						outcome: "reverted",
 						resolved: true
 					} : { outcome: "reverted" }
@@ -1625,6 +1657,7 @@ function blockTargetOf(payload) {
 		newStart,
 		newEnd
 	].every((value) => typeof value === "number" && Number.isFinite(value))) return void 0;
+	const removeWhenResolved = payload.removeWhenResolved;
 	return {
 		...target,
 		block: {
@@ -1632,7 +1665,8 @@ function blockTargetOf(payload) {
 			oldEnd,
 			newStart,
 			newEnd
-		}
+		},
+		removeWhenResolved: typeof removeWhenResolved === "boolean" ? removeWhenResolved : void 0
 	};
 }
 /** Narrow a wire payload to one keep/revert target. */

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

@@ -0,0 +1,23 @@
+/** A compact HSV color picker (saturation/value square + hue bar + hex/RGB
+ *  input). Avoids the browser-native color dialog, which cannot be themed, so
+ *  it matches DSH. Pure helpers are exported for testing. */
+/** Parse `#rrggbb` / `#rgb` / `rrggbb` / `rgb(r,g,b)` into a normalised
+ *  `#rrggbb`, or `undefined` when the text is not a color. */
+export declare function parseColor(input: string): string | undefined;
+/** Convert a `#rrggbb` hex to HSV (h 0-360, s 0-1, v 0-1). */
+export declare function hexToHsv(hex: string): {
+    h: number;
+    s: number;
+    v: number;
+};
+/** Convert HSV (h 0-360, s 0-1, v 0-1) to a `#rrggbb` hex. */
+export declare function hsvToHex(h: number, s: number, v: number): string;
+/** A draggable HSV picker: saturation/value square + hue bar + a hex/RGB text
+ *  input. `onChange` reports a normalised `#rrggbb`; `onClose` fires after a
+ *  committed text value so the caller can close the popover. */
+export declare function ColorPicker({ value, onChange, onClose, ariaLabel, }: {
+    value: string;
+    onChange: (hex: string) => void;
+    onClose?: () => void;
+    ariaLabel: string;
+}): import("react").JSX.Element;

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

@@ -7,6 +7,15 @@ import type { DiffApprovalKey } from './locales.ts';
 import { computeWholeFileDiff } from './whole-file-diff.ts';
 import type { IntraRun } from './whole-file-diff.ts';
 import { highlightLines } from './highlight.ts';
+/** Normalize a path for comparison: forward slashes, no trailing slash. */
+export declare function normalizeDiffPath(p: string): string;
+/** Whether a produced-file chip path and a pending file path refer to the same
+ *  file, tolerant of separator style (\\ vs /) and of a workspace-relative vs
+ *  absolute form. `chipPath` is typically the harness's workspace-relative
+ *  forward-slash path; `filePath` is the host's absolute native-separator path.
+ *  Matching is case-insensitive so a Windows drive/segment case difference does
+ *  not miss the file the user clicked. */
+export declare function diffPathsMatch(chipPath: string, filePath: string, workspacePath: string | undefined): boolean;
 /** The dsh shell's sidebar auto-collapse breakpoint (ui-layout columns.ts):
  * below it the sidebar auto-collapses, and the file list floats on the same
  * breakpoint so the two stay consistent. */
@@ -84,5 +93,5 @@ export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
  */
 export declare function selectedPlainText(): string | undefined;
 /** 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, onAckJustResolved, collapseSidebar, t, }: PendingPanelProps): import("react").JSX.Element;
+export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, onAckRedoCleared, collapseSidebar, t, }: PendingPanelProps): import("react").JSX.Element;
 export {};

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

@@ -32,10 +32,22 @@ export declare const zh: {
     'panel.splitModeDesc': string;
     'panel.navLeadRows': string;
     'panel.navLeadRowsDesc': string;
+    'panel.diffFontSize': string;
+    'panel.diffFontSizeDesc': string;
+    'panel.diffLineHeight': string;
+    'panel.diffLineHeightDesc': string;
+    'panel.diffAddColor': string;
+    'panel.diffAddColorDesc': string;
+    'panel.diffDelColor': string;
+    'panel.diffDelColorDesc': string;
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
     'settings.keybindings': string;
+    'settings.keybindingsDesc': string;
+    'settings.diffView': string;
+    'settings.diffViewDesc': string;
+    'settings.diffPreview': string;
     'panel.keyDesc': string;
     'panel.key.jumpUp': string;
     'panel.key.jumpDown': string;
@@ -134,10 +146,22 @@ export declare const en: {
     'panel.splitModeDesc': string;
     'panel.navLeadRows': string;
     'panel.navLeadRowsDesc': string;
+    'panel.diffFontSize': string;
+    'panel.diffFontSizeDesc': string;
+    'panel.diffLineHeight': string;
+    'panel.diffLineHeightDesc': string;
+    'panel.diffAddColor': string;
+    'panel.diffAddColorDesc': string;
+    'panel.diffDelColor': string;
+    'panel.diffDelColorDesc': string;
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
     'settings.keybindings': string;
+    'settings.keybindingsDesc': string;
+    'settings.diffView': string;
+    'settings.diffViewDesc': string;
+    'settings.diffPreview': string;
     'panel.keyDesc': string;
     'panel.key.jumpUp': string;
     'panel.key.jumpDown': string;

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

@@ -17,9 +17,9 @@ export interface DiffApprovalPort {
     /** Revert one operation. */
     revert(sessionId: SessionId, id: string): Promise<DiffApprovalActionValue>;
     /** Keep one diff block (accept its change into the tracked baseline). */
-    blockKeep(sessionId: SessionId, id: string, block: DiffApprovalBlockRange): Promise<DiffApprovalActionValue>;
+    blockKeep(sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean): Promise<DiffApprovalActionValue>;
     /** Revert one diff block (restore its old lines in the file). */
-    blockRevert(sessionId: SessionId, id: string, block: DiffApprovalBlockRange): Promise<DiffApprovalActionValue>;
+    blockRevert(sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean): Promise<DiffApprovalActionValue>;
     /** Undo the session's last keep/revert (restore the before state). */
     undo(sessionId: SessionId): Promise<DiffApprovalActionValue>;
     /** Redo the session's last undone keep/revert (re-apply the after state). */

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

@@ -3,6 +3,16 @@
 export declare const NAV_LEAD_ROWS_DEFAULT = 2;
 export declare const NAV_LEAD_ROWS_MIN = 0;
 export declare const NAV_LEAD_ROWS_MAX = 10;
+/** The code block's fixed row height used by the virtual window and jump math.
+ *  A hardcoded px base; the settings UI offers 10–36 (a low floor would clip the
+ *  code text, so the range is loose but never degenerate). */
+export declare const DIFF_LINE_HEIGHT_DEFAULT = 22;
+export declare const DIFF_LINE_HEIGHT_MIN = 10;
+export declare const DIFF_LINE_HEIGHT_MAX = 36;
+/** Font-size scale range: a percentage of the current value, stepped by 10. */
+export declare const DIFF_FONT_SCALE_DEFAULT = 100;
+export declare const DIFF_FONT_SCALE_MIN = 50;
+export declare const DIFF_FONT_SCALE_MAX = 200;
 /**
  * Whether copying a reference should also paste it into the chat input and
  * focus it. Defaults to on; only an explicit `'0'` disables it.
@@ -40,6 +50,34 @@ 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;
+/**
+ * The diff code font size as a percentage of the current (theme) size. Defaults
+ * to 100 (the current look); the settings UI steps it by ±10.
+ * @returns the font-size scale, as a percentage (e.g. 100, 110, 90).
+ */
+export declare function diffFontScale(): number;
+/** Persist the diff's code font-size scale (a percentage). */
+export declare function setDiffFontScale(value: number): void;
+/**
+ * The diff code line height in px (the fixed row height the virtual window and
+ * jump math are keyed to). Defaults to 22 (the pre-customization value).
+ * @returns the line height in px.
+ */
+export declare function diffLineHeight(): number;
+/** Persist the diff's code line height (px). */
+export declare function setDiffLineHeight(value: number): void;
+/** The added-line base color the user chose, or `undefined` (theme color). */
+export declare function diffAddColor(): string | undefined;
+/** Persist the added-line base color (a hex like `#22c55e`). */
+export declare function setDiffAddColor(value: string): void;
+/** The removed-line base color the user chose, or `undefined` (theme color). */
+export declare function diffDelColor(): string | undefined;
+/** Persist the removed-line base color (a hex like `#ef4444`). */
+export declare function setDiffDelColor(value: string): void;
+/** The theme's added-line base color, for the settings swatch default. */
+export declare function currentDiffAddColor(): string;
+/** The theme's removed-line base color, for the settings swatch default. */
+export declare function currentDiffDelColor(): string;
 /**
  * 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

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

@@ -20,9 +20,6 @@ export interface PendingDiffSnapshot {
      * superseded the redo history; the panel surfaces it once (deferred if the
      * panel is closed) via a bottom-right notice. */
     redoCleared?: boolean;
-    /** Latched file id whose last block just resolved; the panel prompts once to
-     * remove-or-keep it, then acknowledges to clear the latch. */
-    justResolved?: string | undefined;
 }
 /** The injected face the panel component receives from the plugin body. */
 export interface PendingPanelFace {
@@ -37,9 +34,9 @@ export interface PendingPanelFace {
     /** Revert one operation (restore its prior content, or remove a created file). */
     onRevert: (sessionId: SessionId, id: string) => Promise<void>;
     /** Keep one diff block (accept its change into the tracked baseline). */
-    onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean) => Promise<void>;
     /** Revert one diff block (restore its old lines in the file). */
-    onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean) => Promise<void>;
     /** Open one file with its default application or reveal it in the folder. */
     onOpen: (sessionId: SessionId, id: string, action: DiffApprovalOpenAction) => Promise<void>;
     /** Paste a copied reference into the session's chat input and focus it. */
@@ -52,8 +49,6 @@ export interface PendingPanelFace {
     onImportVcs: (sessionId: SessionId, includeUntracked: boolean) => Promise<VcsImportValue>;
     /** Acknowledge the redo-cleared notice so it is only surfaced once. */
     onAckRedoCleared: () => void;
-    /** Acknowledge the just-resolved prompt so it is only surfaced once. */
-    onAckJustResolved: () => void;
     /** Collapse the DSH sidebar (no-op when already collapsed) before the modal
      * opens or fullscreens, so an expanded sidebar can't overlap the modal. */
     collapseSidebar: () => void;

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

@@ -19,9 +19,9 @@ export interface PendingDiffStore extends HostObservable<PendingDiffSnapshot> {
     /** Revert one operation. */
     revert: (sessionId: SessionId, id: string) => Promise<void>;
     /** Keep one diff block, then refresh so the entry's diff reflects the accept. */
-    blockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    blockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean) => Promise<void>;
     /** Revert one diff block, then refresh so the entry's diff reflects the undo. */
-    blockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    blockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange, removeWhenResolved?: boolean) => Promise<void>;
     /** Undo the session's last keep/revert, then refresh; resolves to the affected entry id when it is still pending. */
     undo: (sessionId: SessionId) => Promise<string | undefined>;
     /** Redo the session's last undone keep/revert, then refresh; resolves to the affected entry id when it is still pending. */
@@ -34,8 +34,6 @@ export interface PendingDiffStore extends HostObservable<PendingDiffSnapshot> {
     reset: () => void;
     /** Acknowledge a redo-cleared notice so the panel surfaces it only once. */
     clearRedoCleared: () => void;
-    /** Acknowledge the just-resolved prompt so it is only surfaced once. */
-    clearJustResolved: () => void;
 }
 /**
  * Create the store over the review-channel port.

package/lib/types/types.d.ts

@@ -88,6 +88,11 @@ export interface DiffApprovalBlockTarget {
     sessionId: SessionId;
     id: string;
     block: DiffApprovalBlockRange;
+    /** When true and this action clears the entry's last remaining change, remove
+     *  the entry from the pending list as part of the same request. When false or
+     *  absent, a fully-resolved entry stays listed (the panel's remove-and-keep
+     *  prompt sets this from the user's choice). */
+    removeWhenResolved?: boolean | undefined;
 }
 /** Outcome of one keep/revert/undo/redo request. */
 export type DiffApprovalActionOutcome = 'kept' | 'reverted' | 'missing' | 'undone' | 'redone' | 'nothing';

package/package.json

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