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
package/dist/agents/baseagent.js
DELETED
|
@@ -1,816 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Baseagent identity + credential resolution.
|
|
3
|
-
*
|
|
4
|
-
* 两部分:
|
|
5
|
-
* 1. normalizeBaseagent —— 把用户输入的各种别名(cc / claude-code / gemini cli …)
|
|
6
|
-
* 归一到 canonical 标识 + 展示名。
|
|
7
|
-
* 2. resolve*Config —— 各后端的凭证解析。输入是 Config 形态
|
|
8
|
-
* (`config.agents.<baseagent>` + override)。启动期由 index.ts 从
|
|
9
|
-
* primaryAgent.config.baseagents 构造一个 syntheticConfig 喂入;各 plugin 的
|
|
10
|
-
* createAgent 也各自构造 syntheticConfig。
|
|
11
|
-
*/
|
|
12
|
-
import fs from 'fs';
|
|
13
|
-
import path from 'path';
|
|
14
|
-
import os from 'os';
|
|
15
|
-
import { createHash } from 'node:crypto';
|
|
16
|
-
import { buildCliLaunchCommand, commandExists, isWindows, resolvePowerShellShimPath, resolveProbePath, } from '../utils/cross-platform.js';
|
|
17
|
-
import { execFile } from 'child_process';
|
|
18
|
-
import { requireTrustedWindowsCmdPathAsync } from '../utils/windows-shell-trust.js';
|
|
19
|
-
import { parse as parseToml } from 'smol-toml';
|
|
20
|
-
import { readRuntimeEnvironmentVariable } from '../config/runtime-env.js';
|
|
21
|
-
import { providerModelEnabled, resolveProviderServiceForBaseagent, resolveProviderService } from '../config/providers.js';
|
|
22
|
-
import { errorQuestionRule } from '../utils/error-utils.js';
|
|
23
|
-
import { getBaseagentPluginDescriptor } from './baseagent-plugin-descriptor.js';
|
|
24
|
-
/** Resolve the installed Codex CLI entrypoint, including npm shims on Windows. */
|
|
25
|
-
export function resolveCodexCliPath() {
|
|
26
|
-
return resolveProbePath('codex');
|
|
27
|
-
}
|
|
28
|
-
/** Return a PS1-only Codex shim for installation diagnostics, never execution. */
|
|
29
|
-
export function resolveCodexPowerShellShimPath() {
|
|
30
|
-
return resolvePowerShellShimPath('codex');
|
|
31
|
-
}
|
|
32
|
-
export function resolveCodexLaunchCommand(args, options = {}) {
|
|
33
|
-
const windows = options.isWindows ?? isWindows;
|
|
34
|
-
const commandPath = options.commandPath !== undefined ? options.commandPath : resolveCodexCliPath();
|
|
35
|
-
if (!commandPath)
|
|
36
|
-
return null;
|
|
37
|
-
return buildCliLaunchCommand(commandPath, args, {
|
|
38
|
-
isWindows: windows,
|
|
39
|
-
comSpec: options.comSpec,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
/** Execute a Codex CLI command without blocking the daemon, including shim trust checks. */
|
|
43
|
-
export async function execCodexCli(args, options) {
|
|
44
|
-
const commandPath = resolveCodexCliPath();
|
|
45
|
-
if (!commandPath)
|
|
46
|
-
throw new Error('Codex CLI not found');
|
|
47
|
-
const resolveWindowsCmd = isWindows && /\.(?:cmd|bat)$/i.test(commandPath)
|
|
48
|
-
? await requireTrustedWindowsCmdPathAsync().then(cmd => () => cmd,
|
|
49
|
-
// Keep launch failures on the existing diagnostic and error path.
|
|
50
|
-
error => () => { throw error; }) : undefined;
|
|
51
|
-
const launchCommand = buildCliLaunchCommand(commandPath, args, { resolveWindowsCmd });
|
|
52
|
-
return new Promise((resolve, reject) => {
|
|
53
|
-
const child = execFile(launchCommand.command, launchCommand.args, {
|
|
54
|
-
...options,
|
|
55
|
-
windowsHide: isWindows,
|
|
56
|
-
windowsVerbatimArguments: launchCommand.windowsVerbatimArguments,
|
|
57
|
-
}, (error, stdout) => error ? reject(error) : resolve(stdout));
|
|
58
|
-
child.stdin?.end();
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
/** 内置 baseagent canonical 名称集合;外部插件不得与这些名称冲突。 */
|
|
62
|
-
export const BUILTIN_BASEAGENT_NAMES = new Set(['claude', 'codex', 'gemini', 'ecagent']);
|
|
63
|
-
/** Implementations still registered directly by the Host; Gemini uses the directory protocol. */
|
|
64
|
-
export const HARDCODED_BASEAGENT_NAMES = new Set(['claude', 'codex', 'ecagent']);
|
|
65
|
-
/** 外部插件名称集合(由插件加载器动态填充) */
|
|
66
|
-
const EXTERNAL_BASEAGENT_NAMES = new Set();
|
|
67
|
-
const BASEAGENT_ALIASES = {
|
|
68
|
-
claude: { canonical: 'claude', displayName: 'Claude Code' },
|
|
69
|
-
cc: { canonical: 'claude', displayName: 'Claude Code' },
|
|
70
|
-
'claude-code': { canonical: 'claude', displayName: 'Claude Code' },
|
|
71
|
-
'claude code': { canonical: 'claude', displayName: 'Claude Code' },
|
|
72
|
-
claudecode: { canonical: 'claude', displayName: 'Claude Code' },
|
|
73
|
-
codex: { canonical: 'codex', displayName: 'Codex' },
|
|
74
|
-
'codex-cli': { canonical: 'codex', displayName: 'Codex' },
|
|
75
|
-
'codex cli': { canonical: 'codex', displayName: 'Codex' },
|
|
76
|
-
gemini: { canonical: 'gemini', displayName: 'Gemini CLI' },
|
|
77
|
-
'gemini-cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
|
|
78
|
-
'gemini cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
|
|
79
|
-
geminicli: { canonical: 'gemini', displayName: 'Gemini CLI' },
|
|
80
|
-
ecagent: { canonical: 'ecagent', displayName: 'ecagent' },
|
|
81
|
-
'ec-agent': { canonical: 'ecagent', displayName: 'ecagent' },
|
|
82
|
-
};
|
|
83
|
-
export const DEFAULT_CLAUDE_MODEL = 'sonnet';
|
|
84
|
-
export const DEFAULT_CODEX_MODEL = 'gpt-6.1-terra';
|
|
85
|
-
export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-flash';
|
|
86
|
-
export function normalizeBaseagent(input) {
|
|
87
|
-
const key = String(input || '').trim().toLowerCase().replace(/_/g, '-');
|
|
88
|
-
return BASEAGENT_ALIASES[key] || { canonical: 'unknown', displayName: input ? String(input) : 'Unknown' };
|
|
89
|
-
}
|
|
90
|
-
export function isSupportedBaseagent(input) {
|
|
91
|
-
const key = String(input || '').trim().toLowerCase();
|
|
92
|
-
return BUILTIN_BASEAGENT_NAMES.has(key) || EXTERNAL_BASEAGENT_NAMES.has(key);
|
|
93
|
-
}
|
|
94
|
-
export function listSupportedBaseagents() {
|
|
95
|
-
return [...new Set([...BUILTIN_BASEAGENT_NAMES, ...EXTERNAL_BASEAGENT_NAMES])];
|
|
96
|
-
}
|
|
97
|
-
export function reservedBaseagentAliases() {
|
|
98
|
-
return new Set(Object.entries(BASEAGENT_ALIASES)
|
|
99
|
-
.filter(([, value]) => HARDCODED_BASEAGENT_NAMES.has(value.canonical)).map(([alias]) => alias));
|
|
100
|
-
}
|
|
101
|
-
/**
|
|
102
|
-
* 注册外部 baseagent 插件的别名,供 normalizeBaseagent() 和 isSupportedBaseagent() 使用。
|
|
103
|
-
* 由插件加载器在加载外部插件时调用;内置插件不经过此路径。
|
|
104
|
-
*
|
|
105
|
-
* @param canonicalName - 插件的 canonical name(如 'myagent')
|
|
106
|
-
* @param displayName - 对外展示名(如 'My Agent')
|
|
107
|
-
* @param aliases - 应归一到 canonicalName 的所有别名(含 canonicalName 本身)
|
|
108
|
-
*/
|
|
109
|
-
export function registerExternalBaseagentAliases(canonicalName, displayName, aliases) {
|
|
110
|
-
if (HARDCODED_BASEAGENT_NAMES.has(canonicalName)) {
|
|
111
|
-
throw new Error(`registerExternalBaseagentAliases: '${canonicalName}' conflicts with a built-in baseagent name`);
|
|
112
|
-
}
|
|
113
|
-
const keys = [...new Set([canonicalName, ...aliases].map(alias => alias.trim().toLowerCase().replace(/_/g, '-')))];
|
|
114
|
-
for (const key of keys) {
|
|
115
|
-
const owner = Object.hasOwn(BASEAGENT_ALIASES, key) ? BASEAGENT_ALIASES[key] : undefined;
|
|
116
|
-
if (!key || key === '__proto__' || key === 'constructor' || key === 'prototype'
|
|
117
|
-
|| (owner && owner.canonical !== canonicalName)) {
|
|
118
|
-
throw new Error(`Baseagent alias '${key}' is invalid or already owned by '${owner?.canonical}'`);
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
const previous = new Map(keys.map(key => [key,
|
|
122
|
-
Object.hasOwn(BASEAGENT_ALIASES, key) ? BASEAGENT_ALIASES[key] : undefined]));
|
|
123
|
-
const wasKnown = EXTERNAL_BASEAGENT_NAMES.has(canonicalName);
|
|
124
|
-
const normalized = { canonical: canonicalName, displayName };
|
|
125
|
-
for (const key of keys)
|
|
126
|
-
BASEAGENT_ALIASES[key] = normalized;
|
|
127
|
-
EXTERNAL_BASEAGENT_NAMES.add(canonicalName);
|
|
128
|
-
return () => {
|
|
129
|
-
for (const [key, oldValue] of previous) {
|
|
130
|
-
if (BASEAGENT_ALIASES[key] !== normalized)
|
|
131
|
-
continue;
|
|
132
|
-
if (oldValue)
|
|
133
|
-
BASEAGENT_ALIASES[key] = oldValue;
|
|
134
|
-
else
|
|
135
|
-
delete BASEAGENT_ALIASES[key];
|
|
136
|
-
}
|
|
137
|
-
if (!wasKnown)
|
|
138
|
-
EXTERNAL_BASEAGENT_NAMES.delete(canonicalName);
|
|
139
|
-
};
|
|
140
|
-
}
|
|
141
|
-
// Runtime prefill only: never write discovered defaults into Agent/defaults files.
|
|
142
|
-
// Connection and model overrides are part of the key, so a changed Provider cannot
|
|
143
|
-
// reuse a selection made for another endpoint, credential or enabled-model set.
|
|
144
|
-
const discoveredDefaultModels = new Map();
|
|
145
|
-
const discoveringDefaultModels = new Map();
|
|
146
|
-
export function clearRuntimeBaseagentModelDefaults() {
|
|
147
|
-
discoveredDefaultModels.clear();
|
|
148
|
-
}
|
|
149
|
-
function defaultModelConnectionKey(baseagent, configured) {
|
|
150
|
-
const providerId = configured?.provider;
|
|
151
|
-
const provider = providerId !== undefined ? resolveProviderServiceForBaseagent(providerId, baseagent) : undefined;
|
|
152
|
-
const settings = baseagent === 'codex' && !provider ? loadCodexSettings() : undefined;
|
|
153
|
-
const connection = provider ?? {
|
|
154
|
-
apiKey: configured?.apiKey,
|
|
155
|
-
baseUrl: configured?.baseUrl,
|
|
156
|
-
headers: configured?.headers,
|
|
157
|
-
queryParams: configured?.queryParams,
|
|
158
|
-
settings,
|
|
159
|
-
codexHome: process.env.CODEX_HOME || path.join(os.homedir(), '.codex'),
|
|
160
|
-
openaiApiKey: process.env.OPENAI_API_KEY,
|
|
161
|
-
codexApiKey: process.env.CODEX_API_KEY,
|
|
162
|
-
openaiBaseUrl: process.env.OPENAI_BASE_URL,
|
|
163
|
-
};
|
|
164
|
-
return createHash('sha256').update(JSON.stringify({ baseagent, connection })).digest('hex');
|
|
165
|
-
}
|
|
166
|
-
function discoveredDefaultModel(baseagent, configured) {
|
|
167
|
-
if (baseagent !== 'codex' && baseagent !== 'ecagent')
|
|
168
|
-
return undefined;
|
|
169
|
-
return discoveredDefaultModels.get(defaultModelConnectionKey(baseagent, configured));
|
|
170
|
-
}
|
|
171
|
-
function defaultModelUnavailable(baseagent) {
|
|
172
|
-
const message = baseagent === 'ecagent'
|
|
173
|
-
? 'ecagent 未配置模型,当前 Provider 目录中没有可用的 deepseek[*]flash;请配置 baseagents.ecagent.model'
|
|
174
|
-
: 'Codex 未配置模型,app-server 目录中没有可用的 gpt[*]terra;请配置 baseagents.codex.model 或 config.toml.model';
|
|
175
|
-
return Object.assign(new Error(message), {
|
|
176
|
-
code: baseagent === 'ecagent' ? 'ECAGENT_MODEL_UNAVAILABLE' : 'CODEX_MODEL_UNAVAILABLE',
|
|
177
|
-
});
|
|
178
|
-
}
|
|
179
|
-
function readLegacyJson(file) {
|
|
180
|
-
try {
|
|
181
|
-
if (!fs.existsSync(file))
|
|
182
|
-
return undefined;
|
|
183
|
-
const value = JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
184
|
-
return value && typeof value === 'object' && !Array.isArray(value)
|
|
185
|
-
? value
|
|
186
|
-
: undefined;
|
|
187
|
-
}
|
|
188
|
-
catch {
|
|
189
|
-
return undefined;
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
function resolveLocalBaseagentModelSelection(baseagent, options = {}) {
|
|
193
|
-
const canonical = normalizeBaseagent(baseagent).canonical;
|
|
194
|
-
const home = options.home ? path.resolve(options.home) : os.homedir();
|
|
195
|
-
if (canonical === 'claude') {
|
|
196
|
-
const file = path.join(home, '.claude', 'settings.json');
|
|
197
|
-
const settings = readLegacyJson(file);
|
|
198
|
-
const model = nonEmptyString(settings?.model);
|
|
199
|
-
const effort = nonEmptyString(settings?.effortLevel);
|
|
200
|
-
return {
|
|
201
|
-
model: model ?? DEFAULT_CLAUDE_MODEL,
|
|
202
|
-
...(model ? { modelPath: file } : {}),
|
|
203
|
-
...(effort ? { effort, effortPath: file } : {}),
|
|
204
|
-
};
|
|
205
|
-
}
|
|
206
|
-
if (canonical === 'codex') {
|
|
207
|
-
const codexHome = options.codexHome
|
|
208
|
-
? path.resolve(options.codexHome)
|
|
209
|
-
: process.env.CODEX_HOME?.trim()
|
|
210
|
-
? path.resolve(process.env.CODEX_HOME)
|
|
211
|
-
: path.join(home, '.codex');
|
|
212
|
-
const file = path.join(codexHome, 'config.toml');
|
|
213
|
-
try {
|
|
214
|
-
const parsed = fs.existsSync(file)
|
|
215
|
-
? recordValue(parseToml(fs.readFileSync(file, 'utf8')))
|
|
216
|
-
: undefined;
|
|
217
|
-
const model = nonEmptyString(parsed?.model);
|
|
218
|
-
const effort = nonEmptyString(parsed?.model_reasoning_effort);
|
|
219
|
-
return {
|
|
220
|
-
model: model ?? DEFAULT_CODEX_MODEL,
|
|
221
|
-
...(model ? { modelPath: file } : {}),
|
|
222
|
-
...(effort ? { effort, effortPath: file } : {}),
|
|
223
|
-
};
|
|
224
|
-
}
|
|
225
|
-
catch {
|
|
226
|
-
return { model: DEFAULT_CODEX_MODEL };
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
if (canonical === 'gemini') {
|
|
230
|
-
return { model: DEFAULT_GEMINI_MODEL };
|
|
231
|
-
}
|
|
232
|
-
if (canonical === 'ecagent') {
|
|
233
|
-
return { model: DEFAULT_ECAGENT_MODEL };
|
|
234
|
-
}
|
|
235
|
-
return undefined;
|
|
236
|
-
}
|
|
237
|
-
/** Read the historical runner selection for the one-time schema migration. */
|
|
238
|
-
export function resolveLegacyBaseagentModelSelection(baseagent, options = {}) {
|
|
239
|
-
const local = resolveLocalBaseagentModelSelection(baseagent, options);
|
|
240
|
-
if (!local)
|
|
241
|
-
return undefined;
|
|
242
|
-
return {
|
|
243
|
-
model: local.model,
|
|
244
|
-
...(local.effort ? { effort: local.effort } : {}),
|
|
245
|
-
source: local.modelPath ?? local.effortPath ?? 'runner-default',
|
|
246
|
-
};
|
|
247
|
-
}
|
|
248
|
-
/** Resolve runtime model/effort without persisting fallback values. */
|
|
249
|
-
export function resolveBaseagentModelSelection(baseagent, configured, options = {}) {
|
|
250
|
-
const identity = normalizeBaseagent(baseagent).canonical;
|
|
251
|
-
if (!BUILTIN_BASEAGENT_NAMES.has(identity)) {
|
|
252
|
-
const descriptor = getBaseagentPluginDescriptor(identity);
|
|
253
|
-
if (!descriptor)
|
|
254
|
-
return undefined;
|
|
255
|
-
const configuredModel = nonEmptyString(configured?.model);
|
|
256
|
-
const model = configuredModel ?? descriptor.defaultModel;
|
|
257
|
-
if (!model)
|
|
258
|
-
return undefined;
|
|
259
|
-
const effort = nonEmptyString(configured?.effort);
|
|
260
|
-
return { model, modelSource: configuredModel ? 'configured' : 'runner',
|
|
261
|
-
...(effort ? { effort, effortSource: 'configured' } : {}) };
|
|
262
|
-
}
|
|
263
|
-
const local = resolveLocalBaseagentModelSelection(baseagent, options);
|
|
264
|
-
if (!local)
|
|
265
|
-
return undefined;
|
|
266
|
-
const configuredModel = nonEmptyString(configured?.model);
|
|
267
|
-
const configuredEffort = nonEmptyString(configured?.effort)
|
|
268
|
-
?? (normalizeBaseagent(baseagent).canonical === 'codex' ? nonEmptyString(configured?.reasoning) : undefined);
|
|
269
|
-
const effort = configuredEffort ?? local.effort;
|
|
270
|
-
const canonical = normalizeBaseagent(baseagent).canonical;
|
|
271
|
-
// Historical constants remain confined to migration. Runtime defaults for
|
|
272
|
-
// these backends must come from the current connection's actual catalog.
|
|
273
|
-
const model = configuredModel ?? (canonical === 'ecagent' || (canonical === 'codex' && !local.modelPath)
|
|
274
|
-
? discoveredDefaultModel(canonical, configured)
|
|
275
|
-
: local.model);
|
|
276
|
-
if (!model)
|
|
277
|
-
return undefined;
|
|
278
|
-
return {
|
|
279
|
-
model,
|
|
280
|
-
...(effort ? { effort } : {}),
|
|
281
|
-
modelSource: configuredModel ? 'configured' : local.modelPath ? 'cli' : 'runner',
|
|
282
|
-
...(configuredEffort
|
|
283
|
-
? { effortSource: 'configured' }
|
|
284
|
-
: local.effort ? { effortSource: 'cli' } : {}),
|
|
285
|
-
};
|
|
286
|
-
}
|
|
287
|
-
/** Resolve missing runtime defaults once per connection, sharing concurrent discovery. */
|
|
288
|
-
export async function resolveRuntimeBaseagentModelSelection(baseagent, configured) {
|
|
289
|
-
const selection = resolveBaseagentModelSelection(baseagent, configured);
|
|
290
|
-
if (selection)
|
|
291
|
-
return selection;
|
|
292
|
-
const canonical = normalizeBaseagent(baseagent).canonical;
|
|
293
|
-
if (canonical !== 'ecagent' && canonical !== 'codex')
|
|
294
|
-
return undefined;
|
|
295
|
-
const key = defaultModelConnectionKey(canonical, configured);
|
|
296
|
-
let pending = discoveringDefaultModels.get(key);
|
|
297
|
-
if (!pending) {
|
|
298
|
-
pending = (async () => {
|
|
299
|
-
try {
|
|
300
|
-
let model;
|
|
301
|
-
if (canonical === 'ecagent') {
|
|
302
|
-
if (!configured?.provider)
|
|
303
|
-
throw defaultModelUnavailable(canonical);
|
|
304
|
-
resolveEcagentConfig({ agents: { ecagent: configured } }, configured);
|
|
305
|
-
const { getProviderCatalog, assertCatalogSelectable } = await import('../core/model/model-catalog.js');
|
|
306
|
-
const catalog = await getProviderCatalog(configured.provider, undefined, false, false, 'ecagent');
|
|
307
|
-
assertCatalogSelectable(catalog);
|
|
308
|
-
model = catalog.models.find(item => (item.verification === 'listed' || catalog.source === 'manual') && /deepseek.*flash/iu.test(item.id))?.id;
|
|
309
|
-
}
|
|
310
|
-
else {
|
|
311
|
-
const connection = resolveOpenaiConfig({ agents: { codex: configured } }, configured);
|
|
312
|
-
const provider = connection.providerId ? resolveProviderServiceForBaseagent(connection.providerId, 'codex') : undefined;
|
|
313
|
-
const { codexNativeCatalog } = await import('./codex/catalog.js');
|
|
314
|
-
const { getProviderCatalog } = await import('../core/model/model-catalog.js');
|
|
315
|
-
const models = provider?.modelPolicy === 'manual'
|
|
316
|
-
? (await getProviderCatalog(provider.providerId, 'codex')).models
|
|
317
|
-
: await codexNativeCatalog({ ...connection, scope: '<runtime-default>', baseagent: 'codex' }, { allowCliFallback: false });
|
|
318
|
-
model = models?.find(item => (item.verification === 'listed' || provider?.modelPolicy === 'manual') && /^gpt.*terra/iu.test(item.id)
|
|
319
|
-
&& providerModelEnabled(item.id, provider?.modelOverrides, provider?.modelPolicy) && item.supportsTools !== false)?.id;
|
|
320
|
-
}
|
|
321
|
-
if (!model)
|
|
322
|
-
throw defaultModelUnavailable(canonical);
|
|
323
|
-
if (discoveredDefaultModels.size >= 128) {
|
|
324
|
-
discoveredDefaultModels.delete(discoveredDefaultModels.keys().next().value);
|
|
325
|
-
}
|
|
326
|
-
discoveredDefaultModels.set(key, model);
|
|
327
|
-
return model;
|
|
328
|
-
}
|
|
329
|
-
catch (error) {
|
|
330
|
-
// Provider/app-server payloads can contain credentials or physical paths.
|
|
331
|
-
// Retain only the dictionary-owned repair hint, never the raw response.
|
|
332
|
-
const rule = errorQuestionRule(error);
|
|
333
|
-
if (rule)
|
|
334
|
-
throw Object.assign(new Error(rule.message ?? '模型连接需要补充信息'), {
|
|
335
|
-
code: rule.question?.fields.includes('baseUrl') ? 'PROVIDER_BASE_URL_MISSING' : 'PROVIDER_CREDENTIAL_INVALID',
|
|
336
|
-
});
|
|
337
|
-
throw defaultModelUnavailable(canonical);
|
|
338
|
-
}
|
|
339
|
-
})().finally(() => discoveringDefaultModels.delete(key));
|
|
340
|
-
discoveringDefaultModels.set(key, pending);
|
|
341
|
-
}
|
|
342
|
-
await pending;
|
|
343
|
-
const resolved = resolveBaseagentModelSelection(canonical, configured);
|
|
344
|
-
// A Provider may have changed while its catalog was in flight. Do not apply
|
|
345
|
-
// that older connection's model to the new configuration.
|
|
346
|
-
if (!resolved)
|
|
347
|
-
throw defaultModelUnavailable(canonical);
|
|
348
|
-
return resolved;
|
|
349
|
-
}
|
|
350
|
-
function directInferencePair(apiKey, baseUrl) {
|
|
351
|
-
const normalizedApiKey = directInferenceValue(apiKey);
|
|
352
|
-
const normalizedBaseUrl = directInferenceValue(baseUrl);
|
|
353
|
-
if (!normalizedApiKey || !normalizedBaseUrl)
|
|
354
|
-
return undefined;
|
|
355
|
-
return { apiKey: normalizedApiKey, baseUrl: normalizedBaseUrl };
|
|
356
|
-
}
|
|
357
|
-
function directInferenceValue(...values) {
|
|
358
|
-
for (const value of values) {
|
|
359
|
-
const normalized = value?.trim();
|
|
360
|
-
const lower = normalized?.toLowerCase();
|
|
361
|
-
if (normalized && !lower?.includes('your-') && !lower?.includes('placeholder'))
|
|
362
|
-
return normalized;
|
|
363
|
-
}
|
|
364
|
-
return undefined;
|
|
365
|
-
}
|
|
366
|
-
const HTTP_HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
|
|
367
|
-
function normalizeStringMap(value, field) {
|
|
368
|
-
if (value === undefined || value === null)
|
|
369
|
-
return undefined;
|
|
370
|
-
if (typeof value !== 'object' || Array.isArray(value)) {
|
|
371
|
-
throw new Error(`${field} must be an object with string values`);
|
|
372
|
-
}
|
|
373
|
-
const entries = [];
|
|
374
|
-
for (const [key, item] of Object.entries(value)) {
|
|
375
|
-
if (!key)
|
|
376
|
-
throw new Error(`${field} names cannot be empty`);
|
|
377
|
-
if (typeof item !== 'string')
|
|
378
|
-
throw new Error(`${field}.${key} must be a string`);
|
|
379
|
-
if (field === 'headers') {
|
|
380
|
-
if (!HTTP_HEADER_NAME.test(key))
|
|
381
|
-
throw new Error(`Invalid HTTP header name: ${key}`);
|
|
382
|
-
if (/[\0\r\n]/.test(item))
|
|
383
|
-
throw new Error(`HTTP header ${key} cannot contain NUL or line breaks`);
|
|
384
|
-
}
|
|
385
|
-
entries.push([key, item]);
|
|
386
|
-
}
|
|
387
|
-
return entries.length > 0 ? Object.fromEntries(entries) : undefined;
|
|
388
|
-
}
|
|
389
|
-
function normalizeRequestMetadata(value) {
|
|
390
|
-
return {
|
|
391
|
-
headers: normalizeStringMap(value?.headers, 'headers'),
|
|
392
|
-
queryParams: normalizeStringMap(value?.queryParams, 'queryParams'),
|
|
393
|
-
};
|
|
394
|
-
}
|
|
395
|
-
/** Retain known connection facts when resolution stops at a missing native key. */
|
|
396
|
-
class NativeConnectionIncompleteError extends Error {
|
|
397
|
-
#connection;
|
|
398
|
-
constructor(message, connection) {
|
|
399
|
-
super(message);
|
|
400
|
-
this.#connection = connection;
|
|
401
|
-
}
|
|
402
|
-
get connection() { return this.#connection; }
|
|
403
|
-
}
|
|
404
|
-
/** Resolve exactly the same native credential precedence as the runner, without model discovery. */
|
|
405
|
-
export function resolveNativeConnectionForRepair(baseagent, configured, runtime) {
|
|
406
|
-
const override = { ...configured, model: '<connection-repair>' };
|
|
407
|
-
try {
|
|
408
|
-
if (baseagent === 'claude')
|
|
409
|
-
return resolveAnthropicConfig({ agents: {} }, override, runtime);
|
|
410
|
-
if (baseagent === 'codex')
|
|
411
|
-
return resolveOpenaiConfig({ agents: {} }, override);
|
|
412
|
-
if (baseagent === 'ecagent')
|
|
413
|
-
return resolveEcagentConfig({ agents: {} }, override);
|
|
414
|
-
if (baseagent === 'gemini')
|
|
415
|
-
return { ...resolveGoogleConfig({ agents: {} }, override),
|
|
416
|
-
baseUrl: process.env.GOOGLE_GEMINI_BASE_URL };
|
|
417
|
-
}
|
|
418
|
-
catch (error) {
|
|
419
|
-
if (error instanceof NativeConnectionIncompleteError)
|
|
420
|
-
return error.connection;
|
|
421
|
-
throw error;
|
|
422
|
-
}
|
|
423
|
-
return undefined;
|
|
424
|
-
}
|
|
425
|
-
/** Claude Code accepts both names; AUTH_TOKEN is kept first for compatibility. */
|
|
426
|
-
function resolveAnthropicApiKey(...values) {
|
|
427
|
-
return directInferenceValue(...values);
|
|
428
|
-
}
|
|
429
|
-
function loadClaudeSettings() {
|
|
430
|
-
try {
|
|
431
|
-
const settingsPath = path.join(os.homedir(), '.claude', 'settings.json');
|
|
432
|
-
if (fs.existsSync(settingsPath)) {
|
|
433
|
-
return JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
catch { }
|
|
437
|
-
return {};
|
|
438
|
-
}
|
|
439
|
-
/**
|
|
440
|
-
* Resolve a complete credential/endpoint pair for direct Anthropic HTTP calls.
|
|
441
|
-
* A pair must come from one source so partial configuration cannot be mixed
|
|
442
|
-
* across Agent config, the process environment, and Claude Code settings.
|
|
443
|
-
*/
|
|
444
|
-
export function resolveAnthropicDirectConfig(override, runtime) {
|
|
445
|
-
if (override?.provider !== undefined) {
|
|
446
|
-
const provider = resolveProviderService(override.provider, 'claude');
|
|
447
|
-
if (!provider.apiKey)
|
|
448
|
-
throw new Error(`Provider ${provider.providerId} has no API key`);
|
|
449
|
-
return { ...provider, apiKey: provider.apiKey };
|
|
450
|
-
}
|
|
451
|
-
const explicit = directInferencePair(override?.apiKey, override?.baseUrl);
|
|
452
|
-
if (explicit) {
|
|
453
|
-
return {
|
|
454
|
-
...explicit,
|
|
455
|
-
...normalizeRequestMetadata(override),
|
|
456
|
-
};
|
|
457
|
-
}
|
|
458
|
-
const environment = directInferencePair(directInferenceValue(readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value, readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value), readRuntimeEnvironmentVariable('ANTHROPIC_BASE_URL', runtime?.agentAid, runtime?.projectPath).value);
|
|
459
|
-
if (environment) {
|
|
460
|
-
return {
|
|
461
|
-
...environment,
|
|
462
|
-
...normalizeRequestMetadata(override),
|
|
463
|
-
};
|
|
464
|
-
}
|
|
465
|
-
const settings = loadClaudeSettings();
|
|
466
|
-
const settingsResolved = directInferencePair(directInferenceValue(settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY), settings.env?.ANTHROPIC_BASE_URL);
|
|
467
|
-
return settingsResolved
|
|
468
|
-
? {
|
|
469
|
-
...settingsResolved,
|
|
470
|
-
...normalizeRequestMetadata(override),
|
|
471
|
-
}
|
|
472
|
-
: undefined;
|
|
473
|
-
}
|
|
474
|
-
export function resolveAnthropicConfig(config, override, runtime) {
|
|
475
|
-
const settings = loadClaudeSettings();
|
|
476
|
-
const providerId = override?.provider ?? config.agents?.claude?.provider;
|
|
477
|
-
if (providerId !== undefined) {
|
|
478
|
-
const provider = resolveProviderService(providerId, 'claude');
|
|
479
|
-
if (!provider.apiKey)
|
|
480
|
-
throw new Error(`Provider ${providerId} has no API key`);
|
|
481
|
-
return {
|
|
482
|
-
apiKey: provider.apiKey,
|
|
483
|
-
baseUrl: provider.baseUrl,
|
|
484
|
-
providerId,
|
|
485
|
-
headers: provider.headers,
|
|
486
|
-
queryParams: provider.queryParams,
|
|
487
|
-
model: override?.model || config.agents?.claude?.model || settings.model || DEFAULT_CLAUDE_MODEL,
|
|
488
|
-
effort: override?.effort || config.agents?.claude?.effort || settings.effortLevel || undefined,
|
|
489
|
-
pathToClaudeCodeExecutable: override?.pathToClaudeCodeExecutable || config.agents?.claude?.pathToClaudeCodeExecutable,
|
|
490
|
-
};
|
|
491
|
-
}
|
|
492
|
-
const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
|
|
493
|
-
const resolveGatewayReference = (value) => {
|
|
494
|
-
const name = value?.match(/^\$\{(ANTHROPIC_BASE_URL|ANTHROPIC_AUTH_TOKEN|ANTHROPIC_API_KEY)\}$/u)?.[1];
|
|
495
|
-
return name ? readRuntimeEnvironmentVariable(name, runtime?.agentAid, runtime?.projectPath).value : value;
|
|
496
|
-
};
|
|
497
|
-
const overrideApiKey = resolveGatewayReference(override?.apiKey);
|
|
498
|
-
const runtimeAuthToken = readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value;
|
|
499
|
-
const runtimeApiKey = readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value;
|
|
500
|
-
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey, undefined, runtimeAuthToken, runtimeApiKey, settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY);
|
|
501
|
-
const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
|
|
502
|
-
const overrideBaseUrlValue = resolveGatewayReference(override?.baseUrl);
|
|
503
|
-
const overrideBaseUrl = isPlaceholderUrl(overrideBaseUrlValue) ? undefined : overrideBaseUrlValue;
|
|
504
|
-
const runtimeBaseUrl = readRuntimeEnvironmentVariable('ANTHROPIC_BASE_URL', runtime?.agentAid, runtime?.projectPath).value;
|
|
505
|
-
const baseUrl = overrideBaseUrl
|
|
506
|
-
|| runtimeBaseUrl
|
|
507
|
-
|| settings.env?.ANTHROPIC_BASE_URL;
|
|
508
|
-
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
509
|
-
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
510
|
-
if (!apiKey)
|
|
511
|
-
throw new NativeConnectionIncompleteError('No API key found for Claude. Select a Provider via baseagents.claude.provider, or set env ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY.', { baseUrl, headers, queryParams });
|
|
512
|
-
const model = override?.model
|
|
513
|
-
|| config.agents?.claude?.model
|
|
514
|
-
|| settings.model
|
|
515
|
-
|| DEFAULT_CLAUDE_MODEL;
|
|
516
|
-
const effort = override?.effort
|
|
517
|
-
|| config.agents?.claude?.effort
|
|
518
|
-
|| settings.effortLevel
|
|
519
|
-
|| undefined;
|
|
520
|
-
const pickExec = (v) => (!v || v.includes('your-') || v.includes('placeholder')) ? undefined : v;
|
|
521
|
-
const pathToClaudeCodeExecutable = pickExec(override?.pathToClaudeCodeExecutable)
|
|
522
|
-
|| pickExec(config.agents?.claude?.pathToClaudeCodeExecutable);
|
|
523
|
-
return { apiKey, baseUrl, headers, queryParams, model, effort, pathToClaudeCodeExecutable };
|
|
524
|
-
}
|
|
525
|
-
function nonEmptyString(value) {
|
|
526
|
-
return typeof value === 'string' && value.trim() ? value.trim() : undefined;
|
|
527
|
-
}
|
|
528
|
-
function recordValue(value) {
|
|
529
|
-
return value && typeof value === 'object' && !Array.isArray(value)
|
|
530
|
-
? value
|
|
531
|
-
: undefined;
|
|
532
|
-
}
|
|
533
|
-
export function loadCodexSettings() {
|
|
534
|
-
const configuredHome = process.env.CODEX_HOME?.trim();
|
|
535
|
-
const codexHome = configuredHome ? path.resolve(configuredHome) : path.join(os.homedir(), '.codex');
|
|
536
|
-
const authPath = path.join(codexHome, 'auth.json');
|
|
537
|
-
const configPath = path.join(codexHome, 'config.toml');
|
|
538
|
-
let authJsonApiKey;
|
|
539
|
-
try {
|
|
540
|
-
if (fs.existsSync(authPath)) {
|
|
541
|
-
const auth = JSON.parse(fs.readFileSync(authPath, 'utf-8'));
|
|
542
|
-
authJsonApiKey = nonEmptyString(auth?.OPENAI_API_KEY);
|
|
543
|
-
}
|
|
544
|
-
}
|
|
545
|
-
catch {
|
|
546
|
-
// A corrupt auth.json must not prevent the provider config from loading.
|
|
547
|
-
}
|
|
548
|
-
let model;
|
|
549
|
-
let effort;
|
|
550
|
-
let baseUrl;
|
|
551
|
-
let provider;
|
|
552
|
-
let bearerToken;
|
|
553
|
-
let requiresOpenaiAuth;
|
|
554
|
-
try {
|
|
555
|
-
if (fs.existsSync(configPath)) {
|
|
556
|
-
const parsed = recordValue(parseToml(fs.readFileSync(configPath, 'utf-8')));
|
|
557
|
-
model = nonEmptyString(parsed?.model);
|
|
558
|
-
effort = nonEmptyString(parsed?.model_reasoning_effort);
|
|
559
|
-
provider = nonEmptyString(parsed?.model_provider);
|
|
560
|
-
const providers = recordValue(parsed?.model_providers);
|
|
561
|
-
const selectedProvider = provider ? recordValue(providers?.[provider]) : undefined;
|
|
562
|
-
baseUrl = nonEmptyString(selectedProvider?.base_url);
|
|
563
|
-
bearerToken = nonEmptyString(selectedProvider?.experimental_bearer_token);
|
|
564
|
-
requiresOpenaiAuth = typeof selectedProvider?.requires_openai_auth === 'boolean'
|
|
565
|
-
? selectedProvider.requires_openai_auth
|
|
566
|
-
: undefined;
|
|
567
|
-
}
|
|
568
|
-
}
|
|
569
|
-
catch { }
|
|
570
|
-
// Codex applies a provider's explicit bearer token before auth.json. Keep
|
|
571
|
-
// that precedence so EvolCore and the app-server select the same identity.
|
|
572
|
-
if (bearerToken) {
|
|
573
|
-
return {
|
|
574
|
-
apiKey: bearerToken,
|
|
575
|
-
authType: 'bearerToken',
|
|
576
|
-
authSource: 'config.toml',
|
|
577
|
-
baseUrl,
|
|
578
|
-
model,
|
|
579
|
-
effort,
|
|
580
|
-
provider,
|
|
581
|
-
requiresOpenaiAuth,
|
|
582
|
-
};
|
|
583
|
-
}
|
|
584
|
-
if (authJsonApiKey) {
|
|
585
|
-
return {
|
|
586
|
-
apiKey: authJsonApiKey,
|
|
587
|
-
authType: 'apiKey',
|
|
588
|
-
authSource: 'auth.json',
|
|
589
|
-
baseUrl,
|
|
590
|
-
model,
|
|
591
|
-
effort,
|
|
592
|
-
provider,
|
|
593
|
-
requiresOpenaiAuth,
|
|
594
|
-
};
|
|
595
|
-
}
|
|
596
|
-
return { baseUrl, model, effort, provider, requiresOpenaiAuth };
|
|
597
|
-
}
|
|
598
|
-
/**
|
|
599
|
-
* Resolve a complete credential/endpoint pair for direct OpenAI HTTP calls.
|
|
600
|
-
* auth.json and config.toml together form the Codex SDK source; fields are
|
|
601
|
-
* never combined with a partial Agent or process-environment configuration.
|
|
602
|
-
*/
|
|
603
|
-
export function resolveOpenaiDirectConfig(override) {
|
|
604
|
-
if (override?.provider !== undefined) {
|
|
605
|
-
const provider = resolveProviderService(override.provider, 'codex');
|
|
606
|
-
if (!provider.apiKey)
|
|
607
|
-
throw new Error(`Provider ${provider.providerId} has no API key`);
|
|
608
|
-
return { ...provider, apiKey: provider.apiKey };
|
|
609
|
-
}
|
|
610
|
-
const explicit = directInferencePair(override?.apiKey, override?.baseUrl);
|
|
611
|
-
if (explicit) {
|
|
612
|
-
return {
|
|
613
|
-
...explicit,
|
|
614
|
-
...normalizeRequestMetadata(override),
|
|
615
|
-
};
|
|
616
|
-
}
|
|
617
|
-
const settings = loadCodexSettings();
|
|
618
|
-
const configuredBearer = settings.authType === 'bearerToken'
|
|
619
|
-
? directInferencePair(settings.apiKey, settings.baseUrl)
|
|
620
|
-
: undefined;
|
|
621
|
-
if (configuredBearer) {
|
|
622
|
-
return {
|
|
623
|
-
...configuredBearer,
|
|
624
|
-
...normalizeRequestMetadata(override),
|
|
625
|
-
};
|
|
626
|
-
}
|
|
627
|
-
const environment = directInferencePair(process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY, process.env.OPENAI_BASE_URL);
|
|
628
|
-
if (environment) {
|
|
629
|
-
return {
|
|
630
|
-
...environment,
|
|
631
|
-
...normalizeRequestMetadata(override),
|
|
632
|
-
};
|
|
633
|
-
}
|
|
634
|
-
const settingsResolved = directInferencePair(settings.apiKey, settings.baseUrl);
|
|
635
|
-
return settingsResolved
|
|
636
|
-
? {
|
|
637
|
-
...settingsResolved,
|
|
638
|
-
...normalizeRequestMetadata(override),
|
|
639
|
-
}
|
|
640
|
-
: undefined;
|
|
641
|
-
}
|
|
642
|
-
export function resolveOpenaiConfig(config, override, runtime) {
|
|
643
|
-
const codexSettings = loadCodexSettings();
|
|
644
|
-
const providerId = override?.provider ?? config.agents?.codex?.provider;
|
|
645
|
-
if (providerId !== undefined) {
|
|
646
|
-
const provider = resolveProviderService(providerId, 'codex');
|
|
647
|
-
if (!provider.apiKey)
|
|
648
|
-
throw new Error(`Provider ${providerId} has no API key`);
|
|
649
|
-
return {
|
|
650
|
-
apiKey: provider.apiKey,
|
|
651
|
-
authType: 'apiKey',
|
|
652
|
-
authSource: 'agent-config',
|
|
653
|
-
baseUrl: provider.baseUrl,
|
|
654
|
-
provider: provider.providerId,
|
|
655
|
-
providerId: provider.providerId,
|
|
656
|
-
headers: provider.headers,
|
|
657
|
-
queryParams: provider.queryParams,
|
|
658
|
-
model: override?.model || config.agents?.codex?.model || codexSettings.model
|
|
659
|
-
|| discoveredDefaultModel('codex', { ...config.agents?.codex, ...override }) || '',
|
|
660
|
-
effort: override?.effort || override?.reasoning || config.agents?.codex?.effort || codexSettings.effort || undefined,
|
|
661
|
-
enableRequestUserInput: override?.enableRequestUserInput ?? config.agents?.codex?.enableRequestUserInput ?? true,
|
|
662
|
-
agentAid: runtime?.agentAid,
|
|
663
|
-
agentConfig: runtime?.agentConfig,
|
|
664
|
-
};
|
|
665
|
-
}
|
|
666
|
-
const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
|
|
667
|
-
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
668
|
-
const environmentApiKey = [process.env.OPENAI_API_KEY, process.env.CODEX_API_KEY]
|
|
669
|
-
.map(value => isPlaceholder(value) ? undefined : value)
|
|
670
|
-
.find((value) => !!value);
|
|
671
|
-
const configuredBearer = codexSettings.authType === 'bearerToken' ? codexSettings.apiKey : undefined;
|
|
672
|
-
const storedApiKey = codexSettings.authType === 'apiKey' ? codexSettings.apiKey : undefined;
|
|
673
|
-
// A selected provider's explicit token is authoritative for that provider.
|
|
674
|
-
// OPENAI_API_KEY is not used by Codex when the provider declares its own
|
|
675
|
-
// bearer token, so choosing it here would make EvolCore and app-server use
|
|
676
|
-
// different credentials.
|
|
677
|
-
const credential = overrideApiKey
|
|
678
|
-
? { apiKey: overrideApiKey, authType: 'apiKey', authSource: 'agent-config' }
|
|
679
|
-
: configuredBearer
|
|
680
|
-
? { apiKey: configuredBearer, authType: 'bearerToken', authSource: 'config.toml' }
|
|
681
|
-
: environmentApiKey
|
|
682
|
-
? { apiKey: environmentApiKey, authType: 'apiKey', authSource: 'environment' }
|
|
683
|
-
: storedApiKey
|
|
684
|
-
? { apiKey: storedApiKey, authType: 'apiKey', authSource: 'auth.json' }
|
|
685
|
-
: undefined;
|
|
686
|
-
const apiKey = credential?.apiKey;
|
|
687
|
-
const authType = credential?.authType;
|
|
688
|
-
const authSource = credential?.authSource;
|
|
689
|
-
const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
|
|
690
|
-
const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
|
|
691
|
-
const baseUrl = overrideBaseUrl
|
|
692
|
-
|| process.env.OPENAI_BASE_URL
|
|
693
|
-
|| codexSettings.baseUrl
|
|
694
|
-
|| undefined;
|
|
695
|
-
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
696
|
-
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
697
|
-
if (!apiKey)
|
|
698
|
-
throw new NativeConnectionIncompleteError('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.', { baseUrl, headers, queryParams });
|
|
699
|
-
const model = override?.model
|
|
700
|
-
|| config.agents?.codex?.model
|
|
701
|
-
|| codexSettings.model
|
|
702
|
-
|| discoveredDefaultModel('codex', { ...config.agents?.codex, ...override }) || '';
|
|
703
|
-
const effort = override?.effort
|
|
704
|
-
|| override?.reasoning
|
|
705
|
-
|| config.agents?.codex?.effort
|
|
706
|
-
|| config.agents?.codex?.reasoning
|
|
707
|
-
|| codexSettings.effort
|
|
708
|
-
|| undefined;
|
|
709
|
-
const enableRequestUserInput = override?.enableRequestUserInput
|
|
710
|
-
?? config.agents?.codex?.enableRequestUserInput
|
|
711
|
-
?? true;
|
|
712
|
-
return {
|
|
713
|
-
apiKey,
|
|
714
|
-
authType,
|
|
715
|
-
authSource,
|
|
716
|
-
baseUrl,
|
|
717
|
-
provider: codexSettings.provider,
|
|
718
|
-
headers,
|
|
719
|
-
queryParams,
|
|
720
|
-
model,
|
|
721
|
-
effort,
|
|
722
|
-
enableRequestUserInput,
|
|
723
|
-
agentAid: runtime?.agentAid,
|
|
724
|
-
agentConfig: runtime?.agentConfig,
|
|
725
|
-
};
|
|
726
|
-
}
|
|
727
|
-
export function resolveGoogleConfig(config, override) {
|
|
728
|
-
const googleCfg = config.agents?.gemini;
|
|
729
|
-
const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
|
|
730
|
-
let cliPath = override?.cliPath || googleCfg?.cliPath || '';
|
|
731
|
-
if (!cliPath) {
|
|
732
|
-
cliPath = commandExists('gemini') ? 'gemini' : '';
|
|
733
|
-
}
|
|
734
|
-
const model = override?.model || googleCfg?.model || DEFAULT_GEMINI_MODEL;
|
|
735
|
-
const providerId = override?.provider ?? googleCfg?.provider;
|
|
736
|
-
if (providerId !== undefined) {
|
|
737
|
-
const provider = resolveProviderService(providerId, 'gemini');
|
|
738
|
-
if (!provider.apiKey)
|
|
739
|
-
throw new Error(`Provider ${providerId} has no API key`);
|
|
740
|
-
if (provider.queryParams && Object.keys(provider.queryParams).length > 0) {
|
|
741
|
-
throw new Error(`Provider ${providerId} gemini service queryParams are unsupported by the Gemini CLI runtime`);
|
|
742
|
-
}
|
|
743
|
-
return { cliPath, model, apiKey: provider.apiKey, providerId, baseUrl: provider.baseUrl, headers: provider.headers,
|
|
744
|
-
queryParams: provider.queryParams };
|
|
745
|
-
}
|
|
746
|
-
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
747
|
-
const apiKey = overrideApiKey
|
|
748
|
-
|| process.env.GEMINI_API_KEY
|
|
749
|
-
|| process.env.GOOGLE_API_KEY
|
|
750
|
-
|| undefined;
|
|
751
|
-
return { cliPath, model, apiKey };
|
|
752
|
-
}
|
|
753
|
-
// ── EvolCore bundled ecagent ──────────────────────────────────────────
|
|
754
|
-
export const DEFAULT_ECAGENT_BASE_URL = 'https://mg-new.evolai.cn/openclaw-proxy/v1';
|
|
755
|
-
export const DEFAULT_ECAGENT_MODEL = 'deepseek-v4.1-flash';
|
|
756
|
-
export const DEFAULT_ECAGENT_TIMEOUT_MS = 120_000;
|
|
757
|
-
export const DEFAULT_ECAGENT_MAX_RETRIES = 2;
|
|
758
|
-
export const DEFAULT_ECAGENT_MAX_RETRY_DELAY_MS = 4_000;
|
|
759
|
-
export function resolveEcagentConfig(config, override) {
|
|
760
|
-
const configured = config.agents?.ecagent;
|
|
761
|
-
const providerId = override?.provider ?? configured?.provider;
|
|
762
|
-
if (providerId !== undefined) {
|
|
763
|
-
const provider = resolveProviderServiceForBaseagent(providerId, 'ecagent');
|
|
764
|
-
if (provider.style !== 'openai-compatible') {
|
|
765
|
-
throw new Error(`Provider ${providerId} uses unsupported ecagent style: ${provider.style}`);
|
|
766
|
-
}
|
|
767
|
-
if (!provider.apiKey)
|
|
768
|
-
throw new Error(`Provider ${providerId} has no API key`);
|
|
769
|
-
const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
|
|
770
|
-
return {
|
|
771
|
-
apiKey: provider.apiKey,
|
|
772
|
-
baseUrl: provider.baseUrl,
|
|
773
|
-
headers: provider.headers,
|
|
774
|
-
queryParams: provider.queryParams,
|
|
775
|
-
model: override?.model || configured?.model
|
|
776
|
-
|| discoveredDefaultModel('ecagent', { ...configured, ...override }) || '',
|
|
777
|
-
effort: override?.effort ?? configured?.effort,
|
|
778
|
-
timeoutMs: numberOr(override?.timeoutMs ?? configured?.timeoutMs, DEFAULT_ECAGENT_TIMEOUT_MS),
|
|
779
|
-
maxRetries: numberOr(override?.maxRetries ?? configured?.maxRetries, DEFAULT_ECAGENT_MAX_RETRIES),
|
|
780
|
-
maxRetryDelayMs: numberOr(override?.maxRetryDelayMs ?? configured?.maxRetryDelayMs, DEFAULT_ECAGENT_MAX_RETRY_DELAY_MS),
|
|
781
|
-
providerId,
|
|
782
|
-
providerServiceType: provider.serviceType,
|
|
783
|
-
providerStyle: provider.style,
|
|
784
|
-
modelOverrides: provider.modelOverrides,
|
|
785
|
-
modelPolicy: provider.modelPolicy,
|
|
786
|
-
};
|
|
787
|
-
}
|
|
788
|
-
const isPlaceholder = (value) => !value
|
|
789
|
-
|| value.includes('your-')
|
|
790
|
-
|| value.includes('placeholder');
|
|
791
|
-
const apiKey = (isPlaceholder(override?.apiKey) ? undefined : override?.apiKey)
|
|
792
|
-
|| process.env.ECAGENT_API_KEY
|
|
793
|
-
|| process.env.OPENAI_API_KEY;
|
|
794
|
-
const baseUrl = (override?.baseUrl && !override.baseUrl.includes('placeholder') ? override.baseUrl : undefined)
|
|
795
|
-
|| process.env.ECAGENT_BASE_URL
|
|
796
|
-
|| DEFAULT_ECAGENT_BASE_URL;
|
|
797
|
-
const model = override?.model || configured?.model
|
|
798
|
-
|| discoveredDefaultModel('ecagent', { ...configured, ...override }) || '';
|
|
799
|
-
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
800
|
-
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
801
|
-
if (!apiKey)
|
|
802
|
-
throw new NativeConnectionIncompleteError('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.', { baseUrl, headers, queryParams });
|
|
803
|
-
const effort = override?.effort ?? configured?.effort;
|
|
804
|
-
const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
|
|
805
|
-
return {
|
|
806
|
-
apiKey,
|
|
807
|
-
baseUrl,
|
|
808
|
-
headers,
|
|
809
|
-
queryParams,
|
|
810
|
-
model,
|
|
811
|
-
effort,
|
|
812
|
-
timeoutMs: numberOr(override?.timeoutMs ?? configured?.timeoutMs, DEFAULT_ECAGENT_TIMEOUT_MS),
|
|
813
|
-
maxRetries: numberOr(override?.maxRetries ?? configured?.maxRetries, DEFAULT_ECAGENT_MAX_RETRIES),
|
|
814
|
-
maxRetryDelayMs: numberOr(override?.maxRetryDelayMs ?? configured?.maxRetryDelayMs, DEFAULT_ECAGENT_MAX_RETRY_DELAY_MS),
|
|
815
|
-
};
|
|
816
|
-
}
|