@carloswon/cairn-memory 0.4.0 → 0.5.0

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 (61) hide show
  1. package/CHANGELOG.md +52 -0
  2. package/README.md +17 -1
  3. package/dist/src/governance/revision-proposal.d.ts +80 -0
  4. package/dist/src/governance/revision-proposal.js +243 -0
  5. package/dist/src/governance/revision-proposal.js.map +1 -0
  6. package/dist/src/interfaces/app-service.d.ts +68 -0
  7. package/dist/src/interfaces/app-service.js +194 -2
  8. package/dist/src/interfaces/app-service.js.map +1 -1
  9. package/dist/src/interfaces/cli/main.js +438 -45
  10. package/dist/src/interfaces/cli/main.js.map +1 -1
  11. package/dist/src/interfaces/console/annotations.d.ts +96 -0
  12. package/dist/src/interfaces/console/annotations.js +274 -0
  13. package/dist/src/interfaces/console/annotations.js.map +1 -0
  14. package/dist/src/interfaces/console/assets/ui-js.js +289 -4
  15. package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
  16. package/dist/src/interfaces/console/server.js +66 -0
  17. package/dist/src/interfaces/console/server.js.map +1 -1
  18. package/dist/src/interfaces/mcp/server.js +113 -0
  19. package/dist/src/interfaces/mcp/server.js.map +1 -1
  20. package/dist/src/jobs/remote.d.ts +6 -0
  21. package/dist/src/jobs/remote.js.map +1 -1
  22. package/dist/src/store/index.d.ts +2 -0
  23. package/dist/src/store/index.js +2 -0
  24. package/dist/src/store/index.js.map +1 -1
  25. package/dist/src/store/memories.d.ts +13 -0
  26. package/dist/src/store/memories.js +29 -2
  27. package/dist/src/store/memories.js.map +1 -1
  28. package/dist/src/store/migrate.js +10 -1
  29. package/dist/src/store/migrate.js.map +1 -1
  30. package/dist/src/store/outbox.d.ts +1 -1
  31. package/dist/src/store/outbox.js.map +1 -1
  32. package/dist/src/store/project-alias.d.ts +13 -0
  33. package/dist/src/store/project-alias.js +55 -0
  34. package/dist/src/store/project-alias.js.map +1 -0
  35. package/dist/src/store/projects.d.ts +37 -0
  36. package/dist/src/store/projects.js +75 -0
  37. package/dist/src/store/projects.js.map +1 -0
  38. package/dist/src/store/schema.d.ts +11 -0
  39. package/dist/src/store/schema.js +55 -0
  40. package/dist/src/store/schema.js.map +1 -1
  41. package/dist/src/sync/apply.d.ts +4 -0
  42. package/dist/src/sync/apply.js +65 -3
  43. package/dist/src/sync/apply.js.map +1 -1
  44. package/dist/src/sync/backup-store.d.ts +63 -0
  45. package/dist/src/sync/backup-store.js +173 -0
  46. package/dist/src/sync/backup-store.js.map +1 -0
  47. package/dist/src/sync/cryptoutil.d.ts +10 -2
  48. package/dist/src/sync/cryptoutil.js +22 -1
  49. package/dist/src/sync/cryptoutil.js.map +1 -1
  50. package/dist/src/sync/events.d.ts +17 -2
  51. package/dist/src/sync/events.js.map +1 -1
  52. package/dist/src/sync/orchestrate.js +5 -1
  53. package/dist/src/sync/orchestrate.js.map +1 -1
  54. package/dist/src/sync/pull.js +1 -1
  55. package/dist/src/sync/pull.js.map +1 -1
  56. package/dist/src/sync/push.d.ts +2 -0
  57. package/dist/src/sync/push.js +28 -2
  58. package/dist/src/sync/push.js.map +1 -1
  59. package/docs/cairn-security.md +14 -0
  60. package/docs/cairn-usage.md +99 -0
  61. package/package.json +1 -1
