dsh-config-manager 0.1.21 → 0.1.23

package/lib/client.d.ts

@@ -959,6 +959,8 @@ declare const zh$1: {
   readonly 'import.conflicts.useImported': "使用备份";
   readonly 'import.conflicts.review': "稍后决定";
   readonly 'import.conflicts.unresolved': "还有 {count} 项未决策";
+  readonly 'import.conflicts.keepCurrentAll': "全部保留当前配置";
+  readonly 'import.conflicts.useImportedAll': "全部使用备份配置";
   readonly 'import.paths.title': "路径映射";
   readonly 'import.paths.hint': "备份中的绝对路径在目标机器可能不存在，请为每条路径指定新位置（留空将跳过该路径）。";
   readonly 'import.paths.old': "原路径";
@@ -1058,6 +1060,9 @@ declare const zh: {
   readonly 'syncflow.needsReviewBadge': "需人工决策";
   readonly 'syncflow.empty': "远端快照与本地一致（无变更）";
   readonly 'syncflow.diffCount': "共 {count} 项差异";
+  readonly 'syncflow.keepLocalAll': "全部保留本地";
+  readonly 'syncflow.useRemoteAll': "全部采用远端";
+  readonly 'syncflow.bulkHint': "批量决策仅作用于冲突项；其余差异默认自动采用。";
   readonly 'syncflow.conflictTitle': "冲突解决";
   readonly 'syncflow.conflictUseLocal': "用本地";
   readonly 'syncflow.conflictUseRemote': "用远端";

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_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_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_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,105 +2075,107 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"categoryItem": "_367UGW_categoryItem",
+	"errorFooter": "_367UGW_errorFooter",
 	"warnText": "_367UGW_warnText",
+	"planScroll": "_367UGW_planScroll",
 	"rowActions": "_367UGW_rowActions",
-	"groupLabel": "_367UGW_groupLabel",
-	"groupNote": "_367UGW_groupNote",
-	"warnList": "_367UGW_warnList",
-	"secretsList": "_367UGW_secretsList",
-	"progressBadge": "_367UGW_progressBadge",
-	"viewBody": "_367UGW_viewBody",
-	"progressPercent": "_367UGW_progressPercent",
-	"sectionHeader": "_367UGW_sectionHeader",
-	"field": "_367UGW_field",
+	"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",
-	"pathIssueKind": "_367UGW_pathIssueKind",
+	"reportList": "_367UGW_reportList",
+	"statRow": "_367UGW_statRow",
+	"progressMeta": "_367UGW_progressMeta",
 	"progressBarDone": "_367UGW_progressBarDone",
-	"modeTabs": "_367UGW_modeTabs",
-	"reportView": "_367UGW_reportView",
+	"secretsList": "_367UGW_secretsList",
 	"snapshotRow": "_367UGW_snapshotRow",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
-	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
+	"confirmScroll": "_367UGW_confirmScroll",
+	"errorBanner": "_367UGW_errorBanner",
+	"secretFields": "_367UGW_secretFields",
+	"categoryName": "_367UGW_categoryName",
 	"errorLine": "_367UGW_errorLine",
-	"banner": "_367UGW_banner",
-	"radioLabel": "_367UGW_radioLabel",
-	"progressMeta": "_367UGW_progressMeta",
-	"groupItems": "_367UGW_groupItems",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"pathNew": "_367UGW_pathNew",
-	"reportList": "_367UGW_reportList",
-	"dangerButton": "_367UGW_dangerButton",
-	"errorReason": "_367UGW_errorReason",
-	"viewTab": "_367UGW_viewTab",
-	"conflictItem": "_367UGW_conflictItem",
-	"diffScroll": "_367UGW_diffScroll",
+	"conflictHead": "_367UGW_conflictHead",
 	"progressBadgeCount": "_367UGW_progressBadgeCount",
-	"formError": "_367UGW_formError",
-	"card": "_367UGW_card",
-	"primaryButton": "_367UGW_primaryButton",
-	"conflictOptions": "_367UGW_conflictOptions",
-	"pathRow": "_367UGW_pathRow",
-	"sectionBody": "_367UGW_sectionBody",
-	"secretFields": "_367UGW_secretFields",
-	"optionsCard": "_367UGW_optionsCard",
-	"statRow": "_367UGW_statRow",
-	"rollbackBox": "_367UGW_rollbackBox",
-	"badgeOk": "_367UGW_badgeOk",
-	"progressBar": "_367UGW_progressBar",
-	"progressLabel": "_367UGW_progressLabel",
+	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
+	"badgeWarn": "_367UGW_badgeWarn",
 	"badge": "_367UGW_badge",
-	"errorAction": "_367UGW_errorAction",
-	"badgeInfo": "_367UGW_badgeInfo",
-	"errorItem": "_367UGW_errorItem",
-	"conflictHead": "_367UGW_conflictHead",
-	"severityError": "_367UGW_severityError",
-	"fieldLabel": "_367UGW_fieldLabel",
+	"badgeError": "_367UGW_badgeError",
 	"actionRow": "_367UGW_actionRow",
-	"errorBanner": "_367UGW_errorBanner",
-	"empty": "_367UGW_empty",
-	"spinner": "_367UGW_spinner",
-	"kindTag": "_367UGW_kindTag",
-	"spinnerLabel": "_367UGW_spinnerLabel",
-	"input": "_367UGW_input",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"planScroll": "_367UGW_planScroll",
-	"errorList": "_367UGW_errorList",
-	"progressDetail": "_367UGW_progressDetail",
+	"dshCmSpin": "_367UGW_dshCmSpin",
+	"groupLabel": "_367UGW_groupLabel",
 	"snapshotList": "_367UGW_snapshotList",
-	"ghostButton": "_367UGW_ghostButton",
-	"hint": "_367UGW_hint",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"conflictDetail": "_367UGW_conflictDetail",
-	"pathValue": "_367UGW_pathValue",
-	"badgeError": "_367UGW_badgeError",
-	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"viewTabs": "_367UGW_viewTabs",
-	"modeTab": "_367UGW_modeTab",
-	"categoryName": "_367UGW_categoryName",
-	"progressTrack": "_367UGW_progressTrack",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"reportText": "_367UGW_reportText",
-	"errorFooter": "_367UGW_errorFooter",
-	"hiddenFile": "_367UGW_hiddenFile",
-	"conflictList": "_367UGW_conflictList",
+	"warnList": "_367UGW_warnList",
+	"progressDetail": "_367UGW_progressDetail",
+	"groupNote": "_367UGW_groupNote",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"conflictOptions": "_367UGW_conflictOptions",
+	"diffScroll": "_367UGW_diffScroll",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"input": "_367UGW_input",
+	"fieldLabel": "_367UGW_fieldLabel",
 	"errorTitle": "_367UGW_errorTitle",
 	"conflictId": "_367UGW_conflictId",
+	"modeTabs": "_367UGW_modeTabs",
+	"groupItems": "_367UGW_groupItems",
+	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
+	"optionsCard": "_367UGW_optionsCard",
 	"reportFooter": "_367UGW_reportFooter",
-	"pathOld": "_367UGW_pathOld",
-	"badgeWarn": "_367UGW_badgeWarn",
+	"progressLabel": "_367UGW_progressLabel",
+	"conflictItem": "_367UGW_conflictItem",
+	"errorList": "_367UGW_errorList",
 	"section": "_367UGW_section",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"field": "_367UGW_field",
+	"viewTab": "_367UGW_viewTab",
+	"progressBlock": "_367UGW_progressBlock",
+	"errorAction": "_367UGW_errorAction",
+	"pathNew": "_367UGW_pathNew",
+	"kindTag": "_367UGW_kindTag",
+	"errorReason": "_367UGW_errorReason",
+	"conflictList": "_367UGW_conflictList",
+	"progressPercent": "_367UGW_progressPercent",
+	"radioLabel": "_367UGW_radioLabel",
+	"reportText": "_367UGW_reportText",
 	"reportScroll": "_367UGW_reportScroll",
-	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
-	"modeHint": "_367UGW_modeHint",
+	"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",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"progressTrack": "_367UGW_progressTrack",
+	"sectionHeader": "_367UGW_sectionHeader",
+	"severityError": "_367UGW_severityError",
+	"viewBody": "_367UGW_viewBody",
+	"badgeInfo": "_367UGW_badgeInfo",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"hiddenFile": "_367UGW_hiddenFile",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"categoryItem": "_367UGW_categoryItem",
+	"modeTab": "_367UGW_modeTab",
+	"ghostButton": "_367UGW_ghostButton",
+	"badgeOk": "_367UGW_badgeOk",
 	"groupList": "_367UGW_groupList",
-	"groupCard": "_367UGW_groupCard",
 	"groupHeader": "_367UGW_groupHeader",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"dshCmSpin": "_367UGW_dshCmSpin",
-	"progressBlock": "_367UGW_progressBlock"
+	"progressBadge": "_367UGW_progressBadge"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -2863,11 +2865,18 @@ const RESOLUTION_OPTIONS = [{
 	value: "useImported",
 	key: "import.conflicts.useImported"
 }];
+/** 批量决策全部冲突项（keepCurrent / useImported），与逐项逻辑一致地更新 tick + onChanged */
+function resolveAll(collector, resolution, setTick, onChanged) {
+	for (const item of collector.conflicts) collector.resolve(item.id, resolution);
+	setTick((v) => v + 1);
+	onChanged();
+}
 /** 冲突项决策列表 */
 function ConflictList({ collector, t, onChanged }) {
 	const [tick, setTick] = (0, react.useState)(0);
 	const items = collector.viewItems();
 	const unresolved = collector.unresolved().length;
+	const hasConflicts = items.length > 0;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: config_manager_module_css_default.conflictList,
 		children: [
@@ -2875,6 +2884,24 @@ function ConflictList({ collector, t, onChanged }) {
 				kind: "warn",
 				children: t("import.conflicts.unresolved", { count: String(unresolved) })
 			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: config_manager_module_css_default.actionRow,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "ghost",
+					disabled: !hasConflicts,
+					onClick: () => {
+						resolveAll(collector, "keepCurrent", setTick, onChanged);
+					},
+					children: t("import.conflicts.keepCurrentAll")
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "primary",
+					disabled: !hasConflicts,
+					onClick: () => {
+						resolveAll(collector, "useImported", setTick, onChanged);
+					},
+					children: t("import.conflicts.useImportedAll")
+				})]
+			}),
 			items.map((view) => {
 				const item = view.item;
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -4240,6 +4267,35 @@ const CONFIRM_REVIEW_KINDS = /* @__PURE__ */ new Set([
 	"Error",
 	"PathMapping"
 ]);
+/**
+* 仅保留需人工决策的项（差异确认列表只渲染这些）。
+* 统计（summarizeConfirmItems）仍基于全量 items，不受影响。
+*/
+function reviewItems(items) {
+	return items.filter((it) => CONFIRM_REVIEW_KINDS.has(it.kind));
+}
+/**
+* 「全部保留本地」：所有 Conflict 项 → resolution=keepLocal、adopt=false。
+* 仅作用于 Conflict 项，非 Conflict 项的 adopt 保持默认。
+*/
+function keepLocalAll(items) {
+	return items.filter((it) => it.kind === "Conflict").map((it) => ({
+		itemId: it.itemId,
+		resolution: "keepLocal",
+		adopt: false
+	}));
+}
+/**
+* 「全部采用远端」：所有 Conflict 项 → resolution=useRemote、adopt=true。
+* 仅作用于 Conflict 项，非 Conflict 项的 adopt 保持默认。
+*/
+function useRemoteAll(items) {
+	return items.filter((it) => it.kind === "Conflict").map((it) => ({
+		itemId: it.itemId,
+		resolution: "useRemote",
+		adopt: true
+	}));
+}
 /** 差异确认列表摘要（按 severity 计数 + 采用数 + needsReview 徽章数据源）。 */
 function summarizeConfirmItems(items) {
 	let info = 0;
@@ -4514,6 +4570,7 @@ function SyncConfirmView(props) {
 		...it,
 		adopt: states[it.itemId]?.adopted ?? it.defaultAdopt
 	}))), [items, states]);
