dsh-diff-approval 0.6.0 → 0.8.0

package/lib/client.js

@@ -11620,8 +11620,39 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			return `${referencePathOf(path, workspacePath)}:${lineRangeLabel(start, end)}`;
 		}
 		//#endregion
+		//#region lib/types/client/settings.js
+		/** Client preferences for the review panel, persisted in localStorage. */
+		const PASTE_ON_COPY_KEY = "diff-approval:paste-on-copy";
+		const IMPORT_UNTRACKED_KEY = "diff-approval:import-untracked";
+		/**
+		* Whether copying a reference should also paste it into the chat input and
+		* focus it. Defaults to on; only an explicit `'0'` disables it.
+		* @returns whether auto-paste is enabled.
+		*/
+		function pasteOnCopyEnabled() {
+			return localStorage.getItem(PASTE_ON_COPY_KEY) !== "0";
+		}
+		/** Persist the auto-paste preference. */
+		function setPasteOnCopyEnabled(value) {
+			localStorage.setItem(PASTE_ON_COPY_KEY, value ? "1" : "0");
+		}
+		/**
+		* Whether importing workspace VCS changes includes new/untracked files (git
+		* `??`, svn `?`, p4 unversioned). Defaults to off: collecting them scans the
+		* whole workspace, which can be slow on large trees, so the preference is
+		* opt-in. Only an explicit `'1'` enables it.
+		* @returns whether untracked files are imported.
+		*/
+		function includeUntrackedEnabled() {
+			return localStorage.getItem(IMPORT_UNTRACKED_KEY) === "1";
+		}
+		/** Persist the import-untracked preference. */
+		function setIncludeUntrackedEnabled(value) {
+			localStorage.setItem(IMPORT_UNTRACKED_KEY, value ? "1" : "0");
+		}
+		//#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_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 css = ".F1KBNa_layer{box-sizing:border-box;flex:none;align-items:center;width:calc(100% + 4px);height:42px;margin:4px -2px;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_badge:disabled{color:var(--dsw-alias-label-tertiary);cursor:default;background:0 0}.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_fullscreenBackdrop{z-index:29;background:var(--dsw-specific-sidebar-fill);position:fixed;inset:0}.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_settingsPage{padding:8px 12px}.F1KBNa_settingsRow{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.F1KBNa_settingsRowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.F1KBNa_settingsRowTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.F1KBNa_settingsRowDesc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}.F1KBNa_settingsSelector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.F1KBNa_settingsSelector:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_settingsSelectorChevron{flex:none}.F1KBNa_states{flex-direction:column;flex:1;min-height:0;padding:4px 12px 12px;display:flex;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-direction:column;flex:none;width:240px;min-height:0;padding:4px 8px 12px;display:flex}.F1KBNa_listScroll{flex:1;min-height:0;overflow-y:auto}.F1KBNa_bulkActions{flex:none;gap:6px;padding-top:8px;display:flex}.F1KBNa_bulkActions .F1KBNa_action{text-align:center;flex:1}.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_noteCentered{text-align:center;margin:auto}.F1KBNa_emptyState{flex-direction:column;align-items:center;gap:10px;margin:auto;display:flex}.F1KBNa_importButton{border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border-radius:8px;padding:5px 14px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_importButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_importButton:disabled{color:var(--dsw-alias-label-tertiary);cursor:default}.F1KBNa_importNote{color:var(--dsw-alias-label-tertiary);text-align:center;margin: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_rowFailed{border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);white-space:nowrap;border-radius:6px;flex:none;padding:1px 6px;font-size:11px;line-height:14px}.F1KBNa_actionError{border-bottom:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-state-error-primary);overflow-wrap:anywhere;margin:0;padding:6px 8px;font-size:12px;line-height:18px}.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_actionQuietDisabled:disabled{cursor:pointer;color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-border-l1);background:0 0}.F1KBNa_actionPrimary.F1KBNa_actionQuietDisabled:disabled{background:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary);color:var(--dsw-static-neutral-bluish-50);opacity:1}.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;outline:none;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_blockFlash{z-index:1;box-sizing:border-box;border:2px solid var(--dsw-alias-state-business-primary);pointer-events:none;border-radius:4px;animation:1s ease-out forwards F1KBNa_diffFlash;position:absolute;left:0;right:0}@keyframes F1KBNa_diffFlash{0%{opacity:1}to{opacity:0}}.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");
@@ -11631,69 +11662,92 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"diffHeader": "F1KBNa_diffHeader",
-			"missing": "F1KBNa_missing",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"diffBody": "F1KBNa_diffBody",
-			"rowPath": "F1KBNa_rowPath",
 			"expandExpanded": "F1KBNa_expandExpanded",
-			"line": "F1KBNa_line",
-			"headerActions": "F1KBNa_headerActions",
-			"states": "F1KBNa_states",
+			"panel": "F1KBNa_panel",
+			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
+			"settingsPage": "F1KBNa_settingsPage",
+			"hint": "F1KBNa_hint",
+			"row": "F1KBNa_row",
+			"title": "F1KBNa_title",
+			"blockActions": "F1KBNa_blockActions",
+			"langLabel": "F1KBNa_langLabel",
 			"detailEmpty": "F1KBNa_detailEmpty",
-			"markerDel": "F1KBNa_markerDel",
+			"del": "F1KBNa_del",
+			"listScroll": "F1KBNa_listScroll",
 			"close": "F1KBNa_close",
-			"markerAdd": "F1KBNa_markerAdd",
-			"statusBar": "F1KBNa_statusBar",
-			"diffStats": "F1KBNa_diffStats",
-			"footerButtons": "F1KBNa_footerButtons",
-			"title": "F1KBNa_title",
-			"row": "F1KBNa_row",
-			"delCount": "F1KBNa_delCount",
-			"expand": "F1KBNa_expand",
-			"layer": "F1KBNa_layer",
+			"group": "F1KBNa_group",
 			"diffActions": "F1KBNa_diffActions",
-			"context": "F1KBNa_context",
-			"langSelect": "F1KBNa_langSelect",
-			"kindTag": "F1KBNa_kindTag",
-			"langLabel": "F1KBNa_langLabel",
-			"flexSpacer": "F1KBNa_flexSpacer",
+			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"states": "F1KBNa_states",
+			"searchInput": "F1KBNa_searchInput",
+			"settingsRowText": "F1KBNa_settingsRowText",
+			"note": "F1KBNa_note",
+			"addCount": "F1KBNa_addCount",
+			"layer": "F1KBNa_layer",
+			"diff": "F1KBNa_diff",
 			"add": "F1KBNa_add",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"diffPath": "F1KBNa_diffPath",
