dsh-diff-approval 0.5.0 → 0.6.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:4px;padding:4px;display:flex;position:absolute;right:6px}.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,69 @@ 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",
-			"markerDel": "F1KBNa_markerDel",
-			"group": "F1KBNa_group",
-			"divergedHint": "F1KBNa_divergedHint",
-			"detailEmpty": "F1KBNa_detailEmpty",
-			"iconAction": "F1KBNa_iconAction",
+			"diffHeader": "F1KBNa_diffHeader",
+			"missing": "F1KBNa_missing",
+			"resizeHandle": "F1KBNa_resizeHandle",
 			"diffBody": "F1KBNa_diffBody",
 			"rowPath": "F1KBNa_rowPath",
-			"addCount": "F1KBNa_addCount",
-			"vSpacer": "F1KBNa_vSpacer",
-			"add": "F1KBNa_add",
-			"overviewMarker": "F1KBNa_overviewMarker",
-			"panel": "F1KBNa_panel",
-			"del": "F1KBNa_del",
-			"row": "F1KBNa_row",
-			"kindHint": "F1KBNa_kindHint",
-			"layer": "F1KBNa_layer",
-			"rowMeta": "F1KBNa_rowMeta",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"footerButtons": "F1KBNa_footerButtons",
-			"rowHead": "F1KBNa_rowHead",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"line": "F1KBNa_line",
+			"headerActions": "F1KBNa_headerActions",
+			"states": "F1KBNa_states",
+			"detailEmpty": "F1KBNa_detailEmpty",
+			"markerDel": "F1KBNa_markerDel",
 			"close": "F1KBNa_close",
+			"markerAdd": "F1KBNa_markerAdd",
+			"statusBar": "F1KBNa_statusBar",
+			"diffStats": "F1KBNa_diffStats",
+			"footerButtons": "F1KBNa_footerButtons",
 			"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",
+			"row": "F1KBNa_row",
+			"delCount": "F1KBNa_delCount",
 			"expand": "F1KBNa_expand",
-			"langLabel": "F1KBNa_langLabel",
-			"statusAction": "F1KBNa_statusAction",
-			"badgeLabel": "F1KBNa_badgeLabel",
+			"layer": "F1KBNa_layer",
 			"diffActions": "F1KBNa_diffActions",
-			"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",
+			"langSelect": "F1KBNa_langSelect",
+			"kindTag": "F1KBNa_kindTag",
+			"langLabel": "F1KBNa_langLabel",
+			"flexSpacer": "F1KBNa_flexSpacer",
+			"add": "F1KBNa_add",
+			"badgeLabel": "F1KBNa_badgeLabel",
+			"diffPath": "F1KBNa_diffPath",
 			"badgeCount": "F1KBNa_badgeCount",
-			"diffHeader": "F1KBNa_diffHeader",
-			"diffStats": "F1KBNa_diffStats",
-			"split": "F1KBNa_split",
-			"line": "F1KBNa_line",
-			"expandExpanded": "F1KBNa_expandExpanded",
+			"rows": "F1KBNa_rows",
 			"rail": "F1KBNa_rail",
-			"note": "F1KBNa_note",
-			"missing": "F1KBNa_missing",
+			"lines": "F1KBNa_lines",
+			"hint": "F1KBNa_hint",
+			"code": "F1KBNa_code",
+			"detail": "F1KBNa_detail",
+			"readError": "F1KBNa_readError",
+			"action": "F1KBNa_action",
 			"header": "F1KBNa_header",
-			"hint": "F1KBNa_hint"
+			"statusAction": "F1KBNa_statusAction",
+			"panel": "F1KBNa_panel",
+			"overviewMarker": "F1KBNa_overviewMarker",
+			"blockActions": "F1KBNa_blockActions",
+			"iconAction": "F1KBNa_iconAction",
+			"rowHead": "F1KBNa_rowHead",
+			"vSpacer": "F1KBNa_vSpacer",
+			"missingHint": "F1KBNa_missingHint",
+			"note": "F1KBNa_note",
+			"gutter": "F1KBNa_gutter",
+			"split": "F1KBNa_split",
+			"divergedHint": "F1KBNa_divergedHint",
+			"overviewRuler": "F1KBNa_overviewRuler",
+			"rowMeta": "F1KBNa_rowMeta",
+			"addCount": "F1KBNa_addCount",
+			"diff": "F1KBNa_diff",
+			"fileList": "F1KBNa_fileList",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"kindHint": "F1KBNa_kindHint",
+			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"del": "F1KBNa_del",
+			"badge": "F1KBNa_badge",
+			"group": "F1KBNa_group"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -11752,7 +11745,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, 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 +11758,9 @@ 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,
+				onMouseEnter: () => {
+					onRowHover(index);
+				},
 				children: [
 					(0, react_jsx_runtime.jsx)("span", {
 						className: PendingPanel_module_css_default.gutter,
@@ -11782,6 +11778,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 +11904,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, 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,17 +12023,32 @@ 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);
 			(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);
 			}, [file.id]);
