dsh-config-manager 0.1.20 → 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/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');

package/src/client/sync/SyncPullPreviewView.test.ts

@@ -1,54 +0,0 @@
-/**
- * P2b SyncPullPreviewView 纯函数测试：projectReviewItems / describeConflicts / formatDiff。
- * 组件挂载 + 交互通过 React 渲染测试覆盖（node --test 不跑 React 渲染；本文件
- * 覆盖核心数据投影逻辑——这是组件层以下的可测部分）。
- */
-import test from 'node:test';
-import assert from 'node:assert/strict';
-
-import { projectReviewItems, describeConflicts, formatDiff } from './pull-preview-model.ts';
-import type { SyncApplyPlan } from '../../sync/risk.ts';
-import type { MergeSectionResult } from '../../sync/merge.ts';
-import type { SectionId } from '../../schema/types.ts';
-
-const rev = (id: SectionId, conflicts: MergeSectionResult['conflicts']): MergeSectionResult => ({
-  id, decision: 'conflict', conflicts,
-});
-
-test('projectReviewItems：review → ReviewDisplayItem，sectionId 与 description 正确', () => {
-  const apply: SyncApplyPlan = {
-    autoApply: [],
-    review: [rev('settings', [{ path: 'general', kind: 'key' }]), rev('workspaces', [])],
-    skipped: [],
-  };
-  const out = projectReviewItems(apply);
-  assert.equal(out.length, 2);
-  assert.equal(out[0]!.sectionId, 'settings');
-  assert.equal(out[0]!.description, '冲突：general');
-  assert.equal(out[0]!.initial, 'pending');
-  assert.equal(out[1]!.sectionId, 'workspaces');
-  assert.equal(out[1]!.description, '分区 workspaces 待审');
-});
-
-test('describeConflicts：空 → 「无变更描述」；多条 → 逗号分隔 + +N', () => {
-  assert.equal(describeConflicts([]), '无变更描述');
-  assert.equal(describeConflicts([{ path: 'a', kind: 'key' }]), '冲突：a');
-  assert.equal(describeConflicts([
-    { path: 'a', kind: 'key' },
-    { path: 'b', kind: 'key' },
-  ]), '冲突：a, b');
-  assert.equal(describeConflicts([
-    { path: 'a', kind: 'key' },
-    { path: 'b', kind: 'key' },
-    { path: 'c', kind: 'key' },
-  ]), '冲突：a, b +1');
-});
-
-test('formatDiff：local==remote → 「（值相同）」；否则显示 JSON 文本', () => {
-  assert.equal(formatDiff({ a: 1 }, { a: 1 }), '（值相同）');
-  const out = formatDiff({ a: 1 }, { a: 2 });
-  assert.ok(out.includes('local:'));
-  assert.ok(out.includes('remote:'));
-  assert.ok(out.includes('"a":1'));
-  assert.ok(out.includes('"a":2'));
-});

package/src/client/sync/SyncPullPreviewView.tsx

