@zhin.js/agent 1.0.2 → 1.0.4
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 +26 -0
- package/lib/activity-feedback/adapter-integration.d.ts +1 -0
- package/lib/activity-feedback/adapter-integration.d.ts.map +1 -1
- package/lib/activity-feedback/adapter-integration.js +11 -3
- package/lib/activity-feedback/adapter-integration.js.map +1 -1
- package/lib/activity-feedback/ai-bus.d.ts +20 -0
- package/lib/activity-feedback/ai-bus.d.ts.map +1 -0
- package/lib/activity-feedback/ai-bus.js +42 -0
- package/lib/activity-feedback/ai-bus.js.map +1 -0
- package/lib/activity-feedback/config-resolver.d.ts.map +1 -1
- package/lib/activity-feedback/config-resolver.js +34 -5
- package/lib/activity-feedback/config-resolver.js.map +1 -1
- package/lib/activity-feedback/event-context.d.ts.map +1 -1
- package/lib/activity-feedback/event-context.js +4 -0
- package/lib/activity-feedback/event-context.js.map +1 -1
- package/lib/activity-feedback/index.d.ts +1 -0
- package/lib/activity-feedback/index.d.ts.map +1 -1
- package/lib/activity-feedback/index.js +1 -0
- package/lib/activity-feedback/index.js.map +1 -1
- package/lib/agent-prompt/registry.d.ts.map +1 -1
- package/lib/agent-prompt/registry.js +2 -2
- package/lib/agent-prompt/registry.js.map +1 -1
- package/lib/agent-prompt/resolver.d.ts.map +1 -1
- package/lib/agent-prompt/resolver.js +2 -2
- package/lib/agent-prompt/resolver.js.map +1 -1
- package/lib/ai-event-subscriber.d.ts +10 -0
- package/lib/ai-event-subscriber.d.ts.map +1 -1
- package/lib/ai-event-subscriber.js +32 -6
- package/lib/ai-event-subscriber.js.map +1 -1
- package/lib/ai-hook-handlers.d.ts +8 -0
- package/lib/ai-hook-handlers.d.ts.map +1 -0
- package/lib/ai-hook-handlers.js +46 -0
- package/lib/ai-hook-handlers.js.map +1 -0
- package/lib/ai-hook-runtime-bus.d.ts +19 -0
- package/lib/ai-hook-runtime-bus.d.ts.map +1 -0
- package/lib/ai-hook-runtime-bus.js +41 -0
- package/lib/ai-hook-runtime-bus.js.map +1 -0
- package/lib/aop/index.d.ts +7 -5
- package/lib/aop/index.d.ts.map +1 -1
- package/lib/aop/index.js +6 -5
- package/lib/aop/index.js.map +1 -1
- package/lib/assistant/deliver-schedule-to-adapter.d.ts +21 -0
- package/lib/assistant/deliver-schedule-to-adapter.d.ts.map +1 -0
- package/lib/assistant/deliver-schedule-to-adapter.js +19 -0
- package/lib/assistant/deliver-schedule-to-adapter.js.map +1 -0
- package/lib/assistant/domains/home-assistant.js +2 -2
- package/lib/assistant/domains/home-assistant.js.map +1 -1
- package/lib/assistant/event-ingress.js +2 -2
- package/lib/assistant/event-ingress.js.map +1 -1
- package/lib/assistant/index.d.ts +1 -1
- package/lib/assistant/index.d.ts.map +1 -1
- package/lib/assistant/index.js +1 -1
- package/lib/assistant/index.js.map +1 -1
- package/lib/assistant/job-engine.js +2 -2
- package/lib/assistant/job-engine.js.map +1 -1
- package/lib/assistant/job-store.js +2 -2
- package/lib/assistant/job-store.js.map +1 -1
- package/lib/assistant/job-worker.js +2 -2
- package/lib/assistant/job-worker.js.map +1 -1
- package/lib/assistant/notification-router.d.ts.map +1 -1
- package/lib/assistant/notification-router.js +2 -2
- package/lib/assistant/notification-router.js.map +1 -1
- package/lib/assistant/runtime-registry.d.ts +2 -0
- package/lib/assistant/runtime-registry.d.ts.map +1 -1
- package/lib/assistant/runtime-registry.js +19 -5
- package/lib/assistant/runtime-registry.js.map +1 -1
- package/lib/assistant/schedule-tool-runtime.js +2 -2
- package/lib/assistant/schedule-tool-runtime.js.map +1 -1
- package/lib/authoring/bridge.d.ts +40 -0
- package/lib/authoring/bridge.d.ts.map +1 -0
- package/lib/authoring/bridge.js +113 -0
- package/lib/authoring/bridge.js.map +1 -0
- package/lib/authoring/define-agent.d.ts +4 -0
- package/lib/authoring/define-agent.d.ts.map +1 -0
- package/lib/authoring/define-agent.js +8 -0
- package/lib/authoring/define-agent.js.map +1 -0
- package/lib/authoring/define-connection.d.ts +5 -0
- package/lib/authoring/define-connection.d.ts.map +1 -0
- package/lib/authoring/define-connection.js +8 -0
- package/lib/authoring/define-connection.js.map +1 -0
- package/lib/authoring/define-dynamic.d.ts +4 -0
- package/lib/authoring/define-dynamic.d.ts.map +1 -0
- package/lib/authoring/define-dynamic.js +8 -0
- package/lib/authoring/define-dynamic.js.map +1 -0
- package/lib/authoring/define-eval.d.ts +5 -0
- package/lib/authoring/define-eval.d.ts.map +1 -0
- package/lib/authoring/define-eval.js +8 -0
- package/lib/authoring/define-eval.js.map +1 -0
- package/lib/authoring/define-hook.d.ts +4 -0
- package/lib/authoring/define-hook.d.ts.map +1 -0
- package/lib/authoring/define-hook.js +8 -0
- package/lib/authoring/define-hook.js.map +1 -0
- package/lib/authoring/define-schedule.d.ts +4 -0
- package/lib/authoring/define-schedule.d.ts.map +1 -0
- package/lib/authoring/define-schedule.js +8 -0
- package/lib/authoring/define-schedule.js.map +1 -0
- package/lib/authoring/define-skill.d.ts +6 -0
- package/lib/authoring/define-skill.d.ts.map +1 -0
- package/lib/authoring/define-skill.js +9 -0
- package/lib/authoring/define-skill.js.map +1 -0
- package/lib/authoring/define-state.d.ts +4 -0
- package/lib/authoring/define-state.d.ts.map +1 -0
- package/lib/authoring/define-state.js +8 -0
- package/lib/authoring/define-state.js.map +1 -0
- package/lib/authoring/define-tool.d.ts +15 -0
- package/lib/authoring/define-tool.d.ts.map +1 -0
- package/lib/authoring/define-tool.js +18 -0
- package/lib/authoring/define-tool.js.map +1 -0
- package/lib/authoring/disable-tool.d.ts +13 -0
- package/lib/authoring/disable-tool.d.ts.map +1 -0
- package/lib/authoring/disable-tool.js +36 -0
- package/lib/authoring/disable-tool.js.map +1 -0
- package/lib/authoring/entries/connections.d.ts +3 -0
- package/lib/authoring/entries/connections.d.ts.map +1 -0
- package/lib/authoring/entries/connections.js +2 -0
- package/lib/authoring/entries/connections.js.map +1 -0
- package/lib/authoring/entries/evals.d.ts +3 -0
- package/lib/authoring/entries/evals.d.ts.map +1 -0
- package/lib/authoring/entries/evals.js +2 -0
- package/lib/authoring/entries/evals.js.map +1 -0
- package/lib/authoring/entries/hooks.d.ts +3 -0
- package/lib/authoring/entries/hooks.d.ts.map +1 -0
- package/lib/authoring/entries/hooks.js +2 -0
- package/lib/authoring/entries/hooks.js.map +1 -0
- package/lib/authoring/entries/schedules.d.ts +3 -0
- package/lib/authoring/entries/schedules.d.ts.map +1 -0
- package/lib/authoring/entries/schedules.js +2 -0
- package/lib/authoring/entries/schedules.js.map +1 -0
- package/lib/authoring/entries/skills.d.ts +3 -0
- package/lib/authoring/entries/skills.d.ts.map +1 -0
- package/lib/authoring/entries/skills.js +2 -0
- package/lib/authoring/entries/skills.js.map +1 -0
- package/lib/authoring/entries/tools.d.ts +5 -0
- package/lib/authoring/entries/tools.d.ts.map +1 -0
- package/lib/authoring/entries/tools.js +3 -0
- package/lib/authoring/entries/tools.js.map +1 -0
- package/lib/authoring/index.d.ts +25 -0
- package/lib/authoring/index.d.ts.map +1 -0
- package/lib/authoring/index.js +14 -0
- package/lib/authoring/index.js.map +1 -0
- package/lib/authoring/tool-policy.d.ts +3 -0
- package/lib/authoring/tool-policy.d.ts.map +1 -0
- package/lib/authoring/tool-policy.js +2 -0
- package/lib/authoring/tool-policy.js.map +1 -0
- package/lib/authoring/types.d.ts +209 -0
- package/lib/authoring/types.d.ts.map +1 -0
- package/lib/authoring/types.js +10 -0
- package/lib/authoring/types.js.map +1 -0
- package/lib/authoring/zod-schema.d.ts +20 -0
- package/lib/authoring/zod-schema.d.ts.map +1 -0
- package/lib/authoring/zod-schema.js +79 -0
- package/lib/authoring/zod-schema.js.map +1 -0
- package/lib/bootstrap.js +2 -2
- package/lib/bootstrap.js.map +1 -1
- package/lib/builtin/analyze-media-tool.d.ts.map +1 -1
- package/lib/builtin/analyze-media-tool.js +18 -19
- package/lib/builtin/analyze-media-tool.js.map +1 -1
- package/lib/builtin/bash-tool.d.ts.map +1 -1
- package/lib/builtin/bash-tool.js +7 -21
- package/lib/builtin/bash-tool.js.map +1 -1
- package/lib/builtin/edit-file-tool.d.ts.map +1 -1
- package/lib/builtin/edit-file-tool.js +13 -43
- package/lib/builtin/edit-file-tool.js.map +1 -1
- package/lib/builtin/glob-tool.d.ts.map +1 -1
- package/lib/builtin/glob-tool.js +5 -13
- package/lib/builtin/glob-tool.js.map +1 -1
- package/lib/builtin/grep-tool.d.ts.map +1 -1
- package/lib/builtin/grep-tool.js +5 -13
- package/lib/builtin/grep-tool.js.map +1 -1
- package/lib/builtin/install-skill-tool.d.ts.map +1 -1
- package/lib/builtin/install-skill-tool.js +2 -2
- package/lib/builtin/install-skill-tool.js.map +1 -1
- package/lib/builtin/list-dir-tool.d.ts.map +1 -1
- package/lib/builtin/list-dir-tool.js +5 -13
- package/lib/builtin/list-dir-tool.js.map +1 -1
- package/lib/builtin/read-file-tool.d.ts.map +1 -1
- package/lib/builtin/read-file-tool.js +20 -26
- package/lib/builtin/read-file-tool.js.map +1 -1
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +5 -8
- package/lib/builtin/web-fetch-tool.js.map +1 -1
- package/lib/builtin/write-file-tool.d.ts.map +1 -1
- package/lib/builtin/write-file-tool.js +12 -44
- package/lib/builtin/write-file-tool.js.map +1 -1
- package/lib/collaboration/ask-user-bridge.d.ts.map +1 -1
- package/lib/collaboration/ask-user-bridge.js +16 -2
- package/lib/collaboration/ask-user-bridge.js.map +1 -1
- package/lib/collaboration/collaboration-delegation.d.ts.map +1 -1
- package/lib/collaboration/collaboration-delegation.js +35 -6
- package/lib/collaboration/collaboration-delegation.js.map +1 -1
- package/lib/collaboration/inbound-turn-execute.js +4 -4
- package/lib/collaboration/inbound-turn-execute.js.map +1 -1
- package/lib/collaboration/inbound-turn-pipeline.d.ts.map +1 -1
- package/lib/collaboration/inbound-turn-pipeline.js +17 -9
- package/lib/collaboration/inbound-turn-pipeline.js.map +1 -1
- package/lib/collaboration/inbound-turn-route.d.ts.map +1 -1
- package/lib/collaboration/inbound-turn-route.js +35 -18
- package/lib/collaboration/inbound-turn-route.js.map +1 -1
- package/lib/collaboration/index.d.ts +2 -0
- package/lib/collaboration/index.d.ts.map +1 -1
- package/lib/collaboration/index.js +1 -0
- package/lib/collaboration/index.js.map +1 -1
- package/lib/collaboration/init-wizard-service.d.ts.map +1 -1
- package/lib/collaboration/init-wizard-service.js +2 -1
- package/lib/collaboration/init-wizard-service.js.map +1 -1
- package/lib/collaboration/runtime-inbound-gate.d.ts +35 -0
- package/lib/collaboration/runtime-inbound-gate.d.ts.map +1 -0
- package/lib/collaboration/runtime-inbound-gate.js +111 -0
- package/lib/collaboration/runtime-inbound-gate.js.map +1 -0
- package/lib/collaboration/runtime-registry.d.ts +2 -2
- package/lib/collaboration/runtime-registry.d.ts.map +1 -1
- package/lib/collaboration/runtime-registry.js +12 -7
- package/lib/collaboration/runtime-registry.js.map +1 -1
- package/lib/connection/authorization-flow.d.ts +26 -0
- package/lib/connection/authorization-flow.d.ts.map +1 -0
- package/lib/connection/authorization-flow.js +76 -0
- package/lib/connection/authorization-flow.js.map +1 -0
- package/lib/connection/index.d.ts +3 -0
- package/lib/connection/index.d.ts.map +1 -0
- package/lib/connection/index.js +2 -0
- package/lib/connection/index.js.map +1 -0
- package/lib/core/agent-core-run.d.ts +1 -0
- package/lib/core/agent-core-run.d.ts.map +1 -1
- package/lib/core/agent-core-run.js +35 -6
- package/lib/core/agent-core-run.js.map +1 -1
- package/lib/core/agent-loop-standalone.js +2 -2
- package/lib/core/agent-loop-standalone.js.map +1 -1
- package/lib/core/agent-loop-turn.d.ts +1 -1
- package/lib/core/agent-loop-turn.d.ts.map +1 -1
- package/lib/core/agent-loop-turn.js +1 -1
- package/lib/core/agent-loop-turn.js.map +1 -1
- package/lib/core/text-sanitize.d.ts.map +1 -1
- package/lib/core/text-sanitize.js +16 -1
- package/lib/core/text-sanitize.js.map +1 -1
- package/lib/core/tool-calls-user-format.d.ts.map +1 -1
- package/lib/core/tool-calls-user-format.js +18 -4
- package/lib/core/tool-calls-user-format.js.map +1 -1
- package/lib/core/turn-event-mapper.d.ts +1 -0
- package/lib/core/turn-event-mapper.d.ts.map +1 -1
- package/lib/core/turn-event-mapper.js +2 -1
- package/lib/core/turn-event-mapper.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +4 -3
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/discovery/agent-surface-info.d.ts +42 -0
- package/lib/discovery/agent-surface-info.d.ts.map +1 -0
- package/lib/discovery/agent-surface-info.js +201 -0
- package/lib/discovery/agent-surface-info.js.map +1 -0
- package/lib/discovery/agent-surface.d.ts +32 -0
- package/lib/discovery/agent-surface.d.ts.map +1 -0
- package/lib/discovery/agent-surface.js +422 -0
- package/lib/discovery/agent-surface.js.map +1 -0
- package/lib/discovery/agents.d.ts +7 -17
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +92 -100
- package/lib/discovery/agents.js.map +1 -1
- package/lib/discovery/register-agent-surface.d.ts +33 -0
- package/lib/discovery/register-agent-surface.d.ts.map +1 -0
- package/lib/discovery/register-agent-surface.js +170 -0
- package/lib/discovery/register-agent-surface.js.map +1 -0
- package/lib/discovery/skills.d.ts.map +1 -1
- package/lib/discovery/skills.js +2 -2
- package/lib/discovery/skills.js.map +1 -1
- package/lib/discovery/tools.d.ts.map +1 -1
- package/lib/discovery/tools.js +2 -2
- package/lib/discovery/tools.js.map +1 -1
- package/lib/dynamic/dynamic-registry.d.ts +34 -0
- package/lib/dynamic/dynamic-registry.d.ts.map +1 -0
- package/lib/dynamic/dynamic-registry.js +52 -0
- package/lib/dynamic/dynamic-registry.js.map +1 -0
- package/lib/event/agent-stream-bus.d.ts +25 -0
- package/lib/event/agent-stream-bus.d.ts.map +1 -0
- package/lib/event/agent-stream-bus.js +22 -0
- package/lib/event/agent-stream-bus.js.map +1 -0
- package/lib/event/agent-stream-hooks.d.ts +10 -0
- package/lib/event/agent-stream-hooks.d.ts.map +1 -0
- package/lib/event/agent-stream-hooks.js +28 -0
- package/lib/event/agent-stream-hooks.js.map +1 -0
- package/lib/event/event-emitter.d.ts.map +1 -1
- package/lib/event/event-emitter.js +7 -2
- package/lib/event/event-emitter.js.map +1 -1
- package/lib/event/event-system.js +2 -2
- package/lib/event/event-system.js.map +1 -1
- package/lib/event/hook-stream-sink.d.ts +7 -0
- package/lib/event/hook-stream-sink.d.ts.map +1 -0
- package/lib/event/hook-stream-sink.js +9 -0
- package/lib/event/hook-stream-sink.js.map +1 -0
- package/lib/event/index.d.ts +6 -0
- package/lib/event/index.d.ts.map +1 -1
- package/lib/event/index.js +4 -0
- package/lib/event/index.js.map +1 -1
- package/lib/event/logging-middleware.js +2 -2
- package/lib/event/logging-middleware.js.map +1 -1
- package/lib/event/publish-agent-stream.d.ts +11 -0
- package/lib/event/publish-agent-stream.d.ts.map +1 -0
- package/lib/event/publish-agent-stream.js +14 -0
- package/lib/event/publish-agent-stream.js.map +1 -0
- package/lib/event/turn-to-agent-stream.d.ts +12 -0
- package/lib/event/turn-to-agent-stream.d.ts.map +1 -0
- package/lib/event/turn-to-agent-stream.js +124 -0
- package/lib/event/turn-to-agent-stream.js.map +1 -0
- package/lib/features/agent-feature.d.ts +23 -0
- package/lib/features/agent-feature.d.ts.map +1 -0
- package/lib/features/agent-feature.js +51 -0
- package/lib/features/agent-feature.js.map +1 -0
- package/lib/features/index.d.ts +3 -0
- package/lib/features/index.d.ts.map +1 -0
- package/lib/features/index.js +3 -0
- package/lib/features/index.js.map +1 -0
- package/lib/features/mcp-feature.d.ts +25 -0
- package/lib/features/mcp-feature.d.ts.map +1 -0
- package/lib/features/mcp-feature.js +52 -0
- package/lib/features/mcp-feature.js.map +1 -0
- package/lib/hooks.d.ts +3 -2
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js +8 -36
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +50 -8
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +34 -6
- package/lib/index.js.map +1 -1
- package/lib/ingress/capability-ingress.d.ts +75 -0
- package/lib/ingress/capability-ingress.d.ts.map +1 -0
- package/lib/ingress/capability-ingress.js +266 -0
- package/lib/ingress/capability-ingress.js.map +1 -0
- package/lib/ingress/index.d.ts +2 -0
- package/lib/ingress/index.d.ts.map +1 -0
- package/lib/ingress/index.js +2 -0
- package/lib/ingress/index.js.map +1 -0
- package/lib/init/activate-ai-database-storage.d.ts +2 -1
- package/lib/init/activate-ai-database-storage.d.ts.map +1 -1
- package/lib/init/activate-ai-database-storage.js +3 -3
- package/lib/init/activate-ai-database-storage.js.map +1 -1
- package/lib/init/bootstrap-gate.d.ts +6 -0
- package/lib/init/bootstrap-gate.d.ts.map +1 -0
- package/lib/init/bootstrap-gate.js +28 -0
- package/lib/init/bootstrap-gate.js.map +1 -0
- package/lib/init/configure-zhin-agent.js +2 -2
- package/lib/init/configure-zhin-agent.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +18 -2
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/define-ai-database-models.d.ts +4 -0
- package/lib/init/define-ai-database-models.d.ts.map +1 -0
- package/lib/init/define-ai-database-models.js +33 -0
- package/lib/init/define-ai-database-models.js.map +1 -0
- package/lib/init/introspection-collectors.d.ts +5 -0
- package/lib/init/introspection-collectors.d.ts.map +1 -1
- package/lib/init/introspection-collectors.js +35 -0
- package/lib/init/introspection-collectors.js.map +1 -1
- package/lib/init/register-ai-service.d.ts.map +1 -1
- package/lib/init/register-ai-service.js +3 -0
- package/lib/init/register-ai-service.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +78 -31
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-capability-features.d.ts +2 -0
- package/lib/init/register-capability-features.d.ts.map +1 -0
- package/lib/init/register-capability-features.js +28 -0
- package/lib/init/register-capability-features.js.map +1 -0
- package/lib/init/register-db-models.d.ts.map +1 -1
- package/lib/init/register-db-models.js +3 -20
- package/lib/init/register-db-models.js.map +1 -1
- package/lib/init/register-db-upgrade.d.ts.map +1 -1
- package/lib/init/register-db-upgrade.js +20 -11
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/register-mcp-from-config.d.ts.map +1 -1
- package/lib/init/register-mcp-from-config.js +8 -6
- package/lib/init/register-mcp-from-config.js.map +1 -1
- package/lib/init/types.d.ts +9 -0
- package/lib/init/types.d.ts.map +1 -1
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +3 -1
- package/lib/init.js.map +1 -1
- package/lib/internal/agent-host.d.ts +5 -0
- package/lib/internal/agent-host.d.ts.map +1 -1
- package/lib/internal/host-types.d.ts +7 -0
- package/lib/internal/host-types.d.ts.map +1 -1
- package/lib/internal/phase-trace.js +2 -2
- package/lib/internal/phase-trace.js.map +1 -1
- package/lib/internal/prompt-trace.js +2 -2
- package/lib/internal/prompt-trace.js.map +1 -1
- package/lib/mcp-client/bridge.d.ts.map +1 -1
- package/lib/mcp-client/bridge.js +3 -1
- package/lib/mcp-client/bridge.js.map +1 -1
- package/lib/media/subagent-user-delivery.d.ts.map +1 -1
- package/lib/media/subagent-user-delivery.js +57 -12
- package/lib/media/subagent-user-delivery.js.map +1 -1
- package/lib/memory-layers.d.ts.map +1 -1
- package/lib/memory-layers.js +2 -2
- package/lib/memory-layers.js.map +1 -1
- package/lib/orchestration-runtime-registry.d.ts +1 -1
- package/lib/orchestrator/hook-registry.d.ts +9 -1
- package/lib/orchestrator/hook-registry.d.ts.map +1 -1
- package/lib/orchestrator/hook-registry.js +38 -4
- package/lib/orchestrator/hook-registry.js.map +1 -1
- package/lib/orchestrator/index.d.ts +6 -1
- package/lib/orchestrator/index.d.ts.map +1 -1
- package/lib/orchestrator/index.js +11 -1
- package/lib/orchestrator/index.js.map +1 -1
- package/lib/orchestrator/mcp-registry.d.ts +8 -0
- package/lib/orchestrator/mcp-registry.d.ts.map +1 -1
- package/lib/orchestrator/mcp-registry.js +21 -2
- package/lib/orchestrator/mcp-registry.js.map +1 -1
- package/lib/orchestrator/orchestration-repository.js +3 -3
- package/lib/orchestrator/orchestration-repository.js.map +1 -1
- package/lib/orchestrator/orchestration-service.d.ts +3 -1
- package/lib/orchestrator/orchestration-service.d.ts.map +1 -1
- package/lib/orchestrator/orchestration-service.js +25 -6
- package/lib/orchestrator/orchestration-service.js.map +1 -1
- package/lib/orchestrator/remote-agent-registry.js +2 -2
- package/lib/orchestrator/remote-agent-registry.js.map +1 -1
- package/lib/orchestrator/remote-task-poller.js +2 -2
- package/lib/orchestrator/remote-task-poller.js.map +1 -1
- package/lib/orchestrator/tool-registry.d.ts.map +1 -1
- package/lib/orchestrator/tool-registry.js +2 -2
- package/lib/orchestrator/tool-registry.js.map +1 -1
- package/lib/orchestrator/tool-selection.d.ts.map +1 -1
- package/lib/orchestrator/tool-selection.js +6 -2
- package/lib/orchestrator/tool-selection.js.map +1 -1
- package/lib/orchestrator/types.d.ts +6 -1
- package/lib/orchestrator/types.d.ts.map +1 -1
- package/lib/plugin-ai-hook-bus.d.ts +8 -0
- package/lib/plugin-ai-hook-bus.d.ts.map +1 -1
- package/lib/plugin-ai-hook-bus.js +20 -1
- package/lib/plugin-ai-hook-bus.js.map +1 -1
- package/lib/plugin-runtime/agent-host-port.d.ts +11 -0
- package/lib/plugin-runtime/agent-host-port.d.ts.map +1 -0
- package/lib/plugin-runtime/agent-host-port.js +3 -0
- package/lib/plugin-runtime/agent-host-port.js.map +1 -0
- package/lib/plugin-runtime/agent-runtime.d.ts +11 -0
- package/lib/plugin-runtime/agent-runtime.d.ts.map +1 -0
- package/lib/plugin-runtime/agent-runtime.js +25 -0
- package/lib/plugin-runtime/agent-runtime.js.map +1 -0
- package/lib/plugin-runtime/capability-ingress.d.ts +25 -0
- package/lib/plugin-runtime/capability-ingress.d.ts.map +1 -0
- package/lib/plugin-runtime/capability-ingress.js +77 -0
- package/lib/plugin-runtime/capability-ingress.js.map +1 -0
- package/lib/plugin-runtime/index.d.ts +4 -0
- package/lib/plugin-runtime/index.d.ts.map +1 -0
- package/lib/plugin-runtime/index.js +4 -0
- package/lib/plugin-runtime/index.js.map +1 -0
- package/lib/prompt/assembly.d.ts.map +1 -1
- package/lib/prompt/assembly.js +3 -1
- package/lib/prompt/assembly.js.map +1 -1
- package/lib/prompt/system-prompt.d.ts.map +1 -1
- package/lib/prompt/system-prompt.js +50 -14
- package/lib/prompt/system-prompt.js.map +1 -1
- package/lib/schedule-manager.d.ts +2 -0
- package/lib/schedule-manager.d.ts.map +1 -1
- package/lib/schedule-manager.js +14 -3
- package/lib/schedule-manager.js.map +1 -1
- package/lib/security/audit-logger.d.ts +19 -5
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +205 -24
- package/lib/security/audit-logger.js.map +1 -1
- package/lib/security/exec-policy.d.ts +7 -1
- package/lib/security/exec-policy.d.ts.map +1 -1
- package/lib/security/exec-policy.js +92 -4
- package/lib/security/exec-policy.js.map +1 -1
- package/lib/security/index.d.ts +1 -0
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +1 -0
- package/lib/security/index.js.map +1 -1
- package/lib/security/owner-approve-always-store.d.ts +20 -15
- package/lib/security/owner-approve-always-store.d.ts.map +1 -1
- package/lib/security/owner-approve-always-store.js +131 -19
- package/lib/security/owner-approve-always-store.js.map +1 -1
- package/lib/security/policy-facade.d.ts +86 -0
- package/lib/security/policy-facade.d.ts.map +1 -0
- package/lib/security/policy-facade.js +230 -0
- package/lib/security/policy-facade.js.map +1 -0
- package/lib/security/sandbox-enhanced.d.ts.map +1 -1
- package/lib/security/sandbox-enhanced.js +27 -19
- package/lib/security/sandbox-enhanced.js.map +1 -1
- package/lib/security/sandbox.d.ts.map +1 -1
- package/lib/security/sandbox.js +6 -6
- package/lib/security/sandbox.js.map +1 -1
- package/lib/session/agent-session-host-port.d.ts +23 -0
- package/lib/session/agent-session-host-port.d.ts.map +1 -0
- package/lib/session/agent-session-host-port.js +61 -0
- package/lib/session/agent-session-host-port.js.map +1 -0
- package/lib/session/http-agent-session-store.d.ts +76 -0
- package/lib/session/http-agent-session-store.d.ts.map +1 -0
- package/lib/session/http-agent-session-store.js +211 -0
- package/lib/session/http-agent-session-store.js.map +1 -0
- package/lib/session/http-approval-adapter.d.ts +11 -0
- package/lib/session/http-approval-adapter.d.ts.map +1 -0
- package/lib/session/http-approval-adapter.js +19 -0
- package/lib/session/http-approval-adapter.js.map +1 -0
- package/lib/session/http-approval-waiter.d.ts +11 -0
- package/lib/session/http-approval-waiter.d.ts.map +1 -0
- package/lib/session/http-approval-waiter.js +38 -0
- package/lib/session/http-approval-waiter.js.map +1 -0
- package/lib/session/http-session-persistence.d.ts +28 -0
- package/lib/session/http-session-persistence.d.ts.map +1 -0
- package/lib/session/http-session-persistence.js +60 -0
- package/lib/session/http-session-persistence.js.map +1 -0
- package/lib/session/http-session-sink.d.ts +11 -0
- package/lib/session/http-session-sink.d.ts.map +1 -0
- package/lib/session/http-session-sink.js +32 -0
- package/lib/session/http-session-sink.js.map +1 -0
- package/lib/session/http-step-projector.d.ts +16 -0
- package/lib/session/http-step-projector.d.ts.map +1 -0
- package/lib/session/http-step-projector.js +118 -0
- package/lib/session/http-step-projector.js.map +1 -0
- package/lib/session/http-turn-runner.d.ts +16 -0
- package/lib/session/http-turn-runner.d.ts.map +1 -0
- package/lib/session/http-turn-runner.js +57 -0
- package/lib/session/http-turn-runner.js.map +1 -0
- package/lib/session/im-approval-adapter.d.ts +12 -0
- package/lib/session/im-approval-adapter.d.ts.map +1 -0
- package/lib/session/im-approval-adapter.js +24 -0
- package/lib/session/im-approval-adapter.js.map +1 -0
- package/lib/session/park-controller.d.ts +24 -0
- package/lib/session/park-controller.d.ts.map +1 -0
- package/lib/session/park-controller.js +58 -0
- package/lib/session/park-controller.js.map +1 -0
- package/lib/session/resolve-session-interaction-port.d.ts +9 -0
- package/lib/session/resolve-session-interaction-port.d.ts.map +1 -0
- package/lib/session/resolve-session-interaction-port.js +13 -0
- package/lib/session/resolve-session-interaction-port.js.map +1 -0
- package/lib/session/session-event-log.d.ts +17 -0
- package/lib/session/session-event-log.d.ts.map +1 -0
- package/lib/session/session-event-log.js +56 -0
- package/lib/session/session-event-log.js.map +1 -0
- package/lib/session/session-interaction-port.d.ts +15 -0
- package/lib/session/session-interaction-port.d.ts.map +1 -0
- package/lib/session/session-interaction-port.js +2 -0
- package/lib/session/session-interaction-port.js.map +1 -0
- package/lib/skill/progressive-disclosure.d.ts +9 -0
- package/lib/skill/progressive-disclosure.d.ts.map +1 -0
- package/lib/skill/progressive-disclosure.js +14 -0
- package/lib/skill/progressive-disclosure.js.map +1 -0
- package/lib/stability/memory-pressure.d.ts.map +1 -1
- package/lib/stability/memory-pressure.js +2 -2
- package/lib/stability/memory-pressure.js.map +1 -1
- package/lib/state/agent-state-store.d.ts +18 -0
- package/lib/state/agent-state-store.d.ts.map +1 -0
- package/lib/state/agent-state-store.js +50 -0
- package/lib/state/agent-state-store.js.map +1 -0
- package/lib/subagent/subagent-runtime.d.ts.map +1 -1
- package/lib/subagent/subagent-runtime.js +9 -9
- package/lib/subagent/subagent-runtime.js.map +1 -1
- package/lib/subagent/subagent-system-init.js +2 -2
- package/lib/subagent/subagent-system-init.js.map +1 -1
- package/lib/subagent-prompt.d.ts.map +1 -1
- package/lib/subagent-prompt.js +32 -8
- package/lib/subagent-prompt.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 +14 -8
- package/lib/task-executor.js.map +1 -1
- package/lib/tool/deferred-resolution.d.ts.map +1 -1
- package/lib/tool/deferred-resolution.js +4 -10
- package/lib/tool/deferred-resolution.js.map +1 -1
- package/lib/tool/prepare-turn-tools.d.ts +1 -1
- package/lib/tool/prepare-turn-tools.d.ts.map +1 -1
- package/lib/tool/prepare-turn-tools.js +15 -1
- package/lib/tool/prepare-turn-tools.js.map +1 -1
- package/lib/tool/sources.d.ts.map +1 -1
- package/lib/tool/sources.js +2 -10
- package/lib/tool/sources.js.map +1 -1
- package/lib/tool/tool-approval-gate.d.ts +30 -0
- package/lib/tool/tool-approval-gate.d.ts.map +1 -0
- package/lib/tool/tool-approval-gate.js +74 -0
- package/lib/tool/tool-approval-gate.js.map +1 -0
- package/lib/tool/tool-approval-once-store.d.ts +10 -0
- package/lib/tool/tool-approval-once-store.d.ts.map +1 -0
- package/lib/tool/tool-approval-once-store.js +16 -0
- package/lib/tool/tool-approval-once-store.js.map +1 -0
- package/lib/tool/tool-model-output.d.ts +3 -0
- package/lib/tool/tool-model-output.d.ts.map +1 -0
- package/lib/tool/tool-model-output.js +7 -0
- package/lib/tool/tool-model-output.js.map +1 -0
- package/lib/turn/auto-continue.js +2 -2
- package/lib/turn/auto-continue.js.map +1 -1
- package/lib/turn/index.d.ts +1 -1
- package/lib/turn/index.d.ts.map +1 -1
- package/lib/turn/index.js +1 -1
- package/lib/turn/index.js.map +1 -1
- package/lib/turn/process-stream.d.ts.map +1 -1
- package/lib/turn/process-stream.js +17 -3
- package/lib/turn/process-stream.js.map +1 -1
- package/lib/turn/turn-complete.d.ts.map +1 -1
- package/lib/turn/turn-complete.js +3 -7
- package/lib/turn/turn-complete.js.map +1 -1
- package/lib/turn/turn-metrics.d.ts +13 -2
- package/lib/turn/turn-metrics.d.ts.map +1 -1
- package/lib/turn/turn-metrics.js +69 -9
- package/lib/turn/turn-metrics.js.map +1 -1
- package/lib/turn/turn-pipeline.d.ts.map +1 -1
- package/lib/turn/turn-pipeline.js +16 -7
- package/lib/turn/turn-pipeline.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +3 -3
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +8 -1
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/user-profile.js +2 -2
- package/lib/user-profile.js.map +1 -1
- package/lib/utils/config-env.js +30 -7
- package/lib/utils/config-env.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +15 -2
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +22 -4
- package/lib/zhin-agent/index.js.map +1 -1
- package/package.json +57 -7
- package/lib/aop/coordination/index.d.ts +0 -7
- package/lib/aop/coordination/index.d.ts.map +0 -1
- package/lib/aop/coordination/index.js +0 -7
- package/lib/aop/coordination/index.js.map +0 -1
- package/lib/aop/inbound/index.d.ts +0 -7
- package/lib/aop/inbound/index.d.ts.map +0 -1
- package/lib/aop/inbound/index.js +0 -6
- package/lib/aop/inbound/index.js.map +0 -1
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-tool approval gate — stacks with ExecPolicy (ADR 0039 P1).
|
|
3
|
+
*/
|
|
4
|
+
import type { Message, Plugin } from '@zhin.js/core';
|
|
5
|
+
import type { ToolApprovalPolicy } from '@zhin.js/ai/tool-policy';
|
|
6
|
+
import type { AgentStreamBus, AgentStreamPublishContext } from '../event/agent-stream-bus.js';
|
|
7
|
+
import type { SessionInteractionPort } from '../session/session-interaction-port.js';
|
|
8
|
+
import type { ToolApprovalOnceStore } from './tool-approval-once-store.js';
|
|
9
|
+
export declare function resolveToolApprovalRequired(policy: ToolApprovalPolicy | undefined, input: {
|
|
10
|
+
toolName: string;
|
|
11
|
+
args: Record<string, unknown>;
|
|
12
|
+
sessionId: string;
|
|
13
|
+
}, onceStore?: ToolApprovalOnceStore): Promise<boolean>;
|
|
14
|
+
export interface ToolApprovalGateOptions {
|
|
15
|
+
toolName: string;
|
|
16
|
+
args: Record<string, unknown>;
|
|
17
|
+
sessionId: string;
|
|
18
|
+
commMessage: Message;
|
|
19
|
+
policy?: ToolApprovalPolicy;
|
|
20
|
+
plugin?: Plugin;
|
|
21
|
+
bus?: AgentStreamBus;
|
|
22
|
+
port?: SessionInteractionPort;
|
|
23
|
+
onceStore?: ToolApprovalOnceStore;
|
|
24
|
+
publishCtx?: AgentStreamPublishContext;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Returns denial message when approval is required but not granted; otherwise null.
|
|
28
|
+
*/
|
|
29
|
+
export declare function runToolApprovalGate(options: ToolApprovalGateOptions): Promise<string | null>;
|
|
30
|
+
//# sourceMappingURL=tool-approval-gate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-approval-gate.d.ts","sourceRoot":"","sources":["../../src/tool/tool-approval-gate.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC7E,SAAS,CAAC,EAAE,qBAAqB,GAChC,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,IAAI,CAAC,EAAE,sBAAsB,CAAC;IAC9B,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,UAAU,CAAC,EAAE,yBAAyB,CAAC;CACxC;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6DxB"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
2
|
+
export async function resolveToolApprovalRequired(policy, input, onceStore) {
|
|
3
|
+
if (!policy || policy === 'never')
|
|
4
|
+
return false;
|
|
5
|
+
if (policy === 'always')
|
|
6
|
+
return true;
|
|
7
|
+
if (policy === 'once') {
|
|
8
|
+
if (!onceStore)
|
|
9
|
+
return true;
|
|
10
|
+
return !onceStore.has(input.sessionId, input.toolName);
|
|
11
|
+
}
|
|
12
|
+
return Boolean(await policy({ toolName: input.toolName, args: input.args }));
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Returns denial message when approval is required but not granted; otherwise null.
|
|
16
|
+
*/
|
|
17
|
+
export async function runToolApprovalGate(options) {
|
|
18
|
+
const required = await resolveToolApprovalRequired(options.policy, {
|
|
19
|
+
toolName: options.toolName,
|
|
20
|
+
args: options.args,
|
|
21
|
+
sessionId: options.sessionId,
|
|
22
|
+
}, options.onceStore);
|
|
23
|
+
if (!required)
|
|
24
|
+
return null;
|
|
25
|
+
if (!options.bus || !options.port) {
|
|
26
|
+
return 'Error: approval required but AgentStreamBus / SessionInteractionPort unavailable';
|
|
27
|
+
}
|
|
28
|
+
const requestId = `approval_${options.toolName}_${Date.now()}`;
|
|
29
|
+
const publishCtx = {
|
|
30
|
+
sessionId: options.sessionId,
|
|
31
|
+
...options.publishCtx,
|
|
32
|
+
};
|
|
33
|
+
await options.bus.publish({
|
|
34
|
+
type: AgentStreamEventType.INPUT_REQUESTED,
|
|
35
|
+
data: {
|
|
36
|
+
sessionId: options.sessionId,
|
|
37
|
+
requestId,
|
|
38
|
+
toolName: options.toolName,
|
|
39
|
+
kind: 'approval',
|
|
40
|
+
args: options.args,
|
|
41
|
+
},
|
|
42
|
+
}, publishCtx);
|
|
43
|
+
const question = `工具「${options.toolName}」需要确认后执行。是否继续?`;
|
|
44
|
+
let approved;
|
|
45
|
+
try {
|
|
46
|
+
approved = await options.port.requestApproval({
|
|
47
|
+
requestId,
|
|
48
|
+
toolName: options.toolName,
|
|
49
|
+
question,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
catch (err) {
|
|
53
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
54
|
+
return `Error: approval wait failed — ${msg}`;
|
|
55
|
+
}
|
|
56
|
+
await options.bus.publish({
|
|
57
|
+
type: AgentStreamEventType.INPUT_COMPLETED,
|
|
58
|
+
data: {
|
|
59
|
+
sessionId: options.sessionId,
|
|
60
|
+
requestId,
|
|
61
|
+
toolName: options.toolName,
|
|
62
|
+
kind: 'approval',
|
|
63
|
+
approved,
|
|
64
|
+
},
|
|
65
|
+
}, publishCtx);
|
|
66
|
+
if (!approved) {
|
|
67
|
+
return `Error: tool "${options.toolName}" execution denied by user`;
|
|
68
|
+
}
|
|
69
|
+
if (options.policy === 'once' && options.onceStore) {
|
|
70
|
+
options.onceStore.add(options.sessionId, options.toolName);
|
|
71
|
+
}
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=tool-approval-gate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-approval-gate.js","sourceRoot":"","sources":["../../src/tool/tool-approval-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-orchestrator store for policy: 'once' tool approvals (ADR 0039 P1).
|
|
3
|
+
*/
|
|
4
|
+
export declare class ToolApprovalOnceStore {
|
|
5
|
+
private readonly keys;
|
|
6
|
+
has(sessionId: string, toolName: string): boolean;
|
|
7
|
+
add(sessionId: string, toolName: string): void;
|
|
8
|
+
clear(): void;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=tool-approval-once-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-approval-once-store.d.ts","sourceRoot":"","sources":["../../src/tool/tool-approval-once-store.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAE1C,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIjD,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI9C,KAAK,IAAI,IAAI;CAGd"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-orchestrator store for policy: 'once' tool approvals (ADR 0039 P1).
|
|
3
|
+
*/
|
|
4
|
+
export class ToolApprovalOnceStore {
|
|
5
|
+
keys = new Set();
|
|
6
|
+
has(sessionId, toolName) {
|
|
7
|
+
return this.keys.has(`${sessionId}:${toolName}`);
|
|
8
|
+
}
|
|
9
|
+
add(sessionId, toolName) {
|
|
10
|
+
this.keys.add(`${sessionId}:${toolName}`);
|
|
11
|
+
}
|
|
12
|
+
clear() {
|
|
13
|
+
this.keys.clear();
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=tool-approval-once-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-approval-once-store.js","sourceRoot":"","sources":["../../src/tool/tool-approval-once-store.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,qBAAqB;IACf,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE1C,GAAG,CAAC,SAAiB,EAAE,QAAgB;QACrC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,GAAG,CAAC,SAAiB,EAAE,QAAgB;QACrC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-model-output.d.ts","sourceRoot":"","sources":["../../src/tool/tool-model-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EACtC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,CAKjB"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export async function applyToolToModelOutput(tool, raw, args) {
|
|
2
|
+
if (!tool.toModelOutput) {
|
|
3
|
+
return typeof raw === 'string' ? raw : JSON.stringify(raw ?? null);
|
|
4
|
+
}
|
|
5
|
+
return tool.toModelOutput({ result: raw, args });
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=tool-model-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-model-output.js","sourceRoot":"","sources":["../../src/tool/tool-model-output.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAsC,EACtC,GAAY,EACZ,IAA6B;IAE7B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import { formatCompact,
|
|
2
|
+
import { formatCompact, getLogger } from '@zhin.js/logger';
|
|
3
3
|
import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
|
|
4
4
|
import { deliverDeferredAutoContinueReply } from './deferred-delivery.js';
|
|
5
5
|
import { buildDeferredAutoContinueUserMessage, shouldDeferredAutoContinue } from './deferred-auto-continue.js';
|
|
@@ -7,7 +7,7 @@ import { buildSubagentAutoContinueUserMessage } from './subagent-auto-continue.j
|
|
|
7
7
|
import { persistSubagentResultToContext } from './persist-subagent-context.js';
|
|
8
8
|
import { persistDeferredWorkerResultToContext } from './persist-deferred-context.js';
|
|
9
9
|
import { processTextTurn } from './turn-pipeline.js';
|
|
10
|
-
const logger =
|
|
10
|
+
const logger = getLogger('ZhinAgent');
|
|
11
11
|
async function executeAutoContinueTurn(host, agent, commMessage, sessionKey, taskId, depth, kind, buildMessage) {
|
|
12
12
|
await host.promptController.waitForIdle();
|
|
13
13
|
host.setDeferredAutoContinueDepth(sessionKey, depth + 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-continue.js","sourceRoot":"","sources":["../../src/turn/auto-continue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"auto-continue.js","sourceRoot":"","sources":["../../src/turn/auto-continue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAC3F,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,oCAAoC,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAC/G,OAAO,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AActC,KAAK,UAAU,uBAAuB,CACpC,IAAsB,EACtB,KAAuB,EACvB,WAAoB,EACpB,UAAkB,EAClB,MAAc,EACd,KAAa,EACb,IAAsB,EACtB,YAA+B;IAE/B,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAEzD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACxB,CAAC,IAAI,CAAC,EAAE,eAAe;QACvB,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,KAAK,GAAG,CAAC;KACjB,CAAC,CAAC,CAAC;IAEJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAC9D,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE;QACrD,gBAAgB,EAAE,CAAC,YAAY,EAAE,CAAC;QAClC,oBAAoB,EAAE,IAAI;KAC3B,CAAC,CACH,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;IAC9C,IAAI,MAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,gCAAgC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACxB,CAAC,IAAI,CAAC,EAAE,oBAAoB;QAC5B,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,KAAK,GAAG,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,MAAM;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAsB,EACtB,KAAuB,EACvB,WAAoB,EACpB,MAAc,EACd,IAAY,EACZ,MAA4B;IAE5B,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,MAAM,oCAAoC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACvG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,MAAM;YACf,KAAK;YACL,SAAS;YACT,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC,CAAC;QACJ,OAAO;IACT,CAAC;IAED,MAAM,uBAAuB,CAC3B,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,KAAK,EACL,UAAU,EACV,GAAG,EAAE,CAAC,oCAAoC,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CACxE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAAsB,EACtB,KAAuB,EACvB,OAAgC;IAEhC,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,KAAK,KAAK;QAAE,OAAO;IAEvD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;IAC3C,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAC5D,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,MAAM,EAAE,WAAW;YACnB,KAAK;SACN,CAAC,CAAC,CAAC;QACJ,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,8BAA8B,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,MAAM,EAAE,gBAAgB;SACzB,CAAC,CAAC,CAAC;QACJ,OAAO;IACT,CAAC;IAED,MAAM,uBAAuB,CAC3B,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,OAAO,CAAC,MAAM,EACd,KAAK,EACL,UAAU,EACV,GAAG,EAAE,CAAC,oCAAoC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAC1F,CAAC;AACJ,CAAC"}
|
package/lib/turn/index.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export { processTextTurnStream } from './process-stream.js';
|
|
|
7
7
|
export { PromptController, TurnSupersededError, } from './prompt-controller.js';
|
|
8
8
|
export type { PromptTurnHooks, PromptTurnRequest } from './prompt-controller.js';
|
|
9
9
|
export { SessionMessageQueue } from './session-message-queue.js';
|
|
10
|
-
export { addUsage, EMPTY_USAGE, formatAiHandlerCompleteLog, formatZhinAgentTurnUsage, } from './turn-metrics.js';
|
|
10
|
+
export { addUsage, EMPTY_USAGE, formatAiHandlerCompleteLog, formatAiHandlerTurnTable, formatOutputElementsPreview, formatZhinAgentTurnUsage, } from './turn-metrics.js';
|
|
11
11
|
export type { ZhinAgentTurnMetrics, ZhinAgentTurnPath } from './turn-metrics.js';
|
|
12
12
|
export { TurnTracker } from './turn-tracker.js';
|
|
13
13
|
export { summarizeMultimodalParts, buildVisionUserMessage, } from './multimodal-message.js';
|
package/lib/turn/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,MAAM,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,MAAM,wBAAwB,CAAC"}
|
package/lib/turn/index.js
CHANGED
|
@@ -5,7 +5,7 @@ export { processTextTurn, processMultimodalTurn } from './turn-pipeline.js';
|
|
|
5
5
|
export { processTextTurnStream } from './process-stream.js';
|
|
6
6
|
export { PromptController, TurnSupersededError, } from './prompt-controller.js';
|
|
7
7
|
export { SessionMessageQueue } from './session-message-queue.js';
|
|
8
|
-
export { addUsage, EMPTY_USAGE, formatAiHandlerCompleteLog, formatZhinAgentTurnUsage, } from './turn-metrics.js';
|
|
8
|
+
export { addUsage, EMPTY_USAGE, formatAiHandlerCompleteLog, formatAiHandlerTurnTable, formatOutputElementsPreview, formatZhinAgentTurnUsage, } from './turn-metrics.js';
|
|
9
9
|
export { TurnTracker } from './turn-tracker.js';
|
|
10
10
|
export { summarizeMultimodalParts, buildVisionUserMessage, } from './multimodal-message.js';
|
|
11
11
|
export { InboundTurnQueue, InboundTurnExpiredError, } from './inbound-turn-queue.js';
|
package/lib/turn/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAG5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAG5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-stream.d.ts","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-stream.d.ts","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAGlF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,wBAAuB,qBAAqB,CAC1C,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3E,GACA,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAuE5C"}
|
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
|
|
3
|
+
import { publishTurnStreamEvents } from '../event/publish-agent-stream.js';
|
|
4
|
+
import { readHttpSessionId } from '../session/resolve-session-interaction-port.js';
|
|
3
5
|
import { runWithInboundQueue } from '../turn/inbound-queue-runtime.js';
|
|
4
6
|
import { processTextTurn } from './turn-pipeline.js';
|
|
5
7
|
export async function* processTextTurnStream(agent, opts) {
|
|
6
8
|
const { content, commMessage, externalTools, inboundQueueConfig, inboundTurnQueue, runInTurnContext } = opts;
|
|
7
9
|
const turnId = randomUUID();
|
|
8
10
|
const sessionId = resolveIMSessionIdFromMessage(commMessage);
|
|
9
|
-
|
|
11
|
+
const streamCtx = () => ({
|
|
12
|
+
sessionId,
|
|
13
|
+
turnId,
|
|
14
|
+
httpSessionId: readHttpSessionId(commMessage),
|
|
15
|
+
});
|
|
16
|
+
const turnStart = { type: 'turn_start', sessionId, turnId };
|
|
17
|
+
yield turnStart;
|
|
18
|
+
publishTurnStreamEvents(agent, turnStart, streamCtx());
|
|
10
19
|
const eventQueue = [];
|
|
11
20
|
let resolveWaiting;
|
|
12
21
|
let done = false;
|
|
@@ -17,6 +26,7 @@ export async function* processTextTurnStream(agent, opts) {
|
|
|
17
26
|
if (event.type === 'turn_end')
|
|
18
27
|
sawTurnEnd = true;
|
|
19
28
|
eventQueue.push(event);
|
|
29
|
+
publishTurnStreamEvents(agent, event, streamCtx());
|
|
20
30
|
resolveWaiting?.();
|
|
21
31
|
};
|
|
22
32
|
const runPromise = runInTurnContext(turnId, () => runWithInboundQueue(commMessage, inboundQueueConfig, inboundTurnQueue, {
|
|
@@ -42,14 +52,18 @@ export async function* processTextTurnStream(agent, opts) {
|
|
|
42
52
|
}
|
|
43
53
|
}
|
|
44
54
|
if (finalError) {
|
|
45
|
-
|
|
55
|
+
const errorEvent = { type: 'error', error: finalError, recoverable: false };
|
|
56
|
+
publishTurnStreamEvents(agent, errorEvent, streamCtx());
|
|
57
|
+
yield errorEvent;
|
|
46
58
|
}
|
|
47
59
|
else if (!sawTurnEnd) {
|
|
48
|
-
|
|
60
|
+
const syntheticEnd = {
|
|
49
61
|
type: 'turn_end',
|
|
50
62
|
output: finalOutput,
|
|
51
63
|
usage: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
|
|
52
64
|
};
|
|
65
|
+
publishTurnStreamEvents(agent, syntheticEnd, streamCtx());
|
|
66
|
+
yield syntheticEnd;
|
|
53
67
|
}
|
|
54
68
|
await runPromise.catch(() => { });
|
|
55
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-stream.js","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"process-stream.js","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-complete.d.ts","sourceRoot":"","sources":["../../src/turn/turn-complete.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"turn-complete.d.ts","sourceRoot":"","sources":["../../src/turn/turn-complete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,YAAY,CAAC;AAErD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,mBAAmB,GACvB,OAAO,CAAC,aAAa,EAAE,CAAC,CAS1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,gBAAgB,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,UAAU,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC9F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAIrG"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { parseOutput } from '@zhin.js/ai';
|
|
2
|
-
import { createAIHookEvent } from '../orchestrator/hook-registry.js';
|
|
3
2
|
import { mergeToolOutboundElements } from '../media/media-tool-bridge.js';
|
|
4
3
|
import { logPhase } from '../internal/phase-trace.js';
|
|
5
4
|
import { EMPTY_USAGE } from './turn-metrics.js';
|
|
@@ -31,13 +30,10 @@ export async function finalizeTurnAfterAgentLoop(p) {
|
|
|
31
30
|
path: finalizePath,
|
|
32
31
|
iterations: p.loopResult.iterations,
|
|
33
32
|
model: p.loopResult.model,
|
|
33
|
+
userInput: p.rawContent.trim() || undefined,
|
|
34
|
+
thinking: p.loopResult.thinking,
|
|
35
|
+
output: p.reply.trim() || undefined,
|
|
34
36
|
});
|
|
35
|
-
if (p.mode === 'text') {
|
|
36
|
-
p.host.orchestrator?.hooks.trigger(createAIHookEvent('message', 'sent', p.sessionId, {
|
|
37
|
-
commMessage: p.commMessage,
|
|
38
|
-
content: p.reply,
|
|
39
|
-
})).catch(() => { });
|
|
40
|
-
}
|
|
41
37
|
await p.host.emitter.dispatch('ai.processing.finish', p.host.emitter.createPayload(p.sessionId, p.commMessage, p.mode, {
|
|
42
38
|
path: reportPath,
|
|
43
39
|
model: p.loopResult.model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-complete.js","sourceRoot":"","sources":["../../src/turn/turn-complete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"turn-complete.js","sourceRoot":"","sources":["../../src/turn/turn-complete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,21 @@
|
|
|
1
|
-
import type { Usage } from '@zhin.js/ai';
|
|
1
|
+
import type { OutputElement, Usage } from '@zhin.js/ai';
|
|
2
2
|
export type { HostTurnPath as ZhinAgentTurnPath, HostTurnMetrics as ZhinAgentTurnMetrics } from '../internal/host-types.js';
|
|
3
3
|
import type { HostTurnMetrics as ZhinAgentTurnMetrics } from '../internal/host-types.js';
|
|
4
4
|
export declare function addUsage(target: Usage, source?: Usage): void;
|
|
5
5
|
export declare const EMPTY_USAGE: Usage;
|
|
6
|
-
|
|
6
|
+
export interface AiHandlerTurnLogContext {
|
|
7
|
+
userInput?: string;
|
|
8
|
+
thinking?: string;
|
|
9
|
+
output?: string;
|
|
10
|
+
path?: string;
|
|
11
|
+
}
|
|
12
|
+
/** AI Handler 层统一汇总日志(框线表格) */
|
|
13
|
+
export declare function formatAiHandlerTurnTable(metrics: ZhinAgentTurnMetrics, totalMs: number, context?: AiHandlerTurnLogContext): string;
|
|
14
|
+
/** @deprecated 使用 formatAiHandlerTurnTable */
|
|
7
15
|
export declare function formatAiHandlerCompleteLog(metrics: ZhinAgentTurnMetrics, totalMs: number): string;
|
|
16
|
+
/** OutputElement[] → 日志预览文本 */
|
|
17
|
+
export declare function formatOutputElementsPreview(elements: OutputElement[]): string | undefined;
|
|
8
18
|
/** @deprecated 使用 formatCompactUsage from @zhin.js/logger */
|
|
9
19
|
export declare function formatZhinAgentTurnUsage(usage: Usage, subagentUsage?: Usage): string;
|
|
20
|
+
export declare function formatAiHandlerFallbackLog(totalMs: number, path?: string): string;
|
|
10
21
|
//# sourceMappingURL=turn-metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-metrics.d.ts","sourceRoot":"","sources":["../../src/turn/turn-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"turn-metrics.d.ts","sourceRoot":"","sources":["../../src/turn/turn-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAWxD,YAAY,EAAE,YAAY,IAAI,iBAAiB,EAAE,eAAe,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAC5H,OAAO,KAAK,EAAE,eAAe,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAKzF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,GAAG,IAAI,CAK5D;AAED,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA0BD,+BAA+B;AAC/B,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,MAAM,CAyBR;AAED,8CAA8C;AAC9C,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjG;AAED,+BAA+B;AAC/B,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,GAAG,SAAS,CAOzF;AAED,6DAA6D;AAC7D,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAEpF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAKjF"}
|
package/lib/turn/turn-metrics.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { formatCompactLog, formatCompactUsage } from '@zhin.js/logger';
|
|
1
|
+
import { formatCompactLog, formatCompactUsage, formatLogKvTable, truncatePreview, wrapDisplayText, } from '@zhin.js/logger';
|
|
2
|
+
import chalk from 'chalk';
|
|
3
|
+
const HANDLER_VALUE_WIDTH = 54;
|
|
4
|
+
const PREVIEW_MAX_CHARS = 320;
|
|
2
5
|
export function addUsage(target, source) {
|
|
3
6
|
if (!source)
|
|
4
7
|
return;
|
|
@@ -11,18 +14,75 @@ export const EMPTY_USAGE = {
|
|
|
11
14
|
completion_tokens: 0,
|
|
12
15
|
total_tokens: 0,
|
|
13
16
|
};
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
function normalizePreviewText(text) {
|
|
18
|
+
return text.replace(/\s+/g, ' ').trim();
|
|
19
|
+
}
|
|
20
|
+
function previewToKvRows(label, raw, maxWidth) {
|
|
21
|
+
const normalized = normalizePreviewText(raw ?? '');
|
|
22
|
+
if (!normalized) {
|
|
23
|
+
return [{ label, value: chalk.dim('·') }];
|
|
24
|
+
}
|
|
25
|
+
const clipped = truncatePreview(normalized, PREVIEW_MAX_CHARS);
|
|
26
|
+
const lines = wrapDisplayText(clipped, maxWidth);
|
|
27
|
+
return lines.map((line, index) => ({
|
|
28
|
+
label: index === 0 ? label : '',
|
|
29
|
+
value: line,
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
function buildModeLine(metrics) {
|
|
33
|
+
const parts = [`mode: ${metrics.path}`];
|
|
34
|
+
if (metrics.iterations != null)
|
|
35
|
+
parts.push(`iter: ${metrics.iterations}`);
|
|
36
|
+
if (metrics.model)
|
|
37
|
+
parts.push(`model: ${metrics.model}`);
|
|
38
|
+
return parts.join(' · ');
|
|
39
|
+
}
|
|
40
|
+
/** AI Handler 层统一汇总日志(框线表格) */
|
|
41
|
+
export function formatAiHandlerTurnTable(metrics, totalMs, context = {}) {
|
|
42
|
+
const userInput = context.userInput ?? metrics.userInput;
|
|
43
|
+
const thinking = context.thinking ?? metrics.thinking;
|
|
44
|
+
const output = context.output ?? metrics.output;
|
|
45
|
+
const rows = [
|
|
46
|
+
{ label: '耗时', value: `${Math.round(totalMs)} ms` },
|
|
47
|
+
{ label: 'Token', value: formatCompactUsage(metrics.usage, metrics.subagentUsage) },
|
|
48
|
+
{ label: '模式', value: buildModeLine(metrics) },
|
|
49
|
+
];
|
|
50
|
+
const contentRows = [
|
|
51
|
+
...previewToKvRows('用户输入', userInput, HANDLER_VALUE_WIDTH),
|
|
52
|
+
...previewToKvRows('思考', thinking, HANDLER_VALUE_WIDTH),
|
|
53
|
+
...previewToKvRows('输出', output, HANDLER_VALUE_WIDTH),
|
|
54
|
+
];
|
|
55
|
+
const sectionBreaks = [rows.length - 1];
|
|
56
|
+
rows.push(...contentRows);
|
|
57
|
+
return formatLogKvTable(rows, {
|
|
58
|
+
title: chalk.bold.cyan(`AI Handler · ${Math.round(totalMs)} ms`),
|
|
59
|
+
sectionBreaks,
|
|
60
|
+
maxValueWidth: HANDLER_VALUE_WIDTH,
|
|
22
61
|
});
|
|
23
62
|
}
|
|
63
|
+
/** @deprecated 使用 formatAiHandlerTurnTable */
|
|
64
|
+
export function formatAiHandlerCompleteLog(metrics, totalMs) {
|
|
65
|
+
return formatAiHandlerTurnTable(metrics, totalMs);
|
|
66
|
+
}
|
|
67
|
+
/** OutputElement[] → 日志预览文本 */
|
|
68
|
+
export function formatOutputElementsPreview(elements) {
|
|
69
|
+
const text = elements.map((el) => {
|
|
70
|
+
if (el.type === 'text')
|
|
71
|
+
return el.content || '';
|
|
72
|
+
if (el.type === 'image')
|
|
73
|
+
return `<image url="${el.url}"/>`;
|
|
74
|
+
return '';
|
|
75
|
+
}).join('\n').trim();
|
|
76
|
+
return text || undefined;
|
|
77
|
+
}
|
|
24
78
|
/** @deprecated 使用 formatCompactUsage from @zhin.js/logger */
|
|
25
79
|
export function formatZhinAgentTurnUsage(usage, subagentUsage) {
|
|
26
80
|
return formatCompactUsage(usage, subagentUsage);
|
|
27
81
|
}
|
|
82
|
+
export function formatAiHandlerFallbackLog(totalMs, path) {
|
|
83
|
+
return formatCompactLog('AI Handler', {
|
|
84
|
+
total_ms: Math.round(totalMs),
|
|
85
|
+
...(path ? { path } : { usage: 'n/a' }),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
28
88
|
//# sourceMappingURL=turn-metrics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-metrics.js","sourceRoot":"","sources":["../../src/turn/turn-metrics.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"turn-metrics.js","sourceRoot":"","sources":["../../src/turn/turn-metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-pipeline.d.ts","sourceRoot":"","sources":["../../src/turn/turn-pipeline.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"turn-pipeline.d.ts","sourceRoot":"","sources":["../../src/turn/turn-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqC,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAalF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMxD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,IAAI,EACL,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAmB7C,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,CAAC,EAAE,OAAO,aAAa,EAAE,YAAY,EAAE,CAAC;IACxD,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oEAAoE;IACpE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;CAC1C;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,aAAa,GAAE,IAAI,EAAO,EAC1B,OAAO,CAAC,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,sBAAsB,GAC9B,OAAO,CAAC,aAAa,EAAE,CAAC,CAmJ1B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,WAAW,EAAE,EACpB,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,EAAE,CAAC,CA6G1B"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { formatCompact,
|
|
1
|
+
import { formatCompact, getLogger } from '@zhin.js/logger';
|
|
2
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
3
|
+
import { publishAgentStream } from '../event/publish-agent-stream.js';
|
|
4
|
+
import { readHttpSessionId } from '../session/resolve-session-interaction-port.js';
|
|
2
5
|
import { userMessagePlainText, parseOutput } from '@zhin.js/ai';
|
|
3
|
-
import { createAIHookEvent } from '../orchestrator/hook-registry.js';
|
|
4
6
|
import { providerSupportsVision } from '../media/vision-capability.js';
|
|
5
7
|
import { buildMultimodalVisionSystemPrompt } from '../prompt/assembly.js';
|
|
6
8
|
import { TurnSupersededError } from './prompt-controller.js';
|
|
@@ -23,7 +25,7 @@ function requireContextSystem(host) {
|
|
|
23
25
|
}
|
|
24
26
|
return host.contextSystem;
|
|
25
27
|
}
|
|
26
|
-
const logger =
|
|
28
|
+
const logger = getLogger('ZhinAgent');
|
|
27
29
|
const now = () => performance.now();
|
|
28
30
|
export async function processTextTurn(host, content, commMessage, externalTools = [], onChunk, extras) {
|
|
29
31
|
const t0 = now();
|
|
@@ -32,6 +34,13 @@ export async function processTextTurn(host, content, commMessage, externalTools
|
|
|
32
34
|
deferredAutoContinue: extras?.deferredAutoContinue,
|
|
33
35
|
});
|
|
34
36
|
const { sessionKey, userId, sessionId, isNewSession, turnUser } = prep;
|
|
37
|
+
const httpSessionId = readHttpSessionId(commMessage);
|
|
38
|
+
if (isNewSession && !httpSessionId) {
|
|
39
|
+
publishAgentStream(host, {
|
|
40
|
+
type: AgentStreamEventType.SESSION_STARTED,
|
|
41
|
+
data: { sessionId },
|
|
42
|
+
}, { sessionId, httpSessionId });
|
|
43
|
+
}
|
|
35
44
|
await host.emitter.dispatch('ai.processing.start', host.emitter.createPayload(sessionId, commMessage, 'text', {
|
|
36
45
|
content,
|
|
37
46
|
}));
|
|
@@ -69,10 +78,10 @@ export async function processTextTurn(host, content, commMessage, externalTools
|
|
|
69
78
|
mcpServerNames,
|
|
70
79
|
});
|
|
71
80
|
const { contextForTools, allTools, resolvedTools, deferredStats, } = toolsPrep;
|
|
72
|
-
host
|
|
73
|
-
|
|
74
|
-
content,
|
|
75
|
-
}
|
|
81
|
+
publishAgentStream(host, {
|
|
82
|
+
type: AgentStreamEventType.MESSAGE_RECEIVED,
|
|
83
|
+
data: { message: content },
|
|
84
|
+
}, { sessionId, httpSessionId: readHttpSessionId(commMessage) });
|
|
76
85
|
const filterMs = (now() - tFilter).toFixed(0);
|
|
77
86
|
logPhase(host.phaseConfig, 'tools.collected', sessionId, { count: resolvedTools.length });
|
|
78
87
|
logger.debug(formatCompact({
|