dsh-config-manager 0.1.19 → 0.1.21

package/src/sync/sync-session.test.ts

@@ -0,0 +1,137 @@
+/**
+ * SyncSessionStore 测试：内存登记临时 ZIP + ImportPlan，TTL 30 分钟，惰性清理，同 id 覆盖。
+ */
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import crypto from 'node:crypto';
+
+import { SyncSessionStore } from './sync-session.ts';
+import type { ImportPlan } from '../core/types.ts';
+import type { SectionId } from '../schema/types.ts';
+
+const DEFAULT_TTL_MS = 30 * 60 * 1000;
+
+function makePlan(seed: string): ImportPlan {
+  return {
+    items: [{ id: `item-${seed}`, kind: 'Update', adapter: 'settings', description: `desc-${seed}`, severity: 'info', target: { adapter: 'settings', ref: 'general' } }],
+    globalStrategy: 'merge',
+    pathMappings: [],
+    missingSecrets: [],
+    needsRestart: false,
+    estimatedActions: { settings: 1 } as unknown as Record<SectionId, number>,
+  };
+}
+
+function makeAnalysis(seed: string): { valid: boolean; errors: string[]; warnings: string[]; compatibility: 'excellent' | 'good' | 'partial' | 'unsupported'; sectionsInZip: SectionId[]; pluginSummary: { installed: number; toInstall: number }; pathIssues: []; secretCount: number; dependencyIssues: [] } {
+  return {
+    valid: true,
+    errors: [],
+    warnings: [],
+    compatibility: 'excellent',
+    sectionsInZip: ['settings'] as SectionId[],
+    pluginSummary: { installed: 0, toInstall: 0 },
+    pathIssues: [],
+    secretCount: 0,
+    dependencyIssues: [],
+  };
+}
+
+function makeSession(store: SyncSessionStore, opts: { seed: string; nowMs?: number }): string {
+  const now = opts.nowMs ?? Date.now();
+  const id = crypto.randomUUID();
+  store.set({
+    id,
+    zipPath: `/tmp/session-${opts.seed}.zip`,
+    plan: makePlan(opts.seed),
+    analysis: makeAnalysis(opts.seed),
+    snapshotId: `snap-${opts.seed}`,
+    repoUrl: 'https://github.com/foo/bar.git',
+    createdAt: now,
+    expiresAt: now + DEFAULT_TTL_MS,
+  });
+  return id;
+}
+
+test('SyncSessionStore: set/get 往返；同 id 覆盖', () => {
+  const store = new SyncSessionStore({ now: () => 5_000_000 });
+  const id = makeSession(store, { seed: 'a', nowMs: 5_000_000 });
+  const s1 = store.get(id);
+  assert.ok(s1, 'get 应返回 session');
+  assert.equal(s1!.zipPath, '/tmp/session-a.zip');
+  assert.equal(s1!.plan.items[0]!.id, 'item-a');
+  assert.equal(s1!.snapshotId, 'snap-a');
+
+  // 同 id 覆盖（仍在有效期内）
+  store.set({
+    id,
+    zipPath: '/tmp/session-b.zip',
+    plan: makePlan('b'),
+    analysis: makeAnalysis('b'),
+    snapshotId: 'snap-b',
+    repoUrl: 'https://github.com/foo/bar.git',
+    createdAt: 5_000_000,
+    expiresAt: 5_000_000 + DEFAULT_TTL_MS,
+  });
+  const s2 = store.get(id);
+  assert.equal(s2!.zipPath, '/tmp/session-b.zip');
+  assert.equal(s2!.plan.items[0]!.id, 'item-b');
+  assert.equal(s2!.snapshotId, 'snap-b');
+});
+
+test('SyncSessionStore: get 过期条目 → undefined（惰性清理）', () => {
+  const store = new SyncSessionStore();
+  const now = 1_000_000;
+  const id = crypto.randomUUID();
+  store.set({
+    id,
+    zipPath: '/tmp/expired.zip',
+    plan: makePlan('x'),
+    analysis: makeAnalysis('x'),
+    snapshotId: 'snap-x',
+    repoUrl: 'https://github.com/foo/bar.git',
+    createdAt: now - DEFAULT_TTL_MS - 1,
+    expiresAt: now - 1,
+  });
+  const s = store.get(id);
+  assert.equal(s, undefined, '过期条目应返回 undefined');
+});
+
+test('SyncSessionStore: delete 移除条目', () => {
+  const store = new SyncSessionStore({ now: () => 5_000_000 });
+  const id = makeSession(store, { seed: 'del', nowMs: 5_000_000 });
+  assert.ok(store.get(id), 'set 后存在');
+  store.delete(id);
+  assert.equal(store.get(id), undefined, 'delete 后不存在');
+});
+
+test('SyncSessionStore: TTL 边界——过期临界点', () => {
+  const store = new SyncSessionStore({ now: () => 2_000_000 });
+  const now = 2_000_000;
+  const id = crypto.randomUUID();
+  // 恰好在 expiresAt（now === expiresAt）→ 视为过期（惰性清理）
+  store.set({
+    id,
+    zipPath: '/tmp/boundary.zip',
+    plan: makePlan('boundary'),
+    analysis: makeAnalysis('boundary'),
+    snapshotId: 'snap-b',
+    repoUrl: 'https://github.com/foo/bar.git',
+    createdAt: now - DEFAULT_TTL_MS,
+    expiresAt: now,
+  });
+  assert.equal(store.get(id), undefined, 'expiresAt === now 视为过期');
+
+  // 还差 1ms → 仍有效
+  const id2 = crypto.randomUUID();
+  store.set({
+    id: id2,
+    zipPath: '/tmp/boundary2.zip',
+    plan: makePlan('boundary2'),
+    analysis: makeAnalysis('boundary2'),
+    snapshotId: 'snap-b2',
+    repoUrl: 'https://github.com/foo/bar.git',
+    createdAt: now - DEFAULT_TTL_MS,
+    expiresAt: now + 1,
+  });
+  assert.ok(store.get(id2), 'expiresAt > now 仍应有效');
+});