+			const blockRanges = (0, react.useMemo)(() => {
+				return model.blocks.map((block) => blockRangesOf(model.diff.rows, block));
+			}, [model]);
+			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;
@@ -12066,9 +12119,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;
@@ -12104,27 +12157,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 +12203,41 @@ 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)("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,12 +12263,15 @@ 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", {
+						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", {
+							children: [(0, react_jsx_runtime.jsxs)("div", {
 								className: PendingPanel_module_css_default.lines,
 								style: { minWidth: `max(100%, ${widestLine}ch)` },
 								children: [
@@ -12214,7 +12286,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 											index,
 											row,
 											runs,
-											focused: inFocusedBlock(index)
+											focused: inFocusedBlock(index),
+											onRowHover
 										}, index);
 									}),
 									end < rowCount && (0, react_jsx_runtime.jsx)("div", {
@@ -12223,7 +12296,30 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 										"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].start * ROW_HEIGHT_PX },
+								children: [(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")
+								})]
+							})]
 						}), rulerMarkers.length > 0 && (0, react_jsx_runtime.jsx)("div", {
 							className: PendingPanel_module_css_default.overviewRuler,
 							"data-diff-approval-ruler": true,
@@ -12274,19 +12370,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,7 +12395,7 @@ 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);
@@ -12438,26 +12538,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", {
@@ -12510,11 +12618,13 @@ 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,
 									t,
 									onKeep,
 									onRevert,
+									onBlockKeep,
+									onBlockRevert,
 									onOpen
 								})
 							})
@@ -12562,7 +12672,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 +12686,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 +12732,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 +12835,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 +12862,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);
@@ -12860,6 +13027,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));

package/lib/index.js

@@ -108,6 +108,28 @@ var PendingDiffStore = class {
 		for (const [key, indexedId] of this.pathIndex) if (indexedId === id) this.pathIndex.delete(key);
 		return true;
 	}
