npm - dsh-diff-approval - Versions diffs - 0.17.0 → 0.18.0 - Mend

dsh-diff-approval 0.17.0 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/lib/client.js +835 -216
package/lib/index.js +37 -3
package/lib/types/client/ColorPicker.d.ts +23 -0
package/lib/types/client/PendingPanel.d.ts +10 -1
package/lib/types/client/locales.d.ts +24 -0
package/lib/types/client/port.d.ts +2 -2
package/lib/types/client/settings.d.ts +38 -0
package/lib/types/client/slots.d.ts +2 -7
package/lib/types/client/store.d.ts +2 -4
package/lib/types/types.d.ts +5 -0
package/package.json +1 -1

package/lib/client.js CHANGED Viewed

@@ -7838,7 +7838,7 @@ window.__ModuleLoader__.load({
 			}
 			return { position: value.length };
 		}
-		function parseColor(sequence) {
+		function parseColor$1(sequence) {
 			const colorMode = sequence.shift();
 			if (colorMode === "2") {
 				const rgb = sequence.splice(0, 3).map((x) => Number.parseInt(x));
@@ -7888,7 +7888,7 @@ window.__ModuleLoader__.load({
 					}
 				});
 				else if (codeInt === 38) {
-					const color = parseColor(sequence);
+					const color = parseColor$1(sequence);
 					if (color) commands.push({
 						type: "setForegroundColor",
 						value: color
@@ -7902,7 +7902,7 @@ window.__ModuleLoader__.load({
 					}
 				});
 				else if (codeInt === 48) {
-					const color = parseColor(sequence);
+					const color = parseColor$1(sequence);
 					if (color) commands.push({
 						type: "setBackgroundColor",
 						value: color
@@ -12384,7 +12384,11 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					});
 					chip.insertAdjacentElement("afterend", btn);
 				}
-				for (const btn of document.querySelectorAll(`[${BUTTON_ATTR}]`)) btn.style.display = "inline-flex";
+				for (const btn of document.querySelectorAll(`[${BUTTON_ATTR}]`)) {
+					const chip = btn.previousElementSibling;
+					const chipHidden = chip !== null && getComputedStyle(chip).display === "none";
+					btn.style.display = chipHidden ? "none" : "inline-flex";
+				}
 			};
 			inject();
 			const observer = new MutationObserver(() => inject());
@@ -12409,6 +12413,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		const TAB_WIDTH_KEY = "diff-approval:tab-size";
 		const SPLIT_MODE_KEY = "diff-approval:split-mode";
 		const NAV_LEAD_KEY = "diff-approval:nav-lead-rows";
+		const DIFF_FONT_SCALE_KEY = "diff-approval:diff-font-scale";
+		const DIFF_LINE_HEIGHT_KEY = "diff-approval:diff-line-height";
+		const DIFF_ADD_COLOR_KEY = "diff-approval:diff-add-color";
+		const DIFF_DEL_COLOR_KEY = "diff-approval:diff-del-color";
 		const WRAP_PREFIX = "diff-approval:wrap:";
 		/**
 		* Whether copying a reference should also paste it into the chat input and
@@ -12465,6 +12473,68 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			localStorage.setItem(TAB_WIDTH_KEY, String(value));
 		}
 		/**
+		* The diff code font size as a percentage of the current (theme) size. Defaults
+		* to 100 (the current look); the settings UI steps it by ±10.
+		* @returns the font-size scale, as a percentage (e.g. 100, 110, 90).
+		*/
+		function diffFontScale() {
+			const raw = Number.parseInt(localStorage.getItem(DIFF_FONT_SCALE_KEY) ?? "", 10);
+			if (!Number.isFinite(raw)) return 100;
+			return Math.max(50, Math.min(200, raw));
+		}
+		/** Persist the diff's code font-size scale (a percentage). */
+		function setDiffFontScale(value) {
+			localStorage.setItem(DIFF_FONT_SCALE_KEY, String(Math.max(50, Math.min(200, value))));
+		}
+		/**
+		* The diff code line height in px (the fixed row height the virtual window and
+		* jump math are keyed to). Defaults to 22 (the pre-customization value).
+		* @returns the line height in px.
+		*/
+		function diffLineHeight() {
+			const raw = Number.parseInt(localStorage.getItem(DIFF_LINE_HEIGHT_KEY) ?? "", 10);
+			if (!Number.isFinite(raw)) return 22;
+			return Math.max(10, Math.min(36, raw));
+		}
+		/** Persist the diff's code line height (px). */
+		function setDiffLineHeight(value) {
+			localStorage.setItem(DIFF_LINE_HEIGHT_KEY, String(Math.max(10, Math.min(36, value))));
+		}
+		/** Read a theme CSS custom property, with a fallback when it is unavailable. */
+		function themeColor(name, fallback) {
+			if (typeof document !== "undefined") {
+				const v = getComputedStyle(document.documentElement).getPropertyValue(name).trim();
+				if (/^#[0-9a-f]{6}$/i.test(v)) return v;
+			}
+			return fallback;
+		}
+		/** The added-line base color the user chose, or `undefined` (theme color). */
+		function diffAddColor() {
+			const v = localStorage.getItem(DIFF_ADD_COLOR_KEY);
+			return v !== null && v.length > 0 ? v : void 0;
+		}
+		/** Persist the added-line base color (a hex like `#22c55e`). */
+		function setDiffAddColor(value) {
+			localStorage.setItem(DIFF_ADD_COLOR_KEY, value);
+		}
+		/** The removed-line base color the user chose, or `undefined` (theme color). */
+		function diffDelColor() {
+			const v = localStorage.getItem(DIFF_DEL_COLOR_KEY);
+			return v !== null && v.length > 0 ? v : void 0;
+		}
+		/** Persist the removed-line base color (a hex like `#ef4444`). */
+		function setDiffDelColor(value) {
+			localStorage.setItem(DIFF_DEL_COLOR_KEY, value);
+		}
+		/** The theme's added-line base color, for the settings swatch default. */
+		function currentDiffAddColor() {
+			return themeColor("--dsw-alias-state-success-primary", "#22c55e");
+		}
+		/** The theme's removed-line base color, for the settings swatch default. */
+		function currentDiffDelColor() {
+			return themeColor("--dsw-alias-state-error-primary", "#ef4444");
+		}
+		/**
 		* Whether the whole-file diff view uses the two-column (side-by-side) layout.
 		* Default off (single column): the unified diff. Only an explicit `'1'` enables
 		* split mode.
@@ -12550,7 +12620,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		}
 		//#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% + 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_settingsGroup{border-bottom:1px solid var(--dsw-alias-border-l2);margin-top:8px}.F1KBNa_settingsGroupHeader{width:100%;color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer;background:0 0;border:none;align-items:center;gap:8px;padding:12px 0;display:flex}.F1KBNa_settingsGroupTitle{font-size:14px;font-weight:400;line-height:22px}.F1KBNa_settingsGroupChevron{margin-left:auto;transition:transform .15s}.F1KBNa_settingsGroup[data-open] .F1KBNa_settingsGroupChevron{transform:rotate(180deg)}.F1KBNa_settingsGroup[data-open] .F1KBNa_settingsGroupHeader{border-bottom:1px solid var(--dsw-alias-border-l2)}.F1KBNa_settingsGroupBody{display:grid}.F1KBNa_settingsGroupBody .F1KBNa_settingsRow{padding-left:16px}.F1KBNa_settingsGroupBody .F1KBNa_settingsRow:last-child,.F1KBNa_settingsPage>.F1KBNa_settingsRow:last-child{border-bottom:none}.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_toggle{border:1px solid var(--dsw-alias-border-l2);cursor:pointer;background:0 0;border-radius:18px;flex:none;width:60px;height:36px;padding:0;position:relative}.F1KBNa_toggle:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_toggle:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}.F1KBNa_toggleOn{border-color:var(--dsw-alias-state-business-primary);background:var(--dsw-alias-state-business-primary)}.F1KBNa_toggleOn:hover{background:var(--dsw-alias-state-business-primary)}.F1KBNa_toggleThumb{background:var(--dsw-alias-label-primary);border-radius:50%;width:28px;height:28px;transition:left .12s;position:absolute;top:3px;left:3px}.F1KBNa_toggleOn .F1KBNa_toggleThumb{background:#fff;left:27px}.F1KBNa_stepper{align-items:center;gap:6px;display:inline-flex}.F1KBNa_stepperButton{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-module-platform);width:32px;height:32px;color:var(--dsw-alias-label-primary);cursor:pointer;border-radius:8px;padding:0;position:relative}.F1KBNa_stepperButton:before,.F1KBNa_stepperButton:after{content:\"\";background:currentColor;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.F1KBNa_stepperButton:before{width:10px;height:1px}.F1KBNa_stepperButton:after{width:1px;height:10px;display:none}.F1KBNa_stepperButtonUp:after{display:block}.F1KBNa_stepperButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_stepperButton:disabled{color:var(--dsw-alias-label-tertiary);cursor:default}.F1KBNa_stepperValue{text-align:center;min-width:2ch;color:var(--dsw-alias-label-primary);font-variant-numeric:tabular-nums;font-size:14px;line-height:22px}.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;position:relative}.F1KBNa_fileListFloat{z-index:40;box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);box-shadow:var(--dsw-shadow-lv2);border-radius:12px;flex-direction:column;padding:6px 8px 10px;display:flex;position:absolute;overflow:hidden}.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_confirmBackdrop{z-index:5;background:color-mix(in srgb, var(--dsw-alias-bg-base) 55%, transparent);justify-content:center;align-items:center;padding:24px;display:flex;position:absolute;inset:0}.F1KBNa_confirmCard{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);max-width:340px;box-shadow:var(--dsw-shadow-lv3);border-radius:12px;flex-direction:column;gap:12px;padding:16px;display:flex}.F1KBNa_confirmText{font:var(--dsw-font-caption);color:var(--dsw-alias-label-primary);overflow-wrap:anywhere;margin:0;line-height:1.5}.F1KBNa_confirmActions{justify-content:flex-end;gap:8px;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{white-space:nowrap;min-width:0;color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block);-webkit-user-select:text;user-select:text;flex:1;font-size:12px;line-height:18px;overflow:auto 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_divider{background:var(--dsw-alias-border-l1);align-self:stretch;width:1px;margin:2px 0}.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);-webkit-text-size-adjust:100%;text-size-adjust:100%;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_searchMatch{background-color:#facc1542;border-radius:2px}.F1KBNa_searchMatchCurrent{background-color:#facc1599;border-radius:2px}.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_diffFlashFade;position:absolute;left:0;right:0}.F1KBNa_blockFlashShake{animation:.7s ease-out forwards F1KBNa_diffFlashShake}@keyframes F1KBNa_diffFlashFade{0%{opacity:1}to{opacity:0}}@keyframes F1KBNa_diffFlashShake{0%{opacity:1;transform:translateY(0)}10%{transform:translateY(1px)}20%{transform:translateY(-1px)}30%{transform:translateY(1px)}40%{transform:translateY(-1px)}50%{transform:translateY(1px)}60%{transform:translateY(-1px)}70%{opacity:1;transform:translateY(0)}to{opacity:0;transform:translateY(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{-webkit-user-select:none;user-select:none;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;-webkit-user-select:none;user-select:none;cursor:default;padding-right:10px;display:table-cell}.F1KBNa_code{white-space:pre;-webkit-user-select:text;user-select:text;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;gap:8px;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}.F1KBNa_notice{z-index:60;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);max-width:360px;box-shadow:var(--dsw-shadow-lv3);border-radius:10px;align-items:flex-start;gap:12px;padding:12px 14px;display:flex;position:fixed;bottom:24px;right:24px}.F1KBNa_noticeText{font:var(--dsw-font-caption);color:var(--dsw-alias-label-primary);flex:1;margin:0;line-height:1.45}.F1KBNa_noticeButton{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);font:var(--dsw-font-caption);cursor:pointer;border-radius:6px;flex:none;padding:4px 10px}.F1KBNa_noticeButton:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_wrap .F1KBNa_line{height:auto;min-height:22px}.F1KBNa_subline{white-space:pre;height:22px;line-height:22px;display:block;overflow:hidden}.F1KBNa_wrapActive{background:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary);color:var(--dsw-static-neutral-bluish-50)}.F1KBNa_wrapActive:hover{background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 85%, var(--dsw-static-neutral-bluish-1000))}.F1KBNa_splitRoot{flex-direction:column;flex:1;min-height:0;display:flex;position:relative}.F1KBNa_diffBodySplit{flex:1;min-height:0;overflow-x:hidden}.F1KBNa_splitCols{width:100%;min-width:0;display:flex}.F1KBNa_splitCol{box-sizing:border-box;flex:1 1 0;min-width:0;overflow:hidden}.F1KBNa_splitDivider{background:var(--dsw-alias-border-l2);flex:0 0 1px}.F1KBNa_splitCol .F1KBNa_gutter,.F1KBNa_splitCol .F1KBNa_code{vertical-align:top}.F1KBNa_splitHScrollRow{border-top:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);flex:none;width:100%;min-width:0;display:flex}.F1KBNa_splitHScroll{flex:1 1 0;min-width:0;height:15px;overflow:auto hidden}.F1KBNa_splitHScroll::-webkit-scrollbar{height:15px}.F1KBNa_splitHScroll::-webkit-scrollbar-track{cursor:default}.F1KBNa_splitHScroll::-webkit-scrollbar-thumb{cursor:default}.F1KBNa_splitHScrollFill{height:1px}.F1KBNa_splitLdel{background-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 12%, transparent)}.F1KBNa_splitLadd{background-color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 10%, transparent)}.F1KBNa_splitRdel{background-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 12%, transparent)}.F1KBNa_splitRadd{background-color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 10%, transparent)}.F1KBNa_intraDel{background-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 26%, transparent);text-decoration:line-through}.F1KBNa_intraAdd{background-color:color-mix(in srgb, var(--dsw-alias-state-success-primary) 24%, transparent)}";
+		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_settingsGroup{border-bottom:1px solid var(--dsw-alias-border-l2);margin-top:8px}.F1KBNa_settingsGroupHeader{width:100%;color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer;text-align:left;background:0 0;border:none;align-items:center;gap:8px;padding:12px 0;display:flex}.F1KBNa_settingsGroupText{text-align:left;flex-direction:column;flex:1;gap:2px;min-width:0;display:flex}.F1KBNa_settingsGroupTitle{font-size:14px;font-weight:400;line-height:22px}.F1KBNa_settingsGroupDesc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}.F1KBNa_settingsGroupChevron{margin-left:auto;transition:transform .15s}.F1KBNa_settingsGroup[data-open] .F1KBNa_settingsGroupChevron{transform:rotate(180deg)}.F1KBNa_settingsGroup[data-open] .F1KBNa_settingsGroupHeader{border-bottom:1px solid var(--dsw-alias-border-l2)}.F1KBNa_settingsGroupBody{flex-direction:column;display:flex}.F1KBNa_settingsGroupBody .F1KBNa_settingsRow{padding-left:16px}.F1KBNa_settingsGroupBody .F1KBNa_settingsRow:last-child,.F1KBNa_settingsPage>.F1KBNa_settingsRow:last-child{border-bottom:none}.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_colorPicker{position:relative}.F1KBNa_colorPickerTrigger{background:var(--dsw-alias-bg-module-platform);width:120px;height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:8px;padding:0 8px;font-size:12px;line-height:18px;display:inline-flex}.F1KBNa_colorPickerTrigger:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_colorSwatch{border:1px solid var(--dsw-alias-border-l2);border-radius:50%;flex:none;width:24px;height:24px}.F1KBNa_colorValue{text-overflow:ellipsis;white-space:nowrap;font-variant-numeric:tabular-nums;flex:1;min-width:0;overflow:hidden}.F1KBNa_colorPickerChevron{flex:none}.F1KBNa_colorBackdrop{z-index:40;position:fixed;inset:0}.F1KBNa_colorPickerPopover{z-index:41;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);box-shadow:var(--dsw-shadow-lv2);border-radius:10px;padding:10px;position:absolute;top:calc(100% + 6px);right:0}.F1KBNa_colorPickerPanel{flex-direction:column;gap:8px;display:flex}.F1KBNa_colorPickerInputRow{align-items:center;gap:8px;display:flex}.F1KBNa_colorPickerPreview{border:1px solid var(--dsw-alias-border-l2);border-radius:6px;flex:none;width:22px;height:22px}.F1KBNa_colorPickerInput{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-module-platform);min-width:0;height:30px;font:inherit;color:var(--dsw-alias-label-primary);border-radius:8px;flex:1;padding:0 8px;font-size:12px;line-height:28px}.F1KBNa_colorPickerInput:focus{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}.F1KBNa_colorSv{border:1px solid var(--dsw-alias-border-l1);cursor:crosshair;touch-action:none;border-radius:8px;height:140px;position:relative}.F1KBNa_colorSvCursor{pointer-events:none;border:2px solid #fff;border-radius:50%;width:14px;height:14px;position:absolute;transform:translate(-50%,-50%);box-shadow:0 0 0 1px #00000080}.F1KBNa_colorHue{border:1px solid var(--dsw-alias-border-l1);cursor:pointer;touch-action:none;border-radius:7px;height:14px;position:relative}.F1KBNa_colorHueCursor{pointer-events:none;border:2px solid #fff;border-radius:50%;width:16px;height:16px;position:absolute;top:50%;transform:translate(-50%,-50%);box-shadow:0 0 0 1px #00000080}.F1KBNa_diffPreview{z-index:2;border:1px solid var(--dsw-alias-border-l1);font:var(--dsw-font-markdown-code-block);background:var(--dsw-alias-markdown-code-block);border-radius:8px;margin-bottom:8px;padding:8px;position:sticky;top:0;overflow:hidden}.F1KBNa_diffPreviewTitle{color:var(--dsw-alias-label-tertiary);margin-bottom:6px;font-family:inherit;font-size:12px;line-height:18px}.F1KBNa_diffPreviewScroll{height:132px;overflow-y:auto}.F1KBNa_toggle{border:1px solid var(--dsw-alias-border-l2);cursor:pointer;background:0 0;border-radius:18px;flex:none;width:60px;height:36px;padding:0;position:relative}.F1KBNa_toggle:hover{background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_toggle:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}.F1KBNa_toggleOn{border-color:var(--dsw-alias-state-business-primary);background:var(--dsw-alias-state-business-primary)}.F1KBNa_toggleOn:hover{background:var(--dsw-alias-state-business-primary)}.F1KBNa_toggleThumb{background:var(--dsw-alias-label-primary);border-radius:50%;width:28px;height:28px;transition:left .12s;position:absolute;top:3px;left:3px}.F1KBNa_toggleOn .F1KBNa_toggleThumb{background:#fff;left:27px}.F1KBNa_stepper{align-items:center;gap:6px;display:inline-flex}.F1KBNa_stepperButton{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-module-platform);width:32px;height:32px;color:var(--dsw-alias-label-primary);cursor:pointer;border-radius:8px;padding:0;position:relative}.F1KBNa_stepperButton:before,.F1KBNa_stepperButton:after{content:\"\";background:currentColor;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.F1KBNa_stepperButton:before{width:10px;height:1px}.F1KBNa_stepperButton:after{width:1px;height:10px;display:none}.F1KBNa_stepperButtonUp:after{display:block}.F1KBNa_stepperButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.F1KBNa_stepperButton:disabled{color:var(--dsw-alias-label-tertiary);cursor:default}.F1KBNa_stepperValue{text-align:center;min-width:2ch;color:var(--dsw-alias-label-primary);font-variant-numeric:tabular-nums;font-size:14px;line-height:22px}.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;position:relative}.F1KBNa_fileListFloat{z-index:40;box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);box-shadow:var(--dsw-shadow-lv2);border-radius:12px;flex-direction:column;padding:6px 8px 10px;display:flex;position:absolute;overflow:hidden}.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_confirmBackdrop{z-index:5;background:color-mix(in srgb, var(--dsw-alias-bg-base) 55%, transparent);justify-content:center;align-items:center;padding:24px;display:flex;position:absolute;inset:0}.F1KBNa_confirmCard{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);max-width:340px;box-shadow:var(--dsw-shadow-lv3);border-radius:12px;flex-direction:column;gap:12px;padding:16px;display:flex}.F1KBNa_confirmText{font:var(--dsw-font-caption);color:var(--dsw-alias-label-primary);overflow-wrap:anywhere;margin:0;line-height:1.5}.F1KBNa_confirmActions{justify-content:flex-end;gap:8px;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(--dsh-diff-add-color,var(--dsw-alias-state-success-primary)) 60%, var(--dsw-alias-label-primary))}.F1KBNa_delCount{color:color-mix(in srgb, var(--dsh-diff-del-color,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{white-space:nowrap;min-width:0;color:var(--dsw-alias-label-primary);font:var(--dsw-font-markdown-code-block);-webkit-user-select:text;user-select:text;flex:1;font-size:12px;line-height:18px;overflow:auto 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_divider{background:var(--dsw-alias-border-l1);align-self:stretch;width:1px;margin:2px 0}.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);-webkit-text-size-adjust:100%;text-size-adjust:100%;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_searchMatch{background-color:#facc1542;border-radius:2px}.F1KBNa_searchMatchCurrent{background-color:#facc1599;border-radius:2px}.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_diffFlashFade;position:absolute;left:0;right:0}.F1KBNa_blockFlashShake{animation:.7s ease-out forwards F1KBNa_diffFlashShake}@keyframes F1KBNa_diffFlashFade{0%{opacity:1}to{opacity:0}}@keyframes F1KBNa_diffFlashShake{0%{opacity:1;transform:translateY(0)}10%{transform:translateY(1px)}20%{transform:translateY(-1px)}30%{transform:translateY(1px)}40%{transform:translateY(-1px)}50%{transform:translateY(1px)}60%{transform:translateY(-1px)}70%{opacity:1;transform:translateY(0)}to{opacity:0;transform:translateY(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%;font-size:calc(1em * var(--dsh-diff-font-scale,1));display:table}.F1KBNa_line{height:var(--dsh-diff-line-height,22px);line-height:var(--dsh-diff-line-height,22px);-webkit-user-select:none;user-select:none;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;-webkit-user-select:none;user-select:none;cursor:default;padding-right:10px;display:table-cell}.F1KBNa_code{white-space:pre;-webkit-user-select:text;user-select:text;display:table-cell}.F1KBNa_context{color:var(--dsw-alias-label-primary)}.F1KBNa_del{background-color:color-mix(in srgb, var(--dsh-diff-del-color,var(--dsw-alias-state-error-primary)) 12%, transparent)}.F1KBNa_add{background-color:color-mix(in srgb, var(--dsh-diff-add-color,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;gap:8px;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}.F1KBNa_notice{z-index:60;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-base);max-width:360px;box-shadow:var(--dsw-shadow-lv3);border-radius:10px;align-items:flex-start;gap:12px;padding:12px 14px;display:flex;position:fixed;bottom:24px;right:24px}.F1KBNa_noticeText{font:var(--dsw-font-caption);color:var(--dsw-alias-label-primary);flex:1;margin:0;line-height:1.45}.F1KBNa_noticeButton{border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);font:var(--dsw-font-caption);cursor:pointer;border-radius:6px;flex:none;padding:4px 10px}.F1KBNa_noticeButton:hover{background:var(--dsw-alias-interactive-bg-hover-solid)}.F1KBNa_wrap .F1KBNa_line{height:auto;min-height:var(--dsh-diff-line-height,22px)}.F1KBNa_subline{height:var(--dsh-diff-line-height,22px);line-height:var(--dsh-diff-line-height,22px);white-space:pre;display:block;overflow:hidden}.F1KBNa_wrapActive{background:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary);color:var(--dsw-static-neutral-bluish-50)}.F1KBNa_wrapActive:hover{background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 85%, var(--dsw-static-neutral-bluish-1000))}.F1KBNa_splitRoot{flex-direction:column;flex:1;min-height:0;display:flex;position:relative}.F1KBNa_diffBodySplit{flex:1;min-height:0;overflow-x:hidden}.F1KBNa_splitCols{width:100%;min-width:0;display:flex}.F1KBNa_splitCol{box-sizing:border-box;flex:1 1 0;min-width:0;overflow:hidden}.F1KBNa_splitDivider{background:var(--dsw-alias-border-l2);flex:0 0 1px}.F1KBNa_splitCol .F1KBNa_gutter,.F1KBNa_splitCol .F1KBNa_code{vertical-align:top}.F1KBNa_splitHScrollRow{border-top:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);flex:none;width:100%;min-width:0;display:flex}.F1KBNa_splitHScroll{flex:1 1 0;min-width:0;height:15px;overflow:auto hidden}.F1KBNa_splitHScroll::-webkit-scrollbar{height:15px}.F1KBNa_splitHScroll::-webkit-scrollbar-track{cursor:default}.F1KBNa_splitHScroll::-webkit-scrollbar-thumb{cursor:default}.F1KBNa_splitHScrollFill{height:1px}.F1KBNa_splitLdel{background-color:color-mix(in srgb, var(--dsh-diff-del-color,var(--dsw-alias-state-error-primary)) 12%, transparent)}.F1KBNa_splitLadd{background-color:color-mix(in srgb, var(--dsh-diff-add-color,var(--dsw-alias-state-success-primary)) 10%, transparent)}.F1KBNa_splitRdel{background-color:color-mix(in srgb, var(--dsh-diff-del-color,var(--dsw-alias-state-error-primary)) 12%, transparent)}.F1KBNa_splitRadd{background-color:color-mix(in srgb, var(--dsh-diff-add-color,var(--dsw-alias-state-success-primary)) 10%, transparent)}.F1KBNa_intraDel{background-color:color-mix(in srgb, var(--dsh-diff-del-color,var(--dsw-alias-state-error-primary)) 26%, transparent);text-decoration:line-through}.F1KBNa_intraAdd{background-color:color-mix(in srgb, var(--dsh-diff-add-color,var(--dsw-alias-state-success-primary)) 24%, transparent)}";
 		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");
@@ -12560,134 +12630,154 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			document.head.appendChild(tag);
 		}
 		var PendingPanel_module_css_default = {
-			"stepperButton": "F1KBNa_stepperButton",
-			"divergedHint": "F1KBNa_divergedHint",
-			"delCount": "F1KBNa_delCount",
-			"expandExpanded": "F1KBNa_expandExpanded",
-			"noticeButton": "F1KBNa_noticeButton",
-			"detail": "F1KBNa_detail",
-			"settingsRow": "F1KBNa_settingsRow",
-			"diffFlashFade": "F1KBNa_diffFlashFade",
-			"searchMatch": "F1KBNa_searchMatch",
-			"rail": "F1KBNa_rail",
-			"title": "F1KBNa_title",
-			"importNote": "F1KBNa_importNote",
-			"diffFlashShake": "F1KBNa_diffFlashShake",
-			"line": "F1KBNa_line",
-			"split": "F1KBNa_split",
-			"missing": "F1KBNa_missing",
+			"confirmBackdrop": "F1KBNa_confirmBackdrop",
+			"statusBar": "F1KBNa_statusBar",
+			"layer": "F1KBNa_layer",
+			"flexSpacer": "F1KBNa_flexSpacer",
+			"fileListFloat": "F1KBNa_fileListFloat",
 			"searchBar": "F1KBNa_searchBar",
-			"splitHScroll": "F1KBNa_splitHScroll",
-			"splitRadd": "F1KBNa_splitRadd",
+			"splitHScrollRow": "F1KBNa_splitHScrollRow",
+			"intraAdd": "F1KBNa_intraAdd",
+			"settingsRowDesc": "F1KBNa_settingsRowDesc",
+			"settingsRow": "F1KBNa_settingsRow",
+			"toggleOn": "F1KBNa_toggleOn",
 			"noteCentered": "F1KBNa_noteCentered",
-			"overviewRuler": "F1KBNa_overviewRuler",
-			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
-			"states": "F1KBNa_states",
+			"colorPickerInput": "F1KBNa_colorPickerInput",
+			"divider": "F1KBNa_divider",
+			"del": "F1KBNa_del",
+			"emptyState": "F1KBNa_emptyState",
+			"settingsGroup": "F1KBNa_settingsGroup",
+			"expand": "F1KBNa_expand",
+			"diffFlashFade": "F1KBNa_diffFlashFade",
 			"vSpacer": "F1KBNa_vSpacer",
-			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
-			"resizeHandle": "F1KBNa_resizeHandle",
-			"diffBodySplit": "F1KBNa_diffBodySplit",
-			"splitCol": "F1KBNa_splitCol",
-			"badge": "F1KBNa_badge",
-			"settingsGroupHeader": "F1KBNa_settingsGroupHeader",
-			"code": "F1KBNa_code",
-			"settingsGroupTitle": "F1KBNa_settingsGroupTitle",
-			"toggleOn": "F1KBNa_toggleOn",
-			"diffPath": "F1KBNa_diffPath",
-			"confirmText": "F1KBNa_confirmText",
-			"searchCount": "F1KBNa_searchCount",
-			"blockFlashShake": "F1KBNa_blockFlashShake",
-			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
-			"hint": "F1KBNa_hint",
-			"settingsGroupBody": "F1KBNa_settingsGroupBody",
-			"group": "F1KBNa_group",
-			"wrap": "F1KBNa_wrap",
-			"splitHScrollRow": "F1KBNa_splitHScrollRow",
-			"header": "F1KBNa_header",
+			"settingsPage": "F1KBNa_settingsPage",
+			"kindTag": "F1KBNa_kindTag",
+			"splitRoot": "F1KBNa_splitRoot",
+			"searchMatch": "F1KBNa_searchMatch",
+			"rowMeta": "F1KBNa_rowMeta",
+			"splitDivider": "F1KBNa_splitDivider",
+			"colorSv": "F1KBNa_colorSv",
 			"iconAction": "F1KBNa_iconAction",
+			"blockPosition": "F1KBNa_blockPosition",
+			"stepperValue": "F1KBNa_stepperValue",
+			"kindHint": "F1KBNa_kindHint",
+			"colorValue": "F1KBNa_colorValue",
+			"toggle": "F1KBNa_toggle",
+			"diffPreviewScroll": "F1KBNa_diffPreviewScroll",
+			"row": "F1KBNa_row",
 			"gutter": "F1KBNa_gutter",
-			"diffActions": "F1KBNa_diffActions",
-			"settingsPage": "F1KBNa_settingsPage",
-			"badgeCount": "F1KBNa_badgeCount",
+			"actionPrimary": "F1KBNa_actionPrimary",
+			"noticeButton": "F1KBNa_noticeButton",
+			"wrapActive": "F1KBNa_wrapActive",
+			"markerAdd": "F1KBNa_markerAdd",
+			"stepperButton": "F1KBNa_stepperButton",
+			"colorBackdrop": "F1KBNa_colorBackdrop",
+			"wrap": "F1KBNa_wrap",
+			"markerDel": "F1KBNa_markerDel",
+			"actionError": "F1KBNa_actionError",
+			"missingHint": "F1KBNa_missingHint",
+			"settingsGroupTitle": "F1KBNa_settingsGroupTitle",
+			"searchMatchCurrent": "F1KBNa_searchMatchCurrent",
+			"addCount": "F1KBNa_addCount",
+			"searchInput": "F1KBNa_searchInput",
 			"footerButtons": "F1KBNa_footerButtons",
+			"colorPickerPanel": "F1KBNa_colorPickerPanel",
+			"rail": "F1KBNa_rail",
+			"close": "F1KBNa_close",
 			"noticeText": "F1KBNa_noticeText",
-			"detailEmpty": "F1KBNa_detailEmpty",
-			"divider": "F1KBNa_divider",
-			"searchMatchCurrent": "F1KBNa_searchMatchCurrent",
-			"splitLadd": "F1KBNa_splitLadd",
-			"actionError": "F1KBNa_actionError",
-			"expand": "F1KBNa_expand",
-			"blockPosition": "F1KBNa_blockPosition",
-			"splitHScrollFill": "F1KBNa_splitHScrollFill",
-			"badgeLabel": "F1KBNa_badgeLabel",
-			"stepper": "F1KBNa_stepper",
-			"statusBar": "F1KBNa_statusBar",
-			"markerDel": "F1KBNa_markerDel",
 			"confirmCard": "F1KBNa_confirmCard",
+			"intraDel": "F1KBNa_intraDel",
+			"header": "F1KBNa_header",
+			"settingsSelectorChevron": "F1KBNa_settingsSelectorChevron",
 			"blockActions": "F1KBNa_blockActions",
-			"toggle": "F1KBNa_toggle",
-			"missingHint": "F1KBNa_missingHint",
-			"diffHeader": "F1KBNa_diffHeader",
-			"splitRdel": "F1KBNa_splitRdel",
-			"headerActions": "F1KBNa_headerActions",
-			"actionPrimary": "F1KBNa_actionPrimary",
-			"readError": "F1KBNa_readError",
-			"splitCols": "F1KBNa_splitCols",
-			"kindHint": "F1KBNa_kindHint",
-			"settingsRowText": "F1KBNa_settingsRowText",
-			"blockFlash": "F1KBNa_blockFlash",
-			"langSelect": "F1KBNa_langSelect",
-			"settingsGroup": "F1KBNa_settingsGroup",
-			"wrapActive": "F1KBNa_wrapActive",
+			"splitHScroll": "F1KBNa_splitHScroll",
+			"splitRadd": "F1KBNa_splitRadd",
 			"rowFailed": "F1KBNa_rowFailed",
-			"del": "F1KBNa_del",
-			"kindTag": "F1KBNa_kindTag",
-			"diff": "F1KBNa_diff",
-			"searchInput": "F1KBNa_searchInput",
-			"lines": "F1KBNa_lines",
-			"stepperButtonUp": "F1KBNa_stepperButtonUp",
-			"confirmActions": "F1KBNa_confirmActions",
-			"listScroll": "F1KBNa_listScroll",
-			"notice": "F1KBNa_notice",
-			"panel": "F1KBNa_panel",
-			"rowHead": "F1KBNa_rowHead",
+			"badge": "F1KBNa_badge",
 			"settingsSelector": "F1KBNa_settingsSelector",
-			"note": "F1KBNa_note",
-			"row": "F1KBNa_row",
-			"markerAdd": "F1KBNa_markerAdd",
-			"intraAdd": "F1KBNa_intraAdd",
-			"importButton": "F1KBNa_importButton",
-			"overviewMarker": "F1KBNa_overviewMarker",
+			"badgeCount": "F1KBNa_badgeCount",
+			"readError": "F1KBNa_readError",
+			"importNote": "F1KBNa_importNote",
+			"statusAction": "F1KBNa_statusAction",
+			"title": "F1KBNa_title",
+			"notice": "F1KBNa_notice",
 			"bulkActions": "F1KBNa_bulkActions",
-			"rowPath": "F1KBNa_rowPath",
+			"blockFlash": "F1KBNa_blockFlash",
+			"rowHead": "F1KBNa_rowHead",
+			"colorSwatch": "F1KBNa_colorSwatch",
+			"split": "F1KBNa_split",
+			"panel": "F1KBNa_panel",
 			"diffStats": "F1KBNa_diffStats",
-			"emptyState": "F1KBNa_emptyState",
+			"detail": "F1KBNa_detail",
+			"code": "F1KBNa_code",
+			"settingsGroupChevron": "F1KBNa_settingsGroupChevron",
+			"settingsRowText": "F1KBNa_settingsRowText",
+			"actionQuietDisabled": "F1KBNa_actionQuietDisabled",
+			"splitHScrollFill": "F1KBNa_splitHScrollFill",
 			"toggleThumb": "F1KBNa_toggleThumb",
-			"stepperValue": "F1KBNa_stepperValue",
-			"settingsRowTitle": "F1KBNa_settingsRowTitle",
-			"diffBody": "F1KBNa_diffBody",
-			"subline": "F1KBNa_subline",
-			"addCount": "F1KBNa_addCount",
-			"layer": "F1KBNa_layer",
-			"intraDel": "F1KBNa_intraDel",
-			"langLabel": "F1KBNa_langLabel",
-			"statusAction": "F1KBNa_statusAction",
-			"action": "F1KBNa_action",
-			"settingsRowDesc": "F1KBNa_settingsRowDesc",
-			"rows": "F1KBNa_rows",
-			"splitRoot": "F1KBNa_splitRoot",
-			"splitDivider": "F1KBNa_splitDivider",
-			"confirmBackdrop": "F1KBNa_confirmBackdrop",
+			"line": "F1KBNa_line",
+			"detailEmpty": "F1KBNa_detailEmpty",
+			"colorSvCursor": "F1KBNa_colorSvCursor",
+			"splitCol": "F1KBNa_splitCol",
+			"colorPickerTrigger": "F1KBNa_colorPickerTrigger",
+			"confirmText": "F1KBNa_confirmText",
+			"colorPickerChevron": "F1KBNa_colorPickerChevron",
+			"fileList": "F1KBNa_fileList",
+			"listScroll": "F1KBNa_listScroll",
+			"confirmActions": "F1KBNa_confirmActions",
+			"headerActions": "F1KBNa_headerActions",
+			"importButton": "F1KBNa_importButton",
+			"settingsGroupHeader": "F1KBNa_settingsGroupHeader",
 			"diffBodyWrap": "F1KBNa_diffBodyWrap",
+			"diffPreviewTitle": "F1KBNa_diffPreviewTitle",
+			"note": "F1KBNa_note",
+			"rows": "F1KBNa_rows",
+			"diffHeader": "F1KBNa_diffHeader",
+			"hint": "F1KBNa_hint",
+			"fullscreenBackdrop": "F1KBNa_fullscreenBackdrop",
+			"searchCount": "F1KBNa_searchCount",
+			"splitRdel": "F1KBNa_splitRdel",
+			"colorHueCursor": "F1KBNa_colorHueCursor",
+			"lines": "F1KBNa_lines",
+			"stepperButtonUp": "F1KBNa_stepperButtonUp",
+			"delCount": "F1KBNa_delCount",
+			"resizeHandle": "F1KBNa_resizeHandle",
 			"splitLdel": "F1KBNa_splitLdel",
+			"missing": "F1KBNa_missing",
 			"add": "F1KBNa_add",
-			"fileList": "F1KBNa_fileList",
-			"fileListFloat": "F1KBNa_fileListFloat",
-			"flexSpacer": "F1KBNa_flexSpacer",
-			"rowMeta": "F1KBNa_rowMeta",
-			"settingsGroupChevron": "F1KBNa_settingsGroupChevron",
+			"states": "F1KBNa_states",
+			"colorPicker": "F1KBNa_colorPicker",
+			"expandExpanded": "F1KBNa_expandExpanded",
+			"diffFlashShake": "F1KBNa_diffFlashShake",
+			"splitLadd": "F1KBNa_splitLadd",
+			"subline": "F1KBNa_subline",
+			"blockFlashShake": "F1KBNa_blockFlashShake",
+			"langSelect": "F1KBNa_langSelect",
+			"settingsGroupBody": "F1KBNa_settingsGroupBody",
+			"colorPickerPreview": "F1KBNa_colorPickerPreview",
+			"diffPreview": "F1KBNa_diffPreview",
+			"rowPath": "F1KBNa_rowPath",
+			"overviewMarker": "F1KBNa_overviewMarker",
+			"colorPickerPopover": "F1KBNa_colorPickerPopover",
+			"settingsRowTitle": "F1KBNa_settingsRowTitle",
+			"badgeLabel": "F1KBNa_badgeLabel",
+			"colorPickerInputRow": "F1KBNa_colorPickerInputRow",
+			"colorHue": "F1KBNa_colorHue",
+			"action": "F1KBNa_action",
+			"group": "F1KBNa_group",
+			"langLabel": "F1KBNa_langLabel",
+			"diffBody": "F1KBNa_diffBody",
+			"diffBodySplit": "F1KBNa_diffBodySplit",
+			"divergedHint": "F1KBNa_divergedHint",
+			"settingsGroupText": "F1KBNa_settingsGroupText",
+			"diff": "F1KBNa_diff",
+			"diffPath": "F1KBNa_diffPath",
+			"settingsGroupDesc": "F1KBNa_settingsGroupDesc",
+			"diffActions": "F1KBNa_diffActions",
+			"stepper": "F1KBNa_stepper",
+			"overviewRuler": "F1KBNa_overviewRuler",
 			"context": "F1KBNa_context",
-			"close": "F1KBNa_close"
+			"splitCols": "F1KBNa_splitCols"
 		};
 		//#endregion
 		//#region lib/types/client/PendingPanel.js
@@ -12721,12 +12811,29 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		const MAX_LIST_WIDTH_PX = 560;
 		/** Inset of the floating file-list card from the code scroll box, in px. */
 		const FLOAT_LIST_MARGIN_PX = 12;
-		/** Fixed diff-row height in px; the virtual window and jump math are built on it. */
-		const ROW_HEIGHT_PX = 22;
-		/** Tolerance absorbed when comparing a block's offset to the navigation anchor,
-		*  so a sub-pixel float error (wrapped row heights, fractional scrollTop) never
-		*  mis-classifies the block the view is sitting on. Half a row height. */
-		const NAV_ANCHOR_TOLERANCE_PX = ROW_HEIGHT_PX / 4;
+		/** Normalize a path for comparison: forward slashes, no trailing slash. */
+		function normalizeDiffPath(p) {
+			return p.replaceAll("\\", "/").replace(/\/+$/, "");
+		}
+		/** Whether a produced-file chip path and a pending file path refer to the same
+		*  file, tolerant of separator style (\\ vs /) and of a workspace-relative vs
+		*  absolute form. `chipPath` is typically the harness's workspace-relative
+		*  forward-slash path; `filePath` is the host's absolute native-separator path.
+		*  Matching is case-insensitive so a Windows drive/segment case difference does
+		*  not miss the file the user clicked. */
+		function diffPathsMatch(chipPath, filePath, workspacePath) {
+			const toAbsolute = (p) => {
+				const norm = normalizeDiffPath(p);
+				if (/^[A-Za-z]:\//.test(norm) || norm.startsWith("/")) return norm;
+				if (workspacePath !== void 0 && workspacePath !== "") return `${normalizeDiffPath(workspacePath).replace(/\/+$/, "")}/${norm}`;
+				return norm;
+			};
+			const absolute = toAbsolute(chipPath).toLowerCase();
+			const file = toAbsolute(filePath).toLowerCase();
+			if (absolute === file) return true;
+			const rel = normalizeDiffPath(chipPath).toLowerCase();
+			return file === rel || file.endsWith(`/${rel}`);
+		}
 		/** The diff view-mode toggle glyph: the whole file as one column of text lines
 		*  (unified) or two side-by-side columns of text lines (split). Hand-drawn
 		*  because the icon library has no single/double-column glyph. Rendered 1:1
@@ -13251,6 +13358,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 		}
 		/** The two-column (side-by-side) whole-file diff view. */
 		const SplitDiff = (0, react.forwardRef)(function SplitDiff({ file, model, runs, langWrap, tabWidthSpaces, busy, t, selection, leadRows, onBlockKeep, onBlockRevert, onWrapToast }, ref) {
+			const ROW_HEIGHT_PX = diffLineHeight();
+			const NAV_ANCHOR_TOLERANCE_PX = ROW_HEIGHT_PX / 4;
 			const { pairs, pairOfRow } = (0, react.useMemo)(() => computeSideBySideDiff(model.diff.rows, true), [model]);
 			const pairCount = pairs.length;
 			const pairRowIndices = (0, react.useMemo)(() => {
@@ -14082,6 +14191,17 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			const [tabWidthSpaces] = (0, react.useState)(() => tabWidth());
 			const [splitView, setSplitView] = (0, react.useState)(() => splitMode());
 			const leadRows = navLeadRows();
+			const diffFontScaleValue = diffFontScale();
+			const diffLineHeightValue = diffLineHeight();
+			const diffAddColorPx = diffAddColor();
+			const diffDelColorPx = diffDelColor();
+			const diffViewVars = {};
+			diffViewVars["--dsh-diff-font-scale"] = String(diffFontScaleValue / 100);
+			diffViewVars["--dsh-diff-line-height"] = `${diffLineHeightValue}px`;
+			if (diffAddColorPx !== void 0) diffViewVars["--dsh-diff-add-color"] = diffAddColorPx;
+			if (diffDelColorPx !== void 0) diffViewVars["--dsh-diff-del-color"] = diffDelColorPx;
+			const ROW_HEIGHT_PX = diffLineHeightValue;
+			const NAV_ANCHOR_TOLERANCE_PX = ROW_HEIGHT_PX / 4;
 			const toggleSplitView = () => {
 				const next = !splitView;
 				setSplitView(next);
@@ -14697,6 +14817,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: PendingPanel_module_css_default.diff,
 				"data-diff-approval-diff": true,
+				style: diffViewVars,
 				children: [
 					(0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.diffHeader,
@@ -15171,7 +15292,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			});
 		}
 		/** Render the pending-edit review panel and its unified footer action. */
-		function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, onAckRedoCleared, onAckJustResolved, collapseSidebar, t }) {
+		function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, onAckRedoCleared, collapseSidebar, t }) {
 			const current = useSessions((state) => state.current);
 			const currentBlank = useSessions((state) => {
 				const id = state.current;
@@ -15209,7 +15330,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			};
 			const handleOpenFileRef = (0, react.useRef)();
 			handleOpenFileRef.current = (path) => {
-				const entry = snapshot.files.find((file) => file.path === path);
+				const entry = snapshot.files.find((file) => diffPathsMatch(path, file.path, snapshot.workspacePath));
 				if (entry === void 0) {
 					showCopyToast(t("panel.fileNotPending"));
 					return;
@@ -15230,8 +15351,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			}, []);
 			/** Whether the redo-cleared notice is showing (bottom-right, OK to dismiss). */
 			const [redoClearedNotice, setRedoClearedNotice] = (0, react.useState)(false);
-			/** A file whose last block just resolved, pending a remove-or-keep choice. */
-			const [confirmDismiss, setConfirmDismiss] = (0, react.useState)(null);
+			/** A last-block keep/revert awaiting the user's remove-or-keep choice; the
+			*  choice rides the same block RPC as its `removeWhenResolved` flag. */
+			const [blockPrompt, setBlockPrompt] = (0, react.useState)(null);
 			/** Bottom offset tracking the chat composer's top edge so the input stays visible. */
 			const [bottomPx, setBottomPx] = (0, react.useState)(FALLBACK_BOTTOM_PX);
 			/** Fullscreen expanded: the panel bottom pins to the window edge, ignoring the composer offset. */
@@ -15370,6 +15492,32 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				};
 			}, [open]);
 			const files = snapshot.files.filter((file) => current !== void 0 && (file.sessionIds ?? [file.sessionId]).includes(current)).sort((left, right) => compareFileNames(left.path, right.path));
+			const blockKeepWithPrompt = (sessionId, id, block, removeWhenResolved) => {
+				const file = files.find((entry) => entry.id === id);
+				if (removeWhenResolved === void 0 && file !== void 0 && changeBlocksOf(computeWholeFileDiff(file.oldText, file.newText)).length === 1) {
+					setBlockPrompt({
+						action: "keep",
+						sessionId,
+						id,
+						block
+					});
+					return Promise.resolve();
+				}
+				return removeWhenResolved === void 0 ? onBlockKeep(sessionId, id, block) : onBlockKeep(sessionId, id, block, removeWhenResolved);
+			};
+			const blockRevertWithPrompt = (sessionId, id, block, removeWhenResolved) => {
+				const file = files.find((entry) => entry.id === id);
+				if (removeWhenResolved === void 0 && file !== void 0 && changeBlocksOf(computeWholeFileDiff(file.oldText, file.newText)).length === 1) {
+					setBlockPrompt({
+						action: "revert",
+						sessionId,
+						id,
+						block
+					});
+					return Promise.resolve();
+				}
+				return removeWhenResolved === void 0 ? onBlockRevert(sessionId, id, block) : onBlockRevert(sessionId, id, block, removeWhenResolved);
+			};
 			/** 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);
@@ -15386,16 +15534,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				if (fresh.length > 0) setActionToast(fresh[0][1]);
 				failedRef.current = current;
 			}, [snapshot.failed]);
-			(0, react.useEffect)(() => {
-				if (snapshot.justResolved === void 0) return;
-				setConfirmDismiss(snapshot.justResolved);
-				const timer = window.setTimeout(() => {
-					onAckJustResolved();
-				}, 0);
-				return () => {
-					window.clearTimeout(timer);
-				};
-			}, [snapshot.justResolved, onAckJustResolved]);
 			(0, react.useEffect)(() => {
 				if (!open) return;
 				if (selected !== "" && files.some((file) => file.id === selected)) return;
@@ -15453,8 +15591,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				}
 			}, entry.id);
 			const selectedFile = files.find((file) => file.id === selected);
-			/** The file whose removal is being confirmed, if any. */
-			const confirmFile = confirmDismiss === null ? void 0 : files.find((file) => file.id === confirmDismiss);
+			/** The file whose removal is being confirmed (a last-block action), if any. */
+			const promptFile = blockPrompt === null ? void 0 : files.find((file) => file.id === blockPrompt.id);
 			const fileListBody = (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { 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", {
@@ -15761,8 +15899,8 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 											t,
 											onKeep,
 											onRevert,
-											onBlockKeep,
-											onBlockRevert,
+											onBlockKeep: blockKeepWithPrompt,
+											onBlockRevert: blockRevertWithPrompt,
 											onOpen,
 											floatMode,
 											floatOpen,
@@ -15782,7 +15920,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 									})
 								]
 							}),
-							confirmFile !== void 0 && (0, react_jsx_runtime.jsx)("div", {
+							blockPrompt !== null && promptFile !== void 0 && (0, react_jsx_runtime.jsx)("div", {
 								className: PendingPanel_module_css_default.confirmBackdrop,
 								"data-diff-confirm": true,
 								children: (0, react_jsx_runtime.jsxs)("div", {
@@ -15791,7 +15929,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 									"aria-modal": "true",
 									children: [(0, react_jsx_runtime.jsx)("p", {
 										className: PendingPanel_module_css_default.confirmText,
-										children: t("panel.resolvedAsk", { file: basenameOf(confirmFile.path) })
+										children: t("panel.resolvedAsk", { file: basenameOf(promptFile.path) })
 									}), (0, react_jsx_runtime.jsxs)("div", {
 										className: PendingPanel_module_css_default.confirmActions,
 										children: [(0, react_jsx_runtime.jsx)("button", {
@@ -15799,8 +15937,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 											className: `${PendingPanel_module_css_default.action} ${PendingPanel_module_css_default.actionPrimary}`,
 											"data-diff-confirm-remove": true,
 											onClick: () => {
-												setConfirmDismiss(null);
-												onKeep(confirmFile.sessionId, confirmFile.id);
+												setBlockPrompt(null);
+												const { action, sessionId, id, block } = blockPrompt;
+												action === "keep" ? onBlockKeep(sessionId, id, block, true) : onBlockRevert(sessionId, id, block, true);
 											},
 											children: t("row.dismiss")
 										}), (0, react_jsx_runtime.jsx)("button", {
@@ -15808,7 +15947,9 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 											className: PendingPanel_module_css_default.action,
 											"data-diff-confirm-keep": true,
 											onClick: () => {
-												setConfirmDismiss(null);
+												setBlockPrompt(null);
+												const { action, sessionId, id, block } = blockPrompt;
+												action === "keep" ? onBlockKeep(sessionId, id, block, false) : onBlockRevert(sessionId, id, block, false);
 											},
 											children: t("panel.keepInList")
 										})]
@@ -15862,6 +16003,215 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			});
 		}
 		//#endregion
+		//#region lib/types/client/ColorPicker.js
+		/** A compact HSV color picker (saturation/value square + hue bar + hex/RGB
+		*  input). Avoids the browser-native color dialog, which cannot be themed, so
+		*  it matches DSH. Pure helpers are exported for testing. */
+		/** Clamp `n` to `[min, max]`. */
+		function clamp(n, min, max) {
+			return Math.max(min, Math.min(max, n));
+		}
+		/** Parse `#rrggbb` / `#rgb` / `rrggbb` / `rgb(r,g,b)` into a normalised
+		*  `#rrggbb`, or `undefined` when the text is not a color. */
+		function parseColor(input) {
+			const text = input.trim();
+			let m = /^#?([0-9a-f]{6})$/i.exec(text);
+			if (m !== null) return `#${m[1].toLowerCase()}`;
+			m = /^#?([0-9a-f]{3})$/i.exec(text);
+			if (m !== null) return `#${m[1].split("").map((c) => c + c).join("").toLowerCase()}`;
+			m = /^rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})(?:\s*,\s*[\d.]+\s*)?\)$/i.exec(text);
+			if (m !== null) return `#${[
+				Math.min(255, Number(m[1])),
+				Math.min(255, Number(m[2])),
+				Math.min(255, Number(m[3]))
+			].map((n) => n.toString(16).padStart(2, "0")).join("")}`;
+		}
+		/** Convert a `#rrggbb` hex to HSV (h 0-360, s 0-1, v 0-1). */
+		function hexToHsv(hex) {
+			const m = /^#?([0-9a-f]{6})$/i.exec(hex.trim());
+			const int = m === null ? 2278750 : Number.parseInt(m[1], 16);
+			const r = (int >> 16 & 255) / 255;
+			const g = (int >> 8 & 255) / 255;
+			const b = (int & 255) / 255;
+			const max = Math.max(r, g, b);
+			const d = max - Math.min(r, g, b);
+			let h = 0;
+			if (d !== 0) {
+				if (max === r) h = (g - b) / d % 6;
+				else if (max === g) h = (b - r) / d + 2;
+				else h = (r - g) / d + 4;
+				h *= 60;
+				if (h < 0) h += 360;
+			}
+			const s = max === 0 ? 0 : d / max;
+			return {
+				h,
+				s,
+				v: max
+			};
+		}
+		/** Convert HSV (h 0-360, s 0-1, v 0-1) to a `#rrggbb` hex. */
+		function hsvToHex(h, s, v) {
+			const c = v * s;
+			const x = c * (1 - Math.abs((h % 360 + 360) % 360 / 60 % 2 - 1));
+			const m = v - c;
+			const hp = (h % 360 + 360) % 360;
+			let r = 0;
+			let g = 0;
+			let b = 0;
+			if (hp < 60) {
+				r = c;
+				g = x;
+				b = 0;
+			} else if (hp < 120) {
+				r = x;
+				g = c;
+				b = 0;
+			} else if (hp < 180) {
+				r = 0;
+				g = c;
+				b = x;
+			} else if (hp < 240) {
+				r = 0;
+				g = x;
+				b = c;
+			} else if (hp < 300) {
+				r = x;
+				g = 0;
+				b = c;
+			} else {
+				r = c;
+				g = 0;
+				b = x;
+			}
+			const to8 = (n) => Math.round((n + m) * 255).toString(16).padStart(2, "0");
+			return `#${to8(r)}${to8(g)}${to8(b)}`;
+		}
+		/** A draggable HSV picker: saturation/value square + hue bar + a hex/RGB text
+		*  input. `onChange` reports a normalised `#rrggbb`; `onClose` fires after a
+		*  committed text value so the caller can close the popover. */
+		function ColorPicker({ value, onChange, onClose, ariaLabel }) {
+			const [hsv, setHsv] = (0, react.useState)(() => hexToHsv(value));
+			const [text, setText] = (0, react.useState)(() => value.toUpperCase());
+			const svRef = (0, react.useRef)(null);
+			const hueRef = (0, react.useRef)(null);
+			(0, react.useEffect)(() => {
+				setHsv(hexToHsv(value));
+				setText(value.toUpperCase());
+			}, [value]);
+			const hueColor = `hsl(${hsv.h.toFixed(1)}, 100%, 50%)`;
+			const commit = (next) => {
+				const normalized = parseColor(next);
+				if (normalized !== void 0 && normalized.toLowerCase() !== value.toLowerCase()) {
+					onChange(normalized);
+					onClose?.();
+				}
+			};
+			const updateSv = (clientX, clientY) => {
+				const el = svRef.current;
+				if (el === null) return;
+				const rect = el.getBoundingClientRect();
+				const s = clamp((clientX - rect.left) / rect.width, 0, 1);
+				const v = 1 - clamp((clientY - rect.top) / rect.height, 0, 1);
+				const hex = hsvToHex(hsv.h, s, v);
+				setHsv((prev) => ({
+					h: prev.h,
+					s,
+					v
+				}));
+				setText(hex.toUpperCase());
+				onChange(hex);
+			};
+			const updateHue = (clientX) => {
+				const el = hueRef.current;
+				if (el === null) return;
+				const rect = el.getBoundingClientRect();
+				const h = clamp((clientX - rect.left) / rect.width, 0, 1) * 360;
+				const hex = hsvToHex(h, hsv.s, hsv.v);
+				setHsv((prev) => ({
+					h,
+					s: prev.s,
+					v: prev.v
+				}));
+				setText(hex.toUpperCase());
+				onChange(hex);
+			};
+			const onSvPointerDown = (e) => {
+				e.currentTarget.setPointerCapture?.(e.pointerId);
+				updateSv(e.clientX, e.clientY);
+			};
+			const onSvPointerMove = (e) => {
+				if (e.buttons > 0) updateSv(e.clientX, e.clientY);
+			};
+			const onHuePointerDown = (e) => {
+				e.currentTarget.setPointerCapture?.(e.pointerId);
+				updateHue(e.clientX);
+			};
+			const onHuePointerMove = (e) => {
+				if (e.buttons > 0) updateHue(e.clientX);
+			};
+			return (0, react_jsx_runtime.jsxs)("div", {
+				className: PendingPanel_module_css_default.colorPickerPanel,
+				children: [
+					(0, react_jsx_runtime.jsxs)("div", {
+						className: PendingPanel_module_css_default.colorPickerInputRow,
+						children: [(0, react_jsx_runtime.jsx)("span", {
+							className: PendingPanel_module_css_default.colorPickerPreview,
+							style: { background: value },
+							"aria-hidden": "true"
+						}), (0, react_jsx_runtime.jsx)("input", {
+							className: PendingPanel_module_css_default.colorPickerInput,
+							value: text,
+							"aria-label": ariaLabel,
+							"data-diff-color-input": true,
+							onChange: (e) => {
+								setText(e.target.value.toUpperCase());
+							},
+							onBlur: () => {
+								commit(text);
+							},
+							onKeyDown: (e) => {
+								if (e.key === "Enter") e.currentTarget.blur();
+							}
+						})]
+					}),
+					(0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.colorSv,
+						ref: svRef,
+						style: { background: `linear-gradient(to top, #000, transparent), linear-gradient(to right, #fff, ${hueColor})` },
+						onPointerDown: onSvPointerDown,
+						onPointerMove: onSvPointerMove,
+						role: "slider",
+						"aria-label": `${ariaLabel} color`,
+						"aria-valuetext": value,
+						children: (0, react_jsx_runtime.jsx)("span", {
+							className: PendingPanel_module_css_default.colorSvCursor,
+							style: {
+								left: `${hsv.s * 100}%`,
+								top: `${(1 - hsv.v) * 100}%`,
+								background: value
+							},
+							"aria-hidden": "true"
+						})
+					}),
+					(0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.colorHue,
+						ref: hueRef,
+						style: { background: "linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)" },
+						onPointerDown: onHuePointerDown,
+						onPointerMove: onHuePointerMove,
+						role: "slider",
+						"aria-label": `${ariaLabel} hue`,
+						children: (0, react_jsx_runtime.jsx)("span", {
+							className: PendingPanel_module_css_default.colorHueCursor,
+							style: { left: `${hsv.h / 360 * 100}%` },
+							"aria-hidden": "true"
+						})
+					})
+				]
+			});
+		}
+		//#endregion
 		//#region lib/types/client/SettingsTab.js
 		/** DSH Settings top-level section for this plugin's preferences. */
 		/** A toggle switch offering the two boolean states 打开 / 关闭. */
@@ -15961,8 +16311,10 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				})]
 			});
 		}