package/src/sync/sync-session.ts

@@ -0,0 +1,76 @@
+/**
+ * SyncSessionStore：一键同步差异确认会话的内存登记。
+ *
+ * 会话把「拉取预览」与「逐项执行导入」解耦：一次 /sync/sync 在内存持有一份
+ * 临时 ZIP 路径 + ImportPlan + ImportAnalysis，配一个 syncSessionId；
+ * /sync/apply-items 凭 id 复用这些数据，避免重复拉取/重复 build ZIP。
+ *
+ * 生命周期：
+ *  - 进程内存（不落盘），默认 TTL 30 分钟，过期条目惰性清理（get 时检查）；
+ *  - 同 id 覆盖（set 后旧 session 被新 session 替换，旧 ZIP 由上层负责清理）；
+ *  - delete 显式移除（/sync/cancel 与 apply-items 消费后调用）。
+ */
+import crypto from 'node:crypto';
+import type { ImportAnalysis, ImportPlan } from '../core/types.ts';
+
+/** 默认会话 TTL（30 分钟） */
+export const DEFAULT_SESSION_TTL_MS = 30 * 60 * 1000;
+
+/** 一次差异确认会话的完整数据 */
+export interface SyncSession {
+  id: string;
+  /** 临时标准 ZIP（apply-items 执行 executeImportPlan 需要） */
+  zipPath: string;
+  plan: ImportPlan;
+  analysis: ImportAnalysis;
+  /** 被拉取的远端快照 id */
+  snapshotId: string;
+  repoUrl: string;
+  gitBin?: string;
+  /** 创建时间（epoch ms） */
+  createdAt: number;
+  /** 过期时间（epoch ms；过期条目惰性清理） */
+  expiresAt: number;
+}
+
+/** 内存会话存储；同 id 覆盖；过期条目视为不存在。 */
+export class SyncSessionStore {
+  private readonly sessions = new Map<string, SyncSession>();
+  private readonly ttlMs: number;
+  private readonly now: () => number;
+
+  constructor(opts: { ttlMs?: number; now?: () => number } = {}) {
+    this.ttlMs = opts.ttlMs ?? DEFAULT_SESSION_TTL_MS;
+    this.now = opts.now ?? (() => Date.now());
+  }
+
+  /** 登记（或覆盖）会话；id 缺省时自动生成。createdAt/expiresAt 缺省自动填充。返回会话 id。 */
+  set(session: Omit<SyncSession, 'id' | 'createdAt' | 'expiresAt'> & { id?: string; createdAt?: number; expiresAt?: number }): string {
+    const id = session.id ?? `sync-session-${crypto.randomUUID()}`;
+    const createdAt = session.createdAt ?? this.now();
+    const expiresAt = session.expiresAt ?? createdAt + this.ttlMs;
+    this.sessions.set(id, {
+      ...session,
+      id,
+      createdAt,
+      expiresAt,
+    });
+    return id;
+  }
+
+  /** 读取会话；过期条目返回 undefined（惰性清理）。 */
+  get(id: string): SyncSession | undefined {
+    const s = this.sessions.get(id);
+    if (s === undefined) return undefined;
+    if (this.now() >= s.expiresAt) {
+      this.sessions.delete(id);
+      return undefined;
+    }
+    return { ...s };
+  }
+
+  /** 删除会话（cancel / apply-items 消费后调用）。 */
+  delete(id: string): void {
+    this.sessions.delete(id);
+  }
+}

