dsh-diff-approval 0.16.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. */
@@ -55,8 +64,9 @@ interface RowRange {
 /** 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;
+    jump: (direction: -1 | 1, wrapGuard?: boolean) => void;
     openSearch: () => void;
+    searchNext: (direction: -1 | 1) => boolean;
 }
 /** The two-column (side-by-side) whole-file diff view. */
 export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
@@ -71,6 +81,8 @@ export declare const SplitDiff: import("react").ForwardRefExoticComponent<{
     leadRows: number;
     onBlockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    /** Notify the parent to toast a block-wrap boundary / single-block (Ctrl+Up/Down). */
+    onWrapToast: (text: string) => void;
 } & import("react").RefAttributes<SplitDiffHandle>>;
 /**
  * Reconstruct the plain text of the current selection so auto-wrap's visual
@@ -81,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/conversation-access.d.ts

@@ -23,6 +23,7 @@ export interface ConversationFace {
             state: {
                 getSnapshot(): {
                     queue: readonly QueueMessageView[];
+                    draft?: string;
                 };
             };
         };
@@ -51,6 +52,14 @@ export declare function resolveConversation(ctx: ClientContext, sessionId: Sessi
 export interface ConversationAccess {
     /** Write the current session's composer draft. */
     writeDraft: (text: string) => void;
+    /**
+     * Append a suffix to the current session's draft (a copy reference), or
+     * replace it when the draft is empty. The existing draft is read from the
+     * input state's plain text — the composer surface is a contenteditable div,
+     * not a <textarea>, so reading a DOM `.value` would always be empty and
+     * silently replace an existing draft instead of appending.
+     */
+    appendDraft: (suffix: string) => void;
     /** Read the current session's still-queued messages (queued placement only). */
     readQueue: () => readonly QueueMessageView[];
     /** Apply an edit mutation to one queued message's full content. */

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

@@ -11,6 +11,11 @@ export declare const zh: {
     'panel.aria': string;
     'panel.stats': string;
     'panel.blockPosition': string;
+    'panel.blockAtEnd': string;
+    'panel.blockAtStart': string;
+    'panel.blockSingle': string;
+    'panel.viewDiff': string;
+    'panel.fileNotPending': string;
     'panel.selectHint': string;
     'panel.searchPlaceholder': string;
     'panel.missing': string;
@@ -27,9 +32,33 @@ 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;
+    'panel.key.copyRef': string;
+    'panel.key.openSearch': string;
+    'panel.key.searchNext': string;
+    'panel.key.searchPrev': string;
+    'panel.key.undo': string;
+    'panel.key.redo': string;
+    'panel.key.cycleNext': string;
+    'panel.key.cyclePrev': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': string;
@@ -96,6 +125,11 @@ export declare const en: {
     'panel.aria': string;
     'panel.stats': string;
     'panel.blockPosition': string;
+    'panel.blockAtEnd': string;
+    'panel.blockAtStart': string;
+    'panel.blockSingle': string;
+    'panel.viewDiff': string;
+    'panel.fileNotPending': string;
     'panel.selectHint': string;
     'panel.searchPlaceholder': string;
     'panel.missing': string;
@@ -112,9 +146,33 @@ 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;
+    'panel.key.copyRef': string;
+    'panel.key.openSearch': string;
+    'panel.key.searchNext': string;
+    'panel.key.searchPrev': string;
+    'panel.key.undo': string;
+    'panel.key.redo': string;
+    'panel.key.cycleNext': string;
+    'panel.key.cyclePrev': string;
     'settings.tabLabel': string;
     'row.create': string;
     'row.failed': 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/produced-diff.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Inject a "查看差异" button beside each DSH produced-file chip.
+ *
+ * The harness's `ProducedFiles` component renders each produced file as a
+ * `<button>` chip inside `[data-produced-files-row]`; the full path rides the
+ * chip's `title`. This plugin wants a quick "view this file's diff" affordance
+ * there, but the plugin should not have to touch the harness component. So this
+ * module watches the DOM for those chips (via a MutationObserver, the same
+ * bridge the dsh-pocket mobile fork uses to inject its 复制 buttons) and injects
+ * a small button after each one. Clicking it dispatches a window event that the
+ * diff-approval panel listens for (see PendingPanel), which opens the panel and
+ * selects the file when it is still pending, or toasts otherwise.
+ *
+ * The injected button is intentionally self-contained (inline styles + a fixed
+ * label) so it needs no stylesheet and no harness change.
+ */
+/** Window event dispatched by the injected button; PendingPanel listens for it. */
+export declare const OPEN_FILE_EVENT = "diff-approval:open-file";
+/**
+ * Start injecting diff buttons into the produced-files row.
+ * @param label - localized "查看差异" text, used as the icon button's accessible
+ *   name + hover title (the button renders only an icon).
+ * @param openPath - called with a produced-file path when its injected button is
+ *   clicked; the diff-approval panel decides whether that file is still pending.
+ * @returns a cleanup that disconnects the observer and removes injected buttons.
+ */
+export declare function startProducedDiffInjection(label: string, openPath: (path: string) => void): () => void;

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

@@ -31,6 +31,17 @@ export declare function referencePathOf(path: string, workspacePath: string | un
  * @returns the range label.
  */
 export declare function lineRangeLabel(start: number, end: number): string;
+/**
+ * Build the bare reference label for a selected line range — `path:range` with
+ * no surrounding parentheses. Used for display (the status-bar copy control
+ * shows the reference without the token-wrapping parens).
+ * @param path - the selected file's path.
+ * @param workspacePath - the current workspace root, or `undefined`.
+ * @param start - first selected line number.
+ * @param end - last selected line number.
+ * @returns the `path:range` reference label.
+ */
+export declare function referenceLabelOf(path: string, workspacePath: string | undefined, start: number, end: number): string;
 /**
  * Build the clipboard text for a selected line range, wrapped in parentheses so
  * the reference reads as one unambiguous token (and can be matched precisely).

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
@@ -68,6 +106,13 @@ export declare const DEFAULT_QUICK_SUMMON = "Ctrl+D";
 export declare function quickSummonKey(): string;
 /** Persist the quick-summon chord. */
 export declare function setQuickSummonKey(value: string): void;
+/** Default chord for each configurable action (every supported key except the
+ *  panel's own ESC-to-close, which is intentionally not remapped). */
+export declare const DEFAULT_KEYBINDINGS: Record<string, string>;
+/** The currently configured chord for one action; falls back to its default. */
+export declare function keybindingOf(action: string): string;
+/** Persist one action's chord. */
+export declare function setKeybinding(action: string, chord: string): void;
 /**
  * Whether a keyboard event matches a chord string like `Ctrl+D`. Modifier
  * names are matched case-insensitively (`Ctrl`/`Control`, `Alt`/`Option`,

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/client/whole-file-diff.d.ts

@@ -46,6 +46,15 @@ export interface WholeFileDiff {
  * @returns the normalized line bodies.
  */
 export declare function contentKey(text: string): string;
+/** Reorder each contiguous change run (a maximal run of non-context rows) into
+ *  the standard unified-diff shape — all `del` rows first, then all `add` rows.
+ *  The diff package's Myers scan can emit per-line replacements (`del add del
+ *  add`) for some content, which reads as interleaved in the viewer and makes
+ *  the split view pair each line separately. Reordering a run to del-block→add-
+ *  block keeps each row's own line numbers and never changes the run's row
+ *  boundaries, so change blocks, split alignment, and keep/revert ranges stay
+ *  correct — it only tidies the display order. */
+export declare function normalizeChangeRuns(rows: WholeFileDiffRow[]): void;
 export declare function computeWholeFileDiff(oldText: string, newText: string): WholeFileDiff;
 /**
  * One intra-line segment of a changed line, used to highlight which characters

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