-		/** A +/- number stepper for an integer preference, clamped to [min, max]. */
-		function StepperRow({ title, description, value, onChange, min, max, dataAttribute, t }) {
+		/** A +/- number stepper for an integer preference, clamped to [min, max]. The
+		*  optional `step` changes the increment (default 1) and `unit` is appended to
+		*  the shown value (e.g. '%'). */
+		function StepperRow({ title, description, value, onChange, min, max, dataAttribute, t, step = 1, unit = "" }) {
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: PendingPanel_module_css_default.settingsRow,
 				children: [(0, react_jsx_runtime.jsxs)("div", {
@@ -15984,13 +16336,13 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							"aria-label": t("action.decrease"),
 							disabled: value <= min,
 							onClick: () => {
-								onChange(Math.max(min, value - 1));
+								onChange(Math.max(min, value - step));
 							}
 						}),
-						(0, react_jsx_runtime.jsx)("span", {
+						(0, react_jsx_runtime.jsxs)("span", {
 							className: PendingPanel_module_css_default.stepperValue,
 							[dataAttribute]: true,
-							children: value
+							children: [value, unit]
 						}),
 						(0, react_jsx_runtime.jsx)("button", {
 							type: "button",
@@ -15999,7 +16351,7 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							"aria-label": t("action.increase"),
 							disabled: value >= max,
 							onClick: () => {
-								onChange(Math.min(max, value + 1));
+								onChange(Math.min(max, value + step));
 							}
 						})
 					]
@@ -16069,6 +16421,162 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				})]
 			});
 		}
