evolcore 0.0.47 → 0.0.48
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 +56 -1
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +139 -39
- 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 +31 -16
- 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/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +81 -24
- 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 +7 -1
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +2 -8
- 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/provider-command.js +74 -13
- package/dist/cli/role.js +61 -17
- package/dist/cli/stats.js +3 -3
- 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-manager.js +2 -6
- 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 +59 -8
- package/dist/config/providers-management.js +467 -49
- 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 +3 -0
- package/dist/core/auth/operation-authorizer.js +25 -0
- package/dist/core/auth/operation-catalog.js +28 -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/command-handler.js +81 -85
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +61 -149
- package/dist/core/command/menu-protocol.js +7 -1
- package/dist/core/command/provider-menu.js +13 -3
- 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 +7 -7
- package/dist/core/evolagent-registry.js +14 -1
- 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 +2 -1
- package/dist/core/message/aun-ipc-sender.js +165 -55
- package/dist/core/message/im-renderer.js +1 -1
- package/dist/core/message/message-bridge.js +51 -334
- package/dist/core/message/message-log.js +5 -0
- package/dist/core/message/message-queue.js +22 -0
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +429 -116
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/ownership/owner-resolver.js +328 -50
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/relation/peer-identity.js +23 -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 +12 -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/directory/owner-directory-admission.js +1 -1
- package/dist/directory/owner-directory-cache.js +45 -28
- package/dist/directory/owner-directory-markdown.js +13 -1
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/eck/message-renderer.js +84 -24
- 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 +4 -2
- package/dist/event-center/registry.js +13 -2
- package/dist/event-center/runtime.js +103 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +92 -59
- package/dist/ipc.js +13 -2
- package/dist/outputs/events.js +62 -0
- package/dist/outputs/protocol.js +102 -0
- package/dist/outputs/service.js +279 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +89 -4
- package/dist/services/ipc-operation.js +4 -15
- package/dist/services/pack-manager.js +12 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- 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 +9 -3
- package/dist/trigger/validation.js +22 -0
- 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/msg-diag.js +1 -0
- 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 +2 -2
- package/kits/docs/evolcore/config.md +12 -0
- package/kits/docs/evolcore/directory.md +22 -3
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +123 -3
- package/kits/docs/evolcore/role.md +80 -0
- package/kits/docs/evolcore/services.md +6 -6
- 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 +10 -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/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/references/calling.md +1 -1
- 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 +221 -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/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +3 -3
- 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 +6 -5
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +4 -1
- package/scripts/agent-template/shared/common.mjs +2 -3
- package/scripts/agent-template/shared/template-contract.mjs +2 -1
- package/scripts/agent-template/shared/template-package.mjs +9 -2
- package/scripts/agent-template/shared/template-runtime.mjs +20 -5
- package/scripts/agent-template/team-pack.mjs +6 -3
- 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
|
@@ -14,7 +14,7 @@ groupRulesError: {{groupRulesError}}
|
|
|
14
14
|
{{/}}
|
|
15
15
|
{{/}}
|
|
16
16
|
{{?speakerRelation}}
|
|
17
|
-
|
|
17
|
+
关系角色: {{speakerRelation}} # owner|admin|member|visitor|自定义角色|none(发言人与我的关系;非联系人按 visitor)
|
|
18
18
|
{{/}}
|
|
19
19
|
{{?peerType}}
|
|
20
20
|
peerType: {{peerType}} # human 或 agent
|
|
@@ -110,7 +110,7 @@ ec thread summary set <peer>/<threadId> '<摘要内容>' --name '<新标题>'
|
|
|
110
110
|
| 用户明确说"总结一下" | 按上面的情形 A / B 序列执行 |
|
|
111
111
|
| 一个明确的阶段或任务完成 | 写入/更新摘要 |
|
|
112
112
|
| 即将跨话题路由(去问另一个 agent)之前 | 写入当前状态 |
|
|
113
|
-
| 话题状态改为 `
|
|
113
|
+
| 话题状态改为 `closed` 之前 | 写入最终成果摘要 |
|
|
114
114
|
| 被唤醒时发现摘要显示"未总结" | 回顾历史后补写 |
|
|
115
115
|
|
|
116
116
|
**摘要规范**:
|
|
@@ -146,9 +146,10 @@ ec thread show current --format json
|
|
|
146
146
|
跨话题更新状态时,使用 `ec thread list <peer>` 返回的独立 `thread-...` id,不要使用主话题 id。
|
|
147
147
|
|
|
148
148
|
```bash
|
|
149
|
-
ec thread status <threadId>
|
|
150
|
-
ec thread status <threadId>
|
|
151
|
-
# 状态值:
|
|
149
|
+
ec thread status <threadId> closed # 讨论结束(收到新消息会自动回退 active)
|
|
150
|
+
ec thread status <threadId> archived # 归档:不再响应消息,仅在用户明确要求时使用
|
|
151
|
+
# 状态值:active | closed | archived
|
|
152
152
|
```
|
|
153
153
|
|
|
154
|
-
独立话题状态改为 `
|
|
154
|
+
独立话题状态改为 `closed` 前,先写入最终摘要;主话题只写摘要,不更新状态。
|
|
155
|
+
**不要自行归档**:`archived` 只在用户明确要求或前端操作时设置。话题的进展写在 summary 里,不要用状态表达任务进度。
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "evolcore",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.48",
|
|
4
4
|
"description": "AI Agent gateway connecting Claude, Codex, Gemini, and the bundled ecagent runner to messaging channels with multi-project session management",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -51,7 +51,9 @@
|
|
|
51
51
|
"predev": "npm run build:ecagent",
|
|
52
52
|
"dev": "tsx watch src/index.ts",
|
|
53
53
|
"build:ecagent": "npm --prefix ecagent run build",
|
|
54
|
-
"build": "
|
|
54
|
+
"build": "node -e \"import('./bin/ec-build.mjs').then(m => m.build())\"",
|
|
55
|
+
"build:core": "npm run build:ecagent && tsc && node -e \"const f='dist/cli/index.js',c=require('fs').readFileSync(f,'utf8');if(!c.startsWith('#!'))require('fs').writeFileSync(f,'#!/usr/bin/env node\\n'+c)\" && node -e \"try{require('child_process').execFileSync('chmod',['+x','dist/cli/index.js'])}catch{}\" && node -e \"for(const f of ['error-dict.json','model-prices.jsonl'])require('fs').copyFileSync('src/utils/'+f,'dist/utils/'+f)\"",
|
|
56
|
+
"postbuild:core": "node -e \"import('./bin/ec-build.mjs').then(m => m.writeBuildIdentity())\"",
|
|
55
57
|
"start": "node dist/index.js",
|
|
56
58
|
"test": "npm run build && vitest run",
|
|
57
59
|
"test:watch": "vitest",
|
|
@@ -64,7 +66,7 @@
|
|
|
64
66
|
"prepublishOnly": "npm test"
|
|
65
67
|
},
|
|
66
68
|
"dependencies": {
|
|
67
|
-
"@agentunion/fastaun": "
|
|
69
|
+
"@agentunion/fastaun": "0.5.36",
|
|
68
70
|
"@anthropic-ai/claude-agent-sdk": "0.3.300",
|
|
69
71
|
"@modelcontextprotocol/sdk": "^1.32.2",
|
|
70
72
|
"ajv": "^8.20.0",
|
|
@@ -72,7 +74,7 @@
|
|
|
72
74
|
"chokidar": "^5.0.0",
|
|
73
75
|
"cron-parser": "^5.5.0",
|
|
74
76
|
"dotenv": "^17.4.2",
|
|
75
|
-
"ec-web": "0.0.
|
|
77
|
+
"ec-web": "0.0.48",
|
|
76
78
|
"ignore": "7.0.5",
|
|
77
79
|
"image-type": "^6.0.0",
|
|
78
80
|
"partial-json": "0.1.7",
|
|
@@ -153,7 +153,10 @@ async function inspectMember(options, { pkg, tpl, templateDir, files, key }) {
|
|
|
153
153
|
assert(BASEAGENTS.includes(name) && isRecord(block) && Object.keys(block).every(f => ['provider', 'model', 'effort', 'params'].includes(f)),
|
|
154
154
|
'INVALID_ARGUMENT', 'Invalid baseagent block');
|
|
155
155
|
}
|
|
156
|
-
const planned = planMemberConfig({ member: spec, vars, providers: options.providers ?? {}, selections, allowMissing: true,
|
|
156
|
+
const planned = planMemberConfig({ member: spec, vars, providers: options.providers ?? {}, selections, allowMissing: true,
|
|
157
|
+
fallbackProviders: Object.fromEntries(Object.entries((options.effectiveConfig ?? targets).baseagents ?? {})
|
|
158
|
+
.filter(([, block]) => typeof block.provider === 'string').map(([name, block]) => [name, block.provider])),
|
|
159
|
+
mode: options.planMode ?? 'overlay_existing' });
|
|
157
160
|
const resolved = planned.config; const refs = planned.providers;
|
|
158
161
|
assert(resolved.baseagents?.[resolved.active_baseagent], 'INVALID_ARGUMENT', 'Default baseagent must be selected');
|
|
159
162
|
assert(Object.keys(selections).every(name => resolved.baseagents?.[name]), 'INVALID_ARGUMENT', 'Unknown baseagent selection');
|
|
@@ -78,10 +78,9 @@ export function atomicBytes(file, bytes, mode = 0o644) {
|
|
|
78
78
|
fs.mkdirSync(path.dirname(file), { recursive: true });
|
|
79
79
|
const temporary = path.join(path.dirname(file), '.template-' + randomUUID());
|
|
80
80
|
try {
|
|
81
|
-
fs.
|
|
81
|
+
const descriptor = fs.openSync(temporary, 'wx', mode);
|
|
82
|
+
try { fs.writeFileSync(descriptor, bytes); fs.fsyncSync(descriptor); } finally { fs.closeSync(descriptor); }
|
|
82
83
|
fs.chmodSync(temporary, mode);
|
|
83
|
-
const descriptor = fs.openSync(temporary, 'r');
|
|
84
|
-
try { fs.fsyncSync(descriptor); } finally { fs.closeSync(descriptor); }
|
|
85
84
|
fs.renameSync(temporary, file);
|
|
86
85
|
} finally { fs.rmSync(temporary, { force: true }); }
|
|
87
86
|
}
|
|
@@ -29,7 +29,8 @@ const versionPattern = /^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$/;
|
|
|
29
29
|
const source = { oneOf: [
|
|
30
30
|
object({ kind: { const: 'artifact' }, packageId: string }),
|
|
31
31
|
object({ kind: { const: 'file' }, path: string }),
|
|
32
|
-
object({ kind: { const: 'remote' }, location,
|
|
32
|
+
object({ kind: { const: 'remote' }, location,
|
|
33
|
+
download: object({ shareId: { ...string, pattern: '^[A-Za-z0-9]{10}$' } }, []), digest }, ['kind', 'location', 'digest']),
|
|
33
34
|
] };
|
|
34
35
|
const include = object({ baseagents: strings, triggers: strings, skills: strings, files: strings });
|
|
35
36
|
const provider = object({ provider: string, model: string, effort: { type: ['string', 'null'], minLength: 1 } }, ['provider', 'model']);
|
|
@@ -5,7 +5,7 @@ import { createHash } from 'node:crypto';
|
|
|
5
5
|
import { gzipSync, gunzipSync } from 'node:zlib';
|
|
6
6
|
import { loadTemplate } from './template.mjs';
|
|
7
7
|
import { normalizeTeam, normalizeTeamSchema, validateContractSchema, readTeamSchema, packageSchema, contractDigest, canonicalJson, validateBuildSelection } from './template-contract.mjs';
|
|
8
|
-
import { BASEAGENTS } from './template-runtime.mjs';
|
|
8
|
+
import { BASEAGENTS, assertPublicTemplateConfig } from './template-runtime.mjs';
|
|
9
9
|
|
|
10
10
|
export const PACKAGE_LIMITS = { file: 20 * 1024 * 1024, total: 200 * 1024 * 1024, entries: 20000 };
|
|
11
11
|
const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
@@ -191,6 +191,7 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
191
191
|
check(record(member) && record(include), 'Collected member and selection required');
|
|
192
192
|
check(include.baseagents.includes(member.config?.active_baseagent), 'Default baseagent is required: ' + key);
|
|
193
193
|
const chosen = structuredClone(member);
|
|
194
|
+
assertPublicTemplateConfig(chosen.config);
|
|
194
195
|
chosen.config.baseagents = Object.fromEntries(Object.entries(chosen.config.baseagents).filter(([name]) => include.baseagents.includes(name)));
|
|
195
196
|
chosen.skills = Object.fromEntries(Object.entries(chosen.skills ?? {}).filter(([name]) => include.skills.includes(name)));
|
|
196
197
|
team.agents.push({ ...chosen, key });
|
|
@@ -211,9 +212,11 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
211
212
|
check(!normalized.errors.length, normalized.errors.join('; '));
|
|
212
213
|
entries.set('template/team.json', { bytes: json(team), mode: 0o644 });
|
|
213
214
|
entries.set('template/team.schema.json', { bytes: json(readTeamSchema()), mode: 0o644 });
|
|
215
|
+
let memberReferences = false;
|
|
214
216
|
for (const [name, entry] of entries) {
|
|
215
217
|
if (entry.bytes.includes(0) || !Buffer.from(entry.bytes.toString('utf8')).equals(entry.bytes)) continue;
|
|
216
218
|
for (const line of entry.bytes.toString('utf8').split('\n')) {
|
|
219
|
+
memberReferences ||= /\{\{\s*members\./.test(line);
|
|
217
220
|
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
221
|
'Credential content in portable resource: ' + name, 'SCAN_BLOCKED');
|
|
219
222
|
for (const aid of line.match(/[a-z0-9][a-z0-9_-]*\.(?:[a-z0-9-]+\.)+[a-z]{2,}/gi) ?? []) {
|
|
@@ -221,10 +224,13 @@ export function buildTemplatePackage({ metadata, members, externalAids = [], pub
|
|
|
221
224
|
}
|
|
222
225
|
}
|
|
223
226
|
}
|
|
227
|
+
if (memberReferences && evolcoreRange === '>=0.0.43-test.8') evolcoreRange = '>=0.0.43-test.8 <0.0.43 || >=0.0.44';
|
|
224
228
|
const info = { $schema_version: 1, id: metadata.id, name: metadata.name, version: metadata.version,
|
|
225
229
|
...(publisher !== undefined ? { publisher: structuredClone(publisher) } : {}), ...(createdAt !== undefined ? { createdAt } : {}),
|
|
226
230
|
...(metadata.description !== undefined ? { description: metadata.description } : {}),
|
|
227
|
-
compat: { platforms: structuredClone(metadata.platforms), evolcore: evolcoreRange,
|
|
231
|
+
compat: { platforms: structuredClone(metadata.platforms), evolcore: evolcoreRange,
|
|
232
|
+
...(memberReferences ? { templateFeatures: ['member-references-v1'] } : {}),
|
|
233
|
+
baseagents: [...new Set(team.agents.flatMap(member => Object.keys(member.config.baseagents)))].sort() },
|
|
228
234
|
externalAids: [...external].sort() };
|
|
229
235
|
const manifest = [...entries].map(([name, entry]) => ({ path: name.slice('template/'.length), size: entry.bytes.length, sha256: packageDigest(entry.bytes).slice(7) }));
|
|
230
236
|
entries.set('PACKAGE.json', { bytes: json(info), mode: 0o644 });
|
|
@@ -265,6 +271,7 @@ export function exportTemplatePackage(templateDir, { publisher, createdAt = Date
|
|
|
265
271
|
check(config.baseagents[config.active_baseagent], 'Default baseagent must have a binding: ' + agent.key);
|
|
266
272
|
for (const field of Object.keys(agent.config ?? {})) if (!Object.hasOwn(config, field)) excluded.push('agents/' + agent.key + '/config/' + field);
|
|
267
273
|
agent.config = config;
|
|
274
|
+
assertPublicTemplateConfig(config);
|
|
268
275
|
}
|
|
269
276
|
// The directory's custom constraints belong to its authoring form. Portable fields use the common schema.
|
|
270
277
|
const normalized = normalizeTeam(team);
|
|
@@ -3,6 +3,21 @@ export const BASEAGENTS = ['claude', 'codex', 'gemini', 'ecagent'];
|
|
|
3
3
|
const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
4
4
|
const fail = message => { throw Object.assign(new Error(message), { code: 'INVALID_ARGUMENT' }); };
|
|
5
5
|
|
|
6
|
+
/** Connection credentials cannot be hidden in otherwise public nested configuration. */
|
|
7
|
+
export function assertPublicTemplateConfig(config) {
|
|
8
|
+
const visit = (value, location) => {
|
|
9
|
+
if (Array.isArray(value)) { value.forEach((item, index) => visit(item, location + '[' + index + ']')); return; }
|
|
10
|
+
if (!record(value)) return;
|
|
11
|
+
for (const [key, item] of Object.entries(value)) {
|
|
12
|
+
if (/^(?:api[-_]?key|access[-_]?token|refresh[-_]?token|token|password|secret|credentials|private[-_]?key|authorization|headers|query[-_]?params)$/i.test(key)) {
|
|
13
|
+
throw Object.assign(new Error('Credential field in public template configuration: ' + location + '.' + key), { code: 'SCAN_BLOCKED' });
|
|
14
|
+
}
|
|
15
|
+
visit(item, location + '.' + key);
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
visit(config, 'config');
|
|
19
|
+
}
|
|
20
|
+
|
|
6
21
|
export function renderText(text, vars = {}, externalAids = {}) {
|
|
7
22
|
let out = text;
|
|
8
23
|
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 +58,8 @@ export function providerUsable(providers, id, baseagent) {
|
|
|
43
58
|
}
|
|
44
59
|
|
|
45
60
|
/** 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');
|
|
61
|
+
export function bindTemplateProviders(config, { providers = {}, defaults = {}, fallbackProviders = {}, selections = {}, allowMissing = false, modelCatalog } = {}) {
|
|
62
|
+
if (!record(config) || !record(providers) || !record(defaults) || !record(fallbackProviders) || !record(selections)) fail('Invalid Provider binding input');
|
|
48
63
|
const out = structuredClone(config);
|
|
49
64
|
const blocks = out.baseagents ?? {};
|
|
50
65
|
if (!record(blocks)) fail('baseagents must be an object');
|
|
@@ -63,7 +78,7 @@ export function bindTemplateProviders(config, { providers = {}, defaults = {}, s
|
|
|
63
78
|
if (select.provider !== undefined && (typeof select.provider !== 'string' || !select.provider)) fail('Invalid selected Provider: ' + name);
|
|
64
79
|
if (select.model !== undefined && (typeof select.model !== 'string' || !select.model.trim())) fail('Invalid model: ' + name);
|
|
65
80
|
if (select.effort !== undefined && select.effort !== null && (typeof select.effort !== 'string' || !select.effort)) fail('Invalid effort: ' + name);
|
|
66
|
-
const selected = select.provider ?? ref?.id;
|
|
81
|
+
const selected = select.provider ?? ref?.id ?? fallbackProviders[name];
|
|
67
82
|
const usable = providerUsable(providers, selected, name);
|
|
68
83
|
const model = select.model ?? block.model ?? defaults.baseagents?.[name]?.model;
|
|
69
84
|
const effort = Object.hasOwn(select, 'effort') ? select.effort : block.effort;
|
|
@@ -108,13 +123,13 @@ export function teamMemberVariables(members, ownerAid, hostAid) {
|
|
|
108
123
|
{ ...variables, 'agent.aid': member.aid, 'project.path': member.projectPath }]));
|
|
109
124
|
}
|
|
110
125
|
|
|
111
|
-
export function planMemberConfig({ member, vars, providers, defaults = {}, selections = {}, allowMissing = false, modelCatalog, mode = 'create_prebuilt' }) {
|
|
126
|
+
export function planMemberConfig({ member, vars, providers, defaults = {}, fallbackProviders = {}, selections = {}, allowMissing = false, modelCatalog, mode = 'create_prebuilt' }) {
|
|
112
127
|
if (!record(member) || !MEMBER_KEY.test(member.key) || !record(vars)) fail('Invalid member plan');
|
|
113
128
|
if (!['create_prebuilt', 'create_on_host', 'overlay_existing'].includes(mode)) fail('Invalid member plan mode');
|
|
114
129
|
const rendered = renderValue(member, vars);
|
|
115
130
|
if (mode !== 'create_prebuilt' && (!record(rendered.config) || Object.keys(rendered.config)
|
|
116
131
|
.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 });
|
|
132
|
+
const binding = bindTemplateProviders(rendered.config ?? {}, { providers, defaults, fallbackProviders, selections, allowMissing, modelCatalog });
|
|
118
133
|
return { key: member.key, profile: rendered.profile, skills: rendered.skills ?? {}, config: binding.config, providers: binding.refs };
|
|
119
134
|
}
|
|
120
135
|
|
|
@@ -179,9 +179,12 @@ export async function collectAgent(options, key, root) {
|
|
|
179
179
|
assert(BASEAGENTS.includes(b.name) && inventory.baseagents.some(x => x.name === b.name), 'INVALID_ARGUMENT', 'Unknown baseagent');
|
|
180
180
|
const source = sourceConfig.baseagents?.[b.name] ?? {};
|
|
181
181
|
const providerId = options.providerRefs?.[b.name]?.id ?? source.provider;
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
182
|
+
const block = {};
|
|
183
|
+
if (providerId !== undefined && providerId !== null) {
|
|
184
|
+
assert(typeof providerId === 'string' && options.providers?.[providerId], 'PROVIDER_NOT_FOUND', 'Configure a Provider for ' + b.name);
|
|
185
|
+
const provider = options.providers[providerId];
|
|
186
|
+
block.provider = { id: providerId, name: provider.name || providerId };
|
|
187
|
+
}
|
|
185
188
|
if (b.model !== undefined) { assert(typeof b.model === 'string' && b.model.trim(), 'INVALID_ARGUMENT', 'Invalid model'); block.model = b.model; }
|
|
186
189
|
if (b.effort !== undefined) { assert(typeof b.effort === 'string' && b.effort.length, 'INVALID_ARGUMENT', 'Invalid effort'); block.effort = b.effort; }
|
|
187
190
|
if (source.params !== undefined) block.params = structuredClone(source.params);
|
package/dist/cli/peer.js
DELETED
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
import { resolvePaths } from '../paths.js';
|
|
2
|
-
import { loadAllAgents } from '../config-store.js';
|
|
3
|
-
import { executeResolvedPeerCommand, resolvePeerCommand, } from '../config/peer-operation-service.js';
|
|
4
|
-
import { daemonUnavailableMessage, queryDaemon } from './help.js';
|
|
5
|
-
import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
6
|
-
import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
|
|
7
|
-
export async function cmdPeer(args) {
|
|
8
|
-
if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
|
|
9
|
-
printHelp();
|
|
10
|
-
return;
|
|
11
|
-
}
|
|
12
|
-
const json = getArgValue(args, '--format') === 'json';
|
|
13
|
-
if (process.env.EVOLCORE_SESSION_ID) {
|
|
14
|
-
try {
|
|
15
|
-
const result = await runManaged(args, json);
|
|
16
|
-
output(result, json);
|
|
17
|
-
}
|
|
18
|
-
catch (err) {
|
|
19
|
-
console.error(`❌ ${err.message ?? String(err)}`);
|
|
20
|
-
process.exitCode = 1;
|
|
21
|
-
}
|
|
22
|
-
return;
|
|
23
|
-
}
|
|
24
|
-
if (!args.includes('--self') && isListCommand(args) && !process.env.EVOLCORE_SELF_AID?.trim()) {
|
|
25
|
-
output(await executeAggregateList(args), json);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
const resolved = resolvePeerCommand(withDefaultSelf(args));
|
|
29
|
-
if (!resolved.ok) {
|
|
30
|
-
const message = resolved.code === 'INVALID_SELF' && !args.includes('--self')
|
|
31
|
-
? `${resolved.reason}; multiple local Agents are configured, add --self <agent-aid>`
|
|
32
|
-
: resolved.reason;
|
|
33
|
-
fail(message, resolved.code);
|
|
34
|
-
}
|
|
35
|
-
const result = await executeResolvedPeerCommand(resolved.command);
|
|
36
|
-
if (!result.ok)
|
|
37
|
-
fail(result.error, result.code, result.data);
|
|
38
|
-
output(result, json);
|
|
39
|
-
}
|
|
40
|
-
function output(value, json) {
|
|
41
|
-
if (json)
|
|
42
|
-
console.log(JSON.stringify(value));
|
|
43
|
-
else
|
|
44
|
-
console.log(JSON.stringify(value, null, 2));
|
|
45
|
-
}
|
|
46
|
-
async function runManaged(args, json) {
|
|
47
|
-
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
48
|
-
const delegationToken = readDelegationCredential();
|
|
49
|
-
if (!delegationToken)
|
|
50
|
-
fail(`${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`, 'DELEGATION_REQUIRED');
|
|
51
|
-
const { response, transportError } = await queryDaemon(resolvePaths().socket, {
|
|
52
|
-
type: 'peer.op',
|
|
53
|
-
argv: ['peer', ...args],
|
|
54
|
-
sessionId,
|
|
55
|
-
delegationToken,
|
|
56
|
-
}, 10_000);
|
|
57
|
-
if (!response) {
|
|
58
|
-
fail(daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'), 'DAEMON_UNAVAILABLE');
|
|
59
|
-
}
|
|
60
|
-
if (!response.ok || !response.result) {
|
|
61
|
-
fail(response.error || 'contact operation failed', response.code || 'CONTACT_AUTH_FAILED', response.data);
|
|
62
|
-
}
|
|
63
|
-
return response.result;
|
|
64
|
-
}
|
|
65
|
-
function fail(message, code = 'INVALID_ARGUMENT', data) {
|
|
66
|
-
const error = new Error(message);
|
|
67
|
-
error.code = code;
|
|
68
|
-
if (data !== undefined)
|
|
69
|
-
error.data = data;
|
|
70
|
-
throw error;
|
|
71
|
-
}
|
|
72
|
-
function printHelp() {
|
|
73
|
-
console.log(`用法:
|
|
74
|
-
ec peer block <primaryId> --self <agent-aid>
|
|
75
|
-
ec peer unblock <primaryId> --self <agent-aid>
|
|
76
|
-
ec peer list --blocked [--self <agent-aid>]
|
|
77
|
-
ec peer list --all [--self <agent-aid>]
|
|
78
|
-
|
|
79
|
-
Options:
|
|
80
|
-
--self <agent-aid> 本端 agent AID;省略时从当前运行环境推断
|
|
81
|
-
--blocked 仅列出已拉黑的对端
|
|
82
|
-
--all 列出所有已登记的对端身份
|
|
83
|
-
--format json 输出 JSON
|
|
84
|
-
--help, -h 显示帮助
|
|
85
|
-
|
|
86
|
-
添加联系人、审批联系人申请由 Evol App 名录流程处理。
|
|
87
|
-
发起 app-v1 加好友申请:ec directory request <target-aid> --self <agent-aid> [--note <申请介绍>]。`);
|
|
88
|
-
}
|
|
89
|
-
function withDefaultSelf(args) {
|
|
90
|
-
if (args.includes('--self'))
|
|
91
|
-
return args;
|
|
92
|
-
const selfAid = resolveStandaloneSelfAid();
|
|
93
|
-
return selfAid ? [...args, '--self', selfAid] : args;
|
|
94
|
-
}
|
|
95
|
-
function isListCommand(args) {
|
|
96
|
-
return args[0] === 'list';
|
|
97
|
-
}
|
|
98
|
-
async function executeAggregateList(args) {
|
|
99
|
-
const agents = loadAllAgents().agents.map(agent => agent.aid).filter(Boolean).sort();
|
|
100
|
-
const results = [];
|
|
101
|
-
for (const aid of agents) {
|
|
102
|
-
const resolved = resolvePeerCommand([...args, '--self', aid]);
|
|
103
|
-
if (!resolved.ok)
|
|
104
|
-
fail(resolved.reason, resolved.code);
|
|
105
|
-
const result = await executeResolvedPeerCommand(resolved.command);
|
|
106
|
-
if (!result.ok)
|
|
107
|
-
fail(result.error, result.code, result.data);
|
|
108
|
-
results.push(result);
|
|
109
|
-
}
|
|
110
|
-
return {
|
|
111
|
-
ok: true,
|
|
112
|
-
operation: 'list',
|
|
113
|
-
filter: args.includes('--blocked') ? 'blocked' : 'all',
|
|
114
|
-
scope: 'all-agents',
|
|
115
|
-
agents: results,
|
|
116
|
-
};
|
|
117
|
-
}
|
|
118
|
-
/** Resolve the local Agent identity for standalone CLI commands. */
|
|
119
|
-
export function resolveStandaloneSelfAid() {
|
|
120
|
-
const runtimeAid = process.env.EVOLCORE_SELF_AID?.trim();
|
|
121
|
-
if (runtimeAid)
|
|
122
|
-
return runtimeAid;
|
|
123
|
-
const agents = loadAllAgents().agents
|
|
124
|
-
.map(agent => agent.aid)
|
|
125
|
-
.filter(Boolean);
|
|
126
|
-
return agents.length === 1 ? agents[0] : undefined;
|
|
127
|
-
}
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
|
-
import { isValidAid } from '../aun/aid/validation.js';
|
|
3
|
-
import { agentConfig } from '../paths.js';
|
|
4
|
-
import { getPeerSnapshot, resolvePeerView } from './peer-book.js';
|
|
5
|
-
import { PeerMutationError } from './peer-book-store.js';
|
|
6
|
-
import { mutatePeerWithOperation } from './peer-request-service.js';
|
|
7
|
-
/**
|
|
8
|
-
* `ec peer` 命令面。
|
|
9
|
-
*
|
|
10
|
-
* 只保留本 Agent 能自主决定的两件事:查看已有对端身份、拉黑/解除拉黑。
|
|
11
|
-
* 添加联系人、审批联系人申请都归 Owner——Owner 在其名录里直接维护,
|
|
12
|
-
* Agent 侧不再有自助入口,也不再持有 pending 状态机。
|
|
13
|
-
*/
|
|
14
|
-
export function resolvePeerCommand(argv) {
|
|
15
|
-
const args = argv[0] === 'peer' ? argv.slice(1) : [...argv];
|
|
16
|
-
const selfAid = String(argValue(args, '--self') || '').trim();
|
|
17
|
-
if (!isValidAid(selfAid))
|
|
18
|
-
return invalid('INVALID_SELF', '--self must be a valid Agent AID');
|
|
19
|
-
const positional = stripOptions(args);
|
|
20
|
-
const [command, subcommand, ...extra] = positional;
|
|
21
|
-
if (extra.length > 0)
|
|
22
|
-
return invalid('INVALID_ARGUMENT', `Unexpected peer arguments: ${extra.join(' ')}`);
|
|
23
|
-
if (command === 'list') {
|
|
24
|
-
if (subcommand !== undefined) {
|
|
25
|
-
return invalid('INVALID_ARGUMENT', 'peer list does not accept a positional argument');
|
|
26
|
-
}
|
|
27
|
-
const filter = args.includes('--blocked')
|
|
28
|
-
? 'blocked'
|
|
29
|
-
: args.includes('--all') ? 'all' : undefined;
|
|
30
|
-
if (!filter)
|
|
31
|
-
return invalid('INVALID_ARGUMENT', 'peer list requires --blocked or --all');
|
|
32
|
-
return {
|
|
33
|
-
ok: true,
|
|
34
|
-
command: { kind: 'list', operationId: 'peer.read', selfAid, filter, canonicalArgv: canonicalArgv(argv) },
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
if (command === 'block' || command === 'unblock') {
|
|
38
|
-
if (!isValidAid(subcommand || '')) {
|
|
39
|
-
return invalid('INVALID_AID', 'primaryId must be a valid individual AID');
|
|
40
|
-
}
|
|
41
|
-
return {
|
|
42
|
-
ok: true,
|
|
43
|
-
command: {
|
|
44
|
-
kind: 'set-blocked',
|
|
45
|
-
operationId: 'peer.block',
|
|
46
|
-
selfAid,
|
|
47
|
-
primaryId: subcommand,
|
|
48
|
-
blocked: command === 'block',
|
|
49
|
-
canonicalArgv: canonicalArgv(argv),
|
|
50
|
-
},
|
|
51
|
-
};
|
|
52
|
-
}
|
|
53
|
-
return invalid('UNKNOWN_COMMAND', `Unknown peer command: ${positional.join(' ')}`);
|
|
54
|
-
}
|
|
55
|
-
export async function executeResolvedPeerCommand(command, actor = 'local-cli') {
|
|
56
|
-
if (!fs.existsSync(agentConfig(command.selfAid))) {
|
|
57
|
-
return { ok: false, code: 'AGENT_NOT_FOUND', error: `Agent does not exist: ${command.selfAid}` };
|
|
58
|
-
}
|
|
59
|
-
try {
|
|
60
|
-
if (command.kind === 'list') {
|
|
61
|
-
const snapshot = getPeerSnapshot(command.selfAid);
|
|
62
|
-
const ids = command.filter === 'blocked'
|
|
63
|
-
? [...snapshot.blockedIndex]
|
|
64
|
-
: [...snapshot.contacts.keys()];
|
|
65
|
-
const items = ids.sort().map(id => resolvePeerView(command.selfAid, id));
|
|
66
|
-
return {
|
|
67
|
-
ok: true,
|
|
68
|
-
operation: 'list',
|
|
69
|
-
selfAid: command.selfAid,
|
|
70
|
-
filter: command.filter,
|
|
71
|
-
peerRevision: snapshot.peerRevision,
|
|
72
|
-
items,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
|
-
if (command.kind === 'set-blocked') {
|
|
76
|
-
if (!getPeerSnapshot(command.selfAid).contacts.has(command.primaryId)) {
|
|
77
|
-
return { ok: false, code: 'NOT_FOUND', error: `Peer was not found: ${command.primaryId}` };
|
|
78
|
-
}
|
|
79
|
-
const result = await mutatePeerWithOperation({
|
|
80
|
-
selfAid: command.selfAid,
|
|
81
|
-
actorId: actor,
|
|
82
|
-
operation: command.blocked ? 'block' : 'unblock',
|
|
83
|
-
primaryId: command.primaryId,
|
|
84
|
-
mutation: {
|
|
85
|
-
type: 'set-status',
|
|
86
|
-
primaryId: command.primaryId,
|
|
87
|
-
status: command.blocked ? 'blocked' : 'active',
|
|
88
|
-
},
|
|
89
|
-
});
|
|
90
|
-
return {
|
|
91
|
-
ok: true,
|
|
92
|
-
operation: 'set-blocked',
|
|
93
|
-
selfAid: command.selfAid,
|
|
94
|
-
primaryId: command.primaryId,
|
|
95
|
-
blocked: command.blocked,
|
|
96
|
-
changed: result.changed,
|
|
97
|
-
peerRevision: result.peerRevision,
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
return { ok: false, code: 'PEER_OPERATION_FAILED', error: 'Unsupported peer operation' };
|
|
101
|
-
}
|
|
102
|
-
catch (error) {
|
|
103
|
-
if (error instanceof PeerMutationError) {
|
|
104
|
-
return { ok: false, code: error.code, error: error.message, ...(error.data ? { data: error.data } : {}) };
|
|
105
|
-
}
|
|
106
|
-
return { ok: false, code: 'PEER_OPERATION_FAILED', error: error instanceof Error ? error.message : String(error) };
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
function argValue(args, flag) {
|
|
110
|
-
const index = args.indexOf(flag);
|
|
111
|
-
return index >= 0 ? args[index + 1] : undefined;
|
|
112
|
-
}
|
|
113
|
-
function stripOptions(args) {
|
|
114
|
-
const result = [];
|
|
115
|
-
for (let index = 0; index < args.length; index += 1) {
|
|
116
|
-
const arg = args[index];
|
|
117
|
-
if (arg === '--self' || arg === '--format') {
|
|
118
|
-
index += 1;
|
|
119
|
-
continue;
|
|
120
|
-
}
|
|
121
|
-
if (arg === '--blocked' || arg === '--all')
|
|
122
|
-
continue;
|
|
123
|
-
result.push(arg);
|
|
124
|
-
}
|
|
125
|
-
return result;
|
|
126
|
-
}
|
|
127
|
-
function canonicalArgv(argv) {
|
|
128
|
-
return argv[0] === 'peer' ? [...argv] : ['peer', ...argv];
|
|
129
|
-
}
|
|
130
|
-
function invalid(code, reason) {
|
|
131
|
-
return { ok: false, code, reason };
|
|
132
|
-
}
|