dsh-diff-approval 0.5.0 → 0.7.0

package/lib/client.js

@@ -11582,30 +11582,21 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		//#endregion
 		//#region lib/types/client/reference.js
 		/**
-		* Reference labels for the selection toolbar: a file name plus a 1-based line
-		* range, using the short name when unambiguous and the full path otherwise.
-		* Pure derivation so the display rule is unit-testable without the panel.
-		* @module dsh-diff-approval/client/reference
-		*/
-		/**
-		* Last path segment of a file path, any separator style.
-		* @param path - the path to shorten.
-		* @returns the segment after the final separator.
-		*/
-		function basenameOf$1(path) {
-			const normalized = path.replaceAll("\\", "/");
-			return normalized.slice(normalized.lastIndexOf("/") + 1);
-		}
-		/**
-		* The path shown in a copied reference: the short name when no other listed
-		* file shares it, the full path otherwise.
+		* The path embedded in a copied reference: workspace-relative (forward
+		* slashes) when the file lives inside the current workspace, the absolute
+		* path otherwise. A bare file name is never enough — a reference must resolve
+		* to exactly one file.
 		* @param path - the selected file's path.
-		* @param files - every currently listed pending file.
-		* @returns the display path for a copied reference.
+		* @param workspacePath - the current workspace root, or `undefined`.
+		* @returns the reference path.
 		*/
