dsh-config-manager 0.1.19 → 0.1.21

package/src/client/sync/sync-api.test.ts

@@ -177,3 +177,158 @@ test('S-09 api.githubCancel()：POST /sync/github/cancel 携带 flowId', async (
   const sent = JSON.parse(String(calls[0]?.init?.body ?? '{}')) as Record<string, unknown>;
   assert.equal(sent['flowId'], 'flow-1');
 });
+
+/* ------------------------------------------------ 一键同步（方案 A）端点契约 */
+
+test('S-10 api.snapshotsList()：POST /sync/snapshots-list，解析倒序快照列表 + currentSnapshotId', async () => {
+  const body = {
+    ok: true,
+    snapshots: [
+      { id: 'sync-2', createdAt: '2026-08-17T10:00:00.000Z', sectionCount: 3, platform: 'darwin', dshVersion: '1.0.0' },
+      { id: 'sync-1', createdAt: '2026-08-16T10:00:00.000Z', sectionCount: 2, platform: 'darwin', dshVersion: '1.0.0' },
+    ],
+    currentSnapshotId: 'sync-1',
+  };
+  const calls: FetchCall[] = [];
+  installFetchMock((call) => {
+    calls.push(call);
+    return jsonResponse(200, body);
+  });
+  const api = new SyncApi();
+  const result = await api.snapshotsList({ repoUrl: 'https://github.com/u/r.git' });
+  assert.equal(result.ok, true);
+  assert.equal(result.snapshots.length, 2);
+  assert.equal(result.snapshots[0]?.id, 'sync-2');
+  assert.equal(result.currentSnapshotId, 'sync-1');
+  assert.equal(calls[0]?.url, SYNC_API.snapshotsList);
+  assert.equal(calls[0]?.init?.method, 'POST');
+});
+
+test('S-11 api.sync()：POST /sync/sync，请求体携带 snapshotId；响应含 items/needsReview/compatibility', async () => {
+  const body = {
+    ok: true,
+    syncSessionId: 'sess-1',
+    snapshotId: 'sync-3',
+    items: [{ itemId: 'settings:a', adapter: 'settings', kind: 'Update', description: '更新', severity: 'info', defaultAdopt: true, adopt: true }],
+    needsReview: false,
+    compatibility: 'good',
+  };
+  const calls: FetchCall[] = [];
+  installFetchMock((call) => {
+    calls.push(call);
+    return jsonResponse(200, body);
+  });
+  const api = new SyncApi();
+  const result = await api.sync({ repoUrl: 'https://github.com/u/r.git', snapshotId: 'sync-3' });
+  assert.equal(result.syncSessionId, 'sess-1');
+  assert.equal(result.items.length, 1);
+  assert.equal(result.compatibility, 'good');
+  assert.equal(calls[0]?.url, SYNC_API.sync);
+  const sent = JSON.parse(String(calls[0]?.init?.body ?? '{}')) as Record<string, unknown>;
+  assert.equal(sent['snapshotId'], 'sync-3');
+});
+
+test('S-12 api.applyItems()：POST /sync/apply-items，携带 adoptions（含 Conflict resolution）', async () => {
+  const body = {
+    ok: true, applied: ['settings'], skipped: ['plugin:x'], needsRestart: false,
+    warnings: [], restoreId: 'rest-1', rolledBack: false, failed: [], result: {},
+  };
+  const calls: FetchCall[] = [];
+  installFetchMock((call) => {
+    calls.push(call);
+    return jsonResponse(200, body);
+  });
+  const api = new SyncApi();
+  const result = await api.applyItems({
+    syncSessionId: 'sess-1',
+    adoptions: [
+      { itemId: 'settings:a', adopt: true },
+      { itemId: 'plugin:x', adopt: true, resolution: 'useRemote' },
+    ],
+  });
+  assert.equal(result.applied[0], 'settings');
+  assert.equal(result.restoreId, 'rest-1');
+  assert.equal(calls[0]?.url, SYNC_API.applyItems);
+  const sent = JSON.parse(String(calls[0]?.init?.body ?? '{}')) as Record<string, unknown>;
+  assert.equal(sent['syncSessionId'], 'sess-1');
+  const adoptions = sent['adoptions'] as Array<Record<string, unknown>>;
+  assert.equal(adoptions[1]?.['resolution'], 'useRemote');
+});
+
+test('S-13 api.cancel()：POST /sync/cancel 携带 syncSessionId', async () => {
+  const calls: FetchCall[] = [];
+  installFetchMock((call) => {
+    calls.push(call);
+    return jsonResponse(200, { ok: true });
+  });
+  const api = new SyncApi();
+  const result = await api.cancel('sess-1');
+  assert.equal(result.ok, true);
+  assert.equal(calls[0]?.url, SYNC_API.cancel);
+  const sent = JSON.parse(String(calls[0]?.init?.body ?? '{}')) as Record<string, unknown>;
+  assert.equal(sent['syncSessionId'], 'sess-1');
+});
+
+/* ------------------------------------------------ 自动同步端点契约 */
+
+test('S-14 api.autosyncStatus()：GET /sync/autosync，解析 enabled/interval/elapsedMs', async () => {
+  const body = {
+    enabled: true, interval: '30m', lastRunAt: '2026-08-17T10:00:00.000Z',
+    lastRunStatus: 'success', consecutiveFailures: 0, elapsedMs: 60000,
+  };
+  let called: FetchCall | null = null;
+  installFetchMock((call) => {
+    called = call;
+    return jsonResponse(200, body);
+  });
+  const lastCall = (): FetchCall | null => called;
+  const api = new SyncApi();
+  const result = await api.autosyncStatus();
+  assert.equal(result.enabled, true);
+  assert.equal(result.interval, '30m');
+  assert.equal(result.consecutiveFailures, 0);
+  assert.equal(result.elapsedMs, 60000);
+  assert.equal(lastCall()?.url, SYNC_API.autosync);
+});
+
+test('S-15 api.autosyncUpdate()：POST /sync/autosync，请求体携带 enabled/interval', async () => {
+  const body = {
+    enabled: true, interval: '60m', consecutiveFailures: 0, elapsedMs: -1,
+  };
+  const calls: FetchCall[] = [];
+  installFetchMock((call) => {
+    calls.push(call);
+    return jsonResponse(200, body);
+  });
+  const api = new SyncApi();
+  const result = await api.autosyncUpdate({ enabled: true, interval: '60m' });
+  assert.equal(result.enabled, true);
+  assert.equal(result.interval, '60m');
+  assert.equal(calls[0]?.url, SYNC_API.autosync);
+  assert.equal(calls[0]?.init?.method, 'POST');
+  const sent = JSON.parse(String(calls[0]?.init?.body ?? '{}')) as Record<string, unknown>;
+  assert.equal(sent['enabled'], true);
+  assert.equal(sent['interval'], '60m');
+});
+
+test('S-16 api.history()：GET /sync/history，解析 { entries }（含 autosync 记录）', async () => {
+  const body = {
+    entries: [
+      { id: 'sync-1', createdAt: '2026-08-17T10:00:00.000Z', kind: 'apply', sectionCount: 3, reviewCount: 0 },
+      {
+        id: '2026-08-17T09:00:00.000Z', createdAt: '2026-08-17T09:00:00.000Z', kind: 'autosync',
+        autosync: {
+          direction: 'both', status: 'skipped', skipReason: 'conflict',
+          conflictedSections: ['settings'], failureCountAtRun: 0, createdAt: '2026-08-17T09:00:00.000Z',
+        },
+      },
+    ],
+  };
+  installFetchMock(() => jsonResponse(200, body));
+  const api = new SyncApi();
+  const result = await api.history();
+  assert.equal(result.entries.length, 2);
+  assert.equal(result.entries[0]?.kind, 'apply');
+  assert.equal(result.entries[1]?.kind, 'autosync');
+  assert.deepEqual(result.entries[1]?.autosync?.conflictedSections, ['settings']);
+});

