@carloswon/cairn-memory 0.6.2 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/interfaces/app-service.d.ts +16 -1
- package/dist/src/interfaces/app-service.js +67 -41
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +24 -0
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-js.js +36 -6
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/model.d.ts +15 -0
- package/dist/src/interfaces/console/model.js +25 -1
- package/dist/src/interfaces/console/model.js.map +1 -1
- package/dist/src/interfaces/console/server.js +12 -2
- package/dist/src/interfaces/console/server.js.map +1 -1
- package/dist/src/store/memories.js +2 -0
- package/dist/src/store/memories.js.map +1 -1
- package/dist/src/sync/apply.d.ts +6 -1
- package/dist/src/sync/apply.js +50 -6
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backfill.d.ts +19 -6
- package/dist/src/sync/backfill.js +38 -7
- package/dist/src/sync/backfill.js.map +1 -1
- package/dist/src/sync/events.d.ts +6 -0
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/pull.d.ts +2 -1
- package/dist/src/sync/pull.js +35 -3
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +2 -2
- package/dist/src/sync/push.js +37 -11
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/route.d.ts +2 -1
- package/dist/src/sync/route.js +22 -1
- package/dist/src/sync/route.js.map +1 -1
- package/dist/src/sync/vault.d.ts +12 -2
- package/dist/src/sync/vault.js +25 -2
- package/dist/src/sync/vault.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,9 +9,17 @@ import { CairnStore } from '../store/index.js';
|
|
|
9
9
|
* (pending / running / done / dead…),就认为这条记忆在**该链**的上行已经有人管过。
|
|
10
10
|
* 只看 pending 会把已 markDone 的记忆算成缺口,每次 backfill 重报同一批。
|
|
11
11
|
*
|
|
12
|
-
* 多链(add-cloud-preserve-mode):
|
|
12
|
+
* 多链(add-cloud-preserve-mode + add-cross-device-project-sync):
|
|
13
13
|
* - 个人链缺口:personal-global 活动、无任何 sync_upstream 任务(既有口径不变);
|
|
14
|
-
* -
|
|
14
|
+
* - 项目链缺口:project-global(且有项目身份)活动、**无本链推送证据**
|
|
15
|
+
* (`sync_pushed:project/<projectId>:<memoryId>`)、且无在途(pending/running/retry)
|
|
16
|
+
* 上行任务。MUST NOT 用「无任何 sync_upstream 任务」:曾经是 personal-global 的
|
|
17
|
+
* 记忆迁入项目后,库里留着一条当年**不可路由完成**的 sync_upstream(项目链还不存在,
|
|
18
|
+
* push 记 sync_job_unroutable 后 markDone),它从未发布到项目链,旧口径却把它当成
|
|
19
|
+
* 「已上行」——2026-11-16 真机 27 条 project-global 全被漏成 0 候选。判据与
|
|
20
|
+
* findScopeExitGap 的 `sync_pushed:personal-global:<id>` 是同一套证据口径。
|
|
21
|
+
* - 保管链缺口(仅保管模式开启):设备限定/project-device 活动、无任何 sync_preserve 任务;
|
|
22
|
+
* 另含缺项目身份的孤儿 project-global(route 侧降级到保管链,判据仍是 sync_preserve)。
|
|
15
23
|
* 不看 sync_upstream:旧版本给 project-global 排过永远发不出去的 sync_upstream
|
|
16
24
|
* (静默完成时代),开启保管模式后这些内容应首次入保管链。
|
|
17
25
|
* - 迁出通知缺口:曾推送到个人链、现已不在个人链、但从未有过任何 sync_scope_exit
|
|
@@ -21,8 +29,10 @@ import { CairnStore } from '../store/index.js';
|
|
|
21
29
|
export interface UpstreamGap {
|
|
22
30
|
memoryId: string;
|
|
23
31
|
scopeId: string;
|
|
24
|
-
/** 缺口所属链:personal = 个人链;preserve = 本设备保管链。 */
|
|
25
|
-
chain: 'personal' | 'preserve';
|
|
32
|
+
/** 缺口所属链:personal = 个人链;project = 项目链;preserve = 本设备保管链。 */
|
|
33
|
+
chain: 'personal' | 'project' | 'preserve';
|
|
34
|
+
/** 项目链缺口的项目身份(project-global 才有)。 */
|
|
35
|
+
projectId?: string;
|
|
26
36
|
}
|
|
27
37
|
export interface ScopeExitGap {
|
|
28
38
|
memoryId: string;
|
|
@@ -44,9 +54,10 @@ export interface BackfillReport {
|
|
|
44
54
|
excluded: number;
|
|
45
55
|
/** 本次实际(dry-run 时为将会)入队的记忆标识,按创建顺序。 */
|
|
46
56
|
memoryIds: string[];
|
|
47
|
-
/** 按链分列(tasks 4.2)。关闭保管模式时 preserve 段全为 0。 */
|
|
57
|
+
/** 按链分列(tasks 4.2 / add-cross-device-project-sync 5.2)。关闭保管模式时 preserve 段全为 0。 */
|
|
48
58
|
chains: {
|
|
49
59
|
personal: ChainBackfillCounts;
|
|
60
|
+
project: ChainBackfillCounts;
|
|
50
61
|
preserve: ChainBackfillCounts;
|
|
51
62
|
};
|
|
52
63
|
/** 存量迁出通知补发(add-cloud-preserve-mode:0.6.x 迁移不产生通知的历史缺口)。 */
|
|
@@ -64,9 +75,11 @@ export declare function findUpstreamGap(store: CairnStore): UpstreamGap[];
|
|
|
64
75
|
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
65
76
|
*/
|
|
66
77
|
export declare function findScopeExitGap(store: CairnStore): ScopeExitGap[];
|
|
67
|
-
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
78
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
79
|
+
* 项目链按 projectId 分列(一条项目一条链)。 */
|
|
68
80
|
export declare function findUpstreamGapChains(store: CairnStore): {
|
|
69
81
|
personal: number;
|
|
82
|
+
project: Record<string, number>;
|
|
70
83
|
preserve: number;
|
|
71
84
|
};
|
|
72
85
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PERSONAL_SPACE_KEY, preserveModeEnabled } from './vault.js';
|
|
1
|
+
import { PERSONAL_SPACE_KEY, PROJECT_CHAIN_PREFIX, preserveModeEnabled } from './vault.js';
|
|
2
2
|
import { enqueueMemorySync, enqueueScopeExit } from './route.js';
|
|
3
3
|
export const BACKFILL_DEFAULT_LIMIT = 500;
|
|
4
4
|
export function findUpstreamGap(store) {
|
|
@@ -10,18 +10,39 @@ export function findUpstreamGap(store) {
|
|
|
10
10
|
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id)
|
|
11
11
|
ORDER BY m.created_at, m.id`)
|
|
12
12
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'personal' }));
|
|
13
|
+
const project = store.db
|
|
14
|
+
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId, s.project_id AS projectId
|
|
15
|
+
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
16
|
+
WHERE m.status = 'active' AND s.preset = 'project-global' AND s.project_id IS NOT NULL
|
|
17
|
+
AND s.sync_policy = 'encrypted' AND s.device_id = 'all'
|
|
18
|
+
AND NOT EXISTS (SELECT 1 FROM meta
|
|
19
|
+
WHERE meta.key = ? || s.project_id || ':' || m.id)
|
|
20
|
+
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
21
|
+
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id
|
|
22
|
+
AND j.status IN ('pending','running','retry'))
|
|
23
|
+
ORDER BY m.created_at, m.id`, 'sync_pushed:' + PROJECT_CHAIN_PREFIX)
|
|
24
|
+
.map((r) => ({
|
|
25
|
+
memoryId: String(r.memoryId),
|
|
26
|
+
scopeId: String(r.scopeId),
|
|
27
|
+
chain: 'project',
|
|
28
|
+
projectId: String(r.projectId),
|
|
29
|
+
}));
|
|
30
|
+
const upstream = [...personal, ...project];
|
|
13
31
|
if (!preserveModeEnabled(store.paths.dataDir))
|
|
14
|
-
return
|
|
15
|
-
//
|
|
32
|
+
return upstream;
|
|
33
|
+
// 保管链缺口:设备限定与 project-device,无任何 sync_preserve 任务。
|
|
34
|
+
// 缺项目身份的孤儿 project-global 也在这里(route 侧把它降级到保管链)。
|
|
16
35
|
const preserve = store.db
|
|
17
36
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
18
37
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
19
|
-
WHERE m.status = 'active'
|
|
38
|
+
WHERE m.status = 'active'
|
|
39
|
+
AND (s.preset IN ('device-local','project-device')
|
|
40
|
+
OR (s.preset = 'project-global' AND s.project_id IS NULL))
|
|
20
41
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
21
42
|
WHERE j.job_type = 'sync_preserve' AND j.entity_id = m.id)
|
|
22
43
|
ORDER BY m.created_at, m.id`)
|
|
23
44
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'preserve' }));
|
|
24
|
-
return [...
|
|
45
|
+
return [...upstream, ...preserve];
|
|
25
46
|
}
|
|
26
47
|
/**
|
|
27
48
|
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
@@ -39,11 +60,18 @@ export function findScopeExitGap(store) {
|
|
|
39
60
|
ORDER BY m.created_at, m.id`)
|
|
40
61
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId) }));
|
|
41
62
|
}
|
|
42
|
-
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
63
|
+
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
64
|
+
* 项目链按 projectId 分列(一条项目一条链)。 */
|
|
43
65
|
export function findUpstreamGapChains(store) {
|
|
44
66
|
const gaps = findUpstreamGap(store);
|
|
67
|
+
const project = {};
|
|
68
|
+
for (const g of gaps) {
|
|
69
|
+
if (g.chain === 'project' && g.projectId)
|
|
70
|
+
project[g.projectId] = (project[g.projectId] ?? 0) + 1;
|
|
71
|
+
}
|
|
45
72
|
return {
|
|
46
73
|
personal: gaps.filter((g) => g.chain === 'personal').length,
|
|
74
|
+
project,
|
|
47
75
|
preserve: gaps.filter((g) => g.chain === 'preserve').length,
|
|
48
76
|
};
|
|
49
77
|
}
|
|
@@ -63,6 +91,7 @@ export function backfillUpstream(store, opts) {
|
|
|
63
91
|
memoryIds: [],
|
|
64
92
|
chains: {
|
|
65
93
|
personal: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
94
|
+
project: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
66
95
|
preserve: { candidates: 0, enqueued: 0, existing: 0, excluded: 0 },
|
|
67
96
|
},
|
|
68
97
|
scopeExits: { candidates: exitGaps.length, enqueued: 0, memoryIds: [] },
|
|
@@ -79,7 +108,9 @@ export function backfillUpstream(store, opts) {
|
|
|
79
108
|
memoryId: g.memoryId,
|
|
80
109
|
scopeId: g.scopeId,
|
|
81
110
|
op: 'memory_upsert',
|
|
82
|
-
|
|
111
|
+
// 项目链任务必须用本链独立键:`memory:<id>` 往往已被当年个人链的任务永久占用
|
|
112
|
+
// (唯一约束,done 之后仍占),复用同键会被幂等去重挡成 existing,项目链永远补不上。
|
|
113
|
+
idempotencyKey: g.chain === 'project' ? `memory:${g.memoryId}:project:${g.projectId}` : `memory:${g.memoryId}`,
|
|
83
114
|
});
|
|
84
115
|
if (r.enqueued) {
|
|
85
116
|
report.enqueued++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmEjE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAE1C,MAAM,UAAU,eAAe,CAAC,KAAiB;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE;SACtB,GAAG,CACF;;;;;mCAK6B,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAmB,EAAE,CAAC,CAAC,CAAC;IAC1G,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE;SACrB,GAAG,CACF;;;;;;;;;mCAS6B,EAC7B,cAAc,GAAG,oBAAoB,CACtC;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1B,KAAK,EAAE,SAAkB;QACzB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;KAC/B,CAAC,CAAC,CAAC;IACN,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC;IAC3C,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC/D,mDAAmD;IACnD,iDAAiD;IACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE;SACtB,GAAG,CACF;;;;;;;mCAO6B,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAmB,EAAE,CAAC,CAAC,CAAC;IAC1G,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AACpC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAiB;IAChD,OAAO,KAAK,CAAC,EAAE;SACZ,GAAG,CACF;;kCAE4B,cAAc,GAAG,kBAAkB,GAAG,GAAG;;;;mCAIxC,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;iCACiC;AACjC,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IACrD,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS;YAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnG,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,MAAM;QAC3D,OAAO;QACP,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,MAAM;KAC5D,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAiB,EAAE,IAAwC;IAC1F,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,MAAM,GAAmB;QAC7B,UAAU,EAAE,GAAG,CAAC,MAAM;QACtB,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE,EAAE;QACb,MAAM,EAAE;YACN,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;YAClE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;YACjE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;SACnE;QACD,UAAU,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;KACxE,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,GAAG;QAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QACxB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,iBAAiB,CAAC,KAAK,EAAE;gBACjC,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,EAAE,EAAE,eAAe;gBACnB,+CAA+C;gBAC/C,mDAAmD;gBACnD,cAAc,EAAE,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,YAAY,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;aAC/G,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAClC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;iBAAM,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBACpC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC7B,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -60,6 +60,12 @@ export interface SyncScopeExitPayload {
|
|
|
60
60
|
lastContentHash: string;
|
|
61
61
|
/** 推送端已知的全部修订内容哈希——与 tombstone 同一血统对齐机制。 */
|
|
62
62
|
knownHashes: string[];
|
|
63
|
+
/**
|
|
64
|
+
* 终态作用域(add-cross-device-project-sync D5):迁出后记忆所在的作用域。
|
|
65
|
+
* 接收端据此更新本地留存副本的展示作用域与标签(仍不复制内容、不产生墓碑)。
|
|
66
|
+
* 新增可选字段而非新事件类型:旧版本忽略未知字段,语义不退化。记忆已不存在时省略。
|
|
67
|
+
*/
|
|
68
|
+
terminalScope?: SyncScopeDescriptor;
|
|
63
69
|
}
|
|
64
70
|
export interface SyncEvent {
|
|
65
71
|
deviceId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC;;;;GAIG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/pull.d.ts
CHANGED
|
@@ -4,7 +4,8 @@ import { VaultConfig } from './vault.js';
|
|
|
4
4
|
import { ApplyOutcome } from './apply.js';
|
|
5
5
|
/**
|
|
6
6
|
* 同步拉取(design D4 + add-cloud-preserve-mode D2/tasks 3.1):
|
|
7
|
-
* 拉取范围 = syncableChains()
|
|
7
|
+
* 拉取范围 = syncableChains()——个人链恒在;项目链 = 本地已知 ∪ 远端发现;
|
|
8
|
+
* 保管模式开启时加本设备保管链。
|
|
8
9
|
* 他人保管链对象完全不被下载(前缀隔离:`preserve/<别的设备>/` 不在任何列举范围内)。
|
|
9
10
|
* 每条链:列举其他设备 → 读 manifest(密文)→ 按 headSeq 对本地游标取差量 chunk
|
|
10
11
|
* → 解密 → 按事件序幂等应用 → 推进游标(单事务)。中断可重入:游标只在一个
|
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 { isPreserveSpaceKey, syncableChains } from './vault.js';
|
|
4
|
+
import { PROJECT_CHAIN_PREFIX, 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}`;
|
|
@@ -52,10 +52,24 @@ export async function syncPull(store, remote, vault) {
|
|
|
52
52
|
if (!keys)
|
|
53
53
|
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote 或导入恢复材料');
|
|
54
54
|
const myDevice = store.identity.deviceId;
|
|
55
|
+
// 项目链发现(tasks 3.1 / design D3):本地已知 ∪ 远端列举。
|
|
56
|
+
// 新设备冷启动时本地零项目行,只靠本地登记发现不了链;反过来远端列举失败
|
|
57
|
+
// 也不能丢掉本地已知链。失败降级为「本次不新增链 + 审计」,绝不阻断个人链。
|
|
58
|
+
const localProjectIds = store.db.all('SELECT id FROM project').map((r) => String(r.id));
|
|
59
|
+
let remoteProjectIds = [];
|
|
60
|
+
try {
|
|
61
|
+
remoteProjectIds = await listProjectChains(remote);
|
|
62
|
+
}
|
|
63
|
+
catch (e) {
|
|
64
|
+
store.audit.record('sync', 'project_chain_list_failed', { type: 'system', id: PROJECT_CHAIN_PREFIX }, {
|
|
65
|
+
error: e.message.slice(0, 200),
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
const projectIds = [...new Set([...localProjectIds, ...remoteProjectIds])];
|
|
55
69
|
const results = [];
|
|
56
70
|
let totalApplied = 0;
|
|
57
|
-
for (const spaceKey of syncableChains(vault, myDevice)) {
|
|
58
|
-
//
|
|
71
|
+
for (const spaceKey of syncableChains(vault, myDevice, projectIds)) {
|
|
72
|
+
// 个人链与项目链:消费链上全部设备的 manifest(含自己——找回场景);
|
|
59
73
|
// 保管链:单写者,只有自己的 manifest。
|
|
60
74
|
const sourceDeviceIds = isPreserveSpaceKey(spaceKey) ? [myDevice] : await listRemoteDevices(remote, spaceKey, myDevice);
|
|
61
75
|
for (const deviceId of sourceDeviceIds) {
|
|
@@ -69,6 +83,24 @@ export async function syncPull(store, remote, vault) {
|
|
|
69
83
|
void manifestKey;
|
|
70
84
|
return { devices: results, totalApplied };
|
|
71
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* 发现远端项目链(tasks 3.1):列举 `project/` 前缀,从 `project/<projectId>/...`
|
|
88
|
+
* 抽出 projectId 并去重。只读;失败由调用方决定降级(不在这里吞错)。
|
|
89
|
+
*/
|
|
90
|
+
async function listProjectChains(remote) {
|
|
91
|
+
const listing = await remote.list(PROJECT_CHAIN_PREFIX);
|
|
92
|
+
const ids = new Set();
|
|
93
|
+
for (const k of listing.keys) {
|
|
94
|
+
if (!k.startsWith(PROJECT_CHAIN_PREFIX))
|
|
95
|
+
continue;
|
|
96
|
+
const rel = k.slice(PROJECT_CHAIN_PREFIX.length);
|
|
97
|
+
const slash = rel.indexOf('/');
|
|
98
|
+
const id = slash === -1 ? rel : rel.slice(0, slash);
|
|
99
|
+
if (id)
|
|
100
|
+
ids.add(id);
|
|
101
|
+
}
|
|
102
|
+
return [...ids];
|
|
103
|
+
}
|
|
72
104
|
/**
|
|
73
105
|
* 发现某条链上的远端设备:列举 <spaceKey>/devices/<id>/manifest.json。
|
|
74
106
|
* 包含自己(add-cloud-preserve-mode 找回场景):本地数据目录丢失后,个人链与保管链
|
|
@@ -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,EAAmC,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
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
|
@@ -4,8 +4,8 @@ import { ChunkMeta } from './events.js';
|
|
|
4
4
|
import { VaultConfig } from './vault.js';
|
|
5
5
|
export interface ChainPushResult {
|
|
6
6
|
spaceKey: string;
|
|
7
|
-
/** personal = 个人链;preserve =
|
|
8
|
-
role: 'personal' | 'preserve';
|
|
7
|
+
/** personal = 个人链;preserve = 本设备保管链;project = 项目链。 */
|
|
8
|
+
role: 'personal' | 'preserve' | 'project';
|
|
9
9
|
publishedChunks: ChunkMeta[];
|
|
10
10
|
headSeq: number;
|
|
11
11
|
eventCount: number;
|
package/dist/src/sync/push.js
CHANGED
|
@@ -3,15 +3,16 @@ 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, isPreserveSpaceKey, preserveSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
6
|
+
import { PERSONAL_SPACE_KEY, isPreserveSpaceKey, preserveSpaceKey, projectSpaceKey, projectIdFromSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
7
7
|
/**
|
|
8
8
|
* 同步推送(design D2 + add-cloud-preserve-mode D2/D4):
|
|
9
9
|
* outbox 的 sync_upstream / sync_preserve / sync_scope_exit 任务 → 事件 → chunk(加密)
|
|
10
10
|
* → manifest(单写者,headSeq 防回退)。事件按内容哈希链组织。
|
|
11
11
|
*
|
|
12
|
-
* 按链分组发布(tasks 2.4):个人链(personal-global
|
|
13
|
-
*
|
|
12
|
+
* 按链分组发布(tasks 2.4):个人链(personal-global)、项目链(project/<projectId>)
|
|
13
|
+
* 与保管链(preserve/<deviceId>)各自 chunk / manifest / 代次。路由判定:
|
|
14
14
|
* - sync_upstream + personal-global 记忆 → 个人链;
|
|
15
|
+
* - 记忆作用域为 project-global(带 projectId)→ 项目链(与保管模式无关);
|
|
15
16
|
* - sync_preserve + 保管链承载作用域 → 保管链;
|
|
16
17
|
* - 其余一律「完成 + 审计 sync_job_unroutable」——静默完成分支已消灭(tasks 2.3):
|
|
17
18
|
* 不可路由任务 MUST 完成并写审计,MUST NOT 产生远端事件。
|
|
@@ -32,14 +33,19 @@ function pushedRevisionKey(spaceKey, memoryId) {
|
|
|
32
33
|
function chunkObjectKey(spaceKey, meta) {
|
|
33
34
|
return `${spaceKey}/${meta.key}`;
|
|
34
35
|
}
|
|
35
|
-
/**
|
|
36
|
+
/**
|
|
37
|
+
* 从作用域行构造事件的作用域描述符(D3)。项目名取 project.name(显示名的权威出处),
|
|
38
|
+
* 项目行缺失时回落 space.name(物化端重建项目行用)。
|
|
39
|
+
*/
|
|
36
40
|
function scopeDescriptor(store, scope) {
|
|
37
41
|
const d = { preset: scope.preset };
|
|
38
42
|
if (scope.projectId) {
|
|
39
43
|
d.projectId = scope.projectId;
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
44
|
+
const projectRow = store.db.get('SELECT name FROM project WHERE id = ?', scope.projectId);
|
|
45
|
+
const spaceRow = projectRow ? null : store.db.get('SELECT name FROM space WHERE id = ?', scope.spaceId);
|
|
46
|
+
const name = projectRow?.name ?? spaceRow?.name;
|
|
47
|
+
if (name)
|
|
48
|
+
d.spaceName = String(name);
|
|
43
49
|
}
|
|
44
50
|
if (scope.deviceId && scope.deviceId !== 'all')
|
|
45
51
|
d.deviceId = scope.deviceId;
|
|
@@ -53,6 +59,7 @@ function buildEventsForChain(store, device, spaceKey, role, jobs, auditUnroutabl
|
|
|
53
59
|
if (role === 'personal' && personalScope.syncPolicy !== 'encrypted') {
|
|
54
60
|
throw err('E_FORBIDDEN', 'personal-global 作用域不是 encrypted;拒绝上行(物理排除语义)');
|
|
55
61
|
}
|
|
62
|
+
const chainProjectId = role === 'project' ? projectIdFromSpaceKey(spaceKey) : null;
|
|
56
63
|
for (const job of jobs) {
|
|
57
64
|
// 迁出通知任务(add-scope-migration):独立的 sync_scope_exit jobType,
|
|
58
65
|
// 生成控制事件而非修订内容。fromSpace 固化于入队时(D4):只发到来源链。
|
|
@@ -75,6 +82,13 @@ function buildEventsForChain(store, device, spaceKey, role, jobs, auditUnroutabl
|
|
|
75
82
|
lastHash = lastHash ?? t?.contentHash ?? '';
|
|
76
83
|
}
|
|
77
84
|
const payload = { lastContentHash: lastHash ?? '', knownHashes };
|
|
85
|
+
// 终态作用域(tasks 2.3 / D5):取记忆【当前】作用域——迁移后即目的地。
|
|
86
|
+
// 记忆已不存在(纯墓碑场景)时省略该字段。
|
|
87
|
+
if (mem) {
|
|
88
|
+
const destinationScope = store.scopes.getById(mem.scopeId);
|
|
89
|
+
if (destinationScope)
|
|
90
|
+
payload.terminalScope = scopeDescriptor(store, destinationScope);
|
|
91
|
+
}
|
|
78
92
|
events.push({ deviceId: device, seq: 0, type: 'scope_exit', memoryId: job.entityId, occurredAt: nowIso(), payload });
|
|
79
93
|
doneJobIds.push(job.id);
|
|
80
94
|
continue;
|
|
@@ -104,6 +118,14 @@ function buildEventsForChain(store, device, spaceKey, role, jobs, auditUnroutabl
|
|
|
104
118
|
continue;
|
|
105
119
|
}
|
|
106
120
|
}
|
|
121
|
+
else if (role === 'project') {
|
|
122
|
+
// 项目链只承载 project-global,且必须是本链的项目(tasks 2.2 物理排除断言)。
|
|
123
|
+
if (!memScope || memScope.preset !== 'project-global' || !chainProjectId || memScope.projectId !== chainProjectId) {
|
|
124
|
+
auditUnroutable(job, `memory_scope_not_project_chain:${memScope?.preset ?? 'unknown'}`);
|
|
125
|
+
doneJobIds.push(job.id);
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
107
129
|
else {
|
|
108
130
|
// 保管链:只承载保管链作用域;描述符取自当前作用域(D3)。
|
|
109
131
|
if (!memScope || !isPreserveScopePreset(memScope.preset)) {
|
|
@@ -189,15 +211,19 @@ function routeJob(store, job, preserveOn) {
|
|
|
189
211
|
return { spaceKey: fromSpace, role: 'preserve' };
|
|
190
212
|
return null;
|
|
191
213
|
}
|
|
214
|
+
// sync_upstream:按记忆当前作用域路由(入队后可能已迁移;迁移动作会重建 outbox,
|
|
215
|
+
// 这里是防御性兜底)。项目链判定必须排在 sync_preserve 与保管链之前——且
|
|
216
|
+
// **不受 preserveDeviceBound 影响**:这是与保管链的关键差别(tasks 2.1)。
|
|
217
|
+
const mem = store.memories.get(job.entityId);
|
|
218
|
+
const scope = mem ? store.scopes.getById(mem.scopeId) : null;
|
|
219
|
+
if (scope?.preset === 'project-global' && scope.projectId) {
|
|
220
|
+
return { spaceKey: projectSpaceKey(scope.projectId), role: 'project' };
|
|
221
|
+
}
|
|
192
222
|
if (job.jobTypeHint === 'sync_preserve') {
|
|
193
223
|
if (!preserveOn)
|
|
194
224
|
return null;
|
|
195
225
|
return { spaceKey: preserveSpaceKey(store.identity.deviceId), role: 'preserve' };
|
|
196
226
|
}
|
|
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
227
|
if (scope?.preset === 'personal-global')
|
|
202
228
|
return { spaceKey: PERSONAL_SPACE_KEY, role: 'personal' };
|
|
203
229
|
if (scope && isPreserveScopePreset(scope.preset) && preserveOn) {
|
|
@@ -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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"}
|
package/dist/src/sync/route.d.ts
CHANGED
|
@@ -8,7 +8,8 @@ import { ScopeRow } from '../core/scope.js';
|
|
|
8
8
|
*
|
|
9
9
|
* 路由规则:
|
|
10
10
|
* - personal-global(encrypted + all)→ `sync_upstream` → 个人链;
|
|
11
|
-
* -
|
|
11
|
+
* - project-global(带 projectId)→ `sync_upstream` → 项目链 project/<projectId>(与保管模式无关);
|
|
12
|
+
* - 保管模式开启 + 设备限定/project-device → `sync_preserve` → 本设备保管链(preserve/<deviceId>);
|
|
12
13
|
* - 其余(device-local OFF / sensitive / agent-private / session-ephemeral)→ 不入队,
|
|
13
14
|
* 这是正常结果不是错误(物理排除语义)。
|
|
14
15
|
*
|
package/dist/src/sync/route.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
2
|
import { scopeAllowsUpstream } from '../core/scope.js';
|
|
3
|
-
import { PERSONAL_SPACE_KEY, preserveModeEnabled, preserveSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
3
|
+
import { PERSONAL_SPACE_KEY, preserveModeEnabled, preserveSpaceKey, projectSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
4
4
|
export function enqueueMemorySync(store, input) {
|
|
5
5
|
const scope = store.scopes.requireById(input.scopeId);
|
|
6
6
|
// 个人链内容:encrypted + all 由触发器兜底,应用层不再重复判定
|
|
@@ -15,6 +15,27 @@ export function enqueueMemorySync(store, input) {
|
|
|
15
15
|
});
|
|
16
16
|
return { enqueued: r.enqueued, chain: r.enqueued ? PERSONAL_SPACE_KEY : null, jobType: r.enqueued ? 'sync_upstream' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
17
17
|
}
|
|
18
|
+
// 项目内容 → 本项目链(add-cross-device-project-sync D2):与保管模式无关,
|
|
19
|
+
// 且必须排在 isPreserveScopePreset 之前——project-global 也在该预设集合里,
|
|
20
|
+
// 顺序写反就会继续走保管链(本项目最容易踩空的一处)。
|
|
21
|
+
if (scope.preset === 'project-global') {
|
|
22
|
+
if (scope.projectId) {
|
|
23
|
+
const r = store.outbox.enqueue({
|
|
24
|
+
jobType: 'sync_upstream',
|
|
25
|
+
scopeId: scope.id,
|
|
26
|
+
entityType: 'memory',
|
|
27
|
+
entityId: input.memoryId,
|
|
28
|
+
payload: { op: input.op, memoryId: input.memoryId },
|
|
29
|
+
idempotencyKey: input.idempotencyKey,
|
|
30
|
+
});
|
|
31
|
+
return { enqueued: r.enqueued, chain: r.enqueued ? projectSpaceKey(scope.projectId) : null, jobType: r.enqueued ? 'sync_upstream' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
32
|
+
}
|
|
33
|
+
// 缺 projectId 无法确定链:降级到下面的保管链/既有分支,但必须留痕(不得静默丢弃)。
|
|
34
|
+
store.audit.record('sync', 'sync_job_unroutable', { type: 'memory', id: input.memoryId }, {
|
|
35
|
+
jobType: 'sync_upstream',
|
|
36
|
+
reason: 'project_global_missing_project_id',
|
|
37
|
+
});
|
|
38
|
+
}
|
|
18
39
|
// 保管模式开启:设备限定与项目内容 → 本设备保管链(spec「保管模式下设备限定写入入队」)
|
|
19
40
|
if (isPreserveScopePreset(scope.preset) && preserveModeEnabled(store.paths.dataDir)) {
|
|
20
41
|
const r = store.outbox.enqueue({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../src/sync/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAY,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../src/sync/route.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/vault.d.ts
CHANGED
|
@@ -54,11 +54,21 @@ export declare const PRESERVE_CHAIN_PREFIX = "preserve/";
|
|
|
54
54
|
/** 本设备的保管链空间键。 */
|
|
55
55
|
export declare function preserveSpaceKey(deviceId: string): string;
|
|
56
56
|
export declare function isPreserveSpaceKey(spaceKey: string): boolean;
|
|
57
|
+
/**
|
|
58
|
+
* 项目链前缀(add-cross-device-project-sync D1):一个项目一条链,`project/<projectId>`。
|
|
59
|
+
* projectId 是跨设备稳定 UUID;所有设备都列举并拉取(与保管链相反)。
|
|
60
|
+
*/
|
|
61
|
+
export declare const PROJECT_CHAIN_PREFIX = "project/";
|
|
62
|
+
export declare function projectSpaceKey(projectId: string): string;
|
|
63
|
+
export declare function isProjectSpaceKey(spaceKey: string): boolean;
|
|
64
|
+
/** 反解项目链的空间键;非项目链或空 id 返回 null(不猜、不抛)。 */
|
|
65
|
+
export declare function projectIdFromSpaceKey(spaceKey: string): string | null;
|
|
57
66
|
/** 保管链承载的作用域预设(spec「保管链与物化过滤」:设备限定与项目内容)。 */
|
|
58
67
|
export declare const PRESERVE_SCOPE_PRESETS: readonly ["device-local", "project-global", "project-device"];
|
|
59
68
|
export declare function isPreserveScopePreset(preset: string): boolean;
|
|
60
69
|
/**
|
|
61
|
-
* 本设备会消费的链(tasks 1.3
|
|
70
|
+
* 本设备会消费的链(tasks 1.3):个人链恒在;项目链按调用方传入的列表展开
|
|
71
|
+
* (本函数不读 DB、不触网——发现与登记是调用方的事);保管模式开启时加本设备保管链。
|
|
62
72
|
* pull 范围 = 这条列表——他人保管链对象完全不被下载(D2)。
|
|
63
73
|
*/
|
|
64
|
-
export declare function syncableChains(vault: VaultConfig, deviceId: string): string[];
|
|
74
|
+
export declare function syncableChains(vault: VaultConfig, deviceId: string, projectIds?: readonly string[]): string[];
|