dsh-config-manager 0.1.20 → 0.1.21

package/lib/client.js

@@ -160,6 +160,69 @@ const uiZh = {
 	"sync.pullOk": "远端快照 {id} 差异预览：共 {count} 项变更",
 	"sync.pullEmpty": "远端快照与本地一致（无变更）",
 	"sync.previewHint": "以上为只读差异预览，不会执行导入。v1 暂不提供一键导入接线；如需应用远端配置，请使用「导入恢复」向导手动导入导出的备份。",
+	"sync.syncTitle": "一键同步",
+	"sync.syncButton": "一键同步",
+	"sync.syncing": "正在同步…",
+	"sync.syncHeadline": "远端快照 {id} 差异确认：共 {count} 项",
+	"sync.syncEmpty": "远端快照与本地一致（无变更）",
+	"sync.syncFailed": "同步失败",
+	"sync.confirmAdopt": "采用远端",
+	"sync.confirmSkip": "跳过",
+	"sync.confirmRequired": "需要人工决策",
+	"sync.needsReviewBadge": "需人工决策",
+	"sync.selectSnapshot": "选择历史快照",
+	"sync.latestSnapshot": "最新快照",
+	"sync.noSnapshots": "远端暂无快照",
+	"sync.confirmImport": "确认导入",
+	"sync.cancelConfirm": "取消",
+	"sync.conflictResolve": "冲突解决",
+	"sync.conflictUseLocal": "用本地",
+	"sync.conflictUseRemote": "用远端",
+	"sync.conflictSkip": "跳过",
+	"sync.conflictResolvedLocal": "已选：本地",
+	"sync.conflictResolvedRemote": "已选：远端",
+	"sync.conflictResolvedSkip": "已选：跳过",
+	"sync.importDone": "已导入 {n} 个分区",
+	"sync.importSkipped": "已跳过 {n} 项",
+	"sync.importFailed": "导入失败（已整体回滚）",
+	"sync.rollbackButton": "回滚到应用前",
+	"sync.rollingBack": "正在回滚…",
+	"sync.rollbackDone": "已回滚到应用前",
+	"sync.appliedSections": "已写入",
+	"sync.importWarnings": "导入告警",
+	"sync.autosyncTitle": "自动同步",
+	"sync.autosyncDesc": "开启后，DSH 将按固定间隔自动执行双向同步（拉取合并 + 上传）；DSH 启动时还会触发一次「自动下载合并（不上传）」以保持本地为最新。仅在无冲突且无需人工干预时才自动写入。",
+	"sync.autosyncEnabled": "启用自动同步",
+	"sync.autosyncInterval": "同步间隔",
+	"sync.autosyncIntervalHint": "DSH 启动时自动下载合并不上传。",
+	"sync.autosyncNever": "从未运行",
+	"sync.autosyncLastRun": "上次运行：{time}",
+	"sync.autosyncNextIn": "下次约 {time} 后",
+	"sync.autosyncSuccess": "成功",
+	"sync.autosyncSkipped": "已跳过",
+	"sync.autosyncFailed": "失败",
+	"sync.autosyncPartial": "部分成功",
+	"sync.autosyncFailCount": "连续失败 {n} 次",
+	"sync.autosyncSyncing": "自动同步进行中…",
+	"sync.interval.5m": "5 分钟",
+	"sync.interval.15m": "15 分钟",
+	"sync.interval.30m": "30 分钟",
+	"sync.interval.60m": "60 分钟",
+	"sync.interval.6h": "6 小时",
+	"sync.interval.12h": "12 小时",
+	"sync.interval.24h": "24 小时",
+	"sync.hist.autosync": "自动同步",
+	"sync.hist.directionPull": "下载",
+	"sync.hist.directionPush": "上传",
+	"sync.hist.directionBoth": "双向",
+	"sync.hist.skipReasonConflict": "冲突项被跳过",
+	"sync.hist.skipReasonNoRemote": "远端无快照",
+	"sync.hist.skipReasonNotConfigured": "未配置仓库",
+	"sync.hist.skipReasonNetwork": "网络问题",
+	"sync.hist.conflictedSections": "跳过冲突分区：{sections}",
+	"sync.hist.appliedSections": "应用分区：{sections}",
+	"sync.hist.failedError": "错误：{error}",
+	"sync.hist.notifiedAt": "已通知",
 	"sync.github.starting": "正在发起 GitHub 授权…",
 	"sync.github.waitingNoCode": "请在浏览器中打开授权页面并完成授权…",
 	"sync.github.waiting": "请在浏览器中打开授权页面，输入一次性代码 {code} 完成授权（自动等待确认）。",
@@ -316,7 +379,70 @@ const uiEn = {
 	"sync.pullOk": "Remote snapshot {id} diff preview: {count} change(s)",
 	"sync.pullEmpty": "Remote snapshot matches local (no changes)",
 	"sync.previewHint": "Read-only diff preview above; nothing is imported. v1 does not wire one-click import yet — use the Import wizard to apply a downloaded backup if needed.",
-	"sync.github.starting": "Starting GitHub authorization…",
+	"sync.syncTitle": "One-Click Sync",
+	"sync.syncButton": "One-click sync",
+	"sync.syncing": "Syncing…",
+	"sync.syncHeadline": "Remote snapshot {id} diff confirm: {count} item(s)",
+	"sync.syncEmpty": "Remote snapshot matches local (no changes)",
+	"sync.syncFailed": "Sync failed",
+	"sync.confirmAdopt": "Adopt remote",
+	"sync.confirmSkip": "Skip",
+	"sync.confirmRequired": "Needs decision",
+	"sync.needsReviewBadge": "Needs decision",
+	"sync.selectSnapshot": "Select snapshot",
+	"sync.latestSnapshot": "Latest snapshot",
+	"sync.noSnapshots": "No remote snapshots",
+	"sync.confirmImport": "Confirm import",
+	"sync.cancelConfirm": "Cancel",
+	"sync.conflictResolve": "Resolve conflict",
+	"sync.conflictUseLocal": "Use local",
+	"sync.conflictUseRemote": "Use remote",
+	"sync.conflictSkip": "Skip",
+	"sync.conflictResolvedLocal": "Chosen: local",
+	"sync.conflictResolvedRemote": "Chosen: remote",
+	"sync.conflictResolvedSkip": "Chosen: skip",
+	"sync.importDone": "Imported {n} section(s)",
+	"sync.importSkipped": "Skipped {n} item(s)",
+	"sync.importFailed": "Import failed (rolled back)",
+	"sync.rollbackButton": "Rollback",
+	"sync.rollingBack": "Rolling back…",
+	"sync.rollbackDone": "Rolled back",
+	"sync.appliedSections": "Written",
+	"sync.importWarnings": "Import warnings",
+	"sync.autosyncTitle": "Auto Sync",
+	"sync.autosyncDesc": "When enabled, DSH will run two-way sync (pull merge + push) on a fixed interval; on startup it also triggers a download-merge (no upload) to keep local up to date. Local writes happen only when there are no conflicts or manual-decision items.",
+	"sync.autosyncEnabled": "Enable auto sync",
+	"sync.autosyncInterval": "Sync interval",
+	"sync.autosyncIntervalHint": "Auto download-merge on DSH startup, no upload.",
+	"sync.autosyncNever": "Never run",
+	"sync.autosyncLastRun": "Last run: {time}",
+	"sync.autosyncNextIn": "Next in ~{time}",
+	"sync.autosyncSuccess": "Success",
+	"sync.autosyncSkipped": "Skipped",
+	"sync.autosyncFailed": "Failed",
+	"sync.autosyncPartial": "Partial",
+	"sync.autosyncFailCount": "{n} consecutive failure(s)",
+	"sync.autosyncSyncing": "Auto sync running…",
+	"sync.interval.5m": "5 min",
+	"sync.interval.15m": "15 min",
+	"sync.interval.30m": "30 min",
+	"sync.interval.60m": "60 min",
+	"sync.interval.6h": "6 hr",
+	"sync.interval.12h": "12 hr",
+	"sync.interval.24h": "24 hr",
+	"sync.hist.autosync": "Auto Sync",
+	"sync.hist.directionPull": "Pull",
+	"sync.hist.directionPush": "Push",
+	"sync.hist.directionBoth": "Both",
+	"sync.hist.skipReasonConflict": "Conflict items skipped",
+	"sync.hist.skipReasonNoRemote": "No remote snapshot",
+	"sync.hist.skipReasonNotConfigured": "No repository configured",
+	"sync.hist.skipReasonNetwork": "Network issue",
+	"sync.hist.conflictedSections": "Skipped conflict sections: {sections}",
+	"sync.hist.appliedSections": "Applied sections: {sections}",
+	"sync.hist.failedError": "Error: {error}",
+	"sync.hist.notifiedAt": "Notified",
+	"sync.github.starting": "Starting GitHub a​u​t​h​o​r​i​z​a​t​i​o​n​…",
 	"sync.github.waitingNoCode": "Open the authorization page in your browser and complete the flow…",
 	"sync.github.waiting": "Open the authorization page in your browser, enter the one-time code {code} to finish (waiting for confirmation).",
 	"sync.github.polling": "Confirming GitHub authorization…",
@@ -1939,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}";
+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 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");
@@ -1949,104 +2075,105 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
+	"categoryItem": "_367UGW_categoryItem",
 	"warnText": "_367UGW_warnText",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"progressDetail": "_367UGW_progressDetail",
-	"conflictDetail": "_367UGW_conflictDetail",
-	"kindTag": "_367UGW_kindTag",
-	"modeTab": "_367UGW_modeTab",
-	"groupList": "_367UGW_groupList",
-	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"rowActions": "_367UGW_rowActions",
 	"groupLabel": "_367UGW_groupLabel",
-	"fieldLabel": "_367UGW_fieldLabel",
-	"groupCard": "_367UGW_groupCard",
-	"hiddenFile": "_367UGW_hiddenFile",
-	"conflictId": "_367UGW_conflictId",
-	"spinner": "_367UGW_spinner",
-	"section": "_367UGW_section",
-	"progressMeta": "_367UGW_progressMeta",
-	"reportScroll": "_367UGW_reportScroll",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
-	"badgeOk": "_367UGW_badgeOk",
-	"banner": "_367UGW_banner",
+	"groupNote": "_367UGW_groupNote",
 	"warnList": "_367UGW_warnList",
+	"secretsList": "_367UGW_secretsList",
 	"progressBadge": "_367UGW_progressBadge",
-	"spinnerLabel": "_367UGW_spinnerLabel",
-	"primaryButton": "_367UGW_primaryButton",
+	"viewBody": "_367UGW_viewBody",
+	"progressPercent": "_367UGW_progressPercent",
+	"sectionHeader": "_367UGW_sectionHeader",
+	"field": "_367UGW_field",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"pathIssueKind": "_367UGW_pathIssueKind",
 	"progressBarDone": "_367UGW_progressBarDone",
-	"secretFields": "_367UGW_secretFields",
-	"progressBadgeCount": "_367UGW_progressBadgeCount",
-	"pathValue": "_367UGW_pathValue",
-	"groupItems": "_367UGW_groupItems",
-	"errorAction": "_367UGW_errorAction",
-	"planScroll": "_367UGW_planScroll",
-	"progressBlock": "_367UGW_progressBlock",
-	"formError": "_367UGW_formError",
+	"modeTabs": "_367UGW_modeTabs",
+	"reportView": "_367UGW_reportView",
+	"snapshotRow": "_367UGW_snapshotRow",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
+	"errorLine": "_367UGW_errorLine",
+	"banner": "_367UGW_banner",
 	"radioLabel": "_367UGW_radioLabel",
-	"badge": "_367UGW_badge",
-	"categoryDesc": "_367UGW_categoryDesc",
+	"progressMeta": "_367UGW_progressMeta",
+	"groupItems": "_367UGW_groupItems",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"sectionTitle": "_367UGW_sectionTitle",
+	"pathNew": "_367UGW_pathNew",
+	"reportList": "_367UGW_reportList",
 	"dangerButton": "_367UGW_dangerButton",
-	"progressPercent": "_367UGW_progressPercent",
-	"progressBar": "_367UGW_progressBar",
-	"ghostButton": "_367UGW_ghostButton",
-	"errorBanner": "_367UGW_errorBanner",
-	"categoryItem": "_367UGW_categoryItem",
-	"errorList": "_367UGW_errorList",
-	"reportText": "_367UGW_reportText",
-	"conflictList": "_367UGW_conflictList",
 	"errorReason": "_367UGW_errorReason",
-	"severityError": "_367UGW_severityError",
-	"rowActions": "_367UGW_rowActions",
+	"viewTab": "_367UGW_viewTab",
+	"conflictItem": "_367UGW_conflictItem",
+	"diffScroll": "_367UGW_diffScroll",
+	"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",
-	"badgeError": "_367UGW_badgeError",
+	"badgeOk": "_367UGW_badgeOk",
+	"progressBar": "_367UGW_progressBar",
+	"progressLabel": "_367UGW_progressLabel",
+	"badge": "_367UGW_badge",
+	"errorAction": "_367UGW_errorAction",
 	"badgeInfo": "_367UGW_badgeInfo",
-	"optionsCard": "_367UGW_optionsCard",
-	"dshCmSpin": "_367UGW_dshCmSpin",
-	"input": "_367UGW_input",
 	"errorItem": "_367UGW_errorItem",
-	"groupHeader": "_367UGW_groupHeader",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"pathOld": "_367UGW_pathOld",
+	"conflictHead": "_367UGW_conflictHead",
+	"severityError": "_367UGW_severityError",
+	"fieldLabel": "_367UGW_fieldLabel",
+	"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",
 	"snapshotList": "_367UGW_snapshotList",
-	"viewTab": "_367UGW_viewTab",
+	"ghostButton": "_367UGW_ghostButton",
+	"hint": "_367UGW_hint",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"pathValue": "_367UGW_pathValue",
+	"badgeError": "_367UGW_badgeError",
 	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"sectionBody": "_367UGW_sectionBody",
-	"actionRow": "_367UGW_actionRow",
-	"modeHint": "_367UGW_modeHint",
-	"statRow": "_367UGW_statRow",
+	"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",
+	"errorTitle": "_367UGW_errorTitle",
+	"conflictId": "_367UGW_conflictId",
 	"reportFooter": "_367UGW_reportFooter",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"sectionHeader": "_367UGW_sectionHeader",
+	"pathOld": "_367UGW_pathOld",
 	"badgeWarn": "_367UGW_badgeWarn",
-	"conflictHead": "_367UGW_conflictHead",
-	"conflictOptions": "_367UGW_conflictOptions",
-	"viewBody": "_367UGW_viewBody",
-	"pathIssueKind": "_367UGW_pathIssueKind",
-	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
-	"snapshotRow": "_367UGW_snapshotRow",
-	"reportList": "_367UGW_reportList",
-	"empty": "_367UGW_empty",
-	"field": "_367UGW_field",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"errorFooter": "_367UGW_errorFooter",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"reportView": "_367UGW_reportView",
-	"secretsList": "_367UGW_secretsList",
-	"pathRow": "_367UGW_pathRow",
-	"groupNote": "_367UGW_groupNote",
-	"card": "_367UGW_card",
+	"section": "_367UGW_section",
+	"reportScroll": "_367UGW_reportScroll",
 	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
-	"conflictItem": "_367UGW_conflictItem",
-	"modeTabs": "_367UGW_modeTabs",
-	"viewTabs": "_367UGW_viewTabs",
-	"errorTitle": "_367UGW_errorTitle",
-	"errorLine": "_367UGW_errorLine",
-	"pathNew": "_367UGW_pathNew",
-	"progressLabel": "_367UGW_progressLabel",
-	"hint": "_367UGW_hint",
-	"errorActionLabel": "_367UGW_errorActionLabel"
+	"modeHint": "_367UGW_modeHint",
+	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"groupList": "_367UGW_groupList",
+	"groupCard": "_367UGW_groupCard",
+	"groupHeader": "_367UGW_groupHeader",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"dshCmSpin": "_367UGW_dshCmSpin",
+	"progressBlock": "_367UGW_progressBlock"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -3804,7 +3931,11 @@ const SYNC_API = {
 	githubPoll: "/api/dsh-config-manager/sync/github/poll",
 	githubCancel: "/api/dsh-config-manager/sync/github/cancel",
 	history: "/api/dsh-config-manager/sync/history",
-	apply: "/api/dsh-config-manager/sync/apply",
+	snapshotsList: "/api/dsh-config-manager/sync/snapshots-list",
+	sync: "/api/dsh-config-manager/sync/sync",
+	applyItems: "/api/dsh-config-manager/sync/apply-items",
+	cancel: "/api/dsh-config-manager/sync/cancel",
+	autosync: "/api/dsh-config-manager/sync/autosync",
 	rollback: "/api/dsh-config-manager/sync/rollback"
 };
 /** DSH credentials 中的同步 token 引用名（Host 半同值；仅供提示文案使用，值由 Host 读写） */
@@ -3872,13 +4003,33 @@ var SyncApi = class {
 	async githubCancel(flowId) {
 		return postJson(SYNC_API.githubCancel, { flowId }, this.t);
 	}
-	/** 同步历史：列出 localSnapshotsDir 下的快照目录（manifest.json: id/createdAt/sectionHashes） */
+	/** 同步历史：列出本地祖先快照 + 自动同步执行记录（按 createdAt 倒序合并）。 */
 	async history() {
 		return readJson(await fetch(SYNC_API.history), this.t);
 	}
-	/** 应用自动应用计划：写本地 + backup + (失败时) rollback + enqueue review；返回 ApplyReport */
-	async apply(payload) {
-		return postJson(SYNC_API.apply, payload, this.t);
+	/** 远端历史快照列表（供「选择历史快照」下拉）。 */
+	async snapshotsList(payload) {
+		return postJson(SYNC_API.snapshotsList, payload, this.t);
+	}
+	/** 一键同步第一步：拉取 → 差异确认会话（items 逐项确认，暂不导入）。 */
+	async sync(payload) {
+		return postJson(SYNC_API.sync, payload, this.t);
+	}
+	/** 一键同步第二步：按用户对差异项的逐项决策执行导入。 */
+	async applyItems(payload) {
+		return postJson(SYNC_API.applyItems, payload, this.t);
+	}
+	/** 取消/清理差异确认会话（丢弃临时 ZIP，零副作用）。 */
+	async cancel(syncSessionId) {
+		return postJson(SYNC_API.cancel, { syncSessionId }, this.t);
+	}
+	/** 自动同步状态（GET /sync/autosync）。 */
+	async autosyncStatus() {
+		return readJson(await fetch(SYNC_API.autosync), this.t);
+	}
+	/** 自动同步配置更新（POST /sync/autosync）。 */
+	async autosyncUpdate(payload) {
+		return postJson(SYNC_API.autosync, payload, this.t);
 	}
 	/** 一键回滚：按 restoreId 调用 backup→rollback */
 	async rollback(payload) {
@@ -3961,8 +4112,8 @@ function computeSyncButtons(busy, repoUrl, t = zhUiT) {
 	return {
 		canPush: enabled,
 		canPull: enabled,
-		pushLabel: busy === "push" ? t("sync.pushing") : t("sync.pushLabel"),
-		pullLabel: busy === "pull" ? t("sync.pulling") : t("sync.pullLabel")
+		pushLabel: busy === "push" ? t("sync.pushing") : busy === "sync" ? t("sync.syncing") : t("sync.pushLabel"),
+		pullLabel: busy === "pull" ? t("sync.pulling") : busy === "sync" ? t("sync.syncing") : t("sync.pullLabel")
 	};
 }
 /** 状态行渲染模型：加载 / 未配置 / 就绪（凭据 + 上次同步 + 通道）/ 错误 */
@@ -4080,11 +4231,78 @@ function githubPollMessage(poll, t = zhUiT) {
 		default: return "";
 	}
 }
+/** 需要人工决策的 PlanItemKind（与 Host /sync/sync 的 needsReview 判定对齐）。 */
+const CONFIRM_REVIEW_KINDS = /* @__PURE__ */ new Set([
+	"Conflict",
+	"MissingSecret",
+	"MissingDependency",
+	"Install",
+	"Error",
+	"PathMapping"
+]);
+/** 差异确认列表摘要（按 severity 计数 + 采用数 + needsReview 徽章数据源）。 */
+function summarizeConfirmItems(items) {
+	let info = 0;
+	let warning = 0;
+	let error = 0;
+	let adopted = 0;
+	let needsReview = false;
+	for (const it of items) {
+		if (it.severity === "error") error += 1;
+		else if (it.severity === "warning") warning += 1;
+		else info += 1;
+		if (it.adopt) adopted += 1;
+		if (CONFIRM_REVIEW_KINDS.has(it.kind)) needsReview = true;
+	}
+	return {
+		total: items.length,
+		info,
+		warning,
+		error,
+		adopted,
+		needsReview
+	};
+}
+/** AutosyncInterval → ms。 */
+function autosyncIntervalMs(interval) {
+	switch (interval) {
+		case "5m": return 300 * 1e3;
+		case "15m": return 900 * 1e3;
+		case "60m": return 3600 * 1e3;
+		case "6h": return 360 * 60 * 1e3;
+		case "12h": return 720 * 60 * 1e3;
+		case "24h": return 1440 * 60 * 1e3;
+		default: return 1800 * 1e3;
+	}
+}
+/** 距下次自动同步剩余 ms（已到期 → 0）。elapsedMs 为 host 计算的「距上次执行已过 ms」。 */
+function computeAutosyncCountdown(elapsedMs, intervalMs) {
+	if (elapsedMs < 0) return -1;
+	return Math.max(0, intervalMs - elapsedMs);
+}
+/** 间隔 ms → 可读时长（如「30 分钟」「6 小时」）。 */
+function formatIntervalDuration(ms, t = zhUiT) {
+	const minutes = Math.round(ms / 6e4);
+	if (minutes < 60) return t("sync.interval.30m");
+	const hours = Math.round(minutes / 60);
+	if (hours === 6) return t("sync.interval.6h");
+	if (hours === 12) return t("sync.interval.12h");
+	if (hours === 24) return t("sync.interval.24h");
+	return `${hours}h`;
+}
+/** 自动同步状态行的可读文案（未运行 / 上次状态 / 连续失败计数）。 */
+function autosyncStatusText(status, t = zhUiT) {
+	if (status.lastRunAt === void 0 || status.lastRunAt === "" || status.lastRunStatus === void 0) return t("sync.autosyncNever");
+	return `${status.lastRunStatus === "success" ? t("sync.autosyncSuccess") : status.lastRunStatus === "skipped" ? t("sync.autosyncSkipped") : status.lastRunStatus === "partial" ? t("sync.autosyncPartial") : t("sync.autosyncFailed")} · ${t("sync.autosyncLastRun", { time: formatDateTime$1(status.lastRunAt) })}${status.consecutiveFailures > 0 ? ` · ${t("sync.autosyncFailCount", { n: String(status.consecutiveFailures) })}` : ""}`;
+}
 //#endregion
 //#region src/client/sync/history-model.ts
-/** 把 entries 排序（createdAt 倒序）并组装展示字段。 */
-function projectHistoryRows(entries) {
-	return [...entries].sort((a, b) => a.createdAt < b.createdAt ? 1 : a.createdAt > b.createdAt ? -1 : 0);
+/** 统一历史条目（快照 + 自动同步）按 createdAt 倒序排序。 */
+function projectSyncHistoryEntries(entries) {
+	return [...entries].sort(byCreatedAtDesc);
+}
+function byCreatedAtDesc(a, b) {
+	return a.createdAt < b.createdAt ? 1 : a.createdAt > b.createdAt ? -1 : 0;
 }
 /** ISO 时间 → 本地可读字符串（短格式） */
 function formatDateTime(iso) {
@@ -4094,17 +4312,62 @@ function formatDateTime(iso) {
 	const pad = (n) => String(n).padStart(2, "0");
 	return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
 }
+/** 自动同步执行记录的方向可读标签。 */
+function directionLabel(direction) {
+	switch (direction) {
+		case "pull": return "下载";
+		case "push": return "上传";
+		default: return "双向";
+	}
+}
+/** 自动同步执行状态可读标签。 */
+function autosyncStatusLabel(status) {
+	switch (status) {
+		case "success": return "成功";
+		case "skipped": return "已跳过";
+		case "partial": return "部分成功";
+		default: return "失败";
+	}
+}
+/** 跳过原因 → 可读描述（host 透传语义；未知原因回退原串）。 */
+function describeSkipReason(reason) {
+	switch (reason) {
+		case "conflict": return "冲突项被跳过";
+		case "no-remote": return "远端无快照";
+		case "not-configured": return "未配置仓库";
+		case "network": return "网络问题";
+		default: return reason ?? "未知";
+	}
+}
+/** 自动同步记录 → 展示行投影。 */
+function projectAutosyncEntry(entry) {
+	const parts = [directionLabel(entry.direction), autosyncStatusLabel(entry.status)];
+	if (entry.skipReason !== void 0) parts.push(describeSkipReason(entry.skipReason));
+	return {
+		id: entry.createdAt,
+		createdAt: entry.createdAt,
+		direction: directionLabel(entry.direction),
+		status: autosyncStatusLabel(entry.status),
+		summary: parts.join(" · "),
+		conflictedSections: entry.conflictedSections,
+		appliedSections: entry.appliedSections,
+		error: entry.error,
+		notifiedAt: entry.notifiedAt,
+		hasDetail: entry.conflictedSections !== void 0 && entry.conflictedSections.length > 0 || entry.appliedSections !== void 0 && entry.appliedSections.length > 0 || entry.error !== void 0
+	};
+}
 //#endregion
 //#region src/client/sync/SyncHistoryView.tsx
 /**
-* 同步历史视图（M6，P2b）：列出 localSnapshotsDir 各快照目录的 manifest.json
-* （id + createdAt + sectionHashes）；每行显示：快照 ID、时间、分区数、关联待审数（来自 sync-review-queue.json）。
+* 同步历史视图（方案 A）：列出本地祖先快照目录（kind=apply）+ 自动同步执行记录
+* （kind=autosync）。自动同步行显示时间/方向/状态/跳过冲突/应用分区，点开可看被跳过
+* 冲突分区明细。
 *
-* 数据获取：通过 Host 的 IPC 端点（与 SyncSettingsView 同模式）。本组件只负责渲染；
-* 数据加载由宿主 API 提供（不在浏览器侧直接读 fs）。
+* 数据获取：GET /sync/history → { entries: SyncHistoryEntry[] }（按 createdAt 倒序合并）。
+* 纯函数投影在 ./history-model.ts（node --test 可测），本组件只做装配。
 */
 function SyncHistoryView(props) {
-	const { api } = props;
+	const { api, t } = props;
 	const [loading, setLoading] = (0, react.useState)(true);
 	const [error, setError] = (0, react.useState)(null);
 	const [entries, setEntries] = (0, react.useState)([]);
@@ -4114,7 +4377,7 @@ function SyncHistoryView(props) {
 			try {
 				const data = await api.history();
 				if (!cancelled) {
-					setEntries(data);
+					setEntries(data.entries);
 					setLoading(false);
 				}
 			} catch (err) {
@@ -4128,40 +4391,426 @@ function SyncHistoryView(props) {
 			cancelled = true;
 		};
 	}, [api]);
-	const rows = (0, react.useMemo)(() => projectHistoryRows(entries), [entries]);
-	if (loading) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: "加载同步历史…" });
+	const rows = (0, react.useMemo)(() => projectSyncHistoryEntries(entries), [entries]);
+	const snapshotRows = (0, react.useMemo)(() => rows.filter((r) => r.kind === "apply" || r.kind === "push" || r.kind === "pull" || r.kind === "rollback").map((r) => ({
+		id: r.id,
+		createdAt: r.createdAt,
+		sectionCount: r.sectionCount ?? 0,
+		reviewCount: r.reviewCount ?? 0
+	})), [rows]);
+	if (loading) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: t("common.loading") });
 	if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Card, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 		className: "error",
 		children: error
 	}) });
