dsh-config-manager 0.1.20 → 0.1.21

package/lib/core/run-registry.d.ts

@@ -1,6 +1,6 @@
 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';
 /** 单个 run 的实时状态（/progress 返回体；纯 JSON 可序列化）。 */

package/lib/core/run-registry.js

@@ -26,7 +26,11 @@ export class RunConflictError extends Error {
     constructor(runId, kind, msg = zhMsg) {
         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;
     }

package/lib/core/run-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-registry.js","sourceRoot":"","sources":["../../src/core/run-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-registry.js","sourceRoot":"","sources":["../../src/core/run-registry.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -55,9 +55,12 @@ import { createHardenedZipParser } from "./security/zip-security.js";
 import { GitTransport } from "./sync/git/git-transport.js";
 import { DeviceFlowStore, GitHubAuthClient } from "./sync/github-auth.js";
 import { SyncEngine } from "./sync/sync-engine.js";
+import { SyncSessionStore } from "./sync/sync-session.js";
+import { AutoSyncScheduler } from "./sync/autosync-scheduler.js";
+import { defaultAutosyncConfig, readAutosyncConfig, writeAutosyncConfig } from "./sync/autosync-config.js";
+import { appendAutosyncEntry, readSyncHistory } from "./sync/sync-history.js";
 import { loadSyncState, saveSyncState } from "./sync/sync-state.js";
 import { readSyncConfig, writeSyncConfig, validateRepoUrl } from "./sync/sync-config.js";
-import { classifyMergePlan } from "./sync/risk.js";
 import { MANIFEST_FILE, parseManifest } from "./schema/manifest.js";
 import { SECTION_IDS } from "./schema/config.js";
 import { parseZip } from "./utils/zip.js";
@@ -101,8 +104,13 @@ const API = {
     syncGithubCancel: '/api/dsh-config-manager/sync/github/cancel',
     // P2：同步历史 / 自动应用 / 一键回滚
     syncHistory: '/api/dsh-config-manager/sync/history',
-    syncApply: '/api/dsh-config-manager/sync/apply',
     syncRollback: '/api/dsh-config-manager/sync/rollback',
+    // m-sync-v2：一键同步（差异确认会话）+ 自动同步 + 历史快照
+    syncSnapshotsList: '/api/dsh-config-manager/sync/snapshots-list',
+    syncSync: '/api/dsh-config-manager/sync/sync',
+    syncApplyItems: '/api/dsh-config-manager/sync/apply-items',
+    syncCancel: '/api/dsh-config-manager/sync/cancel',
+    syncAutosync: '/api/dsh-config-manager/sync/autosync',
 };
 /**
  * 同步 token 的 DSH credentials 引用名（POSIX env-var 形态，满足 CredentialRef 品牌要求）。
@@ -728,6 +736,59 @@ export function writeSyncRouteError(res, error) {
     const message = error instanceof Error ? error.message : String(error);
     writeJson(res, 500, { error: message });
 }
+/** 需要人工决策的 PlanItemKind（一键同步 needsReview 判定 + 逐项确认标记） */
+const REVIEW_KINDS = new Set([
+    'Conflict', 'MissingSecret', 'MissingDependency', 'Install', 'Error', 'PathMapping',
+]);
+/** 把 ImportPlan 投影为逐项可确认的差异项（默认采用 Create/Update/Install；人工项默认不采用）。 */
+function planToConfirmItems(plan) {
+    return plan.items.map((item) => {
+        const manual = REVIEW_KINDS.has(item.kind);
+        let conflict;
+        if (item.kind === 'Conflict') {
+            const c = item.conflict;
+            conflict = {
+                path: c?.path ?? '$',
+                kind: c?.kind === 'file' ? 'file' : c?.kind === 'section' ? 'section' : 'key',
+                ...(c?.local !== undefined ? { local: c.local } : {}),
+                ...(c?.remote !== undefined ? { remote: c.remote } : {}),
+                ...(c?.ancestor !== undefined ? { ancestor: c.ancestor } : {}),
+            };
+        }
+        return {
+            itemId: item.id,
+            adapter: item.adapter,
+            kind: item.kind,
+            description: item.description,
+            severity: item.severity,
+            defaultAdopt: !manual,
+            adopt: !manual,
+            ...(conflict !== undefined ? { conflict } : {}),
+            ...(item.target !== undefined ? { target: item.target } : {}),
+        };
+    });
+}
+/** autosync interval 类型守卫 */
+function isAutosyncInterval(v) {
+    return v === '5m' || v === '15m' || v === '30m' || v === '60m' || v === '6h' || v === '12h' || v === '24h';
+}
+/** 自动同步状态响应（GET /sync/autosync 与 POST 回填；读盘计算 elapsedMs）。 */
+async function buildAutosyncStatus(dir) {
+    const cfg = await readAutosyncConfig(dir);
+    const elapsedMs = cfg.lastRunAt === undefined || cfg.lastRunAt === ''
+        ? -1
+        : Math.max(0, Date.now() - Date.parse(cfg.lastRunAt));
+    return {
+        enabled: cfg.enabled,
+        interval: cfg.interval,
+        ...(cfg.lastRunAt !== undefined ? { lastRunAt: cfg.lastRunAt } : {}),
+        ...(cfg.lastRunStatus !== undefined ? { lastRunStatus: cfg.lastRunStatus } : {}),
+        ...(cfg.lastRunMessage !== undefined ? { lastRunMessage: cfg.lastRunMessage } : {}),
+        consecutiveFailures: cfg.consecutiveFailures,
+        elapsedMs,
+        ...(cfg.lastRunHistoryId !== undefined ? { lastRunHistoryId: cfg.lastRunHistoryId } : {}),
+    };
+}
 export function buildRestoreBody(body) {
     if (body === null || typeof body !== 'object' || Array.isArray(body)) {
         return { ok: false, error: 'invalid JSON body' };
@@ -920,6 +981,19 @@ function makeRoutes(deps) {
             msg,
         });
     };
+    /** 一键同步差异确认会话存储（进程内存；/sync/sync 预览 → /sync/apply-items 逐项执行解耦） */
+    const syncSessions = new SyncSessionStore();
+    /** 自动同步后台调度器（宿主进程生命周期，不依赖浏览器） */
+    let scheduler;
+    scheduler = new AutoSyncScheduler({
+        syncDir,
+        host,
+        makeSyncEngine,
+        msg,
+        runs,
+    });
+    // 启动：读 autosync-config；若 enabled 启动定时器；无条件执行一次「启动触发下载合并」（受阈值约束）
+    scheduler.start();
     return [
         // ------------------------------------------------------------- status
         {
@@ -1295,6 +1369,7 @@ function makeRoutes(deps) {
                         lastSyncAt: state.lastSyncAt === '' ? undefined : state.lastSyncAt,
                         sectionCount: Object.keys(state.sections).length,
                         transport: state.transport,
+                        autosync: await buildAutosyncStatus(syncDir),
                     });
                 }
                 catch (error) {
@@ -1521,22 +1596,29 @@ function makeRoutes(deps) {
                         catch { /* skip */ }
                     }
                     rows.sort((a, b) => (a.createdAt < b.createdAt ? 1 : a.createdAt > b.createdAt ? -1 : 0));
-                    writeJson(res, 200, rows);
+                    // 合并自动同步执行记录（sync-history.json）
+                    const hist = await readSyncHistory(syncDir);
+                    const merged = [
+                        ...rows.map((r) => ({ ...r, kind: 'apply' })),
+                        ...hist.autosyncEntries.map((e) => ({
+                            id: e.createdAt,
+                            createdAt: e.createdAt,
+                            kind: 'autosync',
+                            autosync: e,
+                        })),
+                    ].sort((a, b) => (a.createdAt < b.createdAt ? 1 : a.createdAt > b.createdAt ? -1 : 0));
+                    writeJson(res, 200, { entries: merged });
                 }
                 catch (error) {
                     writeJson(res, 500, { error: error instanceof Error ? error.message : String(error) });
                 }
             },
         },