+		/** One color-picker row: title + description left, a DSH pill trigger that opens
+		*  a small HSV dial (a real color picker, not preset swatches) with a hex/RGB
+		*  input. The native color dialog is browser-styled and is avoided. */
+		function ColorRow({ title, description, value, onChange, dataAttribute }) {
+			const [open, setOpen] = (0, react.useState)(false);
+			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.jsxs)("div", {
+					className: PendingPanel_module_css_default.colorPicker,
+					children: [(0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						className: PendingPanel_module_css_default.colorPickerTrigger,
+						[dataAttribute]: true,
+						"aria-haspopup": "dialog",
+						"aria-expanded": open,
+						"data-diff-color-trigger": true,
+						onClick: () => {
+							setOpen((value) => !value);
+						},
+						children: [
+							(0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.colorSwatch,
+								style: { background: value },
+								"aria-hidden": "true"
+							}),
+							(0, react_jsx_runtime.jsx)("span", {
+								className: PendingPanel_module_css_default.colorValue,
+								children: value.toUpperCase()
+							}),
+							(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: PendingPanel_module_css_default.colorPickerChevron })
+						]
+					}), open && (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.colorBackdrop,
+						onClick: () => {
+							setOpen(false);
+						}
+					}), (0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.colorPickerPopover,
+						children: (0, react_jsx_runtime.jsx)(ColorPicker, {
+							value,
+							onChange,
+							onClose: () => {
+								setOpen(false);
+							},
+							ariaLabel: title
+						})
+					})] })]
+				})]
+			});
+		}
+		/** A live single-column diff preview driven by the current diff-view settings.
+		*  It reuses the real diff's CSS (`.line`/`.gutter`/`.code`/`.del`/`.add`/intra)
+		*  and applies the same CSS variables, so it reflects the actual look. */
+		function DiffViewPreview({ fontScale, lineHeight, addColor, delColor, tabSize, t }) {
+			const vars = {
+				"--dsh-diff-font-scale": String(fontScale / 100),
+				"--dsh-diff-line-height": `${lineHeight}px`,
+				"--dsh-diff-add-color": addColor,
+				"--dsh-diff-del-color": delColor
+			};
+			const rows = [
+				{
+					kind: PendingPanel_module_css_default.context,
+					old: "1",
+					next: "1",
+					code: "export function review(file) {"
+				},
+				{
+					kind: PendingPanel_module_css_default.context,
+					old: "2",
+					next: "2",
+					code: "  // 旧实现：保留当前改动"
+				},
+				{
+					kind: PendingPanel_module_css_default.del,
+					old: "3",
+					next: "",
+					code: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+						"  return ",
+						(0, react_jsx_runtime.jsx)("span", {
+							className: PendingPanel_module_css_default.intraDel,
+							children: "keep"
+						}),
+						"(file)"
+					] })
+				},
+				{
+					kind: PendingPanel_module_css_default.context,
+					old: "3",
+					next: "3",
+					code: "  // 新实现：回退该改动"
+				},
+				{
+					kind: PendingPanel_module_css_default.add,
+					old: "",
+					next: "3",
+					code: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+						"  return ",
+						(0, react_jsx_runtime.jsx)("span", {
+							className: PendingPanel_module_css_default.intraAdd,
+							children: "revert"
+						}),
+						"(file)"
+					] })
+				},
+				{
+					kind: PendingPanel_module_css_default.context,
+					old: "4",
+					next: "4",
+					code: "}"
+				}
+			];
+			return (0, react_jsx_runtime.jsxs)("div", {
+				className: PendingPanel_module_css_default.diffPreview,
+				style: {
+					...vars,
+					tabSize
+				},
+				"data-diff-view-preview": true,
+				children: [(0, react_jsx_runtime.jsx)("div", {
+					className: PendingPanel_module_css_default.diffPreviewTitle,
+					children: t("settings.diffPreview")
+				}), (0, react_jsx_runtime.jsx)("div", {
+					className: PendingPanel_module_css_default.diffPreviewScroll,
+					children: (0, react_jsx_runtime.jsx)("div", {
+						className: PendingPanel_module_css_default.lines,
+						children: rows.map((row, index) => (0, react_jsx_runtime.jsxs)("div", {
+							className: `${PendingPanel_module_css_default.line} ${row.kind}`,
+							children: [
+								(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.gutter,
+									children: row.old
+								}),
+								(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.gutter,
+									children: row.next
+								}),
+								(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.code,
+									children: row.code
+								})
+							]
+						}, index))
+					})
+				})]
+			});
+		}
 		/**
 		* The plugin's preferences: auto-paste a copied reference into the input,
 		* whether importing workspace VCS changes includes untracked files, and the
@@ -16083,6 +16591,13 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			const [tabOpen, setTabOpen] = (0, react.useState)(false);
 			const [split, setSplitState] = (0, react.useState)(splitMode);
 			const [lead, setLeadState] = (0, react.useState)(navLeadRows);
+			const [fontScale, setFontScaleState] = (0, react.useState)(diffFontScale);
+			const [lineHeight, setLineHeightState] = (0, react.useState)(diffLineHeight);
+			const [addColor, setAddColorState] = (0, react.useState)(() => diffAddColor() ?? currentDiffAddColor());
+			const [delColor, setDelColorState] = (0, react.useState)(() => diffDelColor() ?? currentDiffDelColor());
+			const addDefault = currentDiffAddColor();
+			const delDefault = currentDiffDelColor();
+			const [diffOpen, setDiffOpen] = (0, react.useState)(true);
 			const [summon, setSummonState] = (0, react.useState)(quickSummonKey);
 			const [keysOpen, setKeysOpen] = (0, react.useState)(false);
 			const [keybindings, setKeybindingsState] = (0, react.useState)(() => {
@@ -16121,10 +16636,131 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 				setLeadState(value);
 				setNavLeadRows(value);
 			};
+			const setFontScale = (value) => {
+				setFontScaleState(value);
+				setDiffFontScale(value);
+			};
+			const setLineHeight = (value) => {
+				setLineHeightState(value);
+				setDiffLineHeight(value);
+			};
+			const setAddColor = (value) => {
+				setAddColorState(value);
+				setDiffAddColor(value);
+			};
+			const setDelColor = (value) => {
+				setDelColorState(value);
+				setDiffDelColor(value);
+			};
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: PendingPanel_module_css_default.settingsPage,
 				"data-diff-settings": true,
 				children: [
+					(0, react_jsx_runtime.jsxs)("div", {
+						className: PendingPanel_module_css_default.settingsGroup,
+						"data-open": diffOpen || void 0,
+						children: [(0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: PendingPanel_module_css_default.settingsGroupHeader,
+							onClick: () => {
+								setDiffOpen((open) => !open);
+							},
+							"data-diff-view-toggle": true,
+							children: [(0, react_jsx_runtime.jsxs)("span", {
+								className: PendingPanel_module_css_default.settingsGroupText,
+								children: [(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.settingsGroupTitle,
+									children: t("settings.diffView")
+								}), (0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.settingsGroupDesc,
+									children: t("settings.diffViewDesc")
+								})]
+							}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: PendingPanel_module_css_default.settingsGroupChevron })]
+						}), diffOpen && (0, react_jsx_runtime.jsxs)("div", {
+							className: PendingPanel_module_css_default.settingsGroupBody,
+							children: [
+								(0, react_jsx_runtime.jsx)(DiffViewPreview, {
+									fontScale,
+									lineHeight,
+									addColor,
+									delColor,
+									tabSize: tab,
+									t
+								}),
+								(0, react_jsx_runtime.jsx)(StepperRow, {
+									title: t("panel.diffFontSize"),
+									description: t("panel.diffFontSizeDesc"),
+									value: fontScale,
+									onChange: setFontScale,
+									min: 50,
+									max: 200,
+									step: 10,
+									unit: "%",
+									dataAttribute: "data-diff-font-size",
+									t
+								}),
+								(0, react_jsx_runtime.jsx)(StepperRow, {
+									title: t("panel.diffLineHeight"),
+									description: t("panel.diffLineHeightDesc"),
+									value: lineHeight,
+									onChange: setLineHeight,
+									min: 10,
+									max: 36,
+									dataAttribute: "data-diff-line-height",
+									t
+								}),
+								(0, react_jsx_runtime.jsx)(ColorRow, {
+									title: t("panel.diffAddColor"),
+									description: t("panel.diffAddColorDesc", { default: addDefault.toUpperCase() }),
+									value: addColor,
+									onChange: setAddColor,
+									dataAttribute: "data-diff-add-color"
+								}),
+								(0, react_jsx_runtime.jsx)(ColorRow, {
+									title: t("panel.diffDelColor"),
+									description: t("panel.diffDelColorDesc", { default: delDefault.toUpperCase() }),
+									value: delColor,
+									onChange: setDelColor,
+									dataAttribute: "data-diff-del-color"
+								}),
+								(0, react_jsx_runtime.jsx)(TabWidthRow, {
+									title: t("panel.tabWidth"),
+									description: t("panel.tabWidthDesc"),
+									value: tab,
+									open: tabOpen,
+									onOpenChange: setTabOpen,
+									onSelect: setTab,
+									dataAttribute: "data-diff-tab-width-select"
+								}),
+								(0, react_jsx_runtime.jsx)(PreferenceRow, {
+									title: t("panel.splitMode"),
+									description: t("panel.splitModeDesc"),
+									value: split,
+									onSelect: setSplit,
+									dataAttribute: "data-diff-split-mode-select",
+									t
+								}),
+								(0, react_jsx_runtime.jsx)(StepperRow, {
+									title: t("panel.navLeadRows"),
+									description: t("panel.navLeadRowsDesc"),
+									value: lead,
+									onChange: setLead,
+									min: 0,
+									max: 10,
+									dataAttribute: "data-diff-nav-lead-rows",
+									t
+								}),
+								(0, react_jsx_runtime.jsx)(PreferenceRow, {
+									title: t("panel.pasteOnCopy"),
+									description: t("panel.pasteOnCopyDesc"),
+									value: pasteOnCopy,
+									onSelect: setPasteOnCopy,
+									dataAttribute: "data-diff-paste-on-copy-select",
+									t
+								})
+							]
+						})]
+					}),
 					(0, react_jsx_runtime.jsxs)("div", {
 						className: PendingPanel_module_css_default.settingsGroup,
 						"data-open": keysOpen || void 0,
@@ -16135,9 +16771,15 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 								setKeysOpen((open) => !open);
 							},
 							"data-diff-keybindings-toggle": true,
-							children: [(0, react_jsx_runtime.jsx)("span", {
-								className: PendingPanel_module_css_default.settingsGroupTitle,
-								children: t("settings.keybindings")
+							children: [(0, react_jsx_runtime.jsxs)("span", {
+								className: PendingPanel_module_css_default.settingsGroupText,
+								children: [(0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.settingsGroupTitle,
+									children: t("settings.keybindings")
+								}), (0, react_jsx_runtime.jsx)("span", {
+									className: PendingPanel_module_css_default.settingsGroupDesc,
+									children: t("settings.keybindingsDesc")
+								})]
 							}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: PendingPanel_module_css_default.settingsGroupChevron })]
 						}), keysOpen && (0, react_jsx_runtime.jsxs)("div", {
 							className: PendingPanel_module_css_default.settingsGroupBody,
@@ -16160,14 +16802,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							}, action))]
 						})]
 					}),
-					(0, react_jsx_runtime.jsx)(PreferenceRow, {
-						title: t("panel.pasteOnCopy"),
-						description: t("panel.pasteOnCopyDesc"),
-						value: pasteOnCopy,
-						onSelect: setPasteOnCopy,
-						dataAttribute: "data-diff-paste-on-copy-select",
-						t
-					}),
 					(0, react_jsx_runtime.jsx)(PreferenceRow, {
 						title: t("panel.importUntracked"),
 						description: t("panel.importUntrackedDesc"),
@@ -16175,33 +16809,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						onSelect: setIncludeUntracked,
 						dataAttribute: "data-diff-import-untracked-select",
 						t
-					}),
-					(0, react_jsx_runtime.jsx)(TabWidthRow, {
-						title: t("panel.tabWidth"),
-						description: t("panel.tabWidthDesc"),
-						value: tab,
-						open: tabOpen,
-						onOpenChange: setTabOpen,
-						onSelect: setTab,
-						dataAttribute: "data-diff-tab-width-select"
-					}),
-					(0, react_jsx_runtime.jsx)(PreferenceRow, {
-						title: t("panel.splitMode"),
-						description: t("panel.splitModeDesc"),
-						value: split,
-						onSelect: setSplit,
-						dataAttribute: "data-diff-split-mode-select",
-						t
-					}),
-					(0, react_jsx_runtime.jsx)(StepperRow, {
-						title: t("panel.navLeadRows"),
-						description: t("panel.navLeadRowsDesc"),
-						value: lead,
-						onChange: setLead,
-						min: 0,
-						max: 10,
-						dataAttribute: "data-diff-nav-lead-rows",
-						t
 					})
 				]
 			});
@@ -16237,18 +16844,20 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						id
 					}));
 				},
-				async blockKeep(sessionId, id, block) {
+				async blockKeep(sessionId, id, block, removeWhenResolved) {
 					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "block-keep", {
 						sessionId,
 						id,
-						block
+						block,
+						removeWhenResolved
 					}));
 				},
-				async blockRevert(sessionId, id, block) {
+				async blockRevert(sessionId, id, block, removeWhenResolved) {
 					return actionOf(await rpc.call(DIFF_APPROVAL_CHANNEL, "block-revert", {
 						sessionId,
 						id,
-						block
+						block,
+						removeWhenResolved
 					}));
 				},
 				async undo(sessionId) {
@@ -16387,17 +16996,12 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			};
 			const listeners = /* @__PURE__ */ new Set();
 			let redoCleared = false;
