evolcore 0.0.45 → 0.0.47
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 +113 -0
- package/bin/ecmsg.js +33 -23
- package/dist/ability/application-service.js +1 -2
- package/dist/ability/package.js +28 -0
- package/dist/agent-template/jobs.js +158 -36
- package/dist/agent-template/runtime.js +401 -34
- package/dist/agent-template/service.js +764 -369
- package/dist/agent-template/tool-runner.js +35 -17
- package/dist/agent-template/types.js +7 -4
- package/dist/agents/baseagent.js +10 -9
- package/dist/agents/claude-runner.js +22 -6
- package/dist/agents/codex/app-server-client.js +34 -27
- package/dist/agents/codex/diagnostics.js +18 -1
- package/dist/agents/codex-runner.js +3 -1
- package/dist/agents/ecagent-runner.js +3 -1
- package/dist/agents/gemini-runner.js +2 -1
- package/dist/aun/group/fs-download.js +1 -1
- package/dist/aun/menu/client.js +142 -182
- package/dist/aun/rpc/client.js +33 -17
- package/dist/aun/service-proxy.js +6 -23
- package/dist/channels/aun.js +675 -120
- package/dist/channels/daemon.js +1 -1
- package/dist/cli/agent-create.js +37 -10
- package/dist/cli/agent-template.js +105 -84
- package/dist/cli/agent.js +31 -18
- package/dist/cli/daemon-commands.js +42 -56
- package/dist/cli/daemon-lifecycle-client.js +55 -19
- package/dist/cli/directory.js +12 -4
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/events-command.js +2 -1
- package/dist/cli/init-channel.js +2 -2
- package/dist/cli/init.js +57 -21
- package/dist/cli/integrity-command.js +2 -0
- package/dist/cli/managed-command-guard.js +20 -1
- package/dist/cli/menu-client.js +7 -5
- package/dist/cli/restart-monitor.js +135 -46
- package/dist/cli/services-command.js +28 -5
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +49 -19
- package/dist/config/peer-book-store.js +167 -127
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +158 -6
- package/dist/config/provider-identity.js +10 -4
- package/dist/config/provider-ipc-service.js +10 -2
- package/dist/config/provider-local-sync.js +2 -2
- package/dist/config/providers-config.js +95 -10
- package/dist/config/providers-import.js +4 -6
- package/dist/config/providers.js +14 -3
- package/dist/config/role-store.js +1 -1
- package/dist/config/schema-migration.js +123 -16
- package/dist/config/schema-registry.js +6 -2
- package/dist/config-store.js +9 -1
- package/dist/core/agent-application-service.js +56 -29
- package/dist/core/agent-create-status.js +3 -1
- package/dist/core/agent-creation-claim.js +1 -0
- package/dist/core/agent-ipc-registration.js +2 -2
- package/dist/core/agent-reload-coordinator.js +38 -1
- package/dist/core/agent-runtime.js +91 -43
- package/dist/core/auth/agent-delegation.js +13 -3
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +2 -2
- package/dist/core/auth/operation-catalog.js +3 -3
- package/dist/core/bootstrap-service.js +3 -0
- package/dist/core/capability/capability-manager.js +3 -1
- package/dist/core/channel-loader.js +29 -3
- package/dist/core/channel-runtime.js +1 -1
- package/dist/core/command/agent-control.js +6 -5
- package/dist/core/command/agent-template-menu.js +32 -97
- package/dist/core/command/eventcenter-menu.js +61 -13
- package/dist/core/command/menu-catalog.js +11 -4
- package/dist/core/command/menu-handler.js +39 -12
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/slash-handler.js +4 -6
- package/dist/core/command/team-workspace-bootstrap.js +1 -2
- package/dist/core/command/team-workspace-management-store.js +83 -0
- package/dist/core/command/team-workspace-management.js +1 -2
- package/dist/core/command/team-workspace-team.js +26 -3
- package/dist/core/daemon-bootstrap.js +11 -9
- package/dist/core/daemon-control.js +4 -7
- package/dist/core/daemon-lifecycle.js +189 -143
- package/dist/core/evolagent-registry.js +50 -2
- package/dist/core/evolagent.js +2 -1
- package/dist/core/file-integrity/read.js +9 -16
- package/dist/core/file-integrity/store.js +94 -34
- package/dist/core/handoff/dispatcher.js +33 -7
- package/dist/core/handoff/runtime.js +8 -0
- package/dist/core/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/initialization/service.js +22 -4
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +7 -3
- package/dist/core/memory/consolidation.js +6 -6
- package/dist/core/message/aun-ipc-sender.js +109 -7
- package/dist/core/message/contact-admission.js +6 -2
- package/dist/core/message/message-bridge.js +13 -0
- package/dist/core/message/message-queue.js +131 -30
- package/dist/core/message/pending-hints.js +8 -0
- package/dist/core/message/response-engine.js +48 -2
- package/dist/core/message/send-routing.js +3 -12
- package/dist/core/model/catalog-service.js +13 -0
- package/dist/core/model/model-catalog.js +57 -18
- package/dist/core/ownership/owner-resolver.js +27 -10
- package/dist/core/pack-auth.js +163 -31
- package/dist/core/pack-install.js +42 -1
- package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
- package/dist/core/permission/ec-command-parser.js +3 -1
- package/dist/core/permission/shell-environment.js +23 -0
- package/dist/core/rate-window.js +6 -1
- package/dist/core/relation/peer-identity.js +5 -1
- package/dist/core/relation/same-owner-proof.js +2 -1
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/session-file-health.js +36 -7
- package/dist/core/session/session-idle-monitor.js +0 -1
- package/dist/core/session/session-manager.js +14 -0
- package/dist/core/session/session-title.js +26 -6
- package/dist/core/skill/index-generator.js +3 -4
- package/dist/core/task/task-image-resources.js +1 -1
- package/dist/core/thread/thread-service.js +0 -1
- package/dist/core/thread/topic-id.js +8 -0
- package/dist/directory/owner-directory-admission.js +17 -0
- package/dist/directory/owner-directory-cache.js +3 -1
- package/dist/directory/owner-directory-markdown.js +145 -23
- package/dist/directory/owner-directory-policy.js +23 -0
- package/dist/directory/owner-directory-query-operation.js +20 -6
- package/dist/directory/owner-directory-search.js +47 -0
- package/dist/eck/message-renderer.js +171 -32
- package/dist/ecweb/basic-settings-service.js +7 -3
- package/dist/ecweb/providers-service.js +17 -10
- package/dist/ecweb/runtime/lifecycle.js +65 -16
- package/dist/ecweb/runtime/supervisor.js +79 -50
- package/dist/event-center/admission-materializer.js +1 -1
- package/dist/event-center/bus-gate.js +48 -4
- package/dist/event-center/bus-host.js +3 -3
- package/dist/event-center/center-config.js +57 -28
- package/dist/event-center/dispatcher.js +8 -0
- package/dist/event-center/event-log.js +69 -27
- package/dist/event-center/index-generator.js +6 -1
- package/dist/event-center/ipc-operation.js +66 -25
- package/dist/event-center/pack-loader.js +12 -55
- package/dist/event-center/pack-manager.js +5 -3
- package/dist/event-center/registry.js +48 -52
- package/dist/event-center/runtime.js +219 -81
- package/dist/event-center/script-runner.js +18 -7
- package/dist/event-center/types.js +9 -1
- package/dist/event-center/validation.js +33 -4
- package/dist/index.js +132 -75
- package/dist/ipc.js +35 -8
- package/dist/product.js +1 -0
- package/dist/proxy/manager.js +52 -11
- package/dist/proxy/service-supervisor.js +265 -67
- package/dist/services/dispatcher.js +26 -3
- package/dist/services/idempotency.js +128 -0
- package/dist/services/identity.js +3 -27
- package/dist/services/index-generator.js +5 -1
- package/dist/services/index.js +244 -45
- package/dist/services/ipc-operation.js +164 -20
- package/dist/services/pack-manager.js +37 -9
- package/dist/services/router.js +100 -31
- package/dist/services/script-runner.js +15 -4
- package/dist/services/service-payload.js +50 -2
- package/dist/services/validation.js +107 -3
- package/dist/trigger/scheduler.js +18 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/trigger/state.js +7 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +59 -16
- package/dist/utils/error-utils.js +26 -1
- package/dist/utils/instance-registry.js +94 -35
- package/dist/utils/process-introspect.js +187 -27
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/upgrade-jobs.js +4 -4
- package/dist/utils/windows-shell-trust.js +174 -68
- package/kits/docs/context-assembly.md +3 -3
- package/kits/docs/evolcore/agent.md +28 -10
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +22 -0
- package/kits/docs/evolcore/directory.md +46 -12
- package/kits/docs/evolcore/event-center.md +6 -6
- package/kits/docs/evolcore/group-collaboration.md +1 -1
- package/kits/docs/evolcore/menu-client.md +7 -5
- package/kits/docs/evolcore/menu-protocol.md +5 -3
- package/kits/docs/evolcore/msg.md +10 -3
- package/kits/docs/evolcore/provider.md +17 -5
- package/kits/docs/evolcore/services.md +145 -12
- package/kits/docs/evolcore/thread-chain.md +17 -9
- package/kits/docs/prompt-loading-architecture.md +4 -4
- package/kits/eck_message_manifest.json +46 -3
- package/kits/rules/04-relation.md +10 -2
- package/kits/rules/06-channel.md +2 -1
- package/kits/schemas/providers.schema.2.json +1 -0
- package/kits/skills/ec-group/SKILL.md +4 -0
- package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
- package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
- package/kits/skills/thread-ops/SKILL.md +8 -5
- package/kits/templates/message-fragments/group-batch-item.md +3 -0
- package/kits/templates/message-fragments/group-batch.md +1 -0
- package/kits/templates/message-fragments/item-group.md +4 -0
- package/kits/templates/message-fragments/item-private.md +4 -0
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +11 -7
- package/package.json +3 -2
- package/scripts/agent-template/index.mjs +9 -4
- package/scripts/agent-template/inspect.mjs +16 -9
- package/scripts/agent-template/shared/plan.mjs +3 -33
- package/scripts/agent-template/shared/template-contract.mjs +186 -3
- package/scripts/agent-template/shared/template-package.mjs +119 -10
- package/scripts/agent-template/shared/template-runtime.mjs +49 -6
- package/scripts/agent-template/shared/template.mjs +5 -5
- package/scripts/agent-template/team-pack.mjs +245 -0
- package/scripts/agent-template/team-preview.mjs +111 -0
- package/scripts/aid-batch/identity-batch.mjs +143 -0
- package/dist/ability/versions.js +0 -32
- package/dist/aun/model-headers.js +0 -17
- package/dist/channels/builtin-plugins.js +0 -19
- package/dist/core/command/team-workspace-initializer.js +0 -2
- package/dist/core/command/team-workspace-job-store.js +0 -88
- package/dist/core/command/team-workspace-management-service.js +0 -2
- package/dist/core/contact-bind-registry.js +0 -27
- package/dist/event-center/ledger.js +0 -52
- package/dist/services/reply.js +0 -55
- package/kits/templates/message-fragments/item.md +0 -3
- package/scripts/agent-template/pack.mjs +0 -169
|
@@ -4,7 +4,7 @@ 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 { normalizeTeam, normalizeTeamSchema, validateContractSchema, readTeamSchema } from './template-contract.mjs';
|
|
7
|
+
import { normalizeTeam, normalizeTeamSchema, validateContractSchema, readTeamSchema, packageSchema, contractDigest, canonicalJson, validateBuildSelection } from './template-contract.mjs';
|
|
8
8
|
import { BASEAGENTS } from './template-runtime.mjs';
|
|
9
9
|
|
|
10
10
|
export const PACKAGE_LIMITS = { file: 20 * 1024 * 1024, total: 200 * 1024 * 1024, entries: 20000 };
|
|
@@ -107,9 +107,7 @@ export function inspectTemplatePackage(bytes, { digest } = {}) {
|
|
|
107
107
|
const entries = decodePackageEntries(bytes);
|
|
108
108
|
const read = name => { check(entries.has(name), 'Missing package entry: ' + name, 'INTEGRITY_FAILED'); return JSON.parse(entries.get(name).bytes.toString('utf8')); };
|
|
109
109
|
const metadata = read('PACKAGE.json'); const manifest = read('MANIFEST.json');
|
|
110
|
-
check(
|
|
111
|
-
&& metadata.name.length <= 64 && record(metadata.compat) && typeof metadata.compat.evolcore === 'string'
|
|
112
|
-
&& metadata.compat.evolcore.length > 0, 'Invalid package metadata', 'INTEGRITY_FAILED');
|
|
110
|
+
check(!validateContractSchema(metadata, packageSchema).length, 'Invalid package v2 metadata', 'INTEGRITY_FAILED');
|
|
113
111
|
check(Array.isArray(manifest) && manifest.length && entries.size === manifest.length + 2, 'Invalid manifest', 'INTEGRITY_FAILED');
|
|
114
112
|
const seen = new Set();
|
|
115
113
|
for (const entry of manifest) {
|
|
@@ -124,15 +122,119 @@ export function inspectTemplatePackage(bytes, { digest } = {}) {
|
|
|
124
122
|
const team = normalized.team; const schema = normalizeTeamSchema(read('template/team.schema.json'));
|
|
125
123
|
const errors = validateContractSchema(team, schema);
|
|
126
124
|
check(!errors.length, errors.join('; '));
|
|
127
|
-
const platforms = metadata.compat.platforms;
|
|
128
|
-
check(Array.isArray(platforms) && platforms.length === team.host.platform.length
|
|
129
|
-
&& new Set(platforms).size === platforms.length && platforms.every(p => team.host.platform.includes(p)), 'Conflicting platform metadata', 'INTEGRITY_FAILED');
|
|
130
125
|
const keys = team.agents.map(agent => agent.key);
|
|
131
126
|
for (const { path: name } of manifest) check(portableFile(name, keys), 'Unsupported portable resource: ' + name);
|
|
132
127
|
return { metadata, team, schema, entries, digest: actual, changes: normalized.changes,
|
|
133
128
|
resources: manifest.map(({ path: name, size }) => ({ path: name, size })) };
|
|
134
129
|
}
|
|
135
130
|
|
|
131
|
+
/** Directory adapter: reads exactly one keyed member and snapshots all source bytes/permissions. */
|
|
132
|
+
export function collectTemplateDirectory(templateDir, memberKey) {
|
|
133
|
+
regularAncestors(templateDir);
|
|
134
|
+
const { tpl, errors } = loadTemplate(templateDir);
|
|
135
|
+
check(!errors.length, errors.join('; '));
|
|
136
|
+
check(tpl.keys.includes(memberKey), 'Unknown directory member: ' + memberKey);
|
|
137
|
+
const excluded = [];
|
|
138
|
+
const readOptional = relative => {
|
|
139
|
+
const file = path.join(tpl.root, ...relative.split('/'));
|
|
140
|
+
return fs.existsSync(file) ? JSON.parse(fs.readFileSync(file, 'utf8')) : {};
|
|
141
|
+
};
|
|
142
|
+
const defaults = readOptional('.evolcore/agents/defaults.json');
|
|
143
|
+
const providers = readOptional('.evolcore/providers.json').providers ?? {};
|
|
144
|
+
const member = structuredClone(tpl.team.agents.find(agent => agent.key === memberKey));
|
|
145
|
+
const source = { ...structuredClone(defaults), ...member.config,
|
|
146
|
+
baseagents: { ...defaults.baseagents, ...member.config?.baseagents } };
|
|
147
|
+
const config = {};
|
|
148
|
+
for (const name of ['chatmode', 'memory']) if (source[name] !== undefined) config[name] = source[name];
|
|
149
|
+
config.active_baseagent = source.active_baseagent ?? 'claude'; config.baseagents = {};
|
|
150
|
+
for (const [name, sourceBlock] of Object.entries(source.baseagents)) {
|
|
151
|
+
const block = { ...defaults.baseagents?.[name], ...sourceBlock };
|
|
152
|
+
check(BASEAGENTS.includes(name) && record(block), 'Invalid baseagent block');
|
|
153
|
+
const ref = typeof block.provider === 'string' ? { id: block.provider, name: providers[block.provider]?.name ?? block.provider } : block.provider;
|
|
154
|
+
check(record(ref) && /^provider-[0-9]{8}$/.test(ref.id), 'Provider identity required: ' + memberKey + '/' + name);
|
|
155
|
+
config.baseagents[name] = { provider: { id: ref.id, ...(ref.name !== undefined ? { name: ref.name } : {}) } };
|
|
156
|
+
for (const field of ['model', 'effort', 'params']) if (block[field] !== undefined) config.baseagents[name][field] = structuredClone(block[field]);
|
|
157
|
+
}
|
|
158
|
+
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)) excluded.push('members/' + memberKey + '/config/' + field);
|
|
160
|
+
member.config = config;
|
|
161
|
+
const entries = new Map(); const snapshot = [];
|
|
162
|
+
for (const relative of tpl.files) {
|
|
163
|
+
const name = relative.split(path.sep).join('/');
|
|
164
|
+
const file = path.join(tpl.root, relative);
|
|
165
|
+
const stat = fs.statSync(file); const bytes = fs.readFileSync(file);
|
|
166
|
+
snapshot.push({ path: name, mode: stat.mode & 0o777, digest: packageDigest(bytes), size: bytes.length });
|
|
167
|
+
if (['team.json', 'team.schema.json'].includes(name)) continue;
|
|
168
|
+
if (!portableFile(name, [memberKey])) { excluded.push(name); continue; }
|
|
169
|
+
entries.set(name, { bytes, mode: stat.mode & 0o777 });
|
|
170
|
+
}
|
|
171
|
+
const resources = { baseagents: Object.keys(config.baseagents).sort(), triggers: [], skills: [], files: [] };
|
|
172
|
+
for (const name of entries.keys()) {
|
|
173
|
+
if (name.startsWith('workspace/' + memberKey + '/')) resources.files.push(name.slice(('workspace/' + memberKey + '/').length));
|
|
174
|
+
if (name.startsWith('agents/' + memberKey + '/triggers/')) resources.triggers.push(name.split('/')[3]);
|
|
175
|
+
if (name.startsWith('.evolcore/skills/')) resources.skills.push(name.split('/')[2]);
|
|
176
|
+
}
|
|
177
|
+
resources.skills.push(...Object.keys(member.skills ?? {}));
|
|
178
|
+
for (const kind of Object.keys(resources)) resources[kind] = [...new Set(resources[kind])].sort();
|
|
179
|
+
return { member, entries, excluded, platforms: [...tpl.team.host.platform].sort(),
|
|
180
|
+
sourceDigest: contractDigest({ snapshot, member, metadata: { name: tpl.team.name, version: tpl.team.version } }), resources,
|
|
181
|
+
defaultBaseagent: config.active_baseagent, warnings: [] };
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
/** One pure package planner for both runtime-agent and directory collection adapters. */
|
|
185
|
+
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,
|
|
187
|
+
...(metadata.description !== undefined ? { description: metadata.description } : {}), host: { platform: structuredClone(metadata.platforms) }, agents: [] };
|
|
188
|
+
const entries = new Map(); const excluded = []; const external = new Set(externalAids);
|
|
189
|
+
for (const [key, collected] of Object.entries(members)) {
|
|
190
|
+
const { member, include } = collected;
|
|
191
|
+
check(record(member) && record(include), 'Collected member and selection required');
|
|
192
|
+
check(include.baseagents.includes(member.config?.active_baseagent), 'Default baseagent is required: ' + key);
|
|
193
|
+
const chosen = structuredClone(member);
|
|
194
|
+
chosen.config.baseagents = Object.fromEntries(Object.entries(chosen.config.baseagents).filter(([name]) => include.baseagents.includes(name)));
|
|
195
|
+
chosen.skills = Object.fromEntries(Object.entries(chosen.skills ?? {}).filter(([name]) => include.skills.includes(name)));
|
|
196
|
+
team.agents.push({ ...chosen, key });
|
|
197
|
+
excluded.push(...(collected.excluded ?? []));
|
|
198
|
+
for (const [name, entry] of collected.entries) {
|
|
199
|
+
packagePath(name);
|
|
200
|
+
check(portableFile(name, [key]), 'Unsupported collected resource: ' + name);
|
|
201
|
+
const selected = name.startsWith('workspace/') ? include.files.includes(name.slice(('workspace/' + key + '/').length))
|
|
202
|
+
: name.startsWith('.evolcore/skills/') ? include.skills.includes(name.split('/')[2])
|
|
203
|
+
: name.startsWith('agents/' + key + '/triggers/') ? include.triggers.includes(name.split('/')[3]) : true;
|
|
204
|
+
if (!selected) { excluded.push(name); continue; }
|
|
205
|
+
const target = 'template/' + name;
|
|
206
|
+
if (entries.has(target)) check(entries.get(target).bytes.equals(entry.bytes) && entries.get(target).mode === entry.mode, 'Conflicting shared resource', 'SOURCE_CHANGED');
|
|
207
|
+
entries.set(target, { bytes: Buffer.from(entry.bytes), mode: entry.mode });
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
const normalized = normalizeTeam(team);
|
|
211
|
+
check(!normalized.errors.length, normalized.errors.join('; '));
|
|
212
|
+
entries.set('template/team.json', { bytes: json(team), mode: 0o644 });
|
|
213
|
+
entries.set('template/team.schema.json', { bytes: json(readTeamSchema()), mode: 0o644 });
|
|
214
|
+
for (const [name, entry] of entries) {
|
|
215
|
+
if (entry.bytes.includes(0) || !Buffer.from(entry.bytes.toString('utf8')).equals(entry.bytes)) continue;
|
|
216
|
+
for (const line of entry.bytes.toString('utf8').split('\n')) {
|
|
217
|
+
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
|
+
'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
|
+
}
|
|
223
|
+
}
|
|
224
|
+
const info = { $schema_version: 1, id: metadata.id, name: metadata.name, version: metadata.version,
|
|
225
|
+
...(publisher !== undefined ? { publisher: structuredClone(publisher) } : {}), ...(createdAt !== undefined ? { createdAt } : {}),
|
|
226
|
+
...(metadata.description !== undefined ? { description: metadata.description } : {}),
|
|
227
|
+
compat: { platforms: structuredClone(metadata.platforms), evolcore: evolcoreRange, baseagents: [...new Set(team.agents.flatMap(member => Object.keys(member.config.baseagents)))].sort() },
|
|
228
|
+
externalAids: [...external].sort() };
|
|
229
|
+
const manifest = [...entries].map(([name, entry]) => ({ path: name.slice('template/'.length), size: entry.bytes.length, sha256: packageDigest(entry.bytes).slice(7) }));
|
|
230
|
+
entries.set('PACKAGE.json', { bytes: json(info), mode: 0o644 });
|
|
231
|
+
entries.set('MANIFEST.json', { bytes: json(manifest), mode: 0o644 });
|
|
232
|
+
const bytes = encodePackageEntries(entries);
|
|
233
|
+
inspectTemplatePackage(bytes);
|
|
234
|
+
return { bytes, metadata: info, digest: packageDigest(bytes), excluded: [...new Set(excluded)].sort(),
|
|
235
|
+
scan: { findings: [] }, filename: metadata.id + '-' + metadata.version + '.ectpl' };
|
|
236
|
+
}
|
|
237
|
+
|
|
136
238
|
/** Export behavior/resources only; credentials and host infrastructure never enter the share package. */
|
|
137
239
|
export function exportTemplatePackage(templateDir, { publisher, createdAt = Date.now(), evolcoreRange = '>=0.0.43' } = {}) {
|
|
138
240
|
regularAncestors(templateDir);
|
|
@@ -178,19 +280,26 @@ export function exportTemplatePackage(templateDir, { publisher, createdAt = Date
|
|
|
178
280
|
entries.set('template/team.json', { bytes: json(team), mode: 0o644 });
|
|
179
281
|
entries.set('template/team.schema.json', { bytes: json(readTeamSchema()), mode: 0o644 });
|
|
180
282
|
const external = new Set();
|
|
283
|
+
let memberReferences = false;
|
|
181
284
|
for (const [name, entry] of entries) {
|
|
182
285
|
if (entry.bytes.includes(0) || !Buffer.from(entry.bytes.toString('utf8')).equals(entry.bytes)) continue;
|
|
183
286
|
for (const line of entry.bytes.toString('utf8').split('\n')) {
|
|
287
|
+
memberReferences ||= /\{\{\s*members\./.test(line);
|
|
184
288
|
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),
|
|
185
289
|
'Credential content in portable resource: ' + name, 'SENSITIVE_CONTENT');
|
|
186
290
|
for (const aid of line.match(/[a-z0-9][a-z0-9_-]*\.(?:[a-z0-9-]+\.)+[a-z]{2,}/gi) ?? []) {
|
|
187
|
-
if (!line.includes('://' + aid) && !aid.startsWith('www.')) external.add(aid);
|
|
291
|
+
if (!line.includes('://' + aid) && !aid.startsWith('www.') && !line.includes('{{' + aid + '}}') && !new RegExp('\\{\\{\\s*' + aid.replaceAll('.', '\\.') + '\\s*\\}\\}').test(line)) external.add(aid);
|
|
188
292
|
}
|
|
189
293
|
}
|
|
190
294
|
}
|
|
295
|
+
// Older readers normalize test builds to the final version. The upper bound
|
|
296
|
+
// makes those readers reject member references instead of leaving old AIDs.
|
|
297
|
+
if (memberReferences && evolcoreRange === '>=0.0.43') evolcoreRange = '>=0.0.43-test.8 <0.0.43 || >=0.0.44';
|
|
191
298
|
const metadata = { $schema_version: 1, id: team.name, name: team.title ?? team.name, version: team.version,
|
|
192
299
|
...(team.description !== undefined ? { description: team.description } : {}), ...(publisher ? { publisher } : {}), createdAt,
|
|
193
|
-
compat: { platforms: team.host.platform, evolcore: evolcoreRange,
|
|
300
|
+
compat: { platforms: team.host.platform, evolcore: evolcoreRange,
|
|
301
|
+
...(memberReferences ? { templateFeatures: ['member-references-v1'] } : {}),
|
|
302
|
+
baseagents: [...new Set(team.agents.flatMap(agent => Object.keys(agent.config.baseagents)))] }, externalAids: [...external].sort() };
|
|
194
303
|
const manifest = [...entries].map(([name, entry]) => ({ path: name.slice('template/'.length), size: entry.bytes.length, sha256: packageDigest(entry.bytes).slice(7) }));
|
|
195
304
|
entries.set('PACKAGE.json', { bytes: json(metadata), mode: 0o644 });
|
|
196
305
|
entries.set('MANIFEST.json', { bytes: json(manifest), mode: 0o644 });
|
|
@@ -244,7 +353,7 @@ export function attachBuildEnvironment(templateDir, sourceDir) {
|
|
|
244
353
|
check(!base.errors.length, 'Invalid build environment: ' + base.errors.join('; '));
|
|
245
354
|
const teamFile = path.join(templateDir, 'team.json');
|
|
246
355
|
const team = JSON.parse(fs.readFileSync(teamFile, 'utf8'));
|
|
247
|
-
if (base.tpl.team.host
|
|
356
|
+
if (base.tpl.team.host?.config !== undefined) team.host.config = structuredClone(base.tpl.team.host.config);
|
|
248
357
|
if (base.tpl.team.issuer !== undefined) team.issuer = base.tpl.team.issuer;
|
|
249
358
|
for (const name of ['providers.json', 'agents/defaults.json', '.env']) {
|
|
250
359
|
const source = path.join(base.tpl.root, '.evolcore', ...name.split('/'));
|
|
@@ -4,15 +4,19 @@ const record = value => value !== null && typeof value === 'object' && !Array.is
|
|
|
4
4
|
const fail = message => { throw Object.assign(new Error(message), { code: 'INVALID_ARGUMENT' }); };
|
|
5
5
|
|
|
6
6
|
export function renderText(text, vars = {}, externalAids = {}) {
|
|
7
|
-
let out = text
|
|
8
|
-
|
|
7
|
+
let out = text;
|
|
8
|
+
const interpolate = value => value.replace(/\{\{\s*([a-z]+\.[a-z]+|members\.[a-z0-9][a-z0-9_-]{0,31}\.(?:aid|project))\s*\}\}/g,
|
|
9
|
+
(token, key) => {
|
|
10
|
+
if (key.startsWith('members.') && !Object.hasOwn(vars, key)) fail('Unknown team member reference: ' + key);
|
|
11
|
+
return Object.hasOwn(vars, key) ? String(vars[key]) : token;
|
|
12
|
+
});
|
|
9
13
|
// One pass avoids cascading A -> B -> C substitutions.
|
|
10
14
|
const keys = Object.keys(externalAids).sort((a, b) => b.length - a.length);
|
|
11
15
|
if (keys.length) {
|
|
12
16
|
const pattern = keys.map(key => key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
|
|
13
|
-
out = out.replace(new RegExp(pattern, 'g'), match => String(externalAids[match]));
|
|
17
|
+
out = out.replace(new RegExp('(?<![a-zA-Z0-9_.-])(?:' + pattern + ')(?![a-zA-Z0-9_.-])', 'g'), match => String(externalAids[match]));
|
|
14
18
|
}
|
|
15
|
-
return out;
|
|
19
|
+
return interpolate(out);
|
|
16
20
|
}
|
|
17
21
|
|
|
18
22
|
/** Parse JSON first, then render string values so quotes/newlines cannot change types or structure. */
|
|
@@ -39,7 +43,7 @@ export function providerUsable(providers, id, baseagent) {
|
|
|
39
43
|
}
|
|
40
44
|
|
|
41
45
|
/** Match by exact stable ID, never by display name. Missing matches can be previewed, not installed. */
|
|
42
|
-
export function bindTemplateProviders(config, { providers = {}, defaults = {}, selections = {}, allowMissing = false } = {}) {
|
|
46
|
+
export function bindTemplateProviders(config, { providers = {}, defaults = {}, selections = {}, allowMissing = false, modelCatalog } = {}) {
|
|
43
47
|
if (!record(config) || !record(providers) || !record(defaults) || !record(selections)) fail('Invalid Provider binding input');
|
|
44
48
|
const out = structuredClone(config);
|
|
45
49
|
const blocks = out.baseagents ?? {};
|
|
@@ -58,9 +62,17 @@ export function bindTemplateProviders(config, { providers = {}, defaults = {}, s
|
|
|
58
62
|
if (ref !== undefined && (!record(ref) || typeof ref.id !== 'string')) fail('Provider identity required: ' + name);
|
|
59
63
|
if (select.provider !== undefined && (typeof select.provider !== 'string' || !select.provider)) fail('Invalid selected Provider: ' + name);
|
|
60
64
|
if (select.model !== undefined && (typeof select.model !== 'string' || !select.model.trim())) fail('Invalid model: ' + name);
|
|
61
|
-
if (select.effort !== undefined && select.effort !== null &&
|
|
65
|
+
if (select.effort !== undefined && select.effort !== null && (typeof select.effort !== 'string' || !select.effort)) fail('Invalid effort: ' + name);
|
|
62
66
|
const selected = select.provider ?? ref?.id;
|
|
63
67
|
const usable = providerUsable(providers, selected, name);
|
|
68
|
+
const model = select.model ?? block.model ?? defaults.baseagents?.[name]?.model;
|
|
69
|
+
const effort = Object.hasOwn(select, 'effort') ? select.effort : block.effort;
|
|
70
|
+
if (modelCatalog && usable) {
|
|
71
|
+
const catalog = typeof modelCatalog === 'function' ? modelCatalog({ provider: selected, baseagent: name }) : modelCatalog[selected]?.[name];
|
|
72
|
+
const definition = Array.isArray(catalog) ? catalog.find(item => (typeof item === 'string' ? item : item.id) === model) : catalog?.[model];
|
|
73
|
+
if (!definition) throw Object.assign(new Error('Model is not in the selected Provider catalog: ' + model), { code: 'UNRESOLVED' });
|
|
74
|
+
if (effort !== undefined && effort !== null && (!Array.isArray(definition.efforts) || !definition.efforts.includes(effort))) fail('Effort is unsupported by model: ' + model);
|
|
75
|
+
}
|
|
64
76
|
refs.push({ baseagent: name, template: { ...(ref ?? {}), model: block.model, effort: block.effort },
|
|
65
77
|
match: usable ? 'reused' : 'select', provider: usable ? selected : null });
|
|
66
78
|
if (!usable && (!allowMissing || select.provider !== undefined)) {
|
|
@@ -78,3 +90,34 @@ export function bindTemplateProviders(config, { providers = {}, defaults = {}, s
|
|
|
78
90
|
}
|
|
79
91
|
return { config: out, refs };
|
|
80
92
|
}
|
|
93
|
+
|
|
94
|
+
export const MEMBER_KEY = /^[a-z0-9][a-z0-9_-]{0,31}$/;
|
|
95
|
+
|
|
96
|
+
export function teamMemberVariables(members, ownerAid, hostAid) {
|
|
97
|
+
if (!record(members) || !Object.keys(members).length) fail('Team members required');
|
|
98
|
+
const variables = { 'owner.aid': ownerAid, 'host.aid': hostAid };
|
|
99
|
+
const aids = new Set();
|
|
100
|
+
for (const [key, member] of Object.entries(members)) {
|
|
101
|
+
if (!MEMBER_KEY.test(key) || !record(member) || typeof member.aid !== 'string' || !member.aid
|
|
102
|
+
|| aids.has(member.aid) || typeof member.projectPath !== 'string' || !member.projectPath) fail('Invalid or duplicate member context: ' + key);
|
|
103
|
+
aids.add(member.aid);
|
|
104
|
+
variables['members.' + key + '.aid'] = member.aid;
|
|
105
|
+
variables['members.' + key + '.project'] = member.projectPath;
|
|
106
|
+
}
|
|
107
|
+
return Object.fromEntries(Object.entries(members).map(([key, member]) => [key,
|
|
108
|
+
{ ...variables, 'agent.aid': member.aid, 'project.path': member.projectPath }]));
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export function planMemberConfig({ member, vars, providers, defaults = {}, selections = {}, allowMissing = false, modelCatalog, mode = 'create_prebuilt' }) {
|
|
112
|
+
if (!record(member) || !MEMBER_KEY.test(member.key) || !record(vars)) fail('Invalid member plan');
|
|
113
|
+
if (!['create_prebuilt', 'create_on_host', 'overlay_existing'].includes(mode)) fail('Invalid member plan mode');
|
|
114
|
+
const rendered = renderValue(member, vars);
|
|
115
|
+
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 ?? {}, { providers, defaults, selections, allowMissing, modelCatalog });
|
|
118
|
+
return { key: member.key, profile: rendered.profile, skills: rendered.skills ?? {}, config: binding.config, providers: binding.refs };
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export function renderMemberResource(bytes, relative, vars) {
|
|
122
|
+
return renderResource(bytes, vars, {}, { json: relative.endsWith('.json') });
|
|
123
|
+
}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* │ └── skills/<技能名>/ 本机技能,所有 agent 共用
|
|
11
11
|
* ├── agents/<key>/ 每个 agent 的资源(不含配置)
|
|
12
12
|
* │ ├── personal/soul/*.md
|
|
13
|
-
* │ └── triggers/<id>/trigger.json 可用 {{
|
|
13
|
+
* │ └── triggers/<id>/trigger.json 可用 {{members.<key>.aid}} {{owner.aid}} {{host.aid}}
|
|
14
14
|
* └── workspace/<key>/ 可选:该项目目录的初始内容
|
|
15
15
|
*
|
|
16
16
|
* 配置不进模板文件:agent config.json 与 daemon.json 由 pa-team-build 按 team.json 的
|
|
@@ -82,12 +82,12 @@ 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.name
|
|
86
|
-
const version = team.version
|
|
85
|
+
const name = team.name;
|
|
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
|
-
const keys =
|
|
88
|
+
const keys = team.agents.map(agent => agent.key);
|
|
89
89
|
if (keys.length === 0 || !keys.every(k => typeof k === 'string' && KEY_RE.test(k))) {
|
|
90
|
-
errors.push('team.json agents
|
|
90
|
+
errors.push('team.json agents keys are required and must be path-safe');
|
|
91
91
|
}
|
|
92
92
|
if (!schema || schema.type !== 'object') errors.push('team.schema.json must be a JSON Schema object');
|
|
93
93
|
|
|
@@ -0,0 +1,245 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { inspectAgent } from './inspect.mjs';
|
|
4
|
+
import { assert, isRecord, inside, walkFiles, jsonBytes, sha256, atomicBytes, regularPath,
|
|
5
|
+
readJson, behaviorConfig, BASEAGENTS, PROFILE_FIELDS } from './shared/common.mjs';
|
|
6
|
+
import { loadTemplate } from './shared/template.mjs';
|
|
7
|
+
import { normalizeTeam, readTeamSchema } from './shared/template-contract.mjs';
|
|
8
|
+
import { collectTemplateDirectory, buildTemplatePackage, excludedResource as excluded } from './shared/template-package.mjs';
|
|
9
|
+
|
|
10
|
+
function entries(options) {
|
|
11
|
+
assert(isRecord(options.members) && Object.keys(options.members).length, 'INVALID_ARGUMENT', 'Members required');
|
|
12
|
+
const entries = Object.entries(options.members).sort(([a], [b]) => a.localeCompare(b));
|
|
13
|
+
assert(entries.every(([key]) => /^[a-z0-9][a-z0-9_-]{0,31}$/.test(key)), 'INVALID_ARGUMENT', 'Invalid member key');
|
|
14
|
+
const aids = entries.filter(([, source]) => source.kind !== 'directory').map(([, source]) => source.agentAid);
|
|
15
|
+
assert(new Set(aids).size === aids.length, 'INVALID_ARGUMENT', 'Agent sources must be distinct');
|
|
16
|
+
return entries;
|
|
17
|
+
}
|
|
18
|
+
const runtimeNames = new Set(['AIDs', 'agents', 'data', 'logs', 'backups', 'eck', 'directory', 'sessions']);
|
|
19
|
+
function projectFiles(source) {
|
|
20
|
+
return walkFiles(source.projectPath, relative => excluded(relative)
|
|
21
|
+
|| source.projectPath === source.home && runtimeNames.has(relative.split('/')[0]));
|
|
22
|
+
}
|
|
23
|
+
function directory(source, key) {
|
|
24
|
+
const { tpl, errors } = loadTemplate(source.path);
|
|
25
|
+
assert(!errors.length && tpl.team.agents.some(member => member.key === key), 'INVALID_ARGUMENT', errors.join('; ') || 'Directory member missing');
|
|
26
|
+
return { tpl, member: tpl.team.agents.find(member => member.key === key) };
|
|
27
|
+
}
|
|
28
|
+
function sourceSnapshot(selected) {
|
|
29
|
+
const values = [];
|
|
30
|
+
for (const [key, source] of selected) {
|
|
31
|
+
const add = file => {
|
|
32
|
+
regularPath(file); values.push([key, file, sha256(fs.readFileSync(file)), fs.statSync(file).mode & 0o777]);
|
|
33
|
+
};
|
|
34
|
+
if (source.kind === 'directory') {
|
|
35
|
+
for (const relative of walkFiles(source.path)) add(inside(source.path, relative));
|
|
36
|
+
} else {
|
|
37
|
+
values.push([key, source.profile, source.profileVersion, source.effectiveConfig, source.skills]);
|
|
38
|
+
add(path.join(source.agentDir, 'config.json'));
|
|
39
|
+
const personal = path.join(source.agentDir, 'personal');
|
|
40
|
+
for (const relative of walkFiles(personal)) if (relative === 'welcome.md' || relative.startsWith('soul/') && relative.endsWith('.md')) add(inside(personal, relative));
|
|
41
|
+
const triggers = path.join(source.agentDir, 'triggers');
|
|
42
|
+
for (const relative of walkFiles(triggers)) if (relative !== 'active.json' && !relative.endsWith('/active.json')) add(inside(triggers, relative));
|
|
43
|
+
for (const skill of source.skills ?? []) if (skill.type === 'local' && skill.enabled) {
|
|
44
|
+
const root = inside(path.join(source.home, 'skills'), skill.name);
|
|
45
|
+
for (const relative of walkFiles(root)) add(inside(root, relative));
|
|
46
|
+
}
|
|
47
|
+
for (const relative of projectFiles(source)) add(inside(source.projectPath, relative));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return sha256(jsonBytes(values));
|
|
51
|
+
}
|
|
52
|
+
export async function inspectCollection(options) {
|
|
53
|
+
const selected = entries(options); const snapshot = sourceSnapshot(selected); const members = {};
|
|
54
|
+
let platforms = ['linux', 'darwin', 'win32'];
|
|
55
|
+
for (const [key, source] of selected) {
|
|
56
|
+
if (source.kind === 'directory') {
|
|
57
|
+
const { tpl, member } = directory(source, key);
|
|
58
|
+
const platform = tpl.team.host.platform;
|
|
59
|
+
members[key] = { profile: member.profile, resources: { baseagents: Object.keys(member.config.baseagents),
|
|
60
|
+
triggers: walkFiles(path.join(source.path, 'agents', key, 'triggers')).filter(file => file.endsWith('/trigger.json')).map(file => file.split('/')[0]),
|
|
61
|
+
skills: Object.keys(member.skills ?? {}), files: fs.existsSync(path.join(source.path, 'workspace', key))
|
|
62
|
+
? fs.readdirSync(path.join(source.path, 'workspace', key)).sort() : [] },
|
|
63
|
+
defaultBaseagent: member.config.active_baseagent, platforms: platform, warnings: [] };
|
|
64
|
+
platforms = platforms.filter(platformName => platform.includes(platformName));
|
|
65
|
+
} else {
|
|
66
|
+
const data = await inspectAgent(source);
|
|
67
|
+
members[key] = { profile: source.profile, resources: { baseagents: data.baseagents.map(item => item.name),
|
|
68
|
+
triggers: data.triggers.map(item => item.id), skills: data.skills.filter(item => item.type === 'local' && item.enabled).map(item => item.name),
|
|
69
|
+
files: projectFiles(source) },
|
|
70
|
+
defaultBaseagent: data.activeBaseagent, platforms: [process.platform], warnings: [] };
|
|
71
|
+
platforms = platforms.filter(platform => platform === process.platform);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
assert(snapshot === sourceSnapshot(selected), 'SOURCE_CHANGED', 'Source changed while generating inventory');
|
|
75
|
+
return { inventoryDigest: 'sha256:' + sha256(jsonBytes({ snapshot, members, platforms })), members, platforms };
|
|
76
|
+
}
|
|
77
|
+
export function validateCollectionSelection({ inventory, metadata, members }) {
|
|
78
|
+
assert(isRecord(members) && Object.keys(members).sort().join() === Object.keys(inventory.members).sort().join(),
|
|
79
|
+
'INVALID_ARGUMENT', 'Select every inventory member');
|
|
80
|
+
assert(metadata.platforms.every(platform => inventory.platforms.includes(platform)), 'INCOMPATIBLE', 'Platforms must be common to every member');
|
|
81
|
+
for (const [key, member] of Object.entries(members)) {
|
|
82
|
+
assert(isRecord(member) && Object.keys(member).length === 1 && isRecord(member.include), 'INVALID_ARGUMENT', 'Member include required');
|
|
83
|
+
for (const field of ['baseagents', 'triggers', 'skills', 'files']) {
|
|
84
|
+
const selected = member.include[field];
|
|
85
|
+
assert(Array.isArray(selected) && new Set(selected).size === selected.length
|
|
86
|
+
&& selected.every(value => inventory.members[key].resources[field].includes(value)), 'INVALID_ARGUMENT', 'Selection is outside frozen inventory: ' + key + '.' + field);
|
|
87
|
+
}
|
|
88
|
+
assert(member.include.baseagents.includes(inventory.members[key].defaultBaseagent), 'INVALID_ARGUMENT', 'Include the source default baseagent');
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
function copyDirectoryMember(root, source, key, include) {
|
|
92
|
+
const { member } = directory(source, key); const result = structuredClone(member);
|
|
93
|
+
result.config.baseagents = Object.fromEntries(Object.entries(result.config.baseagents).filter(([name]) => include.baseagents.includes(name)));
|
|
94
|
+
result.skills = Object.fromEntries(Object.entries(result.skills ?? {}).filter(([name]) => include.skills.includes(name)));
|
|
95
|
+
for (const relative of walkFiles(source.path)) {
|
|
96
|
+
const wanted = relative.startsWith('agents/' + key + '/personal/')
|
|
97
|
+
|| include.triggers.some(id => relative.startsWith('agents/' + key + '/triggers/' + id + '/'))
|
|
98
|
+
|| include.files.some(file => relative === 'workspace/' + key + '/' + file || relative.startsWith('workspace/' + key + '/' + file + '/'))
|
|
99
|
+
|| include.skills.some(name => relative.startsWith('.evolcore/skills/' + name + '/'));
|
|
100
|
+
if (wanted) {
|
|
101
|
+
const file = inside(source.path, relative);
|
|
102
|
+
atomicBytes(inside(root, relative), fs.readFileSync(file), fs.statSync(file).mode & 0o777);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return result;
|
|
106
|
+
}
|
|
107
|
+
export async function buildCollection(options) {
|
|
108
|
+
const inventory = await inspectCollection(options);
|
|
109
|
+
assert(inventory.inventoryDigest === options.inventoryDigest, 'SOURCE_CHANGED', 'Sources changed since inspect');
|
|
110
|
+
validateCollectionSelection({ inventory, metadata: options.metadata, members: options.selections });
|
|
111
|
+
const selected = entries(options); const members = {};
|
|
112
|
+
assert(!fs.existsSync(options.out), 'CONFLICT', 'Build output already exists');
|
|
113
|
+
fs.mkdirSync(options.out, { recursive: true });
|
|
114
|
+
const teamVariables = selected.filter(([, source]) => source.kind !== 'directory')
|
|
115
|
+
.flatMap(([key, source]) => [[source.agentAid, '{{members.' + key + '.aid}}'], [source.projectPath, '{{members.' + key + '.project}}']]);
|
|
116
|
+
try {
|
|
117
|
+
for (const [key, source] of selected) {
|
|
118
|
+
const include = options.selections[key].include;
|
|
119
|
+
if (source.kind === 'directory') members[key] = { ...collectTemplateDirectory(source.path, key), include };
|
|
120
|
+
else {
|
|
121
|
+
const root = path.join(options.out, 'collect', key); fs.mkdirSync(root, { recursive: true });
|
|
122
|
+
const member = await collectAgent({ ...source, include, teamVariables }, key, root);
|
|
123
|
+
const collected = new Map(walkFiles(root).map(relative => {
|
|
124
|
+
const file = inside(root, relative);
|
|
125
|
+
return [relative, { bytes: fs.readFileSync(file), mode: fs.statSync(file).mode & 0o777 }];
|
|
126
|
+
}));
|
|
127
|
+
// File selections in the inventory are complete relative files, shared with directory collection.
|
|
128
|
+
members[key] = { member, entries: collected, include, excluded: [] };
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
const built = buildTemplatePackage({ metadata: options.metadata, members, publisher: selected[0][1].publisher, createdAt: options.createdAt ?? Date.now() });
|
|
132
|
+
assert((await inspectCollection(options)).inventoryDigest === inventory.inventoryDigest, 'SOURCE_CHANGED', 'Sources changed during build');
|
|
133
|
+
const checked = (await import('./shared/template-package.mjs')).inspectTemplatePackage(built.bytes);
|
|
134
|
+
const file = path.join(options.out, built.filename); atomicBytes(file, built.bytes, 0o600);
|
|
135
|
+
fs.rmSync(path.join(options.out, 'collect'), { recursive: true, force: true });
|
|
136
|
+
return { file, metadata: { id: checked.metadata.id, name: checked.metadata.name, version: checked.metadata.version, description: checked.metadata.description, platforms: checked.metadata.compat.platforms }, members: Object.fromEntries(checked.team.agents.map(member => [member.key, member])), digest: built.digest, size: built.bytes.length,
|
|
137
|
+
externalAids: built.metadata.externalAids ?? [], scan: built.scan, excluded: built.excluded };
|
|
138
|
+
} catch (error) { fs.rmSync(options.out, { recursive: true, force: true }); throw error; }
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
export function identityText(text, options, reverse = false) {
|
|
142
|
+
if (options.teamVariables && !reverse) {
|
|
143
|
+
const mapping = new Map([...options.teamVariables, [options.ownerAid, '{{owner.aid}}'], [options.hostAid, '{{host.aid}}']].filter(([key]) => key));
|
|
144
|
+
const pattern = [...mapping.keys()].sort((a, b) => b.length - a.length).map(key => key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
|
|
145
|
+
return pattern ? text.replace(new RegExp(pattern, 'g'), value => mapping.get(value)) : text;
|
|
146
|
+
}
|
|
147
|
+
const pairs = [[options.agentAid, '{{agent.aid}}'], [options.ownerAid, '{{owner.aid}}'], [options.hostAid, '{{host.aid}}']];
|
|
148
|
+
if (options.projectPath) pairs.push([options.projectPath, '{{project.path}}']);
|
|
149
|
+
for (const [value, token] of pairs) if (value) text = text.split(reverse ? token : value).join(reverse ? value : token);
|
|
150
|
+
return text;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
function identityValue(value, options) {
|
|
154
|
+
if (typeof value === 'string') return identityText(value, options);
|
|
155
|
+
if (Array.isArray(value)) return value.map(v => identityValue(v, options));
|
|
156
|
+
if (isRecord(value)) return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, identityValue(v, options)]));
|
|
157
|
+
return value;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export function normalizeId(aid) {
|
|
161
|
+
let id = aid.split('.')[0].toLowerCase().replace(/[^a-z0-9_-]/g, '-').replace(/^[^a-z0-9]+/, '');
|
|
162
|
+
if (id.length < 3) id = (id || 'a') + '-tpl';
|
|
163
|
+
return id.slice(0, 64);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
export async function collectAgent(options, key, root) {
|
|
167
|
+
const inventory = await inspectAgent(options);
|
|
168
|
+
const include = options.include;
|
|
169
|
+
assert(isRecord(include), 'INVALID_ARGUMENT', 'include is required');
|
|
170
|
+
const selected = options.include.baseagents.map(name => ({ name, default: name === inventory.activeBaseagent,
|
|
171
|
+
model: inventory.baseagents.find(item => item.name === name)?.currentModel ?? undefined,
|
|
172
|
+
effort: inventory.baseagents.find(item => item.name === name)?.currentEffort ?? undefined }));
|
|
173
|
+
assert(selected.some(item => item.default), 'INVALID_ARGUMENT', 'The current default baseagent must be selected');
|
|
174
|
+
const sourceConfig = options.effectiveConfig ?? readJson(path.join(options.agentDir, 'config.json'));
|
|
175
|
+
const config = behaviorConfig(sourceConfig);
|
|
176
|
+
config.active_baseagent = selected.find(b => b.default).name;
|
|
177
|
+
config.baseagents = {};
|
|
178
|
+
for (const b of selected) {
|
|
179
|
+
assert(BASEAGENTS.includes(b.name) && inventory.baseagents.some(x => x.name === b.name), 'INVALID_ARGUMENT', 'Unknown baseagent');
|
|
180
|
+
const source = sourceConfig.baseagents?.[b.name] ?? {};
|
|
181
|
+
const providerId = options.providerRefs?.[b.name]?.id ?? source.provider;
|
|
182
|
+
assert(typeof providerId === 'string' && options.providers?.[providerId], 'PROVIDER_NOT_FOUND', 'Configure a Provider for ' + b.name);
|
|
183
|
+
const provider = options.providers[providerId];
|
|
184
|
+
const block = { provider: { id: providerId, name: provider.name || providerId } };
|
|
185
|
+
if (b.model !== undefined) { assert(typeof b.model === 'string' && b.model.trim(), 'INVALID_ARGUMENT', 'Invalid model'); block.model = b.model; }
|
|
186
|
+
if (b.effort !== undefined) { assert(typeof b.effort === 'string' && b.effort.length, 'INVALID_ARGUMENT', 'Invalid effort'); block.effort = b.effort; }
|
|
187
|
+
if (source.params !== undefined) block.params = structuredClone(source.params);
|
|
188
|
+
config.baseagents[b.name] = block;
|
|
189
|
+
}
|
|
190
|
+
const put = (relative, bytes, mode) => {
|
|
191
|
+
const buffer = Buffer.isBuffer(bytes) ? bytes : Buffer.from(bytes);
|
|
192
|
+
let content = buffer;
|
|
193
|
+
if (!buffer.includes(0) && Buffer.from(buffer.toString('utf8')).equals(buffer)) {
|
|
194
|
+
content = Buffer.from(identityText(buffer.toString('utf8'), options));
|
|
195
|
+
}
|
|
196
|
+
atomicBytes(inside(root, relative), content, mode);
|
|
197
|
+
};
|
|
198
|
+
const agentPrefix = 'agents/' + key;
|
|
199
|
+
for (const name of inventory.profile.soul) put(agentPrefix + '/personal/soul/' + name,
|
|
200
|
+
fs.readFileSync(inside(path.join(options.agentDir, 'personal', 'soul'), name)));
|
|
201
|
+
if (inventory.profile.welcome) put(agentPrefix + '/personal/welcome.md', fs.readFileSync(path.join(options.agentDir, 'personal', 'welcome.md')));
|
|
202
|
+
const triggers = include.triggers ?? [];
|
|
203
|
+
assert(Array.isArray(triggers) && triggers.every(id => inventory.triggers.some(t => t.id === id)), 'INVALID_ARGUMENT', 'Unknown Trigger selection');
|
|
204
|
+
for (const id of triggers) {
|
|
205
|
+
const dir = inside(path.join(options.agentDir, 'triggers'), id);
|
|
206
|
+
const def = readJson(path.join(dir, 'trigger.json'));
|
|
207
|
+
// Approval/runtime provenance belongs to the target environment, never to a template.
|
|
208
|
+
delete def.authorizedBy; delete def.operatorPeers;
|
|
209
|
+
put(agentPrefix + '/triggers/' + id + '/trigger.json', jsonBytes(identityValue(def, options)));
|
|
210
|
+
if (def.execution?.type === 'script') {
|
|
211
|
+
const script = def.execution.script.path;
|
|
212
|
+
const source = inside(dir, script); regularPath(source);
|
|
213
|
+
put(agentPrefix + '/triggers/' + id + '/' + script, fs.readFileSync(source), fs.statSync(source).mode & 0o777);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
const skillNames = include.skills;
|
|
217
|
+
assert(Array.isArray(skillNames) && skillNames.every(name => inventory.skills.some(s => s.name === name && s.type === 'local' && s.enabled)),
|
|
218
|
+
'INVALID_ARGUMENT', 'Unknown or disabled local skill');
|
|
219
|
+
const switches = {};
|
|
220
|
+
for (const s of inventory.skills.filter(s => s.type === 'builtin')) switches[s.name] = { enabled: s.enabled };
|
|
221
|
+
for (const name of skillNames) {
|
|
222
|
+
switches[name] = { enabled: true };
|
|
223
|
+
const dir = inside(path.join(options.home, 'skills'), name);
|
|
224
|
+
for (const file of walkFiles(dir)) put('.evolcore/skills/' + name + '/' + file, fs.readFileSync(inside(dir, file)), fs.statSync(inside(dir, file)).mode & 0o777);
|
|
225
|
+
}
|
|
226
|
+
const files = include.files ?? [];
|
|
227
|
+
assert(Array.isArray(files), 'INVALID_ARGUMENT', 'Invalid files selection');
|
|
228
|
+
const copied = new Set();
|
|
229
|
+
for (const relative of files) {
|
|
230
|
+
const absolute = path.resolve(inventory.project.path, relative);
|
|
231
|
+
const homeRelative = path.relative(options.home, absolute).split(path.sep);
|
|
232
|
+
assert(homeRelative[0] === '..' || !['AIDs', 'agents', 'data', 'logs', 'backups', 'eck', 'directory'].includes(homeRelative[0]),
|
|
233
|
+
'INVALID_ARGUMENT', 'Runtime data is not a project artifact');
|
|
234
|
+
const file = inside(inventory.project.path, relative); regularPath(file);
|
|
235
|
+
assert(!excluded(relative) && fs.existsSync(file), 'INVALID_ARGUMENT', 'Excluded or missing selection: ' + relative);
|
|
236
|
+
const paths = fs.statSync(file).isDirectory() ? walkFiles(file, p => excluded(relative + '/' + p)).map(p => relative + '/' + p) : [relative];
|
|
237
|
+
for (const p of paths) if (!excluded(p) && !copied.has(p)) {
|
|
238
|
+
copied.add(p); const source = inside(inventory.project.path, p);
|
|
239
|
+
put('workspace/' + key + '/' + p, fs.readFileSync(source), fs.statSync(source).mode & 0o777);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
const profile = Object.fromEntries([...PROFILE_FIELDS, 'type']
|
|
243
|
+
.filter(field => options.profile?.[field] !== undefined).map(field => [field, options.profile[field]]));
|
|
244
|
+
return { profile: identityValue(profile, options), config: identityValue(config, options), skills: switches };
|
|
245
|
+
}
|