@carloswon/cairn-memory 0.6.1 → 0.6.3

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 +53 -5
  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 +23 -0
  17. package/dist/src/interfaces/console/model.js +41 -1
  18. package/dist/src/interfaces/console/model.js.map +1 -1
  19. package/dist/src/interfaces/console/server.js +14 -2
  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
package/README.md CHANGED
@@ -144,13 +144,13 @@ npm run test:real # 真实 OBS 云同步往返(需五个 OBS_* 变量齐
144
144
  | `cloud-sync` | OBS/ECS 加密同步 |
145
145
  | `local-console` | 本地控制台 |
146
146
 
147
- 测试基线:`npm test` **不联网**,恒 668 项 / 667 通过 / 0 失败 / 1 显式 skip。真实云端往返单独用 `npm run test:real`。
147
+ 测试基线:`npm test` **不联网**(当前 865 项 / 864 通过 / 0 失败 / 1 显式 skip,以最近一次全量运行为准)。真实云端往返单独用 `npm run test:real`。
148
148
 
149
149
  ### 已知边界
150
150
 
151
151
  - 仅验证 Windows x64 与 Linux/Ubuntu 22.04;macOS 未验证。
152
152
  - Claude Code / Cursor / Copilot 的宿主接入为 `fixture-only`,未在真实 CLI 认证下跑过。
153
- - 云端需要自备 OBS + ECS;默认不安装任何同步 hook。
153
+ - 云端需要自备 OBS + ECS;默认不安装任何同步 hook。设备限定与项目内容默认不上云;对 vault 显式开启保管模式(`vault config --preserve-device-bound on`)后以密文上行到本设备保管链,他机不拉取(见 `docs/cairn-sync.md` 保管模式章节)。
154
154
  - 无本地模型依赖;不做抽取推理。
155
155
 
156
156
  ---