+	/**
+	* Advance one entry's tracked content after a block-level keep/revert. The
+	* entry keeps its id and path; only the given side's text and capture time
+	* move. When the caller decides the sides now match, it removes the entry
+	* instead of updating it.
+	* @param sessionId - the owning session.
+	* @param id - the entry id.
+	* @param patch - the side to advance (`oldText` for keep, `newText` for revert).
+	* @returns whether the entry changed.
+	*/
+	update(sessionId, id, patch) {
+		const key = entryKey(sessionId, id);
+		const entry = this.entries.get(key);
+		if (entry === void 0) return false;
+		const next = {
+			...entry,
+			...patch,
+			updatedAt: Date.now()
+		};
+		this.entries.set(key, next);
+		return true;
+	}
 	/** Total entry count across all sessions. */
 	get size() {
 		return this.entries.size;
@@ -760,7 +782,10 @@ function apply(ctx, config) {
 				if (sessionId === void 0) return rpcError("sessionId must be a non-empty string");
 				return {
 					ok: true,
-					value: { files: await listWithState(await workspaceEntries(sessionId)) }
+					value: {
+						files: await listWithState(await workspaceEntries(sessionId)),
+						workspacePath: workspaceOf(sessionId)?.path
+					}
 				};
 			}
 			case "keep": {
@@ -797,6 +822,51 @@ function apply(ctx, config) {
 					value: { outcome: "reverted" }
 				};
 			}
+			case "block-keep": {
+				const blockTarget = blockTargetOf(payload);
+				if (blockTarget === void 0) return rpcError("sessionId, id, and block must be valid");
+				await ensureLoaded(blockTarget.sessionId);
+				const entry = store.get(blockTarget.sessionId, blockTarget.id);
+				if (entry === void 0) return {
+					ok: true,
+					value: { outcome: "missing" }
+				};
+				const accepted = contentRangeOf(entry.newText, blockTarget.block.newStart, blockTarget.block.newEnd);
+				const updatedOld = replaceContentLines(entry.oldText, blockTarget.block.oldStart, blockTarget.block.oldEnd, accepted);
+				if (updatedOld === entry.newText) store.remove(blockTarget.sessionId, blockTarget.id);
+				else store.update(blockTarget.sessionId, blockTarget.id, { oldText: updatedOld });
+				await persistSession(blockTarget.sessionId);
+				return {
+					ok: true,
+					value: { outcome: "kept" }
+				};
+			}
+			case "block-revert": {
+				const blockTarget = blockTargetOf(payload);
+				if (blockTarget === void 0) return rpcError("sessionId, id, and block must be valid");
+				await ensureLoaded(blockTarget.sessionId);
+				const entry = store.get(blockTarget.sessionId, blockTarget.id);
+				if (entry === void 0) return {
+					ok: true,
+					value: { outcome: "missing" }
+				};
+				const restored = contentRangeOf(entry.oldText, blockTarget.block.oldStart, blockTarget.block.oldEnd);
+				const updatedNew = replaceContentLines(entry.newText, blockTarget.block.newStart, blockTarget.block.newEnd, restored);
+				try {
+					const resolved = await ctx.fs.resolve(entry.path, { signal });
+					if (entry.kind === "create" && updatedNew === "") await rm(ctx.fs.processPath(resolved), { force: true });
+					else await ctx.fs.writeText(resolved, updatedNew, void 0, signal);
+				} catch (error) {
+					return rpcError(`block revert failed: ${errorMessage(error)}`);
+				}
+				if (updatedNew === entry.oldText) store.remove(blockTarget.sessionId, blockTarget.id);
+				else store.update(blockTarget.sessionId, blockTarget.id, { newText: updatedNew });
+				await persistSession(blockTarget.sessionId);
+				return {
+					ok: true,
+					value: { outcome: "reverted" }
+				};
+			}
 			case "open": {
 				const target = openTargetOf(payload);
 				if (target === void 0) return rpcError("sessionId, id, and action must be valid");
@@ -836,6 +906,73 @@ function sessionOf(payload) {
 	const value = payload.sessionId;
 	return typeof value === "string" && value.length > 0 ? SessionId(value) : void 0;
 }
+/** The content lines of `text`, matching the diff's line numbering (a single
+trailing newline is a terminator, not an extra empty line). */
+function contentLinesOf(text) {
+	if (text === "") return [];
+	const lines = text.split("\n");
+	if (lines[lines.length - 1] === "") lines.pop();
+	return lines;
+}
+/** Rebuild text from content lines, keeping `original`'s trailing-newline convention. */
+function fromContentLines(original, lines) {
+	if (lines.length === 0) return "";
+	return lines.join("\n") + (original.endsWith("\n") ? "\n" : "");
+}
+/** The content lines [start..end] (1-based inclusive) of `text`; empty when start > end. */
+function contentRangeOf(text, start, end) {
+	if (start > end) return [];
+	return contentLinesOf(text).slice(start - 1, end);
+}
+/**
+* Replace the content lines [start..end] (1-based) of `text` with `replacement`
+* lines. An empty range (`start > end`) inserts before line `start`. Out-of-range
+* bounds clamp; the trailing-newline convention of `text` is preserved.
+*/
+function replaceContentLines(text, start, end, replacement) {
+	const lines = contentLinesOf(text);
+	const count = lines.length;
+	if (start > end) {
+		const at = Math.min(Math.max(start, 1), count + 1);
+		return fromContentLines(text, [
+			...lines.slice(0, at - 1),
+			...replacement,
+			...lines.slice(at - 1)
+		]);
+	}
+	const s = Math.min(Math.max(start, 1), count + 1);
+	const e = Math.min(Math.max(end, 1), count);
+	if (s > e) return text;
+	return fromContentLines(text, [
+		...lines.slice(0, s - 1),
+		...replacement,
+		...lines.slice(e)
+	]);
+}
+/** Narrow a wire payload to one block keep/revert target. */
+function blockTargetOf(payload) {
+	const target = targetOf(payload);
+	if (target === void 0) return void 0;
+	if (typeof payload !== "object" || payload === null || Array.isArray(payload)) return void 0;
+	const block = payload.block;
+	if (typeof block !== "object" || block === null || Array.isArray(block)) return void 0;
+	const { oldStart, oldEnd, newStart, newEnd } = block;
+	if (![
+		oldStart,
+		oldEnd,
+		newStart,
+		newEnd
+	].every((value) => typeof value === "number" && Number.isFinite(value))) return void 0;
+	return {
+		...target,
+		block: {
+			oldStart,
+			oldEnd,
+			newStart,
+			newEnd
+		}
+	};
+}
 /** Narrow a wire payload to one keep/revert target. */
 function targetOf(payload) {
 	const sessionId = sessionOf(payload);

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

@@ -4,4 +4,4 @@ import type { PendingPanelFace } from './slots.ts';
 /** Full panel props composed by the sidebar footer-action slot. */
 export type PendingPanelProps = PropsRuntime<'sidebar.footer.action'> & InjectFace<PendingPanelFace> & PropsLocale<'diff-approval'>;
 /** Render the pending-edit review panel and its unified footer action. */
-export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onOpen, t, }: PendingPanelProps): import("react").JSX.Element;
+export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, t, }: PendingPanelProps): import("react").JSX.Element;

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

