evolcore 0.0.50 → 0.0.51
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 +39 -2
- package/bin/ec-build.mjs +60 -0
- package/bin/ecmsg.js +65 -63
- package/dist/ability/caller/command.js +24 -15
- package/dist/ability/caller/contract.js +24 -9
- package/dist/ability/caller/credential-files.js +132 -0
- package/dist/ability/caller/daemon.js +32 -7
- package/dist/ability/caller/schema-view.js +157 -0
- package/dist/ability/caller/service.js +202 -63
- package/dist/ability/interop-v1.js +156 -113
- package/dist/agent-template/jobs.js +14 -110
- package/dist/agent-template/runtime.js +331 -193
- package/dist/agent-template/service.js +1029 -1104
- package/dist/agent-template/share.js +103 -0
- package/dist/agent-template/tool-runner.js +25 -0
- package/dist/agent-template/types.js +10 -3
- package/dist/agents/claude/availability.js +94 -0
- package/dist/agents/claude/capability-provider.js +154 -0
- package/dist/agents/claude/index.js +145 -0
- package/dist/agents/{claude-runner.js → claude/runner.js} +74 -158
- package/dist/agents/claude/session-file-adapter.js +246 -0
- package/dist/agents/codex/app-server-client.js +90 -10
- package/dist/agents/codex/availability.js +164 -0
- package/dist/agents/codex/capability-provider.js +138 -0
- package/dist/agents/codex/cli.js +38 -0
- package/dist/agents/codex/index.js +345 -0
- package/dist/agents/codex/mcp-elicitation.js +135 -0
- package/dist/agents/{codex-runner.js → codex/runner.js} +648 -382
- package/dist/agents/codex/session-file-adapter.js +834 -0
- package/dist/agents/dsh/availability.js +28 -0
- package/dist/agents/dsh/capability-provider.js +56 -0
- package/dist/agents/dsh/desktop-locations.ps1 +66 -0
- package/dist/agents/dsh/desktop-probe.cjs +37 -0
- package/dist/agents/dsh/index.js +98 -0
- package/dist/agents/dsh/installation.js +400 -0
- package/dist/agents/dsh/resources.js +755 -0
- package/dist/agents/dsh/runner.js +1183 -0
- package/dist/agents/dsh/runtime/README.md +243 -0
- package/dist/agents/dsh/runtime/authorization.js +23 -0
- package/dist/agents/dsh/runtime/bridge.js +837 -0
- package/dist/agents/dsh/runtime/config.js +271 -0
- package/dist/agents/dsh/runtime/entry.js +229 -0
- package/dist/agents/dsh/runtime/session-inspector.js +340 -0
- package/dist/agents/dsh/runtime/tool-policy.js +49 -0
- package/dist/agents/dsh/session-file-adapter.js +145 -0
- package/dist/agents/ecagent/index.js +215 -0
- package/dist/agents/{ecagent-runner.js → ecagent/runner.js} +592 -106
- package/dist/agents/ecagent/session-file-adapter.js +134 -0
- package/dist/agents/gemini/index.js +55 -10
- package/dist/agents/gemini/{gemini-runner.js → runner.js} +4 -9
- package/dist/aun/ability-device-routing.js +11 -17
- package/dist/aun/aid/agentmd.js +27 -1
- package/dist/aun/aid/managed-operation.js +6 -4
- package/dist/aun/group/invite-service.js +1 -1
- package/dist/aun/menu/client.js +1 -1
- package/dist/aun/msg/history.js +1 -1
- package/dist/aun/msg/managed-operation.js +93 -21
- package/dist/aun/msg/p2p.js +6 -6
- package/dist/aun/service-proxy.js +1 -1
- package/dist/aun/storage/index.js +242 -0
- package/dist/build-identity.json +1 -1
- package/dist/channels/aun.js +180 -43
- package/dist/channels/daemon.js +3 -2
- package/dist/channels/dingtalk.js +1 -1
- package/dist/channels/feishu.js +9 -9
- package/dist/channels/qqbot.js +1 -1
- package/dist/channels/wechat.js +2 -2
- package/dist/channels/wecom.js +1 -1
- package/dist/{agents/claude-gateway → claude-gateway}/agent-registration.js +13 -13
- package/dist/{agents/claude-gateway → claude-gateway}/binding.js +3 -3
- package/dist/{agents/claude-gateway → claude-gateway}/inbox.js +1 -1
- package/dist/{agents/claude-gateway → claude-gateway}/index.js +2 -2
- package/dist/{agents/claude-gateway → claude-gateway}/listing.js +3 -3
- package/dist/{agents/claude-gateway → claude-gateway}/router.js +4 -4
- package/dist/{agents/claude-gateway → claude-gateway}/sessions.js +2 -2
- package/dist/{agents/claude-gateway → claude-gateway}/terminal.js +1 -1
- package/dist/{agents/claude-gateway → claude-gateway}/transcript.js +1 -1
- package/dist/cli/ability-command.js +8 -5
- package/dist/cli/ability-output.js +182 -0
- package/dist/cli/agent-command.js +1 -1
- package/dist/cli/agent-create.js +123 -42
- package/dist/cli/agent-template.js +400 -29
- package/dist/cli/agent.js +14 -11
- package/dist/cli/aun-commands.js +167 -111
- package/dist/cli/daemon-commands.js +38 -8
- package/dist/cli/data-command.js +1 -1
- package/dist/cli/debug-mode.js +9 -0
- package/dist/cli/directory.js +1 -2
- package/dist/cli/ecmsg-gateway.js +55 -19
- package/dist/cli/fs-command.js +67 -39
- package/dist/cli/index.js +25 -11
- package/dist/cli/init.js +124 -29
- package/dist/cli/managed-command-guard.js +2 -0
- package/dist/cli/model.js +1 -1
- package/dist/cli/restart-monitor.js +2 -2
- package/dist/cli/services-command.js +24 -1
- package/dist/cli/skill-command.js +4 -4
- package/dist/cli/task-context.js +24 -14
- package/dist/cli/team-workspace-command.js +50 -52
- package/dist/cli/thread-command.js +3 -2
- package/dist/cli/trigger-command.js +47 -12
- package/dist/cli/watch-logs.js +2 -1
- package/dist/config/boot-log.js +3 -0
- package/dist/config/builtin-role-templates.js +1 -1
- package/dist/config/config-field-policy.js +10 -6
- package/dist/config/config-manager.js +33 -12
- package/dist/config/gateway-config.js +21 -37
- package/dist/config/invoke-ipc-service.js +1 -1
- package/dist/config/owner-config.js +5 -3
- package/dist/config/peer-book-store.js +2 -3
- package/dist/config/peer-book.js +2 -2
- package/dist/config/peer-role-resolver.js +2 -2
- package/dist/config/provider-identity-migration.js +24 -105
- package/dist/config/provider-ipc-service.js +13 -3
- package/dist/config/provider-local-sync.js +4 -1
- package/dist/config/provider-menu-request.js +21 -3
- package/dist/config/provider-templates.js +1 -1
- package/dist/config/providers-config.js +39 -15
- package/dist/config/providers-import.js +3 -3
- package/dist/config/providers-management.js +74 -99
- package/dist/config/schema-migration.js +177 -11
- package/dist/config/schema-registry.js +1 -1
- package/dist/config-store.js +38 -50
- package/dist/core/{agent-application-service.js → agent/agent-application-service.js} +9 -9
- package/dist/core/{agent-create-status.js → agent/agent-create-status.js} +112 -4
- package/dist/core/{agent-creation-claim.js → agent/agent-creation-claim.js} +3 -3
- package/dist/core/{agent-ipc-registration.js → agent/agent-ipc-registration.js} +102 -25
- package/dist/core/{agent-reload-coordinator.js → agent/agent-reload-coordinator.js} +61 -1
- package/dist/core/{agent-runtime.js → agent/agent-runtime.js} +53 -27
- package/dist/core/{evolagent-registry.js → agent/evolagent-registry.js} +12 -12
- package/dist/core/{evolagent.js → agent/evolagent.js} +11 -11
- package/dist/core/auth/agent-delegation.js +1 -8
- package/dist/core/auth/delegation-authorization.js +28 -0
- package/dist/core/auth/operation-authorizer.js +7 -4
- package/dist/core/auth/operation-catalog.js +34 -5
- package/dist/core/baseagent/baseagent-availability.js +197 -0
- package/dist/core/baseagent/baseagent-capability-adapter.js +288 -0
- package/dist/core/baseagent/baseagent-config-shared.js +56 -0
- package/dist/core/baseagent/baseagent-identity.js +68 -0
- package/dist/core/{baseagent-loader.js → baseagent/baseagent-loader.js} +62 -6
- package/dist/core/baseagent/baseagent-model-defaults.js +26 -0
- package/dist/{agents → core/baseagent}/baseagent-plugin-descriptor.js +107 -24
- package/dist/core/baseagent/baseagent-plugin-loader.js +367 -0
- package/dist/core/baseagent/baseagent.js +157 -0
- package/dist/{agents → core/baseagent}/runner-types.js +36 -4
- package/dist/core/capability/capability-manager.js +79 -30
- package/dist/core/capability/providers/claude-capability-provider.js +2 -154
- package/dist/core/capability/providers/codex-capability-provider.js +2 -136
- package/dist/core/{channel-loader.js → channel/channel-loader.js} +226 -38
- package/dist/core/{channel-runtime.js → channel/channel-runtime.js} +18 -18
- package/dist/core/command/agent-control.js +60 -15
- package/dist/core/command/agent-template-menu.js +21 -9
- package/dist/core/command/agentmd-menu-request.js +19 -8
- package/dist/core/command/agentmd-menu.js +14 -5
- package/dist/core/command/command-handler.js +127 -57
- package/dist/core/command/context-policy-menu.js +122 -0
- package/dist/core/command/data-root-resolver.js +157 -20
- package/dist/core/command/memory-slash.js +6 -6
- package/dist/core/command/menu-catalog.js +80 -20
- package/dist/core/command/menu-handler.js +305 -25
- package/dist/core/command/menu-protocol.js +42 -8
- package/dist/core/command/menu-query-batch.js +9 -5
- package/dist/core/command/provider-menu.js +7 -11
- package/dist/core/command/role-menu.js +1 -1
- package/dist/core/command/skill-slash.js +17 -5
- package/dist/core/command/slash-gate.js +2 -4
- package/dist/core/command/slash-handler.js +127 -96
- package/dist/core/command/team-workspace-team.js +3 -3
- package/dist/core/command/topic-slash.js +10 -10
- package/dist/core/{daemon-bootstrap.js → daemon/daemon-bootstrap.js} +14 -14
- package/dist/core/{daemon-control.js → daemon/daemon-control.js} +46 -20
- package/dist/core/{daemon-lifecycle.js → daemon/daemon-lifecycle.js} +15 -15
- package/dist/core/{host-snapshot.js → daemon/host-snapshot.js} +3 -3
- package/dist/core/{ipc-registration.js → daemon/ipc-registration.js} +98 -38
- package/dist/core/{lifecycle-notice.js → daemon/lifecycle-notice.js} +4 -5
- package/dist/core/file-integrity/store.js +1 -1
- package/dist/core/handoff/ipc-registration.js +3 -3
- package/dist/core/handoff/runtime.js +1 -1
- package/dist/{agents → core/inference}/request-identity.js +2 -2
- package/dist/core/inference/text-inference.js +4 -4
- package/dist/core/{bootstrap-messages.js → initialization/bootstrap-messages.js} +10 -10
- package/dist/core/{bootstrap-service.js → initialization/bootstrap-service.js} +24 -23
- package/dist/core/initialization/service.js +54 -9
- package/dist/core/invoke/executors/media.js +1 -1
- package/dist/core/invoke/executors/text.js +1 -1
- package/dist/core/memory/consolidation-context.js +1 -1
- package/dist/core/memory/consolidation-trigger.js +9 -3
- package/dist/core/memory/consolidation.js +4 -4
- package/dist/core/memory/memory-admin.js +6 -6
- package/dist/core/memory/memory-writer.js +1 -1
- package/dist/core/memory/relation-idle-monitor.js +1 -1
- package/dist/core/message/aun-ipc-sender.js +114 -75
- package/dist/core/message/aun-request-registry.js +13 -5
- package/dist/core/message/auto-mention-gate.js +1 -1
- package/dist/core/message/contact-admission.js +1 -1
- package/dist/core/message/im-renderer.js +19 -0
- package/dist/core/{interaction-router.js → message/interaction-router.js} +4 -4
- package/dist/core/message/items-formatter.js +5 -5
- package/dist/core/message/message-admission.js +1 -1
- package/dist/core/message/message-bridge.js +135 -54
- package/dist/core/message/message-queue.js +83 -4
- package/dist/core/message/message-utils.js +1 -1
- package/dist/core/message/peer-mode.js +1 -1
- package/dist/core/message/response-engine.js +347 -163
- package/dist/core/message/send-options.js +9 -6
- package/dist/core/message/send-routing.js +45 -109
- package/dist/core/message/stream-idle-monitor.js +1 -1
- package/dist/core/{data-migration.js → migration/data-migration.js} +29 -1
- package/dist/core/model/catalog-service.js +29 -8
- package/dist/core/model/model-capabilities.js +88 -0
- package/dist/core/model/model-catalog.js +14 -3
- package/dist/core/model/model-diagnostics.js +4 -4
- package/dist/core/ownership/owner-resolver.js +95 -15
- package/dist/core/{pack-auth.js → pack/pack-auth.js} +30 -3
- package/dist/core/{pack-install.js → pack/pack-install.js} +95 -17
- package/dist/core/permission/approval-gateway.js +9 -18
- package/dist/core/permission/ec-command-parser.js +70 -34
- package/dist/core/permission/managed-file.js +234 -0
- package/dist/core/permission/protected-paths.js +56 -0
- package/dist/core/permission/sandbox-runtime.js +267 -3
- package/dist/core/permission/session-path-grants.js +1 -1
- package/dist/core/permission/shell-environment.js +15 -1
- package/dist/core/plugin/plugin-lifecycle.js +442 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +2 -246
- package/dist/core/session/adapters/codex-session-file-adapter.js +2 -566
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +2 -134
- package/dist/core/{background-session → session/background}/session-cleanup.js +2 -2
- package/dist/core/{background-session → session/background}/types.js +1 -1
- package/dist/core/session/session-file-health.js +2 -272
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +29 -2
- package/dist/core/session/session-terminal.js +185 -0
- package/dist/core/session/session-title.js +8 -11
- package/dist/core/{system-session → session/system}/memory.js +43 -9
- package/dist/core/{system-session → session/system}/registry.js +1 -1
- package/dist/core/{system-session → session/system}/types.js +1 -1
- package/dist/core/skill/index-generator.js +1 -0
- package/dist/core/task/task-activity-store.js +112 -0
- package/dist/core/task/task-recovery-service.js +2 -2
- package/dist/core/thread/ipc-operation.js +2 -2
- package/dist/core/thread/thread-operation.js +2 -1
- package/dist/core/thread/thread-route.js +5 -3
- package/dist/core/thread/thread-service.js +14 -4
- package/dist/directory/{owner-directory-admission.js → admission.js} +3 -3
- package/dist/directory/{owner-directory-cache.js → cache.js} +90 -8
- package/dist/directory/{owner-directory-markdown.js → markdown.js} +2 -2
- package/dist/directory/{owner-directory-query-operation.js → query-operation.js} +83 -9
- package/dist/directory/{owner-directory-search.js → search.js} +50 -2
- package/dist/directory/{owner-directory-store.js → store.js} +2 -2
- package/dist/eck/kit-renderer.js +1 -1
- package/dist/eck/manifest-engine.js +64 -2
- package/dist/eck/message-renderer.js +35 -0
- package/dist/ecweb/basic-settings-service.js +9 -3
- package/dist/{contracts → ecweb/contracts}/ecweb-service-protocol.js +2 -1
- package/dist/ecweb/dsh-native-service.js +413 -0
- package/dist/ecweb/providers-service.js +1 -1
- package/dist/ecweb/runtime/lifecycle.js +1 -1
- package/dist/ecweb/runtime/supervisor.js +1 -1
- package/dist/event-center/center-config.js +2 -2
- package/dist/event-center/dispatcher.js +1 -1
- package/dist/event-center/ipc-operation.js +12 -3
- package/dist/event-center/pack-loader.js +2 -2
- package/dist/event-center/registry.js +6 -6
- package/dist/event-center/runtime.js +2 -2
- package/dist/index.js +71 -42
- package/dist/ipc.js +103 -10
- package/dist/outputs/authorization.js +27 -0
- package/dist/outputs/events.js +10 -1
- package/dist/outputs/panel-cards.js +960 -0
- package/dist/paths.js +12 -0
- package/dist/pay/command.js +1 -1
- package/dist/pay/runtime.js +18 -10
- package/dist/response-system/engines/v1/proactive-flow.js +1 -1
- package/dist/services/dispatcher.js +2 -2
- package/dist/services/host/main.js +10 -1
- package/dist/services/host/protocol.js +9 -2
- package/dist/services/host/resident.js +37 -0
- package/dist/services/host-client.js +12 -0
- package/dist/services/host-recycle.js +8 -3
- package/dist/services/host-runtime.js +54 -15
- package/dist/services/index.js +83 -19
- package/dist/services/ipc-operation.js +303 -38
- package/dist/services/pack-manager.js +2 -2
- package/dist/services/router.js +43 -3
- package/dist/services/script-runner.js +34 -25
- package/dist/services/service-payload.js +28 -1
- package/dist/services/validation.js +28 -2
- package/dist/stats/context-usage.js +110 -0
- package/dist/stats/model-resolver.js +103 -17
- package/dist/stats/query.js +5 -0
- package/dist/trigger/application-service.js +3 -2
- package/dist/trigger/authorization.js +36 -33
- package/dist/trigger/ipc-service.js +4 -4
- package/dist/trigger/local-files.js +8 -176
- package/dist/trigger/manager.js +2 -2
- package/dist/trigger/parser.js +48 -0
- package/dist/trigger/scheduler.js +14 -2
- package/dist/trigger/script-executor.js +21 -0
- package/dist/trigger/script-sandbox.js +57 -243
- package/dist/trigger/system-definitions.js +25 -0
- package/dist/trigger/validation.js +1 -1
- package/dist/utils/atomic-write.js +88 -1
- package/dist/utils/cross-platform.js +4 -42
- package/dist/utils/error-dict.json +22 -1
- package/dist/utils/error-utils.js +193 -6
- package/dist/utils/evolcore-version.js +2 -2
- package/dist/utils/host-info.js +1 -1
- package/dist/utils/logger.js +3 -1
- package/dist/utils/media-cache.js +99 -4
- package/dist/utils/startup-trace.js +20 -4
- package/dist/utils/welcome.js +64 -20
- package/ecagent/README.md +35 -0
- package/ecagent/dist/agent-loop.js +80 -30
- package/ecagent/dist/harness/env/nodejs.d.ts +16 -0
- package/ecagent/dist/harness/env/nodejs.js +49 -20
- package/ecagent/dist/harness/messages.js +3 -2
- package/ecagent/dist/harness/types.d.ts +1 -0
- package/ecagent/dist/runtime/types.d.ts +2 -0
- package/ecagent/dist/runtime/utils/validation.d.ts +7 -1
- package/ecagent/dist/runtime/utils/validation.js +42 -0
- package/ecagent/dist/types.d.ts +2 -0
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/channels/feishu.md +1 -1
- package/kits/docs/evolcore/INDEX.md +10 -7
- package/kits/docs/evolcore/agent-create.md +2 -0
- package/kits/docs/evolcore/agent.md +100 -13
- package/kits/docs/evolcore/aid.md +19 -3
- package/kits/docs/evolcore/config.md +94 -0
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/ec-capabilities.md +7 -10
- package/kits/docs/evolcore/ecweb-lifecycle.md +5 -1
- package/kits/docs/evolcore/event.md +1 -1
- package/kits/docs/evolcore/fs.md +49 -3
- package/kits/docs/evolcore/group.md +3 -3
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +24 -2
- package/kits/docs/evolcore/model.md +9 -1
- package/kits/docs/evolcore/msg.md +30 -28
- package/kits/docs/evolcore/pay.md +8 -20
- package/kits/docs/evolcore/plugin.md +74 -0
- package/kits/docs/evolcore/provider.md +8 -2
- package/kits/docs/evolcore/rpc.md +2 -2
- package/kits/docs/evolcore/skill.md +17 -1
- package/kits/docs/evolcore/stats.md +5 -0
- package/kits/docs/evolcore/storage.md +22 -0
- package/kits/docs/evolcore/thread-chain.md +19 -10
- package/kits/docs/evolcore/tool-authorization.md +4 -0
- package/kits/docs/evolcore/trigger.md +89 -13
- package/kits/docs/identity/AID_PROFILE_SPEC.md +1 -1
- package/kits/docs/venues/feishu-group.md +3 -2
- package/kits/docs/venues/feishu-private.md +3 -2
- package/kits/rules/02-navigation.md +20 -13
- package/kits/rules/06-channel.md +18 -2
- package/kits/schemas/_meta.json +8 -4
- package/kits/schemas/agent-config.schema.23.json +19 -3
- package/kits/schemas/agent-config.schema.24.json +986 -0
- package/kits/schemas/agent-config.schema.25.json +986 -0
- package/kits/schemas/daemon.schema.11.json +487 -0
- package/kits/schemas/daemon.schema.12.json +505 -0
- package/kits/schemas/defaults.schema.8.json +484 -0
- package/kits/schemas/providers.schema.1.json +1 -1
- package/kits/schemas/providers.schema.2.json +1 -1
- package/kits/schemas/providers.schema.3.json +8 -2
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/SKILL.md +194 -27
- package/kits/skills/ability/STRUCTURE.md +5 -0
- package/kits/skills/agent-output-cards/SKILL.md +90 -54
- package/kits/skills/agent-output-cards/examples/html-surface.json +11 -0
- package/kits/skills/agent-output-cards/examples/meeting-followups.json +16 -0
- package/kits/skills/agent-output-cards/examples/meeting-latest.json +24 -0
- package/kits/skills/agent-output-cards/examples/project-metrics.json +16 -0
- package/kits/skills/agent-output-cards/examples/quick-links.json +18 -0
- package/kits/skills/agent-output-cards/examples/surface.html +8 -0
- package/kits/skills/agent-template-project/SKILL.md +51 -0
- package/kits/skills/agent-template-project/references/01-collect-and-pack.md +174 -0
- package/kits/skills/agent-template-project/references/02-upload-and-share.md +109 -0
- package/kits/skills/agent-template-project/references/03-download-and-install.md +189 -0
- package/kits/skills/agent-template-project/references/04-upgrade-and-recovery.md +74 -0
- package/kits/skills/agent-template-project/references/05-publish-to-platform.md +62 -0
- package/kits/skills/ec-group/SKILL.md +3 -3
- package/kits/skills/ec-group-collaboration/SKILL.md +4 -4
- package/kits/skills/ec-identity/SKILL.md +9 -6
- package/kits/skills/ec-pay/SKILL.md +163 -41
- package/kits/skills/ec-provider/SKILL.md +5 -5
- package/kits/skills/ec-service-call/SKILL.md +3 -0
- package/kits/skills/ec-skill/SKILL.md +25 -9
- package/kits/skills/ec-skill/scripts/cli.mjs +7 -7
- package/kits/skills/ec-skill/scripts/skill.mjs +55 -41
- package/kits/skills/ec-skill/scripts/template/SKILL.md.tmpl +9 -0
- package/kits/skills/ec-trigger/SKILL.md +2 -2
- package/kits/skills/personal-assistant/SKILL.md +22 -22
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +1 -1
- package/kits/skills/scrapling-article-fetch/SKILL.md +5 -5
- package/kits/skills/thread-ops/SKILL.md +19 -9
- package/kits/skills/wechat-article-media-download/SKILL.md +2 -2
- package/kits/skills/wechat-article-reader/SKILL.md +2 -2
- package/kits/templates/system-fragments/commands.md +1 -1
- package/kits/templates/system-fragments/personal-assistant.md +2 -2
- package/kits/templates/system-fragments/reply.md +14 -9
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +10 -5
- package/package.json +6 -5
- package/scripts/agent-template/index.mjs +7 -1
- package/scripts/agent-template/inspect.mjs +81 -35
- package/scripts/agent-template/overlay.mjs +110 -4
- package/scripts/agent-template/shared/common.mjs +36 -4
- package/scripts/agent-template/shared/plan.mjs +4 -2
- package/scripts/agent-template/shared/service-packs.mjs +104 -0
- package/scripts/agent-template/shared/team-schema.json +467 -54
- package/scripts/agent-template/shared/template-contract.mjs +70 -68
- package/scripts/agent-template/shared/template-package.mjs +153 -36
- package/scripts/agent-template/shared/template-runtime.mjs +76 -64
- package/scripts/agent-template/shared/template.mjs +11 -46
- package/scripts/agent-template/team-pack.mjs +451 -35
- package/scripts/agent-template/team-preview.mjs +75 -226
- package/scripts/aid-batch/identity-batch.mjs +1 -1
- package/dist/agents/baseagent-availability.js +0 -176
- package/dist/agents/baseagent-capability-adapter.js +0 -102
- package/dist/agents/baseagent-plugin-loader.js +0 -145
- package/dist/agents/baseagent.js +0 -816
- package/dist/agents/codex/catalog.js +0 -80
- package/dist/agents/ecagent-plugin-lazy.js +0 -41
- package/dist/agents/tool-time-context.js +0 -55
- package/dist/core/legacy-rename.js +0 -41
- package/dist/core/plugin-lifecycle.js +0 -137
- package/dist/core/rate-window.js +0 -53
- package/dist/core/runner-reload-transaction.js +0 -60
- package/dist/core/runtime-lock.js +0 -90
- package/dist/core/soul.js +0 -66
- package/dist/core/system-session/grants.js +0 -40
- package/dist/directory/owner-directory-agentmd-sync.js +0 -89
- package/dist/directory/owner-directory-request-operation.js +0 -79
- package/dist/directory/owner-directory-text.js +0 -60
- package/kits/skills/ec-pay/references/pay-cli.md +0 -110
- /package/dist/agents/gemini/{gemini-capability-provider.js → capability-provider.js} +0 -0
- /package/dist/agents/gemini/{gemini-session-file-adapter.js → session-file-adapter.js} +0 -0
- /package/dist/{agents/claude-gateway → claude-gateway}/types.js +0 -0
- /package/dist/core/{system-channels.js → channel/system-channels.js} +0 -0
- /package/dist/core/{daemon-file-cache.js → daemon/daemon-file-cache.js} +0 -0
- /package/dist/core/{event-bus.js → event/event-bus.js} +0 -0
- /package/dist/core/{event-catalog.js → event/event-catalog.js} +0 -0
- /package/dist/core/{pack-ledger.js → pack/pack-ledger.js} +0 -0
- /package/dist/directory/{owner-directory-identity.js → identity.js} +0 -0
- /package/dist/directory/{owner-directory-policy.js → policy.js} +0 -0
- /package/dist/directory/{owner-directory-remarks.js → remarks.js} +0 -0
- /package/dist/directory/{owner-directory-scope.js → scope.js} +0 -0
- /package/dist/{contracts → ecweb/contracts}/ecweb-instance.js +0 -0
- /package/kits/templates/{bootstrap-welcome.md → bootstrap-intro.md} +0 -0
|
@@ -17,6 +17,7 @@ import { resolvePhaseOneExecutionSandbox } from '../core/permission/mode.js';
|
|
|
17
17
|
import { killProcessTree, resolveCommandPath } from '../utils/cross-platform.js';
|
|
18
18
|
import { logger } from '../utils/logger.js';
|
|
19
19
|
import { SCRIPTS_DIR } from './pack-manager.js';
|
|
20
|
+
import { SERVICE_TRANSPORT_FIELDS } from './service-payload.js';
|
|
20
21
|
import { DEFAULT_HANDLER_TIMEOUT_MS } from './validation.js';
|
|
21
22
|
import { FrameSplitter } from './host/protocol.js';
|
|
22
23
|
import { errorMessage } from './types.js';
|
|
@@ -77,7 +78,7 @@ export class ServiceScriptRunner {
|
|
|
77
78
|
setHostRuntime(runtime) {
|
|
78
79
|
this.hostRuntimeOverride = runtime;
|
|
79
80
|
}
|
|
80
|
-
async run(pack, handler, message) {
|
|
81
|
+
async run(pack, handler, message, options = {}) {
|
|
81
82
|
const startedAt = Date.now();
|
|
82
83
|
let cmd = handler.script;
|
|
83
84
|
// `cmd` 由 finish 统一带上:解释器与绝对路径在 try 里才算得出来(拿不到 runtime 时
|
|
@@ -91,7 +92,7 @@ export class ServiceScriptRunner {
|
|
|
91
92
|
// cmd 仍在这里拼,日志/台账口径不变。
|
|
92
93
|
const hostRuntime = this.hostRuntimeOverride;
|
|
93
94
|
if (hostRuntime) {
|
|
94
|
-
return await this.runViaHost(hostRuntime, pack, handler, message, finish, (value) => { cmd = value; });
|
|
95
|
+
return await this.runViaHost(hostRuntime, pack, handler, message, finish, (value) => { cmd = value; }, options.peerRole);
|
|
95
96
|
}
|
|
96
97
|
let launch;
|
|
97
98
|
let sandboxFallbackReason;
|
|
@@ -101,7 +102,7 @@ export class ServiceScriptRunner {
|
|
|
101
102
|
const scriptPath = path.join(pack.paths.scriptsDir, handler.script.slice(SCRIPTS_DIR.length + 1));
|
|
102
103
|
const scriptArgs = handler.args ?? [];
|
|
103
104
|
cmd = [executable, scriptPath, ...scriptArgs].join(' ');
|
|
104
|
-
const built = this.buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs);
|
|
105
|
+
const built = this.buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs, options.peerRole);
|
|
105
106
|
// Unsandboxed launches have no directory preparation or new authorization gap.
|
|
106
107
|
launch = built instanceof Promise ? await built : built;
|
|
107
108
|
if (launch.prepare) {
|
|
@@ -196,12 +197,12 @@ export class ServiceScriptRunner {
|
|
|
196
197
|
};
|
|
197
198
|
}
|
|
198
199
|
/** 构造启动配置:fullaccess(或 bypass+owner)→ 无沙箱;否则 trigger 沙箱。 */
|
|
199
|
-
buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs) {
|
|
200
|
+
buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs, peerRoleOverride) {
|
|
201
|
+
const peerRole = peerRoleOverride ?? this.deps.resolvePeerRole?.(message.fromAid) ?? undefined;
|
|
200
202
|
const effective = this.deps.permissionMode
|
|
201
|
-
? this.deps.permissionMode()
|
|
202
|
-
: resolveRuntimePermissionMode({ selfAid: this.deps.aid }).effectiveValue;
|
|
203
|
-
//
|
|
204
|
-
const peerRole = this.deps.resolvePeerRole?.(message.fromAid) ?? undefined;
|
|
203
|
+
? this.deps.permissionMode(peerRole)
|
|
204
|
+
: resolveRuntimePermissionMode({ selfAid: this.deps.aid, role: peerRole }).effectiveValue;
|
|
205
|
+
// Caller policy selects the mode; only bypass + owner exempts the sandbox.
|
|
205
206
|
const sandboxDecision = resolvePhaseOneExecutionSandbox(effective, peerRole);
|
|
206
207
|
const ecEnv = this.buildEcEnv(pack, message);
|
|
207
208
|
if (sandboxDecision.state === 'off') {
|
|
@@ -223,9 +224,21 @@ export class ServiceScriptRunner {
|
|
|
223
224
|
triggerDir: pack.dir,
|
|
224
225
|
scriptPath,
|
|
225
226
|
scriptArgs,
|
|
227
|
+
// 快照以**包目录**为根:handler 可以住在 scripts/<子目录>/,往上跳一级的
|
|
228
|
+
// 相对 import(`../lib/x.mjs`)必须和本地运行解析到同一处。
|
|
229
|
+
snapshotRoot: pack.dir,
|
|
226
230
|
projectPath,
|
|
227
231
|
executionAuthorization: authorization,
|
|
228
|
-
}).then(launch => ({
|
|
232
|
+
}).then(launch => ({
|
|
233
|
+
...launch,
|
|
234
|
+
env: {
|
|
235
|
+
...launch.env,
|
|
236
|
+
...ecEnv,
|
|
237
|
+
// 沙箱里真实包目录是 EPERM,EC_PACK_DIR 必须指向包目录的快照镜像;
|
|
238
|
+
// 否则脚本会拿着一个必然打不开的路径去拼自己的数据文件。
|
|
239
|
+
...(launch.scriptSnapshotRoot ? { EC_PACK_DIR: launch.scriptSnapshotRoot } : {}),
|
|
240
|
+
},
|
|
241
|
+
}));
|
|
229
242
|
}
|
|
230
243
|
buildEcEnv(pack, message) {
|
|
231
244
|
return {
|
|
@@ -265,7 +278,7 @@ export class ServiceScriptRunner {
|
|
|
265
278
|
* 与一次性路径的分工:这里只负责「把契约 stdin 和 per-call env 算出来、交给宿主、
|
|
266
279
|
* 把原始输出交给共用判定」。沙箱、快照、探针都在宿主启动时付过一次。
|
|
267
280
|
*/
|
|
268
|
-
async runViaHost(hostRuntime, pack, handler, message, finish, setCmd) {
|
|
281
|
+
async runViaHost(hostRuntime, pack, handler, message, finish, setCmd, peerRoleOverride) {
|
|
269
282
|
const runtime = handler.runtime ?? inferRuntime(handler.script);
|
|
270
283
|
let executable;
|
|
271
284
|
try {
|
|
@@ -291,9 +304,16 @@ export class ServiceScriptRunner {
|
|
|
291
304
|
const timeoutMs = handler.timeoutMs ?? DEFAULT_HANDLER_TIMEOUT_MS;
|
|
292
305
|
// 形态 B:常驻脚本每帧自带 `callId` 与本次调用的字段(环境变量在它启动时就冻结了)。
|
|
293
306
|
const resident = handler.mode === 'resident';
|
|
307
|
+
/**
|
|
308
|
+
* 常驻调用真正生效的期限。
|
|
309
|
+
*
|
|
310
|
+
* `hostRuntime.run` 对常驻用了 `softTimeoutMs ?? timeoutMs`,所以超时报错必须引用
|
|
311
|
+
* 同一个值——写 `timeoutMs` 会让「配 2s、报 20s」对不上,排查时直接指向错误的字段。
|
|
312
|
+
*/
|
|
313
|
+
const residentTimeoutMs = handler.resident?.softTimeoutMs ?? timeoutMs;
|
|
294
314
|
try {
|
|
295
315
|
const result = await hostRuntime.run({
|
|
296
|
-
role: this.deps.resolvePeerRole?.(message.fromAid) ?? undefined,
|
|
316
|
+
role: peerRoleOverride ?? this.deps.resolvePeerRole?.(message.fromAid) ?? undefined,
|
|
297
317
|
deadlineAt: message.deadlineAt,
|
|
298
318
|
pack,
|
|
299
319
|
handler,
|
|
@@ -323,7 +343,7 @@ export class ServiceScriptRunner {
|
|
|
323
343
|
if (result.timedOut) {
|
|
324
344
|
return hostFinish({
|
|
325
345
|
outcome: 'timeout', exitCode: 124,
|
|
326
|
-
error: { code: 'TIMEOUT', message: `resident call timed out after ${
|
|
346
|
+
error: { code: 'TIMEOUT', message: `resident call timed out after ${residentTimeoutMs}ms` },
|
|
327
347
|
stdoutPreview: '', stderrPreview: result.stderr.slice(-512),
|
|
328
348
|
});
|
|
329
349
|
}
|
|
@@ -831,19 +851,8 @@ export function settleCapturedOutput(input) {
|
|
|
831
851
|
stderrPreview,
|
|
832
852
|
};
|
|
833
853
|
}
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
* 这些字段不是调用方写的,剥掉才能让脚本只面对业务数据。
|
|
837
|
-
*
|
|
838
|
-
* 说明:`client_signature` 由 SDK 自动附加(验签发生在 SDK 层、脚本之前),
|
|
839
|
-
* 剥掉不影响任何安全性;`chatmode` / `thread_id` / `topic_name` 等是会话概念,
|
|
840
|
-
* 服务调用本就不该有(见 docs/services/design.md §十一)。
|
|
841
|
-
*/
|
|
842
|
-
const SERVICE_TRANSPORT_FIELDS = new Set([
|
|
843
|
-
'type', 'request_id', 'call_id', 'client_signature', 'service_deadline_at_ms',
|
|
844
|
-
'chatmode', 'thread_id', 'topic_name', 'topic_status', 'label',
|
|
845
|
-
'task_id', '_evolcore_causation_ref', 'debug',
|
|
846
|
-
]);
|
|
854
|
+
// 传输层字段名单移到 service-payload:调用侧也要用它做「可能被剥离」的提示,
|
|
855
|
+
// 两处各写一份必然漂移。说明见该常量的注释。
|
|
847
856
|
/**
|
|
848
857
|
* 脚本看到的 data:去掉传输层字段,其余原样。
|
|
849
858
|
* 不把整条 payload 交给脚本,避免它依赖 daemon 的内部字段。
|
|
@@ -15,7 +15,7 @@ const SERVICE_WILDCARD = /^services(\.[A-Za-z0-9_-]+){0,2}\.\*$/;
|
|
|
15
15
|
* service replies keep their normal durable delivery semantics. */
|
|
16
16
|
export function isProjectionServiceResult(type) {
|
|
17
17
|
return typeof type === 'string'
|
|
18
|
-
&& /^services\.(?:
|
|
18
|
+
&& /^services\.(?:(?:outputs(?:\.cards)?|panel-cards)\.(?:snapshot|list|detail|changes)|workbench\.(?:snapshot|changes|history))\.result$/.test(type);
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
21
|
* SERVICE_REQUEST 与 SERVICE_RESULT 有意重叠:
|
|
@@ -49,6 +49,33 @@ export const RESERVED_TYPES = new Set([
|
|
|
49
49
|
export function isReservedServiceType(type) {
|
|
50
50
|
return RESERVED_TYPES.has(type);
|
|
51
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* 信封键:只描述「这次投递」本身,不是调用方正文。
|
|
54
|
+
*
|
|
55
|
+
* 它们由演进层/传输层写入,调用方在 `data` 里写这些键一定是误解 —— 而误解不能
|
|
56
|
+
* 静默生效:`--type A --data '{"type":"B"}'` 会把请求路由到 B,调用方拿到一个
|
|
57
|
+
* 看起来合理的回包却调错了对象。`ec services call` 因此在组包前直接拒绝。
|
|
58
|
+
*
|
|
59
|
+
* 只收**纯粹属于信封**的键。`label` / `task_id` / `debug` / `thread_id` 之类虽然也会
|
|
60
|
+
* 被脚本侧剥离,但它们是内置服务可能真正用到的业务字段,拒绝会误伤;那些仍按
|
|
61
|
+
* 既有语义在 `extractServiceData` 里剥离。
|
|
62
|
+
*/
|
|
63
|
+
export const SERVICE_ENVELOPE_KEYS = new Set([
|
|
64
|
+
'type', 'request_id', 'call_id', 'client_signature', 'service_deadline_at_ms', '_evolcore_causation_ref',
|
|
65
|
+
]);
|
|
66
|
+
/**
|
|
67
|
+
* AUN / EvolCore 注入的传输层字段。脚本契约里 `message.data` 是"调用方传来的正文",
|
|
68
|
+
* 这些字段不是调用方写的,剥掉才能让脚本只面对业务数据(`extractServiceData`)。
|
|
69
|
+
*
|
|
70
|
+
* 是 `SERVICE_ENVELOPE_KEYS` 的超集:多出来的 `chatmode` / `thread_id` / `topic_name` 等
|
|
71
|
+
* 是会话概念,服务调用本就不该有;`label` / `task_id` / `debug` 则可能被内置服务当业务
|
|
72
|
+
* 参数用(内置服务直接读 payload,不走剥离),所以它们只剥不拒 —— 见下方 `SERVICE_ENVELOPE_KEYS`。
|
|
73
|
+
*/
|
|
74
|
+
export const SERVICE_TRANSPORT_FIELDS = new Set([
|
|
75
|
+
'type', 'request_id', 'call_id', 'client_signature', 'service_deadline_at_ms',
|
|
76
|
+
'chatmode', 'thread_id', 'topic_name', 'topic_status', 'label',
|
|
77
|
+
'task_id', '_evolcore_causation_ref', 'debug',
|
|
78
|
+
]);
|
|
52
79
|
/** listen 校验:末段不得是 result;允许末段整段通配。 */
|
|
53
80
|
export function isListenableType(type) {
|
|
54
81
|
if (/\.result$/.test(type))
|
|
@@ -55,8 +55,9 @@ function optionalString(value, field, errors, max) {
|
|
|
55
55
|
errors.push(`${field} must be a string`);
|
|
56
56
|
return undefined;
|
|
57
57
|
}
|
|
58
|
+
// 带上实际长度:写包的人拿到 "max 120" 还得自己数一遍才能知道超了多少。
|
|
58
59
|
if (max !== undefined && value.length > max)
|
|
59
|
-
errors.push(`${field} is too long (max ${max})`);
|
|
60
|
+
errors.push(`${field} is too long (max ${max}, actual ${value.length})`);
|
|
60
61
|
return value;
|
|
61
62
|
}
|
|
62
63
|
/**
|
|
@@ -142,14 +143,37 @@ function validateScriptPath(script, errors) {
|
|
|
142
143
|
}
|
|
143
144
|
return script;
|
|
144
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* 声明式 schema 片段:只要是对象就原样收下。
|
|
148
|
+
*
|
|
149
|
+
* 不在这里校验 JSON Schema 本身合法——那需要一整套 meta-schema,而它的唯一收益是
|
|
150
|
+
* 把"作者写错 schema"从运行期提前到装包期;代价是框架必须持续跟进规范版本。
|
|
151
|
+
* 现阶段选择透传,错误由调用方(或作者自测)发现。
|
|
152
|
+
*/
|
|
153
|
+
function optionalSchema(raw, field, errors) {
|
|
154
|
+
if (raw === undefined)
|
|
155
|
+
return undefined;
|
|
156
|
+
if (!isRecord(raw)) {
|
|
157
|
+
errors.push(`${field} must be an object (a JSON Schema fragment)`);
|
|
158
|
+
return undefined;
|
|
159
|
+
}
|
|
160
|
+
return raw;
|
|
161
|
+
}
|
|
145
162
|
function validateHandler(raw, errors) {
|
|
146
163
|
if (!isRecord(raw)) {
|
|
147
164
|
errors.push('listen[].handler must be an object');
|
|
148
165
|
return undefined;
|
|
149
166
|
}
|
|
150
|
-
const extra = Object.keys(raw).filter(key => ![
|
|
167
|
+
const extra = Object.keys(raw).filter(key => ![
|
|
168
|
+
'script', 'runtime', 'args', 'timeoutMs', 'name', 'description', 'mode', 'resident',
|
|
169
|
+
'inputSchema', 'outputSchema',
|
|
170
|
+
].includes(key));
|
|
151
171
|
if (extra.length)
|
|
152
172
|
errors.push(`listen[].handler has unknown fields: ${extra.join(', ')}`);
|
|
173
|
+
// schema 只校验"是个对象":内容原样透传给调用方,不在框架里解释。
|
|
174
|
+
// 想校验就去包作者自己的脚本里校验——两处各写一份必然漂移。
|
|
175
|
+
const inputSchema = optionalSchema(raw.inputSchema, 'listen[].handler.inputSchema', errors);
|
|
176
|
+
const outputSchema = optionalSchema(raw.outputSchema, 'listen[].handler.outputSchema', errors);
|
|
153
177
|
const script = validateScriptPath(raw.script, errors);
|
|
154
178
|
const name = optionalLabel(raw.name, 'listen[].handler.name', HANDLER_NAME_MAX, errors);
|
|
155
179
|
const description = optionalLabel(raw.description, 'listen[].handler.description', HANDLER_DESCRIPTION_MAX, errors);
|
|
@@ -181,6 +205,8 @@ function validateHandler(raw, errors) {
|
|
|
181
205
|
timeoutMs: timeoutMs ?? TIMEOUT_DEFAULT,
|
|
182
206
|
...(name !== undefined ? { name } : {}),
|
|
183
207
|
...(description !== undefined ? { description } : {}),
|
|
208
|
+
...(inputSchema !== undefined ? { inputSchema } : {}),
|
|
209
|
+
...(outputSchema !== undefined ? { outputSchema } : {}),
|
|
184
210
|
...(mode !== undefined ? { mode: mode.mode } : {}),
|
|
185
211
|
...(mode?.resident ? { resident: mode.resident } : {}),
|
|
186
212
|
};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { contextTokensForUsage } from '../core/baseagent/runner-types.js';
|
|
2
|
+
import { resolveRoot } from '../paths.js';
|
|
3
|
+
import { logger } from '../utils/logger.js';
|
|
4
|
+
import { getDbPath, openReadonlyDb } from './db.js';
|
|
5
|
+
export function formatCompactingNotice(totalTokens) {
|
|
6
|
+
if (typeof totalTokens !== 'number' || !Number.isFinite(totalTokens) || totalTokens <= 0) {
|
|
7
|
+
return '当前会话正在压缩中…';
|
|
8
|
+
}
|
|
9
|
+
return `当前会话已到${Math.round(totalTokens / 1_000)}k,正在压缩中…`;
|
|
10
|
+
}
|
|
11
|
+
export async function readLastModelCallContextUsage(sessionId, agentSessionId) {
|
|
12
|
+
try {
|
|
13
|
+
const { getDb, openReadonlyDb, getDbPath } = await import('./db.js');
|
|
14
|
+
const root = resolveRoot();
|
|
15
|
+
const writerDb = getDb(root);
|
|
16
|
+
const db = writerDb || openReadonlyDb(getDbPath(root));
|
|
17
|
+
if (!db)
|
|
18
|
+
return undefined;
|
|
19
|
+
const shouldClose = !writerDb;
|
|
20
|
+
try {
|
|
21
|
+
const row = db.prepare(`SELECT model, input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
|
|
22
|
+
context_tokens, max_tokens
|
|
23
|
+
FROM model_calls
|
|
24
|
+
WHERE session_id = ?
|
|
25
|
+
AND agent_session_id = ?
|
|
26
|
+
AND COALESCE(degraded, 0) = 0
|
|
27
|
+
ORDER BY ts DESC, call_index DESC
|
|
28
|
+
LIMIT 1`).get(sessionId, agentSessionId);
|
|
29
|
+
if (!row)
|
|
30
|
+
return undefined;
|
|
31
|
+
const model = row.model || '';
|
|
32
|
+
const recordedTotalTokens = row.context_tokens ?? undefined;
|
|
33
|
+
let totalTokens;
|
|
34
|
+
if (recordedTotalTokens && recordedTotalTokens > 0) {
|
|
35
|
+
totalTokens = recordedTotalTokens;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
totalTokens = contextTokensForUsage({
|
|
39
|
+
input_tokens: row.input_tokens,
|
|
40
|
+
output_tokens: row.output_tokens,
|
|
41
|
+
cache_creation_input_tokens: row.cache_creation_tokens,
|
|
42
|
+
cache_read_input_tokens: row.cache_read_tokens,
|
|
43
|
+
}, model);
|
|
44
|
+
}
|
|
45
|
+
if (totalTokens <= 0)
|
|
46
|
+
return undefined;
|
|
47
|
+
const maxTokens = row.max_tokens ?? 0;
|
|
48
|
+
if (!(recordedTotalTokens && recordedTotalTokens > 0) && maxTokens > 0 && totalTokens > maxTokens * 1.05) {
|
|
49
|
+
logger.warn(`[ContextUsage] Ignoring implausible context_tokens: session=${sessionId} totalTokens=${totalTokens} maxTokens=${maxTokens}`);
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
return { totalTokens };
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
if (shouldClose)
|
|
56
|
+
db.close();
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
catch (err) {
|
|
60
|
+
logger.debug(`[ContextUsage] Failed to read last model call context usage: ${err}`);
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/** Latest matching recorded turn, not a live query or a compaction threshold. */
|
|
65
|
+
export function readRecordedCodexContextWindow(root, self, model, provider, configuredThreshold) {
|
|
66
|
+
const db = openReadonlyDb(getDbPath(root));
|
|
67
|
+
if (!db)
|
|
68
|
+
return undefined;
|
|
69
|
+
try {
|
|
70
|
+
// Configured runs record their requested compact limit. Do not reuse an
|
|
71
|
+
// enlarged run after reset, a different Provider, or another Agent's data.
|
|
72
|
+
const row = db.prepare(`SELECT ts, max_tokens FROM model_calls
|
|
73
|
+
WHERE agent_aid = ? AND model = ? AND provider_id IS ?
|
|
74
|
+
AND source = 'turn' AND auto_compact_tokens IS ?
|
|
75
|
+
ORDER BY ts DESC, call_index DESC, id DESC LIMIT 1`)
|
|
76
|
+
.get(self, model, provider, configuredThreshold);
|
|
77
|
+
if (!row || !Number.isSafeInteger(row.max_tokens) || row.max_tokens < 1)
|
|
78
|
+
return undefined;
|
|
79
|
+
return { tokens: row.max_tokens, recordedAt: row.ts };
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
// Older/missing statistics must never prevent reading or changing config.
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
db.close();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
/** Latest native window for the selected Agent/model/Provider, regardless of
|
|
90
|
+
* whether that turn used a previous compaction override. */
|
|
91
|
+
export function readLatestCodexContextWindow(root, self, model, provider) {
|
|
92
|
+
const db = openReadonlyDb(getDbPath(root));
|
|
93
|
+
if (!db)
|
|
94
|
+
return undefined;
|
|
95
|
+
try {
|
|
96
|
+
const row = db.prepare(`SELECT ts, max_tokens, auto_compact_tokens FROM model_calls
|
|
97
|
+
WHERE agent_aid = ? AND model = ? AND provider_id IS ? AND source = 'turn'
|
|
98
|
+
ORDER BY ts DESC, call_index DESC, id DESC LIMIT 1`)
|
|
99
|
+
.get(self, model, provider);
|
|
100
|
+
if (!row || !Number.isSafeInteger(row.max_tokens) || row.max_tokens < 1)
|
|
101
|
+
return undefined;
|
|
102
|
+
return { tokens: row.max_tokens, recordedAt: row.ts, autoCompactTokens: row.auto_compact_tokens };
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
return undefined;
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
db.close();
|
|
109
|
+
}
|
|
110
|
+
}
|
|
@@ -19,6 +19,13 @@ export function normalizeUsdToCny(raw) {
|
|
|
19
19
|
export function roundCostForOutput(value) {
|
|
20
20
|
return Number.isFinite(value) ? Number(value.toFixed(4)) : value;
|
|
21
21
|
}
|
|
22
|
+
/** 保留未计价状态,避免回执把官方价冒充网关价或把未知费用显示成零。 */
|
|
23
|
+
export function pricePairForOutput(prices) {
|
|
24
|
+
const round = (cost) => cost
|
|
25
|
+
? { usd: roundCostForOutput(cost.usd), cny: roundCostForOutput(cost.cny) }
|
|
26
|
+
: null;
|
|
27
|
+
return { official: round(prices.official), gateway: round(prices.gateway) };
|
|
28
|
+
}
|
|
22
29
|
// 模型参数缓存(进程内,5 分钟 TTL)
|
|
23
30
|
let _parameterCache = null;
|
|
24
31
|
let _parameterCacheTs = 0;
|
|
@@ -480,7 +487,70 @@ const GATEWAY_PRICING_TTL_MS = 60 * 60 * 1000; // 1h
|
|
|
480
487
|
/** key: baseUrl */
|
|
481
488
|
const gatewayPricingCache = new Map();
|
|
482
489
|
/** 去重并发刷新 */
|
|
483
|
-
const gatewayPricingInFlight = new
|
|
490
|
+
const gatewayPricingInFlight = new Map();
|
|
491
|
+
export const OFFICIAL_PRICING_REFERENCE_URL = 'https://mg-new.evolai.cn/claude-proxy/v1/models';
|
|
492
|
+
let officialPricingReference;
|
|
493
|
+
let officialPricingReferenceRefreshAt = 0;
|
|
494
|
+
let officialPricingReferenceInFlight;
|
|
495
|
+
/** 不携带当前 Provider 的 key/headers,不读取参考端点的 effective_pricing 或能力参数。 */
|
|
496
|
+
async function loadOfficialPricingReference() {
|
|
497
|
+
if (Date.now() < officialPricingReferenceRefreshAt)
|
|
498
|
+
return;
|
|
499
|
+
if (officialPricingReferenceInFlight)
|
|
500
|
+
return officialPricingReferenceInFlight;
|
|
501
|
+
officialPricingReferenceInFlight = (async () => {
|
|
502
|
+
const controller = new AbortController();
|
|
503
|
+
const timer = setTimeout(() => controller.abort(), 5000);
|
|
504
|
+
try {
|
|
505
|
+
const response = await fetch(OFFICIAL_PRICING_REFERENCE_URL, { signal: controller.signal });
|
|
506
|
+
if (!response.ok)
|
|
507
|
+
throw new Error(`HTTP ${response.status}`);
|
|
508
|
+
const json = await response.json();
|
|
509
|
+
const models = Array.isArray(json?.data) ? json.data : Array.isArray(json?.models) ? json.models : [];
|
|
510
|
+
const prices = new Map();
|
|
511
|
+
for (const model of models) {
|
|
512
|
+
const id = model?.id || model?.name || model?.model;
|
|
513
|
+
const quad = apiPricingToQuad(model?.pricing);
|
|
514
|
+
if (typeof id === 'string' && quad)
|
|
515
|
+
prices.set(id, quad);
|
|
516
|
+
}
|
|
517
|
+
if (!prices.size)
|
|
518
|
+
throw new Error('No official prices');
|
|
519
|
+
officialPricingReference = { prices, usdToCny: normalizeUsdToCny(json?.usd_to_cny) };
|
|
520
|
+
officialPricingReferenceRefreshAt = Date.now() + GATEWAY_PRICING_TTL_MS;
|
|
521
|
+
logger.info(`[OfficialPricing] Refreshed reference ${OFFICIAL_PRICING_REFERENCE_URL}: models=${prices.size}`);
|
|
522
|
+
}
|
|
523
|
+
catch (error) {
|
|
524
|
+
// 保留最近成功的参考价;失败时短暂退避,未知价格保持空值。
|
|
525
|
+
officialPricingReferenceRefreshAt = Date.now() + 60_000;
|
|
526
|
+
logger.warn(`[OfficialPricing] Reference unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
|
527
|
+
}
|
|
528
|
+
finally {
|
|
529
|
+
clearTimeout(timer);
|
|
530
|
+
}
|
|
531
|
+
})();
|
|
532
|
+
try {
|
|
533
|
+
await officialPricingReferenceInFlight;
|
|
534
|
+
}
|
|
535
|
+
finally {
|
|
536
|
+
officialPricingReferenceInFlight = undefined;
|
|
537
|
+
}
|
|
538
|
+
}
|
|
539
|
+
/** 写入用量前等待首轮目录刷新,并为缺官方价的模型准备独立参考价。 */
|
|
540
|
+
export async function prepareUsagePricing(pricing, models) {
|
|
541
|
+
const baseUrl = pricing?.source?.baseUrl;
|
|
542
|
+
if (!pricing)
|
|
543
|
+
return pricing;
|
|
544
|
+
if (baseUrl)
|
|
545
|
+
await gatewayPricingInFlight.get(baseUrl);
|
|
546
|
+
const latest = baseUrl ? gatewayPricingCache.get(baseUrl)?.cache : undefined;
|
|
547
|
+
if (latest)
|
|
548
|
+
pricing = { ...latest, source: pricing.source };
|
|
549
|
+
if (models.every(model => pickGatewayQuad(resolveRoot(), pricing.official, model)))
|
|
550
|
+
return pricing;
|
|
551
|
+
await loadOfficialPricingReference();
|
|
552
|
+
return { ...pricing, officialFallback: officialPricingReference ?? { prices: new Map() } };
|
|
553
|
+
}
|
|
484
554
|
/**
|
|
485
555
|
* 把 /v1/models 单个 model 的价格对象转为 PriceQuad。
|
|
486
556
|
* 单位假设:接口价与 model-prices.jsonl 同口径(USD per 1M token),不做换算。
|
|
@@ -488,7 +558,7 @@ const gatewayPricingInFlight = new Set();
|
|
|
488
558
|
export function apiPricingToQuad(p) {
|
|
489
559
|
if (!p || typeof p !== 'object')
|
|
490
560
|
return undefined;
|
|
491
|
-
const n = (v) => (typeof v === 'number' && isFinite(v) ? v : undefined);
|
|
561
|
+
const n = (v) => (typeof v === 'number' && isFinite(v) && v >= 0 ? v : undefined);
|
|
492
562
|
const quad = {
|
|
493
563
|
input: n(p.input),
|
|
494
564
|
output: n(p.output),
|
|
@@ -505,14 +575,20 @@ export function apiPricingToQuad(p) {
|
|
|
505
575
|
* 拉取网关 /v1/models 的官方价(pricing) + 网关价(effective_pricing),写入缓存。
|
|
506
576
|
* 失败静默——保持回退到本地价表 / official。
|
|
507
577
|
*/
|
|
508
|
-
export
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
578
|
+
export function refreshGatewayPricing(baseUrl, apiKey, requestHeaders) {
|
|
579
|
+
const pending = gatewayPricingInFlight.get(baseUrl);
|
|
580
|
+
if (pending)
|
|
581
|
+
return pending;
|
|
582
|
+
const refresh = fetchGatewayPricing(baseUrl, apiKey, requestHeaders)
|
|
583
|
+
.finally(() => { gatewayPricingInFlight.delete(baseUrl); });
|
|
584
|
+
gatewayPricingInFlight.set(baseUrl, refresh);
|
|
585
|
+
return refresh;
|
|
586
|
+
}
|
|
587
|
+
async function fetchGatewayPricing(baseUrl, apiKey, requestHeaders) {
|
|
588
|
+
const controller = new AbortController();
|
|
589
|
+
const timer = setTimeout(() => controller.abort(), 5000);
|
|
512
590
|
try {
|
|
513
591
|
const url = `${baseUrl.replace(/\/+$/, '')}/v1/models`;
|
|
514
|
-
const controller = new AbortController();
|
|
515
|
-
const timer = setTimeout(() => controller.abort(), 5000);
|
|
516
592
|
const resp = await fetch(url, {
|
|
517
593
|
signal: controller.signal,
|
|
518
594
|
headers: {
|
|
@@ -520,7 +596,6 @@ export async function refreshGatewayPricing(baseUrl, apiKey, requestHeaders) {
|
|
|
520
596
|
...requestHeaders,
|
|
521
597
|
},
|
|
522
598
|
});
|
|
523
|
-
clearTimeout(timer);
|
|
524
599
|
if (!resp.ok)
|
|
525
600
|
return;
|
|
526
601
|
const json = await resp.json();
|
|
@@ -552,16 +627,15 @@ export async function refreshGatewayPricing(baseUrl, apiKey, requestHeaders) {
|
|
|
552
627
|
.map(m => (typeof m === 'string' ? m : (m?.id || m?.name || m?.model)))
|
|
553
628
|
.filter((id) => typeof id === 'string' && !!id);
|
|
554
629
|
saveProviderAliases(resolveRoot(), baseUrl, json?.model_aliases, knownIds);
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
}
|
|
630
|
+
// 空价目也要缓存,避免没有 pricing 的网关每次用量结算都重拉目录。
|
|
631
|
+
gatewayPricingCache.set(baseUrl, { cache: { official, gateway, usdToCny }, fetchedAt: Date.now() });
|
|
632
|
+
logger.info(`[GatewayPricing] Refreshed from ${url}: official=${official.size} gateway=${gateway.size} usd_to_cny=${usdToCny ?? `(default ${DEFAULT_USD_TO_CNY})`}`);
|
|
559
633
|
}
|
|
560
634
|
catch {
|
|
561
635
|
// 网络/解析失败:保持回退,不打断查询
|
|
562
636
|
}
|
|
563
637
|
finally {
|
|
564
|
-
|
|
638
|
+
clearTimeout(timer);
|
|
565
639
|
}
|
|
566
640
|
}
|
|
567
641
|
/**
|
|
@@ -575,7 +649,8 @@ export function getGatewayPricing(baseUrl, apiKey, requestHeaders) {
|
|
|
575
649
|
if (!entry || Date.now() - entry.fetchedAt > GATEWAY_PRICING_TTL_MS) {
|
|
576
650
|
void refreshGatewayPricing(baseUrl, apiKey, requestHeaders); // 不 await,stale-while-revalidate
|
|
577
651
|
}
|
|
578
|
-
|
|
652
|
+
// 即使首轮目录尚未返回,也保留实际 Provider,供结算等待刷新及决定参考价回退。
|
|
653
|
+
return { ...(entry?.cache ?? { official: new Map(), gateway: new Map() }), source: { baseUrl } };
|
|
579
654
|
}
|
|
580
655
|
// 网关价格表缓存(从用户覆盖层 model-prices-gateway.jsonl 读取)
|
|
581
656
|
let _gatewayPriceCache = null;
|
|
@@ -626,7 +701,7 @@ function resolveGatewayPriceRow(evolcoreHome, model, ts) {
|
|
|
626
701
|
* 从网关价格 Map 里取价:Map 的键是网关原样下发的 ID(可能带 `[1m]` 后缀),
|
|
627
702
|
* 而 usage 事件记录的可能是基础 ID,反之亦然——两侧都要按候选键链匹配。
|
|
628
703
|
*/
|
|
629
|
-
function pickGatewayQuad(evolcoreHome, map, model) {
|
|
704
|
+
export function pickGatewayQuad(evolcoreHome, map, model) {
|
|
630
705
|
if (!map)
|
|
631
706
|
return null;
|
|
632
707
|
for (const key of modelLookupKeys(evolcoreHome, model)) {
|
|
@@ -664,6 +739,17 @@ function priceQuadToRecord(model, ts, quad, billing_fn, currency = 'USD') {
|
|
|
664
739
|
* @returns 官方价格和网关价格的费用对
|
|
665
740
|
*/
|
|
666
741
|
export function resolvePrices(evolcoreHome, event, gatewayPricing) {
|
|
742
|
+
const directOfficial = pickGatewayQuad(evolcoreHome, gatewayPricing?.official, event.model);
|
|
743
|
+
const usingReference = gatewayPricing?.officialFallback !== undefined && !directOfficial;
|
|
744
|
+
if (usingReference) {
|
|
745
|
+
const quad = pickGatewayQuad(evolcoreHome, gatewayPricing.officialFallback.prices, event.model);
|
|
746
|
+
const fn = BILLING_FNS[event.billing_fn];
|
|
747
|
+
if (!quad || !fn)
|
|
748
|
+
return { official: null, gateway: null };
|
|
749
|
+
const cost = fn(event, priceQuadToRecord(event.model, event.ts, quad, event.billing_fn));
|
|
750
|
+
const rate = normalizeUsdToCny(gatewayPricing.officialFallback.usdToCny) ?? DEFAULT_USD_TO_CNY;
|
|
751
|
+
return { official: { usd: cost.usd ?? (cost.cny ?? 0) / rate, cny: cost.cny ?? (cost.usd ?? 0) * rate }, gateway: null };
|
|
752
|
+
}
|
|
667
753
|
// ── 1. 官方价格(Official Price)──────────────────────────────────────────
|
|
668
754
|
let officialCost = null;
|
|
669
755
|
// 优先级 0: 模型别名命中本地价表。Evol 等中转到官方同名模型时,
|
|
@@ -679,7 +765,7 @@ export function resolvePrices(evolcoreHome, event, gatewayPricing) {
|
|
|
679
765
|
}
|
|
680
766
|
}
|
|
681
767
|
// 优先级 1: 网关接口返回的 pricing 字段
|
|
682
|
-
const officialQuad = officialCost ? null :
|
|
768
|
+
const officialQuad = officialCost ? null : directOfficial;
|
|
683
769
|
if (officialQuad) {
|
|
684
770
|
const priceRow = priceQuadToRecord(event.model, event.ts, officialQuad, event.billing_fn);
|
|
685
771
|
const fn = BILLING_FNS[event.billing_fn];
|
package/dist/stats/query.js
CHANGED
|
@@ -559,6 +559,7 @@ export function querySessionSummary(evolcoreHome, sessionId) {
|
|
|
559
559
|
total_tokens: 0, calls: 0,
|
|
560
560
|
cost_official_usd: 0, cost_official_cny: 0, cost_gateway_usd: 0, cost_gateway_cny: 0,
|
|
561
561
|
usd: 0, cny: 0,
|
|
562
|
+
officialPricedCalls: 0, gatewayPricedCalls: 0,
|
|
562
563
|
};
|
|
563
564
|
const sql = `
|
|
564
565
|
SELECT
|
|
@@ -567,6 +568,8 @@ export function querySessionSummary(evolcoreHome, sessionId) {
|
|
|
567
568
|
COALESCE(SUM(cache_creation_tokens), 0) AS cache_creation_tokens,
|
|
568
569
|
COALESCE(SUM(cache_read_tokens), 0) AS cache_read_tokens,
|
|
569
570
|
COUNT(*) AS calls,
|
|
571
|
+
COUNT(cost_official_usd) AS officialPricedCalls,
|
|
572
|
+
COUNT(cost_gateway_usd) AS gatewayPricedCalls,
|
|
570
573
|
COALESCE(SUM(cost_official_usd), 0) AS cost_official_usd,
|
|
571
574
|
COALESCE(SUM(cost_official_cny), 0) AS cost_official_cny,
|
|
572
575
|
COALESCE(SUM(cost_gateway_usd), 0) AS cost_gateway_usd,
|
|
@@ -586,6 +589,8 @@ export function querySessionSummary(evolcoreHome, sessionId) {
|
|
|
586
589
|
acc.cache_creation_tokens += r.cache_creation_tokens ?? 0;
|
|
587
590
|
acc.cache_read_tokens += r.cache_read_tokens ?? 0;
|
|
588
591
|
acc.calls += r.calls ?? 0;
|
|
592
|
+
acc.officialPricedCalls += r.officialPricedCalls ?? 0;
|
|
593
|
+
acc.gatewayPricedCalls += r.gatewayPricedCalls ?? 0;
|
|
589
594
|
acc.cost_official_usd += r.cost_official_usd ?? 0;
|
|
590
595
|
acc.cost_official_cny += r.cost_official_cny ?? 0;
|
|
591
596
|
acc.cost_gateway_usd += r.cost_gateway_usd ?? 0;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { consolidationCheckCron, removeConsolidationCheckTrigger, seedConsolidationCheckTrigger } from '../core/memory/consolidation-trigger.js';
|
|
2
|
-
import { tryParseChannelKey } from '../core/channel-loader.js';
|
|
2
|
+
import { tryParseChannelKey } from '../core/channel/channel-loader.js';
|
|
3
3
|
import { TriggerDefinitionManager } from './manager.js';
|
|
4
4
|
import { TriggerRunStateStore } from './state.js';
|
|
5
|
-
import { removeLegacyAgentUpgradeCheck, seedSessionIdleCheckTrigger, seedTaskRecoveryTrigger, seedUpgradeCheckTrigger, } from './system-definitions.js';
|
|
5
|
+
import { removeLegacyAgentUpgradeCheck, seedSessionIdleCheckTrigger, seedTaskRecoveryTrigger, seedUpgradeCheckTrigger, seedAgentTemplateCheckTrigger, } from './system-definitions.js';
|
|
6
6
|
import { TriggerFeedbackDispatcher } from './feedback.js';
|
|
7
7
|
import { TriggerRuntimeScheduler } from './scheduler.js';
|
|
8
8
|
import { logger } from '../utils/logger.js';
|
|
@@ -113,6 +113,7 @@ export function buildTriggerScheduler(owner, dependencies, options = {}) {
|
|
|
113
113
|
const manager = new TriggerDefinitionManager(owner.aid);
|
|
114
114
|
if (options.seedUpgradeCheck) {
|
|
115
115
|
seedUpgradeCheckTrigger(manager, owner);
|
|
116
|
+
seedAgentTemplateCheckTrigger(manager, owner);
|
|
116
117
|
seedTaskRecoveryTrigger(manager, owner);
|
|
117
118
|
seedSessionIdleCheckTrigger(manager, owner);
|
|
118
119
|
}
|