dsh-diff-approval 0.15.0 → 0.17.0

package/lib/index.js

@@ -424,11 +424,9 @@ function defaultOpenPath(path, action) {
 /** Cap on one VCS command's runtime; scans (git status, svn status) can be slow
 * on large trees but must not hang the import. */
 const VCS_COMMAND_TIMEOUT_MS = 6e4;
-/** Blobs up to this size are read straight off the executor's buffered stdout
-* (the small-blob path, no temp file); larger blobs go through the checkout-index
-* temp-file path because the executor cap truncates its stdout. Kept below the
-* cap so the small path never truncates. */
-const GIT_BLOB_STDOUT_SAFE = 6e4;
+/** Slack added to a blob's size when raising the per-command stdout budget
+* (`stdoutMaxBytes`), so a baseline blob is never truncated at the boundary. */
+const GIT_BLOB_STDOUT_SLACK = 1024;
 /** Quote one argument for a POSIX-ish shell, so paths with spaces or special
 * characters survive interpolation into VCS command lines. */
 function shq(value) {
@@ -469,12 +467,13 @@ function detectVcsRoot(start) {
 	}
 }
 /** Run one command through the shell executor; a non-zero exit throws. */
-async function runShell(shell, command, workdir, signal) {
+async function runShell(shell, command, workdir, signal, stdoutMaxBytes) {
 	const spec = shell.resolve({
 		command,
 		workdir,
 		timeoutMs: VCS_COMMAND_TIMEOUT_MS,
-		signal
+		signal,
+		stdoutMaxBytes
 	});
 	const result = await shell.run(spec);
 	if (result.exitCode !== 0) {
@@ -539,18 +538,7 @@ async function gitChanges(input) {
 			} catch {
 				size = 0;
 			}
-			if (Number.isFinite(size) && size > 0 && size <= GIT_BLOB_STDOUT_SAFE) oldText = await runShell(shell, `git show :0:${shq(rel)}`, root, signal);
-			else {
-				const tempRel = (await runShell(shell, `git checkout-index --temp --force -- ${shq(rel)}`, root, signal)).trim().split(/\s+/)[0] ?? "";
-				if (tempRel !== "") {
-					const tempFile = resolve(root, tempRel);
-					try {
-						oldText = await readText(tempFile) ?? "";
-					} finally {
-						await rm(tempFile, { force: true }).catch(() => {});
-					}
-				}
-			}
+			if (Number.isFinite(size) && size > 0) oldText = await runShell(shell, `git show :0:${shq(rel)}`, root, signal, size + GIT_BLOB_STDOUT_SLACK);
 		} catch {
 			oldText = "";
 		}

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

@@ -55,8 +55,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 +72,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

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;
@@ -30,6 +35,18 @@ export declare const zh: {
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
+    'settings.keybindings': 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;
@@ -48,6 +65,8 @@ export declare const zh: {
     'action.nextDiff': string;
     'action.showFileList': string;
     'action.hideFileList': string;
+    'action.viewSplit': string;
+    'action.viewUnified': string;
     'action.copyHint': string;
     'action.copied': string;
     'action.langAuto': string;
@@ -94,6 +113,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;
@@ -113,6 +137,18 @@ export declare const en: {
     'panel.quickSummon': string;
     'panel.quickSummonDesc': string;
     'panel.recordShortcut': string;
+    'settings.keybindings': 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;
@@ -131,6 +167,8 @@ export declare const en: {
     'action.nextDiff': string;
     'action.showFileList': string;
     'action.hideFileList': string;
+    'action.viewSplit': string;
+    'action.viewUnified': string;
     'action.copyHint': string;
     'action.copied': string;
     'action.langAuto': string;

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

@@ -68,6 +68,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/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/vcs.d.ts

@@ -44,6 +44,8 @@ export interface ShellExecutorLike {
         workdir?: string | undefined;
         timeoutMs?: number | undefined;
         signal?: AbortSignal | undefined;
+        /** Foreground stdout capture budget in bytes; absent uses the executor's cap. */
+        stdoutMaxBytes?: number | undefined;
     }): unknown;
     run(spec: unknown): Promise<{
         exitCode: number | null;

package/package.json

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