package/src/sync/sync-state.test.ts

@@ -62,6 +62,7 @@ test('saveSyncState / loadSyncState: 完整往返（含 transport 字段）', as
         skills: { hash: 'b'.repeat(64), updatedAt: '2026-08-16T12:00:00.000Z' },
       },
       transport: { type: 'git', ref: 'main' },
+      lastSnapshotId: 'sync-abc',
     };
     await saveSyncState(tmp, state);
     const raw = JSON.parse(await fs.readFile(path.join(tmp, SYNC_STATE_FILE), 'utf8'));
@@ -72,12 +73,13 @@ test('saveSyncState / loadSyncState: 完整往返（含 transport 字段）', as
   }
 });
 
-test('loadSyncState: 文件不存在 → 返回缺省空状态（lastSyncAt 为空串）', async () => {
+test('loadSyncState: 文件不存在 → 返回缺省空状态（lastSyncAt 为空串，lastSnapshotId 为空串）', async () => {
   const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'dsh-sync-state-missing-'));
   try {
     const state = await loadSyncState(tmp);
     assert.equal(state.schemaVersion, SYNC_STATE_SCHEMA_VERSION);
     assert.equal(state.lastSyncAt, '');
+    assert.equal(state.lastSnapshotId, '');
     assert.deepEqual(state.sections, {});
     assert.equal(state.transport, undefined);
   } finally {
@@ -109,10 +111,54 @@ test('saveSyncState: 自动创建目录', async () => {
   const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'dsh-sync-state-mkdir-'));
   try {
     const dir = path.join(tmp, 'nested', 'sync');
-    await saveSyncState(dir, { schemaVersion: SYNC_STATE_SCHEMA_VERSION, lastSyncAt: '', sections: {} });
+    await saveSyncState(dir, { schemaVersion: SYNC_STATE_SCHEMA_VERSION, lastSyncAt: '', sections: {}, lastSnapshotId: '' });
     const state = await loadSyncState(dir);
     assert.equal(state.schemaVersion, SYNC_STATE_SCHEMA_VERSION);
   } finally {
     await fs.rm(tmp, { recursive: true, force: true });
   }
 });
+
+test('loadSyncState: v1 文件 → 内存迁移到 v2 形态（lastSnapshotId=""），不动磁盘', async () => {
+  const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'dsh-sync-state-v1-'));
+  try {
+    // 写入一个 schemaVersion=1 的旧文件（缺 lastSnapshotId）
+    await fs.writeFile(
+      path.join(tmp, SYNC_STATE_FILE),
+      JSON.stringify({
+        schemaVersion: 1,
+        lastSyncAt: '2026-08-15T00:00:00.000Z',
+        sections: { settings: { hash: 'c'.repeat(64), updatedAt: '2026-08-15T00:00:00.000Z' } },
+      }),
+      'utf8',
+    );
+    const state = await loadSyncState(tmp);
+    assert.equal(state.schemaVersion, SYNC_STATE_SCHEMA_VERSION, '内存中应已升级为 v2');
+    assert.equal(state.lastSnapshotId, '', 'v1 文件缺祖先指针时迁移为 ""');
+    assert.equal(state.lastSyncAt, '2026-08-15T00:00:00.000Z');
+    assert.equal(state.sections.settings?.hash, 'c'.repeat(64));
+    // 磁盘上仍是 v1（不就地升级）
+    const onDisk = JSON.parse(await fs.readFile(path.join(tmp, SYNC_STATE_FILE), 'utf8'));
+    assert.equal(onDisk.schemaVersion, 1);
+  } finally {
+    await fs.rm(tmp, { recursive: true, force: true });
+  }
+});
+
+test('saveSyncState / loadSyncState: lastSnapshotId 非空往返', async () => {
+  const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'dsh-sync-state-ancestor-'));
+  try {
+    const state: SyncState = {
+      schemaVersion: SYNC_STATE_SCHEMA_VERSION,
+      lastSyncAt: '2026-08-16T12:00:00.000Z',
+      sections: {},
+      lastSnapshotId: 'sync-deadbeef-1234',
+    };
+    await saveSyncState(tmp, state);
+    const loaded = await loadSyncState(tmp);
+    assert.equal(loaded.lastSnapshotId, 'sync-deadbeef-1234');
+    assert.deepEqual(loaded, state);
+  } finally {
+    await fs.rm(tmp, { recursive: true, force: true });
+  }
+});

