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,7 +1,6 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { isDeepStrictEqual } from 'node:util';
|
|
4
|
-
import { providerIdentity } from './provider-identity.js';
|
|
5
4
|
import { initializationRuntimePlan, providerEnvironmentVariable, providerServiceTypeForBaseagent, providerServiceTypeForPurpose, resolveProviderId, } from './providers-config.js';
|
|
6
5
|
import { validateProvidersFile } from './providers-config.js';
|
|
7
6
|
import { loadSchema } from './schema-registry.js';
|
|
@@ -165,113 +164,15 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
165
164
|
throw new Error('Provider migration requires object configurations');
|
|
166
165
|
return { text, value: value };
|
|
167
166
|
};
|
|
168
|
-
if (!fs.existsSync(providerFile) && !registry)
|
|
169
|
-
return {
|
|
170
|
-
home, changes, summary, pending, expected, registry: { providers: {} },
|
|
171
|
-
sourceRegistry: { providers: {} }, providerMapping: {},
|
|
172
|
-
};
|
|
173
167
|
const original = fs.existsSync(providerFile) ? readJson(providerFile) : { text: null, value: { providers: {} } };
|
|
174
168
|
if (original.text === null)
|
|
175
169
|
expected.push({ file: providerFile, before: null });
|
|
176
170
|
const source = validateProvidersFile(registry ?? original.value);
|
|
177
171
|
const providers = {};
|
|
178
172
|
const mapping = {};
|
|
179
|
-
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
const sourceBase = source.common.baseUrl;
|
|
183
|
-
const staticUrls = !providerEnvironmentVariable(targetBase) && !providerEnvironmentVariable(sourceBase);
|
|
184
|
-
const conflicts = [];
|
|
185
|
-
const targetCommon = { ...target.common, baseUrl: staticUrls ? new URL(targetBase).origin : targetBase };
|
|
186
|
-
const sourceCommon = { ...source.common, baseUrl: staticUrls ? new URL(sourceBase).origin : sourceBase };
|
|
187
|
-
for (const field of ['baseUrl', 'apiKey', 'headers', 'queryParams']) {
|
|
188
|
-
if (!isDeepStrictEqual(targetCommon[field], sourceCommon[field]))
|
|
189
|
-
conflicts.push(`common.${field}`);
|
|
190
|
-
}
|
|
191
|
-
const services = { ...(target.services ?? {}) };
|
|
192
|
-
for (const [serviceType, rawService] of Object.entries(source.services ?? {})) {
|
|
193
|
-
let service = rawService;
|
|
194
|
-
if (staticUrls && targetBase !== sourceBase && new URL(targetBase).origin === new URL(sourceBase).origin) {
|
|
195
|
-
const resolved = new URL(rawService.path || '.', sourceBase.endsWith('/') ? sourceBase : `${sourceBase}/`);
|
|
196
|
-
service = { ...rawService, path: `${resolved.pathname}${resolved.search}${resolved.hash}` };
|
|
197
|
-
if (rawService.catalogPath !== undefined) {
|
|
198
|
-
service.catalogPath = new URL(rawService.catalogPath, sourceBase.replace(/\/+$/u, '') + '/').pathname;
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
if (Object.hasOwn(services, serviceType)) {
|
|
202
|
-
const existing = services[serviceType];
|
|
203
|
-
const equivalent = staticUrls
|
|
204
|
-
? new URL(existing.path || '.', targetBase.endsWith('/') ? targetBase : `${targetBase}/`).href.replace(/\/+$/u, '')
|
|
205
|
-
=== new URL(rawService.path || '.', sourceBase.endsWith('/') ? sourceBase : `${sourceBase}/`).href.replace(/\/+$/u, '')
|
|
206
|
-
&& isDeepStrictEqual({ ...existing, path: undefined }, { ...rawService, path: undefined })
|
|
207
|
-
: isDeepStrictEqual(existing, service);
|
|
208
|
-
if (!equivalent) {
|
|
209
|
-
const sameEndpoint = staticUrls
|
|
210
|
-
? new URL(existing.path || '.', targetBase.endsWith('/') ? targetBase : `${targetBase}/`).href.replace(/\/+$/u, '')
|
|
211
|
-
=== new URL(rawService.path || '.', sourceBase.endsWith('/') ? sourceBase : `${sourceBase}/`).href.replace(/\/+$/u, '')
|
|
212
|
-
: isDeepStrictEqual(existing.path, service.path);
|
|
213
|
-
if (!sameEndpoint)
|
|
214
|
-
conflicts.push(`services.${serviceType}.path`);
|
|
215
|
-
for (const field of ['style', 'models', 'modelPolicy', 'catalogPath', 'apiKey', 'headers', 'queryParams']) {
|
|
216
|
-
if (!isDeepStrictEqual(existing[field], service[field]))
|
|
217
|
-
conflicts.push(`services.${serviceType}.${field}`);
|
|
218
|
-
}
|
|
219
|
-
}
|
|
220
|
-
continue;
|
|
221
|
-
}
|
|
222
|
-
services[serviceType] = service;
|
|
223
|
-
}
|
|
224
|
-
if (conflicts.length) {
|
|
225
|
-
const message = `Provider migration conflict between ${providerIds.join(', ')} (${target.domain}): `
|
|
226
|
-
+ `${conflicts.join(', ')} differ; no configuration was changed`;
|
|
227
|
-
throw Object.assign(new Error(message), {
|
|
228
|
-
code: 'PROVIDER_CONFLICT',
|
|
229
|
-
data: { kind: 'provider_migration_conflict', providerIds, domain: target.domain, fields: conflicts },
|
|
230
|
-
});
|
|
231
|
-
}
|
|
232
|
-
target.services = services;
|
|
233
|
-
};
|
|
234
|
-
for (const [oldId, provider] of Object.entries(source.providers).sort(([left], [right]) => left.localeCompare(right))) {
|
|
235
|
-
if (options.preserveProviderIds) {
|
|
236
|
-
providers[oldId] = provider;
|
|
237
|
-
continue;
|
|
238
|
-
}
|
|
239
|
-
let identity;
|
|
240
|
-
try {
|
|
241
|
-
identity = providerIdentity(provider);
|
|
242
|
-
}
|
|
243
|
-
catch (error) {
|
|
244
|
-
const errorCode = error?.code;
|
|
245
|
-
const legacyUnresolved = provider.domain === undefined && (providerEnvironmentVariable(provider.common.baseUrl)
|
|
246
|
-
? errorCode === 'PROVIDER_DOMAIN_REQUIRED' : errorCode === 'PROVIDER_DOMAIN_INVALID');
|
|
247
|
-
if (!legacyUnresolved)
|
|
248
|
-
throw error;
|
|
249
|
-
if (Object.hasOwn(providers, oldId)) {
|
|
250
|
-
throw Object.assign(new Error(`Provider ID collision with a legacy entry: ${oldId}`), { code: 'PROVIDER_ID_COLLISION' });
|
|
251
|
-
}
|
|
252
|
-
providers[oldId] = provider;
|
|
253
|
-
pending.push(oldId);
|
|
254
|
-
summary.skippedProviders++;
|
|
255
|
-
continue;
|
|
256
|
-
}
|
|
257
|
-
const normalized = { ...provider, domain: identity.domain };
|
|
258
|
-
const existing = providers[identity.providerId];
|
|
259
|
-
if (existing) {
|
|
260
|
-
if (existing.domain !== identity.domain) {
|
|
261
|
-
throw Object.assign(new Error(`Provider ID collision: ${identity.providerId}`), { code: 'PROVIDER_ID_COLLISION' });
|
|
262
|
-
}
|
|
263
|
-
mergeServicesFrom(existing, normalized, [...sourceIds.get(identity.providerId), oldId]);
|
|
264
|
-
sourceIds.get(identity.providerId).push(oldId);
|
|
265
|
-
}
|
|
266
|
-
else {
|
|
267
|
-
providers[identity.providerId] = normalized;
|
|
268
|
-
sourceIds.set(identity.providerId, [oldId]);
|
|
269
|
-
}
|
|
270
|
-
if (oldId !== identity.providerId) {
|
|
271
|
-
mapping[oldId] = identity.providerId;
|
|
272
|
-
summary.providersMigrated++;
|
|
273
|
-
}
|
|
274
|
-
}
|
|
173
|
+
// Provider IDs and entries are independent of endpoint domains. Preserve them verbatim.
|
|
174
|
+
for (const [id, provider] of Object.entries(source.providers))
|
|
175
|
+
providers[id] = provider;
|
|
275
176
|
const aliases = {};
|
|
276
177
|
for (const [alias, target] of Object.entries(source.aliases ?? {}))
|
|
277
178
|
aliases[alias] = mapping[target] ?? target;
|
|
@@ -289,15 +190,15 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
289
190
|
summary.filesChanged++;
|
|
290
191
|
};
|
|
291
192
|
const finish = () => {
|
|
292
|
-
if (
|
|
193
|
+
if ((original.text !== null || Object.keys(providers).length > 0)
|
|
194
|
+
&& !isDeepStrictEqual(original.value, normalizedRegistry))
|
|
293
195
|
queue(providerFile, original.text, normalizedRegistry);
|
|
294
196
|
const plan = { home, changes, summary, pending, expected, registry: normalizedRegistry,
|
|
295
197
|
sourceRegistry: source, providerMapping: aliases };
|
|
296
198
|
validateProviderIdentityMigrationPlan(plan);
|
|
297
199
|
return plan;
|
|
298
200
|
};
|
|
299
|
-
|
|
300
|
-
return finish();
|
|
201
|
+
// Always scan persisted selections: old IDs may already have lost their aliases.
|
|
301
202
|
const agentsDir = path.join(home, 'agents');
|
|
302
203
|
if (fs.existsSync(agentsDir) && fs.lstatSync(agentsDir).isSymbolicLink())
|
|
303
204
|
throw new Error('Provider migration does not follow agent directory symlinks');
|
|
@@ -383,6 +284,24 @@ export function planProviderIdentityMigration(home, registry, options = {}) {
|
|
|
383
284
|
let count = 0;
|
|
384
285
|
count += rewriteSelections(parsed.value.baseagents);
|
|
385
286
|
count += rewriteSelections(parsed.value.agents);
|
|
287
|
+
for (const key of ['baseagents', 'agents']) {
|
|
288
|
+
const blocks = parsed.value[key];
|
|
289
|
+
if (!blocks || typeof blocks !== 'object' || Array.isArray(blocks))
|
|
290
|
+
continue;
|
|
291
|
+
for (const raw of Object.values(blocks)) {
|
|
292
|
+
if (!raw || typeof raw !== 'object' || Array.isArray(raw))
|
|
293
|
+
continue;
|
|
294
|
+
const selection = raw;
|
|
295
|
+
if (typeof selection.provider !== 'string')
|
|
296
|
+
continue;
|
|
297
|
+
const id = resolveProviderId(selection.provider, normalizedRegistry);
|
|
298
|
+
if (Object.hasOwn(providers, id))
|
|
299
|
+
continue;
|
|
300
|
+
// Removing only the stale override restores defaults/native inheritance.
|
|
301
|
+
delete selection.provider;
|
|
302
|
+
count++;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
386
305
|
count += rewriteSelections(parsed.value.Services);
|
|
387
306
|
count += rewriteSelections(parsed.value.decision_model);
|
|
388
307
|
if (path.basename(file) === 'initialization.json') {
|
|
@@ -4,15 +4,14 @@ import { TextDecoder } from 'node:util';
|
|
|
4
4
|
import { auditCommandAuthorization } from '../core/auth/authorization-audit.js';
|
|
5
5
|
import { applyProviderTemplate, createProvider, parseProviderImport, readProvidersSnapshot, updateProvider } from './providers-management.js';
|
|
6
6
|
import { parseProviderTemplateInput, providerTemplateDetail, readProviderTemplates } from './provider-templates.js';
|
|
7
|
-
import { resolveProviderId } from './providers-config.js';
|
|
7
|
+
import { isProviderId, resolveProviderId } from './providers-config.js';
|
|
8
8
|
import { normalizeProviderDomain } from './provider-identity.js';
|
|
9
9
|
export const PROVIDER_INPUT_LIMIT = 1024 * 1024;
|
|
10
10
|
export function providerArgumentError(message) {
|
|
11
11
|
throw Object.assign(new Error(message), { code: 'INVALID_ARGUMENT' });
|
|
12
12
|
}
|
|
13
13
|
export function assertProviderId(value) {
|
|
14
|
-
if (
|
|
15
|
-
|| ['__proto__', 'constructor', 'prototype'].includes(value)) {
|
|
14
|
+
if (!isProviderId(value)) {
|
|
16
15
|
providerArgumentError('A valid Provider ID is required');
|
|
17
16
|
}
|
|
18
17
|
}
|
|
@@ -79,6 +78,14 @@ export function parseProviderCommand(argv) {
|
|
|
79
78
|
return { operation, providerId: needsId ? positional[0] : undefined, file: options.get('--file'), templateId, templateInput, json: options.has('--format') };
|
|
80
79
|
}
|
|
81
80
|
export function parseProviderObject(text) {
|
|
81
|
+
if (text && typeof text === 'object' && !Array.isArray(text)) {
|
|
82
|
+
if (Buffer.byteLength(JSON.stringify(text), 'utf8') > PROVIDER_INPUT_LIMIT) {
|
|
83
|
+
providerArgumentError('Provider JSON must be UTF-8 text under 1 MiB');
|
|
84
|
+
}
|
|
85
|
+
if (!Object.hasOwn(text, 'common'))
|
|
86
|
+
providerArgumentError('Expected one complete Provider object');
|
|
87
|
+
return text;
|
|
88
|
+
}
|
|
82
89
|
if (typeof text !== 'string' || Buffer.byteLength(text, 'utf8') > PROVIDER_INPUT_LIMIT) {
|
|
83
90
|
providerArgumentError('Provider JSON must be UTF-8 text under 1 MiB');
|
|
84
91
|
}
|
|
@@ -98,6 +105,9 @@ export function providerFailure(error) {
|
|
|
98
105
|
const failure = error;
|
|
99
106
|
if (failure?.code === 'NOT_FOUND')
|
|
100
107
|
return { ok: false, code: 'NOT_FOUND', error: 'Provider not found' };
|
|
108
|
+
if (failure?.code === 'PROVIDER_NAME_EXISTS') {
|
|
109
|
+
return { ok: false, code: 'CONFLICT', error: 'Provider name already exists; choose a different name', data: failure.data };
|
|
110
|
+
}
|
|
101
111
|
if (failure?.code === 'PROVIDER_CONFLICT' && failure.data && typeof failure.data === 'object') {
|
|
102
112
|
const details = failure.data;
|
|
103
113
|
if (details.kind === 'provider_domain_exists' && typeof details.providerId === 'string'
|
|
@@ -57,7 +57,10 @@ export async function syncLocalProviders() {
|
|
|
57
57
|
}
|
|
58
58
|
planProviderIdentityMigration(home, registry);
|
|
59
59
|
const imports = listBaseagentImportSources().map(source => {
|
|
60
|
-
const
|
|
60
|
+
const name = `本地 ${source.baseagent}`;
|
|
61
|
+
if (Object.hasOwn(registry.providers, name))
|
|
62
|
+
return { baseagent: source.baseagent, providerId: name, merged: false };
|
|
63
|
+
const result = importBaseagentProviderIntoRegistry(registry, { value: materializeBaseUrl(providerFromBaseagent(source.baseagent)), name });
|
|
61
64
|
return { baseagent: source.baseagent, providerId: result.providerId, merged: result.merged };
|
|
62
65
|
});
|
|
63
66
|
const plan = planProviderIdentityMigration(home, registry);
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { assertProviderId, parseProviderObject, PROVIDER_INPUT_LIMIT, providerArgumentError } from './provider-ipc-service.js';
|
|
2
2
|
import { parseProviderTemplateInput } from './provider-templates.js';
|
|
3
|
+
export function isProviderDetailMenuRequest(request) {
|
|
4
|
+
return request.type === 'menu.query' && (request.name === 'provider' || request.cmd === '/provider')
|
|
5
|
+
&& request.args?.view === 'detail';
|
|
6
|
+
}
|
|
3
7
|
export function validateProviderMenuRequest(request) {
|
|
4
8
|
try {
|
|
5
9
|
if ((request.name !== undefined && request.name !== 'provider')
|
|
@@ -48,8 +52,18 @@ export function validateProviderMenuRequest(request) {
|
|
|
48
52
|
}
|
|
49
53
|
if (request.type !== 'menu.action' && request.action !== undefined)
|
|
50
54
|
providerArgumentError('Unexpected Provider action');
|
|
51
|
-
if (request.type !== 'menu.update' && request.value !== undefined
|
|
55
|
+
if (request.type !== 'menu.update' && request.value !== undefined
|
|
56
|
+
&& !(request.type === 'menu.action' && request.action === 'create' && args.templateId === undefined)) {
|
|
52
57
|
providerArgumentError('Unexpected Provider value');
|
|
58
|
+
}
|
|
59
|
+
if (request.type === 'menu.action' && request.action === 'create' && args.templateId === undefined) {
|
|
60
|
+
if (args.provider === undefined && request.value === undefined)
|
|
61
|
+
providerArgumentError('Create requires args.provider or value');
|
|
62
|
+
if (args.provider !== undefined && request.value !== undefined)
|
|
63
|
+
providerArgumentError('Create accepts args.provider or value, not both');
|
|
64
|
+
if (request.value !== undefined)
|
|
65
|
+
parseProviderObject(request.value);
|
|
66
|
+
}
|
|
53
67
|
if (args.templateId !== undefined && (typeof args.templateId !== 'string' || !/^[a-z0-9][a-z0-9-]{0,63}$/u.test(args.templateId)))
|
|
54
68
|
providerArgumentError('Invalid template ID');
|
|
55
69
|
if ((request.action === 'preview-template' || args.resource === 'provider-template') && !args.templateId)
|
|
@@ -63,8 +77,12 @@ export function validateProviderMenuRequest(request) {
|
|
|
63
77
|
else {
|
|
64
78
|
if (request.type === 'menu.update')
|
|
65
79
|
parseProviderObject(request.value);
|
|
66
|
-
if (request.action === 'create')
|
|
67
|
-
|
|
80
|
+
if (request.action === 'create') {
|
|
81
|
+
if (args.provider !== undefined)
|
|
82
|
+
parseProviderObject(JSON.stringify(args.provider));
|
|
83
|
+
else
|
|
84
|
+
parseProviderObject(request.value);
|
|
85
|
+
}
|
|
68
86
|
}
|
|
69
87
|
if (request.action === 'import' && (typeof args.text !== 'string' || !args.text.trim()
|
|
70
88
|
|| Buffer.byteLength(args.text, 'utf8') > PROVIDER_INPUT_LIMIT))
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { createHash } from 'node:crypto';
|
|
3
3
|
import { kitsDir } from '../paths.js';
|
|
4
|
-
import { fileCache } from '../core/daemon-file-cache.js';
|
|
4
|
+
import { fileCache } from '../core/daemon/daemon-file-cache.js';
|
|
5
5
|
import { providerIdentity } from './provider-identity.js';
|
|
6
6
|
import { validateProviderName, validateProvidersFile } from './providers-config.js';
|
|
7
7
|
function invalid(message, code = 'INVALID_ARGUMENT') {
|
|
@@ -210,12 +210,25 @@ export function providerNameFromBaseUrl(baseUrl) {
|
|
|
210
210
|
export function providerNameFromBaseUrlIfStatic(baseUrl) {
|
|
211
211
|
return providerEnvironmentVariable(baseUrl) ? undefined : providerNameFromBaseUrl(baseUrl);
|
|
212
212
|
}
|
|
213
|
+
/** IP literals are endpoint metadata, not valid registry names. */
|
|
214
|
+
export function providerNameForBaseagentImport(baseUrl, baseagent) {
|
|
215
|
+
const name = providerNameFromBaseUrlIfStatic(baseUrl);
|
|
216
|
+
if (name && isIP(name.replace(/^\[|\]$/gu, ''))) {
|
|
217
|
+
const labels = { claude: 'Claude', codex: 'Codex', gemini: 'Gemini' };
|
|
218
|
+
const label = labels[baseagent];
|
|
219
|
+
if (label)
|
|
220
|
+
return `${label} API`;
|
|
221
|
+
}
|
|
222
|
+
return name;
|
|
223
|
+
}
|
|
213
224
|
export function providerServiceTypeForPurpose(purpose) {
|
|
214
225
|
return purpose === 'auxiliary' ? 'text' : purpose;
|
|
215
226
|
}
|
|
216
227
|
export function providerServiceTypesForBaseagent(baseagent) {
|
|
217
228
|
if (baseagent === 'ecagent')
|
|
218
229
|
return ['ecagent', 'text'];
|
|
230
|
+
if (baseagent === 'dsh')
|
|
231
|
+
return ['dsh', 'claude'];
|
|
219
232
|
return ['claude', 'codex', 'gemini'].includes(baseagent)
|
|
220
233
|
? [baseagent]
|
|
221
234
|
: [...new Set(['text', baseagent])];
|
|
@@ -225,6 +238,10 @@ export function providerServiceTypeForBaseagent(baseagent, provider) {
|
|
|
225
238
|
return provider?.services && !Object.hasOwn(provider.services, 'ecagent') && Object.hasOwn(provider.services, 'text')
|
|
226
239
|
? 'text' : 'ecagent';
|
|
227
240
|
}
|
|
241
|
+
if (baseagent === 'dsh') {
|
|
242
|
+
return provider?.services && !Object.hasOwn(provider.services, 'dsh') && Object.hasOwn(provider.services, 'claude')
|
|
243
|
+
? 'claude' : 'dsh';
|
|
244
|
+
}
|
|
228
245
|
return ['openclaw', 'hermes'].includes(baseagent) ? 'text' : baseagent;
|
|
229
246
|
}
|
|
230
247
|
function resolveProviderServiceTypeForBaseagent(baseagent, selectedServiceType, provider) {
|
|
@@ -247,11 +264,16 @@ export function validateProviderName(value) {
|
|
|
247
264
|
if (typeof value !== 'string')
|
|
248
265
|
throw new Error('Provider name must be a string');
|
|
249
266
|
const name = value.trim();
|
|
250
|
-
if (name.length < 2 || name.length > 20 || !/^[\p{L}\p{N} _-]+$/u.test(name)) {
|
|
267
|
+
if (name.length < 2 || name.length > 20 || !/^[\p{L}\p{N} _-]+$/u.test(name) || PROHIBITED_PATH_SEGMENTS.has(name)) {
|
|
251
268
|
throw new Error('Provider name must be 2–20 characters and contain only letters, numbers, spaces, hyphens, or underscores');
|
|
252
269
|
}
|
|
253
270
|
return name;
|
|
254
271
|
}
|
|
272
|
+
export function isProviderId(value) {
|
|
273
|
+
return typeof value === 'string' && value.length > 0 && value.length <= 128
|
|
274
|
+
&& value === value.trim() && /^[\p{L}\p{N} _-]+$/u.test(value)
|
|
275
|
+
&& !PROHIBITED_PATH_SEGMENTS.has(value);
|
|
276
|
+
}
|
|
255
277
|
function isRecord(value) {
|
|
256
278
|
return !!value && typeof value === 'object' && !Array.isArray(value);
|
|
257
279
|
}
|
|
@@ -362,7 +384,7 @@ function serviceConfig(value, field, serviceType) {
|
|
|
362
384
|
throw new Error(`${field}.models: manual requires exact model IDs`);
|
|
363
385
|
assertFields(override, ['enabled'], `${field}.models.${modelId}`);
|
|
364
386
|
}
|
|
365
|
-
const supportsImageInput = ['text', 'claude', 'codex'].includes(serviceType);
|
|
387
|
+
const supportsImageInput = ['text', 'claude', 'codex', 'dsh'].includes(serviceType);
|
|
366
388
|
const imageMembership = !supportsImageInput && normalized.imageIn !== undefined;
|
|
367
389
|
if (!supportsImageInput)
|
|
368
390
|
delete normalized.imageIn;
|
|
@@ -377,9 +399,11 @@ function serviceConfig(value, field, serviceType) {
|
|
|
377
399
|
function providerConfig(value, field) {
|
|
378
400
|
if (!isRecord(value))
|
|
379
401
|
throw new Error(`${field} must be an object`);
|
|
380
|
-
assertFields(value, ['name', 'domain', 'common', 'services'], field);
|
|
381
|
-
|
|
382
|
-
|
|
402
|
+
assertFields(value, ['name', 'displayName', 'description', 'domain', 'common', 'services'], field);
|
|
403
|
+
for (const key of ['name', 'displayName', 'description']) {
|
|
404
|
+
if (value[key] !== undefined && typeof value[key] !== 'string')
|
|
405
|
+
throw new Error(`${field}.${key} must be a string`);
|
|
406
|
+
}
|
|
383
407
|
if (!isRecord(value.common))
|
|
384
408
|
throw new Error(`${field}.common must be an object`);
|
|
385
409
|
const common = value.common;
|
|
@@ -395,6 +419,8 @@ function providerConfig(value, field) {
|
|
|
395
419
|
const result = {
|
|
396
420
|
...(value.domain !== undefined ? { domain: normalizeProviderDomain(value.domain) } : {}),
|
|
397
421
|
...(typeof value.name === 'string' && value.name.trim() ? { name: value.name.trim() } : {}),
|
|
422
|
+
...(typeof value.displayName === 'string' && value.displayName.trim() ? { displayName: value.displayName.trim() } : {}),
|
|
423
|
+
...(typeof value.description === 'string' && value.description.trim() ? { description: value.description.trim() } : {}),
|
|
398
424
|
common: {
|
|
399
425
|
baseUrl,
|
|
400
426
|
...(apiKey !== undefined ? { apiKey } : {}),
|
|
@@ -439,19 +465,17 @@ export function validateProvidersFile(value) {
|
|
|
439
465
|
for (const [providerId, provider] of Object.entries(value.providers)) {
|
|
440
466
|
if (!providerId.trim())
|
|
441
467
|
throw new Error('provider id cannot be empty');
|
|
442
|
-
|
|
468
|
+
if (!isProviderId(providerId))
|
|
469
|
+
throw new Error('provider id must be a safe identifier');
|
|
443
470
|
providers[providerId] = providerConfig(provider, `providers.${providerId}`);
|
|
444
|
-
if (providers[providerId].domain !== undefined && /^provider-\d{8}$/u.test(providerId)
|
|
445
|
-
&& providerIdentity(providers[providerId]).providerId !== providerId) {
|
|
446
|
-
throw new Error(`Provider ID does not match its domain: ${providerId}`);
|
|
447
|
-
}
|
|
448
471
|
}
|
|
449
472
|
const aliases = {};
|
|
450
473
|
if (value.aliases !== undefined) {
|
|
451
474
|
if (!isRecord(value.aliases))
|
|
452
475
|
throw new Error('providers.json.aliases must be an object');
|
|
453
476
|
for (const [alias, target] of Object.entries(value.aliases)) {
|
|
454
|
-
|
|
477
|
+
if (!isProviderId(alias))
|
|
478
|
+
throw new Error('provider alias must be a safe identifier');
|
|
455
479
|
if (typeof target !== 'string' || !Object.hasOwn(providers, target) || Object.hasOwn(providers, alias)) {
|
|
456
480
|
throw new Error('Provider aliases must point directly to an existing Provider without shadowing an ID');
|
|
457
481
|
}
|
|
@@ -466,7 +490,8 @@ export function validateProvidersFile(value) {
|
|
|
466
490
|
};
|
|
467
491
|
}
|
|
468
492
|
export function resolveProviderId(providerId, config) {
|
|
469
|
-
|
|
493
|
+
if (!isProviderId(providerId))
|
|
494
|
+
throw new Error('provider id must be a safe identifier');
|
|
470
495
|
return config.aliases && Object.hasOwn(config.aliases, providerId) ? config.aliases[providerId] : providerId;
|
|
471
496
|
}
|
|
472
497
|
/** Raw credential selection shared by resolution, repair and import merging. */
|
|
@@ -478,7 +503,7 @@ export function providerServiceCredentials(provider, serviceType) {
|
|
|
478
503
|
queryParams: service?.queryParams ?? provider.common.queryParams,
|
|
479
504
|
};
|
|
480
505
|
}
|
|
481
|
-
export function resolveProviderService(providerId, serviceType, config, defaultStyle = 'systemone') {
|
|
506
|
+
export function resolveProviderService(providerId, serviceType, config, defaultStyle = serviceType === 'text' ? 'openai-compatible' : 'systemone') {
|
|
482
507
|
providerId = resolveProviderId(providerId, config);
|
|
483
508
|
assertSafeRegistrySegment(serviceType, 'service type');
|
|
484
509
|
const providers = config.providers;
|
|
@@ -575,8 +600,7 @@ export function initializationRuntimePlan(record) {
|
|
|
575
600
|
if (!migration || typeof migration !== 'object' || Array.isArray(migration))
|
|
576
601
|
throw new Error('Invalid initialization Provider migration binding');
|
|
577
602
|
if (typeof migration.from !== 'string' || migration.from !== record.plan.provider || typeof migration.to !== 'string'
|
|
578
|
-
||
|
|
579
|
-
|| ['__proto__', 'constructor', 'prototype'].includes(migration.to)) {
|
|
603
|
+
|| !isProviderId(migration.to)) {
|
|
580
604
|
throw new Error('Invalid initialization Provider migration binding');
|
|
581
605
|
}
|
|
582
606
|
return { ...record.plan, provider: migration.to };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { resolveAnthropicConfig, resolveGoogleConfig, resolveOpenaiConfig, } from '../
|
|
1
|
+
import { resolveAnthropicConfig, resolveGoogleConfig, resolveOpenaiConfig, } from '../core/baseagent/baseagent.js';
|
|
2
2
|
import { ConfigTarget, read } from './config-manager.js';
|
|
3
3
|
import { resolveProjectDefaultPath } from '../utils/project-path.js';
|
|
4
|
-
import {
|
|
4
|
+
import { providerNameForBaseagentImport, providerServiceTypeForBaseagent, validateProvidersFile } from './providers-config.js';
|
|
5
5
|
export const IMPORTABLE_BASEAGENTS = ['claude', 'codex', 'gemini'];
|
|
6
6
|
function resolveConnection(baseagent, config, projectPath) {
|
|
7
7
|
if (baseagent === 'claude')
|
|
@@ -38,7 +38,7 @@ export function providerFromBaseagent(baseagent) {
|
|
|
38
38
|
services: { [serviceType]: { path: '' } },
|
|
39
39
|
};
|
|
40
40
|
const normalized = validateProvidersFile({ providers: { imported: provider } }).providers.imported;
|
|
41
|
-
normalized.name ||=
|
|
41
|
+
normalized.name ||= providerNameForBaseagentImport(normalized.common.baseUrl, selected);
|
|
42
42
|
return normalized;
|
|
43
43
|
}
|
|
44
44
|
export function listBaseagentImportSources() {
|