dsh-config-manager 0.1.19 → 0.1.21

package/lib/sync/merge.js

@@ -0,0 +1,325 @@
+import { hashSection } from "./sync-state.js";
+/** 收集 local/remote/ancestor 三个快照中出现过的所有分区 id。 */
+function unionSectionIds(local, remote, ancestor) {
+    const ids = new Set();
+    for (const id of Object.keys(local))
+        ids.add(id);
+    for (const id of Object.keys(remote))
+        ids.add(id);
+    if (ancestor)
+        for (const id of Object.keys(ancestor))
+            ids.add(id);
+    return [...ids];
+}
+function computeHashes(local, remote, ancestor, ids) {
+    const m = new Map();
+    for (const id of ids) {
+        const lh = local[id] !== undefined ? hashSection(local[id]) : undefined;
+        const rh = remote[id] !== undefined ? hashSection(remote[id]) : undefined;
+        const ah = ancestor && ancestor[id] !== undefined ? hashSection(ancestor[id]) : undefined;
+        m.set(id, { local: lh, remote: rh, ancestor: ah });
+    }
+    return m;
+}
+/** 顶层 JSON 分区对象：键序无关判等（深度递归，深层数组也判等）。 */
+function deepEqual(a, b) {
+    if (a === b)
+        return true;
+    if (a === null || b === null)
+        return a === b;
+    if (typeof a !== typeof b)
+        return false;
+    if (typeof a !== 'object')
+        return a === b;
+    if (Array.isArray(a) !== Array.isArray(b))
+        return false;
+    if (Array.isArray(a)) {
+        const aa = a;
+        const bb = b;
+        if (aa.length !== bb.length)
+            return false;
+        for (let i = 0; i < aa.length; i++)
+            if (!deepEqual(aa[i], bb[i]))
+                return false;
+        return true;
+    }
+    const ao = a;
+    const bo = b;
+    const ak = Object.keys(ao).sort();
+    const bk = Object.keys(bo).sort();
+    if (ak.length !== bk.length)
+        return false;
+    for (let i = 0; i < ak.length; i++)
+        if (ak[i] !== bk[i])
+            return false;
+    for (const k of ak)
+        if (!deepEqual(ao[k], bo[k]))
+            return false;
+    return true;
+}
+/** JSON 分区精细合并：按 top-level key 走三方合并。
+ *  - 双侧均未改 → 跳过
+ *  - 仅一侧改   → 采纳该侧
+ *  - 双侧均改   → 若 deepEqual 自动合并；否则留为冲突 */
+function mergeJsonSectionGranular(local, remote, ancestor) {
+    const merged = {};
+    const conflicts = [];
+    const keys = new Set([...Object.keys(local), ...Object.keys(remote), ...(ancestor ? Object.keys(ancestor) : [])]);
+    for (const k of keys) {
+        const lHas = Object.prototype.hasOwnProperty.call(local, k);
+        const rHas = Object.prototype.hasOwnProperty.call(remote, k);
+        const aHas = ancestor ? Object.prototype.hasOwnProperty.call(ancestor, k) : false;
+        const lv = lHas ? local[k] : undefined;
+        const rv = rHas ? remote[k] : undefined;
+        const av = aHas ? ancestor[k] : undefined;
+        if (lHas && rHas) {
+            if (deepEqual(lv, rv)) {
+                merged[k] = lv;
+                continue;
+            }
+            // 双侧都有该 key 但值不同 → 看是否都改过
+            const lChanged = !aHas || !deepEqual(lv, av);
+            const rChanged = !aHas || !deepEqual(rv, av);
+            if (lChanged && rChanged) {
+                if (deepEqual(lv, rv)) {
+                    merged[k] = lv; // 两侧改后恰好相同
+                }
+                else {
+                    conflicts.push({ path: k, kind: 'key', local: lv, remote: rv, ancestor: av });
+                }
+            }
+            else if (lChanged) {
+                merged[k] = lv;
+            }
+            else if (rChanged) {
+                merged[k] = rv;
+            }
+            else {
+                merged[k] = lv; // 双侧都未相对祖先改但 deepEqual 已失败——保持一致
+            }
+        }
+        else if (lHas && !rHas) {
+            // 仅本地有：删/改/增？
+            const lChanged = !aHas || !deepEqual(lv, av);
+            if (lChanged) {
+                // 本地增/改，远程删 → 冲突
+                conflicts.push({ path: k, kind: 'key', local: lv, remote: undefined, ancestor: av });
+            }
+            else {
+                // 本地等于祖先、远程缺：远程删 → 跟随删除
+            }
+        }
+        else if (!lHas && rHas) {
+            const rChanged = !aHas || !deepEqual(rv, av);
+            if (rChanged) {
+                // 本地删、远程增 → 冲突
+                conflicts.push({ path: k, kind: 'key', local: undefined, remote: rv, ancestor: av });
+            }
+            else {
+                // 远程等于祖先、本地缺：本地删 → 跟随删除
+            }
+        }
+        else {
+            // 仅祖先有：双侧都删 → 跟随删除
+        }
+    }
+    return { merged, conflicts };
+}
+/** FilesSection 精细合并：按 relativePath 走三方合并（按文件字节 deepEqual）。 */
+function mergeFilesSectionGranular(local, remote, ancestor) {
+    const lMap = new Map();
+    for (const f of local.files)
+        lMap.set(f.relativePath, f.data);
+    const rMap = new Map();
+    for (const f of remote.files)
+        rMap.set(f.relativePath, f.data);
+    const aMap = new Map();
+    if (ancestor)
+        for (const f of ancestor.files)
+            aMap.set(f.relativePath, f.data);
+    const paths = new Set([...lMap.keys(), ...rMap.keys(), ...aMap.keys()]);
+    const mergedFiles = [];
+    const conflicts = [];
+    for (const p of paths) {
+        const l = lMap.get(p);
+        const r = rMap.get(p);
+        const a = aMap.get(p);
+        const eq = (x, y) => {
+            if (x === undefined || y === undefined)
+                return x === y;
+            if (x.length !== y.length)
+                return false;
+            for (let i = 0; i < x.length; i++)
+                if (x[i] !== y[i])
+                    return false;
+            return true;
+        };
+        if (l && r) {
+            if (eq(l, r)) {
+                mergedFiles.push({ relativePath: p, data: l, contentHash: '' });
+                continue;
+            }
+            const lChanged = !a || !eq(l, a);
+            const rChanged = !a || !eq(r, a);
+            if (lChanged && rChanged) {
+                conflicts.push({ path: p, kind: 'file', local: l, remote: r, ancestor: a });
+            }
+            else if (lChanged) {
+                mergedFiles.push({ relativePath: p, data: l, contentHash: '' });
+            }
+            else if (rChanged) {
+                mergedFiles.push({ relativePath: p, data: r, contentHash: '' });
+            }
+            else {
+                mergedFiles.push({ relativePath: p, data: l, contentHash: '' });
+            }
+        }
+        else if (l && !r) {
+            const aExists = a !== undefined;
+            const lChanged = aExists ? !eq(l, a) : true;
+            if (lChanged) {
+                if (!aExists) {
+                    // 纯本地新增（祖先里也没有）→ keepLocal
+                    mergedFiles.push({ relativePath: p, data: l, contentHash: '' });
+                }
+                else {
+                    // 本地改/增 vs 远程删 → 冲突
+                    conflicts.push({ path: p, kind: 'file', local: l, remote: undefined, ancestor: a });
+                }
+            }
+        }
+        else if (!l && r) {
+            const aExists = a !== undefined;
+            const rChanged = aExists ? !eq(r, a) : true;
+            if (rChanged) {
+                if (!aExists) {
+                    // 纯远程新增（祖先里也没有）→ useRemote
+                    mergedFiles.push({ relativePath: p, data: r, contentHash: '' });
+                }
+                else {
+                    // 本地删 vs 远程改/增 → 冲突
+                    conflicts.push({ path: p, kind: 'file', local: undefined, remote: r, ancestor: a });
+                }
+            }
+        }
+    }
+    return { merged: { version: 1, files: mergedFiles }, conflicts };
+}
+/** 识别 JSON 分区的「键级合并」键值映射（如 settings/ui 的 namespaces、providers 的 providers）。
+ * 返回 undefined → 该分区无法做键级合并，调用方应退化为整分区冲突。 */
+function keyMapOf(data) {
+    const obj = data;
+    if (obj && typeof obj === 'object' && obj['version'] === 1) {
+        const ns = obj['namespaces'];
+        if (ns && typeof ns === 'object' && !Array.isArray(ns))
+            return ns;
+        const prov = obj['providers'];
+        if (prov && typeof prov === 'object' && !Array.isArray(prov))
+            return prov;
+    }
+    return undefined;
+}
+/** 主入口：三方合并。纯函数，无副作用。 */
+export function merge(local, remote, ancestor) {
+    const l = local;
+    const r = remote;
+    const a = ancestor;
+    const ids = unionSectionIds(l, r, a);
+    const hashes = computeHashes(l, r, a, ids);
+    const results = [];
+    for (const id of ids) {
+        const h = hashes.get(id);
+        const lData = l[id];
+        const rData = r[id];
+        const aData = a ? a[id] : undefined;
+        // 远端无 → skip（不在本轮考虑；本地有但远端没有 = 远端"删了"，视作 useRemote=删除）
+        // 本实现按远端视角：远端缺 + 本地存在 + 本地未改祖先 → skip(无变化)；否则冲突。
+        if (rData === undefined && lData !== undefined) {
+            const lChanged = h.ancestor === undefined || h.local !== h.ancestor;
+            if (!lChanged) {
+                results.push({ id, decision: 'skip', conflicts: [] });
+                continue;
+            }
+            results.push({ id, decision: 'conflict', conflicts: [{ path: '$', kind: 'key', local: lData, remote: undefined, ancestor: aData }] });
+            continue;
+        }
+        // 本地无、远端有：远端新增；本地删除过（=等于祖先空）+祖先空→skip；否则按 useRemote。
+        if (lData === undefined && rData !== undefined) {
+            const rChanged = h.ancestor === undefined || h.remote !== h.ancestor;
+            if (!rChanged) {
+                results.push({ id, decision: 'skip', conflicts: [] });
+                continue;
+            }
+            results.push({ id, decision: 'useRemote', merged: rData, conflicts: [] });
+            continue;
+        }
+        // 双方都没有 → skip
+        if (lData === undefined && rData === undefined) {
+            results.push({ id, decision: 'skip', conflicts: [] });
+            continue;
+        }
+        // 双方都有
+        if (h.local === h.remote) {
+            results.push({ id, decision: 'skip', conflicts: [] });
+            continue;
+        }
+        if (h.ancestor === undefined) {
+            // 无祖先 → 两方差异视为整分区冲突（不猜测）
+            results.push({ id, decision: 'conflict', conflicts: [{ path: '$', kind: 'key', local: lData, remote: rData, ancestor: undefined }] });
+            continue;
+        }
+        if (h.local === h.ancestor) {
+            results.push({ id, decision: 'useRemote', merged: rData, conflicts: [] });
+            continue;
+        }
+        if (h.remote === h.ancestor) {
+            results.push({ id, decision: 'keepLocal', merged: lData, conflicts: [] });
+            continue;
+        }
+        // 双侧相对祖先都改 → 进入精细合并
+        if (isFilesSectionData(lData)) {
+            const { merged, conflicts } = mergeFilesSectionGranular(lData, rData, aData);
+            if (conflicts.length === 0) {
+                results.push({ id, decision: 'useRemote', merged: merged, conflicts: [] });
+            }
+            else {
+                results.push({ id, decision: 'conflict', conflicts, merged: undefined });
+            }
+            continue;
+        }
+        // JSON 分区：识别可键级合并的子映射（namespaces / providers）
+        const lKeyMap = keyMapOf(lData);
+        const rKeyMap = keyMapOf(rData);
+        const aKeyMap = aData ? keyMapOf(aData) : undefined;
+        if (lKeyMap && rKeyMap) {
+            const { merged: mergedKeys, conflicts } = mergeJsonSectionGranular(lKeyMap, rKeyMap, aKeyMap);
+            // 重组 SectionData：用 l/r 中较新者保留非键级合并字段（version 等），键级合并字段用 mergedKeys
+            const lObj = lData;
+            const rObj = rData;
+            const base = { ...lObj, ...rObj };
+            // 找到键级合并字段在 base 中的键名
+            const keyFieldName = lKeyMap === lObj['namespaces'] ? 'namespaces'
+                : lKeyMap === lObj['providers'] ? 'providers' : undefined;
+            if (keyFieldName)
+                base[keyFieldName] = mergedKeys;
+            if (conflicts.length === 0) {
+                results.push({ id, decision: 'useRemote', merged: base, conflicts: [] });
+            }
+            else {
+                results.push({ id, decision: 'conflict', conflicts, merged: undefined });
+            }
+            continue;
+        }
+        // 非键级合并 JSON 分区（plugins/mcp/prompts/workspaces 等）：退化为整分区冲突
+        results.push({ id, decision: 'conflict', conflicts: [{ path: '$', kind: 'key', local: lData, remote: rData, ancestor: aData }] });
+    }
+    return { sections: results };
+}
+/** 分区是否为文件类（FilesSection）—— 鸭子类型，复用 sync-state 的判定以保持一致。 */
+function isFilesSectionData(data) {
+    if (data === null || typeof data !== 'object')
+        return false;
+    const obj = data;
+    return obj.version === 1 && Array.isArray(obj.files);
+}
+//# sourceMappingURL=merge.js.map

