@carloswon/cairn-memory 0.6.0 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +2 -2
- package/dist/src/core/types.d.ts +6 -0
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/governance/apply.js +3 -12
- package/dist/src/governance/apply.js.map +1 -1
- package/dist/src/interfaces/app-service.d.ts +19 -0
- package/dist/src/interfaces/app-service.js +107 -67
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +25 -6
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-css.js +6 -2
- package/dist/src/interfaces/console/assets/ui-css.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-js.js +286 -94
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/assets/url-state.d.ts +1 -1
- package/dist/src/interfaces/console/assets/url-state.js +2 -2
- package/dist/src/interfaces/console/assets/url-state.js.map +1 -1
- package/dist/src/interfaces/console/model.d.ts +16 -0
- package/dist/src/interfaces/console/model.js +34 -1
- package/dist/src/interfaces/console/model.js.map +1 -1
- package/dist/src/interfaces/console/server.js +2 -0
- package/dist/src/interfaces/console/server.js.map +1 -1
- package/dist/src/interfaces/mcp/server.js +3 -0
- package/dist/src/interfaces/mcp/server.js.map +1 -1
- package/dist/src/store/memories.d.ts +6 -1
- package/dist/src/store/memories.js +9 -3
- package/dist/src/store/memories.js.map +1 -1
- package/dist/src/store/migrate.js +10 -1
- package/dist/src/store/migrate.js.map +1 -1
- package/dist/src/store/open.js +1 -1
- package/dist/src/store/open.js.map +1 -1
- package/dist/src/store/outbox.d.ts +8 -7
- package/dist/src/store/outbox.js +34 -1
- package/dist/src/store/outbox.js.map +1 -1
- package/dist/src/store/schema.d.ts +17 -0
- package/dist/src/store/schema.js +65 -0
- package/dist/src/store/schema.js.map +1 -1
- package/dist/src/sync/apply.d.ts +12 -2
- package/dist/src/sync/apply.js +109 -19
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backfill.d.ts +48 -5
- package/dist/src/sync/backfill.js +70 -10
- package/dist/src/sync/backfill.js.map +1 -1
- package/dist/src/sync/events.d.ts +18 -0
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/orchestrate.d.ts +4 -0
- package/dist/src/sync/orchestrate.js +24 -10
- package/dist/src/sync/orchestrate.js.map +1 -1
- package/dist/src/sync/pull.d.ts +8 -3
- package/dist/src/sync/pull.js +95 -79
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +16 -0
- package/dist/src/sync/push.js +146 -38
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/route.d.ts +44 -0
- package/dist/src/sync/route.js +88 -0
- package/dist/src/sync/route.js.map +1 -0
- package/dist/src/sync/vault.d.ts +27 -1
- package/dist/src/sync/vault.js +41 -1
- package/dist/src/sync/vault.js.map +1 -1
- package/docs/cairn-security.md +25 -18
- package/package.json +1 -1
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { CairnStore } from '../store/open.js';
|
|
2
|
+
import { ScopeRow } from '../core/scope.js';
|
|
3
|
+
/**
|
|
4
|
+
* 上行路由的唯一判定点(add-cloud-preserve-mode D4 / spec「上行入队完备性」)。
|
|
5
|
+
*
|
|
6
|
+
* app-service / governance.apply / backfill 全部经这一个函数入队——
|
|
7
|
+
* 路由判断曾在 push 与 enqueue 各写一份的教训(promotedPredicate / firstLine)不允许重演。
|
|
8
|
+
*
|
|
9
|
+
* 路由规则:
|
|
10
|
+
* - personal-global(encrypted + all)→ `sync_upstream` → 个人链;
|
|
11
|
+
* - 保管模式开启 + 设备限定/项目内容 → `sync_preserve` → 本设备保管链(preserve/<deviceId>);
|
|
12
|
+
* - 其余(device-local OFF / sensitive / agent-private / session-ephemeral)→ 不入队,
|
|
13
|
+
* 这是正常结果不是错误(物理排除语义)。
|
|
14
|
+
*
|
|
15
|
+
* 惯例键(idempotencyKey)由调用方按入口给「基础键」,本函数为保管链任务追加
|
|
16
|
+
* `:preserve` 后缀——同一记忆先上个人链后入保管链时,两个任务必须并存,
|
|
17
|
+
* 复用同键会被 enqueue 的幂等去重挡住。
|
|
18
|
+
*/
|
|
19
|
+
export type SyncOp = 'memory_upsert' | 'memory_tombstone';
|
|
20
|
+
export interface EnqueueRouteResult {
|
|
21
|
+
enqueued: boolean;
|
|
22
|
+
/** 任务实际路由到的链;未入队时为 null。 */
|
|
23
|
+
chain: string | null;
|
|
24
|
+
jobType: 'sync_upstream' | 'sync_preserve' | 'sync_scope_exit' | null;
|
|
25
|
+
reason?: 'scope_excluded' | 'duplicate';
|
|
26
|
+
}
|
|
27
|
+
export declare function enqueueMemorySync(store: CairnStore, input: {
|
|
28
|
+
memoryId: string;
|
|
29
|
+
scopeId: string;
|
|
30
|
+
op: SyncOp;
|
|
31
|
+
idempotencyKey: string;
|
|
32
|
+
}): EnqueueRouteResult;
|
|
33
|
+
/**
|
|
34
|
+
* 迁出个人链的迁出任务(tasks 2.1,模式无关):入队固化 fromSpaceKey=personal,
|
|
35
|
+
* 防 push 延迟期间二次迁移发错链(D4)。调用方必须已确认 previousScope 是个人链
|
|
36
|
+
* 且记忆曾推送过(sync_pushed 元数据存在)。
|
|
37
|
+
*/
|
|
38
|
+
export declare function enqueueScopeExit(store: CairnStore, memoryId: string): EnqueueRouteResult;
|
|
39
|
+
/** 迁入保管链作用域的强制重发任务(rescope 用:内容未变也要按新描述符重发一次)。 */
|
|
40
|
+
export declare function enqueuePreserveResync(store: CairnStore, memoryId: string, scopeId: string): EnqueueRouteResult;
|
|
41
|
+
/** 兼容包装:governance/apply 与 app-service 既有调用形态(作用域不允许上行时静默返回)。 */
|
|
42
|
+
export declare function routeMemoryUpstream(store: CairnStore, memoryId: string, scopeId: string, op: SyncOp, idempotencyKey: string): void;
|
|
43
|
+
/** 作用域是否曾可上行到个人链(迁出判定的既有口径:encrypted + all + personal 预设)。 */
|
|
44
|
+
export declare function isPersonalChainScope(scope: ScopeRow): boolean;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { err } from '../core/errors.js';
|
|
2
|
+
import { scopeAllowsUpstream } from '../core/scope.js';
|
|
3
|
+
import { PERSONAL_SPACE_KEY, preserveModeEnabled, preserveSpaceKey, isPreserveScopePreset, } from './vault.js';
|
|
4
|
+
export function enqueueMemorySync(store, input) {
|
|
5
|
+
const scope = store.scopes.requireById(input.scopeId);
|
|
6
|
+
// 个人链内容:encrypted + all 由触发器兜底,应用层不再重复判定
|
|
7
|
+
if (scope.preset === 'personal-global') {
|
|
8
|
+
const r = store.outbox.enqueue({
|
|
9
|
+
jobType: 'sync_upstream',
|
|
10
|
+
scopeId: scope.id,
|
|
11
|
+
entityType: 'memory',
|
|
12
|
+
entityId: input.memoryId,
|
|
13
|
+
payload: { op: input.op, memoryId: input.memoryId },
|
|
14
|
+
idempotencyKey: input.idempotencyKey,
|
|
15
|
+
});
|
|
16
|
+
return { enqueued: r.enqueued, chain: r.enqueued ? PERSONAL_SPACE_KEY : null, jobType: r.enqueued ? 'sync_upstream' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
17
|
+
}
|
|
18
|
+
// 保管模式开启:设备限定与项目内容 → 本设备保管链(spec「保管模式下设备限定写入入队」)
|
|
19
|
+
if (isPreserveScopePreset(scope.preset) && preserveModeEnabled(store.paths.dataDir)) {
|
|
20
|
+
const r = store.outbox.enqueue({
|
|
21
|
+
jobType: 'sync_preserve',
|
|
22
|
+
scopeId: scope.id,
|
|
23
|
+
entityType: 'memory',
|
|
24
|
+
entityId: input.memoryId,
|
|
25
|
+
payload: { op: input.op, memoryId: input.memoryId },
|
|
26
|
+
idempotencyKey: `${input.idempotencyKey}:preserve`,
|
|
27
|
+
});
|
|
28
|
+
return { enqueued: r.enqueued, chain: r.enqueued ? preserveSpaceKey(store.identity.deviceId) : null, jobType: r.enqueued ? 'sync_preserve' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
29
|
+
}
|
|
30
|
+
// 关闭模式下的 project-global / 自定义加密空间:任务保留入队(延续既有语义),
|
|
31
|
+
// push 侧「不可路由 → 完成 + 审计 sync_job_unroutable」负责收口(spec:
|
|
32
|
+
// 上行任务 MUST 完成并写审计,MUST NOT 产生远端事件)。
|
|
33
|
+
if (scopeAllowsUpstream(scope)) {
|
|
34
|
+
const r = store.outbox.enqueue({
|
|
35
|
+
jobType: 'sync_upstream',
|
|
36
|
+
scopeId: scope.id,
|
|
37
|
+
entityType: 'memory',
|
|
38
|
+
entityId: input.memoryId,
|
|
39
|
+
payload: { op: input.op, memoryId: input.memoryId },
|
|
40
|
+
idempotencyKey: input.idempotencyKey,
|
|
41
|
+
});
|
|
42
|
+
return { enqueued: r.enqueued, chain: null, jobType: r.enqueued ? 'sync_upstream' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
43
|
+
}
|
|
44
|
+
// agent-private / session-ephemeral / device-local(OFF):任何模式都不上云——
|
|
45
|
+
// 静默排除是既有语义的正常结果,不是错误(与旧 addMemory 行为一致,无审计噪音)。
|
|
46
|
+
return { enqueued: false, chain: null, jobType: null, reason: 'scope_excluded' };
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* 迁出个人链的迁出任务(tasks 2.1,模式无关):入队固化 fromSpaceKey=personal,
|
|
50
|
+
* 防 push 延迟期间二次迁移发错链(D4)。调用方必须已确认 previousScope 是个人链
|
|
51
|
+
* 且记忆曾推送过(sync_pushed 元数据存在)。
|
|
52
|
+
*/
|
|
53
|
+
export function enqueueScopeExit(store, memoryId) {
|
|
54
|
+
const r = store.outbox.enqueue({
|
|
55
|
+
jobType: 'sync_scope_exit',
|
|
56
|
+
scopeId: null,
|
|
57
|
+
entityType: 'memory',
|
|
58
|
+
entityId: memoryId,
|
|
59
|
+
payload: { op: 'scope_exit', memoryId, fromSpace: PERSONAL_SPACE_KEY },
|
|
60
|
+
idempotencyKey: `memory:${memoryId}:scope-exit:${Date.now()}`,
|
|
61
|
+
});
|
|
62
|
+
return { enqueued: r.enqueued, chain: r.enqueued ? PERSONAL_SPACE_KEY : null, jobType: r.enqueued ? 'sync_scope_exit' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
63
|
+
}
|
|
64
|
+
/** 迁入保管链作用域的强制重发任务(rescope 用:内容未变也要按新描述符重发一次)。 */
|
|
65
|
+
export function enqueuePreserveResync(store, memoryId, scopeId) {
|
|
66
|
+
const scope = store.scopes.requireById(scopeId);
|
|
67
|
+
if (!isPreserveScopePreset(scope.preset)) {
|
|
68
|
+
throw err('E_VALIDATION', `scope 不是保管链承载的作用域: ${scope.preset}`);
|
|
69
|
+
}
|
|
70
|
+
const r = store.outbox.enqueue({
|
|
71
|
+
jobType: 'sync_preserve',
|
|
72
|
+
scopeId: scope.id,
|
|
73
|
+
entityType: 'memory',
|
|
74
|
+
entityId: memoryId,
|
|
75
|
+
payload: { op: 'memory_upsert', memoryId, force: true },
|
|
76
|
+
idempotencyKey: `memory:${memoryId}:preserve-resync:${Date.now()}`,
|
|
77
|
+
});
|
|
78
|
+
return { enqueued: r.enqueued, chain: r.enqueued ? preserveSpaceKey(store.identity.deviceId) : null, jobType: r.enqueued ? 'sync_preserve' : null, reason: r.enqueued ? undefined : 'duplicate' };
|
|
79
|
+
}
|
|
80
|
+
/** 兼容包装:governance/apply 与 app-service 既有调用形态(作用域不允许上行时静默返回)。 */
|
|
81
|
+
export function routeMemoryUpstream(store, memoryId, scopeId, op, idempotencyKey) {
|
|
82
|
+
enqueueMemorySync(store, { memoryId, scopeId, op, idempotencyKey });
|
|
83
|
+
}
|
|
84
|
+
/** 作用域是否曾可上行到个人链(迁出判定的既有口径:encrypted + all + personal 预设)。 */
|
|
85
|
+
export function isPersonalChainScope(scope) {
|
|
86
|
+
return scope.preset === 'personal-global' && scope.syncPolicy === 'encrypted' && scope.deviceId === 'all';
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=route.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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
|
@@ -16,6 +16,13 @@ export interface VaultConfig {
|
|
|
16
16
|
syncd?: {
|
|
17
17
|
baseUrl: string;
|
|
18
18
|
};
|
|
19
|
+
/**
|
|
20
|
+
* 保管模式(add-cloud-preserve-mode D1,vault 级开关,缺省 false):
|
|
21
|
+
* 关闭 = 既有物理排除语义(设备限定/项目内容不上云);
|
|
22
|
+
* 开启 = 它们以密文上行到本设备的保管链(preserve/<deviceId>)。
|
|
23
|
+
* 无论何种模式,agent-private 与 session-ephemeral 永不上云。
|
|
24
|
+
*/
|
|
25
|
+
preserveDeviceBound?: boolean;
|
|
19
26
|
createdAt: string;
|
|
20
27
|
}
|
|
21
28
|
export declare function vaultConfigPath(dataDir: string): string;
|
|
@@ -23,6 +30,12 @@ export declare function loadVaultConfig(dataDir: string): VaultConfig | null;
|
|
|
23
30
|
export declare function saveVaultConfig(dataDir: string, cfg: Omit<VaultConfig, 'createdAt' | 'vaultId'> & {
|
|
24
31
|
vaultId?: string;
|
|
25
32
|
}): VaultConfig;
|
|
33
|
+
/** 已有配置的原地修改(vault config 子命令):保留身份与远端段,只改指定开关。 */
|
|
34
|
+
export declare function updateVaultConfig(dataDir: string, patch: {
|
|
35
|
+
preserveDeviceBound: boolean;
|
|
36
|
+
}): VaultConfig;
|
|
37
|
+
/** 保管模式是否开启(缺省关闭;未配置远端时恒关闭)。 */
|
|
38
|
+
export declare function preserveModeEnabled(dataDir: string): boolean;
|
|
26
39
|
/**
|
|
27
40
|
* 环境变量名约定(与 GITHUB_TOKEN 同模式,用户级注入):
|
|
28
41
|
* OBS: OBS_ACCESS_KEY_ID / OBS_SECRET_ACCESS_KEY(+ vault.json 的 endpoint/bucket/prefix)
|
|
@@ -34,5 +47,18 @@ export declare const ENV: {
|
|
|
34
47
|
readonly syncdToken: "CAIRN_SYNCD_TOKEN";
|
|
35
48
|
readonly syncdUrl: "CAIRN_SYNCD_URL";
|
|
36
49
|
};
|
|
37
|
-
/**
|
|
50
|
+
/** 本变更首版同步的个人空间键(跨设备稳定标识;历史键名不改名——design D6)。 */
|
|
38
51
|
export declare const PERSONAL_SPACE_KEY = "personal-global";
|
|
52
|
+
/** 保管链前缀(design D2):每设备一条,`preserve/<deviceId>`,只有本设备拉取。 */
|
|
53
|
+
export declare const PRESERVE_CHAIN_PREFIX = "preserve/";
|
|
54
|
+
/** 本设备的保管链空间键。 */
|
|
55
|
+
export declare function preserveSpaceKey(deviceId: string): string;
|
|
56
|
+
export declare function isPreserveSpaceKey(spaceKey: string): boolean;
|
|
57
|
+
/** 保管链承载的作用域预设(spec「保管链与物化过滤」:设备限定与项目内容)。 */
|
|
58
|
+
export declare const PRESERVE_SCOPE_PRESETS: readonly ["device-local", "project-global", "project-device"];
|
|
59
|
+
export declare function isPreserveScopePreset(preset: string): boolean;
|
|
60
|
+
/**
|
|
61
|
+
* 本设备会消费的链(tasks 1.3):个人链恒在;保管模式开启时加本设备保管链。
|
|
62
|
+
* pull 范围 = 这条列表——他人保管链对象完全不被下载(D2)。
|
|
63
|
+
*/
|
|
64
|
+
export declare function syncableChains(vault: VaultConfig, deviceId: string): string[];
|
package/dist/src/sync/vault.js
CHANGED
|
@@ -33,11 +33,27 @@ export function saveVaultConfig(dataDir, cfg) {
|
|
|
33
33
|
provider: cfg.provider,
|
|
34
34
|
obs: cfg.obs,
|
|
35
35
|
syncd: cfg.syncd,
|
|
36
|
+
...(cfg.preserveDeviceBound ? { preserveDeviceBound: true } : {}),
|
|
36
37
|
createdAt: nowIso(),
|
|
37
38
|
};
|
|
38
39
|
writeFileSync(vaultConfigPath(dataDir), JSON.stringify(full, null, 2), 'utf8');
|
|
39
40
|
return full;
|
|
40
41
|
}
|
|
42
|
+
/** 已有配置的原地修改(vault config 子命令):保留身份与远端段,只改指定开关。 */
|
|
43
|
+
export function updateVaultConfig(dataDir, patch) {
|
|
44
|
+
const cfg = loadVaultConfig(dataDir);
|
|
45
|
+
if (!cfg)
|
|
46
|
+
throw err('E_VALIDATION', 'vault.json 不存在;先 cairn vault init-remote');
|
|
47
|
+
const next = { ...cfg, preserveDeviceBound: patch.preserveDeviceBound };
|
|
48
|
+
if (!patch.preserveDeviceBound)
|
|
49
|
+
delete next.preserveDeviceBound; // 缺省 false:键不落盘,与未配置过一致
|
|
50
|
+
writeFileSync(vaultConfigPath(dataDir), JSON.stringify(next, null, 2), 'utf8');
|
|
51
|
+
return next;
|
|
52
|
+
}
|
|
53
|
+
/** 保管模式是否开启(缺省关闭;未配置远端时恒关闭)。 */
|
|
54
|
+
export function preserveModeEnabled(dataDir) {
|
|
55
|
+
return loadVaultConfig(dataDir)?.preserveDeviceBound === true;
|
|
56
|
+
}
|
|
41
57
|
/**
|
|
42
58
|
* 环境变量名约定(与 GITHUB_TOKEN 同模式,用户级注入):
|
|
43
59
|
* OBS: OBS_ACCESS_KEY_ID / OBS_SECRET_ACCESS_KEY(+ vault.json 的 endpoint/bucket/prefix)
|
|
@@ -49,6 +65,30 @@ export const ENV = {
|
|
|
49
65
|
syncdToken: 'CAIRN_SYNCD_TOKEN',
|
|
50
66
|
syncdUrl: 'CAIRN_SYNCD_URL',
|
|
51
67
|
};
|
|
52
|
-
/**
|
|
68
|
+
/** 本变更首版同步的个人空间键(跨设备稳定标识;历史键名不改名——design D6)。 */
|
|
53
69
|
export const PERSONAL_SPACE_KEY = 'personal-global';
|
|
70
|
+
/** 保管链前缀(design D2):每设备一条,`preserve/<deviceId>`,只有本设备拉取。 */
|
|
71
|
+
export const PRESERVE_CHAIN_PREFIX = 'preserve/';
|
|
72
|
+
/** 本设备的保管链空间键。 */
|
|
73
|
+
export function preserveSpaceKey(deviceId) {
|
|
74
|
+
return `${PRESERVE_CHAIN_PREFIX}${deviceId}`;
|
|
75
|
+
}
|
|
76
|
+
export function isPreserveSpaceKey(spaceKey) {
|
|
77
|
+
return spaceKey.startsWith(PRESERVE_CHAIN_PREFIX);
|
|
78
|
+
}
|
|
79
|
+
/** 保管链承载的作用域预设(spec「保管链与物化过滤」:设备限定与项目内容)。 */
|
|
80
|
+
export const PRESERVE_SCOPE_PRESETS = ['device-local', 'project-global', 'project-device'];
|
|
81
|
+
export function isPreserveScopePreset(preset) {
|
|
82
|
+
return PRESERVE_SCOPE_PRESETS.includes(preset);
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* 本设备会消费的链(tasks 1.3):个人链恒在;保管模式开启时加本设备保管链。
|
|
86
|
+
* pull 范围 = 这条列表——他人保管链对象完全不被下载(D2)。
|
|
87
|
+
*/
|
|
88
|
+
export function syncableChains(vault, deviceId) {
|
|
89
|
+
const chains = [PERSONAL_SPACE_KEY];
|
|
90
|
+
if (vault.preserveDeviceBound === true)
|
|
91
|
+
chains.push(preserveSpaceKey(deviceId));
|
|
92
|
+
return chains;
|
|
93
|
+
}
|
|
54
94
|
//# sourceMappingURL=vault.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/sync/vault.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/sync/vault.ts"],"names":[],"mappings":"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"}
|
package/docs/cairn-security.md
CHANGED
|
@@ -37,15 +37,22 @@
|
|
|
37
37
|
|
|
38
38
|
## 2. 作用域物理边界
|
|
39
39
|
|
|
40
|
-
### 2.1
|
|
40
|
+
### 2.1 上行排除与保管模式(双模,add-cloud-preserve-mode 起)
|
|
41
41
|
|
|
42
|
-
`local_only` 与设备限定内容(`device-local` / `project-device` / `agent-private` / `session-ephemeral` / 自定义 local_only
|
|
42
|
+
`local_only` 与设备限定内容(`device-local` / `project-device` / `agent-private` / `session-ephemeral` / 自定义 local_only 空间)的上行语义由 **vault 级保管模式开关**(`cairn vault config --preserve-device-bound on|off`,默认关闭)决定:
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
- **关闭(默认)**:延续既有物理排除语义——设备限定内容不产生任何上行任务;`agent-private` 与 `session-ephemeral` 永不上云。project-global 等非个人全局内容即使有历史入队任务,也只会被「完成 + 审计 `sync_job_unroutable`」,不产生任何远端事件。
|
|
45
|
+
- **开启(用户显式决定)**:设备限定与项目内容以密文上行到**本设备的保管链**(`preserve/<deviceId>`),事件携带归属设备标签与作用域描述符;**其他设备的保管链不会被拉取**,云端对象仍无明文。`agent-private` 与 `session-ephemeral` 在任何模式下都**不上云**。
|
|
46
|
+
|
|
47
|
+
无论哪种模式,个人链内容的排除都是两层执行:
|
|
48
|
+
|
|
49
|
+
1. **应用层入口**:写入、更正、遗忘、计划应用统一经 `sync/route.ts` 的单一路由判定(个人链 / 保管链 / 不入队)。检索、详情、导出、投影走同一个 `scopeAllowsRead` / 同一组判定入口,禁止各入口自行解释作用域(spec scoped-retrieval「全通道作用域隔离」)。
|
|
50
|
+
2. **数据库触发器兜底**:`outbox_reject_local_upstream` 在 `outbox_job` 插入前检查——`sync_upstream` 任务的作用域若非 `encrypted` + `device_id='all'` 直接 `RAISE(ABORT, 'scope_not_upstreamable')`。保管链任务(`sync_preserve`)在应用层只收保管链承载的作用域,且必须保管模式开启。
|
|
46
51
|
|
|
47
52
|
作用域校验(`validateScopeSpec`)另有硬规则:设备绑定作用域必须是 `local_only`;`sensitive` 内容必须 `local_only`;`encrypted` 同步要求设备为 all。这些规则无法通过 CLI/MCP 参数绕过。
|
|
48
53
|
|
|
54
|
+
**密钥泄露爆炸半径(用户已确认的取舍)**:保管模式开启的 vault 上,vault 密钥泄露的影响范围从「个人全局内容」扩大到「全部记忆」——对端与本机共享 vault 密钥,被入侵的对端可解其他设备保管链的密文。这是换取「全量密文异地保管 + 设备找回」能力的代价;不接受该取舍的用户保持开关关闭即可,关闭时语义与 0.6.x 完全一致。`candidate` / `sensitive` 内容在保管模式下同样会密文上云——某条内容若绝不能离开本机,请使用 `agent-private` 作用域(任何模式都不上云)。
|
|
55
|
+
|
|
49
56
|
### 2.2 导出与投影
|
|
50
57
|
|
|
51
58
|
导出(`cairn export`)与受管投影(`agent plan/apply` 写入的区块内容)走同一判定入口:`local_only` 作用域的内容可以出现在本地导出文件中(本地导出是权威库的本地行为,不是上行),但对应的投影与上行生成仍然只使用其作用域允许的内容;受管投影文件带唯一标记(`<!-- cairn:begin block="cairn-memory" -->`),导入含该标记的文件会被拒绝(`E_PROJECTION_LOOP`),防止导出—回读—再导出回环。
|
|
@@ -265,17 +272,17 @@ cairn uninstall # 遍历五个宿主,移除所有本产品配置
|
|
|
265
272
|
## 10. 操作审计只存摘要(add-operation-audit)
|
|
266
273
|
|
|
267
274
|
读取类操作审计(`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,含拟改正文);生成时秘密扫描命中即拒绝落盘,采纳时再扫一次。
|
|
275
|
+
|
|
276
|
+
---
|
|
277
|
+
|
|
278
|
+
## 11. Agent 不持有记忆写入权(add-agent-managed-revision)
|
|
279
|
+
|
|
280
|
+
「模型只生成候选」在修订环节的落点:Agent 对**已存在的记忆**没有直接修改权。MCP 工具面提供 `revision_propose`(写方案卡)与 `revision_list`(读卡),**刻意不提供任何 apply 工具**——应用提案只能由本地入口(CLI `cairn revision apply`、本地控制台点击)发起,走与人工 `memory_update` 完全相同的修订链、秘密复检与审计。
|
|
281
|
+
|
|
282
|
+
三条机制保证这条边界不是靠约定:
|
|
283
|
+
|
|
284
|
+
1. **工具面即权限面**:MCP 进程根本没有应用提案的代码路径可调(`tests/interfaces/revision-mcp.test.ts` 断言工具面不含 apply)。
|
|
285
|
+
2. **版本一致性不可绕过**:方案卡记录提出时的修订 id,应用时两层校验(提案层 + `reviseMemory` 的 `expectedCurrentRevisionId`);记忆已被改过则拒绝并标陈旧。
|
|
286
|
+
3. **权威语义**:采纳后的新修订记 `user_confirmed`(人批准了 Agent 起草的内容),既不是 `agent_inferred` 也不是 `user_explicit`。
|
|
287
|
+
|
|
288
|
+
方案卡文件与批注同信任域(本机明文 JSON,含拟改正文);生成时秘密扫描命中即拒绝落盘,采纳时再扫一次。
|