@carloswon/cairn-memory 0.6.0 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +2 -2
- package/dist/src/core/types.d.ts +6 -0
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/governance/apply.js +3 -12
- package/dist/src/governance/apply.js.map +1 -1
- package/dist/src/interfaces/app-service.d.ts +19 -0
- package/dist/src/interfaces/app-service.js +107 -67
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +25 -6
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-css.js +6 -2
- package/dist/src/interfaces/console/assets/ui-css.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-js.js +286 -94
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/assets/url-state.d.ts +1 -1
- package/dist/src/interfaces/console/assets/url-state.js +2 -2
- package/dist/src/interfaces/console/assets/url-state.js.map +1 -1
- package/dist/src/interfaces/console/model.d.ts +16 -0
- package/dist/src/interfaces/console/model.js +34 -1
- package/dist/src/interfaces/console/model.js.map +1 -1
- package/dist/src/interfaces/console/server.js +2 -0
- package/dist/src/interfaces/console/server.js.map +1 -1
- package/dist/src/interfaces/mcp/server.js +3 -0
- package/dist/src/interfaces/mcp/server.js.map +1 -1
- package/dist/src/store/memories.d.ts +6 -1
- package/dist/src/store/memories.js +9 -3
- package/dist/src/store/memories.js.map +1 -1
- package/dist/src/store/migrate.js +10 -1
- package/dist/src/store/migrate.js.map +1 -1
- package/dist/src/store/open.js +1 -1
- package/dist/src/store/open.js.map +1 -1
- package/dist/src/store/outbox.d.ts +8 -7
- package/dist/src/store/outbox.js +34 -1
- package/dist/src/store/outbox.js.map +1 -1
- package/dist/src/store/schema.d.ts +17 -0
- package/dist/src/store/schema.js +65 -0
- package/dist/src/store/schema.js.map +1 -1
- package/dist/src/sync/apply.d.ts +12 -2
- package/dist/src/sync/apply.js +109 -19
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backfill.d.ts +48 -5
- package/dist/src/sync/backfill.js +70 -10
- package/dist/src/sync/backfill.js.map +1 -1
- package/dist/src/sync/events.d.ts +18 -0
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/orchestrate.d.ts +4 -0
- package/dist/src/sync/orchestrate.js +24 -10
- package/dist/src/sync/orchestrate.js.map +1 -1
- package/dist/src/sync/pull.d.ts +8 -3
- package/dist/src/sync/pull.js +95 -79
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +16 -0
- package/dist/src/sync/push.js +146 -38
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/route.d.ts +44 -0
- package/dist/src/sync/route.js +88 -0
- package/dist/src/sync/route.js.map +1 -0
- package/dist/src/sync/vault.d.ts +27 -1
- package/dist/src/sync/vault.js +41 -1
- package/dist/src/sync/vault.js.map +1 -1
- package/docs/cairn-security.md +25 -18
- package/package.json +1 -1
package/dist/src/sync/apply.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
2
|
import { nowIso } from '../core/time.js';
|
|
3
|
-
|
|
3
|
+
import { PERSONAL_SPACE_KEY, isPreserveSpaceKey, isPreserveScopePreset } from './vault.js';
|
|
4
|
+
/** 「不再持有」标记:meta 行(不加表列;与 sync_pushed/sync_seq 同一 meta 键空间)。
|
|
5
|
+
* 语义限定为「不再经个人链持有」(保管链内容不在个人链上,标记不覆盖它)。 */
|
|
4
6
|
function scopeExitKey(memoryId) {
|
|
5
7
|
return `scope_exit:${memoryId}`;
|
|
6
8
|
}
|
|
@@ -10,8 +12,47 @@ function hasScopeExitMarker(store, memoryId) {
|
|
|
10
12
|
function clearScopeExitMarker(store, memoryId) {
|
|
11
13
|
store.db.run('DELETE FROM meta WHERE key = ?', scopeExitKey(memoryId));
|
|
12
14
|
}
|
|
15
|
+
function chainRole(spaceKey) {
|
|
16
|
+
if (spaceKey === PERSONAL_SPACE_KEY)
|
|
17
|
+
return 'personal';
|
|
18
|
+
if (isPreserveSpaceKey(spaceKey))
|
|
19
|
+
return 'preserve';
|
|
20
|
+
throw err('E_VALIDATION', `未知同步链: ${spaceKey}`);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* 描述符 → 本地作用域行(find-or-create)。保管链事件的项目作用域会连带
|
|
24
|
+
* find-or-create 项目与空间行(projectId 是跨设备稳定 UUID);只建结构行,
|
|
25
|
+
* 绝不产生任何 outbox 任务(spec:拉取路径不产生上行)。
|
|
26
|
+
*/
|
|
27
|
+
function materializeScope(store, role, descriptor, ownDeviceId) {
|
|
28
|
+
if (role === 'personal') {
|
|
29
|
+
return store.scopes.resolvePreset('personal-global');
|
|
30
|
+
}
|
|
31
|
+
const d = descriptor;
|
|
32
|
+
if (!d) {
|
|
33
|
+
// 保管链事件必有描述符(本变更起才有保管链);缺失属防御路径,按设备限定落位。
|
|
34
|
+
return store.scopes.resolvePreset('device-local', { deviceId: ownDeviceId });
|
|
35
|
+
}
|
|
36
|
+
if (d.preset === 'personal-global') {
|
|
37
|
+
return store.scopes.resolvePreset('personal-global');
|
|
38
|
+
}
|
|
39
|
+
if (!isPreserveScopePreset(d.preset)) {
|
|
40
|
+
// agent-private / session-ephemeral / custom:任何模式都不经云落地
|
|
41
|
+
throw err('E_FORBIDDEN', `保管链事件描述符的作用域不可物化: ${d.preset}`);
|
|
42
|
+
}
|
|
43
|
+
if (d.preset === 'device-local') {
|
|
44
|
+
return store.scopes.resolvePreset('device-local', { deviceId: d.deviceId ?? ownDeviceId });
|
|
45
|
+
}
|
|
46
|
+
// project-global / project-device:projectId 是稳定身份,直接 find-or-create
|
|
47
|
+
const opts = { projectId: d.projectId ?? '', projectName: d.spaceName ?? d.projectId ?? d.preset };
|
|
48
|
+
if (d.preset === 'project-device') {
|
|
49
|
+
return store.scopes.resolvePreset('project-device', { ...opts, deviceId: d.deviceId ?? ownDeviceId });
|
|
50
|
+
}
|
|
51
|
+
return store.scopes.resolvePreset('project-global', opts);
|
|
52
|
+
}
|
|
13
53
|
export function applyEvent(store, ev, spaceKey, audit) {
|
|
14
54
|
const memories = store.memories;
|
|
55
|
+
const role = chainRole(spaceKey);
|
|
15
56
|
// 跨设备记忆身份对齐:id 命中 → 直接用;否则按修订内容哈希血统匹配
|
|
16
57
|
// (记忆 id 在各设备本地生成,不可跨设备引用——第一版实现的教训)
|
|
17
58
|
let mem = memories.get(ev.memoryId) ??
|
|
@@ -28,14 +69,16 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
28
69
|
return 'skipped';
|
|
29
70
|
}
|
|
30
71
|
const alreadyMarked = hasScopeExitMarker(store, mem.id);
|
|
31
|
-
if (alreadyMarked
|
|
32
|
-
return 'skipped'; //
|
|
72
|
+
if (alreadyMarked)
|
|
73
|
+
return 'skipped'; // 幂等:标记存在即处理过(重复事件不再改动)
|
|
33
74
|
store.db.transaction(() => {
|
|
34
|
-
|
|
35
|
-
//
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
75
|
+
store.db.run('INSERT INTO meta (key, value) VALUES (?, ?)', scopeExitKey(mem.id), nowIso());
|
|
76
|
+
// 归档只在「当前持有是经个人链」时发生:记忆已落在保管链作用域(自设备重放
|
|
77
|
+
// 先于迁出事件到达)说明本设备仍以别的作用域持有它,只补标记不归档。
|
|
78
|
+
const scope = store.scopes.getById(mem.scopeId);
|
|
79
|
+
if (scope?.preset === 'personal-global') {
|
|
80
|
+
store.db.run("UPDATE memory SET status = 'archived', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
81
|
+
}
|
|
39
82
|
});
|
|
40
83
|
audit.record('sync', 'scope_exit_applied', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
41
84
|
return 'scopeExited';
|
|
@@ -66,12 +109,31 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
66
109
|
throw err('E_VALIDATION', `upsert 事件缺 upsert payload: ${ev.memoryId}#${ev.seq}`);
|
|
67
110
|
}
|
|
68
111
|
const payload = ev.payload;
|
|
112
|
+
const descriptor = payload.scope;
|
|
113
|
+
// 物化作用域(提前解析:个人链固定 personal-global;保管链按描述符)。
|
|
114
|
+
// 保管链描述符不可物化(agent-private 等)→ skip + 审计,绝不落地。
|
|
115
|
+
let matScope;
|
|
116
|
+
try {
|
|
117
|
+
matScope = materializeScope(store, role, descriptor, store.identity.deviceId);
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
if (e.code === 'E_FORBIDDEN') {
|
|
121
|
+
audit.record('sync', 'preserve_scope_not_materialized', { type: 'memory', id: ev.memoryId }, {
|
|
122
|
+
from: ev.deviceId,
|
|
123
|
+
seq: ev.seq,
|
|
124
|
+
preset: descriptor?.preset ?? null,
|
|
125
|
+
});
|
|
126
|
+
return 'shadowed';
|
|
127
|
+
}
|
|
128
|
+
throw e;
|
|
129
|
+
}
|
|
69
130
|
if (!mem) {
|
|
70
|
-
// 未知记忆:直接创建(内容哈希完整性在 validateUpsertEvent
|
|
131
|
+
// 未知记忆:直接创建(内容哈希完整性在 validateUpsertEvent 已保证)。
|
|
132
|
+
// 归属设备(D8):记录事件来源设备(个人链事件的 deviceId = 发送设备)。
|
|
71
133
|
memories.add({
|
|
72
134
|
kind: payload.kind,
|
|
73
135
|
content: payload.content,
|
|
74
|
-
scopeId:
|
|
136
|
+
scopeId: matScope.id,
|
|
75
137
|
authority: payload.authority,
|
|
76
138
|
createdBy: payload.createdBy ?? `sync:${ev.deviceId}`,
|
|
77
139
|
sourceAgent: payload.sourceAgent,
|
|
@@ -80,7 +142,7 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
80
142
|
expiresAt: payload.expiresAt,
|
|
81
143
|
sensitivity: payload.sensitivity,
|
|
82
144
|
observedAt: payload.observedAt,
|
|
83
|
-
}, store.identity.deviceId);
|
|
145
|
+
}, store.identity.deviceId, ev.deviceId);
|
|
84
146
|
audit.record('sync', 'memory_created_from_remote', { type: 'memory', id: ev.memoryId }, { from: ev.deviceId, seq: ev.seq });
|
|
85
147
|
return 'applied';
|
|
86
148
|
}
|
|
@@ -89,28 +151,62 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
89
151
|
audit.record('sync', 'upsert_shadowed_by_tombstone', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
90
152
|
return 'shadowed';
|
|
91
153
|
}
|
|
154
|
+
const marked = hasScopeExitMarker(store, mem.id);
|
|
92
155
|
// 迁回重推(add-scope-migration):先解除「不再持有」并恢复活动,再走正常修订链。
|
|
93
156
|
// 内容相同也会走到这里(先解除再判定 skipped),所以对端迁回后即使没有新修订也能重新持有。
|
|
94
|
-
|
|
157
|
+
// 重新持有时一并物化回 personal-global(记忆此前被本地迁到别的作用域的场景)。
|
|
158
|
+
if (role === 'personal' && payload.reentry === true && marked) {
|
|
95
159
|
clearScopeExitMarker(store, mem.id);
|
|
96
160
|
if (mem.status === 'archived') {
|
|
97
161
|
store.db.run("UPDATE memory SET status = 'active', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
98
162
|
}
|
|
163
|
+
if (mem.scopeId !== matScope.id) {
|
|
164
|
+
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
165
|
+
}
|
|
99
166
|
audit.record('sync', 'scope_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
100
167
|
}
|
|
101
|
-
else if (payload.reentry !== true &&
|
|
168
|
+
else if (role === 'personal' && payload.reentry !== true && marked) {
|
|
102
169
|
// 迁出后的迟到修订:不再作为活动内容呈现,也不解除标记(spec「迁出事件的通知语义」)
|
|
103
170
|
audit.record('sync', 'upsert_shadowed_by_scope_exit', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
104
171
|
return 'shadowed';
|
|
105
172
|
}
|
|
173
|
+
// 保管链 upsert 落在带标记的记忆上:这是自设备重放(恢复场景)——设备仍以
|
|
174
|
+
// 描述符作用域持有它。解除归档并按描述符落位;保留个人链标记(个人链持有确实已离开,
|
|
175
|
+
// 迟到的个人链修订仍应被挡)。
|
|
176
|
+
const reheldFromMarker = role === 'preserve' && marked;
|
|
177
|
+
if (reheldFromMarker) {
|
|
178
|
+
if (mem.status === 'archived') {
|
|
179
|
+
store.db.run("UPDATE memory SET status = 'active', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
180
|
+
}
|
|
181
|
+
if (mem.scopeId !== matScope.id) {
|
|
182
|
+
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
183
|
+
}
|
|
184
|
+
audit.record('sync', 'preserve_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
185
|
+
}
|
|
106
186
|
if (mem.contentHash === payload.contentHash)
|
|
107
187
|
return 'skipped';
|
|
108
188
|
// 快进:远端事件的父哈希 == 本地当前内容哈希 → 远端是本地历史的孩子
|
|
109
189
|
if (payload.parentHash && payload.parentHash === mem.contentHash) {
|
|
110
190
|
memories.revise(mem.id, payload.content, { reason: `sync from ${ev.deviceId}#${ev.seq}`, author: `sync:${ev.deviceId}` }, store.identity.deviceId);
|
|
191
|
+
// 物化随内容走:保管链事件按描述符落位;个人链事件不动已有落位
|
|
192
|
+
// (本设备主动迁移后的并发修订不该被拉回 personal-global)。
|
|
193
|
+
if (role === 'preserve' && mem.scopeId !== matScope.id) {
|
|
194
|
+
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
195
|
+
}
|
|
111
196
|
audit.record('sync', 'fast_forwarded', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
112
197
|
return 'applied';
|
|
113
198
|
}
|
|
199
|
+
// 每设备每链的事件序列是单写者的(个人链同样按设备分段):事件内容已在
|
|
200
|
+
// 本记忆历史中 → 已并入,跳过(不是等待)。自链重放(找回/自拉取)遇到
|
|
201
|
+
// 「本地已是 v2、事件是 v1」的陈旧修订时,等下去只会让游标永远卡住——
|
|
202
|
+
// 2026-11-15 真实库自拉取实测踩中(个人链自游标停在首个陈旧修订)。
|
|
203
|
+
if (payload.contentHash) {
|
|
204
|
+
const known = memories.findRevisionByContentHash(mem.id, payload.contentHash);
|
|
205
|
+
if (known) {
|
|
206
|
+
audit.record('sync', 'stale_event_skipped', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
207
|
+
return 'skipped';
|
|
208
|
+
}
|
|
209
|
+
}
|
|
114
210
|
// 并发:parentHash 能对齐到本地历史(共同祖先)→ 保留双方并入冲突队列
|
|
115
211
|
const ancestor = payload.parentHash ? memories.findRevisionByContentHash(mem.id, payload.parentHash) : null;
|
|
116
212
|
if (payload.parentHash && ancestor) {
|
|
@@ -157,12 +253,6 @@ function matchByLineage(store, ev) {
|
|
|
157
253
|
}
|
|
158
254
|
return null;
|
|
159
255
|
}
|
|
160
|
-
function scopeScopeId(store, spaceKey) {
|
|
161
|
-
if (spaceKey !== 'personal-global') {
|
|
162
|
-
throw err('E_VALIDATION', `本变更仅同步 personal-global 空间,收到 ${spaceKey}`);
|
|
163
|
-
}
|
|
164
|
-
return store.scopes.resolvePreset('personal-global').id;
|
|
165
|
-
}
|
|
166
256
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
167
257
|
export function applyEvents(store, events, spaceKey) {
|
|
168
258
|
const audit = store.audit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAwBzC,gEAAgE;AAChE,SAAS,YAAY,CAAC,QAAgB;IACpC,OAAO,cAAc,QAAQ,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB,EAAE,QAAgB;IAC7D,OAAO,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,sCAAsC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAiB,EAAE,QAAgB;IAC/D,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAiB,EAAE,EAAa,EAAE,QAAgB,EAAE,KAAe;IAC5F,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,sCAAsC;IACtC,qCAAqC;IACrC,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;QACjC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,uDAAuD;YACvD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,2BAA2B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3H,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChC,2BAA2B;YAC3B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,kCAAkC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7H,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO,SAAS,CAAC,CAAC,cAAc;QAChF,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACxB,+DAA+D;YAC/D,4CAA4C;YAC5C,IAAI,CAAC,aAAa;gBAAE,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,6CAA6C,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAChH,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,oEAAoE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/G,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,2BAA2B;YAC3B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,0BAA0B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1H,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY;YAAE,OAAO,SAAS,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrF,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACjH,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAChC,qCAAqC;QACrC,8CAA8C;QAC9C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;YACjF,IAAI,EAAE,EAAE,CAAC,QAAQ;YACjB,GAAG,EAAE,EAAE,CAAC,GAAG;YACX,SAAS,EAAE,MAAM,CAAE,EAAyB,CAAC,IAAI,CAAC;SACnD,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,GAAG,CAAC,cAAc,EAAE,8BAA8B,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,8CAA8C;QAC9C,QAAQ,CAAC,GAAG,CACV;YACE,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC;YACtC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC,QAAQ,EAAE;YACrD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,eAAe,EAAE,IAAI;YACrB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,EACD,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,4BAA4B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5H,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QAChC,iDAAiD;QACjD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,8BAA8B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACzH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,oDAAoD;IACpD,mDAAmD;IACnD,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QAClE,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9B,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,kEAAkE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3G,CAAC;SAAM,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACzE,8CAA8C;QAC9C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,+BAA+B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1H,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,GAAG,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IAE9D,uCAAuC;IACvC,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC;QACjE,QAAQ,CAAC,MAAM,CACb,GAAG,CAAC,EAAE,EACN,OAAO,CAAC,OAAO,EACf,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,EAC/E,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3G,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,IAAI,OAAO,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,oBAAoB,CAC5C,GAAG,CAAC,EAAE,EACN;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE;YAC7B,MAAM,EAAE,mBAAmB,OAAO,CAAC,UAAU,YAAY,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG;YAC3F,qBAAqB,EAAE,GAAG,CAAC,iBAAiB;YAC5C,cAAc,EAAE,QAAQ,CAAC,EAAE;SAC5B,EACD,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QACF,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,iBAAiB;YAAE,MAAM,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAC7E,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;YACrB,QAAQ,EAAE,GAAG,CAAC,EAAE;YAChB,cAAc,EAAE,QAAQ,CAAC,EAAE;YAC3B,WAAW,EAAE,OAAO,CAAC,iBAAiB;YACtC,WAAW,EAAE,QAAQ,CAAC,EAAE;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9G,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,2CAA2C;IAC3C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,KAAiB,EAAE,EAAa;IACtD,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,EAAE,CAAC,OAA6D,CAAC;QAC3E,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,EAAE,CAAC,IAAI,KAAK,kBAAkB,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,CAAC,GAAG,EAAE,CAAC,OAA+B,CAAC;QAC7C,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,EAAE,CAAC,OAA+B,CAAC;QAC7C,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAChI,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,KAAiB,EAAE,QAAgB;IACvD,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;QACnC,MAAM,GAAG,CAAC,cAAc,EAAE,gCAAgC,QAAQ,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;AAC1D,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,WAAW,CAAC,KAAiB,EAAE,MAAmB,EAAE,QAAgB;IAClF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAC1B,MAAM,OAAO,GAAiB,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IAC/H,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,QAAQ;gBAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,8BAA8B;YAC9B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvE,IAAI,EAAE,EAAE,CAAC,QAAQ;gBACjB,GAAG,EAAE,EAAE,CAAC,GAAG;gBACX,KAAK,EAAG,CAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBACzC,EAAE,EAAE,MAAM,EAAE;aACb,CAAC,CAAC;YACH,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACjC,CAAC"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAkC3F;0CAC0C;AAC1C,SAAS,YAAY,CAAC,QAAgB;IACpC,OAAO,cAAc,QAAQ,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB,EAAE,QAAgB;IAC7D,OAAO,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,sCAAsC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAiB,EAAE,QAAgB;IAC/D,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzE,CAAC;AAKD,SAAS,SAAS,CAAC,QAAgB;IACjC,IAAI,QAAQ,KAAK,kBAAkB;QAAE,OAAO,UAAU,CAAC;IACvD,IAAI,kBAAkB,CAAC,QAAQ,CAAC;QAAE,OAAO,UAAU,CAAC;IACpD,MAAM,GAAG,CAAC,cAAc,EAAE,UAAU,QAAQ,EAAE,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,KAAiB,EAAE,IAAe,EAAE,UAA2C,EAAE,WAAmB;IAC5H,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,CAAC,GAAG,UAAU,CAAC;IACrB,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,yCAAyC;QACzC,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/E,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,iBAAiB,EAAE,CAAC;QACnC,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,wDAAwD;QACxD,MAAM,GAAG,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;IAC7F,CAAC;IACD,oEAAoE;IACpE,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACnG,IAAI,CAAC,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;IACxG,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAiB,EAAE,EAAa,EAAE,QAAgB,EAAE,KAAe;IAC5F,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACjC,sCAAsC;IACtC,qCAAqC;IACrC,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;QACjC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,uDAAuD;YACvD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,2BAA2B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3H,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChC,2BAA2B;YAC3B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,kCAAkC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7H,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,aAAa;YAAE,OAAO,SAAS,CAAC,CAAC,wBAAwB;QAC7D,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACxB,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,6CAA6C,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5F,uCAAuC;YACvC,oCAAoC;YACpC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChD,IAAI,KAAK,EAAE,MAAM,KAAK,iBAAiB,EAAE,CAAC;gBACxC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,oEAAoE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YACvG,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/G,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,2BAA2B;YAC3B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,0BAA0B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1H,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY;YAAE,OAAO,SAAS,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrF,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACjH,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAChC,qCAAqC;QACrC,8CAA8C;QAC9C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;YACjF,IAAI,EAAE,EAAE,CAAC,QAAQ;YACjB,GAAG,EAAE,EAAE,CAAC,GAAG;YACX,SAAS,EAAE,MAAM,CAAE,EAAyB,CAAC,IAAI,CAAC;SACnD,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,GAAG,CAAC,cAAc,EAAE,8BAA8B,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,OAA4B,CAAC;IAChD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAwC,CAAC;IAEpE,6CAA6C;IAC7C,+CAA+C;IAC/C,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAK,CAAuB,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACpD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,iCAAiC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC3F,IAAI,EAAE,EAAE,CAAC,QAAQ;gBACjB,GAAG,EAAE,EAAE,CAAC,GAAG;gBACX,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,IAAI;aACnC,CAAC,CAAC;YACH,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,+CAA+C;QAC/C,6CAA6C;QAC7C,QAAQ,CAAC,GAAG,CACV;YACE,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,QAAQ,CAAC,EAAE;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC,QAAQ,EAAE;YACrD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,eAAe,EAAE,IAAI;YACrB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,EACD,KAAK,CAAC,QAAQ,CAAC,QAAQ,EACvB,EAAE,CAAC,QAAQ,CACZ,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,4BAA4B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5H,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QAChC,iDAAiD;QACjD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,8BAA8B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACzH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAEjD,oDAAoD;IACpD,mDAAmD;IACnD,iDAAiD;IACjD,IAAI,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,MAAM,EAAE,CAAC;QAC9D,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9B,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,kEAAkE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3G,CAAC;SAAM,IAAI,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,MAAM,EAAE,CAAC;QACrE,8CAA8C;QAC9C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,+BAA+B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1H,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,2CAA2C;IAC3C,4CAA4C;IAC5C,iBAAiB;IACjB,MAAM,gBAAgB,GAAG,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC;IACvD,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9B,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,kEAAkE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,IAAI,GAAG,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IAE9D,uCAAuC;IACvC,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC;QACjE,QAAQ,CAAC,MAAM,CACb,GAAG,CAAC,EAAE,EACN,OAAO,CAAC,OAAO,EACf,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,EAC/E,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QACF,iCAAiC;QACjC,wCAAwC;QACxC,IAAI,IAAI,KAAK,UAAU,IAAI,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,EAAE,EAAE,CAAC;YACvD,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3G,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,qCAAqC;IACrC,uCAAuC;IACvC,wCAAwC;IACxC,yCAAyC;IACzC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9E,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAChH,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,IAAI,OAAO,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,oBAAoB,CAC5C,GAAG,CAAC,EAAE,EACN;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE;YAC7B,MAAM,EAAE,mBAAmB,OAAO,CAAC,UAAU,YAAY,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG;YAC3F,qBAAqB,EAAE,GAAG,CAAC,iBAAiB;YAC5C,cAAc,EAAE,QAAQ,CAAC,EAAE;SAC5B,EACD,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QACF,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,iBAAiB;YAAE,MAAM,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAC7E,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;YACrB,QAAQ,EAAE,GAAG,CAAC,EAAE;YAChB,cAAc,EAAE,QAAQ,CAAC,EAAE;YAC3B,WAAW,EAAE,OAAO,CAAC,iBAAiB;YACtC,WAAW,EAAE,QAAQ,CAAC,EAAE;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9G,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,2CAA2C;IAC3C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,KAAiB,EAAE,EAAa;IACtD,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,EAAE,CAAC,OAA6D,CAAC;QAC3E,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,EAAE,CAAC,IAAI,KAAK,kBAAkB,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,CAAC,GAAG,EAAE,CAAC,OAA+B,CAAC;QAC7C,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,EAAE,CAAC,OAA+B,CAAC;QAC7C,OAAO,KAAK,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAChI,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,WAAW,CAAC,KAAiB,EAAE,MAAmB,EAAE,QAAgB;IAClF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAC1B,MAAM,OAAO,GAAiB,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IAC/H,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,QAAQ;gBAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,8BAA8B;YAC9B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvE,IAAI,EAAE,EAAE,CAAC,QAAQ;gBACjB,GAAG,EAAE,EAAE,CAAC,GAAG;gBACX,KAAK,EAAG,CAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBACzC,EAAE,EAAE,MAAM,EAAE;aACb,CAAC,CAAC;YACH,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -1,17 +1,38 @@
|
|
|
1
1
|
import { CairnStore } from '../store/index.js';
|
|
2
2
|
/**
|
|
3
|
-
* 冷启动对账(spec cloud-sync「冷启动对账」/ design D3)。
|
|
3
|
+
* 冷启动对账(spec cloud-sync「冷启动对账」/ design D3 + add-cloud-preserve-mode tasks 4)。
|
|
4
4
|
*
|
|
5
5
|
* 只写本地 outbox:本模块不 import 任何远端实现,也没有网络入口,
|
|
6
6
|
* 因此 `backfill --apply` 不可能与云端交互。
|
|
7
7
|
*
|
|
8
|
-
* 缺口判定**不限制 job
|
|
9
|
-
* (pending / running / done / dead
|
|
8
|
+
* 缺口判定**不限制 job 状态**:只要历史上存在过任意一条对应链的上行任务
|
|
9
|
+
* (pending / running / done / dead…),就认为这条记忆在**该链**的上行已经有人管过。
|
|
10
10
|
* 只看 pending 会把已 markDone 的记忆算成缺口,每次 backfill 重报同一批。
|
|
11
|
+
*
|
|
12
|
+
* 多链(add-cloud-preserve-mode):
|
|
13
|
+
* - 个人链缺口:personal-global 活动、无任何 sync_upstream 任务(既有口径不变);
|
|
14
|
+
* - 保管链缺口(仅保管模式开启):设备限定/项目内容活动、无任何 sync_preserve 任务。
|
|
15
|
+
* 不看 sync_upstream:旧版本给 project-global 排过永远发不出去的 sync_upstream
|
|
16
|
+
* (静默完成时代),开启保管模式后这些内容应首次入保管链。
|
|
17
|
+
* - 迁出通知缺口:曾推送到个人链、现已不在个人链、但从未有过任何 sync_scope_exit
|
|
18
|
+
* 任务的活动记忆——本变更之前迁移到 project-global(可上行目的地)不产生迁出通知
|
|
19
|
+
* (2026-11 双设备事故的 27 条就在这个形状里),对端残缺副本靠补发的通知收敛。
|
|
11
20
|
*/
|
|
12
21
|
export interface UpstreamGap {
|
|
13
22
|
memoryId: string;
|
|
14
23
|
scopeId: string;
|
|
24
|
+
/** 缺口所属链:personal = 个人链;preserve = 本设备保管链。 */
|
|
25
|
+
chain: 'personal' | 'preserve';
|
|
26
|
+
}
|
|
27
|
+
export interface ScopeExitGap {
|
|
28
|
+
memoryId: string;
|
|
29
|
+
scopeId: string;
|
|
30
|
+
}
|
|
31
|
+
export interface ChainBackfillCounts {
|
|
32
|
+
candidates: number;
|
|
33
|
+
enqueued: number;
|
|
34
|
+
existing: number;
|
|
35
|
+
excluded: number;
|
|
15
36
|
}
|
|
16
37
|
export interface BackfillReport {
|
|
17
38
|
/** 库中缺口总数(未按 limit 截断)。 */
|
|
@@ -23,12 +44,34 @@ export interface BackfillReport {
|
|
|
23
44
|
excluded: number;
|
|
24
45
|
/** 本次实际(dry-run 时为将会)入队的记忆标识,按创建顺序。 */
|
|
25
46
|
memoryIds: string[];
|
|
47
|
+
/** 按链分列(tasks 4.2)。关闭保管模式时 preserve 段全为 0。 */
|
|
48
|
+
chains: {
|
|
49
|
+
personal: ChainBackfillCounts;
|
|
50
|
+
preserve: ChainBackfillCounts;
|
|
51
|
+
};
|
|
52
|
+
/** 存量迁出通知补发(add-cloud-preserve-mode:0.6.x 迁移不产生通知的历史缺口)。 */
|
|
53
|
+
scopeExits: {
|
|
54
|
+
candidates: number;
|
|
55
|
+
enqueued: number;
|
|
56
|
+
memoryIds: string[];
|
|
57
|
+
};
|
|
26
58
|
}
|
|
27
59
|
export declare const BACKFILL_DEFAULT_LIMIT = 500;
|
|
28
60
|
export declare function findUpstreamGap(store: CairnStore): UpstreamGap[];
|
|
29
61
|
/**
|
|
30
|
-
*
|
|
31
|
-
*
|
|
62
|
+
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
63
|
+
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
64
|
+
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
65
|
+
*/
|
|
66
|
+
export declare function findScopeExitGap(store: CairnStore): ScopeExitGap[];
|
|
67
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。 */
|
|
68
|
+
export declare function findUpstreamGapChains(store: CairnStore): {
|
|
69
|
+
personal: number;
|
|
70
|
+
preserve: number;
|
|
71
|
+
};
|
|
72
|
+
/**
|
|
73
|
+
* `apply=false` 只统计不写(默认只读)。写入全部经 `enqueueMemorySync` /
|
|
74
|
+
* `enqueueScopeExit`:路由与物理排除的判定只有 route.ts 一处(不在对账层另写一份)。
|
|
32
75
|
*/
|
|
33
76
|
export declare function backfillUpstream(store: CairnStore, opts: {
|
|
34
77
|
apply: boolean;
|
|
@@ -1,45 +1,105 @@
|
|
|
1
|
+
import { PERSONAL_SPACE_KEY, preserveModeEnabled } from './vault.js';
|
|
2
|
+
import { enqueueMemorySync, enqueueScopeExit } from './route.js';
|
|
1
3
|
export const BACKFILL_DEFAULT_LIMIT = 500;
|
|
2
4
|
export function findUpstreamGap(store) {
|
|
3
|
-
|
|
5
|
+
const personal = store.db
|
|
4
6
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
5
7
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
6
|
-
WHERE m.status = 'active' AND s.sync_policy = 'encrypted' AND s.device_id = 'all'
|
|
8
|
+
WHERE m.status = 'active' AND s.sync_policy = 'encrypted' AND s.device_id = 'all' AND s.preset = 'personal-global'
|
|
7
9
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
8
10
|
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id)
|
|
11
|
+
ORDER BY m.created_at, m.id`)
|
|
12
|
+
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'personal' }));
|
|
13
|
+
if (!preserveModeEnabled(store.paths.dataDir))
|
|
14
|
+
return personal;
|
|
15
|
+
// 保管链缺口:设备限定与项目内容,无任何 sync_preserve 任务
|
|
16
|
+
const preserve = store.db
|
|
17
|
+
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
18
|
+
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
19
|
+
WHERE m.status = 'active' AND s.preset IN ('device-local','project-global','project-device')
|
|
20
|
+
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
21
|
+
WHERE j.job_type = 'sync_preserve' AND j.entity_id = m.id)
|
|
22
|
+
ORDER BY m.created_at, m.id`)
|
|
23
|
+
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'preserve' }));
|
|
24
|
+
return [...personal, ...preserve];
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
28
|
+
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
29
|
+
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
30
|
+
*/
|
|
31
|
+
export function findScopeExitGap(store) {
|
|
32
|
+
return store.db
|
|
33
|
+
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
34
|
+
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
35
|
+
JOIN meta ON meta.key = '${'sync_pushed:' + PERSONAL_SPACE_KEY + ':'}' || m.id
|
|
36
|
+
WHERE m.status = 'active' AND s.preset <> 'personal-global'
|
|
37
|
+
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
38
|
+
WHERE j.job_type = 'sync_scope_exit' AND j.entity_id = m.id)
|
|
9
39
|
ORDER BY m.created_at, m.id`)
|
|
10
40
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId) }));
|
|
11
41
|
}
|
|
42
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。 */
|
|
43
|
+
export function findUpstreamGapChains(store) {
|
|
44
|
+
const gaps = findUpstreamGap(store);
|
|
45
|
+
return {
|
|
46
|
+
personal: gaps.filter((g) => g.chain === 'personal').length,
|
|
47
|
+
preserve: gaps.filter((g) => g.chain === 'preserve').length,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
12
50
|
/**
|
|
13
|
-
* `apply=false` 只统计不写(默认只读)。写入全部经 `
|
|
14
|
-
*
|
|
51
|
+
* `apply=false` 只统计不写(默认只读)。写入全部经 `enqueueMemorySync` /
|
|
52
|
+
* `enqueueScopeExit`:路由与物理排除的判定只有 route.ts 一处(不在对账层另写一份)。
|
|
15
53
|
*/
|
|
16
54
|
export function backfillUpstream(store, opts) {
|
|
17
55
|
const gap = findUpstreamGap(store);
|
|
18
56
|
const batch = gap.slice(0, opts.limit ?? BACKFILL_DEFAULT_LIMIT);
|
|
19
|
-
const
|
|
57
|
+
const exitGaps = findScopeExitGap(store);
|
|
58
|
+
const report = {
|
|
59
|
+
candidates: gap.length,
|
|
60
|
+
enqueued: 0,
|
|
61
|
+
existing: 0,
|
|
62
|
+
excluded: 0,
|
|
63
|
+
memoryIds: [],
|
|
64
|
+
chains: {
|
|
65
|
+
personal: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
66
|
+
preserve: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
67
|
+
},
|
|
68
|
+
scopeExits: { candidates: exitGaps.length, enqueued: 0, memoryIds: [] },
|
|
69
|
+
};
|
|
70
|
+
for (const g of gap)
|
|
71
|
+
report.chains[g.chain].candidates++;
|
|
20
72
|
if (!opts.apply) {
|
|
21
73
|
report.memoryIds = batch.map((g) => g.memoryId);
|
|
22
74
|
return report;
|
|
23
75
|
}
|
|
24
76
|
store.db.transaction(() => {
|
|
25
77
|
for (const g of batch) {
|
|
26
|
-
const r = store
|
|
27
|
-
|
|
78
|
+
const r = enqueueMemorySync(store, {
|
|
79
|
+
memoryId: g.memoryId,
|
|
28
80
|
scopeId: g.scopeId,
|
|
29
|
-
|
|
30
|
-
entityId: g.memoryId,
|
|
31
|
-
payload: { op: 'memory_upsert', memoryId: g.memoryId },
|
|
81
|
+
op: 'memory_upsert',
|
|
32
82
|
idempotencyKey: `memory:${g.memoryId}`,
|
|
33
83
|
});
|
|
34
84
|
if (r.enqueued) {
|
|
35
85
|
report.enqueued++;
|
|
36
86
|
report.memoryIds.push(g.memoryId);
|
|
87
|
+
report.chains[g.chain].enqueued++;
|
|
37
88
|
}
|
|
38
89
|
else if (r.reason === 'duplicate') {
|
|
39
90
|
report.existing++;
|
|
91
|
+
report.chains[g.chain].existing++;
|
|
40
92
|
}
|
|
41
93
|
else {
|
|
42
94
|
report.excluded++;
|
|
95
|
+
report.chains[g.chain].excluded++;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
for (const g of exitGaps) {
|
|
99
|
+
const r = enqueueScopeExit(store, g.memoryId);
|
|
100
|
+
if (r.enqueued) {
|
|
101
|
+
report.scopeExits.enqueued++;
|
|
102
|
+
report.scopeExits.memoryIds.push(g.memoryId);
|
|
43
103
|
}
|
|
44
104
|
}
|
|
45
105
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,20 @@ import { MemoryKind, Authority, Sensitivity } from '../core/types.js';
|
|
|
5
5
|
* 因为修订 id 在各设备本地生成、不可跨设备引用。
|
|
6
6
|
*/
|
|
7
7
|
export declare const SYNC_EVENT_VERSION = 1;
|
|
8
|
+
/**
|
|
9
|
+
* 作用域描述符(add-cloud-preserve-mode D3):upsert 事件携带的「内容属于哪类作用域」
|
|
10
|
+
* 声明。拉取侧物化过滤的依据:个人链事件按链语义物化(personal-global);
|
|
11
|
+
* 本设备保管链事件按描述符物化。旧版本事件没有该字段——物化按现状处理(向后兼容)。
|
|
12
|
+
*/
|
|
13
|
+
export interface SyncScopeDescriptor {
|
|
14
|
+
preset: string;
|
|
15
|
+
/** project-global / project-device 的稳定项目身份(add-stable-project-identity 的 UUID)。 */
|
|
16
|
+
projectId?: string;
|
|
17
|
+
/** 项目显示名(物化端重建 project 行时使用;缺省回落 projectId)。 */
|
|
18
|
+
spaceName?: string;
|
|
19
|
+
/** 设备限定作用域绑定的设备。 */
|
|
20
|
+
deviceId?: string;
|
|
21
|
+
}
|
|
8
22
|
export interface SyncUpsertPayload {
|
|
9
23
|
revisionId: string;
|
|
10
24
|
content: string;
|
|
@@ -21,6 +35,8 @@ export interface SyncUpsertPayload {
|
|
|
21
35
|
sourceAgent: string | null;
|
|
22
36
|
createdBy: string;
|
|
23
37
|
reason: string | null;
|
|
38
|
+
/** 作用域描述符(D3):旧版本事件缺省——按链语义物化。 */
|
|
39
|
+
scope?: SyncScopeDescriptor;
|
|
24
40
|
/**
|
|
25
41
|
* 迁回重推标记(add-scope-migration):这条 upsert 来自「迁出后重新迁回」的强制重发。
|
|
26
42
|
* 对端据此解除「不再持有」标记;没有该标记的普通 upsert 在标记存在时按迟到修订跳过。
|
|
@@ -36,6 +52,8 @@ export interface SyncTombstonePayload {
|
|
|
36
52
|
/**
|
|
37
53
|
* 迁出通知 payload(add-scope-migration D3):一条已同步的记忆迁出了可同步作用域。
|
|
38
54
|
* 对端语义是「本设备不再持有」——不是遗忘(无墓碑),不是删除(数据保留)。
|
|
55
|
+
* (来源链固化在 outbox 任务的 payload.fromSpace,由 push 据此选择发布链;
|
|
56
|
+
* 事件本身不带 fromSpace——对端只关心「这条链上的记忆不再持有」。)
|
|
39
57
|
*/
|
|
40
58
|
export interface SyncScopeExitPayload {
|
|
41
59
|
/** 推送端最后已知(已推送)的内容哈希。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC;;;;GAIG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,12 @@ export declare function initRemote(store: CairnStore, input: {
|
|
|
30
30
|
syncd?: {
|
|
31
31
|
baseUrl: string;
|
|
32
32
|
};
|
|
33
|
+
/** 保管模式(add-cloud-preserve-mode D1):init 时即可开启,默认关闭。 */
|
|
34
|
+
preserveDeviceBound?: boolean;
|
|
33
35
|
}): {
|
|
34
36
|
vault: VaultConfig;
|
|
35
37
|
recovery: string;
|
|
36
38
|
};
|
|
39
|
+
/** 切换保管模式(vault config 子命令)。写审计——模式是安全姿态的一部分。 */
|
|
40
|
+
export declare function setPreserveMode(store: CairnStore, enabled: boolean): VaultConfig;
|
|
37
41
|
export { syncPush, syncPull, exportRecoveryMaterial, PERSONAL_SPACE_KEY };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
|
-
import { loadVaultConfig, saveVaultConfig, ENV } from './vault.js';
|
|
2
|
+
import { loadVaultConfig, saveVaultConfig, updateVaultConfig, ENV } from './vault.js';
|
|
3
3
|
import { generateVaultKeys, saveKeys, loadKeys, exportRecoveryMaterial } from './cryptoutil.js';
|
|
4
4
|
import { registerHandler } from '../jobs/worker.js';
|
|
5
5
|
import { syncPush } from './push.js';
|
|
@@ -52,14 +52,15 @@ export function syncContext(store) {
|
|
|
52
52
|
}
|
|
53
53
|
/** 注册 worker 的真实上行 handler(configured 时调用;未配置保持诚实失败 handler)。 */
|
|
54
54
|
export function registerSyncWorker(store, remote, vault) {
|
|
55
|
-
|
|
56
|
-
// worker 已 claim 单个任务;push
|
|
57
|
-
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
|
|
58
|
-
}
|
|
55
|
+
const pushWith = (job) => {
|
|
56
|
+
// worker 已 claim 单个任务;push 以该任务触发批量发布(按链路由;幂等:已推送修订跳过)
|
|
57
|
+
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload, jobTypeHint: job.jobType }] });
|
|
58
|
+
};
|
|
59
|
+
registerHandler('sync_upstream', (job) => pushWith({ ...job, jobType: 'sync_upstream' }));
|
|
59
60
|
// 迁出通知任务走同一条 push 链(add-scope-migration):生成 scope_exit 控制事件。
|
|
60
|
-
registerHandler('sync_scope_exit', (job) => {
|
|
61
|
-
|
|
62
|
-
});
|
|
61
|
+
registerHandler('sync_scope_exit', (job) => pushWith({ ...job, jobType: 'sync_scope_exit' }));
|
|
62
|
+
// 保管链上行任务(add-cloud-preserve-mode):同一条 push,按链路由到 preserve/<deviceId>。
|
|
63
|
+
registerHandler('sync_preserve', (job) => pushWith({ ...job, jobType: 'sync_preserve' }));
|
|
63
64
|
}
|
|
64
65
|
/** 初始化远端:生成/复用密钥 + 写 vault.json + 确保 personal-global 为 encrypted。 */
|
|
65
66
|
export function initRemote(store, input) {
|
|
@@ -80,9 +81,22 @@ export function initRemote(store, input) {
|
|
|
80
81
|
}
|
|
81
82
|
// vault 前缀并入 store prefix(OBS store 的 space/device 必须是单路径段)
|
|
82
83
|
const obs = input.obs ? { endpoint: input.obs.endpoint, bucket: input.obs.bucket, prefix: `${input.obs.prefix}vaults/${keys.vaultId}/` } : undefined;
|
|
83
|
-
const vault = saveVaultConfig(store.paths.dataDir, {
|
|
84
|
-
|
|
84
|
+
const vault = saveVaultConfig(store.paths.dataDir, {
|
|
85
|
+
provider: input.provider,
|
|
86
|
+
obs,
|
|
87
|
+
syncd: input.syncd,
|
|
88
|
+
vaultId: keys.vaultId,
|
|
89
|
+
preserveDeviceBound: input.preserveDeviceBound === true,
|
|
90
|
+
});
|
|
91
|
+
store.audit.record('sync', 'remote_initialized', { type: 'system', id: vault.vaultId }, { provider: vault.provider, preserveDeviceBound: input.preserveDeviceBound === true });
|
|
85
92
|
return { vault, recovery: exportRecoveryMaterial(keys) };
|
|
86
93
|
}
|
|
94
|
+
/** 切换保管模式(vault config 子命令)。写审计——模式是安全姿态的一部分。 */
|
|
95
|
+
export function setPreserveMode(store, enabled) {
|
|
96
|
+
store.assertWritable();
|
|
97
|
+
const vault = updateVaultConfig(store.paths.dataDir, { preserveDeviceBound: enabled });
|
|
98
|
+
store.audit.record('sync', 'preserve_mode_changed', { type: 'system', id: vault.vaultId }, { preserveDeviceBound: enabled });
|
|
99
|
+
return vault;
|
|
100
|
+
}
|
|
87
101
|
export { syncPush, syncPull, exportRecoveryMaterial, PERSONAL_SPACE_KEY };
|
|
88
102
|
//# sourceMappingURL=orchestrate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAe,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAe,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEnG,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;GAIG;AAEH,MAAM,UAAU,gBAAgB,CAAC,KAAkB;IACjD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,MAAM,GAAG,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;QAClE,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,GAAG,CAAC,aAAa,EAAE,UAAU,GAAG,CAAC,KAAK,MAAM,GAAG,CAAC,KAAK,iBAAiB,CAAC,CAAC;QAChF,CAAC;QACD,yBAAyB;QACzB,OAAO,WAAW,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IACjJ,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,MAAM,GAAG,CAAC,cAAc,EAAE,wBAAwB,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK;YAAE,MAAM,GAAG,CAAC,aAAa,EAAE,UAAU,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QACjE,iDAAiD;QACjD,OAAO,aAAa,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,MAAM,GAAG,CAAC,cAAc,EAAE,gBAAgB,MAAM,CAAE,KAA+B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACjG,CAAC;AAED,kBAAkB;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,SAAS,WAAW,CAAC,GAAoD;IACvE,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,aAAa,CAAC,GAAsD;IAC3E,OAAO,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAOD,mDAAmD;AACnD,MAAM,UAAU,WAAW,CAAC,KAAiB;IAC3C,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;AACpD,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,kBAAkB,CAAC,KAAiB,EAAE,MAAmB,EAAE,KAAkB;IAC3F,MAAM,QAAQ,GAAG,CAAC,GAAwF,EAAQ,EAAE;QAClH,uDAAuD;QACvD,KAAK,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACpJ,CAAC,CAAC;IACF,eAAe,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1F,6DAA6D;IAC7D,eAAe,CAAC,iBAAiB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;IAC9F,uEAAuE;IACvE,eAAe,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,UAAU,CACxB,KAAiB,EACjB,KAMC;IAED,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,uDAAuD;IACvD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC5D,IAAI,KAAK,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;QACrC,MAAM,GAAG,CAAC,cAAc,EAAE,yCAAyC,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,IAAe,CAAC;IACpB,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,GAAG,YAAY,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,iBAAiB,EAAE,CAAC;QAC3B,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,4DAA4D;IAC5D,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,UAAU,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACrJ,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;QACjD,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG;QACH,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,KAAK,IAAI;KACxD,CAAC,CAAC;IACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,KAAK,IAAI,EAAE,CAAC,CAAC;IAC/K,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;AAC3D,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,eAAe,CAAC,KAAiB,EAAE,OAAgB;IACjE,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC,CAAC;IACvF,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7H,OAAO,KAAK,CAAC;AACf,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,CAAC"}
|