evolcore 0.0.47 → 0.0.49
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 +90 -1
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +143 -40
- package/dist/agent-template/service.js +66 -13
- package/dist/agents/baseagent.js +60 -20
- package/dist/agents/claude-runner.js +34 -17
- package/dist/agents/codex-runner.js +36 -17
- package/dist/agents/ecagent-runner.js +7 -4
- package/dist/agents/gemini-runner.js +5 -2
- package/dist/agents/runner-types.js +5 -21
- package/dist/aun/aid/agentmd.js +5 -1
- package/dist/aun/msg/p2p.js +2 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +722 -295
- package/dist/channels/daemon.js +9 -25
- package/dist/cli/aun-commands.js +86 -51
- package/dist/cli/code-stats.js +19 -8
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +44 -43
- package/dist/cli/directory.js +13 -2
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +9 -9
- package/dist/cli/init-channel.js +4 -6
- package/dist/cli/init.js +72 -50
- package/dist/cli/invoke-command.js +1 -1
- package/dist/cli/managed-command-guard.js +2 -0
- package/dist/cli/model.js +20 -5
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/quota.js +89 -0
- package/dist/cli/role.js +62 -17
- package/dist/cli/services-command.js +1 -0
- package/dist/cli/stats.js +3 -3
- package/dist/cli/team-workspace-command.js +56 -2
- package/dist/cli/thread-command.js +16 -51
- package/dist/config/boot-log.js +3 -9
- package/dist/config/builtin-roles.js +5 -7
- package/dist/config/config-field-policy.js +71 -1
- package/dist/config/config-manager.js +13 -7
- package/dist/config/daemon-services.js +30 -3
- package/dist/config/gateway-config.js +2 -2
- package/dist/config/invoke-ipc-service.js +6 -4
- package/dist/config/peer-bind-code.js +3 -4
- package/dist/config/peer-book-store.js +62 -229
- package/dist/config/peer-book.js +26 -27
- package/dist/config/peer-role-resolver.js +16 -1
- package/dist/config/provider-identity-migration.js +4 -1
- package/dist/config/provider-ipc-service.js +56 -11
- package/dist/config/provider-menu-request.js +24 -5
- package/dist/config/provider-templates.js +127 -0
- package/dist/config/providers-config.js +67 -12
- package/dist/config/providers-management.js +477 -51
- package/dist/config/resolved-config-op.js +3 -2
- package/dist/config/role-command-service.js +248 -1
- package/dist/config/schema-migration.js +105 -4
- package/dist/core/agent-application-service.js +6 -1
- package/dist/core/agent-runtime.js +4 -0
- package/dist/core/auth/agent-delegation.js +2 -1
- package/dist/core/auth/auth-gateway.js +2 -1
- package/dist/core/auth/delegation-authorization.js +36 -26
- package/dist/core/auth/operation-authorizer.js +25 -0
- package/dist/core/auth/operation-catalog.js +37 -64
- package/dist/core/capability/providers/codex-capability-provider.js +7 -8
- package/dist/core/channel-loader.js +18 -0
- package/dist/core/command/agent-control.js +32 -0
- package/dist/core/command/cli-intent-parser.js +13 -0
- package/dist/core/command/command-handler.js +126 -87
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +67 -150
- package/dist/core/command/menu-protocol.js +31 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/remote-shell.js +565 -0
- package/dist/core/command/role-menu.js +47 -23
- package/dist/core/command/slash-handler.js +26 -43
- package/dist/core/command/team-workspace-items.js +81 -12
- package/dist/core/command/team-workspace-team.js +9 -71
- package/dist/core/command/topic-slash.js +9 -30
- package/dist/core/daemon-bootstrap.js +8 -1
- package/dist/core/daemon-control.js +64 -8
- package/dist/core/daemon-lifecycle.js +16 -2
- package/dist/core/evolagent-registry.js +20 -3
- package/dist/core/file-integrity/store.js +2 -0
- package/dist/core/handoff/runtime.js +37 -1
- package/dist/core/inference/text-inference.js +3 -1
- package/dist/core/initialization/service.js +11 -6
- package/dist/core/interaction-router.js +3 -0
- package/dist/core/invoke/executors/text.js +72 -19
- package/dist/core/ipc-registration.js +3 -1
- package/dist/core/message/aun-ipc-sender.js +279 -107
- package/dist/core/message/contact-admission.js +91 -6
- package/dist/core/message/contact-pending-inbound.js +113 -0
- package/dist/core/message/contact-thread-approval.js +212 -0
- package/dist/core/message/im-renderer.js +41 -2
- package/dist/core/message/message-admission.js +5 -39
- package/dist/core/message/message-bridge.js +140 -370
- package/dist/core/message/message-log.js +29 -0
- package/dist/core/message/message-queue.js +119 -15
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +580 -134
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/config-scope.js +6 -14
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/model/model-diagnostics.js +19 -0
- package/dist/core/model/model-fallback.js +13 -2
- package/dist/core/ownership/owner-resolver.js +328 -50
- package/dist/core/pack-auth.js +3 -0
- package/dist/core/pack-install.js +1 -1
- package/dist/core/permission/ec-command-parser.js +106 -19
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/permission/services-path-acl.js +451 -0
- package/dist/core/permission/tool-policy.js +5 -1
- package/dist/core/relation/peer-identity.js +36 -1
- package/dist/core/relation/same-owner-proof.js +81 -112
- package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
- package/dist/core/session/session-file-health.js +13 -7
- package/dist/core/session/session-fs-store.js +91 -35
- package/dist/core/session/session-manager.js +68 -24
- package/dist/core/session/session-mapper.js +14 -34
- package/dist/core/session/session-transcript.js +5 -1
- package/dist/core/task/task-activity-store.js +84 -0
- package/dist/core/task/task-recovery-service.js +13 -0
- package/dist/core/thread/command-parser.js +7 -12
- package/dist/core/thread/thread-context-storage.js +3 -2
- package/dist/core/thread/thread-operation.js +2 -13
- package/dist/core/thread/thread-service.js +15 -46
- package/dist/core/thread/topic-id.js +15 -0
- package/dist/directory/owner-directory-admission.js +12 -9
- package/dist/directory/owner-directory-cache.js +64 -28
- package/dist/directory/owner-directory-markdown.js +14 -2
- package/dist/directory/owner-directory-policy.js +5 -30
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/directory/owner-directory-request-operation.js +5 -2
- package/dist/eck/kit-renderer.js +1 -1
- package/dist/eck/message-renderer.js +112 -29
- package/dist/ecweb/basic-settings-service.js +3 -1
- package/dist/ecweb/message-context-service.js +1 -1
- package/dist/ecweb/pairing.js +4 -3
- package/dist/ecweb/providers-service.js +26 -1
- package/dist/ecweb/runtime/lifecycle.js +18 -8
- package/dist/ecweb/runtime/proxy-access.js +74 -0
- package/dist/ecweb/runtime/supervisor.js +36 -6
- package/dist/event-center/center-config.js +9 -5
- package/dist/event-center/dispatcher.js +10 -1
- package/dist/event-center/ipc-operation.js +19 -0
- package/dist/event-center/registry.js +29 -3
- package/dist/event-center/runtime.js +106 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +96 -59
- package/dist/ipc.js +38 -3
- package/dist/outputs/authorization.js +16 -0
- package/dist/outputs/cards.js +336 -0
- package/dist/outputs/events.js +63 -0
- package/dist/outputs/protocol.js +103 -0
- package/dist/outputs/service.js +266 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +114 -5
- package/dist/services/ipc-operation.js +88 -15
- package/dist/services/pack-manager.js +13 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/service-payload.js +13 -7
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +2 -2
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +304 -23
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/quota-query.js +95 -0
- package/dist/stats/role-budget.js +5 -2
- package/dist/stats/writer.js +10 -6
- package/dist/trigger/audit.js +7 -0
- package/dist/trigger/authorization.js +105 -11
- package/dist/trigger/feedback.js +10 -0
- package/dist/trigger/history.js +37 -11
- package/dist/trigger/ipc-service.js +12 -1
- package/dist/trigger/manager.js +1 -0
- package/dist/trigger/scheduler.js +7 -5
- package/dist/trigger/script-executor.js +2 -1
- package/dist/trigger/script-sandbox.js +21 -3
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/atomic-write.js +22 -8
- package/dist/utils/cross-platform.js +73 -26
- package/dist/utils/error-dict.json +94 -4
- package/dist/utils/error-utils.js +27 -4
- package/dist/utils/evolcore-version.js +36 -65
- package/dist/utils/host-info.js +100 -1
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/npm-ops.js +43 -8
- package/dist/utils/process-introspect.js +12 -7
- package/dist/utils/process-tree.js +50 -2
- package/dist/utils/windows-shell-trust.js +2 -0
- package/dist/workbench/protocol.js +80 -0
- package/dist/workbench/service.js +359 -0
- package/ecagent/dist/types.d.ts +6 -2
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +4 -2
- package/kits/docs/evolcore/aid.md +25 -0
- package/kits/docs/evolcore/config.md +16 -1
- package/kits/docs/evolcore/directory.md +30 -12
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/msg.md +9 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +124 -4
- package/kits/docs/evolcore/quota.md +54 -0
- package/kits/docs/evolcore/role.md +83 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/stats.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +1 -1
- package/kits/docs/evolcore/thread-chain.md +14 -15
- package/kits/docs/evolcore/tool-authorization.md +5 -0
- package/kits/docs/evolcore/trigger.md +12 -0
- package/kits/eck_message_manifest.json +12 -0
- package/kits/provider-templates.json +1213 -0
- package/kits/rules/04-relation.md +3 -3
- package/kits/schemas/_meta.json +14 -2
- package/kits/schemas/agent-config.schema.20.json +24 -0
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +8 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/agent-output-cards/SKILL.md +57 -0
- package/kits/skills/ec-group/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +19 -72
- package/kits/skills/ec-provider/SKILL.md +270 -0
- package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +34 -21
- package/kits/templates/message-fragments/group-batch-item.md +1 -1
- package/kits/templates/message-fragments/group-batch.md +1 -1
- package/kits/templates/message-fragments/inject-default.md +1 -1
- package/kits/templates/message-fragments/interrupt-insert.md +1 -0
- package/kits/templates/message-fragments/item-group.md +1 -1
- package/kits/templates/message-fragments/item-private.md +1 -1
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/message-fragments/trigger-session.md +1 -1
- package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
- package/kits/templates/roles/admin.json +2 -19
- package/kits/templates/roles/member.json +0 -3
- package/kits/templates/roles/visitor.json +1 -0
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +4 -3
- package/kits/templates/system-fragments/directory-contacts.md +3 -4
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +1 -1
- package/kits/templates/system-fragments/thread.md +7 -5
- package/kits/templates/system-fragments/venue.md +11 -0
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +50 -11
- package/scripts/agent-template/shared/common.mjs +11 -6
- package/scripts/agent-template/shared/team-schema.json +6 -4
- package/scripts/agent-template/shared/template-contract.mjs +62 -11
- package/scripts/agent-template/shared/template-package.mjs +189 -21
- package/scripts/agent-template/shared/template-runtime.mjs +54 -6
- package/scripts/agent-template/shared/template.mjs +2 -2
- package/scripts/agent-template/team-pack.mjs +52 -14
- package/dist/cli/peer.js +0 -127
- package/dist/config/peer-operation-service.js +0 -132
- package/dist/config/peer-request-service.js +0 -532
- package/dist/core/command/connect-menu.js +0 -624
|
@@ -4,8 +4,12 @@ import path from 'node:path';
|
|
|
4
4
|
import { createHash } from 'node:crypto';
|
|
5
5
|
import { gzipSync, gunzipSync } from 'node:zlib';
|
|
6
6
|
import { loadTemplate } from './template.mjs';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
7
|
+
import { resolveTemplateAidDomain } from './template-contract.mjs';
|
|
8
|
+
import { AID_PATTERN, normalizeTeam, normalizeTeamSchema, validateContractSchema, readTeamSchema, packageSchema, contractDigest, canonicalJson, validateBuildSelection } from './template-contract.mjs';
|
|
9
|
+
import { BASEAGENTS, assertPublicTemplateConfig, resolveMemberParameters } from './template-runtime.mjs';
|
|
10
|
+
import { validatePackJson } from '../../../dist/event-center/validation.js';
|
|
11
|
+
import { PACK_RUNTIME_ENTRIES } from '../../../dist/core/pack-install.js';
|
|
12
|
+
import { assert, inside, readJson, regularPath, sha256, walkFiles } from './common.mjs';
|
|
9
13
|
|
|
10
14
|
export const PACKAGE_LIMITS = { file: 20 * 1024 * 1024, total: 200 * 1024 * 1024, entries: 20000 };
|
|
11
15
|
const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
@@ -34,6 +38,80 @@ export function excludedResource(name) {
|
|
|
34
38
|
|| /^\.env/.test(part) || /\.(?:pem|key|db(?:[-.].*)?)$/i.test(part));
|
|
35
39
|
}
|
|
36
40
|
|
|
41
|
+
/** References live in string literals and comments; bare property chains are not identities. */
|
|
42
|
+
function scriptReferenceText(text) {
|
|
43
|
+
const contexts = [{ quote: '', depth: 0, regexAllowed: true, parens: [], control: false }]; let out = '';
|
|
44
|
+
for (let i = 0; i < text.length; i++) {
|
|
45
|
+
const context = contexts.at(-1); const char = text[i]; const next = text[i + 1];
|
|
46
|
+
if (context.quote) {
|
|
47
|
+
if (char === '\\') { out += char + (next ?? ''); i++; }
|
|
48
|
+
else if (char === context.quote) { contexts.pop(); contexts.at(-1).regexAllowed = false; out += '\n'; }
|
|
49
|
+
else if (context.quote === '`' && char === '$' && next === '{') {
|
|
50
|
+
contexts.push({ quote: '', depth: 1, regexAllowed: true, parens: [], control: false }); out += '\n'; i++;
|
|
51
|
+
} else out += char;
|
|
52
|
+
} else if (char === '/' && next === '/') {
|
|
53
|
+
const end = text.indexOf('\n', i + 2);
|
|
54
|
+
out += '\n' + text.slice(i + 2, end < 0 ? text.length : end) + '\n'; i = end < 0 ? text.length : end;
|
|
55
|
+
} else if (char === '/' && next === '*') {
|
|
56
|
+
const end = text.indexOf('*/', i + 2);
|
|
57
|
+
out += '\n' + text.slice(i + 2, end < 0 ? text.length : end) + '\n'; i = end < 0 ? text.length : end + 1;
|
|
58
|
+
} else if (char === '/' && context.regexAllowed) {
|
|
59
|
+
let bracket = false; let end = i + 1;
|
|
60
|
+
for (; end < text.length && !/[\r\n]/.test(text[end]); end++) {
|
|
61
|
+
if (text[end] === '\\') end++;
|
|
62
|
+
else if (text[end] === '[') bracket = true;
|
|
63
|
+
else if (text[end] === ']') bracket = false;
|
|
64
|
+
else if (text[end] === '/' && !bracket) break;
|
|
65
|
+
}
|
|
66
|
+
if (text[end] === '/') { i = end; context.regexAllowed = false; }
|
|
67
|
+
} else if (['"', "'", '`'].includes(char)) {
|
|
68
|
+
contexts.push({ quote: char, depth: 0, regexAllowed: false }); out += '\n';
|
|
69
|
+
} else if (/[a-zA-Z0-9_$]/.test(char)) {
|
|
70
|
+
const start = i;
|
|
71
|
+
while (/[a-zA-Z0-9_$]/.test(text[i + 1] ?? '')) i++;
|
|
72
|
+
const word = text.slice(start, i + 1);
|
|
73
|
+
context.control = /^(?:if|while|for|with|switch|catch)$/.test(word);
|
|
74
|
+
context.regexAllowed = /^(?:return|throw|case|delete|void|typeof|new|in|instanceof|yield|await|else|do)$/.test(word);
|
|
75
|
+
} else if (!/\s/.test(char)) {
|
|
76
|
+
if (context.depth && char === '{') context.depth++;
|
|
77
|
+
else if (context.depth && char === '}' && --context.depth === 0) { contexts.pop(); out += '\n'; }
|
|
78
|
+
if (char === '(') context.parens.push(context.control);
|
|
79
|
+
context.regexAllowed = char === ')' ? context.parens.pop() === true : ![']', '}', '.'].includes(char);
|
|
80
|
+
context.control = false;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return out;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const aidPattern = new RegExp(AID_PATTERN);
|
|
87
|
+
function extractExternalAids(text, name) {
|
|
88
|
+
if (name === 'template/team.json') {
|
|
89
|
+
const team = JSON.parse(text);
|
|
90
|
+
for (const member of team.agents ?? []) {
|
|
91
|
+
delete member.update;
|
|
92
|
+
if (record(member.config)) delete member.config.update;
|
|
93
|
+
}
|
|
94
|
+
text = JSON.stringify(team);
|
|
95
|
+
}
|
|
96
|
+
let references = /\.(?:[cm]?[jt]s|jsx|tsx)$/i.test(name) ? scriptReferenceText(text) : text;
|
|
97
|
+
if (/\.(?:md|markdown|mdx)$/i.test(name)) {
|
|
98
|
+
references = references.replace(/^([ \t]*)(`{3,}|~{3,})[ \t]*(?:[cm]?[jt]s|javascript|typescript|jsx|tsx)\b[^\n]*\n([\s\S]*?)^\1\2[ \t]*\r?$/gim,
|
|
99
|
+
(_match, _indent, _fence, script) => '\n' + scriptReferenceText(script) + '\n');
|
|
100
|
+
}
|
|
101
|
+
references = references.replace(/<script\b[^>]*>([\s\S]*?)<\/script\s*>/gi,
|
|
102
|
+
(_match, script) => '\n' + scriptReferenceText(script) + '\n');
|
|
103
|
+
// Mask each URL/placeholder occurrence so an independent AID on the same line survives.
|
|
104
|
+
references = references.replace(/\{\{[\s\S]*?\}\}|[a-z][a-z0-9+.-]*:\/\/[^\s"'`<>]+/gi, '\n');
|
|
105
|
+
// Consume entire dotted tokens, including invalid JS identifier characters, before validation.
|
|
106
|
+
const candidates = [...references.matchAll(/(?<![a-zA-Z0-9_$.-])[a-zA-Z0-9_$-]+(?:\.[a-zA-Z0-9_$-]+){2,}(?![a-zA-Z0-9_$-]|\.[a-zA-Z0-9_$-])/g)];
|
|
107
|
+
return candidates.filter(match => {
|
|
108
|
+
const aid = match[0];
|
|
109
|
+
return aidPattern.test(aid) && /\.[a-z]{2,}$/.test(aid)
|
|
110
|
+
&& !/\.(?:[cm]?[jt]sx?|json|html|css)$/.test(aid) && !aid.startsWith('www.')
|
|
111
|
+
&& !/^\s*\(/.test(references.slice(match.index + aid.length));
|
|
112
|
+
}).map(match => match[0]);
|
|
113
|
+
}
|
|
114
|
+
|
|
37
115
|
/** Ordered USTAR+gzip, compatible with EvolCore archive(). */
|
|
38
116
|
export function encodePackageEntries(entries) {
|
|
39
117
|
check(entries instanceof Map && entries.size && entries.size <= PACKAGE_LIMITS.entries, 'Invalid package entries');
|
|
@@ -97,7 +175,8 @@ function portableFile(name, keys) {
|
|
|
97
175
|
const relative = rest.join('/');
|
|
98
176
|
return group === 'workspace' && !excludedResource(relative)
|
|
99
177
|
|| group === 'agents' && (relative.startsWith('personal/soul/') && relative.endsWith('.md') && !relative.endsWith('/00-GUIDE.md')
|
|
100
|
-
|| relative === 'personal/welcome.md' || relative.startsWith('triggers/') && !excludedResource(relative)
|
|
178
|
+
|| relative === 'personal/welcome.md' || relative.startsWith('triggers/') && !excludedResource(relative)
|
|
179
|
+
|| isPortableEventPackFile(relative) && !excludedResource(relative));
|
|
101
180
|
}
|
|
102
181
|
|
|
103
182
|
/** Validate all bytes before extracting; never trusts a MANIFEST path for filesystem access. */
|
|
@@ -107,7 +186,8 @@ export function inspectTemplatePackage(bytes, { digest } = {}) {
|
|
|
107
186
|
const entries = decodePackageEntries(bytes);
|
|
108
187
|
const read = name => { check(entries.has(name), 'Missing package entry: ' + name, 'INTEGRITY_FAILED'); return JSON.parse(entries.get(name).bytes.toString('utf8')); };
|
|
109
188
|
const metadata = read('PACKAGE.json'); const manifest = read('MANIFEST.json');
|
|
110
|
-
|
|
189
|
+
const metadataErrors = validateContractSchema(metadata, packageSchema);
|
|
190
|
+
check(!metadataErrors.length, 'Invalid package metadata: ' + metadataErrors.join('; '), 'INTEGRITY_FAILED');
|
|
111
191
|
check(Array.isArray(manifest) && manifest.length && entries.size === manifest.length + 2, 'Invalid manifest', 'INTEGRITY_FAILED');
|
|
112
192
|
const seen = new Set();
|
|
113
193
|
for (const entry of manifest) {
|
|
@@ -124,6 +204,8 @@ export function inspectTemplatePackage(bytes, { digest } = {}) {
|
|
|
124
204
|
check(!errors.length, errors.join('; '));
|
|
125
205
|
const keys = team.agents.map(agent => agent.key);
|
|
126
206
|
for (const { path: name } of manifest) check(portableFile(name, keys), 'Unsupported portable resource: ' + name);
|
|
207
|
+
validateEventPackEntries(new Map([...entries].filter(([name]) => name.startsWith('template/'))
|
|
208
|
+
.map(([name, entry]) => [name.slice('template/'.length), entry])), keys);
|
|
127
209
|
return { metadata, team, schema, entries, digest: actual, changes: normalized.changes,
|
|
128
210
|
resources: manifest.map(({ path: name, size }) => ({ path: name, size })) };
|
|
129
211
|
}
|
|
@@ -142,6 +224,7 @@ export function collectTemplateDirectory(templateDir, memberKey) {
|
|
|
142
224
|
const defaults = readOptional('.evolcore/agents/defaults.json');
|
|
143
225
|
const providers = readOptional('.evolcore/providers.json').providers ?? {};
|
|
144
226
|
const member = structuredClone(tpl.team.agents.find(agent => agent.key === memberKey));
|
|
227
|
+
Object.assign(member, resolveMemberParameters(member));
|
|
145
228
|
const source = { ...structuredClone(defaults), ...member.config,
|
|
146
229
|
baseagents: { ...defaults.baseagents, ...member.config?.baseagents } };
|
|
147
230
|
const config = {};
|
|
@@ -156,7 +239,8 @@ export function collectTemplateDirectory(templateDir, memberKey) {
|
|
|
156
239
|
for (const field of ['model', 'effort', 'params']) if (block[field] !== undefined) config.baseagents[name][field] = structuredClone(block[field]);
|
|
157
240
|
}
|
|
158
241
|
check(config.baseagents[config.active_baseagent], 'Default baseagent must have a binding: ' + memberKey);
|
|
159
|
-
for (const field of Object.keys(member.config ?? {})) if (!Object.hasOwn(config, field)
|
|
242
|
+
for (const field of Object.keys(member.config ?? {})) if (!Object.hasOwn(config, field)
|
|
243
|
+
&& !['version', 'update'].includes(field)) excluded.push('members/' + memberKey + '/config/' + field);
|
|
160
244
|
member.config = config;
|
|
161
245
|
const entries = new Map(); const snapshot = [];
|
|
162
246
|
for (const relative of tpl.files) {
|
|
@@ -168,22 +252,23 @@ export function collectTemplateDirectory(templateDir, memberKey) {
|
|
|
168
252
|
if (!portableFile(name, [memberKey])) { excluded.push(name); continue; }
|
|
169
253
|
entries.set(name, { bytes, mode: stat.mode & 0o777 });
|
|
170
254
|
}
|
|
171
|
-
const resources = { baseagents: Object.keys(config.baseagents).sort(), triggers: [], skills: [], files: [] };
|
|
255
|
+
const resources = { baseagents: Object.keys(config.baseagents).sort(), triggers: [], events: [], skills: [], files: [] };
|
|
172
256
|
for (const name of entries.keys()) {
|
|
173
257
|
if (name.startsWith('workspace/' + memberKey + '/')) resources.files.push(name.slice(('workspace/' + memberKey + '/').length));
|
|
174
258
|
if (name.startsWith('agents/' + memberKey + '/triggers/')) resources.triggers.push(name.split('/')[3]);
|
|
259
|
+
if (name.startsWith('agents/' + memberKey + '/events/')) resources.events.push(name.split('/')[3]);
|
|
175
260
|
if (name.startsWith('.evolcore/skills/')) resources.skills.push(name.split('/')[2]);
|
|
176
261
|
}
|
|
177
262
|
resources.skills.push(...Object.keys(member.skills ?? {}));
|
|
178
263
|
for (const kind of Object.keys(resources)) resources[kind] = [...new Set(resources[kind])].sort();
|
|
179
264
|
return { member, entries, excluded, platforms: [...tpl.team.host.platform].sort(),
|
|
180
|
-
sourceDigest: contractDigest({ snapshot, member, metadata: { name: tpl.team.
|
|
265
|
+
sourceDigest: contractDigest({ snapshot, member, metadata: { name: tpl.team.id, version: tpl.team.version } }), resources,
|
|
181
266
|
defaultBaseagent: config.active_baseagent, warnings: [] };
|
|
182
267
|
}
|
|
183
268
|
|
|
184
269
|
/** One pure package planner for both runtime-agent and directory collection adapters. */
|
|
185
270
|
export function buildTemplatePackage({ metadata, members, externalAids = [], publisher, createdAt, evolcoreRange = '>=0.0.43-test.8' }) {
|
|
186
|
-
const team = { $schema_version: 1, name: metadata.id, title: metadata.name, version: metadata.version,
|
|
271
|
+
const team = { $schema_version: 1, id: metadata.id, name: metadata.id, title: metadata.name, version: metadata.version,
|
|
187
272
|
...(metadata.description !== undefined ? { description: metadata.description } : {}), host: { platform: structuredClone(metadata.platforms) }, agents: [] };
|
|
188
273
|
const entries = new Map(); const excluded = []; const external = new Set(externalAids);
|
|
189
274
|
for (const [key, collected] of Object.entries(members)) {
|
|
@@ -191,6 +276,9 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
191
276
|
check(record(member) && record(include), 'Collected member and selection required');
|
|
192
277
|
check(include.baseagents.includes(member.config?.active_baseagent), 'Default baseagent is required: ' + key);
|
|
193
278
|
const chosen = structuredClone(member);
|
|
279
|
+
Object.assign(chosen, resolveMemberParameters(chosen));
|
|
280
|
+
assertPublicTemplateConfig(chosen.config);
|
|
281
|
+
for (const field of ['version', 'update']) delete chosen.config[field];
|
|
194
282
|
chosen.config.baseagents = Object.fromEntries(Object.entries(chosen.config.baseagents).filter(([name]) => include.baseagents.includes(name)));
|
|
195
283
|
chosen.skills = Object.fromEntries(Object.entries(chosen.skills ?? {}).filter(([name]) => include.skills.includes(name)));
|
|
196
284
|
team.agents.push({ ...chosen, key });
|
|
@@ -200,7 +288,8 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
200
288
|
check(portableFile(name, [key]), 'Unsupported collected resource: ' + name);
|
|
201
289
|
const selected = name.startsWith('workspace/') ? include.files.includes(name.slice(('workspace/' + key + '/').length))
|
|
202
290
|
: name.startsWith('.evolcore/skills/') ? include.skills.includes(name.split('/')[2])
|
|
203
|
-
: name.startsWith('agents/' + key + '/triggers/') ? include.triggers.includes(name.split('/')[3])
|
|
291
|
+
: name.startsWith('agents/' + key + '/triggers/') ? include.triggers.includes(name.split('/')[3])
|
|
292
|
+
: name.startsWith('agents/' + key + '/events/') ? (include.events ?? []).includes(name.split('/')[3]) : true;
|
|
204
293
|
if (!selected) { excluded.push(name); continue; }
|
|
205
294
|
const target = 'template/' + name;
|
|
206
295
|
if (entries.has(target)) check(entries.get(target).bytes.equals(entry.bytes) && entries.get(target).mode === entry.mode, 'Conflicting shared resource', 'SOURCE_CHANGED');
|
|
@@ -211,20 +300,27 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
211
300
|
check(!normalized.errors.length, normalized.errors.join('; '));
|
|
212
301
|
entries.set('template/team.json', { bytes: json(team), mode: 0o644 });
|
|
213
302
|
entries.set('template/team.schema.json', { bytes: json(readTeamSchema()), mode: 0o644 });
|
|
303
|
+
let memberReferences = false;
|
|
214
304
|
for (const [name, entry] of entries) {
|
|
215
305
|
if (entry.bytes.includes(0) || !Buffer.from(entry.bytes.toString('utf8')).equals(entry.bytes)) continue;
|
|
216
306
|
for (const line of entry.bytes.toString('utf8').split('\n')) {
|
|
307
|
+
memberReferences ||= /\{\{\s*members\./.test(line);
|
|
217
308
|
check(!/(?:sk-[A-Za-z0-9_-]{16,}|ghp_[A-Za-z0-9]{20,}|AKIA[A-Z0-9]{16}|-----BEGIN .*PRIVATE KEY|(?:API_KEY|TOKEN|SECRET|PASSWORD)\s*=\s*(?!\$\{)\S{8,})/i.test(line),
|
|
218
309
|
'Credential content in portable resource: ' + name, 'SCAN_BLOCKED');
|
|
219
|
-
for (const aid of line.match(/[a-z0-9][a-z0-9_-]*\.(?:[a-z0-9-]+\.)+[a-z]{2,}/gi) ?? []) {
|
|
220
|
-
if (!line.includes('://' + aid) && !aid.startsWith('www.') && !line.includes('{{' + aid + '}}') && !new RegExp('\\{\\{\\s*' + aid.replaceAll('.', '\\.') + '\\s*\\}\\}').test(line)) external.add(aid);
|
|
221
|
-
}
|
|
222
310
|
}
|
|
311
|
+
for (const aid of extractExternalAids(entry.bytes.toString('utf8'), name)) external.add(aid);
|
|
223
312
|
}
|
|
313
|
+
if (memberReferences && evolcoreRange === '>=0.0.43-test.8') evolcoreRange = '>=0.0.43-test.8 <0.0.43 || >=0.0.44';
|
|
314
|
+
const templateFeatures = [
|
|
315
|
+
...(memberReferences ? ['member-references-v1'] : []),
|
|
316
|
+
...([...entries.keys()].some(name => /^template\/agents\/[^/]+\/events\//.test(name)) ? ['event-packs-v1'] : []),
|
|
317
|
+
];
|
|
224
318
|
const info = { $schema_version: 1, id: metadata.id, name: metadata.name, version: metadata.version,
|
|
225
319
|
...(publisher !== undefined ? { publisher: structuredClone(publisher) } : {}), ...(createdAt !== undefined ? { createdAt } : {}),
|
|
226
320
|
...(metadata.description !== undefined ? { description: metadata.description } : {}),
|
|
227
|
-
compat: { platforms: structuredClone(metadata.platforms), evolcore: evolcoreRange,
|
|
321
|
+
compat: { platforms: structuredClone(metadata.platforms), evolcore: evolcoreRange,
|
|
322
|
+
...(templateFeatures.length ? { templateFeatures } : {}),
|
|
323
|
+
baseagents: [...new Set(team.agents.flatMap(member => Object.keys(member.config.baseagents)))].sort() },
|
|
228
324
|
externalAids: [...external].sort() };
|
|
229
325
|
const manifest = [...entries].map(([name, entry]) => ({ path: name.slice('template/'.length), size: entry.bytes.length, sha256: packageDigest(entry.bytes).slice(7) }));
|
|
230
326
|
entries.set('PACKAGE.json', { bytes: json(info), mode: 0o644 });
|
|
@@ -249,6 +345,7 @@ export function exportTemplatePackage(templateDir, { publisher, createdAt = Date
|
|
|
249
345
|
const providers = readOptional('.evolcore/providers.json').providers ?? {};
|
|
250
346
|
if (team.host.config !== undefined) { delete team.host.config; excluded.push('host.config'); }
|
|
251
347
|
for (const agent of team.agents) {
|
|
348
|
+
Object.assign(agent, resolveMemberParameters(agent));
|
|
252
349
|
const source = { ...structuredClone(defaults), ...agent.config,
|
|
253
350
|
baseagents: { ...defaults.baseagents, ...agent.config?.baseagents } };
|
|
254
351
|
const config = {};
|
|
@@ -263,8 +360,10 @@ export function exportTemplatePackage(templateDir, { publisher, createdAt = Date
|
|
|
263
360
|
for (const field of ['model', 'effort', 'params']) if (block[field] !== undefined) config.baseagents[name][field] = structuredClone(block[field]);
|
|
264
361
|
}
|
|
265
362
|
check(config.baseagents[config.active_baseagent], 'Default baseagent must have a binding: ' + agent.key);
|
|
266
|
-
for (const field of Object.keys(agent.config ?? {})) if (!Object.hasOwn(config, field)
|
|
363
|
+
for (const field of Object.keys(agent.config ?? {})) if (!Object.hasOwn(config, field)
|
|
364
|
+
&& !['version', 'update'].includes(field)) excluded.push('agents/' + agent.key + '/config/' + field);
|
|
267
365
|
agent.config = config;
|
|
366
|
+
assertPublicTemplateConfig(config);
|
|
268
367
|
}
|
|
269
368
|
// The directory's custom constraints belong to its authoring form. Portable fields use the common schema.
|
|
270
369
|
const normalized = normalizeTeam(team);
|
|
@@ -287,18 +386,20 @@ export function exportTemplatePackage(templateDir, { publisher, createdAt = Date
|
|
|
287
386
|
memberReferences ||= /\{\{\s*members\./.test(line);
|
|
288
387
|
check(!/(?:sk-[A-Za-z0-9_-]{16,}|ghp_[A-Za-z0-9]{20,}|AKIA[A-Z0-9]{16}|-----BEGIN .*PRIVATE KEY|(?:API_KEY|TOKEN|SECRET|PASSWORD)\s*=\s*(?!\$\{)\S{8,})/i.test(line),
|
|
289
388
|
'Credential content in portable resource: ' + name, 'SENSITIVE_CONTENT');
|
|
290
|
-
for (const aid of line.match(/[a-z0-9][a-z0-9_-]*\.(?:[a-z0-9-]+\.)+[a-z]{2,}/gi) ?? []) {
|
|
291
|
-
if (!line.includes('://' + aid) && !aid.startsWith('www.') && !line.includes('{{' + aid + '}}') && !new RegExp('\\{\\{\\s*' + aid.replaceAll('.', '\\.') + '\\s*\\}\\}').test(line)) external.add(aid);
|
|
292
|
-
}
|
|
293
389
|
}
|
|
390
|
+
for (const aid of extractExternalAids(entry.bytes.toString('utf8'), name)) external.add(aid);
|
|
294
391
|
}
|
|
295
392
|
// Older readers normalize test builds to the final version. The upper bound
|
|
296
393
|
// makes those readers reject member references instead of leaving old AIDs.
|
|
297
394
|
if (memberReferences && evolcoreRange === '>=0.0.43') evolcoreRange = '>=0.0.43-test.8 <0.0.43 || >=0.0.44';
|
|
298
|
-
const
|
|
395
|
+
const templateFeatures = [
|
|
396
|
+
...(memberReferences ? ['member-references-v1'] : []),
|
|
397
|
+
...([...entries.keys()].some(name => /^template\/agents\/[^/]+\/events\//.test(name)) ? ['event-packs-v1'] : []),
|
|
398
|
+
];
|
|
399
|
+
const metadata = { $schema_version: 1, id: team.id, name: team.title ?? team.id, version: team.version,
|
|
299
400
|
...(team.description !== undefined ? { description: team.description } : {}), ...(publisher ? { publisher } : {}), createdAt,
|
|
300
401
|
compat: { platforms: team.host.platform, evolcore: evolcoreRange,
|
|
301
|
-
...(
|
|
402
|
+
...(templateFeatures.length ? { templateFeatures } : {}),
|
|
302
403
|
baseagents: [...new Set(team.agents.flatMap(agent => Object.keys(agent.config.baseagents)))] }, externalAids: [...external].sort() };
|
|
303
404
|
const manifest = [...entries].map(([name, entry]) => ({ path: name.slice('template/'.length), size: entry.bytes.length, sha256: packageDigest(entry.bytes).slice(7) }));
|
|
304
405
|
entries.set('PACKAGE.json', { bytes: json(metadata), mode: 0o644 });
|
|
@@ -353,8 +454,9 @@ export function attachBuildEnvironment(templateDir, sourceDir) {
|
|
|
353
454
|
check(!base.errors.length, 'Invalid build environment: ' + base.errors.join('; '));
|
|
354
455
|
const teamFile = path.join(templateDir, 'team.json');
|
|
355
456
|
const team = JSON.parse(fs.readFileSync(teamFile, 'utf8'));
|
|
356
|
-
|
|
357
|
-
|
|
457
|
+
team.host.config = structuredClone(base.tpl.team.host.config ?? {});
|
|
458
|
+
team.host.config.aun = { ...team.host.config.aun, defaultAidDomain: resolveTemplateAidDomain(base.tpl.team) };
|
|
459
|
+
delete team.issuer;
|
|
358
460
|
for (const name of ['providers.json', 'agents/defaults.json', '.env']) {
|
|
359
461
|
const source = path.join(base.tpl.root, '.evolcore', ...name.split('/'));
|
|
360
462
|
if (!fs.existsSync(source)) continue;
|
|
@@ -372,3 +474,69 @@ export function templateProviderSummary(templateDir) {
|
|
|
372
474
|
const providers = JSON.parse(fs.readFileSync(file, 'utf8')).providers ?? {};
|
|
373
475
|
return Object.entries(providers).map(([id, value]) => ({ id, name: value.name ?? id, services: Object.keys(value.services ?? {}) }));
|
|
374
476
|
}
|
|
477
|
+
|
|
478
|
+
const EVENT_PACK_NAME_PATTERN = /^[a-z0-9][a-z0-9_-]{0,63}$/;
|
|
479
|
+
const TEMPLATE_EVENT_BUS_PATTERN = /^\{\{\s*(?:members\.[a-z0-9][a-z0-9_-]{0,31}\.aid|(?:agent|owner|host)\.aid)\s*\}\}$/;
|
|
480
|
+
|
|
481
|
+
/** Share package definitions/assets, never runtime state, logs, backups or caches. */
|
|
482
|
+
export function isPortableEventPackResource(relative) {
|
|
483
|
+
return relative.split('/').every(part => part && part !== '..' && !part.startsWith('.')
|
|
484
|
+
&& !PACK_RUNTIME_ENTRIES.has(part) && !['node_modules', '__pycache__'].includes(part)
|
|
485
|
+
&& !part.endsWith('_') && !part.endsWith('~') && !/\.(?:bak|pyc)$/i.test(part));
|
|
486
|
+
}
|
|
487
|
+
|
|
488
|
+
export function isPortableEventPackFile(relative) {
|
|
489
|
+
const [group, id, ...rest] = relative.split('/');
|
|
490
|
+
return group === 'events' && EVENT_PACK_NAME_PATTERN.test(id ?? '') && rest.length > 0
|
|
491
|
+
&& isPortableEventPackResource(rest.join('/'));
|
|
492
|
+
}
|
|
493
|
+
|
|
494
|
+
/** Reuse the runtime validator; only template bus references need a validation placeholder. */
|
|
495
|
+
export function validateEventPack(raw, files, { template = false, location = 'events' } = {}) {
|
|
496
|
+
const checked = structuredClone(raw);
|
|
497
|
+
if (template && checked && typeof checked === 'object') {
|
|
498
|
+
for (const kind of ['publish', 'subscribe']) if (Array.isArray(checked[kind])) {
|
|
499
|
+
for (const entry of checked[kind]) if (entry && TEMPLATE_EVENT_BUS_PATTERN.test(entry.bus)) entry.bus = sha256(entry.bus).slice(0, 16) + '.agentid.cn';
|
|
500
|
+
}
|
|
501
|
+
}
|
|
502
|
+
const result = validatePackJson(checked);
|
|
503
|
+
assert(result.ok, 'INVALID_ARGUMENT', location + '/pack.json: ' + result.errors.join('; '));
|
|
504
|
+
for (const entry of result.value.subscribe) {
|
|
505
|
+
assert(files.includes(entry.handler.script), 'INVALID_ARGUMENT', location + ': missing handler ' + entry.handler.script);
|
|
506
|
+
}
|
|
507
|
+
return raw;
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
/** Read-only inventory: loading must not create logs or migrate source files. */
|
|
511
|
+
export function readEventPacks(eventsDir, { template = false } = {}) {
|
|
512
|
+
if (!fs.existsSync(eventsDir)) return [];
|
|
513
|
+
regularPath(eventsDir);
|
|
514
|
+
return fs.readdirSync(eventsDir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))
|
|
515
|
+
.filter(entry => !entry.name.startsWith('.') && !entry.name.startsWith('_'))
|
|
516
|
+
.flatMap(entry => {
|
|
517
|
+
assert(!entry.isSymbolicLink(), 'INVALID_ARGUMENT', 'Symbolic event pack: ' + entry.name);
|
|
518
|
+
if (!entry.isDirectory()) return [];
|
|
519
|
+
const dir = inside(eventsDir, entry.name);
|
|
520
|
+
if (fs.existsSync(path.join(dir, '.archived'))) return [];
|
|
521
|
+
assert(EVENT_PACK_NAME_PATTERN.test(entry.name), 'INVALID_ARGUMENT', 'Invalid event pack name: ' + entry.name);
|
|
522
|
+
const files = walkFiles(dir, relative => !isPortableEventPackResource(relative));
|
|
523
|
+
assert(files.includes('pack.json'), 'INVALID_ARGUMENT', 'Event pack missing pack.json: ' + entry.name);
|
|
524
|
+
const definition = validateEventPack(readJson(path.join(dir, 'pack.json')), files, { template, location: 'events/' + entry.name });
|
|
525
|
+
return [{ id: entry.name, dir, files, definition }];
|
|
526
|
+
});
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
/** Validate the complete portable file set, including disabled packs and orphan assets. */
|
|
530
|
+
export function validateEventPackEntries(entries, keys) {
|
|
531
|
+
for (const key of keys) {
|
|
532
|
+
const prefix = 'agents/' + key + '/events/';
|
|
533
|
+
const ids = new Set([...entries.keys()].filter(name => name.startsWith(prefix)).map(name => name.slice(prefix.length).split('/')[0]));
|
|
534
|
+
for (const id of ids) {
|
|
535
|
+
const packPrefix = prefix + id + '/';
|
|
536
|
+
const entry = entries.get(packPrefix + 'pack.json');
|
|
537
|
+
assert(entry, 'INVALID_ARGUMENT', 'Event pack missing pack.json: ' + prefix + id);
|
|
538
|
+
const files = [...entries.keys()].filter(name => name.startsWith(packPrefix)).map(name => name.slice(packPrefix.length));
|
|
539
|
+
validateEventPack(JSON.parse(entry.bytes.toString('utf8')), files, { template: true, location: prefix + id });
|
|
540
|
+
}
|
|
541
|
+
}
|
|
542
|
+
}
|
|
@@ -1,8 +1,55 @@
|
|
|
1
1
|
/** Shared, pure template binding/rendering. No home discovery or runtime writes. */
|
|
2
2
|
export const BASEAGENTS = ['claude', 'codex', 'gemini', 'ecagent'];
|
|
3
|
+
export const MEMBER_PARAMETER_FIELDS = ['version', 'update'];
|
|
3
4
|
const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
4
5
|
const fail = message => { throw Object.assign(new Error(message), { code: 'INVALID_ARGUMENT' }); };
|
|
5
6
|
|
|
7
|
+
/** Author declarations only; never generates versions or grants update authority. */
|
|
8
|
+
export function resolveMemberParameters(member) {
|
|
9
|
+
if (!record(member)) fail('Member must be an object');
|
|
10
|
+
const out = {};
|
|
11
|
+
const prefix = 'Member ' + (member.key ?? '(unknown)') + '.';
|
|
12
|
+
if ([member, member.config].some(value => record(value) && Object.hasOwn(value, 'publisherAid'))) fail(prefix + 'publisherAid: use update.publisher');
|
|
13
|
+
for (const field of MEMBER_PARAMETER_FIELDS) {
|
|
14
|
+
const declarations = [member, member.config].filter(value => record(value) && Object.hasOwn(value, field));
|
|
15
|
+
for (const declaration of declarations) {
|
|
16
|
+
const value = declaration[field];
|
|
17
|
+
const valid = field === 'version'
|
|
18
|
+
? typeof value === 'string' && /^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$/.test(value)
|
|
19
|
+
: record(value) && Object.keys(value).every(key => ['mode', 'publisher'].includes(key))
|
|
20
|
+
&& ['auto', 'manual', 'disabled'].includes(value.mode);
|
|
21
|
+
if (!valid) fail(prefix + field + ': invalid declaration');
|
|
22
|
+
if (field === 'update' && Object.hasOwn(value, 'publisher')
|
|
23
|
+
&& (typeof value.publisher !== 'string' || !/^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?){2,}$/.test(value.publisher))) {
|
|
24
|
+
fail(prefix + 'update.publisher: invalid AID');
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
if (declarations.length === 2) {
|
|
28
|
+
const equal = field === 'update'
|
|
29
|
+
? declarations[0][field].mode === declarations[1][field].mode && declarations[0][field].publisher === declarations[1][field].publisher
|
|
30
|
+
: declarations[0][field] === declarations[1][field];
|
|
31
|
+
if (!equal) fail(prefix + field + ': conflicts with config.' + field);
|
|
32
|
+
}
|
|
33
|
+
if (declarations.length) out[field] = structuredClone(declarations[0][field]);
|
|
34
|
+
}
|
|
35
|
+
return out;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Connection credentials cannot be hidden in otherwise public nested configuration. */
|
|
39
|
+
export function assertPublicTemplateConfig(config) {
|
|
40
|
+
const visit = (value, location) => {
|
|
41
|
+
if (Array.isArray(value)) { value.forEach((item, index) => visit(item, location + '[' + index + ']')); return; }
|
|
42
|
+
if (!record(value)) return;
|
|
43
|
+
for (const [key, item] of Object.entries(value)) {
|
|
44
|
+
if (/^(?:api[-_]?key|access[-_]?token|refresh[-_]?token|token|password|secret|credentials|private[-_]?key|authorization|headers|query[-_]?params)$/i.test(key)) {
|
|
45
|
+
throw Object.assign(new Error('Credential field in public template configuration: ' + location + '.' + key), { code: 'SCAN_BLOCKED' });
|
|
46
|
+
}
|
|
47
|
+
visit(item, location + '.' + key);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
visit(config, 'config');
|
|
51
|
+
}
|
|
52
|
+
|
|
6
53
|
export function renderText(text, vars = {}, externalAids = {}) {
|
|
7
54
|
let out = text;
|
|
8
55
|
const interpolate = value => value.replace(/\{\{\s*([a-z]+\.[a-z]+|members\.[a-z0-9][a-z0-9_-]{0,31}\.(?:aid|project))\s*\}\}/g,
|
|
@@ -43,8 +90,8 @@ export function providerUsable(providers, id, baseagent) {
|
|
|
43
90
|
}
|
|
44
91
|
|
|
45
92
|
/** Match by exact stable ID, never by display name. Missing matches can be previewed, not installed. */
|
|
46
|
-
export function bindTemplateProviders(config, { providers = {}, defaults = {}, selections = {}, allowMissing = false, modelCatalog } = {}) {
|
|
47
|
-
if (!record(config) || !record(providers) || !record(defaults) || !record(selections)) fail('Invalid Provider binding input');
|
|
93
|
+
export function bindTemplateProviders(config, { providers = {}, defaults = {}, fallbackProviders = {}, selections = {}, allowMissing = false, modelCatalog } = {}) {
|
|
94
|
+
if (!record(config) || !record(providers) || !record(defaults) || !record(fallbackProviders) || !record(selections)) fail('Invalid Provider binding input');
|
|
48
95
|
const out = structuredClone(config);
|
|
49
96
|
const blocks = out.baseagents ?? {};
|
|
50
97
|
if (!record(blocks)) fail('baseagents must be an object');
|
|
@@ -63,7 +110,7 @@ export function bindTemplateProviders(config, { providers = {}, defaults = {}, s
|
|
|
63
110
|
if (select.provider !== undefined && (typeof select.provider !== 'string' || !select.provider)) fail('Invalid selected Provider: ' + name);
|
|
64
111
|
if (select.model !== undefined && (typeof select.model !== 'string' || !select.model.trim())) fail('Invalid model: ' + name);
|
|
65
112
|
if (select.effort !== undefined && select.effort !== null && (typeof select.effort !== 'string' || !select.effort)) fail('Invalid effort: ' + name);
|
|
66
|
-
const selected = select.provider ?? ref?.id;
|
|
113
|
+
const selected = select.provider ?? ref?.id ?? fallbackProviders[name];
|
|
67
114
|
const usable = providerUsable(providers, selected, name);
|
|
68
115
|
const model = select.model ?? block.model ?? defaults.baseagents?.[name]?.model;
|
|
69
116
|
const effort = Object.hasOwn(select, 'effort') ? select.effort : block.effort;
|
|
@@ -108,13 +155,14 @@ export function teamMemberVariables(members, ownerAid, hostAid) {
|
|
|
108
155
|
{ ...variables, 'agent.aid': member.aid, 'project.path': member.projectPath }]));
|
|
109
156
|
}
|
|
110
157
|
|
|
111
|
-
export function planMemberConfig({ member, vars, providers, defaults = {}, selections = {}, allowMissing = false, modelCatalog, mode = 'create_prebuilt' }) {
|
|
158
|
+
export function planMemberConfig({ member, vars, providers, defaults = {}, fallbackProviders = {}, selections = {}, allowMissing = false, modelCatalog, mode = 'create_prebuilt' }) {
|
|
112
159
|
if (!record(member) || !MEMBER_KEY.test(member.key) || !record(vars)) fail('Invalid member plan');
|
|
113
160
|
if (!['create_prebuilt', 'create_on_host', 'overlay_existing'].includes(mode)) fail('Invalid member plan mode');
|
|
161
|
+
const parameters = resolveMemberParameters(member);
|
|
114
162
|
const rendered = renderValue(member, vars);
|
|
115
163
|
if (mode !== 'create_prebuilt' && (!record(rendered.config) || Object.keys(rendered.config)
|
|
116
|
-
.some(key => !['chatmode', 'memory', 'active_baseagent', 'baseagents'].includes(key)))) fail('Unsupported live-host member configuration');
|
|
117
|
-
const binding = bindTemplateProviders(rendered.config
|
|
164
|
+
.some(key => !['chatmode', 'memory', 'active_baseagent', 'baseagents', 'version', 'update'].includes(key)))) fail('Unsupported live-host member configuration');
|
|
165
|
+
const binding = bindTemplateProviders({ ...rendered.config, ...parameters }, { providers, defaults, fallbackProviders, selections, allowMissing, modelCatalog });
|
|
118
166
|
return { key: member.key, profile: rendered.profile, skills: rendered.skills ?? {}, config: binding.config, providers: binding.refs };
|
|
119
167
|
}
|
|
120
168
|
|
|
@@ -30,7 +30,7 @@ export const HOME_ALLOWED = ['providers.json', 'agents', 'skills', '.env'];
|
|
|
30
30
|
const HOME_AGENTS_ALLOWED = ['defaults.json'];
|
|
31
31
|
|
|
32
32
|
/** 每个 agent 目录里允许出现的条目。配置文件不在其中——它由工具生成。 */
|
|
33
|
-
const AGENT_DIR_ALLOWED = ['personal', 'triggers'];
|
|
33
|
+
const AGENT_DIR_ALLOWED = ['personal', 'triggers', 'events'];
|
|
34
34
|
|
|
35
35
|
const KEY_RE = /^[a-z0-9][a-z0-9_-]{0,31}$/;
|
|
36
36
|
const NAME_RE = /^[a-z0-9][a-z0-9._-]{0,63}$/;
|
|
@@ -82,7 +82,7 @@ export function loadTemplate(dir) {
|
|
|
82
82
|
try { schema = normalizeTeamSchema(schema); } catch (err) { return { errors: [err.message] }; }
|
|
83
83
|
errors.push(...validateContractSchema(team, schema, 'team.json'));
|
|
84
84
|
|
|
85
|
-
const name = team.
|
|
85
|
+
const name = team.id;
|
|
86
86
|
const version = team.version;
|
|
87
87
|
if (typeof name !== 'string' || !NAME_RE.test(name)) errors.push(`team.json name must match ${NAME_RE}`);
|
|
88
88
|
const keys = team.agents.map(agent => agent.key);
|
|
@@ -5,7 +5,8 @@ import { assert, isRecord, inside, walkFiles, jsonBytes, sha256, atomicBytes, re
|
|
|
5
5
|
readJson, behaviorConfig, BASEAGENTS, PROFILE_FIELDS } from './shared/common.mjs';
|
|
6
6
|
import { loadTemplate } from './shared/template.mjs';
|
|
7
7
|
import { normalizeTeam, readTeamSchema } from './shared/template-contract.mjs';
|
|
8
|
-
import { collectTemplateDirectory, buildTemplatePackage, excludedResource as excluded } from './shared/template-package.mjs';
|
|
8
|
+
import { collectTemplateDirectory, buildTemplatePackage, excludedResource as excluded, readEventPacks } from './shared/template-package.mjs';
|
|
9
|
+
import { resolveMemberParameters } from './shared/template-runtime.mjs';
|
|
9
10
|
|
|
10
11
|
function entries(options) {
|
|
11
12
|
assert(isRecord(options.members) && Object.keys(options.members).length, 'INVALID_ARGUMENT', 'Members required');
|
|
@@ -16,9 +17,15 @@ function entries(options) {
|
|
|
16
17
|
return entries;
|
|
17
18
|
}
|
|
18
19
|
const runtimeNames = new Set(['AIDs', 'agents', 'data', 'logs', 'backups', 'eck', 'directory', 'sessions']);
|
|
19
|
-
function projectFiles(source) {
|
|
20
|
+
function projectFiles(source, warnings = []) {
|
|
21
|
+
// Inventory describes choices, not the eventual package. Use the same filter
|
|
22
|
+
// for its content snapshot; skipped files must never be read or selectable.
|
|
20
23
|
return walkFiles(source.projectPath, relative => excluded(relative)
|
|
21
|
-
|| source.projectPath === source.home && runtimeNames.has(relative.split('/')[0])
|
|
24
|
+
|| source.projectPath === source.home && runtimeNames.has(relative.split('/')[0]), {
|
|
25
|
+
maxTotalBytes: Infinity,
|
|
26
|
+
onOversizedFile: file => warnings.push({ code: 'FILE_TOO_LARGE', ...file,
|
|
27
|
+
message: 'Skipped oversized project file: ' + file.path + ' (' + file.size + ' bytes; limit ' + file.limit + ' bytes)' }),
|
|
28
|
+
});
|
|
22
29
|
}
|
|
23
30
|
function directory(source, key) {
|
|
24
31
|
const { tpl, errors } = loadTemplate(source.path);
|
|
@@ -40,6 +47,9 @@ function sourceSnapshot(selected) {
|
|
|
40
47
|
for (const relative of walkFiles(personal)) if (relative === 'welcome.md' || relative.startsWith('soul/') && relative.endsWith('.md')) add(inside(personal, relative));
|
|
41
48
|
const triggers = path.join(source.agentDir, 'triggers');
|
|
42
49
|
for (const relative of walkFiles(triggers)) if (relative !== 'active.json' && !relative.endsWith('/active.json')) add(inside(triggers, relative));
|
|
50
|
+
for (const pack of readEventPacks(path.join(source.agentDir, 'events'))) {
|
|
51
|
+
for (const relative of pack.files) add(inside(pack.dir, relative));
|
|
52
|
+
}
|
|
43
53
|
for (const skill of source.skills ?? []) if (skill.type === 'local' && skill.enabled) {
|
|
44
54
|
const root = inside(path.join(source.home, 'skills'), skill.name);
|
|
45
55
|
for (const relative of walkFiles(root)) add(inside(root, relative));
|
|
@@ -56,18 +66,21 @@ export async function inspectCollection(options) {
|
|
|
56
66
|
if (source.kind === 'directory') {
|
|
57
67
|
const { tpl, member } = directory(source, key);
|
|
58
68
|
const platform = tpl.team.host.platform;
|
|
59
|
-
members[key] = { profile: member.profile, resources: { baseagents: Object.keys(member.config.baseagents),
|
|
69
|
+
members[key] = { ...resolveMemberParameters(member), profile: member.profile, resources: { baseagents: Object.keys(member.config.baseagents),
|
|
60
70
|
triggers: walkFiles(path.join(source.path, 'agents', key, 'triggers')).filter(file => file.endsWith('/trigger.json')).map(file => file.split('/')[0]),
|
|
71
|
+
events: readEventPacks(path.join(source.path, 'agents', key, 'events'), { template: true }).map(pack => pack.id),
|
|
61
72
|
skills: Object.keys(member.skills ?? {}), files: fs.existsSync(path.join(source.path, 'workspace', key))
|
|
62
73
|
? fs.readdirSync(path.join(source.path, 'workspace', key)).sort() : [] },
|
|
63
74
|
defaultBaseagent: member.config.active_baseagent, platforms: platform, warnings: [] };
|
|
64
75
|
platforms = platforms.filter(platformName => platform.includes(platformName));
|
|
65
76
|
} else {
|
|
66
77
|
const data = await inspectAgent(source);
|
|
67
|
-
|
|
78
|
+
const warnings = [];
|
|
79
|
+
members[key] = { ...resolveMemberParameters({ key, config: source.effectiveConfig }), profile: source.profile, resources: { baseagents: data.baseagents.map(item => item.name),
|
|
68
80
|
triggers: data.triggers.map(item => item.id), skills: data.skills.filter(item => item.type === 'local' && item.enabled).map(item => item.name),
|
|
69
|
-
|
|
70
|
-
|
|
81
|
+
events: data.events.map(pack => pack.id),
|
|
82
|
+
files: projectFiles(source, warnings) },
|
|
83
|
+
defaultBaseagent: data.activeBaseagent, platforms: [process.platform], warnings };
|
|
71
84
|
platforms = platforms.filter(platform => platform === process.platform);
|
|
72
85
|
}
|
|
73
86
|
}
|
|
@@ -79,9 +92,11 @@ export function validateCollectionSelection({ inventory, metadata, members }) {
|
|
|
79
92
|
'INVALID_ARGUMENT', 'Select every inventory member');
|
|
80
93
|
assert(metadata.platforms.every(platform => inventory.platforms.includes(platform)), 'INCOMPATIBLE', 'Platforms must be common to every member');
|
|
81
94
|
for (const [key, member] of Object.entries(members)) {
|
|
82
|
-
assert(isRecord(member) && Object.keys(member).
|
|
83
|
-
|
|
84
|
-
|
|
95
|
+
assert(isRecord(member) && Object.keys(member).every(field => ['include', 'version', 'update'].includes(field))
|
|
96
|
+
&& isRecord(member.include), 'INVALID_ARGUMENT', 'Member include required');
|
|
97
|
+
resolveMemberParameters({ ...member, key });
|
|
98
|
+
for (const field of ['baseagents', 'triggers', 'skills', 'files', 'events']) {
|
|
99
|
+
const selected = member.include[field] ?? (field === 'events' ? [] : undefined);
|
|
85
100
|
assert(Array.isArray(selected) && new Set(selected).size === selected.length
|
|
86
101
|
&& selected.every(value => inventory.members[key].resources[field].includes(value)), 'INVALID_ARGUMENT', 'Selection is outside frozen inventory: ' + key + '.' + field);
|
|
87
102
|
}
|
|
@@ -95,6 +110,7 @@ function copyDirectoryMember(root, source, key, include) {
|
|
|
95
110
|
for (const relative of walkFiles(source.path)) {
|
|
96
111
|
const wanted = relative.startsWith('agents/' + key + '/personal/')
|
|
97
112
|
|| include.triggers.some(id => relative.startsWith('agents/' + key + '/triggers/' + id + '/'))
|
|
113
|
+
|| (include.events ?? []).some(id => relative.startsWith('agents/' + key + '/events/' + id + '/'))
|
|
98
114
|
|| include.files.some(file => relative === 'workspace/' + key + '/' + file || relative.startsWith('workspace/' + key + '/' + file + '/'))
|
|
99
115
|
|| include.skills.some(name => relative.startsWith('.evolcore/skills/' + name + '/'));
|
|
100
116
|
if (wanted) {
|
|
@@ -128,6 +144,9 @@ export async function buildCollection(options) {
|
|
|
128
144
|
members[key] = { member, entries: collected, include, excluded: [] };
|
|
129
145
|
}
|
|
130
146
|
}
|
|
147
|
+
for (const [key, collected] of Object.entries(members)) {
|
|
148
|
+
Object.assign(collected.member, resolveMemberParameters({ ...options.selections[key], key }));
|
|
149
|
+
}
|
|
131
150
|
const built = buildTemplatePackage({ metadata: options.metadata, members, publisher: selected[0][1].publisher, createdAt: options.createdAt ?? Date.now() });
|
|
132
151
|
assert((await inspectCollection(options)).inventoryDigest === inventory.inventoryDigest, 'SOURCE_CHANGED', 'Sources changed during build');
|
|
133
152
|
const checked = (await import('./shared/template-package.mjs')).inspectTemplatePackage(built.bytes);
|
|
@@ -179,9 +198,12 @@ export async function collectAgent(options, key, root) {
|
|
|
179
198
|
assert(BASEAGENTS.includes(b.name) && inventory.baseagents.some(x => x.name === b.name), 'INVALID_ARGUMENT', 'Unknown baseagent');
|
|
180
199
|
const source = sourceConfig.baseagents?.[b.name] ?? {};
|
|
181
200
|
const providerId = options.providerRefs?.[b.name]?.id ?? source.provider;
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
201
|
+
const block = {};
|
|
202
|
+
if (providerId !== undefined && providerId !== null) {
|
|
203
|
+
assert(typeof providerId === 'string' && options.providers?.[providerId], 'PROVIDER_NOT_FOUND', 'Configure a Provider for ' + b.name);
|
|
204
|
+
const provider = options.providers[providerId];
|
|
205
|
+
block.provider = { id: providerId, name: provider.name || providerId };
|
|
206
|
+
}
|
|
185
207
|
if (b.model !== undefined) { assert(typeof b.model === 'string' && b.model.trim(), 'INVALID_ARGUMENT', 'Invalid model'); block.model = b.model; }
|
|
186
208
|
if (b.effort !== undefined) { assert(typeof b.effort === 'string' && b.effort.length, 'INVALID_ARGUMENT', 'Invalid effort'); block.effort = b.effort; }
|
|
187
209
|
if (source.params !== undefined) block.params = structuredClone(source.params);
|
|
@@ -196,6 +218,17 @@ export async function collectAgent(options, key, root) {
|
|
|
196
218
|
atomicBytes(inside(root, relative), content, mode);
|
|
197
219
|
};
|
|
198
220
|
const agentPrefix = 'agents/' + key;
|
|
221
|
+
const eventPacks = readEventPacks(path.join(options.agentDir, 'events'));
|
|
222
|
+
const events = include.events ?? [];
|
|
223
|
+
assert(Array.isArray(events) && events.every(id => eventPacks.some(pack => pack.id === id)), 'INVALID_ARGUMENT', 'Unknown event pack selection');
|
|
224
|
+
for (const pack of eventPacks.filter(pack => events.includes(pack.id))) {
|
|
225
|
+
for (const relative of pack.files) {
|
|
226
|
+
assert(!excluded(relative), 'INVALID_ARGUMENT', 'Excluded event pack resource: ' + relative);
|
|
227
|
+
const source = inside(pack.dir, relative);
|
|
228
|
+
const bytes = relative === 'pack.json' ? jsonBytes(identityValue(pack.definition, options)) : fs.readFileSync(source);
|
|
229
|
+
put(agentPrefix + '/events/' + pack.id + '/' + relative, bytes, fs.statSync(source).mode & 0o777);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
199
232
|
for (const name of inventory.profile.soul) put(agentPrefix + '/personal/soul/' + name,
|
|
200
233
|
fs.readFileSync(inside(path.join(options.agentDir, 'personal', 'soul'), name)));
|
|
201
234
|
if (inventory.profile.welcome) put(agentPrefix + '/personal/welcome.md', fs.readFileSync(path.join(options.agentDir, 'personal', 'welcome.md')));
|
|
@@ -241,5 +274,10 @@ export async function collectAgent(options, key, root) {
|
|
|
241
274
|
}
|
|
242
275
|
const profile = Object.fromEntries([...PROFILE_FIELDS, 'type']
|
|
243
276
|
.filter(field => options.profile?.[field] !== undefined).map(field => [field, options.profile[field]]));
|
|
244
|
-
|
|
277
|
+
const renderedProfile = identityValue(profile, options);
|
|
278
|
+
// The avatar names an existing public object. Its host must stay at the
|
|
279
|
+
// source AID; the new member has not uploaded that object to its own storage.
|
|
280
|
+
if (profile.avatar !== undefined) renderedProfile.avatar = profile.avatar;
|
|
281
|
+
return { ...resolveMemberParameters({ key, config: sourceConfig }),
|
|
282
|
+
profile: renderedProfile, config: identityValue(config, options), skills: switches };
|
|
245
283
|
}
|