package/src/sync/sync-state.ts

@@ -11,7 +11,9 @@ import type { FilesSection, SectionData, SectionId } from '../schema/types.ts';
 import { createSnapshotFs, joinFs } from './fs.ts';
 import type { SnapshotFs } from './fs.ts';
 
-export const SYNC_STATE_SCHEMA_VERSION = 1;
+export const SYNC_STATE_SCHEMA_VERSION = 2;
+/** 历史可读取版本：v1 缺 lastSnapshotId 时做内存迁移到 v2（lastSnapshotId=''）。 */
+export const SYNC_STATE_SUPPORTED_VERSIONS: readonly number[] = [1, 2];
 export const SYNC_STATE_FILE = 'sync-state.json';
 
 /** 单个分区的同步状态：内容 hash + 最近变更时间 */
@@ -27,6 +29,8 @@ export interface SyncState {
   sections: Partial<Record<SectionId, SyncSectionState>>;
   /** 当前绑定的传输通道（type = SyncTransport.type，ref = 通道内引用，如 git 分支） */
   transport?: { type: string; ref: string };
+  /** 最近一次同步的快照 ID（= 共同祖先指针）；'' = 从未同步或无祖先 */
+  lastSnapshotId: string;
 }
 
 /** 文件类分区判定：{ version: 1, files: [...] }（duck-typing，与 JSON 分区区分） */
@@ -71,11 +75,12 @@ export function hashSection(data: SectionData): string {
   return sha256Hex(canonicalJson(data));
 }
 