@@ -1,165 +0,0 @@
-/**
- * 拉取预览页（M5，P2b）：消费 SyncApplyPlan，渲染
- *  - 自动已应用列表（autoApplied）—— 绿色状态徽章 + sectionId/description；
- *  - 待审变更列表（review）—— 每项三个按钮（用本地 / 用远端 / 跳过）+ 局部差异 diff；
- *  - 整体 rollback 后「回滚到应用前」按钮（调用 restoreId）；
- *  - 全部 review 解决 → 触发 onAllResolved 回调（sync 完成）。
- *
- * 设计：与 SyncSettingsView 同模式 —— 全部渲染模型来自 ./sync-view.ts 纯函数，
- * 组件只做装配 + 状态；测试在 node --test 跑纯函数部分。
- */
-import { useCallback, useMemo, useState } from 'react'
-import type { ReactNode } from 'react'
-
-import type { SyncApplyPlan } from '../../sync/risk.ts'
-import type { MergeConflict, MergeSectionResult } from '../../sync/merge.ts'
-import { Badge, Button, Card, SectionTitle } from '../common/ui.tsx'
-import { resolveItem } from '../../sync/review-queue.ts'
-import type { ReviewQueueItem } from '../../sync/review-queue.ts'
-import { projectReviewItems, describeConflicts, formatDiff } from './pull-preview-model.ts'
-import type { ReviewDisplayItem } from './pull-preview-model.ts'
-
-// 纯数据投影逻辑放在 ./pull-preview-model.ts（node --test 可测）；本文件仅装配。
-
-export interface SyncPullPreviewViewProps {
-  /** SyncApplyPlan（autoApply + review + skipped） */
-  applyPlan: SyncApplyPlan
-  /** stateDir（用于 resolveItem 写回 sync-review-queue.json） */
-  stateDir: string
-  /** 失败 ApplyReport（提供 restoreId） */
-  restoreId?: string
-  /** 已应用的 sectionId 列表（applyMergePlan.ok=true 时显示成功绿条） */
-  appliedIds?: readonly string[]
-  /** 来自 Importer 的 warning 列表（applyMergePlan.warnings） */
-  warnings?: readonly string[]
-  /** 全部 review 项解决后回调（让上层触发 sync 完成） */
-  onAllResolved?: () => void
-  /** 调用 rollback.ts 恢复 backup 的 handler（UI 一键回滚入口） */
-  onRollback?: (restoreId: string) => Promise<void> | void
-}
-
-interface ItemDecisionState {
-  /** 'pending' = 未决；其它 = 用户已决策 */
-  status: 'pending' | 'useRemote' | 'keepLocal' | 'skip'
-}
-
-export function SyncPullPreviewView(props: SyncPullPreviewViewProps): ReactNode {
-  const { applyPlan, stateDir, appliedIds = [], warnings = [], restoreId, onAllResolved, onRollback } = props;
-  const items = useMemo(() => projectReviewItems(applyPlan), [applyPlan]);
-  const [decisions, setDecisions] = useState<Record<string, ItemDecisionState['status']>>(() => {
-    const init: Record<string, ItemDecisionState['status']> = {};
-    for (const it of items) init[it.itemId] = it.initial;
-    return init;
-  });
-
-  const decide = useCallback(async (itemId: string, decision: 'useRemote' | 'keepLocal' | 'skip') => {
-    setDecisions((prev) => ({ ...prev, [itemId]: decision }));
-    try {
-      await resolveItem(stateDir, itemId, decision);
-    } catch (err) {
-      // 决策持久化失败：UI 层错误处理——此处仅控制台提示，上层可通过 warnings 透传
-      console.warn(`resolveItem(${itemId}) 失败：`, err);
-    }
-  }, [stateDir]);
-
-  // 计算剩余未决项
-  const pendingIds = useMemo(() => items.filter((i) => decisions[i.itemId] === 'pending').map((i) => i.itemId), [items, decisions]);
-  if (pendingIds.length === 0 && items.length > 0 && onAllResolved) {
-    // useEffect 替代：此处直接调用——组件是纯展示
-    queueMicrotask(() => onAllResolved());
-  }
-
-  return (
-    <div className="sync-pull-preview">
-      {/* 自动已应用列表 */}
-      {appliedIds.length > 0 && (
-        <Card>
-          <SectionTitle title={`自动已应用（${appliedIds.length}）`} />
-          <ul>
-            {appliedIds.map((sid) => (
-              <li key={sid}>
-                <Badge kind="ok">✓</Badge> <code>{sid}</code>
-              </li>
-            ))}
-          </ul>
-          {warnings.length > 0 && (
-            <ul className="warnings">
-              {warnings.map((w, i) => <li key={i} className="warning">{w}</li>)}
-            </ul>
-          )}
-          {restoreId && onRollback && (
-            <Button variant="danger" onClick={() => onRollback(restoreId)}>{`回滚到应用前 (${restoreId})`}</Button>
-          )}
-        </Card>
-      )}
-
-      {/* 待审列表 */}
-      {items.length > 0 && (
-        <Card>
-          <SectionTitle title={`待审变更（${items.length}）`} />
-          {items.map((it) => (
-            <ReviewItemRow
-              key={it.itemId}
-              item={it}
-              state={decisions[it.itemId] ?? 'pending'}
-              onDecide={(d) => decide(it.itemId, d)}
-            />
-          ))}
-        </Card>
-      )}
-
-      {/* 跳过 */}
-      {applyPlan.skipped.length > 0 && (
-        <Card>
-          <SectionTitle title={`无变化（${applyPlan.skipped.length}）`} />
-          <ul>
-            {applyPlan.skipped.map((r) => (
-              <li key={r.id}><code>{r.id}</code> —— skip（无变化）</li>
-            ))}
-          </ul>
-        </Card>
-      )}
-    </div>
-  );
-}
-
-interface ReviewItemRowProps {
-  item: ReviewDisplayItem
-  state: ItemDecisionState['status']
-  onDecide: (d: 'useRemote' | 'keepLocal' | 'skip') => void
-}
-
-function ReviewItemRow({ item, state, onDecide }: ReviewItemRowProps): ReactNode {
-  return (
-    <div className={`review-item state-${state}`}>
-      <div className="review-item-header">
-        <code>{item.sectionId}</code> <span>{item.description}</span>
-        <Badge kind={state === 'pending' ? 'warn' : 'ok'}>{labelForState(state)}</Badge>
-      </div>
-      {item.conflicts.length > 0 && (
-        <details>
-          <summary>差异（{item.conflicts.length}）</summary>
-          <pre>
-            {item.conflicts.map((c, i) => (
-              <div key={i}>{formatDiff(c.local, c.remote)}</div>
-            ))}
-          </pre>
-        </details>
-      )}
-      <div className="review-item-actions">
-        <Button variant="ghost" disabled={state !== 'pending'} onClick={() => onDecide('keepLocal')}>用本地</Button>
-        <Button variant="primary" disabled={state !== 'pending'} onClick={() => onDecide('useRemote')}>用远端</Button>
-        <Button variant="ghost" disabled={state !== 'pending'} onClick={() => onDecide('skip')}>跳过</Button>
-      </div>
-    </div>
-  );
-}
-
-function labelForState(s: ItemDecisionState['status']): string {
-  switch (s) {
-    case 'pending': return '待决';
-    case 'useRemote': return '已选：远端';
-    case 'keepLocal': return '已选：本地';
-    case 'skip': return '已选：跳过';
-  }
-}

