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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isSupportedBaseagent } from '../
|
|
1
|
+
import { isSupportedBaseagent } from '../core/baseagent/baseagent.js';
|
|
2
2
|
import { createHash, randomUUID } from 'node:crypto';
|
|
3
3
|
import { isDeepStrictEqual } from 'node:util';
|
|
4
4
|
import fs from 'node:fs';
|
|
@@ -7,7 +7,7 @@ import { resolvePaths } from '../paths.js';
|
|
|
7
7
|
import { ConfigTarget, mutateConfig, notifyConfigWrite } from './config-manager.js';
|
|
8
8
|
import { atomicReadJson } from '../utils/atomic-write.js';
|
|
9
9
|
import { readProvidersFile, validateProvidersFile } from './providers.js';
|
|
10
|
-
import { initializationRuntimePlan, providerEnvironmentVariable, providerNameFromBaseUrlIfStatic, resolveProviderId, resolveProviderService, resolveProviderServiceForBaseagent, validateProviderName } from './providers-config.js';
|
|
10
|
+
import { initializationRuntimePlan, isProviderId, providerEnvironmentVariable, providerNameForBaseagentImport, providerNameFromBaseUrlIfStatic, resolveProviderId, resolveProviderService, resolveProviderServiceForBaseagent, validateProviderName } from './providers-config.js';
|
|
11
11
|
import { providerIdentity as storedProviderIdentity } from './provider-identity.js';
|
|
12
12
|
import { planProviderIdentityMigration } from './provider-identity-migration.js';
|
|
13
13
|
import { isInteractionSendAccepted, sendInteractionPayload } from '../core/message/message-utils.js';
|
|
@@ -27,7 +27,7 @@ export function prepareProviderTemplate(templateId, value, file = resolvePaths()
|
|
|
27
27
|
const registry = readProvidersFile(file);
|
|
28
28
|
let generated = generateProviderTemplate(templateId, input);
|
|
29
29
|
const identity = providerIdentity(generated.provider);
|
|
30
|
-
let existing
|
|
30
|
+
let existing;
|
|
31
31
|
if (draft) {
|
|
32
32
|
const previous = registry.providers[resolveProviderId(draft.providerId, registry)];
|
|
33
33
|
const provider = resolveDraftProvider(draft.value, previous, draft.imports);
|
|
@@ -45,7 +45,7 @@ export function prepareProviderTemplate(templateId, value, file = resolvePaths()
|
|
|
45
45
|
// Resolve each service to enforce the same origin and credential constraints before preview/save.
|
|
46
46
|
for (const type of Object.keys(normalized.services ?? {}))
|
|
47
47
|
resolveProviderService('draft', type, { providers: { draft: normalized } });
|
|
48
|
-
return { ...generated, provider: normalized, incoming: generated.provider, providerId: existing?.[0] ?? identity.providerId,
|
|
48
|
+
return { ...generated, provider: normalized, incoming: generated.provider, providerId: existing?.[0] ?? normalized.name ?? identity.providerId,
|
|
49
49
|
existing: !!existing, conflicts: selected.filter(type => Object.hasOwn(existing?.[1].services ?? {}, type)),
|
|
50
50
|
serviceTypes: selected, revision: providersRevision(registry), before: existing?.[1] };
|
|
51
51
|
}
|
|
@@ -53,19 +53,16 @@ export async function applyProviderTemplate(input, file = resolvePaths().provide
|
|
|
53
53
|
const config = parseProviderTemplateInput(input.config);
|
|
54
54
|
if (!config.apiKey)
|
|
55
55
|
throw new Error('A product API key is required');
|
|
56
|
-
const
|
|
56
|
+
const registry = readProvidersFile(file);
|
|
57
|
+
const targetId = input.providerId === undefined ? undefined : resolveProviderId(input.providerId, registry);
|
|
58
|
+
const target = targetId === undefined ? undefined : registry.providers[targetId];
|
|
59
|
+
if (targetId !== undefined && !target)
|
|
60
|
+
throw Object.assign(new Error('Provider not found'), { code: 'NOT_FOUND' });
|
|
61
|
+
const draft = prepareProviderTemplate(input.templateId, config, file, targetId && target ? { providerId: targetId, value: target } : undefined);
|
|
57
62
|
if (input.providerId !== undefined) {
|
|
58
|
-
const targetId = resolveProviderId(input.providerId, readProvidersFile(file));
|
|
59
|
-
if (!draft.existing || targetId !== draft.providerId)
|
|
60
|
-
throw new Error('Template domain does not match the target Provider');
|
|
61
63
|
const data = await updateProvider({ providerId: targetId, revision: input.revision ?? draft.revision, value: draft.provider }, file);
|
|
62
64
|
return { ...data, providerId: targetId };
|
|
63
65
|
}
|
|
64
|
-
if (draft.existing)
|
|
65
|
-
throw Object.assign(new Error('Provider domain already exists; explicitly update the existing Provider'), {
|
|
66
|
-
code: 'PROVIDER_CONFLICT', statusCode: 409,
|
|
67
|
-
data: { kind: 'provider_domain_exists', providerId: draft.providerId, domain: draft.provider.domain },
|
|
68
|
-
});
|
|
69
66
|
return createProvider({ revision: input.revision ?? draft.revision, value: draft.provider }, file);
|
|
70
67
|
}
|
|
71
68
|
export function previewProviderTemplate(templateId, config, context) {
|
|
@@ -516,8 +513,14 @@ export function providersRevision(value) {
|
|
|
516
513
|
export function readProvidersSnapshot(file = resolvePaths().providersConfig) {
|
|
517
514
|
return providersSnapshot(readProvidersFile(file));
|
|
518
515
|
}
|
|
516
|
+
export function readProviderDetail(providerId, file = resolvePaths().providersConfig) {
|
|
517
|
+
const registry = readProvidersFile(file);
|
|
518
|
+
providerId = resolveProviderId(providerId, registry);
|
|
519
|
+
const provider = registry.providers[providerId];
|
|
520
|
+
return provider && { providerId, provider: redactProvider(provider, true), revision: providersRevision(registry) };
|
|
521
|
+
}
|
|
519
522
|
export function readProviderForExport(providerId, serviceType, file = resolvePaths().providersConfig, includeApiKey = false) {
|
|
520
|
-
if (
|
|
523
|
+
if (!isProviderId(providerId))
|
|
521
524
|
throw new Error('Invalid provider identifier');
|
|
522
525
|
if (serviceType !== undefined && (!/^[A-Za-z0-9_-]+$/u.test(serviceType) || ['__proto__', 'constructor', 'prototype'].includes(serviceType)))
|
|
523
526
|
throw new Error('Invalid service type');
|
|
@@ -548,21 +551,25 @@ export function readProviderForExport(providerId, serviceType, file = resolvePat
|
|
|
548
551
|
}
|
|
549
552
|
return exported;
|
|
550
553
|
}
|
|
551
|
-
function
|
|
552
|
-
const
|
|
553
|
-
for (const
|
|
554
|
-
|
|
554
|
+
function redactProvider(value, includeApiKey = false) {
|
|
555
|
+
const provider = structuredClone(value);
|
|
556
|
+
for (const connection of [provider.common, ...Object.values(provider.services ?? {})]) {
|
|
557
|
+
if (!includeApiKey) {
|
|
555
558
|
const masked = maskProviderApiKey(connection.apiKey, PROVIDER_SECRET_MASK);
|
|
556
559
|
if (masked !== undefined)
|
|
557
560
|
connection.apiKey = masked;
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
561
|
+
}
|
|
562
|
+
for (const field of ['headers', 'queryParams']) {
|
|
563
|
+
const values = connection[field];
|
|
564
|
+
if (values)
|
|
565
|
+
for (const key of Object.keys(values))
|
|
566
|
+
values[key] = PROVIDER_SECRET_MASK;
|
|
564
567
|
}
|
|
565
568
|
}
|
|
569
|
+
return provider;
|
|
570
|
+
}
|
|
571
|
+
function providersSnapshot(value) {
|
|
572
|
+
const providers = Object.fromEntries(Object.entries(value.providers).map(([id, provider]) => [id, redactProvider(provider)]));
|
|
566
573
|
return {
|
|
567
574
|
...(value.$schema_version !== undefined ? { $schema_version: value.$schema_version } : {}),
|
|
568
575
|
...(value.nextId !== undefined ? { nextId: value.nextId } : {}),
|
|
@@ -571,6 +578,20 @@ function providersSnapshot(value) {
|
|
|
571
578
|
revision: providersRevision(value),
|
|
572
579
|
};
|
|
573
580
|
}
|
|
581
|
+
/** The internal name is fixed at creation; discard submitted names before validation. */
|
|
582
|
+
function retainProviderName(value, previous) {
|
|
583
|
+
if (!previous || !value || typeof value !== 'object' || Array.isArray(value))
|
|
584
|
+
return value;
|
|
585
|
+
const provider = { ...value };
|
|
586
|
+
delete provider.name;
|
|
587
|
+
if (previous.name !== undefined)
|
|
588
|
+
provider.name = previous.name;
|
|
589
|
+
const common = provider.common;
|
|
590
|
+
if (common && typeof common === 'object' && !Array.isArray(common)
|
|
591
|
+
&& common.baseUrl !== previous.common.baseUrl && provider.domain === previous.domain)
|
|
592
|
+
delete provider.domain;
|
|
593
|
+
return provider;
|
|
594
|
+
}
|
|
574
595
|
function retainSecrets(value, previous) {
|
|
575
596
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
576
597
|
return value;
|
|
@@ -605,7 +626,7 @@ function retainSecrets(value, previous) {
|
|
|
605
626
|
return provider;
|
|
606
627
|
}
|
|
607
628
|
export function resolveProviderDraftService(input, file = resolvePaths().providersConfig) {
|
|
608
|
-
if (
|
|
629
|
+
if (!isProviderId(input.providerId)) {
|
|
609
630
|
throw new Error('Invalid provider identifier');
|
|
610
631
|
}
|
|
611
632
|
const current = readProvidersFile(file);
|
|
@@ -622,7 +643,7 @@ export function resolveProviderDraftService(input, file = resolvePaths().provide
|
|
|
622
643
|
return resolveProviderService(providerId, input.serviceType, { providers: { [providerId]: provider } });
|
|
623
644
|
}
|
|
624
645
|
export async function updateProvider(input, file = resolvePaths().providersConfig) {
|
|
625
|
-
if (
|
|
646
|
+
if (!isProviderId(input.providerId)) {
|
|
626
647
|
throw new Error('Invalid provider identifier');
|
|
627
648
|
}
|
|
628
649
|
const result = mutateConfig(ConfigTarget.Providers, { providerFile: file }, config => {
|
|
@@ -641,11 +662,9 @@ export async function updateProvider(input, file = resolvePaths().providersConfi
|
|
|
641
662
|
}
|
|
642
663
|
else {
|
|
643
664
|
const previous = current.providers[providerId];
|
|
644
|
-
const value = retainSecrets(input.value, previous);
|
|
665
|
+
const value = retainProviderName(retainSecrets(input.value, previous), previous);
|
|
645
666
|
const normalized = validateProvidersFile({ providers: { draft: value } }).providers.draft;
|
|
646
667
|
assertProviderDomainUnchanged(previous, normalized);
|
|
647
|
-
if (normalized.name !== undefined)
|
|
648
|
-
normalized.name = validateProviderName(normalized.name);
|
|
649
668
|
current.providers[providerId] = normalized;
|
|
650
669
|
}
|
|
651
670
|
return current;
|
|
@@ -721,26 +740,12 @@ function removeProviderAliases(config, providerId) {
|
|
|
721
740
|
delete config.aliases;
|
|
722
741
|
}
|
|
723
742
|
function assertProviderDomainUnchanged(previous, next) {
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
if (previous.domain === undefined && ['PROVIDER_DOMAIN_REQUIRED', 'PROVIDER_DOMAIN_INVALID', 'PROVIDER_BASE_URL_MISSING'].includes(code ?? '')) {
|
|
731
|
-
if (previous.common.baseUrl === next.common.baseUrl) {
|
|
732
|
-
if (next.domain !== undefined)
|
|
733
|
-
next.domain = providerIdentity(next).domain;
|
|
734
|
-
return;
|
|
735
|
-
}
|
|
736
|
-
}
|
|
737
|
-
throw error;
|
|
738
|
-
}
|
|
739
|
-
const identity = providerIdentity(next);
|
|
740
|
-
if (identity.domain !== previousDomain) {
|
|
741
|
-
throw Object.assign(new Error('Provider domain is immutable; create a different Provider'), { code: 'PROVIDER_DOMAIN_IMMUTABLE' });
|
|
742
|
-
}
|
|
743
|
-
next.domain = identity.domain;
|
|
743
|
+
if (previous.name !== next.name)
|
|
744
|
+
throw Object.assign(new Error('Provider name is immutable; change displayName instead'), { code: 'PROVIDER_NAME_IMMUTABLE' });
|
|
745
|
+
if (previous.common.baseUrl !== next.common.baseUrl && next.domain === previous.domain)
|
|
746
|
+
delete next.domain;
|
|
747
|
+
if (next.domain !== undefined)
|
|
748
|
+
next.domain = providerIdentity(next).domain;
|
|
744
749
|
}
|
|
745
750
|
function existingProviderDomain(provider) {
|
|
746
751
|
try {
|
|
@@ -753,23 +758,14 @@ function existingProviderDomain(provider) {
|
|
|
753
758
|
function availableProviderId(config, provider) {
|
|
754
759
|
const identity = providerIdentity(provider);
|
|
755
760
|
provider.domain = identity.domain;
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
}
|
|
763
|
-
if (domain === identity.domain) {
|
|
764
|
-
throw Object.assign(new Error('Provider domain already exists; update or explicitly merge it'), {
|
|
765
|
-
code: 'PROVIDER_CONFLICT', statusCode: 409, data: { kind: 'provider_domain_exists', providerId: existingId, domain },
|
|
766
|
-
});
|
|
767
|
-
}
|
|
768
|
-
}
|
|
769
|
-
if (Object.hasOwn(config.aliases ?? {}, identity.providerId)) {
|
|
770
|
-
throw Object.assign(new Error('Provider ID conflicts with a legacy alias'), { code: 'PROVIDER_ID_COLLISION', statusCode: 409 });
|
|
761
|
+
const name = validateProviderName(provider.name);
|
|
762
|
+
if (Object.hasOwn(config.providers, name) || Object.hasOwn(config.aliases ?? {}, name)
|
|
763
|
+
|| Object.values(config.providers).some(existing => existing.name === name)) {
|
|
764
|
+
throw Object.assign(new Error('Provider name already exists; choose a different name'), {
|
|
765
|
+
code: 'PROVIDER_NAME_EXISTS', statusCode: 409, data: { kind: 'provider_name_exists', name },
|
|
766
|
+
});
|
|
771
767
|
}
|
|
772
|
-
return
|
|
768
|
+
return name;
|
|
773
769
|
}
|
|
774
770
|
export async function createProvider(input, file = resolvePaths().providersConfig) {
|
|
775
771
|
if (!/^[a-f0-9]{64}$/u.test(input.revision))
|
|
@@ -777,9 +773,7 @@ export async function createProvider(input, file = resolvePaths().providersConfi
|
|
|
777
773
|
const normalized = validateProvidersFile({ providers: { imported: input.value } });
|
|
778
774
|
rejectMaskedImportSecrets(normalized.providers);
|
|
779
775
|
const provider = normalized.providers.imported;
|
|
780
|
-
provider.name
|
|
781
|
-
if (provider.name !== undefined)
|
|
782
|
-
provider.name = validateProviderName(provider.name);
|
|
776
|
+
provider.name = validateProviderName(provider.name);
|
|
783
777
|
const result = mutateConfig(ConfigTarget.Providers, { providerFile: file }, config => {
|
|
784
778
|
const current = config;
|
|
785
779
|
if (providersRevision(current) !== input.revision) {
|
|
@@ -787,9 +781,6 @@ export async function createProvider(input, file = resolvePaths().providersConfi
|
|
|
787
781
|
}
|
|
788
782
|
const identity = providerIdentity(provider);
|
|
789
783
|
provider.domain = identity.domain;
|
|
790
|
-
const existing = current.providers[identity.providerId];
|
|
791
|
-
if (existing && isDeepStrictEqual(existing, provider))
|
|
792
|
-
return { current, providerId: identity.providerId };
|
|
793
784
|
const providerId = availableProviderId(current, provider);
|
|
794
785
|
current.providers[providerId] = provider;
|
|
795
786
|
delete current.nextId;
|
|
@@ -798,27 +789,7 @@ export async function createProvider(input, file = resolvePaths().providersConfi
|
|
|
798
789
|
return { ...providersSnapshot(result.value.current), providerId: result.value.providerId };
|
|
799
790
|
}
|
|
800
791
|
function upgradeProviderId(current, oldId) {
|
|
801
|
-
|
|
802
|
-
const identity = providerIdentity(provider);
|
|
803
|
-
provider.domain = identity.domain;
|
|
804
|
-
if (oldId === identity.providerId)
|
|
805
|
-
return oldId;
|
|
806
|
-
const remaining = { ...current.providers };
|
|
807
|
-
delete remaining[oldId];
|
|
808
|
-
const aliases = { ...current.aliases };
|
|
809
|
-
if (aliases[identity.providerId] === oldId)
|
|
810
|
-
delete aliases[identity.providerId];
|
|
811
|
-
const providerId = availableProviderId({ providers: remaining, aliases }, provider);
|
|
812
|
-
for (const [alias, target] of Object.entries(aliases)) {
|
|
813
|
-
if (target === oldId)
|
|
814
|
-
aliases[alias] = providerId;
|
|
815
|
-
}
|
|
816
|
-
aliases[oldId] = providerId;
|
|
817
|
-
delete current.providers[oldId];
|
|
818
|
-
current.providers[providerId] = provider;
|
|
819
|
-
current.aliases = aliases;
|
|
820
|
-
delete current.nextId;
|
|
821
|
-
return providerId;
|
|
792
|
+
return oldId;
|
|
822
793
|
}
|
|
823
794
|
async function mutateProvidersWithIdentityUpgrade(revision, file, mutation) {
|
|
824
795
|
if (!/^[a-f0-9]{64}$/u.test(revision))
|
|
@@ -939,7 +910,7 @@ function resolveDraftProvider(value, previous, imports = []) {
|
|
|
939
910
|
}
|
|
940
911
|
secretSource = secretSource ? mergeImportedProvider(secretSource, imported, source ? new Set(Object.keys(imported.services ?? {})) : undefined, !!source) : imported;
|
|
941
912
|
}
|
|
942
|
-
const provider = validateProvidersFile({ providers: { draft: retainSecrets(value, secretSource) } }).providers.draft;
|
|
913
|
+
const provider = validateProvidersFile({ providers: { draft: retainProviderName(retainSecrets(value, secretSource), previous) } }).providers.draft;
|
|
943
914
|
if (imports.length && secretSource && providerIdentity(provider).domain !== providerIdentity(secretSource).domain) {
|
|
944
915
|
throw new Error('Imported Provider domain does not match the draft Provider');
|
|
945
916
|
}
|
|
@@ -950,7 +921,7 @@ export async function saveProviderChanges(input, file = resolvePaths().providers
|
|
|
950
921
|
throw new Error('Provider changes are required');
|
|
951
922
|
const identifiers = new Set();
|
|
952
923
|
for (const change of input.changes) {
|
|
953
|
-
if (!change || typeof change.providerId !== 'string' ||
|
|
924
|
+
if (!change || typeof change.providerId !== 'string' || !isProviderId(change.providerId)
|
|
954
925
|
|| ['__proto__', 'constructor', 'prototype'].includes(change.providerId) || identifiers.has(change.providerId)) {
|
|
955
926
|
throw new Error('Invalid or duplicate provider identifier');
|
|
956
927
|
}
|
|
@@ -987,9 +958,11 @@ export async function saveProviderChanges(input, file = resolvePaths().providers
|
|
|
987
958
|
const provider = resolveDraftProvider(change.value, previous, change.imports);
|
|
988
959
|
if (previous)
|
|
989
960
|
assertProviderDomainUnchanged(previous, provider);
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
provider.name
|
|
961
|
+
if (change.create) {
|
|
962
|
+
provider.name ||= providerNameFromBaseUrlIfStatic(provider.common.baseUrl);
|
|
963
|
+
if (provider.name !== undefined)
|
|
964
|
+
provider.name = validateProviderName(provider.name);
|
|
965
|
+
}
|
|
993
966
|
let providerId = change.create ? availableProviderId(current, provider) : targetId;
|
|
994
967
|
if (change.create)
|
|
995
968
|
delete current.nextId;
|
|
@@ -1006,14 +979,16 @@ export function importBaseagentProviderIntoRegistry(current, input) {
|
|
|
1006
979
|
const normalized = validateProvidersFile({ providers: { imported: input.value } });
|
|
1007
980
|
rejectMaskedImportSecrets(normalized.providers);
|
|
1008
981
|
const imported = normalized.providers.imported;
|
|
1009
|
-
imported.name ||=
|
|
982
|
+
imported.name ||= providerNameForBaseagentImport(imported.common.baseUrl, Object.keys(imported.services ?? {}).find(type => ['claude', 'codex', 'gemini'].includes(type)) ?? '');
|
|
1010
983
|
if (input.name !== undefined)
|
|
1011
984
|
imported.name = validateProviderName(input.name);
|
|
1012
985
|
if (input.resolution === 'cancel')
|
|
1013
986
|
throw Object.assign(new Error('Provider import cancelled'), { code: 'CANCELLED', statusCode: 409 });
|
|
1014
987
|
const identity = providerIdentity(imported);
|
|
1015
988
|
imported.domain = identity.domain;
|
|
1016
|
-
const match =
|
|
989
|
+
const match = input.resolution === 'merge'
|
|
990
|
+
? Object.entries(current.providers).find(([id, provider]) => id === imported.name || provider.name === imported.name)
|
|
991
|
+
: undefined;
|
|
1017
992
|
if (match && input.requireResolution && input.resolution === undefined) {
|
|
1018
993
|
const [providerId, existing] = match;
|
|
1019
994
|
throw Object.assign(new Error('Provider conflict requires an explicit resolution'), {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { isSupportedBaseagent } from '../
|
|
1
|
+
import { isSupportedBaseagent } from '../core/baseagent/baseagent.js';
|
|
2
2
|
import crypto from 'crypto';
|
|
3
3
|
import { isDeepStrictEqual } from 'node:util';
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
import path from 'path';
|
|
6
6
|
import { resolvePaths } from '../paths.js';
|
|
7
|
-
import { acquireConfigMutationLock, ConfigError } from './config-manager.js';
|
|
7
|
+
import { acquireConfigMutationLock, normalizeProcessConfigCompat, stripLegacyAunGatewayConfig, ConfigError } from './config-manager.js';
|
|
8
8
|
import { firstConfiguredOwner } from './owner-config.js';
|
|
9
9
|
import { currentVersion, loadSchema } from './schema-registry.js';
|
|
10
10
|
import { planProviderIdentityMigration, validateProviderIdentityMigrationPlan } from './provider-identity-migration.js';
|
|
@@ -14,8 +14,11 @@ import { snapshot } from './snapshot.js';
|
|
|
14
14
|
import { logger } from '../utils/logger.js';
|
|
15
15
|
import { parseContactAlias } from './peer-alias.js';
|
|
16
16
|
import { recoverAllPeerBookMutationsSync } from './peer-book-store.js';
|
|
17
|
+
import { normalizeDaemonServices } from './daemon-services.js';
|
|
18
|
+
import { DAEMON_CONFIG_FILENAME } from '../product.js';
|
|
17
19
|
import { atomicReplaceFile } from '../utils/atomic-write.js';
|
|
18
20
|
const MIGRATION_KIND = {
|
|
21
|
+
'baseagent-declarations-v1': 'agent-only-model',
|
|
19
22
|
'auxiliary-model-v1': 'auxiliary-model',
|
|
20
23
|
'agent-only-model-v1': 'agent-only-model',
|
|
21
24
|
'agent-model-provider-v1': 'agent-only-model',
|
|
@@ -28,6 +31,158 @@ const MIGRATION_KIND = {
|
|
|
28
31
|
'peer-file-v1': 'agent-only-model',
|
|
29
32
|
'peer-state-v4': 'agent-only-model',
|
|
30
33
|
};
|
|
34
|
+
/** Move legacy deployment intent once. No directory discovery and no Agent/session rewrites. */
|
|
35
|
+
export function runBaseagentDeclarationMigration(options = {}) {
|
|
36
|
+
const home = path.resolve(options.home ?? resolvePaths().root);
|
|
37
|
+
const id = 'baseagent-declarations-v1';
|
|
38
|
+
const marker = path.join(home, 'data', id + '-completed.json');
|
|
39
|
+
// Every CLI process reaches this check. Once migration is committed and no
|
|
40
|
+
// recovery journal remains, don't serialize routine commands on a no-op.
|
|
41
|
+
// A journal must still pass through the lock so interrupted writes recover
|
|
42
|
+
// before the completion marker is trusted.
|
|
43
|
+
if (fs.existsSync(marker) && !fs.existsSync(journalPath(home, id))) {
|
|
44
|
+
return { changedFiles: 0, backup: null };
|
|
45
|
+
}
|
|
46
|
+
const release = acquireLock(home, id);
|
|
47
|
+
try {
|
|
48
|
+
recoverJournal(home, id);
|
|
49
|
+
const daemonFile = path.join(home, DAEMON_CONFIG_FILENAME);
|
|
50
|
+
if (fs.existsSync(marker) || !fs.existsSync(daemonFile))
|
|
51
|
+
return { changedFiles: 0, backup: null };
|
|
52
|
+
const daemon = readJson(daemonFile);
|
|
53
|
+
if (!isRecord(daemon.value))
|
|
54
|
+
throw new Error('Daemon configuration must be an object');
|
|
55
|
+
if (Number(daemon.value.$schema_version) > currentVersion('daemon'))
|
|
56
|
+
return { changedFiles: 0, backup: null };
|
|
57
|
+
const changes = [];
|
|
58
|
+
const next = normalizeProcessConfigCompat(normalizeDaemonServices(stripLegacyAunGatewayConfig(structuredClone(daemon.value), daemonFile, message => logger.warn(message))));
|
|
59
|
+
const defaultsFile = path.join(home, 'agents', 'defaults.json');
|
|
60
|
+
const defaults = fs.existsSync(defaultsFile) ? readJson(defaultsFile) : undefined;
|
|
61
|
+
if (defaults && !isRecord(defaults.value))
|
|
62
|
+
throw new Error('Defaults configuration must be an object');
|
|
63
|
+
if (defaults && isRecord(defaults.value) && Number(defaults.value.$schema_version) > currentVersion('defaults')) {
|
|
64
|
+
throw new Error('Defaults configuration was written by a newer version');
|
|
65
|
+
}
|
|
66
|
+
const blocks = defaults && isRecord(defaults.value) && isRecord(defaults.value.baseagents) ? defaults.value.baseagents : {};
|
|
67
|
+
const names = new Set();
|
|
68
|
+
// v12 already uses explicit declarations. Never resurrect a deliberately removed entry.
|
|
69
|
+
if (Number(next.$schema_version ?? 0) < 12) {
|
|
70
|
+
for (const name of ['claude', 'codex', 'ecagent', ...Object.keys(blocks)])
|
|
71
|
+
names.add(name);
|
|
72
|
+
const inspect = (config) => {
|
|
73
|
+
if (typeof config.active_baseagent === 'string')
|
|
74
|
+
names.add(config.active_baseagent);
|
|
75
|
+
if (isRecord(config.baseagents))
|
|
76
|
+
for (const name of Object.keys(config.baseagents))
|
|
77
|
+
names.add(name);
|
|
78
|
+
};
|
|
79
|
+
if (defaults && isRecord(defaults.value))
|
|
80
|
+
inspect(defaults.value);
|
|
81
|
+
const root = path.join(home, 'agents');
|
|
82
|
+
for (const entry of fs.existsSync(root) ? fs.readdirSync(root, { withFileTypes: true }) : []) {
|
|
83
|
+
if (!entry.isDirectory() || !validAid(entry.name))
|
|
84
|
+
continue;
|
|
85
|
+
const file = path.join(root, entry.name, 'config.json');
|
|
86
|
+
if (!fs.existsSync(file))
|
|
87
|
+
continue;
|
|
88
|
+
try {
|
|
89
|
+
const agent = readJson(file).value;
|
|
90
|
+
if (isRecord(agent))
|
|
91
|
+
inspect(agent);
|
|
92
|
+
else
|
|
93
|
+
logger.warn('[BaseagentPlugins] Skipping invalid Agent configuration: ' + file);
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
// The regular Agent loader reports this file; it must not prevent
|
|
97
|
+
// other Agents or the control plane from upgrading their declarations.
|
|
98
|
+
logger.warn('[BaseagentPlugins] Cannot inspect Agent configuration: ' + file, error);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (next.plugins !== undefined && !isRecord(next.plugins))
|
|
103
|
+
throw new Error('Daemon plugins must be an object');
|
|
104
|
+
const plugins = { ...(isRecord(next.plugins) ? next.plugins : {}) };
|
|
105
|
+
for (const rawName of names) {
|
|
106
|
+
const name = BASEAGENT_ALIASES.get(rawName) ?? rawName;
|
|
107
|
+
if (!/^[a-z][a-z0-9-]{0,31}$/.test(name))
|
|
108
|
+
throw new Error('Invalid legacy baseagent name: ' + name);
|
|
109
|
+
if (hasOwn(plugins, 'baseagent:' + name))
|
|
110
|
+
continue;
|
|
111
|
+
const block = blocks[name];
|
|
112
|
+
const enabled = isRecord(block) && hasOwn(block, 'enabled') ? block.enabled : true;
|
|
113
|
+
if (typeof enabled !== 'boolean')
|
|
114
|
+
throw new Error('Invalid legacy enabled flag: ' + name);
|
|
115
|
+
plugins['baseagent:' + name] = { enabled, force: false };
|
|
116
|
+
}
|
|
117
|
+
next.plugins = plugins;
|
|
118
|
+
// Existing process compatibility normalization retires owner/service fields before this migration.
|
|
119
|
+
next.$schema_version = 12;
|
|
120
|
+
const validate = (name, value) => {
|
|
121
|
+
const schema = loadSchema(name, name === 'defaults' && Number(value.$schema_version) < 7 ? Number(value.$schema_version) : undefined);
|
|
122
|
+
const checked = structuredClone(value);
|
|
123
|
+
// An existing AID never consumes this legacy fallback. Match saveDaemonConfig's compatibility rule.
|
|
124
|
+
if (name === 'daemon' && typeof checked.aid === 'string' && checked.aid && isRecord(checked.aun))
|
|
125
|
+
delete checked.aun.defaultAidDomain;
|
|
126
|
+
if (!schema.validate(checked))
|
|
127
|
+
throw new Error(name + ' migration validation failed: ' + JSON.stringify(schema.validate.errors));
|
|
128
|
+
};
|
|
129
|
+
validate('daemon', next);
|
|
130
|
+
if (!isDeepStrictEqual(next, daemon.value))
|
|
131
|
+
changes.push({ file: daemonFile, kind: 'agent-only-model', before: daemon.text, after: jsonText(next) });
|
|
132
|
+
if (defaults && isRecord(defaults.value)) {
|
|
133
|
+
const value = stripLegacyAunGatewayConfig(structuredClone(defaults.value), defaultsFile, message => logger.warn(message));
|
|
134
|
+
if (isRecord(value.baseagents))
|
|
135
|
+
for (const block of Object.values(value.baseagents))
|
|
136
|
+
if (isRecord(block))
|
|
137
|
+
delete block.enabled;
|
|
138
|
+
// Promote compatible old files before validating plugin names. Historical
|
|
139
|
+
// model/provider fields still belong to their existing migrations.
|
|
140
|
+
const previousVersion = Number(value.$schema_version ?? 1);
|
|
141
|
+
const upgraded = { ...value, $schema_version: currentVersion('defaults') };
|
|
142
|
+
value.$schema_version = previousVersion >= 7 || loadSchema('defaults').validate(upgraded)
|
|
143
|
+
? upgraded.$schema_version : previousVersion;
|
|
144
|
+
validate('defaults', value);
|
|
145
|
+
if (!isDeepStrictEqual(value, defaults.value))
|
|
146
|
+
changes.push({ file: defaultsFile, kind: 'agent-only-model', before: defaults.text, after: jsonText(value) });
|
|
147
|
+
}
|
|
148
|
+
changes.push({ file: marker, kind: 'agent-only-model', before: null, after: jsonText({ schemaVersion: 1 }) });
|
|
149
|
+
const backup = options.apply ? applyMigration({ home, changes, summary: { filesChanged: changes.length } }, id) : null;
|
|
150
|
+
return { changedFiles: changes.length, backup };
|
|
151
|
+
}
|
|
152
|
+
finally {
|
|
153
|
+
release();
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
/** Capture legacy deployment intent before any writer stamps the new process schema. */
|
|
157
|
+
export function preserveBaseagentDeclarationsOnWrite(value) {
|
|
158
|
+
if (!isRecord(value))
|
|
159
|
+
return value;
|
|
160
|
+
const file = resolvePaths().daemonConfig;
|
|
161
|
+
if (!fs.existsSync(file))
|
|
162
|
+
return value;
|
|
163
|
+
const previous = readJson(file).value;
|
|
164
|
+
if (!isRecord(previous) || Number(previous.$schema_version ?? 0) >= 12)
|
|
165
|
+
return value;
|
|
166
|
+
const result = runBaseagentDeclarationMigration({ apply: true });
|
|
167
|
+
if (!result.changedFiles || (value.plugins !== undefined && !isRecord(value.plugins)))
|
|
168
|
+
return value;
|
|
169
|
+
const migrated = readJson(file).value;
|
|
170
|
+
return { ...value, plugins: { ...(isRecord(migrated) && isRecord(migrated.plugins) ? migrated.plugins : {}),
|
|
171
|
+
...(isRecord(value.plugins) ? value.plugins : {}) } };
|
|
172
|
+
}
|
|
173
|
+
/** A caller may still hold the pre-migration Defaults object when saving it. */
|
|
174
|
+
export function migrateBaseagentDefaultsOnWrite(value) {
|
|
175
|
+
const result = runBaseagentDeclarationMigration({ apply: true });
|
|
176
|
+
if (!result.changedFiles || !isRecord(value) || !isRecord(value.baseagents))
|
|
177
|
+
return value;
|
|
178
|
+
const blocks = Object.fromEntries(Object.entries(value.baseagents).map(([name, raw]) => {
|
|
179
|
+
if (!isRecord(raw))
|
|
180
|
+
return [name, raw];
|
|
181
|
+
const { enabled: _enabled, ...settings } = raw;
|
|
182
|
+
return [name, settings];
|
|
183
|
+
}));
|
|
184
|
+
return { ...value, baseagents: blocks };
|
|
185
|
+
}
|
|
31
186
|
const BASEAGENT_ALIASES = new Map([
|
|
32
187
|
['cc', 'claude'],
|
|
33
188
|
['claude-code', 'claude'],
|
|
@@ -511,6 +666,24 @@ function assertDaemonStopped(home) {
|
|
|
511
666
|
function lockPath(home, id) {
|
|
512
667
|
return path.join(home, 'data', `${id}-migration.lock`);
|
|
513
668
|
}
|
|
669
|
+
const LOCK_OWNER_WAIT_MS = 1000;
|
|
670
|
+
const LOCK_OWNER_POLL_INTERVAL_MS = 10;
|
|
671
|
+
function readLockOwner(ownerFile, dir) {
|
|
672
|
+
const deadline = Date.now() + LOCK_OWNER_WAIT_MS;
|
|
673
|
+
const waitCell = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
|
|
674
|
+
while (true) {
|
|
675
|
+
try {
|
|
676
|
+
return JSON.parse(fs.readFileSync(ownerFile, 'utf8'));
|
|
677
|
+
}
|
|
678
|
+
catch {
|
|
679
|
+
if (Date.now() >= deadline)
|
|
680
|
+
throw new Error(`Migration lock is unreadable: ${dir}`);
|
|
681
|
+
// mkdir is the atomic lock acquisition; the owner record is written immediately
|
|
682
|
+
// afterward. Give that initializer a bounded window to publish valid JSON.
|
|
683
|
+
Atomics.wait(waitCell, 0, 0, LOCK_OWNER_POLL_INTERVAL_MS);
|
|
684
|
+
}
|
|
685
|
+
}
|
|
686
|
+
}
|
|
514
687
|
function acquireLock(home, id) {
|
|
515
688
|
const dir = lockPath(home, id);
|
|
516
689
|
const ownerFile = path.join(dir, 'owner.json');
|
|
@@ -521,13 +694,7 @@ function acquireLock(home, id) {
|
|
|
521
694
|
catch (error) {
|
|
522
695
|
if (!isRecord(error) || error.code !== 'EEXIST')
|
|
523
696
|
throw error;
|
|
524
|
-
|
|
525
|
-
try {
|
|
526
|
-
owner = JSON.parse(fs.readFileSync(ownerFile, 'utf8'));
|
|
527
|
-
}
|
|
528
|
-
catch {
|
|
529
|
-
throw new Error(`Migration lock is unreadable: ${dir}`);
|
|
530
|
-
}
|
|
697
|
+
const owner = readLockOwner(ownerFile, dir);
|
|
531
698
|
const pid = isRecord(owner) ? Number(owner.pid) : NaN;
|
|
532
699
|
if (Number.isInteger(pid) && pid > 0 && processIsAlive(pid)) {
|
|
533
700
|
throw new Error(`Another ${id} migration is already running (pid=${pid})`);
|
|
@@ -1109,7 +1276,6 @@ const AGENT_BASEAGENT_REMOVED_FIELDS = [
|
|
|
1109
1276
|
const AGENT_TOP_REMOVED_FIELDS = ['model', 'models', 'decision_model', 'response_modes', 'dispatch'];
|
|
1110
1277
|
/** 剥离后内容与新版本 schema 等价的直接前驱版本。 */
|
|
1111
1278
|
const AGENT_CONFIG_RESTAMP = { from: 13, to: 16 };
|
|
1112
|
-
const DEFAULTS_SCHEMA_TARGET = 5;
|
|
1113
1279
|
/** 指认 provider 时各 baseagent 使用的服务类型。 */
|
|
1114
1280
|
const BASEAGENT_SERVICE_TYPES = {
|
|
1115
1281
|
claude: 'claude',
|
|
@@ -1387,7 +1553,7 @@ function planAgentModelProviderMigration(home) {
|
|
|
1387
1553
|
}
|
|
1388
1554
|
}
|
|
1389
1555
|
if (isDefaults) {
|
|
1390
|
-
value.$schema_version =
|
|
1556
|
+
value.$schema_version = currentVersion('defaults');
|
|
1391
1557
|
}
|
|
1392
1558
|
else if (typeof value.$schema_version === 'number' && value.$schema_version < AGENT_CONFIG_RESTAMP.to) {
|
|
1393
1559
|
// Model/provider migration preserves the v16 admission fields unchanged.
|
|
@@ -14,7 +14,7 @@ import fs from 'fs';
|
|
|
14
14
|
import path from 'path';
|
|
15
15
|
import { createRequire } from 'node:module';
|
|
16
16
|
import { kitsSchemasDir } from '../paths.js';
|
|
17
|
-
import { createErrorCapturingReader, fileCache } from '../core/daemon-file-cache.js';
|
|
17
|
+
import { createErrorCapturingReader, fileCache } from '../core/daemon/daemon-file-cache.js';
|
|
18
18
|
let _ajv = null;
|
|
19
19
|
const requireSchemaDependency = createRequire(import.meta.url);
|
|
20
20
|
function ajv() {
|