@zhin.js/agent 0.1.30 → 0.1.32
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 +89 -24
- package/lib/builtin/memory-search-tool.d.ts +2 -0
- package/lib/builtin/memory-search-tool.d.ts.map +1 -0
- package/lib/builtin/memory-search-tool.js +61 -0
- package/lib/builtin/memory-search-tool.js.map +1 -0
- package/lib/builtin/memory-upsert-tool.d.ts +2 -0
- package/lib/builtin/memory-upsert-tool.d.ts.map +1 -0
- package/lib/builtin/memory-upsert-tool.js +75 -0
- package/lib/builtin/memory-upsert-tool.js.map +1 -0
- package/lib/builtin/orchestration-tools.d.ts +7 -0
- package/lib/builtin/orchestration-tools.d.ts.map +1 -0
- package/lib/builtin/orchestration-tools.js +283 -0
- package/lib/builtin/orchestration-tools.js.map +1 -0
- package/lib/builtin/run-deferred-task-tool.d.ts +1 -1
- package/lib/builtin/run-deferred-task-tool.d.ts.map +1 -1
- package/lib/builtin/run-deferred-task-tool.js +1 -1
- package/lib/builtin/run-deferred-task-tool.js.map +1 -1
- package/lib/builtin/run-spec-dry-run-tool.d.ts +6 -0
- package/lib/builtin/run-spec-dry-run-tool.d.ts.map +1 -0
- package/lib/builtin/run-spec-dry-run-tool.js +51 -0
- package/lib/builtin/run-spec-dry-run-tool.js.map +1 -0
- package/lib/builtin/run-validation-spec-tool.d.ts +8 -0
- package/lib/builtin/run-validation-spec-tool.d.ts.map +1 -0
- package/lib/builtin/run-validation-spec-tool.js +44 -0
- package/lib/builtin/run-validation-spec-tool.js.map +1 -0
- package/lib/builtin/spawn-task-tool.d.ts +1 -1
- package/lib/builtin/spawn-task-tool.d.ts.map +1 -1
- package/lib/builtin/spawn-task-tool.js +53 -1
- package/lib/builtin/spawn-task-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 +6 -0
- package/lib/builtin-tools.js.map +1 -1
- package/lib/config/normalize-ai-config.d.ts +4 -0
- package/lib/config/normalize-ai-config.d.ts.map +1 -1
- package/lib/config/normalize-ai-config.js +23 -6
- package/lib/config/normalize-ai-config.js.map +1 -1
- package/lib/config/provider-instance.d.ts.map +1 -1
- package/lib/config/provider-instance.js +26 -7
- package/lib/config/provider-instance.js.map +1 -1
- package/lib/config/types.d.ts +2 -1
- package/lib/config/types.d.ts.map +1 -1
- package/lib/config/types.js.map +1 -1
- package/lib/config/validate-ai-config.d.ts.map +1 -1
- package/lib/config/validate-ai-config.js +5 -0
- package/lib/config/validate-ai-config.js.map +1 -1
- package/lib/create-agent-session.d.ts +16 -0
- package/lib/create-agent-session.d.ts.map +1 -0
- package/lib/create-agent-session.js +15 -0
- package/lib/create-agent-session.js.map +1 -0
- package/lib/deferred-worker-runner.d.ts +2 -0
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +17 -34
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/discovery/agents.d.ts +5 -0
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +7 -0
- package/lib/discovery/agents.js.map +1 -1
- package/lib/discovery/skills.d.ts +1 -1
- package/lib/discovery/skills.d.ts.map +1 -1
- package/lib/discovery/skills.js +2 -9
- package/lib/discovery/skills.js.map +1 -1
- package/lib/discovery/utils.d.ts +7 -1
- package/lib/discovery/utils.d.ts.map +1 -1
- package/lib/discovery/utils.js +66 -5
- package/lib/discovery/utils.js.map +1 -1
- package/lib/index.d.ts +19 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +12 -2
- 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 +38 -13
- 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 +86 -9
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-args.d.ts +34 -0
- package/lib/init/introspection-args.d.ts.map +1 -0
- package/lib/init/introspection-args.js +71 -0
- package/lib/init/introspection-args.js.map +1 -0
- package/lib/init/introspection-collectors.d.ts +21 -0
- package/lib/init/introspection-collectors.d.ts.map +1 -0
- package/lib/init/introspection-collectors.js +74 -0
- package/lib/init/introspection-collectors.js.map +1 -0
- package/lib/init/introspection-commands-format.d.ts +1 -1
- package/lib/init/introspection-commands-format.js +4 -4
- package/lib/init/introspection-commands-format.js.map +1 -1
- package/lib/init/introspection-output.d.ts +6 -0
- package/lib/init/introspection-output.d.ts.map +1 -0
- package/lib/init/introspection-output.js +52 -0
- package/lib/init/introspection-output.js.map +1 -0
- package/lib/init/introspection-pagination.d.ts +14 -0
- package/lib/init/introspection-pagination.d.ts.map +1 -0
- package/lib/init/introspection-pagination.js +33 -0
- package/lib/init/introspection-pagination.js.map +1 -0
- package/lib/init/introspection-rest.d.ts +24 -0
- package/lib/init/introspection-rest.d.ts.map +1 -0
- package/lib/init/introspection-rest.js +65 -0
- package/lib/init/introspection-rest.js.map +1 -0
- package/lib/init/register-agent-mesh-mcp.d.ts +2 -0
- package/lib/init/register-agent-mesh-mcp.d.ts.map +1 -0
- package/lib/init/register-agent-mesh-mcp.js +13 -0
- package/lib/init/register-agent-mesh-mcp.js.map +1 -0
- package/lib/init/register-ai-trigger.d.ts.map +1 -1
- package/lib/init/register-ai-trigger.js +29 -4
- 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 +4 -0
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-db-models.d.ts.map +1 -1
- package/lib/init/register-db-models.js +10 -8
- package/lib/init/register-db-models.js.map +1 -1
- package/lib/init/register-db-upgrade.d.ts +1 -1
- package/lib/init/register-db-upgrade.d.ts.map +1 -1
- package/lib/init/register-db-upgrade.js +22 -3
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/register-group-session-passive.d.ts +3 -0
- package/lib/init/register-group-session-passive.d.ts.map +1 -0
- package/lib/init/register-group-session-passive.js +55 -0
- package/lib/init/register-group-session-passive.js.map +1 -0
- package/lib/init/register-introspection-commands.d.ts.map +1 -1
- package/lib/init/register-introspection-commands.js +5 -6
- package/lib/init/register-introspection-commands.js.map +1 -1
- package/lib/init/register-management-tools.d.ts +1 -1
- package/lib/init/register-management-tools.d.ts.map +1 -1
- package/lib/init/register-management-tools.js +57 -36
- package/lib/init/register-management-tools.js.map +1 -1
- package/lib/init/upgrade-agent-db-schema.d.ts +41 -0
- package/lib/init/upgrade-agent-db-schema.d.ts.map +1 -0
- package/lib/init/upgrade-agent-db-schema.js +170 -0
- package/lib/init/upgrade-agent-db-schema.js.map +1 -0
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +4 -0
- package/lib/init.js.map +1 -1
- package/lib/mcp-server/agent-mesh-tools.d.ts +8 -0
- package/lib/mcp-server/agent-mesh-tools.d.ts.map +1 -0
- package/lib/mcp-server/agent-mesh-tools.js +138 -0
- package/lib/mcp-server/agent-mesh-tools.js.map +1 -0
- package/lib/media/deliver-subagent-result.d.ts +7 -0
- package/lib/media/deliver-subagent-result.d.ts.map +1 -1
- package/lib/media/deliver-subagent-result.js +3 -1
- package/lib/media/deliver-subagent-result.js.map +1 -1
- package/lib/media/media-normalize.d.ts +2 -0
- package/lib/media/media-normalize.d.ts.map +1 -1
- package/lib/media/media-normalize.js +89 -0
- package/lib/media/media-normalize.js.map +1 -1
- package/lib/media/subagent-user-delivery.d.ts +2 -9
- package/lib/media/subagent-user-delivery.d.ts.map +1 -1
- package/lib/media/subagent-user-delivery.js.map +1 -1
- package/lib/memory-entry-registry.d.ts +7 -0
- package/lib/memory-entry-registry.d.ts.map +1 -0
- package/lib/memory-entry-registry.js +8 -0
- package/lib/memory-entry-registry.js.map +1 -0
- package/lib/orchestration-memory-hook.d.ts +3 -0
- package/lib/orchestration-memory-hook.d.ts.map +1 -0
- package/lib/orchestration-memory-hook.js +22 -0
- package/lib/orchestration-memory-hook.js.map +1 -0
- package/lib/orchestration-runtime-registry.d.ts +14 -0
- package/lib/orchestration-runtime-registry.d.ts.map +1 -0
- package/lib/orchestration-runtime-registry.js +15 -0
- package/lib/orchestration-runtime-registry.js.map +1 -0
- package/lib/orchestrator/agent-dispatcher.d.ts +36 -3
- package/lib/orchestrator/agent-dispatcher.d.ts.map +1 -1
- package/lib/orchestrator/agent-dispatcher.js +203 -13
- package/lib/orchestrator/agent-dispatcher.js.map +1 -1
- package/lib/orchestrator/delegation-processor.d.ts +33 -0
- package/lib/orchestrator/delegation-processor.d.ts.map +1 -0
- package/lib/orchestrator/delegation-processor.js +140 -0
- package/lib/orchestrator/delegation-processor.js.map +1 -0
- package/lib/orchestrator/mission-milestone-notify.d.ts +17 -0
- package/lib/orchestrator/mission-milestone-notify.d.ts.map +1 -0
- package/lib/orchestrator/mission-milestone-notify.js +49 -0
- package/lib/orchestrator/mission-milestone-notify.js.map +1 -0
- package/lib/orchestrator/mission-negotiation.d.ts +17 -0
- package/lib/orchestrator/mission-negotiation.d.ts.map +1 -0
- package/lib/orchestrator/mission-negotiation.js +89 -0
- package/lib/orchestrator/mission-negotiation.js.map +1 -0
- package/lib/orchestrator/mission-patch-acl.d.ts +9 -0
- package/lib/orchestrator/mission-patch-acl.d.ts.map +1 -0
- package/lib/orchestrator/mission-patch-acl.js +29 -0
- package/lib/orchestrator/mission-patch-acl.js.map +1 -0
- package/lib/orchestrator/mission-runner.d.ts +24 -0
- package/lib/orchestrator/mission-runner.d.ts.map +1 -0
- package/lib/orchestrator/mission-runner.js +179 -0
- package/lib/orchestrator/mission-runner.js.map +1 -0
- package/lib/orchestrator/mission-spec.d.ts +44 -0
- package/lib/orchestrator/mission-spec.d.ts.map +1 -0
- package/lib/orchestrator/mission-spec.js +121 -0
- package/lib/orchestrator/mission-spec.js.map +1 -0
- package/lib/orchestrator/mission-state.d.ts +48 -0
- package/lib/orchestrator/mission-state.d.ts.map +1 -0
- package/lib/orchestrator/mission-state.js +66 -0
- package/lib/orchestrator/mission-state.js.map +1 -0
- package/lib/orchestrator/orchestration-repository.d.ts +85 -0
- package/lib/orchestrator/orchestration-repository.d.ts.map +1 -0
- package/lib/orchestrator/orchestration-repository.js +325 -0
- package/lib/orchestrator/orchestration-repository.js.map +1 -0
- package/lib/orchestrator/orchestration-service.d.ts +58 -0
- package/lib/orchestrator/orchestration-service.d.ts.map +1 -0
- package/lib/orchestrator/orchestration-service.js +221 -0
- package/lib/orchestrator/orchestration-service.js.map +1 -0
- package/lib/orchestrator/remote-agent-registry.d.ts +32 -0
- package/lib/orchestrator/remote-agent-registry.d.ts.map +1 -0
- package/lib/orchestrator/remote-agent-registry.js +120 -0
- package/lib/orchestrator/remote-agent-registry.js.map +1 -0
- package/lib/orchestrator/remote-task-executor.d.ts +10 -0
- package/lib/orchestrator/remote-task-executor.d.ts.map +1 -0
- package/lib/orchestrator/remote-task-executor.js +142 -0
- package/lib/orchestrator/remote-task-executor.js.map +1 -0
- package/lib/orchestrator/remote-task-poller.d.ts +16 -0
- package/lib/orchestrator/remote-task-poller.d.ts.map +1 -0
- package/lib/orchestrator/remote-task-poller.js +75 -0
- package/lib/orchestrator/remote-task-poller.js.map +1 -0
- package/lib/plugin-loop-hooks.d.ts +32 -0
- package/lib/plugin-loop-hooks.d.ts.map +1 -0
- package/lib/plugin-loop-hooks.js +69 -0
- package/lib/plugin-loop-hooks.js.map +1 -0
- package/lib/service.d.ts +38 -22
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +61 -19
- package/lib/service.js.map +1 -1
- package/lib/session-tree-runtime-registry.d.ts +20 -0
- package/lib/session-tree-runtime-registry.d.ts.map +1 -0
- package/lib/session-tree-runtime-registry.js +25 -0
- package/lib/session-tree-runtime-registry.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 +17 -21
- package/lib/subagent-ai-events.js.map +1 -1
- package/lib/subagent-artifact.d.ts +7 -0
- package/lib/subagent-artifact.d.ts.map +1 -0
- package/lib/subagent-artifact.js +26 -0
- package/lib/subagent-artifact.js.map +1 -0
- package/lib/subagent-parent-context.d.ts +9 -0
- package/lib/subagent-parent-context.d.ts.map +1 -0
- package/lib/subagent-parent-context.js +50 -0
- package/lib/subagent-parent-context.js.map +1 -0
- package/lib/subagent-preset.d.ts +10 -0
- package/lib/subagent-preset.d.ts.map +1 -0
- package/lib/subagent-preset.js +44 -0
- package/lib/subagent-preset.js.map +1 -0
- package/lib/subagent-prompt.d.ts +7 -0
- package/lib/subagent-prompt.d.ts.map +1 -0
- package/lib/subagent-prompt.js +14 -0
- package/lib/subagent-prompt.js.map +1 -0
- package/lib/subagent.d.ts +19 -0
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +175 -92
- package/lib/subagent.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.d.ts +7 -3
- package/lib/typing-indicator/adapter-integration.d.ts.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +30 -6
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/typing-indicator/index.d.ts +26 -3
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +94 -6
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/typing-indicator/integration.d.ts.map +1 -1
- package/lib/typing-indicator/integration.js +7 -2
- package/lib/typing-indicator/integration.js.map +1 -1
- package/lib/zhin-agent/agent-loop-standalone.d.ts +32 -0
- package/lib/zhin-agent/agent-loop-standalone.d.ts.map +1 -0
- package/lib/zhin-agent/agent-loop-standalone.js +144 -0
- package/lib/zhin-agent/agent-loop-standalone.js.map +1 -0
- package/lib/zhin-agent/agent-loop-turn.d.ts +52 -0
- package/lib/zhin-agent/agent-loop-turn.d.ts.map +1 -0
- package/lib/zhin-agent/agent-loop-turn.js +328 -0
- package/lib/zhin-agent/agent-loop-turn.js.map +1 -0
- package/lib/zhin-agent/branch-summarization-runtime.d.ts +16 -0
- package/lib/zhin-agent/branch-summarization-runtime.d.ts.map +1 -0
- package/lib/zhin-agent/branch-summarization-runtime.js +58 -0
- package/lib/zhin-agent/branch-summarization-runtime.js.map +1 -0
- package/lib/zhin-agent/builtin-tools.d.ts +3 -2
- package/lib/zhin-agent/builtin-tools.d.ts.map +1 -1
- package/lib/zhin-agent/builtin-tools.js +15 -16
- package/lib/zhin-agent/builtin-tools.js.map +1 -1
- package/lib/zhin-agent/compaction-runtime.d.ts +25 -0
- package/lib/zhin-agent/compaction-runtime.d.ts.map +1 -0
- package/lib/zhin-agent/compaction-runtime.js +78 -0
- package/lib/zhin-agent/compaction-runtime.js.map +1 -0
- package/lib/zhin-agent/config.d.ts +22 -2
- package/lib/zhin-agent/config.d.ts.map +1 -1
- package/lib/zhin-agent/config.js +25 -2
- package/lib/zhin-agent/config.js.map +1 -1
- package/lib/zhin-agent/deferred-auto-continue.d.ts +11 -0
- package/lib/zhin-agent/deferred-auto-continue.d.ts.map +1 -0
- package/lib/zhin-agent/deferred-auto-continue.js +41 -0
- package/lib/zhin-agent/deferred-auto-continue.js.map +1 -0
- package/lib/zhin-agent/deferred-delivery.d.ts +9 -0
- package/lib/zhin-agent/deferred-delivery.d.ts.map +1 -0
- package/lib/zhin-agent/deferred-delivery.js +35 -0
- package/lib/zhin-agent/deferred-delivery.js.map +1 -0
- package/lib/zhin-agent/index.d.ts +60 -11
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +264 -22
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/model-resolver.d.ts +0 -1
- package/lib/zhin-agent/model-resolver.d.ts.map +1 -1
- package/lib/zhin-agent/model-resolver.js.map +1 -1
- package/lib/zhin-agent/multimodal-message.d.ts +9 -0
- package/lib/zhin-agent/multimodal-message.d.ts.map +1 -0
- package/lib/zhin-agent/multimodal-message.js +69 -0
- package/lib/zhin-agent/multimodal-message.js.map +1 -0
- package/lib/zhin-agent/persist-deferred-context.d.ts +5 -0
- package/lib/zhin-agent/persist-deferred-context.d.ts.map +1 -0
- package/lib/zhin-agent/persist-deferred-context.js +40 -0
- package/lib/zhin-agent/persist-deferred-context.js.map +1 -0
- package/lib/zhin-agent/prompt-access.d.ts +4 -0
- package/lib/zhin-agent/prompt-access.d.ts.map +1 -0
- package/lib/zhin-agent/prompt-access.js +7 -0
- package/lib/zhin-agent/prompt-access.js.map +1 -0
- package/lib/zhin-agent/prompt-builder.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-builder.js +5 -0
- package/lib/zhin-agent/prompt-builder.js.map +1 -1
- package/lib/zhin-agent/prompt-controller.d.ts +53 -0
- package/lib/zhin-agent/prompt-controller.d.ts.map +1 -0
- package/lib/zhin-agent/prompt-controller.js +165 -0
- package/lib/zhin-agent/prompt-controller.js.map +1 -0
- package/lib/zhin-agent/prompt-input.d.ts +3 -0
- package/lib/zhin-agent/prompt-input.d.ts.map +1 -0
- package/lib/zhin-agent/prompt-input.js +8 -0
- package/lib/zhin-agent/prompt-input.js.map +1 -0
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +4 -0
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/session-io.d.ts +28 -11
- package/lib/zhin-agent/session-io.d.ts.map +1 -1
- package/lib/zhin-agent/session-io.js +64 -28
- package/lib/zhin-agent/session-io.js.map +1 -1
- package/lib/zhin-agent/session-message-queue.d.ts +20 -0
- package/lib/zhin-agent/session-message-queue.d.ts.map +1 -0
- package/lib/zhin-agent/session-message-queue.js +52 -0
- package/lib/zhin-agent/session-message-queue.js.map +1 -0
- package/lib/zhin-agent/session-tree-commands.d.ts +5 -0
- package/lib/zhin-agent/session-tree-commands.d.ts.map +1 -0
- package/lib/zhin-agent/session-tree-commands.js +44 -0
- package/lib/zhin-agent/session-tree-commands.js.map +1 -0
- package/lib/zhin-agent/tool-calls-user-format.d.ts.map +1 -1
- package/lib/zhin-agent/tool-calls-user-format.js +3 -0
- package/lib/zhin-agent/tool-calls-user-format.js.map +1 -1
- package/lib/zhin-agent/tool-orchestration.d.ts.map +1 -1
- package/lib/zhin-agent/tool-orchestration.js +25 -6
- 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 +4 -4
- package/lib/zhin-agent/tool-runtime.js.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.d.ts.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.js +13 -0
- package/lib/zhin-agent/tool-search-orchestrator.js.map +1 -1
- package/lib/zhin-agent/turn-context.d.ts +9 -0
- package/lib/zhin-agent/turn-context.d.ts.map +1 -0
- package/lib/zhin-agent/turn-context.js +12 -0
- package/lib/zhin-agent/turn-context.js.map +1 -0
- package/lib/zhin-agent/turn-pipeline.d.ts +7 -1
- package/lib/zhin-agent/turn-pipeline.d.ts.map +1 -1
- package/lib/zhin-agent/turn-pipeline.js +136 -450
- package/lib/zhin-agent/turn-pipeline.js.map +1 -1
- package/lib/zhin-agent/turn-user-message.d.ts +8 -0
- package/lib/zhin-agent/turn-user-message.d.ts.map +1 -0
- package/lib/zhin-agent/turn-user-message.js +10 -0
- package/lib/zhin-agent/turn-user-message.js.map +1 -0
- package/lib/zhin-agent/zhin-agent-private.d.ts +17 -4
- package/lib/zhin-agent/zhin-agent-private.d.ts.map +1 -1
- package/lib/zhin-agent/zhin-agent-private.js.map +1 -1
- package/package.json +4 -3
- package/lib/zhin-agent/llm-runner.d.ts +0 -18
- package/lib/zhin-agent/llm-runner.d.ts.map +0 -1
- package/lib/zhin-agent/llm-runner.js +0 -163
- package/lib/zhin-agent/llm-runner.js.map +0 -1
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* agentLoop turn runner (ADR 0009) — used when ContextRepository is wired.
|
|
3
|
+
*/
|
|
4
|
+
import type { AgentTool, Usage } from '@zhin.js/ai';
|
|
5
|
+
import { type AgentMessage } from '@zhin.js/ai';
|
|
6
|
+
import { type ToolCallRecord } from './tool-calls-user-format.js';
|
|
7
|
+
import type { PromptTurnHooks } from './prompt-controller.js';
|
|
8
|
+
import type { ZhinAgentPrivate, OnChunkCallback, ToolContext } from './zhin-agent-private.js';
|
|
9
|
+
export interface AgentLoopTurnInput {
|
|
10
|
+
host: ZhinAgentPrivate;
|
|
11
|
+
sessionId: string;
|
|
12
|
+
/** 本轮 user 消息 extra(入库 agent_messages.extra) */
|
|
13
|
+
userMessageExtra?: import('@zhin.js/ai').AgentMessageExtra;
|
|
14
|
+
rawContent: string;
|
|
15
|
+
context: ToolContext;
|
|
16
|
+
contextForTools: ToolContext;
|
|
17
|
+
allTools: AgentTool[];
|
|
18
|
+
resolvedTools: AgentTool[];
|
|
19
|
+
personaEnhanced: string;
|
|
20
|
+
modelId: string;
|
|
21
|
+
modelCandidates: string[];
|
|
22
|
+
onChunk?: OnChunkCallback;
|
|
23
|
+
initialMessages?: AgentMessage[];
|
|
24
|
+
promptHooks?: PromptTurnHooks;
|
|
25
|
+
signal?: AbortSignal;
|
|
26
|
+
deferredStats?: string;
|
|
27
|
+
}
|
|
28
|
+
export interface AgentLoopTurnResult {
|
|
29
|
+
reply: string;
|
|
30
|
+
usage: Usage;
|
|
31
|
+
path: 'chat' | 'agent' | 'multimodal';
|
|
32
|
+
iterations: number;
|
|
33
|
+
model: string;
|
|
34
|
+
toolCalls: ToolCallRecord[];
|
|
35
|
+
}
|
|
36
|
+
export interface AgentLoopVisionTurnInput {
|
|
37
|
+
host: ZhinAgentPrivate;
|
|
38
|
+
sessionId: string;
|
|
39
|
+
context: ToolContext;
|
|
40
|
+
visionSystemPrompt: string;
|
|
41
|
+
userMessages: AgentMessage[];
|
|
42
|
+
modelCandidates: string[];
|
|
43
|
+
onChunk?: OnChunkCallback;
|
|
44
|
+
promptHooks?: PromptTurnHooks;
|
|
45
|
+
signal?: AbortSignal;
|
|
46
|
+
}
|
|
47
|
+
export type AgentLoopVisionTurnResult = AgentLoopTurnResult & {
|
|
48
|
+
path: 'multimodal';
|
|
49
|
+
};
|
|
50
|
+
export declare function runAgentLoopVisionTurn(input: AgentLoopVisionTurnInput): Promise<AgentLoopVisionTurnResult>;
|
|
51
|
+
export declare function runAgentLoopTextTurn(input: AgentLoopTurnInput): Promise<AgentLoopTurnResult>;
|
|
52
|
+
//# sourceMappingURL=agent-loop-turn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-loop-turn.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAOL,KAAK,YAAY,EAIlB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA0C9F,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,OAAO,aAAa,EAAE,iBAAiB,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;IACrB,eAAe,EAAE,WAAW,CAAC;IAC7B,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAuErF,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC,CAuBpC;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyOlG"}
|
|
@@ -0,0 +1,328 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* agentLoop turn runner (ADR 0009) — used when ContextRepository is wired.
|
|
3
|
+
*/
|
|
4
|
+
import { getPlugin } from '@zhin.js/core';
|
|
5
|
+
import { formatCompact, Logger } from '@zhin.js/logger';
|
|
6
|
+
import { agentLoop, agentContextFrom, assistantText, createUserMessage, getModel, convertLegacyTools, } from '@zhin.js/ai';
|
|
7
|
+
import { runWithBashToolContext } from '../security/bash-tool-context.js';
|
|
8
|
+
import { applyExecPolicyToTools } from '../security/exec-policy.js';
|
|
9
|
+
import { createOwnerOrchestratedToolResultTransform } from '../orchestrator/owner-confirm-orchestration.js';
|
|
10
|
+
import { resolveModelHarness } from './model-harness.js';
|
|
11
|
+
import { buildAgentPathSystemPrompt, buildChatPathSystemPrompt } from './prompt-assembly.js';
|
|
12
|
+
import { planToolRun } from './tool-runtime.js';
|
|
13
|
+
import { sanitizeAssistantReply } from './text-sanitize.js';
|
|
14
|
+
import { formatToolCallsForUser } from './tool-calls-user-format.js';
|
|
15
|
+
import { transformContextWithCompaction } from './compaction-runtime.js';
|
|
16
|
+
import { logPhase, usageLogFields } from './phase-trace.js';
|
|
17
|
+
const logger = new Logger(null, 'ZhinAgent:AgentLoopTurn');
|
|
18
|
+
function resolveAIService(plugin) {
|
|
19
|
+
if (!plugin)
|
|
20
|
+
return undefined;
|
|
21
|
+
try {
|
|
22
|
+
return plugin.inject?.('ai');
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function tokenUsageToLegacy(usage) {
|
|
29
|
+
return {
|
|
30
|
+
prompt_tokens: usage.input,
|
|
31
|
+
completion_tokens: usage.output,
|
|
32
|
+
total_tokens: usage.totalTokens,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
function toolResultToAgentMessage(toolCall, result, isError) {
|
|
36
|
+
const text = typeof result === 'string'
|
|
37
|
+
? result
|
|
38
|
+
: result == null
|
|
39
|
+
? ''
|
|
40
|
+
: JSON.stringify(result);
|
|
41
|
+
return {
|
|
42
|
+
role: 'toolResult',
|
|
43
|
+
toolCallId: toolCall.id,
|
|
44
|
+
toolName: toolCall.name,
|
|
45
|
+
content: [{ type: 'text', text: text || (isError ? 'Error' : '') }],
|
|
46
|
+
isError,
|
|
47
|
+
timestamp: Date.now(),
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
async function runAgentLoopVisionTurnOnce(input) {
|
|
51
|
+
const { host, sessionId, context, visionSystemPrompt, modelId, onChunk, promptHooks, signal } = input;
|
|
52
|
+
const repo = host.contextRepository;
|
|
53
|
+
const providerAlias = host.getTurnProvider().name;
|
|
54
|
+
const llmModel = getModel(providerAlias, modelId);
|
|
55
|
+
const loaded = await repo.loadContext(sessionId);
|
|
56
|
+
const promptMessages = input.userMessages;
|
|
57
|
+
let iterations = 0;
|
|
58
|
+
let lastAssistantText = '';
|
|
59
|
+
let lastUsage;
|
|
60
|
+
logPhase(host.phaseConfig, 'agent_loop.vision.start', sessionId, { model: modelId });
|
|
61
|
+
const loopContext = agentContextFrom({
|
|
62
|
+
systemPrompt: visionSystemPrompt,
|
|
63
|
+
messages: loaded.messages,
|
|
64
|
+
tools: [],
|
|
65
|
+
});
|
|
66
|
+
const loopConfig = {
|
|
67
|
+
model: llmModel,
|
|
68
|
+
maxIterations: 1,
|
|
69
|
+
convertToLlm: (messages) => messages,
|
|
70
|
+
getSteeringMessages: promptHooks?.getSteeringMessages,
|
|
71
|
+
getFollowUpMessages: promptHooks?.getFollowUpMessages,
|
|
72
|
+
};
|
|
73
|
+
for await (const event of agentLoop(promptMessages, loopContext, loopConfig, signal)) {
|
|
74
|
+
if (event.type === 'turn_start') {
|
|
75
|
+
iterations += 1;
|
|
76
|
+
}
|
|
77
|
+
if (event.type === 'message_update' && event.delta?.type === 'text_delta') {
|
|
78
|
+
onChunk?.(event.delta.text, lastAssistantText + event.delta.text);
|
|
79
|
+
}
|
|
80
|
+
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
|
81
|
+
const assistant = event.message;
|
|
82
|
+
lastAssistantText = assistantText(assistant);
|
|
83
|
+
lastUsage = assistant.usage;
|
|
84
|
+
onChunk?.(lastAssistantText, lastAssistantText);
|
|
85
|
+
}
|
|
86
|
+
if (event.type === 'agent_end') {
|
|
87
|
+
const userBatch = event.userMessages ?? promptMessages;
|
|
88
|
+
await repo.appendMessages(sessionId, [...userBatch, ...event.messages]);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
const reply = sanitizeAssistantReply(lastAssistantText);
|
|
92
|
+
if (!reply.trim()) {
|
|
93
|
+
throw new Error('Empty vision model response');
|
|
94
|
+
}
|
|
95
|
+
logPhase(host.phaseConfig, 'agent_loop.vision.end', sessionId, {
|
|
96
|
+
iterations,
|
|
97
|
+
...usageLogFields(lastUsage ? tokenUsageToLegacy(lastUsage) : undefined),
|
|
98
|
+
});
|
|
99
|
+
return {
|
|
100
|
+
reply,
|
|
101
|
+
usage: lastUsage ? tokenUsageToLegacy(lastUsage) : { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
|
|
102
|
+
path: 'multimodal',
|
|
103
|
+
iterations,
|
|
104
|
+
model: modelId,
|
|
105
|
+
toolCalls: [],
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
export async function runAgentLoopVisionTurn(input) {
|
|
109
|
+
const candidates = input.modelCandidates.filter(Boolean);
|
|
110
|
+
if (candidates.length === 0) {
|
|
111
|
+
throw new Error('No vision model candidates configured');
|
|
112
|
+
}
|
|
113
|
+
let lastError;
|
|
114
|
+
for (let i = 0; i < candidates.length; i++) {
|
|
115
|
+
const modelId = candidates[i];
|
|
116
|
+
try {
|
|
117
|
+
return await runAgentLoopVisionTurnOnce({ ...input, modelId });
|
|
118
|
+
}
|
|
119
|
+
catch (err) {
|
|
120
|
+
lastError = err instanceof Error ? err : new Error(String(err));
|
|
121
|
+
const isLast = i === candidates.length - 1;
|
|
122
|
+
if (isLast)
|
|
123
|
+
break;
|
|
124
|
+
logger.warn(formatCompact({
|
|
125
|
+
mode: 'multimodal',
|
|
126
|
+
fallback: `${modelId}→${candidates[i + 1]}`,
|
|
127
|
+
error: lastError.message.slice(0, 120),
|
|
128
|
+
}));
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
throw lastError ?? new Error('All vision model candidates failed');
|
|
132
|
+
}
|
|
133
|
+
export async function runAgentLoopTextTurn(input) {
|
|
134
|
+
const { host, sessionId, userMessageExtra, context, contextForTools, allTools, resolvedTools, personaEnhanced, modelId, onChunk, promptHooks, signal, } = input;
|
|
135
|
+
const repo = host.contextRepository;
|
|
136
|
+
const providerAlias = host.getTurnProvider().name;
|
|
137
|
+
const llmModel = getModel(providerAlias, modelId);
|
|
138
|
+
const loaded = await repo.loadContext(sessionId);
|
|
139
|
+
const promptMessages = input.initialMessages?.length
|
|
140
|
+
? input.initialMessages
|
|
141
|
+
: [createUserMessage(input.rawContent)];
|
|
142
|
+
const toolRun = allTools.length > 0
|
|
143
|
+
? await planToolRun(resolvedTools, host.config.preExecTimeout)
|
|
144
|
+
: { mode: 'agent', preExecution: { tools: [], data: '' } };
|
|
145
|
+
const preData = toolRun.preExecution.data;
|
|
146
|
+
const hasTools = allTools.length > 0;
|
|
147
|
+
const systemPrompt = hasTools
|
|
148
|
+
? await buildAgentPathSystemPrompt(host, {
|
|
149
|
+
content: input.rawContent,
|
|
150
|
+
context: contextForTools,
|
|
151
|
+
sessionId,
|
|
152
|
+
personaEnhanced,
|
|
153
|
+
preData,
|
|
154
|
+
deferredStats: input.deferredStats,
|
|
155
|
+
})
|
|
156
|
+
: buildChatPathSystemPrompt(host, personaEnhanced, contextForTools);
|
|
157
|
+
const agentTools = hasTools
|
|
158
|
+
? applyExecPolicyToTools(host.config, resolvedTools, {
|
|
159
|
+
approvalMode: host.config.execApprovalMode,
|
|
160
|
+
})
|
|
161
|
+
: [];
|
|
162
|
+
const harness = resolveModelHarness(host.getTurnProvider().name, modelId, host.config.modelHarness);
|
|
163
|
+
const maxIterations = hasTools
|
|
164
|
+
? (harness.maxIterations ?? host.config.maxIterations)
|
|
165
|
+
: 1;
|
|
166
|
+
let orchestrationPlugin = host.emitter.getHostPlugin() ?? undefined;
|
|
167
|
+
if (!orchestrationPlugin) {
|
|
168
|
+
try {
|
|
169
|
+
orchestrationPlugin = getPlugin().root ?? getPlugin();
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
logger.warn(formatCompact({ warn: 'no_host_plugin' }));
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
const transformToolResult = createOwnerOrchestratedToolResultTransform({
|
|
176
|
+
toolContext: contextForTools,
|
|
177
|
+
disableHardOrchestration: false,
|
|
178
|
+
plugin: orchestrationPlugin,
|
|
179
|
+
});
|
|
180
|
+
const legacyByName = new Map(agentTools.map((t) => [t.name, t]));
|
|
181
|
+
const llmTools = convertLegacyTools(agentTools);
|
|
182
|
+
const toolCalls = [];
|
|
183
|
+
let iterations = 0;
|
|
184
|
+
let lastAssistantText = '';
|
|
185
|
+
let lastUsage;
|
|
186
|
+
logPhase(host.phaseConfig, 'agent_loop.turn.start', sessionId, {
|
|
187
|
+
model: modelId,
|
|
188
|
+
maxIterations,
|
|
189
|
+
toolCount: agentTools.length,
|
|
190
|
+
});
|
|
191
|
+
if (hasTools) {
|
|
192
|
+
await host.emitter.dispatch('ai.agent.start', host.emitter.createPayload(sessionId, contextForTools, 'text', {
|
|
193
|
+
path: 'agent',
|
|
194
|
+
model: modelId,
|
|
195
|
+
}));
|
|
196
|
+
}
|
|
197
|
+
const loopContext = agentContextFrom({
|
|
198
|
+
systemPrompt,
|
|
199
|
+
messages: loaded.messages,
|
|
200
|
+
tools: llmTools,
|
|
201
|
+
});
|
|
202
|
+
const contextWindow = llmModel.contextWindow ?? host.config.contextTokens;
|
|
203
|
+
const aiService = resolveAIService(orchestrationPlugin);
|
|
204
|
+
const loopHooks = aiService?.loopHooks;
|
|
205
|
+
const loopConfig = {
|
|
206
|
+
model: llmModel,
|
|
207
|
+
maxIterations,
|
|
208
|
+
sessionId,
|
|
209
|
+
convertToLlm: (messages) => messages,
|
|
210
|
+
transformContext: async (messages, ctxSignal) => transformContextWithCompaction(messages, ctxSignal, {
|
|
211
|
+
host,
|
|
212
|
+
sessionId,
|
|
213
|
+
context: contextForTools,
|
|
214
|
+
model: llmModel,
|
|
215
|
+
compactionConfig: host.config.compaction,
|
|
216
|
+
contextWindow,
|
|
217
|
+
mode: 'text',
|
|
218
|
+
loopHooks,
|
|
219
|
+
}),
|
|
220
|
+
onContextOverflow: async (messages, ctxSignal) => transformContextWithCompaction(messages, ctxSignal, {
|
|
221
|
+
host,
|
|
222
|
+
sessionId,
|
|
223
|
+
context: contextForTools,
|
|
224
|
+
model: llmModel,
|
|
225
|
+
compactionConfig: host.config.compaction,
|
|
226
|
+
contextWindow,
|
|
227
|
+
mode: 'text',
|
|
228
|
+
force: true,
|
|
229
|
+
loopHooks,
|
|
230
|
+
}),
|
|
231
|
+
getSteeringMessages: promptHooks?.getSteeringMessages,
|
|
232
|
+
getFollowUpMessages: promptHooks?.getFollowUpMessages,
|
|
233
|
+
executeTool: async (toolCall, _tools, toolSignal) => {
|
|
234
|
+
const legacy = legacyByName.get(toolCall.name);
|
|
235
|
+
if (!legacy) {
|
|
236
|
+
return toolResultToAgentMessage(toolCall, `Unknown tool: ${toolCall.name}`, true);
|
|
237
|
+
}
|
|
238
|
+
try {
|
|
239
|
+
const raw = await runWithBashToolContext(contextForTools, () => legacy.execute(toolCall.arguments));
|
|
240
|
+
const rawText = typeof raw === 'string' ? raw : JSON.stringify(raw ?? null);
|
|
241
|
+
const transformed = await transformToolResult({
|
|
242
|
+
toolName: toolCall.name,
|
|
243
|
+
toolCallId: toolCall.id,
|
|
244
|
+
args: toolCall.arguments,
|
|
245
|
+
result: rawText,
|
|
246
|
+
});
|
|
247
|
+
const resultText = typeof transformed === 'string' ? transformed : String(transformed);
|
|
248
|
+
toolCalls.push({ tool: toolCall.name, args: toolCall.arguments, result: resultText });
|
|
249
|
+
host.emitter.emit('ai.tool.result', host.emitter.createPayload(sessionId, contextForTools, 'text', {
|
|
250
|
+
path: 'agent',
|
|
251
|
+
toolName: toolCall.name,
|
|
252
|
+
result: resultText,
|
|
253
|
+
}));
|
|
254
|
+
return toolResultToAgentMessage(toolCall, resultText, false);
|
|
255
|
+
}
|
|
256
|
+
catch (err) {
|
|
257
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
258
|
+
toolCalls.push({ tool: toolCall.name, args: toolCall.arguments, result: message });
|
|
259
|
+
return toolResultToAgentMessage(toolCall, message, true);
|
|
260
|
+
}
|
|
261
|
+
},
|
|
262
|
+
beforeToolCall: async ({ toolCall }) => {
|
|
263
|
+
host.emitter.emit('ai.tool.call', host.emitter.createPayload(sessionId, contextForTools, 'text', {
|
|
264
|
+
path: 'agent',
|
|
265
|
+
toolName: toolCall.name,
|
|
266
|
+
args: toolCall.arguments,
|
|
267
|
+
}));
|
|
268
|
+
return loopHooks?.runBeforeToolCall({ toolCall, sessionId });
|
|
269
|
+
},
|
|
270
|
+
afterToolCall: async ({ toolCall, result }) => {
|
|
271
|
+
await loopHooks?.runAfterToolCall({ toolCall, result, sessionId });
|
|
272
|
+
},
|
|
273
|
+
};
|
|
274
|
+
for await (const event of agentLoop(promptMessages, loopContext, loopConfig, signal)) {
|
|
275
|
+
if (event.type === 'turn_start') {
|
|
276
|
+
iterations += 1;
|
|
277
|
+
}
|
|
278
|
+
if (event.type === 'message_update' && event.delta?.type === 'text_delta') {
|
|
279
|
+
onChunk?.(event.delta.text, lastAssistantText + event.delta.text);
|
|
280
|
+
}
|
|
281
|
+
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
|
282
|
+
const assistant = event.message;
|
|
283
|
+
lastAssistantText = assistantText(assistant);
|
|
284
|
+
lastUsage = assistant.usage;
|
|
285
|
+
onChunk?.(lastAssistantText, lastAssistantText);
|
|
286
|
+
}
|
|
287
|
+
if (event.type === 'agent_end') {
|
|
288
|
+
const userBatch = event.userMessages ?? promptMessages;
|
|
289
|
+
const batch = [...userBatch, ...event.messages];
|
|
290
|
+
const messageExtras = batch.map((msg, i) => (msg.role === 'user' && i < userBatch.length ? userMessageExtra : undefined));
|
|
291
|
+
await repo.appendMessages(sessionId, batch, { messageExtras });
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
const reply = sanitizeAssistantReply(lastAssistantText, {
|
|
295
|
+
toolSummary: formatToolCallsForUser(toolCalls),
|
|
296
|
+
});
|
|
297
|
+
const spawnedSubagent = toolCalls.some(tc => tc.tool === 'spawn_task');
|
|
298
|
+
if (spawnedSubagent) {
|
|
299
|
+
await host.getActiveTurnTracker()?.waitForPendingSubagents();
|
|
300
|
+
}
|
|
301
|
+
const delegatedOnly = spawnedSubagent
|
|
302
|
+
&& !toolCalls.some(tc => tc.tool === 'run_deferred_task')
|
|
303
|
+
&& !toolCalls.some(tc => tc.tool === 'generate_image'
|
|
304
|
+
&& tc.result
|
|
305
|
+
&& typeof tc.result === 'object'
|
|
306
|
+
&& typeof tc.result.image === 'string');
|
|
307
|
+
const finalReply = delegatedOnly ? '' : reply;
|
|
308
|
+
if (hasTools) {
|
|
309
|
+
await host.emitter.dispatch('ai.agent.finish', host.emitter.createPayload(sessionId, contextForTools, 'text', {
|
|
310
|
+
path: 'agent',
|
|
311
|
+
model: modelId,
|
|
312
|
+
iterations,
|
|
313
|
+
}));
|
|
314
|
+
}
|
|
315
|
+
logPhase(host.phaseConfig, 'agent_loop.turn.end', sessionId, {
|
|
316
|
+
iterations,
|
|
317
|
+
...usageLogFields(lastUsage ? tokenUsageToLegacy(lastUsage) : undefined),
|
|
318
|
+
});
|
|
319
|
+
return {
|
|
320
|
+
reply: finalReply,
|
|
321
|
+
usage: lastUsage ? tokenUsageToLegacy(lastUsage) : { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
|
|
322
|
+
path: hasTools ? 'agent' : 'chat',
|
|
323
|
+
iterations,
|
|
324
|
+
model: modelId,
|
|
325
|
+
toolCalls,
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
//# sourceMappingURL=agent-loop-turn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-loop-turn.js","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Branch summarization on session tree switch — ADR 0010 D3.
|
|
3
|
+
*/
|
|
4
|
+
import type { CompactionConfig } from './config.js';
|
|
5
|
+
import type { ZhinAgentPrivate } from './zhin-agent-private.js';
|
|
6
|
+
export interface BranchSummarizationOptions {
|
|
7
|
+
compactionConfig?: CompactionConfig;
|
|
8
|
+
contextWindow?: number;
|
|
9
|
+
}
|
|
10
|
+
export declare function summarizeAbandonedBranchIfNeeded(host: ZhinAgentPrivate, sessionId: string, oldLeafId: number | null | undefined, newLeafId: number, options?: BranchSummarizationOptions): Promise<void>;
|
|
11
|
+
export declare function switchActiveLeafWithBranchSummarization(host: ZhinAgentPrivate, sessionId: string, messageId: number, options?: BranchSummarizationOptions): Promise<boolean>;
|
|
12
|
+
export declare function jumpToBranchIndexWithSummarization(host: ZhinAgentPrivate, sessionId: string, index: number, options?: BranchSummarizationOptions): Promise<{
|
|
13
|
+
ok: boolean;
|
|
14
|
+
message: string;
|
|
15
|
+
}>;
|
|
16
|
+
//# sourceMappingURL=branch-summarization-runtime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branch-summarization-runtime.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/branch-summarization-runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAe3C"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Branch summarization on session tree switch — ADR 0010 D3.
|
|
3
|
+
*/
|
|
4
|
+
import { abandonedRowsToMessages, collectAbandonedPathRows, compactAgentMessages, estimateAgentMessagesTokens, getModel, } from '@zhin.js/ai';
|
|
5
|
+
export async function summarizeAbandonedBranchIfNeeded(host, sessionId, oldLeafId, newLeafId, options = {}) {
|
|
6
|
+
const compaction = options.compactionConfig ?? host.config.compaction;
|
|
7
|
+
if (compaction?.enabled === false)
|
|
8
|
+
return;
|
|
9
|
+
if (oldLeafId == null || oldLeafId === newLeafId)
|
|
10
|
+
return;
|
|
11
|
+
if (await host.contextRepository.hasBranchSummary(sessionId, newLeafId))
|
|
12
|
+
return;
|
|
13
|
+
const allRows = await host.contextRepository.loadMessageRows(sessionId);
|
|
14
|
+
const abandoned = collectAbandonedPathRows(allRows, oldLeafId, newLeafId);
|
|
15
|
+
if (abandoned.length === 0)
|
|
16
|
+
return;
|
|
17
|
+
const messages = abandonedRowsToMessages(abandoned);
|
|
18
|
+
const keepRecentTokens = compaction?.keepRecentTokens ?? 20_000;
|
|
19
|
+
if (estimateAgentMessagesTokens(messages) <= keepRecentTokens)
|
|
20
|
+
return;
|
|
21
|
+
const provider = host.getTurnProvider();
|
|
22
|
+
const modelId = host.config.chatModel || provider.models[0] || '';
|
|
23
|
+
const llmModel = getModel(provider.name, modelId);
|
|
24
|
+
const contextWindow = options.contextWindow ?? llmModel.contextWindow ?? host.config.contextTokens;
|
|
25
|
+
const result = await compactAgentMessages({
|
|
26
|
+
model: llmModel,
|
|
27
|
+
messages,
|
|
28
|
+
contextWindow,
|
|
29
|
+
keepRecentTokens: Math.min(keepRecentTokens, Math.max(500, Math.floor(messages.length * 200))),
|
|
30
|
+
minKeepCount: 1,
|
|
31
|
+
customInstructions: 'Summarize this abandoned conversation branch so it can be recalled later if the user returns to it.',
|
|
32
|
+
});
|
|
33
|
+
if (!result.summary?.trim())
|
|
34
|
+
return;
|
|
35
|
+
await host.contextRepository.saveSummary(sessionId, result.summary, {
|
|
36
|
+
branchAnchorMessageId: newLeafId,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
export async function switchActiveLeafWithBranchSummarization(host, sessionId, messageId, options = {}) {
|
|
40
|
+
const session = await host.agentSessionStore.getBySessionId(sessionId);
|
|
41
|
+
const oldLeaf = session?.active_leaf_message_id;
|
|
42
|
+
if (oldLeaf === messageId)
|
|
43
|
+
return true;
|
|
44
|
+
await summarizeAbandonedBranchIfNeeded(host, sessionId, oldLeaf, messageId, options);
|
|
45
|
+
return host.contextRepository.setActiveLeaf(sessionId, messageId);
|
|
46
|
+
}
|
|
47
|
+
export async function jumpToBranchIndexWithSummarization(host, sessionId, index, options = {}) {
|
|
48
|
+
const points = await host.contextRepository.listBranchPoints(sessionId);
|
|
49
|
+
const point = points.find(p => p.index === index);
|
|
50
|
+
if (!point) {
|
|
51
|
+
return { ok: false, message: `未找到分支点 #${index}` };
|
|
52
|
+
}
|
|
53
|
+
const ok = await switchActiveLeafWithBranchSummarization(host, sessionId, point.messageId, options);
|
|
54
|
+
return ok
|
|
55
|
+
? { ok: true, message: `已跳转到分支点 #${index}:${point.preview}` }
|
|
56
|
+
: { ok: false, message: '跳转失败' };
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=branch-summarization-runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branch-summarization-runtime.js","sourceRoot":"","sources":["../../src/zhin-agent/branch-summarization-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
* 由 ZhinAgent.process() 按需创建并注入到工具列表中。
|
|
6
6
|
*/
|
|
7
7
|
import type { AgentTool } from '@zhin.js/core';
|
|
8
|
-
import type {
|
|
8
|
+
import type { ImTranscriptQuery, ImTranscriptStore, MemoryImTranscriptStore } from '@zhin.js/ai';
|
|
9
9
|
import type { UserProfileStore } from '../user-profile.js';
|
|
10
10
|
export { createSpawnTaskTool } from '../builtin/spawn-task-tool.js';
|
|
11
|
-
|
|
11
|
+
type TranscriptHistoryReader = Pick<ImTranscriptStore, 'search' | 'listRecent'> | Pick<MemoryImTranscriptStore, 'search' | 'listRecent'>;
|
|
12
|
+
export declare function createImTranscriptHistoryTool(store: TranscriptHistoryReader, query: ImTranscriptQuery): AgentTool;
|
|
12
13
|
export declare function createUserProfileTool(userId: string, profiles: UserProfileStore): AgentTool;
|
|
13
14
|
//# sourceMappingURL=builtin-tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAyB,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACxH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAsBpE,KAAK,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,uBAAuB,EAAE,QAAQ,GAAG,YAAY,CAAC,CAAC;AAEzI,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,uBAAuB,EAC9B,KAAK,EAAE,iBAAiB,GACvB,SAAS,CAwCX;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAqD3F"}
|
|
@@ -5,30 +5,27 @@
|
|
|
5
5
|
* 由 ZhinAgent.process() 按需创建并注入到工具列表中。
|
|
6
6
|
*/
|
|
7
7
|
export { createSpawnTaskTool } from '../builtin/spawn-task-tool.js';
|
|
8
|
-
function
|
|
9
|
-
const role = hit.
|
|
8
|
+
function formatTranscriptHitLine(hit) {
|
|
9
|
+
const role = hit.direction === 'inbound' ? '用户' : '助手';
|
|
10
10
|
const time = new Date(hit.time).toLocaleString('zh-CN');
|
|
11
|
-
const who = hit.senderName && hit.
|
|
12
|
-
return `[${time}] ${role}${who}: ${hit.
|
|
11
|
+
const who = hit.senderName && hit.direction === 'inbound' ? ` (${hit.senderName})` : '';
|
|
12
|
+
return `[${time}] ${role}${who}: ${hit.body}`;
|
|
13
13
|
}
|
|
14
|
-
function
|
|
14
|
+
function formatTranscriptToolResult(result, header) {
|
|
15
15
|
let output = header;
|
|
16
|
-
if (result.summary) {
|
|
17
|
-
output += `\n\n📋 对话摘要:\n${result.summary}`;
|
|
18
|
-
}
|
|
19
16
|
if (result.messages.length > 0) {
|
|
20
|
-
output += `\n\n💬 聊天记录:\n${result.messages.map(
|
|
17
|
+
output += `\n\n💬 聊天记录:\n${result.messages.map(formatTranscriptHitLine).join('\n')}`;
|
|
21
18
|
}
|
|
22
19
|
else {
|
|
23
20
|
output += '\n\n未找到相关聊天记录。';
|
|
24
21
|
}
|
|
25
22
|
return output;
|
|
26
23
|
}
|
|
27
|
-
export function
|
|
24
|
+
export function createImTranscriptHistoryTool(store, query) {
|
|
28
25
|
return {
|
|
29
26
|
name: 'chat_history',
|
|
30
27
|
source: 'builtin:context',
|
|
31
|
-
description: '
|
|
28
|
+
description: '从 im_transcripts 按需查询本场景历史聊天(platform+bot+群/私聊)。支持关键词模糊搜索 body;keyword 留空则返回最近若干条。当用户问「之前聊过什么」「我们讨论过什么」时使用。',
|
|
32
29
|
parameters: {
|
|
33
30
|
type: 'object',
|
|
34
31
|
properties: {
|
|
@@ -50,11 +47,11 @@ export function createChatHistoryTool(chatHistory, query) {
|
|
|
50
47
|
? Math.floor(args.limit)
|
|
51
48
|
: 10;
|
|
52
49
|
if (keyword.trim()) {
|
|
53
|
-
const result = await
|
|
54
|
-
return
|
|
50
|
+
const result = await store.search(query, keyword, limit);
|
|
51
|
+
return formatTranscriptToolResult(result, `关键词「${keyword.trim()}」的搜索结果(最多 ${limit} 条):`);
|
|
55
52
|
}
|
|
56
|
-
const result = await
|
|
57
|
-
return
|
|
53
|
+
const result = await store.listRecent(query, limit);
|
|
54
|
+
return formatTranscriptToolResult(result, `最近 ${limit} 条聊天记录:`);
|
|
58
55
|
},
|
|
59
56
|
};
|
|
60
57
|
}
|
|
@@ -85,7 +82,9 @@ export function createUserProfileTool(userId, profiles) {
|
|
|
85
82
|
tags: ['profile', '偏好', '用户', '个性化', '记住'],
|
|
86
83
|
keywords: ['我叫', '我的名字', '记住我', '我喜欢', '我偏好', '我习惯', '叫我', '我是'],
|
|
87
84
|
async execute(args) {
|
|
88
|
-
const
|
|
85
|
+
const action = typeof args.action === 'string' ? args.action : '';
|
|
86
|
+
const key = typeof args.key === 'string' ? args.key : '';
|
|
87
|
+
const value = typeof args.value === 'string' ? args.value : '';
|
|
89
88
|
switch (action) {
|
|
90
89
|
case 'get': {
|
|
91
90
|
const all = await profiles.getAll(userId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../src/zhin-agent/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../src/zhin-agent/builtin-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type ContextRepository, type Model } from '@zhin.js/ai';
|
|
2
|
+
import type { AgentMessage } from '@zhin.js/ai';
|
|
3
|
+
import type { CompactionConfig } from './config.js';
|
|
4
|
+
import type { PluginAILoopHookRegistry } from '../plugin-loop-hooks.js';
|
|
5
|
+
import type { ZhinAgentPrivate, ToolContext } from './zhin-agent-private.js';
|
|
6
|
+
export interface CompactionRuntimeOptions {
|
|
7
|
+
host: ZhinAgentPrivate;
|
|
8
|
+
sessionId: string;
|
|
9
|
+
context: ToolContext;
|
|
10
|
+
model: Model;
|
|
11
|
+
compactionConfig?: CompactionConfig;
|
|
12
|
+
contextWindow: number;
|
|
13
|
+
mode?: 'text' | 'multimodal';
|
|
14
|
+
customInstructions?: string;
|
|
15
|
+
force?: boolean;
|
|
16
|
+
loopHooks?: PluginAILoopHookRegistry | null;
|
|
17
|
+
}
|
|
18
|
+
export declare function transformContextWithCompaction(messages: AgentMessage[], signal: AbortSignal | undefined, options: CompactionRuntimeOptions): Promise<AgentMessage[]>;
|
|
19
|
+
export declare function manualCompactSession(repo: ContextRepository, options: Omit<CompactionRuntimeOptions, 'host'> & {
|
|
20
|
+
host: ZhinAgentPrivate;
|
|
21
|
+
}): Promise<{
|
|
22
|
+
ok: boolean;
|
|
23
|
+
message: string;
|
|
24
|
+
}>;
|
|
25
|
+
//# sourceMappingURL=compaction-runtime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compaction-runtime.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,KAAK,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;CAC7C;AA0BD,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAgDzB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,GAAG;IAChD,IAAI,EAAE,gBAAgB,CAAC;CACxB,GACA,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB3C"}
|