package/src/client/sync/pull-preview-model.ts

@@ -1,44 +0,0 @@
-/**
- * m-sync-ui (P2b)：SyncPullPreviewView 的纯数据投影逻辑（无副作用、无 React 依赖）。
- * 与 sync-view.ts 同模式：纯函数 → node --test 覆盖；React 组件只做装配。
- */
-import type { SyncApplyPlan } from '../../sync/risk.ts';
-import type { MergeConflict } from '../../sync/merge.ts';
-
-export interface ReviewDisplayItem {
-  itemId: string;
-  sectionId: string;
-  description: string;
-  conflicts: MergeConflict[];
-  initial: 'pending' | 'useRemote' | 'keepLocal' | 'skip';
-}
-
-/** 把 SyncApplyPlan.review 拆成 UI 可显示形态（同步函数，无副作用） */
-export function projectReviewItems(applyPlan: SyncApplyPlan): ReviewDisplayItem[] {
-  const out: ReviewDisplayItem[] = [];
-  for (const r of applyPlan.review) {
-    out.push({
-      itemId: `${r.id}`,
-      sectionId: r.id,
-      description: r.conflicts.length > 0 ? describeConflicts(r.conflicts) : `分区 ${r.id} 待审`,
-      conflicts: r.conflicts,
-      initial: 'pending',
-    });
-  }
-  return out;
-}
-
-/** 简短描述 conflicts（最多 2 条；超出显示 +N） */
-export function describeConflicts(conflicts: readonly MergeConflict[]): string {
-  if (conflicts.length === 0) return '无变更描述';
-  const sample = conflicts.slice(0, 2).map((c) => `${c.path || '$'}`).join(', ');
-  return conflicts.length <= 2 ? `冲突：${sample}` : `冲突：${sample} +${conflicts.length - 2}`;
-}
-
-/** 渲染差异（local vs remote）的紧凑 JSON 视图（纯字符串） */
-export function formatDiff(local: unknown, remote: unknown): string {
-  const L = JSON.stringify(local, null, 0);
-  const R = JSON.stringify(remote, null, 0);
-  if (L === R) return '（值相同）';
-  return `local: ${L}\nremote: ${R}`;
-}