dsh-config-manager 0.1.20 → 0.1.21

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…',

package/src/client/sync/sync-view-v2.test.ts

@@ -0,0 +1,131 @@
+/**
+ * m-sync-ui (方案 A)：一键同步差异确认 + 自动同步 渲染模型纯函数测试。
+ * TDD：先写失败测试，再实现 sync-view.ts 对应函数。
+ */
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import type { ApplyItemsResponse, AutosyncStatusResponse, SyncConfirmItem } from './sync-api.ts'
+import {
+  applyItemsReportView, autosyncIntervalMs, autosyncStatusText, buildAdoptions,
+  computeAutosyncCountdown, summarizeConfirmItems,
+} from './sync-view.ts'
+
+/* ---------------------------------------------------------------- 一键同步差异确认 */
+
+function confirmItem(overrides: Partial<SyncConfirmItem>): SyncConfirmItem {
+  return {
+    itemId: 'a', adapter: 'settings', kind: 'Update', description: 'd', severity: 'info',
+    defaultAdopt: true, adopt: true, ...overrides,
+  }
+}
+
+test('sync-view: summarizeConfirmItems 统计 severity + 采用数 + needsReview', () => {
+  const items: SyncConfirmItem[] = [
+    confirmItem({ itemId: 'a', severity: 'info', kind: 'Update' }),
+    confirmItem({ itemId: 'b', severity: 'warning', kind: 'MissingDependency', defaultAdopt: false, adopt: false }),
+    confirmItem({ itemId: 'c', severity: 'error', kind: 'Error', defaultAdopt: false, adopt: false }),
+    confirmItem({ itemId: 'd', severity: 'info', kind: 'Conflict', defaultAdopt: false, adopt: false }),
+  ]
+  const s = summarizeConfirmItems(items)
+  assert.equal(s.total, 4)
+  assert.equal(s.info, 2)
+  assert.equal(s.warning, 1)
+  assert.equal(s.error, 1)
+  assert.equal(s.adopted, 1)
+  assert.equal(s.needsReview, true)
+})
+
+test('sync-view: summarizeConfirmItems 空数组 → 全零 + 不需决策', () => {
+  const s = summarizeConfirmItems([])
+  assert.equal(s.total, 0)
+  assert.equal(s.adopted, 0)
+  assert.equal(s.needsReview, false)
+})
+
+test('sync-view: buildAdoptions 收集用户决策；未列出项视为 adopt=false', () => {
+  const items: SyncConfirmItem[] = [
+    confirmItem({ itemId: 'a', kind: 'Update' }),
+    confirmItem({ itemId: 'b', kind: 'Create' }),
+    confirmItem({ itemId: 'c', kind: 'Conflict', defaultAdopt: false }),
+  ]
+  const adopted = new Map<string, boolean>([
+    ['a', true],
+    ['b', false],
+    ['c', true],
+  ])
+  const resolutions = new Map<string, 'useRemote' | 'keepLocal' | 'skip'>([['c', 'useRemote']])
+  const out = buildAdoptions(items, adopted, resolutions)
+  // 只有 adopt=true 的项进列表（a、c）；b 未采纳剔除
+  const ids = out.map((o) => o.itemId)
+  assert.deepEqual(ids, ['a', 'c'])
+  assert.equal(out[1]?.resolution, 'useRemote')
+})
+
+test('sync-view: buildAdoptions Conflict 项未给 resolution → 抛错（强制先解决）', () => {
+  const items: SyncConfirmItem[] = [
+    confirmItem({ itemId: 'c', kind: 'Conflict', defaultAdopt: false }),
+  ]
+  const adopted = new Map<string, boolean>([['c', true]])
+  const resolutions = new Map<string, 'useRemote' | 'keepLocal' | 'skip'>()
+  assert.throws(() => buildAdoptions(items, adopted, resolutions), /解决/)
+})
+
+test('sync-view: applyItemsReportView 成功 → ok 头部含 applied 计数与 restoreId', () => {
+  const report: ApplyItemsResponse = {
+    ok: true, applied: ['settings', 'plugins'], skipped: [], needsRestart: false,
+    warnings: [], restoreId: 'rest-1', rolledBack: false, failed: [], result: {},
+  }
+  const view = applyItemsReportView(report)
+  assert.notEqual(view, null)
+  assert.equal(view?.kind, 'ok')
+  assert.match(view?.headline ?? '', /2/)
+  assert.equal(view?.restoreId, 'rest-1')
+})
+
+test('sync-view: applyItemsReportView 失败且整体回滚 → rolledBack 渲染', () => {
+  const report: ApplyItemsResponse = {
+    ok: false, applied: [], skipped: [], needsRestart: false,
+    warnings: [], restoreId: 'rest-2', rolledBack: true,
+    failed: [{ itemId: 'x', message: '导入失败' }], result: {},
+  }
+  const view = applyItemsReportView(report)
+  assert.equal(view?.kind, 'rolledBack')
+  assert.equal(view?.restoreId, 'rest-2')
+})
+
+test('sync-view: applyItemsReportView null → null', () => {
+  assert.equal(applyItemsReportView(null), null)
+})
+
+/* ---------------------------------------------------------------- 自动同步 */
+
+test('sync-view: autosyncIntervalMs 换算正确', () => {
+  assert.equal(autosyncIntervalMs('5m'), 5 * 60 * 1000)
+  assert.equal(autosyncIntervalMs('30m'), 30 * 60 * 1000)
+  assert.equal(autosyncIntervalMs('24h'), 24 * 60 * 60 * 1000)
+})
+
+test('sync-view: computeAutosyncCountdown 距上次已过超过间隔 → 0（到期立即）', () => {
+  assert.equal(computeAutosyncCountdown(30 * 60 * 1000, 30 * 60 * 1000), 0)
+  assert.equal(computeAutosyncCountdown(31 * 60 * 1000, 30 * 60 * 1000), 0)
+  assert.equal(computeAutosyncCountdown(10 * 60 * 1000, 30 * 60 * 1000), 20 * 60 * 1000)
+})
+
+test('sync-view: autosyncStatusText 覆盖未运行 / 各状态', () => {
+  const status: AutosyncStatusResponse = {
+    enabled: true, interval: '30m', consecutiveFailures: 0, elapsedMs: -1,
+  }
+  assert.match(autosyncStatusText(status), /从未运行/)
+  const ran: AutosyncStatusResponse = {
+    enabled: true, interval: '30m', consecutiveFailures: 0, elapsedMs: 0,
+    lastRunAt: '2026-08-17T10:00:00.000Z', lastRunStatus: 'success',
+  }
+  assert.match(autosyncStatusText(ran), /成功/)
+  const failed: AutosyncStatusResponse = {
+    enabled: true, interval: '30m', consecutiveFailures: 3, elapsedMs: 0,
+    lastRunAt: '2026-08-17T10:00:00.000Z', lastRunStatus: 'failed', lastRunMessage: '认证失败',
+  }
+  assert.match(autosyncStatusText(failed), /失败/)
+  assert.match(autosyncStatusText(failed), /连续失败 3 次/)
+})

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

