dsh-config-manager 0.1.23 → 0.1.25

package/README.md

@@ -41,6 +41,18 @@ DSH is your AI assistant workbench — it holds your settings: model configs, pl
 
 ---
 
+## 📸 Screenshots
+
+| Export | Import Preview |
+|:---:|:---:|
+| ![One-click Export](assets/screenshot-export.png) | ![Import Preview](assets/screenshot-import-preview.png) |
+
+| Snapshot Restore | Remote Sync |
+|:---:|:---:|
+| ![Snapshot Restore](assets/screenshot-snapshots.png) | ![Remote Sync](assets/screenshot-sync.png) |
+
+---
+
 ## 🔄 How it works?
 
 ### Export (pack it up)

package/README.zh-CN.md

@@ -40,6 +40,18 @@ DSH 是你的 AI 助手工作台，里面存着你的各种设置：模型配置
 
 ---
 
+## 📸 功能截图
+
+| 导出备份 | 导入预览 |
+|:---:|:---:|
+| ![一键导出](assets/screenshot-export.png) | ![导入预览](assets/screenshot-import-preview.png) |
+
+| 快照恢复 | 远程同步 |
+|:---:|:---:|
+| ![快照恢复](assets/screenshot-snapshots.png) | ![远程同步](assets/screenshot-sync.png) |
+
+---
+
 ## 🔄 它是怎么工作的？
 
 ### 导出（打包带走）

package/lib/client.d.ts