@@ -63,6 +63,12 @@ export interface MemoryRecord {
63
63
  sensitivity: Sensitivity;
64
64
  currentRevisionId: string | null;
65
65
  contentHash: string;
66
+ /**
67
+ * 归属设备(add-cloud-preserve-mode D7):本机创建 = 本机设备标识;
68
+ * 同步到达 = 事件来源设备;NULL = 未知(存量记忆)。溯源事实,一经写入
69
+ * 不被修订改写,不参与读取授权(授权仍以作用域为唯一依据)。
70
+ */
71
+ originDeviceId: string | null;
66
72
  createdBy: string;
67
73
  createdAt: string;
68
74
  updatedAt: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,aAAa;IACb,YAAY;IACZ,MAAM;IACN,UAAU;IACV,SAAS;IACT,WAAW;IACX,aAAa;IACb,QAAQ;CACA,CAAC;AAGX,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,YAAY;CACJ,CAAC;AAGX,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,eAAe;IACf,gBAAgB;IAChB,gBAAgB;IAChB,qBAAqB;CACb,CAAC;AAmGX,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,aAAa;IACb,YAAY;IACZ,MAAM;IACN,UAAU;IACV,SAAS;IACT,WAAW;IACX,aAAa;IACb,QAAQ;CACA,CAAC;AAGX,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,YAAY;CACJ,CAAC;AAGX,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,eAAe;IACf,gBAAgB;IAChB,gBAAgB;IAChB,qBAAqB;CACb,CAAC;AAyGX,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { err, isCairnError } from '../core/errors.js';
2
- import { scopeAllowsUpstream } from '../core/scope.js';
2
+ import { routeMemoryUpstream } from '../sync/route.js';
3
3
  export function applyPlan(store, input) {
4
4
  const { planId, approvalId, deviceId, scan } = input;
5
5
  const emptyReport = { planId, alreadyApplied: true, applied: 0, skipped: 0, failed: 0, results: [] };
@@ -157,20 +157,11 @@ function applyOp(store, plan, op, evidenceByItem, deviceId) {
157
157
  }
158
158
  /**
159
159
  * 治理写入的上行落点(spec cloud-sync「上行入队完备性」)。
160
- * 准入判定复用 `scopeAllowsUpstream`;作用域不允许上行属正常结果,不入队也不报错,
160
+ * 路由与排除判定只在 sync/route.ts 一处;作用域不允许上行属正常结果,不入队也不报错,
161
161
  * 因此不会让计划应用失败、不会把 op 标记 failed(design D1/D2)。
162
162
  */
163
163
  function enqueueUpstream(store, memoryId, scopeId, idempotencyKey) {
164
- if (!scopeAllowsUpstream(store.scopes.requireById(scopeId)))
165
- return;
166
- store.outbox.enqueue({
167
- jobType: 'sync_upstream',
168
- scopeId,
169
- entityType: 'memory',
170
- entityId: memoryId,
171
- payload: { op: 'memory_upsert', memoryId },
172
- idempotencyKey,
173
- });
164
+ routeMemoryUpstream(store, memoryId, scopeId, 'memory_upsert', idempotencyKey);
174
165
  }
175
166
  function evidenceForOp(op, evidenceByItem) {
176
167
  if (op.itemId == null)
@@ -1 +1 @@
1
- {"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/governance/apply.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/governance/apply.ts"],"names":[],"mappings":"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"}
@@ -114,6 +114,22 @@ export interface DoctorReport {
114
114
  /** 作用域允许上行但没有过任何 sync_upstream 任务的活动记忆数(design D4)。 */
115
115
  upstreamGap: number;
116
116
  };
117
+ /** 同步链状态(add-cloud-preserve-mode tasks 5.1):保管模式 + 各链本地序号/游标/缺口。 */
118
+ sync: {
119
+ preserveDeviceBound: boolean;
120
+ chains: {
121
+ spaceKey: string;
122
+ role: 'personal' | 'preserve';
123
+ /** 本机已发布到的序号(meta sync_seq);从未 push 过为 0。 */
124
+ localSeq: number;
125
+ /** 对各远端设备的拉取游标。 */
126
+ pullCursors: Record<string, number>;
127
+ /** 该链的待处理上行任务数(pending/retry/running)。 */
128
+ pendingJobs: number;
129
+ /** 该链的上行缺口(应上行但从未入队)。 */
130
+ gap: number;
131
+ }[];
132
+ };
117
133
  remote: 'not_configured' | 'configured_untested' | 'verified';
118
134
  remoteProvider?: string;
119
135
  model: 'not_configured';
@@ -300,10 +316,13 @@ export declare class AppService {
300
316
  syncd?: {
301
317
  baseUrl: string;
302
318
  };
319
+ preserveDeviceBound?: boolean;
303
320
  }): {
304
321
  vault: ReturnType<typeof loadVaultConfig>;
305
322
  recovery: string;
306
323
  };
324
+ /** 保管模式开关(add-cloud-preserve-mode D1):vault config 子命令的落点。 */
325
+ vaultConfigPreserve(enabled: boolean): Record<string, unknown>;
307
326
  vaultStatus(): Record<string, unknown>;
308
327
  vaultImportKey(recovery: string): void;
309
328
  vaultExportKey(): string;
@@ -13,8 +13,10 @@ import { scanText } from '../core/secrets.js';
13
13
  import { loadVaultConfig } from '../sync/vault.js';
14
14
  import { loadKeys, exportRecoveryMaterial, importRecoveryMaterial, saveKeys } from '../sync/cryptoutil.js';
15
15
  import { nowIso } from '../core/time.js';
16
- import { syncContext, initRemote, syncPush, syncPull, registerSyncWorker, PERSONAL_SPACE_KEY } from '../sync/orchestrate.js';
17
- import { findUpstreamGap, backfillUpstream } from '../sync/backfill.js';
16
+ import { syncContext, initRemote, setPreserveMode, syncPush, syncPull, registerSyncWorker, PERSONAL_SPACE_KEY } from '../sync/orchestrate.js';
17
+ import { findUpstreamGap, findUpstreamGapChains, findScopeExitGap, backfillUpstream } from '../sync/backfill.js';
18
+ import { enqueueMemorySync, enqueueScopeExit, enqueuePreserveResync, isPersonalChainScope } from '../sync/route.js';
19
+ import { preserveSpaceKey } from '../sync/vault.js';
18
20
  import { proposeRevision, readRevisionProposals, getRevisionProposal, resolveRevisionProposal, countPendingRevisions, } from '../governance/revision-proposal.js';
19
21
  import { importSnapshot } from '../onboarding/import.js';
20
22
  import { addAnnotation as storeAnnotation, addAnnotationsBatch as storeAnnotationsBatch, readAnnotations as storeReadAnnotations, resolveAnnotation as storeResolveAnnotation, countOpenAnnotations, } from './console/annotations.js';
@@ -222,16 +224,7 @@ export class AppService {
222
224
  expiresAt: input.expiresAt ?? null,
223
225
  sensitivity,
224
226
  }, ctx.deviceId);
