@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
package/lib/builtin-tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../src/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../src/builtin-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { AIConfig } from '@zhin.js/core';
|
|
2
2
|
import type { AgentBindingConfig, ProviderInstanceConfig } from './types.js';
|
|
3
|
+
/** Normalize legacy `driver` → required `api` (ADR 0009 D1). */
|
|
4
|
+
export declare function normalizeProviderEntry(alias: string, cfg: ProviderInstanceConfig & {
|
|
5
|
+
driver?: string;
|
|
6
|
+
}): ProviderInstanceConfig;
|
|
3
7
|
export interface NormalizedAiRoutingConfig {
|
|
4
8
|
providers: Record<string, ProviderInstanceConfig>;
|
|
5
9
|
agents: Record<string, AgentBindingConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"normalize-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EACV,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAgBpB,gEAAgE;AAChE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,sBAAsB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAChD,sBAAsB,CAKxB;AA8BD,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,QAAQ,GAAG,SAAS,GAAG,yBAAyB,CA2B5F"}
|
|
@@ -1,12 +1,22 @@
|
|
|
1
|
+
import { driverToModelApi } from '@zhin.js/ai';
|
|
1
2
|
import { DEFAULT_ZHIN_AGENT_NAME } from './types.js';
|
|
2
3
|
const LEGACY_DRIVER_KEYS = new Set([
|
|
3
4
|
'openai', 'anthropic', 'deepseek', 'moonshot', 'zhipu', 'google', 'gemini', 'ollama', 'cloudflare',
|
|
4
5
|
]);
|
|
5
|
-
function
|
|
6
|
+
function isNamedProviderShape(providers) {
|
|
6
7
|
if (!providers || typeof providers !== 'object' || Array.isArray(providers))
|
|
7
8
|
return false;
|
|
8
9
|
const first = Object.values(providers)[0];
|
|
9
|
-
|
|
10
|
+
if (!first || typeof first !== 'object')
|
|
11
|
+
return false;
|
|
12
|
+
return 'api' in first || 'driver' in first;
|
|
13
|
+
}
|
|
14
|
+
/** Normalize legacy `driver` → required `api` (ADR 0009 D1). */
|
|
15
|
+
export function normalizeProviderEntry(alias, cfg) {
|
|
16
|
+
const legacyDriver = cfg.driver?.trim().toLowerCase();
|
|
17
|
+
const api = cfg.api?.trim() || (legacyDriver ? driverToModelApi(legacyDriver) : driverToModelApi(alias));
|
|
18
|
+
const { driver: _driver, ...rest } = cfg;
|
|
19
|
+
return { ...rest, api };
|
|
10
20
|
}
|
|
11
21
|
function normalizeLegacyProviders(legacy) {
|
|
12
22
|
const out = {};
|
|
@@ -14,7 +24,7 @@ function normalizeLegacyProviders(legacy) {
|
|
|
14
24
|
if (key === 'custom' || !cfg || typeof cfg !== 'object')
|
|
15
25
|
continue;
|
|
16
26
|
if (LEGACY_DRIVER_KEYS.has(key)) {
|
|
17
|
-
out[key] = {
|
|
27
|
+
out[key] = normalizeProviderEntry(key, { ...cfg, api: driverToModelApi(key) });
|
|
18
28
|
}
|
|
19
29
|
}
|
|
20
30
|
return out;
|
|
@@ -35,9 +45,16 @@ function mergeLegacyRoutesIntoAgents(agents, routes) {
|
|
|
35
45
|
* 解析 ai.providers / agents;兼容旧版 providers.<driver> 与顶层 ai.routes。
|
|
36
46
|
*/
|
|
37
47
|
export function normalizeAiRoutingConfig(ai) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
48
|
+
let providers;
|
|
49
|
+
if (isNamedProviderShape(ai?.providers)) {
|
|
50
|
+
providers = {};
|
|
51
|
+
for (const [alias, cfg] of Object.entries(ai.providers)) {
|
|
52
|
+
providers[alias] = normalizeProviderEntry(alias, cfg);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
providers = normalizeLegacyProviders(ai?.providers ?? {});
|
|
57
|
+
}
|
|
41
58
|
const agents = { ...(ai?.agents ?? {}) };
|
|
42
59
|
const legacyRoutes = ai?.routes ?? {};
|
|
43
60
|
mergeLegacyRoutesIntoAgents(agents, legacyRoutes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-ai-config.js","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize-ai-config.js","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-instance.d.ts","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,eAAe,CAAC;AAYhE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-instance.d.ts","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,eAAe,CAAC;AAYhE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAwCzD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,sBAAsB,GAC1B,UAAU,GAAG,IAAI,CAqBnB;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,GAAG,SAAS,GAC5D,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAQzB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AnthropicProvider, CloudflareProvider, DeepSeekProvider, MoonshotProvider, OllamaProvider, OpenAIProvider, ZhipuProvider, GoogleProvider, } from '@zhin.js/core';
|
|
2
|
-
const
|
|
2
|
+
const VENDOR_FACTORIES = {
|
|
3
3
|
openai: { factory: OpenAIProvider, requireApiKey: true },
|
|
4
4
|
anthropic: { factory: AnthropicProvider, requireApiKey: true },
|
|
5
5
|
deepseek: { factory: DeepSeekProvider, requireApiKey: true },
|
|
@@ -9,12 +9,31 @@ const DRIVER_FACTORIES = {
|
|
|
9
9
|
gemini: { factory: GoogleProvider, requireApiKey: true },
|
|
10
10
|
ollama: { factory: OllamaProvider, requireApiKey: false },
|
|
11
11
|
};
|
|
12
|
+
function resolveVendorAlias(alias, api) {
|
|
13
|
+
const lower = alias.trim().toLowerCase();
|
|
14
|
+
if (VENDOR_FACTORIES[lower] || lower === 'cloudflare')
|
|
15
|
+
return lower;
|
|
16
|
+
const head = lower.split(/[-_/]/)[0];
|
|
17
|
+
if (head && (VENDOR_FACTORIES[head] || head === 'cloudflare'))
|
|
18
|
+
return head;
|
|
19
|
+
switch (api) {
|
|
20
|
+
case 'anthropic-messages':
|
|
21
|
+
return 'anthropic';
|
|
22
|
+
case 'google-generative-ai':
|
|
23
|
+
return 'google';
|
|
24
|
+
case 'ollama-chat':
|
|
25
|
+
return 'ollama';
|
|
26
|
+
case 'cloudflare-workers-ai':
|
|
27
|
+
return 'cloudflare';
|
|
28
|
+
case 'openai-completions':
|
|
29
|
+
default:
|
|
30
|
+
return 'openai';
|
|
31
|
+
}
|
|
32
|
+
}
|
|
12
33
|
export function createProviderInstance(alias, raw) {
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const { driver: _d, ...rest } = raw;
|
|
17
|
-
if (driver === 'cloudflare') {
|
|
34
|
+
const vendor = resolveVendorAlias(alias, raw.api?.trim() || 'openai-completions');
|
|
35
|
+
const { api: _api, ...rest } = raw;
|
|
36
|
+
if (vendor === 'cloudflare') {
|
|
18
37
|
const cfg = rest;
|
|
19
38
|
if (!cfg.apiKey || !cfg.accountId)
|
|
20
39
|
return null;
|
|
@@ -22,7 +41,7 @@ export function createProviderInstance(alias, raw) {
|
|
|
22
41
|
provider.name = alias;
|
|
23
42
|
return provider;
|
|
24
43
|
}
|
|
25
|
-
const entry =
|
|
44
|
+
const entry = VENDOR_FACTORIES[vendor];
|
|
26
45
|
if (!entry)
|
|
27
46
|
return null;
|
|
28
47
|
const cfg = { ...rest };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-instance.js","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,aAAa,EACb,cAAc,GACf,MAAM,eAAe,CAAC;AAKvB,MAAM,gBAAgB,GAGlB;IACF,MAAM,EAAE,EAAE,OAAO,EAAE,cAAiC,EAAE,aAAa,EAAE,IAAI,EAAE;IAC3E,SAAS,EAAE,EAAE,OAAO,EAAE,iBAAoC,EAAE,aAAa,EAAE,IAAI,EAAE;IACjF,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAmC,EAAE,aAAa,EAAE,IAAI,EAAE;IAC/E,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAmC,EAAE,aAAa,EAAE,IAAI,EAAE;IAC/E,KAAK,EAAE,EAAE,OAAO,EAAE,aAAgC,EAAE,aAAa,EAAE,IAAI,EAAE;IACzE,MAAM,EAAE,EAAE,OAAO,EAAE,cAAiC,EAAE,aAAa,EAAE,IAAI,EAAE;IAC3E,MAAM,EAAE,EAAE,OAAO,EAAE,cAAiC,EAAE,aAAa,EAAE,IAAI,EAAE;IAC3E,MAAM,EAAE,EAAE,OAAO,EAAE,cAAiC,EAAE,aAAa,EAAE,KAAK,EAAE;CAC7E,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"provider-instance.js","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"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"}
|
package/lib/config/types.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { ProviderConfig } from '@zhin.js/core';
|
|
2
2
|
export type ProviderDriver = 'openai' | 'anthropic' | 'deepseek' | 'moonshot' | 'zhipu' | 'google' | 'gemini' | 'ollama' | 'cloudflare';
|
|
3
3
|
export interface ProviderInstanceConfig extends ProviderConfig {
|
|
4
|
-
|
|
4
|
+
/** LLM protocol id (ADR 0009 D1), e.g. openai-completions */
|
|
5
|
+
api: string;
|
|
5
6
|
}
|
|
6
7
|
export interface RouteMatchConfig {
|
|
7
8
|
adapter?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,WAAW,GACX,UAAU,GACV,UAAU,GACV,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,YAAY,CAAC;AAEjB,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,WAAW,GACX,UAAU,GACV,UAAU,GACV,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,YAAY,CAAC;AAEjB,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,6DAA6D;IAC7D,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,mBAAmB;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAED,qCAAqC;AACrC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,yBAAyB;AACzB,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,eAAO,MAAM,uBAAuB,SAAS,CAAC"}
|
package/lib/config/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAmDA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAE1E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,yBAAyB,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"validate-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAE1E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,yBAAyB,GAAG,MAAM,EAAE,CA2ChF"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { DEFAULT_ZHIN_AGENT_NAME } from './types.js';
|
|
2
2
|
export function validateAiRoutingConfig(cfg) {
|
|
3
3
|
const errors = [];
|
|
4
|
+
for (const [alias, prov] of Object.entries(cfg.providers)) {
|
|
5
|
+
if (!prov.api?.trim()) {
|
|
6
|
+
errors.push(`ai.providers.${alias}: api is required`);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
4
9
|
if (!cfg.agents[DEFAULT_ZHIN_AGENT_NAME]) {
|
|
5
10
|
errors.push(`ai.agents.${DEFAULT_ZHIN_AGENT_NAME} is required`);
|
|
6
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-ai-config.js","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,UAAU,uBAAuB,CAAC,GAA8B;IACpE,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,aAAa,uBAAuB,cAAc,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,uBAAuB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC;QACtD,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE;gBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0BAA0B,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAChF,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;QAE7C,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;YACrC,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;gBAC5B,MAAM,CAAC,IAAI,CAAC,aAAa,uBAAuB,0DAA0D,CAAC,CAAC;YAC9G,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0CAA0C,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,WAAW,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0CAA0C,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"validate-ai-config.js","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,UAAU,uBAAuB,CAAC,GAA8B;IACpE,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,gBAAgB,KAAK,mBAAmB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,aAAa,uBAAuB,cAAc,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,uBAAuB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC;QACtD,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE;gBAAE,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0BAA0B,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAChF,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;QAE7C,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;YACrC,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;gBAC5B,MAAM,CAAC,IAAI,CAAC,aAAa,uBAAuB,0DAA0D,CAAC,CAAC;YAC9G,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0CAA0C,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,WAAW,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,0CAA0C,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Programmatic SDK entry for standalone harness (ADR 0010 D6).
|
|
3
|
+
*/
|
|
4
|
+
import type { AIConfig } from '@zhin.js/core';
|
|
5
|
+
import { AIService, type CreateServiceAgentOptions, type ServiceAgentResult } from './service.js';
|
|
6
|
+
export interface CreateAgentSessionOptions {
|
|
7
|
+
config?: AIConfig;
|
|
8
|
+
cwd?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface AgentSessionHandle {
|
|
11
|
+
service: AIService;
|
|
12
|
+
prompt(text: string, options?: CreateServiceAgentOptions): Promise<ServiceAgentResult>;
|
|
13
|
+
dispose(): void;
|
|
14
|
+
}
|
|
15
|
+
export declare function createAgentSession(options?: CreateAgentSessionOptions): AgentSessionHandle;
|
|
16
|
+
//# sourceMappingURL=create-agent-session.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-agent-session.d.ts","sourceRoot":"","sources":["../src/create-agent-session.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,KAAK,yBAAyB,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElG,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvF,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,yBAA8B,GAAG,kBAAkB,CAY9F"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { AIService } from './service.js';
|
|
2
|
+
export function createAgentSession(options = {}) {
|
|
3
|
+
const config = options.config ?? {};
|
|
4
|
+
const service = new AIService(config);
|
|
5
|
+
return {
|
|
6
|
+
service,
|
|
7
|
+
async prompt(text, runOptions) {
|
|
8
|
+
return service.runAgent(text, runOptions);
|
|
9
|
+
},
|
|
10
|
+
dispose() {
|
|
11
|
+
service.dispose();
|
|
12
|
+
},
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=create-agent-session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-agent-session.js","sourceRoot":"","sources":["../src/create-agent-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAA2D,MAAM,cAAc,CAAC;AAalG,MAAM,UAAU,kBAAkB,CAAC,UAAqC,EAAE;IACxE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO;QACL,OAAO;QACP,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU;YAC3B,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO;YACL,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AIProvider, AgentTool } from '@zhin.js/core';
|
|
2
|
+
import type { ToolCallRecord } from './zhin-agent/tool-calls-user-format.js';
|
|
2
3
|
import type { ModelRegistry } from '@zhin.js/ai';
|
|
3
4
|
import type { ZhinAgentConfig, ExecApprovalMode } from './zhin-agent/config.js';
|
|
4
5
|
import type { ToolContext } from '@zhin.js/core';
|
|
@@ -34,6 +35,7 @@ export interface DeferredWorkerResult {
|
|
|
34
35
|
loadedToolNames: string[];
|
|
35
36
|
iterations: number;
|
|
36
37
|
status: 'ok' | 'partial' | 'error';
|
|
38
|
+
toolCalls?: ToolCallRecord[];
|
|
37
39
|
}
|
|
38
40
|
export declare class DeferredWorkerRunner {
|
|
39
41
|
runSync(options: DeferredWorkerRunOptions): Promise<DeferredWorkerResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred-worker-runner.d.ts","sourceRoot":"","sources":["../src/deferred-worker-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"deferred-worker-runner.d.ts","sourceRoot":"","sources":["../src/deferred-worker-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAQ3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAO7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAGhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMjD,0BAA0B;AAC1B,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,SAAS,EAAE,CAAC;IAC7B,eAAe,EAAE,SAAS,EAAE,CAAC;IAC7B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACvC,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,UAAU,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,4BAA4B,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,qBAAa,oBAAoB;IACzB,OAAO,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAgMhF"}
|
|
@@ -3,17 +3,14 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { Logger } from '@zhin.js/core';
|
|
5
5
|
import { formatCompact, formatCompactUsage, truncatePreview } from '@zhin.js/logger';
|
|
6
|
-
import { createAgent } from '@zhin.js/ai';
|
|
7
6
|
import { isOmittedToolSummary, sanitizeToolResult, stripHallucinatedToolCalls, } from '@zhin.js/ai';
|
|
8
7
|
import { stripThinkBlocks } from './zhin-agent/text-sanitize.js';
|
|
8
|
+
import { runAgentLoopStandaloneTurn } from './zhin-agent/agent-loop-standalone.js';
|
|
9
9
|
import { selectDeferredToolsForWorker } from './deferred-worker-tool-load.js';
|
|
10
10
|
import { resolveAgentPromptMarkdown, resolveDeferredToolsForPlatform, } from './agent-prompt/index.js';
|
|
11
11
|
import { resolveWorkerSlowToolTimeout } from './zhin-agent/config.js';
|
|
12
|
-
import { applyExecPolicyToTools } from './security/exec-policy.js';
|
|
13
|
-
import { RESERVED_TOOL_NAME_PREFIXES } from './reserved-tools.js';
|
|
14
|
-
import { resolveContextBudget } from './zhin-agent/context-budget.js';
|
|
15
12
|
import { createOwnerOrchestratedToolResultTransform } from './orchestrator/owner-confirm-orchestration.js';
|
|
16
|
-
import {
|
|
13
|
+
import { applyExecPolicyToTools } from './security/exec-policy.js';
|
|
17
14
|
import { DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS } from './zhin-agent/config.js';
|
|
18
15
|
const logger = new Logger(null, 'DeferredWorker');
|
|
19
16
|
const ORCHESTRATOR_TOOL_SET = new Set(DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS);
|
|
@@ -77,14 +74,6 @@ export class DeferredWorkerRunner {
|
|
|
77
74
|
}));
|
|
78
75
|
}
|
|
79
76
|
const model = provider.models[0];
|
|
80
|
-
const contextBudget = execPolicyConfig
|
|
81
|
-
? resolveContextBudget({
|
|
82
|
-
config: execPolicyConfig,
|
|
83
|
-
provider,
|
|
84
|
-
modelRegistry: modelRegistry ?? null,
|
|
85
|
-
model,
|
|
86
|
-
})
|
|
87
|
-
: null;
|
|
88
77
|
const platformBody = await resolveAgentPromptMarkdown({
|
|
89
78
|
ctx: promptCtx,
|
|
90
79
|
config: execPolicyConfig,
|
|
@@ -117,24 +106,20 @@ ${goal}${platformBlock}
|
|
|
117
106
|
toolQuery,
|
|
118
107
|
loadedToolNames,
|
|
119
108
|
});
|
|
120
|
-
const agent = createAgent(provider, {
|
|
121
|
-
model,
|
|
122
|
-
systemPrompt,
|
|
123
|
-
tools,
|
|
124
|
-
maxIterations,
|
|
125
|
-
turnTimeout: execPolicyConfig?.timeout ?? 60_000,
|
|
126
|
-
// Worker 须能注册 bash/read_file 等内置名;仅保留编排类元工具不可被插件覆盖
|
|
127
|
-
reservedToolNames: [...ORCHESTRATOR_TOOL_SET],
|
|
128
|
-
reservedToolNamePrefixes: RESERVED_TOOL_NAME_PREFIXES,
|
|
129
|
-
contextWindow: contextBudget?.contextWindow ?? provider.contextWindow,
|
|
130
|
-
forceMicroCompactEachTurn: true,
|
|
131
|
-
transformToolResult: createOwnerOrchestratedToolResultTransform({
|
|
132
|
-
toolContext: origin,
|
|
133
|
-
disableHardOrchestration: true,
|
|
134
|
-
}),
|
|
135
|
-
});
|
|
136
109
|
try {
|
|
137
|
-
const result = await
|
|
110
|
+
const result = await runAgentLoopStandaloneTurn({
|
|
111
|
+
provider,
|
|
112
|
+
model,
|
|
113
|
+
systemPrompt,
|
|
114
|
+
tools,
|
|
115
|
+
userInput: goal,
|
|
116
|
+
maxIterations,
|
|
117
|
+
toolContext: origin,
|
|
118
|
+
transformToolResult: createOwnerOrchestratedToolResultTransform({
|
|
119
|
+
toolContext: origin,
|
|
120
|
+
disableHardOrchestration: true,
|
|
121
|
+
}),
|
|
122
|
+
});
|
|
138
123
|
const hitMaxIter = result.iterations >= maxIterations;
|
|
139
124
|
const summary = buildWorkerSummary(result, summaryMaxChars, hitMaxIter);
|
|
140
125
|
logger.info(formatCompact({
|
|
@@ -164,6 +149,7 @@ ${goal}${platformBlock}
|
|
|
164
149
|
loadedToolNames,
|
|
165
150
|
iterations: result.iterations,
|
|
166
151
|
status: hitMaxIter ? 'partial' : 'ok',
|
|
152
|
+
toolCalls: result.toolCalls,
|
|
167
153
|
};
|
|
168
154
|
}
|
|
169
155
|
catch (error) {
|
|
@@ -193,13 +179,10 @@ ${goal}${platformBlock}
|
|
|
193
179
|
status: 'error',
|
|
194
180
|
};
|
|
195
181
|
}
|
|
196
|
-
finally {
|
|
197
|
-
agent.dispose();
|
|
198
|
-
}
|
|
199
182
|
}
|
|
200
183
|
}
|
|
201
184
|
function buildWorkerSummary(result, maxChars, hitMaxIter) {
|
|
202
|
-
const raw = result.content
|
|
185
|
+
const raw = result.content.trim() || '';
|
|
203
186
|
let cleaned = sanitizeToolResult(stripHallucinatedToolCalls(stripThinkBlocks(raw)), { maxChars });
|
|
204
187
|
if (isOmittedToolSummary(cleaned)) {
|
|
205
188
|
cleaned = summarizeWorkerToolCalls(result.toolCalls, maxChars);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred-worker-runner.js","sourceRoot":"","sources":["../src/deferred-worker-runner.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAErF,OAAO,
|
|
1
|
+
{"version":3,"file":"deferred-worker-runner.js","sourceRoot":"","sources":["../src/deferred-worker-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* 同名先发现者优先
|
|
6
6
|
*/
|
|
7
7
|
import { type Plugin } from '@zhin.js/core';
|
|
8
|
+
export type SubagentContextMode = 'fork' | 'fresh';
|
|
8
9
|
export interface AgentMeta {
|
|
9
10
|
name: string;
|
|
10
11
|
description: string;
|
|
@@ -22,6 +23,10 @@ export interface AgentMeta {
|
|
|
22
23
|
maxIterations?: number;
|
|
23
24
|
/** 所属插件名(从 agents/ 目录归属推断) */
|
|
24
25
|
ownerPlugin?: string;
|
|
26
|
+
/** spawn_task 使用的 AgentRole(默认 subtask 或按预设名推断) */
|
|
27
|
+
role?: string;
|
|
28
|
+
/** fork:注入主会话快照;fresh:空 standalone 上下文 */
|
|
29
|
+
contextMode?: SubagentContextMode;
|
|
25
30
|
}
|
|
26
31
|
/**
|
|
27
32
|
* 扫描 agents/ 目录,发现 *.agent.md 文件
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC;AAYnD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAMD;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAuGxF;AAED,6DAA6D;AAC7D,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7E"}
|
package/lib/discovery/agents.js
CHANGED
|
@@ -9,6 +9,9 @@ import * as os from 'node:os';
|
|
|
9
9
|
import * as path from 'node:path';
|
|
10
10
|
import { Logger } from '@zhin.js/core';
|
|
11
11
|
import { getDataDir } from './utils.js';
|
|
12
|
+
const KNOWN_AGENT_ROLES = new Set([
|
|
13
|
+
'main', 'subtask', 'worker', 'researcher', 'executor', 'reviewer', 'planner',
|
|
14
|
+
]);
|
|
12
15
|
const logger = new Logger(null, 'builtin-tools');
|
|
13
16
|
// ============================================================================
|
|
14
17
|
// 发现
|
|
@@ -97,6 +100,8 @@ export async function discoverWorkspaceAgents(root) {
|
|
|
97
100
|
continue;
|
|
98
101
|
}
|
|
99
102
|
seenNames.add(metadata.name);
|
|
103
|
+
const roleRaw = typeof metadata.role === 'string' ? metadata.role.trim() : undefined;
|
|
104
|
+
const contextRaw = typeof metadata.contextMode === 'string' ? metadata.contextMode.trim() : undefined;
|
|
100
105
|
agents.push({
|
|
101
106
|
name: metadata.name,
|
|
102
107
|
description: metadata.description,
|
|
@@ -108,6 +113,8 @@ export async function discoverWorkspaceAgents(root) {
|
|
|
108
113
|
provider: metadata.provider,
|
|
109
114
|
maxIterations: typeof metadata.maxIterations === 'number' ? metadata.maxIterations : undefined,
|
|
110
115
|
ownerPlugin: dirToPlugin.get(agentsDir),
|
|
116
|
+
role: roleRaw && KNOWN_AGENT_ROLES.has(roleRaw) ? roleRaw : undefined,
|
|
117
|
+
contextMode: contextRaw === 'fork' || contextRaw === 'fresh' ? contextRaw : undefined,
|
|
111
118
|
});
|
|
112
119
|
logger.debug(`Agent发现成功: ${metadata.name}`);
|
|
113
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAe,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 技能发现(SKILL.md 文件扫描与加载)
|
|
3
3
|
*
|
|
4
|
-
* 加载顺序:Workspace(cwd/skills)> Local(~/.zhin/skills)>
|
|
4
|
+
* 加载顺序:Workspace(cwd/skills)> Local(~/.zhin/skills)> .agents/skills(向上至 git root)> 已加载插件包 skills/
|
|
5
5
|
* 同名先发现者优先,支持平台/依赖兼容性过滤
|
|
6
6
|
*/
|
|
7
7
|
import { type Plugin } from '@zhin.js/core';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/discovery/skills.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAUpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,uCAAuC;IACvC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAMD;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/discovery/skills.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAUpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,uCAAuC;IACvC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAMD;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoHxF;AAMD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,CAEjE;AAQD;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAclF;AAMD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAajE;AAMD;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBrE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,MAAa,GAAG,MAAM,CAwEzG"}
|
package/lib/discovery/skills.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 技能发现(SKILL.md 文件扫描与加载)
|
|
3
3
|
*
|
|
4
|
-
* 加载顺序:Workspace(cwd/skills)> Local(~/.zhin/skills)>
|
|
4
|
+
* 加载顺序:Workspace(cwd/skills)> Local(~/.zhin/skills)> .agents/skills(向上至 git root)> 已加载插件包 skills/
|
|
5
5
|
* 同名先发现者优先,支持平台/依赖兼容性过滤
|
|
6
6
|
*/
|
|
7
7
|
import * as fs from 'node:fs';
|
|
@@ -9,7 +9,7 @@ import * as path from 'node:path';
|
|
|
9
9
|
import { exec } from 'node:child_process';
|
|
10
10
|
import { promisify } from 'node:util';
|
|
11
11
|
import { Logger } from '@zhin.js/core';
|
|
12
|
-
import { getSkillSearchDirectories
|
|
12
|
+
import { getSkillSearchDirectories } from './utils.js';
|
|
13
13
|
const execAsync = promisify(exec);
|
|
14
14
|
const logger = new Logger(null, 'builtin-tools');
|
|
15
15
|
// ============================================================================
|
|
@@ -22,7 +22,6 @@ const logger = new Logger(null, 'builtin-tools');
|
|
|
22
22
|
export async function discoverWorkspaceSkills(root) {
|
|
23
23
|
const skills = [];
|
|
24
24
|
const seenNames = new Set();
|
|
25
|
-
const dataDir = getDataDir();
|
|
26
25
|
const skillDirs = getSkillSearchDirectories(root ?? undefined);
|
|
27
26
|
// Build dir → pluginName mapping for attribution
|
|
28
27
|
const dirToPlugin = new Map();
|
|
@@ -41,12 +40,6 @@ export async function discoverWorkspaceSkills(root) {
|
|
|
41
40
|
for (const child of (root.children || []))
|
|
42
41
|
mapPlugin(child);
|
|
43
42
|
}
|
|
44
|
-
// 确保 data/skills 目录存在
|
|
45
|
-
const defaultSkillDir = path.join(dataDir, 'skills');
|
|
46
|
-
if (!fs.existsSync(defaultSkillDir)) {
|
|
47
|
-
fs.mkdirSync(defaultSkillDir, { recursive: true });
|
|
48
|
-
logger.debug(`Created skill directory: ${defaultSkillDir}`);
|
|
49
|
-
}
|
|
50
43
|
for (const skillsDir of skillDirs) {
|
|
51
44
|
if (!fs.existsSync(skillsDir))
|
|
52
45
|
continue;
|