-		function copyDisplayPath(path, files) {
-			const base = basenameOf$1(path);
-			return files.some((file) => file.path !== path && basenameOf$1(file.path) === base) ? path : base;
+		function referencePathOf(path, workspacePath) {
+			if (workspacePath === void 0 || workspacePath.length === 0) return path;
+			const normalized = path.replaceAll("\\", "/");
+			const root = workspacePath.replaceAll("\\", "/");
+			const prefix = root.endsWith("/") ? root : `${root}/`;
+			if (normalized.length > prefix.length && normalized.slice(0, prefix.length).toLowerCase() === prefix.toLowerCase()) return normalized.slice(prefix.length);
+			return path;
 		}
 		/**
 		* Format one line range as a reference suffix: a single line number, or the
@@ -11620,17 +11611,17 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		/**
 		* Build the clipboard text for a selected line range.
 		* @param path - the selected file's path.
-		* @param files - every currently listed pending file.
+		* @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 text.
 		*/
-		function referenceOf(path, files, start, end) {
-			return `${copyDisplayPath(path, files)}:${lineRangeLabel(start, end)}`;
+		function referenceOf(path, workspacePath, start, end) {
+			return `${referencePathOf(path, workspacePath)}:${lineRangeLabel(start, end)}`;
 		}
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/dsh-diff-approval/dsh-diff-approval/src/client/PendingPanel.module.css.mjs
-		const css = ".F1KBNa_layer{box-sizing:border-box;flex:none;align-items:center;width:calc(100% + 8px);height:42px;margin:4px -4px;display:flex;position:relative}.F1KBNa_footerButtons{align-items:center;width:100%;display:flex}.F1KBNa_badge{box-sizing:border-box;width:100%;height:42px;color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border:none;border-radius:12px;align-items:center;gap:8px;padding:0 10px 0 8px;font-family:inherit;font-size:14px;line-height:22px;display:flex;overflow:hidden}.F1KBNa_badge:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_badge[data-active]{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_badgeLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.F1KBNa_badgeCount{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;flex:none;margin-left:auto;font-size:12px;line-height:16px}.F1KBNa_layer.F1KBNa_rail{width:36px;height:36px;margin:8px 0 10px}.F1KBNa_rail .F1KBNa_badge{border-radius:50%;justify-content:center;gap:0;width:36px;height:36px;padding:0}.F1KBNa_rail .F1KBNa_badgeLabel{display:none}.F1KBNa_rail .F1KBNa_badgeCount{box-sizing:border-box;background:var(--dsw-alias-state-business-primary);min-width:18px;height:18px;color:var(--dsw-alias-label-primary-foreground);font-variant-numeric:tabular-nums;border-radius:9px;justify-content:center;align-items:center;padding:0 4px;font-size:11px;line-height:18px;display:flex;position:absolute;top:-3px;right:-7px}.F1KBNa_panel{z-index:30;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);width:auto;max-width:none;box-shadow:var(--dsw-shadow-lv2);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:12px;flex-direction:column;display:flex;position:fixed;inset:8px 8px 128px;overflow:hidden}.F1KBNa_header{box-sizing:border-box;border-bottom:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);flex:none;justify-content:space-between;align-items:center;min-height:44px;padding:10px 12px;display:flex}.F1KBNa_headerActions{align-items:center;gap:2px;display:flex}.F1KBNa_states{flex:1;min-height:0;padding:4px 12px 12px;overflow-y:auto}.F1KBNa_split{flex:1;align-items:stretch;min-height:0;display:flex}.F1KBNa_fileList{box-sizing:border-box;border-right:1px solid var(--dsw-alias-border-l2);flex:none;width:240px;min-height:0;padding:4px 8px 12px;overflow-y:auto}.F1KBNa_resizeHandle{cursor:col-resize;background:0 0;flex:none;width:5px;margin:0 -2px}.F1KBNa_resizeHandle:hover{background:var(--dsw-alias-border-l2)}.F1KBNa_detail{flex-direction:column;flex:1;min-width:0;min-height:0;display:flex}.F1KBNa_detailEmpty{color:var(--dsw-alias-label-tertiary);text-align:center;flex:1;justify-content:center;align-items:center;margin:0;padding:24px;font-size:12px;line-height:18px;display:flex}.F1KBNa_title{color:var(--dsw-alias-label-primary);font-size:13px;font-weight:500;line-height:20px}.F1KBNa_note,.F1KBNa_readError,.F1KBNa_hint{color:var(--dsw-alias-label-tertiary);margin:4px 0;font-size:12px;line-height:18px}.F1KBNa_readError{color:var(--dsw-alias-state-error-primary)}.F1KBNa_group{color:var(--dsw-alias-label-tertiary);margin:8px 0 4px;font-size:12px;font-weight:500;line-height:16px}.F1KBNa_rows{margin:0;padding:0;list-style:none}.F1KBNa_row{border:1px solid #0000;border-radius:10px;margin:2px 0}.F1KBNa_rowHead{width:100%;color:var(--dsw-alias-label-primary);font:inherit;text-align:left;cursor:pointer;background:0 0;border:none;border-radius:10px;align-items:baseline;gap:8px;padding:6px 8px;display:flex}.F1KBNa_rowHead:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_rowHead[data-selected]{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_rowPath{text-overflow:ellipsis;white-space:nowrap;min-width:0;font:var(--dsw-font-markdown-code-block);overflow:hidden}.F1KBNa_kindTag{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-tertiary);white-space:nowrap;border-radius:6px;flex:none;padding:1px 6px;font-size:11px;line-height:14px}.F1KBNa_kindHint{color:var(--dsw-alias-label-tertiary);flex:none;font-size:12px;line-height:16px}.F1KBNa_divergedHint,.F1KBNa_missingHint{border-bottom:1px solid var(--dsw-alias-border-l2);margin:0;padding:6px 8px;font-size:12px;line-height:18px}.F1KBNa_missing{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-label,var(--dsw-alias-state-warn-primary));white-space:nowrap;border-radius:6px;flex:none;padding:1px 6px;font-size:11px;line-height:14px}.F1KBNa_missingHint{color:var(--dsw-alias-state-warn-label,var(--dsw-alias-state-warn-primary))}.F1KBNa_rowMeta{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;flex:none;gap:6px;margin-left:auto;font-size:12px;line-height:16px;display:inline-flex}.F1KBNa_addCount{color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 60%, var(--dsw-alias-label-primary))}.F1KBNa_delCount{color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 60%, var(--dsw-alias-label-primary))}.F1KBNa_diff{background:var(--dsw-alias-markdown-code-block);flex-direction:column;flex:1;min-height:0;display:flex;position:relative;overflow:hidden}.F1KBNa_diffHeader{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:6px 8px;display:flex}.F1KBNa_diffPath{text-overflow:ellipsis;white-space:nowrap;min-width:0;color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block);flex:1;font-size:12px;line-height:18px;overflow:hidden}.F1KBNa_diffActions{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:6px 8px;display:flex}.F1KBNa_diffStats{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:12px;line-height:16px}.F1KBNa_flexSpacer{flex:1}.F1KBNa_action{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border-radius:8px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_action:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_action:disabled{color:var(--dsw-alias-label-tertiary);cursor:default}.F1KBNa_iconAction{justify-content:center;align-items:center;padding:4px 6px;display:inline-flex}.F1KBNa_close{cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:0;display:inline-flex}.F1KBNa_close:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.F1KBNa_expand{cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:0;display:inline-flex}.F1KBNa_expand:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.F1KBNa_expandExpanded svg{transform:rotate(180deg)}.F1KBNa_diffBodyWrap{flex:1;min-height:0;display:flex;position:relative}.F1KBNa_diffBody{min-width:0;font:var(--dsw-font-markdown-code-block);flex:1;padding:8px 10px;overflow:auto}.F1KBNa_overviewRuler{pointer-events:none;opacity:.5;width:8px;position:absolute;top:0;bottom:0;right:0}.F1KBNa_overviewMarker{border-radius:2px;width:100%;min-height:2px;position:absolute;right:0}.F1KBNa_markerDel{background-color:var(--dsw-alias-state-error-primary)}.F1KBNa_markerAdd{background-color:var(--dsw-alias-state-success-primary)}.F1KBNa_lines{border-spacing:0;width:max-content;min-width:100%;display:table}.F1KBNa_line{height:22px;line-height:22px;display:table-row}.F1KBNa_vSpacer{display:table-row}.F1KBNa_gutter{box-sizing:border-box;text-align:right;width:44px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;user-select:none;padding-right:10px;display:table-cell}.F1KBNa_code{white-space:pre;display:table-cell}.F1KBNa_context{color:var(--dsw-alias-label-primary)}.F1KBNa_del{background-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 12%, transparent)}.F1KBNa_add{background-color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 10%, transparent)}.F1KBNa_statusBar{box-sizing:border-box;border-top:1px solid var(--dsw-alias-border-l2);height:34px;color:var(--dsw-alias-label-tertiary);font-family:var(--dsw-font-markdown-code-block);font-variant-numeric:tabular-nums;flex:none;align-items:center;padding:0 8px;font-size:12px;line-height:18px;display:flex}.F1KBNa_statusAction{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);white-space:nowrap;cursor:pointer;background:0 0;border-radius:8px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_statusAction:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_langSelect{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border-radius:8px;flex:none;align-items:center;gap:4px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px;display:inline-flex}.F1KBNa_langSelect:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_langLabel{text-overflow:ellipsis;white-space:nowrap;max-width:140px;overflow:hidden}";
+		const css = ".F1KBNa_layer{box-sizing:border-box;flex:none;align-items:center;width:calc(100% + 8px);height:42px;margin:4px -4px;display:flex;position:relative}.F1KBNa_footerButtons{align-items:center;width:100%;display:flex}.F1KBNa_badge{box-sizing:border-box;width:100%;height:42px;color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border:none;border-radius:12px;align-items:center;gap:8px;padding:0 10px 0 8px;font-family:inherit;font-size:14px;line-height:22px;display:flex;overflow:hidden}.F1KBNa_badge:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_badge[data-active]{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_badgeLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.F1KBNa_badgeCount{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;flex:none;margin-left:auto;font-size:12px;line-height:16px}.F1KBNa_layer.F1KBNa_rail{width:36px;height:36px;margin:8px 0 10px}.F1KBNa_rail .F1KBNa_badge{border-radius:50%;justify-content:center;gap:0;width:36px;height:36px;padding:0}.F1KBNa_rail .F1KBNa_badgeLabel{display:none}.F1KBNa_rail .F1KBNa_badgeCount{box-sizing:border-box;background:var(--dsw-alias-state-business-primary);min-width:18px;height:18px;color:var(--dsw-alias-label-primary-foreground);font-variant-numeric:tabular-nums;border-radius:9px;justify-content:center;align-items:center;padding:0 4px;font-size:11px;line-height:18px;display:flex;position:absolute;top:-3px;right:-7px}.F1KBNa_panel{z-index:30;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);width:auto;max-width:none;box-shadow:var(--dsw-shadow-lv2);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:12px;flex-direction:column;display:flex;position:fixed;inset:8px 8px 128px;overflow:hidden}.F1KBNa_header{box-sizing:border-box;border-bottom:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);flex:none;justify-content:space-between;align-items:center;min-height:44px;padding:10px 12px;display:flex}.F1KBNa_headerActions{align-items:center;gap:2px;display:flex}.F1KBNa_states{flex:1;min-height:0;padding:4px 12px 12px;overflow-y:auto}.F1KBNa_split{flex:1;align-items:stretch;min-height:0;display:flex}.F1KBNa_fileList{box-sizing:border-box;border-right:1px solid var(--dsw-alias-border-l2);flex:none;width:240px;min-height:0;padding:4px 8px 12px;overflow-y:auto}.F1KBNa_resizeHandle{cursor:col-resize;background:0 0;flex:none;width:5px;margin:0 -2px}.F1KBNa_resizeHandle:hover{background:var(--dsw-alias-border-l2)}.F1KBNa_detail{flex-direction:column;flex:1;min-width:0;min-height:0;display:flex}.F1KBNa_detailEmpty{color:var(--dsw-alias-label-tertiary);text-align:center;flex:1;justify-content:center;align-items:center;margin:0;padding:24px;font-size:12px;line-height:18px;display:flex}.F1KBNa_title{color:var(--dsw-alias-label-primary);font-size:13px;font-weight:500;line-height:20px}.F1KBNa_note,.F1KBNa_readError,.F1KBNa_hint{color:var(--dsw-alias-label-tertiary);margin:4px 0;font-size:12px;line-height:18px}.F1KBNa_readError{color:var(--dsw-alias-state-error-primary)}.F1KBNa_group{color:var(--dsw-alias-label-tertiary);margin:8px 0 4px;font-size:12px;font-weight:500;line-height:16px}.F1KBNa_rows{margin:0;padding:0;list-style:none}.F1KBNa_row{border:1px solid #0000;border-radius:10px;margin:2px 0}.F1KBNa_rowHead{width:100%;color:var(--dsw-alias-label-primary);font:inherit;text-align:left;cursor:pointer;background:0 0;border:none;border-radius:10px;align-items:baseline;gap:8px;padding:6px 8px;display:flex}.F1KBNa_rowHead:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_rowHead[data-selected]{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_rowPath{text-overflow:ellipsis;white-space:nowrap;min-width:0;font:var(--dsw-font-markdown-code-block);overflow:hidden}.F1KBNa_kindTag{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-tertiary);white-space:nowrap;border-radius:6px;flex:none;padding:1px 6px;font-size:11px;line-height:14px}.F1KBNa_kindHint{color:var(--dsw-alias-label-tertiary);flex:none;font-size:12px;line-height:16px}.F1KBNa_divergedHint,.F1KBNa_missingHint{border-bottom:1px solid var(--dsw-alias-border-l2);margin:0;padding:6px 8px;font-size:12px;line-height:18px}.F1KBNa_missing{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-label,var(--dsw-alias-state-warn-primary));white-space:nowrap;border-radius:6px;flex:none;padding:1px 6px;font-size:11px;line-height:14px}.F1KBNa_missingHint{color:var(--dsw-alias-state-warn-label,var(--dsw-alias-state-warn-primary))}.F1KBNa_rowMeta{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;flex:none;gap:6px;margin-left:auto;font-size:12px;line-height:16px;display:inline-flex}.F1KBNa_addCount{color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 60%, var(--dsw-alias-label-primary))}.F1KBNa_delCount{color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 60%, var(--dsw-alias-label-primary))}.F1KBNa_diff{background:var(--dsw-alias-markdown-code-block);flex-direction:column;flex:1;min-height:0;display:flex;position:relative;overflow:hidden}.F1KBNa_diffHeader{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:6px 8px;display:flex}.F1KBNa_diffPath{text-overflow:ellipsis;white-space:nowrap;min-width:0;color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block);flex:1;font-size:12px;line-height:18px;overflow:hidden}.F1KBNa_diffActions{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:6px 8px;display:flex}.F1KBNa_diffStats{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:12px;line-height:16px}.F1KBNa_flexSpacer{flex:1}.F1KBNa_action{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border-radius:8px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_action:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_action:disabled{color:var(--dsw-alias-label-tertiary);cursor:default}.F1KBNa_actionPrimary{background:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary);color:var(--dsw-static-neutral-bluish-50)}.F1KBNa_actionPrimary:hover:not(:disabled){background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 85%, var(--dsw-static-neutral-bluish-1000))}.F1KBNa_actionPrimary:disabled{background:var(--dsw-alias-state-business-primary);color:var(--dsw-static-neutral-bluish-50);opacity:.55}.F1KBNa_iconAction{justify-content:center;align-items:center;min-height:25px;padding:4px 6px;display:inline-flex}.F1KBNa_close{cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:0;display:inline-flex}.F1KBNa_close:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.F1KBNa_expand{cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:0;display:inline-flex}.F1KBNa_expand:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.F1KBNa_expandExpanded svg{transform:rotate(180deg)}.F1KBNa_diffBodyWrap{flex:1;min-height:0;display:flex;position:relative}.F1KBNa_diffBody{min-width:0;font:var(--dsw-font-markdown-code-block);cursor:text;flex:1;padding:0;position:relative;overflow:auto}.F1KBNa_diffBody::-webkit-scrollbar,.F1KBNa_diffBody::-webkit-scrollbar-track,.F1KBNa_diffBody::-webkit-scrollbar-thumb{cursor:default}.F1KBNa_blockActions{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-markdown-code-block);box-shadow:var(--dsw-shadow-lv1);z-index:2;border-radius:10px;align-items:center;gap:9px;padding:5px;display:flex;position:absolute;right:8px}.F1KBNa_blockPosition{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;white-space:nowrap;margin-top:1px;margin-left:7px;font-size:12px;line-height:16px}.F1KBNa_searchBar{z-index:3;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-markdown-code-block);box-shadow:var(--dsw-shadow-lv1);border-radius:10px;align-items:center;gap:4px;padding:4px;display:flex;position:absolute;top:8px;right:8px}.F1KBNa_searchInput{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);width:150px;color:var(--dsw-alias-label-primary);border-radius:6px;outline:none;padding:3px 8px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_searchInput:focus{border-color:var(--dsw-alias-state-business-primary)}.F1KBNa_searchCount{text-align:center;min-width:34px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;white-space:nowrap;font-size:12px;line-height:16px}.F1KBNa_diffBody [data-diff-search=hit]{background-image:linear-gradient(#facc1529,#facc1529)}.F1KBNa_diffBody [data-diff-search=current]{background-image:linear-gradient(#facc1552,#facc1552)}.F1KBNa_overviewRuler{pointer-events:none;opacity:.5;width:4px;position:absolute;top:0;bottom:0;right:0}.F1KBNa_overviewMarker{border-radius:2px;width:100%;min-height:2px;position:absolute;right:0}.F1KBNa_markerDel{background-color:var(--dsw-alias-state-error-primary)}.F1KBNa_markerAdd{background-color:var(--dsw-alias-state-success-primary)}.F1KBNa_lines{border-spacing:0;width:max-content;min-width:100%;display:table}.F1KBNa_line{height:22px;line-height:22px;display:table-row}.F1KBNa_vSpacer{display:table-row}.F1KBNa_gutter{box-sizing:border-box;text-align:right;width:44px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;user-select:none;cursor:default;padding-right:10px;display:table-cell}.F1KBNa_code{white-space:pre;display:table-cell}.F1KBNa_context{color:var(--dsw-alias-label-primary)}.F1KBNa_del{background-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 12%, transparent)}.F1KBNa_add{background-color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 10%, transparent)}.F1KBNa_statusBar{box-sizing:border-box;border-top:1px solid var(--dsw-alias-border-l2);height:34px;color:var(--dsw-alias-label-tertiary);font-family:var(--dsw-font-markdown-code-block);font-variant-numeric:tabular-nums;flex:none;align-items:center;padding:0 8px;font-size:12px;line-height:18px;display:flex}.F1KBNa_statusAction{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);white-space:nowrap;cursor:pointer;background:0 0;border-radius:8px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_statusAction:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_langSelect{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border-radius:8px;flex:none;align-items:center;gap:4px;padding:3px 12px;font-family:inherit;font-size:12px;line-height:18px;display:inline-flex}.F1KBNa_langSelect:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_langLabel{text-overflow:ellipsis;white-space:nowrap;max-width:140px;overflow:hidden}";
 		const tagId = "dsh-diff-approval/PendingPanel.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -11640,67 +11631,73 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"code": "F1KBNa_code",
-			"diffBodyWrap": "F1KBNa_diffBodyWrap",
-			"badge": "F1KBNa_badge",
-			"readError": "F1KBNa_readError",
-			"diff": "F1KBNa_diff",
+			"gutter": "F1KBNa_gutter",
+			"missingHint": "F1KBNa_missingHint",
+			"searchCount": "F1KBNa_searchCount",
+			"hint": "F1KBNa_hint",
+			"layer": "F1KBNa_layer",
+			"footerButtons": "F1KBNa_footerButtons",
+			"langSelect": "F1KBNa_langSelect",
+			"addCount": "F1KBNa_addCount",
+			"rowPath": "F1KBNa_rowPath",
+			"context": "F1KBNa_context",
+			"kindTag": "F1KBNa_kindTag",
+			"states": "F1KBNa_states",
+			"resizeHandle": "F1KBNa_resizeHandle",
+			"diffStats": "F1KBNa_diffStats",
+			"del": "F1KBNa_del",
+			"searchInput": "F1KBNa_searchInput",
+			"expand": "F1KBNa_expand",
+			"searchBar": "F1KBNa_searchBar",
 			"markerDel": "F1KBNa_markerDel",
-			"group": "F1KBNa_group",
+			"title": "F1KBNa_title",
+			"vSpacer": "F1KBNa_vSpacer",
+			"badgeCount": "F1KBNa_badgeCount",
+			"kindHint": "F1KBNa_kindHint",
+			"rail": "F1KBNa_rail",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"action": "F1KBNa_action",
+			"diffHeader": "F1KBNa_diffHeader",
+			"fileList": "F1KBNa_fileList",
+			"diffActions": "F1KBNa_diffActions",
+			"readError": "F1KBNa_readError",
+			"note": "F1KBNa_note",
+			"line": "F1KBNa_line",
 			"divergedHint": "F1KBNa_divergedHint",
-			"detailEmpty": "F1KBNa_detailEmpty",
+			"group": "F1KBNa_group",
+			"diff": "F1KBNa_diff",
+			"code": "F1KBNa_code",
+			"headerActions": "F1KBNa_headerActions",
+			"detail": "F1KBNa_detail",
+			"missing": "F1KBNa_missing",
+			"add": "F1KBNa_add",
+			"badgeLabel": "F1KBNa_badgeLabel",
 			"iconAction": "F1KBNa_iconAction",
+			"markerAdd": "F1KBNa_markerAdd",
+			"row": "F1KBNa_row",
 			"diffBody": "F1KBNa_diffBody",
-			"rowPath": "F1KBNa_rowPath",
-			"addCount": "F1KBNa_addCount",
-			"vSpacer": "F1KBNa_vSpacer",
-			"add": "F1KBNa_add",
-			"overviewMarker": "F1KBNa_overviewMarker",
+			"langLabel": "F1KBNa_langLabel",
+			"lines": "F1KBNa_lines",
 			"panel": "F1KBNa_panel",
-			"del": "F1KBNa_del",
-			"row": "F1KBNa_row",
-			"kindHint": "F1KBNa_kindHint",
-			"layer": "F1KBNa_layer",
+			"split": "F1KBNa_split",
+			"badge": "F1KBNa_badge",
+			"delCount": "F1KBNa_delCount",
+			"overviewRuler": "F1KBNa_overviewRuler",
 			"rowMeta": "F1KBNa_rowMeta",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"footerButtons": "F1KBNa_footerButtons",
-			"rowHead": "F1KBNa_rowHead",
+			"blockActions": "F1KBNa_blockActions",
+			"rows": "F1KBNa_rows",
+			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"detailEmpty": "F1KBNa_detailEmpty",
 			"close": "F1KBNa_close",
-			"title": "F1KBNa_title",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"lines": "F1KBNa_lines",
-			"missingHint": "F1KBNa_missingHint",
-			"diffPath": "F1KBNa_diffPath",
-			"detail": "F1KBNa_detail",
-			"states": "F1KBNa_states",
-			"headerActions": "F1KBNa_headerActions",
-			"fileList": "F1KBNa_fileList",
-			"langSelect": "F1KBNa_langSelect",
-			"expand": "F1KBNa_expand",
-			"langLabel": "F1KBNa_langLabel",
+			"statusBar": "F1KBNa_statusBar",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"rowHead": "F1KBNa_rowHead",
 			"statusAction": "F1KBNa_statusAction",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"diffActions": "F1KBNa_diffActions",
+			"diffPath": "F1KBNa_diffPath",
 			"flexSpacer": "F1KBNa_flexSpacer",
-			"kindTag": "F1KBNa_kindTag",
-			"gutter": "F1KBNa_gutter",
-			"markerAdd": "F1KBNa_markerAdd",
-			"rows": "F1KBNa_rows",
-			"delCount": "F1KBNa_delCount",
-			"context": "F1KBNa_context",
-			"action": "F1KBNa_action",
-			"statusBar": "F1KBNa_statusBar",
-			"badgeCount": "F1KBNa_badgeCount",
-			"diffHeader": "F1KBNa_diffHeader",
-			"diffStats": "F1KBNa_diffStats",
-			"split": "F1KBNa_split",
-			"line": "F1KBNa_line",
-			"expandExpanded": "F1KBNa_expandExpanded",
-			"rail": "F1KBNa_rail",
-			"note": "F1KBNa_note",
-			"missing": "F1KBNa_missing",
+			"blockPosition": "F1KBNa_blockPosition",
 			"header": "F1KBNa_header",
-			"hint": "F1KBNa_hint"
+			"overviewMarker": "F1KBNa_overviewMarker"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -11736,6 +11733,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		const ROW_HEIGHT_PX = 22;
 		/** Rows rendered beyond the visible window in each direction. */
 		const OVERSCAN_ROWS = 8;
+		/** Height of the floating per-block Keep/Revert frame in px: 26px actions +
+		* 5px frame padding on each side + 1px border on each side, plus a little
+		* breathing room so the bottom padding never sits flush against it. */
+		const BLOCK_ACTIONS_FRAME_PX = 40;
 		/** The trailing file-name segment of a path, used for row display. */
 		function basenameOf(path) {
 			const index = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
@@ -11752,7 +11753,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		* does not re-render rows whose content, highlight, and focus are unchanged.
 		*/
 		const DiffRow = (0, react.memo)(function DiffRow(props) {
-			const { index, row, runs, focused } = props;
+			const { index, row, runs, focused, searchHit, searchCurrent, onRowHover } = props;
 			const lineNumber = row.kind === "del" ? row.oldLine : row.newLine;
 			const sideRuns = row.kind === "del" ? runs?.oldRuns : runs?.newRuns;
 			const lineRuns = lineNumber === void 0 ? void 0 : sideRuns?.[lineNumber - 1];
@@ -11765,6 +11766,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				"data-diff-line": row.kind,
 				"data-diff-row": index,
 				"data-diff-focused": focused ? "" : void 0,
+				"data-diff-search": searchHit ? searchCurrent ? "current" : "hit" : void 0,
+				onMouseEnter: () => {
+					onRowHover(index);
+				},
 				children: [
 					(0, react_jsx_runtime.jsx)("span", {
 						className: PendingPanel_module_css_default.gutter,
@@ -11782,6 +11787,48 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				]
 			});
 		});
+		/**
+		* One diff block's old/new line ranges, 1-based inclusive, for block-level
+		* keep/revert. A side with no lines (a pure addition or deletion) is empty;
+		* its start is that side's insertion point — the line after the surrounding
+		* context — so the host can insert there.
+		* @param rows - the whole-file diff rows.
+		* @param block - the block's row range.
+		* @returns the old and new line ranges.
+		*/
+		function blockRangesOf(rows, block) {
+			let oldStart = Infinity;
+			let oldEnd = -Infinity;
+			let newStart = Infinity;
+			let newEnd = -Infinity;
+			for (let index = block.start; index <= block.end; index++) {
+				const row = rows[index];
+				if (row === void 0) continue;
+				if (row.oldLine !== void 0) {
+					oldStart = Math.min(oldStart, row.oldLine);
+					oldEnd = Math.max(oldEnd, row.oldLine);
+				}
+				if (row.newLine !== void 0) {
+					newStart = Math.min(newStart, row.newLine);
+					newEnd = Math.max(newEnd, row.newLine);
+				}
+			}
+			const before = rows[block.start - 1];
+			if (oldStart === Infinity) {
+				oldStart = (before?.oldLine ?? 0) + 1;
+				oldEnd = oldStart - 1;
+			}
+			if (newStart === Infinity) {
+				newStart = (before?.newLine ?? 0) + 1;
+				newEnd = newStart - 1;
+			}
+			return {
+				oldStart,
+				oldEnd,
+				newStart,
+				newEnd
+			};
+		}
 		/** Split a row list into maximal runs of non-context rows. */
 		function changeBlocksOf(diff) {
 			const blocks = [];
@@ -11866,48 +11913,48 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			const stats = (0, react.useMemo)(() => computeWholeFileDiff(file.oldText, file.newText), [file.oldText, file.newText]);
 			return (0, react_jsx_runtime.jsx)("li", {
 				className: PendingPanel_module_css_default.row,
-				children: (0, react_jsx_runtime.jsxs)("button", {
-					type: "button",
-					className: PendingPanel_module_css_default.rowHead,
-					"data-selected": selected || void 0,
-					onClick: () => {
-						onSelect(file.id);
-					},
-					children: [
-						(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
-							label: file.path,
-							delayMs: 500,
-							maxWidth: 560,
-							children: (0, react_jsx_runtime.jsx)("span", {
+				children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+					label: file.path,
+					delayMs: 500,
+					maxWidth: 560,
+					children: (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						className: PendingPanel_module_css_default.rowHead,
+						"data-selected": selected || void 0,
+						onClick: () => {
+							onSelect(file.id);
+						},
+						children: [
+							(0, react_jsx_runtime.jsx)("span", {
 								className: PendingPanel_module_css_default.rowPath,
 								children: basenameOf(file.path)
+							}),
+							file.kind === "create" && (0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.kindTag,
+								children: t("row.create")
+							}),
+							file.missing && (0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.missing,
+								title: t("panel.missingHint"),
+								children: t("panel.missing")
+							}),
+							(0, react_jsx_runtime.jsxs)("span", {
+								className: PendingPanel_module_css_default.rowMeta,
+								children: [(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.addCount,
+									children: t("row.added", { added: stats.added })
+								}), (0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.delCount,
+									children: t("row.removed", { removed: stats.removed })
+								})]
 							})
-						}),
-						file.kind === "create" && (0, react_jsx_runtime.jsx)("span", {
-							className: PendingPanel_module_css_default.kindTag,
-							children: t("row.create")
-						}),
-						file.missing && (0, react_jsx_runtime.jsx)("span", {
-							className: PendingPanel_module_css_default.missing,
-							title: t("panel.missingHint"),
-							children: t("panel.missing")
-						}),
-						(0, react_jsx_runtime.jsxs)("span", {
-							className: PendingPanel_module_css_default.rowMeta,
-							children: [(0, react_jsx_runtime.jsx)("span", {
-								className: PendingPanel_module_css_default.addCount,
-								children: t("row.added", { added: stats.added })
-							}), (0, react_jsx_runtime.jsx)("span", {
-								className: PendingPanel_module_css_default.delCount,
-								children: t("row.removed", { removed: stats.removed })
-							})]
-						})
-					]
+						]
+					})
 				})
 			});
 		}
 		/** The selected file's diff, actions, jump controls, and copy toolbar. */