+			"overviewMarker": "F1KBNa_overviewMarker",
+			"settingsRowDesc": "F1KBNa_settingsRowDesc",
+			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
+			"searchCount": "F1KBNa_searchCount",
 			"badgeCount": "F1KBNa_badgeCount",
-			"rows": "F1KBNa_rows",
+			"context": "F1KBNa_context",
+			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
+			"kindHint": "F1KBNa_kindHint",
+			"footerButtons": "F1KBNa_footerButtons",
+			"diffHeader": "F1KBNa_diffHeader",
+			"resizeHandle": "F1KBNa_resizeHandle",
+			"statusBar": "F1KBNa_statusBar",
+			"rowPath": "F1KBNa_rowPath",
+			"settingsSelector": "F1KBNa_settingsSelector",
+			"importButton": "F1KBNa_importButton",
+			"markerAdd": "F1KBNa_markerAdd",
+			"header": "F1KBNa_header",
+			"settingsRowTitle": "F1KBNa_settingsRowTitle",
+			"emptyState": "F1KBNa_emptyState",
 			"rail": "F1KBNa_rail",
-			"lines": "F1KBNa_lines",
-			"hint": "F1KBNa_hint",
-			"code": "F1KBNa_code",
-			"detail": "F1KBNa_detail",
-			"readError": "F1KBNa_readError",
+			"diffFlash": "F1KBNa_diffFlash",
 			"action": "F1KBNa_action",
-			"header": "F1KBNa_header",
+			"detail": "F1KBNa_detail",
+			"rowMeta": "F1KBNa_rowMeta",
+			"actionError": "F1KBNa_actionError",
+			"diffStats": "F1KBNa_diffStats",
+			"flexSpacer": "F1KBNa_flexSpacer",
+			"diffBody": "F1KBNa_diffBody",
 			"statusAction": "F1KBNa_statusAction",
-			"panel": "F1KBNa_panel",
-			"overviewMarker": "F1KBNa_overviewMarker",
-			"blockActions": "F1KBNa_blockActions",
-			"iconAction": "F1KBNa_iconAction",
-			"rowHead": "F1KBNa_rowHead",
+			"readError": "F1KBNa_readError",
+			"kindTag": "F1KBNa_kindTag",
+			"delCount": "F1KBNa_delCount",
+			"blockPosition": "F1KBNa_blockPosition",
+			"overviewRuler": "F1KBNa_overviewRuler",
+			"rowFailed": "F1KBNa_rowFailed",
+			"headerActions": "F1KBNa_headerActions",
+			"divergedHint": "F1KBNa_divergedHint",
+			"code": "F1KBNa_code",
+			"noteCentered": "F1KBNa_noteCentered",
+			"expand": "F1KBNa_expand",
 			"vSpacer": "F1KBNa_vSpacer",
-			"missingHint": "F1KBNa_missingHint",
-			"note": "F1KBNa_note",
-			"gutter": "F1KBNa_gutter",
+			"importNote": "F1KBNa_importNote",
+			"settingsRow": "F1KBNa_settingsRow",
 			"split": "F1KBNa_split",
-			"divergedHint": "F1KBNa_divergedHint",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"rowMeta": "F1KBNa_rowMeta",
-			"addCount": "F1KBNa_addCount",
-			"diff": "F1KBNa_diff",
-			"fileList": "F1KBNa_fileList",
+			"missing": "F1KBNa_missing",
 			"actionPrimary": "F1KBNa_actionPrimary",
-			"kindHint": "F1KBNa_kindHint",
-			"diffBodyWrap": "F1KBNa_diffBodyWrap",
-			"del": "F1KBNa_del",
+			"blockFlash": "F1KBNa_blockFlash",
+			"langSelect": "F1KBNa_langSelect",
 			"badge": "F1KBNa_badge",
-			"group": "F1KBNa_group"
+			"diffPath": "F1KBNa_diffPath",
+			"iconAction": "F1KBNa_iconAction",
+			"markerDel": "F1KBNa_markerDel",
+			"bulkActions": "F1KBNa_bulkActions",
+			"gutter": "F1KBNa_gutter",
+			"rowHead": "F1KBNa_rowHead",
+			"searchBar": "F1KBNa_searchBar",
+			"fileList": "F1KBNa_fileList",
+			"lines": "F1KBNa_lines",
+			"rows": "F1KBNa_rows",
+			"missingHint": "F1KBNa_missingHint",
+			"line": "F1KBNa_line",
+			"badgeLabel": "F1KBNa_badgeLabel"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -11727,25 +11781,55 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		const MAX_LIST_WIDTH_PX = 560;
 		/** Fixed diff-row height in px; the virtual window and jump math are built on it. */
 		const ROW_HEIGHT_PX = 22;
+		/** The overview ruler's width in px (mirrors `.overviewRuler`). The flash is
+		* kept off it even when the scroller has no vertical scrollbar. */
+		const OVERVIEW_RULER_WIDTH_PX = 4;
 		/** 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;
+		/** How long a fully-processed list stays open before the panel folds, so the
+		* last action (a Keep-all/Revert-all especially) can still be undone with
+		* Ctrl+Z. An undo that restores an entry cancels the pending close. */
+		const EMPTY_CLOSE_GRACE_MS = 3e3;
 		/** The trailing file-name segment of a path, used for row display. */
 		function basenameOf(path) {
 			const index = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
 			return index < 0 ? path : path.slice(index + 1);
 		}
+		/**
+		* Open the DSH settings dialog and switch to this plugin's section. The
+		* settings shell keeps its open state and the active section id as
+		* component-local viewing state with no cross-plugin service, so the dialog
+		* is opened by clicking the sidebar's settings trigger and then the nav cell
+		* for this section. `element.click()` still fires React's delegated click
+		* handlers, reaching the same state transitions a user gesture would.
+		* @param sectionLabel - the nav label of this plugin's settings section.
+		*/
+		function openSettingsSection(sectionLabel) {
+			const trigger = document.querySelector("button[aria-haspopup=\"dialog\"]");
+			if (trigger === null) return;
+			trigger.click();
+			requestAnimationFrame(() => {
+				Array.from(document.querySelectorAll("button")).find((button) => button.textContent?.trim() === sectionLabel)?.click();
+			});
+		}
 		/** The diff body's row class per line kind. */
 		const ROW_CLASS = {
 			context: PendingPanel_module_css_default.context,
 			del: PendingPanel_module_css_default.del,
 			add: PendingPanel_module_css_default.add
 		};