-			let justResolved;
 			const publish = (next) => {
 				let result = next;
 				if (redoCleared) result = {
 					...result,
 					redoCleared: true
 				};
-				if (justResolved !== void 0) result = {
-					...result,
-					justResolved
-				};
 				snapshot = result;
 				for (const listener of [...listeners]) listener();
 			};
@@ -16501,15 +17105,15 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						await port.revert(sessionId, id);
 					});
 				},
-				async blockKeep(sessionId, id, block) {
+				async blockKeep(sessionId, id, block, removeWhenResolved) {
 					const { error: _cleared, ...base } = snapshot;
 					publish({
 						...base,
 						busy: /* @__PURE__ */ new Set([...snapshot.busy, id])
 					});
-					let value;
 					try {
-						value = await port.blockKeep(sessionId, id, block);
+						if (removeWhenResolved === void 0) await port.blockKeep(sessionId, id, block);
+						else await port.blockKeep(sessionId, id, block, removeWhenResolved);
 					} catch (error) {
 						markFailed(id, error instanceof Error ? error.message : String(error));
 						publish({
@@ -16519,18 +17123,17 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						return;
 					}
 					clearFailed(id);
-					if (value.resolved === true) justResolved = id;
 					await this.refresh(sessionId);
 				},
-				async blockRevert(sessionId, id, block) {
+				async blockRevert(sessionId, id, block, removeWhenResolved) {
 					const { error: _cleared, ...base } = snapshot;
 					publish({
 						...base,
 						busy: /* @__PURE__ */ new Set([...snapshot.busy, id])
 					});
-					let value;
 					try {
-						value = await port.blockRevert(sessionId, id, block);
+						if (removeWhenResolved === void 0) await port.blockRevert(sessionId, id, block);
+						else await port.blockRevert(sessionId, id, block, removeWhenResolved);
 					} catch (error) {
 						markFailed(id, error instanceof Error ? error.message : String(error));
 						publish({
@@ -16540,7 +17143,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 						return;
 					}
 					clearFailed(id);
-					if (value.resolved === true) justResolved = id;
 					await this.refresh(sessionId);
 				},
 				async undo(sessionId) {
@@ -16579,7 +17181,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					}
 				},
 				reset() {
-					justResolved = void 0;
 					publish({
 						read: false,
 						files: [],
@@ -16590,11 +17191,6 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 					redoCleared = false;
 					const { redoCleared: _omit, ...rest } = snapshot;
 					publish(rest);
-				},
-				clearJustResolved() {
-					justResolved = void 0;
-					const { justResolved: _omit, ...rest } = snapshot;
-					publish(rest);
 				}
 			};
 		}
@@ -16766,10 +17362,22 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"panel.splitModeDesc": "开启后整文件差异用左「改前」｜右「当前」双栏、逐行对齐的视图展示，默认关闭使用单栏（合并）视图。",
 			"panel.navLeadRows": "差异跳转行距",
 			"panel.navLeadRowsDesc": "按上/下跳转差异时，目标差异上方保留的行数（默认 2）。也用于从当前滚动位置定位上/下一个差异。",
+			"panel.diffFontSize": "字号",
+			"panel.diffFontSizeDesc": "差异代码的文字大小，按当前字号的百分比缩放（默认为100%，每次 ±10%）。",
+			"panel.diffLineHeight": "行高",
+			"panel.diffLineHeightDesc": "差异代码每行的高度（像素，默认 22），滚动与跳转定位会随之调整。",
+			"panel.diffAddColor": "新增颜色",
+			"panel.diffAddColorDesc": "新增行的基础色；行背景与逐词差异由它派生。默认色：{default}。",
+			"panel.diffDelColor": "删除颜色",
+			"panel.diffDelColorDesc": "删除行的基础色；行背景与逐词差异由它派生。默认色：{default}。",
 			"panel.quickSummon": "快速呼出",
 			"panel.quickSummonDesc": "用键盘快捷键打开/关闭差异面板。点击右侧按钮后按下新的按键组合即可修改。",
 			"panel.recordShortcut": "按下快捷键…",
-			"settings.keybindings": "按键设置",
+			"settings.keybindings": "快捷键",
+			"settings.keybindingsDesc": "展开后可配置各项操作的按键组合。",
+			"settings.diffView": "差异视图",
+			"settings.diffViewDesc": "调整差异的显示效果（字号、行高、新增/删除颜色）与布局偏好。",
+			"settings.diffPreview": "预览",
 			"panel.keyDesc": "点击右侧按钮后按下新的按键组合即可修改。",
 			"panel.key.jumpUp": "跳转到上一个差异块",
 			"panel.key.jumpDown": "跳转到下一个差异块",
@@ -16860,10 +17468,22 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 			"panel.splitModeDesc": "When on, the whole-file differences render as a side-by-side (left \"before\" | right \"current\") line-aligned view. Off (default) uses the single-column unified view.",
 			"panel.navLeadRows": "Block jump lead rows",
 			"panel.navLeadRowsDesc": "Rows left above the jumped-to diff block on up/down navigation (default 2). Also used to locate the previous/next diff from the current scroll position.",
+			"panel.diffFontSize": "Font size",
+			"panel.diffFontSizeDesc": "Diff code text size as a percentage of the current size (defaults to 100%, ±10% per step).",
+			"panel.diffLineHeight": "Line height",
+			"panel.diffLineHeightDesc": "The diff code line height, in pixels (default 22); scrolling and jump positioning follow it.",
+			"panel.diffAddColor": "Added color",
+			"panel.diffAddColorDesc": "Base color for added lines; the row background and intra-line diff are derived from it. Default: {default}.",
+			"panel.diffDelColor": "Removed color",
+			"panel.diffDelColorDesc": "Base color for removed lines; the row background and intra-line diff are derived from it. Default: {default}.",
 			"panel.quickSummon": "Quick summon",
 			"panel.quickSummonDesc": "Open or close the diff panel with a keyboard shortcut. Click the button and press a new chord to change it.",
 			"panel.recordShortcut": "Press keys…",
-			"settings.keybindings": "Keybindings",
+			"settings.keybindings": "Shortcuts",
+			"settings.keybindingsDesc": "Expand to configure the key combo for each action.",
+			"settings.diffView": "Diff view",
+			"settings.diffViewDesc": "Adjust the diff appearance (font size, line height, add/delete colors) and layout preferences.",
+			"settings.diffPreview": "Preview",
 			"panel.keyDesc": "Click the button, then press a new chord to rebind it.",
 			"panel.key.jumpUp": "Jump to the previous diff block",
 			"panel.key.jumpDown": "Jump to the next diff block",
@@ -17045,14 +17665,13 @@ XID_Start XIDS`.split(/\s/).map((p) => [w(p), p]));
 							if (filePath !== void 0 && before !== void 0 && after !== void 0) remapFile(filePath, before, after);
 						});
 					},
-					onBlockKeep: (sessionId, id, block) => store.blockKeep(sessionId, id, block),
-					onBlockRevert: (sessionId, id, block) => store.blockRevert(sessionId, id, block),
+					onBlockKeep: (sessionId, id, block, removeWhenResolved) => store.blockKeep(sessionId, id, block, removeWhenResolved),
+					onBlockRevert: (sessionId, id, block, removeWhenResolved) => store.blockRevert(sessionId, id, block, removeWhenResolved),
 					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),
 					onAckRedoCleared: () => store.clearRedoCleared(),
-					onAckJustResolved: () => store.clearJustResolved(),
 					onPasteReference: (sessionId, reference) => {
 						conversationAccess(ctx, () => sessionId).appendDraft(reference);
 						document.querySelector("[data-composer-input]")?.focus();