@zhin.js/agent 0.2.0 → 0.2.1
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/README.md +1 -1
- package/lib/agent-prompt/resolver.js +4 -4
- package/lib/agent-prompt/resolver.js.map +1 -1
- package/lib/ai-event-bus.d.ts.map +1 -1
- package/lib/ai-event-bus.js +20 -31
- package/lib/ai-event-bus.js.map +1 -1
- package/lib/ai-event-subscriber.d.ts +1 -1
- package/lib/ai-event-subscriber.d.ts.map +1 -1
- package/lib/ai-event-subscriber.js +1 -1
- package/lib/ai-event-subscriber.js.map +1 -1
- package/lib/assistant/home-policy.d.ts +2 -2
- package/lib/assistant/home-policy.d.ts.map +1 -1
- package/lib/assistant/home-policy.js +28 -10
- package/lib/assistant/home-policy.js.map +1 -1
- package/lib/assistant/home-tools.js +14 -14
- package/lib/assistant/home-tools.js.map +1 -1
- package/lib/assistant/index.d.ts +1 -1
- package/lib/assistant/index.js +1 -1
- package/lib/assistant/legacy-convert.d.ts +3 -8
- package/lib/assistant/legacy-convert.d.ts.map +1 -1
- package/lib/assistant/legacy-convert.js +8 -8
- package/lib/assistant/legacy-convert.js.map +1 -1
- package/lib/assistant/notification-router.js +6 -6
- package/lib/assistant/notification-router.js.map +1 -1
- package/lib/assistant/types.d.ts +1 -1
- package/lib/assistant/types.d.ts.map +1 -1
- package/lib/builtin/activate-skill-tool.d.ts +2 -2
- package/lib/builtin/activate-skill-tool.d.ts.map +1 -1
- package/lib/builtin/activate-skill-tool.js +1 -1
- package/lib/builtin/activate-skill-tool.js.map +1 -1
- package/lib/builtin/analyze-media-tool.d.ts +2 -2
- package/lib/builtin/analyze-media-tool.d.ts.map +1 -1
- package/lib/builtin/analyze-media-tool.js +3 -3
- package/lib/builtin/analyze-media-tool.js.map +1 -1
- package/lib/builtin/ask-user-tool.d.ts +4 -4
- package/lib/builtin/ask-user-tool.d.ts.map +1 -1
- package/lib/builtin/ask-user-tool.js +16 -16
- package/lib/builtin/ask-user-tool.js.map +1 -1
- package/lib/builtin/bash-tool.d.ts +2 -2
- package/lib/builtin/bash-tool.d.ts.map +1 -1
- package/lib/builtin/bash-tool.js +8 -3
- package/lib/builtin/bash-tool.js.map +1 -1
- package/lib/builtin/builtin-base-tool.d.ts +2 -2
- package/lib/builtin/builtin-base-tool.d.ts.map +1 -1
- package/lib/builtin/edit-file-tool.d.ts +2 -2
- package/lib/builtin/edit-file-tool.d.ts.map +1 -1
- package/lib/builtin/edit-file-tool.js +6 -6
- package/lib/builtin/edit-file-tool.js.map +1 -1
- package/lib/builtin/glob-tool.d.ts +2 -2
- package/lib/builtin/glob-tool.d.ts.map +1 -1
- package/lib/builtin/glob-tool.js +3 -3
- package/lib/builtin/glob-tool.js.map +1 -1
- package/lib/builtin/grep-tool.d.ts +2 -2
- package/lib/builtin/grep-tool.d.ts.map +1 -1
- package/lib/builtin/grep-tool.js +3 -3
- package/lib/builtin/grep-tool.js.map +1 -1
- package/lib/builtin/install-skill-tool.d.ts +2 -2
- package/lib/builtin/install-skill-tool.d.ts.map +1 -1
- package/lib/builtin/install-skill-tool.js +1 -1
- package/lib/builtin/install-skill-tool.js.map +1 -1
- package/lib/builtin/list-dir-tool.d.ts +2 -2
- package/lib/builtin/list-dir-tool.d.ts.map +1 -1
- package/lib/builtin/list-dir-tool.js +3 -3
- package/lib/builtin/list-dir-tool.js.map +1 -1
- package/lib/builtin/memory-search-tool.d.ts.map +1 -1
- package/lib/builtin/memory-search-tool.js +5 -11
- package/lib/builtin/memory-search-tool.js.map +1 -1
- package/lib/builtin/memory-upsert-tool.d.ts.map +1 -1
- package/lib/builtin/memory-upsert-tool.js +10 -16
- package/lib/builtin/memory-upsert-tool.js.map +1 -1
- package/lib/builtin/orchestration-tools.d.ts +2 -2
- package/lib/builtin/orchestration-tools.d.ts.map +1 -1
- package/lib/builtin/orchestration-tools.js +5 -11
- package/lib/builtin/orchestration-tools.js.map +1 -1
- package/lib/builtin/read-file-tool.d.ts +2 -2
- package/lib/builtin/read-file-tool.d.ts.map +1 -1
- package/lib/builtin/read-file-tool.js +4 -4
- package/lib/builtin/read-file-tool.js.map +1 -1
- package/lib/builtin/spawn-task-tool.d.ts +6 -6
- package/lib/builtin/spawn-task-tool.d.ts.map +1 -1
- package/lib/builtin/spawn-task-tool.js +10 -17
- package/lib/builtin/spawn-task-tool.js.map +1 -1
- package/lib/builtin/todo-read-tool.d.ts +2 -2
- package/lib/builtin/todo-read-tool.d.ts.map +1 -1
- package/lib/builtin/todo-read-tool.js +1 -1
- package/lib/builtin/todo-read-tool.js.map +1 -1
- package/lib/builtin/todo-write-tool.d.ts +2 -2
- package/lib/builtin/todo-write-tool.d.ts.map +1 -1
- package/lib/builtin/todo-write-tool.js +1 -1
- package/lib/builtin/todo-write-tool.js.map +1 -1
- package/lib/builtin/web-fetch-tool.d.ts +2 -2
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +2 -2
- package/lib/builtin/web-fetch-tool.js.map +1 -1
- package/lib/builtin/web-search-locale.d.ts +4 -4
- package/lib/builtin/web-search-locale.d.ts.map +1 -1
- package/lib/builtin/web-search-locale.js +4 -3
- package/lib/builtin/web-search-locale.js.map +1 -1
- package/lib/builtin/web-search-tool.d.ts +3 -3
- package/lib/builtin/web-search-tool.d.ts.map +1 -1
- package/lib/builtin/web-search-tool.js +3 -3
- package/lib/builtin/web-search-tool.js.map +1 -1
- package/lib/builtin/write-file-tool.d.ts +2 -2
- package/lib/builtin/write-file-tool.d.ts.map +1 -1
- package/lib/builtin/write-file-tool.js +6 -6
- package/lib/builtin/write-file-tool.js.map +1 -1
- package/lib/common-adapter-tools.js +3 -3
- package/lib/common-adapter-tools.js.map +1 -1
- package/lib/config/fix-ai-config.d.ts +9 -0
- package/lib/config/fix-ai-config.d.ts.map +1 -0
- package/lib/config/fix-ai-config.js +69 -0
- package/lib/config/fix-ai-config.js.map +1 -0
- package/lib/config/index.d.ts +5 -0
- package/lib/config/index.d.ts.map +1 -0
- package/lib/config/index.js +5 -0
- package/lib/config/index.js.map +1 -0
- package/lib/config/types.d.ts +1 -1
- package/lib/config/types.d.ts.map +1 -1
- package/lib/cron-engine.d.ts.map +1 -1
- package/lib/cron-engine.js +4 -4
- package/lib/cron-engine.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts +2 -2
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +3 -3
- package/lib/discovery/tools.d.ts +1 -1
- package/lib/discovery/tools.d.ts.map +1 -1
- package/lib/discovery/tools.js +21 -6
- package/lib/discovery/tools.js.map +1 -1
- package/lib/hooks.d.ts +1 -1
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js +1 -1
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +5 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -2
- package/lib/index.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +20 -9
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-args.d.ts +1 -1
- package/lib/init/introspection-args.js +1 -1
- package/lib/init/introspection-args.js.map +1 -1
- package/lib/init/introspection-collectors.d.ts +2 -2
- package/lib/init/introspection-collectors.d.ts.map +1 -1
- package/lib/init/introspection-collectors.js +4 -4
- package/lib/init/introspection-collectors.js.map +1 -1
- package/lib/init/introspection-commands-format.d.ts +3 -3
- package/lib/init/introspection-commands-format.d.ts.map +1 -1
- package/lib/init/introspection-commands-format.js +6 -6
- package/lib/init/introspection-commands-format.js.map +1 -1
- package/lib/init/introspection-rest.d.ts +2 -2
- package/lib/init/introspection-rest.d.ts.map +1 -1
- package/lib/init/introspection-rest.js +4 -4
- package/lib/init/introspection-rest.js.map +1 -1
- package/lib/init/management-command-guard.d.ts +3 -3
- package/lib/init/management-command-guard.d.ts.map +1 -1
- package/lib/init/management-command-guard.js +3 -3
- package/lib/init/management-command-guard.js.map +1 -1
- package/lib/init/message-media.d.ts +2 -2
- package/lib/init/message-media.d.ts.map +1 -1
- package/lib/init/message-media.js +1 -1
- package/lib/init/message-media.js.map +1 -1
- package/lib/init/register-ai-trigger.d.ts.map +1 -1
- package/lib/init/register-ai-trigger.js +43 -58
- package/lib/init/register-ai-trigger.js.map +1 -1
- package/lib/init/register-db-upgrade.d.ts.map +1 -1
- package/lib/init/register-db-upgrade.js +2 -0
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/register-group-session-passive.d.ts.map +1 -1
- package/lib/init/register-group-session-passive.js +5 -10
- package/lib/init/register-group-session-passive.js.map +1 -1
- package/lib/init/register-introspection-commands.js +7 -7
- package/lib/init/register-introspection-commands.js.map +1 -1
- package/lib/init/register-management-tools.d.ts.map +1 -1
- package/lib/init/register-management-tools.js +8 -29
- package/lib/init/register-management-tools.js.map +1 -1
- package/lib/init/register-owner-approve-commands.js +13 -13
- package/lib/init/register-owner-approve-commands.js.map +1 -1
- package/lib/init/register-typing-indicator.d.ts +3 -3
- package/lib/init/register-typing-indicator.js +41 -41
- package/lib/init/register-typing-indicator.js.map +1 -1
- package/lib/init/upgrade-agent-db-schema.d.ts.map +1 -1
- package/lib/init/upgrade-agent-db-schema.js +5 -4
- package/lib/init/upgrade-agent-db-schema.js.map +1 -1
- package/lib/init/upgrade-endpoint-id-schema.d.ts +12 -0
- package/lib/init/upgrade-endpoint-id-schema.d.ts.map +1 -0
- package/lib/init/upgrade-endpoint-id-schema.js +58 -0
- package/lib/init/upgrade-endpoint-id-schema.js.map +1 -0
- package/lib/mcp-client/connection.js +1 -1
- package/lib/mcp-client/connection.js.map +1 -1
- package/lib/media/constants.d.ts +1 -1
- package/lib/media/constants.d.ts.map +1 -1
- package/lib/media/constants.js +1 -1
- package/lib/media/constants.js.map +1 -1
- package/lib/media/deliver-subagent-result.d.ts.map +1 -1
- package/lib/media/deliver-subagent-result.js +6 -5
- package/lib/media/deliver-subagent-result.js.map +1 -1
- package/lib/memory-layers.d.ts +3 -3
- package/lib/memory-layers.d.ts.map +1 -1
- package/lib/memory-layers.js +3 -3
- package/lib/memory-layers.js.map +1 -1
- package/lib/orchestrator/delegation-processor.d.ts.map +1 -1
- package/lib/orchestrator/delegation-processor.js +8 -8
- package/lib/orchestrator/delegation-processor.js.map +1 -1
- package/lib/orchestrator/hook-registry.js.map +1 -1
- package/lib/orchestrator/mission-milestone-notify.d.ts +3 -3
- package/lib/orchestrator/mission-milestone-notify.d.ts.map +1 -1
- package/lib/orchestrator/mission-milestone-notify.js +15 -10
- package/lib/orchestrator/mission-milestone-notify.js.map +1 -1
- package/lib/orchestrator/mission-runner.d.ts +2 -3
- package/lib/orchestrator/mission-runner.d.ts.map +1 -1
- package/lib/orchestrator/mission-runner.js +13 -11
- package/lib/orchestrator/mission-runner.js.map +1 -1
- package/lib/orchestrator/orchestration-repository.d.ts +6 -0
- package/lib/orchestrator/orchestration-repository.d.ts.map +1 -1
- package/lib/orchestrator/orchestration-repository.js +30 -0
- package/lib/orchestrator/orchestration-repository.js.map +1 -1
- package/lib/orchestrator/owner-confirm-orchestration.d.ts +3 -3
- package/lib/orchestrator/owner-confirm-orchestration.d.ts.map +1 -1
- package/lib/orchestrator/owner-confirm-orchestration.js +5 -5
- package/lib/orchestrator/owner-confirm-orchestration.js.map +1 -1
- package/lib/orchestrator/tool-registry.d.ts +4 -5
- package/lib/orchestrator/tool-registry.d.ts.map +1 -1
- package/lib/orchestrator/tool-registry.js +7 -11
- package/lib/orchestrator/tool-registry.js.map +1 -1
- package/lib/orchestrator/tool-selection.d.ts +7 -6
- package/lib/orchestrator/tool-selection.d.ts.map +1 -1
- package/lib/orchestrator/tool-selection.js +47 -38
- package/lib/orchestrator/tool-selection.js.map +1 -1
- package/lib/orchestrator/types.d.ts +3 -6
- package/lib/orchestrator/types.d.ts.map +1 -1
- package/lib/routing/route-matcher.d.ts +1 -1
- package/lib/routing/route-matcher.d.ts.map +1 -1
- package/lib/routing/route-matcher.js +3 -3
- package/lib/routing/route-matcher.js.map +1 -1
- package/lib/security/audit-logger.d.ts +3 -3
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +2 -2
- package/lib/security/audit-logger.js.map +1 -1
- package/lib/security/comm-message-context.d.ts +20 -0
- package/lib/security/comm-message-context.d.ts.map +1 -0
- package/lib/security/comm-message-context.js +19 -0
- package/lib/security/comm-message-context.js.map +1 -0
- package/lib/security/dangerous-tool-policy.d.ts +4 -4
- package/lib/security/dangerous-tool-policy.d.ts.map +1 -1
- package/lib/security/dangerous-tool-policy.js +39 -31
- package/lib/security/dangerous-tool-policy.js.map +1 -1
- package/lib/security/exec-policy.js +9 -9
- package/lib/security/exec-policy.js.map +1 -1
- package/lib/security/file-role-policy.d.ts +1 -1
- package/lib/security/file-role-policy.d.ts.map +1 -1
- package/lib/security/file-role-policy.js +3 -4
- package/lib/security/file-role-policy.js.map +1 -1
- package/lib/security/index.d.ts +1 -1
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +1 -1
- package/lib/security/index.js.map +1 -1
- package/lib/security/owner-approve-always-store.d.ts +18 -16
- package/lib/security/owner-approve-always-store.d.ts.map +1 -1
- package/lib/security/owner-approve-always-store.js +133 -117
- package/lib/security/owner-approve-always-store.js.map +1 -1
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +7 -1
- package/lib/service.js.map +1 -1
- package/lib/stability/memory-pressure.d.ts +31 -0
- package/lib/stability/memory-pressure.d.ts.map +1 -0
- package/lib/stability/memory-pressure.js +104 -0
- package/lib/stability/memory-pressure.js.map +1 -0
- package/lib/stability/registry-cleanup.d.ts +5 -0
- package/lib/stability/registry-cleanup.d.ts.map +1 -0
- package/lib/stability/registry-cleanup.js +20 -0
- package/lib/stability/registry-cleanup.js.map +1 -0
- package/lib/subagent-ai-events.d.ts +2 -2
- package/lib/subagent-ai-events.d.ts.map +1 -1
- package/lib/subagent-ai-events.js +5 -22
- package/lib/subagent-ai-events.js.map +1 -1
- package/lib/subagent-goal-notify.d.ts +4 -4
- package/lib/subagent-goal-notify.d.ts.map +1 -1
- package/lib/subagent-goal-notify.js +6 -5
- package/lib/subagent-goal-notify.js.map +1 -1
- package/lib/subagent.d.ts +3 -11
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +3 -9
- package/lib/subagent.js.map +1 -1
- package/lib/task-executor.d.ts +1 -0
- package/lib/task-executor.d.ts.map +1 -1
- package/lib/task-executor.js +17 -9
- package/lib/task-executor.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.d.ts +22 -22
- package/lib/typing-indicator/adapter-integration.d.ts.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +47 -47
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/typing-indicator/index.d.ts +2 -2
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +1 -1
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/typing-indicator/integration.d.ts +8 -8
- package/lib/typing-indicator/integration.d.ts.map +1 -1
- package/lib/typing-indicator/integration.js +14 -14
- package/lib/typing-indicator/integration.js.map +1 -1
- package/lib/zhin-agent/agent-loop-standalone.d.ts +2 -2
- package/lib/zhin-agent/agent-loop-standalone.d.ts.map +1 -1
- package/lib/zhin-agent/agent-loop-standalone.js +5 -5
- package/lib/zhin-agent/agent-loop-standalone.js.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.d.ts +4 -4
- package/lib/zhin-agent/agent-loop-turn.d.ts.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.js +8 -8
- package/lib/zhin-agent/agent-loop-turn.js.map +1 -1
- package/lib/zhin-agent/builtin-tools.d.ts.map +1 -1
- package/lib/zhin-agent/compaction-runtime.d.ts +6 -2
- package/lib/zhin-agent/compaction-runtime.d.ts.map +1 -1
- package/lib/zhin-agent/compaction-runtime.js +25 -1
- package/lib/zhin-agent/compaction-runtime.js.map +1 -1
- package/lib/zhin-agent/deferred-delivery.d.ts +3 -3
- package/lib/zhin-agent/deferred-delivery.d.ts.map +1 -1
- package/lib/zhin-agent/deferred-delivery.js +5 -5
- package/lib/zhin-agent/deferred-delivery.js.map +1 -1
- package/lib/zhin-agent/event-emitter.d.ts +2 -2
- package/lib/zhin-agent/event-emitter.d.ts.map +1 -1
- package/lib/zhin-agent/event-emitter.js +7 -7
- package/lib/zhin-agent/event-emitter.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +12 -12
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +38 -92
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/model-resolver.d.ts.map +1 -1
- package/lib/zhin-agent/model-resolver.js +2 -0
- package/lib/zhin-agent/model-resolver.js.map +1 -1
- package/lib/zhin-agent/persist-deferred-context.d.ts +2 -2
- package/lib/zhin-agent/persist-deferred-context.d.ts.map +1 -1
- package/lib/zhin-agent/persist-deferred-context.js +3 -9
- package/lib/zhin-agent/persist-deferred-context.js.map +1 -1
- package/lib/zhin-agent/prompt-assembly.d.ts +5 -5
- package/lib/zhin-agent/prompt-assembly.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-assembly.js +11 -11
- package/lib/zhin-agent/prompt-assembly.js.map +1 -1
- package/lib/zhin-agent/prompt-controller.d.ts +3 -3
- package/lib/zhin-agent/prompt-controller.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-controller.js +2 -2
- package/lib/zhin-agent/prompt-controller.js.map +1 -1
- package/lib/zhin-agent/prompt.d.ts +8 -8
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +40 -53
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/session-io.d.ts +8 -8
- package/lib/zhin-agent/session-io.d.ts.map +1 -1
- package/lib/zhin-agent/session-io.js +45 -30
- package/lib/zhin-agent/session-io.js.map +1 -1
- package/lib/zhin-agent/session-tree-commands.d.ts +3 -3
- package/lib/zhin-agent/session-tree-commands.d.ts.map +1 -1
- package/lib/zhin-agent/session-tree-commands.js +7 -19
- package/lib/zhin-agent/session-tree-commands.js.map +1 -1
- package/lib/zhin-agent/tool-orchestration.d.ts +3 -3
- package/lib/zhin-agent/tool-orchestration.d.ts.map +1 -1
- package/lib/zhin-agent/tool-orchestration.js +9 -15
- package/lib/zhin-agent/tool-orchestration.js.map +1 -1
- package/lib/zhin-agent/tool-runtime.d.ts +2 -2
- package/lib/zhin-agent/tool-runtime.d.ts.map +1 -1
- package/lib/zhin-agent/tool-runtime.js +2 -2
- package/lib/zhin-agent/tool-runtime.js.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.d.ts +2 -2
- package/lib/zhin-agent/tool-search-orchestrator.d.ts.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.js +9 -9
- package/lib/zhin-agent/tool-search-orchestrator.js.map +1 -1
- package/lib/zhin-agent/turn-pipeline.d.ts +4 -3
- package/lib/zhin-agent/turn-pipeline.d.ts.map +1 -1
- package/lib/zhin-agent/turn-pipeline.js +37 -59
- package/lib/zhin-agent/turn-pipeline.js.map +1 -1
- package/lib/zhin-agent/turn-user-message.d.ts +2 -2
- package/lib/zhin-agent/turn-user-message.d.ts.map +1 -1
- package/lib/zhin-agent/turn-user-message.js +2 -2
- package/lib/zhin-agent/turn-user-message.js.map +1 -1
- package/lib/zhin-agent/web-search-locale-attach.d.ts +2 -2
- package/lib/zhin-agent/web-search-locale-attach.d.ts.map +1 -1
- package/lib/zhin-agent/web-search-locale-attach.js +5 -4
- package/lib/zhin-agent/web-search-locale-attach.js.map +1 -1
- package/lib/zhin-agent/zhin-agent-private.d.ts +7 -7
- package/lib/zhin-agent/zhin-agent-private.d.ts.map +1 -1
- package/package.json +15 -5
- package/lib/security/bash-tool-context.d.ts +0 -20
- package/lib/security/bash-tool-context.d.ts.map +0 -1
- package/lib/security/bash-tool-context.js +0 -19
- package/lib/security/bash-tool-context.js.map +0 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
*/
|
|
5
5
|
import { getPlugin, MessageCommand } from '@zhin.js/core';
|
|
6
|
-
import { addBashApproveRule, addOwnerApproveAlways, clearPendingOrchestrationTool, formatBashApproveList,
|
|
6
|
+
import { addBashApproveRule, addOwnerApproveAlways, clearPendingOrchestrationTool, formatBashApproveList, getOwnerCommMessageOrUndefined, getPendingOrchestrationTool, removeBashApproveRule, removeOwnerApproveAlways, OWNER_APPROVE_ALWAYS_TOOL, } from '../security/owner-approve-always-store.js';
|
|
7
7
|
function usageLines() {
|
|
8
8
|
return [
|
|
9
9
|
'用法(bash / icqq):',
|
|
@@ -21,9 +21,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
21
21
|
.usage('/approve always bash')
|
|
22
22
|
.action((message) => {
|
|
23
23
|
const plugin = getPlugin().root ?? getPlugin();
|
|
24
|
-
const ctx =
|
|
24
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
25
25
|
if (!ctx)
|
|
26
|
-
return '⚠️ 仅
|
|
26
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
27
27
|
const r = addOwnerApproveAlways(plugin, ctx, OWNER_APPROVE_ALWAYS_TOOL);
|
|
28
28
|
if (!r.ok)
|
|
29
29
|
return `⚠️ ${r.error}\n${usageLines()}`;
|
|
@@ -35,9 +35,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
35
35
|
.desc('Owner:永久放行 bash(须在近期 bash 待确认窗口内)')
|
|
36
36
|
.action((message) => {
|
|
37
37
|
const plugin = getPlugin().root ?? getPlugin();
|
|
38
|
-
const ctx =
|
|
38
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
39
39
|
if (!ctx)
|
|
40
|
-
return '⚠️ 仅
|
|
40
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
41
41
|
const pending = getPendingOrchestrationTool(plugin, ctx);
|
|
42
42
|
if (!pending) {
|
|
43
43
|
return `⚠️ 无近期 bash 待确认上下文,请使用:/approve always bash。\n${usageLines()}`;
|
|
@@ -54,9 +54,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
54
54
|
.desc('Owner:按 id(或前 8 位前缀)删除一条放行正则')
|
|
55
55
|
.action((message, match) => {
|
|
56
56
|
const plugin = getPlugin().root ?? getPlugin();
|
|
57
|
-
const ctx =
|
|
57
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
58
58
|
if (!ctx)
|
|
59
|
-
return '⚠️ 仅
|
|
59
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
60
60
|
const id = String(match.params?.id ?? '').trim();
|
|
61
61
|
if (!id)
|
|
62
62
|
return `⚠️ 请提供规则 id。\n${usageLines()}`;
|
|
@@ -72,9 +72,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
72
72
|
.usage('/approve rule ^icqq\\\\s+friend\\\\s+like\\\\b')
|
|
73
73
|
.action((message, match) => {
|
|
74
74
|
const plugin = getPlugin().root ?? getPlugin();
|
|
75
|
-
const ctx =
|
|
75
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
76
76
|
if (!ctx)
|
|
77
|
-
return '⚠️ 仅
|
|
77
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
78
78
|
const raw = String(match.params?.pattern ?? '').trim();
|
|
79
79
|
if (!raw)
|
|
80
80
|
return `⚠️ 请提供正则。\n${usageLines()}`;
|
|
@@ -89,9 +89,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
89
89
|
.desc('Owner:列出 bash 永久放行与正则规则')
|
|
90
90
|
.action((message) => {
|
|
91
91
|
const plugin = getPlugin().root ?? getPlugin();
|
|
92
|
-
const ctx =
|
|
92
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
93
93
|
if (!ctx)
|
|
94
|
-
return '⚠️ 仅
|
|
94
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
95
95
|
return formatBashApproveList(plugin, ctx);
|
|
96
96
|
});
|
|
97
97
|
commandService.add(listCmd, pluginName);
|
|
@@ -100,9 +100,9 @@ function registerApproveCommands(commandService, pluginName, disposers) {
|
|
|
100
100
|
.desc('Owner:撤销 bash 永久放行(保留正则规则)')
|
|
101
101
|
.action((message) => {
|
|
102
102
|
const plugin = getPlugin().root ?? getPlugin();
|
|
103
|
-
const ctx =
|
|
103
|
+
const ctx = getOwnerCommMessageOrUndefined(plugin, message);
|
|
104
104
|
if (!ctx)
|
|
105
|
-
return '⚠️ 仅
|
|
105
|
+
return '⚠️ 仅 Endpoint Owner 可在私聊中使用此指令。';
|
|
106
106
|
const r = removeOwnerApproveAlways(plugin, ctx, OWNER_APPROVE_ALWAYS_TOOL);
|
|
107
107
|
if (!r.ok)
|
|
108
108
|
return `⚠️ ${r.error}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-owner-approve-commands.js","sourceRoot":"","sources":["../../src/init/register-owner-approve-commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,cAAc,EAAqC,MAAM,eAAe,CAAC;AAC7F,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,6BAA6B,EAC7B,qBAAqB,EACrB,8BAA8B,EAC9B,2BAA2B,EAC3B,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,2CAA2C,CAAC;AAEnD,SAAS,UAAU;IACjB,OAAO;QACL,kBAAkB;QAClB,oDAAoD;QACpD,mDAAmD;QACnD,qDAAqD;QACrD,0CAA0C;QAC1C,wDAAwD;QACxD,gDAAgD;KACjD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAC9B,cAA8B,EAC9B,UAAkB,EAClB,SAAyB;IAEzB,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,sBAAsB,CAAC;SAC9D,IAAI,CAAC,yBAAyB,EAAE,uCAAuC,CAAC;SACxE,KAAK,CAAC,sBAAsB,CAAC;SAC7B,MAAM,CAAC,CAAC,OAAgB,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG;YAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"register-owner-approve-commands.js","sourceRoot":"","sources":["../../src/init/register-owner-approve-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Typing Indicator AI Event Binder
|
|
3
3
|
*
|
|
4
|
-
* 订阅 root 上的 AI 生命周期事件,驱动各平台
|
|
5
|
-
* 平台适配器(如 ICQQ)应在
|
|
6
|
-
* 仅对未挂载的
|
|
4
|
+
* 订阅 root 上的 AI 生命周期事件,驱动各平台 Endpoint 已有的 Typing Indicator。
|
|
5
|
+
* 平台适配器(如 ICQQ)应在 Endpoint 连接时自行挂载 `$typingIndicator`;
|
|
6
|
+
* 仅对未挂载的 Endpoint 才用通用 enableTypingIndicatorForBot 兜底。
|
|
7
7
|
*/
|
|
8
8
|
import type { AIServiceRefs } from './shared-refs.js';
|
|
9
9
|
export declare function registerTypingIndicator(_refs: AIServiceRefs): void;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Typing Indicator AI Event Binder
|
|
3
3
|
*
|
|
4
|
-
* 订阅 root 上的 AI 生命周期事件,驱动各平台
|
|
5
|
-
* 平台适配器(如 ICQQ)应在
|
|
6
|
-
* 仅对未挂载的
|
|
4
|
+
* 订阅 root 上的 AI 生命周期事件,驱动各平台 Endpoint 已有的 Typing Indicator。
|
|
5
|
+
* 平台适配器(如 ICQQ)应在 Endpoint 连接时自行挂载 `$typingIndicator`;
|
|
6
|
+
* 仅对未挂载的 Endpoint 才用通用 enableTypingIndicatorForBot 兜底。
|
|
7
7
|
*/
|
|
8
8
|
import { getPlugin } from '@zhin.js/core';
|
|
9
9
|
import { subscribeAIEvents } from '../ai-event-subscriber.js';
|
|
10
10
|
import { enableTypingIndicatorForBot, } from '../typing-indicator/adapter-integration.js';
|
|
11
|
-
/** 与
|
|
11
|
+
/** 与 Message.$channel.type 一致(群聊 sceneId 通常只是群号,无 group: 前缀) */
|
|
12
12
|
function resolveSceneType(payload) {
|
|
13
13
|
const scope = payload.scope;
|
|
14
14
|
if (scope === 'group' || scope === 'channel' || scope === 'private') {
|
|
@@ -62,29 +62,29 @@ function resolveTypingSceneConfig(config, sceneType) {
|
|
|
62
62
|
function isGenericTypingManager(manager) {
|
|
63
63
|
return typeof manager.getActiveIndicator === 'function';
|
|
64
64
|
}
|
|
65
|
-
function resolveTypingManager(
|
|
66
|
-
if (
|
|
67
|
-
return
|
|
65
|
+
function resolveTypingManager(endpoint, platform, config, adapter) {
|
|
66
|
+
if (endpoint.$typingIndicator) {
|
|
67
|
+
return endpoint.$typingIndicator;
|
|
68
68
|
}
|
|
69
|
-
return enableTypingIndicatorForBot(
|
|
69
|
+
return enableTypingIndicatorForBot(endpoint, platform, config, adapter);
|
|
70
70
|
}
|
|
71
71
|
async function startTypingForPayload(root, logger, payload, reason) {
|
|
72
|
-
const { platform,
|
|
73
|
-
if (!platform || !
|
|
72
|
+
const { platform, endpointId, sessionId, messageId } = payload;
|
|
73
|
+
if (!platform || !endpointId)
|
|
74
74
|
return;
|
|
75
75
|
try {
|
|
76
76
|
const adapter = root.injectAdapter(platform);
|
|
77
|
-
const
|
|
78
|
-
if (!
|
|
79
|
-
logger.debug(`[TypingIndicator]
|
|
77
|
+
const endpoint = adapter?.endpoints?.get(endpointId);
|
|
78
|
+
if (!endpoint) {
|
|
79
|
+
logger.debug(`[TypingIndicator] Endpoint not found for platform: ${platform}, endpointId: ${endpointId}`);
|
|
80
80
|
return;
|
|
81
81
|
}
|
|
82
|
-
const
|
|
83
|
-
const config = (
|
|
82
|
+
const endpointConfig = (endpoint.$config || {});
|
|
83
|
+
const config = (endpointConfig.typingIndicator || {});
|
|
84
84
|
if (config.enabled === false) {
|
|
85
85
|
return;
|
|
86
86
|
}
|
|
87
|
-
const manager = resolveTypingManager(
|
|
87
|
+
const manager = resolveTypingManager(endpoint, platform, config, adapter);
|
|
88
88
|
const sceneType = resolveSceneType(payload);
|
|
89
89
|
const targets = resolveTypingTargets(payload, sceneType);
|
|
90
90
|
const sceneConfig = resolveTypingSceneConfig(config, sceneType);
|
|
@@ -92,7 +92,7 @@ async function startTypingForPayload(root, logger, payload, reason) {
|
|
|
92
92
|
if (isGenericTypingManager(manager)) {
|
|
93
93
|
const indicatorOpts = {
|
|
94
94
|
platform,
|
|
95
|
-
|
|
95
|
+
endpointId,
|
|
96
96
|
sessionId,
|
|
97
97
|
messageId,
|
|
98
98
|
sceneType,
|
|
@@ -105,7 +105,7 @@ async function startTypingForPayload(root, logger, payload, reason) {
|
|
|
105
105
|
}
|
|
106
106
|
await manager.start({
|
|
107
107
|
platform,
|
|
108
|
-
|
|
108
|
+
endpointId,
|
|
109
109
|
sessionId,
|
|
110
110
|
messageId,
|
|
111
111
|
sceneType,
|
|
@@ -128,22 +128,22 @@ async function startTypingForPayload(root, logger, payload, reason) {
|
|
|
128
128
|
}
|
|
129
129
|
}
|
|
130
130
|
async function stopTypingForPayload(root, logger, payload, reason) {
|
|
131
|
-
const { platform,
|
|
132
|
-
if (!platform || !
|
|
131
|
+
const { platform, endpointId, sessionId, messageId } = payload;
|
|
132
|
+
if (!platform || !endpointId)
|
|
133
133
|
return;
|
|
134
134
|
try {
|
|
135
135
|
const adapter = root.injectAdapter(platform);
|
|
136
|
-
const
|
|
137
|
-
if (!
|
|
136
|
+
const endpoint = adapter?.endpoints?.get(endpointId);
|
|
137
|
+
if (!endpoint?.$typingIndicator)
|
|
138
138
|
return;
|
|
139
139
|
const sceneType = resolveSceneType(payload);
|
|
140
140
|
const targets = resolveTypingTargets(payload, sceneType);
|
|
141
|
-
const manager =
|
|
141
|
+
const manager = endpoint.$typingIndicator;
|
|
142
142
|
logger.debug(`[TypingIndicator] Stopping indicator (${reason}) session=${sessionId}`);
|
|
143
143
|
if (isGenericTypingManager(manager)) {
|
|
144
144
|
await manager.stop({
|
|
145
145
|
platform,
|
|
146
|
-
|
|
146
|
+
endpointId,
|
|
147
147
|
sessionId,
|
|
148
148
|
messageId,
|
|
149
149
|
sceneType,
|
|
@@ -186,20 +186,20 @@ export function registerTypingIndicator(_refs) {
|
|
|
186
186
|
await stopTypingForPayload(root, logger, payload, 'typing.stop');
|
|
187
187
|
},
|
|
188
188
|
onThinking: async (payload) => {
|
|
189
|
-
const { platform,
|
|
190
|
-
if (!platform || !
|
|
189
|
+
const { platform, endpointId, sessionId, messageId, thinking } = payload;
|
|
190
|
+
if (!platform || !endpointId || !thinking)
|
|
191
191
|
return;
|
|
192
192
|
try {
|
|
193
193
|
const adapter = root.injectAdapter(platform);
|
|
194
|
-
const
|
|
195
|
-
const manager =
|
|
194
|
+
const endpoint = adapter?.endpoints?.get(endpointId);
|
|
195
|
+
const manager = endpoint?.$typingIndicator;
|
|
196
196
|
if (!manager || !isGenericTypingManager(manager))
|
|
197
197
|
return;
|
|
198
198
|
const sceneType = resolveSceneType(payload);
|
|
199
199
|
const targets = resolveTypingTargets(payload, sceneType);
|
|
200
200
|
const indicator = manager.getActiveIndicator({
|
|
201
201
|
platform,
|
|
202
|
-
|
|
202
|
+
endpointId,
|
|
203
203
|
sessionId,
|
|
204
204
|
messageId,
|
|
205
205
|
sceneType,
|
|
@@ -215,13 +215,13 @@ export function registerTypingIndicator(_refs) {
|
|
|
215
215
|
}
|
|
216
216
|
},
|
|
217
217
|
onSubagentStart: async (payload) => {
|
|
218
|
-
const { platform,
|
|
219
|
-
if (!platform || !
|
|
218
|
+
const { platform, endpointId, sessionId, messageId, label } = payload;
|
|
219
|
+
if (!platform || !endpointId)
|
|
220
220
|
return;
|
|
221
221
|
try {
|
|
222
222
|
const adapter = root.injectAdapter(platform);
|
|
223
|
-
const
|
|
224
|
-
const manager =
|
|
223
|
+
const endpoint = adapter?.endpoints?.get(endpointId);
|
|
224
|
+
const manager = endpoint?.$typingIndicator;
|
|
225
225
|
if (!manager || !isGenericTypingManager(manager)) {
|
|
226
226
|
return;
|
|
227
227
|
}
|
|
@@ -229,7 +229,7 @@ export function registerTypingIndicator(_refs) {
|
|
|
229
229
|
const targets = resolveTypingTargets(payload, sceneType);
|
|
230
230
|
const indicator = manager.getActiveIndicator({
|
|
231
231
|
platform,
|
|
232
|
-
|
|
232
|
+
endpointId,
|
|
233
233
|
sessionId,
|
|
234
234
|
messageId,
|
|
235
235
|
sceneType,
|
|
@@ -246,20 +246,20 @@ export function registerTypingIndicator(_refs) {
|
|
|
246
246
|
}
|
|
247
247
|
},
|
|
248
248
|
onSubagentFinish: async (payload) => {
|
|
249
|
-
const { platform,
|
|
250
|
-
if (!platform || !
|
|
249
|
+
const { platform, endpointId, sessionId, messageId } = payload;
|
|
250
|
+
if (!platform || !endpointId)
|
|
251
251
|
return;
|
|
252
252
|
try {
|
|
253
253
|
const adapter = root.injectAdapter(platform);
|
|
254
|
-
const
|
|
255
|
-
const manager =
|
|
254
|
+
const endpoint = adapter?.endpoints?.get(endpointId);
|
|
255
|
+
const manager = endpoint?.$typingIndicator;
|
|
256
256
|
if (!manager || !isGenericTypingManager(manager))
|
|
257
257
|
return;
|
|
258
258
|
const sceneType = resolveSceneType(payload);
|
|
259
259
|
const targets = resolveTypingTargets(payload, sceneType);
|
|
260
260
|
const indicator = manager.getActiveIndicator({
|
|
261
261
|
platform,
|
|
262
|
-
|
|
262
|
+
endpointId,
|
|
263
263
|
sessionId,
|
|
264
264
|
messageId,
|
|
265
265
|
sceneType,
|
|
@@ -267,8 +267,8 @@ export function registerTypingIndicator(_refs) {
|
|
|
267
267
|
groupId: targets.groupId,
|
|
268
268
|
});
|
|
269
269
|
if (indicator && typeof indicator.update === 'function') {
|
|
270
|
-
const
|
|
271
|
-
const config = (
|
|
270
|
+
const endpointConfig = (endpoint?.$config || {});
|
|
271
|
+
const config = (endpointConfig.typingIndicator || {});
|
|
272
272
|
const msg = String(config.message || '正在处理中...');
|
|
273
273
|
await indicator.update(msg);
|
|
274
274
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-typing-indicator.js","sourceRoot":"","sources":["../../src/init/register-typing-indicator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EACL,2BAA2B,GAG5B,MAAM,4CAA4C,CAAC;AAKpD,
|
|
1
|
+
{"version":3,"file":"register-typing-indicator.js","sourceRoot":"","sources":["../../src/init/register-typing-indicator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-agent-db-schema.d.ts","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE;QACH,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAClE,CAAC;AAIF,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYpF,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,GAC1B,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"upgrade-agent-db-schema.d.ts","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE;QACH,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAClE,CAAC;AAIF,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYpF,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,GAC1B,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAWrE;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAEzE;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EACxC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAItB;AAED,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAED,qEAAqE;AACrE,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2DAA2D;AAC3D,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,uBAAuB,EAAE,GAC9B,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAqBjD;AAED,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC,CAMD"}
|
|
@@ -19,11 +19,12 @@ export const AGENT_SESSION_TREE_SCHEMA_PATCHES = {
|
|
|
19
19
|
export function resolveAgentDbQuery(dbFeature) {
|
|
20
20
|
const direct = dbFeature.query;
|
|
21
21
|
if (typeof direct === 'function') {
|
|
22
|
-
return
|
|
22
|
+
return direct.bind(dbFeature);
|
|
23
23
|
}
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
const db = dbFeature.db;
|
|
25
|
+
const nested = db?.query;
|
|
26
|
+
if (typeof nested === 'function' && db) {
|
|
27
|
+
return nested.bind(db);
|
|
27
28
|
}
|
|
28
29
|
return undefined;
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-agent-db-schema.js","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iCAAiC,GAA2C;IACvF,cAAc,EAAE;QACd,EAAE,EAAE,SAAS;QACb,SAAS,EAAE,SAAS;QACpB,KAAK,EAAE,MAAM;KACd;IACD,cAAc,EAAE;QACd,sBAAsB,EAAE,SAAS;KAClC;IACD,eAAe,EAAE;QACf,wBAAwB,EAAE,SAAS;KACpC;CACF,CAAC;AAEF,MAAM,UAAU,mBAAmB,CACjC,SAA2B;IAE3B,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;IAC/B,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"upgrade-agent-db-schema.js","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bot → Endpoint 破坏性重命名:旧 SQLite 表 bot_id 列升级为 endpoint_id。
|
|
3
|
+
* CREATE TABLE IF NOT EXISTS 不会改已有表结构。
|
|
4
|
+
*/
|
|
5
|
+
import { type AgentDbQueryable } from './upgrade-agent-db-schema.js';
|
|
6
|
+
export declare function upgradeBotIdToEndpointIdColumns(dbFeature: AgentDbQueryable): Promise<string[]>;
|
|
7
|
+
/** 在 db.start() 后、任何 ORM 写入前注册(可重复调用,仅注册一次) */
|
|
8
|
+
export declare function registerEndpointIdColumnMigrationHook(logger: {
|
|
9
|
+
info: (msg: string) => void;
|
|
10
|
+
error: (msg: string, err?: unknown) => void;
|
|
11
|
+
}): void;
|
|
12
|
+
//# sourceMappingURL=upgrade-endpoint-id-schema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-endpoint-id-schema.d.ts","sourceRoot":"","sources":["../../src/init/upgrade-endpoint-id-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AActC,wBAAsB,+BAA+B,CACnD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAED,+CAA+C;AAC/C,wBAAgB,qCAAqC,CACnD,MAAM,EAAE;IAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GACnF,IAAI,CAcN"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bot → Endpoint 破坏性重命名:旧 SQLite 表 bot_id 列升级为 endpoint_id。
|
|
3
|
+
* CREATE TABLE IF NOT EXISTS 不会改已有表结构。
|
|
4
|
+
*/
|
|
5
|
+
import { onDatabaseAfterStart } from '@zhin.js/core';
|
|
6
|
+
import { listSqliteTableColumns, resolveAgentDbDialect, resolveAgentDbQuery, } from './upgrade-agent-db-schema.js';
|
|
7
|
+
let migrationHookRegistered = false;
|
|
8
|
+
async function listSqliteUserTables(query) {
|
|
9
|
+
const rows = (await query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`));
|
|
10
|
+
if (!Array.isArray(rows))
|
|
11
|
+
return [];
|
|
12
|
+
return rows.map((r) => String(r.name ?? '')).filter(Boolean);
|
|
13
|
+
}
|
|
14
|
+
export async function upgradeBotIdToEndpointIdColumns(dbFeature) {
|
|
15
|
+
const queryFn = resolveAgentDbQuery(dbFeature);
|
|
16
|
+
if (!queryFn)
|
|
17
|
+
return [];
|
|
18
|
+
const dialect = resolveAgentDbDialect(dbFeature);
|
|
19
|
+
if (dialect && dialect !== 'sqlite') {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
const tables = await listSqliteUserTables((sql) => queryFn(sql));
|
|
23
|
+
const renamed = [];
|
|
24
|
+
for (const table of tables) {
|
|
25
|
+
let columns;
|
|
26
|
+
try {
|
|
27
|
+
columns = await listSqliteTableColumns((sql) => queryFn(sql), table);
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
if (columns.size === 0)
|
|
33
|
+
continue;
|
|
34
|
+
if (!columns.has('bot_id') || columns.has('endpoint_id'))
|
|
35
|
+
continue;
|
|
36
|
+
await queryFn(`ALTER TABLE "${table}" RENAME COLUMN "bot_id" TO "endpoint_id"`);
|
|
37
|
+
renamed.push(`${table}.bot_id→endpoint_id`);
|
|
38
|
+
}
|
|
39
|
+
return renamed;
|
|
40
|
+
}
|
|
41
|
+
/** 在 db.start() 后、任何 ORM 写入前注册(可重复调用,仅注册一次) */
|
|
42
|
+
export function registerEndpointIdColumnMigrationHook(logger) {
|
|
43
|
+
if (migrationHookRegistered)
|
|
44
|
+
return;
|
|
45
|
+
migrationHookRegistered = true;
|
|
46
|
+
onDatabaseAfterStart(async (db) => {
|
|
47
|
+
try {
|
|
48
|
+
const renamed = await upgradeBotIdToEndpointIdColumns({ db });
|
|
49
|
+
if (renamed.length > 0) {
|
|
50
|
+
logger.info(`Database: renamed bot_id → endpoint_id (${renamed.join(', ')})`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch (e) {
|
|
54
|
+
logger.error('Database: bot_id → endpoint_id migration failed:', e);
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=upgrade-endpoint-id-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-endpoint-id-schema.js","sourceRoot":"","sources":["../../src/init/upgrade-endpoint-id-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,GAEpB,MAAM,8BAA8B,CAAC;AAEtC,IAAI,uBAAuB,GAAG,KAAK,CAAC;AAEpC,KAAK,UAAU,oBAAoB,CACjC,KAAwC;IAExC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CACvB,gFAAgF,CACjF,CAA6B,CAAC;IAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,SAA2B;IAE3B,MAAM,OAAO,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,OAAO,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,OAAoB,CAAC;QACzB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,sBAAsB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QACvE,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,SAAS;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;YAAE,SAAS;QAEnE,MAAM,OAAO,CAAC,gBAAgB,KAAK,2CAA2C,CAAC,CAAC;QAChF,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,qBAAqB,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,qCAAqC,CACnD,MAAoF;IAEpF,IAAI,uBAAuB;QAAE,OAAO;IACpC,uBAAuB,GAAG,IAAI,CAAC;IAE/B,oBAAoB,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAChC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,+BAA+B,CAAC,EAAE,EAAE,EAAsB,CAAC,CAAC;YAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,2CAA2C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChF,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/mcp-client/connection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAUrF,MAAM,OAAO,mBAAmB;IACrB,IAAI,CAAS;IACd,KAAK,CAAiB;IACtB,MAAM,GAAQ,IAAI,CAAC;IACnB,SAAS,GAAQ,IAAI,CAAC;IACtB,KAAK,GAA6B;QACxC,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,YAAY,KAAqB;QAC/B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,WAAW,KAAc,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAkB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,IAAI,SAAS,KAAoB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,IAAI,OAAO,KAAkB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAEzD,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC;QAE5C,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,+DAA+D,CAAC;gBACnF,OAAO,IAAI,CAAC,KAAK,CAAC;YACpB,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAE1E,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE1C,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;QAC/B,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/mcp-client/connection.ts"],"names":[],"mappings":"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"}
|
package/lib/media/constants.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/media/constants.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/media/constants.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,eAAO,MAAM,6BAA6B,2BAA2B,CAAC"}
|
package/lib/media/constants.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/media/constants.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/media/constants.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,CAAC,MAAM,6BAA6B,GAAG,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver-subagent-result.d.ts","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAI9E,MAAM,WAAW,wBAAwB;IACvC,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,sEAAsE;IACtE,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjD;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"deliver-subagent-result.d.ts","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAI9E,MAAM,WAAW,wBAAwB;IACvC,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,sEAAsE;IACtE,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjD;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC9F"}
|
|
@@ -7,16 +7,17 @@ import { mergeToolOutboundElements } from './media-tool-bridge.js';
|
|
|
7
7
|
import { publishOutboundElements } from './media-publisher.js';
|
|
8
8
|
export async function deliverSubagentResult(params) {
|
|
9
9
|
const { origin, delivery, send } = params;
|
|
10
|
+
const message = origin.message;
|
|
10
11
|
const base = {
|
|
11
|
-
context:
|
|
12
|
-
|
|
13
|
-
id:
|
|
14
|
-
type:
|
|
12
|
+
context: String(message.$adapter),
|
|
13
|
+
endpoint: message.$endpoint,
|
|
14
|
+
id: message.$channel?.id ?? message.$sender.id,
|
|
15
|
+
type: (message.$channel?.type ?? 'private'),
|
|
15
16
|
};
|
|
16
17
|
const elements = delivery.elements?.length
|
|
17
18
|
? delivery.elements
|
|
18
19
|
: mergeToolOutboundElements(parseOutput(delivery.text), delivery.toolCalls ?? []);
|
|
19
|
-
const segments = await publishOutboundElements(elements,
|
|
20
|
+
const segments = await publishOutboundElements(elements, String(message.$adapter));
|
|
20
21
|
if (!segments.length) {
|
|
21
22
|
await send({ ...base, content: delivery.text });
|
|
22
23
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver-subagent-result.js","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAI9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAgB/D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAAmC;IAC7E,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAiC;QACzC,OAAO,EAAE,MAAM,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"deliver-subagent-result.js","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAI9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAgB/D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAAmC;IAC7E,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,IAAI,GAAiC;QACzC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;QACjC,QAAQ,EAAE,OAAO,CAAC,SAAS;QAC3B,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9C,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,SAAS,CAAgB;KAC3D,CAAC;IAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM;QACxC,CAAC,CAAC,QAAQ,CAAC,QAAQ;QACnB,CAAC,CAAC,yBAAyB,CACzB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC1B,QAAQ,CAAC,SAAS,IAAI,EAAE,CACzB,CAAC;IACJ,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,CAAiB,EAAE,EAAE,CACpC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;IACvF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC;YACT,GAAG,IAAI;YACP,OAAO,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,QAAQ;SACzD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|