-	if (rows.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: "尚无同步历史" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: "完成首次 push/pull 后这里会显示快照记录。" })] });
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SectionTitle, { title: `同步历史（${rows.length}）` }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("table", {
+	if (rows.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("history.empty") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("history.emptyHint") })] });
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SectionTitle, { title: `${t("history.title")}（${rows.length}）` }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("table", {
 		className: "sync-history-table",
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("thead", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: "快照 ID" }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: "时间" }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: "分区" }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: "待审" })
-		] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: rows.map((r) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: r.id }) }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: formatDateTime(r.createdAt) }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: r.sectionCount }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: r.reviewCount > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: r.reviewCount }) : 0 })
-		] }, r.id)) })]
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("history.colTime") }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("history.colKind") }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("history.colDetail") })
+		] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: rows.map((r) => {
+			if (r.kind === "autosync" && r.autosync !== void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AutosyncRow, {
+				entry: r.autosync,
+				t
+			}, r.id);
+			const snap = snapshotRows.find((s) => s.id === r.id);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: formatDateTime(r.createdAt) }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+					kind: "info",
+					children: t("history.kindSnapshot")
+				}) }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: r.id }), snap !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+					" · ",
+					snap.sectionCount,
+					" ",
+					t("history.sectionCount")
+				] })] })
+			] }, r.id);
+		}) })]
 	})] });
 }