+		/** Empty failure map reused as the snapshot's canonical absent value. */
+		const EMPTY_FAILED_MAP = /* @__PURE__ */ new Map();
 		/**
 		* One rendered diff row, memoized so a poll or an unrelated state change
 		* 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, onRowHover } = 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];
@@ -11758,6 +11842,7 @@ 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);
 				},
@@ -11900,7 +11985,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			};
 		}
 		/** One row of the file list: the clickable head in the left pane. */
-		function PendingFileRow({ file, selected, t, onSelect }) {
+		function PendingFileRow({ file, selected, failedMessage, t, onSelect }) {
 			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,
@@ -11929,6 +12014,11 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 								title: t("panel.missingHint"),
 								children: t("panel.missing")
 							}),
+							failedMessage !== void 0 && (0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.rowFailed,
+								title: failedMessage,
+								children: t("row.failed")
+							}),
 							(0, react_jsx_runtime.jsxs)("span", {
 								className: PendingPanel_module_css_default.rowMeta,
 								children: [(0, react_jsx_runtime.jsx)("span", {
@@ -11945,7 +12035,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			});
 		}
 		/** The selected file's diff, actions, jump controls, and copy toolbar. */
-		function PendingDiff({ file, busy, workspacePath, t, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen }) {
+		function PendingDiff({ file, busy, workspacePath, jumpSignal, undoFlash, failedMessage, onPasteReference, 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)(() => [{
@@ -12026,19 +12116,76 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			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);
+			const [flashKey, setFlashKey] = (0, react.useState)(0);
 			(0, react.useEffect)(() => {
 				setFocus(0);
 				setScrollTop(0);
 				if (bodyRef.current !== null) bodyRef.current.scrollTop = 0;
+				bodyRef.current?.focus();
+				setFlashKey((key) => key + 1);
 				setHoveredBlock(void 0);
 				setSelection(void 0);
 				setLangOverride(void 0);
 				setLangMenuOpen(false);
 				setCopied(false);
+				setSearchOpen(false);
+				setSearchQuery("");
+				setSearchIndex(0);
 			}, [file.id]);
+			(0, react.useEffect)(() => {
+				if (undoFlash === 0) return;
+				setFocus(0);
+				setScrollTick((tick) => tick + 1);
+				setFlashKey((key) => key + 1);
+			}, [undoFlash]);
 			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.useLayoutEffect)(() => {
+				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) => {
@@ -12055,6 +12202,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			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;
@@ -12073,7 +12222,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					observer?.disconnect();
 				};
 			}, [file.id]);
-			(0, react.useEffect)(() => {
+			(0, react.useLayoutEffect)(() => {
 				if (rowCount === 0) return;
 				const block = model.blocks[focus];
 				if (block === void 0) return;
@@ -12102,7 +12251,12 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					return 0;
 				});
 				setScrollTick((tick) => tick + 1);
+				setFlashKey((key) => key + 1);
 			};
+			(0, react.useEffect)(() => {
+				if (jumpSignal === 0) return;
+				jump(1);
+			}, [jumpSignal]);
 			const onScroll = () => {
 				const body = bodyRef.current;
 				if (body === null) return;
@@ -12127,10 +12281,15 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				if (selectionReference === void 0) return;
 				if (!await (0, _deepseek_ai_dsh_client_ui_primitives.writeClipboard)(selectionReference)) return;
 				setCopied(true);
+				if (pasteOnCopyEnabled()) onPasteReference(file.sessionId, selectionReference);
 				window.setTimeout(() => {
 					setCopied(false);
 				}, 1500);
-			}, [selectionReference]);
+			}, [
+				file.sessionId,
+				onPasteReference,
+				selectionReference
+			]);
 			(0, react.useEffect)(() => {
 				const onKeyDown = (event) => {
 					if (!(event.ctrlKey || event.metaKey) || event.altKey || event.shiftKey) return;
@@ -12139,13 +12298,50 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					event.preventDefault();
 					copySelection();
 				};
-				document.addEventListener("keydown", onKeyDown);
+				window.addEventListener("keydown", onKeyDown, true);
 				return () => {
-					document.removeEventListener("keydown", onKeyDown);
+					window.removeEventListener("keydown", onKeyDown, true);
 				};
 			}, [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 jumpRef = (0, react.useRef)(jump);
+			jumpRef.current = jump;
+			(0, react.useEffect)(() => {
+				const onKeyDown = (event) => {
+					if (!(event.ctrlKey || event.metaKey) || event.altKey || event.shiftKey) return;
+					const key = event.key.toLowerCase();
+					if (key !== "arrowup" && key !== "arrowdown") return;
+					const target = event.target;
+					if (target instanceof Element && target.closest("input, textarea, [contenteditable=\"true\"]") !== null) return;
+					event.preventDefault();
+					jumpRef.current(key === "arrowup" ? -1 : 1);
+				};
+				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;
+			const flashWidth = (() => {
+				const scroller = bodyRef.current;
+				if (scroller === null) return 0;
+				const scrollbarWidth = scroller.offsetWidth - scroller.clientWidth;
+				return Math.max(0, scroller.clientWidth - (scrollbarWidth > 0 ? 0 : OVERVIEW_RULER_WIDTH_PX));
+			})();
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: PendingPanel_module_css_default.diff,
 				"data-diff-approval-diff": true,
@@ -12234,105 +12430,211 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 									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} ${PendingPanel_module_css_default.actionPrimary}`,
+								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionPrimary} ${PendingPanel_module_css_default.actionQuietDisabled}`,
 								"data-diff-keep": true,
 								disabled: busy,
 								onClick: () => {
 									onKeep(file.sessionId, file.id);
 								},
-								children: busy ? t("action.busy") : t("action.keep")
+								children: t("action.keep")
 							}),
 							(0, react_jsx_runtime.jsx)("button", {
 								type: "button",
-								className: PendingPanel_module_css_default.action,
+								className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionQuietDisabled}`,
 								"data-diff-revert": true,
 								disabled: busy,
 								onClick: () => {
 									onRevert(file.sessionId, file.id);
 								},
-								children: busy ? t("action.busy") : t("action.revert")
+								children: t("action.revert")
 							})
 						]
 					}),
+					failedMessage !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+						className: PendingPanel_module_css_default.actionError,
+						"data-diff-action-error": true,
+						children: failedMessage
+					}),
 					file.missing && (0, react_jsx_runtime.jsx)("p", {
 						className: PendingPanel_module_css_default.missingHint,
 						children: t("panel.missingHint")
 					}),
 					(0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.diffBodyWrap,
-						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: [
+							(0, react_jsx_runtime.jsxs)("div", {
+								className: PendingPanel_module_css_default.diffBody,
+								ref: bodyRef,
+								tabIndex: 0,
+								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")
+										})
+									]
+								})]
+							}),
+							focusedBlock !== void 0 && flashKey > 0 && (0, react_jsx_runtime.jsx)("div", {
+								className: PendingPanel_module_css_default.blockFlash,
+								"data-diff-block-flash": true,
+								style: {
+									top: focusedBlock.start * ROW_HEIGHT_PX - scrollTop,
+									height: Math.min((focusedBlock.end - focusedBlock.start + 1) * ROW_HEIGHT_PX, viewportHeight > 0 ? viewportHeight : Number.POSITIVE_INFINITY),
+									width: flashWidth
+								}
+							}, flashKey),
+							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();
+										}
+									}),
+									(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}`
+									}),
+									(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 })
 									}),