package/src/client/sync/sync-api.ts

@@ -23,6 +23,8 @@
  *  - 本文件不 import 任何 node 模块（纯浏览器 bundle；sync-engine 仅作 type-only 引用）。
  */
 import type { SyncPullReport, SyncPushReport } from '../../sync/sync-engine.ts';
+import type { PlanItemKind } from '../../core/types.ts';
+import type { SectionId } from '../../schema/types.ts';
 import { ConfigManagerApiError } from '../api.ts';
 import { zhUiT, type UiT } from '../../ui/i18n.ts';
 
@@ -35,6 +37,13 @@ export const SYNC_API = {
   githubStart: '/api/dsh-config-manager/sync/github/start',
   githubPoll: '/api/dsh-config-manager/sync/github/poll',
   githubCancel: '/api/dsh-config-manager/sync/github/cancel',
+  history: '/api/dsh-config-manager/sync/history',
+  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',
 } as const;
 
 /** DSH credentials 中的同步 token 引用名（Host 半同值；仅供提示文案使用，值由 Host 读写） */
@@ -56,6 +65,8 @@ export interface SyncStatusResponse {
   /** sync-state.sections 条目数 */
   sectionCount: number;
   transport?: { type: string; ref: string };
+  /** 自动同步当前状态（供 UI 顶部开关回填；§3.9） */
+  autosync?: AutosyncStatusResponse;
 }
 
 /** push 请求体（token 可选：非空则 Host 先写入 DSH credentials 再使用） */