+function AutosyncRow({ entry, t }) {
+	const row = projectAutosyncEntry(entry);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: formatDateTime(row.createdAt) }),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+			kind: "info",
+			children: t("history.kindAutosync")
+		}) }),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
+			row.summary,
+			entry.pushedSnapshotId !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				" · ",
+				t("history.autosyncPush"),
+				" ",
+				entry.pushedSnapshotId
+			] }),
+			entry.pulledSnapshotId !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				" · ",
+				t("history.autosyncPull"),
+				" ",
+				entry.pulledSnapshotId
+			] })
+		] }), row.hasDetail && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("history.detail") }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: config_manager_module_css_default.reportList,
+			children: [
+				row.conflictedSections !== void 0 && row.conflictedSections.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: config_manager_module_css_default.fieldLabel,
+					children: t("history.autosyncConflicted", { sections: "" })
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: config_manager_module_css_default.statRow,
+					children: row.conflictedSections.map((sid) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+						kind: "warn",
+						children: sid
+					}, sid))
+				})] }),
+				row.appliedSections !== void 0 && row.appliedSections.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: config_manager_module_css_default.fieldLabel,
+					children: t("history.autosyncApplied", { sections: "" })
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: config_manager_module_css_default.statRow,
+					children: row.appliedSections.map((sid) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+						kind: "ok",
+						children: sid
+					}, sid))
+				})] }),
+				row.error !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: config_manager_module_css_default.fieldLabel,
+					children: t("history.autosyncError", { error: "" })
+				}), row.error] })
+			]
+		})] })] })
+	] });
+}
 //#endregion
