@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
package/lib/builtin-tools.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ export interface BuiltinToolsOptions {
|
|
|
17
17
|
plugin: Plugin;
|
|
18
18
|
/** L4 语义记忆:注册 memory_search / memory_upsert */
|
|
19
19
|
semanticMemory?: boolean;
|
|
20
|
+
/** 知识库目录(注册 knowledge_search 工具) */
|
|
21
|
+
knowledgeDir?: string;
|
|
20
22
|
/** Max chars for skill instruction extraction (model-size-aware) */
|
|
21
23
|
skillInstructionMaxChars?: number;
|
|
22
24
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../src/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../src/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAqBvD,MAAM,WAAW,mBAAmB;IAClC,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC1C;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACxD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE,CA2C5E"}
|
package/lib/builtin-tools.js
CHANGED
|
@@ -29,6 +29,7 @@ import { createAskUserTool } from './builtin/ask-user-tool.js';
|
|
|
29
29
|
import { createAnalyzeMediaTool } from './builtin/analyze-media-tool.js';
|
|
30
30
|
import { createMemorySearchTool } from './builtin/memory-search-tool.js';
|
|
31
31
|
import { createMemoryUpsertTool } from './builtin/memory-upsert-tool.js';
|
|
32
|
+
import { createKnowledgeSearchTool } from './builtin/knowledge-search-tool.js';
|
|
32
33
|
/**
|
|
33
34
|
* 创建所有内置系统工具
|
|
34
35
|
*/
|
|
@@ -46,7 +47,7 @@ export function createBuiltinTools(options) {
|
|
|
46
47
|
tools.push(createListDirTool());
|
|
47
48
|
tools.push(createGlobTool());
|
|
48
49
|
tools.push(createGrepTool());
|
|
49
|
-
tools.push(createBashTool());
|
|
50
|
+
tools.push(createBashTool(pluginRef.root ?? pluginRef));
|
|
50
51
|
tools.push(createWebSearchTool());
|
|
51
52
|
tools.push(createWebFetchTool());
|
|
52
53
|
tools.push(createTodoReadTool(DATA_DIR));
|
|
@@ -62,6 +63,9 @@ export function createBuiltinTools(options) {
|
|
|
62
63
|
tools.push(createMemorySearchTool());
|
|
63
64
|
tools.push(createMemoryUpsertTool());
|
|
64
65
|
}
|
|
66
|
+
if (options?.knowledgeDir) {
|
|
67
|
+
tools.push(createKnowledgeSearchTool({ knowledgeDir: options.knowledgeDir }));
|
|
68
|
+
}
|
|
65
69
|
return tools;
|
|
66
70
|
}
|
|
67
71
|
//# sourceMappingURL=builtin-tools.js.map
|
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;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/fix-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"fix-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/fix-ai-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACjD;IAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CA0E9D"}
|
|
@@ -53,7 +53,7 @@ export function applyAiConfigFixes(ai) {
|
|
|
53
53
|
fixes.push('removed deprecated ai.memoryMcp');
|
|
54
54
|
}
|
|
55
55
|
if (hadDriver)
|
|
56
|
-
fixes.push('migrated ai.providers.*.driver to
|
|
56
|
+
fixes.push('migrated ai.providers.*.driver to sdk');
|
|
57
57
|
const context = next.context;
|
|
58
58
|
if (context && typeof context === 'object' && !Array.isArray(context)) {
|
|
59
59
|
const ctx = { ...context };
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import type { AIConfig } from '@zhin.js/
|
|
1
|
+
import type { AIConfig } from '@zhin.js/ai';
|
|
2
2
|
import type { AgentBindingConfig, ProviderInstanceConfig } from './types.js';
|
|
3
|
-
/** Normalize
|
|
3
|
+
/** Normalize provider entry to required `sdk` (ADR 0018). Rejects api/preset/spec. */
|
|
4
4
|
export declare function normalizeProviderEntry(alias: string, cfg: ProviderInstanceConfig & {
|
|
5
5
|
driver?: string;
|
|
6
|
+
api?: string;
|
|
7
|
+
preset?: string;
|
|
8
|
+
spec?: string;
|
|
6
9
|
}): ProviderInstanceConfig;
|
|
7
10
|
export interface NormalizedAiRoutingConfig {
|
|
8
11
|
providers: Record<string, ProviderInstanceConfig>;
|
|
@@ -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,
|
|
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,aAAa,CAAC;AAE5D,OAAO,KAAK,EACV,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAqCpB,sFAAsF;AACtF,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,sBAAsB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9F,sBAAsB,CA4BxB;AAiCD,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,22 +1,62 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isSdkId } from '@zhin.js/ai';
|
|
2
2
|
import { DEFAULT_ZHIN_AGENT_NAME } from './types.js';
|
|
3
3
|
const LEGACY_DRIVER_KEYS = new Set([
|
|
4
4
|
'openai', 'anthropic', 'deepseek', 'moonshot', 'zhipu', 'google', 'gemini', 'ollama', 'cloudflare',
|
|
5
5
|
]);
|
|
6
|
+
/** Map legacy driver names to sdk ids (hard break: api/preset/spec are rejected). */
|
|
7
|
+
const DRIVER_TO_SDK = {
|
|
8
|
+
openai: 'openai',
|
|
9
|
+
anthropic: 'anthropic',
|
|
10
|
+
deepseek: 'deepseek',
|
|
11
|
+
moonshot: 'openai-compatible',
|
|
12
|
+
zhipu: 'openai-compatible',
|
|
13
|
+
google: 'google',
|
|
14
|
+
gemini: 'google',
|
|
15
|
+
ollama: 'ollama',
|
|
16
|
+
cloudflare: 'openai-compatible',
|
|
17
|
+
};
|
|
6
18
|
function isNamedProviderShape(providers) {
|
|
7
19
|
if (!providers || typeof providers !== 'object' || Array.isArray(providers))
|
|
8
20
|
return false;
|
|
9
21
|
const first = Object.values(providers)[0];
|
|
10
22
|
if (!first || typeof first !== 'object')
|
|
11
23
|
return false;
|
|
12
|
-
return '
|
|
24
|
+
return 'sdk' in first || 'driver' in first || 'api' in first || 'preset' in first;
|
|
13
25
|
}
|
|
14
|
-
|
|
26
|
+
function inferSdkFromAlias(alias) {
|
|
27
|
+
const lower = alias.trim().toLowerCase();
|
|
28
|
+
if (DRIVER_TO_SDK[lower])
|
|
29
|
+
return DRIVER_TO_SDK[lower];
|
|
30
|
+
const head = lower.split(/[-_/]/)[0];
|
|
31
|
+
if (head && DRIVER_TO_SDK[head])
|
|
32
|
+
return DRIVER_TO_SDK[head];
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
/** Normalize provider entry to required `sdk` (ADR 0018). Rejects api/preset/spec. */
|
|
15
36
|
export function normalizeProviderEntry(alias, cfg) {
|
|
37
|
+
if (cfg.api?.trim() || cfg.preset?.trim() || cfg.spec?.trim()) {
|
|
38
|
+
throw new Error(`ai.providers.${alias}: "api", "preset", and "spec" are removed; use "sdk" instead (ADR 0018)`);
|
|
39
|
+
}
|
|
16
40
|
const legacyDriver = cfg.driver?.trim().toLowerCase();
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
41
|
+
const sdkRaw = cfg.sdk?.trim().toLowerCase()
|
|
42
|
+
|| (legacyDriver ? DRIVER_TO_SDK[legacyDriver] : undefined)
|
|
43
|
+
|| inferSdkFromAlias(alias);
|
|
44
|
+
if (!sdkRaw || !isSdkId(sdkRaw)) {
|
|
45
|
+
throw new Error(`ai.providers.${alias}: sdk is required (openai | anthropic | google | deepseek | ollama | openai-compatible)`);
|
|
46
|
+
}
|
|
47
|
+
const rest = { ...cfg };
|
|
48
|
+
delete rest.driver;
|
|
49
|
+
delete rest.api;
|
|
50
|
+
delete rest.preset;
|
|
51
|
+
delete rest.spec;
|
|
52
|
+
const normalized = { ...rest, sdk: sdkRaw };
|
|
53
|
+
if (typeof normalized.apiKey === 'string')
|
|
54
|
+
normalized.apiKey = normalized.apiKey.trim();
|
|
55
|
+
if (typeof normalized.baseUrl === 'string')
|
|
56
|
+
normalized.baseUrl = normalized.baseUrl.trim();
|
|
57
|
+
if (typeof normalized.host === 'string')
|
|
58
|
+
normalized.host = normalized.host.trim();
|
|
59
|
+
return normalized;
|
|
20
60
|
}
|
|
21
61
|
function normalizeLegacyProviders(legacy) {
|
|
22
62
|
const out = {};
|
|
@@ -24,7 +64,10 @@ function normalizeLegacyProviders(legacy) {
|
|
|
24
64
|
if (key === 'custom' || !cfg || typeof cfg !== 'object')
|
|
25
65
|
continue;
|
|
26
66
|
if (LEGACY_DRIVER_KEYS.has(key)) {
|
|
27
|
-
out[key] = normalizeProviderEntry(key, {
|
|
67
|
+
out[key] = normalizeProviderEntry(key, {
|
|
68
|
+
...cfg,
|
|
69
|
+
sdk: DRIVER_TO_SDK[key],
|
|
70
|
+
});
|
|
28
71
|
}
|
|
29
72
|
}
|
|
30
73
|
return out;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-ai-config.js","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"normalize-ai-config.js","sourceRoot":"","sources":["../../src/config/normalize-ai-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AIProvider } from '@zhin.js/
|
|
1
|
+
import type { AIProvider } from '@zhin.js/ai';
|
|
2
2
|
import type { ProviderInstanceConfig } from './types.js';
|
|
3
3
|
export declare function createProviderInstance(alias: string, raw: ProviderInstanceConfig): AIProvider | null;
|
|
4
4
|
export declare function registerProviderInstances(providers: Record<string, ProviderInstanceConfig> | undefined): Map<string, AIProvider>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-instance.d.ts","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"provider-instance.d.ts","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,sBAAsB,GAC1B,UAAU,GAAG,IAAI,CAEnB;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,GAAG,SAAS,GAC5D,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAQzB"}
|
|
@@ -1,55 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
const VENDOR_FACTORIES = {
|
|
3
|
-
openai: { factory: OpenAIProvider, requireApiKey: true },
|
|
4
|
-
anthropic: { factory: AnthropicProvider, requireApiKey: true },
|
|
5
|
-
deepseek: { factory: DeepSeekProvider, requireApiKey: true },
|
|
6
|
-
moonshot: { factory: MoonshotProvider, requireApiKey: true },
|
|
7
|
-
zhipu: { factory: ZhipuProvider, requireApiKey: true },
|
|
8
|
-
google: { factory: GoogleProvider, requireApiKey: true },
|
|
9
|
-
gemini: { factory: GoogleProvider, requireApiKey: true },
|
|
10
|
-
ollama: { factory: OllamaProvider, requireApiKey: false },
|
|
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
|
-
}
|
|
1
|
+
import { createSdkProviderAdapter } from '@zhin.js/ai';
|
|
33
2
|
export function createProviderInstance(alias, raw) {
|
|
34
|
-
|
|
35
|
-
const { api: _api, ...rest } = raw;
|
|
36
|
-
if (vendor === 'cloudflare') {
|
|
37
|
-
const cfg = rest;
|
|
38
|
-
if (!cfg.apiKey || !cfg.accountId)
|
|
39
|
-
return null;
|
|
40
|
-
const provider = new CloudflareProvider(cfg);
|
|
41
|
-
provider.name = alias;
|
|
42
|
-
return provider;
|
|
43
|
-
}
|
|
44
|
-
const entry = VENDOR_FACTORIES[vendor];
|
|
45
|
-
if (!entry)
|
|
46
|
-
return null;
|
|
47
|
-
const cfg = { ...rest };
|
|
48
|
-
if (entry.requireApiKey && !cfg.apiKey)
|
|
49
|
-
return null;
|
|
50
|
-
const provider = new entry.factory(cfg);
|
|
51
|
-
provider.name = alias;
|
|
52
|
-
return provider;
|
|
3
|
+
return createSdkProviderAdapter(alias, raw);
|
|
53
4
|
}
|
|
54
5
|
export function registerProviderInstances(providers) {
|
|
55
6
|
const map = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-instance.js","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider-instance.js","sourceRoot":"","sources":["../../src/config/provider-instance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAGvD,MAAM,UAAU,sBAAsB,CACpC,KAAa,EACb,GAA2B;IAE3B,OAAO,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,SAA6D;IAE7D,MAAM,GAAG,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC1C,IAAI,CAAC,SAAS;QAAE,OAAO,GAAG,CAAC;IAC3B,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACrD,MAAM,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/lib/config/types.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import type { ProviderConfig } from '@zhin.js/
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import type { ProviderConfig } from '@zhin.js/ai';
|
|
2
|
+
import type { SdkId } from '@zhin.js/ai';
|
|
3
|
+
import type { OllamaProviderConfig } from '@zhin.js/ai';
|
|
4
|
+
export type { SdkId };
|
|
5
|
+
export interface ProviderInstanceConfig extends ProviderConfig, OllamaProviderConfig {
|
|
6
|
+
/** AI SDK provider id (ADR 0018 closed table) */
|
|
7
|
+
sdk: SdkId;
|
|
8
|
+
/** Cloudflare Workers AI */
|
|
9
|
+
accountId?: string;
|
|
6
10
|
}
|
|
7
11
|
export interface RouteMatchConfig {
|
|
8
12
|
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,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,YAAY,EAAE,KAAK,EAAE,CAAC;AAEtB,MAAM,WAAW,sBAAuB,SAAQ,cAAc,EAAE,oBAAoB;IAClF,iDAAiD;IACjD,GAAG,EAAE,KAAK,CAAC;IACX,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,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":"AA6CA,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":"
|
|
1
|
+
{"version":3,"file":"validate-ai-config.d.ts","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAE1E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,yBAAyB,GAAG,MAAM,EAAE,CAqDhF"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
|
+
import { isSdkId } from '@zhin.js/ai';
|
|
1
2
|
import { DEFAULT_ZHIN_AGENT_NAME } from './types.js';
|
|
2
3
|
export function validateAiRoutingConfig(cfg) {
|
|
3
4
|
const errors = [];
|
|
4
5
|
for (const [alias, prov] of Object.entries(cfg.providers)) {
|
|
5
|
-
if (!prov.
|
|
6
|
-
errors.push(`ai.providers.${alias}:
|
|
6
|
+
if (!prov.sdk?.trim()) {
|
|
7
|
+
errors.push(`ai.providers.${alias}: sdk is required`);
|
|
8
|
+
}
|
|
9
|
+
else if (!isSdkId(prov.sdk.trim())) {
|
|
10
|
+
errors.push(`ai.providers.${alias}: invalid sdk "${prov.sdk}" (openai | anthropic | google | deepseek | ollama | openai-compatible)`);
|
|
11
|
+
}
|
|
12
|
+
if (prov.sdk === 'openai-compatible' && !prov.baseUrl?.trim() && !prov.accountId?.trim()) {
|
|
13
|
+
errors.push(`ai.providers.${alias}: openai-compatible requires baseUrl or accountId`);
|
|
14
|
+
}
|
|
15
|
+
if (prov.sdk === 'ollama' && !prov.host?.trim() && !prov.baseUrl?.trim()) {
|
|
16
|
+
errors.push(`ai.providers.${alias}: ollama requires host or baseUrl`);
|
|
7
17
|
}
|
|
8
18
|
}
|
|
9
19
|
if (!cfg.agents[DEFAULT_ZHIN_AGENT_NAME]) {
|
|
@@ -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,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"}
|
|
1
|
+
{"version":3,"file":"validate-ai-config.js","sourceRoot":"","sources":["../../src/config/validate-ai-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Programmatic SDK entry for standalone harness (ADR 0010 D6).
|
|
3
3
|
*/
|
|
4
|
-
import type { AIConfig } from '@zhin.js/
|
|
4
|
+
import type { AIConfig } from '@zhin.js/ai';
|
|
5
5
|
import { AIService, type CreateServiceAgentOptions, type ServiceAgentResult } from './service.js';
|
|
6
6
|
export interface CreateAgentSessionOptions {
|
|
7
7
|
config?: AIConfig;
|
|
@@ -1 +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,
|
|
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,aAAa,CAAC;AAC5C,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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AIProvider, AgentTool } from '@zhin.js/
|
|
1
|
+
import type { AIProvider, AgentTool } from '@zhin.js/ai';
|
|
2
2
|
import type { ToolCallRecord } from './zhin-agent/tool-calls-user-format.js';
|
|
3
3
|
import type { ModelRegistry } from '@zhin.js/ai';
|
|
4
4
|
import type { ZhinAgentConfig, ExecApprovalMode } from './zhin-agent/config.js';
|
|
@@ -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,
|
|
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,aAAa,CAAC;AASzD,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;AAMhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C,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,OAAO,CAAC;IAChB,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;CAyNhF"}
|
|
@@ -3,14 +3,17 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { Logger } from '@zhin.js/core';
|
|
5
5
|
import { formatCompact, formatCompactUsage, truncatePreview } from '@zhin.js/logger';
|
|
6
|
-
import { isOmittedToolSummary, sanitizeToolResult, stripHallucinatedToolCalls, } from '@zhin.js/ai';
|
|
6
|
+
import { isOmittedToolSummary, sanitizeToolResult, stripHallucinatedToolCalls, getModel, } from '@zhin.js/ai';
|
|
7
7
|
import { stripThinkBlocks } from './zhin-agent/text-sanitize.js';
|
|
8
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
|
-
import { resolveWorkerSlowToolTimeout } from './zhin-agent/config.js';
|
|
11
|
+
import { resolveWorkerSlowToolTimeout, isPromptTraceEnabled, isPromptTraceVerbose, isPhaseTraceEnabled, buildAgentPromptCacheStreamOptions } from './zhin-agent/config.js';
|
|
12
12
|
import { createOwnerOrchestratedToolResultTransform } from './orchestrator/owner-confirm-orchestration.js';
|
|
13
13
|
import { applyExecPolicyToTools } from './security/exec-policy.js';
|
|
14
|
+
import { logPromptComposition } from './zhin-agent/prompt-trace.js';
|
|
15
|
+
import { resolveWorkspacePrompt } from './zhin-agent/workspace-prompt.js';
|
|
16
|
+
import { resolveIMSessionIdFromMessage } from '@zhin.js/ai';
|
|
14
17
|
import { DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS } from './zhin-agent/config.js';
|
|
15
18
|
const logger = new Logger(null, 'DeferredWorker');
|
|
16
19
|
const ORCHESTRATOR_TOOL_SET = new Set(DEFAULT_TOOL_SEARCH_ORCHESTRATOR_TOOLS);
|
|
@@ -74,6 +77,7 @@ export class DeferredWorkerRunner {
|
|
|
74
77
|
}));
|
|
75
78
|
}
|
|
76
79
|
const model = provider.models[0];
|
|
80
|
+
const llmModel = getModel(provider.name, model);
|
|
77
81
|
const platformBody = await resolveAgentPromptMarkdown({
|
|
78
82
|
ctx: promptCtx,
|
|
79
83
|
config: execPolicyConfig,
|
|
@@ -81,18 +85,11 @@ export class DeferredWorkerRunner {
|
|
|
81
85
|
const platformBlock = platformBody.trim()
|
|
82
86
|
? `\n\n## Platform\n${platformBody.trim()}`
|
|
83
87
|
: '';
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
You execute a single delegated task using the tools provided. Reply with a concise factual summary when done.
|
|
88
|
+
const workerBody = resolveWorkspacePrompt('deferred-worker', llmModel.sdk);
|
|
89
|
+
const systemPrompt = `${workerBody.trim()}
|
|
87
90
|
|
|
88
91
|
## Task
|
|
89
|
-
${goal}${platformBlock}
|
|
90
|
-
|
|
91
|
-
## Rules
|
|
92
|
-
- Use tools to complete the task; do not describe steps without acting.
|
|
93
|
-
- Shell approval follows Worker/Task execApprovalMode configuration.
|
|
94
|
-
- If a tool fails, try an alternative once, then report honestly.
|
|
95
|
-
- Final answer: plain language summary for the orchestrator (no tool call syntax).`;
|
|
92
|
+
${goal}${platformBlock}`;
|
|
96
93
|
const maxIterations = options.maxIterations ?? execPolicyConfig?.maxSubagentIterations ?? 15;
|
|
97
94
|
logger.info(formatCompact({
|
|
98
95
|
worker: 'delegated',
|
|
@@ -107,6 +104,20 @@ ${goal}${platformBlock}
|
|
|
107
104
|
loadedToolNames,
|
|
108
105
|
});
|
|
109
106
|
try {
|
|
107
|
+
if (execPolicyConfig && isPromptTraceEnabled(execPolicyConfig)) {
|
|
108
|
+
logPromptComposition({
|
|
109
|
+
config: {
|
|
110
|
+
promptTraceEnabled: true,
|
|
111
|
+
promptTraceVerbose: isPromptTraceVerbose(execPolicyConfig),
|
|
112
|
+
},
|
|
113
|
+
sessionId: resolveIMSessionIdFromMessage(origin) ?? 'deferred',
|
|
114
|
+
label: 'deferred_worker',
|
|
115
|
+
systemPrompt,
|
|
116
|
+
historyMessages: [],
|
|
117
|
+
tools,
|
|
118
|
+
userPreview: goal,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
110
121
|
const result = await runAgentLoopStandaloneTurn({
|
|
111
122
|
provider,
|
|
112
123
|
model,
|
|
@@ -115,6 +126,22 @@ ${goal}${platformBlock}
|
|
|
115
126
|
userInput: goal,
|
|
116
127
|
maxIterations,
|
|
117
128
|
commMessage: origin,
|
|
129
|
+
...buildAgentPromptCacheStreamOptions(execPolicyConfig ?? {}, {
|
|
130
|
+
modelSdk: llmModel.sdk,
|
|
131
|
+
provider: provider.name,
|
|
132
|
+
modelId: model,
|
|
133
|
+
label: 'deferred_worker',
|
|
134
|
+
}),
|
|
135
|
+
iterationTrace: execPolicyConfig && isPhaseTraceEnabled(execPolicyConfig)
|
|
136
|
+
? {
|
|
137
|
+
config: {
|
|
138
|
+
phaseTraceEnabled: true,
|
|
139
|
+
onPhaseTrace: execPolicyConfig.onPhaseTrace,
|
|
140
|
+
},
|
|
141
|
+
sessionId: resolveIMSessionIdFromMessage(origin) ?? 'deferred',
|
|
142
|
+
label: 'deferred_worker',
|
|
143
|
+
}
|
|
144
|
+
: undefined,
|
|
118
145
|
transformToolResult: createOwnerOrchestratedToolResultTransform({
|
|
119
146
|
commMessage: origin,
|
|
120
147
|
disableHardOrchestration: true,
|
|
@@ -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,EACL,oBAAoB,EACpB,kBAAkB,EAClB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"deferred-worker-runner.js","sourceRoot":"","sources":["../src/deferred-worker-runner.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -4,24 +4,6 @@
|
|
|
4
4
|
* Provides AgentOrchestrator as the central registry for
|
|
5
5
|
* tools, skills, subagents, mcps, and hooks.
|
|
6
6
|
*/
|
|
7
|
-
export type { AIConfig, AIProvider, ChatMessage, ContentPart, AgentTool, AgentConfig, AgentResult, ToolResultTransformInput, ToolResultTransform, } from '@zhin.js/ai';
|
|
8
|
-
export { Agent, createAgent, formatToolTitle } from '@zhin.js/ai';
|
|
9
|
-
export type { AgentState, AgentEvents } from '@zhin.js/ai';
|
|
10
|
-
export { SessionManager, MemorySessionManager, DatabaseSessionManager, createMemorySessionManager, createDatabaseSessionManager, AI_SESSION_MODEL, } from '@zhin.js/ai';
|
|
11
|
-
export { ContextManager, createContextManager, CHAT_MESSAGE_MODEL, CONTEXT_SUMMARY_MODEL, } from '@zhin.js/ai';
|
|
12
|
-
export type { ContextConfig, MessageRecord } from '@zhin.js/ai';
|
|
13
|
-
export { ConversationMemory, AI_MESSAGE_MODEL, AI_SUMMARY_MODEL, } from '@zhin.js/ai';
|
|
14
|
-
export type { ConversationMemoryConfig } from '@zhin.js/ai';
|
|
15
|
-
export { RateLimiter } from '@zhin.js/ai';
|
|
16
|
-
export type { RateLimitConfig, RateLimitResult } from '@zhin.js/ai';
|
|
17
|
-
export { detectTone } from '@zhin.js/ai';
|
|
18
|
-
export type { Tone } from '@zhin.js/ai';
|
|
19
|
-
export { parseOutput, renderToPlainText, renderToSatori } from '@zhin.js/ai';
|
|
20
|
-
export type { OutputElement, TextElement, ImageElement, AudioElement, VideoElement, CardElement, FileElement, CardField, CardButton, } from '@zhin.js/ai';
|
|
21
|
-
export { MemoryStorageBackend, DatabaseStorageBackend, createSwappableBackend, } from '@zhin.js/ai';
|
|
22
|
-
export type { StorageBackend, DbModel } from '@zhin.js/ai';
|
|
23
|
-
export { estimateTokens, estimateMessagesTokens, splitMessagesByTokenShare, chunkMessagesByMaxTokens, computeAdaptiveChunkRatio, resolveContextWindowTokens, evaluateContextWindowGuard, summarizeWithFallback, summarizeInStages, pruneHistoryForContext, compactSession, DEFAULT_CONTEXT_TOKENS, } from '@zhin.js/ai';
|
|
24
|
-
export type { ContextWindowSource, ContextWindowInfo, ContextWindowGuardResult, PruneResult } from '@zhin.js/ai';
|
|
25
7
|
export { AIService } from './service.js';
|
|
26
8
|
export type { ServiceAgent, ServiceAgentResult, CreateServiceAgentOptions } from './service.js';
|
|
27
9
|
export { createAgentSession } from './create-agent-session.js';
|
|
@@ -38,6 +20,10 @@ export { ZHIN_NEEDS_OWNER_FIRST_LINE, OWNER_HARD_ORCHESTRATION_TOOLS, parseNeeds
|
|
|
38
20
|
export type { OwnerOrchestrationOptions } from './orchestrator/owner-confirm-orchestration.js';
|
|
39
21
|
export { buildRichSystemPrompt, buildLiteSystemPromptWithPlatform, buildContextHint, buildEnhancedPersona, buildUserMessageWithHistory, contentToText, describePromptSectionsForDebug, } from './zhin-agent/prompt.js';
|
|
40
22
|
export type { RichSystemPromptContext, PromptSectionDebugInfo } from './zhin-agent/prompt.js';
|
|
23
|
+
export { buildAgentsEnvelopeContext, collectAgentsInstructionChain, clearAgentsInstructionCache, } from './zhin-agent/agents-instruction.js';
|
|
24
|
+
export type { AgentsInstructionEntry } from './zhin-agent/agents-instruction.js';
|
|
25
|
+
export { resolveWorkspacePrompt, clearWorkspacePromptCache, } from './zhin-agent/workspace-prompt.js';
|
|
26
|
+
export type { WorkspacePromptRole } from './zhin-agent/workspace-prompt.js';
|
|
41
27
|
export { registerAgentPromptContributor, unregisterAgentPromptContributor, getAgentPromptContributor, clearAgentPromptContributors, resolveAgentPromptSections, resolveAgentPromptMarkdown, resolveDeferredToolsForPlatform, formatAgentPromptSectionsMarkdown, } from './agent-prompt/index.js';
|
|
42
28
|
export type { ResolveAgentPromptOptions } from './agent-prompt/index.js';
|
|
43
29
|
export { createImTranscriptHistoryTool, createUserProfileTool, createSpawnTaskTool } from './zhin-agent/builtin-tools.js';
|
|
@@ -81,7 +67,7 @@ export { getRemoteAgentRegistry, initRemoteAgentRegistry, } from './orchestrator
|
|
|
81
67
|
export { getRemoteTaskPoller, startRemoteTaskPoller, } from './orchestrator/remote-task-poller.js';
|
|
82
68
|
export { introspectionRestBindings, introspectionRestEndpoints, introspectionRestCommands, introspectionRestMcp, introspectionRestTools, } from './init/introspection-rest.js';
|
|
83
69
|
export type { IntrospectionJsonResponse } from './init/introspection-rest.js';
|
|
84
|
-
export { loadBootstrapFiles, buildContextFiles, buildBootstrapContextSection, loadSoulPersona, loadToolsGuide, loadAgentsMemory, clearBootstrapCache, getFileMemoryContext, } from './bootstrap.js';
|
|
70
|
+
export { loadBootstrapFiles, buildContextFiles, buildBootstrapContextSection, buildStableContextFiles, buildStableBootstrapSection, loadSoulPersona, loadToolsGuide, loadAgentsMemory, clearBootstrapCache, getFileMemoryContext, STABLE_BOOTSTRAP_FILENAMES, } from './bootstrap.js';
|
|
85
71
|
export type { BootstrapFile, ContextFile } from './bootstrap.js';
|
|
86
72
|
export { preprocessInboundMedia, publishOutboundElements, resolveMultimodalConfig, resolveOutboundCapabilities, INBOUND_MEDIA_PARTS_EXTRA_KEY, } from './media/index.js';
|
|
87
73
|
export type { MediaBinaryPayload, MultimodalConfig, OutboundMediaCapabilities } from './media/index.js';
|