-/** 读取同步状态；文件不存在 → 返回缺省空状态（从未同步） */
+/** 读取同步状态；文件不存在 → 返回缺省空状态（从未同步）。
+ * v1 文件 → 内存迁移到 v2（lastSnapshotId=''），不在磁盘上就地升级。 */
 export async function loadSyncState(dir: string, fsx: SnapshotFs = createSnapshotFs(), msg: MsgFunc = zhMsg): Promise<SyncState> {
   const file = joinFs(dir, SYNC_STATE_FILE);
   if (!(await fsx.exists(file))) {
-    return { schemaVersion: SYNC_STATE_SCHEMA_VERSION, lastSyncAt: '', sections: {} };
+    return { schemaVersion: SYNC_STATE_SCHEMA_VERSION, lastSyncAt: '', sections: {}, lastSnapshotId: '' };
   }
   const raw = Buffer.from(await fsx.readFile(file)).toString('utf8');
   const parsed = parseJsonSafe(raw);
@@ -83,8 +88,8 @@ export async function loadSyncState(dir: string, fsx: SnapshotFs = createSnapsho
     throw new Error(msg('sync.state.notObject'));
   }
   const obj = parsed as Record<string, unknown>;
-  if (obj['schemaVersion'] !== SYNC_STATE_SCHEMA_VERSION) {
-    throw new Error(msg('sync.state.schemaUnsupported', { version: String(obj['schemaVersion']), expected: String(SYNC_STATE_SCHEMA_VERSION) }));
+  if (typeof obj['schemaVersion'] !== 'number' || !SYNC_STATE_SUPPORTED_VERSIONS.includes(obj['schemaVersion'])) {
+    throw new Error(msg('sync.state.schemaUnsupported', { version: String(obj['schemaVersion']), expected: String(SYNC_STATE_SUPPORTED_VERSIONS.join('/')) }));
   }
   if (typeof obj['lastSyncAt'] !== 'string') {
     throw new Error(msg('sync.state.lastSyncAt'));
@@ -107,6 +112,7 @@ export async function loadSyncState(dir: string, fsx: SnapshotFs = createSnapsho
     schemaVersion: SYNC_STATE_SCHEMA_VERSION,
     lastSyncAt: obj['lastSyncAt'],
     sections,
+    lastSnapshotId: typeof obj['lastSnapshotId'] === 'string' ? obj['lastSnapshotId'] : '',
   };
   const t = obj['transport'];
   if (t !== undefined) {

package/src/ui/i18n.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * 客户端展示层（src/ui/*、src/client/common/*）的渲染文案目录（zh 源语言 / en 镜像）。
  *
  * 与 core 的 messages.ts 分工：本目录负责「客户端纯渲染层」（ReportView / ErrorBanner /
@@ -158,6 +158,72 @@ export const uiZh = {
   'sync.pullOk': '远端快照 {id} 差异预览：共 {count} 项变更',
   'sync.pullEmpty': '远端快照与本地一致（无变更）',
   'sync.previewHint': '以上为只读差异预览，不会执行导入。v1 暂不提供一键导入接线；如需应用远端配置，请使用「导入恢复」向导手动导入导出的备份。',
+  // 一键同步（方案 A：拉取 → 逐项确认 → apply-items）
+  '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': '导入告警',
+  // 自动同步（方案 A：宿主后台调度）
+  '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 小时',
+  // 自动同步历史（kind=autosync 行渲染）
+  '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': '已通知',
   // GitHub OAuth 区块
   'sync.github.starting': '正在发起 GitHub 授权…',
   'sync.github.waitingNoCode': '请在浏览器中打开授权页面并完成授权…',
@@ -318,7 +384,70 @@ export const uiEn: Record<UiTextKey, string> = {
   '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…',
@@ -352,4 +481,4 @@ export function makeUiT(lang: 'zh' | 'en'): UiT {
 }
 
 /** 缺省 UI 翻译（zh）：未注入的渲染路径行为与改造前完全一致。 */
-export const zhUiT: UiT = makeUiT('zh');
+export const zhUiT: UiT = makeUiT('zh');