-//#region src/client/sync/SyncPullPreviewView.tsx
+//#region src/client/sync/SyncConfirmView.tsx
 /**
-* 拉取预览页（M5，P2b）：消费 SyncApplyPlan，渲染
-*  - 自动已应用列表（autoApplied）—— 绿色状态徽章 + sectionId/description；
-*  - 待审变更列表（review）—— 每项三个按钮（用本地 / 用远端 / 跳过）+ 局部差异 diff；
-*  - 整体 rollback 后「回滚到应用前」按钮（调用 restoreId）；
-*  - 全部 review 解决 → 触发 onAllResolved 回调（sync 完成）。
+* 一键同步差异确认视图（方案 A §5 差异确认数据流）。
 *
-* 设计：与 SyncSettingsView 同模式 —— 全部渲染模型来自 ./sync-view.ts 纯函数，
-* 组件只做装配 + 状态；测试在 node --test 跑纯函数部分。
+* 消费 POST /sync/sync 返回的 items[]，渲染逐项确认列表：
+* - 每项：kindTag + description + severity + 「采用远端」复选框（默认勾选，可取消）；
+* - Conflict 项：内联弹窗（用本地 / 用远端 / 跳过）；
+* - 底部：「确认导入」（apply-items）+「取消」（cancel）。
+*
+* 全部渲染模型来自 ./sync-view.ts 纯函数（node 单测覆盖），组件只做装配 + 交互状态。
 */
