evolcore 0.0.43-test.5 → 0.0.43-test.7
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 +95 -0
- package/bin/ecmsg.js +281 -81
- package/dist/agents/baseagent-availability.js +20 -5
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +36 -3
- package/dist/agents/codex-runner.js +75 -8
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +306 -30
- package/dist/cli/agent-create.js +18 -8
- package/dist/cli/aun-commands.js +9 -1
- package/dist/cli/daemon-commands.js +34 -65
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +38 -3
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/init.js +75 -0
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/provider-command.js +1 -1
- package/dist/cli/restart-monitor.js +67 -50
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/task-context.js +38 -1
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-logs.js +6 -4
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +6 -4
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +1 -8
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/peer-role-resolver.js +1 -1
- package/dist/config/provider-identity-migration.js +92 -17
- package/dist/config/provider-local-sync.js +2 -0
- package/dist/config/providers-config.js +13 -0
- package/dist/config/providers-management.js +100 -10
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +86 -88
- package/dist/config/snapshot.js +70 -41
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +146 -15
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +75 -42
- package/dist/core/channel-loader.js +45 -13
- package/dist/core/channel-runtime.js +116 -45
- package/dist/core/command/agent-control.js +1 -1
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +58 -16
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +338 -0
- package/dist/core/command/menu-catalog.js +8 -0
- package/dist/core/command/menu-handler.js +206 -87
- package/dist/core/command/menu-protocol.js +142 -22
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/role-menu.js +27 -15
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +45 -15
- package/dist/core/daemon-lifecycle.js +478 -75
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +130 -42
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +4 -4
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +51 -11
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +149 -19
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +57 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +163 -52
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +55 -7
- package/dist/core/ownership/owner-resolver.js +8 -0
- package/dist/core/permission/ec-command-parser.js +14 -3
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +163 -3
- package/dist/core/session/session-idle-monitor.js +9 -1
- package/dist/core/session/session-manager.js +36 -2
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/directory/owner-directory-admission.js +42 -30
- package/dist/directory/owner-directory-cache.js +143 -126
- package/dist/directory/owner-directory-query-operation.js +9 -8
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +14 -8
- package/dist/ecweb/runtime/supervisor.js +62 -30
- package/dist/event-center/admission-materializer.js +114 -0
- package/dist/event-center/bus-gate.js +136 -0
- package/dist/event-center/bus-host.js +290 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +100 -0
- package/dist/event-center/client-factory.js +50 -0
- package/dist/event-center/daemon.js +45 -0
- package/dist/event-center/directory-source.js +53 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +63 -0
- package/dist/event-center/ipc-operation.js +308 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +202 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +238 -0
- package/dist/event-center/runtime.js +641 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +35 -0
- package/dist/event-center/validation.js +413 -0
- package/dist/index.js +751 -268
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +43 -18
- package/dist/proxy/service-supervisor.js +78 -35
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +458 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +204 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +95 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +21 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +78 -5
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +175 -13
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +109 -10
- package/dist/utils/startup-trace.js +222 -44
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +10 -17
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +5 -2
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/event-center.md +207 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +3 -2
- package/kits/docs/evolcore/group.md +2 -2
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +27 -8
- package/kits/docs/evolcore/provider.md +23 -3
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +277 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/eck_manifest.json +45 -7
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +5 -6
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +9 -7
- package/kits/templates/system-fragments/reply.md +2 -6
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +11 -9
- package/package.json +5 -6
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
|
@@ -0,0 +1,449 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 服务路由核心:入站 services.* 请求 → 保留字 / 包匹配 → 限流 / 幂等 / 准入 → 脚本 → 回复。
|
|
3
|
+
*
|
|
4
|
+
* 本模块不碰 AUN 传输:它只返回 ServiceReply,由 channels/aun.ts 负责发出。
|
|
5
|
+
* 应答(*.result)完全不经过这里——那是 AunRequestRegistry 的事,在消息层更早分支。
|
|
6
|
+
*/
|
|
7
|
+
import fs from 'node:fs';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { logger } from '../utils/logger.js';
|
|
10
|
+
import { matchFilter } from '../trigger/event-source.js';
|
|
11
|
+
import { ServiceDispatcher } from './dispatcher.js';
|
|
12
|
+
import { IdempotencyStore } from './idempotency.js';
|
|
13
|
+
import { readLocalSelfIdentity } from './identity.js';
|
|
14
|
+
import { writeServicesIndex } from './index-generator.js';
|
|
15
|
+
import { packLedger, routerLedger, ServiceLedger } from './ledger.js';
|
|
16
|
+
import { ServiceMessageLog } from './message-log.js';
|
|
17
|
+
import { buildPackState, loadPackDir, loadPacks } from './pack-manager.js';
|
|
18
|
+
import { buildErrorReply, buildSilentReply, buildSuccessReply, replyFromOutcome } from './reply.js';
|
|
19
|
+
import { DEFAULT_ROUTER_CONFIG, loadRouterConfig, RateLimiter } from './router.js';
|
|
20
|
+
import { ServiceScriptRunner } from './script-runner.js';
|
|
21
|
+
import { isReservedServiceType, matchesListen, RESERVED_TYPES } from './service-payload.js';
|
|
22
|
+
import { errorMessage } from './types.js';
|
|
23
|
+
export { classifyServicePayloadType, parseServiceType, isReservedServiceType, RESERVED_TYPES } from './service-payload.js';
|
|
24
|
+
export { resolveSelfIdentity, readLocalSelfIdentity, isServicesIdentity } from './identity.js';
|
|
25
|
+
export class ServiceRouter {
|
|
26
|
+
servicesDir;
|
|
27
|
+
deps;
|
|
28
|
+
config = DEFAULT_ROUTER_CONFIG;
|
|
29
|
+
packs;
|
|
30
|
+
identity;
|
|
31
|
+
routerErrors = [];
|
|
32
|
+
limiter = new RateLimiter(DEFAULT_ROUTER_CONFIG);
|
|
33
|
+
dispatcher;
|
|
34
|
+
scriptRunner;
|
|
35
|
+
idempotency = new Map();
|
|
36
|
+
started = false;
|
|
37
|
+
constructor(servicesDir, deps, limits) {
|
|
38
|
+
this.servicesDir = servicesDir;
|
|
39
|
+
this.deps = deps;
|
|
40
|
+
this.identity = { aid: deps.aid, type: 'agent', exttype: '' };
|
|
41
|
+
this.packs = buildPackState([], [], this.identity);
|
|
42
|
+
this.scriptRunner = new ServiceScriptRunner(deps);
|
|
43
|
+
this.dispatcher = new ServiceDispatcher(this.scriptRunner, limits);
|
|
44
|
+
}
|
|
45
|
+
/** 首次加载:读 router.json + 扫描包。identity 必须已就绪。重复调用只更新 identity。 */
|
|
46
|
+
ensureStarted(identity) {
|
|
47
|
+
this.identity = identity;
|
|
48
|
+
if (this.started)
|
|
49
|
+
return;
|
|
50
|
+
this.reload();
|
|
51
|
+
this.started = true;
|
|
52
|
+
}
|
|
53
|
+
/** 重新加载 router.json 与全部包(ec services reload / 热重载用)。 */
|
|
54
|
+
reload() {
|
|
55
|
+
const router = loadRouterConfig(this.servicesDir);
|
|
56
|
+
this.config = router.config;
|
|
57
|
+
this.routerErrors = router.errors;
|
|
58
|
+
this.limiter.setConfig(router.config);
|
|
59
|
+
const loaded = loadPacks(this.servicesDir);
|
|
60
|
+
this.packs = buildPackState(loaded.valid, loaded.invalid.map(item => ({ id: item.packId, errors: item.errors })), this.identity, this.packs.revision);
|
|
61
|
+
// 索引与包集合同步重建;空集删除,交给 manifest 的 optional 判缺失。
|
|
62
|
+
writeServicesIndex(this.servicesDir, this.identity.aid, this.packs.activePacks);
|
|
63
|
+
if (router.exists) {
|
|
64
|
+
const ledger = routerLedger(this.servicesDir);
|
|
65
|
+
ledger.append({ action: 'router.load', result: router.errors.length ? 'failed' : 'ok', ...(router.errors.length ? { reason: router.errors.join('; ') } : {}) });
|
|
66
|
+
}
|
|
67
|
+
for (const pack of this.packs.activePacks) {
|
|
68
|
+
packLedger(pack).append({ action: 'pack.load', result: 'ok', packId: pack.id, revision: pack.revision });
|
|
69
|
+
}
|
|
70
|
+
for (const item of this.packs.skippedPacks) {
|
|
71
|
+
const packDir = path.join(this.servicesDir, item.id);
|
|
72
|
+
new ServiceLedger(path.join(packDir, 'ledger.jsonl')).append({ action: 'pack.skipped', packId: item.id, reason: item.reason });
|
|
73
|
+
}
|
|
74
|
+
for (const item of this.packs.invalidPacks) {
|
|
75
|
+
const ledger = new ServiceLedger(path.join(this.servicesDir, item.id, 'ledger.jsonl'));
|
|
76
|
+
ledger.append({ action: 'pack.invalid', result: 'failed', packId: item.id, reason: item.errors.join('; ') });
|
|
77
|
+
}
|
|
78
|
+
return this.snapshot();
|
|
79
|
+
}
|
|
80
|
+
/** ECK 的 hasServicePacks:是否有已激活(requires 通过)的包。读内存状态,不扫目录。 */
|
|
81
|
+
hasActivePacks() {
|
|
82
|
+
return this.packs.activePacks.length > 0;
|
|
83
|
+
}
|
|
84
|
+
snapshot() {
|
|
85
|
+
return { enabled: this.config.enabled, config: this.config, packs: this.packs, identity: this.identity, routerErrors: this.routerErrors };
|
|
86
|
+
}
|
|
87
|
+
get enabled() {
|
|
88
|
+
return this.config.enabled;
|
|
89
|
+
}
|
|
90
|
+
/** services 模式下给非 Owner 的错误回复也走 builtin 额度。 */
|
|
91
|
+
consumeBuiltinQuota(fromAid) {
|
|
92
|
+
return this.limiter.consume('builtin', fromAid);
|
|
93
|
+
}
|
|
94
|
+
/** 单包热加载(ec services reload <name>)。 */
|
|
95
|
+
reloadPack(packId) {
|
|
96
|
+
const packDir = path.join(this.servicesDir, packId);
|
|
97
|
+
const errors = [];
|
|
98
|
+
const pack = loadPackDir(packDir, errors);
|
|
99
|
+
if (!pack)
|
|
100
|
+
return { ok: false, errors };
|
|
101
|
+
// 全量重建:跨包冲突必须重算。
|
|
102
|
+
this.reload();
|
|
103
|
+
return { ok: true, errors: [] };
|
|
104
|
+
}
|
|
105
|
+
/** 包的实际路径(CLI 用);只对已加载的包有效。 */
|
|
106
|
+
packPaths(packId) {
|
|
107
|
+
const pack = this.packs.activePacks.find(candidate => candidate.id === packId);
|
|
108
|
+
if (!pack)
|
|
109
|
+
return undefined;
|
|
110
|
+
return { dir: pack.dir, logs: pack.paths.logsDir, ledger: pack.paths.ledger };
|
|
111
|
+
}
|
|
112
|
+
idempotencyFor(pack) {
|
|
113
|
+
let store = this.idempotency.get(pack.id);
|
|
114
|
+
if (!store) {
|
|
115
|
+
store = new IdempotencyStore(pack.paths.idempotency);
|
|
116
|
+
this.idempotency.set(pack.id, store);
|
|
117
|
+
}
|
|
118
|
+
return store;
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* 处理一条服务请求。返回 ServiceReply;`shouldSend=false` 表示静默。
|
|
122
|
+
* 调用方必须已判定 `classifyServicePayloadType(type) === 'request'`。
|
|
123
|
+
*/
|
|
124
|
+
async handleRequest(message, options = {}) {
|
|
125
|
+
const type = message.type;
|
|
126
|
+
if (!this.config.enabled) {
|
|
127
|
+
logger.debug(`[Services] router disabled; dropped ${type} mid=${message.messageId}`);
|
|
128
|
+
return buildSilentReply(type, message.requestId);
|
|
129
|
+
}
|
|
130
|
+
// 保留字:整条 type 精确相等才算,两段形式。
|
|
131
|
+
if (isReservedServiceType(type)) {
|
|
132
|
+
return this.handleBuiltin(type, message, options);
|
|
133
|
+
}
|
|
134
|
+
const match = this.resolvePack(type);
|
|
135
|
+
if (!match)
|
|
136
|
+
return this.handleUnmatched(type, message);
|
|
137
|
+
const { pack, handler } = match;
|
|
138
|
+
// 幂等:命中时回上次结果,不执行脚本。
|
|
139
|
+
const store = this.idempotencyFor(pack);
|
|
140
|
+
const cached = store.lookup(message.fromAid, message.requestId);
|
|
141
|
+
if (cached) {
|
|
142
|
+
packLedger(pack).append({ action: 'service.duplicate', packId: pack.id, type, from: message.fromAid, requestId: message.requestId });
|
|
143
|
+
return { type: String(cached.result.type ?? `${type}.result`), requestId: message.requestId, shouldSend: true, payload: cached.result };
|
|
144
|
+
}
|
|
145
|
+
if (options.admission === 'blocked') {
|
|
146
|
+
ServiceMessageLog.forPack(pack).writeDropped(message, 'blocked');
|
|
147
|
+
packLedger(pack).append({ action: 'service.rejected', packId: pack.id, type, from: message.fromAid, requestId: message.requestId, code: 'BLOCKED' });
|
|
148
|
+
return buildSilentReply(type, message.requestId);
|
|
149
|
+
}
|
|
150
|
+
if (options.admission === 'not_authorized') {
|
|
151
|
+
ServiceMessageLog.forPack(pack).writeDropped(message, 'not_authorized');
|
|
152
|
+
packLedger(pack).append({ action: 'service.rejected', packId: pack.id, type, from: message.fromAid, requestId: message.requestId, code: 'NOT_AUTHORIZED' });
|
|
153
|
+
return buildErrorReply(type, message.requestId, 'NOT_AUTHORIZED', 'service call is not authorized', {
|
|
154
|
+
...(options.requestContact ? { request_contact: options.requestContact } : {}),
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
const limit = this.limiter.consume('service', message.fromAid);
|
|
158
|
+
if (!limit.allow) {
|
|
159
|
+
packLedger(pack).append({ action: 'service.rejected', packId: pack.id, type, from: message.fromAid, requestId: message.requestId, code: 'RATE_LIMITED' });
|
|
160
|
+
return buildErrorReply(type, message.requestId, 'RATE_LIMITED', '请求过于频繁,请稍后重试', {
|
|
161
|
+
...(limit.retryAfter !== undefined ? { retry_after: limit.retryAfter } : {}),
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
// 包层 filter:不匹配则不 spawn、不写 handled。
|
|
165
|
+
const log = ServiceMessageLog.forPack(pack);
|
|
166
|
+
log.writeReceived(message);
|
|
167
|
+
if (handler.filter && !this.matchesFilter(handler.filter, message)) {
|
|
168
|
+
log.writeFiltered(message, 'filter_mismatch');
|
|
169
|
+
return buildSilentReply(type, message.requestId);
|
|
170
|
+
}
|
|
171
|
+
packLedger(pack).append({ action: 'service.invoked', packId: pack.id, type, from: message.fromAid, requestId: message.requestId });
|
|
172
|
+
const outcome = await this.dispatcher.run(pack, handler.handler, message);
|
|
173
|
+
log.writeHandled(message, {
|
|
174
|
+
cmd: handler.handler.script,
|
|
175
|
+
exit: outcome.exitCode,
|
|
176
|
+
ms: outcome.durationMs,
|
|
177
|
+
outcome: outcome.outcome,
|
|
178
|
+
...(outcome.error ? { reason: `${outcome.error.code}: ${outcome.error.message}`.slice(0, 240) } : {}),
|
|
179
|
+
// 无沙箱执行必须留痕:事后排查「这个脚本为什么能读到不该读的东西」靠它。
|
|
180
|
+
...(outcome.sandboxAbsent ? { sandboxAbsent: outcome.sandboxAbsent } : {}),
|
|
181
|
+
});
|
|
182
|
+
if (outcome.outcome === 'error' || outcome.outcome === 'timeout') {
|
|
183
|
+
logger.warn(`[Services] ${pack.id} handler for ${type} ${outcome.outcome}: ${outcome.error?.code ?? ''} ${outcome.error?.message ?? ''}`);
|
|
184
|
+
}
|
|
185
|
+
const reply = replyFromOutcome(type, message.requestId, outcome);
|
|
186
|
+
// 成功与失败都记:同一 (from, request_id) 重试必须回同一结果,不能重跑脚本。
|
|
187
|
+
if (reply.shouldSend) {
|
|
188
|
+
store.record(message.fromAid, message.requestId, reply.payload);
|
|
189
|
+
}
|
|
190
|
+
if (reply.shouldSend) {
|
|
191
|
+
packLedger(pack).append({ action: 'service.replied', packId: pack.id, type, from: message.fromAid, requestId: message.requestId, ...(reply.payload.ok === false ? { result: 'failed' } : { result: 'ok' }) });
|
|
192
|
+
}
|
|
193
|
+
// reply.allowed=false:脚本只处理、只记录,不回。
|
|
194
|
+
if (!pack.reply.allowed)
|
|
195
|
+
return buildSilentReply(type, message.requestId);
|
|
196
|
+
return reply;
|
|
197
|
+
}
|
|
198
|
+
/** 内置查询服务:豁免准入(blocked 仍拒),受限流。 */
|
|
199
|
+
handleBuiltin(type, message, options) {
|
|
200
|
+
if (options.admission === 'blocked')
|
|
201
|
+
return buildSilentReply(type, message.requestId);
|
|
202
|
+
const limit = this.limiter.consume('builtin', message.fromAid);
|
|
203
|
+
if (!limit.allow) {
|
|
204
|
+
return buildErrorReply(type, message.requestId, 'RATE_LIMITED', '请求过于频繁,请稍后重试', {
|
|
205
|
+
...(limit.retryAfter !== undefined ? { retry_after: limit.retryAfter } : {}),
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
switch (type) {
|
|
209
|
+
case 'services.ping':
|
|
210
|
+
return buildSuccessReply(type, message.requestId, { ok: true, ts: Date.now(), version: '1' });
|
|
211
|
+
case 'services.list':
|
|
212
|
+
return buildSuccessReply(type, message.requestId, {
|
|
213
|
+
services: this.describeAll(),
|
|
214
|
+
builtin: [...RESERVED_TYPES],
|
|
215
|
+
});
|
|
216
|
+
case 'services.describe': {
|
|
217
|
+
const target = readStringField(message.payload, 'service');
|
|
218
|
+
// 不带 service 时退化为清单:与 `ec services describe <aid>` 的语义一致。
|
|
219
|
+
if (!target)
|
|
220
|
+
return buildSuccessReply(type, message.requestId, { services: this.describeAll(), builtin: [...RESERVED_TYPES] });
|
|
221
|
+
const described = this.describeOne(target);
|
|
222
|
+
if (!described)
|
|
223
|
+
return buildErrorReply(type, message.requestId, 'UNKNOWN_TYPE', `no service accepts ${target}`);
|
|
224
|
+
return buildSuccessReply(type, message.requestId, described);
|
|
225
|
+
}
|
|
226
|
+
case 'services.schema': {
|
|
227
|
+
const target = readStringField(message.payload, 'service');
|
|
228
|
+
if (!target)
|
|
229
|
+
return buildErrorReply(type, message.requestId, 'INVALID_ARGUMENT', 'services.schema requires data.service (a services.* type)');
|
|
230
|
+
const described = this.describeOne(target);
|
|
231
|
+
if (!described)
|
|
232
|
+
return buildErrorReply(type, message.requestId, 'UNKNOWN_TYPE', `no service accepts ${target}`);
|
|
233
|
+
return buildSuccessReply(type, message.requestId, { type: target, schema: serviceRequestSchema(target, described) });
|
|
234
|
+
}
|
|
235
|
+
case 'services.skill': {
|
|
236
|
+
const target = readStringField(message.payload, 'service');
|
|
237
|
+
if (!target)
|
|
238
|
+
return buildErrorReply(type, message.requestId, 'INVALID_ARGUMENT', 'services.skill requires data.service');
|
|
239
|
+
const described = this.describeOne(target);
|
|
240
|
+
if (!described)
|
|
241
|
+
return buildErrorReply(type, message.requestId, 'UNKNOWN_TYPE', `no service accepts ${target}`);
|
|
242
|
+
return buildSuccessReply(type, message.requestId, { type: target, skill: renderServiceSkill(this.identity.aid, described) });
|
|
243
|
+
}
|
|
244
|
+
default:
|
|
245
|
+
return buildErrorReply(type, message.requestId, 'UNSUPPORTED', `builtin service ${type} is not implemented yet`);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
/** 精确索引优先,其次通配;应答永不参与(matchesListen 已挡)。 */
|
|
249
|
+
resolvePack(type) {
|
|
250
|
+
const exact = this.packs.routeIndex.get(type);
|
|
251
|
+
if (exact && exact.length > 0)
|
|
252
|
+
return { pack: exact[0].pack, handler: exact[0].entry };
|
|
253
|
+
for (const candidate of this.packs.wildcardIndex) {
|
|
254
|
+
if (matchesListen(candidate.entry.type, type))
|
|
255
|
+
return { pack: candidate.pack, handler: candidate.entry };
|
|
256
|
+
}
|
|
257
|
+
return undefined;
|
|
258
|
+
}
|
|
259
|
+
handleUnmatched(type, message) {
|
|
260
|
+
logger.debug(`[Services] no active pack matched ${type} from=${message.fromAid} mid=${message.messageId}`);
|
|
261
|
+
// 任一 active 包要求 reject 时回 UNKNOWN_TYPE;否则保持 silent,避免对端枚举服务。
|
|
262
|
+
const reject = this.packs.activePacks.some(pack => pack.unmatched === 'reject');
|
|
263
|
+
return reject
|
|
264
|
+
? buildErrorReply(type, message.requestId, 'UNKNOWN_TYPE', `no service accepts ${type}`)
|
|
265
|
+
: buildSilentReply(type, message.requestId);
|
|
266
|
+
}
|
|
267
|
+
matchesFilter(filter, message) {
|
|
268
|
+
if (!filter || typeof filter !== 'object')
|
|
269
|
+
return true;
|
|
270
|
+
const pseudo = {
|
|
271
|
+
...message.payload,
|
|
272
|
+
type: message.type,
|
|
273
|
+
};
|
|
274
|
+
try {
|
|
275
|
+
return matchFilter(pseudo, filter);
|
|
276
|
+
}
|
|
277
|
+
catch {
|
|
278
|
+
return false;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
/** services.list 的正文:每个 active 包及其全部 listen type。 */
|
|
282
|
+
describeAll() {
|
|
283
|
+
return this.packs.activePacks.map(pack => ({
|
|
284
|
+
pack: pack.id,
|
|
285
|
+
name: pack.name,
|
|
286
|
+
...(pack.description ? { description: pack.description } : {}),
|
|
287
|
+
types: pack.listen.map(entry => entry.type),
|
|
288
|
+
/** 精确 type;通配形式保留原样,调用方据此判断可发范围。 */
|
|
289
|
+
unmatched: pack.unmatched,
|
|
290
|
+
reply: pack.reply.allowed,
|
|
291
|
+
}));
|
|
292
|
+
}
|
|
293
|
+
/**
|
|
294
|
+
* services.describe / schema / skill 的查询:按 data.service 找清单条目。
|
|
295
|
+
* 接受三种写法:精确请求 type、通配 listen type、包名。
|
|
296
|
+
*/
|
|
297
|
+
describeOne(target) {
|
|
298
|
+
for (const pack of this.packs.activePacks) {
|
|
299
|
+
for (const entry of pack.listen) {
|
|
300
|
+
if (entry.type === target || (entry.type.endsWith('.*') && matchesListen(entry.type, target))) {
|
|
301
|
+
return {
|
|
302
|
+
type: target,
|
|
303
|
+
pack: pack.id,
|
|
304
|
+
name: pack.name,
|
|
305
|
+
...(pack.description ? { description: pack.description } : {}),
|
|
306
|
+
listen: entry.type,
|
|
307
|
+
script: entry.handler.script,
|
|
308
|
+
...(entry.handler.runtime ? { runtime: entry.handler.runtime } : {}),
|
|
309
|
+
timeoutMs: entry.handler.timeoutMs ?? 30_000,
|
|
310
|
+
...(entry.handler.args && entry.handler.args.length > 0 ? { args: entry.handler.args } : {}),
|
|
311
|
+
...(entry.filter ? { filter: entry.filter } : {}),
|
|
312
|
+
reply: pack.reply.allowed,
|
|
313
|
+
};
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
if (pack.listen.some(entry => entry.type === target))
|
|
317
|
+
continue;
|
|
318
|
+
// 包名写法:返回该包第一个 type 的完整描述,并附全部 type。
|
|
319
|
+
if (pack.id === target) {
|
|
320
|
+
const first = pack.listen[0];
|
|
321
|
+
if (!first)
|
|
322
|
+
continue;
|
|
323
|
+
return {
|
|
324
|
+
type: first.type,
|
|
325
|
+
pack: pack.id,
|
|
326
|
+
name: pack.name,
|
|
327
|
+
...(pack.description ? { description: pack.description } : {}),
|
|
328
|
+
listen: first.type,
|
|
329
|
+
script: first.handler.script,
|
|
330
|
+
...(first.handler.runtime ? { runtime: first.handler.runtime } : {}),
|
|
331
|
+
timeoutMs: first.handler.timeoutMs ?? 30_000,
|
|
332
|
+
types: pack.listen.map(entry => entry.type),
|
|
333
|
+
reply: pack.reply.allowed,
|
|
334
|
+
};
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
return undefined;
|
|
338
|
+
}
|
|
339
|
+
/** 关闭:停止接收新任务。 */
|
|
340
|
+
close() {
|
|
341
|
+
this.dispatcher.close();
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
function readStringField(payload, key) {
|
|
345
|
+
const value = payload[key];
|
|
346
|
+
return typeof value === 'string' && value.trim() ? value.trim() : undefined;
|
|
347
|
+
}
|
|
348
|
+
/**
|
|
349
|
+
* 服务请求 payload 的 JSON Schema。
|
|
350
|
+
*
|
|
351
|
+
* 关键事实:`service.json` 不声明入参结构——参数完全由脚本自己解释,schema 无从得知。
|
|
352
|
+
* 因此这里给的是**信封**schema(type / request_id / data),`data` 保持开放对象,
|
|
353
|
+
* 并明确写出这一点,避免调用方以为有字段级约束。
|
|
354
|
+
*/
|
|
355
|
+
export function serviceRequestSchema(requestType, described) {
|
|
356
|
+
return {
|
|
357
|
+
type: 'object',
|
|
358
|
+
required: ['type'],
|
|
359
|
+
additionalProperties: true,
|
|
360
|
+
properties: {
|
|
361
|
+
type: { const: requestType, description: '请求 type;应答 type 固定为 `<请求 type>.result`' },
|
|
362
|
+
request_id: {
|
|
363
|
+
type: 'string',
|
|
364
|
+
description: '调用方生成的关联 ID;缺失时 daemon 用 message_id 补齐',
|
|
365
|
+
},
|
|
366
|
+
data: {
|
|
367
|
+
type: 'object',
|
|
368
|
+
description: `入参由服务端脚本解释,无声明式约束(服务包 ${described.pack},脚本 ${described.script})`,
|
|
369
|
+
},
|
|
370
|
+
},
|
|
371
|
+
'x-evolcore-service': {
|
|
372
|
+
pack: described.pack,
|
|
373
|
+
script: described.script,
|
|
374
|
+
timeoutMs: described.timeoutMs,
|
|
375
|
+
reply: described.reply ? 'allowed' : 'disabled',
|
|
376
|
+
},
|
|
377
|
+
};
|
|
378
|
+
}
|
|
379
|
+
/** services.skill 的正文:一段可直接读的用法说明。 */
|
|
380
|
+
export function renderServiceSkill(selfAid, described) {
|
|
381
|
+
const lines = [];
|
|
382
|
+
lines.push(`# ${described.name} — ${described.type}`);
|
|
383
|
+
lines.push('');
|
|
384
|
+
if (described.description) {
|
|
385
|
+
lines.push(described.description);
|
|
386
|
+
lines.push('');
|
|
387
|
+
}
|
|
388
|
+
lines.push('调用方式:');
|
|
389
|
+
lines.push(` ec services call ${selfAid} ${described.type} --data '<json>'`);
|
|
390
|
+
lines.push('');
|
|
391
|
+
lines.push('要点:');
|
|
392
|
+
lines.push(` - 入参放在 data 里;具体字段由服务端脚本解释,无声明式约束。`);
|
|
393
|
+
lines.push(` - 超时 ${described.timeoutMs}ms;超时后不要直接重发,先确认是否已执行。`);
|
|
394
|
+
lines.push(` - 回复 type 固定为 ${described.type}.result,正文是 {ok, data} 或 {ok, error:{code,message}}。`);
|
|
395
|
+
if (!described.reply)
|
|
396
|
+
lines.push(' - 该服务包未开启回复:调用方收不到结果,只会有执行记录。');
|
|
397
|
+
if (described.types && described.types.length > 1) {
|
|
398
|
+
lines.push('');
|
|
399
|
+
lines.push('该包的其它 type:');
|
|
400
|
+
for (const type of described.types)
|
|
401
|
+
lines.push(` ${type}`);
|
|
402
|
+
}
|
|
403
|
+
lines.push('');
|
|
404
|
+
return lines.join('\n');
|
|
405
|
+
}
|
|
406
|
+
/** 进程内单例(每个 AID 一个,由 channels/aun.ts 持有)。 */
|
|
407
|
+
const routers = new Map();
|
|
408
|
+
export function getServiceRouter(aid, servicesDir, deps) {
|
|
409
|
+
let router = routers.get(aid);
|
|
410
|
+
if (!router) {
|
|
411
|
+
router = new ServiceRouter(servicesDir, deps);
|
|
412
|
+
routers.set(aid, router);
|
|
413
|
+
}
|
|
414
|
+
return router;
|
|
415
|
+
}
|
|
416
|
+
export function releaseServiceRouter(aid) {
|
|
417
|
+
const router = routers.get(aid);
|
|
418
|
+
if (!router)
|
|
419
|
+
return;
|
|
420
|
+
router.close();
|
|
421
|
+
routers.delete(aid);
|
|
422
|
+
}
|
|
423
|
+
/** 已启动实例(CLI 只读查询用);未启动返回 undefined。 */
|
|
424
|
+
export function peekServiceRouter(aid) {
|
|
425
|
+
return routers.get(aid);
|
|
426
|
+
}
|
|
427
|
+
/** 全部已启动实例的 aid(CLI 解析 --aid 用)。 */
|
|
428
|
+
export function listServiceRouterAids() {
|
|
429
|
+
return [...routers.keys()];
|
|
430
|
+
}
|
|
431
|
+
/**
|
|
432
|
+
* CLI 用的一次性实例:不注册到单例表,只做扫描与检查。
|
|
433
|
+
* 用于 daemon 未运行时的 `ec services status/doctor`,以及 daemon 侧 `--aid` 不在活跃表时的兜底。
|
|
434
|
+
*/
|
|
435
|
+
export function createOfflineServiceRouter(aid, servicesDir, deps) {
|
|
436
|
+
const router = new ServiceRouter(servicesDir, deps);
|
|
437
|
+
router.ensureStarted(readLocalSelfIdentity(aid) ?? { aid, type: 'agent', exttype: '' });
|
|
438
|
+
return router;
|
|
439
|
+
}
|
|
440
|
+
/** services/ 目录是否存在(总闸之外的第二层:目录都没有就没必要扫)。 */
|
|
441
|
+
export function servicesDirExists(servicesDir) {
|
|
442
|
+
try {
|
|
443
|
+
return fs.statSync(servicesDir).isDirectory();
|
|
444
|
+
}
|
|
445
|
+
catch {
|
|
446
|
+
return false;
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
export { errorMessage };
|