-        // ------------------------------------------------------ sync/apply
-        // P2：应用自动应用计划。流程：
-        //   1) engine.merge 拉取远端 → 三方合并 → classifyMergePlan(firstSync)
-        //   2) engine.applyMergePlan(apply) → backup + Importer.executeImportPlan(rollbackOnError=true)
-        //      失败 → rollback + enqueueItems → return ApplyReport{ok:false,rolledBack:true,review}
-        //   3) 全成功 → recordBaseline + 标记 firstSyncCompleted
+        // ------------------------------------------------------ sync/snapshots-list
+        // m-sync-v2：远端历史快照列表（供「选择历史快照」下拉）。
         {
             kind: 'exact',
-            path: API.syncApply,
+            path: API.syncSnapshotsList,
             handler: async (req, res) => {
                 if (!guard(req, res, 'POST'))
                     return;
@@ -1548,17 +1630,208 @@ function makeRoutes(deps) {
                 try {
                     const { repoUrl, gitBin } = await prepareSync(body);
                     const engine = makeSyncEngine(repoUrl, gitBin);
-                    const merge = await withTimeout(engine.merge(), ROUTE_TIMEOUT_MS, '同步三方合并超时（5 分钟）');
-                    // 首次强制预览：sync-state.lastSyncAt === '' 时一律 review
+                    const metas = await withTimeout(engine.listSnapshots(), ROUTE_TIMEOUT_MS, msg('host.syncPullTimeout'));
+                    const snapshots = [...metas]
+                        .sort((a, b) => (a.createdAt < b.createdAt ? 1 : a.createdAt > b.createdAt ? -1 : 0))
+                        .map((m) => ({
+                        id: m.id,
+                        createdAt: m.createdAt,
+                        sectionCount: m.manifest.sectionIds.length,
+                        platform: m.manifest.platform,
+                        dshVersion: m.manifest.dshVersion,
+                    }));
                     const state = await loadSyncState(syncDir);
-                    const firstSync = state.lastSyncAt === '';
-                    const apply = classifyMergePlan(merge, { firstSync });
-                    if (firstSync) {
-                        state.lastSyncAt = new Date().toISOString();
-                        await saveSyncState(syncDir, state);
+                    writeJson(res, 200, { ok: true, snapshots, currentSnapshotId: state.lastSnapshotId === '' ? undefined : state.lastSnapshotId });
+                }
+                catch (error) {
+                    writeSyncRouteError(res, error);
+                }
+            },
+        },
+        // ------------------------------------------------------ sync/sync
+        // m-sync-v2：一键同步第一步 —— 拉取 → 差异确认会话（内存登记临时 ZIP + ImportPlan）。
+        {
+            kind: 'exact',
+            path: API.syncSync,
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                if (body === undefined) {
+                    writeJson(res, 400, { error: 'invalid JSON body' });
+                    return;
+                }
+                try {
+                    const { repoUrl, gitBin } = await prepareSync(body);
+                    const engine = makeSyncEngine(repoUrl, gitBin);
+                    const snapshotId = typeof body['snapshotId'] === 'string' && body['snapshotId'] !== '' ? body['snapshotId'] : undefined;
+                    const preview = await withTimeout(engine.preview(snapshotId === undefined ? {} : { snapshotId }), ROUTE_TIMEOUT_MS, msg('host.syncPullTimeout'));
+                    if (!preview.ok || preview.plan === null || preview.analysis === null) {
+                        writeJson(res, 200, { ok: false, syncSessionId: '', snapshotId: preview.snapshotId, items: [], needsReview: false, compatibility: 'unsupported', message: preview.message ?? '同步预览失败' });
+                        return;
                     }
-                    const report = await engine.applyMergePlan(apply);
-                    writeJson(res, 200, report);
+                    const syncSessionId = syncSessions.set({
+                        zipPath: preview.zipPath,
+                        plan: preview.plan,
+                        analysis: preview.analysis,
+                        snapshotId: preview.snapshotId,
+                        repoUrl,
+                        gitBin,
+                    });
+                    const items = planToConfirmItems(preview.plan);
+                    const needsReview = items.some((i) => REVIEW_KINDS.has(i.kind)) || preview.analysis.pathIssues.length > 0;
+                    writeJson(res, 200, {
+                        ok: true,
+                        syncSessionId,
+                        snapshotId: preview.snapshotId,
+                        items,
+                        needsReview,
+                        compatibility: preview.analysis.compatibility,
+                    });
+                }
+                catch (error) {
+                    writeSyncRouteError(res, error);
+                }
+            },
+        },
+        // ------------------------------------------------------ sync/apply-items
+        // m-sync-v2：一键同步第二步 —— 按用户对差异项的逐项决策执行导入。
+        {
+            kind: 'exact',
+            path: API.syncApplyItems,
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                if (body === undefined) {
+                    writeJson(res, 400, { error: 'invalid JSON body' });
+                    return;
+                }
+                try {
+                    const syncSessionId = typeof body['syncSessionId'] === 'string' ? body['syncSessionId'] : '';
+                    const session = syncSessions.get(syncSessionId);
+                    if (session === undefined) {
+                        writeJson(res, 400, { error: '同步会话不存在或已过期，请重新拉取预览' });
+                        return;
+                    }
+                    const adoptions = Array.isArray(body['adoptions']) ? body['adoptions'] : [];
+                    // 构造子计划（仅含采纳项）
+                    const byId = new Map();
+                    for (const a of adoptions) {
+                        if (typeof a?.['itemId'] !== 'string')
+                            continue;
+                        byId.set(a['itemId'], { adopt: a['adopt'] === true, resolution: typeof a['resolution'] === 'string' ? a['resolution'] : undefined });
+                    }
+                    const subItems = session.plan.items.filter((item) => {
+                        const d = byId.get(item.id);
+                        if (d === undefined || !d.adopt)
+                            return false;
+                        // Conflict 项必须有 resolution，且 keepLocal/skip 从子计划剔除
+                        if (item.kind === 'Conflict') {
+                            if (d.resolution === undefined)
+                                throw new SyncRouteError(`冲突项 ${item.id} 必须提供 resolution（useRemote/keepLocal/skip）`);
+                            if (d.resolution === 'keepLocal' || d.resolution === 'skip')
+                                return false;
+                        }
+                        return true;
+                    });
+                    const subPlan = {
+                        ...session.plan,
+                        items: subItems,
+                    };
+                    // 消费会话（同一 session 只允许一次 apply-items）
+                    syncSessions.delete(syncSessionId);
+                    await fs.rm(dirname(session.zipPath), { recursive: true, force: true }).catch(() => { });
+                    const engine = makeSyncEngine(session.repoUrl, session.gitBin);
+                    const report = await engine.applyItems(session.zipPath, subPlan, {
+                        onItem: (info) => { },
+                    });
+                    writeJson(res, 200, {
+                        ok: report.ok,
+                        applied: report.applied,
+                        skipped: subItems.map((i) => i.id),
+                        needsRestart: report.needsRestart === true,
+                        warnings: report.warnings,
+                        restoreId: report.restoreId,
+                        rolledBack: report.rolledBack,
+                        failed: report.failed,
+                        result: report.result,
+                    });
+                }
+                catch (error) {
+                    writeSyncRouteError(res, error);
+                }
+            },
+        },
+        // ------------------------------------------------------ sync/cancel
+        // m-sync-v2：取消 / 清理差异确认会话（丢弃临时 ZIP，零副作用）。
+        {
+            kind: 'exact',
+            path: API.syncCancel,
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                if (body === undefined) {
+                    writeJson(res, 400, { error: 'invalid JSON body' });
+                    return;
+                }
+                try {
+                    const syncSessionId = typeof body['syncSessionId'] === 'string' ? body['syncSessionId'] : '';
+                    if (syncSessionId !== '') {
+                        const session = syncSessions.get(syncSessionId);
+                        if (session !== undefined) {
+                            await fs.rm(dirname(session.zipPath), { recursive: true, force: true }).catch(() => { });
+                        }
+                        syncSessions.delete(syncSessionId);
+                    }
+                    writeJson(res, 200, { ok: true });
+                }
+                catch (error) {
+                    writeSyncRouteError(res, error);
+                }
+            },
+        },
+        // ------------------------------------------------------ sync/autosync
+        // m-sync-v2：自动同步配置读写（总开关 + 间隔 + 启动阈值 + 状态）。
+        {
+            kind: 'exact',
+            path: API.syncAutosync,
+            handler: async (req, res) => {
+                if (!guard(req, res, 'GET'))
+                    return;
+                try {
+                    writeJson(res, 200, await buildAutosyncStatus(syncDir));
+                }
+                catch (error) {
+                    writeSyncRouteError(res, error);
+                }
+            },
+        },
+        {
+            kind: 'exact',
+            path: API.syncAutosync,
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                if (body === undefined) {
+                    writeJson(res, 400, { error: 'invalid JSON body' });
+                    return;
+                }
+                try {
+                    const cfg = await readAutosyncConfig(syncDir);
+                    if (typeof body['enabled'] === 'boolean')
+                        cfg.enabled = body['enabled'];
+                    if (typeof body['interval'] === 'string' && isAutosyncInterval(body['interval']))
+                        cfg.interval = body['interval'];
+                    if (typeof body['startupMinIntervalMs'] === 'number' && Number.isFinite(body['startupMinIntervalMs']) && body['startupMinIntervalMs'] > 0) {
+                        cfg.startupMinIntervalMs = body['startupMinIntervalMs'];
+                    }
+                    await writeAutosyncConfig(syncDir, cfg);
+                    if (scheduler)
+                        scheduler.reload().catch(() => { });
+                    writeJson(res, 200, await buildAutosyncStatus(syncDir));
                 }
                 catch (error) {
                     writeSyncRouteError(res, error);