@zhin.js/agent 0.2.1 → 0.3.1
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 +11 -12
- package/lib/agent-prompt/resolver.d.ts +2 -1
- package/lib/agent-prompt/resolver.d.ts.map +1 -1
- package/lib/agent-prompt/resolver.js +8 -3
- package/lib/agent-prompt/resolver.js.map +1 -1
- package/lib/assistant/home-mcp-bridge.d.ts +1 -1
- package/lib/assistant/home-mcp-bridge.d.ts.map +1 -1
- package/lib/assistant/home-policy.js +20 -21
- package/lib/assistant/home-policy.js.map +1 -1
- package/lib/assistant/home-tools.d.ts.map +1 -1
- package/lib/assistant/home-tools.js +5 -2
- package/lib/assistant/home-tools.js.map +1 -1
- package/lib/bootstrap.d.ts +12 -0
- package/lib/bootstrap.d.ts.map +1 -1
- package/lib/bootstrap.js +14 -0
- package/lib/bootstrap.js.map +1 -1
- package/lib/builtin/analyze-media-tool.d.ts.map +1 -1
- package/lib/builtin/analyze-media-tool.js +11 -5
- package/lib/builtin/analyze-media-tool.js.map +1 -1
- package/lib/builtin/bash-tool.d.ts +4 -2
- package/lib/builtin/bash-tool.d.ts.map +1 -1
- package/lib/builtin/bash-tool.js +17 -14
- package/lib/builtin/bash-tool.js.map +1 -1
- package/lib/builtin/generate-image-tool.d.ts +1 -1
- package/lib/builtin/generate-image-tool.d.ts.map +1 -1
- package/lib/builtin/generate-image-tool.js +3 -3
- package/lib/builtin/generate-image-tool.js.map +1 -1
- package/lib/builtin/grep-tool.d.ts.map +1 -1
- package/lib/builtin/grep-tool.js +4 -1
- package/lib/builtin/grep-tool.js.map +1 -1
- package/lib/builtin/knowledge-search-tool.d.ts +6 -0
- package/lib/builtin/knowledge-search-tool.d.ts.map +1 -0
- package/lib/builtin/knowledge-search-tool.js +184 -0
- package/lib/builtin/knowledge-search-tool.js.map +1 -0
- package/lib/builtin/orchestration-tools.d.ts +2 -1
- package/lib/builtin/orchestration-tools.d.ts.map +1 -1
- package/lib/builtin/orchestration-tools.js.map +1 -1
- package/lib/builtin/read-file-tool.d.ts.map +1 -1
- package/lib/builtin/read-file-tool.js +4 -4
- package/lib/builtin/read-file-tool.js.map +1 -1
- package/lib/builtin/run-spec-dry-run-tool.d.ts +1 -4
- package/lib/builtin/run-spec-dry-run-tool.d.ts.map +1 -1
- package/lib/builtin/run-spec-dry-run-tool.js.map +1 -1
- package/lib/builtin/run-validation-spec-tool.d.ts +1 -4
- package/lib/builtin/run-validation-spec-tool.d.ts.map +1 -1
- package/lib/builtin/run-validation-spec-tool.js.map +1 -1
- package/lib/builtin/spawn-task-tool.d.ts +2 -1
- package/lib/builtin/spawn-task-tool.d.ts.map +1 -1
- package/lib/builtin/spawn-task-tool.js.map +1 -1
- package/lib/builtin/web-fetch-tool.d.ts +2 -0
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +38 -16
- package/lib/builtin/web-fetch-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 +5 -1
- package/lib/builtin-tools.js.map +1 -1
- package/lib/config/fix-ai-config.d.ts +1 -1
- package/lib/config/fix-ai-config.d.ts.map +1 -1
- package/lib/config/fix-ai-config.js +1 -1
- package/lib/config/normalize-ai-config.d.ts +5 -2
- package/lib/config/normalize-ai-config.d.ts.map +1 -1
- package/lib/config/normalize-ai-config.js +50 -7
- package/lib/config/normalize-ai-config.js.map +1 -1
- package/lib/config/provider-instance.d.ts +1 -1
- package/lib/config/provider-instance.d.ts.map +1 -1
- package/lib/config/provider-instance.js +2 -51
- package/lib/config/provider-instance.js.map +1 -1
- package/lib/config/types.d.ts +9 -5
- 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 +12 -2
- package/lib/config/validate-ai-config.js.map +1 -1
- package/lib/create-agent-session.d.ts +1 -1
- package/lib/create-agent-session.d.ts.map +1 -1
- package/lib/deferred-worker-runner.d.ts +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +39 -12
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/index.d.ts +5 -19
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -10
- package/lib/index.js.map +1 -1
- package/lib/init/activate-ai-database-storage.d.ts +1 -1
- package/lib/init/activate-ai-database-storage.d.ts.map +1 -1
- package/lib/init/activate-ai-database-storage.js +12 -8
- package/lib/init/activate-ai-database-storage.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +18 -6
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-collectors.d.ts +1 -1
- package/lib/init/introspection-collectors.d.ts.map +1 -1
- package/lib/init/introspection-collectors.js.map +1 -1
- package/lib/init/introspection-commands-format.d.ts +1 -1
- package/lib/init/introspection-commands-format.d.ts.map +1 -1
- package/lib/init/introspection-commands-format.js.map +1 -1
- package/lib/init/message-media.d.ts +2 -1
- package/lib/init/message-media.d.ts.map +1 -1
- package/lib/init/message-media.js.map +1 -1
- package/lib/init/register-agent-mesh-mcp.d.ts.map +1 -1
- package/lib/init/register-agent-mesh-mcp.js +18 -2
- package/lib/init/register-agent-mesh-mcp.js.map +1 -1
- package/lib/init/register-ai-service.d.ts.map +1 -1
- package/lib/init/register-ai-service.js +2 -1
- package/lib/init/register-ai-service.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +12 -7
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/register-introspection-commands.d.ts.map +1 -1
- package/lib/init/register-introspection-commands.js +8 -9
- package/lib/init/register-introspection-commands.js.map +1 -1
- package/lib/init/register-owner-approve-commands.d.ts.map +1 -1
- package/lib/init/register-owner-approve-commands.js +16 -22
- package/lib/init/register-owner-approve-commands.js.map +1 -1
- package/lib/mcp-client/bridge.d.ts +4 -4
- package/lib/mcp-client/bridge.d.ts.map +1 -1
- package/lib/mcp-client/bridge.js.map +1 -1
- package/lib/mcp-client/connection.d.ts.map +1 -1
- package/lib/mcp-client/connection.js +37 -1
- package/lib/mcp-client/connection.js.map +1 -1
- package/lib/mcp-server/agent-mesh-tools.js +1 -1
- package/lib/mcp-server/agent-mesh-tools.js.map +1 -1
- package/lib/media/media-capabilities.d.ts.map +1 -1
- package/lib/media/media-capabilities.js +5 -7
- package/lib/media/media-capabilities.js.map +1 -1
- package/lib/media/resolve-config.d.ts.map +1 -1
- package/lib/media/resolve-config.js +5 -7
- package/lib/media/resolve-config.js.map +1 -1
- package/lib/memory-layers.d.ts.map +1 -1
- package/lib/memory-layers.js +10 -15
- package/lib/memory-layers.js.map +1 -1
- package/lib/orchestrator/agent-dispatcher.d.ts +1 -1
- package/lib/orchestrator/agent-dispatcher.d.ts.map +1 -1
- package/lib/orchestrator/owner-confirm-orchestration.d.ts +1 -1
- package/lib/orchestrator/owner-confirm-orchestration.d.ts.map +1 -1
- package/lib/orchestrator/owner-confirm-orchestration.js +3 -9
- package/lib/orchestrator/owner-confirm-orchestration.js.map +1 -1
- package/lib/orchestrator/remote-agent-registry.d.ts +1 -1
- package/lib/orchestrator/remote-agent-registry.d.ts.map +1 -1
- package/lib/plugin-ai-hook-bus.d.ts.map +1 -1
- package/lib/plugin-ai-hook-bus.js +2 -7
- package/lib/plugin-ai-hook-bus.js.map +1 -1
- package/lib/routing/runtime-binding.d.ts +1 -1
- package/lib/routing/runtime-binding.d.ts.map +1 -1
- package/lib/security/audit-logger.d.ts +1 -0
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +17 -7
- package/lib/security/audit-logger.js.map +1 -1
- package/lib/security/dangerous-tool-policy.d.ts +4 -0
- package/lib/security/dangerous-tool-policy.d.ts.map +1 -1
- package/lib/security/dangerous-tool-policy.js +46 -42
- package/lib/security/dangerous-tool-policy.js.map +1 -1
- package/lib/security/exec-policy.d.ts +1 -1
- package/lib/security/exec-policy.d.ts.map +1 -1
- package/lib/security/exec-policy.js +15 -3
- package/lib/security/exec-policy.js.map +1 -1
- package/lib/security/file-policy.d.ts +8 -0
- package/lib/security/file-policy.d.ts.map +1 -1
- package/lib/security/file-policy.js +48 -12
- package/lib/security/file-policy.js.map +1 -1
- package/lib/security/file-role-policy.d.ts +6 -3
- package/lib/security/file-role-policy.d.ts.map +1 -1
- package/lib/security/file-role-policy.js +29 -6
- package/lib/security/file-role-policy.js.map +1 -1
- package/lib/security/index.d.ts +3 -45
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +3 -66
- package/lib/security/index.js.map +1 -1
- package/lib/security/network-policy.d.ts +30 -87
- package/lib/security/network-policy.d.ts.map +1 -1
- package/lib/security/network-policy.js +133 -280
- package/lib/security/network-policy.js.map +1 -1
- package/lib/security/owner-approve-always-store.js +0 -1
- package/lib/security/owner-approve-always-store.js.map +1 -1
- package/lib/security/sandbox-docker.d.ts +28 -0
- package/lib/security/sandbox-docker.d.ts.map +1 -0
- package/lib/security/sandbox-docker.js +177 -0
- package/lib/security/sandbox-docker.js.map +1 -0
- package/lib/security/sandbox.d.ts +10 -0
- package/lib/security/sandbox.d.ts.map +1 -1
- package/lib/security/sandbox.js +152 -14
- package/lib/security/sandbox.js.map +1 -1
- package/lib/service.d.ts +4 -5
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +4 -12
- package/lib/service.js.map +1 -1
- package/lib/subagent.d.ts +7 -3
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +2 -2
- package/lib/subagent.js.map +1 -1
- package/lib/types/disposable.d.ts +5 -0
- package/lib/types/disposable.d.ts.map +1 -0
- package/lib/types/disposable.js +2 -0
- package/lib/types/disposable.js.map +1 -0
- package/lib/zhin-agent/agent-loop-standalone.d.ts +11 -0
- package/lib/zhin-agent/agent-loop-standalone.d.ts.map +1 -1
- package/lib/zhin-agent/agent-loop-standalone.js +26 -7
- package/lib/zhin-agent/agent-loop-standalone.js.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.d.ts.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.js +76 -9
- package/lib/zhin-agent/agent-loop-turn.js.map +1 -1
- package/lib/zhin-agent/agents-instruction.d.ts +15 -0
- package/lib/zhin-agent/agents-instruction.d.ts.map +1 -0
- package/lib/zhin-agent/agents-instruction.js +98 -0
- package/lib/zhin-agent/agents-instruction.js.map +1 -0
- package/lib/zhin-agent/builtin-tools.d.ts +1 -1
- package/lib/zhin-agent/builtin-tools.d.ts.map +1 -1
- package/lib/zhin-agent/compaction-runtime.d.ts.map +1 -1
- package/lib/zhin-agent/compaction-runtime.js +7 -1
- package/lib/zhin-agent/compaction-runtime.js.map +1 -1
- package/lib/zhin-agent/config.d.ts +53 -3
- package/lib/zhin-agent/config.d.ts.map +1 -1
- package/lib/zhin-agent/config.js +53 -2
- package/lib/zhin-agent/config.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +20 -16
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +108 -99
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/interfaces.d.ts +63 -0
- package/lib/zhin-agent/interfaces.d.ts.map +1 -0
- package/lib/zhin-agent/interfaces.js +8 -0
- package/lib/zhin-agent/interfaces.js.map +1 -0
- package/lib/zhin-agent/model-harness.js +1 -1
- package/lib/zhin-agent/phase-trace.d.ts +12 -1
- package/lib/zhin-agent/phase-trace.d.ts.map +1 -1
- package/lib/zhin-agent/phase-trace.js +25 -0
- package/lib/zhin-agent/phase-trace.js.map +1 -1
- package/lib/zhin-agent/prompt-assembly.d.ts +13 -4
- package/lib/zhin-agent/prompt-assembly.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-assembly.js +34 -8
- package/lib/zhin-agent/prompt-assembly.js.map +1 -1
- package/lib/zhin-agent/prompt-trace.d.ts +20 -0
- package/lib/zhin-agent/prompt-trace.d.ts.map +1 -0
- package/lib/zhin-agent/prompt-trace.js +72 -0
- package/lib/zhin-agent/prompt-trace.js.map +1 -0
- package/lib/zhin-agent/prompt.d.ts +25 -3
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +109 -46
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/session-io.d.ts +2 -2
- package/lib/zhin-agent/session-io.d.ts.map +1 -1
- package/lib/zhin-agent/session-io.js +2 -3
- package/lib/zhin-agent/session-io.js.map +1 -1
- package/lib/zhin-agent/task-continuation.d.ts +4 -4
- package/lib/zhin-agent/task-continuation.d.ts.map +1 -1
- package/lib/zhin-agent/task-continuation.js.map +1 -1
- package/lib/zhin-agent/tool-catalog.d.ts.map +1 -1
- package/lib/zhin-agent/tool-catalog.js +9 -1
- package/lib/zhin-agent/tool-catalog.js.map +1 -1
- package/lib/zhin-agent/turn-pipeline.d.ts.map +1 -1
- package/lib/zhin-agent/turn-pipeline.js +44 -11
- package/lib/zhin-agent/turn-pipeline.js.map +1 -1
- package/lib/zhin-agent/turn-user-message.d.ts +4 -1
- package/lib/zhin-agent/turn-user-message.d.ts.map +1 -1
- package/lib/zhin-agent/turn-user-message.js +39 -0
- package/lib/zhin-agent/turn-user-message.js.map +1 -1
- package/lib/zhin-agent/workspace-prompt.d.ts +10 -0
- package/lib/zhin-agent/workspace-prompt.d.ts.map +1 -0
- package/lib/zhin-agent/workspace-prompt.js +55 -0
- package/lib/zhin-agent/workspace-prompt.js.map +1 -0
- package/lib/zhin-agent/zhin-agent-private.d.ts +2 -0
- 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 +16 -6
- package/lib/monitoring/index.d.ts +0 -79
- package/lib/monitoring/index.d.ts.map +0 -1
- package/lib/monitoring/index.js +0 -197
- package/lib/monitoring/index.js.map +0 -1
- package/lib/monitoring/metrics.d.ts +0 -260
- package/lib/monitoring/metrics.d.ts.map +0 -1
- package/lib/monitoring/metrics.js +0 -550
- package/lib/monitoring/metrics.js.map +0 -1
- package/lib/security/budget-limiter.d.ts +0 -161
- package/lib/security/budget-limiter.d.ts.map +0 -1
- package/lib/security/budget-limiter.js +0 -392
- package/lib/security/budget-limiter.js.map +0 -1
- package/lib/security/security-config.example.d.ts +0 -33
- package/lib/security/security-config.example.d.ts.map +0 -1
- package/lib/security/security-config.example.js +0 -166
- package/lib/security/security-config.example.js.map +0 -1
|
@@ -3,7 +3,13 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { RateLimitConfig } from '@zhin.js/ai';
|
|
5
5
|
import { type QueueMode } from '@zhin.js/ai';
|
|
6
|
+
import type { AIProvider, AgentSessionStore, ContextRepository, IMSessionStore, ImTranscriptStore, MemoryAgentSessionStore, MemoryIMSessionStore, ModelRegistry, SessionManager } from '@zhin.js/ai';
|
|
7
|
+
import type { Plugin } from '@zhin.js/core';
|
|
6
8
|
import type { ModelHarnessConfig } from './model-harness.js';
|
|
9
|
+
import type { AgentOrchestrator } from '../orchestrator/index.js';
|
|
10
|
+
import type { SkillRegistry } from '../orchestrator/skill-registry.js';
|
|
11
|
+
import type { SubagentResultSender } from '../subagent.js';
|
|
12
|
+
import type { ResolvedAgentBinding } from '../config/types.js';
|
|
7
13
|
export type ModelSizeHint = 'small' | 'medium' | 'large';
|
|
8
14
|
export type ExecApprovalMode = 'ask' | 'allow' | 'deny';
|
|
9
15
|
/**
|
|
@@ -83,6 +89,16 @@ export interface ZhinAgentConfig {
|
|
|
83
89
|
modelHarness?: ModelHarnessConfig;
|
|
84
90
|
/** 输出回合 phase 观测日志(或通过 ZHIN_AGENT_PHASE_TRACE 环境变量开启) */
|
|
85
91
|
phaseTrace?: boolean;
|
|
92
|
+
/** 记录发往 LLM 的提示词规模分段(或通过 ZHIN_AGENT_PROMPT_TRACE;默认随 phaseTrace 开启) */
|
|
93
|
+
promptTrace?: boolean;
|
|
94
|
+
/** promptTrace 时输出 system 首尾预览(或 ZHIN_AGENT_PROMPT_TRACE_VERBOSE) */
|
|
95
|
+
promptTraceVerbose?: boolean;
|
|
96
|
+
/** Provider prompt cache(anthropic / openai / openai-compatible);默认启用,仅显式 false 禁用 */
|
|
97
|
+
promptCache?: boolean;
|
|
98
|
+
/** OpenAI `prompt_cache_retention`(默认 in_memory;部分模型支持 24h) */
|
|
99
|
+
promptCacheRetention?: 'in_memory' | '24h';
|
|
100
|
+
/** OpenAI `prompt_cache_key` 前缀(默认 zhin) */
|
|
101
|
+
promptCacheKeyPrefix?: string;
|
|
86
102
|
/** phase 观测回调(测试或自定义遥测;与 phaseTrace 同时生效) */
|
|
87
103
|
onPhaseTrace?: (event: {
|
|
88
104
|
phase: string;
|
|
@@ -116,10 +132,10 @@ export interface ZhinAgentConfig {
|
|
|
116
132
|
deferredAutoContinueMaxDepth?: number;
|
|
117
133
|
}
|
|
118
134
|
/** 主 Agent 默认常驻编排工具(不含 activate_skill:执行一律经 Worker;文生图走 deferred) */
|
|
119
|
-
export declare const DEFAULT_ORCHESTRATOR_TOOLS: readonly ["tool_search", "
|
|
135
|
+
export declare const DEFAULT_ORCHESTRATOR_TOOLS: readonly ["tool_search", "run_deferred_task", "ask_user", "spawn_task"];
|
|
120
136
|
/** 硬编排 v1 追加的总监工具 */
|
|
121
137
|
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", "
|
|
138
|
+
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"];
|
|
123
139
|
/** 不进入主编排也不进入 deferred 目录 */
|
|
124
140
|
export declare const DEFERRED_CATALOG_EXCLUDED_TOOLS: readonly ["activate_skill", "install_skill"];
|
|
125
141
|
/** @deprecated 使用 DEFERRED_CATALOG_EXCLUDED_TOOLS */
|
|
@@ -127,12 +143,46 @@ export declare const TOOL_SEARCH_EXCLUDED_TOOLS: readonly ["activate_skill", "in
|
|
|
127
143
|
/** Deferred Worker 默认基础工具 */
|
|
128
144
|
export declare const DEFAULT_WORKER_BASE_TOOLS: readonly ["bash", "read_file", "web_search"];
|
|
129
145
|
/** @deprecated 使用 DEFAULT_ORCHESTRATOR_TOOLS */
|
|
130
|
-
export declare const DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS: readonly ["tool_search", "
|
|
146
|
+
export declare const DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS: readonly ["tool_search", "run_deferred_task", "ask_user", "spawn_task"];
|
|
131
147
|
/** @deprecated 使用 DEFAULT_WORKER_BASE_TOOLS */
|
|
132
148
|
export declare const DEFAULT_TOOL_SEARCH_WORKER_BASE_TOOLS: readonly ["bash", "read_file", "web_search"];
|
|
149
|
+
/** ZhinAgent 运行依赖(通过 setter 或 configure() 注入) */
|
|
150
|
+
export interface ZhinAgentDependencies {
|
|
151
|
+
skillRegistry: SkillRegistry;
|
|
152
|
+
orchestrator: AgentOrchestrator;
|
|
153
|
+
sessionManager: SessionManager;
|
|
154
|
+
imSessionStore: IMSessionStore | MemoryIMSessionStore;
|
|
155
|
+
agentSessionStore: AgentSessionStore | MemoryAgentSessionStore;
|
|
156
|
+
contextRepository: ContextRepository;
|
|
157
|
+
imTranscriptStore: ImTranscriptStore;
|
|
158
|
+
modelRegistry: ModelRegistry;
|
|
159
|
+
hostPlugin: Plugin;
|
|
160
|
+
providerResolver: (alias: string) => AIProvider;
|
|
161
|
+
activeBinding: ResolvedAgentBinding;
|
|
162
|
+
subagentSender: SubagentResultSender;
|
|
163
|
+
deferredResultSender: SubagentResultSender;
|
|
164
|
+
bootstrapContext: string;
|
|
165
|
+
activeSkillsContext: string;
|
|
166
|
+
skillsSummaryXML: string;
|
|
167
|
+
}
|
|
133
168
|
export declare const DEFAULT_CONFIG: Required<ZhinAgentConfig>;
|
|
134
169
|
/** `env` 参数主要用于测试注入,运行时默认读取 `process.env`。 */
|
|
135
170
|
export declare function isPhaseTraceEnabled(config: Required<ZhinAgentConfig>, env?: NodeJS.ProcessEnv): boolean;
|
|
171
|
+
/** 默认随 phaseTrace 开启;可单独用 `ZHIN_AGENT_PROMPT_TRACE` 或 `ai.agent.promptTrace` 控制。 */
|
|
172
|
+
export declare function isPromptTraceEnabled(config: Required<ZhinAgentConfig>, env?: NodeJS.ProcessEnv): boolean;
|
|
173
|
+
export declare function isPromptTraceVerbose(config: Required<ZhinAgentConfig>, env?: NodeJS.ProcessEnv): boolean;
|
|
174
|
+
/** Provider prompt cache:默认启用;`promptCache: false` 或 `ZHIN_AGENT_PROMPT_CACHE=0` 显式禁用。 */
|
|
175
|
+
export declare function isPromptCacheEnabled(config: Pick<ZhinAgentConfig, 'promptCache'>, modelSdk: string | undefined, env?: NodeJS.ProcessEnv): boolean;
|
|
176
|
+
export declare function buildAgentPromptCacheStreamOptions(config: Pick<ZhinAgentConfig, 'promptCache' | 'promptCacheRetention' | 'promptCacheKeyPrefix'>, parts: {
|
|
177
|
+
modelSdk: string | undefined;
|
|
178
|
+
provider: string;
|
|
179
|
+
modelId: string;
|
|
180
|
+
label: string;
|
|
181
|
+
}, env?: NodeJS.ProcessEnv): {
|
|
182
|
+
promptCache: boolean;
|
|
183
|
+
promptCacheKey?: string;
|
|
184
|
+
promptCacheRetention?: 'in_memory' | '24h';
|
|
185
|
+
};
|
|
136
186
|
/** run_deferred_task 外层超时:须覆盖 Worker 多轮 LLM + MCP(默认远高于 Agent 30s 工具超时) */
|
|
137
187
|
export declare function resolveDeferredTaskToolTimeout(config: Pick<Required<ZhinAgentConfig>, 'timeout' | 'subagentTurnWaitMs' | 'maxSubagentIterations'>): number;
|
|
138
188
|
/** Worker 内慢工具(MCP 等)默认超时 */
|
|
@@ -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;AACnD,OAAO,
|
|
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, DEFAULT_FOLLOW_UP_MODE, DEFAULT_STEERING_MODE } from '@zhin.js/ai';
|
|
4
|
+
import { DEFAULT_CONTEXT_TOKENS, DEFAULT_FOLLOW_UP_MODE, DEFAULT_STEERING_MODE, buildPromptCacheKey } 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
|
/**
|
|
@@ -50,7 +50,6 @@ export const KEYWORD_TRIGGERS = {
|
|
|
50
50
|
/** 主 Agent 默认常驻编排工具(不含 activate_skill:执行一律经 Worker;文生图走 deferred) */
|
|
51
51
|
export const DEFAULT_ORCHESTRATOR_TOOLS = [
|
|
52
52
|
'tool_search',
|
|
53
|
-
'web_search',
|
|
54
53
|
'run_deferred_task',
|
|
55
54
|
'ask_user',
|
|
56
55
|
'spawn_task',
|
|
@@ -122,6 +121,9 @@ export const DEFAULT_CONFIG = {
|
|
|
122
121
|
modelHarness: {},
|
|
123
122
|
phaseTrace: false,
|
|
124
123
|
onPhaseTrace: () => { },
|
|
124
|
+
promptTraceVerbose: false,
|
|
125
|
+
promptCacheRetention: 'in_memory',
|
|
126
|
+
promptCacheKeyPrefix: 'zhin',
|
|
125
127
|
deferredToolMaxResults: 8,
|
|
126
128
|
orchestratorTools: [...DEFAULT_ORCHESTRATOR_TOOLS],
|
|
127
129
|
workerBaseTools: [...DEFAULT_WORKER_BASE_TOOLS],
|
|
@@ -140,6 +142,55 @@ export function isPhaseTraceEnabled(config, env = process.env) {
|
|
|
140
142
|
const raw = env.ZHIN_AGENT_PHASE_TRACE?.trim().toLowerCase();
|
|
141
143
|
return !!raw && TRUE_VALUES.has(raw);
|
|
142
144
|
}
|
|
145
|
+
function envFlagEnabled(env, key) {
|
|
146
|
+
const raw = env[key]?.trim().toLowerCase();
|
|
147
|
+
return !!raw && TRUE_VALUES.has(raw);
|
|
148
|
+
}
|
|
149
|
+
/** 默认随 phaseTrace 开启;可单独用 `ZHIN_AGENT_PROMPT_TRACE` 或 `ai.agent.promptTrace` 控制。 */
|
|
150
|
+
export function isPromptTraceEnabled(config, env = process.env) {
|
|
151
|
+
if (config.promptTrace === true)
|
|
152
|
+
return true;
|
|
153
|
+
if (config.promptTrace === false) {
|
|
154
|
+
return envFlagEnabled(env, 'ZHIN_AGENT_PROMPT_TRACE');
|
|
155
|
+
}
|
|
156
|
+
if (envFlagEnabled(env, 'ZHIN_AGENT_PROMPT_TRACE'))
|
|
157
|
+
return true;
|
|
158
|
+
return isPhaseTraceEnabled(config, env);
|
|
159
|
+
}
|
|
160
|
+
export function isPromptTraceVerbose(config, env = process.env) {
|
|
161
|
+
if (config.promptTraceVerbose)
|
|
162
|
+
return true;
|
|
163
|
+
return envFlagEnabled(env, 'ZHIN_AGENT_PROMPT_TRACE_VERBOSE');
|
|
164
|
+
}
|
|
165
|
+
/** Provider prompt cache:默认启用;`promptCache: false` 或 `ZHIN_AGENT_PROMPT_CACHE=0` 显式禁用。 */
|
|
166
|
+
export function isPromptCacheEnabled(config, modelSdk, env = process.env) {
|
|
167
|
+
const supported = modelSdk === 'anthropic'
|
|
168
|
+
|| modelSdk === 'openai'
|
|
169
|
+
|| modelSdk === 'openai-compatible';
|
|
170
|
+
if (!supported)
|
|
171
|
+
return false;
|
|
172
|
+
if (config.promptCache === false)
|
|
173
|
+
return false;
|
|
174
|
+
const raw = env.ZHIN_AGENT_PROMPT_CACHE?.trim().toLowerCase();
|
|
175
|
+
if (raw && ['0', 'false', 'no', 'off'].includes(raw))
|
|
176
|
+
return false;
|
|
177
|
+
return true;
|
|
178
|
+
}
|
|
179
|
+
export function buildAgentPromptCacheStreamOptions(config, parts, env = process.env) {
|
|
180
|
+
const promptCache = isPromptCacheEnabled(config, parts.modelSdk, env);
|
|
181
|
+
if (!promptCache)
|
|
182
|
+
return { promptCache: false };
|
|
183
|
+
return {
|
|
184
|
+
promptCache: true,
|
|
185
|
+
promptCacheKey: buildPromptCacheKey({
|
|
186
|
+
prefix: config.promptCacheKeyPrefix ?? 'zhin',
|
|
187
|
+
label: parts.label,
|
|
188
|
+
provider: parts.provider,
|
|
189
|
+
modelId: parts.modelId,
|
|
190
|
+
}),
|
|
191
|
+
promptCacheRetention: config.promptCacheRetention ?? 'in_memory',
|
|
192
|
+
};
|
|
193
|
+
}
|
|
143
194
|
/** run_deferred_task 外层超时:须覆盖 Worker 多轮 LLM + MCP(默认远高于 Agent 30s 工具超时) */
|
|
144
195
|
export function resolveDeferredTaskToolTimeout(config) {
|
|
145
196
|
const turnMs = config.timeout ?? 60_000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,qBAAqB,EAAkB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,6 @@ import type { AIProvider, AgentTool, AgentMessage, ContentPart, ImageContent } f
|
|
|
20
20
|
import type { Tool, Message } from '../orchestrator/types.js';
|
|
21
21
|
import type { SkillRegistry } from '../orchestrator/skill-registry.js';
|
|
22
22
|
import type { AgentOrchestrator } from '../orchestrator/index.js';
|
|
23
|
-
import { type SessionManager } from '@zhin.js/ai';
|
|
24
|
-
import { MemoryAgentSessionStore, type AgentSessionStore, type ContextRepository, type IMSessionStore, type ImTranscriptStore } from '@zhin.js/ai';
|
|
25
23
|
import type { OutputElement } from '@zhin.js/ai';
|
|
26
24
|
import { type ZhinAgentTurnMetrics } from './turn-metrics.js';
|
|
27
25
|
import { TurnTracker } from './turn-tracker.js';
|
|
@@ -29,17 +27,19 @@ import { ZhinAgentEventEmitter } from './event-emitter.js';
|
|
|
29
27
|
import type { ModelRegistry } from '@zhin.js/ai';
|
|
30
28
|
import { UserProfileStore } from '../user-profile.js';
|
|
31
29
|
import { SubagentManager, type SubagentOrigin, type SubagentResultSender } from '../subagent.js';
|
|
32
|
-
import { type ZhinAgentConfig, type OnChunkCallback } from './config.js';
|
|
30
|
+
import { type ZhinAgentConfig, type OnChunkCallback, type ZhinAgentDependencies } from './config.js';
|
|
33
31
|
import type { ResolvedAgentBinding } from '../config/types.js';
|
|
34
32
|
import type { DeferredWorkerResult } from '../deferred-worker-runner.js';
|
|
35
33
|
export type { ZhinAgentConfig, OnChunkCallback } from './config.js';
|
|
34
|
+
export type { IAgentTurnProcessor, IAgentSessionManager, IAgentDiagnostics, IAgentConfigurator } from './interfaces.js';
|
|
36
35
|
export type { ZhinAgentTurnMetrics, ZhinAgentTurnPath } from './turn-metrics.js';
|
|
37
36
|
export { PromptAccessDeniedError } from './prompt-access.js';
|
|
38
37
|
export { formatAiHandlerCompleteLog, formatZhinAgentTurnUsage } from './turn-metrics.js';
|
|
39
38
|
export * from './prompt-builder.js';
|
|
40
39
|
export * from './prompt-templates.js';
|
|
41
40
|
export * from './task-continuation.js';
|
|
42
|
-
|
|
41
|
+
import type { IAgentTurnProcessor, IAgentSessionManager, IAgentDiagnostics, IAgentConfigurator } from './interfaces.js';
|
|
42
|
+
export declare class ZhinAgent implements IAgentTurnProcessor, IAgentSessionManager, IAgentDiagnostics, IAgentConfigurator {
|
|
43
43
|
private provider;
|
|
44
44
|
private providerResolver;
|
|
45
45
|
private activeBinding;
|
|
@@ -61,6 +61,8 @@ export declare class ZhinAgent {
|
|
|
61
61
|
private skillsSummaryXML;
|
|
62
62
|
private modelRegistry;
|
|
63
63
|
private phaseTraceEnabled;
|
|
64
|
+
private promptTraceEnabled;
|
|
65
|
+
private promptTraceVerbose;
|
|
64
66
|
private readonly emitter;
|
|
65
67
|
private deferredCatalog;
|
|
66
68
|
private readonly deferredWorkerRunner;
|
|
@@ -73,22 +75,25 @@ export declare class ZhinAgent {
|
|
|
73
75
|
private resolveMemoryPersistenceReady;
|
|
74
76
|
private memoryPersistenceDone;
|
|
75
77
|
private get phaseConfig();
|
|
78
|
+
private get promptTraceConfig();
|
|
76
79
|
constructor(provider: AIProvider, config?: ZhinAgentConfig);
|
|
80
|
+
/**
|
|
81
|
+
* 统一依赖注入入口。替代逐字段 setter。
|
|
82
|
+
* 所有 setter 现委托到此方法;新代码优先使用 configure()。
|
|
83
|
+
*/
|
|
84
|
+
configure(deps: Partial<ZhinAgentDependencies>): void;
|
|
85
|
+
/** @deprecated 使用 configure({ skillRegistry }) */
|
|
77
86
|
setSkillRegistry(registry: SkillRegistry): void;
|
|
87
|
+
/** @deprecated 使用 configure({ orchestrator }) */
|
|
78
88
|
setOrchestrator(orchestrator: AgentOrchestrator): void;
|
|
79
|
-
|
|
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;
|
|
89
|
+
/** @deprecated 使用 configure({ modelRegistry }) */
|
|
87
90
|
setModelRegistry(registry: ModelRegistry): void;
|
|
91
|
+
/** @deprecated 使用 configure({ hostPlugin }) */
|
|
88
92
|
setHostPlugin(plugin: Plugin): void;
|
|
93
|
+
/** @deprecated 使用 configure({ providerResolver }) */
|
|
89
94
|
setProviderResolver(resolver: (alias: string) => AIProvider): void;
|
|
90
95
|
private wireLlmApiLayer;
|
|
91
|
-
/**
|
|
96
|
+
/** @deprecated 使用 configure({ activeBinding }) */
|
|
92
97
|
setActiveBinding(binding: ResolvedAgentBinding | null): void;
|
|
93
98
|
getActiveBinding(): ResolvedAgentBinding | null;
|
|
94
99
|
getTurnProvider(): AIProvider;
|
|
@@ -99,7 +104,9 @@ export declare class ZhinAgent {
|
|
|
99
104
|
markMemoryPersistenceReady(): void;
|
|
100
105
|
upgradeProfilesToDatabase(model: any): void;
|
|
101
106
|
initSubagentManager(createTools: () => AgentTool[]): void;
|
|
107
|
+
/** @deprecated 使用 configure({ subagentSender }) */
|
|
102
108
|
setSubagentSender(sender: SubagentResultSender): void;
|
|
109
|
+
/** @deprecated 使用 configure({ deferredResultSender }) */
|
|
103
110
|
setDeferredResultSender(sender: SubagentResultSender): void;
|
|
104
111
|
getDeferredResultSender(): SubagentResultSender | null;
|
|
105
112
|
getDeferredAutoContinueDepth(sessionKey: string): number;
|
|
@@ -113,9 +120,6 @@ export declare class ZhinAgent {
|
|
|
113
120
|
getEventEmitter(): ZhinAgentEventEmitter;
|
|
114
121
|
getUserProfiles(): UserProfileStore;
|
|
115
122
|
registerTool(tool: AgentTool): () => void;
|
|
116
|
-
setBootstrapContext(context: string): void;
|
|
117
|
-
setActiveSkillsContext(content: string): void;
|
|
118
|
-
setSkillsSummaryXML(xml: string): void;
|
|
119
123
|
getLastTurnMetrics(): ZhinAgentTurnMetrics | null;
|
|
120
124
|
private beginActiveTurn;
|
|
121
125
|
private finalizeActiveTurn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EACT,YAAY,EACZ,WAAW,EACX,YAAY,EAGb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/index.ts"],"names":[],"mappings":"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"}
|
package/lib/zhin-agent/index.js
CHANGED
|
@@ -16,10 +16,9 @@
|
|
|
16
16
|
* 12. 多模态输入:图片/音频直接传给视觉模型
|
|
17
17
|
*/
|
|
18
18
|
import { randomUUID } from 'node:crypto';
|
|
19
|
-
import { getPlugin } from '@zhin.js/core';
|
|
20
19
|
import { formatCompact, Logger } from '@zhin.js/logger';
|
|
21
20
|
import { createMemorySessionManager, resolveIMSessionIdFromMessage, } from '@zhin.js/ai';
|
|
22
|
-
import { ConversationMemory, createMemoryContextRepository, MemoryIMSessionStore, MemoryImTranscriptStore, getModel, registerLlmApiFromProviders,
|
|
21
|
+
import { ConversationMemory, createMemoryContextRepository, MemoryIMSessionStore, MemoryImTranscriptStore, getModel, registerLlmApiFromProviders, sdkEntryFromProvider, } from '@zhin.js/ai';
|
|
23
22
|
import { TurnTracker } from './turn-tracker.js';
|
|
24
23
|
import { ZhinAgentEventEmitter } from './event-emitter.js';
|
|
25
24
|
import { UserProfileStore } from '../user-profile.js';
|
|
@@ -27,7 +26,7 @@ import { RateLimiter } from '@zhin.js/ai';
|
|
|
27
26
|
import { SubagentManager } from '../subagent.js';
|
|
28
27
|
import { buildParentContextPreamble } from '../subagent-parent-context.js';
|
|
29
28
|
import { getAgentDispatcher } from '../orchestrator/agent-dispatcher.js';
|
|
30
|
-
import { DEFAULT_CONFIG, isPhaseTraceEnabled, } from './config.js';
|
|
29
|
+
import { DEFAULT_CONFIG, isPhaseTraceEnabled, isPromptTraceEnabled, isPromptTraceVerbose, } from './config.js';
|
|
31
30
|
import { DeferredWorkerRunner } from '../deferred-worker-runner.js';
|
|
32
31
|
import { deliverDeferredAutoContinueReply } from './deferred-delivery.js';
|
|
33
32
|
import { processTextTurn, processMultimodalTurn } from './turn-pipeline.js';
|
|
@@ -74,6 +73,8 @@ export class ZhinAgent {
|
|
|
74
73
|
skillsSummaryXML = '';
|
|
75
74
|
modelRegistry = null;
|
|
76
75
|
phaseTraceEnabled;
|
|
76
|
+
promptTraceEnabled;
|
|
77
|
+
promptTraceVerbose;
|
|
77
78
|
emitter = new ZhinAgentEventEmitter();
|
|
78
79
|
deferredCatalog = [];
|
|
79
80
|
deferredWorkerRunner = new DeferredWorkerRunner();
|
|
@@ -88,10 +89,18 @@ export class ZhinAgent {
|
|
|
88
89
|
get phaseConfig() {
|
|
89
90
|
return { phaseTraceEnabled: this.phaseTraceEnabled, onPhaseTrace: this.config.onPhaseTrace };
|
|
90
91
|
}
|
|
92
|
+
get promptTraceConfig() {
|
|
93
|
+
return {
|
|
94
|
+
promptTraceEnabled: this.promptTraceEnabled,
|
|
95
|
+
promptTraceVerbose: this.promptTraceVerbose,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
91
98
|
constructor(provider, config) {
|
|
92
99
|
this.provider = provider;
|
|
93
100
|
this.config = { ...DEFAULT_CONFIG, ...config };
|
|
94
101
|
this.phaseTraceEnabled = isPhaseTraceEnabled(this.config);
|
|
102
|
+
this.promptTraceEnabled = isPromptTraceEnabled(this.config);
|
|
103
|
+
this.promptTraceVerbose = isPromptTraceVerbose(this.config);
|
|
95
104
|
this.memoryPersistenceReady = new Promise((resolve) => {
|
|
96
105
|
this.resolveMemoryPersistenceReady = resolve;
|
|
97
106
|
});
|
|
@@ -116,73 +125,85 @@ export class ZhinAgent {
|
|
|
116
125
|
// DB 注入完成前由 waitForMemoryPersistence 等待;useDatabase:false 时由 bootstrap 立即 mark
|
|
117
126
|
}
|
|
118
127
|
// ── DI setters ──────────────────────────────────────────────────────
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
128
|
+
/**
|
|
129
|
+
* 统一依赖注入入口。替代逐字段 setter。
|
|
130
|
+
* 所有 setter 现委托到此方法;新代码优先使用 configure()。
|
|
131
|
+
*/
|
|
132
|
+
configure(deps) {
|
|
133
|
+
if (deps.skillRegistry !== undefined) {
|
|
134
|
+
this.skillRegistry = deps.skillRegistry;
|
|
135
|
+
logger.debug(`SkillRegistry connected (${deps.skillRegistry.size} skills)`);
|
|
136
|
+
}
|
|
137
|
+
if (deps.orchestrator !== undefined) {
|
|
138
|
+
this.orchestrator = deps.orchestrator;
|
|
139
|
+
logger.debug('AgentOrchestrator connected for MCP and resources');
|
|
140
|
+
}
|
|
141
|
+
if (deps.sessionManager !== undefined) {
|
|
142
|
+
this.sessions.dispose();
|
|
143
|
+
this.sessions = deps.sessionManager;
|
|
144
|
+
}
|
|
145
|
+
if (deps.imSessionStore !== undefined)
|
|
146
|
+
this.imSessionStore = deps.imSessionStore;
|
|
147
|
+
if (deps.agentSessionStore !== undefined)
|
|
148
|
+
this.agentSessionStore = deps.agentSessionStore;
|
|
149
|
+
if (deps.contextRepository !== undefined)
|
|
150
|
+
this.contextRepository = deps.contextRepository;
|
|
151
|
+
if (deps.imTranscriptStore !== undefined)
|
|
152
|
+
this.imTranscriptStore = deps.imTranscriptStore;
|
|
153
|
+
if (deps.modelRegistry !== undefined) {
|
|
154
|
+
this.modelRegistry = deps.modelRegistry;
|
|
155
|
+
this.subagentManager?.setModelRegistry(deps.modelRegistry);
|
|
156
|
+
}
|
|
157
|
+
if (deps.hostPlugin !== undefined)
|
|
158
|
+
this.emitter.setHostPlugin(deps.hostPlugin);
|
|
159
|
+
if (deps.providerResolver !== undefined) {
|
|
160
|
+
this.providerResolver = deps.providerResolver;
|
|
161
|
+
this.wireLlmApiLayer();
|
|
162
|
+
}
|
|
163
|
+
if (deps.activeBinding !== undefined) {
|
|
164
|
+
this.activeBinding = deps.activeBinding;
|
|
165
|
+
if (deps.activeBinding) {
|
|
166
|
+
const patch = bindingToModelConfig(deps.activeBinding);
|
|
167
|
+
this.config = { ...this.config, ...patch };
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (deps.subagentSender !== undefined) {
|
|
171
|
+
this.subagentManager?.setSender(deps.subagentSender);
|
|
172
|
+
}
|
|
173
|
+
if (deps.deferredResultSender !== undefined)
|
|
174
|
+
this.deferredResultSender = deps.deferredResultSender;
|
|
175
|
+
if (deps.bootstrapContext !== undefined) {
|
|
176
|
+
this.bootstrapContext = deps.bootstrapContext;
|
|
177
|
+
logger.debug(`Bootstrap context set (${deps.bootstrapContext.length} chars)`);
|
|
178
|
+
}
|
|
179
|
+
if (deps.activeSkillsContext !== undefined)
|
|
180
|
+
this.activeSkillsContext = deps.activeSkillsContext || '';
|
|
181
|
+
if (deps.skillsSummaryXML !== undefined)
|
|
182
|
+
this.skillsSummaryXML = deps.skillsSummaryXML || '';
|
|
183
|
+
}
|
|
184
|
+
/** @deprecated 使用 configure({ skillRegistry }) */
|
|
185
|
+
setSkillRegistry(registry) { this.configure({ skillRegistry: registry }); }
|
|
186
|
+
/** @deprecated 使用 configure({ orchestrator }) */
|
|
187
|
+
setOrchestrator(orchestrator) { this.configure({ orchestrator }); }
|
|
188
|
+
/** @deprecated 使用 configure({ modelRegistry }) */
|
|
189
|
+
setModelRegistry(registry) { this.configure({ modelRegistry: registry }); }
|
|
190
|
+
/** @deprecated 使用 configure({ hostPlugin }) */
|
|
191
|
+
setHostPlugin(plugin) { this.configure({ hostPlugin: plugin }); }
|
|
192
|
+
/** @deprecated 使用 configure({ providerResolver }) */
|
|
193
|
+
setProviderResolver(resolver) { this.configure({ providerResolver: resolver }); }
|
|
163
194
|
wireLlmApiLayer() {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
registerLlmApiFromProviders([{
|
|
171
|
-
alias: this.provider.name,
|
|
172
|
-
provider: this.provider,
|
|
173
|
-
config: { api: 'openai-completions' },
|
|
174
|
-
models: [],
|
|
175
|
-
}], resolve);
|
|
176
|
-
}
|
|
177
|
-
/** 入站回合注入 ai.agents.<name> 绑定(zhin 或其它 route 摘要路径) */
|
|
195
|
+
registerLlmApiFromProviders([sdkEntryFromProvider(this.provider)], (alias) => {
|
|
196
|
+
const p = alias === this.provider.name ? this.provider : this.providerResolver?.(alias);
|
|
197
|
+
return p?.models ?? [];
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
/** @deprecated 使用 configure({ activeBinding }) */
|
|
178
201
|
setActiveBinding(binding) {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
...patch,
|
|
185
|
-
};
|
|
202
|
+
if (binding === null) {
|
|
203
|
+
this.activeBinding = null;
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
this.configure({ activeBinding: binding });
|
|
186
207
|
}
|
|
187
208
|
}
|
|
188
209
|
getActiveBinding() {
|
|
@@ -273,14 +294,10 @@ export class ZhinAgent {
|
|
|
273
294
|
});
|
|
274
295
|
logger.debug('SubagentManager initialized');
|
|
275
296
|
}
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
}
|
|
281
|
-
setDeferredResultSender(sender) {
|
|
282
|
-
this.deferredResultSender = sender;
|
|
283
|
-
}
|
|
297
|
+
/** @deprecated 使用 configure({ subagentSender }) */
|
|
298
|
+
setSubagentSender(sender) { this.configure({ subagentSender: sender }); }
|
|
299
|
+
/** @deprecated 使用 configure({ deferredResultSender }) */
|
|
300
|
+
setDeferredResultSender(sender) { this.configure({ deferredResultSender: sender }); }
|
|
284
301
|
getDeferredResultSender() {
|
|
285
302
|
return this.deferredResultSender;
|
|
286
303
|
}
|
|
@@ -346,16 +363,6 @@ export class ZhinAgent {
|
|
|
346
363
|
this.externalTools.set(tool.name, tool);
|
|
347
364
|
return () => { this.externalTools.delete(tool.name); };
|
|
348
365
|
}
|
|
349
|
-
setBootstrapContext(context) {
|
|
350
|
-
this.bootstrapContext = context;
|
|
351
|
-
logger.debug(`Bootstrap context set (${context.length} chars)`);
|
|
352
|
-
}
|
|
353
|
-
setActiveSkillsContext(content) {
|
|
354
|
-
this.activeSkillsContext = content || '';
|
|
355
|
-
}
|
|
356
|
-
setSkillsSummaryXML(xml) {
|
|
357
|
-
this.skillsSummaryXML = xml || '';
|
|
358
|
-
}
|
|
359
366
|
getLastTurnMetrics() {
|
|
360
367
|
return this.lastTurnMetrics;
|
|
361
368
|
}
|
|
@@ -391,8 +398,11 @@ export class ZhinAgent {
|
|
|
391
398
|
}
|
|
392
399
|
// ── prompt() / steer / followUp (ADR 0009 D6) ─────────────────────
|
|
393
400
|
assertMasterForPromptControl(commMessage) {
|
|
401
|
+
const plugin = this.emitter.getHostPlugin();
|
|
402
|
+
if (!plugin) {
|
|
403
|
+
throw new PromptAccessDeniedError('steer/followUp 需要有效的 master 上下文');
|
|
404
|
+
}
|
|
394
405
|
try {
|
|
395
|
-
const plugin = getPlugin().root ?? getPlugin();
|
|
396
406
|
const role = resolveToolRequesterRole(plugin, commMessage);
|
|
397
407
|
if (role !== 'master') {
|
|
398
408
|
throw new PromptAccessDeniedError('steer/followUp 仅 master 可用');
|
|
@@ -523,21 +533,20 @@ export class ZhinAgent {
|
|
|
523
533
|
if (this.promptController) {
|
|
524
534
|
this.promptController.abort();
|
|
525
535
|
}
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
}
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
this.imTranscriptStore.dispose();
|
|
537
|
-
}
|
|
536
|
+
// 使用 Disposable 接口统一清理资源(运行时 has-dispose 检查)
|
|
537
|
+
const tryDispose = (obj) => {
|
|
538
|
+
if (obj && typeof obj.dispose === 'function') {
|
|
539
|
+
obj.dispose?.();
|
|
540
|
+
}
|
|
541
|
+
};
|
|
542
|
+
tryDispose(this.imSessionStore);
|
|
543
|
+
tryDispose(this.agentSessionStore);
|
|
544
|
+
tryDispose(this.contextRepository);
|
|
545
|
+
tryDispose(this.imTranscriptStore);
|
|
538
546
|
this.deferredAutoContinueDepthBySession.clear();
|
|
539
547
|
this.deferredCatalog = [];
|
|
540
548
|
this.lastTurnMetrics = null;
|
|
549
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- disposed, fields intentionally nulled
|
|
541
550
|
this.provider = null;
|
|
542
551
|
this.providerResolver = null;
|
|
543
552
|
this.skillRegistry = null;
|