evolcore 0.0.48 → 0.0.50
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 +97 -0
- package/bin/ecmsg.js +9 -4
- package/dist/ability/caller/authorization.js +21 -0
- package/dist/ability/caller/command.js +164 -0
- package/dist/ability/caller/contract.js +102 -0
- package/dist/ability/caller/daemon.js +158 -0
- package/dist/ability/caller/service.js +380 -0
- package/dist/ability/command-contract.js +5 -0
- package/dist/ability/daemon.js +5 -1
- package/dist/ability/interop-v1.js +10 -3
- package/dist/ability/management.js +1 -0
- package/dist/agent-template/jobs.js +173 -1
- package/dist/agent-template/runtime.js +285 -8
- package/dist/agent-template/service.js +1159 -40
- package/dist/agent-template/types.js +2 -1
- package/dist/agents/baseagent-availability.js +27 -3
- package/dist/agents/baseagent-capability-adapter.js +102 -0
- package/dist/agents/baseagent-plugin-descriptor.js +274 -0
- package/dist/agents/baseagent-plugin-loader.js +145 -0
- package/dist/agents/baseagent.js +68 -2
- package/dist/agents/claude-gateway/agent-registration.js +389 -0
- package/dist/agents/claude-gateway/binding.js +96 -0
- package/dist/agents/claude-gateway/inbox.js +138 -0
- package/dist/agents/claude-gateway/index.js +125 -0
- package/dist/agents/claude-gateway/listing.js +330 -0
- package/dist/agents/claude-gateway/router.js +328 -0
- package/dist/agents/claude-gateway/sessions.js +128 -0
- package/dist/agents/claude-gateway/terminal.js +250 -0
- package/dist/agents/claude-gateway/transcript.js +272 -0
- package/dist/agents/claude-gateway/types.js +14 -0
- package/dist/agents/claude-runner.js +6 -10
- package/dist/agents/codex-runner.js +9 -2
- package/dist/agents/{gemini-runner.js → gemini/gemini-runner.js} +17 -17
- package/dist/{core/session/adapters → agents/gemini}/gemini-session-file-adapter.js +2 -2
- package/dist/agents/gemini/index.js +51 -0
- package/dist/aun/aid/control-aid.js +52 -32
- package/dist/aun/group/invite-service.js +6 -36
- package/dist/aun/group/operations.js +6 -0
- package/dist/aun/msg/mention-schema.js +1 -1
- package/dist/aun/msg/p2p.js +31 -2
- package/dist/aun/msg/upload.js +126 -3
- package/dist/build-identity.json +1 -1
- package/dist/channels/aun.js +1175 -457
- package/dist/cli/ability-command.js +42 -0
- package/dist/cli/agent-command.js +20 -1
- package/dist/cli/agent-create.js +78 -18
- package/dist/cli/agent-template.js +5 -3
- package/dist/cli/agent.js +91 -0
- package/dist/cli/aun-commands.js +92 -34
- package/dist/cli/bench.js +5 -2
- package/dist/cli/config.js +22 -6
- package/dist/cli/daemon-commands.js +245 -101
- package/dist/cli/directory.js +6 -1
- package/dist/cli/ecmsg-gateway.js +11 -9
- package/dist/cli/index.js +30 -5
- package/dist/cli/init.js +39 -63
- package/dist/cli/managed-command-guard.js +3 -0
- package/dist/cli/menu-client.js +32 -7
- package/dist/cli/model.js +20 -5
- package/dist/cli/pay-command.js +30 -0
- package/dist/cli/provider-command.js +6 -2
- package/dist/cli/quota.js +89 -0
- package/dist/cli/restart-monitor.js +2 -2
- package/dist/cli/role.js +1 -0
- package/dist/cli/services-command.js +12 -9
- package/dist/cli/team-workspace-command.js +56 -2
- package/dist/cli/thread-command.js +78 -12
- package/dist/config/access-policy.js +16 -3
- package/dist/config/config-field-policy.js +88 -9
- package/dist/config/config-manager.js +97 -47
- package/dist/config/config-operation-service.js +22 -1
- package/dist/config/gateway-config.js +9 -8
- package/dist/config/owner-config.js +0 -16
- package/dist/config/peer-role-resolver.js +1 -7
- package/dist/config/providers-config.js +107 -20
- package/dist/config/providers-management.js +45 -21
- package/dist/config/resolved-config-op.js +4 -44
- package/dist/config/schema-migration.js +78 -5
- package/dist/config/schema-registry.js +52 -7
- package/dist/config-store.js +1309 -17
- package/dist/core/agent-application-service.js +220 -1
- package/dist/core/agent-ipc-registration.js +19 -2
- package/dist/core/agent-reload-coordinator.js +5 -0
- package/dist/core/agent-runtime.js +198 -54
- package/dist/core/auth/agent-delegation.js +14 -0
- package/dist/core/auth/delegation-authorization.js +33 -26
- package/dist/core/auth/operation-authorizer.js +16 -1
- package/dist/core/auth/operation-catalog.js +59 -7
- package/dist/core/baseagent-loader.js +30 -3
- package/dist/core/capability/capability-manager.js +16 -7
- package/dist/core/channel-runtime.js +4 -2
- package/dist/core/command/agent-control.js +20 -2
- package/dist/core/command/agent-template-menu.js +4 -3
- package/dist/core/command/cli-intent-parser.js +28 -0
- package/dist/core/command/command-handler.js +45 -2
- package/dist/core/command/menu-catalog.js +20 -4
- package/dist/core/command/menu-file-path.js +70 -0
- package/dist/core/command/menu-handler.js +97 -73
- package/dist/core/command/menu-protocol.js +29 -0
- package/dist/core/command/menu-query-batch.js +2 -2
- package/dist/core/command/private-mention-menu.js +71 -0
- package/dist/core/command/remote-shell.js +565 -0
- package/dist/core/command/slash-handler.js +17 -26
- package/dist/core/command/team-workspace-bootstrap.js +2 -1
- package/dist/core/command/topic-slash.js +7 -1
- package/dist/core/daemon-bootstrap.js +0 -4
- package/dist/core/daemon-control.js +58 -1
- package/dist/core/daemon-lifecycle.js +29 -7
- package/dist/core/evolagent-registry.js +18 -9
- package/dist/core/handoff/runtime.js +1 -1
- package/dist/core/host-snapshot.js +8 -3
- package/dist/core/initialization/service.js +3 -0
- package/dist/core/interaction-router.js +130 -0
- package/dist/core/ipc-registration.js +5 -0
- package/dist/core/memory/consolidation-context.js +2 -1
- package/dist/core/memory/consolidation.js +35 -64
- package/dist/core/message/aun-ipc-sender.js +213 -74
- package/dist/core/message/aun-request-registry.js +31 -0
- package/dist/core/message/contact-admission.js +91 -6
- package/dist/core/message/contact-pending-inbound.js +113 -0
- package/dist/core/message/contact-thread-approval.js +212 -0
- package/dist/core/message/im-renderer.js +40 -1
- package/dist/core/message/message-admission.js +5 -39
- package/dist/core/message/message-bridge.js +197 -45
- package/dist/core/message/message-log.js +32 -0
- package/dist/core/message/message-queue.js +102 -18
- package/dist/core/message/peer-mode.js +15 -4
- package/dist/core/message/response-engine.js +174 -26
- package/dist/core/message/send-options.js +37 -3
- package/dist/core/message/send-routing.js +11 -7
- package/dist/core/model/config-scope.js +6 -14
- package/dist/core/model/model-catalog.js +5 -5
- package/dist/core/model/model-diagnostics.js +19 -0
- package/dist/core/model/model-fallback.js +13 -2
- package/dist/core/ownership/owner-resolver.js +12 -86
- package/dist/core/pack-auth.js +7 -0
- package/dist/core/pack-install.js +1 -1
- package/dist/core/permission/ec-command-parser.js +288 -77
- package/dist/core/permission/protected-paths.js +64 -9
- package/dist/core/permission/services-path-acl.js +458 -0
- package/dist/core/permission/tool-policy.js +26 -10
- package/dist/core/relation/peer-identity.js +13 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +6 -2
- package/dist/core/session/adapters/codex-session-file-adapter.js +4 -0
- package/dist/core/session/session-manager.js +47 -10
- package/dist/core/session/session-mapper.js +16 -0
- package/dist/core/skill/index-generator.js +2 -3
- package/dist/core/skill/switch-resolver.js +3 -0
- package/dist/core/task/task-recovery-service.js +1 -0
- package/dist/core/thread/command-parser.js +4 -1
- package/dist/core/thread/ipc-operation.js +4 -2
- package/dist/core/thread/thread-operation.js +25 -10
- package/dist/core/thread/thread-service.js +294 -55
- package/dist/core/thread/topic-id.js +67 -2
- package/dist/core/thread/types.js +15 -1
- package/dist/directory/owner-directory-admission.js +11 -8
- package/dist/directory/owner-directory-cache.js +19 -0
- package/dist/directory/owner-directory-markdown.js +1 -1
- package/dist/directory/owner-directory-policy.js +5 -30
- package/dist/directory/owner-directory-request-operation.js +5 -2
- package/dist/eck/kit-renderer.js +3 -2
- package/dist/eck/message-renderer.js +28 -5
- package/dist/ecweb/basic-settings-service.js +5 -9
- package/dist/ecweb/providers-service.js +4 -2
- package/dist/ecweb/runtime/supervisor.js +36 -8
- package/dist/event-center/center-config.js +9 -5
- package/dist/event-center/dispatcher.js +10 -1
- package/dist/event-center/ipc-operation.js +19 -0
- package/dist/event-center/registry.js +20 -5
- package/dist/event-center/runtime.js +10 -7
- package/dist/index.js +120 -41
- package/dist/ipc.js +83 -3
- package/dist/outputs/authorization.js +16 -0
- package/dist/outputs/cards.js +336 -0
- package/dist/outputs/events.js +3 -2
- package/dist/outputs/protocol.js +1 -0
- package/dist/outputs/service.js +2 -15
- package/dist/paths.js +48 -1
- package/dist/pay/command.js +38 -0
- package/dist/pay/protocol.js +136 -0
- package/dist/pay/runtime.js +188 -0
- package/dist/pay/service.js +384 -0
- package/dist/pay/store.js +81 -0
- package/dist/response-system/engines/v1/proactive-flow.js +29 -2
- package/dist/services/dispatcher.js +23 -5
- package/dist/services/host/main.js +388 -0
- package/dist/services/host/protocol.js +118 -0
- package/dist/services/host/resident.js +310 -0
- package/dist/services/host-client.js +386 -0
- package/dist/services/host-deploy.js +180 -0
- package/dist/services/host-launch.js +117 -0
- package/dist/services/host-recycle.js +203 -0
- package/dist/services/host-runtime.js +802 -0
- package/dist/services/idempotency.js +44 -86
- package/dist/services/index-generator.js +4 -3
- package/dist/services/index.js +204 -22
- package/dist/services/ipc-operation.js +288 -44
- package/dist/services/pack-manager.js +1 -0
- package/dist/services/script-runner.js +515 -83
- package/dist/services/service-payload.js +13 -7
- package/dist/services/validation.js +109 -4
- package/dist/stats/budget.js +1 -1
- package/dist/stats/model-resolver.js +2 -2
- package/dist/stats/quota-query.js +95 -0
- package/dist/trigger/application-service.js +6 -4
- package/dist/trigger/local-files.js +19 -9
- package/dist/trigger/scheduler.js +22 -12
- package/dist/trigger/script-sandbox.js +51 -8
- package/dist/utils/aid-bind.js +3 -0
- package/dist/utils/atomic-write.js +22 -8
- package/dist/utils/evolcore-version.js +2 -2
- package/dist/utils/host-info.js +173 -1
- package/dist/utils/logger.js +2 -2
- package/dist/utils/media-cache.js +190 -43
- package/dist/utils/npm-ops.js +43 -8
- package/dist/utils/restart-safety.js +14 -1
- package/dist/utils/system-memory.js +113 -25
- package/dist/utils/systemd-lifecycle.js +154 -0
- package/dist/utils/windows-shell-trust.js +7 -3
- package/dist/workbench/service.js +1 -1
- package/kits/docs/INDEX.md +3 -2
- package/kits/docs/aun/AUN/346/266/210/346/201/257/347/261/273/345/236/213/344/270/216/345/261/236/346/200/247.md +1 -0
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/evolcore/INDEX.md +9 -6
- package/kits/docs/evolcore/agent.md +36 -1
- package/kits/docs/evolcore/aid.md +45 -3
- package/kits/docs/evolcore/config.md +5 -2
- package/kits/docs/evolcore/directory.md +8 -9
- package/kits/docs/evolcore/group.md +2 -1
- package/kits/docs/evolcore/memory-tags.md +2 -0
- package/kits/docs/evolcore/menu-client.md +3 -3
- package/kits/docs/evolcore/menu-protocol.md +7 -0
- package/kits/docs/evolcore/model.md +3 -0
- package/kits/docs/evolcore/msg.md +77 -10
- package/kits/docs/evolcore/pay.md +34 -0
- package/kits/docs/evolcore/provider.md +22 -1
- package/kits/docs/evolcore/quota.md +54 -0
- package/kits/docs/evolcore/role.md +3 -0
- package/kits/docs/evolcore/services.md +46 -18
- package/kits/docs/evolcore/stats.md +2 -0
- package/kits/docs/evolcore/thread-chain.md +2 -0
- package/kits/docs/evolcore/tool-authorization.md +10 -0
- package/kits/docs/evolcore/trigger.md +2 -0
- package/kits/rules/01-overview.md +11 -32
- package/kits/rules/02-navigation.md +7 -0
- package/kits/rules/06-channel.md +3 -3
- package/kits/schemas/_meta.json +38 -5
- package/kits/schemas/agent-config.schema.20.json +24 -0
- package/kits/schemas/agent-config.schema.21.json +974 -0
- package/kits/schemas/agent-config.schema.22.json +977 -0
- package/kits/schemas/agent-config.schema.23.json +958 -0
- package/kits/schemas/daemon.schema.10.json +373 -0
- package/kits/schemas/daemon.schema.9.json +12 -0
- package/kits/schemas/defaults.schema.7.json +472 -0
- package/kits/schemas/providers.schema.3.json +18 -2
- package/kits/schemas/relation-config.schema.13.json +289 -0
- package/kits/skills/.switches.json +17 -1
- package/kits/skills/ability/SKILL.md +229 -34
- package/kits/skills/ability/STRUCTURE.md +333 -0
- package/kits/skills/ability/references/cli.md +208 -0
- package/kits/skills/ability/references/development.md +107 -37
- package/kits/skills/ability/references/management.md +106 -46
- package/kits/skills/ability/references/runtime-protocol.md +65 -63
- package/kits/skills/agent-output-cards/SKILL.md +64 -0
- package/kits/skills/ec-group/SKILL.md +8 -6
- package/kits/skills/ec-group/TASK.md +186 -0
- package/kits/skills/ec-group/WORKLOG.md +180 -0
- package/kits/skills/ec-group-collaboration/SKILL.md +3 -3
- package/kits/skills/ec-pay/SKILL.md +101 -0
- package/kits/skills/ec-pay/references/pay-cli.md +110 -0
- package/kits/skills/ec-provider/SKILL.md +58 -9
- package/kits/skills/{ec-service-proxy → ec-proxy}/SKILL.md +8 -5
- package/kits/skills/ec-service-call/SKILL.md +135 -0
- package/kits/skills/ec-service-pack/SKILL.md +277 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/templates/memory-consolidation/notes.md +2 -2
- package/kits/templates/memory-consolidation/workflow.md +46 -0
- package/kits/templates/roles/visitor.json +1 -0
- package/kits/templates/system-fragments/channel.md +13 -4
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/directory-contacts.md +3 -4
- package/kits/templates/system-fragments/reply.md +1 -0
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +27 -128
- package/kits/templates/system-fragments/venue.md +27 -0
- package/package.json +4 -5
- package/scripts/agent-template/inspect.mjs +79 -29
- package/scripts/agent-template/overlay.mjs +20 -2
- package/scripts/agent-template/shared/common.mjs +24 -6
- package/scripts/agent-template/shared/team-schema.json +23 -5
- package/scripts/agent-template/shared/template-contract.mjs +107 -17
- package/scripts/agent-template/shared/template-package.mjs +254 -29
- package/scripts/agent-template/shared/template-runtime.mjs +145 -2
- package/scripts/agent-template/shared/template.mjs +67 -9
- package/scripts/agent-template/team-pack.mjs +132 -41
- package/scripts/agent-template/team-preview.mjs +249 -5
- package/kits/docs/aun/ABILITY_CALLING.md +0 -280
- package/kits/docs/evolcore/ability.md +0 -185
- package/kits/skills/ability/references/calling.md +0 -56
- package/kits/skills/ability/references/contract-checklist.md +0 -37
- package/kits/skills/ability/references/recovery.md +0 -27
- /package/dist/{core/capability/providers → agents/gemini}/gemini-capability-provider.js +0 -0
package/dist/cli/directory.js
CHANGED
|
@@ -74,7 +74,12 @@ function output(result, json) {
|
|
|
74
74
|
}
|
|
75
75
|
switch (result.action) {
|
|
76
76
|
case 'request': {
|
|
77
|
-
|
|
77
|
+
if (result.status === 'queued') {
|
|
78
|
+
console.log(`✓ 已将加密 friend.invite.v1 加好友申请排入发送队列,目标=${result.targetAid} outbox_id=${result.outbox_id ?? '-'}`);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
console.log(`✓ 已向 ${result.targetAid} 发送加密 friend.invite.v1 加好友申请,message_id=${result.message_id ?? '-'}`);
|
|
82
|
+
}
|
|
78
83
|
console.log('发送成功只表示申请已提交;请等待 Evol App 处理并同步联系人名录,再重试原消息。');
|
|
79
84
|
return;
|
|
80
85
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* 混在带 IO 的入口脚本里就无法回归验证。
|
|
10
10
|
*/
|
|
11
11
|
import { isThreadTopicId, parseDurationToMs } from '../core/message/send-routing.js';
|
|
12
|
-
import { GATEWAY_FLAG_ALIASES, GATEWAY_ROUTE_VALUE_FLAGS, MANAGED_SEND_BOOLEAN_FLAGS, MANAGED_SEND_VALUE_FLAGS, } from '../core/message/send-options.js';
|
|
12
|
+
import { GATEWAY_FLAG_ALIASES, GATEWAY_ROUTE_VALUE_FLAGS, isValidEncryptMode, MANAGED_SEND_BOOLEAN_FLAGS, MANAGED_SEND_VALUE_FLAGS, } from '../core/message/send-options.js';
|
|
13
13
|
/**
|
|
14
14
|
* 选项表来自 `send-options.ts`(唯一事实源),网关**不再维护第二份**。
|
|
15
15
|
*
|
|
@@ -20,7 +20,7 @@ import { GATEWAY_FLAG_ALIASES, GATEWAY_ROUTE_VALUE_FLAGS, MANAGED_SEND_BOOLEAN_F
|
|
|
20
20
|
const ROUTE_VALUE_FLAGS = new Set(GATEWAY_ROUTE_VALUE_FLAGS);
|
|
21
21
|
/** 原样透传给底层发送通道的选项(取一个值)。 */
|
|
22
22
|
const PASSTHROUGH_VALUE_FLAGS = new Set(MANAGED_SEND_VALUE_FLAGS.filter(flag => !ROUTE_VALUE_FLAGS.has(flag)));
|
|
23
|
-
/** 原样透传的布尔选项(`--encrypt
|
|
23
|
+
/** 原样透传的布尔选项(`--encrypt` 由网关按三态单独处理)。 */
|
|
24
24
|
const PASSTHROUGH_BOOLEAN_FLAGS = new Set(MANAGED_SEND_BOOLEAN_FLAGS.filter(flag => flag === '--mention-all'));
|
|
25
25
|
/** 正文来源类选项:出现即表示有正文,不再要求位置参数。 */
|
|
26
26
|
export const BODY_FLAGS = new Set([
|
|
@@ -51,10 +51,6 @@ export function parseGatewayArgs(args) {
|
|
|
51
51
|
route.help = true;
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
|
-
if (token === '--no-encrypt') {
|
|
55
|
-
route.noEncrypt = true;
|
|
56
|
-
continue;
|
|
57
|
-
}
|
|
58
54
|
if (PASSTHROUGH_BOOLEAN_FLAGS.has(token)) {
|
|
59
55
|
passthrough.push(token);
|
|
60
56
|
continue;
|
|
@@ -78,8 +74,12 @@ export function parseGatewayArgs(args) {
|
|
|
78
74
|
route.from = value;
|
|
79
75
|
else if (flag === '--check-every')
|
|
80
76
|
route.checkEvery = value;
|
|
81
|
-
else if (flag === '--encrypt')
|
|
77
|
+
else if (flag === '--encrypt') {
|
|
78
|
+
if (!isValidEncryptMode(value)) {
|
|
79
|
+
return { ok: false, error: `--encrypt 只接受 yes|no|auto,收到 ${value}` };
|
|
80
|
+
}
|
|
82
81
|
route.encrypt = value;
|
|
82
|
+
}
|
|
83
83
|
continue;
|
|
84
84
|
}
|
|
85
85
|
if (PASSTHROUGH_VALUE_FLAGS.has(flag)) {
|
|
@@ -122,7 +122,7 @@ export function formatDuration(ms) {
|
|
|
122
122
|
* "跨话题参数必须成对"的校验。
|
|
123
123
|
* - **跨话题必须成对注入**。`--check-every` 由网关按判定结果给出(缺省 20m),
|
|
124
124
|
* 不依赖调用方是否传了它。
|
|
125
|
-
* - **加密显式下发二态**,不依赖 daemon 默认值:`--encrypt` 或 `--no
|
|
125
|
+
* - **加密显式下发二态**,不依赖 daemon 默认值:`--encrypt yes` 或 `--encrypt no`。
|
|
126
126
|
*/
|
|
127
127
|
/**
|
|
128
128
|
* 目标 ID 是否是 AID 形态。
|
|
@@ -158,7 +158,9 @@ export function buildDownstreamArgv(route, text, passthrough) {
|
|
|
158
158
|
// 「有 --thread 没 --check-every」,直接报 Cross-thread sends require …。
|
|
159
159
|
argv.push('--check-every', route.checkEveryMs ? formatDuration(route.checkEveryMs) : 'none');
|
|
160
160
|
}
|
|
161
|
-
|
|
161
|
+
// 三态原样下发:`auto` 不能在这里塌成二态——它要求下游按「本轮是否被对端
|
|
162
|
+
// 消息触发」决定,网关替它拍板会把会话首条消息锁成明文/密文之一。
|
|
163
|
+
argv.push('--encrypt', route.encrypt);
|
|
162
164
|
// 保留网关正文的字面量语义,包括经 `--` 传入的 --encrypt 等文本。
|
|
163
165
|
if (text.length > 0)
|
|
164
166
|
argv.push('--', ...text);
|
package/dist/cli/index.js
CHANGED
|
@@ -41,6 +41,7 @@ Agent 与会话:
|
|
|
41
41
|
services 服务路由:服务包状态、台账、诊断与对端调用
|
|
42
42
|
memory 记忆:写 note、整理正式记忆、触发整理会话
|
|
43
43
|
task 恢复暂停或异常中断的会话任务
|
|
44
|
+
pay 网站付款卡片、二维码、订单核验与状态
|
|
44
45
|
trigger 管理定时与事件触发器
|
|
45
46
|
proxy 查询和管理 daemon 服务代理
|
|
46
47
|
team 管理 Team Workspace、导航和成员
|
|
@@ -72,6 +73,7 @@ AUN:
|
|
|
72
73
|
invoke 统一模型调用:按 provider 的 style 路由到内置执行器
|
|
73
74
|
ability 按 AID 管理能力插件、运行、发布和作业
|
|
74
75
|
stats Token 用量与费用统计
|
|
76
|
+
quota 查询 Agent 和对端的生效限额、已用与剩余额度
|
|
75
77
|
skill EC 技能管理:加载、安装、启停与索引刷新
|
|
76
78
|
diagnose 检查启动环境
|
|
77
79
|
version 显示组件版本
|
|
@@ -108,8 +110,8 @@ export const KNOWN_TOP_LEVEL_COMMANDS = new Set([
|
|
|
108
110
|
'agent', 'aid', 'rpc', 'diag', 'menu-client',
|
|
109
111
|
'storage', 'fs', 'msg', 'thread', 'events', 'services',
|
|
110
112
|
'session', 'getmeta', 'group', 'model', 'skill', 'response',
|
|
111
|
-
'config', 'peer', 'directory', 'role', 'stats',
|
|
112
|
-
'provider', 'invoke', 'ability',
|
|
113
|
+
'config', 'peer', 'directory', 'role', 'stats', 'quota',
|
|
114
|
+
'provider', 'invoke', 'ability', 'pay',
|
|
113
115
|
// 版本三个别名在 switch 之前统一处理(含只在早期分支出现的 -V)。
|
|
114
116
|
'version', '-v', '-V', '--version',
|
|
115
117
|
'bench', 'link-rules',
|
|
@@ -118,7 +120,7 @@ function printLifecycleHelp(command) {
|
|
|
118
120
|
const help = {
|
|
119
121
|
start: `用法: ec start [--foreground] [--diagnose|-d] [--debug] [--as-mode dev|install]\n\n --foreground 前台运行,适合 systemd 或容器直接管理\n --diagnose, -d 以诊断模式启动 daemon\n --debug 调试模式:注册调试 IPC,可在宿主终端以任意 session 身份发命令\n --as-mode 覆盖运行模式判定(仅本次启动生效,不写配置):\n install = 按安装模式(校验随包文件完整性,篡改自动恢复)\n dev = 按开发模式(不校验随包文件)`,
|
|
120
122
|
stop: '用法: ec stop\n\n停止当前 EVOLCORE_HOME 下运行的 EvolCore 服务。',
|
|
121
|
-
restart: `用法: ec restart [--clear] [--diagnose|-d]\n\n --clear 同时清理跨 HOME 残留的 EvolCore 主进程\n --diagnose, -d 以诊断模式启动新 daemon
|
|
123
|
+
restart: `用法: ec restart [--clear] [--diagnose|-d] [--skip-package-upgrades|--apply-package-upgrades]\n\n --clear 同时清理跨 HOME 残留的 EvolCore 主进程\n --diagnose, -d 以诊断模式启动新 daemon\n --skip-package-upgrades 仅重启,不应用缓存升级(systemd 首批仅支持纯重启)\n --apply-package-upgrades 应用缓存升级(systemd 暂不支持)`,
|
|
122
124
|
status: '用法: ec status [--format json]\n\n查看 daemon、Agent、渠道与队列运行状态。JSON 模式输出结构化状态快照。',
|
|
123
125
|
logs: `用法: ec logs [选项]\n\n --level <trace|debug|info|warn|error|fatal> 最低日志级别\n --module <name> 只显示指定模块\n --raw 原始输出\n --no-color 禁用颜色`,
|
|
124
126
|
watch: `用法: ec watch [logs|log|aid|msg|diag|web|session]\n\n ec watch 打开监控选择菜单\n ec watch logs 选择日志类型后监控\n ec watch log <类型...> 直接监控指定日志类型\n ec watch aid 监控 AID 连接\n ec watch msg 打开消息 TUI\n ec watch diag 实时诊断消息生命周期(AUN→daemon→任务)\n ec watch web 安装/升级并启动 EC Web\n ec watch session ec watch web 的兼容别名`,
|
|
@@ -218,6 +220,10 @@ export async function main(args) {
|
|
|
218
220
|
console.log(MAIN_HELP);
|
|
219
221
|
return;
|
|
220
222
|
}
|
|
223
|
+
if (['agent', 'config', 'init', 'model', 'provider', 'role', 'status', 'diagnose'].includes(cmd)) {
|
|
224
|
+
const { discoverBaseagentPlugins } = await import('../agents/baseagent-plugin-loader.js');
|
|
225
|
+
await discoverBaseagentPlugins({ quiet: true });
|
|
226
|
+
}
|
|
221
227
|
switch (cmd) {
|
|
222
228
|
case 'init': {
|
|
223
229
|
try {
|
|
@@ -375,11 +381,20 @@ export async function main(args) {
|
|
|
375
381
|
printLifecycleHelp('restart');
|
|
376
382
|
break;
|
|
377
383
|
}
|
|
378
|
-
if (!rejectUnknownFlags('restart', strippedArgs.slice(1), ['--clear', '--diagnose', '-d'])) {
|
|
384
|
+
if (!rejectUnknownFlags('restart', strippedArgs.slice(1), ['--clear', '--diagnose', '-d', '--skip-package-upgrades', '--apply-package-upgrades'])) {
|
|
385
|
+
process.exitCode = 1;
|
|
386
|
+
break;
|
|
387
|
+
}
|
|
388
|
+
if (strippedArgs.includes('--skip-package-upgrades') && strippedArgs.includes('--apply-package-upgrades')) {
|
|
389
|
+
console.error('Choose only one package upgrade option');
|
|
379
390
|
process.exitCode = 1;
|
|
380
391
|
break;
|
|
381
392
|
}
|
|
382
|
-
await (await import('./daemon-commands.js')).cmdRestart({
|
|
393
|
+
await (await import('./daemon-commands.js')).cmdRestart({
|
|
394
|
+
clear: strippedArgs.includes('--clear'), diagnose: strippedArgs.includes('--diagnose') || strippedArgs.includes('-d'),
|
|
395
|
+
...(strippedArgs.includes('--skip-package-upgrades') ? { applyPackageUpgrades: false }
|
|
396
|
+
: strippedArgs.includes('--apply-package-upgrades') ? { applyPackageUpgrades: true } : {}),
|
|
397
|
+
});
|
|
383
398
|
break;
|
|
384
399
|
case 'upgrade':
|
|
385
400
|
case 'update': {
|
|
@@ -651,6 +666,11 @@ export async function main(args) {
|
|
|
651
666
|
await cmdTeamWorkspace(strippedArgs.slice(1));
|
|
652
667
|
break;
|
|
653
668
|
}
|
|
669
|
+
case 'pay': {
|
|
670
|
+
const { cmdPay } = await import('./pay-command.js');
|
|
671
|
+
await cmdPay(strippedArgs.slice(1));
|
|
672
|
+
break;
|
|
673
|
+
}
|
|
654
674
|
case 'response': {
|
|
655
675
|
const { cmdResponse } = await import('./response.js');
|
|
656
676
|
await cmdResponse(strippedArgs.slice(1));
|
|
@@ -691,6 +711,11 @@ export async function main(args) {
|
|
|
691
711
|
await handleStats(strippedArgs.slice(1));
|
|
692
712
|
break;
|
|
693
713
|
}
|
|
714
|
+
case 'quota': {
|
|
715
|
+
const { cmdQuota } = await import('./quota.js');
|
|
716
|
+
await cmdQuota(strippedArgs.slice(1));
|
|
717
|
+
break;
|
|
718
|
+
}
|
|
694
719
|
case 'version':
|
|
695
720
|
case '-v':
|
|
696
721
|
case '--version': {
|
package/dist/cli/init.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
|
+
import { isSupportedBaseagent, listSupportedBaseagents } from '../agents/baseagent.js';
|
|
2
3
|
import os from 'os';
|
|
3
4
|
import path from 'path';
|
|
4
5
|
import readline from 'readline';
|
|
@@ -28,7 +29,7 @@ import { assertProjectPathReference, defaultProjectsRoot, hasProjectPathEnvironm
|
|
|
28
29
|
import { WEB_CLI_BIN, WEB_PACKAGE_NAME, WEB_PACKAGE_LATEST } from '../product.js';
|
|
29
30
|
import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
|
|
30
31
|
import { askInit, printInitCancelHint } from './init-cancel.js';
|
|
31
|
-
import { AUTO_BASEAGENT_CANDIDATES,
|
|
32
|
+
import { AUTO_BASEAGENT_CANDIDATES, detectAvailableBaseagents, detectBaseagentDetails, } from '../agents/baseagent-availability.js';
|
|
32
33
|
// ==================== Helpers ====================
|
|
33
34
|
function ask(rl, question) {
|
|
34
35
|
return askInit(rl, question);
|
|
@@ -80,12 +81,6 @@ function pickDefault(available) {
|
|
|
80
81
|
function pickInteractiveDefault(available) {
|
|
81
82
|
return available.includes('ecagent') ? 'ecagent' : pickDefault(available);
|
|
82
83
|
}
|
|
83
|
-
function hasConfiguredProcessOwner(config) {
|
|
84
|
-
const controlAid = config.aid?.toLowerCase();
|
|
85
|
-
return [config.owner, ...(config.owners ?? [])].some(owner => (typeof owner === 'string'
|
|
86
|
-
&& isValidAid(owner)
|
|
87
|
-
&& owner.toLowerCase() !== controlAid));
|
|
88
|
-
}
|
|
89
84
|
function buildDefaults(chosen, available, projectsDefaultPath) {
|
|
90
85
|
const baseagents = {};
|
|
91
86
|
for (const b of available) {
|
|
@@ -334,25 +329,9 @@ export async function cmdInitWeb(dependencies = {}) {
|
|
|
334
329
|
console.error(`❌ ${missingControlIdentityMessage(controlAid)}`);
|
|
335
330
|
return false;
|
|
336
331
|
}
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
}
|
|
341
|
-
catch (error) {
|
|
342
|
-
console.warn(`⚠️ 主机控制 AID Owner 绑定暂未提交,将由 daemon 后续重试: ${installErrorMessage(error)}`);
|
|
343
|
-
}
|
|
344
|
-
}
|
|
345
|
-
if (config.owner) {
|
|
346
|
-
try {
|
|
347
|
-
await (dependencies.ensureAgentMd ?? ensureControlAgentMd)(controlAid, { ownerAid: config.owner });
|
|
348
|
-
}
|
|
349
|
-
catch (error) {
|
|
350
|
-
console.warn(`⚠️ 主机控制 AID 名片暂未发布,将由 daemon 后续重试: ${installErrorMessage(error)}`);
|
|
351
|
-
}
|
|
352
|
-
}
|
|
353
|
-
else {
|
|
354
|
-
console.log('ℹ 主机名片将在 Web 初始化完成 Owner 绑定后发布。');
|
|
355
|
-
}
|
|
332
|
+
// Owner 只由 ownership 协议授予,控制面不再从 daemon.json 读绑定目标。
|
|
333
|
+
// 名片补全由 daemon 在协议共识落地后自行完成。
|
|
334
|
+
console.log('ℹ 主机名片将在 Owner 绑定经协议确认后发布。');
|
|
356
335
|
if (ecwebService(config.services)?.enabled === false) {
|
|
357
336
|
console.error('❌ ECWeb 已被手动关闭,未修改设置;请先启用 ECWeb 后重试初始化。');
|
|
358
337
|
return false;
|
|
@@ -538,8 +517,8 @@ export async function cmdInit(options) {
|
|
|
538
517
|
else {
|
|
539
518
|
let chosen;
|
|
540
519
|
if (options.baseagent) {
|
|
541
|
-
if (!
|
|
542
|
-
console.log(`❌ 无效 baseagent: ${options.baseagent}(可选: ${
|
|
520
|
+
if (!isSupportedBaseagent(options.baseagent)) {
|
|
521
|
+
console.log(`❌ 无效 baseagent: ${options.baseagent}(可选: ${listSupportedBaseagents().join('/')})`);
|
|
543
522
|
return false; // 硬错误:不落 tail
|
|
544
523
|
}
|
|
545
524
|
if (!available.includes(options.baseagent)) {
|
|
@@ -575,6 +554,7 @@ export async function cmdInit(options) {
|
|
|
575
554
|
return initTail({
|
|
576
555
|
nonInteractive: options?.nonInteractive,
|
|
577
556
|
autoStart: options?.autoStart,
|
|
557
|
+
owner: options?.owner,
|
|
578
558
|
});
|
|
579
559
|
// ── 内部函数 ──
|
|
580
560
|
async function runInteractive() {
|
|
@@ -589,8 +569,8 @@ export async function cmdInit(options) {
|
|
|
589
569
|
console.log(' ecagent 为可选项,请显式输入 ecagent');
|
|
590
570
|
continue;
|
|
591
571
|
}
|
|
592
|
-
if (!
|
|
593
|
-
console.log(` 无效选择,可选: ${
|
|
572
|
+
if (!isSupportedBaseagent(input)) {
|
|
573
|
+
console.log(` 无效选择,可选: ${listSupportedBaseagents().join('/')}`);
|
|
594
574
|
continue;
|
|
595
575
|
}
|
|
596
576
|
if (!available.includes(input)) {
|
|
@@ -679,6 +659,8 @@ export async function initTail(options = {}) {
|
|
|
679
659
|
const daemonConfig = loadDaemonConfig();
|
|
680
660
|
let controlAidReady = !!daemonConfig.aid;
|
|
681
661
|
let autoStartReady = true;
|
|
662
|
+
// 绑定目标只在本轮存在:Owner 只由 ownership 协议授予,daemon.json 不再保存它。
|
|
663
|
+
let promptedOwner = options.owner?.trim() || undefined;
|
|
682
664
|
if (daemonConfig.aid) {
|
|
683
665
|
console.log(`✓ 控制 AID 已存在: ${daemonConfig.aid}`);
|
|
684
666
|
}
|
|
@@ -711,16 +693,14 @@ export async function initTail(options = {}) {
|
|
|
711
693
|
catch { /* ignore */ }
|
|
712
694
|
}
|
|
713
695
|
}
|
|
714
|
-
else {
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
autoStartReady = await applyAutostart(options.autoStart);
|
|
721
|
-
}
|
|
696
|
+
else if (!promptedOwner) {
|
|
697
|
+
console.error('❌ 未指定有效的进程级管理者 AID;请在交互式终端运行 ec init,或使用 ec aid bind 显式完成绑定。');
|
|
698
|
+
return false;
|
|
699
|
+
}
|
|
700
|
+
else if (options.autoStart !== undefined) {
|
|
701
|
+
autoStartReady = await applyAutostart(options.autoStart);
|
|
722
702
|
}
|
|
723
|
-
const configuredOwner =
|
|
703
|
+
const configuredOwner = promptedOwner;
|
|
724
704
|
if (controlAidReady && configuredOwner) {
|
|
725
705
|
try {
|
|
726
706
|
const binding = await submitControlAidRegistration(loadDaemonConfig().aid, configuredOwner);
|
|
@@ -766,31 +746,27 @@ export async function initTail(options = {}) {
|
|
|
766
746
|
return true;
|
|
767
747
|
}
|
|
768
748
|
async function handleOwnersPrompt(rl) {
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
}
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
continue;
|
|
782
|
-
}
|
|
783
|
-
ownerAid = input;
|
|
784
|
-
}
|
|
785
|
-
try {
|
|
786
|
-
saveDaemonConfig({ ...daemonConfigForOwners, owner: ownerAid });
|
|
749
|
+
if (promptedOwner)
|
|
750
|
+
return true;
|
|
751
|
+
const controlAid = loadDaemonConfig().aid;
|
|
752
|
+
// 输入只用于本轮的绑定邀约,不写入 daemon.json:Owner 由协议授予,
|
|
753
|
+
// 配置文件不再持有任何 Owner 声明。
|
|
754
|
+
let ownerAid = '';
|
|
755
|
+
while (!ownerAid) {
|
|
756
|
+
const input = (await ask(rl, '请输入 EvolCore 管理者 AID: ')).trim();
|
|
757
|
+
if (!isValidAid(input)) {
|
|
758
|
+
console.log(` ⚠ 跳过非法 AID: ${input}`);
|
|
759
|
+
console.log(' 未输入合法 AID,不可跳过,请重新输入');
|
|
760
|
+
continue;
|
|
787
761
|
}
|
|
788
|
-
|
|
789
|
-
console.
|
|
790
|
-
|
|
762
|
+
if (controlAid && input.toLowerCase() === controlAid.toLowerCase()) {
|
|
763
|
+
console.log(' ⚠ 管理者 AID 不能与本机 EvolCore 控制 AID 相同,请重新输入');
|
|
764
|
+
continue;
|
|
791
765
|
}
|
|
792
|
-
|
|
766
|
+
ownerAid = input;
|
|
793
767
|
}
|
|
768
|
+
promptedOwner = ownerAid;
|
|
769
|
+
console.log(`✓ 本轮绑定目标: ${ownerAid}(须经协议确认后生效)`);
|
|
794
770
|
return true;
|
|
795
771
|
}
|
|
796
772
|
async function handleEcwebPrompt() {
|
|
@@ -923,8 +899,8 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
|
|
|
923
899
|
}
|
|
924
900
|
let chosenBaseagent;
|
|
925
901
|
if (opts.baseagent) {
|
|
926
|
-
if (!
|
|
927
|
-
fail('INVALID_BASEAGENT', `invalid baseagent: ${opts.baseagent} (choose: ${
|
|
902
|
+
if (!isSupportedBaseagent(opts.baseagent)) {
|
|
903
|
+
fail('INVALID_BASEAGENT', `invalid baseagent: ${opts.baseagent} (choose: ${listSupportedBaseagents().join('/')})`, EXIT_USAGE, format);
|
|
928
904
|
}
|
|
929
905
|
if (!available.includes(opts.baseagent)) {
|
|
930
906
|
const reason = opts.baseagent === 'codex' ? (await probeCodexAvailability()).reason : undefined;
|
|
@@ -22,6 +22,7 @@ const MANAGED_TASK_COMMANDS = new Set([
|
|
|
22
22
|
'model',
|
|
23
23
|
'msg',
|
|
24
24
|
'team',
|
|
25
|
+
'pay',
|
|
25
26
|
'proxy',
|
|
26
27
|
'provider',
|
|
27
28
|
// `invoke` 调用已登记的端点,不改配置;具体授权由 invoke.op 的委托校验完成。
|
|
@@ -59,6 +60,8 @@ const MANAGED_TASK_COMMANDS = new Set([
|
|
|
59
60
|
// `stats` reads the usage database directly. It authorizes each managed call
|
|
60
61
|
// against the task's relation role in `resolveManagedStatsScope`.
|
|
61
62
|
'stats',
|
|
63
|
+
// Quota reads validate task credentials and scope inside quota.op.
|
|
64
|
+
'quota',
|
|
62
65
|
'status',
|
|
63
66
|
'storage',
|
|
64
67
|
'task',
|
package/dist/cli/menu-client.js
CHANGED
|
@@ -2,6 +2,7 @@ import fs from 'node:fs';
|
|
|
2
2
|
import { getArgValue, wantsHelp } from './help.js';
|
|
3
3
|
import { executeMenuClientRequest, MenuClientError } from '../aun/menu/index.js';
|
|
4
4
|
import { readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
5
|
+
import { isValidEncryptMode, resolveEncryptFlagValue } from '../core/message/send-options.js';
|
|
5
6
|
function parseDurationMs(value) {
|
|
6
7
|
if (value === undefined)
|
|
7
8
|
return undefined;
|
|
@@ -34,15 +35,42 @@ function readRequest(args, readFile = (file) => fs.readFileSync(file, 'utf8')) {
|
|
|
34
35
|
throw new MenuClientError('INVALID_ARGUMENT', `Invalid request JSON: ${error?.message ?? String(error)}`);
|
|
35
36
|
}
|
|
36
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* 读取 `--encrypt yes|no|auto`。
|
|
40
|
+
*
|
|
41
|
+
* 只有三态,裸写由 `validateOptions` 报参数错误。`auto` 与不写都返回
|
|
42
|
+
* undefined —— 由 daemon 沿用本机 `aun.defaultEncrypt`,这是 menu 请求
|
|
43
|
+
* 一贯的默认语义(不是一个可以本地判定的「跟随入站」)。
|
|
44
|
+
*/
|
|
45
|
+
function readEncryptMode(args) {
|
|
46
|
+
for (let index = 0; index < args.length; index += 1) {
|
|
47
|
+
if (args[index] !== '--encrypt')
|
|
48
|
+
continue;
|
|
49
|
+
const mode = args[index + 1];
|
|
50
|
+
if (!isValidEncryptMode(mode))
|
|
51
|
+
continue;
|
|
52
|
+
return resolveEncryptFlagValue(mode);
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
37
56
|
function validateOptions(args) {
|
|
38
57
|
const valueOptions = new Set(['--request-file', '--request-json', '--timeout', '--remote-token', '--ecweb-token', '--app', '--aun-path', '--format']);
|
|
39
|
-
const booleanOptions = new Set(['--
|
|
58
|
+
const booleanOptions = new Set(['--wait']);
|
|
40
59
|
const seen = new Set();
|
|
41
60
|
for (let index = 0; index < args.length; index += 1) {
|
|
42
61
|
const option = args[index];
|
|
43
62
|
if (seen.has(option))
|
|
44
63
|
throw new MenuClientError('INVALID_ARGUMENT', `Duplicate option: ${option}`);
|
|
45
64
|
seen.add(option);
|
|
65
|
+
if (option === '--encrypt') {
|
|
66
|
+
// 三态取值,必须带 yes|no|auto;裸写是参数错误。
|
|
67
|
+
const mode = args[index + 1];
|
|
68
|
+
if (!isValidEncryptMode(mode)) {
|
|
69
|
+
throw new MenuClientError('INVALID_ARGUMENT', `--encrypt 只接受 yes|no|auto${mode === undefined ? '' : `,收到 ${mode}`}`);
|
|
70
|
+
}
|
|
71
|
+
index += 1;
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
46
74
|
if (booleanOptions.has(option))
|
|
47
75
|
continue;
|
|
48
76
|
if (!valueOptions.has(option))
|
|
@@ -52,9 +80,6 @@ function validateOptions(args) {
|
|
|
52
80
|
}
|
|
53
81
|
index += 1;
|
|
54
82
|
}
|
|
55
|
-
if (args.includes('--encrypt') && args.includes('--no-encrypt')) {
|
|
56
|
-
throw new MenuClientError('INVALID_ARGUMENT', '--encrypt and --no-encrypt are mutually exclusive');
|
|
57
|
-
}
|
|
58
83
|
const format = getArgValue(args, '--format');
|
|
59
84
|
if (format !== undefined && format !== 'json')
|
|
60
85
|
throw new MenuClientError('INVALID_ARGUMENT', '--format currently supports only json');
|
|
@@ -71,7 +96,7 @@ export function parseMenuClientArgs(args, readFile) {
|
|
|
71
96
|
return {
|
|
72
97
|
fromAid, targetAid, request: readRequest(options, readFile),
|
|
73
98
|
timeoutMs: parseDurationMs(getArgValue(options, '--timeout')),
|
|
74
|
-
encrypt:
|
|
99
|
+
encrypt: readEncryptMode(options),
|
|
75
100
|
waitForCompletion: options.includes('--wait'),
|
|
76
101
|
remoteAccessToken: getArgValue(options, '--remote-token') ?? getArgValue(options, '--ecweb-token'),
|
|
77
102
|
slotId: getArgValue(options, '--app'), aunPath: getArgValue(options, '--aun-path'),
|
|
@@ -84,8 +109,8 @@ export async function cmdMenuClient(args) {
|
|
|
84
109
|
--request-file <path> 从 JSON 文件读取一个 menu.* 请求
|
|
85
110
|
--request-json <json> 直接传入一个 menu.* JSON 请求
|
|
86
111
|
--timeout <时长> 默认 15s,最大 120s
|
|
87
|
-
--encrypt
|
|
88
|
-
|
|
112
|
+
--encrypt yes|no|auto 使用 E2EE / 强制明文 / 跟随本机默认
|
|
113
|
+
省略时沿用本机 daemon 默认配置;携带授权 token 时不可用
|
|
89
114
|
--wait 等待升级或模板作业终态;超时后可按 jobId 查询
|
|
90
115
|
--remote-token <token> 使用 daemon 远程访问 token 临时授权
|
|
91
116
|
--ecweb-token <token> --remote-token 的兼容别名
|
package/dist/cli/model.js
CHANGED
|
@@ -18,6 +18,7 @@ import { getCatalog, getModelInfo, catalogEfforts, resolveCatalogModel, assertCa
|
|
|
18
18
|
import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole, } from '../core/model/model-permission.js';
|
|
19
19
|
import { resolvePaths } from '../paths.js';
|
|
20
20
|
import { daemonUnavailableMessage, queryDaemon } from './help.js';
|
|
21
|
+
import { readTaskRuntimeContextFromEnv } from './task-context.js';
|
|
21
22
|
import { parsePeerKey } from '../core/relation/peer-identity.js';
|
|
22
23
|
import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
|
|
23
24
|
import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
@@ -189,7 +190,7 @@ Commands:
|
|
|
189
190
|
list 列出可用模型,标注当前 Agent 级模型
|
|
190
191
|
current 显示 Agent 级模型(经角色约束)+ 来源
|
|
191
192
|
info <model-id> 查看单个模型详情(厂商/上下文/价格/模态/effort/状态)
|
|
192
|
-
use <model-id> 设置 Agent
|
|
193
|
+
use <model-id> 设置 Agent 级模型(托管会话省略 --self;--self 仅可用于等于本端 AID)
|
|
193
194
|
reset 清除 Agent 级模型与推理强度,回落到较低优先级配置
|
|
194
195
|
effort <level> 设置 Agent 级推理强度(low|medium|high|xhigh|max|auto)
|
|
195
196
|
check 诊断网关连通性与模型可用性(分阶段输出进度)
|
|
@@ -203,6 +204,7 @@ Commands:
|
|
|
203
204
|
修改 Agent 级后,该 Agent 所有会话的下一条消息即时生效。
|
|
204
205
|
角色策略请通过角色策略编辑器修改。
|
|
205
206
|
托管会话内省略 --self/--peer/--role 时,命令作用于当前会话;写操作仅当前 Agent 的 owner/admin 可用。
|
|
207
|
+
托管会话的写操作不接受指向其他 Agent 的 --self,也不接受 --peer/--role;--self <本端 AID> 等同省略。
|
|
206
208
|
|
|
207
209
|
Options:
|
|
208
210
|
--self <aid> 本端 AID
|
|
@@ -216,7 +218,8 @@ Options:
|
|
|
216
218
|
ec model list
|
|
217
219
|
ec model current --self bot.agentid.pub --peer aun#alice.agentid.pub
|
|
218
220
|
ec model info deepseek-v4-pro
|
|
219
|
-
ec model use opus
|
|
221
|
+
ec model use opus # 托管会话(作用于当前 Agent)
|
|
222
|
+
ec model use opus --self bot.agentid.pub # 非托管终端
|
|
220
223
|
ec model effort high --self bot.agentid.pub
|
|
221
224
|
ec model reset --self bot.agentid.pub
|
|
222
225
|
ec model check --self bot.agentid.pub`;
|
|
@@ -485,9 +488,21 @@ export async function cmdModel(args) {
|
|
|
485
488
|
return;
|
|
486
489
|
}
|
|
487
490
|
if (process.env.EVOLCORE_SESSION_ID) {
|
|
488
|
-
if (!['list', 'current', 'info', 'check'].includes(sub)
|
|
489
|
-
|
|
490
|
-
|
|
491
|
+
if (!['list', 'current', 'info', 'check'].includes(sub)) {
|
|
492
|
+
if (args.some(arg => arg === '--peer' || arg === '--role')) {
|
|
493
|
+
fail(formatJson, 'NOT_ALLOWED', 'Managed model writes cannot select --peer or --role');
|
|
494
|
+
}
|
|
495
|
+
const selfIndex = args.indexOf('--self');
|
|
496
|
+
if (selfIndex !== -1) {
|
|
497
|
+
// 托管写入只作用于当前会话的 Agent;`--self <本端 AID>` 是幂等写法,
|
|
498
|
+
// 与省略等价,按 help 的示例照抄不应失败。
|
|
499
|
+
const requested = args[selfIndex + 1];
|
|
500
|
+
const own = process.env.EVOLCORE_SELF_AID || readTaskRuntimeContextFromEnv()?.selfAid;
|
|
501
|
+
if (!own || requested !== own) {
|
|
502
|
+
fail(formatJson, 'NOT_ALLOWED', 'Managed model writes apply to the current session Agent; omit --self (--self must equal the current AID)');
|
|
503
|
+
}
|
|
504
|
+
args = args.slice(0, selfIndex).concat(args.slice(selfIndex + 2));
|
|
505
|
+
}
|
|
491
506
|
}
|
|
492
507
|
await runManagedCliOperation(['model', ...args], formatJson, sub === 'check' ? 60_000 : 10_000);
|
|
493
508
|
return;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { resolvePaths } from '../paths.js';
|
|
2
|
+
import { ipcQuery } from '../ipc.js';
|
|
3
|
+
import { readDelegationCredential, hashCurrentDelegatedCommand } from '../core/auth/agent-delegation.js';
|
|
4
|
+
import { parsePaymentCommand, PAYMENT_HELP } from '../pay/command.js';
|
|
5
|
+
export async function cmdPay(args) {
|
|
6
|
+
if (!args.length || args.includes('--help') || args.includes('-h')) {
|
|
7
|
+
console.log(PAYMENT_HELP);
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
try {
|
|
11
|
+
parsePaymentCommand(args);
|
|
12
|
+
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
13
|
+
const delegationToken = readDelegationCredential();
|
|
14
|
+
if (!sessionId || !delegationToken)
|
|
15
|
+
throw Object.assign(new Error('ec pay requires an active delegated Owner conversation'), { code: 'DELEGATION_REQUIRED' });
|
|
16
|
+
const result = await ipcQuery(resolvePaths().socket, {
|
|
17
|
+
type: 'pay.op', argv: ['pay', ...args], sessionId, delegationToken,
|
|
18
|
+
delegationCommandHash: hashCurrentDelegatedCommand(),
|
|
19
|
+
}, 120_000, { throwOnError: false });
|
|
20
|
+
if (!result)
|
|
21
|
+
throw new Error('Payment daemon is unavailable');
|
|
22
|
+
console.log(JSON.stringify(result, null, 2));
|
|
23
|
+
if (!result.ok)
|
|
24
|
+
process.exitCode = 1;
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
console.error(JSON.stringify({ ok: false, code: error.code ?? 'PAYMENT_FAILED', error: error instanceof Error ? error.message : String(error) }));
|
|
28
|
+
process.exitCode = 1;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
@@ -62,12 +62,16 @@ function providerText(command, data) {
|
|
|
62
62
|
lines.push(`${indent}${label(field)}:${label(value)}`);
|
|
63
63
|
};
|
|
64
64
|
const provider = structuredClone(data.provider ?? {});
|
|
65
|
+
const envReference = /^\$(?:[A-Za-z_][A-Za-z0-9_]*|\{[A-Za-z_][A-Za-z0-9_]*\})$/u;
|
|
66
|
+
const redactKey = (value) => (typeof value === 'string' && value && !envReference.test(value) ? '<redacted>' : value);
|
|
65
67
|
for (const connection of [provider.common, ...Object.values(provider.services ?? {})]) {
|
|
66
68
|
if (!connection)
|
|
67
69
|
continue;
|
|
68
70
|
const key = connection.apiKey;
|
|
69
|
-
if (
|
|
70
|
-
connection.apiKey =
|
|
71
|
+
if (Array.isArray(key))
|
|
72
|
+
connection.apiKey = key.map(redactKey);
|
|
73
|
+
else if (key)
|
|
74
|
+
connection.apiKey = redactKey(key);
|
|
71
75
|
for (const field of ['headers', 'queryParams']) {
|
|
72
76
|
if (connection[field])
|
|
73
77
|
for (const key of Object.keys(connection[field]))
|