@@ -7,7 +7,10 @@
  */
 import type { PlanItem, PlanItemKind } from '../../core/types.ts';
 import type { PullChange, SyncPullReport, SyncPushReport } from '../../sync/sync-engine.ts';
-import type { GithubPollResponse, SyncStatusResponse } from './sync-api.ts';
+import type {
+  ApplyItemsResponse, AutosyncInterval, AutosyncStatusResponse, GithubPollResponse, SyncConfirmItem,
+  SyncItemAdoption, SyncStatusResponse,
+} from './sync-api.ts';
 import { zhUiT, type UiT } from '../../ui/i18n.ts';
 
 /* ---------------------------------------------------------------- 私有仓库提示 */
@@ -94,15 +97,15 @@ export interface SyncButtons {
  * - 仓库地址为空 → 禁用（无仓库无从同步）；
  * - busy 时按钮文案切换为「正在推送/拉取…」（配 Spinner）。
  */
-export function computeSyncButtons(busy: 'push' | 'pull' | 'apply' | 'rollback' | null, repoUrl: string, t: UiT = zhUiT): SyncButtons {
+export function computeSyncButtons(busy: 'sync' | 'push' | 'pull' | 'apply' | 'rollback' | null, repoUrl: string, t: UiT = zhUiT): SyncButtons {
   const idle = busy === null;
   const repoOk = repoUrl.trim() !== '';
   const enabled = idle && repoOk;
   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'),
   };
 }
 
@@ -290,3 +293,147 @@ export function githubPollMessage(poll: GithubPollResponse, t: UiT = zhUiT): str
       return '';
   }
 }