-		function PendingDiff({ file, files, busy, t, onKeep, onRevert, onOpen }) {
+		function PendingDiff({ file, busy, workspacePath, jumpSignal, t, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen }) {
 			const [langOverride, setLangOverride] = (0, react.useState)(void 0);
 			const [langMenuOpen, setLangMenuOpen] = (0, react.useState)(false);
 			const langMenuItems = (0, react.useMemo)(() => [{
@@ -11985,23 +12032,88 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			const [scrollTick, setScrollTick] = (0, react.useState)(0);
 			const [scrollTop, setScrollTop] = (0, react.useState)(0);
 			const [viewportHeight, setViewportHeight] = (0, react.useState)(0);
+			const [hoveredBlock, setHoveredBlock] = (0, react.useState)(void 0);
 			const [selection, setSelection] = (0, react.useState)(void 0);
 			const [copied, setCopied] = (0, react.useState)(false);
+			const [searchOpen, setSearchOpen] = (0, react.useState)(false);
+			const [searchQuery, setSearchQuery] = (0, react.useState)("");
+			const [searchIndex, setSearchIndex] = (0, react.useState)(0);
+			const searchInputRef = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				setFocus(0);
 				setScrollTop(0);
 				if (bodyRef.current !== null) bodyRef.current.scrollTop = 0;
+				setHoveredBlock(void 0);
 				setSelection(void 0);
 				setLangOverride(void 0);
 				setLangMenuOpen(false);
 				setCopied(false);
+				setSearchOpen(false);
+				setSearchQuery("");
+				setSearchIndex(0);
 			}, [file.id]);
+			const blockRanges = (0, react.useMemo)(() => {
+				return model.blocks.map((block) => blockRangesOf(model.diff.rows, block));
+			}, [model]);
+			const searchMatches = (0, react.useMemo)(() => {
+				if (searchQuery === "") return [];
+				const lower = searchQuery.toLowerCase();
+				const matches = [];
+				for (let index = 0; index < model.diff.rows.length; index++) if (model.diff.rows[index].text.toLowerCase().includes(lower)) matches.push(index);
+				return matches;
+			}, [model, searchQuery]);
+			const searchHitSet = (0, react.useMemo)(() => new Set(searchMatches), [searchMatches]);
+			const currentSearchRow = searchMatches.length === 0 ? void 0 : searchMatches[searchIndex % searchMatches.length];
+			const goSearch = (direction) => {
+				if (searchMatches.length === 0) return;
+				setSearchIndex((current) => (current + direction + searchMatches.length) % searchMatches.length);
+			};
+			const toggleSearch = () => {
+				if (searchOpen) {
+					setSearchOpen(false);
+					setSearchQuery("");
+					setSearchIndex(0);
+				} else setSearchOpen(true);
+			};
+			const closeSearch = () => {
+				setSearchOpen(false);
+				setSearchQuery("");
+				setSearchIndex(0);
+			};
+			(0, react.useEffect)(() => {
+				if (searchOpen) searchInputRef.current?.focus();
+			}, [searchOpen]);
+			(0, react.useEffect)(() => {
+				setSearchIndex(0);
+			}, [searchQuery, file.id]);
+			(0, react.useEffect)(() => {
+				const row = currentSearchRow;
+				if (row === void 0) return;
+				const body = bodyRef.current;
+				if (body === null) return;
+				const target = row * ROW_HEIGHT_PX + ROW_HEIGHT_PX / 2 - body.clientHeight / 2;
+				const clamped = Math.max(0, Math.min(target, body.scrollHeight - body.clientHeight));
+				if (body.scrollTop !== clamped) body.scrollTop = clamped;
+				setScrollTop(clamped);
+			}, [currentSearchRow, searchMatches]);
+			const blockIndexByRow = (0, react.useMemo)(() => {
+				const map = /* @__PURE__ */ new Map();
+				model.blocks.forEach((block, blockIndex) => {
+					for (let index = block.start; index <= block.end; index++) map.set(index, blockIndex);
+				});
+				return map;
+			}, [model]);
+			const onRowHover = (0, react.useCallback)((index) => {
+				setHoveredBlock(blockIndexByRow.get(index));
+			}, [blockIndexByRow]);
 			const rows = model.diff.rows;
 			const rowCount = rows.length;
 			const viewport = viewportHeight > 0 ? viewportHeight : rowCount * ROW_HEIGHT_PX;
 			const start = Math.max(0, Math.floor(scrollTop / ROW_HEIGHT_PX) - OVERSCAN_ROWS);
 			const end = Math.min(rowCount, Math.ceil((scrollTop + viewport) / ROW_HEIGHT_PX) + OVERSCAN_ROWS);
 			const visibleRows = rows.slice(start, end);
+			const hoveredBlockEnd = hoveredBlock !== void 0 ? model.blocks[hoveredBlock]?.end : void 0;
+			const blockActionsPadPx = hoveredBlockEnd === void 0 ? 0 : Math.max(0, (hoveredBlockEnd + 1) * ROW_HEIGHT_PX + BLOCK_ACTIONS_FRAME_PX - rowCount * ROW_HEIGHT_PX);
 			const widestLine = (0, react.useMemo)(() => {
 				let widest = 0;
 				for (const row of model.diff.rows) if (row.text.length > widest) widest = row.text.length;
@@ -12050,6 +12162,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				});
 				setScrollTick((tick) => tick + 1);
 			};
+			(0, react.useEffect)(() => {
+				if (jumpSignal === 0) return;
+				jump(1);
+			}, [jumpSignal]);
 			const onScroll = () => {
 				const body = bodyRef.current;
 				if (body === null) return;
@@ -12066,9 +12182,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			}, [file.id]);
 			const selectionReference = (() => {
 				if (selection === void 0) return void 0;
-				const lineNumbers = model.diff.rows.slice(selection.start, selection.end + 1).map((row) => row.newLine ?? row.oldLine).filter((number) => number !== void 0);
+				const lineNumbers = model.diff.rows.slice(selection.start, selection.end + 1).map((row) => row.newLine).filter((number) => number !== void 0);
 				if (lineNumbers.length === 0) return void 0;
-				return referenceOf(file.path, files, Math.min(...lineNumbers), Math.max(...lineNumbers));
+				return referenceOf(file.path, workspacePath, Math.min(...lineNumbers), Math.max(...lineNumbers));
 			})();
 			const copySelection = (0, react.useCallback)(async () => {
 				if (selectionReference === void 0) return;
@@ -12091,6 +12207,20 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					document.removeEventListener("keydown", onKeyDown);
 				};
 			}, [copySelection]);
