@carloswon/cairn-memory 0.6.1 → 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.
Files changed (60) hide show
  1. package/README.md +2 -2
  2. package/dist/src/core/types.d.ts +6 -0
  3. package/dist/src/core/types.js.map +1 -1
  4. package/dist/src/governance/apply.js +3 -12
  5. package/dist/src/governance/apply.js.map +1 -1
  6. package/dist/src/interfaces/app-service.d.ts +19 -0
  7. package/dist/src/interfaces/app-service.js +107 -67
  8. package/dist/src/interfaces/app-service.js.map +1 -1
  9. package/dist/src/interfaces/cli/main.js +25 -6
  10. package/dist/src/interfaces/cli/main.js.map +1 -1
  11. package/dist/src/interfaces/console/assets/ui-js.js +39 -3
  12. package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
  13. package/dist/src/interfaces/console/assets/url-state.d.ts +1 -1
  14. package/dist/src/interfaces/console/assets/url-state.js +2 -2
  15. package/dist/src/interfaces/console/assets/url-state.js.map +1 -1
  16. package/dist/src/interfaces/console/model.d.ts +16 -0
  17. package/dist/src/interfaces/console/model.js +34 -1
  18. package/dist/src/interfaces/console/model.js.map +1 -1
  19. package/dist/src/interfaces/console/server.js +2 -0
  20. package/dist/src/interfaces/console/server.js.map +1 -1
  21. package/dist/src/interfaces/mcp/server.js +3 -0
  22. package/dist/src/interfaces/mcp/server.js.map +1 -1
  23. package/dist/src/store/memories.d.ts +6 -1
  24. package/dist/src/store/memories.js +9 -3
  25. package/dist/src/store/memories.js.map +1 -1
  26. package/dist/src/store/migrate.js +10 -1
  27. package/dist/src/store/migrate.js.map +1 -1
  28. package/dist/src/store/open.js +1 -1
  29. package/dist/src/store/open.js.map +1 -1
  30. package/dist/src/store/outbox.d.ts +8 -7
  31. package/dist/src/store/outbox.js +34 -1
  32. package/dist/src/store/outbox.js.map +1 -1
  33. package/dist/src/store/schema.d.ts +17 -0
  34. package/dist/src/store/schema.js +65 -0
  35. package/dist/src/store/schema.js.map +1 -1
  36. package/dist/src/sync/apply.d.ts +12 -2
  37. package/dist/src/sync/apply.js +109 -19
  38. package/dist/src/sync/apply.js.map +1 -1
  39. package/dist/src/sync/backfill.d.ts +48 -5
  40. package/dist/src/sync/backfill.js +70 -10
  41. package/dist/src/sync/backfill.js.map +1 -1
  42. package/dist/src/sync/events.d.ts +18 -0
  43. package/dist/src/sync/events.js.map +1 -1
  44. package/dist/src/sync/orchestrate.d.ts +4 -0
  45. package/dist/src/sync/orchestrate.js +24 -10
  46. package/dist/src/sync/orchestrate.js.map +1 -1
  47. package/dist/src/sync/pull.d.ts +8 -3
  48. package/dist/src/sync/pull.js +95 -79
  49. package/dist/src/sync/pull.js.map +1 -1
  50. package/dist/src/sync/push.d.ts +16 -0
  51. package/dist/src/sync/push.js +146 -38
  52. package/dist/src/sync/push.js.map +1 -1
  53. package/dist/src/sync/route.d.ts +44 -0
  54. package/dist/src/sync/route.js +88 -0
  55. package/dist/src/sync/route.js.map +1 -0
  56. package/dist/src/sync/vault.d.ts +27 -1
  57. package/dist/src/sync/vault.js +41 -1
  58. package/dist/src/sync/vault.js.map +1 -1
  59. package/docs/cairn-security.md +25 -18
  60. package/package.json +74 -74
@@ -1 +1 @@
1
- {"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"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"}
@@ -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):列举其他设备 → 读 manifest(密文)→ 按 headSeq 对
7
- * 本地游标取差量 chunk → 解密 → 按事件序幂等应用 → 推进游标(单事务)。
8
- * 中断可重入:游标只在一个 chunk 全部事件应用成功后推进。
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;
@@ -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 { PERSONAL_SPACE_KEY } from './vault.js';
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
- // 发现远端设备:列举 <spaceKey>/devices/<id>/manifest.json
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 && d !== myDevice)
87
+ if (d)
63
88
  deviceIds.add(d);
64
89
  }
65
- const results = [];
66
- let totalApplied = 0;
67
- for (const deviceId of deviceIds) {
68
- const sealed = await remote.getManifest(spaceKey, deviceId);
69
- if (!sealed)
70
- continue;
71
- if (!(sealed instanceof Uint8Array))
72
- throw err('E_VALIDATION', '远端 manifest 不是字节对象');
73
- // 第三轮验证 P1:外来 vault / 密钥不匹配的 manifest 解密必然失败——
74
- // 降级为跳过 + 审计(不是密钥损坏,不能让本 vault 的同步停摆)
75
- let manifest;
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
- manifest = decryptManifestDoc(sealed, keys.vaultKey, vault.vaultId, spaceKey, deviceId);
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
- store.audit.record('sync', 'manifest_skipped', { type: 'system', id: deviceId }, { reason: 'foreign_vault_or_undecryptable' });
83
- results.push({ deviceId, headSeq: 0, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'foreign_vault_or_undecryptable' });
84
- continue;
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
- try {
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
- void manifestKey;
145
- return { devices: results, totalApplied };
146
- }
147
- function chunkObjectKey(spaceKey, meta) {
148
- return `${spaceKey}/${meta.key}`;
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":"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"}
1
+ {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/sync/pull.ts"],"names":[],"mappings":"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"}
@@ -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;
@@ -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):outbox 的 sync_upstream 任务 → 事件 → chunk(加密)
9
- * → manifest(单写者,headSeq 防回退)。事件按内容哈希链组织;
10
- * local_only/设备限定内容由 outbox 层物理排除(触发器兜底),
11
- * 打包层再按 scope 过滤一次(spec:打包前物理排除)。
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
- /** 构建事件:只收 encrypted 作用域(personal-global);payload 为当前修订快照。 */
27
- function buildEvents(store, device, jobs) {
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 scope = store.scopes.resolvePreset('personal-global');
31
- if (scope.syncPolicy !== 'encrypted') {
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
- // 生成控制事件而非修订内容。此时记忆多半已迁到 local_only 作用域、
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(PERSONAL_SPACE_KEY, job.entityId));
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
- if (mem.scopeId !== scope.id) {
72
- // 作用域迁移属后续边界:不入本空间链,任务照常完成
73
- doneJobIds.push(job.id);
74
- continue;
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(PERSONAL_SPACE_KEY, mem.id));
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 spaceKey = PERSONAL_SPACE_KEY;
144
- // 迁出通知与上行内容走同一条 push 链(add-scope-migration);两者都是本空间的同步事件。
210
+ const preserveOn = vault.preserveDeviceBound === true;
145
211
  const jobs = opts.preclaimedJobs
146
- ?? store.outbox.claimReady(opts.maxJobs ?? 200).filter((j) => j.jobType === 'sync_upstream' || j.jobType === 'sync_scope_exit');
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, spaceKey, jobs);
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, spaceKey, jobs) {
231
+ async function pushClaimed(store, remote, vault, jobs, preserveOn) {
163
232
  const device = store.identity.deviceId;
164
- const { events, doneJobIds } = buildEvents(store, device, jobs);
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
- for (const j of jobs) {
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), {