@@ -71,6 +82,172 @@ export interface SyncPullPayload extends SyncPushPayload {
   snapshotId?: string;
 }
 
+/* ---------------------------------------------------------------- 一键同步（方案 A） */
+
+/** GET /sync/snapshots-list 响应：远端历史快照列表（按 createdAt 倒序）。 */
+export interface SyncSnapshotsListResponse {
+  ok: boolean;
+  /** 按 createdAt 倒序（最新在前） */
+  snapshots: SyncSnapshotLite[];
+  /** 当前本地祖先指针（sync-state.lastSnapshotId），用于高亮当前基线 */
+  currentSnapshotId?: string;
+}
+
+/** 远端快照摘要（「选择历史快照」下拉项）。 */
+export interface SyncSnapshotLite {
+  id: string;
+  createdAt: string;
+  sectionCount: number;
+  platform: string;
+  dshVersion: string;
+}
+
+/** POST /sync/sync 请求体（一键同步第一步：拉取 → 差异确认会话）。 */
+export interface SyncStartPayload {
+  repoUrl: string;
+  gitBin?: string;
+  token?: string;
+  /** 缺省 = 最新快照；传入则对该历史快照拉取 */
+  snapshotId?: string;
+}
+
+/** POST /sync/sync 响应：差异确认会话（items 供 UI 逐项确认）。 */
+export 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 投影 + 冲突详情）。 */
+export 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）。 */
+export interface SyncConflictDetail {
+  path: string;
+  kind: 'key' | 'file' | 'section';
+  local?: unknown;
+  remote?: unknown;
+  ancestor?: unknown;
+  diff?: string;
+}
+
+/** POST /sync/apply-items 请求体（一键同步第二步：按逐项决策执行导入）。 */
+export interface ApplyItemsPayload {
+  syncSessionId: string;
+  /** 每项的最终采纳决策（未列出项视为 adopt=false） */
+  adoptions: SyncItemAdoption[];
+}
+
+/** 单条采纳决策。 */
+export interface SyncItemAdoption {
+  itemId: string;
+  adopt: boolean;
+  /** 冲突项解决方案（仅当该项是 Conflict 且 adopt=true 时必须） */
+  resolution?: 'useRemote' | 'keepLocal' | 'skip';
+}
+
+/** POST /sync/apply-items 响应。 */
+export 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;
+}
+
+/* ---------------------------------------------------------------- 自动同步 */
+
+/** 统一间隔类型。 */
+export type AutosyncInterval = '5m' | '15m' | '30m' | '60m' | '6h' | '12h' | '24h';
+
+/** 最近一次自动同步执行状态。 */
+export type AutosyncRunStatus = 'success' | 'skipped' | 'failed' | 'partial';
+
+/** GET/POST /sync/autosync 响应：自动同步状态。 */
+export interface AutosyncStatusResponse {
+  enabled: boolean;
+  interval: AutosyncInterval;
+  lastRunAt?: string;
+  lastRunStatus?: AutosyncRunStatus;
+  lastRunMessage?: string;
+  consecutiveFailures: number;
+  /** 距上次自动同步已过 ms（host 计算，供 UI 倒计时/立即触发判断） */
+  elapsedMs: number;
+  lastRunHistoryId?: string;
+}
+
+/** POST /sync/autosync 请求体。 */
+export interface AutosyncUpdatePayload {
+  enabled: boolean;
+  interval?: AutosyncInterval;
+  startupMinIntervalMs?: number;
+}
+
+/* ---------------------------------------------------------------- 同步历史 */
+
+/** 自动同步执行记录（§3.7 AutosyncHistoryEntry）。 */
+export 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 非空）。 */
+export interface SyncHistoryEntry {
+  id: string;
+  createdAt: string;
+  kind: 'push' | 'pull' | 'apply' | 'autosync' | 'rollback';
+  sectionCount?: number;
+  reviewCount?: number;
+  autosync?: AutosyncHistoryEntry;
+}
+
+/** GET /sync/history 响应：{ entries }。 */
+export interface SyncHistoryResponse {
+  entries: SyncHistoryEntry[];
+}
+
 /* ---------------------------------------------------------------- GitHub OAuth device flow */
 
 /** POST /sync/github/start 响应：UI 展示用（device_code 只存宿主，绝不回传） */