-									visibleRows.map((row, offset) => {
-										const index = start + offset;
-										return (0, react_jsx_runtime.jsx)(DiffRow, {
-											index,
-											row,
-											runs,
-											focused: inFocusedBlock(index),
-											onRowHover
-										}, index);
+									(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 })
 									}),
-									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-close": true,
+										"aria-label": t("action.close"),
+										onClick: closeSearch,
+										children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 14 })
 									})
 								]
-							}), 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,
-							"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,
@@ -12395,11 +12697,34 @@ 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, onBlockKeep, onBlockRevert, onOpen, t }) {
+		function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, t }) {
 			const current = useSessions((state) => state.current);
+			const currentBlank = useSessions((state) => {
+				const id = state.current;
+				return id === void 0 ? false : state.byId[id]?.blank ?? false;
+			});
+			const noSession = current === void 0 || currentBlank;
 			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);
+			/** Bumped when an undo/redo affected the already-open file, so its detail
+			* pane re-selects the undone diff (flash). */
+			const [undoFlash, setUndoFlash] = (0, react.useState)(0);
+			/** Which bulk decision (keep-all / revert-all) is running; null when idle. */
+			const [bulkBusy, setBulkBusy] = (0, react.useState)(null);
+			/** True while a workspace-changes import is running. */
+			const [importBusy, setImportBusy] = (0, react.useState)(false);
+			/** Feedback under the empty note after an import (no VCS, or a failure). */
+			const [importNote, setImportNote] = (0, react.useState)(void 0);
+			/** Whether the last import note is a failure (drives the alert role). */
+			const [importFailed, setImportFailed] = (0, react.useState)(false);
+			/** A transient banner for an import that found nothing to bring in. */
+			const [importToast, setImportToast] = (0, react.useState)(null);
+			/** A transient banner for a keep/revert failure. */
+			const [actionToast, setActionToast] = (0, react.useState)(null);
 			/** 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. */
@@ -12461,13 +12786,27 @@ 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);
+			/** Per-file keep/revert failures, surfaced inline on the row and detail. */
+			const failed = snapshot.failed ?? EMPTY_FAILED_MAP;
+			const failedInitialized = (0, react.useRef)(false);
+			const failedRef = (0, react.useRef)(void 0);
+			(0, react.useEffect)(() => {
+				const current = snapshot.failed;
+				if (!failedInitialized.current) {
+					failedInitialized.current = true;
+					failedRef.current = current;
+					return;
+				}
+				const previous = failedRef.current;
+				const fresh = [...(current ?? EMPTY_FAILED_MAP).entries()].filter(([id]) => previous === void 0 || !previous.has(id));
+				if (fresh.length > 0) setActionToast(fresh[0][1]);
+				failedRef.current = current;
+			}, [snapshot.failed]);
 			(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,
@@ -12476,10 +12815,15 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				selected
 			]);
 			(0, react.useEffect)(() => {
-				if (open && openedCount > 0 && snapshot.read && snapshot.error === void 0 && files.length === 0) {
+				if (!open || openedCount === 0) return;
+				if (!(snapshot.read && snapshot.error === void 0 && files.length === 0)) return;
+				const timer = window.setTimeout(() => {
 					setOpenedCount(0);
 					setOpen(false);
-				}
+				}, EMPTY_CLOSE_GRACE_MS);
+				return () => {
+					window.clearTimeout(timer);
+				};
 			}, [
 				open,
 				openedCount,
@@ -12487,17 +12831,88 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				snapshot.error,
 				files.length
 			]);
+			const runImportVcs = async () => {
+				if (current === void 0 || importBusy) return;
+				setImportBusy(true);
+				setImportNote(void 0);
+				setImportFailed(false);
+				setImportToast(null);
+				try {
+					const value = await onImportVcs(current, includeUntrackedEnabled());
+					await onRefresh(current);
+					if (!value.detected) setImportNote(t("panel.importNoVcs"));
+					else if (value.imported === 0) setImportToast(t("panel.importNone"));
+				} catch (error) {
+					setImportFailed(true);
+					setImportNote(t("panel.importFailed", { message: error instanceof Error ? error.message : String(error) }));
+				} finally {
+					setImportBusy(false);
+				}
+			};
 			const toggleOpen = () => {
 				if (!open) setOpenedCount(files.length);
 				setOpen((value) => !value);
 			};
