evolcore 0.0.49 → 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 +103 -3
- package/bin/ec-build.mjs +60 -0
- package/bin/ecmsg.js +64 -57
- package/dist/ability/caller/authorization.js +21 -0
- package/dist/ability/caller/command.js +173 -0
- package/dist/ability/caller/contract.js +117 -0
- package/dist/ability/caller/credential-files.js +132 -0
- package/dist/ability/caller/daemon.js +183 -0
- package/dist/ability/caller/schema-view.js +157 -0
- package/dist/ability/caller/service.js +519 -0
- package/dist/ability/command-contract.js +5 -0
- package/dist/ability/daemon.js +5 -1
- package/dist/ability/interop-v1.js +156 -106
- package/dist/ability/management.js +1 -0
- package/dist/agent-template/jobs.js +79 -3
- package/dist/agent-template/runtime.js +459 -47
- package/dist/agent-template/service.js +1242 -198
- package/dist/agent-template/share.js +103 -0
- package/dist/agent-template/tool-runner.js +25 -0
- package/dist/agent-template/types.js +10 -2
- 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} +78 -166
- 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} +652 -383
- 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 +96 -0
- package/dist/agents/{gemini-runner.js → gemini/runner.js} +18 -23
- package/dist/{core/session/adapters/gemini-session-file-adapter.js → agents/gemini/session-file-adapter.js} +2 -2
- package/dist/aun/ability-device-routing.js +11 -17
- package/dist/aun/aid/agentmd.js +27 -1
- package/dist/aun/aid/control-aid.js +52 -32
- package/dist/aun/aid/managed-operation.js +6 -4
- package/dist/aun/group/invite-service.js +7 -37
- package/dist/aun/group/operations.js +6 -0
- 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/mention-schema.js +1 -1
- package/dist/aun/msg/p2p.js +32 -4
- package/dist/aun/msg/upload.js +126 -3
- 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 +698 -213
- 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/claude-gateway/agent-registration.js +389 -0
- package/dist/claude-gateway/binding.js +96 -0
- package/dist/claude-gateway/inbox.js +138 -0
- package/dist/claude-gateway/index.js +125 -0
- package/dist/claude-gateway/listing.js +330 -0
- package/dist/claude-gateway/router.js +328 -0
- package/dist/claude-gateway/sessions.js +128 -0
- package/dist/claude-gateway/terminal.js +250 -0
- package/dist/claude-gateway/transcript.js +272 -0
- package/dist/claude-gateway/types.js +14 -0
- package/dist/cli/ability-command.js +45 -0
- package/dist/cli/ability-output.js +182 -0
- package/dist/cli/agent-command.js +21 -2
- package/dist/cli/agent-create.js +197 -56
- package/dist/cli/agent-template.js +400 -27
- package/dist/cli/agent.js +105 -11
- package/dist/cli/aun-commands.js +237 -123
- package/dist/cli/bench.js +5 -2
- package/dist/cli/config.js +22 -6
- package/dist/cli/daemon-commands.js +283 -109
- 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 +64 -26
- package/dist/cli/fs-command.js +67 -39
- package/dist/cli/index.js +45 -12
- package/dist/cli/init.js +161 -90
- package/dist/cli/managed-command-guard.js +3 -0
- package/dist/cli/menu-client.js +32 -7
- package/dist/cli/model.js +1 -1
- package/dist/cli/pay-command.js +30 -0
- package/dist/cli/provider-command.js +6 -2
- package/dist/cli/restart-monitor.js +4 -4
- package/dist/cli/services-command.js +35 -10
- 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 +81 -14
- package/dist/cli/trigger-command.js +47 -12
- package/dist/cli/watch-logs.js +2 -1
- package/dist/config/access-policy.js +16 -3
- package/dist/config/boot-log.js +3 -0
- package/dist/config/builtin-role-templates.js +1 -1
- package/dist/config/config-field-policy.js +26 -13
- package/dist/config/config-manager.js +113 -52
- package/dist/config/config-operation-service.js +22 -1
- package/dist/config/gateway-config.js +29 -44
- package/dist/config/invoke-ipc-service.js +1 -1
- package/dist/config/owner-config.js +5 -19
- package/dist/config/peer-book-store.js +2 -3
- package/dist/config/peer-book.js +2 -2
- package/dist/config/peer-role-resolver.js +3 -9
- 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 +138 -31
- package/dist/config/providers-import.js +3 -3
- package/dist/config/providers-management.js +109 -118
- package/dist/config/resolved-config-op.js +1 -42
- package/dist/config/schema-migration.js +254 -15
- package/dist/config/schema-registry.js +53 -8
- package/dist/config-store.js +1343 -63
- package/dist/core/{agent-application-service.js → agent/agent-application-service.js} +228 -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} +119 -25
- package/dist/core/{agent-reload-coordinator.js → agent/agent-reload-coordinator.js} +65 -0
- package/dist/core/{agent-runtime.js → agent/agent-runtime.js} +249 -79
- package/dist/core/{evolagent-registry.js → agent/evolagent-registry.js} +23 -18
- package/dist/core/{evolagent.js → agent/evolagent.js} +11 -11
- package/dist/core/auth/agent-delegation.js +15 -8
- package/dist/core/auth/delegation-authorization.js +28 -0
- package/dist/core/auth/operation-authorizer.js +20 -2
- package/dist/core/auth/operation-catalog.js +80 -8
- 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} +89 -6
- package/dist/core/baseagent/baseagent-model-defaults.js +26 -0
- package/dist/core/baseagent/baseagent-plugin-descriptor.js +357 -0
- 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 +91 -33
- 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} +21 -19
- package/dist/core/command/agent-control.js +80 -17
- package/dist/core/command/agent-template-menu.js +23 -10
- package/dist/core/command/agentmd-menu-request.js +19 -8
- package/dist/core/command/agentmd-menu.js +14 -5
- package/dist/core/command/cli-intent-parser.js +15 -0
- 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 +95 -19
- package/dist/core/command/menu-file-path.js +70 -0
- package/dist/core/command/menu-handler.js +392 -93
- package/dist/core/command/menu-protocol.js +47 -8
- package/dist/core/command/menu-query-batch.js +9 -5
- package/dist/core/command/private-mention-menu.js +71 -0
- 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 +143 -121
- package/dist/core/command/team-workspace-bootstrap.js +2 -1
- package/dist/core/command/team-workspace-team.js +3 -3
- package/dist/core/command/topic-slash.js +16 -10
- package/dist/core/{daemon-bootstrap.js → daemon/daemon-bootstrap.js} +14 -18
- package/dist/core/{daemon-control.js → daemon/daemon-control.js} +48 -21
- package/dist/core/{daemon-lifecycle.js → daemon/daemon-lifecycle.js} +28 -20
- package/dist/core/{host-snapshot.js → daemon/host-snapshot.js} +10 -5
- package/dist/core/{ipc-registration.js → daemon/ipc-registration.js} +101 -37
- 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 +2 -2
- 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 +57 -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 +3 -2
- package/dist/core/memory/consolidation-trigger.js +9 -3
- package/dist/core/memory/consolidation.js +39 -68
- 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 +204 -88
- package/dist/core/message/aun-request-registry.js +44 -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} +131 -1
- 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 +239 -59
- package/dist/core/message/message-log.js +8 -0
- package/dist/core/message/message-queue.js +88 -7
- package/dist/core/message/message-utils.js +1 -1
- package/dist/core/message/peer-mode.js +16 -5
- package/dist/core/message/response-engine.js +351 -152
- package/dist/core/message/send-options.js +44 -7
- package/dist/core/message/send-routing.js +55 -115
- 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 +18 -7
- package/dist/core/model/model-diagnostics.js +4 -4
- package/dist/core/ownership/owner-resolver.js +107 -101
- package/dist/core/{pack-auth.js → pack/pack-auth.js} +34 -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 +242 -82
- package/dist/core/permission/managed-file.js +234 -0
- package/dist/core/permission/protected-paths.js +120 -9
- package/dist/core/permission/sandbox-runtime.js +267 -3
- package/dist/core/permission/services-path-acl.js +9 -2
- package/dist/core/permission/session-path-grants.js +1 -1
- package/dist/core/permission/shell-environment.js +15 -1
- package/dist/core/permission/tool-policy.js +21 -9
- package/dist/core/plugin/plugin-lifecycle.js +442 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +2 -242
- package/dist/core/session/adapters/codex-session-file-adapter.js +2 -562
- 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 +76 -12
- package/dist/core/session/session-mapper.js +16 -0
- 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 +3 -3
- package/dist/core/skill/switch-resolver.js +3 -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/command-parser.js +4 -1
- package/dist/core/thread/ipc-operation.js +6 -4
- package/dist/core/thread/thread-operation.js +27 -11
- package/dist/core/thread/thread-route.js +5 -3
- package/dist/core/thread/thread-service.js +307 -58
- package/dist/core/thread/topic-id.js +52 -2
- package/dist/core/thread/types.js +15 -1
- 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 +3 -2
- package/dist/eck/manifest-engine.js +64 -2
- package/dist/eck/message-renderer.js +35 -0
- package/dist/ecweb/basic-settings-service.js +12 -10
- 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 +5 -3
- 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 +181 -77
- package/dist/ipc.js +161 -12
- 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 +60 -1
- package/dist/pay/command.js +38 -0
- package/dist/pay/protocol.js +136 -0
- package/dist/pay/runtime.js +196 -0
- package/dist/pay/service.js +384 -0
- package/dist/pay/store.js +81 -0
- package/dist/response-system/engines/v1/proactive-flow.js +30 -3
- package/dist/services/dispatcher.js +25 -7
- package/dist/services/host/main.js +397 -0
- package/dist/services/host/protocol.js +125 -0
- package/dist/services/host/resident.js +347 -0
- package/dist/services/host-client.js +398 -0
- package/dist/services/host-deploy.js +180 -0
- package/dist/services/host-launch.js +117 -0
- package/dist/services/host-recycle.js +208 -0
- package/dist/services/host-runtime.js +841 -0
- package/dist/services/idempotency.js +44 -86
- package/dist/services/index-generator.js +4 -3
- package/dist/services/index.js +258 -36
- package/dist/services/ipc-operation.js +503 -78
- package/dist/services/pack-manager.js +2 -2
- package/dist/services/router.js +43 -3
- package/dist/services/script-runner.js +541 -100
- package/dist/services/service-payload.js +28 -1
- package/dist/services/validation.js +136 -5
- 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 +9 -6
- package/dist/trigger/authorization.js +36 -33
- package/dist/trigger/ipc-service.js +4 -4
- package/dist/trigger/local-files.js +8 -166
- package/dist/trigger/manager.js +2 -2
- package/dist/trigger/parser.js +48 -0
- package/dist/trigger/scheduler.js +35 -13
- package/dist/trigger/script-executor.js +21 -0
- package/dist/trigger/script-sandbox.js +77 -232
- package/dist/trigger/system-definitions.js +25 -0
- package/dist/trigger/validation.js +1 -1
- package/dist/utils/aid-bind.js +3 -0
- 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 +74 -1
- package/dist/utils/logger.js +5 -3
- package/dist/utils/media-cache.js +284 -42
- package/dist/utils/restart-safety.js +14 -1
- package/dist/utils/startup-trace.js +20 -4
- package/dist/utils/system-memory.js +113 -25
- package/dist/utils/systemd-lifecycle.js +154 -0
- package/dist/utils/welcome.js +64 -20
- package/dist/utils/windows-shell-trust.js +7 -3
- 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 +3 -2
- package/kits/docs/aun/AUN/346/266/210/346/201/257/347/261/273/345/236/213/344/270/216/345/261/236/346/200/247.md +1 -0
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/channels/feishu.md +1 -1
- package/kits/docs/evolcore/INDEX.md +13 -9
- package/kits/docs/evolcore/agent-create.md +2 -0
- package/kits/docs/evolcore/agent.md +133 -11
- package/kits/docs/evolcore/aid.md +39 -6
- package/kits/docs/evolcore/config.md +95 -1
- 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 +5 -4
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/memory-tags.md +2 -0
- package/kits/docs/evolcore/menu-client.md +3 -3
- package/kits/docs/evolcore/menu-protocol.md +31 -2
- package/kits/docs/evolcore/model.md +12 -1
- package/kits/docs/evolcore/msg.md +96 -36
- package/kits/docs/evolcore/pay.md +22 -0
- package/kits/docs/evolcore/plugin.md +74 -0
- package/kits/docs/evolcore/provider.md +29 -2
- package/kits/docs/evolcore/rpc.md +2 -2
- package/kits/docs/evolcore/services.md +46 -18
- 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 +20 -9
- package/kits/docs/evolcore/tool-authorization.md +14 -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/01-overview.md +11 -32
- package/kits/rules/02-navigation.md +20 -6
- package/kits/rules/06-channel.md +20 -4
- package/kits/schemas/_meta.json +42 -5
- package/kits/schemas/agent-config.schema.21.json +974 -0
- package/kits/schemas/agent-config.schema.22.json +977 -0
- package/kits/schemas/agent-config.schema.23.json +974 -0
- 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.10.json +373 -0
- package/kits/schemas/daemon.schema.11.json +487 -0
- package/kits/schemas/daemon.schema.12.json +505 -0
- package/kits/schemas/daemon.schema.9.json +12 -0
- package/kits/schemas/defaults.schema.7.json +472 -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 +26 -4
- package/kits/schemas/relation-config.schema.13.json +289 -0
- package/kits/skills/.switches.json +17 -1
- package/kits/skills/ability/SKILL.md +395 -33
- package/kits/skills/ability/STRUCTURE.md +338 -0
- package/kits/skills/ability/references/cli.md +208 -0
- package/kits/skills/ability/references/development.md +107 -37
- package/kits/skills/ability/references/management.md +106 -46
- package/kits/skills/ability/references/runtime-protocol.md +65 -63
- package/kits/skills/agent-output-cards/SKILL.md +80 -37
- 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 +8 -6
- package/kits/skills/ec-group/TASK.md +186 -0
- package/kits/skills/ec-group/WORKLOG.md +180 -0
- package/kits/skills/ec-group-collaboration/SKILL.md +5 -5
- package/kits/skills/ec-identity/SKILL.md +9 -6
- package/kits/skills/ec-pay/SKILL.md +223 -0
- package/kits/skills/ec-provider/SKILL.md +6 -6
- package/kits/skills/{ec-service-proxy → ec-proxy}/SKILL.md +8 -5
- package/kits/skills/ec-service-call/SKILL.md +138 -0
- package/kits/skills/ec-service-pack/SKILL.md +277 -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 +3 -3
- 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/memory-consolidation/notes.md +2 -2
- package/kits/templates/memory-consolidation/workflow.md +46 -0
- package/kits/templates/system-fragments/channel.md +13 -4
- package/kits/templates/system-fragments/commands.md +5 -4
- package/kits/templates/system-fragments/personal-assistant.md +2 -2
- package/kits/templates/system-fragments/reply.md +15 -9
- package/kits/templates/system-fragments/session.md +2 -2
- package/kits/templates/system-fragments/thread.md +30 -127
- package/kits/templates/system-fragments/venue.md +16 -0
- package/package.json +7 -7
- package/scripts/agent-template/index.mjs +7 -1
- package/scripts/agent-template/inspect.mjs +99 -39
- package/scripts/agent-template/overlay.mjs +126 -2
- package/scripts/agent-template/shared/common.mjs +49 -5
- 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 +468 -39
- package/scripts/agent-template/shared/template-contract.mjs +93 -51
- package/scripts/agent-template/shared/template-package.mjs +225 -44
- package/scripts/agent-template/shared/template-runtime.mjs +137 -15
- package/scripts/agent-template/shared/template.mjs +31 -8
- package/scripts/agent-template/team-pack.mjs +528 -56
- package/scripts/agent-template/team-preview.mjs +102 -9
- package/scripts/aid-batch/identity-batch.mjs +1 -1
- package/dist/agents/baseagent-availability.js +0 -152
- package/dist/agents/baseagent.js +0 -750
- 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/docs/aun/ABILITY_CALLING.md +0 -280
- package/kits/docs/evolcore/ability.md +0 -185
- package/kits/skills/ability/references/calling.md +0 -56
- package/kits/skills/ability/references/contract-checklist.md +0 -37
- package/kits/skills/ability/references/recovery.md +0 -27
- /package/dist/{core/capability/providers/gemini-capability-provider.js → agents/gemini/capability-provider.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,36 +1,36 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { resolveAunSendDevice } from '../../aun/ability-device-routing.js';
|
|
3
3
|
import crypto from 'crypto';
|
|
4
|
-
import { authorizeDelegatedAunMsgSend, delegationFailureDetailCode, hasTrustedFullAccessDelegation, } from '../auth/agent-delegation.js';
|
|
5
|
-
import { formatChannelKey, tryParseChannelKey } from '../channel-loader.js';
|
|
4
|
+
import { authorizeDelegatedAunMsgSend, delegationFailureDetailCode, hasTrustedFullAccessDelegation, hashDelegatedCommandArgv, } from '../auth/agent-delegation.js';
|
|
5
|
+
import { formatChannelKey, tryParseChannelKey } from '../channel/channel-loader.js';
|
|
6
6
|
import { AUN_HANDOFF_MARKER_FIELD } from '../../channels/aun.js';
|
|
7
7
|
import { classifyAunPayloadForLog } from './message-log.js';
|
|
8
8
|
import { isValidAunDeliveryForChannel } from './outbound.js';
|
|
9
9
|
import { isHClassPath } from '../permission/protected-paths.js';
|
|
10
10
|
import { normalizeAunMentionEntries, withAunAttention } from '../../aun/msg/mention-schema.js';
|
|
11
11
|
import { resolveManagedSendArgv } from '../../cli/aun-commands.js';
|
|
12
|
-
import {
|
|
12
|
+
import { readMessageLocalFile, resolveAttachmentLocalPath } from '../permission/managed-file.js';
|
|
13
13
|
import { TriggerDefinitionManager } from '../../trigger/manager.js';
|
|
14
|
-
import {
|
|
14
|
+
import { sameGroupAid } from '../../aun/group/identity.js';
|
|
15
15
|
import { resolveThreadRouteTarget } from '../thread/thread-route.js';
|
|
16
16
|
import { isMainSessionThreadId, isTopicThreadId, parseMainTopicId, safeFormatMainTopicId, sessionLocalTopicId, } from '../thread/topic-id.js';
|
|
17
17
|
import { ThreadService } from '../thread/thread-service.js';
|
|
18
18
|
import { diagLog } from '../../utils/msg-diag.js';
|
|
19
19
|
import { buildEnvelope, DEFAULT_NOOP_SENTINEL } from './message-utils.js';
|
|
20
20
|
import { sessionTopicThreadId } from '../thread/topic-id.js';
|
|
21
|
-
import { getAunRequestRegistry, requestDiagnostics, requestTtlSeconds } from './aun-request-registry.js';
|
|
21
|
+
import { getAunRequestRegistry, redactAbilityCredentials, requestDiagnostics, requestTtlSeconds } from './aun-request-registry.js';
|
|
22
22
|
import { canonicalizeEvolcoreCommandArgv, parseJsonObjectArgument } from '../permission/ec-command-parser.js';
|
|
23
|
-
import { formatPeerKey, parsePeerKey, readAunPeerKind, resolveAunPeerKind } from '../relation/peer-identity.js';
|
|
23
|
+
import { PeerIdentityCache, formatPeerKey, parsePeerKey, readAunPeerKind, resolveAunPeerKind } from '../relation/peer-identity.js';
|
|
24
24
|
import { logger } from '../../utils/logger.js';
|
|
25
|
-
import { MESSAGE_CLI_BIN } from '../../product.js';
|
|
26
|
-
import {
|
|
25
|
+
import { MESSAGE_CLI_BIN, MAIN_CLI_BIN } from '../../product.js';
|
|
26
|
+
import { parseRemoteCommand } from '../../ability/caller/command.js';
|
|
27
|
+
import { buildDownstreamArgv, parseGatewayArgs } from '../../cli/ecmsg-gateway.js';
|
|
27
28
|
import { resolveSendRoute } from './send-routing.js';
|
|
28
29
|
import { agentDir } from '../../paths.js';
|
|
29
30
|
import { chatDirPath, readAllJsonlLines } from '../session/session-fs-store.js';
|
|
30
|
-
import { prepareContactThreadDelegation, finishContactThreadDelegation
|
|
31
|
-
import { currentContactBinding } from './contact-admission.js';
|
|
31
|
+
import { prepareContactThreadDelegation, finishContactThreadDelegation } from './contact-thread-approval.js';
|
|
32
32
|
const TASK_ID_MESSAGE_PAYLOAD_TYPES = new Set(['text', 'link', 'image', 'video', 'voice', 'file']);
|
|
33
|
-
const TOPIC_SOURCE_MESSAGE_TYPES = new Set(['text', 'link', 'image', 'video', 'voice', 'file', 'action_card']);
|
|
33
|
+
const TOPIC_SOURCE_MESSAGE_TYPES = new Set(['text', 'link', 'image', 'video', 'voice', 'file', 'action_card', 'widget_card']);
|
|
34
34
|
/** Stamp the actual runtime source before handoff/outbox persistence, including retries. */
|
|
35
35
|
export function withAunTopicSource(payload, input) {
|
|
36
36
|
// A caller's payload can be copied from another message. Its old provenance
|
|
@@ -227,11 +227,21 @@ async function applyManagedCrossThreadSendEffects(input) {
|
|
|
227
227
|
: ThreadService.findMainSessionEntry(input.selfAid, input.targetChannelId);
|
|
228
228
|
const originThreadName = originEntry?.name || (originThreadId || originPeer);
|
|
229
229
|
const originPeerName = originEntry?.peerName || originPeer;
|
|
230
|
-
//
|
|
230
|
+
// 来源话题对端的主体类型:以身份缓存(agent.md 快照)为准,按来源对端 AID 查。
|
|
231
|
+
// 复查唤醒建出的话题会话 peerType 兜底成 'system'(feedback.ts),但 peerId 是真实对端,
|
|
232
|
+
// 只按 trigger:/bg: 前缀过滤会把 'system' 写进信封;运行时取值仅作兜底,且排除 'system'。
|
|
231
233
|
const originPeerType = (() => {
|
|
234
|
+
try {
|
|
235
|
+
const cached = PeerIdentityCache.get('aun', originPeer, agentDir(input.selfAid));
|
|
236
|
+
if (cached && cached.source !== 'unknown' && cached.type)
|
|
237
|
+
return cached.type;
|
|
238
|
+
}
|
|
239
|
+
catch {
|
|
240
|
+
// 缓存不可读时退回运行时取值
|
|
241
|
+
}
|
|
232
242
|
const type = String(input.runtime?.peerType ?? '').trim();
|
|
233
243
|
const peerId = String(input.runtime?.peerId ?? '');
|
|
234
|
-
if (!type || peerId.startsWith('trigger:') || peerId.startsWith('bg:'))
|
|
244
|
+
if (!type || type === 'system' || peerId.startsWith('trigger:') || peerId.startsWith('bg:'))
|
|
235
245
|
return undefined;
|
|
236
246
|
return type;
|
|
237
247
|
})();
|
|
@@ -479,8 +489,15 @@ async function deliverSelfAddressed(input) {
|
|
|
479
489
|
logger.warn('[AUN] self-dispatch role unresolved; falling back to visitor');
|
|
480
490
|
enqueueRole = 'visitor';
|
|
481
491
|
}
|
|
492
|
+
// 历史话题可能建立时没有绑定项目,projectPath 为空;直接用空值入队会被
|
|
493
|
+
// MessageQueue 拒绝,消息已发出却没进本机队列。按来源任务或 agent 配置兜底。
|
|
494
|
+
const projectPath = String(session.projectPath ?? '').trim()
|
|
495
|
+
|| String(input.fallbackProjectPath ?? '').trim();
|
|
496
|
+
if (!projectPath) {
|
|
497
|
+
return { deliveryError: `enqueue failed: session ${session.id} has no project path` };
|
|
498
|
+
}
|
|
482
499
|
try {
|
|
483
|
-
await input.messageQueue.enqueue(session.id, message,
|
|
500
|
+
await input.messageQueue.enqueue(session.id, message, projectPath, {
|
|
484
501
|
interruptible: false,
|
|
485
502
|
agentName: params.aid,
|
|
486
503
|
...(enqueueRole ? { role: enqueueRole } : {}),
|
|
@@ -546,18 +563,6 @@ async function resolveGatewaySend(argv, grant, runtime, session) {
|
|
|
546
563
|
|| (currentChatType !== 'private' && currentChatType !== 'group')) {
|
|
547
564
|
throw Object.assign(new Error('Current AUN conversation route is unavailable'), { code: 'AUN_OUTBOUND_ROUTE_REQUIRED' });
|
|
548
565
|
}
|
|
549
|
-
// An unqualified report to Owner continues its unique originating delegation.
|
|
550
|
-
// Explicit --thread always wins; unrelated conversations keep normal routing.
|
|
551
|
-
let returningToOrigin = false;
|
|
552
|
-
if (options.thread === undefined && options.to
|
|
553
|
-
&& normalizeAid(options.to) === currentContactBinding(grant.selfAid)?.owner_aid) {
|
|
554
|
-
const origin = findContactThreadReturn({ selfAid: grant.selfAid, grant, runtime });
|
|
555
|
-
if (origin) {
|
|
556
|
-
options.thread = origin.originThreadId;
|
|
557
|
-
options.checkEvery ??= 'none';
|
|
558
|
-
returningToOrigin = true;
|
|
559
|
-
}
|
|
560
|
-
}
|
|
561
566
|
const resolveKind = async (target) => {
|
|
562
567
|
if (normalizeAid(target) === normalizeAid(currentPeer))
|
|
563
568
|
return currentChatType;
|
|
@@ -575,10 +580,6 @@ async function resolveGatewaySend(argv, grant, runtime, session) {
|
|
|
575
580
|
}
|
|
576
581
|
};
|
|
577
582
|
const kinds = new Map();
|
|
578
|
-
if (options.to) {
|
|
579
|
-
options.to = expandGroupBase(grant.selfAid, options.to, normalizeGroupAid);
|
|
580
|
-
kinds.set(options.to, await resolveKind(options.to));
|
|
581
|
-
}
|
|
582
583
|
const mainPeer = options.thread ? parseMainTopicId(options.thread) : undefined;
|
|
583
584
|
if (mainPeer) {
|
|
584
585
|
const peer = mainPeer.aidA === grant.selfAid ? mainPeer.aidB : mainPeer.aidA;
|
|
@@ -590,7 +591,6 @@ async function resolveGatewaySend(argv, grant, runtime, session) {
|
|
|
590
591
|
return entry ? { threadId: entry.threadId, selfAid: grant.selfAid,
|
|
591
592
|
peer: { channelType: entry.channelType ?? 'aun', peerKind: entry.peerKind, id: entry.peer } } : undefined;
|
|
592
593
|
},
|
|
593
|
-
resolveTarget: id => ({ channelType: 'aun', peerKind: kinds.get(id) ?? 'private', id }),
|
|
594
594
|
resolvePeerKind: id => kinds.get(id),
|
|
595
595
|
mainSessionExists: peer => !!ThreadService.findMainSessionEntry(grant.selfAid, peer.id),
|
|
596
596
|
resolveLastTopicEncrypt: threadId => {
|
|
@@ -603,6 +603,7 @@ async function resolveGatewaySend(argv, grant, runtime, session) {
|
|
|
603
603
|
},
|
|
604
604
|
};
|
|
605
605
|
const route = resolveSendRoute({ ...options,
|
|
606
|
+
selfMode: options.selfMode === true,
|
|
606
607
|
encrypt: options.encrypt,
|
|
607
608
|
inboundTriggered: runtime.inboundEncrypted !== undefined,
|
|
608
609
|
inboundEncrypted: runtime.inboundEncrypted === true, }, {
|
|
@@ -611,12 +612,10 @@ async function resolveGatewaySend(argv, grant, runtime, session) {
|
|
|
611
612
|
}, deps);
|
|
612
613
|
if (!route.ok)
|
|
613
614
|
throw Object.assign(new Error(route.message), { code: route.code });
|
|
614
|
-
if (returningToOrigin)
|
|
615
|
-
route.source.thread = 'derived';
|
|
616
615
|
return { route, argv: buildDownstreamArgv(route, text, passthrough) };
|
|
617
616
|
}
|
|
618
|
-
export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, sessionManager, messageQueue, createCrossThreadReviewTrigger, }) {
|
|
619
|
-
|
|
617
|
+
export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, sessionManager, messageQueue, resolveAgentProjectPath, createCrossThreadReviewTrigger, }) {
|
|
618
|
+
const getRequest = async (params, abilityGrant) => {
|
|
620
619
|
if (!params.sessionId || !params.delegationToken) {
|
|
621
620
|
return { ok: false, code: 'DELEGATION_REQUIRED', error: 'Request queries require an active delegated session' };
|
|
622
621
|
}
|
|
@@ -633,6 +632,14 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
633
632
|
|| request.origin.peerKey !== authorization.grant.peerKey || request.origin.threadId !== runtime.threadId) {
|
|
634
633
|
return { ok: false, code: 'REQUEST_NOT_FOUND', error: 'Request is not available in this session' };
|
|
635
634
|
}
|
|
635
|
+
if (abilityGrant) {
|
|
636
|
+
if (!agentDelegationRegistry.isCurrentTaskGrant(abilityGrant) || !request.responseCorrelation
|
|
637
|
+
|| authorization.grant.taskId !== abilityGrant.taskId || authorization.grant.selfAid !== abilityGrant.selfAid
|
|
638
|
+
|| authorization.grant.sessionId !== abilityGrant.sessionId) {
|
|
639
|
+
return { ok: false, code: 'REQUEST_NOT_FOUND', error: 'Ability request is not available in the current task' };
|
|
640
|
+
}
|
|
641
|
+
return { ok: true, request: request };
|
|
642
|
+
}
|
|
636
643
|
const targetRoute = request.origin.targetThreadId
|
|
637
644
|
? resolveThreadRouteTarget(params.aid, request.origin.targetThreadId, 'msg', request.targetAid)
|
|
638
645
|
: undefined;
|
|
@@ -647,10 +654,12 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
647
654
|
});
|
|
648
655
|
if (!permitted.ok)
|
|
649
656
|
return { ok: false, code: permitted.code, error: permitted.reason };
|
|
650
|
-
return request ? { ok: true, request: request }
|
|
657
|
+
return request ? { ok: true, request: (request.responseCorrelation ? redactAbilityCredentials(request) : request) }
|
|
651
658
|
: { ok: false, code: 'REQUEST_NOT_FOUND', error: `request not found: ${params.requestId}` };
|
|
652
|
-
}
|
|
653
|
-
|
|
659
|
+
};
|
|
660
|
+
ipcServer.setAunRequestGetExecutor(params => getRequest(params));
|
|
661
|
+
ipcServer.setAbilityRequestGetExecutor?.((params, grant) => getRequest(params, grant));
|
|
662
|
+
const sender = async (params, inspectedGrant, gatewayRoute, protocolGrant) => {
|
|
654
663
|
let textFile;
|
|
655
664
|
let payloadFile;
|
|
656
665
|
try {
|
|
@@ -710,10 +719,14 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
710
719
|
catch (error) {
|
|
711
720
|
return { ok: false, code: error.code ?? 'INVALID_ARGUMENT', error: error instanceof Error ? error.message : String(error) };
|
|
712
721
|
}
|
|
722
|
+
const isSystemEvent = params.trustedSystemEvent === true
|
|
723
|
+
&& params.payload?.type === 'event' && params.payload.event === 'topic.renamed';
|
|
724
|
+
// 改名事件只同步元数据,不读取或重建托管任务上下文。
|
|
713
725
|
// 活跃任务走内存上下文;调试会话(--as-session)和已结束的会话没有内存记录,
|
|
714
726
|
// 这时从会话本身重建,否则跨话题复查会静默不创建(getTaskRuntimeContext 返回 null)。
|
|
715
|
-
let runtime =
|
|
716
|
-
|
|
727
|
+
let runtime = !isSystemEvent && params.originSessionId
|
|
728
|
+
? responseEngine.getTaskRuntimeContext(params.originSessionId) : undefined;
|
|
729
|
+
if (!isSystemEvent && !runtime && params.originSessionId && sessionManager) {
|
|
717
730
|
try {
|
|
718
731
|
const session = await sessionManager.getSessionById(params.originSessionId);
|
|
719
732
|
if (session) {
|
|
@@ -731,6 +744,10 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
731
744
|
}
|
|
732
745
|
}
|
|
733
746
|
const runtimeCausation = runtime?.causation;
|
|
747
|
+
if (protocolGrant && (!runtime || runtime.selfAid !== params.aid || runtime.peerKey !== protocolGrant.peerKey
|
|
748
|
+
|| !agentDelegationRegistry.isCurrentTaskGrant(protocolGrant))) {
|
|
749
|
+
return { ok: false, code: 'INVALID_DELEGATION', error: 'Ability transport requires the current task context', sent: false };
|
|
750
|
+
}
|
|
734
751
|
// 跨话题自派(self-address):收件人是本端自己,话题归属仍是 (自端, 对端)。
|
|
735
752
|
// 此时 `params.to` 不是「话题对端」,不能拿它做话题一致性校验。
|
|
736
753
|
const selfAddressed = isSelfAidTarget(params.aid, params.to);
|
|
@@ -742,11 +759,18 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
742
759
|
}
|
|
743
760
|
// 话题引用解析:`threadRef` 是调用方写的原值(可能是主话题 id),
|
|
744
761
|
// `threadRoute` 非空即"这是跨话题发送"——与话题 id 是否为空无关。
|
|
762
|
+
// `--selfmode` 是结构化标记:收件人必须是本端。网关已经保证,这里兜住
|
|
763
|
+
// 手工构造的 IPC 请求,避免把一条「委托」误当成「自派」。
|
|
764
|
+
if (params.selfMode === true && !selfAddressed) {
|
|
765
|
+
return { ok: false, code: 'INVALID_ARGUMENT', error: '--selfmode requires the local AID as recipient' };
|
|
766
|
+
}
|
|
745
767
|
const threadRef = params.thread;
|
|
746
768
|
const threadRoute = threadRef
|
|
747
769
|
? resolveThreadRouteTarget(params.aid, threadRef, params.scope, params.to, { allowSelfTarget: selfAddressed })
|
|
748
770
|
: undefined;
|
|
749
|
-
|
|
771
|
+
// 首次联系:主话题的会话还不存在,投递侧(handoff)会随本条消息建立。
|
|
772
|
+
// 除此之外,带 --thread 却解析不到话题都是错误。
|
|
773
|
+
if (threadRef && !threadRoute && gatewayRoute?.firstContact !== true) {
|
|
750
774
|
return { ok: false, code: 'TOPIC_NOT_FOUND', error: `话题不存在或不属于目标对端: ${threadRef}` };
|
|
751
775
|
}
|
|
752
776
|
// Topic lookup also restores the current topic; cross-topic side effects
|
|
@@ -760,12 +784,62 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
760
784
|
? threadRef
|
|
761
785
|
: (safeFormatMainTopicId(params.aid, threadRoute.peer) ?? threadRef))
|
|
762
786
|
: gatewayRoute?.threadId;
|
|
763
|
-
const
|
|
764
|
-
|
|
787
|
+
const inst = channelInstances.find((candidate) => {
|
|
788
|
+
if (candidate.channelType !== 'aun')
|
|
789
|
+
return false;
|
|
790
|
+
const ch = candidate.channel;
|
|
791
|
+
try {
|
|
792
|
+
const aidState = typeof ch?.getAidState === 'function' ? ch.getAidState() : null;
|
|
793
|
+
if (aidState?.aid === params.aid)
|
|
794
|
+
return true;
|
|
795
|
+
if (typeof ch?.getAid === 'function' && ch.getAid() === params.aid)
|
|
796
|
+
return true;
|
|
797
|
+
}
|
|
798
|
+
catch { /* ignore */ }
|
|
799
|
+
return false;
|
|
800
|
+
});
|
|
801
|
+
const ch = inst?.channel;
|
|
802
|
+
// `auto` 沿用业务消息的入站加密状态;无任务上下文的系统事件按主动发送处理。
|
|
803
|
+
const encrypt = typeof params.encrypt === 'boolean'
|
|
804
|
+
? params.encrypt
|
|
805
|
+
: params.encrypt === 'auto'
|
|
806
|
+
? runtime?.inboundEncrypted === true
|
|
807
|
+
: (typeof ch?.getDefaultEncrypt === 'function' ? ch.getDefaultEncrypt() : false);
|
|
808
|
+
if (isSystemEvent) {
|
|
809
|
+
const payload = params.payload;
|
|
810
|
+
const data = payload.data && typeof payload.data === 'object' && !Array.isArray(payload.data)
|
|
811
|
+
? payload.data : undefined;
|
|
812
|
+
if (!threadRoute || (threadRoute.channelType ?? 'aun') !== 'aun' || selfAddressed
|
|
813
|
+
|| !(isTopicThreadId(threadRef) || typeof threadRef === 'string' && parseMainTopicId(threadRef))
|
|
814
|
+
|| payload.thread_id !== threadRef || data?.schema_version !== 1
|
|
815
|
+
|| typeof data.name !== 'string' || !data.name.trim()
|
|
816
|
+
|| typeof data.name_updated_at !== 'number' || !Number.isFinite(data.name_updated_at)
|
|
817
|
+
|| payload.occurred_at !== data.name_updated_at
|
|
818
|
+
|| params.argv !== undefined || params.file || params.deviceId || params.returnPolicy === 'required') {
|
|
819
|
+
return { ok: false, code: 'INVALID_SYSTEM_EVENT', error: 'Invalid topic.renamed event or target', sent: false };
|
|
820
|
+
}
|
|
821
|
+
if (!ch) {
|
|
822
|
+
return { ok: false, code: 'AUN_CHANNEL_NOT_FOUND', error: `AUN channel not found for ${params.aid}` };
|
|
823
|
+
}
|
|
824
|
+
if (params.scope === 'group' ? typeof ch.sendDaemonGroupMsg !== 'function' : typeof ch.sendDaemonMsg !== 'function') {
|
|
825
|
+
return { ok: false, code: params.scope === 'group' ? 'AUN_GROUP_UNSUPPORTED' : 'AUN_MSG_UNSUPPORTED',
|
|
826
|
+
error: `AUN channel does not support daemon ${params.scope === 'group' ? 'group' : 'private'} sends` };
|
|
827
|
+
}
|
|
828
|
+
// 此标记仅由进程内 ThreadSystemMsgSender 注入,公共 IPC 不接收。
|
|
829
|
+
// 发送后直接返回渠道回执,不进入 handoff、inbox 或复查业务。
|
|
830
|
+
const diagnostic = { aid: params.aid, from: params.aid, to: params.to,
|
|
831
|
+
text: classifyAunPayloadForLog(payload).content };
|
|
832
|
+
diagLog('aun_out', diagnostic);
|
|
833
|
+
const sent = params.scope === 'group'
|
|
834
|
+
? await ch.sendDaemonGroupMsg({ groupId: params.to, payload, encrypt })
|
|
835
|
+
: await ch.sendDaemonMsg({ to: params.to, payload, encrypt });
|
|
836
|
+
if (sent.ok && sent.message_id)
|
|
837
|
+
diagLog('send_ok', { ...diagnostic, msgId: sent.message_id });
|
|
838
|
+
return sent;
|
|
839
|
+
}
|
|
765
840
|
// 非托管跨话题自派:调用方没有委托凭证,用本机 controlToken 证明「本机控制面调用」。
|
|
766
841
|
// 只有「跨话题自派 + 会话级 msg 发送」走这条,其余(含一切发给对端的发送)仍必须走委托链。
|
|
767
|
-
const localSelfSend =
|
|
768
|
-
&& params.localControl === true
|
|
842
|
+
const localSelfSend = params.localControl === true
|
|
769
843
|
&& selfAddressed
|
|
770
844
|
&& params.scope === 'msg'
|
|
771
845
|
&& !params.originSessionId;
|
|
@@ -789,18 +863,18 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
789
863
|
sessionId: '',
|
|
790
864
|
},
|
|
791
865
|
}
|
|
792
|
-
:
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
866
|
+
: protocolGrant ? { ok: true, grant: protocolGrant }
|
|
867
|
+
: await authorizeDelegatedAunMsgSend(agentDelegationRegistry, {
|
|
868
|
+
delegationToken: params.delegationToken,
|
|
869
|
+
delegationCommandHash: params.delegationCommandHash,
|
|
870
|
+
sessionId: params.originSessionId,
|
|
871
|
+
messageId: params.originMessageId,
|
|
872
|
+
aid: params.aid,
|
|
873
|
+
to: params.to,
|
|
874
|
+
scope: params.scope,
|
|
875
|
+
action: params.file ? 'file' : 'send',
|
|
876
|
+
threadRouted: authorizationTargetRouted,
|
|
877
|
+
});
|
|
804
878
|
if (!delegation.ok) {
|
|
805
879
|
return {
|
|
806
880
|
ok: false,
|
|
@@ -811,7 +885,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
811
885
|
...(delegation.sent === false ? { sent: false } : {}),
|
|
812
886
|
};
|
|
813
887
|
}
|
|
814
|
-
const fullAccess =
|
|
888
|
+
const fullAccess = hasTrustedFullAccessDelegation(delegation.grant);
|
|
815
889
|
try {
|
|
816
890
|
const fileScope = runtime?.projectPath && delegation.grant
|
|
817
891
|
? { selfAid: delegation.grant.selfAid, projectPath: runtime.projectPath,
|
|
@@ -821,13 +895,13 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
821
895
|
if ((textFile || payloadFile || params.file) && !fileScope)
|
|
822
896
|
throw new Error('Current task project context is unavailable');
|
|
823
897
|
if (textFile) {
|
|
824
|
-
const text = new TextDecoder('utf-8', { fatal: true }).decode(
|
|
898
|
+
const text = new TextDecoder('utf-8', { fatal: true }).decode(readMessageLocalFile(textFile, fileScope));
|
|
825
899
|
if (!text || text.includes('\0'))
|
|
826
900
|
throw new Error('Message file must contain nonempty UTF-8 text');
|
|
827
901
|
params.payload = { type: 'text', text };
|
|
828
902
|
}
|
|
829
903
|
if (payloadFile) {
|
|
830
|
-
const raw = new TextDecoder('utf-8', { fatal: true }).decode(
|
|
904
|
+
const raw = new TextDecoder('utf-8', { fatal: true }).decode(readMessageLocalFile(payloadFile, fileScope));
|
|
831
905
|
params.payload = parseJsonObjectArgument(raw, '--payload-file');
|
|
832
906
|
}
|
|
833
907
|
if (params.file) {
|
|
@@ -846,8 +920,12 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
846
920
|
: safeFormatMainTopicId(params.aid, gatewayRoute.peer.id);
|
|
847
921
|
const payloadThread = params.payload?.thread_id;
|
|
848
922
|
const expectedThread = isTopicThreadId(gatewayRoute.threadId) ? gatewayRoute.threadId : undefined;
|
|
923
|
+
// 自派一律是发给本端的 msg;委托按话题对端类型选 scope。
|
|
924
|
+
const expectedScope = gatewayRoute.recipient === 'self'
|
|
925
|
+
? 'msg'
|
|
926
|
+
: (gatewayRoute.peer.peerKind === 'group' ? 'group' : 'msg');
|
|
849
927
|
if (params.aid !== gatewayRoute.self || params.to !== gatewayRoute.recipientId
|
|
850
|
-
|| params.scope !==
|
|
928
|
+
|| params.scope !== expectedScope
|
|
851
929
|
|| topicId !== gatewayRoute.threadId
|
|
852
930
|
|| (payloadThread !== undefined && payloadThread !== expectedThread)) {
|
|
853
931
|
throw Object.assign(new Error('Message recipient or topic conflicts with the resolved send route'), {
|
|
@@ -863,31 +941,12 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
863
941
|
error: error instanceof Error ? error.message : String(error),
|
|
864
942
|
};
|
|
865
943
|
}
|
|
866
|
-
const inst = channelInstances.find((candidate) => {
|
|
867
|
-
if (candidate.channelType !== 'aun')
|
|
868
|
-
return false;
|
|
869
|
-
const ch = candidate.channel;
|
|
870
|
-
try {
|
|
871
|
-
const aidState = typeof ch?.getAidState === 'function' ? ch.getAidState() : null;
|
|
872
|
-
if (aidState?.aid === params.aid)
|
|
873
|
-
return true;
|
|
874
|
-
if (typeof ch?.getAid === 'function' && ch.getAid() === params.aid)
|
|
875
|
-
return true;
|
|
876
|
-
}
|
|
877
|
-
catch { /* ignore */ }
|
|
878
|
-
return false;
|
|
879
|
-
});
|
|
880
|
-
const ch = inst?.channel;
|
|
881
944
|
if (!ch) {
|
|
882
945
|
return { ok: false, error: `AUN channel not found for ${params.aid}`, code: 'AUN_CHANNEL_NOT_FOUND' };
|
|
883
946
|
}
|
|
884
|
-
// The IPC command already carries the caller-selected transport scope.
|
|
885
|
-
// Never reclassify the target by parsing its AID string: a private AID may
|
|
886
|
-
// look group-like and a group identifier may use a future format.
|
|
887
|
-
const encrypt = typeof params.encrypt === 'boolean'
|
|
888
|
-
? params.encrypt
|
|
889
|
-
: (typeof ch.getDefaultEncrypt === 'function' ? ch.getDefaultEncrypt() : false);
|
|
890
947
|
let payload = params.payload;
|
|
948
|
+
// 文件发送成功构造 payload 后,在这里留下归档路径文案,供后面写历史时使用。
|
|
949
|
+
let archivedFileLog = null;
|
|
891
950
|
if (params.file) {
|
|
892
951
|
if (isHClassPath(params.file.filePath) && !fullAccess) {
|
|
893
952
|
return {
|
|
@@ -909,17 +968,28 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
909
968
|
code: error?.code ?? 'AUN_FILE_UPLOAD_FAILED',
|
|
910
969
|
};
|
|
911
970
|
}
|
|
971
|
+
// 上传成功后归档到 agent 级附件目录(与 outbox 投递同一落点)。
|
|
972
|
+
// 归档失败不阻断发送:历史退回 payload 分类得到的 `[file] 文件名`。
|
|
973
|
+
if (typeof ch.archiveDaemonFile === 'function') {
|
|
974
|
+
archivedFileLog = ch.archiveDaemonFile(params.to, params.file.filePath, params.file.as);
|
|
975
|
+
}
|
|
912
976
|
}
|
|
913
977
|
if (!payload) {
|
|
914
978
|
return { ok: false, error: 'message payload is required', code: 'INVALID_PAYLOAD' };
|
|
915
979
|
}
|
|
980
|
+
if (payload.type === 'widget_card') {
|
|
981
|
+
if (params.returnPolicy === 'required' || params.deviceId || selfAddressed) {
|
|
982
|
+
return { ok: false, code: 'INVALID_WIDGET_TARGET', error: 'WidgetCard requires a conversation target without --return required or device targeting' };
|
|
983
|
+
}
|
|
984
|
+
payload = { ...payload, initiator: params.scope === 'group' ? delegation.grant?.actorId : params.to };
|
|
985
|
+
}
|
|
916
986
|
if (params.rawPayload !== true && runtime?.taskId
|
|
917
987
|
&& typeof payload.type === 'string' && TASK_ID_MESSAGE_PAYLOAD_TYPES.has(payload.type)) {
|
|
918
988
|
payload = { ...payload, task_id: runtime.taskId };
|
|
919
989
|
}
|
|
920
|
-
// 托管 argv 通道(
|
|
921
|
-
// 自身会写日志,私聊 sendDaemonMsg 只在 args.log
|
|
922
|
-
//
|
|
990
|
+
// 托管 argv 通道(ecmsg 经 daemon 发送)不带 log 元数据:群聊 sendDaemonGroupMsg
|
|
991
|
+
// 自身会写日志,私聊 sendDaemonMsg 只在 args.log 存在时才写,于是私聊的
|
|
992
|
+
// 托管发送不落 messages.jsonl,话题历史里查不到已发出的消息。
|
|
923
993
|
// 这里在 payload 定型后按同一套规则补出日志元数据,让两条路径记账一致。
|
|
924
994
|
if (params.argv !== undefined && params.log === undefined) {
|
|
925
995
|
const classified = classifyAunPayloadForLog(payload);
|
|
@@ -935,6 +1005,14 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
935
1005
|
},
|
|
936
1006
|
};
|
|
937
1007
|
}
|
|
1008
|
+
// 文件已归档:历史正文改记归档别名路径。是否压过 payload 分类结果只在
|
|
1009
|
+
// 交给通道时决定(见 channelLog),不进 IPC 线上契约。
|
|
1010
|
+
if (archivedFileLog && params.log) {
|
|
1011
|
+
params = { ...params, log: { ...params.log, content: archivedFileLog } };
|
|
1012
|
+
}
|
|
1013
|
+
const channelLog = (sessionId) => params.log
|
|
1014
|
+
? { ...params.log, sessionId, ...(archivedFileLog ? { contentAuthoritative: true } : {}) }
|
|
1015
|
+
: undefined;
|
|
938
1016
|
try {
|
|
939
1017
|
if (params.rawPayload !== true && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
|
|
940
1018
|
payload = { ...payload, mentions: normalizeAunMentionEntries(payload.mentions) };
|
|
@@ -1156,7 +1234,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
1156
1234
|
}
|
|
1157
1235
|
}
|
|
1158
1236
|
const debug = await resolveOutboundDebug(sessionId => responseEngine.getOutboundDebug(sessionId), params.originSessionId);
|
|
1159
|
-
// 主动发送路径(ecmsg send
|
|
1237
|
+
// 主动发送路径(ecmsg send)不经过
|
|
1160
1238
|
// deliverTextEntry,出站诊断需要在这里单独打点,否则 diag 里查不到 agent 手发的消息。
|
|
1161
1239
|
const diagText = params.log?.content ?? classifyAunPayloadForLog(payload).content;
|
|
1162
1240
|
const diagCommon = {
|
|
@@ -1179,7 +1257,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
1179
1257
|
encrypt,
|
|
1180
1258
|
debug,
|
|
1181
1259
|
model: typeof debug?.model === 'string' ? debug.model : undefined,
|
|
1182
|
-
log:
|
|
1260
|
+
log: channelLog(handoffSessionId ?? params.log?.sessionId),
|
|
1183
1261
|
});
|
|
1184
1262
|
if (threadRouted && targetTopicId && sent.ok && sent.message_id && targetSessionId) {
|
|
1185
1263
|
const effects = await applyManagedCrossThreadSendEffects({
|
|
@@ -1222,7 +1300,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
1222
1300
|
causation: runtimeCausation,
|
|
1223
1301
|
debug,
|
|
1224
1302
|
model: typeof debug?.model === 'string' ? debug.model : undefined,
|
|
1225
|
-
log:
|
|
1303
|
+
log: channelLog(handoffSessionId ?? params.log?.sessionId),
|
|
1226
1304
|
}).catch((error) => { finishContactDelegation(); throw error; });
|
|
1227
1305
|
finishContactDelegation(sent.ok ? sent.message_id : undefined);
|
|
1228
1306
|
// send_ok 只看网关是否返回 message_id,与 aun_out 的差值即发送失败次数;
|
|
@@ -1268,6 +1346,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
1268
1346
|
encrypted: encrypt,
|
|
1269
1347
|
originThreadId: runtime?.threadId,
|
|
1270
1348
|
originPeer: runtime?.peerId,
|
|
1349
|
+
fallbackProjectPath: runtime?.projectPath || resolveAgentProjectPath?.(params.aid),
|
|
1271
1350
|
});
|
|
1272
1351
|
if (delivered.deliveryError)
|
|
1273
1352
|
sent.self_delivery_error = delivered.deliveryError;
|
|
@@ -1300,4 +1379,41 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
|
|
|
1300
1379
|
return sent;
|
|
1301
1380
|
};
|
|
1302
1381
|
ipcServer.setAunMsgSender(sender);
|
|
1382
|
+
ipcServer.setAbilityRequestSender?.(async (params, originGrant) => {
|
|
1383
|
+
try {
|
|
1384
|
+
// This is a daemon-only API, not a public IPC flag or a payload-type
|
|
1385
|
+
// exemption. Retain the approved execution spec as well as argv, so
|
|
1386
|
+
// bounded-output/cd-prefixed approvals use the same v2 hash as IPC.
|
|
1387
|
+
if (hashDelegatedCommandArgv([MAIN_CLI_BIN, ...params.argv], params.executionSpec) !== params.delegationCommandHash) {
|
|
1388
|
+
return { ok: false, code: 'INVALID_DELEGATION', error: 'Ability command hash mismatch', sent: false };
|
|
1389
|
+
}
|
|
1390
|
+
const command = parseRemoteCommand(params.argv);
|
|
1391
|
+
const validation = agentDelegationRegistry.validate(params.delegationToken, params.originSessionId, params.delegationCommandHash);
|
|
1392
|
+
if (!validation.ok)
|
|
1393
|
+
return { ok: false, code: validation.code, error: validation.reason, sent: false };
|
|
1394
|
+
const validated = validation.grant;
|
|
1395
|
+
const grant = originGrant;
|
|
1396
|
+
if (!agentDelegationRegistry.isCurrentTaskGrant(grant) || validated.taskId !== grant.taskId
|
|
1397
|
+
|| validated.selfAid !== grant.selfAid || validated.sessionId !== grant.sessionId) {
|
|
1398
|
+
return { ok: false, code: 'INVALID_DELEGATION', error: 'Ability origin task was replaced or revoked', sent: false };
|
|
1399
|
+
}
|
|
1400
|
+
if (grant.selfAid !== params.aid || grant.channelType !== 'aun' || !agentDelegationRegistry.isCurrentTaskGrant(grant)
|
|
1401
|
+
|| grant.messageId !== params.originMessageId || !['call', 'discover'].includes(command.action) || command.options['dry-run']
|
|
1402
|
+
|| params.payload.type !== 'ability' || params.payload.role !== 'call'
|
|
1403
|
+
|| command.provider && command.provider !== params.to
|
|
1404
|
+
|| (command.action === 'discover' ? params.payload.ability_path !== 'protocol/discover' : command.path && command.path !== params.payload.ability_path)) {
|
|
1405
|
+
return { ok: false, code: 'INVALID_DELEGATION', error: 'Ability request does not match its approved Caller and command', sent: false };
|
|
1406
|
+
}
|
|
1407
|
+
if (command.action === 'call' && grant.permissionMode === 'readonly') {
|
|
1408
|
+
return { ok: false, code: 'NOT_ALLOWED', error: 'Readonly tasks cannot send business calls', sent: false };
|
|
1409
|
+
}
|
|
1410
|
+
return sender({ aid: params.aid, to: params.to, scope: 'msg', deviceId: params.deviceId, payload: params.payload,
|
|
1411
|
+
rawPayload: true, encrypt: true, returnPolicy: 'required', timeoutMs: params.timeoutMs,
|
|
1412
|
+
originSessionId: params.originSessionId, originMessageId: params.originMessageId,
|
|
1413
|
+
delegationToken: params.delegationToken, delegationCommandHash: params.delegationCommandHash }, undefined, undefined, grant);
|
|
1414
|
+
}
|
|
1415
|
+
catch (error) {
|
|
1416
|
+
return { ok: false, code: error.code ?? 'INVALID_ARGUMENT', error: error instanceof Error ? error.message : String(error), sent: false };
|
|
1417
|
+
}
|
|
1418
|
+
});
|
|
1303
1419
|
}
|
|
@@ -4,8 +4,16 @@ import crypto from 'crypto';
|
|
|
4
4
|
import { StringDecoder } from 'node:string_decoder';
|
|
5
5
|
import { resolvePaths } from '../../paths.js';
|
|
6
6
|
import { appendJsonlDurable } from '../session/session-fs-store.js';
|
|
7
|
-
import {
|
|
7
|
+
import { isAbilityDiscoveryQuery } from '../../aun/ability-device-routing.js';
|
|
8
8
|
import { validateAbilityResult } from '../../ability/interop-v1.js';
|
|
9
|
+
/** Remove standard Ability credential fields from durable request history. */
|
|
10
|
+
export function redactAbilityCredentials(value) {
|
|
11
|
+
if (Array.isArray(value))
|
|
12
|
+
return value.map(redactAbilityCredentials);
|
|
13
|
+
if (!value || typeof value !== 'object')
|
|
14
|
+
return value;
|
|
15
|
+
return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, key === 'credential' ? '[redacted]' : redactAbilityCredentials(item)]));
|
|
16
|
+
}
|
|
9
17
|
export function requestDiagnostics(record) {
|
|
10
18
|
const ignoredReason = record.lastIgnoredResponse?.reason;
|
|
11
19
|
const unresolved = record.state !== 'completed' && record.state !== 'failed';
|
|
@@ -62,6 +70,7 @@ function normalizeTimeoutMs(value) {
|
|
|
62
70
|
export class AunRequestRegistry {
|
|
63
71
|
records = new Map();
|
|
64
72
|
waiters = new Map();
|
|
73
|
+
observers = new Map();
|
|
65
74
|
loaded = new Set();
|
|
66
75
|
appends = new Map();
|
|
67
76
|
key(selfAid, requestId) {
|
|
@@ -127,7 +136,7 @@ export class AunRequestRegistry {
|
|
|
127
136
|
persist(record) {
|
|
128
137
|
const file = requestFile(record.selfAid);
|
|
129
138
|
fs.mkdirSync(path.dirname(file), { recursive: true });
|
|
130
|
-
appendJsonlDurable(file, { event: 'upsert', record });
|
|
139
|
+
appendJsonlDurable(file, { event: 'upsert', record: record.responseCorrelation ? redactAbilityCredentials(record) : record });
|
|
131
140
|
this.records.set(this.key(record.selfAid, record.requestId), record);
|
|
132
141
|
for (const alias of record.correlationKeys)
|
|
133
142
|
this.records.set(this.key(record.selfAid, alias), record);
|
|
@@ -151,7 +160,7 @@ export class AunRequestRegistry {
|
|
|
151
160
|
const fd = fs.openSync(staged, 'wx', 0o600);
|
|
152
161
|
try {
|
|
153
162
|
for (const record of this.recordsFor(selfAid))
|
|
154
|
-
fs.writeSync(fd, JSON.stringify({ event: 'upsert', record }) + '\n');
|
|
163
|
+
fs.writeSync(fd, JSON.stringify({ event: 'upsert', record: record.responseCorrelation ? redactAbilityCredentials(record) : record }) + '\n');
|
|
155
164
|
fs.fsyncSync(fd);
|
|
156
165
|
}
|
|
157
166
|
finally {
|
|
@@ -165,6 +174,12 @@ export class AunRequestRegistry {
|
|
|
165
174
|
}
|
|
166
175
|
}
|
|
167
176
|
notify(record) {
|
|
177
|
+
if (['completed', 'failed'].includes(record.state)) {
|
|
178
|
+
const key = this.key(record.selfAid, record.requestId);
|
|
179
|
+
for (const observer of this.observers.get(key) ?? [])
|
|
180
|
+
observer(record);
|
|
181
|
+
this.observers.delete(key);
|
|
182
|
+
}
|
|
168
183
|
if (!['completed', 'failed', 'unknown', 'pending'].includes(record.state))
|
|
169
184
|
return;
|
|
170
185
|
const waiters = this.waiters.get(this.key(record.selfAid, record.requestId));
|
|
@@ -213,7 +228,7 @@ export class AunRequestRegistry {
|
|
|
213
228
|
updatedAt: now,
|
|
214
229
|
deadlineAt: now + collectionMs,
|
|
215
230
|
...(abilityCorrelation ? { responseCorrelation: abilityCorrelation } : {}),
|
|
216
|
-
...(!params.targetDeviceId &&
|
|
231
|
+
...(!params.targetDeviceId && isAbilityDiscoveryQuery(params.payload) ? {
|
|
217
232
|
responseMode: 'all_devices',
|
|
218
233
|
responses: [],
|
|
219
234
|
} : {}),
|
|
@@ -296,7 +311,7 @@ export class AunRequestRegistry {
|
|
|
296
311
|
if (expected) {
|
|
297
312
|
// Match EvolApp's caller: encrypted private transport is required.
|
|
298
313
|
// Generic requests keep their existing transport semantics.
|
|
299
|
-
if (params.encrypted !== true || params.transport !== 'p2p')
|
|
314
|
+
if (params.encrypted !== true || params.transport !== 'p2p' || !stringValue(params.fromDeviceId))
|
|
300
315
|
continue;
|
|
301
316
|
try {
|
|
302
317
|
// EvolApp replay ACKs can omit ability_path; terminal results must
|
|
@@ -394,6 +409,30 @@ export class AunRequestRegistry {
|
|
|
394
409
|
}, waitMs);
|
|
395
410
|
});
|
|
396
411
|
}
|
|
412
|
+
/** Observe late results without extending the original transmission/collection TTL. */
|
|
413
|
+
async observe(selfAid, requestId, timeoutMs) {
|
|
414
|
+
const current = this.get(selfAid, requestId);
|
|
415
|
+
if (!current || ['completed', 'failed'].includes(current.state))
|
|
416
|
+
return current;
|
|
417
|
+
return new Promise(resolve => {
|
|
418
|
+
const key = this.key(selfAid, requestId);
|
|
419
|
+
const waiters = this.observers.get(key) ?? new Set();
|
|
420
|
+
const done = (record) => {
|
|
421
|
+
clearTimeout(timer);
|
|
422
|
+
waiters.delete(callback);
|
|
423
|
+
if (waiters.size === 0)
|
|
424
|
+
this.observers.delete(key);
|
|
425
|
+
resolve(record);
|
|
426
|
+
};
|
|
427
|
+
const callback = (record) => {
|
|
428
|
+
if (['completed', 'failed'].includes(record.state))
|
|
429
|
+
done(record);
|
|
430
|
+
};
|
|
431
|
+
const timer = setTimeout(() => done(this.get(selfAid, requestId)), Math.max(1, Math.min(timeoutMs, 60_000)));
|
|
432
|
+
waiters.add(callback);
|
|
433
|
+
this.observers.set(key, waiters);
|
|
434
|
+
});
|
|
435
|
+
}
|
|
397
436
|
}
|
|
398
437
|
let defaultRegistry;
|
|
399
438
|
export function getAunRequestRegistry() {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { readGroupHistoryContext } from '../../aun/group/history.js';
|
|
3
3
|
import { getPackageRoot } from '../../paths.js';
|
|
4
|
-
import { createErrorCapturingReader, fileCache } from '../daemon-file-cache.js';
|
|
4
|
+
import { createErrorCapturingReader, fileCache } from '../daemon/daemon-file-cache.js';
|
|
5
5
|
import { logger } from '../../utils/logger.js';
|
|
6
6
|
const MAX_HISTORY_MESSAGES = 20;
|
|
7
7
|
const MAX_HISTORY_MESSAGE_CHARS = 800;
|
|
@@ -7,7 +7,7 @@ import { atomicWriteJson } from '../../utils/atomic-write.js';
|
|
|
7
7
|
import { isValidAid } from '../../aun/aid/validation.js';
|
|
8
8
|
import { readAccessPolicy } from '../../config/access-policy.js';
|
|
9
9
|
import { resolvePeerView } from '../../config/peer-book.js';
|
|
10
|
-
import { readOwnerDirectoryMembership } from '../../directory/
|
|
10
|
+
import { readOwnerDirectoryMembership } from '../../directory/admission.js';
|
|
11
11
|
import { ownerResolver } from '../ownership/owner-resolver.js';
|
|
12
12
|
import { isProcessRunning } from '../../utils/cross-platform.js';
|
|
13
13
|
export const CONTACT_EVENT_TTL_MS = 3 * 24 * 60 * 60 * 1000;
|