evolcore 0.0.41-test.0 → 0.0.41-test.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 +62 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +88 -49
- package/dist/agents/claude-runner.js +177 -92
- package/dist/agents/codex-runner.js +146 -71
- package/dist/agents/ecagent-runner.js +1 -1
- package/dist/agents/gemini-runner.js +1 -1
- package/dist/aun/aid/agentmd.js +98 -11
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +26 -2
- package/dist/aun/aid/identity.js +91 -0
- package/dist/aun/aid/index.js +1 -1
- package/dist/aun/aid/managed-operation.js +1 -1
- package/dist/aun/aid/ownership-operation.js +23 -22
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -21
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/menu/client.js +27 -0
- package/dist/aun/msg/managed-operation.js +68 -7
- package/dist/aun/msg/p2p.js +8 -8
- package/dist/aun/service-proxy.js +53 -12
- package/dist/channels/aun.js +633 -32
- package/dist/channels/daemon.js +15 -1
- package/dist/cli/agent-command.js +5 -2
- package/dist/cli/agent-create.js +991 -233
- package/dist/cli/agent.js +49 -10
- package/dist/cli/aid-bind-command.js +48 -19
- package/dist/cli/aun-commands.js +48 -36
- package/dist/cli/daemon-commands.js +679 -697
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +72 -5
- package/dist/cli/init-channel.js +1 -1
- package/dist/cli/init.js +75 -1
- package/dist/cli/managed-command-guard.js +17 -1
- package/dist/cli/model.js +40 -40
- package/dist/cli/provider-command.js +57 -0
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +4 -2
- package/dist/cli/role.js +85 -0
- package/dist/cli/stats.js +10 -3
- package/dist/cli/task-context.js +19 -0
- package/dist/config/access-policy.js +7 -2
- package/dist/config/boot-log.js +39 -1
- package/dist/config/config-field-policy.js +17 -39
- package/dist/config/config-manager.js +183 -44
- package/dist/config/config-operation-service.js +5 -19
- package/dist/config/contact-book-store.js +47 -21
- package/dist/config/contact-book.js +18 -12
- package/dist/config/contact-operation-service.js +3 -4
- package/dist/config/contact-request-service.js +11 -0
- package/dist/config/daemon-services.js +11 -0
- package/dist/config/gateway-config.js +88 -594
- package/dist/config/owner-config.js +2 -2
- package/dist/config/peer-role-resolver.js +15 -12
- package/dist/config/provider-ipc-service.js +132 -0
- package/dist/config/provider-menu-request.js +58 -0
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/providers-management.js +78 -5
- package/dist/config/resolved-config-op.js +11 -1
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +1000 -25
- package/dist/config-store.js +89 -4
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +4 -1
- package/dist/core/agent-application-service.js +60 -11
- package/dist/core/agent-create-status.js +203 -0
- package/dist/core/agent-creation-claim.js +177 -0
- package/dist/core/agent-ipc-registration.js +39 -18
- package/dist/core/agent-runtime.js +194 -24
- package/dist/core/auth/agent-delegation.js +6 -3
- package/dist/core/auth/auth-gateway.js +67 -2
- package/dist/core/auth/authorization-audit.js +58 -11
- package/dist/core/auth/delegation-authorization.js +5 -2
- package/dist/core/auth/operation-authorizer.js +43 -6
- package/dist/core/auth/operation-catalog.js +45 -7
- package/dist/core/channel-loader.js +2 -0
- package/dist/core/command/agent-control.js +260 -21
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +8 -3
- package/dist/core/command/command-handler.js +112 -154
- package/dist/core/command/connect-menu.js +11 -3
- package/dist/core/command/data-root-resolver.js +5 -4
- package/dist/core/command/memory-slash.js +16 -8
- package/dist/core/command/menu-catalog.js +10 -6
- package/dist/core/command/menu-handler.js +106 -73
- package/dist/core/command/menu-protocol.js +15 -1
- package/dist/core/command/provider-menu.js +46 -0
- package/dist/core/command/role-menu.js +147 -30
- package/dist/core/command/slash-handler.js +125 -255
- package/dist/core/daemon-control.js +26 -27
- package/dist/core/event-catalog.js +10 -0
- package/dist/core/evolagent-registry.js +7 -5
- package/dist/core/evolagent.js +10 -8
- package/dist/core/file-integrity/store.js +11 -0
- package/dist/core/handoff/ipc-registration.js +3 -0
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/initialization/service.js +491 -0
- package/dist/core/ipc-registration.js +40 -24
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +96 -1
- package/dist/core/memory/consolidation-trigger.js +208 -191
- package/dist/core/memory/consolidation.js +333 -35
- package/dist/core/memory/index-manager.js +27 -5
- package/dist/core/memory/memory-admin.js +45 -5
- package/dist/core/memory/memory-writer.js +163 -18
- package/dist/core/memory/relation-idle-monitor.js +119 -58
- package/dist/core/memory/relation-sweep.js +55 -45
- package/dist/core/message/aun-ipc-sender.js +81 -69
- package/dist/core/message/im-renderer.js +25 -4
- package/dist/core/message/message-admission.js +89 -4
- package/dist/core/message/message-bridge.js +66 -21
- package/dist/core/message/response-engine.js +108 -35
- package/dist/core/model/catalog-service.js +5 -3
- package/dist/core/model/config-scope.js +29 -71
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +30 -41
- package/dist/core/model/model-diagnostics.js +4 -3
- package/dist/core/model/model-fallback.js +10 -7
- package/dist/core/model/model-permission.js +3 -2
- package/dist/core/ownership/owner-resolver.js +772 -158
- package/dist/core/permission/approval-gateway.js +103 -403
- package/dist/core/permission/ec-command-parser.js +62 -6
- package/dist/core/permission/index.js +1 -0
- package/dist/core/permission/permission-result.js +78 -0
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +21 -46
- package/dist/core/relation/peer-identity.js +64 -1
- package/dist/core/role/runtime-policy.js +72 -13
- package/dist/core/session/session-capsule.js +1 -1
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +20 -0
- package/dist/core/session/session-renew.js +3 -3
- package/dist/core/skill/index-generator.js +15 -5
- package/dist/core/system-session/memory.js +43 -8
- package/dist/core/thread/thread-service.js +19 -6
- package/dist/directory/owner-directory-admission.js +95 -0
- package/dist/directory/owner-directory-authorization.js +309 -0
- package/dist/directory/owner-directory-cache.js +635 -0
- package/dist/eck/kit-renderer.js +2 -2
- package/dist/ecweb/basic-settings-service.js +33 -40
- package/dist/ecweb/init-menu.js +32 -0
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +93 -19
- package/dist/ipc.js +247 -29
- package/dist/paths.js +7 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +484 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/trigger/authorization.js +27 -17
- package/dist/trigger/feedback.js +2 -3
- package/dist/trigger/ipc-service.js +105 -78
- package/dist/trigger/local-files.js +2 -1
- package/dist/trigger/manager.js +5 -3
- package/dist/trigger/scheduler.js +88 -6
- package/dist/utils/atomic-write.js +28 -0
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +26 -2
- package/dist/utils/logger.js +92 -6
- package/dist/utils/package-version-info.js +4 -2
- package/dist/utils/welcome.js +1 -1
- package/kits/docs/INDEX.md +1 -0
- package/kits/docs/aun/SDK.md +4 -1
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +1 -0
- package/kits/docs/evolcore/agent.md +8 -1
- package/kits/docs/evolcore/aid.md +67 -17
- package/kits/docs/evolcore/config.md +28 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/fs.md +11 -0
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -2
- package/kits/docs/evolcore/memory-consolidation.md +32 -8
- package/kits/docs/evolcore/memory.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +4 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +4 -7
- package/kits/docs/evolcore/provider.md +50 -0
- package/kits/docs/identity/AID_PROFILE_SPEC.md +52 -17
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/rules/01-overview.md +3 -0
- package/kits/rules/04-relation.md +1 -1
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +8 -3
- package/kits/schemas/agent-config.schema.16.json +891 -0
- package/kits/schemas/daemon.schema.9.json +366 -0
- package/kits/schemas/defaults.schema.5.json +406 -127
- package/kits/schemas/relation-config.schema.11.json +277 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ec-agent-create/SKILL.md +3 -0
- package/kits/skills/ec-identity/SKILL.md +2 -2
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-skill/scripts/skill.mjs +6 -0
- package/kits/skills/personal-assistant/SKILL.md +176 -0
- package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
- package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
- package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
- package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
- package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
- package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
- package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
- package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
- package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
- package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
- package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
- package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
- package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
- package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
- package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
- package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
- package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
- package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
- package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
- package/kits/skills/thread-ops/SKILL.md +5 -0
- package/kits/templates/memory-consolidation/forget.md +19 -6
- package/kits/templates/memory-consolidation/notes.md +1 -1
- package/kits/templates/memory-consolidation/profile.md +2 -2
- package/kits/templates/memory-consolidation/promote.md +20 -3
- package/kits/templates/roles/member.json +8 -1
- package/kits/templates/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/memory.md +4 -4
- package/kits/templates/system-fragments/venue.md +1 -1
- package/package.json +7 -3
- package/dist/core/message/create-status.js +0 -96
|
@@ -15,6 +15,7 @@ import { refreshMemoryMeta, readMemoryMeta } from './index-manager.js';
|
|
|
15
15
|
import { stripLegacySignature } from './memory-document.js';
|
|
16
16
|
import { moveRecord, verifyFile } from '../file-integrity/store.js';
|
|
17
17
|
import { readFmArray, readFmValue, readUpdatedAtMs, reviewWindowDays, DEFAULT_FORGET_AFTER_DAYS } from './staleness.js';
|
|
18
|
+
import { appendForgetLog, normalizeForgetReason } from './consolidation-ops-records.js';
|
|
18
19
|
export const MEMORY_SCOPES = ['relation', 'agent', 'owner'];
|
|
19
20
|
const SLUG_RE = /^[a-zA-Z0-9][a-zA-Z0-9-]{0,63}$/;
|
|
20
21
|
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
@@ -212,20 +213,34 @@ export async function dropNote(target, slug) {
|
|
|
212
213
|
const r = await dropMemoryNote({ taskCtx: ctxOf(target), target: slug, memoryConfig: target.memoryConfig });
|
|
213
214
|
return r.filePath;
|
|
214
215
|
}
|
|
216
|
+
function manualLog(memoryDir, action, slug, log) {
|
|
217
|
+
appendForgetLog(memoryDir, {
|
|
218
|
+
action,
|
|
219
|
+
slug,
|
|
220
|
+
reason: normalizeForgetReason(log?.reason) || '未注明理由',
|
|
221
|
+
source: `slash:${log?.actorAid ?? 'unknown'}`,
|
|
222
|
+
});
|
|
223
|
+
}
|
|
215
224
|
/** 归档一条正式记忆并重建索引。 */
|
|
216
|
-
export async function archiveMemoryFile(target, scope, slug) {
|
|
225
|
+
export async function archiveMemoryFile(target, scope, slug, log) {
|
|
217
226
|
assertSlug(slug);
|
|
218
|
-
await archiveMemory({ taskCtx: ctxOf(target), scope, ownerAid: target.ownerAid, targets: [slug] });
|
|
227
|
+
const r = await archiveMemory({ taskCtx: ctxOf(target), scope, ownerAid: target.ownerAid, targets: [slug] });
|
|
228
|
+
for (const src of r.archivedSources)
|
|
229
|
+
manualLog(path.dirname(path.dirname(src)), '手动归档', slug, log);
|
|
219
230
|
await reindexScope(target, scope);
|
|
220
231
|
}
|
|
221
232
|
/** 把已归档记忆恢复回 consolidated/ 并重建索引。同名已存在时拒绝,不覆盖。 */
|
|
222
|
-
export async function restoreMemoryFile(target, scope, slug) {
|
|
233
|
+
export async function restoreMemoryFile(target, scope, slug, log) {
|
|
223
234
|
assertSlug(slug);
|
|
224
235
|
const dirs = scopeDirs(target, scope);
|
|
225
|
-
const
|
|
236
|
+
const archiveConsolidated = path.join(dirs.memoryDir, 'archive', 'consolidated');
|
|
226
237
|
const dest = path.join(dirs.consolidatedDir, `${slug}.md`);
|
|
227
|
-
|
|
238
|
+
// 同一 slug 归档过多次时,重名的那几份带时间戳(见 memory-writer 的 archivePath)。
|
|
239
|
+
// 没有 slug.md 就取时间戳最新的一份,并在结果里说明恢复的是哪一份。
|
|
240
|
+
const pick = resolveArchivedMemory(archiveConsolidated, slug);
|
|
241
|
+
if (!pick)
|
|
228
242
|
throw new Error(`找不到已归档记忆: ${scope}/${slug}`);
|
|
243
|
+
const src = pick.filePath;
|
|
229
244
|
if (fs.existsSync(dest))
|
|
230
245
|
throw new Error(`正式记忆中已存在同名文件: ${scope}/${slug},未恢复`);
|
|
231
246
|
// 归档期间被改过的话先恢复;恢复不了就拒绝,不把篡改内容放回正式记忆
|
|
@@ -235,5 +250,30 @@ export async function restoreMemoryFile(target, scope, slug) {
|
|
|
235
250
|
fs.mkdirSync(dirs.consolidatedDir, { recursive: true });
|
|
236
251
|
fs.renameSync(src, dest);
|
|
237
252
|
moveRecord(src, dest);
|
|
253
|
+
manualLog(dirs.memoryDir, '恢复', slug, log);
|
|
238
254
|
await reindexScope(target, scope);
|
|
255
|
+
return { restoredFrom: path.basename(src), stamped: pick.stamped };
|
|
256
|
+
}
|
|
257
|
+
/**
|
|
258
|
+
* 在 archive/consolidated/ 里找某个 slug 的归档文件。
|
|
259
|
+
* 优先 <slug>.md;没有就取 <slug>.<时间戳>.md 里最新的一份(时间戳写进文件名,
|
|
260
|
+
* 字典序即时间序,与 cleanupPreviousConsolidationBatches 同一个假设)。
|
|
261
|
+
*/
|
|
262
|
+
function resolveArchivedMemory(archiveConsolidated, slug) {
|
|
263
|
+
const plain = path.join(archiveConsolidated, `${slug}.md`);
|
|
264
|
+
if (fs.existsSync(plain))
|
|
265
|
+
return { filePath: plain, stamped: false };
|
|
266
|
+
let names;
|
|
267
|
+
try {
|
|
268
|
+
names = fs.readdirSync(archiveConsolidated);
|
|
269
|
+
}
|
|
270
|
+
catch {
|
|
271
|
+
return undefined;
|
|
272
|
+
}
|
|
273
|
+
const prefix = `${slug}.`;
|
|
274
|
+
const stamped = names
|
|
275
|
+
.filter(n => n.startsWith(prefix) && n.endsWith('.md') && n.length > prefix.length + 3)
|
|
276
|
+
.sort()
|
|
277
|
+
.pop();
|
|
278
|
+
return stamped ? { filePath: path.join(archiveConsolidated, stamped), stamped: true } : undefined;
|
|
239
279
|
}
|
|
@@ -15,9 +15,10 @@
|
|
|
15
15
|
import fs from 'fs';
|
|
16
16
|
import path from 'path';
|
|
17
17
|
import { resolveRoot } from '../../paths.js';
|
|
18
|
-
import { moveRecord, registerFile, verifyFile } from '../file-integrity/store.js';
|
|
18
|
+
import { moveRecord, registerFile, unregisterFile, verifyFile } from '../file-integrity/store.js';
|
|
19
19
|
import { refreshMemoryMeta } from './index-manager.js';
|
|
20
20
|
import { getMemoryArray, getMemoryString, parseMemoryDocument, serializeMemoryDocument, setMemoryField, } from './memory-document.js';
|
|
21
|
+
import { logger } from '../../utils/logger.js';
|
|
21
22
|
const SLUG_RE = /^[a-zA-Z0-9][a-zA-Z0-9-]{0,63}$/;
|
|
22
23
|
/** 一条记忆应是一句话能说清的结论,10KB 足够;超过通常意味着该拆成多条。 */
|
|
23
24
|
const MAX_CONTENT_BYTES = 10 * 1024;
|
|
@@ -45,6 +46,8 @@ export function resolveScopeDirs(scope, taskCtx, ownerAid, peerKeyOverride) {
|
|
|
45
46
|
const memoryDir = path.join(root, 'memory', 'owner', ownerAid);
|
|
46
47
|
return { memoryDir, consolidatedDir: path.join(memoryDir, 'consolidated') };
|
|
47
48
|
}
|
|
49
|
+
/** 画像固定 slug:整理会话按 consolidated/profile.md 注入画像。 */
|
|
50
|
+
export const PROFILE_SLUG = 'profile';
|
|
48
51
|
/**
|
|
49
52
|
* peerKey 校验。单一实现,避免多处各写一份、强度漂移。
|
|
50
53
|
*
|
|
@@ -67,6 +70,17 @@ export function assertPeerKey(peerKey) {
|
|
|
67
70
|
if (/[\x00-\x1f\x7f]/.test(peerKey)) {
|
|
68
71
|
throw new Error(`INVALID_PEER_KEY: peerKey 含控制字符: "${peerKey}"`);
|
|
69
72
|
}
|
|
73
|
+
// 系统会话的后台伪对端(bg:<kind>)、trigger 伪对端不是关系。旧版本把整理会话自己的伪对端
|
|
74
|
+
// 当关系写过记忆,留下 daemon#bg%3Amemory-consolidate-* 这类没人读的目录。
|
|
75
|
+
const hashIdx = peerKey.indexOf('#');
|
|
76
|
+
let peerId = hashIdx >= 0 ? peerKey.slice(hashIdx + 1) : peerKey;
|
|
77
|
+
try {
|
|
78
|
+
peerId = decodeURIComponent(peerId);
|
|
79
|
+
}
|
|
80
|
+
catch { /* 解不开就按原文判断 */ }
|
|
81
|
+
if (peerId.startsWith('bg:') || peerId.startsWith('trigger:')) {
|
|
82
|
+
throw new Error(`INVALID_PEER_KEY: 后台 / trigger 伪对端不是关系,不能写关系记忆: "${peerKey}"`);
|
|
83
|
+
}
|
|
70
84
|
return peerKey;
|
|
71
85
|
}
|
|
72
86
|
/** 某个关系的 memory 根:agents/<selfAid>/relations/<peerKey>/memory */
|
|
@@ -75,19 +89,22 @@ function relationMemoryDirOf(selfAid, peerKey) {
|
|
|
75
89
|
return path.join(resolveRoot(), 'agents', selfAid, 'relations', peerKey, 'memory');
|
|
76
90
|
}
|
|
77
91
|
/**
|
|
78
|
-
* 把 `<peerKey>/consolidated/<file>`
|
|
92
|
+
* 把 `<peerKey>/consolidated/<file>` / `agent/consolidated/<file>` 形式的路径
|
|
93
|
+
* 解析成对应层的绝对路径。
|
|
79
94
|
*
|
|
80
|
-
* 这是 generalize / promote
|
|
81
|
-
*
|
|
82
|
-
* `consolidated/x.md`
|
|
83
|
-
*
|
|
95
|
+
* 这是 generalize / promote 跨层操作源文件的解析原语。与"任意绝对路径"相比,
|
|
96
|
+
* 它要求路径显式带上来源层,因此不会有"这是哪一层"的歧义——同一个
|
|
97
|
+
* `consolidated/x.md` 在产出层会被解析成该层的同名文件,改错对象还不报错,
|
|
98
|
+
* 正是这个前缀要消除的问题。
|
|
99
|
+
*
|
|
100
|
+
* `agent/` 是保留段,指本 agent 的 personal/memory,不可能是关系名。
|
|
84
101
|
*
|
|
85
102
|
* 返回 undefined 表示不是这个形态(交给调用方继续走其他分支)。
|
|
86
103
|
*/
|
|
87
104
|
function resolvePeerPrefixedPath(selfAid, allowedPeerKey, input) {
|
|
88
105
|
const normalized = input.replace(/\\/g, '/');
|
|
89
106
|
const parts = normalized.split('/');
|
|
90
|
-
// 至少
|
|
107
|
+
// 至少 <层>/consolidated/<file>
|
|
91
108
|
if (parts.length < 3 || parts[1] !== 'consolidated')
|
|
92
109
|
return undefined;
|
|
93
110
|
const peerKey = parts[0];
|
|
@@ -96,6 +113,17 @@ function resolvePeerPrefixedPath(selfAid, allowedPeerKey, input) {
|
|
|
96
113
|
// peerKey 里本来就可能带 `#`(aun#xxx),不能靠字符判断形态,靠段结构。
|
|
97
114
|
if (peerKey === 'consolidated' || peerKey === 'pending' || peerKey === 'archive')
|
|
98
115
|
return undefined;
|
|
116
|
+
// agent 层:本 agent 自己的 personal/memory。promote 的候选来源之一。
|
|
117
|
+
// 不涉及跨关系越权,与会话所属关系无关。
|
|
118
|
+
if (peerKey === 'agent') {
|
|
119
|
+
const agentConsolidated = path.join(resolveRoot(), 'agents', selfAid, 'personal', 'memory', 'consolidated');
|
|
120
|
+
const abs = path.resolve(agentConsolidated, parts.slice(2).join('/'));
|
|
121
|
+
const rel = path.relative(agentConsolidated, abs);
|
|
122
|
+
if (rel.startsWith('..') || path.isAbsolute(rel)) {
|
|
123
|
+
throw new Error(`ROLE_ACCESS_DENIED: 路径越界: ${input}`);
|
|
124
|
+
}
|
|
125
|
+
return abs;
|
|
126
|
+
}
|
|
99
127
|
// 整理一律按关系进行:只允许操作本次会话所属关系。会话没有所属关系(如 owner 层 forget)
|
|
100
128
|
// 时一律拒绝——放开等于让它对读不到的关系目录做 archive/update,绕过 grants 模型。
|
|
101
129
|
if (!allowedPeerKey || peerKey !== allowedPeerKey) {
|
|
@@ -180,6 +208,22 @@ export async function createMemory(req) {
|
|
|
180
208
|
throw new Error(`MEMORY_TOO_LARGE: content ${bytes} 字节,超过上限 ${MAX_CONTENT_BYTES} 字节(10KB)。` +
|
|
181
209
|
`一条记忆应当是一句话能说清的结论。内容确实这么多时,请拆成多条分别 create。`);
|
|
182
210
|
}
|
|
211
|
+
// 画像的形态是固定的:关系作用域、slug=profile、写本会话所属关系。
|
|
212
|
+
// 整理会话靠固定路径 consolidated/profile.md 注入画像(eck_manifest.memory.json 的 peer-profile),
|
|
213
|
+
// slug 写成别的名字、写进别的关系,都会让画像「存在但读不到」。
|
|
214
|
+
// 作用域 / 标签 / 关系在建目录之前查;slug 在唯一性闸门之后查(已有画像时先报 PROFILE_EXISTS)。
|
|
215
|
+
const isProfileTag = req.tags.includes('profile');
|
|
216
|
+
if (isProfileTag || (req.scope === 'relation' && req.slug === PROFILE_SLUG)) {
|
|
217
|
+
if (req.scope !== 'relation') {
|
|
218
|
+
throw new Error(`PROFILE_SCOPE: 画像只能写 --scope relation,收到 ${req.scope}`);
|
|
219
|
+
}
|
|
220
|
+
if (!isProfileTag) {
|
|
221
|
+
throw new Error(`PROFILE_TAG: slug=${PROFILE_SLUG} 留给画像,必须带 profile 标签;普通记忆请换一个 slug`);
|
|
222
|
+
}
|
|
223
|
+
if (req.targetPeerKey && req.targetPeerKey !== req.taskCtx.peerKey) {
|
|
224
|
+
throw new Error(`PROFILE_PEER: 画像只能写本次会话所属关系(${req.taskCtx.peerKey ?? '无'}),不能用 --peer 写别的关系`);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
183
227
|
const dirs = resolveScopeDirs(req.scope, req.taskCtx, req.ownerAid, req.targetPeerKey);
|
|
184
228
|
fs.mkdirSync(dirs.consolidatedDir, { recursive: true });
|
|
185
229
|
const targetPath = path.join(dirs.consolidatedDir, `${req.slug}.md`);
|
|
@@ -195,10 +239,14 @@ export async function createMemory(req) {
|
|
|
195
239
|
for (const other of others) {
|
|
196
240
|
if (!replacePaths.includes(other)) {
|
|
197
241
|
throw new Error(`PROFILE_EXISTS: 该作用域已有画像记忆: ${other}\n` +
|
|
198
|
-
`一个关系只能有一条 profile 记忆,重新生成请用 --replaces
|
|
242
|
+
`一个关系只能有一条 profile 记忆,重新生成请用 --slug ${PROFILE_SLUG} --replaces 'consolidated/${path.basename(other)}'。`);
|
|
199
243
|
}
|
|
200
244
|
}
|
|
201
245
|
}
|
|
246
|
+
if (isProfileTag && req.slug !== PROFILE_SLUG) {
|
|
247
|
+
throw new Error(`PROFILE_SLUG: 画像的 slug 固定为 ${PROFILE_SLUG},收到 ${req.slug}。`
|
|
248
|
+
+ `重新生成用 --slug ${PROFILE_SLUG} --replaces 'consolidated/${PROFILE_SLUG}.md'`);
|
|
249
|
+
}
|
|
202
250
|
const now = new Date().toISOString();
|
|
203
251
|
const createdAt = readExistingCreatedAt(targetPath) ?? now;
|
|
204
252
|
const document = parseMemoryDocument('');
|
|
@@ -206,10 +254,10 @@ export async function createMemory(req) {
|
|
|
206
254
|
setMemoryField(document, 'name', req.slug);
|
|
207
255
|
setMemoryField(document, 'description', req.description.trim());
|
|
208
256
|
setMemoryField(document, 'scope', req.scope);
|
|
209
|
-
//
|
|
210
|
-
|
|
211
|
-
if (req.scope === 'relation'
|
|
212
|
-
setMemoryField(document, 'peerKey',
|
|
257
|
+
// frontmatter 记的必须是实际落盘目录的关系:直接从目录取(relations/<peerKey>/memory),
|
|
258
|
+
// 不从请求参数再算一遍——两处各算各的,正是旧画像 peerKey 写成伪对端的原因
|
|
259
|
+
if (req.scope === 'relation')
|
|
260
|
+
setMemoryField(document, 'peerKey', path.basename(path.dirname(dirs.memoryDir)));
|
|
213
261
|
if (req.scope === 'owner' && req.ownerAid)
|
|
214
262
|
setMemoryField(document, 'ownerAid', req.ownerAid);
|
|
215
263
|
setMemoryField(document, 'createdAt', createdAt);
|
|
@@ -231,13 +279,24 @@ export async function createMemory(req) {
|
|
|
231
279
|
setMemoryField(document, 'replaces', replacePaths.map(p => path.relative(agentRoot, p)));
|
|
232
280
|
}
|
|
233
281
|
document.body = req.content.trimEnd();
|
|
282
|
+
const archived = [];
|
|
283
|
+
const archivedSources = [];
|
|
284
|
+
// 原地替换(如重新生成 profile):新文件会覆盖旧文件,必须在写入前复制一份进 archive/,
|
|
285
|
+
// 否则旧版本直接丢失。用复制而不是 rename:写入失败时原文件仍在原位。
|
|
286
|
+
// 目标固定为 archive/consolidated/<同名>,每次覆盖:只保留上一版,不累积时间戳副本。
|
|
287
|
+
if (fs.existsSync(targetPath) && replacePaths.some(p => path.resolve(p) === path.resolve(targetPath))) {
|
|
288
|
+
const dest = path.join(dirs.memoryDir, 'archive', 'consolidated', path.basename(targetPath));
|
|
289
|
+
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
|
290
|
+
fs.copyFileSync(targetPath, dest);
|
|
291
|
+
registerFile(dest, req.taskCtx.selfAid);
|
|
292
|
+
archived.push(dest);
|
|
293
|
+
archivedSources.push(targetPath); // 与 archived 按下标配对(ipc.ts 写 ops 记录)
|
|
294
|
+
}
|
|
234
295
|
const tmp = targetPath + '.tmp';
|
|
235
296
|
fs.writeFileSync(tmp, serializeMemoryDocument(document), 'utf-8');
|
|
236
297
|
fs.renameSync(tmp, targetPath);
|
|
237
298
|
registerFile(targetPath, req.taskCtx.selfAid);
|
|
238
299
|
// 归档被替换的旧文件(在写入成功之后做,失败不影响新文件)
|
|
239
|
-
const archived = [];
|
|
240
|
-
const archivedSources = [];
|
|
241
300
|
for (const p of replacePaths) {
|
|
242
301
|
if (!fs.existsSync(p))
|
|
243
302
|
continue;
|
|
@@ -390,7 +449,10 @@ export async function updateMemory(req) {
|
|
|
390
449
|
if (!fs.existsSync(filePath))
|
|
391
450
|
throw new Error(`找不到记忆文件: ${filePath}`);
|
|
392
451
|
const document = readMemory(readVerifiedMemory(filePath));
|
|
452
|
+
// 校验之后再取 mtime:被带外改过的文件恢复时会还原成登记时的 mtime
|
|
453
|
+
const prevMtimeMs = fs.statSync(filePath).mtimeMs;
|
|
393
454
|
const prevTags = getMemoryArray(document, 'tags');
|
|
455
|
+
const prevUpdatedAt = getMemoryString(document, 'updatedAt');
|
|
394
456
|
if (req.tags !== undefined)
|
|
395
457
|
setMemoryField(document, 'tags', req.tags.length > 0 ? req.tags : undefined);
|
|
396
458
|
// 刷新 updatedAt(--touch 的续期语义就是刷新这里 + 文件 mtime)
|
|
@@ -404,7 +466,45 @@ export async function updateMemory(req) {
|
|
|
404
466
|
// 要刷的是**该文件所在层**的 _meta.json,不是本作用域那份。
|
|
405
467
|
const targetMemoryDir = sourceMemoryDirOf(filePath);
|
|
406
468
|
refreshMemoryMeta(targetMemoryDir);
|
|
407
|
-
return { ok: true, filePath, prevTags, scopeDirs: dirs, targetMemoryDir };
|
|
469
|
+
return { ok: true, filePath, prevTags, scopeDirs: dirs, targetMemoryDir, prevUpdatedAt, prevMtimeMs };
|
|
470
|
+
}
|
|
471
|
+
/**
|
|
472
|
+
* 整理收尾兜底:generalize / promote 成功结束后,候选里还带着升级标签的,由程序摘掉。
|
|
473
|
+
*
|
|
474
|
+
* 手册要求模型对"不该升级"的候选 update 去标签,但模型常常只写反馈不动标签
|
|
475
|
+
* (例:owner 层已有等价条目,判定无需提升就结束)。标签不摘,关系整理链每次都按
|
|
476
|
+
* to-promote 计数再拉起一轮,同一条候选被反复评估、每轮"无改动"。
|
|
477
|
+
*
|
|
478
|
+
* 只动已被候选清单列出、且仍带该标签的文件;会话期间被归档 / 改写过的自然跳过。
|
|
479
|
+
* 返回实际摘掉标签的文件及其原标签(供写 ops 记录、回撤)。
|
|
480
|
+
*/
|
|
481
|
+
export function stripUpgradeTag(files, tag, selfAid) {
|
|
482
|
+
const stripped = [];
|
|
483
|
+
const touchedDirs = new Set();
|
|
484
|
+
for (const filePath of files) {
|
|
485
|
+
try {
|
|
486
|
+
if (!fs.existsSync(filePath))
|
|
487
|
+
continue;
|
|
488
|
+
const document = readMemory(readVerifiedMemory(filePath));
|
|
489
|
+
const prevTags = getMemoryArray(document, 'tags');
|
|
490
|
+
if (!prevTags.includes(tag))
|
|
491
|
+
continue;
|
|
492
|
+
const nextTags = prevTags.filter(t => t !== tag);
|
|
493
|
+
setMemoryField(document, 'tags', nextTags.length > 0 ? nextTags : undefined);
|
|
494
|
+
const tmp = filePath + '.tmp';
|
|
495
|
+
fs.writeFileSync(tmp, serializeMemoryDocument(document), 'utf-8');
|
|
496
|
+
fs.renameSync(tmp, filePath);
|
|
497
|
+
registerFile(filePath, selfAid);
|
|
498
|
+
touchedDirs.add(sourceMemoryDirOf(filePath));
|
|
499
|
+
stripped.push({ filePath, prevTags });
|
|
500
|
+
}
|
|
501
|
+
catch (error) {
|
|
502
|
+
logger.warn(`[Memory] 摘除 ${tag} 失败(${filePath}): ${error?.message}`);
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
for (const dir of touchedDirs)
|
|
506
|
+
refreshMemoryMeta(dir);
|
|
507
|
+
return stripped;
|
|
408
508
|
}
|
|
409
509
|
// ── archive ────────────────────────────────────────────────────────────────
|
|
410
510
|
export async function archiveMemory(req) {
|
|
@@ -440,6 +540,41 @@ export async function archiveMemory(req) {
|
|
|
440
540
|
}
|
|
441
541
|
return { ok: true, archived, archivedSources, scopeDirs: dirs };
|
|
442
542
|
}
|
|
543
|
+
// ── rollback helpers ───────────────────────────────────────────────────────
|
|
544
|
+
//
|
|
545
|
+
// 整理会话失败时 rollbackConsolidation 按 ops.jsonl 倒序调用。必须和正向操作一样过台账:
|
|
546
|
+
// 直接写盘不重新登记的话,收尾紧接着的 rebuildIndex(verifyFile restoreOnFail)会把文件
|
|
547
|
+
// 恢复成回撤前的样子,回撤等于没做。
|
|
548
|
+
/** 撤销一次 update:恢复 tags、updatedAt 与 mtime,并重新登记。 */
|
|
549
|
+
export function revertMemoryUpdate(req) {
|
|
550
|
+
const document = readMemory(readVerifiedMemory(req.filePath));
|
|
551
|
+
setMemoryField(document, 'tags', req.prevTags.length > 0 ? req.prevTags : undefined);
|
|
552
|
+
if (req.prevUpdatedAt !== undefined)
|
|
553
|
+
setMemoryField(document, 'updatedAt', req.prevUpdatedAt);
|
|
554
|
+
const tmp = req.filePath + '.tmp';
|
|
555
|
+
fs.writeFileSync(tmp, serializeMemoryDocument(document), 'utf-8');
|
|
556
|
+
fs.renameSync(tmp, req.filePath);
|
|
557
|
+
// 先还原 mtime 再登记:快照带着登记时的 mtime,之后的恢复不会把它重新「续期」
|
|
558
|
+
if (req.prevMtimeMs !== undefined) {
|
|
559
|
+
const t = new Date(req.prevMtimeMs);
|
|
560
|
+
fs.utimesSync(req.filePath, t, t);
|
|
561
|
+
}
|
|
562
|
+
registerFile(req.filePath, req.selfAid);
|
|
563
|
+
refreshMemoryMeta(sourceMemoryDirOf(req.filePath));
|
|
564
|
+
}
|
|
565
|
+
/** 撤销一次归档:从 archive/ 移回原路径,台账跟着搬。 */
|
|
566
|
+
export function revertMemoryArchive(archivedTo, sourceFile) {
|
|
567
|
+
fs.mkdirSync(path.dirname(sourceFile), { recursive: true });
|
|
568
|
+
fs.renameSync(archivedTo, sourceFile);
|
|
569
|
+
moveRecord(archivedTo, sourceFile);
|
|
570
|
+
refreshMemoryMeta(path.dirname(path.dirname(sourceFile)));
|
|
571
|
+
}
|
|
572
|
+
/** 撤销一次 create:删掉新写入的文件,台账记录与快照一起删。 */
|
|
573
|
+
export function revertMemoryCreate(filePath) {
|
|
574
|
+
fs.unlinkSync(filePath);
|
|
575
|
+
unregisterFile(filePath);
|
|
576
|
+
refreshMemoryMeta(path.dirname(path.dirname(filePath)));
|
|
577
|
+
}
|
|
443
578
|
const NOTE_MAX_CONTENT_BYTES = 4 * 1024;
|
|
444
579
|
function assertMemoryEnabled(memoryConfig) {
|
|
445
580
|
if (memoryConfig?.enableRelation === false) {
|
|
@@ -453,9 +588,7 @@ export function relationMemoryDir(taskCtx) {
|
|
|
453
588
|
const peerKey = taskCtx.peerKey;
|
|
454
589
|
if (!peerKey)
|
|
455
590
|
throw new Error('relation 作用域需要 peerKey(当前会话无对端信息)');
|
|
456
|
-
|
|
457
|
-
throw new Error(`INVALID_PEER_KEY: peerKey 格式非法: "${peerKey}"`);
|
|
458
|
-
}
|
|
591
|
+
assertPeerKey(peerKey);
|
|
459
592
|
return path.join(resolveRoot(), 'agents', selfAid, 'relations', peerKey, 'memory');
|
|
460
593
|
}
|
|
461
594
|
function pendingDir(taskCtx) {
|
|
@@ -497,6 +630,10 @@ function writeAtomic(filePath, content, exclusive = false) {
|
|
|
497
630
|
throw error;
|
|
498
631
|
}
|
|
499
632
|
}
|
|
633
|
+
let pendingNoteListener;
|
|
634
|
+
export function setPendingNoteListener(listener) {
|
|
635
|
+
pendingNoteListener = listener;
|
|
636
|
+
}
|
|
500
637
|
export async function writeMemoryNote(req) {
|
|
501
638
|
assertMemoryEnabled(req.memoryConfig);
|
|
502
639
|
assertNoteContent(req.content);
|
|
@@ -529,6 +666,14 @@ export async function writeMemoryNote(req) {
|
|
|
529
666
|
throw new Error(`SLUG_EXISTS: 该 slug 已存在同名 note: ${filePath}`);
|
|
530
667
|
const content = serializeMemoryDocument(document);
|
|
531
668
|
writeAtomic(filePath, content, true);
|
|
669
|
+
if (pendingNoteListener && req.taskCtx.selfAid && req.taskCtx.peerKey) {
|
|
670
|
+
try {
|
|
671
|
+
pendingNoteListener(req.taskCtx.selfAid, req.taskCtx.peerKey);
|
|
672
|
+
}
|
|
673
|
+
catch (error) {
|
|
674
|
+
logger.warn(`[Memory] note 写入监听失败: ${error?.message}`);
|
|
675
|
+
}
|
|
676
|
+
}
|
|
532
677
|
return { ok: true, filePath, dirCreated, fileSize: Buffer.byteLength(content, 'utf-8') };
|
|
533
678
|
}
|
|
534
679
|
export async function updateMemoryNote(req) {
|