+	const displayItems = (0, react.useMemo)(() => reviewItems(items), [items]);
 	const setAdopted = (itemId, adopted) => {
 		setStates((prev) => ({
 			...prev,
@@ -4538,6 +4595,24 @@ function SyncConfirmView(props) {
 			};
 		});
 	};
+	const applyBulkDecision = (decisions) => {
+		if (decisions.length === 0) return;
+		setStates((prev) => {
+			const next = { ...prev };
+			for (const d of decisions) {
+				const existing = prev[d.itemId] ?? {
+					adopted: false,
+					resolution: void 0
+				};
+				next[d.itemId] = {
+					...existing,
+					resolution: d.resolution,
+					adopted: d.adopt
+				};
+			}
+			return next;
+		});
+	};
 	const runApply = async () => {
 		const unresolved = items.find((it) => it.kind === "Conflict" && states[it.itemId]?.adopted === true && states[it.itemId]?.resolution === void 0);
 		if (unresolved !== void 0) {
@@ -4660,41 +4735,69 @@ function SyncConfirmView(props) {
 			className: config_manager_module_css_default.hint,
 			children: t("syncflow.adoptHint")
 		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: config_manager_module_css_default.actionRow,
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "ghost",
+					disabled: busy || displayItems.filter((it) => it.kind === "Conflict").length === 0,
+					onClick: () => {
+						applyBulkDecision(keepLocalAll(items));
+					},
+					children: t("syncflow.keepLocalAll")
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "primary",
+					disabled: busy || displayItems.filter((it) => it.kind === "Conflict").length === 0,
+					onClick: () => {
+						applyBulkDecision(useRemoteAll(items));
+					},
+					children: t("syncflow.useRemoteAll")
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: config_manager_module_css_default.hint,
+					children: t("syncflow.bulkHint")
+				})
+			]
+		}),
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-			className: config_manager_module_css_default.reportList,
-			children: items.map((it) => {
-				const st = states[it.itemId] ?? { adopted: it.defaultAdopt };
-				const isConflict = it.kind === "Conflict";
-				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: config_manager_module_css_default.statRow,
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-							className: config_manager_module_css_default.checkboxRow,
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-								type: "checkbox",
-								checked: st.adopted,
-								disabled: busy,
-								onChange: (e) => {
-									setAdopted(it.itemId, e.target.checked);
+			className: config_manager_module_css_default.confirmScroll,
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: config_manager_module_css_default.reportList,
+				children: displayItems.map((it) => {
+					const st = states[it.itemId] ?? { adopted: it.defaultAdopt };
+					const isConflict = it.kind === "Conflict";
+					return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: config_manager_module_css_default.statRow,
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+								className: config_manager_module_css_default.checkboxRow,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+									type: "checkbox",
+									checked: st.adopted,
+									disabled: busy,
+									onChange: (e) => {
+										setAdopted(it.itemId, e.target.checked);
+									}
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: kindLabel(it.kind, api.t) })]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+								kind: it.severity === "error" ? "error" : it.severity === "warning" ? "warn" : "info",
+								children: severityLabel(it.severity, api.t)
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: it.description }),
+							isConflict && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ConflictResolver, {
+								item: it,
+								resolution: st.resolution,
+								busy,
+								t,
+								onResolve: (r) => {
+									setResolution(it.itemId, r);
 								}
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: kindLabel(it.kind, api.t) })]
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
-							kind: it.severity === "error" ? "error" : it.severity === "warning" ? "warn" : "info",
-							children: severityLabel(it.severity, api.t)
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: it.description }),
-						isConflict && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ConflictResolver, {
-							item: it,
-							resolution: st.resolution,
-							busy,
-							t,
-							onResolve: (r) => {
-								setResolution(it.itemId, r);
-							}
-						})
-					]
-				}, it.itemId);
+							})
+						]
+					}, it.itemId);
+				})
 			})
 		}),
 		error !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
