@carloswon/cairn-memory 0.6.3 → 0.6.5
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/dist/src/interfaces/app-service.d.ts +16 -1
- package/dist/src/interfaces/app-service.js +67 -41
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +24 -0
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-js.js +20 -2
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/model.d.ts +8 -0
- package/dist/src/interfaces/console/model.js +18 -1
- package/dist/src/interfaces/console/model.js.map +1 -1
- package/dist/src/store/memories.js +2 -0
- package/dist/src/store/memories.js.map +1 -1
- package/dist/src/sync/apply.d.ts +10 -2
- package/dist/src/sync/apply.js +57 -9
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backfill.d.ts +27 -6
- package/dist/src/sync/backfill.js +46 -9
- package/dist/src/sync/backfill.js.map +1 -1
- package/dist/src/sync/events.d.ts +6 -0
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/pull.d.ts +2 -1
- package/dist/src/sync/pull.js +35 -3
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +2 -2
- package/dist/src/sync/push.js +37 -11
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/route.d.ts +2 -1
- package/dist/src/sync/route.js +22 -1
- package/dist/src/sync/route.js.map +1 -1
- package/dist/src/sync/vault.d.ts +12 -2
- package/dist/src/sync/vault.js +25 -2
- package/dist/src/sync/vault.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memories.js","sourceRoot":"","sources":["../../../src/store/memories.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memories.js","sourceRoot":"","sources":["../../../src/store/memories.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/apply.d.ts
CHANGED
|
@@ -10,13 +10,18 @@ import { AuditLog } from '../store/audit.js';
|
|
|
10
10
|
* scope_exit(add-scope-migration):远端迁出 → 本地标记「不再持有」(meta 标记 + 归档,
|
|
11
11
|
* 无墓碑不删数据);带 reentry 标记的迁回重推解除标记;迟到修订按 shadowed 跳过。
|
|
12
12
|
*
|
|
13
|
-
* 物化过滤(add-cloud-preserve-mode tasks 3.2):
|
|
13
|
+
* 物化过滤(add-cloud-preserve-mode tasks 3.2 + add-cross-device-project-sync tasks 3.3):
|
|
14
14
|
* - 个人链事件 → 物化为 personal-global(现状不变;旧事件无描述符同样走这条);
|
|
15
|
+
* - 项目链事件 → 强制按描述符 projectId 物化为该项目的 project-global(缺 projectId → skip + 审计);
|
|
15
16
|
* - 本设备保管链事件 → 按描述符物化(device-local 归本机、项目内容归本机);
|
|
16
17
|
* 描述符缺失(防御)→ 按 device-local 处理并审计;
|
|
17
18
|
* agent-private / session-ephemeral 描述符 → 永不物化(skip + 审计)。
|
|
18
19
|
* - 归属设备:落地时把 event.deviceId 记为 origin_device_id(D8)。
|
|
19
20
|
*
|
|
21
|
+
* 「不再持有」标记按链角色分流(design D4):个人链迟到修订 → shadowed;
|
|
22
|
+
* 项目链 upsert → 解除(project_reheld);保管链 upsert → 只恢复活动(preserve_reheld,
|
|
23
|
+
* 保留个人链标记)。
|
|
24
|
+
*
|
|
20
25
|
* 保管链是单写者链(只有本设备写),因此多一条个人链没有的规则:
|
|
21
26
|
* 事件内容哈希命中本地任一历史修订 → 该事件已并入本地历史,跳过(不是等待)。
|
|
22
27
|
*/
|
|
@@ -29,8 +34,11 @@ export interface ApplyOutcome {
|
|
|
29
34
|
shadowed: number;
|
|
30
35
|
/** 收到 scope_exit 并标记「不再持有」的条数(add-scope-migration)。 */
|
|
31
36
|
scopeExited: number;
|
|
37
|
+
/** 本次因项目链/保管链 upsert 解除「不再持有」标记并恢复活动的条数。
|
|
38
|
+
* 追加维度:这些事件同时仍按其返回结果计入 skipped/applied(不改变既有语义)。 */
|
|
39
|
+
revived: number;
|
|
32
40
|
}
|
|
33
|
-
export declare function applyEvent(store: CairnStore, ev: SyncEvent, spaceKey: string, audit: AuditLog): keyof ApplyOutcome;
|
|
41
|
+
export declare function applyEvent(store: CairnStore, ev: SyncEvent, spaceKey: string, audit: AuditLog, tally?: ApplyOutcome): keyof ApplyOutcome;
|
|
34
42
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
35
43
|
export declare function applyEvents(store: CairnStore, events: SyncEvent[], spaceKey: string): {
|
|
36
44
|
outcome: ApplyOutcome;
|
package/dist/src/sync/apply.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
|
+
import { canonicalJson } from '../core/hash.js';
|
|
2
3
|
import { nowIso } from '../core/time.js';
|
|
3
|
-
import { PERSONAL_SPACE_KEY, isPreserveSpaceKey, isPreserveScopePreset } from './vault.js';
|
|
4
|
+
import { PERSONAL_SPACE_KEY, isPreserveSpaceKey, isPreserveScopePreset, isProjectSpaceKey } from './vault.js';
|
|
4
5
|
/** 「不再持有」标记:meta 行(不加表列;与 sync_pushed/sync_seq 同一 meta 键空间)。
|
|
5
6
|
* 语义限定为「不再经个人链持有」(保管链内容不在个人链上,标记不覆盖它)。 */
|
|
6
7
|
function scopeExitKey(memoryId) {
|
|
@@ -11,10 +12,22 @@ function hasScopeExitMarker(store, memoryId) {
|
|
|
11
12
|
}
|
|
12
13
|
function clearScopeExitMarker(store, memoryId) {
|
|
13
14
|
store.db.run('DELETE FROM meta WHERE key = ?', scopeExitKey(memoryId));
|
|
15
|
+
// 重新持有后终态作用域不再成立,随标记一并清除(否则活动记忆上会挂着过期「终态」)。
|
|
16
|
+
store.db.run('DELETE FROM meta WHERE key = ?', terminalScopeKey(memoryId));
|
|
17
|
+
}
|
|
18
|
+
/** 终态作用域(add-cross-device-project-sync D6):不再持有副本的展示补充信息,
|
|
19
|
+
* 不是记忆状态机的一部分,因此落 meta 而不加 memory 列。 */
|
|
20
|
+
function terminalScopeKey(memoryId) {
|
|
21
|
+
return `terminal_scope:${memoryId}`;
|
|
22
|
+
}
|
|
23
|
+
function writeTerminalScope(store, memoryId, scope) {
|
|
24
|
+
store.db.run('INSERT OR REPLACE INTO meta (key, value) VALUES (?, ?)', terminalScopeKey(memoryId), canonicalJson(scope));
|
|
14
25
|
}
|
|
15
26
|
function chainRole(spaceKey) {
|
|
16
27
|
if (spaceKey === PERSONAL_SPACE_KEY)
|
|
17
28
|
return 'personal';
|
|
29
|
+
if (isProjectSpaceKey(spaceKey))
|
|
30
|
+
return 'project';
|
|
18
31
|
if (isPreserveSpaceKey(spaceKey))
|
|
19
32
|
return 'preserve';
|
|
20
33
|
throw err('E_VALIDATION', `未知同步链: ${spaceKey}`);
|
|
@@ -23,12 +36,22 @@ function chainRole(spaceKey) {
|
|
|
23
36
|
* 描述符 → 本地作用域行(find-or-create)。保管链事件的项目作用域会连带
|
|
24
37
|
* find-or-create 项目与空间行(projectId 是跨设备稳定 UUID);只建结构行,
|
|
25
38
|
* 绝不产生任何 outbox 任务(spec:拉取路径不产生上行)。
|
|
39
|
+
*
|
|
40
|
+
* 项目链(tasks 3.3):链键本身就是 `project/<projectId>`,落点**必须**是该项目
|
|
41
|
+
* 的 project-global 作用域——描述符里的 preset 差异不作数(旧对端/异常载荷也
|
|
42
|
+
* 不能让项目内容掉进 personal-global)。缺 projectId 无法确定落点 → E_FORBIDDEN。
|
|
26
43
|
*/
|
|
27
44
|
function materializeScope(store, role, descriptor, ownDeviceId) {
|
|
28
45
|
if (role === 'personal') {
|
|
29
46
|
return store.scopes.resolvePreset('personal-global');
|
|
30
47
|
}
|
|
31
48
|
const d = descriptor;
|
|
49
|
+
if (role === 'project') {
|
|
50
|
+
const projectId = d?.projectId;
|
|
51
|
+
if (!projectId)
|
|
52
|
+
throw err('E_FORBIDDEN', '项目链事件描述符缺 projectId');
|
|
53
|
+
return store.scopes.resolvePreset('project-global', { projectId, projectName: d.spaceName ?? projectId });
|
|
54
|
+
}
|
|
32
55
|
if (!d) {
|
|
33
56
|
// 保管链事件必有描述符(本变更起才有保管链);缺失属防御路径,按设备限定落位。
|
|
34
57
|
return store.scopes.resolvePreset('device-local', { deviceId: ownDeviceId });
|
|
@@ -50,7 +73,7 @@ function materializeScope(store, role, descriptor, ownDeviceId) {
|
|
|
50
73
|
}
|
|
51
74
|
return store.scopes.resolvePreset('project-global', opts);
|
|
52
75
|
}
|
|
53
|
-
export function applyEvent(store, ev, spaceKey, audit) {
|
|
76
|
+
export function applyEvent(store, ev, spaceKey, audit, tally) {
|
|
54
77
|
const memories = store.memories;
|
|
55
78
|
const role = chainRole(spaceKey);
|
|
56
79
|
// 跨设备记忆身份对齐:id 命中 → 直接用;否则按修订内容哈希血统匹配
|
|
@@ -69,10 +92,18 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
69
92
|
return 'skipped';
|
|
70
93
|
}
|
|
71
94
|
const alreadyMarked = hasScopeExitMarker(store, mem.id);
|
|
72
|
-
|
|
73
|
-
|
|
95
|
+
// 终态作用域(tasks 4.1):旧事件没有该字段——缺省不写,展示端按「未知」处理。
|
|
96
|
+
const terminal = ev.payload.terminalScope;
|
|
97
|
+
if (alreadyMarked) {
|
|
98
|
+
// 幂等:标记存在即处理过。旧事件先到、带终态的新事件后到时只补写终态。
|
|
99
|
+
if (terminal)
|
|
100
|
+
writeTerminalScope(store, mem.id, terminal);
|
|
101
|
+
return 'skipped';
|
|
102
|
+
}
|
|
74
103
|
store.db.transaction(() => {
|
|
75
104
|
store.db.run('INSERT INTO meta (key, value) VALUES (?, ?)', scopeExitKey(mem.id), nowIso());
|
|
105
|
+
if (terminal)
|
|
106
|
+
writeTerminalScope(store, mem.id, terminal);
|
|
76
107
|
// 归档只在「当前持有是经个人链」时发生:记忆已落在保管链作用域(自设备重放
|
|
77
108
|
// 先于迁出事件到达)说明本设备仍以别的作用域持有它,只补标记不归档。
|
|
78
109
|
const scope = store.scopes.getById(mem.scopeId);
|
|
@@ -118,7 +149,7 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
118
149
|
}
|
|
119
150
|
catch (e) {
|
|
120
151
|
if (e.code === 'E_FORBIDDEN') {
|
|
121
|
-
audit.record('sync', 'preserve_scope_not_materialized', { type: 'memory', id: ev.memoryId }, {
|
|
152
|
+
audit.record('sync', role === 'project' ? 'project_scope_not_materialized' : 'preserve_scope_not_materialized', { type: 'memory', id: ev.memoryId }, {
|
|
122
153
|
from: ev.deviceId,
|
|
123
154
|
seq: ev.seq,
|
|
124
155
|
preset: descriptor?.preset ?? null,
|
|
@@ -170,6 +201,21 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
170
201
|
audit.record('sync', 'upsert_shadowed_by_scope_exit', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
171
202
|
return 'shadowed';
|
|
172
203
|
}
|
|
204
|
+
// 项目链 upsert 落在带标记的记忆上(tasks 3.4 / design D4):这不等于「个人链的
|
|
205
|
+
// 迟到修订」——记忆在**另一条链**被重新发布,本设备重新持有它:清标记 + 恢复活动 +
|
|
206
|
+
// 按描述符落到项目作用域。个人链的 shadowed 分支(上面)必须保持逐字不变。
|
|
207
|
+
if (role === 'project' && marked) {
|
|
208
|
+
clearScopeExitMarker(store, mem.id);
|
|
209
|
+
if (mem.status === 'archived') {
|
|
210
|
+
store.db.run("UPDATE memory SET status = 'active', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
211
|
+
}
|
|
212
|
+
if (mem.scopeId !== matScope.id) {
|
|
213
|
+
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
214
|
+
}
|
|
215
|
+
audit.record('sync', 'project_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
216
|
+
if (tally)
|
|
217
|
+
tally.revived++;
|
|
218
|
+
}
|
|
173
219
|
// 保管链 upsert 落在带标记的记忆上:这是自设备重放(恢复场景)——设备仍以
|
|
174
220
|
// 描述符作用域持有它。解除归档并按描述符落位;保留个人链标记(个人链持有确实已离开,
|
|
175
221
|
// 迟到的个人链修订仍应被挡)。
|
|
@@ -182,15 +228,17 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
182
228
|
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
183
229
|
}
|
|
184
230
|
audit.record('sync', 'preserve_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
231
|
+
if (tally)
|
|
232
|
+
tally.revived++;
|
|
185
233
|
}
|
|
186
234
|
if (mem.contentHash === payload.contentHash)
|
|
187
235
|
return 'skipped';
|
|
188
236
|
// 快进:远端事件的父哈希 == 本地当前内容哈希 → 远端是本地历史的孩子
|
|
189
237
|
if (payload.parentHash && payload.parentHash === mem.contentHash) {
|
|
190
238
|
memories.revise(mem.id, payload.content, { reason: `sync from ${ev.deviceId}#${ev.seq}`, author: `sync:${ev.deviceId}` }, store.identity.deviceId);
|
|
191
|
-
//
|
|
239
|
+
// 物化随内容走:保管链/项目链事件按描述符落位;个人链事件不动已有落位
|
|
192
240
|
// (本设备主动迁移后的并发修订不该被拉回 personal-global)。
|
|
193
|
-
if (role === 'preserve' && mem.scopeId !== matScope.id) {
|
|
241
|
+
if ((role === 'preserve' || role === 'project') && mem.scopeId !== matScope.id) {
|
|
194
242
|
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
195
243
|
}
|
|
196
244
|
audit.record('sync', 'fast_forwarded', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
@@ -256,11 +304,11 @@ function matchByLineage(store, ev) {
|
|
|
256
304
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
257
305
|
export function applyEvents(store, events, spaceKey) {
|
|
258
306
|
const audit = store.audit;
|
|
259
|
-
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0, scopeExited: 0 };
|
|
307
|
+
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0, scopeExited: 0, revived: 0 };
|
|
260
308
|
const waitEvents = [];
|
|
261
309
|
for (const ev of events) {
|
|
262
310
|
try {
|
|
263
|
-
const r = applyEvent(store, ev, spaceKey, audit);
|
|
311
|
+
const r = applyEvent(store, ev, spaceKey, audit, outcome);
|
|
264
312
|
outcome[r]++;
|
|
265
313
|
if (r === 'waited')
|
|
266
314
|
waitEvents.push(ev);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,20 +9,36 @@ import { CairnStore } from '../store/index.js';
|
|
|
9
9
|
* (pending / running / done / dead…),就认为这条记忆在**该链**的上行已经有人管过。
|
|
10
10
|
* 只看 pending 会把已 markDone 的记忆算成缺口,每次 backfill 重报同一批。
|
|
11
11
|
*
|
|
12
|
-
* 多链(add-cloud-preserve-mode):
|
|
12
|
+
* 多链(add-cloud-preserve-mode + add-cross-device-project-sync):
|
|
13
13
|
* - 个人链缺口:personal-global 活动、无任何 sync_upstream 任务(既有口径不变);
|
|
14
|
-
* -
|
|
14
|
+
* - 项目链缺口:project-global(且有项目身份)活动、**无本链推送证据**
|
|
15
|
+
* (`sync_pushed:project/<projectId>:<memoryId>`)、且无在途(pending/running/retry)
|
|
16
|
+
* 上行任务。MUST NOT 用「无任何 sync_upstream 任务」:曾经是 personal-global 的
|
|
17
|
+
* 记忆迁入项目后,库里留着一条当年**不可路由完成**的 sync_upstream(项目链还不存在,
|
|
18
|
+
* push 记 sync_job_unroutable 后 markDone),它从未发布到项目链,旧口径却把它当成
|
|
19
|
+
* 「已上行」——2026-11-16 真机 27 条 project-global 全被漏成 0 候选。判据与
|
|
20
|
+
* findScopeExitGap 的 `sync_pushed:personal-global:<id>` 是同一套证据口径。
|
|
21
|
+
* - 保管链缺口(仅保管模式开启):设备限定/project-device 活动、无任何 sync_preserve 任务;
|
|
22
|
+
* 另含缺项目身份的孤儿 project-global(route 侧降级到保管链,判据仍是 sync_preserve)。
|
|
15
23
|
* 不看 sync_upstream:旧版本给 project-global 排过永远发不出去的 sync_upstream
|
|
16
24
|
* (静默完成时代),开启保管模式后这些内容应首次入保管链。
|
|
17
25
|
* - 迁出通知缺口:曾推送到个人链、现已不在个人链、但从未有过任何 sync_scope_exit
|
|
18
26
|
* 任务的活动记忆——本变更之前迁移到 project-global(可上行目的地)不产生迁出通知
|
|
19
27
|
* (2026-11 双设备事故的 27 条就在这个形状里),对端残缺副本靠补发的通知收敛。
|
|
28
|
+
*
|
|
29
|
+
* 三条链的缺口判据都必须排除「本机不是发布者」的副本(2026-11-16 真机对端 upstreamGap=27):
|
|
30
|
+
* `sync_pushed` 元数据只在 push.ts 写入,接收方永远没有它——不排除的话,**每一台接收设备**
|
|
31
|
+
* 上拉下来的每条记忆都恒被判缺口,且自身永不消解(发布方本机看不出来)。
|
|
32
|
+
* 依据是 `memory.origin_device_id`(本机创建 = 本机 deviceId;同步到达 = 事件来源设备)。
|
|
33
|
+
* `NULL` 视为「可能由本机创建」(历史记忆),仍算缺口,避免把真缺口一刀切漏掉。
|
|
20
34
|
*/
|
|
21
35
|
export interface UpstreamGap {
|
|
22
36
|
memoryId: string;
|
|
23
37
|
scopeId: string;
|
|
24
|
-
/** 缺口所属链:personal = 个人链;preserve = 本设备保管链。 */
|
|
25
|
-
chain: 'personal' | 'preserve';
|
|
38
|
+
/** 缺口所属链:personal = 个人链;project = 项目链;preserve = 本设备保管链。 */
|
|
39
|
+
chain: 'personal' | 'project' | 'preserve';
|
|
40
|
+
/** 项目链缺口的项目身份(project-global 才有)。 */
|
|
41
|
+
projectId?: string;
|
|
26
42
|
}
|
|
27
43
|
export interface ScopeExitGap {
|
|
28
44
|
memoryId: string;
|
|
@@ -44,9 +60,10 @@ export interface BackfillReport {
|
|
|
44
60
|
excluded: number;
|
|
45
61
|
/** 本次实际(dry-run 时为将会)入队的记忆标识,按创建顺序。 */
|
|
46
62
|
memoryIds: string[];
|
|
47
|
-
/** 按链分列(tasks 4.2)。关闭保管模式时 preserve 段全为 0。 */
|
|
63
|
+
/** 按链分列(tasks 4.2 / add-cross-device-project-sync 5.2)。关闭保管模式时 preserve 段全为 0。 */
|
|
48
64
|
chains: {
|
|
49
65
|
personal: ChainBackfillCounts;
|
|
66
|
+
project: ChainBackfillCounts;
|
|
50
67
|
preserve: ChainBackfillCounts;
|
|
51
68
|
};
|
|
52
69
|
/** 存量迁出通知补发(add-cloud-preserve-mode:0.6.x 迁移不产生通知的历史缺口)。 */
|
|
@@ -62,11 +79,15 @@ export declare function findUpstreamGap(store: CairnStore): UpstreamGap[];
|
|
|
62
79
|
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
63
80
|
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
64
81
|
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
82
|
+
* 接收方副本没有 `sync_pushed:personal-global:<id>`(该元数据只由 push 写),因此
|
|
83
|
+
* 不会被误判为「曾推」——本函数不需要 origin_device_id 条件。
|
|
65
84
|
*/
|
|
66
85
|
export declare function findScopeExitGap(store: CairnStore): ScopeExitGap[];
|
|
67
|
-
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
86
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
87
|
+
* 项目链按 projectId 分列(一条项目一条链)。 */
|
|
68
88
|
export declare function findUpstreamGapChains(store: CairnStore): {
|
|
69
89
|
personal: number;
|
|
90
|
+
project: Record<string, number>;
|
|
70
91
|
preserve: number;
|
|
71
92
|
};
|
|
72
93
|
/**
|
|
@@ -1,32 +1,59 @@
|
|
|
1
|
-
import { PERSONAL_SPACE_KEY, preserveModeEnabled } from './vault.js';
|
|
1
|
+
import { PERSONAL_SPACE_KEY, PROJECT_CHAIN_PREFIX, preserveModeEnabled } from './vault.js';
|
|
2
2
|
import { enqueueMemorySync, enqueueScopeExit } from './route.js';
|
|
3
3
|
export const BACKFILL_DEFAULT_LIMIT = 500;
|
|
4
4
|
export function findUpstreamGap(store) {
|
|
5
|
+
const ownDeviceId = store.identity.deviceId;
|
|
5
6
|
const personal = store.db
|
|
6
7
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
7
8
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
8
9
|
WHERE m.status = 'active' AND s.sync_policy = 'encrypted' AND s.device_id = 'all' AND s.preset = 'personal-global'
|
|
10
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
9
11
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
10
12
|
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id)
|
|
11
|
-
ORDER BY m.created_at, m.id
|
|
13
|
+
ORDER BY m.created_at, m.id`, ownDeviceId)
|
|
12
14
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'personal' }));
|
|
15
|
+
const project = store.db
|
|
16
|
+
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId, s.project_id AS projectId
|
|
17
|
+
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
18
|
+
WHERE m.status = 'active' AND s.preset = 'project-global' AND s.project_id IS NOT NULL
|
|
19
|
+
AND s.sync_policy = 'encrypted' AND s.device_id = 'all'
|
|
20
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
21
|
+
AND NOT EXISTS (SELECT 1 FROM meta
|
|
22
|
+
WHERE meta.key = ? || s.project_id || ':' || m.id)
|
|
23
|
+
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
24
|
+
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id
|
|
25
|
+
AND j.status IN ('pending','running','retry'))
|
|
26
|
+
ORDER BY m.created_at, m.id`, ownDeviceId, 'sync_pushed:' + PROJECT_CHAIN_PREFIX)
|
|
27
|
+
.map((r) => ({
|
|
28
|
+
memoryId: String(r.memoryId),
|
|
29
|
+
scopeId: String(r.scopeId),
|
|
30
|
+
chain: 'project',
|
|
31
|
+
projectId: String(r.projectId),
|
|
32
|
+
}));
|
|
33
|
+
const upstream = [...personal, ...project];
|
|
13
34
|
if (!preserveModeEnabled(store.paths.dataDir))
|
|
14
|
-
return
|
|
15
|
-
//
|
|
35
|
+
return upstream;
|
|
36
|
+
// 保管链缺口:设备限定与 project-device,无任何 sync_preserve 任务。
|
|
37
|
+
// 缺项目身份的孤儿 project-global 也在这里(route 侧把它降级到保管链)。
|
|
16
38
|
const preserve = store.db
|
|
17
39
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
18
40
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
19
|
-
WHERE m.status = 'active'
|
|
41
|
+
WHERE m.status = 'active'
|
|
42
|
+
AND (s.preset IN ('device-local','project-device')
|
|
43
|
+
OR (s.preset = 'project-global' AND s.project_id IS NULL))
|
|
44
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
20
45
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
21
46
|
WHERE j.job_type = 'sync_preserve' AND j.entity_id = m.id)
|
|
22
|
-
ORDER BY m.created_at, m.id
|
|
47
|
+
ORDER BY m.created_at, m.id`, ownDeviceId)
|
|
23
48
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'preserve' }));
|
|
24
|
-
return [...
|
|
49
|
+
return [...upstream, ...preserve];
|
|
25
50
|
}
|
|
26
51
|
/**
|
|
27
52
|
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
28
53
|
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
29
54
|
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
55
|
+
* 接收方副本没有 `sync_pushed:personal-global:<id>`(该元数据只由 push 写),因此
|
|
56
|
+
* 不会被误判为「曾推」——本函数不需要 origin_device_id 条件。
|
|
30
57
|
*/
|
|
31
58
|
export function findScopeExitGap(store) {
|
|
32
59
|
return store.db
|
|
@@ -39,11 +66,18 @@ export function findScopeExitGap(store) {
|
|
|
39
66
|
ORDER BY m.created_at, m.id`)
|
|
40
67
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId) }));
|
|
41
68
|
}
|
|
42
|
-
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
69
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
70
|
+
* 项目链按 projectId 分列(一条项目一条链)。 */
|
|
43
71
|
export function findUpstreamGapChains(store) {
|
|
44
72
|
const gaps = findUpstreamGap(store);
|
|
73
|
+
const project = {};
|
|
74
|
+
for (const g of gaps) {
|
|
75
|
+
if (g.chain === 'project' && g.projectId)
|
|
76
|
+
project[g.projectId] = (project[g.projectId] ?? 0) + 1;
|
|
77
|
+
}
|
|
45
78
|
return {
|
|
46
79
|
personal: gaps.filter((g) => g.chain === 'personal').length,
|
|
80
|
+
project,
|
|
47
81
|
preserve: gaps.filter((g) => g.chain === 'preserve').length,
|
|
48
82
|
};
|
|
49
83
|
}
|
|
@@ -63,6 +97,7 @@ export function backfillUpstream(store, opts) {
|
|
|
63
97
|
memoryIds: [],
|
|
64
98
|
chains: {
|
|
65
99
|
personal: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
100
|
+
project: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
66
101
|
preserve: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
67
102
|
},
|
|
68
103
|
scopeExits: { candidates: exitGaps.length, enqueued: 0, memoryIds: [] },
|
|
@@ -79,7 +114,9 @@ export function backfillUpstream(store, opts) {
|
|
|
79
114
|
memoryId: g.memoryId,
|
|
80
115
|
scopeId: g.scopeId,
|
|
81
116
|
op: 'memory_upsert',
|
|
82
|
-
|
|
117
|
+
// 项目链任务必须用本链独立键:`memory:<id>` 往往已被当年个人链的任务永久占用
|
|
118
|
+
// (唯一约束,done 之后仍占),复用同键会被幂等去重挡成 existing,项目链永远补不上。
|
|
119
|
+
idempotencyKey: g.chain === 'project' ? `memory:${g.memoryId}:project:${g.projectId}` : `memory:${g.memoryId}`,
|
|
83
120
|
});
|
|
84
121
|
if (r.enqueued) {
|
|
85
122
|
report.enqueued++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,12 @@ export interface SyncScopeExitPayload {
|
|
|
60
60
|
lastContentHash: string;
|
|
61
61
|
/** 推送端已知的全部修订内容哈希——与 tombstone 同一血统对齐机制。 */
|
|
62
62
|
knownHashes: string[];
|
|
63
|
+
/**
|
|
64
|
+
* 终态作用域(add-cross-device-project-sync D5):迁出后记忆所在的作用域。
|
|
65
|
+
* 接收端据此更新本地留存副本的展示作用域与标签(仍不复制内容、不产生墓碑)。
|
|
66
|
+
* 新增可选字段而非新事件类型:旧版本忽略未知字段,语义不退化。记忆已不存在时省略。
|
|
67
|
+
*/
|
|
68
|
+
terminalScope?: SyncScopeDescriptor;
|
|
63
69
|
}
|
|
64
70
|
export interface SyncEvent {
|
|
65
71
|
deviceId: string;
|
|
@@ -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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"}
|
package/dist/src/sync/pull.d.ts
CHANGED
|
@@ -4,7 +4,8 @@ import { VaultConfig } from './vault.js';
|
|
|
4
4
|
import { ApplyOutcome } from './apply.js';
|
|
5
5
|
/**
|
|
6
6
|
* 同步拉取(design D4 + add-cloud-preserve-mode D2/tasks 3.1):
|
|
7
|
-
* 拉取范围 = syncableChains()
|
|
7
|
+
* 拉取范围 = syncableChains()——个人链恒在;项目链 = 本地已知 ∪ 远端发现;
|
|
8
|
+
* 保管模式开启时加本设备保管链。
|
|
8
9
|
* 他人保管链对象完全不被下载(前缀隔离:`preserve/<别的设备>/` 不在任何列举范围内)。
|
|
9
10
|
* 每条链:列举其他设备 → 读 manifest(密文)→ 按 headSeq 对本地游标取差量 chunk
|
|
10
11
|
* → 解密 → 按事件序幂等应用 → 推进游标(单事务)。中断可重入:游标只在一个
|