225
- if (scopeAllowsUpstream(scope)) {
226
- store.outbox.enqueue({
227
- jobType: 'sync_upstream',
228
- scopeId: scope.id,
229
- entityType: 'memory',
230
- entityId: memory.id,
231
- payload: { op: 'memory_upsert', memoryId: memory.id },
232
- idempotencyKey: `memory:${memory.id}`,
233
- });
234
- }
227
+ enqueueMemorySync(store, { memoryId: memory.id, scopeId: scope.id, op: 'memory_upsert', idempotencyKey: `memory:${memory.id}` });
235
228
  const auditAction = decision.action === 'candidate' ? 'added_candidate' : 'added';
236
229
  store.audit.record('memory', auditAction, { type: 'memory', id: memory.id }, { ...auditDetail, kind, authority, sensitivity });
237
230
  return { action: decision.action, basis: decision.basis, memory, duplicateOf: null };
@@ -249,16 +242,7 @@ export class AppService {
249
242
  const scope = store.scopes.requireById(mem.scopeId);
250
243
  const ctx = this.caller;
251
244
  const out = store.memories.revise(id, newContent, { reason: opts.reason ?? '用户更正', author: ctx.agentId, expectedCurrentRevisionId: opts.expectedCurrentRevisionId, authority: opts.authority }, ctx.deviceId);
252
- if (scopeAllowsUpstream(scope)) {
253
- store.outbox.enqueue({
254
- jobType: 'sync_upstream',
255
- scopeId: scope.id,
256
- entityType: 'memory',
257
- entityId: id,
258
- payload: { op: 'memory_upsert', memoryId: id },
259
- idempotencyKey: `memory:${id}:rev:${out.revision.id}`,
260
- });
261
- }
245
+ enqueueMemorySync(store, { memoryId: id, scopeId: scope.id, op: 'memory_upsert', idempotencyKey: `memory:${id}:rev:${out.revision.id}` });
262
246
  store.audit.record('memory', 'revised', { type: 'memory', id }, { revisionId: out.revision.id });
263
247
  return out;
264
248
  }
@@ -267,17 +251,7 @@ export class AppService {
267
251
  store.assertWritable();
268
252
  const mem = store.memories.require(id);
269
253
  const out = store.memories.forget(id, reason, this.caller.agentId);
270
- const scope = store.scopes.requireById(mem.scopeId);
271
- if (scopeAllowsUpstream(scope)) {
272
- store.outbox.enqueue({
273
- jobType: 'sync_upstream',
274
- scopeId: scope.id,
275
- entityType: 'memory',
276
- entityId: id,
277
- payload: { op: 'memory_tombstone', memoryId: id },
278
- idempotencyKey: `memory:${id}:tombstone`,
279
- });
280
- }
254
+ enqueueMemorySync(store, { memoryId: id, scopeId: mem.scopeId, op: 'memory_tombstone', idempotencyKey: `memory:${id}:tombstone` });
281
255
  store.audit.record('memory', 'forgotten', { type: 'memory', id }, { reason: reason ?? null });
282
256
  return out;
283
257
  }