@@ -5,17 +5,21 @@
  * @module dsh-diff-approval/client/port
  */
 import type { ClientConnectionRpc, SessionId } from '@deepseek-ai/dsh-client-connection/client';
-import type { DiffApprovalActionValue, DiffApprovalOpenAction, DiffApprovalOpenValue, PendingFileDiff } from '../types.ts';
+import type { DiffApprovalActionValue, DiffApprovalBlockRange, DiffApprovalListValue, DiffApprovalOpenAction, DiffApprovalOpenValue } from '../types.ts';
 /** The channel the host half registers and this port calls. */
 export declare const DIFF_APPROVAL_CHANNEL = "/diff-approval";
 /** This package's business verbs over the review channel. */
 export interface DiffApprovalPort {
-    /** Read one session's pending entries, oldest capture first. */
-    list(sessionId: SessionId): Promise<PendingFileDiff[]>;
+    /** Read one session's pending entries (plus its workspace root), oldest capture first. */
+    list(sessionId: SessionId): Promise<DiffApprovalListValue>;
     /** Keep one operation. */
     keep(sessionId: SessionId, id: string): Promise<DiffApprovalActionValue>;
     /** 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>;
+    /** Revert one diff block (restore its old lines in the file). */
+    blockRevert(sessionId: SessionId, id: string, block: DiffApprovalBlockRange): Promise<DiffApprovalActionValue>;
     /** Open one file with its default application or reveal it in the folder. */
     open(sessionId: SessionId, id: string, action: DiffApprovalOpenAction): Promise<DiffApprovalOpenValue>;
 }

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

@@ -1,10 +1,10 @@
 /**
- * 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.
+ * Reference labels for the selection toolbar: a workspace-relative path (or
+ * the absolute path when the file is outside the workspace) plus a 1-based
+ * line range. Pure derivation so the display rule is unit-testable without
+ * the panel.
  * @module dsh-diff-approval/client/reference
  */
-import type { PendingFileDiff } from '../types.ts';
 /**
  * Last path segment of a file path, any separator style.
  * @param path - the path to shorten.
@@ -12,13 +12,15 @@ import type { PendingFileDiff } from '../types.ts';
  */
 export declare function basenameOf(path: string): string;
 /**
- * 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.
  */
-export declare function copyDisplayPath(path: string, files: readonly PendingFileDiff[]): string;
+export declare function referencePathOf(path: string, workspacePath: string | undefined): string;
 /**
  * Format one line range as a reference suffix: a single line number, or the
  * inclusive range when the selection spans more than one line.
@@ -30,9 +32,9 @@ export declare function lineRangeLabel(start: number, end: number): string;
 /**
  * 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.
  */
-export declare function referenceOf(path: string, files: readonly PendingFileDiff[], start: number, end: number): string;
+export declare function referenceOf(path: string, workspacePath: string | undefined, start: number, end: number): string;

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

@@ -1,7 +1,7 @@
 /** The panel's injected business face and its observable snapshot. */
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots';
 import type { SessionId } from '@deepseek-ai/dsh-client-connection/client';