@@ -21,8 +21,8 @@
21
21
  */
22
22
  /** 密文格式版本号(线格式首字节)。未来算法更换/密钥轮换时递增并引入 keyId(design D3)。 */
23
23
  export declare const CIPHER_VERSION = 1;
24
- /** AAD 对象类型:chunk(一批同步事件)或 manifest(设备 manifest)。 */
25
- export type EncryptedObjectKind = 'chunk' | 'manifest';
24
+ /** AAD 对象类型:chunk(一批同步事件)、manifest(设备 manifest)、backup(设备备份快照)。 */
25
+ export type EncryptedObjectKind = 'chunk' | 'manifest' | 'backup';
26
26
  /**
27
27
  * AAD 绑定字段:协议版本、vault、space、对象类型与对象 ID 全部入册
28
28
  * (spec:认证加密 AAD 绑定协议版本、vault、space、对象标识)。
@@ -47,6 +47,14 @@ export declare function generateVaultKeys(): VaultKeys;
47
47
  * 确定性:同 vaultKey + 同 spaceId 永远得到同一 spaceKey(跨设备无需协商)。
48
48
  */
49
49
  export declare function deriveSpaceKey(vaultKey: Uint8Array, spaceId: string): Uint8Array;
50
+ /**
51
+ * 派生设备备份密钥(add-cloud-backup D2):HKDF-SHA256(vaultKey, salt='cairn-backup-key', info=`v1|${deviceId}`)。
52
+ * 与 deriveSpaceKey 平行但不同域(不同 salt):
53
+ * - 复用 vaultKey → 用户不需要多抄一份恢复材料;
54
+ * - 混入 deviceId → 备份只能由生成它的设备解开(其他设备拿到密文也无密钥材料);
55
+ * - 密文不可被当 chunk 解开、反之亦然(spec:两类对象密文不可互相替换)。
56
+ */
57
+ export declare function deriveBackupKey(vaultKey: Uint8Array, deviceId: string): Uint8Array;
50
58
  /**
51
59
  * 加密一个同步对象。输出 = [versionByte(1)] + [nonce(24)] + [ciphertext+tag]。
52
60
  * AAD = UTF8(`v1|${vaultId}|${spaceId}|${kind}|${objectId}`)。
@@ -42,6 +42,8 @@ const KEY_LEN = 32;
42
42
  const MIN_BLOB_LEN = VERSION_LEN + NONCE_LEN + TAG_LEN;
43
43
  /** HKDF salt 固定串。info 携带协议版本与 spaceId;tests/sync 有字面量锚定测试防止无意变更。 */
44
44
  const SPACE_KEY_SALT = 'cairn-space-key';
45
+ /** 备份派生路径的独立 salt:与 space 密钥不同域,两类密文不可互换(add-cloud-backup D2)。 */
46
+ const BACKUP_KEY_SALT = 'cairn-backup-key';
45
47
  const KEYS_FILE = 'keys.json';
46
48
  const KEYS_FORMAT = 'cairn-vault-keys';
47
49
  const KEYS_VERSION = 1;
@@ -75,6 +77,25 @@ export function deriveSpaceKey(vaultKey, spaceId) {
75
77
  }
76
78
  return hkdf(sha256, vaultKey, textEncoder.encode(SPACE_KEY_SALT), textEncoder.encode(`v1|${spaceId}`), KEY_LEN);
77
79
  }