@@ -695,6 +695,8 @@ interface SyncConfirmItem {
   adapter: SectionId;
   kind: PlanItemKind;
   description: string;
+  /** 变更详情（如插件「当前 1.1 vs 导入 1.6」），与导入恢复向导展示一致 */
+  detail?: string;
   severity: 'info' | 'warning' | 'error';
   /** 默认采纳方向；Conflict/MissingSecret 等人工项默认 false */
   defaultAdopt: boolean;
@@ -727,8 +729,9 @@ interface ApplyItemsPayload {
 interface SyncItemAdoption {
   itemId: string;
   adopt: boolean;
-  /** 冲突项解决方案（仅当该项是 Conflict 且 adopt=true 时必须） */
-  resolution?: 'useRemote' | 'keepLocal' | 'skip';
+  /** 冲突项解决方案（仅当该项是 Conflict 且 adopt=true 时必须）。
+   *  与导入恢复向导一致：keepLocal=保留当前 / useRemote=使用导入；跳过 = adopt=false。 */
+  resolution?: 'useRemote' | 'keepLocal';
 }
 /** POST /sync/apply-items 响应。 */
 interface ApplyItemsResponse {
@@ -1060,17 +1063,16 @@ declare const zh: {
   readonly 'syncflow.needsReviewBadge': "需人工决策";
   readonly 'syncflow.empty': "远端快照与本地一致（无变更）";
   readonly 'syncflow.diffCount': "共 {count} 项差异";
-  readonly 'syncflow.keepLocalAll': "全部保留本地";
-  readonly 'syncflow.useRemoteAll': "全部采用远端";
+  readonly 'syncflow.keepLocalAll': "全部保留当前配置";
+  readonly 'syncflow.useRemoteAll': "全部使用备份配置";
   readonly 'syncflow.bulkHint': "批量决策仅作用于冲突项；其余差异默认自动采用。";
   readonly 'syncflow.conflictTitle': "冲突解决";
-  readonly 'syncflow.conflictUseLocal': "用本地";
-  readonly 'syncflow.conflictUseRemote': "用远端";
-  readonly 'syncflow.conflictSkip': "跳过";
-  readonly 'syncflow.conflictLocalLabel': "本地";
-  readonly 'syncflow.conflictRemoteLabel': "远端";
+  readonly 'syncflow.conflictUseLocal': "保留当前";
+  readonly 'syncflow.conflictUseRemote': "使用备份";
+  readonly 'syncflow.conflictLocalLabel': "当前";
+  readonly 'syncflow.conflictRemoteLabel': "备份";
   readonly 'syncflow.conflictAncestorLabel': "共同祖先";
-  readonly 'syncflow.conflictUnresolved': "冲突项 {itemId} 尚未选择解决方式（用本地 / 用远端 / 跳过）";
+  readonly 'syncflow.conflictUnresolved': "冲突项 {itemId} 尚未选择解决方式（保留当前 / 使用备份）";
   readonly 'syncflow.diff': "差异";
   readonly 'syncflow.importDone': "已导入 {n} 个分区";
   readonly 'syncflow.importFailed': "导入失败（已整体回滚）";

package/lib/client.js

@@ -2065,7 +2065,7 @@ var RunStore = class {
 const runStore = new RunStore();
 //#endregion
 //#region \0config-manager-css:/home/runner/work/dsh-config-manager/dsh-config-manager/src/client/config-manager.module.css.js
-const css = "._367UGW_section{height:100%;min-height:0;color:var(--dsw-alias-label-primary);font-family:var(--dsw-font-family);flex-direction:column;gap:10px;font-size:13px;display:flex}._367UGW_sectionHeader{flex:none;align-items:center;gap:10px;display:flex}._367UGW_viewTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:1;gap:2px;display:flex}._367UGW_viewTab{color:var(--dsw-alias-label-secondary);cursor:pointer;white-space:nowrap;background:0 0;border:none;border-bottom:2px solid #0000;border-radius:6px 6px 0 0;padding:7px 14px;font-size:13px}._367UGW_viewTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_viewTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_sectionBody{flex-direction:column;flex:1;min-height:0;display:flex;overflow-y:auto}._367UGW_viewBody{flex-direction:column;gap:12px;padding:4px 2px 16px;display:flex}._367UGW_sectionTitleBlock{flex-direction:column;gap:2px;display:flex}._367UGW_sectionTitle{color:var(--dsw-alias-label-primary);margin:0;font-size:15px;font-weight:700}._367UGW_sectionSubtitle{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:1.5}._367UGW_primaryButton{color:var(--dsw-alias-label-primary-foreground);background:var(--dsw-alias-button-info-fill);cursor:pointer;white-space:nowrap;border:none;border-radius:8px;align-items:center;gap:6px;padding:6px 14px;font-size:13px;font-weight:600;display:inline-flex}._367UGW_primaryButton:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}._367UGW_primaryButton:disabled{opacity:.5;cursor:default}._367UGW_ghostButton{color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;align-items:center;gap:6px;padding:5px 12px;font-size:12px;display:inline-flex}._367UGW_ghostButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}._367UGW_ghostButton:disabled{opacity:.45;cursor:default}._367UGW_dangerButton{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;padding:5px 12px;font-size:12px}._367UGW_dangerButton:hover:not(:disabled){background:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary-foreground)}._367UGW_dangerButton:disabled{opacity:.45;cursor:default}._367UGW_badge{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);white-space:nowrap;border-radius:999px;padding:1px 8px;font-size:11px;line-height:1.6;display:inline-block}._367UGW_badgeInfo{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_badgeOk{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_badgeWarn{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_badgeError{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere;border-radius:8px;padding:8px 12px;font-size:12.5px;line-height:1.5}._367UGW_banner[data-kind=ok]{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_banner[data-kind=error]{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner[data-kind=info]{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_banner[data-kind=warn]{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_card{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;flex-direction:column;flex:none;gap:10px;padding:12px;display:flex}._367UGW_field{flex-direction:column;gap:5px;display:flex}._367UGW_fieldLabel{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:600}._367UGW_input{color:var(--dsw-alias-label-primary);background:var(--dsw-specific-input-major);border:1px solid var(--dsw-alias-border-l2);resize:vertical;border-radius:8px;outline:none;padding:7px 10px;font-family:inherit;font-size:13px}._367UGW_input:focus{border-color:var(--dsw-alias-state-business-primary)}._367UGW_input::placeholder{color:var(--dsw-alias-label-tertiary)}._367UGW_input:disabled{opacity:.55}._367UGW_select{-webkit-appearance:none;appearance:none;color:var(--dsw-alias-label-primary);background-color:var(--dsw-specific-input-major);background-image:linear-gradient(45deg, transparent 50%, var(--dsw-alias-label-secondary) 50%), linear-gradient(135deg, var(--dsw-alias-label-secondary) 50%, transparent 50%);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;background-position:calc(100% - 17px) calc(50% - 1px),calc(100% - 12px) calc(50% - 1px);background-repeat:no-repeat;background-size:5px 5px,5px 5px;border-radius:8px;outline:none;max-width:100%;padding:7px 30px 7px 10px;font-family:inherit;font-size:13px}._367UGW_select:hover:not(:disabled){border-color:var(--dsw-alias-border-l1)}._367UGW_select:focus{border-color:var(--dsw-alias-state-business-primary)}._367UGW_select:disabled{opacity:.55;cursor:default}._367UGW_select option{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2)}._367UGW_hint{color:var(--dsw-alias-label-tertiary);font-size:11.5px;line-height:1.5}._367UGW_formError{color:var(--dsw-alias-state-error-primary);margin:0;font-size:12px}._367UGW_checkboxRow{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:flex-start;gap:8px;font-size:13px;display:flex}._367UGW_checkboxRow input{flex:none;margin-top:2px}._367UGW_radioLabel{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:center;gap:6px;font-size:13px;display:inline-flex}._367UGW_secretFields{grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:10px 12px;padding-top:4px;display:grid}._367UGW_hiddenFile{display:none}._367UGW_modeTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;gap:2px;display:flex}._367UGW_modeTab{color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-bottom:2px solid #0000;padding:6px 12px;font-size:12.5px}._367UGW_modeTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_modeTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_modeHint{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5}._367UGW_groupList{flex-direction:column;gap:10px;display:flex}._367UGW_groupCard{gap:8px}._367UGW_groupHeader{flex-wrap:wrap;align-items:baseline;gap:8px;display:flex}._367UGW_groupLabel{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:700}._367UGW_groupNote{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_groupItems{flex-direction:column;gap:6px;display:flex}._367UGW_categoryItem{flex-wrap:wrap;align-items:center;gap:8px;display:inline-flex}._367UGW_categoryName{font-weight:500}._367UGW_categoryDesc{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_optionsCard{gap:8px}._367UGW_warnList{margin:4px 0 0;padding-left:18px}._367UGW_actionRow{flex-wrap:wrap;align-items:center;gap:10px;display:flex}._367UGW_progressBlock{flex-direction:column;flex:none;gap:6px;display:flex}._367UGW_progressMeta{color:var(--dsw-alias-label-secondary);flex-wrap:wrap;gap:12px;font-size:12px;display:flex}._367UGW_progressLabel{font-weight:600}._367UGW_progressDetail{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;max-width:320px;overflow:hidden}._367UGW_progressBadge{font-variant-numeric:tabular-nums;white-space:nowrap;border-radius:999px;align-items:center;gap:2px;padding:1px 8px;font-size:11px;line-height:18px;display:inline-flex}._367UGW_progressBadgeSection{background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 14%, transparent);color:var(--dsw-alias-state-business-primary)}._367UGW_progressBadgeCount{background:color-mix(in srgb, var(--dsw-alias-state-info-primary) 14%, transparent);color:var(--dsw-alias-state-info-primary)}._367UGW_progressPercent{font-variant-numeric:tabular-nums;margin-left:auto}._367UGW_progressTrack{background:var(--dsw-alias-interactive-bg-hover);border-radius:999px;height:8px;overflow:hidden}._367UGW_progressBar{background:var(--dsw-alias-state-business-primary);border-radius:999px;height:100%;transition:width .12s linear}._367UGW_progressBarDone{background:var(--dsw-alias-state-success-primary)}._367UGW_progressIndeterminate{width:40%;animation:1s ease-in-out infinite _367UGW_dshCmIndeterminate}@keyframes _367UGW_dshCmIndeterminate{0%{margin-left:-40%}to{margin-left:100%}}._367UGW_reportView{flex-direction:column;gap:10px;display:flex}._367UGW_statRow{flex-wrap:wrap;align-items:center;gap:6px;display:flex}._367UGW_reportText{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:260px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:10px 12px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}._367UGW_reportFooter{justify-content:flex-end;gap:8px;display:flex}._367UGW_rollbackBox{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_rollbackBox ._367UGW_reportText{border-color:var(--dsw-alias-border-l2)}._367UGW_errorBanner{border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_errorTitle{color:var(--dsw-alias-state-error-primary);font-size:13px;font-weight:700}._367UGW_errorReason{white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorAction{color:var(--dsw-alias-label-secondary);font-size:12.5px}._367UGW_errorActionLabel{color:var(--dsw-alias-state-business-primary)}._367UGW_errorItem{color:var(--dsw-alias-label-tertiary);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorFooter{justify-content:flex-end;display:flex}._367UGW_errorList{flex-direction:column;gap:4px;display:flex}._367UGW_errorLine{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-state-error-primary);border-radius:6px;margin:0;padding:6px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictList{flex-direction:column;gap:10px;display:flex}._367UGW_conflictItem{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_conflictHead{flex-wrap:wrap;align-items:center;gap:8px;display:flex}._367UGW_conflictId{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:600}._367UGW_severityError{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);border-radius:999px;padding:0 6px;font-size:10.5px}._367UGW_conflictDetail{background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);border-radius:6px;margin:0;padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictOptions{flex-wrap:wrap;gap:14px;display:flex}._367UGW_pathMappingList{flex-direction:column;gap:8px;display:flex}._367UGW_pathRow{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;padding:10px 12px;display:grid}._367UGW_pathOld,._367UGW_pathNew{flex-direction:column;gap:4px;min-width:0;display:flex}._367UGW_pathValue{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}._367UGW_pathIssueKind{color:var(--dsw-alias-state-warn-primary);font-size:10.5px}._367UGW_secretsList{flex-direction:column;gap:10px;display:flex}._367UGW_empty{text-align:center;color:var(--dsw-alias-label-tertiary);padding:22px 12px;font-size:12.5px}._367UGW_spinnerWrap{align-items:center;gap:6px;display:inline-flex}._367UGW_spinner{border:2px solid var(--dsw-alias-state-business-primary);vertical-align:-1px;border-top-color:#0000;border-radius:50%;flex:none;width:11px;height:11px;animation:.8s linear infinite _367UGW_dshCmSpin;display:inline-block}._367UGW_spinnerLabel{color:var(--dsw-alias-label-secondary);font-size:12px}@keyframes _367UGW_dshCmSpin{to{transform:rotate(360deg)}}._367UGW_snapshotList{flex-direction:column;gap:2px;display:flex}._367UGW_snapshotRowHeader,._367UGW_snapshotRow{grid-template-columns:minmax(120px,1.2fr) minmax(140px,1.6fr) 90px 56px 56px;align-items:center;gap:8px;padding:6px 10px;font-size:12px;display:grid}._367UGW_snapshotRowHeader{color:var(--dsw-alias-label-tertiary);border-bottom:1px solid var(--dsw-alias-border-l1);font-size:11px}._367UGW_snapshotRow{text-align:left;width:100%;color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border:1px solid #0000;border-radius:6px}._367UGW_snapshotRow:hover{background:var(--dsw-alias-interactive-bg-hover)}._367UGW_snapshotRow[data-active]{border-color:var(--dsw-alias-state-business-primary);background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 10%, transparent)}._367UGW_warnText{color:var(--dsw-alias-state-warn-primary)}._367UGW_reportList{color:var(--dsw-alias-label-primary);flex-direction:column;gap:3px;margin:8px 0 4px;padding-left:18px;font-size:12px;display:flex}._367UGW_kindTag{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);border-radius:4px;padding:1px 6px;font-size:10.5px;display:inline-block}._367UGW_planScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;height:280px;padding:2px 10px 8px;overflow-y:auto}._367UGW_planScroll ._367UGW_reportList{margin-top:6px}._367UGW_reportScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;max-height:220px;padding:2px 10px 6px;overflow-y:auto}._367UGW_reportScroll ._367UGW_reportList{margin-top:4px}._367UGW_confirmScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;max-height:280px;padding:2px 10px 6px;overflow-y:auto}._367UGW_confirmScroll ._367UGW_reportList{margin-top:4px;margin-bottom:0}._367UGW_rowActions{gap:8px;margin-top:10px;display:flex}._367UGW_diffScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:240px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:8px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}";
+const css = "._367UGW_section{height:100%;min-height:0;color:var(--dsw-alias-label-primary);font-family:var(--dsw-font-family);flex-direction:column;gap:10px;font-size:13px;display:flex}._367UGW_sectionHeader{flex:none;align-items:center;gap:10px;display:flex}._367UGW_viewTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:1;gap:2px;display:flex}._367UGW_viewTab{color:var(--dsw-alias-label-secondary);cursor:pointer;white-space:nowrap;background:0 0;border:none;border-bottom:2px solid #0000;border-radius:6px 6px 0 0;padding:7px 14px;font-size:13px}._367UGW_viewTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_viewTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_sectionBody{flex-direction:column;flex:1;min-height:0;display:flex;overflow-y:auto}._367UGW_viewBody{flex-direction:column;gap:12px;padding:4px 2px 16px;display:flex}._367UGW_sectionTitleBlock{flex-direction:column;gap:2px;display:flex}._367UGW_sectionTitle{color:var(--dsw-alias-label-primary);margin:0;font-size:15px;font-weight:700}._367UGW_sectionSubtitle{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:1.5}._367UGW_primaryButton{color:var(--dsw-alias-label-primary-foreground);background:var(--dsw-alias-button-info-fill);cursor:pointer;white-space:nowrap;border:none;border-radius:8px;align-items:center;gap:6px;padding:6px 14px;font-size:13px;font-weight:600;display:inline-flex}._367UGW_primaryButton:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}._367UGW_primaryButton:disabled{opacity:.5;cursor:default}._367UGW_ghostButton{color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;align-items:center;gap:6px;padding:5px 12px;font-size:12px;display:inline-flex}._367UGW_ghostButton:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}._367UGW_ghostButton:disabled{opacity:.45;cursor:default}._367UGW_dangerButton{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);cursor:pointer;white-space:nowrap;background:0 0;border-radius:8px;padding:5px 12px;font-size:12px}._367UGW_dangerButton:hover:not(:disabled){background:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary-foreground)}._367UGW_dangerButton:disabled{opacity:.45;cursor:default}._367UGW_badge{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);white-space:nowrap;border-radius:999px;padding:1px 8px;font-size:11px;line-height:1.6;display:inline-block}._367UGW_badgeInfo{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_badgeOk{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_badgeWarn{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_badgeError{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere;border-radius:8px;padding:8px 12px;font-size:12.5px;line-height:1.5}._367UGW_banner[data-kind=ok]{color:var(--dsw-alias-state-success-primary);border-color:var(--dsw-alias-state-success-primary)}._367UGW_banner[data-kind=error]{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}._367UGW_banner[data-kind=info]{color:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary)}._367UGW_banner[data-kind=warn]{color:var(--dsw-alias-state-warn-primary);border-color:var(--dsw-alias-state-warn-primary)}._367UGW_card{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;flex-direction:column;flex:none;gap:10px;padding:12px;display:flex}._367UGW_field{flex-direction:column;gap:5px;display:flex}._367UGW_fieldLabel{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:600}._367UGW_input{color:var(--dsw-alias-label-primary);background:var(--dsw-specific-input-major);border:1px solid var(--dsw-alias-border-l2);resize:vertical;border-radius:8px;outline:none;padding:7px 10px;font-family:inherit;font-size:13px}._367UGW_input:focus{border-color:var(--dsw-alias-state-business-primary)}._367UGW_input::placeholder{color:var(--dsw-alias-label-tertiary)}._367UGW_input:disabled{opacity:.55}._367UGW_select{-webkit-appearance:none;appearance:none;color:var(--dsw-alias-label-primary);background-color:var(--dsw-specific-input-major);background-image:linear-gradient(45deg, transparent 50%, var(--dsw-alias-label-secondary) 50%), linear-gradient(135deg, var(--dsw-alias-label-secondary) 50%, transparent 50%);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;background-position:calc(100% - 17px) calc(50% - 1px),calc(100% - 12px) calc(50% - 1px);background-repeat:no-repeat;background-size:5px 5px,5px 5px;border-radius:8px;outline:none;max-width:100%;padding:7px 30px 7px 10px;font-family:inherit;font-size:13px}._367UGW_select:hover:not(:disabled){border-color:var(--dsw-alias-border-l1)}._367UGW_select:focus{border-color:var(--dsw-alias-state-business-primary)}._367UGW_select:disabled{opacity:.55;cursor:default}._367UGW_select option{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2)}._367UGW_hint{color:var(--dsw-alias-label-tertiary);font-size:11.5px;line-height:1.5}._367UGW_formError{color:var(--dsw-alias-state-error-primary);margin:0;font-size:12px}._367UGW_checkboxRow{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:flex-start;gap:8px;font-size:13px;display:flex}._367UGW_checkboxRow input{flex:none;margin-top:2px}._367UGW_radioLabel{color:var(--dsw-alias-label-primary);cursor:pointer;align-items:center;gap:6px;font-size:13px;display:inline-flex}._367UGW_secretFields{grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:10px 12px;padding-top:4px;display:grid}._367UGW_hiddenFile{display:none}._367UGW_modeTabs{border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;gap:2px;display:flex}._367UGW_modeTab{color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-bottom:2px solid #0000;padding:6px 12px;font-size:12.5px}._367UGW_modeTab:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}._367UGW_modeTab[data-active]{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-business-primary);font-weight:600}._367UGW_modeHint{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5}._367UGW_groupList{flex-direction:column;gap:10px;display:flex}._367UGW_groupCard{gap:8px}._367UGW_groupHeader{flex-wrap:wrap;align-items:baseline;gap:8px;display:flex}._367UGW_groupLabel{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:700}._367UGW_groupNote{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_groupItems{flex-direction:column;gap:6px;display:flex}._367UGW_categoryItem{flex-wrap:wrap;align-items:center;gap:8px;display:inline-flex}._367UGW_categoryName{font-weight:500}._367UGW_categoryDesc{color:var(--dsw-alias-label-tertiary);font-size:11.5px}._367UGW_optionsCard{gap:8px}._367UGW_warnList{margin:4px 0 0;padding-left:18px}._367UGW_actionRow{flex-wrap:wrap;align-items:center;gap:10px;display:flex}._367UGW_progressBlock{flex-direction:column;flex:none;gap:6px;display:flex}._367UGW_progressMeta{color:var(--dsw-alias-label-secondary);flex-wrap:wrap;gap:12px;font-size:12px;display:flex}._367UGW_progressLabel{font-weight:600}._367UGW_progressDetail{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;max-width:320px;overflow:hidden}._367UGW_progressBadge{font-variant-numeric:tabular-nums;white-space:nowrap;border-radius:999px;align-items:center;gap:2px;padding:1px 8px;font-size:11px;line-height:18px;display:inline-flex}._367UGW_progressBadgeSection{background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 14%, transparent);color:var(--dsw-alias-state-business-primary)}._367UGW_progressBadgeCount{background:color-mix(in srgb, var(--dsw-alias-state-info-primary) 14%, transparent);color:var(--dsw-alias-state-info-primary)}._367UGW_progressPercent{font-variant-numeric:tabular-nums;margin-left:auto}._367UGW_progressTrack{background:var(--dsw-alias-interactive-bg-hover);border-radius:999px;height:8px;overflow:hidden}._367UGW_progressBar{background:var(--dsw-alias-state-business-primary);border-radius:999px;height:100%;transition:width .12s linear}._367UGW_progressBarDone{background:var(--dsw-alias-state-success-primary)}._367UGW_progressIndeterminate{width:40%;animation:1s ease-in-out infinite _367UGW_dshCmIndeterminate}@keyframes _367UGW_dshCmIndeterminate{0%{margin-left:-40%}to{margin-left:100%}}._367UGW_reportView{flex-direction:column;gap:10px;display:flex}._367UGW_statRow{flex-wrap:wrap;align-items:center;gap:6px;display:flex}._367UGW_reportText{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:260px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:10px 12px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}._367UGW_reportFooter{justify-content:flex-end;gap:8px;display:flex}._367UGW_rollbackBox{border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_rollbackBox ._367UGW_reportText{border-color:var(--dsw-alias-border-l2)}._367UGW_errorBanner{border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_errorTitle{color:var(--dsw-alias-state-error-primary);font-size:13px;font-weight:700}._367UGW_errorReason{white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorAction{color:var(--dsw-alias-label-secondary);font-size:12.5px}._367UGW_errorActionLabel{color:var(--dsw-alias-state-business-primary)}._367UGW_errorItem{color:var(--dsw-alias-label-tertiary);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}._367UGW_errorFooter{justify-content:flex-end;display:flex}._367UGW_errorList{flex-direction:column;gap:4px;display:flex}._367UGW_errorLine{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-state-error-primary);border-radius:6px;margin:0;padding:6px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictList{flex-direction:column;gap:10px;display:flex}._367UGW_conflictItem{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;flex-direction:column;gap:6px;padding:10px 12px;display:flex}._367UGW_conflictHead{flex-wrap:wrap;align-items:center;gap:8px;display:flex}._367UGW_conflictId{color:var(--dsw-alias-label-primary);font-size:12.5px;font-weight:600}._367UGW_severityError{color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-primary);border-radius:999px;padding:0 6px;font-size:10.5px}._367UGW_conflictDetail{background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-secondary);border-radius:6px;margin:0;padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}._367UGW_conflictOptions{flex-wrap:wrap;gap:14px;display:flex}._367UGW_pathMappingList{flex-direction:column;gap:8px;display:flex}._367UGW_pathRow{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:8px;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:10px;padding:10px 12px;display:grid}._367UGW_pathOld,._367UGW_pathNew{flex-direction:column;gap:4px;min-width:0;display:flex}._367UGW_pathValue{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}._367UGW_pathIssueKind{color:var(--dsw-alias-state-warn-primary);font-size:10.5px}._367UGW_secretsList{flex-direction:column;gap:10px;display:flex}._367UGW_empty{text-align:center;color:var(--dsw-alias-label-tertiary);padding:22px 12px;font-size:12.5px}._367UGW_spinnerWrap{align-items:center;gap:6px;display:inline-flex}._367UGW_spinner{border:2px solid var(--dsw-alias-state-business-primary);vertical-align:-1px;border-top-color:#0000;border-radius:50%;flex:none;width:11px;height:11px;animation:.8s linear infinite _367UGW_dshCmSpin;display:inline-block}._367UGW_spinnerLabel{color:var(--dsw-alias-label-secondary);font-size:12px}@keyframes _367UGW_dshCmSpin{to{transform:rotate(360deg)}}._367UGW_snapshotList{flex-direction:column;gap:2px;display:flex}._367UGW_snapshotRowHeader,._367UGW_snapshotRow{grid-template-columns:minmax(120px,1.2fr) minmax(140px,1.6fr) 90px 56px 56px;align-items:center;gap:8px;padding:6px 10px;font-size:12px;display:grid}._367UGW_snapshotRowHeader{color:var(--dsw-alias-label-tertiary);border-bottom:1px solid var(--dsw-alias-border-l1);font-size:11px}._367UGW_snapshotRow{text-align:left;width:100%;color:var(--dsw-alias-label-primary);cursor:pointer;background:0 0;border:1px solid #0000;border-radius:6px}._367UGW_snapshotRow:hover{background:var(--dsw-alias-interactive-bg-hover)}._367UGW_snapshotRow[data-active]{border-color:var(--dsw-alias-state-business-primary);background:color-mix(in srgb, var(--dsw-alias-state-business-primary) 10%, transparent)}._367UGW_warnText{color:var(--dsw-alias-state-warn-primary)}._367UGW_reportList{color:var(--dsw-alias-label-primary);flex-direction:column;gap:3px;margin:8px 0 4px;padding-left:18px;font-size:12px;display:flex}._367UGW_kindTag{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);border-radius:4px;padding:1px 6px;font-size:10.5px;display:inline-block}._367UGW_planScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;height:280px;padding:2px 10px 8px;overflow-y:auto}._367UGW_planScroll ._367UGW_reportList{margin-top:6px}._367UGW_reportScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;max-height:220px;padding:2px 10px 6px;overflow-y:auto}._367UGW_reportScroll ._367UGW_reportList{margin-top:4px}._367UGW_confirmScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;max-height:280px;padding:2px 10px 6px;overflow-y:auto}._367UGW_confirmScroll ._367UGW_reportList{margin-top:4px;margin-bottom:0}._367UGW_pullScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;height:280px;padding:2px 10px 6px;overflow-y:auto}._367UGW_pullScroll ._367UGW_reportList{margin-top:4px;margin-bottom:0}._367UGW_rowActions{gap:8px;margin-top:10px;display:flex}._367UGW_diffScroll{overscroll-behavior:contain;background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l2);white-space:pre-wrap;word-break:break-all;max-height:240px;color:var(--dsw-alias-label-primary);border-radius:8px;margin:0;padding:8px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;line-height:1.6;overflow:auto}";
 const tagId = "dsh-config-manager/config-manager.module.css";
 if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"dsh-config-manager/config-manager.module.css\"]") === null) {
 	const tag = document.createElement("style");
@@ -2075,107 +2075,108 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"errorFooter": "_367UGW_errorFooter",
-	"warnText": "_367UGW_warnText",
-	"planScroll": "_367UGW_planScroll",
-	"rowActions": "_367UGW_rowActions",
-	"dangerButton": "_367UGW_dangerButton",
-	"card": "_367UGW_card",
-	"groupCard": "_367UGW_groupCard",
-	"errorItem": "_367UGW_errorItem",
-	"formError": "_367UGW_formError",
-	"pathOld": "_367UGW_pathOld",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"pathValue": "_367UGW_pathValue",
-	"select": "_367UGW_select",
-	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"sectionBody": "_367UGW_sectionBody",
-	"banner": "_367UGW_banner",
-	"hint": "_367UGW_hint",
-	"reportView": "_367UGW_reportView",
-	"categoryDesc": "_367UGW_categoryDesc",
-	"reportList": "_367UGW_reportList",
-	"statRow": "_367UGW_statRow",
-	"progressMeta": "_367UGW_progressMeta",
-	"progressBarDone": "_367UGW_progressBarDone",
-	"secretsList": "_367UGW_secretsList",
-	"snapshotRow": "_367UGW_snapshotRow",
-	"confirmScroll": "_367UGW_confirmScroll",
-	"errorBanner": "_367UGW_errorBanner",
-	"secretFields": "_367UGW_secretFields",
-	"categoryName": "_367UGW_categoryName",
-	"errorLine": "_367UGW_errorLine",
-	"conflictHead": "_367UGW_conflictHead",
-	"progressBadgeCount": "_367UGW_progressBadgeCount",
-	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
-	"badgeWarn": "_367UGW_badgeWarn",
-	"badge": "_367UGW_badge",
-	"badgeError": "_367UGW_badgeError",
-	"actionRow": "_367UGW_actionRow",
-	"dshCmSpin": "_367UGW_dshCmSpin",
-	"groupLabel": "_367UGW_groupLabel",
-	"snapshotList": "_367UGW_snapshotList",
 	"warnList": "_367UGW_warnList",
-	"progressDetail": "_367UGW_progressDetail",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"sectionSubtitle": "_367UGW_sectionSubtitle",
 	"groupNote": "_367UGW_groupNote",
-	"rollbackBox": "_367UGW_rollbackBox",
+	"conflictItem": "_367UGW_conflictItem",
+	"badgeWarn": "_367UGW_badgeWarn",
+	"progressBadge": "_367UGW_progressBadge",
 	"conflictOptions": "_367UGW_conflictOptions",
-	"diffScroll": "_367UGW_diffScroll",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
-	"input": "_367UGW_input",
+	"pathOld": "_367UGW_pathOld",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"categoryName": "_367UGW_categoryName",
 	"fieldLabel": "_367UGW_fieldLabel",
-	"errorTitle": "_367UGW_errorTitle",
-	"conflictId": "_367UGW_conflictId",
-	"modeTabs": "_367UGW_modeTabs",
-	"groupItems": "_367UGW_groupItems",
-	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
-	"optionsCard": "_367UGW_optionsCard",
-	"reportFooter": "_367UGW_reportFooter",
-	"progressLabel": "_367UGW_progressLabel",
-	"conflictItem": "_367UGW_conflictItem",
-	"errorList": "_367UGW_errorList",
 	"section": "_367UGW_section",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"field": "_367UGW_field",
-	"viewTab": "_367UGW_viewTab",
-	"progressBlock": "_367UGW_progressBlock",
+	"radioLabel": "_367UGW_radioLabel",
+	"groupLabel": "_367UGW_groupLabel",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"errorLine": "_367UGW_errorLine",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"groupList": "_367UGW_groupList",
+	"actionRow": "_367UGW_actionRow",
+	"progressBarDone": "_367UGW_progressBarDone",
 	"errorAction": "_367UGW_errorAction",
-	"pathNew": "_367UGW_pathNew",
+	"progressBlock": "_367UGW_progressBlock",
+	"snapshotList": "_367UGW_snapshotList",
 	"kindTag": "_367UGW_kindTag",
-	"errorReason": "_367UGW_errorReason",
+	"spinner": "_367UGW_spinner",
 	"conflictList": "_367UGW_conflictList",
-	"progressPercent": "_367UGW_progressPercent",
-	"radioLabel": "_367UGW_radioLabel",
+	"reportFooter": "_367UGW_reportFooter",
+	"banner": "_367UGW_banner",
+	"field": "_367UGW_field",
+	"categoryItem": "_367UGW_categoryItem",
+	"errorBanner": "_367UGW_errorBanner",
+	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
+	"primaryButton": "_367UGW_primaryButton",
 	"reportText": "_367UGW_reportText",
 	"reportScroll": "_367UGW_reportScroll",
-	"progressBar": "_367UGW_progressBar",
-	"viewTabs": "_367UGW_viewTabs",
-	"pathRow": "_367UGW_pathRow",
-	"spinner": "_367UGW_spinner",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"primaryButton": "_367UGW_primaryButton",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"empty": "_367UGW_empty",
-	"progressBadgeSection": "_367UGW_progressBadgeSection",
-	"modeHint": "_367UGW_modeHint",
+	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
 	"conflictDetail": "_367UGW_conflictDetail",
-	"progressTrack": "_367UGW_progressTrack",
-	"sectionHeader": "_367UGW_sectionHeader",
-	"severityError": "_367UGW_severityError",
-	"viewBody": "_367UGW_viewBody",
+	"empty": "_367UGW_empty",
+	"sectionTitle": "_367UGW_sectionTitle",
 	"badgeInfo": "_367UGW_badgeInfo",
-	"pathIssueKind": "_367UGW_pathIssueKind",
 	"hiddenFile": "_367UGW_hiddenFile",
-	"spinnerLabel": "_367UGW_spinnerLabel",
-	"categoryItem": "_367UGW_categoryItem",
+	"errorItem": "_367UGW_errorItem",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"card": "_367UGW_card",
+	"diffScroll": "_367UGW_diffScroll",
+	"viewBody": "_367UGW_viewBody",
+	"conflictId": "_367UGW_conflictId",
+	"errorFooter": "_367UGW_errorFooter",
+	"severityError": "_367UGW_severityError",
+	"errorReason": "_367UGW_errorReason",
+	"secretsList": "_367UGW_secretsList",
 	"modeTab": "_367UGW_modeTab",
-	"ghostButton": "_367UGW_ghostButton",
-	"badgeOk": "_367UGW_badgeOk",
-	"groupList": "_367UGW_groupList",
+	"dangerButton": "_367UGW_dangerButton",
+	"statRow": "_367UGW_statRow",
+	"dshCmSpin": "_367UGW_dshCmSpin",
+	"snapshotRow": "_367UGW_snapshotRow",
+	"warnText": "_367UGW_warnText",
+	"rowActions": "_367UGW_rowActions",
+	"groupCard": "_367UGW_groupCard",
+	"sectionHeader": "_367UGW_sectionHeader",
+	"badge": "_367UGW_badge",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"pathNew": "_367UGW_pathNew",
+	"viewTab": "_367UGW_viewTab",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"reportList": "_367UGW_reportList",
+	"pullScroll": "_367UGW_pullScroll",
+	"optionsCard": "_367UGW_optionsCard",
 	"groupHeader": "_367UGW_groupHeader",
-	"progressBadge": "_367UGW_progressBadge"
+	"groupItems": "_367UGW_groupItems",
+	"progressBadgeCount": "_367UGW_progressBadgeCount",
+	"reportView": "_367UGW_reportView",
+	"confirmScroll": "_367UGW_confirmScroll",
+	"progressMeta": "_367UGW_progressMeta",
+	"errorTitle": "_367UGW_errorTitle",
+	"badgeError": "_367UGW_badgeError",
+	"sectionBody": "_367UGW_sectionBody",
+	"progressLabel": "_367UGW_progressLabel",
+	"input": "_367UGW_input",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"progressBar": "_367UGW_progressBar",
+	"viewTabs": "_367UGW_viewTabs",
+	"pathRow": "_367UGW_pathRow",
+	"badgeOk": "_367UGW_badgeOk",
+	"hint": "_367UGW_hint",
+	"formError": "_367UGW_formError",
+	"progressDetail": "_367UGW_progressDetail",
+	"progressTrack": "_367UGW_progressTrack",
+	"select": "_367UGW_select",
+	"errorList": "_367UGW_errorList",
+	"ghostButton": "_367UGW_ghostButton",
+	"conflictHead": "_367UGW_conflictHead",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"modeHint": "_367UGW_modeHint",
+	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"modeTabs": "_367UGW_modeTabs",
+	"progressPercent": "_367UGW_progressPercent",
+	"secretFields": "_367UGW_secretFields",
+	"pathValue": "_367UGW_pathValue",
+	"planScroll": "_367UGW_planScroll"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -4319,6 +4320,28 @@ function summarizeConfirmItems(items) {
 		needsReview
 	};
 }
+/**
+* 收集用户逐项决策 → apply-items 请求体 adoptions[]。
+* 仅包含 adopt=true 的项；Conflict 项 adopt=true 且未给 resolution → 抛错（强制先解决）。
+* 与导入恢复向导一致：只提供「保留当前 / 使用导入」两项，跳过 = 取消勾选（adopt=false）。
+*/
+function buildAdoptions(items, adopted, resolutions) {
+	const out = [];
+	for (const it of items) {
+		if (adopted.get(it.itemId) !== true) continue;
+		const adoption = {
+			itemId: it.itemId,
+			adopt: true
+		};
+		if (it.kind === "Conflict") {
+			const resolution = resolutions.get(it.itemId);
+			if (resolution === void 0) throw new Error(`冲突项 ${it.itemId} 必须先选择解决方式（保留当前 / 使用导入）`);
+			adoption.resolution = resolution;
+		}
+		out.push(adoption);
+	}
+	return out;
+}
 /** AutosyncInterval → ms。 */
 function autosyncIntervalMs(interval) {
 	switch (interval) {
@@ -4624,15 +4647,12 @@ function SyncConfirmView(props) {
 		try {
 			const adoptedMap = /* @__PURE__ */ new Map();
 			for (const it of items) adoptedMap.set(it.itemId, states[it.itemId]?.adopted ?? false);
-			const adoptions = items.filter((it) => adoptedMap.get(it.itemId) === true).map((it) => {
-				const adoption = {
-					itemId: it.itemId,
-					adopt: true
-				};
+			const resolutions = /* @__PURE__ */ new Map();
+			for (const it of items) {
 				const res = states[it.itemId]?.resolution;
-				if (it.kind === "Conflict" && res !== void 0 && res !== "skip") adoption.resolution = res;
-				return adoption;
-			});
+				if (res !== void 0) resolutions.set(it.itemId, res);
+			}
+			const adoptions = buildAdoptions(items, adoptedMap, resolutions);
 			const result = await api.applyItems({
 				syncSessionId,
 				adoptions
@@ -4835,36 +4855,19 @@ function SyncConfirmView(props) {
 }
 function ConflictResolver({ item, resolution, busy, t, onResolve }) {
 	const conflict = item.conflict;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-		className: config_manager_module_css_default.rowActions,
+	const options = [{
+		value: "keepLocal",
+		label: t("syncflow.conflictUseLocal")
+	}, {
+		value: "useRemote",
+		label: t("syncflow.conflictUseRemote")
+	}];
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: config_manager_module_css_default.conflictItem,
 		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: config_manager_module_css_default.fieldLabel,
-				children: t("syncflow.conflictTitle")
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-				variant: "ghost",
-				disabled: busy || resolution === "keepLocal",
-				onClick: () => {
-					onResolve("keepLocal");
-				},
-				children: resolution === "keepLocal" ? `✓ ${t("syncflow.conflictUseLocal")}` : t("syncflow.conflictUseLocal")
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-				variant: "primary",
-				disabled: busy || resolution === "useRemote",
-				onClick: () => {
-					onResolve("useRemote");
-				},
-				children: resolution === "useRemote" ? `✓ ${t("syncflow.conflictUseRemote")}` : t("syncflow.conflictUseRemote")
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-				variant: "ghost",
-				disabled: busy || resolution === "skip",
-				onClick: () => {
-					onResolve("skip");
-				},
-				children: resolution === "skip" ? `✓ ${t("syncflow.conflictSkip")}` : t("syncflow.conflictSkip")
+			item.detail !== void 0 && item.detail !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+				className: config_manager_module_css_default.conflictDetail,
+				children: item.detail
 			}),
 			conflict?.diff !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
 				className: config_manager_module_css_default.conflictDetail,
@@ -4872,6 +4875,21 @@ function ConflictResolver({ item, resolution, busy, t, onResolve }) {
 					className: config_manager_module_css_default.diffScroll,
 					children: conflict.diff
 				})]
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: config_manager_module_css_default.conflictOptions,
+				children: options.map((opt) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+					className: config_manager_module_css_default.radioLabel,
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+						type: "radio",
+						name: `sync-conflict-${item.itemId}`,
+						checked: resolution === opt.value,
+						disabled: busy,
+						onChange: () => {
+							onResolve(opt.value);
+						}
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: opt.label })]
+				}, opt.value))
 			})
 		]
 	});
