dsh-config-manager 0.1.19 → 0.1.21

package/lib/client.d.ts

@@ -240,8 +240,8 @@ interface SnapshotMeta {
 }
 //#endregion
 //#region src/core/run-registry.d.ts
-/** run 类型：导出 / 导入。 */
-type RunKind = 'export' | 'import';
+/** run 类型：导出 / 导入 / 自动同步 / 一键同步逐项应用。 */
+type RunKind = 'export' | 'import' | 'autosync' | 'sync-apply';
 /** run 状态：进行中 / 完成 / 失败。 */
 type RunStatus = 'running' | 'done' | 'failed';
 /** 单个 run 的实时状态（/progress 返回体；纯 JSON 可序列化）。 */
@@ -421,6 +421,69 @@ declare const uiZh: {
   readonly 'sync.pullOk': "远端快照 {id} 差异预览：共 {count} 项变更";
   readonly 'sync.pullEmpty': "远端快照与本地一致（无变更）";
   readonly 'sync.previewHint': "以上为只读差异预览，不会执行导入。v1 暂不提供一键导入接线；如需应用远端配置，请使用「导入恢复」向导手动导入导出的备份。";
+  readonly 'sync.syncTitle': "一键同步";
+  readonly 'sync.syncButton': "一键同步";
+  readonly 'sync.syncing': "正在同步…";
+  readonly 'sync.syncHeadline': "远端快照 {id} 差异确认：共 {count} 项";
+  readonly 'sync.syncEmpty': "远端快照与本地一致（无变更）";
+  readonly 'sync.syncFailed': "同步失败";
+  readonly 'sync.confirmAdopt': "采用远端";
+  readonly 'sync.confirmSkip': "跳过";
+  readonly 'sync.confirmRequired': "需要人工决策";
+  readonly 'sync.needsReviewBadge': "需人工决策";
+  readonly 'sync.selectSnapshot': "选择历史快照";
+  readonly 'sync.latestSnapshot': "最新快照";
+  readonly 'sync.noSnapshots': "远端暂无快照";
+  readonly 'sync.confirmImport': "确认导入";
+  readonly 'sync.cancelConfirm': "取消";
+  readonly 'sync.conflictResolve': "冲突解决";
+  readonly 'sync.conflictUseLocal': "用本地";
+  readonly 'sync.conflictUseRemote': "用远端";
+  readonly 'sync.conflictSkip': "跳过";
+  readonly 'sync.conflictResolvedLocal': "已选：本地";
+  readonly 'sync.conflictResolvedRemote': "已选：远端";
+  readonly 'sync.conflictResolvedSkip': "已选：跳过";
+  readonly 'sync.importDone': "已导入 {n} 个分区";
+  readonly 'sync.importSkipped': "已跳过 {n} 项";
+  readonly 'sync.importFailed': "导入失败（已整体回滚）";
+  readonly 'sync.rollbackButton': "回滚到应用前";
+  readonly 'sync.rollingBack': "正在回滚…";
+  readonly 'sync.rollbackDone': "已回滚到应用前";
+  readonly 'sync.appliedSections': "已写入";
+  readonly 'sync.importWarnings': "导入告警";
+  readonly 'sync.autosyncTitle': "自动同步";
+  readonly 'sync.autosyncDesc': "开启后，DSH 将按固定间隔自动执行双向同步（拉取合并 + 上传）；DSH 启动时还会触发一次「自动下载合并（不上传）」以保持本地为最新。仅在无冲突且无需人工干预时才自动写入。";
+  readonly 'sync.autosyncEnabled': "启用自动同步";
+  readonly 'sync.autosyncInterval': "同步间隔";
+  readonly 'sync.autosyncIntervalHint': "DSH 启动时自动下载合并不上传。";
+  readonly 'sync.autosyncNever': "从未运行";
+  readonly 'sync.autosyncLastRun': "上次运行：{time}";
+  readonly 'sync.autosyncNextIn': "下次约 {time} 后";
+  readonly 'sync.autosyncSuccess': "成功";
+  readonly 'sync.autosyncSkipped': "已跳过";
+  readonly 'sync.autosyncFailed': "失败";
+  readonly 'sync.autosyncPartial': "部分成功";
+  readonly 'sync.autosyncFailCount': "连续失败 {n} 次";
+  readonly 'sync.autosyncSyncing': "自动同步进行中…";
+  readonly 'sync.interval.5m': "5 分钟";
+  readonly 'sync.interval.15m': "15 分钟";
+  readonly 'sync.interval.30m': "30 分钟";
+  readonly 'sync.interval.60m': "60 分钟";
+  readonly 'sync.interval.6h': "6 小时";
+  readonly 'sync.interval.12h': "12 小时";
+  readonly 'sync.interval.24h': "24 小时";
+  readonly 'sync.hist.autosync': "自动同步";
+  readonly 'sync.hist.directionPull': "下载";
+  readonly 'sync.hist.directionPush': "上传";
+  readonly 'sync.hist.directionBoth': "双向";
+  readonly 'sync.hist.skipReasonConflict': "冲突项被跳过";
+  readonly 'sync.hist.skipReasonNoRemote': "远端无快照";
+  readonly 'sync.hist.skipReasonNotConfigured': "未配置仓库";
+  readonly 'sync.hist.skipReasonNetwork': "网络问题";
+  readonly 'sync.hist.conflictedSections': "跳过冲突分区：{sections}";
+  readonly 'sync.hist.appliedSections': "应用分区：{sections}";
+  readonly 'sync.hist.failedError': "错误：{error}";
+  readonly 'sync.hist.notifiedAt': "已通知";
   readonly 'sync.github.starting': "正在发起 GitHub 授权…";
   readonly 'sync.github.waitingNoCode': "请在浏览器中打开授权页面并完成授权…";
   readonly 'sync.github.waiting': "请在浏览器中打开授权页面，输入一次性代码 {code} 完成授权（自动等待确认）。";
@@ -575,6 +638,8 @@ interface SyncStatusResponse {
     type: string;
     ref: string;
   };
+  /** 自动同步当前状态（供 UI 顶部开关回填；§3.9） */
+  autosync?: AutosyncStatusResponse;
 }
 /** push 请求体（token 可选：非空则 Host 先写入 DSH credentials 再使用） */
 interface SyncPushPayload {
@@ -587,6 +652,156 @@ interface SyncPullPayload extends SyncPushPayload {
   strategy?: 'merge' | 'replace' | 'skipExisting';
   snapshotId?: string;
 }
+/** GET /sync/snapshots-list 响应：远端历史快照列表（按 createdAt 倒序）。 */
+interface SyncSnapshotsListResponse {
+  ok: boolean;
+  /** 按 createdAt 倒序（最新在前） */
+  snapshots: SyncSnapshotLite[];
+  /** 当前本地祖先指针（sync-state.lastSnapshotId），用于高亮当前基线 */
+  currentSnapshotId?: string;
+}
+/** 远端快照摘要（「选择历史快照」下拉项）。 */
+interface SyncSnapshotLite {
+  id: string;
+  createdAt: string;
+  sectionCount: number;
+  platform: string;
+  dshVersion: string;
+}
+/** POST /sync/sync 请求体（一键同步第一步：拉取 → 差异确认会话）。 */
+interface SyncStartPayload {
+  repoUrl: string;
+  gitBin?: string;
+  token?: string;
+  /** 缺省 = 最新快照；传入则对该历史快照拉取 */
+  snapshotId?: string;
+}
+/** POST /sync/sync 响应：差异确认会话（items 供 UI 逐项确认）。 */
+interface SyncStartResponse {
+  ok: boolean;
+  /** 差异确认会话 id：后续 apply-items / cancel 引用 */
+  syncSessionId: string;
+  /** 被拉取的远端快照 id */
+  snapshotId: string;
+  items: SyncConfirmItem[];
+  /** 是否包含任何需人工决策项 */
+  needsReview: boolean;
+  compatibility: 'excellent' | 'good' | 'partial' | 'unsupported';
+  message?: string;
+}
+/** 单条可确认的差异项（由 ImportPlan.item 投影 + 冲突详情）。 */
+interface SyncConfirmItem {
+  itemId: string;
+  adapter: SectionId;
+  kind: PlanItemKind;
+  description: string;
+  severity: 'info' | 'warning' | 'error';
+  /** 默认采纳方向；Conflict/MissingSecret 等人工项默认 false */
+  defaultAdopt: boolean;
+  /** 用户最终决策（缺省 = defaultAdopt） */
+  adopt: boolean;
+  /** 冲突项内联解决所需详情（仅 Conflict 项非空） */
+  conflict?: SyncConflictDetail;
+  /** 该项若采用将写入的目标摘要 */
+  target?: {
+    adapter: SectionId;
+    ref: string;
+  };
+}
+/** 冲突项内联解决详情（来源 MergeConflict + 可读 diff）。 */
+interface SyncConflictDetail {
+  path: string;
+  kind: 'key' | 'file' | 'section';
+  local?: unknown;
+  remote?: unknown;
+  ancestor?: unknown;
+  diff?: string;
+}
+/** POST /sync/apply-items 请求体（一键同步第二步：按逐项决策执行导入）。 */
+interface ApplyItemsPayload {
+  syncSessionId: string;
+  /** 每项的最终采纳决策（未列出项视为 adopt=false） */
+  adoptions: SyncItemAdoption[];
+}
+/** 单条采纳决策。 */
+interface SyncItemAdoption {
+  itemId: string;
+  adopt: boolean;
+  /** 冲突项解决方案（仅当该项是 Conflict 且 adopt=true 时必须） */
+  resolution?: 'useRemote' | 'keepLocal' | 'skip';
+}
+/** POST /sync/apply-items 响应。 */
+interface ApplyItemsResponse {
+  ok: boolean;
+  applied: string[];
+  skipped: string[];
+  needsRestart: boolean;
+  warnings: string[];
+  /** 应用前快照 id（UI 一键回滚用） */
+  restoreId: string;
+  /** 任一失败是否整体回滚 */
+  rolledBack: boolean;
+  failed: {
+    itemId: string;
+    message?: string;
+  }[];
+  result: unknown;
+}
+/** 统一间隔类型。 */
+type AutosyncInterval = '5m' | '15m' | '30m' | '60m' | '6h' | '12h' | '24h';
+/** 最近一次自动同步执行状态。 */
+type AutosyncRunStatus = 'success' | 'skipped' | 'failed' | 'partial';
+/** GET/POST /sync/autosync 响应：自动同步状态。 */
+interface AutosyncStatusResponse {
+  enabled: boolean;
+  interval: AutosyncInterval;
+  lastRunAt?: string;
+  lastRunStatus?: AutosyncRunStatus;
+  lastRunMessage?: string;
+  consecutiveFailures: number;
+  /** 距上次自动同步已过 ms（host 计算，供 UI 倒计时/立即触发判断） */
+  elapsedMs: number;
+  lastRunHistoryId?: string;
+}
+/** POST /sync/autosync 请求体。 */
+interface AutosyncUpdatePayload {
+  enabled: boolean;
+  interval?: AutosyncInterval;
+  startupMinIntervalMs?: number;
+}
+/** 自动同步执行记录（§3.7 AutosyncHistoryEntry）。 */
+interface AutosyncHistoryEntry {
+  direction: 'pull' | 'push' | 'both';
+  status: 'success' | 'skipped' | 'failed' | 'partial';
+  /** 跳过原因（冲突项 / 缺失依赖 / Install / 错误 / 无远端 / 网络） */
+  skipReason?: string;
+  /** 被跳过的冲突分区 id（冲突跳过时列出） */
+  conflictedSections?: string[];
+  /** 本次自动合并实际写入的分区 */
+  appliedSections?: string[];
+  /** 本次 push 产生的快照 id */
+  pushedSnapshotId?: string;
+  /** 本次 pull 来源快照 id */
+  pulledSnapshotId?: string;
+  error?: string;
+  notifiedAt?: string;
+  /** 本次触发时的连续失败计数 */
+  failureCountAtRun: number;
+  createdAt: string;
+}
+/** 同步历史条目（Host 端返回；kind='autosync' 时 autosync 非空）。 */
+interface SyncHistoryEntry {
+  id: string;
+  createdAt: string;
+  kind: 'push' | 'pull' | 'apply' | 'autosync' | 'rollback';
+  sectionCount?: number;
+  reviewCount?: number;
+  autosync?: AutosyncHistoryEntry;
+}
+/** GET /sync/history 响应：{ entries }。 */
+interface SyncHistoryResponse {
+  entries: SyncHistoryEntry[];
+}
 /** POST /sync/github/start 响应：UI 展示用（device_code 只存宿主，绝不回传） */
 interface GithubDeviceFlowStartResponse {
   /** 随机 flowId：后续 poll/cancel 凭它引用宿主侧登记的 device_code */
@@ -632,6 +847,29 @@ declare class SyncApi {
   githubCancel(flowId: string): Promise<{
     ok: boolean;
   }>;
+  /** 同步历史：列出本地祖先快照 + 自动同步执行记录（按 createdAt 倒序合并）。 */
+  history(): Promise<SyncHistoryResponse>;
+  /** 远端历史快照列表（供「选择历史快照」下拉）。 */
+  snapshotsList(payload: SyncPushPayload): Promise<SyncSnapshotsListResponse>;
+  /** 一键同步第一步：拉取 → 差异确认会话（items 逐项确认，暂不导入）。 */
+  sync(payload: SyncStartPayload): Promise<SyncStartResponse>;
+  /** 一键同步第二步：按用户对差异项的逐项决策执行导入。 */
+  applyItems(payload: ApplyItemsPayload): Promise<ApplyItemsResponse>;
+  /** 取消/清理差异确认会话（丢弃临时 ZIP，零副作用）。 */
+  cancel(syncSessionId: string): Promise<{
+    ok: boolean;
+  }>;
+  /** 自动同步状态（GET /sync/autosync）。 */
+  autosyncStatus(): Promise<AutosyncStatusResponse>;
+  /** 自动同步配置更新（POST /sync/autosync）。 */
+  autosyncUpdate(payload: AutosyncUpdatePayload): Promise<AutosyncStatusResponse>;
+  /** 一键回滚：按 restoreId 调用 backup→rollback */
+  rollback(payload: {
+    restoreId: string;
+  }): Promise<{
+    ok: boolean;
+    full: boolean;
+  }>;
 }
 //#endregion
 //#region src/client/client-types.d.ts
@@ -780,6 +1018,7 @@ declare const zh: {
   readonly 'config.token': "认证 token";
   readonly 'config.tokenHint': "将安全写入 DSH credentials（引用名 {ref}），不会写入同步文件或日志。留空表示沿用已保存的凭据。";
   readonly 'config.tokenSaved': "凭据已配置";
+  readonly 'config.tokenPlaceholder': "ghp_…（可选）";
   readonly 'config.gitBin': "git 可执行文件（可选）";
   readonly 'config.gitBinHint': "缺省使用 PATH 中的 git。";
   readonly 'github.title': "GitHub 登录";
@@ -804,6 +1043,84 @@ declare const zh: {
   readonly 'change.total': "共 {total} 项变更";
   readonly 'sections.title': "同步分区";
   readonly 'warnings.title': "分区告警";
+  readonly 'syncflow.title': "一键同步";
+  readonly 'syncflow.button': "一键同步";
+  readonly 'syncflow.syncing': "正在同步…";
+  readonly 'syncflow.syncFailed': "同步失败";
+  readonly 'syncflow.snapshotOption': "（{date} · {count} 分区）";
+  readonly 'syncflow.selectSnapshot': "选择历史快照";
+  readonly 'syncflow.latestSnapshot': "最新快照";
+  readonly 'syncflow.noSnapshots': "远端暂无快照";
+  readonly 'syncflow.confirmImport': "确认导入";
+  readonly 'syncflow.cancel': "取消";
+  readonly 'syncflow.adoptRemote': "采用远端";
+  readonly 'syncflow.adoptHint': "勾选 = 导入该项；取消 = 跳过";
+  readonly 'syncflow.needsReviewBadge': "需人工决策";
+  readonly 'syncflow.empty': "远端快照与本地一致（无变更）";
+  readonly 'syncflow.diffCount': "共 {count} 项差异";
+  readonly 'syncflow.conflictTitle': "冲突解决";
+  readonly 'syncflow.conflictUseLocal': "用本地";
+  readonly 'syncflow.conflictUseRemote': "用远端";
+  readonly 'syncflow.conflictSkip': "跳过";
+  readonly 'syncflow.conflictLocalLabel': "本地";
+  readonly 'syncflow.conflictRemoteLabel': "远端";
+  readonly 'syncflow.conflictAncestorLabel': "共同祖先";
+  readonly 'syncflow.conflictUnresolved': "冲突项 {itemId} 尚未选择解决方式（用本地 / 用远端 / 跳过）";
+  readonly 'syncflow.diff': "差异";
+  readonly 'syncflow.importDone': "已导入 {n} 个分区";
+  readonly 'syncflow.importFailed': "导入失败（已整体回滚）";
+  readonly 'syncflow.importedSections': "已写入";
+  readonly 'syncflow.importWarnings': "导入告警";
+  readonly 'syncflow.rollback': "回滚到应用前";
+  readonly 'syncflow.rollingBack': "正在回滚…";
+  readonly 'syncflow.rollbackDone': "已回滚到应用前";
+  readonly 'syncflow.needsRestart': "部分改动需要重启 DSH 后生效";
+  readonly 'autosync.title': "自动同步";
+  readonly 'autosync.description': "开启后，DSH 将按固定间隔自动执行双向同步（拉取合并 + 上传）；DSH 启动时还会触发一次「自动下载合并（不上传）」以保持本地为最新。仅在无冲突且无需人工干预时才自动写入。";
+  readonly 'autosync.enable': "启用自动同步";
+  readonly 'autosync.interval': "同步间隔";
+  readonly 'autosync.intervalHint': "DSH 启动时自动下载合并不上传。";
+  readonly 'autosync.interval5m': "5 分钟";
+  readonly 'autosync.interval15m': "15 分钟";
+  readonly 'autosync.interval30m': "30 分钟";
+  readonly 'autosync.interval60m': "60 分钟";
+  readonly 'autosync.interval6h': "6 小时";
+  readonly 'autosync.interval12h': "12 小时";
+  readonly 'autosync.interval24h': "24 小时";
+  readonly 'autosync.status': "上次运行：{status}（{time}）";
+  readonly 'autosync.statusNever': "从未运行";
+  readonly 'autosync.nextRun': "下次约 {time} 后";
+  readonly 'autosync.failCount': "连续失败 {n} 次";
+  readonly 'autosync.running': "自动同步进行中…";
+  readonly 'autosync.success': "成功";
+  readonly 'autosync.skipped': "已跳过";
+  readonly 'autosync.failed': "失败";
+  readonly 'autosync.partial': "部分成功";
+  readonly 'history.title': "同步历史";
+  readonly 'history.empty': "尚无同步历史";
+  readonly 'history.emptyHint': "完成首次 push / 一键同步 / 自动同步后，这里会显示记录。";
+  readonly 'history.colTime': "时间";
+  readonly 'history.colKind': "类型";
+  readonly 'history.colDetail': "详情";
+  readonly 'history.kindSnapshot': "快照";
+  readonly 'history.kindAutosync': "自动同步";
+  readonly 'history.sectionCount': "分区";
+  readonly 'history.detail': "明细";
+  readonly 'history.autosyncDirection': "方向：{direction}";
+  readonly 'history.autosyncPull': "下载";
+  readonly 'history.autosyncPush': "上传";
+  readonly 'history.autosyncBoth': "双向";
+  readonly 'history.autosyncSkipReason': "跳过原因：{reason}";
+  readonly 'history.autosyncReasonConflict': "冲突";
+  readonly 'history.autosyncReasonNoRemote': "无远端快照";
+  readonly 'history.autosyncReasonNotConfigured': "未配置仓库";
+  readonly 'history.autosyncReasonNetwork': "网络问题";
+  readonly 'history.autosyncConflicted': "跳过冲突分区：{sections}";
+  readonly 'history.autosyncApplied': "应用分区：{sections}";
+  readonly 'history.autosyncError': "错误：{error}";
+  readonly 'history.autosyncNotified': "已通知（连续失败 3 次）";
+  readonly 'history.column.snapshot': "快照";
+  readonly 'history.column.autosync': "自动同步";
   readonly 'common.close': "关闭";
   readonly 'common.retry': "重试";
   readonly 'common.loading': "加载中…";