-import type { DiffApprovalOpenAction, PendingFileDiff } from '../types.ts';
+import type { DiffApprovalBlockRange, DiffApprovalOpenAction, PendingFileDiff } from '../types.ts';
 /** What the panel reads and drives: the pending list plus in-flight entries. */
 export interface PendingDiffSnapshot {
     /** Whether a list read has completed at least once. */
@@ -12,6 +12,8 @@ export interface PendingDiffSnapshot {
     error?: string;
     /** Entry ids whose keep/revert is in flight; their controls are disabled. */
     busy: ReadonlySet<string>;
+    /** The viewing session's workspace root (when it has one); enables workspace-relative references. */
+    workspacePath?: string | undefined;
 }
 /** The injected face the panel component receives from the plugin body. */
 export interface PendingPanelFace {
@@ -25,6 +27,10 @@ export interface PendingPanelFace {
     onKeep: (sessionId: SessionId, id: string) => Promise<void>;
     /** 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>;
+    /** Revert one diff block (restore its old lines in the file). */
+    onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     /** Open one file with its default application or reveal it in the folder. */
     onOpen: (sessionId: SessionId, id: string, action: DiffApprovalOpenAction) => Promise<void>;
 }

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

@@ -7,7 +7,7 @@
  */
 import type { SessionId } from '@deepseek-ai/dsh-client-connection/client';
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots';
-import type { DiffApprovalOpenAction } from '../types.ts';
+import type { DiffApprovalBlockRange, DiffApprovalOpenAction } from '../types.ts';
 import type { PendingDiffSnapshot } from './slots.ts';
 import type { DiffApprovalPort } from './port.ts';
 /** The observable the panel reads and the plugin body drives. */
@@ -18,6 +18,10 @@ export interface PendingDiffStore extends HostObservable<PendingDiffSnapshot> {
     keep: (sessionId: SessionId, id: string) => Promise<void>;
     /** 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>;
+    /** Revert one diff block, then refresh so the entry's diff reflects the undo. */
+    blockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     /** Open one file with its default application or reveal it in the folder. */
     open: (sessionId: SessionId, id: string, action: DiffApprovalOpenAction) => Promise<void>;
     /** Drop every local fact (used on connection reset). */

package/lib/types/index.d.ts

@@ -35,7 +35,7 @@
  */
 import { Context } from '@deepseek-ai/cordis';
 import type { DiffApprovalOpenAction } from './types.ts';
-export type { DiffApprovalActionOutcome, DiffApprovalActionValue, DiffApprovalListValue, DiffApprovalOpenAction, DiffApprovalOpenValue, PendingEntry, PendingEntryKind, PendingFileDiff, } from './types.ts';
+export type { DiffApprovalActionOutcome, DiffApprovalActionValue, DiffApprovalBlockRange, DiffApprovalBlockTarget, DiffApprovalListValue, DiffApprovalOpenAction, DiffApprovalOpenValue, PendingEntry, PendingEntryKind, PendingFileDiff, } from './types.ts';
 export { PendingDiffStore } from './pending.ts';
 export { PendingPersistence, defaultStorageDir } from './persist.ts';
 export { defaultOpenPath } from './open.ts';

package/lib/types/pending.d.ts

@@ -55,6 +55,20 @@ export declare class PendingDiffStore {
      * @returns whether an entry was removed.
      */
     remove(sessionId: SessionId, id: string): boolean;
+    /**
+     * Advance one entry's tracked content after a block-level keep/revert. The
+     * entry keeps its id and path; only the given side's text and capture time
+     * move. When the caller decides the sides now match, it removes the entry
+     * instead of updating it.
+     * @param sessionId - the owning session.
+     * @param id - the entry id.
+     * @param patch - the side to advance (`oldText` for keep, `newText` for revert).
+     * @returns whether the entry changed.
+     */
+    update(sessionId: SessionId, id: string, patch: {
+        oldText?: string;
+        newText?: string;
+    }): boolean;
     /** Total entry count across all sessions. */
     get size(): number;
 }

package/lib/types/types.d.ts

@@ -51,6 +51,8 @@ export interface PendingFileDiff extends PendingEntry {
 export interface DiffApprovalListValue {
     /** Pending entries for the requested session, oldest capture first. */
     files: PendingFileDiff[];
+    /** The viewing session's workspace root (when it has one), for workspace-relative references. */
+    workspacePath?: string | undefined;
 }
 /** What the open endpoint asks the OS to do with a file. */
 export type DiffApprovalOpenAction = 'open' | 'reveal';
@@ -59,6 +61,27 @@ export interface DiffApprovalOpenValue {
     /** What the request did; `missing` means no pending entry existed. */
     outcome: 'opened' | 'missing';
 }
+/**
+ * One diff block's line ranges on the old and new sides, 1-based inclusive.
+ * A side is empty when its start exceeds its end; an empty side's start is
+ * the insertion point (the line before which content inserts) on that side.
+ */
+export interface DiffApprovalBlockRange {
+    /** First old-file line this block spans; the insertion point for pure additions. */
+    oldStart: number;
+    /** Last old-file line; `oldStart - 1` when the block has no old side. */
+    oldEnd: number;
+    /** First new-file line this block spans; the insertion point for pure deletions. */
+    newStart: number;
+    /** Last new-file line; `newStart - 1` when the block has no new side. */
+    newEnd: number;
+}
+/** Target of one block-level keep/revert: the entry plus the block range. */
+export interface DiffApprovalBlockTarget {
+    sessionId: SessionId;
+    id: string;
+    block: DiffApprovalBlockRange;
+}
 /** Outcome of one keep/revert request. */
 export type DiffApprovalActionOutcome = 'kept' | 'reverted' | 'missing';
 /** Value returned by the channel's keep and revert endpoints. */

package/package.json

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