+function SyncConfirmView(props) {
+	const { api, syncSessionId, snapshotId, items, needsReview, compatibility, t, onCancel, onRollbackDone } = props;
+	const [states, setStates] = (0, react.useState)(() => {
+		const init = {};
+		for (const it of items) init[it.itemId] = {
+			adopted: it.defaultAdopt,
+			resolution: void 0
+		};
+		return init;
+	});
+	const [phase, setPhase] = (0, react.useState)("idle");
+	const [applyResult, setApplyResult] = (0, react.useState)(null);
+	const [error, setError] = (0, react.useState)(null);
+	const summary = (0, react.useMemo)(() => summarizeConfirmItems(items.map((it) => ({
+		...it,
+		adopt: states[it.itemId]?.adopted ?? it.defaultAdopt
+	}))), [items, states]);
+	const setAdopted = (itemId, adopted) => {
+		setStates((prev) => ({
+			...prev,
+			[itemId]: {
+				...prev[itemId],
+				adopted
+			}
+		}));
+	};
+	const setResolution = (itemId, resolution) => {
+		setStates((prev) => {
+			const existing = prev[itemId] ?? {
+				adopted: false,
+				resolution: void 0
+			};
+			return {
+				...prev,
+				[itemId]: {
+					...existing,
+					resolution
+				}
+			};
+		});
+	};
+	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) {
+			setError(t("syncflow.conflictUnresolved", { itemId: unresolved.itemId }));
+			return;
+		}
+		setPhase("applying");
+		setError(null);
+		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 res = states[it.itemId]?.resolution;
+				if (it.kind === "Conflict" && res !== void 0 && res !== "skip") adoption.resolution = res;
+				return adoption;
+			});
+			const result = await api.applyItems({
+				syncSessionId,
+				adoptions
+			});
+			setPhase(result.ok ? "done" : "failed");
+			setApplyResult(result);
+		} catch (err) {
+			setPhase("failed");
+			setError(err instanceof Error ? err.message : String(err));
+		}
+	};
+	const runCancel = async () => {
+		setPhase("cancelling");
+		setError(null);
+		try {
+			await api.cancel(syncSessionId);
+		} catch {}
+		onCancel();
+	};
+	const runRollback = async (restoreId) => {
+		setPhase("applying");
+		setError(null);
+		try {
+			await api.rollback({ restoreId });
+			setPhase("done");
+			setApplyResult(null);
+			onRollbackDone?.();
+		} catch (err) {
+			setPhase("failed");
+			setError(err instanceof Error ? err.message : String(err));
+		}
+	};
+	const busy = phase === "applying" || phase === "cancelling";
+	if (items.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: config_manager_module_css_default.groupLabel,
+			children: t("syncflow.title")
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: "ok",
+			children: t("syncflow.empty")
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			className: config_manager_module_css_default.actionRow,
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+				disabled: busy,
+				onClick: () => {
+					runCancel();
+				},
+				children: t("syncflow.cancel")
+			})
+		})
+	] });
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: config_manager_module_css_default.groupLabel,
+			children: [t("syncflow.title"), compatibility !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+				kind: "info",
+				children: compatibility
+			})]
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: needsReview ? "warn" : "info",
+			children: needsReview ? t("syncflow.needsReviewBadge") : t("syncflow.diffCount", { count: String(summary.total) })
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: config_manager_module_css_default.statRow,
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+					kind: "info",
+					children: t("syncflow.diffCount", { count: String(summary.total) })
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Badge, {
+					kind: "ok",
+					children: [
+						t("syncflow.adoptRemote"),
+						" ",
+						summary.adopted
+					]
+				}),
+				summary.error > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Badge, {
+					kind: "error",
+					children: [
+						severityLabel("error", api.t),
+						" × ",
+						summary.error
+					]
+				}),
+				summary.warning > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Badge, {
+					kind: "warn",
+					children: [
+						severityLabel("warning", api.t),
+						" × ",
+						summary.warning
+					]
+				})
+			]
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: config_manager_module_css_default.hint,
+			children: t("syncflow.adoptHint")
+		}),
+		/* @__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);
+								}
+							}), /* @__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);
+			})
+		}),
+		error !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: "error",
+			children: error
+		}),
+		phase === "idle" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: config_manager_module_css_default.actionRow,
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+				variant: "primary",
+				disabled: busy || summary.adopted === 0,
+				onClick: () => {
+					runApply();
+				},
+				children: t("syncflow.confirmImport")
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+				disabled: busy,
+				onClick: () => {
+					runCancel();
+				},
+				children: t("syncflow.cancel")
+			})]
+		}),
+		(phase === "done" || phase === "failed") && applyResult !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ApplyResultCard, {
+			result: applyResult,
+			busy,
+			t,
+			onRollback: runRollback
+		}),
+		(phase === "done" || phase === "failed") && applyResult === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: "ok",
+			children: t("syncflow.rollbackDone")
+		})
+	] });
+}
+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,
+		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")
+			}),
+			conflict?.diff !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
+				className: config_manager_module_css_default.conflictDetail,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("syncflow.diff") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+					className: config_manager_module_css_default.diffScroll,
+					children: conflict.diff
+				})]
+			})
+		]
+	});
+}
+function ApplyResultCard({ result, busy, t, onRollback }) {
+	const ok = result.ok;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: ok ? "ok" : "error",
+			children: ok ? t("syncflow.importDone", { n: String(result.applied.length) }) : t("syncflow.importFailed")
+		}),
+		result.needsRestart && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
+			kind: "warn",
+			children: t("syncflow.needsRestart")
+		}),
+		result.applied.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: config_manager_module_css_default.fieldLabel,
+			children: t("syncflow.importedSections")
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			className: config_manager_module_css_default.statRow,
+			children: result.applied.map((sid) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+				kind: "ok",
+				children: sid
+			}, sid))
+		})] }),
+		result.warnings.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: config_manager_module_css_default.fieldLabel,
+			children: t("syncflow.importWarnings")
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+			className: config_manager_module_css_default.warnList,
+			children: result.warnings.map((w, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: w }, i))
+		})] }),
+		result.restoreId !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+			variant: "danger",
+			disabled: busy,
+			onClick: () => {
+				onRollback(result.restoreId);
+			},
+			children: busy ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: t("syncflow.rollingBack") }) : t("syncflow.rollback")
+		})
+	] });
+}
 //#endregion
 //#region src/client/sync/SyncSettingsView.tsx
 /**
@@ -4173,8 +4822,10 @@ function SyncHistoryView(props) {
 *   + gitBin（可选）；
 * - 私有仓库强制提示横幅（常驻）；
 * - 推送按钮 → SyncPushReport（快照 id / 分区 / 告警）；
-* - 拉取按钮 → SyncPullReport.changes 差异摘要（description/kind/severity）+
-*   「预览不执行导入」提示；needsReview 高亮（v1 不做完整导入接线）；
+* - 拉取按钮 → SyncPullReport.changes 差异摘要（description/kind/severity）；
+* - 【方案 A】一键同步主按钮：拉取 → 差异确认会话（SyncConfirmView 逐项确认）→
+*   确认导入（apply-items）→ 执行结果 + 一键回滚（restoreId）；「选择历史快照」下拉；
+* - 【方案 A】自动同步设置区块：总开关 + 间隔下拉 + 状态（上次运行 / 下次倒计时）；
 * - 状态行：凭据配置 + 上次同步时间 + 通道（来自 GET /sync/status，组件挂载时加载）。
 *
 * 全部渲染模型来自 ./sync-view.ts 纯函数（node 单测覆盖），组件只做装配；
@@ -4189,6 +4840,15 @@ const initialGithub = {
 	interval: 5,
 	error: null
 };
+const AUTOSYNC_INTERVAL_OPTIONS = [
+	"5m",
+	"15m",
+	"30m",
+	"60m",
+	"6h",
+	"12h",
+	"24h"
+];
 const initial = {
 	loading: true,
 	loadError: null,
@@ -4199,7 +4859,13 @@ const initial = {
 	busy: null,
 	pushReport: null,
 	pullReport: null,
-	applyReport: null,
+	confirmSession: null,
+	snapshots: [],
+	selectedSnapshotId: "",
+	autosync: null,
+	autosyncEnabled: false,
+	autosyncInterval: "30m",
+	lastRestoreId: null,
 	error: null,
 	github: initialGithub
 };
@@ -4219,7 +4885,7 @@ function SyncSettingsView({ api, t }) {
 	}));
 	/** GitHub 轮询定时器（卸载/取消时清理，防止泄漏与跨流程串扰） */
 	const githubPollTimer = (0, react.useRef)(null);