package/lib/sync/merge.js.map

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

package/lib/sync/review-queue.d.ts

@@ -0,0 +1,51 @@
+/**
+ * m-sync-flow：待审队列持久化（独立文件 sync-review-queue.json）。
+ *
+ * 与 sync-state.json 分文件存放：sync-state 是机器可读同步元数据，
+ * 待审队列是用户可见/可决策的工作队列；混在一起会让同步引擎误读。
+ *
+ * 设计：
+ *  - 只存差异摘要（items 数组），不存全量 payload——避免双写；
+ *    UI 需要完整数据时回拉远端或复用运行时 MergePlan。
+ *  - 写入用 writeFile + rename 原子提交：半成品文件不会污染读侧。
+ *  - 损坏 JSON 严格拒绝（不静默降级到空队列）。
+ */
+import fs from 'node:fs/promises';
+export declare const REVIEW_QUEUE_FILE = "sync-review-queue.json";
+/** 单条待审项（决策前 description/local/remote/ancestor 必填；decision 可选） */
+export interface ReviewQueueItem {
+    id: string;
+    /** 分区 id（settings / providers / workspaces / plugins / mcp 等） */
+    sectionId: string;
+    /** 'key' | 'file' | 'section'：冲突粒度（来自 MergeConflict.kind 或整分区冲突） */
+    kind: 'key' | 'file' | 'section';
+    description: string;
+    local?: unknown;
+    remote?: unknown;
+    ancestor?: unknown;
+    /** 用户决策（resolve 后写入） */
+    decision?: 'useRemote' | 'keepLocal' | 'skip';
+    decidedAt?: string;
+    /** 关联的远端快照 id（追溯来源） */
+    snapshotId?: string;
+}
+export interface ReviewQueue {
+    items: ReviewQueueItem[];
+    updatedAt: string;
+}
+export declare const EMPTY_REVIEW_QUEUE: ReviewQueue;
+/** 读取待审队列；文件不存在 → 返回空队列；损坏 JSON 抛错。 */
+export declare function readReviewQueue(stateDir: string, fsx?: Pick<typeof fs, 'readFile' | 'writeFile' | 'rename' | 'stat' | 'mkdir'>): Promise<ReviewQueue>;
+/**
+ * 原子写入：先写临时文件 + rename 到目标文件（POSIX/Windows 均支持 rename 原子替换）。
+ * 同一 stateDir 下并发调用不会产生半成品文件（写完临时再 rename）。
+ */
+export declare function writeReviewQueue(stateDir: string, queue: ReviewQueue, fsx?: Pick<typeof fs, 'readFile' | 'writeFile' | 'rename' | 'stat' | 'mkdir'>): Promise<void>;
+/** 把多 item 追加到队列（同 id 视为同一项，不重复追加） */
+export declare function enqueueItems(stateDir: string, items: Omit<ReviewQueueItem, 'id' | 'decidedAt' | 'decision'>[], now?: () => Date, fsx?: Pick<typeof fs, 'readFile' | 'writeFile' | 'rename' | 'stat' | 'mkdir'>): Promise<ReviewQueue>;
+/** 把整组合并后的 autoApply 项（失败回滚后）入队 */
+export declare function enqueueAutoAppliedOnFailure(stateDir: string, items: Omit<ReviewQueueItem, 'id' | 'decidedAt' | 'decision'>[], fsx?: Pick<typeof fs, 'readFile' | 'writeFile' | 'rename' | 'stat' | 'mkdir'>): Promise<ReviewQueue>;
+/** 用户对某条 item 做了决策（keepLocal / useRemote / skip）；未找到抛错。 */
+export declare function resolveItem(stateDir: string, itemId: string, decision: 'useRemote' | 'keepLocal' | 'skip', now?: () => Date, fsx?: Pick<typeof fs, 'readFile' | 'writeFile' | 'rename' | 'stat' | 'mkdir'>): Promise<ReviewQueue>;
+/** 工具：在临时目录构造 stateDir 的便捷工厂（测试用） */
+export declare function tmpStateDir(prefix: string): Promise<string>;

