@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,78 @@
|
|
|
1
|
+
import { autoCompactAgentMessagesIfNeeded, createAgentCompactionState, estimateAgentMessagesTokens, } from '@zhin.js/ai';
|
|
2
|
+
function resolveAgentCompactionConfig(compaction, contextWindow) {
|
|
3
|
+
return {
|
|
4
|
+
enabled: compaction?.enabled !== false,
|
|
5
|
+
auto: compaction?.auto !== false,
|
|
6
|
+
keepRecentTokens: compaction?.keepRecentTokens ?? 20_000,
|
|
7
|
+
minKeepCount: compaction?.minKeepCount ?? 2,
|
|
8
|
+
contextWindow,
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
const compactionStateBySession = new Map();
|
|
12
|
+
function getCompactionState(sessionId) {
|
|
13
|
+
let state = compactionStateBySession.get(sessionId);
|
|
14
|
+
if (!state) {
|
|
15
|
+
state = createAgentCompactionState();
|
|
16
|
+
compactionStateBySession.set(sessionId, state);
|
|
17
|
+
}
|
|
18
|
+
return state;
|
|
19
|
+
}
|
|
20
|
+
export async function transformContextWithCompaction(messages, signal, options) {
|
|
21
|
+
if (signal?.aborted)
|
|
22
|
+
return messages;
|
|
23
|
+
const cfg = resolveAgentCompactionConfig(options.compactionConfig, options.contextWindow);
|
|
24
|
+
if (cfg.enabled === false)
|
|
25
|
+
return messages;
|
|
26
|
+
const beforeTokens = estimateAgentMessagesTokens(messages);
|
|
27
|
+
const state = getCompactionState(options.sessionId);
|
|
28
|
+
const result = await autoCompactAgentMessagesIfNeeded({
|
|
29
|
+
model: options.model,
|
|
30
|
+
messages,
|
|
31
|
+
config: cfg,
|
|
32
|
+
state,
|
|
33
|
+
force: options.force,
|
|
34
|
+
customInstructions: options.customInstructions,
|
|
35
|
+
});
|
|
36
|
+
if (result.summary?.trim()) {
|
|
37
|
+
const anchorId = await options.host.contextRepository.resolveCompactionAnchorId(options.sessionId, cfg.keepRecentTokens ?? 20_000, cfg.minKeepCount ?? 2);
|
|
38
|
+
await options.host.contextRepository.saveSummary(options.sessionId, result.summary, anchorId);
|
|
39
|
+
}
|
|
40
|
+
if (result.wasCompacted) {
|
|
41
|
+
const afterTokens = estimateAgentMessagesTokens(result.messages);
|
|
42
|
+
options.host.emitSessionCompactEvent(options.sessionId, options.context, options.mode ?? 'text', {
|
|
43
|
+
microSavedTokens: result.microSavedTokens,
|
|
44
|
+
autoSavedTokens: result.autoSavedTokens,
|
|
45
|
+
totalTokensBefore: beforeTokens,
|
|
46
|
+
totalTokensAfter: afterTokens,
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
let out = result.messages;
|
|
50
|
+
if (options.loopHooks) {
|
|
51
|
+
out = await options.loopHooks.runTransformContext(out, {
|
|
52
|
+
sessionId: options.sessionId,
|
|
53
|
+
signal,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
return out;
|
|
57
|
+
}
|
|
58
|
+
export async function manualCompactSession(repo, options) {
|
|
59
|
+
const cfg = resolveAgentCompactionConfig(options.compactionConfig, options.contextWindow);
|
|
60
|
+
if (cfg.enabled === false) {
|
|
61
|
+
return { ok: false, message: 'compaction 已禁用(ai.agent.compaction.enabled=false)' };
|
|
62
|
+
}
|
|
63
|
+
const loaded = await repo.loadContext(options.sessionId);
|
|
64
|
+
const messages = loaded.messages;
|
|
65
|
+
if (messages.length < 2) {
|
|
66
|
+
return { ok: false, message: '消息过少,无需压缩' };
|
|
67
|
+
}
|
|
68
|
+
const compacted = await transformContextWithCompaction(messages, undefined, {
|
|
69
|
+
...options,
|
|
70
|
+
force: true,
|
|
71
|
+
});
|
|
72
|
+
const saved = estimateAgentMessagesTokens(messages) - estimateAgentMessagesTokens(compacted);
|
|
73
|
+
return {
|
|
74
|
+
ok: true,
|
|
75
|
+
message: `已压缩会话,约节省 ${Math.max(0, saved)} tokens(保留最近 ~${cfg.keepRecentTokens ?? 20_000} tokens)`,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=compaction-runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compaction-runtime.js","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* ZhinAgent 配置、常量、类型定义
|
|
3
3
|
*/
|
|
4
4
|
import type { RateLimitConfig } from '@zhin.js/ai';
|
|
5
|
+
import { type QueueMode } from '@zhin.js/ai';
|
|
5
6
|
import type { ModelHarnessConfig } from './model-harness.js';
|
|
6
7
|
export type ModelSizeHint = 'small' | 'medium' | 'large';
|
|
7
8
|
export type ExecApprovalMode = 'ask' | 'allow' | 'deny';
|
|
@@ -24,6 +25,13 @@ export declare const HISTORY_CONTEXT_MARKER = "[Chat messages since your last re
|
|
|
24
25
|
/** 与 @zhin.js/core `CURRENT_USER_MESSAGE_MARKER` 保持一致 */
|
|
25
26
|
export declare const CURRENT_MESSAGE_MARKER = "[Current message - respond to this]";
|
|
26
27
|
export type OnChunkCallback = (chunk: string, full: string) => void;
|
|
28
|
+
/** ADR 0010 — session compaction config. */
|
|
29
|
+
export interface CompactionConfig {
|
|
30
|
+
enabled?: boolean;
|
|
31
|
+
auto?: boolean;
|
|
32
|
+
keepRecentTokens?: number;
|
|
33
|
+
minKeepCount?: number;
|
|
34
|
+
}
|
|
27
35
|
/** 上下文感知内置工具的关键词触发正则 */
|
|
28
36
|
export declare const KEYWORD_TRIGGERS: {
|
|
29
37
|
readonly chatHistory: RegExp;
|
|
@@ -43,11 +51,10 @@ export interface ZhinAgentConfig {
|
|
|
43
51
|
toneAwareness?: boolean;
|
|
44
52
|
/** 聊天任务使用的模型(覆盖自动选择) */
|
|
45
53
|
chatModel?: string;
|
|
46
|
-
/** 纯闲聊(0工具)使用的轻量模型,留空则复用 chatModel */
|
|
47
|
-
chatLiteModel?: string;
|
|
48
54
|
visionModel?: string;
|
|
49
55
|
contextTokens?: number;
|
|
50
56
|
maxHistoryShare?: number;
|
|
57
|
+
compaction?: CompactionConfig;
|
|
51
58
|
disabledTools?: string[];
|
|
52
59
|
allowedTools?: string[];
|
|
53
60
|
execSecurity?: 'deny' | 'allowlist' | 'full';
|
|
@@ -92,14 +99,27 @@ export interface ZhinAgentConfig {
|
|
|
92
99
|
platformPromptSectionMaxChars?: number;
|
|
93
100
|
/** 单 slot 平台 prompt 合计上限(字符) */
|
|
94
101
|
platformPromptMaxChars?: number;
|
|
102
|
+
/** steer 队列 drain 模式(ADR 0009 Grill #13) */
|
|
103
|
+
steeringMode?: QueueMode;
|
|
104
|
+
/** followUp 队列 drain 模式(ADR 0009 Grill #13) */
|
|
105
|
+
followUpMode?: QueueMode;
|
|
95
106
|
/**
|
|
96
107
|
* 同一轮对话内累计多少次策略/安全拒绝后强制结束工具循环(默认 2,传给 Agent)。
|
|
97
108
|
* 设为 0 禁用熔断。
|
|
98
109
|
*/
|
|
99
110
|
policyDenialStopAfter?: number;
|
|
111
|
+
/**
|
|
112
|
+
* @deprecated Worker 结果经 run_deferred_task 同步回传主 Agent,不再使用独立 auto_continue 回合。
|
|
113
|
+
*/
|
|
114
|
+
deferredAutoContinue?: boolean;
|
|
115
|
+
/** @deprecated 见 deferredAutoContinue */
|
|
116
|
+
deferredAutoContinueMaxDepth?: number;
|
|
100
117
|
}
|
|
101
118
|
/** 主 Agent 默认常驻编排工具(不含 activate_skill:执行一律经 Worker;文生图走 deferred) */
|
|
102
119
|
export declare const DEFAULT_ORCHESTRATOR_TOOLS: readonly ["tool_search", "run_deferred_task", "ask_user", "spawn_task"];
|
|
120
|
+
/** 硬编排 v1 追加的总监工具 */
|
|
121
|
+
export declare const HARD_ORCHESTRATION_TOOLS: readonly ["orchestration_start", "orchestration_add_task", "orchestration_status", "orchestration_complete", "orchestration_retry_task", "orchestration_skip_task", "orchestration_patch_state"];
|
|
122
|
+
export declare const DEFAULT_HARD_ORCHESTRATOR_TOOLS: readonly ["tool_search", "run_deferred_task", "ask_user", "spawn_task", "orchestration_start", "orchestration_add_task", "orchestration_status", "orchestration_complete", "orchestration_retry_task", "orchestration_skip_task", "orchestration_patch_state"];
|
|
103
123
|
/** 不进入主编排也不进入 deferred 目录 */
|
|
104
124
|
export declare const DEFERRED_CATALOG_EXCLUDED_TOOLS: readonly ["activate_skill", "install_skill"];
|
|
105
125
|
/** @deprecated 使用 DEFERRED_CATALOG_EXCLUDED_TOOLS */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"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"}
|
package/lib/zhin-agent/config.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* ZhinAgent 配置、常量、类型定义
|
|
3
3
|
*/
|
|
4
|
-
import { DEFAULT_CONTEXT_TOKENS } from '@zhin.js/ai';
|
|
4
|
+
import { DEFAULT_CONTEXT_TOKENS, DEFAULT_FOLLOW_UP_MODE, DEFAULT_STEERING_MODE } from '@zhin.js/ai';
|
|
5
5
|
const SMALL_MODEL_RE = /[:\-_](0\.5|1\.?[58]?|[3-8])b\b/i;
|
|
6
6
|
const MEDIUM_MODEL_RE = /[:\-_](14|[12][0-9]|32)b\b/i;
|
|
7
7
|
/**
|
|
@@ -54,6 +54,20 @@ export const DEFAULT_ORCHESTRATOR_TOOLS = [
|
|
|
54
54
|
'ask_user',
|
|
55
55
|
'spawn_task',
|
|
56
56
|
];
|
|
57
|
+
/** 硬编排 v1 追加的总监工具 */
|
|
58
|
+
export const HARD_ORCHESTRATION_TOOLS = [
|
|
59
|
+
'orchestration_start',
|
|
60
|
+
'orchestration_add_task',
|
|
61
|
+
'orchestration_status',
|
|
62
|
+
'orchestration_complete',
|
|
63
|
+
'orchestration_retry_task',
|
|
64
|
+
'orchestration_skip_task',
|
|
65
|
+
'orchestration_patch_state',
|
|
66
|
+
];
|
|
67
|
+
export const DEFAULT_HARD_ORCHESTRATOR_TOOLS = [
|
|
68
|
+
...DEFAULT_ORCHESTRATOR_TOOLS,
|
|
69
|
+
...HARD_ORCHESTRATION_TOOLS,
|
|
70
|
+
];
|
|
57
71
|
/** 不进入主编排也不进入 deferred 目录 */
|
|
58
72
|
export const DEFERRED_CATALOG_EXCLUDED_TOOLS = ['activate_skill', 'install_skill'];
|
|
59
73
|
/** @deprecated 使用 DEFERRED_CATALOG_EXCLUDED_TOOLS */
|
|
@@ -80,10 +94,15 @@ export const DEFAULT_CONFIG = {
|
|
|
80
94
|
rateLimit: {},
|
|
81
95
|
toneAwareness: true,
|
|
82
96
|
chatModel: '',
|
|
83
|
-
chatLiteModel: '',
|
|
84
97
|
visionModel: '',
|
|
85
98
|
contextTokens: DEFAULT_CONTEXT_TOKENS,
|
|
86
99
|
maxHistoryShare: 0.5,
|
|
100
|
+
compaction: {
|
|
101
|
+
enabled: true,
|
|
102
|
+
auto: true,
|
|
103
|
+
keepRecentTokens: 20_000,
|
|
104
|
+
minKeepCount: 2,
|
|
105
|
+
},
|
|
87
106
|
disabledTools: [],
|
|
88
107
|
allowedTools: [],
|
|
89
108
|
execSecurity: 'deny',
|
|
@@ -106,7 +125,11 @@ export const DEFAULT_CONFIG = {
|
|
|
106
125
|
workerBaseTools: [...DEFAULT_WORKER_BASE_TOOLS],
|
|
107
126
|
platformPromptSectionMaxChars: 2048,
|
|
108
127
|
platformPromptMaxChars: 4096,
|
|
128
|
+
steeringMode: DEFAULT_STEERING_MODE,
|
|
129
|
+
followUpMode: DEFAULT_FOLLOW_UP_MODE,
|
|
109
130
|
policyDenialStopAfter: 2,
|
|
131
|
+
deferredAutoContinue: false,
|
|
132
|
+
deferredAutoContinueMaxDepth: 8,
|
|
110
133
|
};
|
|
111
134
|
/** `env` 参数主要用于测试注入,运行时默认读取 `process.env`。 */
|
|
112
135
|
export function isPhaseTraceEnabled(config, env = process.env) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Deferred worker 完成后自动唤醒主 Agent 续聊(方案 B)。
|
|
3
|
+
*/
|
|
4
|
+
import { type UserMessage } from '@zhin.js/ai';
|
|
5
|
+
import type { DeferredWorkerResult } from '../deferred-worker-runner.js';
|
|
6
|
+
import type { ZhinAgentConfig } from './config.js';
|
|
7
|
+
export declare const DEFERRED_AUTO_CONTINUE_MARKER = "[Deferred worker \u5B8C\u6210 \u2014 \u81EA\u52A8\u7EED\u804A]";
|
|
8
|
+
export declare function isDeferredAutoContinueEnabled(config: Required<ZhinAgentConfig>, env?: NodeJS.ProcessEnv): boolean;
|
|
9
|
+
export declare function shouldDeferredAutoContinue(config: Required<ZhinAgentConfig>, result: DeferredWorkerResult, depth: number, persisted: boolean, env?: NodeJS.ProcessEnv): boolean;
|
|
10
|
+
export declare function buildDeferredAutoContinueUserMessage(taskId: string, goal: string, status: DeferredWorkerResult['status']): UserMessage;
|
|
11
|
+
//# sourceMappingURL=deferred-auto-continue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferred-auto-continue.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/deferred-auto-continue.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,6BAA6B,mEAAgC,CAAC;AAK3E,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAKT;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,OAAO,EAClB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAMT;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GACrC,WAAW,CAWb"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Deferred worker 完成后自动唤醒主 Agent 续聊(方案 B)。
|
|
3
|
+
*/
|
|
4
|
+
import { createUserMessage } from '@zhin.js/ai';
|
|
5
|
+
import { resolveSubagentDisplayLabel } from '../subagent-goal-notify.js';
|
|
6
|
+
import { extractDeferredBody } from './deferred-delivery.js';
|
|
7
|
+
export const DEFERRED_AUTO_CONTINUE_MARKER = '[Deferred worker 完成 — 自动续聊]';
|
|
8
|
+
const FALSE_ENV = new Set(['0', 'false', 'off', 'no']);
|
|
9
|
+
const TRUE_ENV = new Set(['1', 'true', 'on', 'yes']);
|
|
10
|
+
export function isDeferredAutoContinueEnabled(config, env = process.env) {
|
|
11
|
+
const raw = env.ZHIN_DEFERRED_AUTO_CONTINUE?.trim().toLowerCase();
|
|
12
|
+
if (raw && FALSE_ENV.has(raw))
|
|
13
|
+
return false;
|
|
14
|
+
if (raw && TRUE_ENV.has(raw))
|
|
15
|
+
return true;
|
|
16
|
+
return config.deferredAutoContinue;
|
|
17
|
+
}
|
|
18
|
+
export function shouldDeferredAutoContinue(config, result, depth, persisted, env = process.env) {
|
|
19
|
+
if (!isDeferredAutoContinueEnabled(config, env))
|
|
20
|
+
return false;
|
|
21
|
+
if (!persisted)
|
|
22
|
+
return false;
|
|
23
|
+
if (result.status === 'error')
|
|
24
|
+
return false;
|
|
25
|
+
if (depth >= config.deferredAutoContinueMaxDepth)
|
|
26
|
+
return false;
|
|
27
|
+
return extractDeferredBody(result).trim().length > 0;
|
|
28
|
+
}
|
|
29
|
+
export function buildDeferredAutoContinueUserMessage(taskId, goal, status) {
|
|
30
|
+
const label = resolveSubagentDisplayLabel(undefined, goal);
|
|
31
|
+
const text = [
|
|
32
|
+
DEFERRED_AUTO_CONTINUE_MARKER,
|
|
33
|
+
`任务【${taskId}】· ${label}`,
|
|
34
|
+
`Worker 状态:${status}。`,
|
|
35
|
+
'请根据上下文中 `[Deferred worker 完成]` 的 Worker 输出继续推进任务(含答题、提交、后续 API 调用);无需等待用户输入。',
|
|
36
|
+
'若任务已全部完成,向用户简要汇报结果;否则继续调用工具(含 run_deferred_task)执行下一步。',
|
|
37
|
+
'不要向用户重复粘贴 Worker 的完整原始输出。',
|
|
38
|
+
].join('\n');
|
|
39
|
+
return createUserMessage(text);
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=deferred-auto-continue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferred-auto-continue.js","sourceRoot":"","sources":["../../src/zhin-agent/deferred-auto-continue.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAoB,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,MAAM,CAAC,MAAM,6BAA6B,GAAG,6BAA6B,CAAC;AAE3E,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACvD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAErD,MAAM,UAAU,6BAA6B,CAC3C,MAAiC,EACjC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,GAAG,GAAG,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAClE,IAAI,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,OAAO,MAAM,CAAC,oBAAoB,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAAiC,EACjC,MAA4B,EAC5B,KAAa,EACb,SAAkB,EAClB,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,KAAK,IAAI,MAAM,CAAC,4BAA4B;QAAE,OAAO,KAAK,CAAC;IAC/D,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,MAAc,EACd,IAAY,EACZ,MAAsC;IAEtC,MAAM,KAAK,GAAG,2BAA2B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG;QACX,6BAA6B;QAC7B,MAAM,MAAM,MAAM,KAAK,EAAE;QACzB,aAAa,MAAM,GAAG;QACtB,8EAA8E;QAC9E,wDAAwD;QACxD,2BAA2B;KAC5B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { OutputElement } from '@zhin.js/ai';
|
|
2
|
+
import type { DeferredWorkerResult } from '../deferred-worker-runner.js';
|
|
3
|
+
import type { ToolContext } from '../orchestrator/types.js';
|
|
4
|
+
import type { SubagentResultSender } from '../subagent.js';
|
|
5
|
+
export declare function extractDeferredBody(result: DeferredWorkerResult): string;
|
|
6
|
+
export declare function deliverDeferredWorkerResult(sender: SubagentResultSender, context: ToolContext, goal: string, taskId: string, result: DeferredWorkerResult): Promise<void>;
|
|
7
|
+
/** deferred auto-continue 完成后将主 Agent 续聊回复推送到 IM */
|
|
8
|
+
export declare function deliverDeferredAutoContinueReply(sender: SubagentResultSender, context: ToolContext, elements: OutputElement[]): Promise<void>;
|
|
9
|
+
//# sourceMappingURL=deferred-delivery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferred-delivery.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/deferred-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAG3D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAaxE;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,oDAAoD;AACpD,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CAGf"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { truncatePreview } from '@zhin.js/logger';
|
|
2
|
+
import { originFromToolContext } from '../builtin/spawn-task-tool.js';
|
|
3
|
+
import { buildSubagentUserDelivery } from '../media/subagent-user-delivery.js';
|
|
4
|
+
import { resolveSubagentDisplayLabel } from '../subagent-goal-notify.js';
|
|
5
|
+
export function extractDeferredBody(result) {
|
|
6
|
+
try {
|
|
7
|
+
const parsed = JSON.parse(result.summary);
|
|
8
|
+
if (parsed.error?.trim())
|
|
9
|
+
return parsed.error.trim();
|
|
10
|
+
if (parsed.summary?.trim())
|
|
11
|
+
return parsed.summary.trim();
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
// fall through
|
|
15
|
+
}
|
|
16
|
+
return result.summary.trim();
|
|
17
|
+
}
|
|
18
|
+
export async function deliverDeferredWorkerResult(sender, context, goal, taskId, result) {
|
|
19
|
+
const label = resolveSubagentDisplayLabel(undefined, goal);
|
|
20
|
+
const body = extractDeferredBody(result) || truncatePreview(goal, 300);
|
|
21
|
+
const delivery = buildSubagentUserDelivery({
|
|
22
|
+
label: `deferred:${taskId} ${label}`,
|
|
23
|
+
status: result.status === 'error' ? 'error' : 'ok',
|
|
24
|
+
result: body,
|
|
25
|
+
toolCalls: result.toolCalls ?? [],
|
|
26
|
+
});
|
|
27
|
+
await sender(originFromToolContext(context), delivery);
|
|
28
|
+
}
|
|
29
|
+
/** deferred auto-continue 完成后将主 Agent 续聊回复推送到 IM */
|
|
30
|
+
export async function deliverDeferredAutoContinueReply(sender, context, elements) {
|
|
31
|
+
if (!elements.length)
|
|
32
|
+
return;
|
|
33
|
+
await sender(originFromToolContext(context), { text: '', elements });
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=deferred-delivery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferred-delivery.js","sourceRoot":"","sources":["../../src/zhin-agent/deferred-delivery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAEzE,MAAM,UAAU,mBAAmB,CAAC,MAA4B;IAC9D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAIvC,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACrD,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAA4B,EAC5B,OAAoB,EACpB,IAAY,EACZ,MAAc,EACd,MAA4B;IAE5B,MAAM,KAAK,GAAG,2BAA2B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QACzC,KAAK,EAAE,YAAY,MAAM,IAAI,KAAK,EAAE;QACpC,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QAClD,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,EAAE;KAClC,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,MAA4B,EAC5B,OAAoB,EACpB,QAAyB;IAEzB,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO;IAC7B,MAAM,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -16,23 +16,25 @@
|
|
|
16
16
|
* 12. 多模态输入:图片/音频直接传给视觉模型
|
|
17
17
|
*/
|
|
18
18
|
import type { Plugin } from '@zhin.js/core';
|
|
19
|
-
import type { AIProvider, AgentTool, ContentPart } from '@zhin.js/ai';
|
|
19
|
+
import type { AIProvider, AgentTool, AgentMessage, ContentPart, ImageContent } from '@zhin.js/ai';
|
|
20
20
|
import type { Tool, ToolContext } from '../orchestrator/types.js';
|
|
21
21
|
import type { SkillRegistry } from '../orchestrator/skill-registry.js';
|
|
22
22
|
import type { AgentOrchestrator } from '../orchestrator/index.js';
|
|
23
23
|
import { type SessionManager } from '@zhin.js/ai';
|
|
24
|
-
import type
|
|
25
|
-
import { type IMSessionStore } from '@zhin.js/ai';
|
|
24
|
+
import { MemoryAgentSessionStore, type AgentSessionStore, type ContextRepository, type IMSessionStore, type ImTranscriptStore } from '@zhin.js/ai';
|
|
26
25
|
import type { OutputElement } from '@zhin.js/ai';
|
|
27
26
|
import { type ZhinAgentTurnMetrics } from './turn-metrics.js';
|
|
27
|
+
import { TurnTracker } from './turn-tracker.js';
|
|
28
28
|
import { ZhinAgentEventEmitter } from './event-emitter.js';
|
|
29
29
|
import type { ModelRegistry } from '@zhin.js/ai';
|
|
30
30
|
import { UserProfileStore } from '../user-profile.js';
|
|
31
|
-
import { SubagentManager, type SubagentResultSender } from '../subagent.js';
|
|
31
|
+
import { SubagentManager, type SubagentOrigin, type SubagentResultSender } from '../subagent.js';
|
|
32
32
|
import { type ZhinAgentConfig, type OnChunkCallback } from './config.js';
|
|
33
33
|
import type { ResolvedAgentBinding } from '../config/types.js';
|
|
34
|
+
import type { DeferredWorkerResult } from '../deferred-worker-runner.js';
|
|
34
35
|
export type { ZhinAgentConfig, OnChunkCallback } from './config.js';
|
|
35
36
|
export type { ZhinAgentTurnMetrics, ZhinAgentTurnPath } from './turn-metrics.js';
|
|
37
|
+
export { PromptAccessDeniedError } from './prompt-access.js';
|
|
36
38
|
export { formatAiHandlerCompleteLog, formatZhinAgentTurnUsage } from './turn-metrics.js';
|
|
37
39
|
export * from './prompt-builder.js';
|
|
38
40
|
export * from './prompt-templates.js';
|
|
@@ -45,8 +47,10 @@ export declare class ZhinAgent {
|
|
|
45
47
|
private skillRegistry;
|
|
46
48
|
private orchestrator;
|
|
47
49
|
private sessions;
|
|
48
|
-
private chatHistory;
|
|
49
50
|
private imSessionStore;
|
|
51
|
+
private agentSessionStore;
|
|
52
|
+
private contextRepository;
|
|
53
|
+
private imTranscriptStore;
|
|
50
54
|
private memory;
|
|
51
55
|
private externalTools;
|
|
52
56
|
private userProfiles;
|
|
@@ -61,7 +65,10 @@ export declare class ZhinAgent {
|
|
|
61
65
|
private deferredCatalog;
|
|
62
66
|
private readonly deferredWorkerRunner;
|
|
63
67
|
private lastToolSearchDeferredStats?;
|
|
64
|
-
private readonly
|
|
68
|
+
private readonly promptController;
|
|
69
|
+
private deferredResultSender;
|
|
70
|
+
private deferredAutoContinueDepthBySession;
|
|
71
|
+
private lastTurnMetrics;
|
|
65
72
|
private memoryPersistenceReady;
|
|
66
73
|
private resolveMemoryPersistenceReady;
|
|
67
74
|
private memoryPersistenceDone;
|
|
@@ -70,16 +77,22 @@ export declare class ZhinAgent {
|
|
|
70
77
|
setSkillRegistry(registry: SkillRegistry): void;
|
|
71
78
|
setOrchestrator(orchestrator: AgentOrchestrator): void;
|
|
72
79
|
setSessionManager(manager: SessionManager): void;
|
|
73
|
-
setChatHistory(history: ChatHistoryContext): void;
|
|
74
80
|
setIMSessionStore(store: IMSessionStore): void;
|
|
81
|
+
setAgentSessionStore(store: AgentSessionStore | MemoryAgentSessionStore): void;
|
|
82
|
+
setContextRepository(repo: ContextRepository): void;
|
|
83
|
+
setImTranscriptStore(store: ImTranscriptStore): void;
|
|
84
|
+
getContextRepository(): ContextRepository;
|
|
85
|
+
getAgentSessionStore(): AgentSessionStore | MemoryAgentSessionStore;
|
|
86
|
+
getImTranscriptStore(): ImTranscriptStore;
|
|
75
87
|
setModelRegistry(registry: ModelRegistry): void;
|
|
76
88
|
setHostPlugin(plugin: Plugin): void;
|
|
77
89
|
setProviderResolver(resolver: (alias: string) => AIProvider): void;
|
|
90
|
+
private wireLlmApiLayer;
|
|
78
91
|
/** 入站回合注入 ai.agents.<name> 绑定(zhin 或其它 route 摘要路径) */
|
|
79
92
|
setActiveBinding(binding: ResolvedAgentBinding | null): void;
|
|
80
93
|
getActiveBinding(): ResolvedAgentBinding | null;
|
|
81
94
|
getTurnProvider(): AIProvider;
|
|
82
|
-
/** @deprecated 消息事实源已迁至
|
|
95
|
+
/** @deprecated 消息事实源已迁至 im_transcripts / agent_messages,保留空实现以兼容旧 bootstrap */
|
|
83
96
|
upgradeMemoryToDatabase(_msgModel: unknown, _sumModel: unknown): Promise<void>;
|
|
84
97
|
/** 等待 DB store 注入(bootstrap 会 mark;已 mark 时立即返回) */
|
|
85
98
|
waitForMemoryPersistence(): Promise<void>;
|
|
@@ -87,7 +100,16 @@ export declare class ZhinAgent {
|
|
|
87
100
|
upgradeProfilesToDatabase(model: any): void;
|
|
88
101
|
initSubagentManager(createTools: () => AgentTool[]): void;
|
|
89
102
|
setSubagentSender(sender: SubagentResultSender): void;
|
|
103
|
+
setDeferredResultSender(sender: SubagentResultSender): void;
|
|
104
|
+
getDeferredResultSender(): SubagentResultSender | null;
|
|
105
|
+
getDeferredAutoContinueDepth(sessionKey: string): number;
|
|
106
|
+
resetDeferredAutoContinueDepth(sessionKey: string): void;
|
|
107
|
+
continueAfterDeferredWorker(context: ToolContext, taskId: string, goal: string, result: DeferredWorkerResult): Promise<void>;
|
|
108
|
+
getActiveTurnTracker(): TurnTracker | undefined;
|
|
109
|
+
runInTurnContext<T>(turnId: string, fn: () => Promise<T>): Promise<T>;
|
|
90
110
|
getSubagentManager(): SubagentManager | null;
|
|
111
|
+
/** fork 模式:主会话 active_leaf 链快照(不含 spawn_task / tool_search 编排噪声) */
|
|
112
|
+
buildParentContextSnapshotForSubagent(origin: SubagentOrigin): Promise<string | undefined>;
|
|
91
113
|
getEventEmitter(): ZhinAgentEventEmitter;
|
|
92
114
|
getUserProfiles(): UserProfileStore;
|
|
93
115
|
registerTool(tool: AgentTool): () => void;
|
|
@@ -98,11 +120,38 @@ export declare class ZhinAgent {
|
|
|
98
120
|
private beginActiveTurn;
|
|
99
121
|
private finalizeActiveTurn;
|
|
100
122
|
private emitSessionNewEvent;
|
|
101
|
-
|
|
102
|
-
|
|
123
|
+
emitSessionCompactEvent(sessionId: string, context: ToolContext, mode: 'text' | 'multimodal', info: {
|
|
124
|
+
microSavedTokens: number;
|
|
125
|
+
autoSavedTokens: number;
|
|
126
|
+
totalTokensBefore: number;
|
|
127
|
+
totalTokensAfter: number;
|
|
128
|
+
}): void;
|
|
129
|
+
private assertMasterForPromptControl;
|
|
130
|
+
subscribe(listener: (event: import('@zhin.js/ai').AgentEvent, signal: AbortSignal) => void | Promise<void>): () => void;
|
|
131
|
+
abort(): void;
|
|
132
|
+
waitForIdle(): Promise<void>;
|
|
133
|
+
isPromptBusy(): boolean;
|
|
134
|
+
clearSteeringQueue(sessionKey?: string): void;
|
|
135
|
+
clearFollowUpQueue(sessionKey?: string): void;
|
|
136
|
+
steer(message: AgentMessage, context: ToolContext): void;
|
|
137
|
+
followUp(message: AgentMessage, context: ToolContext): void;
|
|
138
|
+
/**
|
|
139
|
+
* 对齐 Agent.prompt:入队并执行 LLM turn(需 IM ToolContext)。
|
|
140
|
+
* process() / processMultimodal() 在 agentLoop 路径下内部委托此方法。
|
|
141
|
+
*/
|
|
142
|
+
prompt(input: string | AgentMessage | AgentMessage[], context: ToolContext, options?: {
|
|
143
|
+
images?: ImageContent[];
|
|
144
|
+
onChunk?: OnChunkCallback;
|
|
145
|
+
}): Promise<void>;
|
|
146
|
+
/** 旁听由 zhin `message.receive` 写入 im_transcripts,此处保留空实现 */
|
|
103
147
|
appendPassiveGroupChatter(_context: ToolContext, _rawContent: string): Promise<void>;
|
|
104
|
-
/** 归档当前场景 active 会话(/
|
|
148
|
+
/** 归档当前场景 active 会话(/reset);下次 @ 将创建新 session 纪元 */
|
|
105
149
|
archiveSessionForContext(context: ToolContext): Promise<boolean>;
|
|
150
|
+
/** 手动压缩当前 session epoch(/compact) */
|
|
151
|
+
compactSessionForContext(context: ToolContext): Promise<{
|
|
152
|
+
ok: boolean;
|
|
153
|
+
message: string;
|
|
154
|
+
}>;
|
|
106
155
|
process(content: string, context: ToolContext, externalTools?: Tool[], onChunk?: OnChunkCallback): Promise<OutputElement[]>;
|
|
107
156
|
private resolveAgentToolsForTurn;
|
|
108
157
|
private runDeferredWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/index.ts"],"names":[],"mappings":"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"}
|