80
+ /**
81
+ * 派生设备备份密钥(add-cloud-backup D2):HKDF-SHA256(vaultKey, salt='cairn-backup-key', info=`v1|${deviceId}`)。
82
+ * 与 deriveSpaceKey 平行但不同域(不同 salt):
83
+ * - 复用 vaultKey → 用户不需要多抄一份恢复材料;
84
+ * - 混入 deviceId → 备份只能由生成它的设备解开(其他设备拿到密文也无密钥材料);
85
+ * - 密文不可被当 chunk 解开、反之亦然(spec:两类对象密文不可互相替换)。
86
+ */
87
+ export function deriveBackupKey(vaultKey, deviceId) {
88
+ if (!(vaultKey instanceof Uint8Array) || vaultKey.length !== KEY_LEN) {
89
+ throw err('E_VALIDATION', 'vault_key_invalid_length', {
90
+ expected: KEY_LEN,
91
+ got: vaultKey instanceof Uint8Array ? vaultKey.length : null,
92
+ });
93
+ }
94
+ if (typeof deviceId !== 'string' || deviceId.length === 0) {
95
+ throw err('E_VALIDATION', 'device_id_invalid');
96
+ }
97
+ return hkdf(sha256, vaultKey, textEncoder.encode(BACKUP_KEY_SALT), textEncoder.encode(`v1|${deviceId}`), KEY_LEN);
98
+ }
78
99
  /**
79
100
  * 加密一个同步对象。输出 = [versionByte(1)] + [nonce(24)] + [ciphertext+tag]。
80
101
  * AAD = UTF8(`v1|${vaultId}|${spaceId}|${kind}|${objectId}`)。
@@ -288,7 +309,7 @@ function assertAad(aad) {
288
309
  aad.spaceId.length === 0 ||
289
310
  typeof aad.objectId !== 'string' ||
290
311
  aad.objectId.length === 0 ||
291
- (aad.kind !== 'chunk' && aad.kind !== 'manifest')) {
312
+ (aad.kind !== 'chunk' && aad.kind !== 'manifest' && aad.kind !== 'backup')) {
292
313
  throw err('E_VALIDATION', 'aad_invalid');
293
314
  }
294
315
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cryptoutil.js","sourceRoot":"","sources":["../../../src/sync/cryptoutil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cryptoutil.js","sourceRoot":"","sources":["../../../src/sync/cryptoutil.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,11 @@ export interface SyncUpsertPayload {
21
21
  sourceAgent: string | null;
22
22
  createdBy: string;
23
23
  reason: string | null;
24
+ /**
25
+ * 迁回重推标记(add-scope-migration):这条 upsert 来自「迁出后重新迁回」的强制重发。
26
+ * 对端据此解除「不再持有」标记;没有该标记的普通 upsert 在标记存在时按迟到修订跳过。
27
+ */
28
+ reentry?: boolean;
24
29
  }
25
30
  export interface SyncTombstonePayload {
26
31
  /** 遗忘时的内容哈希(tombstone 行记录)。 */
@@ -28,14 +33,24 @@ export interface SyncTombstonePayload {
28
33
  /** 推送端已知的全部修订内容哈希——跨设备记忆身份对齐(本地 id 不可跨设备引用)。 */
29
34
  knownHashes: string[];
30
35
  }
36
+ /**
37
+ * 迁出通知 payload(add-scope-migration D3):一条已同步的记忆迁出了可同步作用域。
38
+ * 对端语义是「本设备不再持有」——不是遗忘(无墓碑),不是删除(数据保留)。
39
+ */
40
+ export interface SyncScopeExitPayload {
41
+ /** 推送端最后已知(已推送)的内容哈希。 */
42
+ lastContentHash: string;
43
+ /** 推送端已知的全部修订内容哈希——与 tombstone 同一血统对齐机制。 */
44
+ knownHashes: string[];
45
+ }
31
46
  export interface SyncEvent {
32
47
  deviceId: string;
33
48
  seq: number;
34
- type: 'memory_upsert' | 'memory_tombstone';
49
+ type: 'memory_upsert' | 'memory_tombstone' | 'scope_exit';
35
50
  /** 推送端本地记忆 id;跨设备对账以内容哈希血统为准(见 SyncTombstonePayload)。 */
36
51
  memoryId: string;
37
52
  occurredAt: string;
38
- payload: SyncUpsertPayload | SyncTombstonePayload | null;
53
+ payload: SyncUpsertPayload | SyncTombstonePayload | SyncScopeExitPayload | null;
39
54
  }
40
55
  /** 打包前校验:内容哈希必须与正文一致(传输完整性内建于事件)。 */
41
56
  export declare function validateUpsertEvent(ev: SyncEvent): void;
@@ -1 +1 @@
1
- {"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"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"}
@@ -54,7 +54,11 @@ export function syncContext(store) {
54
54
  export function registerSyncWorker(store, remote, vault) {
55
55
  registerHandler('sync_upstream', (job) => {
56
56
  // worker 已 claim 单个任务;push 以该任务触发批量发布(幂等:已推送修订跳过)
57
- void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId }] });
57
+ void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
58
+ });
59
+ // 迁出通知任务走同一条 push 链(add-scope-migration):生成 scope_exit 控制事件。
60
+ registerHandler('sync_scope_exit', (job) => {
61
+ void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
58
62
  });