+			(0, react.useEffect)(() => {
+				if (noSession) setOpen(false);
+			}, [noSession]);
+			/** Run the same decision over every current-session file, sequentially. */
+			const runBulk = async (kind) => {
+				setBulkBusy(kind);
+				try {
+					for (const file of files) if (kind === "keep") await onKeep(file.sessionId, file.id);
+					else await onRevert(file.sessionId, file.id);
+				} finally {
+					setBulkBusy(null);
+				}
+			};
 			const renderEntry = (entry) => (0, react_jsx_runtime.jsx)(PendingFileRow, {
 				file: entry,
 				selected: selected === entry.id,
+				failedMessage: failed.get(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);
+			const handleUndo = async (sessionId) => {
+				const id = await onUndo(sessionId);
+				if (id === void 0) return;
+				if (id === selected) setUndoFlash((signal) => signal + 1);
+				else setSelected(id);
+			};
+			const handleRedo = async (sessionId) => {
+				const id = await onRedo(sessionId);
+				if (id === void 0) return;
+				if (id === selected) setUndoFlash((signal) => signal + 1);
+				else setSelected(id);
+			};
+			(0, react.useEffect)(() => {
+				if (!open || current === void 0) return;
+				const onKeyDown = (event) => {
+					if (!(event.ctrlKey || event.metaKey) || event.altKey) return;
+					const key = event.key.toLowerCase();
+					if (key !== "z" && key !== "y") return;
+					const target = event.target;
+					if (target instanceof Element && target.closest("input, textarea, [contenteditable=\"true\"]") !== null) return;
+					event.preventDefault();
+					if (key === "z") {
+						if (event.shiftKey) handleRedo(current);
+						else handleUndo(current);
+					} else handleRedo(current);
+				};
+				window.addEventListener("keydown", onKeyDown, true);
+				return () => {
+					window.removeEventListener("keydown", onKeyDown, true);
+				};
+			}, [
+				open,
+				current,
+				handleUndo,
+				handleRedo
+			]);
 			/** Drag the list/detail divider; width follows the pointer within its bounds. */
 			const startResize = (event) => {
 				if (event.button !== 0) return;
@@ -12526,132 +12941,316 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			};
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: wide ? PendingPanel_module_css_default.layer : `${PendingPanel_module_css_default.layer} ${PendingPanel_module_css_default.rail}`,
-				children: [open && (0, react_jsx_runtime.jsxs)("section", {
-					className: PendingPanel_module_css_default.panel,
-					style: { bottom: expanded ? PANEL_INSET_PX : bottomPx },
-					"data-diff-approval-panel": true,
-					"aria-label": t("panel.title"),
-					children: [(0, react_jsx_runtime.jsxs)("header", {
-						className: PendingPanel_module_css_default.header,
-						children: [(0, react_jsx_runtime.jsx)("span", {
-							className: PendingPanel_module_css_default.title,
-							children: t("panel.title")
-						}), (0, react_jsx_runtime.jsxs)("div", {
-							className: PendingPanel_module_css_default.headerActions,
-							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 })
+				children: [
+					importToast !== null && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Toast, {
+						text: importToast,
+						onDone: () => {
+							setImportToast(null);
+						}
+					}),
+					actionToast !== null && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Toast, {
+						text: actionToast,
+						onDone: () => {
+							setActionToast(null);
+						}
+					}),
+					open && expanded && (0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.fullscreenBackdrop,
+						"data-diff-fullscreen-backdrop": true
+					}),
+					open && (0, react_jsx_runtime.jsxs)("section", {
+						className: PendingPanel_module_css_default.panel,
+						style: { bottom: expanded ? PANEL_INSET_PX : bottomPx },
+						"data-diff-approval-panel": true,
+						"aria-label": t("panel.title"),
+						children: [(0, react_jsx_runtime.jsxs)("header", {
+							className: PendingPanel_module_css_default.header,
+							children: [(0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.title,
+								children: t("panel.title")
+							}), (0, react_jsx_runtime.jsxs)("div", {
+								className: PendingPanel_module_css_default.headerActions,
+								children: [
+									(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+										label: t("action.settings"),
+										side: "bottom",
+										delayMs: 500,
+										children: (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: PendingPanel_module_css_default.expand,
+											"data-diff-approval-settings": true,
+											"aria-label": t("action.settings"),
+											onClick: () => {
+												setOpen(false);
+												openSettingsSection(t("settings.tabLabel"));
+											},
+											children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSettingsOutline16, { size: 14 })
+										})
+									}),
+									(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", {
+							className: PendingPanel_module_css_default.states,
+							children: [
+								snapshot.error !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+									className: PendingPanel_module_css_default.readError,
+									role: "alert",
+									children: t("panel.readFailed", { message: snapshot.error })
+								}),
+								!snapshot.read && snapshot.error === void 0 && (0, react_jsx_runtime.jsx)("p", {
+									className: PendingPanel_module_css_default.note,
+									children: t("panel.loading")
+								}),
+								snapshot.read && snapshot.error === void 0 && files.length === 0 && (0, react_jsx_runtime.jsxs)("div", {
+									className: PendingPanel_module_css_default.emptyState,
+									children: [
+										(0, react_jsx_runtime.jsx)("p", {
+											className: `${PendingPanel_module_css_default.note} ${PendingPanel_module_css_default.noteCentered}`,
+											children: t("panel.empty")
+										}),
+										(0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: PendingPanel_module_css_default.importButton,
+											"data-diff-import-vcs": true,
+											disabled: importBusy,
+											onClick: () => {
+												runImportVcs();
+											},
+											children: importBusy ? t("action.importVcsBusy") : t("action.importVcs")
+										}),
+										importNote !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+											className: PendingPanel_module_css_default.importNote,
+											role: importFailed ? "alert" : void 0,
+											children: importNote
+										})
+									]
 								})
-							}), (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 })
+							]
+						}) : (0, react_jsx_runtime.jsxs)("div", {
+							className: PendingPanel_module_css_default.split,
+							children: [
+								(0, react_jsx_runtime.jsxs)("nav", {
+									className: PendingPanel_module_css_default.fileList,
+									style: { width: listWidth },
+									"data-diff-approval-file-list": true,
+									children: [(0, react_jsx_runtime.jsx)("div", {
+										className: PendingPanel_module_css_default.listScroll,
+										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: files.map(renderEntry)
+										})] })
+									}), files.length > 0 && (0, react_jsx_runtime.jsxs)("div", {
+										className: PendingPanel_module_css_default.bulkActions,
+										children: [(0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionPrimary}`,
+											"data-diff-keep-all": true,
+											disabled: bulkBusy !== null,
+											onClick: () => {
+												runBulk("keep");
+											},
+											children: bulkBusy === "keep" ? t("action.busy") : t("action.keepAll")
+										}), (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: PendingPanel_module_css_default.action,
+											"data-diff-revert-all": true,
+											disabled: bulkBusy !== null,
+											onClick: () => {
+												runBulk("revert");
+											},
+											children: bulkBusy === "revert" ? t("action.busy") : t("action.revertAll")
+										})]
+									})]
+								}),
+								(0, react_jsx_runtime.jsx)("div", {
+									className: PendingPanel_module_css_default.resizeHandle,
+									"data-diff-resize": true,
+									onMouseDown: startResize
+								}),
+								(0, react_jsx_runtime.jsx)("div", {
+									className: PendingPanel_module_css_default.detail,
+									children: selectedFile === void 0 ? (0, react_jsx_runtime.jsx)("p", {
+										className: PendingPanel_module_css_default.detailEmpty,
+										children: t("panel.selectHint")
+									}) : (0, react_jsx_runtime.jsx)(PendingDiff, {
+										file: selectedFile,
+										busy: snapshot.busy.has(selectedFile.id),
+										workspacePath: snapshot.workspacePath,
+										jumpSignal,
+										undoFlash,
+										failedMessage: failed.get(selectedFile.id),
+										onPasteReference,
+										t,
+										onKeep,
+										onRevert,
+										onBlockKeep,
+										onBlockRevert,
+										onOpen
+									})
 								})
-							})]
+							]
 						})]
-					}), snapshot.error !== void 0 || !snapshot.read || files.length === 0 ? (0, react_jsx_runtime.jsxs)("div", {
-						className: PendingPanel_module_css_default.states,
-						children: [
-							snapshot.error !== void 0 && (0, react_jsx_runtime.jsx)("p", {
-								className: PendingPanel_module_css_default.readError,
-								role: "alert",
-								children: t("panel.readFailed", { message: snapshot.error })
-							}),
-							!snapshot.read && snapshot.error === void 0 && (0, react_jsx_runtime.jsx)("p", {
-								className: PendingPanel_module_css_default.note,
-								children: t("panel.loading")
-							}),
-							snapshot.read && snapshot.error === void 0 && files.length === 0 && (0, react_jsx_runtime.jsx)("p", {
-								className: PendingPanel_module_css_default.note,
-								children: t("panel.empty")
-							})
-						]
-					}) : (0, react_jsx_runtime.jsxs)("div", {
-						className: PendingPanel_module_css_default.split,
-						children: [
-							(0, react_jsx_runtime.jsxs)("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", {
-									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)
-								})] })]
-							}),
-							(0, react_jsx_runtime.jsx)("div", {
-								className: PendingPanel_module_css_default.resizeHandle,
-								"data-diff-resize": true,
-								onMouseDown: startResize
-							}),
-							(0, react_jsx_runtime.jsx)("div", {
-								className: PendingPanel_module_css_default.detail,
-								children: selectedFile === void 0 ? (0, react_jsx_runtime.jsx)("p", {
-									className: PendingPanel_module_css_default.detailEmpty,
-									children: t("panel.selectHint")
-								}) : (0, react_jsx_runtime.jsx)(PendingDiff, {
-									file: selectedFile,
-									busy: snapshot.busy.has(selectedFile.id),
-									workspacePath: snapshot.workspacePath,
-									t,
-									onKeep,
-									onRevert,
-									onBlockKeep,
-									onBlockRevert,
-									onOpen
+					}),
+					(0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.footerButtons,
+						children: (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: noSession ? `${PendingPanel_module_css_default.badge} ${PendingPanel_module_css_default.badgeDisabled}` : PendingPanel_module_css_default.badge,
+							"data-diff-approval-badge": files.length,
+							"data-active": open ? "" : void 0,
+							"aria-label": t("panel.aria"),
+							"aria-expanded": open,
+							disabled: noSession,
+							onClick: toggleOpen,
+							children: [
+								(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconListPenOutline16, { size: wide ? 16 : 18 }),
+								wide && (0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.badgeLabel,
+									children: t("panel.aria")
+								}),
+								(wide || files.length > 0) && (0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.badgeCount,
+									children: files.length
 								})
-							})
-						]
-					})]
-				}), (0, react_jsx_runtime.jsx)("div", {
-					className: PendingPanel_module_css_default.footerButtons,
-					children: (0, react_jsx_runtime.jsxs)("button", {
-						type: "button",
-						className: PendingPanel_module_css_default.badge,
-						"data-diff-approval-badge": files.length,
-						"data-active": open ? "" : void 0,
-						"aria-label": t("panel.aria"),
-						"aria-expanded": open,
-						onClick: toggleOpen,
-						children: [
-							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconListPenOutline16, { size: wide ? 16 : 18 }),
-							wide && (0, react_jsx_runtime.jsx)("span", {
-								className: PendingPanel_module_css_default.badgeLabel,
-								children: t("panel.aria")
-							}),
-							(wide || files.length > 0) && (0, react_jsx_runtime.jsx)("span", {
-								className: PendingPanel_module_css_default.badgeCount,
-								children: files.length
-							})
-						]
+							]
+						})
 					})
+				]
+			});
+		}
+		//#endregion
+		//#region lib/types/client/SettingsTab.js
+		/** DSH Settings top-level section for this plugin's preferences. */
+		/** A pill picker offering the two boolean states 打开 / 关闭. */
+		function OnOffPicker({ value, open, onOpenChange, onSelect, dataAttribute, t }) {
+			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
+				open,
+				onClose: () => {
+					onOpenChange(false);
+				},
+				items: [{
+					id: "on",
+					label: t("action.toggleOn")
+				}, {
+					id: "off",
+					label: t("action.toggleOff")
+				}],
+				selectedId: value ? "on" : "off",
+				onSelect: (id) => {
+					onOpenChange(false);
+					onSelect(id === "on");
+				},
+				align: "end",
+				portal: true,
+				anchor: (0, react_jsx_runtime.jsxs)("button", {
+					type: "button",
+					className: PendingPanel_module_css_default.settingsSelector,
+					"aria-haspopup": "menu",
+					"aria-expanded": open,
+					onClick: () => {
+						onOpenChange(!open);
+					},
+					[dataAttribute]: true,
+					children: [value ? t("action.toggleOn") : t("action.toggleOff"), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: PendingPanel_module_css_default.settingsSelectorChevron })]
+				})
+			});
+		}
+		/** One Agent-preset-style preference row: title + description, pill picker right. */
+		function PreferenceRow({ title, description, value, open, onOpenChange, onSelect, dataAttribute, t }) {
+			return (0, react_jsx_runtime.jsxs)("div", {
+				className: PendingPanel_module_css_default.settingsRow,
+				children: [(0, react_jsx_runtime.jsxs)("div", {
+					className: PendingPanel_module_css_default.settingsRowText,
+					children: [(0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.settingsRowTitle,
+						children: title
+					}), (0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.settingsRowDesc,
+						children: description
+					})]
+				}), (0, react_jsx_runtime.jsx)(OnOffPicker, {
+					value,
+					open,
+					onOpenChange,
+					onSelect,
+					dataAttribute,
+					t
+				})]
+			});
+		}
+		/**
+		* The plugin's preferences: auto-paste a copied reference into the input, and
+		* whether importing workspace VCS changes includes untracked files. Each row
+		* mirrors the harness's Agent-preset row (title + description on the left, a
+		* pill picker on the right) with the two boolean states 打开 / 关闭.
+		*/
+		function DiffApprovalSettingsTab({ t }) {
+			const [pasteOnCopy, setPasteOnCopyState] = (0, react.useState)(pasteOnCopyEnabled);
+			const [pasteOnCopyOpen, setPasteOnCopyOpen] = (0, react.useState)(false);
+			const [includeUntracked, setIncludeUntrackedState] = (0, react.useState)(includeUntrackedEnabled);
+			const [includeUntrackedOpen, setIncludeUntrackedOpen] = (0, react.useState)(false);
+			const setPasteOnCopy = (value) => {
+				setPasteOnCopyState(value);
+				setPasteOnCopyEnabled(value);
+			};
+			const setIncludeUntracked = (value) => {
+				setIncludeUntrackedState(value);
+				setIncludeUntrackedEnabled(value);
+			};
+			return (0, react_jsx_runtime.jsxs)("div", {
+				className: PendingPanel_module_css_default.settingsPage,
+				"data-diff-settings": true,
+				children: [(0, react_jsx_runtime.jsx)(PreferenceRow, {
+					title: t("panel.pasteOnCopy"),
+					description: t("panel.pasteOnCopyDesc"),
+					value: pasteOnCopy,
+					open: pasteOnCopyOpen,
+					onOpenChange: setPasteOnCopyOpen,
+					onSelect: setPasteOnCopy,
+					dataAttribute: "data-diff-paste-on-copy-select",
+					t
+				}), (0, react_jsx_runtime.jsx)(PreferenceRow, {
+					title: t("panel.importUntracked"),
+					description: t("panel.importUntrackedDesc"),
+					value: includeUntracked,
+					open: includeUntrackedOpen,
+					onOpenChange: setIncludeUntrackedOpen,
+					onSelect: setIncludeUntracked,
+					dataAttribute: "data-diff-import-untracked-select",
+					t
 				})]
 			});
 		}
@@ -12700,6 +13299,18 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						block
 					}));
 				},
+				async undo(sessionId) {
+					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "undo", { sessionId }));
+				},
+				async redo(sessionId) {
+					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "redo", { sessionId }));
+				},
+				async importVcs(sessionId, includeUntracked) {
+					return importValueOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "vcs-import", {
+						sessionId,
+						includeUntracked
+					}));
+				},
 				async open(sessionId, id, action) {
 					return openOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "open", {
 						sessionId,
@@ -12756,8 +13367,25 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			const value = result.value;
 			if (typeof value !== "object" || value === null) throw new Error("the action returned a malformed value");
 			const outcome = value.outcome;
-			if (outcome !== "kept" && outcome !== "reverted" && outcome !== "missing") throw new Error("the action returned a malformed outcome");
-			return { outcome };
+			if (outcome !== "kept" && outcome !== "reverted" && outcome !== "missing" && outcome !== "undone" && outcome !== "redone" && outcome !== "nothing") throw new Error("the action returned a malformed outcome");
+			const id = value.id;
+			return {
+				outcome,
+				id: typeof id === "string" && id.length > 0 ? id : void 0
+			};
+		}
+		/** Narrow the vcs-import endpoint's value; a malformed wire value is a failure. */
+		function importValueOf(result) {
+			if (!result.ok) throw new Error(`${result.error.code}: ${result.error.message}`);
+			const value = result.value;
+			if (typeof value !== "object" || value === null) throw new Error("the import returned a malformed value");
+			const imported = value.imported;
+			const detected = value.detected;
+			if (typeof imported !== "number" || typeof detected !== "boolean") throw new Error("the import returned a malformed value");
+			return {
+				imported,
+				detected
+			};
 		}
 		/** Narrow the open endpoint's value; a malformed wire value is an open failure. */
 		function openOf(result) {
@@ -12779,6 +13407,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		*/
 		/** An empty busy set reused as the snapshot's canonical absent value. */
 		const EMPTY_BUSY = /* @__PURE__ */ new Set();
+		/** An empty failure map reused as the snapshot's canonical absent value. */
+		const EMPTY_FAILED = /* @__PURE__ */ new Map();
+		/** How long a failed keep/revert hint stays visible before it auto-clears. */
+		const FAILED_HINT_MS = 5e3;
 		/**
 		* Create the store over the review-channel port.
 		* @param port - the typed channel port.
@@ -12795,22 +13427,51 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				snapshot = next;
 				for (const listener of [...listeners]) listener();
 			};
+			const failedOf = (value) => value.failed ?? EMPTY_FAILED;
+			/** Record one entry's failed keep/revert with its message; auto-clears after a few seconds. */
+			const markFailed = (id, message) => {
+				publish({
+					...snapshot,
+					failed: new Map([...failedOf(snapshot), [id, message]])
+				});
+				window.setTimeout(() => {
+					if (failedOf(snapshot).get(id) !== message) return;
+					const next = new Map(failedOf(snapshot));
+					next.delete(id);
+					publish({
+						...snapshot,
+						failed: next
+					});
+				}, FAILED_HINT_MS);
+			};
+			/** Drop one entry's failure marker after a successful retry. */
+			const clearFailed = (id) => {
+				if (!failedOf(snapshot).has(id)) return;
+				const next = new Map(failedOf(snapshot));
+				next.delete(id);
+				publish({
+					...snapshot,
+					failed: next
+				});
+			};
 			const withBusy = async (id, action) => {
 				const { error: _cleared, ...base } = snapshot;
 				publish({
 					...base,
+					failed: failedOf(snapshot),
 					busy: /* @__PURE__ */ new Set([...snapshot.busy, id])
 				});
 				try {
 					await action();
 				} catch (error) {
+					markFailed(id, error instanceof Error ? error.message : String(error));
 					publish({
 						...snapshot,
-						error: error instanceof Error ? error.message : String(error),
 						busy: new Set([...snapshot.busy].filter((busy) => busy !== id))
 					});
 					return;
 				}
+				clearFailed(id);
 				publish({
 					...snapshot,
 					files: snapshot.files.filter((file) => file.id !== id),
@@ -12830,7 +13491,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						publish({
 							read: true,
 							files: [],
-							busy: EMPTY_BUSY
+							busy: EMPTY_BUSY,
+							failed: failedOf(snapshot)
 						});
 						return;
 					}
@@ -12840,7 +13502,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							read: true,
 							files,
 							workspacePath,
-							busy: EMPTY_BUSY
+							busy: EMPTY_BUSY,
+							failed: failedOf(snapshot)
 						});
 					} catch (error) {
 						publish({
@@ -12848,7 +13511,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							files: snapshot.files,
 							workspacePath: snapshot.workspacePath,
 							error: error instanceof Error ? error.message : String(error),
-							busy: snapshot.busy
+							busy: snapshot.busy,
+							failed: failedOf(snapshot)
 						});
 					}
 				},
@@ -12871,13 +13535,14 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					try {
 						await port.blockKeep(sessionId, id, block);
 					} catch (error) {
+						markFailed(id, error instanceof Error ? error.message : String(error));
 						publish({
 							...snapshot,
-							error: error instanceof Error ? error.message : String(error),
 							busy: new Set([...snapshot.busy].filter((busy) => busy !== id))
 						});
 						return;
 					}
+					clearFailed(id);
 					await this.refresh(sessionId);
 				},
 				async blockRevert(sessionId, id, block) {
@@ -12889,14 +13554,40 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					try {
 						await port.blockRevert(sessionId, id, block);
 					} catch (error) {
+						markFailed(id, error instanceof Error ? error.message : String(error));
 						publish({
 							...snapshot,
-							error: error instanceof Error ? error.message : String(error),
 							busy: new Set([...snapshot.busy].filter((busy) => busy !== id))
 						});
 						return;
 					}
+					clearFailed(id);
+					await this.refresh(sessionId);
+				},
+				async undo(sessionId) {
+					try {
+						const value = await port.undo(sessionId);
+						await this.refresh(sessionId);
+						const id = value.id;
+						return id !== void 0 && snapshot.files.some((file) => file.id === id) ? id : void 0;
+					} catch {
+						return;
+					}
+				},
+				async redo(sessionId) {
+					try {
+						const value = await port.redo(sessionId);
+						await this.refresh(sessionId);
+						const id = value.id;
+						return id !== void 0 && snapshot.files.some((file) => file.id === id) ? id : void 0;
+					} catch {
+						return;
+					}
+				},
+				async importVcs(sessionId, includeUntracked) {
+					const value = await port.importVcs(sessionId, includeUntracked);
 					await this.refresh(sessionId);
+					return value;
 				},
 				async open(sessionId, id, action) {
 					try {
@@ -12931,15 +13622,25 @@ 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": "回退会删除该新建的文件。",
+			"panel.pasteOnCopy": "复制引用后自动粘贴到消息输入框",
+			"panel.pasteOnCopyDesc": "开启后，复制的引用会自动填入消息输入框，输入框会获得焦点。",
+			"panel.importUntracked": "导入未跟踪的文件改动",
+			"panel.importUntrackedDesc": "开启后，导入工作区改动会包含未跟踪/未版本化的新增文件（Git 未跟踪、SVN 未版本化、Perforce 未版本化）。收集改动需要扫描整个工作区，文件数量大时可能较慢。",
+			"settings.tabLabel": "改动审批",
 			"row.create": "新增文件",
+			"row.failed": "失败",
 			"row.added": "+{added}",
 			"row.removed": "-{removed}",
 			"action.keep": "保留",
 			"action.revert": "回退",
+			"action.keepAll": "全部保留",
+			"action.revertAll": "全部回退",
 			"action.openFile": "打开文件",
 			"action.revealFile": "打开所在目录",
 			"action.busy": "处理中…",
@@ -12950,6 +13651,16 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"action.langAuto": "自动",
 			"action.langAutoDetected": "自动：{lang}",
 			"action.langSelect": "高亮语言",
+			"action.toggleOn": "打开",
+			"action.toggleOff": "关闭",
+			"action.importVcs": "导入工作区改动",
+			"action.importVcsBusy": "导入中…",
+			"panel.importNone": "没有可导入的改动",
+			"panel.importDone": "已导入 {count} 个改动",
+			"panel.importNoVcs": "未检测到版本控制（Git / SVN / Perforce）",
+			"panel.importFailed": "导入失败：{message}",
+			"action.search": "搜索 (Ctrl+F)",
+			"action.settings": "设置",
 			"action.expand": "展开全屏",
 			"action.exitFullscreen": "退出全屏",
 			"action.close": "关闭",
@@ -12967,15 +13678,25 @@ 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.",
+			"panel.pasteOnCopy": "Paste the copied reference into the composer",
+			"panel.pasteOnCopyDesc": "When enabled, a copied reference is pasted into the composer, which then receives focus.",
+			"panel.importUntracked": "Import changes to untracked files",
+			"panel.importUntrackedDesc": "When enabled, importing workspace changes includes new/untracked files (Git-untracked, SVN-unversioned, Perforce-unversioned). Collecting changes scans the whole workspace, which can be slow on large trees.",
+			"settings.tabLabel": "Diff Approval",
 			"row.create": "New file",
+			"row.failed": "Failed",
 			"row.added": "+{added}",
 			"row.removed": "-{removed}",
 			"action.keep": "Keep",
 			"action.revert": "Revert",
+			"action.keepAll": "Keep all",
+			"action.revertAll": "Revert all",
 			"action.openFile": "Open file",
 			"action.revealFile": "Reveal in folder",
 			"action.busy": "Working…",
@@ -12986,6 +13707,16 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"action.langAuto": "Auto",
 			"action.langAutoDetected": "Auto: {lang}",
 			"action.langSelect": "Highlight language",
+			"action.toggleOn": "On",
+			"action.toggleOff": "Off",
+			"action.importVcs": "Import workspace changes",
+			"action.importVcsBusy": "Importing…",
+			"panel.importNone": "No changes to import",
+			"panel.importDone": "Imported {count} changes",
+			"panel.importNoVcs": "No version control detected (Git / SVN / Perforce)",
+			"panel.importFailed": "Import failed: {message}",
+			"action.search": "Search (Ctrl+F)",
+			"action.settings": "Settings",
 			"action.expand": "Expand fullscreen",
 			"action.exitFullscreen": "Exit fullscreen",
 			"action.close": "Close",
@@ -13012,6 +13743,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				zh,
 				en
 			}), "ui-diff-approval: dictionaries");
+			const t = ctx.locale.bind(NS);
 			const store = createPendingDiffStore(createDiffApprovalPort(ctx.get("connection").rpc));
 			ctx.on("connection/reset", () => {
 				store.reset();
@@ -13029,9 +13761,29 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					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)
+					onOpen: (sessionId, id, action) => store.open(sessionId, id, action),
+					onUndo: (sessionId) => store.undo(sessionId),
+					onRedo: (sessionId) => store.redo(sessionId),
+					onImportVcs: (sessionId, includeUntracked) => store.importVcs(sessionId, includeUntracked),
+					onPasteReference: (sessionId, reference) => {
+						const actx = ctx.get("sessions")?.scope(sessionId);
+						if (actx === void 0) return;
+						const conversation = actx.get("conversation");
+						if (conversation?.input === void 0) return;
+						const textarea = document.querySelector("[data-composer-card] textarea");
+						const base = textarea?.value ?? "";
+						conversation.input.for(actx).setDraft(base === "" ? reference : `${base} ${reference}`);
+						textarea?.focus();
+					}
 				})
 			}, PendingPanel));
+			ctx.slots.inject("settings.section", () => ctx.slots.register({
+				name: "settings.section",
+				id: "diff-approval",
+				order: 100,
+				label: () => t("settings.tabLabel"),
+				locale: NS
+			}, DiffApprovalSettingsTab));
 		}
 		//#endregion
 		exports.DIFF_APPROVAL_CHANNEL = DIFF_APPROVAL_CHANNEL;