-	/** 挂载时读取同步状态（配置回填 + 上次同步时间 + 凭据状态） */
+	/** 挂载时读取同步状态（配置回填 + 上次同步时间 + 凭据状态 + autosync） */
 	const loadStatus = async () => {
 		patch({
 			loading: true,
@@ -4231,8 +4897,14 @@ function SyncSettingsView({ api, t }) {
 				loading: false,
 				statusInfo: info,
 				repoUrl: info.repoUrl ?? "",
-				gitBin: info.gitBin ?? ""
+				gitBin: info.gitBin ?? "",
+				...info.autosync !== void 0 ? {
+					autosync: info.autosync,
+					autosyncEnabled: info.autosync.enabled,
+					autosyncInterval: info.autosync.interval
+				} : {}
 			});
+			if (info.autosync === void 0) loadAutosync();
 		} catch (err) {
 			patch({
 				loading: false,
@@ -4240,6 +4912,26 @@ function SyncSettingsView({ api, t }) {
 			});
 		}
 	};
+	/** 读取自动同步状态（GET /sync/autosync）。 */
+	const loadAutosync = async () => {
+		try {
+			const autosync = await api.autosyncStatus();
+			patch({
+				autosync,
+				autosyncEnabled: autosync.enabled,
+				autosyncInterval: autosync.interval
+			});
+		} catch (err) {
+			patch({ error: err instanceof Error ? err.message : String(err) });
+		}
+	};
+	/** 读取远端历史快照列表（「选择历史快照」下拉数据源）。 */
+	const loadSnapshots = async () => {
+		try {
+			const res = await api.snapshotsList(payload());
+			patch({ snapshots: res.snapshots });
+		} catch {}
+	};
 	(0, react.useEffect)(() => {
 		loadStatus();
 	}, []);
@@ -4365,19 +5057,35 @@ function SyncSettingsView({ api, t }) {
 			});
 		}
 	};
-	/** P2：自动应用（Host 端 engine.merge + classifyMergePlan + applyMergePlan 走完整链路） */
-	const runApply = async () => {
+	/** 一键同步：拉取 → 差异确认会话（先取消旧会话，再发起新会话）。 */
+	const runSync = async (snapshotId) => {
+		if (state.confirmSession !== null) try {
+			await api.cancel(state.confirmSession.syncSessionId);
+		} catch {}
 		patch({
-			busy: "apply",
+			busy: "sync",
 			error: null,
-			applyReport: null
+			confirmSession: null,
+			lastRestoreId: null
 		});
 		try {
-			const report = await api.apply(payload());
+			const session = await api.sync({
+				...payload(),
+				...snapshotId !== void 0 && snapshotId !== "" ? { snapshotId } : {}
+			});
+			if (!session.ok) {
+				patch({
+					busy: null,
+					error: session.message ?? t("syncflow.syncFailed")
+				});
+				return;
+			}
 			patch({
 				busy: null,
-				applyReport: report
+				confirmSession: session,
+				token: ""
 			});
+			loadSnapshots();
 		} catch (err) {
 			patch({
 				busy: null,
@@ -4385,23 +5093,50 @@ function SyncSettingsView({ api, t }) {
 			});
 		}
 	};
-	/** P2：一键回滚（按 apply 返回的 restoreId 调 Host /sync/rollback） */
-	const runRollback = async (restoreId) => {
+	/** 用户取消差异确认：清除会话，复位到空闲。 */
+	const cancelConfirm = () => {
+		patch({ confirmSession: null });
+	};
+	/** 从 SyncConfirmView 透传的一键回滚完成信号。 */
+	const onRollbackApplied = () => {
+		patch({ lastRestoreId: null });
+	};
+	const toggleAutosync = async (enabled) => {
 		patch({
-			busy: "rollback",
+			autosyncEnabled: enabled,
 			error: null
 		});
 		try {
-			await api.rollback({ restoreId });
+			const updated = await api.autosyncUpdate({
+				enabled,
+				interval: state.autosyncInterval
+			});
 			patch({
-				busy: null,
-				applyReport: null
+				autosync: updated,
+				autosyncEnabled: updated.enabled,
+				autosyncInterval: updated.interval
 			});
 		} catch (err) {
+			patch({ error: err instanceof Error ? err.message : String(err) });
+		}
+	};
+	const updateAutosyncInterval = async (interval) => {
+		patch({
+			autosyncInterval: interval,
+			error: null
+		});
+		try {
+			const updated = await api.autosyncUpdate({
+				enabled: state.autosyncEnabled,
+				interval
+			});
 			patch({
-				busy: null,
-				error: err instanceof Error ? err.message : String(err)
+				autosync: updated,
+				autosyncEnabled: updated.enabled,
+				autosyncInterval: updated.interval
 			});
+		} catch (err) {
+			patch({ error: err instanceof Error ? err.message : String(err) });
 		}
 	};
 	const status = computeSyncStatus(state.statusInfo, state.loading, state.loadError, uiT);
@@ -4411,6 +5146,8 @@ function SyncSettingsView({ api, t }) {
 	const githubView = computeGithubLoginView(state.github.phase, state.github.userCode, state.github.verificationUri, state.github.error, uiT);
 	/** GitHub 流程进行中（请求设备码 / 等待授权 / 轮询）：禁用 push/pull，避免无凭据操作 */
 	const githubBusy = state.github.phase === "starting" || state.github.phase === "waiting" || state.github.phase === "polling";
+	const autosyncText = state.autosync !== null ? autosyncStatusText(state.autosync, uiT) : t("autosync.statusNever");
+	const autosyncCountdown = state.autosync !== null && state.autosync.elapsedMs >= 0 ? formatIntervalDuration(computeAutosyncCountdown(state.autosync.elapsedMs, autosyncIntervalMs(state.autosync.interval)), uiT) : null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: config_manager_module_css_default.viewBody,
 		children: [
@@ -4469,7 +5206,7 @@ function SyncSettingsView({ api, t }) {
 							className: config_manager_module_css_default.input,
 							value: state.token,
 							autoComplete: "off",
-							placeholder: "ghp_…（可选）",
+							placeholder: t("config.tokenPlaceholder"),
 							disabled: state.busy !== null,
 							onChange: (e) => {
 								patch({ token: e.target.value });
@@ -4571,22 +5308,79 @@ function SyncSettingsView({ api, t }) {
 			})] }),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: config_manager_module_css_default.actionRow,
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					variant: "primary",
-					disabled: !buttons.canPush || githubBusy,
-					onClick: () => {
-						runPush();
-					},
-					children: state.busy === "push" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: buttons.pushLabel }) : buttons.pushLabel
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					disabled: !buttons.canPull || githubBusy,
-					onClick: () => {
-						runPull();
-					},
-					children: state.busy === "pull" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: buttons.pullLabel }) : buttons.pullLabel
-				})]
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						variant: "primary",
+						disabled: state.busy !== null || state.repoUrl.trim() === "",
+						onClick: () => {
+							runSync();
+						},
+						children: state.busy === "sync" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: t("syncflow.syncing") }) : t("syncflow.button")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						disabled: !buttons.canPush || githubBusy,
+						onClick: () => {
+							runPush();
+						},
+						children: state.busy === "push" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: buttons.pushLabel }) : buttons.pushLabel
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						disabled: !buttons.canPull || githubBusy,
+						onClick: () => {
+							runPull();
+						},
+						children: state.busy === "pull" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: buttons.pullLabel }) : buttons.pullLabel
+					})
+				]
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: config_manager_module_css_default.statRow,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+					className: config_manager_module_css_default.field,
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: config_manager_module_css_default.fieldLabel,
+							children: t("syncflow.selectSnapshot")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+							className: config_manager_module_css_default.input,
+							value: state.selectedSnapshotId,
+							disabled: state.busy !== null,
+							onChange: (e) => {
+								const id = e.target.value;
+								patch({ selectedSnapshotId: id });
+								runSync(id === "" ? void 0 : id);
+							},
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+								value: "",
+								children: t("syncflow.latestSnapshot")
+							}), state.snapshots.map((s) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+								value: s.id,
+								children: [s.id, t("syncflow.snapshotOption", {
+									date: s.createdAt.slice(0, 10),
+									count: String(s.sectionCount)
+								})]
+							}, s.id))]
+						}),
+						state.snapshots.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: config_manager_module_css_default.hint,
+							children: t("syncflow.noSnapshots")
+						})
+					]
+				})
 			}),
 			state.error !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorBanner, { error: state.error }),
