@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/pull.d.ts
CHANGED
|
@@ -3,12 +3,17 @@ import { RemoteStore } from '../jobs/remote.js';
|
|
|
3
3
|
import { VaultConfig } from './vault.js';
|
|
4
4
|
import { ApplyOutcome } from './apply.js';
|
|
5
5
|
/**
|
|
6
|
-
* 同步拉取(design D4
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* 同步拉取(design D4 + add-cloud-preserve-mode D2/tasks 3.1):
|
|
7
|
+
* 拉取范围 = syncableChains()——个人链恒在;保管模式开启时加本设备保管链。
|
|
8
|
+
* 他人保管链对象完全不被下载(前缀隔离:`preserve/<别的设备>/` 不在任何列举范围内)。
|
|
9
|
+
* 每条链:列举其他设备 → 读 manifest(密文)→ 按 headSeq 对本地游标取差量 chunk
|
|
10
|
+
* → 解密 → 按事件序幂等应用 → 推进游标(单事务)。中断可重入:游标只在一个
|
|
11
|
+
* chunk 全部事件应用成功后推进。
|
|
9
12
|
*/
|
|
10
13
|
export interface PullDeviceResult {
|
|
11
14
|
deviceId: string;
|
|
15
|
+
/** 事件链空间键(个人链或保管链)。 */
|
|
16
|
+
spaceKey: string;
|
|
12
17
|
headSeq: number;
|
|
13
18
|
appliedBefore: number;
|
|
14
19
|
outcome: ApplyOutcome | null;
|
package/dist/src/sync/pull.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
2
|
import { manifestKey, unpackChunk, } from './events.js';
|
|
3
3
|
import { deriveSpaceKey, loadKeys, decryptObject } from './cryptoutil.js';
|
|
4
|
-
import {
|
|
4
|
+
import { isPreserveSpaceKey, syncableChains } from './vault.js';
|
|
5
5
|
import { applyEvents } from './apply.js';
|
|
6
6
|
export function pullCursorKey(spaceKey, remoteDevice) {
|
|
7
7
|
return `sync_pull:${spaceKey}:${remoteDevice}`;
|
|
@@ -43,14 +43,39 @@ function decryptChunk(sealed, vaultKey, vaultId, spaceKey, meta, deviceId) {
|
|
|
43
43
|
});
|
|
44
44
|
return unpackChunk(plain, deviceId, meta);
|
|
45
45
|
}
|
|
46
|
+
function chunkObjectKey(spaceKey, meta) {
|
|
47
|
+
return `${spaceKey}/${meta.key}`;
|
|
48
|
+
}
|
|
46
49
|
export async function syncPull(store, remote, vault) {
|
|
47
50
|
store.assertWritable();
|
|
48
|
-
const spaceKey = PERSONAL_SPACE_KEY;
|
|
49
51
|
const keys = loadKeys(store.paths.dataDir);
|
|
50
52
|
if (!keys)
|
|
51
53
|
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote 或导入恢复材料');
|
|
52
54
|
const myDevice = store.identity.deviceId;
|
|
53
|
-
|
|
55
|
+
const results = [];
|
|
56
|
+
let totalApplied = 0;
|
|
57
|
+
for (const spaceKey of syncableChains(vault, myDevice)) {
|
|
58
|
+
// 个人链:消费链上全部设备的 manifest(含自己——找回场景);
|
|
59
|
+
// 保管链:单写者,只有自己的 manifest。
|
|
60
|
+
const sourceDeviceIds = isPreserveSpaceKey(spaceKey) ? [myDevice] : await listRemoteDevices(remote, spaceKey, myDevice);
|
|
61
|
+
for (const deviceId of sourceDeviceIds) {
|
|
62
|
+
const r = await pullFromDevice(store, remote, vault, keys, spaceKey, deviceId);
|
|
63
|
+
if (r) {
|
|
64
|
+
results.push(r);
|
|
65
|
+
totalApplied += r.appliedBefore;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
void manifestKey;
|
|
70
|
+
return { devices: results, totalApplied };
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* 发现某条链上的远端设备:列举 <spaceKey>/devices/<id>/manifest.json。
|
|
74
|
+
* 包含自己(add-cloud-preserve-mode 找回场景):本地数据目录丢失后,个人链与保管链
|
|
75
|
+
* 的恢复都靠重放自己的 manifest。游标机制保证幂等且增量——健康设备首次自拉取
|
|
76
|
+
* 只是「全部跳过 + 游标推进到头」,之后每轮只看新增。
|
|
77
|
+
*/
|
|
78
|
+
async function listRemoteDevices(remote, spaceKey, _myDevice) {
|
|
54
79
|
const listing = await remote.list(`${spaceKey}/devices/`);
|
|
55
80
|
const manifestSuffix = '/manifest.json';
|
|
56
81
|
const deviceIds = new Set();
|
|
@@ -59,92 +84,83 @@ export async function syncPull(store, remote, vault) {
|
|
|
59
84
|
continue;
|
|
60
85
|
const rel = k.slice(`${spaceKey}/devices/`.length);
|
|
61
86
|
const d = rel.slice(0, rel.indexOf('/'));
|
|
62
|
-
if (d
|
|
87
|
+
if (d)
|
|
63
88
|
deviceIds.add(d);
|
|
64
89
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
90
|
+
return [...deviceIds];
|
|
91
|
+
}
|
|
92
|
+
async function pullFromDevice(store, remote, vault, keys, spaceKey, deviceId) {
|
|
93
|
+
const sealed = await remote.getManifest(spaceKey, deviceId);
|
|
94
|
+
if (!sealed)
|
|
95
|
+
return null; // 该设备在此链上没有 manifest(含健康设备的自链):无行可报
|
|
96
|
+
if (!(sealed instanceof Uint8Array))
|
|
97
|
+
throw err('E_VALIDATION', '远端 manifest 不是字节对象');
|
|
98
|
+
// 第三轮验证 P1:外来 vault / 密钥不匹配的 manifest 解密必然失败——
|
|
99
|
+
// 降级为跳过 + 审计(不是密钥损坏,不能让本 vault 的同步停摆)
|
|
100
|
+
let manifest;
|
|
101
|
+
try {
|
|
102
|
+
manifest = decryptManifestDoc(sealed, keys.vaultKey, vault.vaultId, spaceKey, deviceId);
|
|
103
|
+
}
|
|
104
|
+
catch (e) {
|
|
105
|
+
const code = e.code;
|
|
106
|
+
if (code === 'E_VALIDATION') {
|
|
107
|
+
store.audit.record('sync', 'manifest_skipped', { type: 'system', id: deviceId }, { reason: 'foreign_vault_or_undecryptable', spaceKey });
|
|
108
|
+
return { deviceId, spaceKey, headSeq: 0, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'foreign_vault_or_undecryptable' };
|
|
109
|
+
}
|
|
110
|
+
throw e;
|
|
111
|
+
}
|
|
112
|
+
const cursor = getCursor(store, spaceKey, deviceId);
|
|
113
|
+
if (manifest.headSeq <= cursor) {
|
|
114
|
+
return { deviceId, spaceKey, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0 };
|
|
115
|
+
}
|
|
116
|
+
// 取 (cursor, headSeq] 覆盖的 chunk
|
|
117
|
+
const chunks = manifest.chunks.filter((c) => c.seqTo > cursor && c.seqFrom <= manifest.headSeq).sort((a, b) => a.seqFrom - b.seqFrom);
|
|
118
|
+
const events = [];
|
|
119
|
+
let chunkSkip = false;
|
|
120
|
+
for (const meta of chunks) {
|
|
121
|
+
const sealedChunk = await remote.getObject(chunkObjectKey(spaceKey, meta));
|
|
122
|
+
if (!sealedChunk) {
|
|
123
|
+
// chunk 缺失(上传中断于 manifest 之前的孤儿引用):跳过该 chunk,游标不越过它
|
|
124
|
+
store.audit.record('sync', 'chunk_missing', { type: 'system', id: meta.key }, { device: deviceId, spaceKey });
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
76
127
|
try {
|
|
77
|
-
|
|
128
|
+
events.push(...decryptChunk(sealedChunk, keys.vaultKey, vault.vaultId, spaceKey, meta, deviceId));
|
|
78
129
|
}
|
|
79
130
|
catch (e) {
|
|
80
131
|
const code = e.code;
|
|
81
132
|
if (code === 'E_VALIDATION') {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
throw e;
|
|
87
|
-
}
|
|
88
|
-
const cursor = getCursor(store, spaceKey, deviceId);
|
|
89
|
-
if (manifest.headSeq <= cursor) {
|
|
90
|
-
results.push({ deviceId, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0 });
|
|
91
|
-
continue;
|
|
92
|
-
}
|
|
93
|
-
// 取 (cursor, headSeq] 覆盖的 chunk
|
|
94
|
-
const chunks = manifest.chunks.filter((c) => c.seqTo > cursor && c.seqFrom <= manifest.headSeq).sort((a, b) => a.seqFrom - b.seqFrom);
|
|
95
|
-
const events = [];
|
|
96
|
-
let chunkSkip = false;
|
|
97
|
-
for (const meta of chunks) {
|
|
98
|
-
const sealedChunk = await remote.getObject(chunkObjectKey(spaceKey, meta));
|
|
99
|
-
if (!sealedChunk) {
|
|
100
|
-
// chunk 缺失(上传中断于 manifest 之前的孤儿引用):跳过该 chunk,游标不越过它
|
|
101
|
-
store.audit.record('sync', 'chunk_missing', { type: 'system', id: meta.key }, { device: deviceId });
|
|
133
|
+
// 单个 chunk 不可解密(外来/损坏):跳过该设备本轮,不拖垮整链
|
|
134
|
+
store.audit.record('sync', 'chunk_skipped', { type: 'system', id: meta.key }, { device: deviceId, spaceKey, reason: 'undecryptable' });
|
|
135
|
+
chunkSkip = true;
|
|
102
136
|
break;
|
|
103
137
|
}
|
|
104
|
-
|
|
105
|
-
events.push(...decryptChunk(sealedChunk, keys.vaultKey, vault.vaultId, spaceKey, meta, deviceId));
|
|
106
|
-
}
|
|
107
|
-
catch (e) {
|
|
108
|
-
const code = e.code;
|
|
109
|
-
if (code === 'E_VALIDATION') {
|
|
110
|
-
// 单个 chunk 不可解密(外来/损坏):跳过该设备本轮,不拖垮整链
|
|
111
|
-
store.audit.record('sync', 'chunk_skipped', { type: 'system', id: meta.key }, { device: deviceId, reason: 'undecryptable' });
|
|
112
|
-
chunkSkip = true;
|
|
113
|
-
break;
|
|
114
|
-
}
|
|
115
|
-
throw e;
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
if (chunkSkip) {
|
|
119
|
-
results.push({ deviceId, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'undecryptable_chunk' });
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
// 按序应用
|
|
123
|
-
events.sort((a, b) => a.seq - b.seq);
|
|
124
|
-
const { outcome, waitEvents } = applyEvents(store, events, spaceKey);
|
|
125
|
-
// 游标推进到最后一个成功应用的事件序(等待依赖的事件不推进——下次重试)
|
|
126
|
-
let appliedThrough = cursor;
|
|
127
|
-
for (const ev of events) {
|
|
128
|
-
if (waitEvents.some((w) => w.seq === ev.seq && w.memoryId === ev.memoryId))
|
|
129
|
-
break;
|
|
130
|
-
appliedThrough = ev.seq;
|
|
138
|
+
throw e;
|
|
131
139
|
}
|
|
132
|
-
if (appliedThrough > cursor)
|
|
133
|
-
setCursor(store, spaceKey, deviceId, appliedThrough);
|
|
134
|
-
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
|
|
135
|
-
totalApplied += applied;
|
|
136
|
-
results.push({
|
|
137
|
-
deviceId,
|
|
138
|
-
headSeq: manifest.headSeq,
|
|
139
|
-
appliedBefore: applied,
|
|
140
|
-
outcome,
|
|
141
|
-
waited: waitEvents.length,
|
|
142
|
-
});
|
|
143
140
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
|
|
141
|
+
if (chunkSkip) {
|
|
142
|
+
return { deviceId, spaceKey, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'undecryptable_chunk' };
|
|
143
|
+
}
|
|
144
|
+
// 按序应用(物化过滤在 applyEvent 内按链角色执行)
|
|
145
|
+
events.sort((a, b) => a.seq - b.seq);
|
|
146
|
+
const { outcome, waitEvents } = applyEvents(store, events, spaceKey);
|
|
147
|
+
// 游标推进到最后一个成功应用的事件序(等待依赖的事件不推进——下次重试)
|
|
148
|
+
let appliedThrough = cursor;
|
|
149
|
+
for (const ev of events) {
|
|
150
|
+
if (waitEvents.some((w) => w.seq === ev.seq && w.memoryId === ev.memoryId))
|
|
151
|
+
break;
|
|
152
|
+
appliedThrough = ev.seq;
|
|
153
|
+
}
|
|
154
|
+
if (appliedThrough > cursor)
|
|
155
|
+
setCursor(store, spaceKey, deviceId, appliedThrough);
|
|
156
|
+
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
|
|
157
|
+
return {
|
|
158
|
+
deviceId,
|
|
159
|
+
spaceKey,
|
|
160
|
+
headSeq: manifest.headSeq,
|
|
161
|
+
appliedBefore: applied,
|
|
162
|
+
outcome,
|
|
163
|
+
waited: waitEvents.length,
|
|
164
|
+
};
|
|
149
165
|
}
|
|
150
166
|
//# sourceMappingURL=pull.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/sync/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAIL,WAAW,EACX,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/sync/pull.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/push.d.ts
CHANGED
|
@@ -2,17 +2,33 @@ import { CairnStore } from '../store/open.js';
|
|
|
2
2
|
import { RemoteStore } from '../jobs/remote.js';
|
|
3
3
|
import { ChunkMeta } from './events.js';
|
|
4
4
|
import { VaultConfig } from './vault.js';
|
|
5
|
+
export interface ChainPushResult {
|
|
6
|
+
spaceKey: string;
|
|
7
|
+
/** personal = 个人链;preserve = 本设备保管链。 */
|
|
8
|
+
role: 'personal' | 'preserve';
|
|
9
|
+
publishedChunks: ChunkMeta[];
|
|
10
|
+
headSeq: number;
|
|
11
|
+
eventCount: number;
|
|
12
|
+
/** 该链完成的任务数(含事件为空被幂等完成的)。 */
|
|
13
|
+
jobs: number;
|
|
14
|
+
}
|
|
5
15
|
export interface PushResult {
|
|
6
16
|
publishedChunks: ChunkMeta[];
|
|
7
17
|
headSeq: number;
|
|
8
18
|
eventCount: number;
|
|
9
19
|
jobs: number;
|
|
20
|
+
/** 按链分列(tasks 2.4);单链场景与顶层字段一致。 */
|
|
21
|
+
chains: ChainPushResult[];
|
|
22
|
+
/** 因不可路由而完成并审计的任务数(add-cloud-preserve-mode:消灭静默完成)。 */
|
|
23
|
+
unroutable: number;
|
|
10
24
|
}
|
|
11
25
|
interface PendingJob {
|
|
12
26
|
id: string;
|
|
13
27
|
entityId: string;
|
|
14
28
|
/** 完整任务行才带 payload;worker preclaim 路径会传入。op=scope_exit / force 用于控制事件。 */
|
|
15
29
|
payload?: Record<string, unknown>;
|
|
30
|
+
/** 任务类型(路由判定用);worker preclaim 路径由调用方传入。 */
|
|
31
|
+
jobTypeHint?: string;
|
|
16
32
|
}
|
|
17
33
|
export declare function syncPush(store: CairnStore, remote: RemoteStore, vault: VaultConfig, opts?: {
|
|
18
34
|
maxJobs?: number;
|
package/dist/src/sync/push.js
CHANGED
|
@@ -3,12 +3,21 @@ import { sha256Hex } from '../core/hash.js';
|
|
|
3
3
|
import { nowIso } from '../core/time.js';
|
|
4
4
|
import { emptyManifest, nextManifest, packChunk, validateUpsertEvent, } from './events.js';
|
|
5
5
|
import { deriveSpaceKey, loadKeys, encryptObject, decryptObject } from './cryptoutil.js';
|
|
6
|
-
import { PERSONAL_SPACE_KEY } from './vault.js';
|
|
6
|
+
import { PERSONAL_SPACE_KEY, isPreserveSpaceKey, preserveSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
7
7
|
/**
|
|
8
|
-
* 同步推送(design D2
|
|
9
|
-
* →
|
|
10
|
-
*
|
|
11
|
-
*
|
|
8
|
+
* 同步推送(design D2 + add-cloud-preserve-mode D2/D4):
|
|
9
|
+
* outbox 的 sync_upstream / sync_preserve / sync_scope_exit 任务 → 事件 → chunk(加密)
|
|
10
|
+
* → manifest(单写者,headSeq 防回退)。事件按内容哈希链组织。
|
|
11
|
+
*
|
|
12
|
+
* 按链分组发布(tasks 2.4):个人链(personal-global)与保管链(preserve/<deviceId>)
|
|
13
|
+
* 各自 chunk / manifest / 代次。路由判定:
|
|
14
|
+
* - sync_upstream + personal-global 记忆 → 个人链;
|
|
15
|
+
* - sync_preserve + 保管链承载作用域 → 保管链;
|
|
16
|
+
* - 其余一律「完成 + 审计 sync_job_unroutable」——静默完成分支已消灭(tasks 2.3):
|
|
17
|
+
* 不可路由任务 MUST 完成并写审计,MUST NOT 产生远端事件。
|
|
18
|
+
*
|
|
19
|
+
* 关闭模式下设备限定内容由 outbox 层物理排除(触发器 + route.ts 双重检查),
|
|
20
|
+
* 打包层对个人链再按 scope 过滤一次(spec:打包前物理排除)。
|
|
12
21
|
* 失败只留下可重试状态:推送异常时已领取任务复位为 pending(spec agent-interfaces)。
|
|
13
22
|
*/
|
|
14
23
|
const MAX_EVENTS_PER_CHUNK = 200;
|
|
@@ -23,21 +32,38 @@ function pushedRevisionKey(spaceKey, memoryId) {
|
|
|
23
32
|
function chunkObjectKey(spaceKey, meta) {
|
|
24
33
|
return `${spaceKey}/${meta.key}`;
|
|
25
34
|
}
|
|
26
|
-
/**
|
|
27
|
-
function
|
|
35
|
+
/** 从作用域行构造事件的作用域描述符(D3)。项目名从 space 表取(物化端重建项目行用)。 */
|
|
36
|
+
function scopeDescriptor(store, scope) {
|
|
37
|
+
const d = { preset: scope.preset };
|
|
38
|
+
if (scope.projectId) {
|
|
39
|
+
d.projectId = scope.projectId;
|
|
40
|
+
const spaceRow = store.db.get('SELECT name FROM space WHERE id = ?', scope.spaceId);
|
|
41
|
+
if (spaceRow?.name)
|
|
42
|
+
d.spaceName = String(spaceRow.name);
|
|
43
|
+
}
|
|
44
|
+
if (scope.deviceId && scope.deviceId !== 'all')
|
|
45
|
+
d.deviceId = scope.deviceId;
|
|
46
|
+
return d;
|
|
47
|
+
}
|
|
48
|
+
/** 构建单链事件。payload 为当前修订快照;scope_exit 生成控制事件。 */
|
|
49
|
+
function buildEventsForChain(store, device, spaceKey, role, jobs, auditUnroutable) {
|
|
28
50
|
const events = [];
|
|
29
51
|
const doneJobIds = [];
|
|
30
|
-
const
|
|
31
|
-
if (
|
|
52
|
+
const personalScope = store.scopes.resolvePreset('personal-global');
|
|
53
|
+
if (role === 'personal' && personalScope.syncPolicy !== 'encrypted') {
|
|
32
54
|
throw err('E_FORBIDDEN', 'personal-global 作用域不是 encrypted;拒绝上行(物理排除语义)');
|
|
33
55
|
}
|
|
34
56
|
for (const job of jobs) {
|
|
35
57
|
// 迁出通知任务(add-scope-migration):独立的 sync_scope_exit jobType,
|
|
36
|
-
//
|
|
37
|
-
// 走不了下面的常规 upsert 分支(那里对非本空间记忆是静默完成)。
|
|
58
|
+
// 生成控制事件而非修订内容。fromSpace 固化于入队时(D4):只发到来源链。
|
|
38
59
|
if (job.payload?.['op'] === 'scope_exit') {
|
|
60
|
+
const fromSpace = typeof job.payload['fromSpace'] === 'string' ? String(job.payload['fromSpace']) : PERSONAL_SPACE_KEY;
|
|
61
|
+
if (fromSpace !== spaceKey) {
|
|
62
|
+
// 该迁出的来源链不是本链:留给对应链处理(目前迁出只发生在个人链)。
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
39
65
|
const mem = store.memories.get(job.entityId);
|
|
40
|
-
const pushedRow = store.db.get('SELECT value FROM meta WHERE key = ?', pushedRevisionKey(
|
|
66
|
+
const pushedRow = store.db.get('SELECT value FROM meta WHERE key = ?', pushedRevisionKey(spaceKey, job.entityId));
|
|
41
67
|
let lastHash = pushedRow ? String(pushedRow.value) : null;
|
|
42
68
|
let knownHashes = [];
|
|
43
69
|
if (mem) {
|
|
@@ -68,10 +94,23 @@ function buildEvents(store, device, jobs) {
|
|
|
68
94
|
doneJobIds.push(job.id);
|
|
69
95
|
continue;
|
|
70
96
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
97
|
+
const memScope = store.scopes.getById(mem.scopeId);
|
|
98
|
+
if (role === 'personal') {
|
|
99
|
+
// 打包层物理排除(spec:打包前排除)+ 消灭静默完成(tasks 2.3):
|
|
100
|
+
// 非个人链记忆的任务不可路由 → 完成 + 审计(旧实现是静默完成,27 条迁移事故的根源)。
|
|
101
|
+
if (!memScope || memScope.preset !== 'personal-global') {
|
|
102
|
+
auditUnroutable(job, `memory_scope_not_personal:${memScope?.preset ?? 'unknown'}`);
|
|
103
|
+
doneJobIds.push(job.id);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// 保管链:只承载保管链作用域;描述符取自当前作用域(D3)。
|
|
109
|
+
if (!memScope || !isPreserveScopePreset(memScope.preset)) {
|
|
110
|
+
auditUnroutable(job, `memory_scope_not_preservable:${memScope?.preset ?? 'unknown'}`);
|
|
111
|
+
doneJobIds.push(job.id);
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
75
114
|
}
|
|
76
115
|
if (mem.status === 'tombstoned') {
|
|
77
116
|
const knownHashes = store.memories.revisions(mem.id).map((r) => r.contentHash);
|
|
@@ -88,9 +127,10 @@ function buildEvents(store, device, jobs) {
|
|
|
88
127
|
continue;
|
|
89
128
|
}
|
|
90
129
|
const currentRevId = mem.currentRevisionId;
|
|
91
|
-
const pushedRow = store.db.get('SELECT value FROM meta WHERE key = ?', pushedRevisionKey(
|
|
130
|
+
const pushedRow = store.db.get('SELECT value FROM meta WHERE key = ?', pushedRevisionKey(spaceKey, mem.id));
|
|
92
131
|
const pushedRevId = pushedRow ? pushedRow.value : null;
|
|
93
|
-
// force
|
|
132
|
+
// force(迁回/重迁移重推):修订未变也要重发一次修订快照,对端据此解除「不再持有」
|
|
133
|
+
// 或按新描述符重新物化。
|
|
94
134
|
const force = job.payload?.['force'] === true;
|
|
95
135
|
if (!currentRevId || (pushedRevId === currentRevId && !force)) {
|
|
96
136
|
// 无当前修订或该修订已推送:幂等完成
|
|
@@ -106,7 +146,7 @@ function buildEvents(store, device, jobs) {
|
|
|
106
146
|
parentHash: parentRow ? parentRow.content_hash : null,
|
|
107
147
|
kind: mem.kind,
|
|
108
148
|
authority: mem.authority,
|
|
109
|
-
scopeId: PERSONAL_SPACE_KEY,
|
|
149
|
+
scopeId: role === 'personal' ? PERSONAL_SPACE_KEY : memScope.preset,
|
|
110
150
|
sensitivity: mem.sensitivity,
|
|
111
151
|
confidence: mem.confidence,
|
|
112
152
|
observedAt: mem.observedAt,
|
|
@@ -115,6 +155,7 @@ function buildEvents(store, device, jobs) {
|
|
|
115
155
|
sourceAgent: mem.sourceAgent,
|
|
116
156
|
createdBy: mem.createdBy,
|
|
117
157
|
reason: rev.reason,
|
|
158
|
+
...(role === 'personal' ? { scope: { preset: 'personal-global' } } : { scope: scopeDescriptor(store, memScope) }),
|
|
118
159
|
...(force ? { reentry: true } : {}),
|
|
119
160
|
};
|
|
120
161
|
events.push({ deviceId: device, seq: 0, type: 'memory_upsert', memoryId: mem.id, occurredAt: nowIso(), payload });
|
|
@@ -138,16 +179,44 @@ function assignSeqs(store, spaceKey, events) {
|
|
|
138
179
|
}
|
|
139
180
|
});
|
|
140
181
|
}
|
|
182
|
+
/** 单个 job 的归属:返回目标链空间键;不可路由返回 null。 */
|
|
183
|
+
function routeJob(store, job, preserveOn) {
|
|
184
|
+
if (job.payload?.['op'] === 'scope_exit') {
|
|
185
|
+
const fromSpace = typeof job.payload['fromSpace'] === 'string' ? String(job.payload['fromSpace']) : PERSONAL_SPACE_KEY;
|
|
186
|
+
if (fromSpace === PERSONAL_SPACE_KEY)
|
|
187
|
+
return { spaceKey: PERSONAL_SPACE_KEY, role: 'personal' };
|
|
188
|
+
if (isPreserveSpaceKey(fromSpace))
|
|
189
|
+
return { spaceKey: fromSpace, role: 'preserve' };
|
|
190
|
+
return null;
|
|
191
|
+
}
|
|
192
|
+
if (job.jobTypeHint === 'sync_preserve') {
|
|
193
|
+
if (!preserveOn)
|
|
194
|
+
return null;
|
|
195
|
+
return { spaceKey: preserveSpaceKey(store.identity.deviceId), role: 'preserve' };
|
|
196
|
+
}
|
|
197
|
+
// sync_upstream:按记忆当前作用域路由(入队后可能已迁移;迁移动作会重建 outbox,
|
|
198
|
+
// 这里是防御性兜底)。personal → 个人链;保管链作用域 → 保管链(开启时);其余不可路由。
|
|
199
|
+
const mem = store.memories.get(job.entityId);
|
|
200
|
+
const scope = mem ? store.scopes.getById(mem.scopeId) : null;
|
|
201
|
+
if (scope?.preset === 'personal-global')
|
|
202
|
+
return { spaceKey: PERSONAL_SPACE_KEY, role: 'personal' };
|
|
203
|
+
if (scope && isPreserveScopePreset(scope.preset) && preserveOn) {
|
|
204
|
+
return { spaceKey: preserveSpaceKey(store.identity.deviceId), role: 'preserve' };
|
|
205
|
+
}
|
|
206
|
+
return null;
|
|
207
|
+
}
|
|
141
208
|
export async function syncPush(store, remote, vault, opts = {}) {
|
|
142
209
|
store.assertWritable();
|
|
143
|
-
const
|
|
144
|
-
// 迁出通知与上行内容走同一条 push 链(add-scope-migration);两者都是本空间的同步事件。
|
|
210
|
+
const preserveOn = vault.preserveDeviceBound === true;
|
|
145
211
|
const jobs = opts.preclaimedJobs
|
|
146
|
-
?? store.outbox
|
|
212
|
+
?? store.outbox
|
|
213
|
+
.claimReady(opts.maxJobs ?? 200)
|
|
214
|
+
.filter((j) => j.jobType === 'sync_upstream' || j.jobType === 'sync_scope_exit' || j.jobType === 'sync_preserve')
|
|
215
|
+
.map((j) => ({ id: j.id, entityId: j.entityId, payload: j.payload, jobTypeHint: j.jobType }));
|
|
147
216
|
if (jobs.length === 0)
|
|
148
217
|
return null;
|
|
149
218
|
try {
|
|
150
|
-
return await pushClaimed(store, remote, vault,
|
|
219
|
+
return await pushClaimed(store, remote, vault, jobs, preserveOn);
|
|
151
220
|
}
|
|
152
221
|
catch (e) {
|
|
153
222
|
// 失败复位:已领取任务回到 pending(可重试状态),错误照常抛出
|
|
@@ -159,9 +228,60 @@ export async function syncPush(store, remote, vault, opts = {}) {
|
|
|
159
228
|
throw e;
|
|
160
229
|
}
|
|
161
230
|
}
|
|
162
|
-
async function pushClaimed(store, remote, vault,
|
|
231
|
+
async function pushClaimed(store, remote, vault, jobs, preserveOn) {
|
|
163
232
|
const device = store.identity.deviceId;
|
|
164
|
-
const
|
|
233
|
+
const keys = loadKeys(store.paths.dataDir);
|
|
234
|
+
if (!keys)
|
|
235
|
+
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote');
|
|
236
|
+
const counts = { unroutable: 0 };
|
|
237
|
+
const auditUnroutable = (job, reason) => {
|
|
238
|
+
counts.unroutable++;
|
|
239
|
+
store.audit.record('sync', 'sync_job_unroutable', { type: 'memory', id: job.entityId }, {
|
|
240
|
+
jobId: job.id,
|
|
241
|
+
jobType: job.jobTypeHint ?? null,
|
|
242
|
+
reason,
|
|
243
|
+
});
|
|
244
|
+
};
|
|
245
|
+
// 按目标链分组;不可路由任务立即完成 + 审计(MUST NOT 产生远端事件)
|
|
246
|
+
const byChain = new Map();
|
|
247
|
+
const doneDirectly = [];
|
|
248
|
+
for (const job of jobs) {
|
|
249
|
+
const target = routeJob(store, job, preserveOn);
|
|
250
|
+
if (!target) {
|
|
251
|
+
auditUnroutable(job, preserveOn ? 'no_route_for_job' : 'preserve_mode_off_or_scope_not_routable');
|
|
252
|
+
doneDirectly.push(job.id);
|
|
253
|
+
continue;
|
|
254
|
+
}
|
|
255
|
+
const entry = byChain.get(target.spaceKey) ?? { role: target.role, jobs: [] };
|
|
256
|
+
entry.jobs.push(job);
|
|
257
|
+
byChain.set(target.spaceKey, entry);
|
|
258
|
+
}
|
|
259
|
+
for (const id of doneDirectly)
|
|
260
|
+
store.outbox.markDone(id);
|
|
261
|
+
const chains = [];
|
|
262
|
+
for (const [spaceKey, entry] of byChain) {
|
|
263
|
+
const { events, doneJobIds } = buildEventsForChain(store, device, spaceKey, entry.role, entry.jobs, auditUnroutable);
|
|
264
|
+
// 【顺序纪律】先发布后 markDone(单链时代的既有契约:推送异常时已领取任务
|
|
265
|
+
// 必须回到 pending 可重试)。markDone 提前会让「发布失败」把任务永久卡在
|
|
266
|
+
// done——本地认为已上传、远端没有对象,且 catch 的 running 复位救不回来
|
|
267
|
+
// (2026-11-15 真实库实测踩中:48 个保管链任务 done 而远端 0 对象)。
|
|
268
|
+
const chainResult = await publishChain(store, remote, vault, keys, device, spaceKey, events);
|
|
269
|
+
for (const id of doneJobIds)
|
|
270
|
+
store.outbox.markDone(id);
|
|
271
|
+
chains.push({ spaceKey, role: entry.role, jobs: entry.jobs.length, ...chainResult });
|
|
272
|
+
}
|
|
273
|
+
const publishedChunks = chains.flatMap((c) => c.publishedChunks);
|
|
274
|
+
return {
|
|
275
|
+
publishedChunks,
|
|
276
|
+
headSeq: publishedChunks.length > 0 ? Math.max(...publishedChunks.map((c) => c.seqTo)) : 0,
|
|
277
|
+
eventCount: chains.reduce((n, c) => n + c.eventCount, 0),
|
|
278
|
+
jobs: jobs.length,
|
|
279
|
+
chains,
|
|
280
|
+
unroutable: counts.unroutable,
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
/** 单链发布:分配序号 → chunk → manifest(既有单链逻辑参数化)。 */
|
|
284
|
+
async function publishChain(store, remote, vault, keys, device, spaceKey, events) {
|
|
165
285
|
if (events.length > 0) {
|
|
166
286
|
assignSeqs(store, spaceKey, events);
|
|
167
287
|
for (const ev of events) {
|
|
@@ -169,9 +289,6 @@ async function pushClaimed(store, remote, vault, spaceKey, jobs) {
|
|
|
169
289
|
validateUpsertEvent(ev);
|
|
170
290
|
}
|
|
171
291
|
}
|
|
172
|
-
const keys = loadKeys(store.paths.dataDir);
|
|
173
|
-
if (!keys)
|
|
174
|
-
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote');
|
|
175
292
|
const spaceKeyBytes = deriveSpaceKey(keys.vaultKey, spaceKey);
|
|
176
293
|
// 读自身 manifest(密文,AAD 绑定逻辑标识)
|
|
177
294
|
let current = emptyManifest(vault.vaultId, spaceKey, device);
|
|
@@ -226,16 +343,7 @@ async function pushClaimed(store, remote, vault, spaceKey, jobs) {
|
|
|
226
343
|
}
|
|
227
344
|
});
|
|
228
345
|
}
|
|
229
|
-
|
|
230
|
-
if (doneJobIds.includes(j.id))
|
|
231
|
-
store.outbox.markDone(j.id);
|
|
232
|
-
}
|
|
233
|
-
return {
|
|
234
|
-
publishedChunks,
|
|
235
|
-
headSeq: publishedChunks.length > 0 ? Math.max(...publishedChunks.map((c) => c.seqTo)) : current.headSeq,
|
|
236
|
-
eventCount: events.length,
|
|
237
|
-
jobs: jobs.length,
|
|
238
|
-
};
|
|
346
|
+
return { publishedChunks, headSeq: publishedChunks.length > 0 ? Math.max(...publishedChunks.map((c) => c.seqTo)) : current.headSeq, eventCount: events.length };
|
|
239
347
|
}
|
|
240
348
|
function decryptManifestDoc(sealed, vaultKey, vaultId, spaceKey, device) {
|
|
241
349
|
const plain = decryptObject(sealed, deriveSpaceKey(vaultKey, spaceKey), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/sync/push.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/sync/push.ts"],"names":[],"mappings":"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"}
|