59
63
  }
60
64
  /** 初始化远端:生成/复用密钥 + 写 vault.json + 确保 personal-global 为 encrypted。 */
@@ -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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"}
@@ -131,7 +131,7 @@ export async function syncPull(store, remote, vault) {
131
131
  }
132
132
  if (appliedThrough > cursor)
133
133
  setCursor(store, spaceKey, deviceId, appliedThrough);
134
- const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0);
134
+ const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
135
135
  totalApplied += applied;
136
136
  results.push({
137
137
  deviceId,
@@ -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":"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,EAAe,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAgB,MAAM,YAAY,CAAC;AAuBvD,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,YAAoB;IAClE,OAAO,aAAa,QAAQ,IAAI,YAAY,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,SAAS,CAAC,KAAiB,EAAE,QAAgB,EAAE,YAAoB;IAC1E,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,sCAAsC,EAAE,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IACxG,OAAO,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,SAAS,CAAC,KAAiB,EAAE,QAAgB,EAAE,YAAoB,EAAE,GAAW;IACvF,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;IAC3E,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,yCAAyC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,6CAA6C,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAkB,EAAE,QAAoB,EAAE,OAAe,EAAE,QAAgB,EAAE,MAAc;IACrH,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;QACtE,OAAO;QACP,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,iBAAiB,MAAM,EAAE;KACpC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAgB,CAAC;IAC3E,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpF,MAAM,GAAG,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gCAAgC;AAChC,SAAS,YAAY,CAAC,MAAkB,EAAE,QAAoB,EAAE,OAAe,EAAE,QAAgB,EAAE,IAAe,EAAE,QAAgB;IAClI,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;QACtE,OAAO;QACP,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI,CAAC,GAAG;KACnB,CAAC,CAAC;IACH,OAAO,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,KAAiB,EAAE,MAAmB,EAAE,KAAkB;IACvF,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,kBAAkB,CAAC;IACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,CAAC,IAAI;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,4DAA4D,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAEzC,kDAAkD;IAClD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,WAAW,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,gBAAgB,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC;YAAE,SAAS;QAC1C,MAAM,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,QAAQ,WAAW,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,KAAK,QAAQ;YAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,IAAI,CAAC,CAAC,MAAM,YAAY,UAAU,CAAC;YAAE,MAAM,GAAG,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;QACrF,+CAA+C;QAC/C,sCAAsC;QACtC,IAAI,QAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1F,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,GAAI,CAAuB,CAAC,IAAI,CAAC;YAC3C,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,gCAAgC,EAAE,CAAC,CAAC;gBAC/H,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,gCAAgC,EAAE,CAAC,CAAC;gBACpI,SAAS;YACX,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,OAAO,IAAI,MAAM,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAClG,SAAS;QACX,CAAC;QACD,gCAAgC;QAChC,MAAM,MAAM,GAAgB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QACnJ,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAC3E,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,oDAAoD;gBACpD,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACpG,MAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YACpG,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,GAAI,CAAuB,CAAC,IAAI,CAAC;gBAC3C,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;oBAC5B,qCAAqC;oBACrC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;oBAC7H,SAAS,GAAG,IAAI,CAAC;oBACjB,MAAM;gBACR,CAAC;gBACD,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC,CAAC;YACxI,SAAS;QACX,CAAC;QACD,OAAO;QACP,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrE,sCAAsC;QACtC,IAAI,cAAc,GAAG,MAAM,CAAC;QAC5B,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;YACxB,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ,CAAC;gBAAE,MAAM;YAClF,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC;QAC1B,CAAC;QACD,IAAI,cAAc,GAAG,MAAM;YAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,IAAI,CAAC,CAAC,CAAC;QAChI,YAAY,IAAI,OAAO,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC;YACX,QAAQ;YACR,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,aAAa,EAAE,OAAO;YACtB,OAAO;YACP,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;IACL,CAAC;IACD,KAAK,WAAW,CAAC;IACjB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB,EAAE,IAAe;IACvD,OAAO,GAAG,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AACnC,CAAC"}
@@ -11,6 +11,8 @@ export interface PushResult {
11
11
  interface PendingJob {
12
12
  id: string;
13
13
  entityId: string;
14
+ /** 完整任务行才带 payload;worker preclaim 路径会传入。op=scope_exit / force 用于控制事件。 */
15
+ payload?: Record<string, unknown>;
14
16
  }
15
17
  export declare function syncPush(store: CairnStore, remote: RemoteStore, vault: VaultConfig, opts?: {
16
18
  maxJobs?: number;
@@ -32,6 +32,27 @@ function buildEvents(store, device, jobs) {
32
32
  throw err('E_FORBIDDEN', 'personal-global 作用域不是 encrypted;拒绝上行(物理排除语义)');
33
33
  }
34
34
  for (const job of jobs) {
35
+ // 迁出通知任务(add-scope-migration):独立的 sync_scope_exit jobType,
36
+ // 生成控制事件而非修订内容。此时记忆多半已迁到 local_only 作用域、
37
+ // 走不了下面的常规 upsert 分支(那里对非本空间记忆是静默完成)。
38
+ if (job.payload?.['op'] === 'scope_exit') {
39
+ 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));
41
+ let lastHash = pushedRow ? String(pushedRow.value) : null;
42
+ let knownHashes = [];
43
+ if (mem) {
44
+ knownHashes = store.memories.revisions(mem.id).map((r) => r.contentHash);
45
+ lastHash = lastHash ?? mem.contentHash;
46
+ }
47
+ else {
48
+ const t = store.memories.getTombstone(job.entityId);
49
+ lastHash = lastHash ?? t?.contentHash ?? '';
50
+ }
51
+ const payload = { lastContentHash: lastHash ?? '', knownHashes };
52
+ events.push({ deviceId: device, seq: 0, type: 'scope_exit', memoryId: job.entityId, occurredAt: nowIso(), payload });
53
+ doneJobIds.push(job.id);
54
+ continue;
55
+ }
35
56
  const mem = store.memories.get(job.entityId);
36
57
  if (!mem) {
37
58
  // 记忆已不存在:作为 tombstone 传播;对端按内容哈希血统对齐
@@ -69,7 +90,9 @@ function buildEvents(store, device, jobs) {
69
90
  const currentRevId = mem.currentRevisionId;
70
91
  const pushedRow = store.db.get('SELECT value FROM meta WHERE key = ?', pushedRevisionKey(PERSONAL_SPACE_KEY, mem.id));
71
92
  const pushedRevId = pushedRow ? pushedRow.value : null;
72
- if (!currentRevId || pushedRevId === currentRevId) {
93
+ // force(迁回重推):修订未变也要重发一次修订快照,对端据此解除「不再持有」。
94
+ const force = job.payload?.['force'] === true;
95
+ if (!currentRevId || (pushedRevId === currentRevId && !force)) {
73
96
  // 无当前修订或该修订已推送:幂等完成
74
97
  doneJobIds.push(job.id);
75
98
  continue;
@@ -92,6 +115,7 @@ function buildEvents(store, device, jobs) {
92
115
  sourceAgent: mem.sourceAgent,
93
116
  createdBy: mem.createdBy,
94
117
  reason: rev.reason,
118
+ ...(force ? { reentry: true } : {}),
95
119
  };
96
120
  events.push({ deviceId: device, seq: 0, type: 'memory_upsert', memoryId: mem.id, occurredAt: nowIso(), payload });
97
121
  doneJobIds.push(job.id);
@@ -117,7 +141,9 @@ function assignSeqs(store, spaceKey, events) {
117
141
  export async function syncPush(store, remote, vault, opts = {}) {
118
142
  store.assertWritable();
119
143
  const spaceKey = PERSONAL_SPACE_KEY;
120
- const jobs = opts.preclaimedJobs ?? store.outbox.claimReady(opts.maxJobs ?? 200).filter((j) => j.jobType === 'sync_upstream');
144
+ // 迁出通知与上行内容走同一条 push 链(add-scope-migration);两者都是本空间的同步事件。
145
+ const jobs = opts.preclaimedJobs
146
+ ?? store.outbox.claimReady(opts.maxJobs ?? 200).filter((j) => j.jobType === 'sync_upstream' || j.jobType === 'sync_scope_exit');
121
147
  if (jobs.length === 0)
122
148
  return null;
123
149
  try {
@@ -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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"}
@@ -265,3 +265,17 @@ cairn uninstall # 遍历五个宿主,移除所有本产品配置
265
265
  ## 10. 操作审计只存摘要(add-operation-audit)
266
266
 
267
267
  读取类操作审计(`operation` 类目)由**构造方式**保证零内容泄露:审计写入点只从操作返回值提取白名单计数字段(候选数、命中通道、耗时、对象 id),代码路径上接触不到查询原文与记忆正文。回归测试断言敏感正文与查询原文在审计全表中零出现。保留期清理按类目白名单执行(只清 `operation`),治理审计(计划/审批/写入)永不自动删除;审计入口全部只读,不存在修改/删除审计的命令或工具。
268
+
269
+ ---
270
+
271
+ ## 11. Agent 不持有记忆写入权(add-agent-managed-revision)
272
+
273
+ 「模型只生成候选」在修订环节的落点:Agent 对**已存在的记忆**没有直接修改权。MCP 工具面提供 `revision_propose`(写方案卡)与 `revision_list`(读卡),**刻意不提供任何 apply 工具**——应用提案只能由本地入口(CLI `cairn revision apply`、本地控制台点击)发起,走与人工 `memory_update` 完全相同的修订链、秘密复检与审计。
274
+
275
+ 三条机制保证这条边界不是靠约定:
276
+
277
+ 1. **工具面即权限面**:MCP 进程根本没有应用提案的代码路径可调(`tests/interfaces/revision-mcp.test.ts` 断言工具面不含 apply)。
278
+ 2. **版本一致性不可绕过**:方案卡记录提出时的修订 id,应用时两层校验(提案层 + `reviseMemory` 的 `expectedCurrentRevisionId`);记忆已被改过则拒绝并标陈旧。
279
+ 3. **权威语义**:采纳后的新修订记 `user_confirmed`(人批准了 Agent 起草的内容),既不是 `agent_inferred` 也不是 `user_explicit`。
280
+
281
+ 方案卡文件与批注同信任域(本机明文 JSON,含拟改正文);生成时秘密扫描命中即拒绝落盘,采纳时再扫一次。
@@ -787,6 +787,104 @@ cairn agent apply --plan-file plan.json
787
787
 
788
788
  ---
789
789
 
790
+ ## 项目身份与别名(add-stable-project-identity)
791
+
792
+ 项目主键是 **UUIDv7**,路径与 git 地址只是别名。这样仓库改名、换机器改路径都不会让旧记忆掉到一个"不存在的项目"下。
793
+
794
+ ```bash
795
+ # 首次:未登记过的路径/地址 → 新建项目(UUID)并记下第一条别名
796
+ cairn project resolve D:\Neusoft\HDRS6Project\江南大学附属医院 --name 江南大学附属医院
797
+
798
+ # 仓库改名 / 换设备:把新地址追加为同一项目的别名(旧别名保留)
799
+ cairn project alias add <project-id> https://gitee.com/owner/new-name.git
800
+
801
+ # 之后用任一别名解析都会得到同一个 projectId(created=false)
802
+ cairn project resolve git@gitee.com:owner/new-name.git
803
+
804
+ # 列出全部项目及别名(只读,不会新建)
805
+ cairn project list
806
+ ```
807
+
808
+ MCP 侧对应 `project_resolve`(参数 `path_or_url`、可选 `name`)与 `project_list`,与 CLI 共用同一实现。
809
+
810
+ 归一化只做**明确等价**的变换,不做模糊匹配:
811
+
812
+ | 输入 | 归一化结果 |
813
+ | --- | --- |
814
+ | `https://Host/o/r.git`、`git@host:o/r.git`、`ssh://git@host/o/r.git` | `https://host/o/r`(去凭据、host 小写、去 `.git`) |
815
+ | `d:\proj\x\` | `D:/proj/x`(盘符大写、分隔符统一、去尾斜杠) |
816
+ | `D:/Proj` vs `D:/proj` | **两个不同项目**(Linux 上就是两个目录,不能合并) |
817
+
818
+ 三条边界:
819
+
820
+ - **解析不校验路径是否存在**——跨设备解析时对方目录本就不在本机。
821
+ - **不做自动上溯**——传子目录就按子目录算,请传项目根。
822
+ - **别名冲突必须显式处理**:别名已属于别的项目时 `alias add` 会以退出码 4 拒绝并报告归属,不会静默改绑。
823
+
824
+ > 当前边界:项目表**不同步**(同步链只覆盖 `personal-global` 的记忆事件)。所以在两台设备上用同一路径解析会各建一个新项目;要让它们成为同一个,需要手工在一端 `project alias add` 另一端的路径。等记忆真正按项目作用域使用、且项目表进入同步协议后,这一步才能自动化。
825
+
826
+ ---
827
+
828
+ ## 作用域迁移(add-scope-migration)
829
+
830
+ 活动记忆可以换作用域(归属),**不删不重建**:id、修订历史、证据链、权威级别全部保留,只改 `scope_id`。与「删了重建」「候选晋升」是三件不同的事。
831
+
832
+ ```bash
833
+ # 单条迁移:把私人项目相关记忆从 personal-global 降到 device-local
834
+ cairn rescope <id> --scope-preset device-local
835
+
836
+ # 迁到项目作用域必须给项目标识,缺了直接拒绝(退出码 2),不会静默落到别的作用域
837
+ cairn rescope <id> --scope-preset project-device --scope-project <projectId>
838
+
839
+ # 用户亲口说的记忆(user_explicit)迁移会改变可见范围,需要显式确认
840
+ cairn rescope <id> --scope-preset device-local --force
841
+
842
+ # 批量:每行一个 id,逐条报告成功/失败/跳过,单条失败不中断
843
+ cairn rescope --ids-file ids.txt --scope-preset project-device --scope-project <pid> --force
844
+
845
+ # WebUI 批注联动:控制台把记忆标为「需迁移作用域」,终端一键处理(先列清单再逐条执行)
846
+ cairn rescope --pending --scope-preset device-local [--dry-run]
847
+ ```
848
+
849
+ **⚠️ 迁移前必读的两条后果**(命令执行前也会打印):
850
+
851
+ - **迁到设备类作用域(`device-local` / `project-device`)会失去跨设备同步**。这是定义层的:设备绑定作用域物理不上行,不是实现选择。迁出时其他设备会收到一条「迁出通知」,把它们本地的这条记忆标为「不再持有」(检索不再返回)——**数据不删除、无墓碑记录**,本机仍完整持有。
852
+ - **云端既有密文不会自动删除**。对象存储是追加语义,迁出只发通知不清理旧密文;其他设备在收到通知前仍可能拉到旧副本。要清理云端对象需要显式的 purge 能力(暂未提供)。
853
+
854
+ 迁出不是遗忘:本机与其他设备都没有墓碑,遗忘时间线不变。迁回 `personal-global` 后,对端会收到一次强制重发的修订快照(带迁回标记),自动解除「不再持有」,内容按正常修订链继续同步。
855
+
856
+ 安全阀:冲突中的记忆拒绝迁移(状态不明确);墓碑无作用域可迁移;`user_explicit` 记忆需要 `--force`(减速带,不是禁止)。每次迁移写审计(前后作用域、是否失去同步)。
857
+
858
+ 退出码:成功 0;用法/校验(缺 preset、缺 projectId)2;治理拒绝(user_explicit 无 force)3;状态冲突 4。单条显式指定时失败直接退出对应码;`--ids-file` 批量则逐条软报告,整体退出码 0。
859
+
860
+ ---
861
+
862
+ ## 设备备份的云端容灾(add-cloud-backup)
863
+
864
+ `cairn backup` 的本地快照只在同一块硬盘上;硬盘坏了 `device-local` 记忆全丢。备份通道把快照**端到端加密后上传**到远端(与同步同一 vault、同一凭据,但独立前缀与独立密钥派生):
865
+
866
+ ```bash
867
+ # 加密上传(先 vault init-remote;无 vault 明确拒绝,不产生弱加密产物)
868
+ cairn backup --upload # 默认保留最近 5 份 [--keep N]
869
+
870
+ # 列出本设备的远端备份(名称 / 时间 / 密文字节)
871
+ cairn backup --list-remote
872
+
873
+ # 恢复:默认还原到新路径(~/.cairn/restore-<时间戳>/),当前库完全不动
874
+ cairn restore --from-remote <name> [--to <dir>]
875
+
876
+ # 覆盖当前库:必须 --force,且会先把当前库自动备份一份(pre-restore-*.db)
877
+ cairn restore --from-remote <name> --force
878
+ ```
879
+
880
+ 三条后果要记住:
881
+
882
+ - **只有本机解得开**:备份密钥混入设备身份,其他设备拿到密文也解不开。所以 **`device.json` 丢了 = 旧备份全部解不开**——重装前备份它,或用 `device re-enroll` 恢复同一身份。
883
+ - **syncd 暂不支持删除**:保留策略在 OBS 后端自动淘汰;syncd 后端只上传不删除(输出有提示),旧备份手动清理。
884
+ - **上传不碰本地库**:`backup --upload` 只读快照 + 写远端,失败不影响任何记忆读写。
885
+
886
+ ---
887
+
790
888
  ## 8. 命令与退出码速查
791
889
 
792
890
  | 命令 | 作用 |
@@ -808,6 +906,7 @@ cairn agent apply --plan-file plan.json
808
906
  | `backup` / `restore` | 一致性备份与恢复 |
809
907
  | `doctor [--host <agent>]` | 健康检查(诚实分级) |
810
908
  | `status` | 库状态摘要 |
909
+ | `project resolve\|list\|alias add` | 项目身份:id 为 UUID,路径/URL 只作别名 |
811
910
  | `worker run-once [--max N]` | 处理一轮后台任务 |
812
911
  | `device status\|re-enroll` | 设备身份与克隆恢复 |
813
912
  | `agent plan\|apply\|doctor\|uninstall --host <agent>` | 宿主配置管理(plan 零写入) |
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@carloswon/cairn-memory",
3
- "version": "0.4.0",
3
+ "version": "0.5.0",
4
4
  "description": "Cairn — 个人、多设备、多 Agent 的本地优先记忆主权层。本地 SQLite 为权威副本,云端仅作可选加密中继。",
5
5
  "license": "MIT",
6
6
  "type": "module",