@zhin.js/agent 0.2.0 → 0.3.0
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.d.ts.map +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-mcp-bridge.d.ts +1 -1
- package/lib/assistant/home-mcp-bridge.d.ts.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/knowledge-search-tool.d.ts +6 -0
- package/lib/builtin/knowledge-search-tool.d.ts.map +1 -0
- package/lib/builtin/knowledge-search-tool.js +184 -0
- package/lib/builtin/knowledge-search-tool.js.map +1 -0
- 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 +3 -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/run-spec-dry-run-tool.d.ts +1 -4
- package/lib/builtin/run-spec-dry-run-tool.d.ts.map +1 -1
- package/lib/builtin/run-spec-dry-run-tool.js.map +1 -1
- package/lib/builtin/run-validation-spec-tool.d.ts +1 -4
- package/lib/builtin/run-validation-spec-tool.d.ts.map +1 -1
- package/lib/builtin/run-validation-spec-tool.js.map +1 -1
- package/lib/builtin/spawn-task-tool.d.ts +7 -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 +4 -2
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +55 -10
- 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/builtin-tools.d.ts +2 -0
- package/lib/builtin-tools.d.ts.map +1 -1
- package/lib/builtin-tools.js +4 -0
- package/lib/builtin-tools.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/normalize-ai-config.d.ts +1 -1
- package/lib/config/normalize-ai-config.d.ts.map +1 -1
- package/lib/config/provider-instance.d.ts +1 -1
- package/lib/config/provider-instance.d.ts.map +1 -1
- package/lib/config/provider-instance.js +1 -1
- package/lib/config/provider-instance.js.map +1 -1
- package/lib/config/types.d.ts +2 -2
- package/lib/config/types.d.ts.map +1 -1
- package/lib/create-agent-session.d.ts +1 -1
- package/lib/create-agent-session.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 +3 -3
- 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 -22
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -11
- package/lib/index.js.map +1 -1
- package/lib/init/activate-ai-database-storage.d.ts +1 -1
- package/lib/init/activate-ai-database-storage.d.ts.map +1 -1
- package/lib/init/activate-ai-database-storage.js +12 -8
- package/lib/init/activate-ai-database-storage.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +38 -15
- 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 +4 -3
- 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-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +6 -3
- package/lib/init/register-builtin-tools.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.d.ts.map +1 -1
- package/lib/mcp-client/connection.js +38 -2
- 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/agent-dispatcher.d.ts +1 -1
- package/lib/orchestrator/agent-dispatcher.d.ts.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/remote-agent-registry.d.ts +1 -1
- package/lib/orchestrator/remote-agent-registry.d.ts.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/routing/runtime-binding.d.ts +1 -1
- package/lib/routing/runtime-binding.d.ts.map +1 -1
- package/lib/security/audit-logger.d.ts +4 -3
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +14 -4
- 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 +43 -33
- package/lib/security/dangerous-tool-policy.js.map +1 -1
- package/lib/security/exec-policy.d.ts +1 -1
- package/lib/security/exec-policy.d.ts.map +1 -1
- package/lib/security/exec-policy.js +56 -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 +4 -5
- package/lib/security/file-role-policy.js.map +1 -1
- package/lib/security/index.d.ts +3 -47
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +3 -68
- 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 -118
- package/lib/security/owner-approve-always-store.js.map +1 -1
- package/lib/security/sandbox-docker.d.ts +28 -0
- package/lib/security/sandbox-docker.d.ts.map +1 -0
- package/lib/security/sandbox-docker.js +177 -0
- package/lib/security/sandbox-docker.js.map +1 -0
- package/lib/security/sandbox.d.ts +9 -0
- package/lib/security/sandbox.d.ts.map +1 -1
- package/lib/security/sandbox.js +215 -14
- package/lib/security/sandbox.js.map +1 -1
- package/lib/service.d.ts +4 -5
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +8 -9
- 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 +10 -14
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +5 -11
- 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 +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/config.d.ts +25 -0
- package/lib/zhin-agent/config.d.ts.map +1 -1
- package/lib/zhin-agent/config.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 +29 -28
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +114 -162
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/interfaces.d.ts +63 -0
- package/lib/zhin-agent/interfaces.d.ts.map +1 -0
- package/lib/zhin-agent/interfaces.js +8 -0
- package/lib/zhin-agent/interfaces.js.map +1 -0
- 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 +7 -7
- 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 +10 -10
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +62 -55
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/session-io.d.ts +10 -10
- package/lib/zhin-agent/session-io.d.ts.map +1 -1
- package/lib/zhin-agent/session-io.js +47 -33
- 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/task-continuation.d.ts +4 -4
- package/lib/zhin-agent/task-continuation.d.ts.map +1 -1
- package/lib/zhin-agent/task-continuation.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/monitoring/index.d.ts +0 -79
- package/lib/monitoring/index.d.ts.map +0 -1
- package/lib/monitoring/index.js +0 -197
- package/lib/monitoring/index.js.map +0 -1
- package/lib/monitoring/metrics.d.ts +0 -260
- package/lib/monitoring/metrics.d.ts.map +0 -1
- package/lib/monitoring/metrics.js +0 -550
- package/lib/monitoring/metrics.js.map +0 -1
- 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
- package/lib/security/budget-limiter.d.ts +0 -161
- package/lib/security/budget-limiter.d.ts.map +0 -1
- package/lib/security/budget-limiter.js +0 -392
- package/lib/security/budget-limiter.js.map +0 -1
- package/lib/security/network-policy.d.ts +0 -98
- package/lib/security/network-policy.d.ts.map +0 -1
- package/lib/security/network-policy.js +0 -305
- package/lib/security/network-policy.js.map +0 -1
- package/lib/security/security-config.example.d.ts +0 -33
- package/lib/security/security-config.example.d.ts.map +0 -1
- package/lib/security/security-config.example.js +0 -166
- package/lib/security/security-config.example.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestration-tools.js","sourceRoot":"","sources":["../../src/builtin/orchestration-tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orchestration-tools.js","sourceRoot":"","sources":["../../src/builtin/orchestration-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tool,
|
|
1
|
+
import type { Tool, Message, ToolParametersSchema, ToolResult } from '@zhin.js/core';
|
|
2
2
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
3
3
|
export declare const READ_FILE_PARAMETERS: ToolParametersSchema;
|
|
4
4
|
export declare class ReadFileBuiltinTool extends BuiltinBaseTool {
|
|
@@ -7,7 +7,7 @@ export declare class ReadFileBuiltinTool extends BuiltinBaseTool {
|
|
|
7
7
|
readonly parameters: ToolParametersSchema<Record<string, any>>;
|
|
8
8
|
readonly kind = "file";
|
|
9
9
|
constructor();
|
|
10
|
-
run(args: Record<string, unknown>,
|
|
10
|
+
run(args: Record<string, unknown>, commMessage?: Message): Promise<ToolResult>;
|
|
11
11
|
}
|
|
12
12
|
/** 工厂:供 createBuiltinTools 与其它入口使用 */
|
|
13
13
|
export declare function createReadFileTool(): Tool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAUzD,eAAO,MAAM,oBAAoB,EAAE,oBAWlC,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,wMACuC;IAC3D,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,UAAU;;IAmBjB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAmDrF;AAED,sCAAsC;AACtC,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|
|
@@ -36,20 +36,20 @@ export class ReadFileBuiltinTool extends BuiltinBaseTool {
|
|
|
36
36
|
this.tags.push('file', 'read');
|
|
37
37
|
this.keywords.push('读文件', '读取文件', '查看文件', '打开文件', '文件内容', 'read file', 'read', 'cat', '查看', '打开');
|
|
38
38
|
}
|
|
39
|
-
async run(args,
|
|
39
|
+
async run(args, commMessage) {
|
|
40
40
|
const filePathArg = args.file_path;
|
|
41
41
|
if (typeof filePathArg !== 'string' || !filePathArg.trim()) {
|
|
42
42
|
return 'Error: file_path is required';
|
|
43
43
|
}
|
|
44
44
|
// 第 1 层:角色门控(所有角色均可读取,但需走统一流程)
|
|
45
|
-
const roleDecision = checkFileToolAccess('read_file',
|
|
45
|
+
const roleDecision = checkFileToolAccess('read_file', commMessage);
|
|
46
46
|
if (!roleDecision.allowed) {
|
|
47
47
|
if (roleDecision.needsOwnerApproval)
|
|
48
48
|
return toOwnerSignal(roleDecision);
|
|
49
49
|
return toDenyError(roleDecision);
|
|
50
50
|
}
|
|
51
51
|
// 第 2 层:文件角色权限矩阵(user 只有 read 权限,安全放行)
|
|
52
|
-
const fileRole =
|
|
52
|
+
const fileRole = toolRequesterRoleToFileRole(roleDecision.role);
|
|
53
53
|
const permResult = checkFilePermission(fileRole, 'read', filePathArg);
|
|
54
54
|
if (!permResult.allowed) {
|
|
55
55
|
return formatFilePermissionMessage(permResult, 'read_file');
|
|
@@ -57,7 +57,7 @@ export class ReadFileBuiltinTool extends BuiltinBaseTool {
|
|
|
57
57
|
// 第 3 层:敏感路径检测 + 文件操作
|
|
58
58
|
try {
|
|
59
59
|
const fp = expandHome(filePathArg);
|
|
60
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('read_file', fp,
|
|
60
|
+
const sensitiveDecision = checkSensitiveFilePathAccess('read_file', fp, commMessage);
|
|
61
61
|
if (!sensitiveDecision.allowed) {
|
|
62
62
|
if (sensitiveDecision.needsOwnerApproval)
|
|
63
63
|
return toOwnerSignal(sensitiveDecision);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-tool.js","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAChI,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrI,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CAAC;IACpD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CACjE,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,QAAgB;IACnC,OAAO,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAyB;IACxD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,6BAA6B,EAAE;QACtE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE;KAC1D;IACD,QAAQ,EAAE,CAAC,WAAW,CAAC;CACxB,CAAC;AAEF,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAC7C,IAAI,GAAG,WAAW,CAAC;IACnB,WAAW,GAClB,wDAAwD,CAAC;IAClD,UAAU,GAAG,oBAAoB,CAAC;IAClC,IAAI,GAAG,MAAM,CAAC;IAEvB;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,KAAK,EACL,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,EACN,WAAW,EACX,MAAM,EACN,KAAK,EACL,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,
|
|
1
|
+
{"version":3,"file":"read-file-tool.js","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
* run_spec_dry_run — Planner tool: manifest + vitest dry-run.
|
|
3
|
-
*/
|
|
4
|
-
import type { AgentTool } from '@zhin.js/core';
|
|
1
|
+
import type { AgentTool } from '@zhin.js/ai';
|
|
5
2
|
export declare function createRunSpecDryRunTool(): AgentTool;
|
|
6
3
|
//# sourceMappingURL=run-spec-dry-run-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-spec-dry-run-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/run-spec-dry-run-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-spec-dry-run-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/run-spec-dry-run-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA6D7C,wBAAgB,uBAAuB,IAAI,SAAS,CAEnD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-spec-dry-run-tool.js","sourceRoot":"","sources":["../../src/builtin/run-spec-dry-run-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-spec-dry-run-tool.js","sourceRoot":"","sources":["../../src/builtin/run-spec-dry-run-tool.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EACL,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,MAAM,GAAyB;IACnC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE;QACpD,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,WAAW,EAAE,2CAA2C;SACzD;KACF;IACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;CACrB,CAAC;AAEF,MAAM,iBAAkB,SAAQ,eAAe;IACpC,IAAI,GAAG,kBAAkB,CAAC;IAC1B,WAAW,GAClB,4FAA4F,CAAC;IACtF,UAAU,GAAG,MAAM,CAAC;IAE7B,KAAK,CAAC,GAAG,CAAC,IAA6B;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,KAAK;YAAE,OAAO,YAAY,CAAC;QAEhC,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO,2BAA2B,CAAC;QAE7C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG;YAAE,OAAO,OAAO,KAAK,MAAM,CAAC;QAEpC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,mBAAmB,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QACzD,CAAC;QAED,MAAM,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE;YACjC,qBAAqB,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5F,eAAe,EAAE,MAAM,CAAC,cAAc;YACtC,mBAAmB,EAAE,IAAI;YACzB,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,OAAO,CACL,8BAA8B,MAAM,CAAC,cAAc,IAAI;cACrD,SAAS,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,iBAAiB,EAAE,CAAC,MAAM,EAAe,CAAC;AACvD,CAAC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* run_validation_spec — Validator-only tool (ADR 0011 D3).
|
|
3
|
-
*/
|
|
4
|
-
import type { AgentTool } from '@zhin.js/core';
|
|
1
|
+
import type { AgentTool } from '@zhin.js/ai';
|
|
5
2
|
export type { ValidationSpecRunner } from '../orchestrator/mission-spec.js';
|
|
6
3
|
export { defaultValidationSpecRunner, setValidationSpecRunnerForTests, resetValidationSpecRunner, getValidationSpecRunner, } from '../orchestrator/mission-spec.js';
|
|
7
4
|
export declare function createRunValidationSpecTool(): AgentTool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-validation-spec-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/run-validation-spec-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-validation-spec-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/run-validation-spec-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAQ7C,YAAY,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,EAC/B,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AAiDzC,wBAAgB,2BAA2B,IAAI,SAAS,CAEvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-validation-spec-tool.js","sourceRoot":"","sources":["../../src/builtin/run-validation-spec-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-validation-spec-tool.js","sourceRoot":"","sources":["../../src/builtin/run-validation-spec-tool.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,EAC/B,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AAEzC,MAAM,MAAM,GAAyB;IACnC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE;KACrD;IACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;CACrB,CAAC;AAEF,MAAM,qBAAsB,SAAQ,eAAe;IACxC,IAAI,GAAG,qBAAqB,CAAC;IAC7B,WAAW,GAClB,sEAAsE,CAAC;IAChE,UAAU,GAAG,MAAM,CAAC;IAE7B,KAAK,CAAC,GAAG,CAAC,IAA6B;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,KAAK;YAAE,OAAO,YAAY,CAAC;QAEhC,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO,2BAA2B,CAAC;QAE7C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,wCAAwC,CAAC;QAClD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,uBAAuB,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAChF,MAAM,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAE9F,MAAM,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE;YACjC,eAAe,EAAE,UAAU;YAC3B,KAAK,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;SACrD,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,EAAE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7C,OAAO,CACL,6BAA6B,UAAU,CAAC,MAAM,IAAI;kBAChD,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CACnC,CAAC;QACJ,CAAC;QACD,OAAO,CACL,6BAA6B,UAAU,CAAC,MAAM,WAAW,UAAU,CAAC,MAAM,IAAI;cAC5E,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CACnC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO,IAAI,qBAAqB,EAAE,CAAC,MAAM,EAAe,CAAC;AAC3D,CAAC"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* spawn_task — 主会话将耗时任务派给后台子 agent(与 issue #396 对齐)
|
|
3
3
|
*/
|
|
4
|
-
import type {
|
|
4
|
+
import type { Message, Tool, ToolParametersSchema, ToolResult } from '@zhin.js/core';
|
|
5
|
+
import type { AgentTool } from '@zhin.js/ai';
|
|
5
6
|
import type { SubagentManager, SubagentOrigin } from '../subagent.js';
|
|
6
7
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
7
8
|
export declare const SPAWN_TASK_PARAMETERS: ToolParametersSchema;
|
|
8
|
-
export declare function
|
|
9
|
+
export declare function originFromMessage(message: Message): SubagentOrigin;
|
|
9
10
|
export declare class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
10
|
-
private readonly
|
|
11
|
+
private readonly sessionCommMessage;
|
|
11
12
|
private readonly manager;
|
|
12
13
|
readonly name = "spawn_task";
|
|
13
14
|
readonly description = "\u5C06\u590D\u6742\u6216\u8017\u65F6\u7684\u4EFB\u52A1\u4EA4\u7ED9\u5B50 agent\u3002\u9ED8\u8BA4\u5F02\u6B65\uFF08\u5B8C\u6210\u540E\u53E6\u6761\u63A8\u9001\uFF09\uFF1B\u9700\u540C\u6B65\u7B49\u5F85\u7ED3\u679C\u65F6\u8BBE wait=true\u3002\u786C\u7F16\u6392\u6A21\u5F0F\u4E0B\u987B\u4F20 run_id+task_id\u3002\u6587\u751F\u56FE\u7528 draw\uFF0C\u8BC6\u56FE\u7528 vision\u3002\u542B\u56FE\u7ED3\u679C\u65E5\u5FD7 preview \u4E3A {image}\uFF1Bwait=true \u65F6\u52FF\u518D\u53D1\u300C\u7A0D\u7B49\u300D\u3002";
|
|
14
15
|
readonly parameters: ToolParametersSchema<Record<string, any>>;
|
|
15
|
-
constructor(
|
|
16
|
+
constructor(sessionCommMessage: Message, manager: SubagentManager);
|
|
16
17
|
toTool(): Tool;
|
|
17
|
-
run(args: Record<string, unknown>,
|
|
18
|
+
run(args: Record<string, unknown>, _commMessage?: Message): Promise<ToolResult>;
|
|
18
19
|
}
|
|
19
|
-
export declare function createSpawnTaskTool(
|
|
20
|
+
export declare function createSpawnTaskTool(commMessage: Message, manager: SubagentManager): AgentTool;
|
|
20
21
|
//# sourceMappingURL=spawn-task-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-task-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/spawn-task-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"spawn-task-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/spawn-task-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKtE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,qBAAqB,EAAE,oBAoCnC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAElE;AAED,qBAAa,oBAAqB,SAAQ,eAAe;IAOrD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,WAAW,4fAC+H;IACnJ,QAAQ,CAAC,UAAU,4CAAyB;gBAGzB,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,eAAe;IAO3C,MAAM,IAAI,IAAI;IAMR,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAqEtF;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,eAAe,GACvB,SAAS,CAEX"}
|
|
@@ -37,25 +37,18 @@ export const SPAWN_TASK_PARAMETERS = {
|
|
|
37
37
|
},
|
|
38
38
|
required: ['task'],
|
|
39
39
|
};
|
|
40
|
-
export function
|
|
41
|
-
return {
|
|
42
|
-
platform: context.platform || '',
|
|
43
|
-
botId: context.botId || '',
|
|
44
|
-
senderId: context.senderId || '',
|
|
45
|
-
sceneId: context.sceneId || '',
|
|
46
|
-
sceneType: context.message?.$channel?.type || 'private',
|
|
47
|
-
messageId: context.messageId || context.message?.$id,
|
|
48
|
-
};
|
|
40
|
+
export function originFromMessage(message) {
|
|
41
|
+
return { message };
|
|
49
42
|
}
|
|
50
43
|
export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
51
|
-
|
|
44
|
+
sessionCommMessage;
|
|
52
45
|
manager;
|
|
53
46
|
name = 'spawn_task';
|
|
54
47
|
description = '将复杂或耗时的任务交给子 agent。默认异步(完成后另条推送);需同步等待结果时设 wait=true。硬编排模式下须传 run_id+task_id。文生图用 draw,识图用 vision。含图结果日志 preview 为 {image};wait=true 时勿再发「稍等」。';
|
|
55
48
|
parameters = SPAWN_TASK_PARAMETERS;
|
|
56
|
-
constructor(
|
|
49
|
+
constructor(sessionCommMessage, manager) {
|
|
57
50
|
super();
|
|
58
|
-
this.
|
|
51
|
+
this.sessionCommMessage = sessionCommMessage;
|
|
59
52
|
this.manager = manager;
|
|
60
53
|
this.tags.push('agent', 'async', 'task', '后台', '子任务');
|
|
61
54
|
this.keywords.push('后台', '异步', '子任务', 'spawn', 'background', '并行', '独立处理');
|
|
@@ -65,7 +58,7 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
|
65
58
|
tool.source = 'builtin:context';
|
|
66
59
|
return tool;
|
|
67
60
|
}
|
|
68
|
-
async run(args,
|
|
61
|
+
async run(args, _commMessage) {
|
|
69
62
|
const task = args.task;
|
|
70
63
|
const label = args.label;
|
|
71
64
|
const agentName = args.agent;
|
|
@@ -101,7 +94,7 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
|
101
94
|
return remoteResult.message;
|
|
102
95
|
}
|
|
103
96
|
}
|
|
104
|
-
const origin =
|
|
97
|
+
const origin = originFromMessage(this.sessionCommMessage);
|
|
105
98
|
const labelStr = typeof label === 'string' ? label : undefined;
|
|
106
99
|
const agentOpt = typeof agentName === 'string' && agentName.trim() ? agentName.trim() : undefined;
|
|
107
100
|
const contextMode = args.context === 'fork' || args.context === 'fresh' ? args.context : undefined;
|
|
@@ -114,7 +107,7 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
|
114
107
|
origin,
|
|
115
108
|
agent: agentOpt,
|
|
116
109
|
role: orchestrationRole,
|
|
117
|
-
notifyContext: this.
|
|
110
|
+
notifyContext: this.sessionCommMessage,
|
|
118
111
|
contextMode,
|
|
119
112
|
orchestrationTaskId: orchestrationTaskId || undefined,
|
|
120
113
|
};
|
|
@@ -126,7 +119,7 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
|
|
|
126
119
|
return this.manager.spawn(opts);
|
|
127
120
|
}
|
|
128
121
|
}
|
|
129
|
-
export function createSpawnTaskTool(
|
|
130
|
-
return new SpawnTaskBuiltinTool(
|
|
122
|
+
export function createSpawnTaskTool(commMessage, manager) {
|
|
123
|
+
return new SpawnTaskBuiltinTool(commMessage, manager).toTool();
|
|
131
124
|
}
|
|
132
125
|
//# sourceMappingURL=spawn-task-tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-task-tool.js","sourceRoot":"","sources":["../../src/builtin/spawn-task-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spawn-task-tool.js","sourceRoot":"","sources":["../../src/builtin/spawn-task-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tool,
|
|
1
|
+
import type { Tool, Message, ToolParametersSchema, ToolResult } from '@zhin.js/core';
|
|
2
2
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
3
3
|
export declare const TODO_READ_PARAMETERS: ToolParametersSchema;
|
|
4
4
|
export declare class TodoReadBuiltinTool extends BuiltinBaseTool {
|
|
@@ -8,7 +8,7 @@ export declare class TodoReadBuiltinTool extends BuiltinBaseTool {
|
|
|
8
8
|
readonly parameters: ToolParametersSchema<Record<string, any>>;
|
|
9
9
|
readonly kind = "plan";
|
|
10
10
|
constructor(dataDir: string);
|
|
11
|
-
run(args: Record<string, unknown>,
|
|
11
|
+
run(args: Record<string, unknown>, _commMessage?: Message): Promise<ToolResult>;
|
|
12
12
|
}
|
|
13
13
|
export declare function createTodoReadTool(dataDir: string): Tool;
|
|
14
14
|
//# sourceMappingURL=todo-read-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"todo-read-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/todo-read-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"todo-read-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/todo-read-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,oBAAoB,EAAE,oBASlC,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,eAAe;IAM1C,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,0IAA4B;IAChD,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,UAAU;gBAEM,OAAO,EAAE,MAAM;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAoBtF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAExD"}
|
|
@@ -27,7 +27,7 @@ export class TodoReadBuiltinTool extends BuiltinBaseTool {
|
|
|
27
27
|
this.tags.push('plan', 'todo');
|
|
28
28
|
this.keywords.push('任务', '计划', '进度', 'todo', '待办');
|
|
29
29
|
}
|
|
30
|
-
async run(args,
|
|
30
|
+
async run(args, _commMessage) {
|
|
31
31
|
try {
|
|
32
32
|
const chatId = args.chat_id;
|
|
33
33
|
const dir = chatId && chatId !== 'global'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"todo-read-tool.js","sourceRoot":"","sources":["../../src/builtin/todo-read-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,oBAAoB,GAAyB;IACxD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,iCAAiC;SAC/C;KACF;IACD,QAAQ,EAAE,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAMzB;IALpB,IAAI,GAAG,WAAW,CAAC;IACnB,WAAW,GAAG,wBAAwB,CAAC;IACvC,UAAU,GAAG,oBAAoB,CAAC;IAClC,IAAI,GAAG,MAAM,CAAC;IAEvB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,
|
|
1
|
+
{"version":3,"file":"todo-read-tool.js","sourceRoot":"","sources":["../../src/builtin/todo-read-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,oBAAoB,GAAyB;IACxD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,iCAAiC;SAC/C;KACF;IACD,QAAQ,EAAE,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAMzB;IALpB,IAAI,GAAG,WAAW,CAAC;IACnB,WAAW,GAAG,wBAAwB,CAAC;IACvC,UAAU,GAAG,oBAAoB,CAAC;IAClC,IAAI,GAAG,MAAM,CAAC;IAEvB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,YAAsB;QAC7D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GACP,MAAM,IAAI,MAAM,KAAK,QAAQ;gBAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAgB,CAAC;gBACrD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAAE,OAAO,kDAAkD,CAAC;YACxF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,qBAAqB,CAAC;YACzE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,CAAS,EAAE,EAAE;gBACpD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;gBACzF,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACtF,CAAC,CAAC,CAAC;YACH,OAAO,aAAa,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACnI,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tool,
|
|
1
|
+
import type { Tool, Message, ToolParametersSchema, ToolResult } from '@zhin.js/core';
|
|
2
2
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
3
3
|
export declare const TODO_WRITE_PARAMETERS: ToolParametersSchema;
|
|
4
4
|
export declare class TodoWriteBuiltinTool extends BuiltinBaseTool {
|
|
@@ -8,7 +8,7 @@ export declare class TodoWriteBuiltinTool extends BuiltinBaseTool {
|
|
|
8
8
|
readonly parameters: ToolParametersSchema<Record<string, any>>;
|
|
9
9
|
readonly kind = "plan";
|
|
10
10
|
constructor(dataDir: string);
|
|
11
|
-
run(args: Record<string, unknown>,
|
|
11
|
+
run(args: Record<string, unknown>, _commMessage?: Message): Promise<ToolResult>;
|
|
12
12
|
}
|
|
13
13
|
export declare function createTodoWriteTool(dataDir: string): Tool;
|
|
14
14
|
//# sourceMappingURL=todo-write-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"todo-write-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/todo-write-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"todo-write-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/todo-write-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,qBAAqB,EAAE,oBAanC,CAAC;AAEF,qBAAa,oBAAqB,SAAQ,eAAe;IAM3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,WAAW,gJAA6B;IACjD,QAAQ,CAAC,UAAU,4CAAyB;IAC5C,QAAQ,CAAC,IAAI,UAAU;gBAEM,OAAO,EAAE,MAAM;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAetF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEzD"}
|
|
@@ -31,7 +31,7 @@ export class TodoWriteBuiltinTool extends BuiltinBaseTool {
|
|
|
31
31
|
this.tags.push('plan', 'todo');
|
|
32
32
|
this.keywords.push('创建计划', '更新任务', '标记完成', 'todo');
|
|
33
33
|
}
|
|
34
|
-
async run(args,
|
|
34
|
+
async run(args, _commMessage) {
|
|
35
35
|
try {
|
|
36
36
|
const chatId = args.chat_id;
|
|
37
37
|
const dir = chatId ? path.join(this.dataDir, 'groups', chatId) : this.dataDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"todo-write-tool.js","sourceRoot":"","sources":["../../src/builtin/todo-write-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAyB;IACzD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,2DAA2D;SACzE;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,UAAU;SACxB;KACF;IACD,QAAQ,EAAE,CAAC,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IAM1B;IALpB,IAAI,GAAG,YAAY,CAAC;IACpB,WAAW,GAAG,yBAAyB,CAAC;IACxC,UAAU,GAAG,qBAAqB,CAAC;IACnC,IAAI,GAAG,MAAM,CAAC;IAEvB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,
|
|
1
|
+
{"version":3,"file":"todo-write-tool.js","sourceRoot":"","sources":["../../src/builtin/todo-write-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAyB;IACzD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,2DAA2D;SACzE;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,UAAU;SACxB;KACF;IACD,QAAQ,EAAE,CAAC,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IAM1B;IALpB,IAAI,GAAG,YAAY,CAAC;IACpB,WAAW,GAAG,yBAAyB,CAAC;IACxC,UAAU,GAAG,qBAAqB,CAAC;IACnC,IAAI,GAAG,MAAM,CAAC;IAEvB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,YAAsB;QAC7D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACxF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC7C,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAc,CAAC;YAClC,MAAM,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC;YAC7D,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACrE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;YAClE,OAAO,oBAAoB,IAAI,IAAI,KAAK,CAAC,MAAM,QAAQ,CAAC;QAC1D,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;AACpD,CAAC"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* web_fetch — HTTP(S) 抓取、SSRF 防护、HTML 去标签与长度截断
|
|
3
3
|
*/
|
|
4
|
-
import type { Tool,
|
|
4
|
+
import type { Tool, Message, ToolParametersSchema, ToolResult } from '@zhin.js/core';
|
|
5
5
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
6
6
|
export declare const WEB_FETCH_DEFAULT_MAX_LENGTH: number;
|
|
7
7
|
export declare const WEB_FETCH_PARAMETERS: ToolParametersSchema;
|
|
8
8
|
/** 与原先 builtin-tools 中 web_fetch 一致的正文提取(实现见 @zhin.js/core htmlToPlainText) */
|
|
9
9
|
export declare function stripFetchedHtmlToText(html: string): string;
|
|
10
|
+
/** SSRF 防护:检查主机名是否属于内网/私有/危险地址 */
|
|
11
|
+
export declare function isBlockedSsrfHostname(hostname: string): boolean;
|
|
10
12
|
export declare class WebFetchBuiltinTool extends BuiltinBaseTool {
|
|
11
13
|
readonly name = "web_fetch";
|
|
12
14
|
readonly description = "\u6293\u53D6\u6307\u5B9A URL \u7684\u7F51\u9875\u5185\u5BB9\u5E76\u63D0\u53D6\u6B63\u6587\uFF08\u53BB\u9664\u5E7F\u544A\u3001\u811A\u672C\u7B49\uFF09\uFF0C\u8FD4\u56DE\u53EF\u8BFB\u6587\u672C\u3002\u4EC5\u652F\u6301 http/https \u534F\u8BAE\u3002";
|
|
13
15
|
readonly parameters: ToolParametersSchema<Record<string, any>>;
|
|
14
16
|
readonly kind = "web";
|
|
15
17
|
constructor();
|
|
16
|
-
run(args: Record<string, unknown>,
|
|
18
|
+
run(args: Record<string, unknown>, commMessage?: Message): Promise<ToolResult>;
|
|
17
19
|
}
|
|
18
20
|
export declare function createWebFetchTool(): Tool;
|
|
19
21
|
//# sourceMappingURL=web-fetch-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"web-fetch-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,eAAO,MAAM,4BAA4B,QAAY,CAAC;AAEtD,eAAO,MAAM,oBAAoB,EAAE,oBAOlC,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,kCAAkC;AAClC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAyB/D;AAED,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,2PACwC;IAC5D,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,SAAS;;IAiBhB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA2ErF;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|
|
@@ -16,16 +16,31 @@ export const WEB_FETCH_PARAMETERS = {
|
|
|
16
16
|
export function stripFetchedHtmlToText(html) {
|
|
17
17
|
return htmlToPlainText(html);
|
|
18
18
|
}
|
|
19
|
-
|
|
19
|
+
/** SSRF 防护:检查主机名是否属于内网/私有/危险地址 */
|
|
20
|
+
export function isBlockedSsrfHostname(hostname) {
|
|
20
21
|
const h = hostname.toLowerCase();
|
|
21
|
-
return (
|
|
22
|
+
return (
|
|
23
|
+
// Localhost
|
|
24
|
+
h === 'localhost' ||
|
|
22
25
|
h === '127.0.0.1' ||
|
|
23
26
|
h === '::1' ||
|
|
24
27
|
h === '0.0.0.0' ||
|
|
25
28
|
h.endsWith('.local') ||
|
|
29
|
+
// IPv4 private ranges
|
|
26
30
|
h.startsWith('10.') ||
|
|
27
31
|
h.startsWith('192.168.') ||
|
|
28
|
-
/^172\.(1[6-9]|2\d|3[01])\./.test(h)
|
|
32
|
+
/^172\.(1[6-9]|2\d|3[01])\./.test(h) ||
|
|
33
|
+
// Cloud metadata endpoints (AWS/GCP/Azure)
|
|
34
|
+
h === '169.254.169.254' ||
|
|
35
|
+
h === 'metadata.google.internal' ||
|
|
36
|
+
h === 'metadata.google.com' ||
|
|
37
|
+
// IPv6 private/link-local ranges
|
|
38
|
+
/^fd[0-9a-f]{2}:/i.test(h) ||
|
|
39
|
+
/^fe80:/i.test(h) ||
|
|
40
|
+
// System-level domain blocklist
|
|
41
|
+
h.endsWith('.onion') ||
|
|
42
|
+
h.endsWith('.internal') ||
|
|
43
|
+
h.endsWith('.localhost'));
|
|
29
44
|
}
|
|
30
45
|
export class WebFetchBuiltinTool extends BuiltinBaseTool {
|
|
31
46
|
name = 'web_fetch';
|
|
@@ -37,9 +52,9 @@ export class WebFetchBuiltinTool extends BuiltinBaseTool {
|
|
|
37
52
|
this.tags.push('web', 'fetch');
|
|
38
53
|
this.keywords.push('抓取网页', '打开链接', '获取网页', '读网页', 'fetch', 'url', '链接内容', '网页内容');
|
|
39
54
|
}
|
|
40
|
-
async run(args,
|
|
55
|
+
async run(args, commMessage) {
|
|
41
56
|
try {
|
|
42
|
-
const accessDecision = checkDangerousToolAccess('web_fetch',
|
|
57
|
+
const accessDecision = checkDangerousToolAccess('web_fetch', commMessage);
|
|
43
58
|
if (!accessDecision.allowed) {
|
|
44
59
|
if (accessDecision.needsOwnerApproval) {
|
|
45
60
|
return toOwnerSignal(accessDecision);
|
|
@@ -60,11 +75,41 @@ export class WebFetchBuiltinTool extends BuiltinBaseTool {
|
|
|
60
75
|
if (isBlockedSsrfHostname(hostname)) {
|
|
61
76
|
return `ZHIN_NEEDS_OWNER:\n禁止访问内网地址 ${hostname}(SSRF 防护)。若确有需要,请 Owner 确认风险后调整策略或在受控环境代为抓取。`;
|
|
62
77
|
}
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
78
|
+
const MAX_REDIRECTS = 5;
|
|
79
|
+
let currentUrl = String(args.url ?? '');
|
|
80
|
+
let redirectCount = 0;
|
|
81
|
+
let response;
|
|
82
|
+
// Manual redirect following with SSRF check at each hop
|
|
83
|
+
while (true) {
|
|
84
|
+
response = await fetch(currentUrl, {
|
|
85
|
+
headers: { 'User-Agent': ZHIN_WEB_USER_AGENT },
|
|
86
|
+
signal: AbortSignal.timeout(WEB_TOOL_FETCH_TIMEOUT_MS),
|
|
87
|
+
redirect: 'manual',
|
|
88
|
+
});
|
|
89
|
+
if (response.status >= 300 && response.status < 400) {
|
|
90
|
+
const location = response.headers.get('location');
|
|
91
|
+
if (!location)
|
|
92
|
+
break;
|
|
93
|
+
redirectCount++;
|
|
94
|
+
if (redirectCount > MAX_REDIRECTS) {
|
|
95
|
+
return `Error: 超过最大重定向次数 (${MAX_REDIRECTS})`;
|
|
96
|
+
}
|
|
97
|
+
// Resolve relative redirects
|
|
98
|
+
const redirectUrl = new URL(location, currentUrl);
|
|
99
|
+
const redirectHostname = redirectUrl.hostname.toLowerCase();
|
|
100
|
+
// SSRF check on each redirect target
|
|
101
|
+
if (isBlockedSsrfHostname(redirectHostname)) {
|
|
102
|
+
return `ZHIN_NEEDS_OWNER:\n重定向目标 ${redirectHostname} 被 SSRF 防护拦截。`;
|
|
103
|
+
}
|
|
104
|
+
// Only follow http/https redirects
|
|
105
|
+
if (!['http:', 'https:'].includes(redirectUrl.protocol)) {
|
|
106
|
+
return `Error: 不允许重定向到 ${redirectUrl.protocol} 协议`;
|
|
107
|
+
}
|
|
108
|
+
currentUrl = redirectUrl.href;
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
68
113
|
if (!response.ok)
|
|
69
114
|
return `HTTP ${response.status}: ${response.statusText}`;
|
|
70
115
|
const html = await response.text();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch-tool.js","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAErF,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,GAAG,IAAI,CAAC;AAEtD,MAAM,CAAC,MAAM,oBAAoB,GAAyB;IACxD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,4BAA4B,EAAE;QAClE,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE;KACjE;IACD,QAAQ,EAAE,CAAC,KAAK,CAAC;CAClB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"web-fetch-tool.js","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* web_search 的 Bing 市场/语言:优先
|
|
2
|
+
* web_search 的 Bing 市场/语言:优先 Message.extra,其次用户档案,默认中文。
|
|
3
3
|
*/
|
|
4
|
-
import type {
|
|
5
|
-
/** 写入
|
|
4
|
+
import type { Message } from '@zhin.js/core';
|
|
5
|
+
/** 写入 AgentTurnMessage.extra 的键(集成方也可直接设置以覆盖档案) */
|
|
6
6
|
export declare const WEB_SEARCH_LOCALE_EXTRA_KEY: "web_search_locale";
|
|
7
7
|
/** 无用户设置时的 Bing setmkt / 界面语言 */
|
|
8
8
|
export declare const DEFAULT_WEB_SEARCH_MARKET = "zh-CN";
|
|
@@ -12,5 +12,5 @@ export declare const DEFAULT_WEB_SEARCH_MARKET = "zh-CN";
|
|
|
12
12
|
export declare function normalizeWebSearchLocaleHint(raw: string): string;
|
|
13
13
|
/** 随 Bing 市场生成 Accept-Language,与 setmkt 一致 */
|
|
14
14
|
export declare function acceptLanguageForMarket(market: string): string;
|
|
15
|
-
export declare function resolveWebSearchMarketFromContext(
|
|
15
|
+
export declare function resolveWebSearchMarketFromContext(commMessage?: Message): string;
|
|
16
16
|
//# sourceMappingURL=web-search-locale.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-search-locale.d.ts","sourceRoot":"","sources":["../../src/builtin/web-search-locale.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"web-search-locale.d.ts","sourceRoot":"","sources":["../../src/builtin/web-search-locale.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAoB,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,mDAAmD;AACnD,eAAO,MAAM,2BAA2B,EAAG,mBAA4B,CAAC;AAExE,iCAAiC;AACjC,eAAO,MAAM,yBAAyB,UAAU,CAAC;AAEjD;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAgDhE;AAED,8CAA8C;AAC9C,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,iCAAiC,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAO/E"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** 写入
|
|
1
|
+
/** 写入 AgentTurnMessage.extra 的键(集成方也可直接设置以覆盖档案) */
|
|
2
2
|
export const WEB_SEARCH_LOCALE_EXTRA_KEY = 'web_search_locale';
|
|
3
3
|
/** 无用户设置时的 Bing setmkt / 界面语言 */
|
|
4
4
|
export const DEFAULT_WEB_SEARCH_MARKET = 'zh-CN';
|
|
@@ -63,8 +63,9 @@ export function acceptLanguageForMarket(market) {
|
|
|
63
63
|
}
|
|
64
64
|
return `${m},${m};q=0.9,en;q=0.8`;
|
|
65
65
|
}
|
|
66
|
-
export function resolveWebSearchMarketFromContext(
|
|
67
|
-
const
|
|
66
|
+
export function resolveWebSearchMarketFromContext(commMessage) {
|
|
67
|
+
const extra = commMessage ? commMessage.extra : undefined;
|
|
68
|
+
const raw = extra?.[WEB_SEARCH_LOCALE_EXTRA_KEY];
|
|
68
69
|
if (typeof raw === 'string' && raw.trim()) {
|
|
69
70
|
return normalizeWebSearchLocaleHint(raw);
|
|
70
71
|
}
|