@@ -189,4 +366,46 @@ export class SyncApi {
   async githubCancel(flowId: string): Promise<{ ok: boolean }> {
     return postJson<{ ok: boolean }>(SYNC_API.githubCancel, { flowId }, this.t);
   }
+
+  /** 同步历史：列出本地祖先快照 + 自动同步执行记录（按 createdAt 倒序合并）。 */
+  async history(): Promise<SyncHistoryResponse> {
+    const response = await fetch(SYNC_API.history);
+    return readJson<SyncHistoryResponse>(response, this.t);
+  }
+
+  /** 远端历史快照列表（供「选择历史快照」下拉）。 */
+  async snapshotsList(payload: SyncPushPayload): Promise<SyncSnapshotsListResponse> {
+    return postJson<SyncSnapshotsListResponse>(SYNC_API.snapshotsList, payload, this.t);
+  }
+
+  /** 一键同步第一步：拉取 → 差异确认会话（items 逐项确认，暂不导入）。 */
+  async sync(payload: SyncStartPayload): Promise<SyncStartResponse> {
+    return postJson<SyncStartResponse>(SYNC_API.sync, payload, this.t);
+  }
+
+  /** 一键同步第二步：按用户对差异项的逐项决策执行导入。 */
+  async applyItems(payload: ApplyItemsPayload): Promise<ApplyItemsResponse> {
+    return postJson<ApplyItemsResponse>(SYNC_API.applyItems, payload, this.t);
+  }
+
+  /** 取消/清理差异确认会话（丢弃临时 ZIP，零副作用）。 */
+  async cancel(syncSessionId: string): Promise<{ ok: boolean }> {
+    return postJson<{ ok: boolean }>(SYNC_API.cancel, { syncSessionId }, this.t);
+  }
+
+  /** 自动同步状态（GET /sync/autosync）。 */
+  async autosyncStatus(): Promise<AutosyncStatusResponse> {
+    const response = await fetch(SYNC_API.autosync);
+    return readJson<AutosyncStatusResponse>(response, this.t);
+  }
+
+  /** 自动同步配置更新（POST /sync/autosync）。 */
+  async autosyncUpdate(payload: AutosyncUpdatePayload): Promise<AutosyncStatusResponse> {
+    return postJson<AutosyncStatusResponse>(SYNC_API.autosync, payload, this.t);
+  }
+
+  /** 一键回滚：按 restoreId 调用 backup→rollback */
+  async rollback(payload: { restoreId: string }): Promise<{ ok: boolean; full: boolean }> {
+    return postJson<{ ok: boolean; full: boolean }>(SYNC_API.rollback, payload, this.t);
+  }
 }

package/src/client/sync/sync-locales.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * 远程同步设置区块（config-manager-sync）表面文案：zh 为源语言，en 镜像每个键。
  * 独立命名空间、独立文件：不触碰共享的 locales.ts（并行会话已改），零冲突。
  * 键集合经 `SyncKey` 类型在 client/index.ts 注册处做编译期校验。
@@ -17,6 +17,7 @@ export const zh = {
   'config.token': '认证 token',
   'config.tokenHint': '将安全写入 DSH credentials（引用名 {ref}），不会写入同步文件或日志。留空表示沿用已保存的凭据。',
   'config.tokenSaved': '凭据已配置',
+  'config.tokenPlaceholder': 'ghp_…（可选）',
   'config.gitBin': 'git 可执行文件（可选）',
   'config.gitBinHint': '缺省使用 PATH 中的 git。',
   // GitHub OAuth 登录（device flow，无需手动输入 token）
@@ -45,6 +46,87 @@ export const zh = {
   'change.total': '共 {total} 项变更',
   'sections.title': '同步分区',
   'warnings.title': '分区告警',
+  // 一键同步（方案 A：拉取 → 逐项确认 → apply-items）
+  '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 后生效',
+  // 自动同步（方案 A）
+  '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': '重试',
@@ -61,6 +143,7 @@ export const en: Record<keyof typeof zh, string> = {
   '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',
@@ -85,6 +168,84 @@ export const en: Record<keyof typeof zh, string> = {
   '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…',