evolcore 0.0.49 → 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 +64 -1
- 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 +280 -6
- 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 +4 -1
- 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 +29 -1
- package/dist/aun/msg/upload.js +126 -3
- package/dist/build-identity.json +1 -1
- package/dist/channels/aun.js +537 -189
- 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/ecmsg-gateway.js +11 -9
- package/dist/cli/index.js +23 -4
- package/dist/cli/init.js +39 -63
- package/dist/cli/managed-command-guard.js +1 -0
- package/dist/cli/menu-client.js +32 -7
- package/dist/cli/pay-command.js +30 -0
- package/dist/cli/provider-command.js +6 -2
- package/dist/cli/restart-monitor.js +2 -2
- package/dist/cli/services-command.js +11 -9
- package/dist/cli/thread-command.js +78 -12
- package/dist/config/access-policy.js +16 -3
- package/dist/config/config-field-policy.js +17 -8
- package/dist/config/config-manager.js +86 -46
- 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 +99 -16
- package/dist/config/providers-management.js +35 -19
- package/dist/config/resolved-config-op.js +1 -42
- 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/operation-authorizer.js +16 -1
- package/dist/core/auth/operation-catalog.js +50 -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 +15 -0
- 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 +91 -72
- package/dist/core/command/menu-protocol.js +5 -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/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 +2 -1
- package/dist/core/daemon-lifecycle.js +13 -5
- package/dist/core/evolagent-registry.js +12 -7
- 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 +4 -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 +98 -21
- package/dist/core/message/aun-request-registry.js +31 -0
- package/dist/core/message/message-bridge.js +105 -6
- package/dist/core/message/message-log.js +8 -0
- package/dist/core/message/message-queue.js +5 -3
- package/dist/core/message/peer-mode.js +15 -4
- package/dist/core/message/response-engine.js +23 -8
- package/dist/core/message/send-options.js +37 -3
- package/dist/core/message/send-routing.js +11 -7
- package/dist/core/model/model-catalog.js +5 -5
- package/dist/core/ownership/owner-resolver.js +12 -86
- package/dist/core/pack-auth.js +4 -0
- package/dist/core/permission/ec-command-parser.js +182 -58
- package/dist/core/permission/protected-paths.js +64 -9
- package/dist/core/permission/services-path-acl.js +9 -2
- package/dist/core/permission/tool-policy.js +21 -9
- 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/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 +52 -2
- package/dist/core/thread/types.js +15 -1
- package/dist/eck/kit-renderer.js +2 -1
- package/dist/ecweb/basic-settings-service.js +5 -9
- package/dist/ecweb/providers-service.js +4 -2
- package/dist/index.js +116 -41
- package/dist/ipc.js +58 -2
- 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 +176 -18
- package/dist/services/ipc-operation.js +204 -44
- package/dist/services/script-runner.js +515 -83
- package/dist/services/validation.js +109 -4
- 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 -20
- package/dist/utils/aid-bind.js +3 -0
- package/dist/utils/evolcore-version.js +2 -2
- package/dist/utils/host-info.js +73 -0
- package/dist/utils/logger.js +2 -2
- package/dist/utils/media-cache.js +190 -43
- 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/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 +7 -6
- package/kits/docs/evolcore/agent.md +36 -1
- package/kits/docs/evolcore/aid.md +20 -3
- package/kits/docs/evolcore/config.md +1 -1
- 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 +68 -10
- package/kits/docs/evolcore/pay.md +34 -0
- package/kits/docs/evolcore/provider.md +21 -0
- package/kits/docs/evolcore/services.md +46 -18
- package/kits/docs/evolcore/thread-chain.md +2 -0
- package/kits/docs/evolcore/tool-authorization.md +10 -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.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 +13 -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 +12 -5
- 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 +1 -1
- 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/system-fragments/channel.md +13 -4
- package/kits/templates/system-fragments/commands.md +4 -3
- 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 -129
- package/kits/templates/system-fragments/venue.md +16 -0
- package/package.json +4 -5
- package/scripts/agent-template/inspect.mjs +37 -23
- package/scripts/agent-template/overlay.mjs +20 -2
- package/scripts/agent-template/shared/common.mjs +16 -4
- package/scripts/agent-template/shared/team-schema.json +20 -4
- package/scripts/agent-template/shared/template-contract.mjs +53 -13
- package/scripts/agent-template/shared/template-package.mjs +90 -26
- package/scripts/agent-template/shared/template-runtime.mjs +111 -1
- package/scripts/agent-template/shared/template.mjs +65 -7
- package/scripts/agent-template/team-pack.mjs +89 -33
- 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
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* 包内幂等(.idempotency.jsonl):按 (fromAid, request_id)
|
|
2
|
+
* 包内幂等(.idempotency.jsonl):按 (fromAid, request_id) 去重,默认窗口 15 秒。
|
|
3
3
|
*
|
|
4
4
|
* 与 `claimInboundMessage` 是两层不同的东西:后者管传输层 `message_id` 重投,
|
|
5
5
|
* 这里管对端用同一 `request_id` 重试。命中时回上次结果,脚本不再执行。
|
|
6
|
+
*
|
|
7
|
+
* 窗口是**调用窗口的余量**,不是独立策略:服务请求走 volatile TTL(默认 12 秒),
|
|
8
|
+
* 15 秒 = 12 秒等待期 + 3 秒;更长调用保留至执行截止后 3 秒。
|
|
6
9
|
*/
|
|
7
10
|
import fs from 'node:fs';
|
|
8
11
|
import path from 'node:path';
|
|
9
|
-
export const IDEMPOTENCY_WINDOW_MS =
|
|
12
|
+
export const IDEMPOTENCY_WINDOW_MS = 15_000;
|
|
10
13
|
function key(from, requestId) {
|
|
11
14
|
return `${from}\u0000${requestId}`;
|
|
12
15
|
}
|
|
13
|
-
/**
|
|
14
|
-
|
|
15
|
-
const date = new Date(ts);
|
|
16
|
-
return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
|
|
17
|
-
}
|
|
16
|
+
/** 文件行数超过这个值就重写一次,丢掉已过期记录。 */
|
|
17
|
+
const COMPACT_THRESHOLD_LINES = 500;
|
|
18
18
|
export class IdempotencyStore {
|
|
19
19
|
filePath;
|
|
20
20
|
records = new Map();
|
|
@@ -29,12 +29,18 @@ export class IdempotencyStore {
|
|
|
29
29
|
/** 同上,键 → 完成信号触发器。与 `inFlight` 同生命周期。 */
|
|
30
30
|
releasers = new Map();
|
|
31
31
|
loadedMtimeMs = -1;
|
|
32
|
+
/**
|
|
33
|
+
* 文件当前的行数(含已过期的行)。
|
|
34
|
+
*
|
|
35
|
+
* 压实判据必须是**文件行数**而不是 `records.size`:`ensureLoaded` 读完就先
|
|
36
|
+
* `evict`,内存表里只剩窗口内的那几条,拿它比阈值永远够不到,文件只增不减。
|
|
37
|
+
*/
|
|
38
|
+
fileLines = 0;
|
|
32
39
|
constructor(filePath) {
|
|
33
40
|
this.filePath = filePath;
|
|
34
41
|
}
|
|
35
42
|
/** 按文件 mtime 懒加载;文件被外部改动时重读。 */
|
|
36
43
|
ensureLoaded(now = Date.now()) {
|
|
37
|
-
this.rotateIfMonthChanged(now);
|
|
38
44
|
let mtimeMs = 0;
|
|
39
45
|
try {
|
|
40
46
|
mtimeMs = fs.statSync(this.filePath).mtimeMs;
|
|
@@ -44,14 +50,17 @@ export class IdempotencyStore {
|
|
|
44
50
|
}
|
|
45
51
|
if (mtimeMs === this.loadedMtimeMs) {
|
|
46
52
|
this.evict(now);
|
|
53
|
+
this.compactIfNeeded(now);
|
|
47
54
|
return;
|
|
48
55
|
}
|
|
49
56
|
this.records.clear();
|
|
57
|
+
let lines = 0;
|
|
50
58
|
try {
|
|
51
59
|
const text = fs.readFileSync(this.filePath, 'utf8');
|
|
52
60
|
for (const line of text.split('\n')) {
|
|
53
61
|
if (!line)
|
|
54
62
|
continue;
|
|
63
|
+
lines++;
|
|
55
64
|
try {
|
|
56
65
|
const record = JSON.parse(line);
|
|
57
66
|
if (typeof record.from === 'string' && typeof record.requestId === 'string'
|
|
@@ -68,98 +77,41 @@ export class IdempotencyStore {
|
|
|
68
77
|
// 读失败按空表处理,下次调用再试。
|
|
69
78
|
}
|
|
70
79
|
this.loadedMtimeMs = mtimeMs;
|
|
80
|
+
this.fileLines = lines;
|
|
71
81
|
this.evict(now);
|
|
82
|
+
this.compactIfNeeded(now);
|
|
72
83
|
}
|
|
73
84
|
evict(now) {
|
|
74
|
-
const cutoff = now - IDEMPOTENCY_WINDOW_MS;
|
|
75
85
|
for (const [entryKey, record] of this.records) {
|
|
76
|
-
if (record.ts <
|
|
86
|
+
if ((record.expiresAt ?? record.ts + IDEMPOTENCY_WINDOW_MS) < now)
|
|
77
87
|
this.records.delete(entryKey);
|
|
78
88
|
}
|
|
79
89
|
}
|
|
80
90
|
/**
|
|
81
|
-
*
|
|
91
|
+
* 压实:丢掉已过期的行后整体重写。
|
|
82
92
|
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
-
* 又给文件大小设了自然上界。归档目标与 `removePack` 的日志归档同在 `logs/` 下。
|
|
93
|
+
* 窗口只有 15 秒,所以这里不再按月归档——一份文件里几乎不可能同时存在两个月的
|
|
94
|
+
* 记录。剩下的问题只是 append-only 会让文件一直变长,按行数触发即可。
|
|
86
95
|
*
|
|
87
|
-
*
|
|
88
|
-
* 定时器只会空转。
|
|
96
|
+
* 失败不影响去重:老文件继续用,下次再试。
|
|
89
97
|
*/
|
|
90
|
-
|
|
91
|
-
if (
|
|
92
|
-
return; // 没什么可滚的。
|
|
93
|
-
// 判据是**最新一条记录的时间**,不是文件 mtime:mtime 表示"最后一次写入",
|
|
94
|
-
// 一次补写或外部拷贝都会把它拉到别的月份,那时按它切会把还在窗口内的记录误归档。
|
|
95
|
-
this.ensureLoadedFresh(now);
|
|
96
|
-
if (this.records.size === 0)
|
|
98
|
+
compactIfNeeded(now) {
|
|
99
|
+
if (this.fileLines < COMPACT_THRESHOLD_LINES)
|
|
97
100
|
return;
|
|
98
|
-
|
|
99
|
-
if (monthKey(newest) === monthKey(now))
|
|
100
|
-
return;
|
|
101
|
-
const archiveDir = path.join(path.dirname(this.filePath), 'logs');
|
|
102
|
-
const archivePath = path.join(archiveDir, `idempotency-${monthKey(newest)}.jsonl`);
|
|
103
|
-
let carried = [];
|
|
101
|
+
this.evict(now);
|
|
104
102
|
try {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
this.
|
|
108
|
-
carried = [...this.records.values()].filter(record => record.ts >= now - IDEMPOTENCY_WINDOW_MS);
|
|
109
|
-
fs.mkdirSync(archiveDir, { recursive: true });
|
|
110
|
-
// 目标已存在(外部拷贝可能造成)就跟在后面追加,不覆盖——覆盖等于丢掉已归档的历史。
|
|
111
|
-
if (fs.existsSync(archivePath)) {
|
|
112
|
-
fs.appendFileSync(archivePath, fs.readFileSync(this.filePath, 'utf8'), 'utf8');
|
|
113
|
-
fs.rmSync(this.filePath, { force: true });
|
|
114
|
-
}
|
|
115
|
-
else {
|
|
116
|
-
fs.renameSync(this.filePath, archivePath);
|
|
117
|
-
}
|
|
118
|
-
// 仍有效的记录写回新文件:归档要归档,但去重语义不能因为跨月断掉。
|
|
103
|
+
const kept = [...this.records.values()];
|
|
104
|
+
const text = kept.map(record => `${JSON.stringify(record)}\n`).join('');
|
|
105
|
+
const temp = `${this.filePath}.tmp`;
|
|
119
106
|
fs.mkdirSync(path.dirname(this.filePath), { recursive: true });
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
this.
|
|
124
|
-
for (const record of carried)
|
|
125
|
-
this.records.set(key(record.from, record.requestId), record);
|
|
126
|
-
this.loadedMtimeMs = text ? fs.statSync(this.filePath).mtimeMs : 0;
|
|
127
|
-
}
|
|
128
|
-
catch {
|
|
129
|
-
// 滚动失败不影响去重:继续用当前文件,下次再试。
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
/**
|
|
133
|
-
* 直接重读文件、不触发滚动(滚动过程中要用,否则递归)。
|
|
134
|
-
*
|
|
135
|
-
* 只在跨月那一刻调用一次,不必在意"mtime 没变就跳过"的优化。
|
|
136
|
-
*/
|
|
137
|
-
ensureLoadedFresh(now) {
|
|
138
|
-
this.records.clear();
|
|
139
|
-
try {
|
|
140
|
-
for (const line of fs.readFileSync(this.filePath, 'utf8').split('\n')) {
|
|
141
|
-
if (!line)
|
|
142
|
-
continue;
|
|
143
|
-
try {
|
|
144
|
-
const record = JSON.parse(line);
|
|
145
|
-
if (typeof record.from === 'string' && typeof record.requestId === 'string'
|
|
146
|
-
&& Number.isFinite(record.ts) && record.result && typeof record.result === 'object') {
|
|
147
|
-
this.records.set(key(record.from, record.requestId), record);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
catch {
|
|
151
|
-
// 跳过坏行
|
|
152
|
-
}
|
|
153
|
-
}
|
|
107
|
+
fs.writeFileSync(temp, text, 'utf8');
|
|
108
|
+
fs.renameSync(temp, this.filePath);
|
|
109
|
+
this.loadedMtimeMs = fs.statSync(this.filePath).mtimeMs;
|
|
110
|
+
this.fileLines = kept.length;
|
|
154
111
|
}
|
|
155
112
|
catch {
|
|
156
|
-
//
|
|
113
|
+
// 压实失败不影响去重:继续用当前文件。
|
|
157
114
|
}
|
|
158
|
-
this.loadedMtimeMs = now;
|
|
159
|
-
}
|
|
160
|
-
/** 幂等文件的月度归档路径(CLI / 排查用)。 */
|
|
161
|
-
static archivePathFor(filePath, month) {
|
|
162
|
-
return path.join(path.dirname(filePath), 'logs', `idempotency-${month}.jsonl`);
|
|
163
115
|
}
|
|
164
116
|
/** 命中的上次结果;未命中返回 undefined。 */
|
|
165
117
|
lookup(from, requestId, now = Date.now()) {
|
|
@@ -167,7 +119,7 @@ export class IdempotencyStore {
|
|
|
167
119
|
const record = this.records.get(key(from, requestId));
|
|
168
120
|
if (!record)
|
|
169
121
|
return undefined;
|
|
170
|
-
if (record.
|
|
122
|
+
if ((record.expiresAt ?? record.ts + IDEMPOTENCY_WINDOW_MS) < now) {
|
|
171
123
|
this.records.delete(key(from, requestId));
|
|
172
124
|
return undefined;
|
|
173
125
|
}
|
|
@@ -202,17 +154,23 @@ export class IdempotencyStore {
|
|
|
202
154
|
resolve?.();
|
|
203
155
|
}
|
|
204
156
|
/** 记录一次成功执行的结果。IO 失败吞掉:去重是优化,不是正确性前提。 */
|
|
205
|
-
record(from, requestId, result, now = Date.now()) {
|
|
157
|
+
record(from, requestId, result, now = Date.now(), deadlineAt) {
|
|
206
158
|
this.ensureLoaded(now);
|
|
207
|
-
const
|
|
159
|
+
const expiresAt = Math.max(now + IDEMPOTENCY_WINDOW_MS, Math.min(deadlineAt ?? now, now + 300_000) + 3000);
|
|
160
|
+
const record = { ts: now, from, requestId, result, expiresAt };
|
|
208
161
|
this.records.set(key(from, requestId), record);
|
|
209
162
|
try {
|
|
210
163
|
fs.mkdirSync(path.dirname(this.filePath), { recursive: true });
|
|
211
164
|
fs.appendFileSync(this.filePath, `${JSON.stringify(record)}\n`, 'utf8');
|
|
212
165
|
this.loadedMtimeMs = fs.statSync(this.filePath).mtimeMs;
|
|
166
|
+
this.fileLines++;
|
|
213
167
|
}
|
|
214
168
|
catch {
|
|
215
169
|
// 写失败不影响本次回复,只是下次重试会再执行一遍。
|
|
170
|
+
return;
|
|
216
171
|
}
|
|
172
|
+
// 压实放在写入之后:`loadedMtimeMs` 刚刚对齐,下一次 `ensureLoaded` 会走
|
|
173
|
+
// "mtime 未变"的短路分支,不在这里判就永远轮不到。
|
|
174
|
+
this.compactIfNeeded(now);
|
|
217
175
|
}
|
|
218
176
|
}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import fs from 'node:fs';
|
|
10
10
|
import path from 'node:path';
|
|
11
11
|
import { logger } from '../utils/logger.js';
|
|
12
|
+
import { DEFAULT_HANDLER_TIMEOUT_MS } from './validation.js';
|
|
12
13
|
export const SERVICES_INDEX_FILE = '.index.md';
|
|
13
14
|
/**
|
|
14
15
|
* @param servicesDir `$AGENT_DIR/services`
|
|
@@ -34,7 +35,7 @@ export function writeServicesIndex(servicesDir, selfAid, activePacks) {
|
|
|
34
35
|
lines.push('');
|
|
35
36
|
lines.push('调用方式(对端视角):');
|
|
36
37
|
lines.push(` ec services describe <本AID> 查看完整参数与示例`);
|
|
37
|
-
lines.push(` ec services call <本AID> <type> --data '<json>'`);
|
|
38
|
+
lines.push(` ec services call --aid <本AID> --type <type> --data '<json>'`);
|
|
38
39
|
lines.push('');
|
|
39
40
|
// 分档写出:各档权限不同,混成一行会让模型以为 enable 和 status 一样随手可调,
|
|
40
41
|
// 试一次被拒才发现(详见 $KITS_DOCS/evolcore/services.md §十)。
|
|
@@ -47,12 +48,12 @@ export function writeServicesIndex(servicesDir, selfAid, activePacks) {
|
|
|
47
48
|
for (const pack of activePacks) {
|
|
48
49
|
lines.push(`- ${pack.id}(${pack.name})`);
|
|
49
50
|
for (const entry of pack.listen) {
|
|
50
|
-
const timeoutMs = entry.handler.timeoutMs ??
|
|
51
|
+
const timeoutMs = entry.handler.timeoutMs ?? DEFAULT_HANDLER_TIMEOUT_MS;
|
|
51
52
|
lines.push(` ${entry.type} ${entry.handler.script} timeout ${formatTimeout(timeoutMs)}`);
|
|
52
53
|
}
|
|
53
54
|
const first = pack.listen[0];
|
|
54
55
|
if (first) {
|
|
55
|
-
lines.push(` 示例: ec services call ${selfAid} ${exampleType(first.type)} --data '{}'`);
|
|
56
|
+
lines.push(` 示例: ec services call --aid ${selfAid} --type ${exampleType(first.type)} --data '{}'`);
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
lines.push('');
|
package/dist/services/index.js
CHANGED
|
@@ -5,9 +5,11 @@
|
|
|
5
5
|
* 应答(*.result)完全不经过这里——那是 AunRequestRegistry 的事,在消息层更早分支。
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
|
+
import { agentProjectChangeGate } from '../config-store.js';
|
|
8
9
|
import { logger } from '../utils/logger.js';
|
|
9
10
|
import { matchFilter } from '../trigger/event-source.js';
|
|
10
11
|
import { ServiceDispatcher } from './dispatcher.js';
|
|
12
|
+
import { ServiceHostRuntime } from './host-runtime.js';
|
|
11
13
|
import { IdempotencyStore } from './idempotency.js';
|
|
12
14
|
import { readLocalSelfIdentity } from './identity.js';
|
|
13
15
|
import { writeServicesIndex } from './index-generator.js';
|
|
@@ -20,6 +22,7 @@ import { RateWindow } from '../core/rate-window.js';
|
|
|
20
22
|
import { ServiceScriptRunner } from './script-runner.js';
|
|
21
23
|
import { buildErrorReply, buildSilentReply, buildSuccessReply, replyFromOutcome, isReservedServiceType, matchesListen, RESERVED_TYPES, } from './service-payload.js';
|
|
22
24
|
import { errorMessage } from './types.js';
|
|
25
|
+
import { DEFAULT_HANDLER_TIMEOUT_MS } from './validation.js';
|
|
23
26
|
import { isOutputType } from '../outputs/protocol.js';
|
|
24
27
|
import { outputRequestSchema, outputResponseSchema } from '../outputs/protocol.js';
|
|
25
28
|
import { OutputService } from '../outputs/service.js';
|
|
@@ -47,6 +50,27 @@ const UNAUTHORIZED_NOTICE_MAX = 10_000;
|
|
|
47
50
|
* 但拿不到包名、服务 type、reply 策略这些内部结构。
|
|
48
51
|
*/
|
|
49
52
|
const UNAUTHORIZED_MINIMAL_BUILTIN = ['services.ping'];
|
|
53
|
+
/**
|
|
54
|
+
* 调度层拒收码:脚本**一秒都没执行**。
|
|
55
|
+
*
|
|
56
|
+
* 三个后果必须一致处理,漏一个就会把偶发故障放大成持续故障:
|
|
57
|
+
*
|
|
58
|
+
* 1. 不进 `handled` 日志(那是"脚本跑完了"的记录);
|
|
59
|
+
* 2. 进 `service.rejected` 台账(运维要看得出是调度层挡的);
|
|
60
|
+
* 3. **不进包内幂等缓存**——否则调用方 15 秒内重试会拿到缓存下来的失败。
|
|
61
|
+
*
|
|
62
|
+
* `SERVICES_HOST_*` 属于这一类:宿主启动中 / 重启中 / 降级 / 协议破坏,
|
|
63
|
+
* 被调用的脚本根本没被拉起。
|
|
64
|
+
*/
|
|
65
|
+
const SCHEDULER_REJECTION_CODES = new Set([
|
|
66
|
+
'SERVICE_DEADLINE_EXCEEDED',
|
|
67
|
+
'QUEUE_FULL',
|
|
68
|
+
'DISPATCHER_CLOSED',
|
|
69
|
+
'SERVICES_HOST_STARTING',
|
|
70
|
+
'SERVICES_HOST_RESTARTING',
|
|
71
|
+
'SERVICES_HOST_UNAVAILABLE',
|
|
72
|
+
'SERVICES_HOST_PROTOCOL',
|
|
73
|
+
]);
|
|
50
74
|
export class ServiceRouter {
|
|
51
75
|
servicesDir;
|
|
52
76
|
deps;
|
|
@@ -64,9 +88,19 @@ export class ServiceRouter {
|
|
|
64
88
|
/** fromAid → 上次告知未准入的时间;窗口内重复调用静默。 */
|
|
65
89
|
unauthorizedNotified = new Map();
|
|
66
90
|
started = false;
|
|
91
|
+
activeRequests = 0;
|
|
92
|
+
mutationHolds = new Set();
|
|
93
|
+
pauseForMutation(token) {
|
|
94
|
+
if (this.activeRequests)
|
|
95
|
+
throw Object.assign(new Error('Agent service requests are active'), { code: 'AGENT_BUSY' });
|
|
96
|
+
this.mutationHolds.add(token);
|
|
97
|
+
return () => { this.mutationHolds.delete(token); };
|
|
98
|
+
}
|
|
67
99
|
outputService;
|
|
68
100
|
outputCardsService;
|
|
69
101
|
workbenchService;
|
|
102
|
+
/** 常驻宿主运行时(总闸打开且被调用时才真正启动进程)。 */
|
|
103
|
+
hostRuntime;
|
|
70
104
|
constructor(servicesDir, deps, limits,
|
|
71
105
|
/**
|
|
72
106
|
* 只读快照模式:不写索引、不写台账。
|
|
@@ -87,6 +121,40 @@ export class ServiceRouter {
|
|
|
87
121
|
this.outputCardsService = new OutputCardsService(deps.aid);
|
|
88
122
|
this.workbenchService = deps.workbenchService ?? new WorkbenchService(deps.aid, { offline: readonlySnapshot });
|
|
89
123
|
}
|
|
124
|
+
/**
|
|
125
|
+
* 按总闸决定是否把宿主运行时挂到 runner 上。
|
|
126
|
+
*
|
|
127
|
+
* 挂载语义是「下一次调用走宿主」,本次不启动进程——懒启动由宿主运行时自己保证。
|
|
128
|
+
* 关闸时把引用摘掉即可:已起的宿主由 `close()` 收掉,不在这里杀(可能有在途调用)。
|
|
129
|
+
*/
|
|
130
|
+
syncHostRuntime() {
|
|
131
|
+
const enabled = this.config.host?.enabled === true;
|
|
132
|
+
if (!enabled) {
|
|
133
|
+
this.scriptRunner.setHostRuntime(undefined);
|
|
134
|
+
// 摘引用之后宿主进程还活着,要等 1 小时空闲回收。关闸是显式运维动作,
|
|
135
|
+
// 结果应该是「现在就没了」——空闲时立刻收掉;有在途调用时保留进程,
|
|
136
|
+
// 交给调用结束后正常的空闲回收(不强杀在途调用)。
|
|
137
|
+
void this.hostRuntime?.retireIfIdle().catch(error => {
|
|
138
|
+
logger.warn(`[Services] host retire after disable failed: ${errorMessage(error)}`);
|
|
139
|
+
});
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
if (this.hostRuntime) {
|
|
143
|
+
this.hostRuntime.cancelRetirement();
|
|
144
|
+
this.scriptRunner.setHostRuntime(this.hostRuntime);
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
this.hostRuntime = new ServiceHostRuntime({
|
|
148
|
+
aid: this.deps.aid,
|
|
149
|
+
identity: () => this.identity,
|
|
150
|
+
getProjectPath: this.deps.getProjectPath,
|
|
151
|
+
// 缺省时返回 undefined,由宿主运行时在启动阶段明确拒绝(不静默降级)。
|
|
152
|
+
getRuntimeRoot: this.deps.getRuntimeRoot ?? (() => undefined),
|
|
153
|
+
...(this.deps.permissionMode ? { permissionMode: this.deps.permissionMode } : {}),
|
|
154
|
+
...(this.deps.onHostLog ? { onHostLog: this.deps.onHostLog } : {}),
|
|
155
|
+
});
|
|
156
|
+
this.scriptRunner.setHostRuntime(this.hostRuntime);
|
|
157
|
+
}
|
|
90
158
|
/** 首次加载:读 services-config.json + 扫描包。identity 必须已就绪。重复调用只更新 identity。 */
|
|
91
159
|
ensureStarted(identity) {
|
|
92
160
|
this.identity = identity;
|
|
@@ -109,11 +177,17 @@ export class ServiceRouter {
|
|
|
109
177
|
this.config = router.config;
|
|
110
178
|
this.routerErrors = router.errors;
|
|
111
179
|
this.limiter.setConfig(router.config);
|
|
180
|
+
// 总闸变化要立刻反映到执行路径上:打开 → 下次调用懒启动宿主;
|
|
181
|
+
// 关闭 → 后续调用退回一次性路径(已起的宿主在 close 时收掉)。
|
|
182
|
+
this.syncHostRuntime();
|
|
112
183
|
// 顺带清理过期窗口:reload 是低频动作,够用了,不值得为此单开一个定时器。
|
|
113
184
|
this.limiter.prune();
|
|
114
185
|
this.unauthorizedWindow.prune();
|
|
115
186
|
const loaded = loadPacks(this.servicesDir);
|
|
116
187
|
this.packs = buildPackState(loaded.valid, loaded.invalid.map(item => ({ id: item.packId, errors: item.errors })), this.identity);
|
|
188
|
+
// 热重载:已运行的宿主若与当前代码不一致,请求滚动重启(走空闲窗口,不打断调用)。
|
|
189
|
+
// 必须在包集合更新之后、且用新集合判——否则"改了代码"这个判断拿到的是旧快照。
|
|
190
|
+
this.hostRuntime?.reconcile(this.packs.activePacks.map(pack => ({ id: pack.id, revision: pack.revision })));
|
|
117
191
|
// 索引与包集合同步重建;空集删除,交给 manifest 的 optional 判缺失。
|
|
118
192
|
// 只读快照不写:查询命令不该改变磁盘状态。
|
|
119
193
|
if (!this.readonlySnapshot) {
|
|
@@ -216,6 +290,18 @@ export class ServiceRouter {
|
|
|
216
290
|
* 调用方必须已判定 `classifyServicePayloadType(type) === 'request'`。
|
|
217
291
|
*/
|
|
218
292
|
async handleRequest(message, options = {}) {
|
|
293
|
+
if (this.mutationHolds.size || agentProjectChangeGate(this.deps.aid))
|
|
294
|
+
return options.admission === 'blocked' ? buildSilentReply(message.type, message.requestId)
|
|
295
|
+
: buildErrorReply(message.type, message.requestId, 'AGENT_BUSY', 'Agent project migration is in progress');
|
|
296
|
+
this.activeRequests++;
|
|
297
|
+
try {
|
|
298
|
+
return await this.handleUnpausedRequest(message, options);
|
|
299
|
+
}
|
|
300
|
+
finally {
|
|
301
|
+
this.activeRequests--;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
async handleUnpausedRequest(message, options) {
|
|
219
305
|
const type = message.type;
|
|
220
306
|
if (!this.config.enabled) {
|
|
221
307
|
logger.debug(`[Services] router disabled; dropped ${type} mid=${message.messageId}`);
|
|
@@ -367,9 +453,13 @@ export class ServiceRouter {
|
|
|
367
453
|
}
|
|
368
454
|
packLedger(pack).append({ action: 'service.invoked', packId: pack.id, type, from: message.fromAid, requestId: message.requestId });
|
|
369
455
|
const outcome = await this.dispatcher.run(pack, handler.handler, message);
|
|
370
|
-
// 没跑起来 ≠
|
|
456
|
+
// 没跑起来 ≠ 脚本失败:调度层拒收时脚本一秒都没执行。
|
|
371
457
|
// 混进 `handled` 会让"这个服务为什么老是 error"指向错误的方向。
|
|
372
|
-
|
|
458
|
+
//
|
|
459
|
+
// `SERVICES_HOST_*` 与 `QUEUE_FULL` 同类:宿主正在启动/重启/降级/协议破坏,
|
|
460
|
+
// **脚本根本没被拉起**。这类失败还不能进幂等缓存(见下方 `record` 的条件)——
|
|
461
|
+
// 记进去的话调用方 15 秒内重试会拿到缓存的失败,把一次偶发重启放大成持续故障。
|
|
462
|
+
const notRun = SCHEDULER_REJECTION_CODES.has(outcome.error?.code ?? '');
|
|
373
463
|
if (notRun) {
|
|
374
464
|
log.writeDropped(message, outcome.error.code.toLowerCase());
|
|
375
465
|
packLedger(pack).append({
|
|
@@ -399,9 +489,11 @@ export class ServiceRouter {
|
|
|
399
489
|
logger.warn(`[Services] ${pack.id} handler for ${type} ${outcome.outcome}: ${outcome.error?.code ?? ''} ${outcome.error?.message ?? ''}`);
|
|
400
490
|
}
|
|
401
491
|
const reply = replyFromOutcome(type, message.requestId, outcome);
|
|
402
|
-
//
|
|
403
|
-
|
|
404
|
-
|
|
492
|
+
// 成功与**脚本自身**的失败都记:同一 (from, request_id) 重试必须回同一结果,不能重跑脚本。
|
|
493
|
+
// 但调度层拒收不记——脚本没执行过,"上次结果"不存在;记下来会把偶发重启
|
|
494
|
+
// 变成 15 秒内必现的失败(调用方重试时命中缓存)。
|
|
495
|
+
if (reply.shouldSend && !notRun) {
|
|
496
|
+
store.record(message.fromAid, message.requestId, reply.payload, Date.now(), message.deadlineAt);
|
|
405
497
|
}
|
|
406
498
|
if (reply.shouldSend) {
|
|
407
499
|
packLedger(pack).append({ action: 'service.replied', packId: pack.id, type, from: message.fromAid, requestId: message.requestId, ...(reply.payload.ok === false ? { result: 'failed' } : { result: 'ok' }) });
|
|
@@ -480,7 +572,8 @@ export class ServiceRouter {
|
|
|
480
572
|
// 不带 service 时退化为清单:与 `ec services describe <aid>` 的语义一致。
|
|
481
573
|
if (!target)
|
|
482
574
|
return buildSuccessReply(type, message.requestId, { services: [...this.describeAll(), ...native], builtin: [...RESERVED_TYPES] });
|
|
483
|
-
const output = native.find(item => Array.isArray(item.
|
|
575
|
+
const output = native.find(item => Array.isArray(item.handlers)
|
|
576
|
+
&& item.handlers.some(entry => entry?.type === target));
|
|
484
577
|
if (output)
|
|
485
578
|
return buildSuccessReply(type, message.requestId, output);
|
|
486
579
|
const described = this.describeOne(target);
|
|
@@ -564,13 +657,45 @@ export class ServiceRouter {
|
|
|
564
657
|
return false;
|
|
565
658
|
}
|
|
566
659
|
}
|
|
660
|
+
/**
|
|
661
|
+
* 宿主运行时状态(运维观测用)。
|
|
662
|
+
*
|
|
663
|
+
* 未启用时返回 `{ enabled: false }`;启用但未启动时 `running: false`——
|
|
664
|
+
* 这两种要能区分:前者是闸门关着,后者是懒加载还没被调用过。
|
|
665
|
+
*/
|
|
666
|
+
hostStatus() {
|
|
667
|
+
const enabled = this.config.host?.enabled === true;
|
|
668
|
+
// 关闸后进程可能还在(有在途调用,等它们跑完再收):必须如实报出来,
|
|
669
|
+
// 否则 `{enabled:false}` 会让人以为进程已经没了。
|
|
670
|
+
if (!enabled) {
|
|
671
|
+
const running = this.hostRuntime?.running === true;
|
|
672
|
+
return running
|
|
673
|
+
? { enabled: false, running: true, draining: true }
|
|
674
|
+
: { enabled: false };
|
|
675
|
+
}
|
|
676
|
+
return {
|
|
677
|
+
enabled: true,
|
|
678
|
+
...(this.hostRuntime ? this.hostRuntime.status() : { running: false, started: false }),
|
|
679
|
+
};
|
|
680
|
+
}
|
|
567
681
|
/** services.list 的正文:每个 active 包及其全部 listen type。 */
|
|
568
682
|
describeAll() {
|
|
569
683
|
return this.packs.activePacks.map(pack => ({
|
|
570
684
|
pack: pack.id,
|
|
571
685
|
name: pack.name,
|
|
572
686
|
...(pack.description ? { description: pack.description } : {}),
|
|
573
|
-
|
|
687
|
+
/**
|
|
688
|
+
* 逐 handler 一条,`type` 与展示信息同属一个记录。
|
|
689
|
+
*
|
|
690
|
+
* 不用「`types: string[]` + 另一个带标注的数组」两个平行数组:同一 type 出现两处
|
|
691
|
+
* 必然漂移,消费方还得自己按下标对齐。`handlers` 与 `pack.json` 的 `listen[].handler`、
|
|
692
|
+
* 以及 `describeOne` 返回的 `handlers` 三处同名同义。
|
|
693
|
+
*/
|
|
694
|
+
handlers: pack.listen.map(entry => ({
|
|
695
|
+
type: entry.type,
|
|
696
|
+
...(entry.handler.name ? { name: entry.handler.name } : {}),
|
|
697
|
+
...(entry.handler.description ? { description: entry.handler.description } : {}),
|
|
698
|
+
})),
|
|
574
699
|
/** 精确 type;通配形式保留原样,调用方据此判断可发范围。 */
|
|
575
700
|
unmatched: pack.unmatched,
|
|
576
701
|
reply: pack.reply.allowed,
|
|
@@ -588,11 +713,15 @@ export class ServiceRouter {
|
|
|
588
713
|
type: target,
|
|
589
714
|
pack: pack.id,
|
|
590
715
|
name: pack.name,
|
|
591
|
-
|
|
716
|
+
/** handler 的说明优先于包说明:调用方问的是「这个 type」,不是「这个包」。 */
|
|
717
|
+
...(entry.handler.description
|
|
718
|
+
? { description: entry.handler.description }
|
|
719
|
+
: pack.description ? { description: pack.description } : {}),
|
|
720
|
+
...(entry.handler.name ? { handlerName: entry.handler.name } : {}),
|
|
592
721
|
listen: entry.type,
|
|
593
722
|
script: entry.handler.script,
|
|
594
723
|
...(entry.handler.runtime ? { runtime: entry.handler.runtime } : {}),
|
|
595
|
-
timeoutMs: entry.handler.timeoutMs ??
|
|
724
|
+
timeoutMs: entry.handler.timeoutMs ?? DEFAULT_HANDLER_TIMEOUT_MS,
|
|
596
725
|
...(entry.handler.args && entry.handler.args.length > 0 ? { args: entry.handler.args } : {}),
|
|
597
726
|
...(entry.filter ? { filter: entry.filter } : {}),
|
|
598
727
|
reply: pack.reply.allowed,
|
|
@@ -614,8 +743,12 @@ export class ServiceRouter {
|
|
|
614
743
|
listen: first.type,
|
|
615
744
|
script: first.handler.script,
|
|
616
745
|
...(first.handler.runtime ? { runtime: first.handler.runtime } : {}),
|
|
617
|
-
timeoutMs: first.handler.timeoutMs ??
|
|
618
|
-
|
|
746
|
+
timeoutMs: first.handler.timeoutMs ?? DEFAULT_HANDLER_TIMEOUT_MS,
|
|
747
|
+
handlers: pack.listen.map(entry => ({
|
|
748
|
+
type: entry.type,
|
|
749
|
+
...(entry.handler.name ? { name: entry.handler.name } : {}),
|
|
750
|
+
...(entry.handler.description ? { description: entry.handler.description } : {}),
|
|
751
|
+
})),
|
|
619
752
|
reply: pack.reply.allowed,
|
|
620
753
|
};
|
|
621
754
|
}
|
|
@@ -630,6 +763,7 @@ export class ServiceRouter {
|
|
|
630
763
|
*/
|
|
631
764
|
close() {
|
|
632
765
|
this.dispatcher.close();
|
|
766
|
+
void this.hostRuntime?.close();
|
|
633
767
|
void this.outputService.close();
|
|
634
768
|
this.outputCardsService.close();
|
|
635
769
|
this.workbenchService.close();
|
|
@@ -638,16 +772,26 @@ export class ServiceRouter {
|
|
|
638
772
|
return [{
|
|
639
773
|
pack: 'builtin.outputs', name: 'Agent output projection',
|
|
640
774
|
description: 'Owner-authorized read-only Agent output snapshots and changes',
|
|
641
|
-
|
|
775
|
+
handlers: toHandlerList(['services.outputs.snapshot', 'services.outputs.list', 'services.outputs.detail', 'services.outputs.changes', ...OUTPUT_CARDS_TYPES]),
|
|
642
776
|
unmatched: 'silent', reply: true,
|
|
643
777
|
}];
|
|
644
778
|
}
|
|
645
779
|
workbenchDescriptions() {
|
|
646
780
|
return [{ pack: 'builtin.workbench', name: 'Team workbench projection',
|
|
647
781
|
description: 'Owner-authorized current tasks, retained execution history and event-driven changes',
|
|
648
|
-
|
|
782
|
+
handlers: toHandlerList(WORKBENCH_TYPES), unmatched: 'silent', reply: true }];
|
|
649
783
|
}
|
|
650
784
|
}
|
|
785
|
+
/**
|
|
786
|
+
* type 字符串列表 → `handlers` 记录列表(内置服务用)。
|
|
787
|
+
*
|
|
788
|
+
* 内置服务没有可声明的 handler 元信息,所以每个条目只有 `type`。存在的意义是让
|
|
789
|
+
* `services.list` 返回的数组**形状统一**:包条目与内置条目都带 `handlers`,消费方
|
|
790
|
+
* 不需要按来源分支处理。
|
|
791
|
+
*/
|
|
792
|
+
function toHandlerList(types) {
|
|
793
|
+
return types.map(type => ({ type }));
|
|
794
|
+
}
|
|
651
795
|
function readStringField(payload, key) {
|
|
652
796
|
const data = payload.data;
|
|
653
797
|
const value = payload[key] ?? (data && typeof data === 'object' && !Array.isArray(data)
|
|
@@ -686,16 +830,27 @@ export function serviceRequestSchema(requestType, described) {
|
|
|
686
830
|
};
|
|
687
831
|
}
|
|
688
832
|
/** services.skill 的正文:一段可直接读的用法说明。 */
|
|
833
|
+
/**
|
|
834
|
+
* 压成单行:`skills` 的正文是给对端 Agent 读的 markdown,description 里若带换行会
|
|
835
|
+
* 破坏列表结构(作者可能写多行说明)。折叠连续空白并截断,不做语义处理。
|
|
836
|
+
*/
|
|
837
|
+
function singleLine(text, max = 120) {
|
|
838
|
+
const flat = text.replace(/\s+/g, ' ').trim();
|
|
839
|
+
return flat.length > max ? `${flat.slice(0, max - 1)}…` : flat;
|
|
840
|
+
}
|
|
689
841
|
export function renderServiceSkill(selfAid, described) {
|
|
690
842
|
const lines = [];
|
|
691
|
-
|
|
843
|
+
const heading = described.handlerName
|
|
844
|
+
? `${described.name} / ${described.handlerName} — ${described.type}`
|
|
845
|
+
: `${described.name} — ${described.type}`;
|
|
846
|
+
lines.push(`# ${heading}`);
|
|
692
847
|
lines.push('');
|
|
693
848
|
if (described.description) {
|
|
694
849
|
lines.push(described.description);
|
|
695
850
|
lines.push('');
|
|
696
851
|
}
|
|
697
852
|
lines.push('调用方式:');
|
|
698
|
-
lines.push(` ec services call ${selfAid} ${described.type} --data '<json>'`);
|
|
853
|
+
lines.push(` ec services call --aid ${selfAid} --type ${described.type} --data '<json>'`);
|
|
699
854
|
lines.push('');
|
|
700
855
|
lines.push('要点:');
|
|
701
856
|
lines.push(` - 入参放在 data 里;具体字段由服务端脚本解释,无声明式约束。`);
|
|
@@ -703,11 +858,14 @@ export function renderServiceSkill(selfAid, described) {
|
|
|
703
858
|
lines.push(` - 回复 type 固定为 ${described.type}.result,正文是 {ok, data} 或 {ok, error:{code,message}}。`);
|
|
704
859
|
if (!described.reply)
|
|
705
860
|
lines.push(' - 该服务包未开启回复:调用方收不到结果,只会有执行记录。');
|
|
706
|
-
if (described.
|
|
861
|
+
if (described.handlers && described.handlers.length > 1) {
|
|
707
862
|
lines.push('');
|
|
708
863
|
lines.push('该包的其它 type:');
|
|
709
|
-
for (const
|
|
710
|
-
|
|
864
|
+
for (const entry of described.handlers) {
|
|
865
|
+
const title = entry.name ? `${entry.name} ` : '';
|
|
866
|
+
const note = entry.description ? ` — ${singleLine(entry.description)}` : '';
|
|
867
|
+
lines.push(` ${title}${entry.type}${note}`.replace(/\s+$/, ''));
|
|
868
|
+
}
|
|
711
869
|
}
|
|
712
870
|
lines.push('');
|
|
713
871
|
return lines.join('\n');
|