+			(0, react.useEffect)(() => {
+				const onKeyDown = (event) => {
+					if (!(event.ctrlKey || event.metaKey) || event.altKey || event.shiftKey) return;
+					if (event.key.toLowerCase() !== "f") return;
+					event.preventDefault();
+					setSearchOpen(true);
+					searchInputRef.current?.focus();
+					searchInputRef.current?.select();
+				};
+				window.addEventListener("keydown", onKeyDown, true);
+				return () => {
+					window.removeEventListener("keydown", onKeyDown, true);
+				};
+			}, []);
 			const focusedBlock = model.blocks.length > 0 ? model.blocks[focus] : void 0;
 			const inFocusedBlock = (index) => focusedBlock !== void 0 && index >= focusedBlock.start && index <= focusedBlock.end;
 			return (0, react_jsx_runtime.jsxs)("div", {
@@ -12104,27 +12234,35 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 								className: PendingPanel_module_css_default.diffPath,
 								children: file.path
 							}),
-							(0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
-								"data-diff-open": true,
-								"aria-label": t("action.openFile"),
-								title: t("action.openFile"),
-								onClick: () => {
-									onOpen(file.sessionId, file.id, "open");
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutline16, { size: 14 })
+							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.openFile"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+									"data-diff-open": true,
+									"aria-label": t("action.openFile"),
+									onClick: () => {
+										onOpen(file.sessionId, file.id, "open");
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutline16, { size: 14 })
+								})
 							}),