+			state.confirmSession !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SyncConfirmView, {
+				api,
+				syncSessionId: state.confirmSession.syncSessionId,
+				snapshotId: state.confirmSession.snapshotId,
+				items: state.confirmSession.items,
+				needsReview: state.confirmSession.needsReview,
+				compatibility: state.confirmSession.compatibility,
+				t,
+				onCancel: cancelConfirm,
+				onRollbackDone: onRollbackApplied
+			}),
 			pushView !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: config_manager_module_css_default.groupLabel,
@@ -4684,67 +5478,82 @@ function SyncSettingsView({ api, t }) {
 					children: pullView.previewHint
 				})
 			] }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-				className: config_manager_module_css_default.actionRow,
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					variant: "primary",
-					disabled: state.busy !== null || state.pullReport === null,
-					onClick: () => {
-						runApply();
-					},
-					children: state.busy === "apply" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: "自动应用中…" }) : "自动应用（合并 + 写本地）"
-				})
-			}),
-			state.applyReport !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: config_manager_module_css_default.groupLabel,
-					children: "自动应用结果"
+					children: t("autosync.title")
 				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Banner, {
-					kind: state.applyReport.ok ? "ok" : "error",
-					children: state.applyReport.ok ? `已应用 ${state.applyReport.applied.length} 个分区（restoreId=${state.applyReport.restoreId}）` : `自动应用失败（已整体回滚，restoreId=${state.applyReport.restoreId}）`
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: config_manager_module_css_default.hint,
+					children: t("autosync.description")
 				}),