+
+/* ---------------------------------------------------------------- 一键同步差异确认（方案 A） */
+
+/** 需要人工决策的 PlanItemKind（与 Host /sync/sync 的 needsReview 判定对齐）。 */
+const CONFIRM_REVIEW_KINDS: ReadonlySet<PlanItemKind> = new Set([
+  'Conflict', 'MissingSecret', 'MissingDependency', 'Install', 'Error', 'PathMapping',
+]);
+
+export interface SyncConfirmSummary {
+  total: number;
+  info: number;
+  warning: number;
+  error: number;
+  /** 默认/当前采用数（adopt=true 的项数）。 */
+  adopted: number;
+  /** 是否包含任何需人工决策项。 */
+  needsReview: boolean;
+}
+
+/** 差异确认列表摘要（按 severity 计数 + 采用数 + needsReview 徽章数据源）。 */
+export function summarizeConfirmItems(items: readonly SyncConfirmItem[]): SyncConfirmSummary {
+  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 };
+}
+
+/**
+ * 收集用户逐项决策 → apply-items 请求体 adoptions[]。
+ * 仅包含 adopt=true 的项；Conflict 项 adopt=true 且未给 resolution → 抛错（强制先解决）。
+ */
+export function buildAdoptions(
+  items: readonly SyncConfirmItem[],
+  adopted: ReadonlyMap<string, boolean>,
+  resolutions: ReadonlyMap<string, 'useRemote' | 'keepLocal' | 'skip'>,
+): SyncItemAdoption[] {
+  const out: SyncItemAdoption[] = [];
+  for (const it of items) {
+    if (adopted.get(it.itemId) !== true) continue; // adopt=false / 未列出 → 跳过
+    const adoption: SyncItemAdoption = { itemId: it.itemId, adopt: true };
+    if (it.kind === 'Conflict') {
+      const resolution = resolutions.get(it.itemId);
+      if (resolution === undefined) {
+        throw new Error(`冲突项 ${it.itemId} 必须先选择解决方式（用本地 / 用远端 / 跳过）`);
+      }
+      if (resolution !== 'skip') adoption.resolution = resolution;
+    }
+    out.push(adoption);
+  }
+  return out;
+}
+
+export type ApplyItemsViewKind = 'ok' | 'failed' | 'rolledBack';
+
+export interface ApplyItemsView {
+  kind: ApplyItemsViewKind;
+  headline: string;
+  sections: string[];
+  warnings: string[];
+  restoreId: string;
+  needsRestart: boolean;
+}
+
+/** apply-items 执行结果 → 渲染模型（ok / failed / 整体回滚）。 */
+export function applyItemsReportView(
+  report: ApplyItemsResponse | null,
+  t: UiT = zhUiT,
+): ApplyItemsView | null {
+  if (report === null) return null;
+  const failedOnly = report.failed.length > 0 && !report.ok;
+  const kind: ApplyItemsViewKind = !report.ok && report.rolledBack ? 'rolledBack' : failedOnly ? 'failed' : 'ok';
+  const headline = kind === 'ok'
+    ? t('sync.importDone', { n: String(report.applied.length) })
+    : kind === 'rolledBack'
+      ? t('sync.importFailed')
+      : t('sync.importFailed');
+  return {
+    kind,
+    headline,
+    sections: report.applied,
+    warnings: report.warnings,
+    restoreId: report.restoreId,
+    needsRestart: report.needsRestart,
+  };
+}
+
+/* ---------------------------------------------------------------- 自动同步（方案 A） */
+
+/** AutosyncInterval → ms。 */
+export function autosyncIntervalMs(interval: AutosyncInterval): number {
+  switch (interval) {
+    case '5m': return 5 * 60 * 1000;
+    case '15m': return 15 * 60 * 1000;
+    case '60m': return 60 * 60 * 1000;
+    case '6h': return 6 * 60 * 60 * 1000;
+    case '12h': return 12 * 60 * 60 * 1000;
+    case '24h': return 24 * 60 * 60 * 1000;
+    default: return 30 * 60 * 1000;
+  }
+}
+
+/** 距下次自动同步剩余 ms（已到期 → 0）。elapsedMs 为 host 计算的「距上次执行已过 ms」。 */
+export function computeAutosyncCountdown(elapsedMs: number, intervalMs: number): number {
+  if (elapsedMs < 0) return -1; // 从未运行
+  return Math.max(0, intervalMs - elapsedMs);
+}
+
+/** 间隔 ms → 可读时长（如「30 分钟」「6 小时」）。 */
+export function formatIntervalDuration(ms: number, t: UiT = zhUiT): string {
+  const minutes = Math.round(ms / 60000);
+  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`;
+}
+
+/** 自动同步状态行的可读文案（未运行 / 上次状态 / 连续失败计数）。 */
+export function autosyncStatusText(status: AutosyncStatusResponse, t: UiT = zhUiT): string {
+  if (status.lastRunAt === undefined || status.lastRunAt === '' || status.lastRunStatus === undefined) {
+    return t('sync.autosyncNever');
+  }
+  const statusText = status.lastRunStatus === 'success'
+    ? t('sync.autosyncSuccess')
+    : status.lastRunStatus === 'skipped'
+      ? t('sync.autosyncSkipped')
+      : status.lastRunStatus === 'partial'
+        ? t('sync.autosyncPartial')
+        : t('sync.autosyncFailed');
+  const time = formatDateTime(status.lastRunAt);
+  const base = t('sync.autosyncLastRun', { time });
+  const fail = status.consecutiveFailures > 0 ? ` · ${t('sync.autosyncFailCount', { n: String(status.consecutiveFailures) })}` : '';
+  return `${statusText} · ${base}${fail}`;
+}

package/src/core/run-registry.ts

@@ -21,8 +21,8 @@ import { randomBytes } from 'node:crypto'
 import { zhMsg } from './messages.ts'
 import type { MsgFunc } from './messages.ts'
 
-/** run 类型：导出 / 导入。 */
-export type RunKind = 'export' | 'import'
+/** run 类型：导出 / 导入 / 自动同步 / 一键同步逐项应用。 */
+export type RunKind = 'export' | 'import' | 'autosync' | 'sync-apply'
 
 /** run 状态：进行中 / 完成 / 失败。 */
 export type RunStatus = 'running' | 'done' | 'failed'
@@ -59,7 +59,11 @@ export class RunConflictError extends Error {
     super(
       kind === 'export'
         ? msg('run.conflict.export', { runId })
-        : msg('run.conflict.import', { runId }),
+        : kind === 'autosync'
+          ? '自动同步已在进行中'
+          : kind === 'sync-apply'
+            ? '一键同步已在进行中'
+            : msg('run.conflict.import', { runId }),
     )
     this.name = 'RunConflictError'
     this.runId = runId