package/lib/sync/review-queue.js

@@ -0,0 +1,119 @@
+/**
+ * m-sync-flow：待审队列持久化（独立文件 sync-review-queue.json）。
+ *
+ * 与 sync-state.json 分文件存放：sync-state 是机器可读同步元数据，
+ * 待审队列是用户可见/可决策的工作队列；混在一起会让同步引擎误读。
+ *
+ * 设计：
+ *  - 只存差异摘要（items 数组），不存全量 payload——避免双写；
+ *    UI 需要完整数据时回拉远端或复用运行时 MergePlan。
+ *  - 写入用 writeFile + rename 原子提交：半成品文件不会污染读侧。
+ *  - 损坏 JSON 严格拒绝（不静默降级到空队列）。
+ */
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import crypto from 'node:crypto';
+import { parseJsonSafe, stringifyJsonSafe } from "../utils/json.js";
+export const REVIEW_QUEUE_FILE = 'sync-review-queue.json';
+export const EMPTY_REVIEW_QUEUE = { items: [], updatedAt: '' };
+/** 读取待审队列；文件不存在 → 返回空队列；损坏 JSON 抛错。 */
+export async function readReviewQueue(stateDir, fsx = fs) {
+    const file = path.join(stateDir, REVIEW_QUEUE_FILE);
+    try {
+        const raw = await fsx.readFile(file, 'utf8');
+        const parsed = parseJsonSafe(raw);
+        if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            throw new Error('sync-review-queue.json 损坏：必须是对象');
+        }
+        const obj = parsed;
+        if (!Array.isArray(obj['items'])) {
+            throw new Error('sync-review-queue.json 损坏：items 必须是数组');
+        }
+        const items = [];
+        for (const it of obj['items']) {
+            if (it === null || typeof it !== 'object' || Array.isArray(it)) {
+                throw new Error('sync-review-queue.json 损坏：每个 item 必须是对象');
+            }
+            const i = it;
+            if (typeof i['id'] !== 'string' || typeof i['sectionId'] !== 'string'
+                || typeof i['kind'] !== 'string' || typeof i['description'] !== 'string') {
+                throw new Error('sync-review-queue.json 损坏：item 必须含字符串 id/sectionId/kind/description');
+            }
+            items.push(i);
+        }
+        return {
+            items,
+            updatedAt: typeof obj['updatedAt'] === 'string' ? obj['updatedAt'] : '',
+        };
+    }
+    catch (err) {
+        if (err.code === 'ENOENT')
+            return { ...EMPTY_REVIEW_QUEUE };
+        throw err;
+    }
+}
+/**
+ * 原子写入：先写临时文件 + rename 到目标文件（POSIX/Windows 均支持 rename 原子替换）。
+ * 同一 stateDir 下并发调用不会产生半成品文件（写完临时再 rename）。
+ */
+export async function writeReviewQueue(stateDir, queue, fsx = fs) {
+    await fsx.mkdir(stateDir, { recursive: true });
+    const target = path.join(stateDir, REVIEW_QUEUE_FILE);
+    const tmp = path.join(stateDir, `.${REVIEW_QUEUE_FILE}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`);
+    const data = stringifyJsonSafe(queue, { space: 2 });
+    try {
+        await fsx.writeFile(tmp, data, 'utf8');
+        await fsx.rename(tmp, target);
+    }
+    catch (err) {
+        // 清理可能残留的临时文件
+        try {
+            await fsx.stat(tmp);
+            await fsx.rename(tmp, target);
+        }
+        catch { /* ignore */ }
+        throw err;
+    }
+}
+/** 生成稳定 id（基于内容的 hex；同 description → 同 id，便于去重） */
+function hashItemId(sectionId, kind, description, path) {
+    const h = crypto.createHash('sha256');
+    h.update(`${sectionId}\u0000${kind}\u0000${path ?? ''}\u0000${description}`);
+    return h.digest('hex').slice(0, 16);
+}
+/** 把多 item 追加到队列（同 id 视为同一项，不重复追加） */
+export async function enqueueItems(stateDir, items, now = () => new Date(), fsx = fs) {
+    const current = await readReviewQueue(stateDir, fsx);
+    const seen = new Set(current.items.map((i) => i.id));
+    for (const it of items) {
+        const id = hashItemId(it.sectionId, it.kind, it.description);
+        if (seen.has(id))
+            continue;
+        current.items.push({ ...it, id });
+        seen.add(id);
+    }
+    current.updatedAt = now().toISOString();
+    await writeReviewQueue(stateDir, current, fsx);
+    return current;
+}
+/** 把整组合并后的 autoApply 项（失败回滚后）入队 */
+export async function enqueueAutoAppliedOnFailure(stateDir, items, fsx = fs) {
+    return enqueueItems(stateDir, items, undefined, fsx);
+}
+/** 用户对某条 item 做了决策（keepLocal / useRemote / skip）；未找到抛错。 */
+export async function resolveItem(stateDir, itemId, decision, now = () => new Date(), fsx = fs) {
+    const current = await readReviewQueue(stateDir, fsx);
+    const idx = current.items.findIndex((i) => i.id === itemId);
+    if (idx === -1)
+        throw new Error(`resolveItem: 未找到 itemId ${itemId}`);
+    current.items[idx] = { ...current.items[idx], decision, decidedAt: now().toISOString() };
+    current.updatedAt = now().toISOString();
+    await writeReviewQueue(stateDir, current, fsx);
+    return current;
+}
+/** 工具：在临时目录构造 stateDir 的便捷工厂（测试用） */
+export function tmpStateDir(prefix) {
+    return fs.mkdtemp(path.join(os.tmpdir(), prefix));
+}
+//# sourceMappingURL=review-queue.js.map