@@ -4905,6 +5008,7 @@ function SyncSettingsView({ api, t }) {
 				} : {}
 			});
 			if (info.autosync === void 0) loadAutosync();
+			if (info.configured && (info.repoUrl ?? "").trim() !== "") loadSnapshots(info.repoUrl);
 		} catch (err) {
 			patch({
 				loading: false,
@@ -4925,10 +5029,20 @@ function SyncSettingsView({ api, t }) {
 			patch({ error: err instanceof Error ? err.message : String(err) });
 		}
 	};
-	/** 读取远端历史快照列表（「选择历史快照」下拉数据源）。 */
-	const loadSnapshots = async () => {
+	/**
+	* 读取远端历史快照列表（「选择历史快照」下拉数据源）。
+	* repoUrlOverride：挂载时仓库地址刚从 status 回填、state.repoUrl 尚未生效，
+	* 直接传 info.repoUrl 避免竞态读旧值；缺省读 state.repoUrl（同步成功后的刷新路径）。
+	* 无仓库地址时静默跳过（不发无效请求，下拉留空）。
+	*/
+	const loadSnapshots = async (repoUrlOverride) => {
+		const repoUrl = repoUrlOverride ?? state.repoUrl;
+		if (repoUrl.trim() === "") return;
 		try {
-			const res = await api.snapshotsList(payload());
+			const res = await api.snapshotsList({
+				...payload(),
+				repoUrl
+			});
 			patch({ snapshots: res.snapshots });
 		} catch {}
 	};
@@ -5343,7 +5457,7 @@ function SyncSettingsView({ api, t }) {
 							children: t("syncflow.selectSnapshot")
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-							className: config_manager_module_css_default.input,
+							className: config_manager_module_css_default.select,
 							value: state.selectedSnapshotId,
 							disabled: state.busy !== null,
 							onChange: (e) => {
@@ -5742,6 +5856,8 @@ const zh$1 = {
 	"import.conflicts.useImported": "使用备份",
 	"import.conflicts.review": "稍后决定",
 	"import.conflicts.unresolved": "还有 {count} 项未决策",
+	"import.conflicts.keepCurrentAll": "全部保留当前配置",
+	"import.conflicts.useImportedAll": "全部使用备份配置",
 	"import.paths.title": "路径映射",
 	"import.paths.hint": "备份中的绝对路径在目标机器可能不存在，请为每条路径指定新位置（留空将跳过该路径）。",
 	"import.paths.old": "原路径",
@@ -5853,6 +5969,8 @@ const en$1 = {
 	"import.conflicts.useImported": "Use backup",
 	"import.conflicts.review": "Decide later",
 	"import.conflicts.unresolved": "{count} item(s) unresolved",
+	"import.conflicts.keepCurrentAll": "Keep all current",
+	"import.conflicts.useImportedAll": "Use all backup",
 	"import.paths.title": "Path Mapping",
 	"import.paths.hint": "Absolute paths in the backup may not exist on this machine. Map each path to a new location (leave blank to skip).",
 	"import.paths.old": "Original path",
@@ -5950,6 +6068,9 @@ const zh = {
 	"syncflow.needsReviewBadge": "需人工决策",
 	"syncflow.empty": "远端快照与本地一致（无变更）",
 	"syncflow.diffCount": "共 {count} 项差异",
+	"syncflow.keepLocalAll": "全部保留本地",
+	"syncflow.useRemoteAll": "全部采用远端",
+	"syncflow.bulkHint": "批量决策仅作用于冲突项；其余差异默认自动采用。",
 	"syncflow.conflictTitle": "冲突解决",
 	"syncflow.conflictUseLocal": "用本地",
 	"syncflow.conflictUseRemote": "用远端",
@@ -6067,6 +6188,9 @@ 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.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",