-							(0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
-								"data-diff-reveal": true,
-								"aria-label": t("action.revealFile"),
-								title: t("action.revealFile"),
-								onClick: () => {
-									onOpen(file.sessionId, file.id, "reveal");
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, { size: 14 })
+							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.revealFile"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+									"data-diff-reveal": true,
+									"aria-label": t("action.revealFile"),
+									onClick: () => {
+										onOpen(file.sessionId, file.id, "reveal");
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, { size: 14 })
+								})
 							})
 						]
 					}),
@@ -12142,33 +12280,54 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 								className: PendingPanel_module_css_default.kindHint,
 								children: t("panel.createHint")
 							}),
-							model.blocks.length > 0 && (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
-								"data-diff-prev": true,
-								"aria-label": t("action.prevDiff"),
-								title: t("action.prevDiff"),
-								disabled: busy,
-								onClick: () => {
-									jump(-1);
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronUpOutline14, { size: 14 })
-							}), (0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
-								"data-diff-next": true,
-								"aria-label": t("action.nextDiff"),
-								title: t("action.nextDiff"),
-								disabled: busy,
-								onClick: () => {
-									jump(1);
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 14 })
+							model.blocks.length > 0 && (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.prevDiff"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+									"data-diff-prev": true,
+									"aria-label": t("action.prevDiff"),
+									disabled: busy,
+									onClick: () => {
+										jump(-1);
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronUpOutline14, { size: 14 })
+								})
+							}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.nextDiff"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+									"data-diff-next": true,
+									"aria-label": t("action.nextDiff"),
+									disabled: busy,
+									onClick: () => {
+										jump(1);
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 14 })
+								})
 							})] }),