@@ -5570,21 +5588,24 @@ function SyncSettingsView({ api, t }) {
 						children: t("pull.needsReview")
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: config_manager_module_css_default.reportList,
-						children: pullView.summary.items.map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: config_manager_module_css_default.statRow,
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: config_manager_module_css_default.kindTag,
-									children: kindLabel(c.kind, uiT)
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
-									kind: c.severity === "error" ? "error" : c.severity === "warning" ? "warn" : "info",
-									children: severityLabel(c.severity, uiT)
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: c.description })
-							]
-						}, c.id))
+						className: config_manager_module_css_default.pullScroll,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: config_manager_module_css_default.reportList,
+							children: pullView.summary.items.map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: config_manager_module_css_default.statRow,
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: config_manager_module_css_default.kindTag,
+										children: kindLabel(c.kind, uiT)
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+										kind: c.severity === "error" ? "error" : c.severity === "warning" ? "warn" : "info",
+										children: severityLabel(c.severity, uiT)
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: c.description })
+								]
+							}, c.id))
+						})
 					})
 				] }),
 				pullView.previewHint !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
@@ -6068,17 +6089,16 @@ const zh = {
 	"syncflow.needsReviewBadge": "需人工决策",
 	"syncflow.empty": "远端快照与本地一致（无变更）",
 	"syncflow.diffCount": "共 {count} 项差异",
-	"syncflow.keepLocalAll": "全部保留本地",
-	"syncflow.useRemoteAll": "全部采用远端",
+	"syncflow.keepLocalAll": "全部保留当前配置",
+	"syncflow.useRemoteAll": "全部使用备份配置",
 	"syncflow.bulkHint": "批量决策仅作用于冲突项；其余差异默认自动采用。",
 	"syncflow.conflictTitle": "冲突解决",
-	"syncflow.conflictUseLocal": "用本地",
-	"syncflow.conflictUseRemote": "用远端",
-	"syncflow.conflictSkip": "跳过",
-	"syncflow.conflictLocalLabel": "本地",
-	"syncflow.conflictRemoteLabel": "远端",
+	"syncflow.conflictUseLocal": "保留当前",
+	"syncflow.conflictUseRemote": "使用备份",
+	"syncflow.conflictLocalLabel": "当前",
+	"syncflow.conflictRemoteLabel": "备份",
 	"syncflow.conflictAncestorLabel": "共同祖先",
-	"syncflow.conflictUnresolved": "冲突项 {itemId} 尚未选择解决方式（用本地 / 用远端 / 跳过）",
+	"syncflow.conflictUnresolved": "冲突项 {itemId} 尚未选择解决方式（保留当前 / 使用备份）",
 	"syncflow.diff": "差异",
 	"syncflow.importDone": "已导入 {n} 个分区",
 	"syncflow.importFailed": "导入失败（已整体回滚）",
@@ -6188,17 +6208,16 @@ const en = {
 	"syncflow.needsReviewBadge": "Needs decision",
 	"syncflow.empty": "Remote snapshot matches local (no changes)",
 	"syncflow.diffCount": "{count} change(s)",
-	"syncflow.keepLocalAll": "Keep all local",
-	"syncflow.useRemoteAll": "Adopt all remote",
+	"syncflow.keepLocalAll": "Keep all current",
+	"syncflow.useRemoteAll": "Use all backup",
 	"syncflow.bulkHint": "Bulk decisions only apply to conflict items; other changes are adopted by default.",
 	"syncflow.conflictTitle": "Resolve conflict",
-	"syncflow.conflictUseLocal": "Use local",
-	"syncflow.conflictUseRemote": "Use remote",
-	"syncflow.conflictSkip": "Skip",
-	"syncflow.conflictLocalLabel": "Local",
-	"syncflow.conflictRemoteLabel": "Remote",
+	"syncflow.conflictUseLocal": "Keep current",
+	"syncflow.conflictUseRemote": "Use backup",
+	"syncflow.conflictLocalLabel": "Current",
+	"syncflow.conflictRemoteLabel": "Backup",
 	"syncflow.conflictAncestorLabel": "Common ancestor",
-	"syncflow.conflictUnresolved": "Conflict item {itemId} has no resolution yet (use local / use remote / skip)",
+	"syncflow.conflictUnresolved": "Conflict item {itemId} has no resolution yet (keep current / use backup)",
 	"syncflow.diff": "Diff",
 	"syncflow.importDone": "Imported {n} section(s)",
 	"syncflow.importFailed": "Import failed (rolled back)",