@@ -338,7 +312,14 @@ export class AppService {
338
312
  const scope = store.scopes.requireById(out.scopeId);
339
313
  // outbox:旧作用域的任务必须作废(否则发到错空间),新作用域按新修订重新入队。
340
314
  store.db.run("DELETE FROM outbox_job WHERE entity_type = 'memory' AND entity_id = ? AND status = 'pending'", id);
341
- if (scopeAllowsUpstream(scope)) {
315
+ // 迁出完整性(D4):候选也可能推送过(add 即入队);晋升带作用域迁移离开个人链时,
316
+ // 与 rescope 同一语义——对端残缺副本要靠迁出通知收敛。
317
+ const previousScope = store.scopes.getById(previousScopeId);
318
+ const wasPushedPersonal = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_pushed:${PERSONAL_SPACE_KEY}:${id}`) != null;
319
+ if (previousScope && isPersonalChainScope(previousScope) && wasPushedPersonal && previousScope.id !== scope.id) {
320
+ enqueueScopeExit(store, id);
321
+ }
322
+ if (scopeAllowsUpstream(scope) && scope.preset === 'personal-global') {
342
323
  store.outbox.enqueue({
343
324
  jobType: 'sync_upstream',
344
325
  scopeId: scope.id,
@@ -348,6 +329,13 @@ export class AppService {
348
329
  idempotencyKey: `memory:${id}:rev:${out.currentRevisionId ?? ''}`,
349
330
  });
350
331
  }
332
+ else if (scope.preset === 'device-local' || scope.preset === 'project-global' || scope.preset === 'project-device') {
333
+ const wasPushedPreserve = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_pushed:${preserveSpaceKey(store.identity.deviceId)}:${id}`) != null;
334
+ if (wasPushedPreserve)
335
+ enqueuePreserveResync(store, id, scope.id);
336
+ else
337
+ enqueueMemorySync(store, { memoryId: id, scopeId: scope.id, op: 'memory_upsert', idempotencyKey: `memory:${id}:rev:${out.currentRevisionId ?? ''}` });
338
+ }
351
339
  store.audit.record('memory', 'promoted_candidate', { type: 'memory', id }, {
352
340
  fromScope: previousScopeId,
353
341
  toScope: out.scopeId,
@@ -394,16 +382,23 @@ export class AppService {
394
382
  throw err('E_FORBIDDEN', '用户明确陈述(user_explicit)的记忆迁移会改变可见范围,需要 --force 显式确认');
395
383
  }
396
384
  const willLoseSync = scopeAllowsUpstream(previousScope) && !scopeAllowsUpstream(target);
397
- // 「曾同步过」= 该记忆在本空间链上推送过修订(sync_pushed 元数据存在)。
385
+ // 「曾同步过」= 该记忆在个人链上推送过修订(sync_pushed 元数据存在)。
398
386
  // 只有这种情况对端才持有副本,迁出才需要通知;从未上行的记忆迁出无人需要知道。
399
- const wasPushed = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_pushed:${PERSONAL_SPACE_KEY}:${id}`) != null;
387
+ const wasPushedPersonal = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_pushed:${PERSONAL_SPACE_KEY}:${id}`) != null;
388
+ const wasPushedPreserve = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_pushed:${preserveSpaceKey(store.identity.deviceId)}:${id}`) != null;
400
389
  const scopeExitEnqueued = store.db.transaction(() => {
401
390
  store.memories.migrateScope(id, target.id, this.caller.agentId);
402
391
  // outbox 重建:照抄 promoteCandidate——旧作用域下的待同步任务若照发,
403
392
  // 会把记忆同步到错误的云端空间(design D2)。
404
393
  store.db.run("DELETE FROM outbox_job WHERE entity_type = 'memory' AND entity_id = ? AND status = 'pending'", id);
405
- if (scopeAllowsUpstream(target)) {
406
- // 迁入可同步作用域:重新入队。若此前同步过,修订未变会被 push 的幂等检查
394
+ // 迁出完整性(add-cloud-preserve-mode D4 / tasks 2.1,模式无关):
395
+ // 记忆离开个人链 → 必入队迁出通知,无论去向是项目、设备限定还是其他任何地方——
396
+ // 对端据此把残缺副本转「不再持有」(2026-11-14~15 双设备事故的核心修复)。
397
+ // 入队固化 fromSpace=personal(D4):push 延迟期间二次迁移不会把通知发错链。
398
+ const leftPersonalChain = isPersonalChainScope(previousScope) && wasPushedPersonal;
399
+ const exitResult = leftPersonalChain ? enqueueScopeExit(store, id) : null;
400
+ if (scopeAllowsUpstream(target) && target.preset === 'personal-global') {
401
+ // 迁回个人链:重新入队。若此前同步过,修订未变会被 push 的幂等检查
407
402
  // 跳过、对端永远收不到「重新持有」的信号——因此带 force 让 push 无条件重发
408
403
  // 一次修订快照(payload.reentry),对端据此解除「不再持有」标记。
409
404
  store.outbox.enqueue({
@@ -411,26 +406,23 @@ export class AppService {
411
406
  scopeId: target.id,
412
407
  entityType: 'memory',
413
408
  entityId: id,
414
- payload: { op: 'memory_upsert', memoryId: id, ...(wasPushed ? { force: true } : {}) },
415
- idempotencyKey: wasPushed ? `memory:${id}:re-entry:${Date.now()}` : `memory:${id}:rev:${mem.currentRevisionId ?? ''}`,
409
+ payload: { op: 'memory_upsert', memoryId: id, ...(wasPushedPersonal ? { force: true } : {}) },
410
+ idempotencyKey: wasPushedPersonal ? `memory:${id}:re-entry:${Date.now()}` : `memory:${id}:rev:${mem.currentRevisionId ?? ''}`,
416
411
  });
417
- return false;
418
412
  }
419
- if (scopeAllowsUpstream(previousScope) && wasPushed) {
420
- // 迁出通知:独立 jobType(不是上行内容任务,spec 要求迁移不产生新的上行任务)。
421
- // 幂等键带时间戳:迁出→迁回→再迁出的每一轮都要各发一次通知,
422
- // 固定键会被已完成的历史任务挡住(enqueue 按键去重不分状态)。
423
- const enq = store.outbox.enqueue({
424
- jobType: 'sync_scope_exit',
425
- scopeId: target.id,
426
- entityType: 'memory',
427
- entityId: id,
428
- payload: { op: 'scope_exit', memoryId: id },
429
- idempotencyKey: `memory:${id}:scope-exit:${Date.now()}`,
430
- });
431
- return enq.enqueued;
413
+ else if (target.preset === 'device-local' || target.preset === 'project-global' || target.preset === 'project-device') {
414
+ // 迁入保管链承载的作用域(device-local / project-*):开启保管模式时入队
415
+ // 保管链上行(D4:新空间可发布时也要有上行任务);同一修订已推送过保管链时
416
+ // 带 force 重发,让对端(自设备重放)按新描述符重新物化。
417
+ const vaultPreserveOn = loadVaultConfig(store.paths.dataDir)?.preserveDeviceBound === true;
418
+ if (vaultPreserveOn) {
419
+ if (wasPushedPreserve)
420
+ enqueuePreserveResync(store, id, target.id);
421
+ else
422
+ enqueueMemorySync(store, { memoryId: id, scopeId: target.id, op: 'memory_upsert', idempotencyKey: `memory:${id}:rev:${mem.currentRevisionId ?? ''}` });
423
+ }
432
424
  }
433
- return false;
425
+ return exitResult?.enqueued ?? false;
434
426
  });
435
427
  store.audit.record('memory', 'scope_migrated', { type: 'memory', id }, {
436
428
  fromScope: previousScope.id,
@@ -719,6 +711,11 @@ export class AppService {
719
711
  if (upstreamGap > 0) {
720
712
  notes.push(`上行缺口 ${upstreamGap} 条:作用域允许上行但未入队,执行 cairn sync backfill --apply 补齐`);
721
713
  }
714
+ // 存量迁出通知缺口(add-cloud-preserve-mode):对端残缺副本收敛的前提,同一自愈纪律。
715
+ const scopeExitGap = findScopeExitGap(store).length;
716
+ if (scopeExitGap > 0) {
717
+ notes.push(`存量迁出通知缺口 ${scopeExitGap} 条:曾同步到个人链的记忆已迁出但从未通知对端,执行 cairn sync backfill --apply 补发`);
718
+ }
722
719
  // 待办批注:与 upstreamGap 同一条纪律——只进 notes,不进 problems,不改退出码。
723
720
  let pendingAnnotations = 0;
724
721
  try {
@@ -757,6 +754,34 @@ export class AppService {
757
754
  remote = 'configured_untested';
758
755
  }
759
756
  }
757
+ // 各链状态(tasks 5.1):全部来自本地 meta 与 outbox,不触网——doctor 保持离线可用。
758
+ const preserveOn = vault?.preserveDeviceBound === true;
759
+ const gapChains = findUpstreamGapChains(store);
760
+ const chainSpecs = [
761
+ { spaceKey: PERSONAL_SPACE_KEY, role: 'personal', gap: gapChains.personal },
762
+ ...(preserveOn ? [{ spaceKey: preserveSpaceKey(store.identity.deviceId), role: 'preserve', gap: gapChains.preserve }] : []),
763
+ ];
764
+ const syncChains = chainSpecs.map((c) => {
765
+ const seqRow = store.db.get('SELECT value FROM meta WHERE key = ?', `sync_seq:${c.spaceKey}`);
766
+ const cursors = {};
767
+ for (const r of store.db.all('SELECT key, value FROM meta WHERE key LIKE ?', `sync_pull:${c.spaceKey}:%`)) {
768
+ const remoteDevice = String(r['key']).slice(`sync_pull:${c.spaceKey}:`.length);
769
+ cursors[remoteDevice] = Number(r['value']);
770
+ }
771
+ // pending 按任务类型归属链:sync_preserve 只会发布到保管链;
772
+ // sync_upstream / sync_scope_exit 发布到个人链(不可路由的会在 push 时完成并审计)。
773
+ const pendingTypes = c.role === 'preserve' ? ['sync_preserve'] : ['sync_upstream', 'sync_scope_exit'];
774
+ const placeholders = pendingTypes.map(() => '?').join(',');
775
+ const pending = Number(store.db.scalar(`SELECT COUNT(*) AS n FROM outbox_job WHERE status IN ('pending','retry','running') AND job_type IN (${placeholders})`, ...pendingTypes) ?? 0);
776
+ return {
777
+ spaceKey: c.spaceKey,
778
+ role: c.role,
779
+ localSeq: Number(seqRow?.value ?? 0),
780
+ pullCursors: cursors,
781
+ pendingJobs: pending,
782
+ gap: c.gap,
783
+ };
784
+ });
760
785
  if (remote === 'not_configured') {
761
786
  notes.push('模型未配置(本变更无模型路径);云端未配置(remote=not_configured)。核心功能不依赖二者。');
762
787
  }
@@ -776,6 +801,7 @@ export class AppService {
776
801
  openConflicts: store.conflicts.countOpen(),
777
802
  upstreamGap,
778
803
  },
804
+ sync: { preserveDeviceBound: preserveOn, chains: syncChains },
779
805
  remote,
780
806
  remoteProvider,
781
807
  model: 'not_configured',
@@ -789,6 +815,11 @@ export class AppService {
789
815
  vaultInitRemote(input) {
790
816
  return initRemote(this.store, input);
791
817
  }
818
+ /** 保管模式开关(add-cloud-preserve-mode D1):vault config 子命令的落点。 */
819
+ vaultConfigPreserve(enabled) {
820
+ const vault = setPreserveMode(this.store, enabled);
821
+ return { vaultId: vault.vaultId, preserveDeviceBound: vault.preserveDeviceBound === true };
822
+ }
792
823
  vaultStatus() {
793
824
  const vault = loadVaultConfig(this.store.paths.dataDir);
794
825
  const keys = vault ? Boolean(loadKeys(this.store.paths.dataDir)) : false;
@@ -799,6 +830,7 @@ export class AppService {
799
830
  obs: vault?.obs ?? null,
800
831
  syncd: vault?.syncd ?? null,
801
832
  keysPresent: keys,
833
+ preserveDeviceBound: vault?.preserveDeviceBound === true,
802
834
  };
803
835
  }
804
836
  vaultImportKey(recovery) {
@@ -850,11 +882,28 @@ export class AppService {
850
882
  status() {
851
883
  const store = this.store;
852
884
  const outbox = store.outbox.counts();
885
+ const gapChains = findUpstreamGapChains(store);
886
+ const vault = loadVaultConfig(store.paths.dataDir);
887
+ const preserveOn = vault?.preserveDeviceBound === true;
888
+ const chains = {
889
+ [PERSONAL_SPACE_KEY]: {
890
+ localSeq: Number(store.db.get('SELECT value FROM meta WHERE key = ?', `sync_seq:${PERSONAL_SPACE_KEY}`)?.value ?? 0),
891
+ gap: gapChains.personal,
892
+ },
893
+ };
894
+ if (preserveOn) {
895
+ const key = preserveSpaceKey(store.identity.deviceId);
896
+ chains[key] = {
897
+ localSeq: Number(store.db.get('SELECT value FROM meta WHERE key = ?', `sync_seq:${key}`)?.value ?? 0),
898
+ gap: gapChains.preserve,
899
+ };
900
+ }
853
901
  return {
854
902
  device: store.identity.deviceId,
855
903
  memories: store.memories.countsByStatus(),
856
904
  outbox,
857
905
  openConflicts: store.conflicts.countOpen(),
906
+ sync: { preserveDeviceBound: preserveOn, chains },
858
907
  };
859
908
  }
860
909
  // -------------------------------------------------------------------------
@@ -990,21 +1039,12 @@ export class AppService {
990
1039
  }
991
1040
  }
992
1041
  /**
993
- * 编排层上行落点(spec cloud-sync「上行入队完备性」):准入判定复用 `scopeAllowsUpstream`,
1042
+ * 编排层上行落点(spec cloud-sync「上行入队完备性」+ add-cloud-preserve-mode):
1043
+ * 路由与物理排除判定只在 sync/route.ts 一处——本函数是它的兼容包装。
994
1044
  * 作用域不允许上行时静默返回——这是正常结果,不是错误。
995
1045
  */
996
1046
  function enqueueMemoryUpstream(store, memoryId, scopeId, op, idempotencyKey) {
997
- const scope = store.scopes.requireById(scopeId);
998
- if (!scopeAllowsUpstream(scope))
999
- return;
1000
- store.outbox.enqueue({
1001
- jobType: 'sync_upstream',
1002
- scopeId: scope.id,
1003
- entityType: 'memory',
1004
- entityId: memoryId,
1005
- payload: { op, memoryId },
1006
- idempotencyKey,
1007
- });
1047
+ enqueueMemorySync(store, { memoryId, scopeId, op, idempotencyKey });
1008
1048
  }
1009
1049
  /** 扫描命中错误:秘密优先;仅注入命中 → E_INJECTION_SUSPECTED。均不回显原文。 */
1010
1050
  function scanError(scan) {