-				state.applyReport.applied.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: config_manager_module_css_default.fieldLabel,
-					children: "已写入"
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				/* @__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: state.autosyncEnabled,
+						disabled: state.busy !== null,
+						onChange: (e) => {
+							toggleAutosync(e.target.checked);
+						}
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("autosync.enable") })]
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+					className: config_manager_module_css_default.field,
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: config_manager_module_css_default.fieldLabel,
+							children: t("autosync.interval")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+							className: config_manager_module_css_default.input,
+							value: state.autosyncInterval,
+							disabled: state.busy !== null,
+							onChange: (e) => {
+								updateAutosyncInterval(e.target.value);
+							},
+							children: AUTOSYNC_INTERVAL_OPTIONS.map((iv) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+								value: iv,
+								children: intervalLabel(iv, t)
+							}, iv))
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: config_manager_module_css_default.hint,
+							children: t("autosync.intervalHint")
+						})
+					]
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: config_manager_module_css_default.statRow,
-					children: state.applyReport.applied.map((sid) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
-						kind: "ok",
-						children: sid
-					}, sid))
-				})] }),
-				state.applyReport.warnings.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: config_manager_module_css_default.fieldLabel,
-					children: "告警"
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
-					className: config_manager_module_css_default.warnList,
-					children: state.applyReport.warnings.map((w, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: w }, i))
-				})] }),
-				state.applyReport.review.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: config_manager_module_css_default.fieldLabel,
-					children: "待审（已入 sync-review-queue.json）"
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
-					className: config_manager_module_css_default.warnList,
-					children: state.applyReport.review.map((r, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
-						r.sectionId,
-						" — ",
-						r.description
-					] }, i))
-				})] }),
-				!state.applyReport.ok && state.applyReport.restoreId !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					variant: "danger",
-					disabled: state.busy !== null,
-					onClick: () => {
-						runRollback(state.applyReport.restoreId);
-					},
-					children: state.busy === "rollback" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Spinner, { label: "回滚中…" }) : "回滚到应用前"
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+						kind: state.autosync?.lastRunStatus === "failed" ? "error" : state.autosync?.lastRunStatus === "skipped" ? "warn" : "info",
+						children: autosyncText
+					}), autosyncCountdown !== null && state.autosyncEnabled && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+						kind: "info",
+						children: t("autosync.nextRun", { time: autosyncCountdown })
+					})]
 				})
 			] }),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SyncHistoryView, { api })
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SyncHistoryView, {
+				api,
+				t
+			})
 		]
 	});
 }
+/** AutosyncInterval → 可读标签（复用 i18n interval 键）。 */
+function intervalLabel(iv, t) {
+	switch (iv) {
+		case "5m": return t("autosync.interval5m");
+		case "15m": return t("autosync.interval15m");
+		case "30m": return t("autosync.interval30m");
+		case "60m": return t("autosync.interval60m");
+		case "6h": return t("autosync.interval6h");
+		case "12h": return t("autosync.interval12h");
+		case "24h": return t("autosync.interval24h");
+		default: return iv;
+	}
+}
 //#endregion
 //#region src/client/ConfigManagerSection.tsx
 /**
@@ -5101,6 +5910,7 @@ const zh = {
 	"config.token": "认证 token",
 	"config.tokenHint": "将安全写入 DSH credentials（引用名 {ref}），不会写入同步文件或日志。留空表示沿用已保存的凭据。",
 	"config.tokenSaved": "凭据已配置",
+	"config.tokenPlaceholder": "ghp_…（可选）",
 	"config.gitBin": "git 可执行文件（可选）",
 	"config.gitBinHint": "缺省使用 PATH 中的 git。",
 	"github.title": "GitHub 登录",
@@ -5125,6 +5935,84 @@ const zh = {
 	"change.total": "共 {total} 项变更",
 	"sections.title": "同步分区",
 	"warnings.title": "分区告警",
+	"syncflow.title": "一键同步",
+	"syncflow.button": "一键同步",
+	"syncflow.syncing": "正在同步…",
+	"syncflow.syncFailed": "同步失败",
+	"syncflow.snapshotOption": "（{date} · {count} 分区）",
+	"syncflow.selectSnapshot": "选择历史快照",
+	"syncflow.latestSnapshot": "最新快照",
+	"syncflow.noSnapshots": "远端暂无快照",
+	"syncflow.confirmImport": "确认导入",
+	"syncflow.cancel": "取消",
+	"syncflow.adoptRemote": "采用远端",
+	"syncflow.adoptHint": "勾选 = 导入该项；取消 = 跳过",
+	"syncflow.needsReviewBadge": "需人工决策",
+	"syncflow.empty": "远端快照与本地一致（无变更）",
+	"syncflow.diffCount": "共 {count} 项差异",
+	"syncflow.conflictTitle": "冲突解决",
+	"syncflow.conflictUseLocal": "用本地",
+	"syncflow.conflictUseRemote": "用远端",
+	"syncflow.conflictSkip": "跳过",
+	"syncflow.conflictLocalLabel": "本地",
+	"syncflow.conflictRemoteLabel": "远端",
+	"syncflow.conflictAncestorLabel": "共同祖先",
+	"syncflow.conflictUnresolved": "冲突项 {itemId} 尚未选择解决方式（用本地 / 用远端 / 跳过）",
+	"syncflow.diff": "差异",
+	"syncflow.importDone": "已导入 {n} 个分区",
+	"syncflow.importFailed": "导入失败（已整体回滚）",
+	"syncflow.importedSections": "已写入",
+	"syncflow.importWarnings": "导入告警",
+	"syncflow.rollback": "回滚到应用前",
+	"syncflow.rollingBack": "正在回滚…",
+	"syncflow.rollbackDone": "已回滚到应用前",
+	"syncflow.needsRestart": "部分改动需要重启 DSH 后生效",
+	"autosync.title": "自动同步",
+	"autosync.description": "开启后，DSH 将按固定间隔自动执行双向同步（拉取合并 + 上传）；DSH 启动时还会触发一次「自动下载合并（不上传）」以保持本地为最新。仅在无冲突且无需人工干预时才自动写入。",
+	"autosync.enable": "启用自动同步",
+	"autosync.interval": "同步间隔",
+	"autosync.intervalHint": "DSH 启动时自动下载合并不上传。",
+	"autosync.interval5m": "5 分钟",
+	"autosync.interval15m": "15 分钟",
+	"autosync.interval30m": "30 分钟",
+	"autosync.interval60m": "60 分钟",
+	"autosync.interval6h": "6 小时",
+	"autosync.interval12h": "12 小时",
+	"autosync.interval24h": "24 小时",
+	"autosync.status": "上次运行：{status}（{time}）",
+	"autosync.statusNever": "从未运行",
+	"autosync.nextRun": "下次约 {time} 后",
+	"autosync.failCount": "连续失败 {n} 次",
+	"autosync.running": "自动同步进行中…",
+	"autosync.success": "成功",
+	"autosync.skipped": "已跳过",
+	"autosync.failed": "失败",
+	"autosync.partial": "部分成功",
+	"history.title": "同步历史",
+	"history.empty": "尚无同步历史",
+	"history.emptyHint": "完成首次 push / 一键同步 / 自动同步后，这里会显示记录。",
+	"history.colTime": "时间",
+	"history.colKind": "类型",
+	"history.colDetail": "详情",
+	"history.kindSnapshot": "快照",
+	"history.kindAutosync": "自动同步",
+	"history.sectionCount": "分区",
+	"history.detail": "明细",
+	"history.autosyncDirection": "方向：{direction}",
+	"history.autosyncPull": "下载",
+	"history.autosyncPush": "上传",
+	"history.autosyncBoth": "双向",
+	"history.autosyncSkipReason": "跳过原因：{reason}",
+	"history.autosyncReasonConflict": "冲突",
+	"history.autosyncReasonNoRemote": "无远端快照",
+	"history.autosyncReasonNotConfigured": "未配置仓库",
+	"history.autosyncReasonNetwork": "网络问题",
+	"history.autosyncConflicted": "跳过冲突分区：{sections}",
+	"history.autosyncApplied": "应用分区：{sections}",
+	"history.autosyncError": "错误：{error}",
+	"history.autosyncNotified": "已通知（连续失败 3 次）",
+	"history.column.snapshot": "快照",
+	"history.column.autosync": "自动同步",
 	"common.close": "关闭",
 	"common.retry": "重试",
 	"common.loading": "加载中…"
@@ -5139,6 +6027,7 @@ const en = {
 	"config.token": "Auth token",
 	"config.tokenHint": "Securely written into DSH credentials (ref {ref}); never written into sync files or logs. Leave blank to reuse the saved credential.",
 	"config.tokenSaved": "Credential configured",
+	"config.tokenPlaceholder": "ghp_… (optional)",
 	"config.gitBin": "git executable (optional)",
 	"config.gitBinHint": "Defaults to git on PATH.",
 	"github.title": "GitHub Sign-in",
@@ -5163,6 +6052,84 @@ const en = {
 	"change.total": "{total} change(s)",
 	"sections.title": "Synced Sections",
 	"warnings.title": "Section Warnings",
+	"syncflow.title": "One-Click Sync",
+	"syncflow.button": "One-click sync",
+	"syncflow.syncing": "Syncing…",
+	"syncflow.syncFailed": "Sync failed",
+	"syncflow.snapshotOption": "({date} · {count} sections)",
+	"syncflow.selectSnapshot": "Select snapshot",
+	"syncflow.latestSnapshot": "Latest snapshot",
+	"syncflow.noSnapshots": "No remote snapshots",
+	"syncflow.confirmImport": "Confirm import",
+	"syncflow.cancel": "Cancel",
+	"syncflow.adoptRemote": "Adopt remote",
+	"syncflow.adoptHint": "Check = import item; uncheck = skip",
+	"syncflow.needsReviewBadge": "Needs decision",
+	"syncflow.empty": "Remote snapshot matches local (no changes)",
+	"syncflow.diffCount": "{count} change(s)",
+	"syncflow.conflictTitle": "Resolve conflict",
+	"syncflow.conflictUseLocal": "Use local",
+	"syncflow.conflictUseRemote": "Use remote",
+	"syncflow.conflictSkip": "Skip",
+	"syncflow.conflictLocalLabel": "Local",
+	"syncflow.conflictRemoteLabel": "Remote",
+	"syncflow.conflictAncestorLabel": "Common ancestor",
+	"syncflow.conflictUnresolved": "Conflict item {itemId} has no resolution yet (use local / use remote / skip)",
+	"syncflow.diff": "Diff",
+	"syncflow.importDone": "Imported {n} section(s)",
+	"syncflow.importFailed": "Import failed (rolled back)",
+	"syncflow.importedSections": "Written",
+	"syncflow.importWarnings": "Import warnings",
+	"syncflow.rollback": "Rollback",
+	"syncflow.rollingBack": "Rolling back…",
+	"syncflow.rollbackDone": "Rolled back",
+	"syncflow.needsRestart": "Some changes require a DSH restart to take effect",
+	"autosync.title": "Auto Sync",
+	"autosync.description": "When enabled, DSH will run two-way sync (pull merge + push) on a fixed interval; on startup it also triggers a download-merge (no upload) to keep local up to date. Local writes happen only when there are no conflicts or manual-decision items.",
+	"autosync.enable": "Enable auto sync",
+	"autosync.interval": "Sync interval",
+	"autosync.intervalHint": "Auto download-merge on DSH startup, no upload.",
+	"autosync.interval5m": "5 min",
+	"autosync.interval15m": "15 min",
+	"autosync.interval30m": "30 min",
+	"autosync.interval60m": "60 min",
+	"autosync.interval6h": "6 hr",
+	"autosync.interval12h": "12 hr",
+	"autosync.interval24h": "24 hr",
+	"autosync.status": "Last run: {status} ({time})",
+	"autosync.statusNever": "Never run",
+	"autosync.nextRun": "Next in ~{time}",
+	"autosync.failCount": "{n} consecutive failure(s)",
+	"autosync.running": "Auto sync running…",
+	"autosync.success": "Success",
+	"autosync.skipped": "Skipped",
+	"autosync.failed": "Failed",
+	"autosync.partial": "Partial",
+	"history.title": "Sync History",
+	"history.empty": "No sync history yet",
+	"history.emptyHint": "Records appear here after your first push / one-click sync / auto sync.",
+	"history.colTime": "Time",
+	"history.colKind": "Kind",
+	"history.colDetail": "Detail",
+	"history.kindSnapshot": "Snapshot",
+	"history.kindAutosync": "Auto Sync",
+	"history.sectionCount": "sections",
+	"history.detail": "Detail",
+	"history.autosyncDirection": "Direction: {direction}",
+	"history.autosyncPull": "Pull",
+	"history.autosyncPush": "Push",
+	"history.autosyncBoth": "Both",
+	"history.autosyncSkipReason": "Skip reason: {reason}",
+	"history.autosyncReasonConflict": "Conflict",
+	"history.autosyncReasonNoRemote": "No remote snapshot",
+	"history.autosyncReasonNotConfigured": "No repository configured",
+	"history.autosyncReasonNetwork": "Network issue",
+	"history.autosyncConflicted": "Skipped conflict sections: {sections}",
+	"history.autosyncApplied": "Applied sections: {sections}",
+	"history.autosyncError": "Error: {error}",
+	"history.autosyncNotified": "Notified (3 consecutive failures)",
+	"history.column.snapshot": "Snapshot",
+	"history.column.autosync": "Auto Sync",
 	"common.close": "Close",
 	"common.retry": "Retry",
 	"common.loading": "Loading…"