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/services/index.js
CHANGED
|
@@ -5,13 +5,16 @@
|
|
|
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';
|
|
14
16
|
import { servicePackLedger as packLedger, routerLedger, ServiceLedger } from '../core/pack-ledger.js';
|
|
17
|
+
import { scheduleServicesAclHarden } from '../core/permission/services-path-acl.js';
|
|
15
18
|
import { ServiceMessageLog } from './message-log.js';
|
|
16
19
|
import { buildPackState, loadPackDir, loadPacks } from './pack-manager.js';
|
|
17
20
|
import { DEFAULT_ROUTER_CONFIG, loadRouterConfig, RateLimiter } from './router.js';
|
|
@@ -19,13 +22,15 @@ import { RateWindow } from '../core/rate-window.js';
|
|
|
19
22
|
import { ServiceScriptRunner } from './script-runner.js';
|
|
20
23
|
import { buildErrorReply, buildSilentReply, buildSuccessReply, replyFromOutcome, isReservedServiceType, matchesListen, RESERVED_TYPES, } from './service-payload.js';
|
|
21
24
|
import { errorMessage } from './types.js';
|
|
25
|
+
import { DEFAULT_HANDLER_TIMEOUT_MS } from './validation.js';
|
|
22
26
|
import { isOutputType } from '../outputs/protocol.js';
|
|
23
27
|
import { outputRequestSchema, outputResponseSchema } from '../outputs/protocol.js';
|
|
24
28
|
import { OutputService } from '../outputs/service.js';
|
|
29
|
+
import { isOutputCardsType, outputCardsRequestSchema, outputCardsResponseSchema, OutputCardsService, OUTPUT_CARDS_TYPES } from '../outputs/cards.js';
|
|
25
30
|
import { DataRootError } from '../core/command/team-workspace-store.js';
|
|
26
31
|
import { isWorkbenchType, WORKBENCH_TYPES, workbenchRequestSchema, workbenchResponseSchema } from '../workbench/protocol.js';
|
|
27
32
|
import { WorkbenchService } from '../workbench/service.js';
|
|
28
|
-
export { classifyServicePayloadType, parseServiceType, isReservedServiceType, RESERVED_TYPES } from './service-payload.js';
|
|
33
|
+
export { classifyServicePayloadType, parseServiceType, isReservedServiceType, isProjectionServiceResult, RESERVED_TYPES } from './service-payload.js';
|
|
29
34
|
export { readLocalSelfIdentity } from './identity.js';
|
|
30
35
|
/**
|
|
31
36
|
* 未准入调用的回复预算。
|
|
@@ -45,6 +50,27 @@ const UNAUTHORIZED_NOTICE_MAX = 10_000;
|
|
|
45
50
|
* 但拿不到包名、服务 type、reply 策略这些内部结构。
|
|
46
51
|
*/
|
|
47
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
|
+
]);
|
|
48
74
|
export class ServiceRouter {
|
|
49
75
|
servicesDir;
|
|
50
76
|
deps;
|
|
@@ -62,8 +88,19 @@ export class ServiceRouter {
|
|
|
62
88
|
/** fromAid → 上次告知未准入的时间;窗口内重复调用静默。 */
|
|
63
89
|
unauthorizedNotified = new Map();
|
|
64
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
|
+
}
|
|
65
99
|
outputService;
|
|
100
|
+
outputCardsService;
|
|
66
101
|
workbenchService;
|
|
102
|
+
/** 常驻宿主运行时(总闸打开且被调用时才真正启动进程)。 */
|
|
103
|
+
hostRuntime;
|
|
67
104
|
constructor(servicesDir, deps, limits,
|
|
68
105
|
/**
|
|
69
106
|
* 只读快照模式:不写索引、不写台账。
|
|
@@ -81,8 +118,43 @@ export class ServiceRouter {
|
|
|
81
118
|
this.scriptRunner = new ServiceScriptRunner(deps);
|
|
82
119
|
this.dispatcher = new ServiceDispatcher(this.scriptRunner, limits);
|
|
83
120
|
this.outputService = deps.outputService ?? new OutputService(deps.aid);
|
|
121
|
+
this.outputCardsService = new OutputCardsService(deps.aid);
|
|
84
122
|
this.workbenchService = deps.workbenchService ?? new WorkbenchService(deps.aid, { offline: readonlySnapshot });
|
|
85
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
|
+
}
|
|
86
158
|
/** 首次加载:读 services-config.json + 扫描包。identity 必须已就绪。重复调用只更新 identity。 */
|
|
87
159
|
ensureStarted(identity) {
|
|
88
160
|
this.identity = identity;
|
|
@@ -90,6 +162,14 @@ export class ServiceRouter {
|
|
|
90
162
|
return;
|
|
91
163
|
this.reload();
|
|
92
164
|
this.started = true;
|
|
165
|
+
// ACL 兜底层自愈:存量包(加固逻辑上线前装的、或目录从别的机器拷贝来的)在这里收敛,
|
|
166
|
+
// 新包由 `pack add` 当场处理。用户不需要知道 ACL 存在。
|
|
167
|
+
//
|
|
168
|
+
// 异步 + 进程内去重:调度立即返回(实测 0ms),加固在后台子进程里跑,
|
|
169
|
+
// 不阻塞启动、不阻塞包执行。只读快照(offline router)不参与,查询不该改磁盘状态。
|
|
170
|
+
if (!this.readonlySnapshot) {
|
|
171
|
+
scheduleServicesAclHarden(this.servicesDir, message => logger.warn(`[Services] ${message}`));
|
|
172
|
+
}
|
|
93
173
|
}
|
|
94
174
|
/** 重新加载 services-config.json 与全部包(ec services reload / 热重载用)。 */
|
|
95
175
|
reload() {
|
|
@@ -97,11 +177,17 @@ export class ServiceRouter {
|
|
|
97
177
|
this.config = router.config;
|
|
98
178
|
this.routerErrors = router.errors;
|
|
99
179
|
this.limiter.setConfig(router.config);
|
|
180
|
+
// 总闸变化要立刻反映到执行路径上:打开 → 下次调用懒启动宿主;
|
|
181
|
+
// 关闭 → 后续调用退回一次性路径(已起的宿主在 close 时收掉)。
|
|
182
|
+
this.syncHostRuntime();
|
|
100
183
|
// 顺带清理过期窗口:reload 是低频动作,够用了,不值得为此单开一个定时器。
|
|
101
184
|
this.limiter.prune();
|
|
102
185
|
this.unauthorizedWindow.prune();
|
|
103
186
|
const loaded = loadPacks(this.servicesDir);
|
|
104
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 })));
|
|
105
191
|
// 索引与包集合同步重建;空集删除,交给 manifest 的 optional 判缺失。
|
|
106
192
|
// 只读快照不写:查询命令不该改变磁盘状态。
|
|
107
193
|
if (!this.readonlySnapshot) {
|
|
@@ -204,6 +290,18 @@ export class ServiceRouter {
|
|
|
204
290
|
* 调用方必须已判定 `classifyServicePayloadType(type) === 'request'`。
|
|
205
291
|
*/
|
|
206
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) {
|
|
207
305
|
const type = message.type;
|
|
208
306
|
if (!this.config.enabled) {
|
|
209
307
|
logger.debug(`[Services] router disabled; dropped ${type} mid=${message.messageId}`);
|
|
@@ -214,7 +312,7 @@ export class ServiceRouter {
|
|
|
214
312
|
this.rejectLedger('BLOCKED', type, message);
|
|
215
313
|
return buildSilentReply(type, message.requestId);
|
|
216
314
|
}
|
|
217
|
-
if (isOutputType(type) || isWorkbenchType(type)) {
|
|
315
|
+
if (isOutputType(type) || isOutputCardsType(type) || isWorkbenchType(type)) {
|
|
218
316
|
if (options.admission === 'not_authorized')
|
|
219
317
|
return this.unauthorizedReply(type, message, 'business');
|
|
220
318
|
const rule = this.callRuleFor(type);
|
|
@@ -224,7 +322,11 @@ export class ServiceRouter {
|
|
|
224
322
|
if (!limit.allow)
|
|
225
323
|
return buildErrorReply(type, message.requestId, 'RATE_LIMITED', 'Output query rate exceeded');
|
|
226
324
|
try {
|
|
227
|
-
const data =
|
|
325
|
+
const data = isWorkbenchType(type)
|
|
326
|
+
? await this.workbenchService.handle(message)
|
|
327
|
+
: isOutputCardsType(type)
|
|
328
|
+
? await this.outputCardsService.handle(message)
|
|
329
|
+
: await this.outputService.handle(message);
|
|
228
330
|
return buildSuccessReply(type, message.requestId, data);
|
|
229
331
|
}
|
|
230
332
|
catch (error) {
|
|
@@ -351,9 +453,13 @@ export class ServiceRouter {
|
|
|
351
453
|
}
|
|
352
454
|
packLedger(pack).append({ action: 'service.invoked', packId: pack.id, type, from: message.fromAid, requestId: message.requestId });
|
|
353
455
|
const outcome = await this.dispatcher.run(pack, handler.handler, message);
|
|
354
|
-
// 没跑起来 ≠
|
|
456
|
+
// 没跑起来 ≠ 脚本失败:调度层拒收时脚本一秒都没执行。
|
|
355
457
|
// 混进 `handled` 会让"这个服务为什么老是 error"指向错误的方向。
|
|
356
|
-
|
|
458
|
+
//
|
|
459
|
+
// `SERVICES_HOST_*` 与 `QUEUE_FULL` 同类:宿主正在启动/重启/降级/协议破坏,
|
|
460
|
+
// **脚本根本没被拉起**。这类失败还不能进幂等缓存(见下方 `record` 的条件)——
|
|
461
|
+
// 记进去的话调用方 15 秒内重试会拿到缓存的失败,把一次偶发重启放大成持续故障。
|
|
462
|
+
const notRun = SCHEDULER_REJECTION_CODES.has(outcome.error?.code ?? '');
|
|
357
463
|
if (notRun) {
|
|
358
464
|
log.writeDropped(message, outcome.error.code.toLowerCase());
|
|
359
465
|
packLedger(pack).append({
|
|
@@ -383,9 +489,11 @@ export class ServiceRouter {
|
|
|
383
489
|
logger.warn(`[Services] ${pack.id} handler for ${type} ${outcome.outcome}: ${outcome.error?.code ?? ''} ${outcome.error?.message ?? ''}`);
|
|
384
490
|
}
|
|
385
491
|
const reply = replyFromOutcome(type, message.requestId, outcome);
|
|
386
|
-
//
|
|
387
|
-
|
|
388
|
-
|
|
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);
|
|
389
497
|
}
|
|
390
498
|
if (reply.shouldSend) {
|
|
391
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' }) });
|
|
@@ -447,7 +555,7 @@ export class ServiceRouter {
|
|
|
447
555
|
catch { /* private capabilities */ }
|
|
448
556
|
const native = [...outputs, ...(workbenchAuthorized ? this.workbenchDescriptions() : [])];
|
|
449
557
|
const requestedService = readStringField(message.payload, 'service');
|
|
450
|
-
if (requestedService && isOutputType(requestedService) && !outputAuthorized) {
|
|
558
|
+
if (requestedService && (isOutputType(requestedService) || isOutputCardsType(requestedService)) && !outputAuthorized) {
|
|
451
559
|
return buildErrorReply(type, message.requestId, 'OUTPUT_FORBIDDEN', 'Current protocol Owner authorization is required');
|
|
452
560
|
}
|
|
453
561
|
if (requestedService && isWorkbenchType(requestedService) && !workbenchAuthorized) {
|
|
@@ -464,7 +572,8 @@ export class ServiceRouter {
|
|
|
464
572
|
// 不带 service 时退化为清单:与 `ec services describe <aid>` 的语义一致。
|
|
465
573
|
if (!target)
|
|
466
574
|
return buildSuccessReply(type, message.requestId, { services: [...this.describeAll(), ...native], builtin: [...RESERVED_TYPES] });
|
|
467
|
-
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));
|
|
468
577
|
if (output)
|
|
469
578
|
return buildSuccessReply(type, message.requestId, output);
|
|
470
579
|
const described = this.describeOne(target);
|
|
@@ -480,6 +589,10 @@ export class ServiceRouter {
|
|
|
480
589
|
return buildSuccessReply(type, message.requestId, {
|
|
481
590
|
type: target, schema: workbenchRequestSchema(target), responseDataSchema: workbenchResponseSchema(target),
|
|
482
591
|
});
|
|
592
|
+
if (isOutputCardsType(target))
|
|
593
|
+
return buildSuccessReply(type, message.requestId, {
|
|
594
|
+
type: target, schema: outputCardsRequestSchema(target), responseDataSchema: outputCardsResponseSchema(),
|
|
595
|
+
});
|
|
483
596
|
if (isOutputType(target))
|
|
484
597
|
return buildSuccessReply(type, message.requestId, {
|
|
485
598
|
type: target, schema: outputRequestSchema(target), responseDataSchema: outputResponseSchema(),
|
|
@@ -496,6 +609,9 @@ export class ServiceRouter {
|
|
|
496
609
|
if (isWorkbenchType(target))
|
|
497
610
|
return buildSuccessReply(type, message.requestId, { type: target,
|
|
498
611
|
skill: 'Read-only Owner-private workbench. Requires encrypted AUN and the current verified protocol Owner. Send protocolVersion:1. Snapshot includes current tasks and retained past executions only; no future schedules. Subscribe to team.workbench.changed on the same Bus and read changes when invalidated. Results are bounded; follow history nextCursor, reset on INDEX_CHANGED. Never poll. Task details use the existing Activity command with taskId.' });
|
|
612
|
+
if (isOutputCardsType(target))
|
|
613
|
+
return buildSuccessReply(type, message.requestId, { type: target,
|
|
614
|
+
skill: 'Owner-authorized output card projection. Cards are declaration-only metadata linked to real files in this Agent output. Use services.outputs.cards.snapshot/list/detail/changes, follow nextCursor, and reset on INDEX_CHANGED. Never poll. Publish or remove cards with ec team cards after referenced files are complete.' });
|
|
499
615
|
if (isOutputType(target))
|
|
500
616
|
return buildSuccessReply(type, message.requestId, { type: target,
|
|
501
617
|
skill: 'Read-only fixed Agent output. Requires encrypted AUN and current verified protocol Owner. Send protocolVersion:1 and the schema-defined data fields. Results are bounded; follow nextCursor and reset on INDEX_CHANGED. No periodic reads.' });
|
|
@@ -541,13 +657,45 @@ export class ServiceRouter {
|
|
|
541
657
|
return false;
|
|
542
658
|
}
|
|
543
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
|
+
}
|
|
544
681
|
/** services.list 的正文:每个 active 包及其全部 listen type。 */
|
|
545
682
|
describeAll() {
|
|
546
683
|
return this.packs.activePacks.map(pack => ({
|
|
547
684
|
pack: pack.id,
|
|
548
685
|
name: pack.name,
|
|
549
686
|
...(pack.description ? { description: pack.description } : {}),
|
|
550
|
-
|
|
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
|
+
})),
|
|
551
699
|
/** 精确 type;通配形式保留原样,调用方据此判断可发范围。 */
|
|
552
700
|
unmatched: pack.unmatched,
|
|
553
701
|
reply: pack.reply.allowed,
|
|
@@ -565,11 +713,15 @@ export class ServiceRouter {
|
|
|
565
713
|
type: target,
|
|
566
714
|
pack: pack.id,
|
|
567
715
|
name: pack.name,
|
|
568
|
-
|
|
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 } : {}),
|
|
569
721
|
listen: entry.type,
|
|
570
722
|
script: entry.handler.script,
|
|
571
723
|
...(entry.handler.runtime ? { runtime: entry.handler.runtime } : {}),
|
|
572
|
-
timeoutMs: entry.handler.timeoutMs ??
|
|
724
|
+
timeoutMs: entry.handler.timeoutMs ?? DEFAULT_HANDLER_TIMEOUT_MS,
|
|
573
725
|
...(entry.handler.args && entry.handler.args.length > 0 ? { args: entry.handler.args } : {}),
|
|
574
726
|
...(entry.filter ? { filter: entry.filter } : {}),
|
|
575
727
|
reply: pack.reply.allowed,
|
|
@@ -591,8 +743,12 @@ export class ServiceRouter {
|
|
|
591
743
|
listen: first.type,
|
|
592
744
|
script: first.handler.script,
|
|
593
745
|
...(first.handler.runtime ? { runtime: first.handler.runtime } : {}),
|
|
594
|
-
timeoutMs: first.handler.timeoutMs ??
|
|
595
|
-
|
|
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
|
+
})),
|
|
596
752
|
reply: pack.reply.allowed,
|
|
597
753
|
};
|
|
598
754
|
}
|
|
@@ -607,23 +763,35 @@ export class ServiceRouter {
|
|
|
607
763
|
*/
|
|
608
764
|
close() {
|
|
609
765
|
this.dispatcher.close();
|
|
766
|
+
void this.hostRuntime?.close();
|
|
610
767
|
void this.outputService.close();
|
|
768
|
+
this.outputCardsService.close();
|
|
611
769
|
this.workbenchService.close();
|
|
612
770
|
}
|
|
613
771
|
outputDescriptions() {
|
|
614
772
|
return [{
|
|
615
773
|
pack: 'builtin.outputs', name: 'Agent output projection',
|
|
616
774
|
description: 'Owner-authorized read-only Agent output snapshots and changes',
|
|
617
|
-
|
|
775
|
+
handlers: toHandlerList(['services.outputs.snapshot', 'services.outputs.list', 'services.outputs.detail', 'services.outputs.changes', ...OUTPUT_CARDS_TYPES]),
|
|
618
776
|
unmatched: 'silent', reply: true,
|
|
619
777
|
}];
|
|
620
778
|
}
|
|
621
779
|
workbenchDescriptions() {
|
|
622
780
|
return [{ pack: 'builtin.workbench', name: 'Team workbench projection',
|
|
623
781
|
description: 'Owner-authorized current tasks, retained execution history and event-driven changes',
|
|
624
|
-
|
|
782
|
+
handlers: toHandlerList(WORKBENCH_TYPES), unmatched: 'silent', reply: true }];
|
|
625
783
|
}
|
|
626
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
|
+
}
|
|
627
795
|
function readStringField(payload, key) {
|
|
628
796
|
const data = payload.data;
|
|
629
797
|
const value = payload[key] ?? (data && typeof data === 'object' && !Array.isArray(data)
|
|
@@ -662,16 +830,27 @@ export function serviceRequestSchema(requestType, described) {
|
|
|
662
830
|
};
|
|
663
831
|
}
|
|
664
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
|
+
}
|
|
665
841
|
export function renderServiceSkill(selfAid, described) {
|
|
666
842
|
const lines = [];
|
|
667
|
-
|
|
843
|
+
const heading = described.handlerName
|
|
844
|
+
? `${described.name} / ${described.handlerName} — ${described.type}`
|
|
845
|
+
: `${described.name} — ${described.type}`;
|
|
846
|
+
lines.push(`# ${heading}`);
|
|
668
847
|
lines.push('');
|
|
669
848
|
if (described.description) {
|
|
670
849
|
lines.push(described.description);
|
|
671
850
|
lines.push('');
|
|
672
851
|
}
|
|
673
852
|
lines.push('调用方式:');
|
|
674
|
-
lines.push(` ec services call ${selfAid} ${described.type} --data '<json>'`);
|
|
853
|
+
lines.push(` ec services call --aid ${selfAid} --type ${described.type} --data '<json>'`);
|
|
675
854
|
lines.push('');
|
|
676
855
|
lines.push('要点:');
|
|
677
856
|
lines.push(` - 入参放在 data 里;具体字段由服务端脚本解释,无声明式约束。`);
|
|
@@ -679,11 +858,14 @@ export function renderServiceSkill(selfAid, described) {
|
|
|
679
858
|
lines.push(` - 回复 type 固定为 ${described.type}.result,正文是 {ok, data} 或 {ok, error:{code,message}}。`);
|
|
680
859
|
if (!described.reply)
|
|
681
860
|
lines.push(' - 该服务包未开启回复:调用方收不到结果,只会有执行记录。');
|
|
682
|
-
if (described.
|
|
861
|
+
if (described.handlers && described.handlers.length > 1) {
|
|
683
862
|
lines.push('');
|
|
684
863
|
lines.push('该包的其它 type:');
|
|
685
|
-
for (const
|
|
686
|
-
|
|
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
|
+
}
|
|
687
869
|
}
|
|
688
870
|
lines.push('');
|
|
689
871
|
return lines.join('\n');
|