+							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.search"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+									"data-diff-search-toggle": true,
+									"aria-label": t("action.search"),
+									onClick: toggleSearch,
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, { size: 14 })
+								})
+							}),
 							(0, react_jsx_runtime.jsx)("span", { className: PendingPanel_module_css_default.flexSpacer }),
 							(0, react_jsx_runtime.jsx)("button", {
 								type: "button",
-								className: PendingPanel_module_css_default.action,
+								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionPrimary}`,
 								"data-diff-keep": true,
 								disabled: busy,
 								onClick: () => {
@@ -12194,49 +12353,154 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					}),
 					(0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.diffBodyWrap,
-						children: [(0, react_jsx_runtime.jsx)("div", {
-							className: PendingPanel_module_css_default.diffBody,
-							ref: bodyRef,
-							onScroll,
-							"data-diff-body": true,
-							children: (0, react_jsx_runtime.jsxs)("div", {
-								className: PendingPanel_module_css_default.lines,
-								style: { minWidth: `max(100%, ${widestLine}ch)` },
+						children: [
+							(0, react_jsx_runtime.jsxs)("div", {
+								className: PendingPanel_module_css_default.diffBody,
+								ref: bodyRef,
+								onScroll,
+								onMouseLeave: () => {
+									setHoveredBlock(void 0);
+								},
+								"data-diff-body": true,
+								children: [(0, react_jsx_runtime.jsxs)("div", {
+									className: PendingPanel_module_css_default.lines,
+									style: { minWidth: `max(100%, ${widestLine}ch)` },
+									children: [
+										start > 0 && (0, react_jsx_runtime.jsx)("div", {
+											className: PendingPanel_module_css_default.vSpacer,
+											style: { height: start * ROW_HEIGHT_PX },
+											"aria-hidden": "true"
+										}),
+										visibleRows.map((row, offset) => {
+											const index = start + offset;
+											return (0, react_jsx_runtime.jsx)(DiffRow, {
+												index,
+												row,
+												runs,
+												focused: inFocusedBlock(index),
+												searchHit: searchHitSet.has(index),
+												searchCurrent: index === currentSearchRow,
+												onRowHover
+											}, index);
+										}),
+										end < rowCount && (0, react_jsx_runtime.jsx)("div", {
+											className: PendingPanel_module_css_default.vSpacer,
+											style: { height: (rowCount - end) * ROW_HEIGHT_PX },
+											"aria-hidden": "true"
+										}),
+										blockActionsPadPx > 0 && (0, react_jsx_runtime.jsx)("div", {
+											className: PendingPanel_module_css_default.vSpacer,
+											style: { height: blockActionsPadPx },
+											"aria-hidden": "true"
+										})
+									]
+								}), hoveredBlock !== void 0 && model.blocks[hoveredBlock] !== void 0 && (0, react_jsx_runtime.jsxs)("div", {
+									className: PendingPanel_module_css_default.blockActions,
+									"data-diff-block-actions": true,
+									style: { top: (model.blocks[hoveredBlock].end + 1) * ROW_HEIGHT_PX },
+									children: [
+										(0, react_jsx_runtime.jsx)("span", {
+											className: PendingPanel_module_css_default.blockPosition,
+											"data-diff-block-position": true,
+											children: t("panel.blockPosition", {
+												current: hoveredBlock + 1,
+												total: model.blocks.length
+											})
+										}),
+										(0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionPrimary}`,
+											"data-diff-block-keep": true,
+											disabled: busy,
+											onClick: () => {
+												onBlockKeep(file.sessionId, file.id, blockRanges[hoveredBlock]);
+											},
+											children: t("action.keep")
+										}),
+										(0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: PendingPanel_module_css_default.action,
+											"data-diff-block-revert": true,
+											disabled: busy,
+											onClick: () => {
+												onBlockRevert(file.sessionId, file.id, blockRanges[hoveredBlock]);
+											},
+											children: t("action.revert")
+										})
+									]
+								})]
+							}),
+							searchOpen && (0, react_jsx_runtime.jsxs)("div", {
+								className: PendingPanel_module_css_default.searchBar,
+								"data-diff-searchbar": true,
 								children: [
-									start > 0 && (0, react_jsx_runtime.jsx)("div", {
-										className: PendingPanel_module_css_default.vSpacer,
-										style: { height: start * ROW_HEIGHT_PX },
-										"aria-hidden": "true"
+									(0, react_jsx_runtime.jsx)("input", {
+										ref: searchInputRef,
+										className: PendingPanel_module_css_default.searchInput,
+										"data-diff-search-input": true,
+										value: searchQuery,
+										placeholder: t("panel.searchPlaceholder"),
+										onChange: (event) => {
+											setSearchQuery(event.target.value);
+										},
+										onKeyDown: (event) => {
+											if (event.key === "Enter") {
+												event.preventDefault();
+												goSearch(event.shiftKey ? -1 : 1);
+											} else if (event.key === "Escape") closeSearch();
+										}
 									}),
-									visibleRows.map((row, offset) => {
-										const index = start + offset;
-										return (0, react_jsx_runtime.jsx)(DiffRow, {
-											index,
-											row,
-											runs,
-											focused: inFocusedBlock(index)
-										}, index);
+									(0, react_jsx_runtime.jsx)("span", {
+										className: PendingPanel_module_css_default.searchCount,
+										"data-diff-search-count": true,
+										children: searchMatches.length === 0 ? "0/0" : `${searchIndex % searchMatches.length + 1}/${searchMatches.length}`
 									}),
-									end < rowCount && (0, react_jsx_runtime.jsx)("div", {
-										className: PendingPanel_module_css_default.vSpacer,
-										style: { height: (rowCount - end) * ROW_HEIGHT_PX },
-										"aria-hidden": "true"
+									(0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+										"data-diff-search-prev": true,
+										"aria-label": t("action.prevDiff"),
+										disabled: searchMatches.length === 0,
+										onClick: () => {
+											goSearch(-1);
+										},
+										children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronUpOutline14, { size: 14 })
+									}),
+									(0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+										"data-diff-search-next": true,
+										"aria-label": t("action.nextDiff"),
+										disabled: searchMatches.length === 0,
+										onClick: () => {
+											goSearch(1);
+										},
+										children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 14 })
+									}),
+									(0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.iconAction}`,
+										"data-diff-search-close": true,
+										"aria-label": t("action.close"),
+										onClick: closeSearch,
+										children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 14 })
 									})
 								]
+							}),
+							rulerMarkers.length > 0 && (0, react_jsx_runtime.jsx)("div", {
+								className: PendingPanel_module_css_default.overviewRuler,
+								"data-diff-approval-ruler": true,
+								"aria-hidden": "true",
+								children: rulerMarkers.map((marker, index) => (0, react_jsx_runtime.jsx)("div", {
+									className: `${PendingPanel_module_css_default.overviewMarker} ${marker.kind === "del" ? PendingPanel_module_css_default.markerDel : PendingPanel_module_css_default.markerAdd}`,
+									"data-diff-ruler-marker": marker.kind,
+									style: {
+										top: `${marker.top}%`,
+										height: `${marker.height}%`
+									}
+								}, index))
 							})
-						}), rulerMarkers.length > 0 && (0, react_jsx_runtime.jsx)("div", {
-							className: PendingPanel_module_css_default.overviewRuler,
-							"data-diff-approval-ruler": true,
-							"aria-hidden": "true",
-							children: rulerMarkers.map((marker, index) => (0, react_jsx_runtime.jsx)("div", {
-								className: `${PendingPanel_module_css_default.overviewMarker} ${marker.kind === "del" ? PendingPanel_module_css_default.markerDel : PendingPanel_module_css_default.markerAdd}`,
-								"data-diff-ruler-marker": marker.kind,
-								style: {
-									top: `${marker.top}%`,
-									height: `${marker.height}%`
-								}
-							}, index))
-						})]
+						]
 					}),
 					(0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.statusBar,
@@ -12274,19 +12538,23 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 								onClose: () => {
 									setLangMenuOpen(false);
 								},
-								anchor: (0, react_jsx_runtime.jsxs)("button", {
-									type: "button",
-									className: PendingPanel_module_css_default.langSelect,
-									"data-diff-lang": true,
-									"aria-label": t("action.langSelect"),
-									title: t("action.langSelect"),
-									onClick: () => {
-										setLangMenuOpen((value) => !value);
-									},
-									children: [(0, react_jsx_runtime.jsx)("span", {
-										className: PendingPanel_module_css_default.langLabel,
-										children: langLabel
-									}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 12 })]
+								anchor: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+									label: t("action.langSelect"),
+									side: "top",
+									delayMs: 500,
+									children: (0, react_jsx_runtime.jsxs)("button", {
+										type: "button",
+										className: PendingPanel_module_css_default.langSelect,
+										"data-diff-lang": true,
+										"aria-label": t("action.langSelect"),
+										onClick: () => {
+											setLangMenuOpen((value) => !value);
+										},
+										children: [(0, react_jsx_runtime.jsx)("span", {
+											className: PendingPanel_module_css_default.langLabel,
+											children: langLabel
+										}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 12 })]
+									})
 								})
 							})
 						]
@@ -12295,11 +12563,14 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			});
 		}
 		/** Render the pending-edit review panel and its unified footer action. */
-		function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onOpen, t }) {
+		function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, t }) {
 			const current = useSessions((state) => state.current);
 			const snapshot = usePending((snapshot) => snapshot);
 			const [open, setOpen] = (0, react.useState)(false);
 			const [selected, setSelected] = (0, react.useState)("");
+			/** Bumped when the already-open file is clicked again, to jump to the next
+			* diff block in the open file's detail pane. */
+			const [jumpSignal, setJumpSignal] = (0, react.useState)(0);
 			/** Pending count captured at open time; auto-close needs a list that emptied. */
 			const [openedCount, setOpenedCount] = (0, react.useState)(0);
 			/** Bottom offset tracking the chat composer's top edge so the input stays visible. */
@@ -12361,13 +12632,11 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					document.removeEventListener("pointerdown", onPointerDown, true);
 				};
 			}, [open]);
-			const files = snapshot.files;
-			const mine = files.filter((file) => file.sessionId === current);
-			const theirs = files.filter((file) => file.sessionId !== current);
+			const files = snapshot.files.filter((file) => file.sessionId === current);
 			(0, react.useEffect)(() => {
 				if (!open) return;
 				if (selected !== "" && files.some((file) => file.id === selected)) return;
-				const next = [...mine, ...theirs][0];
+				const next = files[0];
 				if (next !== void 0 && next.id !== selected) setSelected(next.id);
 			}, [
 				open,
@@ -12395,7 +12664,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				file: entry,
 				selected: selected === entry.id,
 				t,
-				onSelect: setSelected
+				onSelect: (id) => {
+					if (id === selected) setJumpSignal((signal) => signal + 1);
+					else setSelected(id);
+				}
 			}, entry.id);
 			const selectedFile = files.find((file) => file.id === selected);
 			/** Drag the list/detail divider; width follows the pointer within its bounds. */
@@ -12438,26 +12710,34 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							children: t("panel.title")
 						}), (0, react_jsx_runtime.jsxs)("div", {
 							className: PendingPanel_module_css_default.headerActions,
-							children: [(0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: expanded ? `${PendingPanel_module_css_default.expand} ${PendingPanel_module_css_default.expandExpanded}` : PendingPanel_module_css_default.expand,
-								"data-diff-approval-expand": true,
-								"aria-label": t(expanded ? "action.exitFullscreen" : "action.expand"),
-								title: t(expanded ? "action.exitFullscreen" : "action.expand"),
-								onClick: () => {
-									setExpanded((value) => !value);
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFullscreenOutline16, { size: 14 })
-							}), (0, react_jsx_runtime.jsx)("button", {
-								type: "button",
-								className: PendingPanel_module_css_default.close,
-								"data-diff-approval-close": true,
-								"aria-label": t("action.close"),
-								title: t("action.close"),
-								onClick: () => {
-									setOpen(false);
-								},
-								children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 14 })
+							children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t(expanded ? "action.exitFullscreen" : "action.expand"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: expanded ? `${PendingPanel_module_css_default.expand} ${PendingPanel_module_css_default.expandExpanded}` : PendingPanel_module_css_default.expand,
+									"data-diff-approval-expand": true,
+									"aria-label": t(expanded ? "action.exitFullscreen" : "action.expand"),
+									onClick: () => {
+										setExpanded((value) => !value);
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFullscreenOutline16, { size: 14 })
+								})
+							}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+								label: t("action.close"),
+								side: "bottom",
+								delayMs: 500,
+								children: (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: PendingPanel_module_css_default.close,
+									"data-diff-approval-close": true,
+									"aria-label": t("action.close"),
+									onClick: () => {
+										setOpen(false);
+									},
+									children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 14 })
+								})
 							})]
 						})]
 					}), snapshot.error !== void 0 || !snapshot.read || files.length === 0 ? (0, react_jsx_runtime.jsxs)("div", {
@@ -12480,23 +12760,17 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					}) : (0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.split,
 						children: [
-							(0, react_jsx_runtime.jsxs)("nav", {
+							(0, react_jsx_runtime.jsx)("nav", {
 								className: PendingPanel_module_css_default.fileList,
 								style: { width: listWidth },
 								"data-diff-approval-file-list": true,
-								children: [mine.length > 0 && (0, react_jsx_runtime.jsxs)("section", { children: [(0, react_jsx_runtime.jsx)("h3", {
+								children: files.length > 0 && (0, react_jsx_runtime.jsxs)("section", { children: [(0, react_jsx_runtime.jsx)("h3", {
 									className: PendingPanel_module_css_default.group,
 									children: t("panel.group.current")
 								}), (0, react_jsx_runtime.jsx)("ul", {
 									className: PendingPanel_module_css_default.rows,
-									children: mine.map(renderEntry)
-								})] }), theirs.length > 0 && (0, react_jsx_runtime.jsxs)("section", { children: [(0, react_jsx_runtime.jsx)("h3", {
-									className: PendingPanel_module_css_default.group,
-									children: t("panel.group.others")
-								}), (0, react_jsx_runtime.jsx)("ul", {
-									className: PendingPanel_module_css_default.rows,
-									children: theirs.map(renderEntry)
-								})] })]
+									children: files.map(renderEntry)
+								})] })
 							}),
 							(0, react_jsx_runtime.jsx)("div", {
 								className: PendingPanel_module_css_default.resizeHandle,
@@ -12510,11 +12784,14 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 									children: t("panel.selectHint")
 								}) : (0, react_jsx_runtime.jsx)(PendingDiff, {
 									file: selectedFile,
-									files,
 									busy: snapshot.busy.has(selectedFile.id),
+									workspacePath: snapshot.workspacePath,
+									jumpSignal,
 									t,
 									onKeep,
 									onRevert,
+									onBlockKeep,
+									onBlockRevert,
 									onOpen
 								})
 							})
@@ -12562,7 +12839,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		function createDiffApprovalPort(rpc) {
 			return {
 				async list(sessionId) {
-					return filesOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "list", { sessionId }));
+					return listValueOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "list", { sessionId }));
 				},
 				async keep(sessionId, id) {
 					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "keep", {
@@ -12576,6 +12853,20 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						id
 					}));
 				},
+				async blockKeep(sessionId, id, block) {
+					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "block-keep", {
+						sessionId,
+						id,
+						block
+					}));
+				},
+				async blockRevert(sessionId, id, block) {
+					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "block-revert", {
+						sessionId,
+						id,
+						block
+					}));
+				},
 				async open(sessionId, id, action) {
 					return openOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "open", {
 						sessionId,
@@ -12608,18 +12899,23 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			};
 		}
 		/** Narrow the list endpoint's value; a malformed wire value is a read failure. */
-		function filesOf(result) {
+		function listValueOf(result) {
 			if (!result.ok) throw new Error(`${result.error.code}: ${result.error.message}`);
 			const value = result.value;
 			if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("list returned a malformed value");
 			const rows = value.files;
 			if (!Array.isArray(rows)) throw new Error("list returned a malformed value");
+			const workspace = value.workspacePath;
+			const workspacePath = typeof workspace === "string" && workspace.length > 0 ? workspace : void 0;
 			const files = [];
 			for (const row of rows) {
 				const file = pendingFileOf(row);
 				if (file !== void 0) files.push(file);
 			}
-			return files;
+			return {
+				files,
+				workspacePath
+			};
 		}
 		/** Narrow one action endpoint's value; a malformed wire value is an action failure. */
 		function actionOf(result) {
@@ -12706,16 +13002,18 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						return;
 					}
 					try {
-						const files = await port.list(sessionId);
+						const { files, workspacePath } = await port.list(sessionId);
 						publish({
 							read: true,
 							files,
+							workspacePath,
 							busy: EMPTY_BUSY
 						});
 					} catch (error) {
 						publish({
 							read: true,
 							files: snapshot.files,
+							workspacePath: snapshot.workspacePath,
 							error: error instanceof Error ? error.message : String(error),
 							busy: snapshot.busy
 						});
@@ -12731,6 +13029,42 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						await port.revert(sessionId, id);
 					});
 				},
+				async blockKeep(sessionId, id, block) {
+					const { error: _cleared, ...base } = snapshot;
+					publish({
+						...base,
+						busy: /* @__PURE__ */ new Set([...snapshot.busy, id])
+					});
+					try {
+						await port.blockKeep(sessionId, id, block);
+					} catch (error) {
+						publish({
+							...snapshot,
+							error: error instanceof Error ? error.message : String(error),
+							busy: new Set([...snapshot.busy].filter((busy) => busy !== id))
+						});
+						return;
+					}
+					await this.refresh(sessionId);
+				},
+				async blockRevert(sessionId, id, block) {
+					const { error: _cleared, ...base } = snapshot;
+					publish({
+						...base,
+						busy: /* @__PURE__ */ new Set([...snapshot.busy, id])
+					});
+					try {
+						await port.blockRevert(sessionId, id, block);
+					} catch (error) {
+						publish({
+							...snapshot,
+							error: error instanceof Error ? error.message : String(error),
+							busy: new Set([...snapshot.busy].filter((busy) => busy !== id))
+						});
+						return;
+					}
+					await this.refresh(sessionId);
+				},
 				async open(sessionId, id, action) {
 					try {
 						await port.open(sessionId, id, action);
@@ -12764,7 +13098,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"panel.group.others": "其他会话",
 			"panel.aria": "待处理改动",
 			"panel.stats": "+{added} -{removed}",
+			"panel.blockPosition": "第 {current}/{total} 块",
 			"panel.selectHint": "点击每项查看整个文件的差异；选中文本后，用底部状态栏或 Ctrl+L 复制引用",
+			"panel.searchPlaceholder": "搜索",
 			"panel.missing": "文件已不存在",
 			"panel.missingHint": "该文件已不存在，回退会恢复该文件。",
 			"panel.createHint": "回退会删除该新建的文件。",
@@ -12783,6 +13119,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"action.langAuto": "自动",
 			"action.langAutoDetected": "自动：{lang}",
 			"action.langSelect": "高亮语言",
+			"action.search": "搜索 (Ctrl+F)",
 			"action.expand": "展开全屏",
 			"action.exitFullscreen": "退出全屏",
 			"action.close": "关闭",
@@ -12800,7 +13137,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"panel.group.others": "Other sessions",
 			"panel.aria": "Pending changes",
 			"panel.stats": "+{added} -{removed}",
+			"panel.blockPosition": "{current}/{total}",
 			"panel.selectHint": "Select an item to review its whole-file diff; select text and copy its reference from the status bar (Ctrl+L)",
+			"panel.searchPlaceholder": "Search",
 			"panel.missing": "File is gone",
 			"panel.missingHint": "This file no longer exists; reverting restores it.",
 			"panel.createHint": "Reverting removes this created file.",
@@ -12819,6 +13158,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"action.langAuto": "Auto",
 			"action.langAutoDetected": "Auto: {lang}",
 			"action.langSelect": "Highlight language",
+			"action.search": "Search (Ctrl+F)",
 			"action.expand": "Expand fullscreen",
 			"action.exitFullscreen": "Exit fullscreen",
 			"action.close": "Close",
@@ -12860,6 +13200,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					},
 					onKeep: (sessionId, path) => store.keep(sessionId, path),
 					onRevert: (sessionId, path) => store.revert(sessionId, path),
+					onBlockKeep: (sessionId, id, block) => store.blockKeep(sessionId, id, block),
+					onBlockRevert: (sessionId, id, block) => store.blockRevert(sessionId, id, block),
 					onOpen: (sessionId, id, action) => store.open(sessionId, id, action)
 				})
 			}, PendingPanel));