package/lib/sync/review-queue.js.map

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

package/lib/sync/risk.d.ts

@@ -0,0 +1,59 @@
+/**
+ * m-sync-flow：分级自动应用策略 + 首次强制预览（纯函数）。
+ *
+ * 数据源：P2a 的 MergePlan（每分区 decision + conflicts）。
+ * 产出：SyncApplyPlan 三组（autoApply / review / skipped），供 SyncEngine.applyMergePlan 与 UI 使用。
+ *
+ * 规则：
+ *  - SECTION_RISK_TIER 把每个 SectionId 静态归类到 low / medium / high；
+ *  - 双向 conflict 分区永远进 review（无论风险与 firstSync 与否）；
+ *  - firstSync=true 时所有非 skip 项一律进 review（安全第一：人工确认后才开启自动）；
+ *  - firstSync=false 时按风险等级分流：低风险且 useRemote/keepLocal 进 autoApply；
+ *    中风险、high、双向冲突 → review；skip 或无变化 → skipped。
+ */
+import type { MergePlan, MergeSectionResult } from './merge.ts';
+import type { SectionId } from '../schema/types.ts';
+/** 分区风险等级（驱动自动应用 vs 待审） */
+export type RiskTier = 'low' | 'medium' | 'high';
+/**
+ * 分区风险映射（v1 静态表；可后续接入适配器声明的 risk 字段动态化）。
+ * - low    ：低风险——自动应用（无冲突时）
+ *   settings / ui / providers / prompts
+ * - medium ：中风险——待审队列（路径映射、安装、变更）
+ *   workspaces / plugins / mcp
+ * - high   ：高风险——永不自动（含双向冲突、设备专属、凭据/秘密）
+ *   credentialsStatus / secrets / sessions / pluginFiles / workspaces? 不，
+ *   按规划表 workspaces 归 medium（中风险），credentialsStatus/secrets 归 high；
+ *   agentPresets / skills 暂归 low（受 sync 通道的 portable 过滤实际不会携带 skills）。
+ */
+export declare const SECTION_RISK_TIER: Readonly<Record<SectionId, RiskTier>>;
+export interface ClassifyOptions {
+    /**
+     * true = 首次同步：所有非 skip 项一律进 review（无论风险等级）；
+     * false（默认）= 按风险等级分流。
+     * 调用方在 SyncEngine 中维护 firstSyncCompleted 标志。
+     */
+    firstSync: boolean;
+}
+/** 自动应用三组结果（互斥：同一 sectionId 只出现在一组） */
+export interface SyncApplyPlan {
+    autoApply: MergeSectionResult[];
+    review: MergeSectionResult[];
+    skipped: MergeSectionResult[];
+}
+/**
+ * 按风险等级 + firstSync 标志将 MergePlan 分流到三组。
+ * 纯函数：相同输入 → 相同输出；不读 fs、不发网络。
+ */
+export declare function classifyMergePlan(plan: MergePlan, opts: ClassifyOptions): SyncApplyPlan;
+/**
+ * 分流摘要计数（供 UI 徽章显示）。
+ * 同一函数复用：纯函数无副作用。
+ */
+export interface SyncApplySummary {
+    autoApplyCount: number;
+    reviewCount: number;
+    skippedCount: number;
+    totalCount: number;
+}
+export declare function summarizeApplyPlan(apply: SyncApplyPlan): SyncApplySummary;