@zhin.js/agent 0.3.0 → 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-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/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/web-fetch-tool.d.ts +1 -1
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +2 -25
- package/lib/builtin/web-fetch-tool.js.map +1 -1
- package/lib/builtin-tools.js +1 -1
- package/lib/builtin-tools.js.map +1 -1
- package/lib/config/fix-ai-config.js +1 -1
- package/lib/config/normalize-ai-config.d.ts +4 -1
- 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.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 +8 -4
- 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/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 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -1
- package/lib/index.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/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 +7 -5
- package/lib/init/register-builtin-tools.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-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/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/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/security/audit-logger.js +5 -5
- 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 +42 -40
- package/lib/security/dangerous-tool-policy.js.map +1 -1
- package/lib/security/exec-policy.d.ts.map +1 -1
- package/lib/security/exec-policy.js +8 -43
- 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 +28 -5
- package/lib/security/file-role-policy.js.map +1 -1
- package/lib/security/index.d.ts +2 -0
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +2 -0
- package/lib/security/index.js.map +1 -1
- package/lib/security/network-policy.d.ts +41 -0
- package/lib/security/network-policy.d.ts.map +1 -0
- package/lib/security/network-policy.js +158 -0
- package/lib/security/network-policy.js.map +1 -0
- package/lib/security/sandbox.d.ts +1 -0
- package/lib/security/sandbox.d.ts.map +1 -1
- package/lib/security/sandbox.js +7 -70
- package/lib/security/sandbox.js.map +1 -1
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +3 -4
- package/lib/service.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/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 +28 -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 +3 -0
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +31 -28
- package/lib/zhin-agent/index.js.map +1 -1
- 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 +11 -2
- 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 +23 -1
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +87 -44
- package/lib/zhin-agent/prompt.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 +17 -7
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
* Standalone agentLoop runner (subagent / deferred worker) — isolated memory context.
|
|
3
3
|
*/
|
|
4
4
|
import { formatCompact, Logger } from '@zhin.js/logger';
|
|
5
|
-
import { agentLoop, agentContextFrom, assistantText, createUserMessage, createMemoryContextRepository, getModel, convertLegacyTools, registerLlmApiFromProviders, } from '@zhin.js/ai';
|
|
5
|
+
import { agentLoop, agentContextFrom, assistantText, createUserMessage, createMemoryContextRepository, getModel, convertLegacyTools, registerLlmApiFromProviders, sdkEntryFromProvider, } from '@zhin.js/ai';
|
|
6
6
|
import { runWithCommMessage, runWithDirectAgentExecution } from '../security/comm-message-context.js';
|
|
7
7
|
import { sanitizeAssistantReply } from './text-sanitize.js';
|
|
8
8
|
import { formatToolCallsForUser } from './tool-calls-user-format.js';
|
|
9
9
|
import { buildVisionUserMessage, summarizeMultimodalParts } from './multimodal-message.js';
|
|
10
10
|
import { DEFAULT_MULTIMODAL_CONFIG } from '../media/media-types.js';
|
|
11
|
+
import { logAgentLoopIterationEnd } from './phase-trace.js';
|
|
11
12
|
const logger = new Logger(null, 'AgentLoopStandalone');
|
|
12
13
|
function tokenUsageToLegacy(usage) {
|
|
13
14
|
return {
|
|
@@ -40,12 +41,10 @@ async function buildUserMessages(input) {
|
|
|
40
41
|
return [user];
|
|
41
42
|
}
|
|
42
43
|
function ensureLlmApi(provider, resolveProvider) {
|
|
43
|
-
registerLlmApiFromProviders([{
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
models: provider.models,
|
|
48
|
-
}], (alias) => (alias === provider.name ? provider : resolveProvider?.(alias)));
|
|
44
|
+
registerLlmApiFromProviders([sdkEntryFromProvider(provider)], (alias) => {
|
|
45
|
+
const p = alias === provider.name ? provider : resolveProvider?.(alias);
|
|
46
|
+
return p?.models ?? [];
|
|
47
|
+
});
|
|
49
48
|
}
|
|
50
49
|
export async function runAgentLoopStandaloneTurn(input) {
|
|
51
50
|
const { provider, model, systemPrompt, tools, userInput, maxIterations, commMessage, transformToolResult, callbacks, signal, directExecution = true, } = input;
|
|
@@ -100,6 +99,11 @@ export async function runAgentLoopStandaloneTurn(input) {
|
|
|
100
99
|
const loopConfig = {
|
|
101
100
|
model: llmModel,
|
|
102
101
|
maxIterations,
|
|
102
|
+
streamOptions: {
|
|
103
|
+
promptCache: input.promptCache !== false,
|
|
104
|
+
promptCacheKey: input.promptCacheKey,
|
|
105
|
+
promptCacheRetention: input.promptCacheRetention,
|
|
106
|
+
},
|
|
103
107
|
convertToLlm: (messages) => messages,
|
|
104
108
|
beforeToolCall: async ({ toolCall }) => {
|
|
105
109
|
callbacks?.onToolCall?.(toolCall.name, toolCall.arguments);
|
|
@@ -118,6 +122,21 @@ export async function runAgentLoopStandaloneTurn(input) {
|
|
|
118
122
|
lastAssistantText = `Something went wrong: ${assistant.errorMessage}. Please try again or rephrase your request.`;
|
|
119
123
|
}
|
|
120
124
|
lastUsage = assistant.usage;
|
|
125
|
+
const trace = input.iterationTrace;
|
|
126
|
+
if (trace) {
|
|
127
|
+
const toolNames = assistant.content
|
|
128
|
+
.filter((b) => b.type === 'toolCall')
|
|
129
|
+
.map((b) => b.name)
|
|
130
|
+
.join(',');
|
|
131
|
+
logAgentLoopIterationEnd(trace.config, trace.sessionId, {
|
|
132
|
+
iteration: iterations,
|
|
133
|
+
model,
|
|
134
|
+
label: trace.label ?? 'standalone',
|
|
135
|
+
usage: assistant.usage,
|
|
136
|
+
stopReason: assistant.stopReason,
|
|
137
|
+
toolNames: toolNames || undefined,
|
|
138
|
+
});
|
|
139
|
+
}
|
|
121
140
|
}
|
|
122
141
|
if (event.type === 'agent_end') {
|
|
123
142
|
const userBatch = event.userMessages ?? promptMessages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop-standalone.js","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-standalone.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,6BAA6B,EAC7B,QAAQ,EACR,kBAAkB,EAClB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"agent-loop-standalone.js","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-standalone.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop-turn.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAOL,KAAK,YAAY,EAIlB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-loop-turn.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAOL,KAAK,YAAY,EAIlB,MAAM,aAAa,CAAC;AASrB,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AA0C1F,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,OAAO,aAAa,EAAE,iBAAiB,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,MAAM,yBAAyB,GAAG,mBAAmB,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAyFrF,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC,CAuBpC;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyRlG"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* agentLoop turn runner (ADR 0009) — used when ContextRepository is wired.
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
4
|
+
import { getHostRootPlugin } from '@zhin.js/core';
|
|
5
5
|
import { formatCompact, Logger } from '@zhin.js/logger';
|
|
6
6
|
import { agentLoop, agentContextFrom, assistantText, createUserMessage, getModel, convertLegacyTools, } from '@zhin.js/ai';
|
|
7
7
|
import { runWithCommMessage } from '../security/comm-message-context.js';
|
|
8
8
|
import { applyExecPolicyToTools } from '../security/exec-policy.js';
|
|
9
9
|
import { createOwnerOrchestratedToolResultTransform } from '../orchestrator/owner-confirm-orchestration.js';
|
|
10
10
|
import { resolveModelHarness } from './model-harness.js';
|
|
11
|
-
import { buildAgentPathSystemPrompt, buildChatPathSystemPrompt } from './prompt-assembly.js';
|
|
11
|
+
import { buildAgentPathSystemPrompt, buildChatPathSystemPrompt, describeAgentPathPromptSections } from './prompt-assembly.js';
|
|
12
|
+
import { logPromptComposition } from './prompt-trace.js';
|
|
12
13
|
import { planToolRun } from './tool-runtime.js';
|
|
13
14
|
import { sanitizeAssistantReply } from './text-sanitize.js';
|
|
14
15
|
import { formatToolCallsForUser } from './tool-calls-user-format.js';
|
|
15
16
|
import { transformContextWithCompaction } from './compaction-runtime.js';
|
|
16
|
-
import { logPhase,
|
|
17
|
+
import { logPhase, tokenUsageLogFields, logAgentLoopIterationEnd } from './phase-trace.js';
|
|
18
|
+
import { buildAgentPromptCacheStreamOptions } from './config.js';
|
|
17
19
|
const logger = new Logger(null, 'ZhinAgent:AgentLoopTurn');
|
|
18
20
|
function resolveAIService(plugin) {
|
|
19
21
|
if (!plugin)
|
|
@@ -66,6 +68,12 @@ async function runAgentLoopVisionTurnOnce(input) {
|
|
|
66
68
|
const loopConfig = {
|
|
67
69
|
model: llmModel,
|
|
68
70
|
maxIterations: 1,
|
|
71
|
+
streamOptions: buildAgentPromptCacheStreamOptions(host.config, {
|
|
72
|
+
modelSdk: llmModel.sdk,
|
|
73
|
+
provider: providerAlias,
|
|
74
|
+
modelId,
|
|
75
|
+
label: 'vision',
|
|
76
|
+
}),
|
|
69
77
|
convertToLlm: (messages) => messages,
|
|
70
78
|
getSteeringMessages: promptHooks?.getSteeringMessages,
|
|
71
79
|
getFollowUpMessages: promptHooks?.getFollowUpMessages,
|
|
@@ -81,6 +89,18 @@ async function runAgentLoopVisionTurnOnce(input) {
|
|
|
81
89
|
const assistant = event.message;
|
|
82
90
|
lastAssistantText = assistantText(assistant);
|
|
83
91
|
lastUsage = assistant.usage;
|
|
92
|
+
const toolNames = assistant.content
|
|
93
|
+
.filter((b) => b.type === 'toolCall')
|
|
94
|
+
.map((b) => b.name)
|
|
95
|
+
.join(',');
|
|
96
|
+
logAgentLoopIterationEnd(host.phaseConfig, sessionId, {
|
|
97
|
+
iteration: iterations,
|
|
98
|
+
model: modelId,
|
|
99
|
+
label: 'vision',
|
|
100
|
+
usage: assistant.usage,
|
|
101
|
+
stopReason: assistant.stopReason,
|
|
102
|
+
toolNames: toolNames || undefined,
|
|
103
|
+
});
|
|
84
104
|
onChunk?.(lastAssistantText, lastAssistantText);
|
|
85
105
|
}
|
|
86
106
|
if (event.type === 'agent_end') {
|
|
@@ -94,7 +114,7 @@ async function runAgentLoopVisionTurnOnce(input) {
|
|
|
94
114
|
}
|
|
95
115
|
logPhase(host.phaseConfig, 'agent_loop.vision.end', sessionId, {
|
|
96
116
|
iterations,
|
|
97
|
-
...
|
|
117
|
+
...tokenUsageLogFields(lastUsage),
|
|
98
118
|
});
|
|
99
119
|
return {
|
|
100
120
|
reply,
|
|
@@ -152,6 +172,7 @@ export async function runAgentLoopTextTurn(input) {
|
|
|
152
172
|
personaEnhanced,
|
|
153
173
|
preData,
|
|
154
174
|
deferredStats: input.deferredStats,
|
|
175
|
+
modelSdk: llmModel.sdk,
|
|
155
176
|
})
|
|
156
177
|
: buildChatPathSystemPrompt(host, personaEnhanced, contextForTools);
|
|
157
178
|
const agentTools = hasTools
|
|
@@ -159,16 +180,44 @@ export async function runAgentLoopTextTurn(input) {
|
|
|
159
180
|
approvalMode: host.config.execApprovalMode,
|
|
160
181
|
})
|
|
161
182
|
: [];
|
|
183
|
+
if (hasTools) {
|
|
184
|
+
const sections = await describeAgentPathPromptSections(host, {
|
|
185
|
+
commMessage: contextForTools,
|
|
186
|
+
content: input.rawContent,
|
|
187
|
+
sessionId,
|
|
188
|
+
deferredStats: input.deferredStats,
|
|
189
|
+
modelSdk: llmModel.sdk,
|
|
190
|
+
});
|
|
191
|
+
logPromptComposition({
|
|
192
|
+
config: host.promptTraceConfig,
|
|
193
|
+
sessionId,
|
|
194
|
+
label: 'orchestrator',
|
|
195
|
+
systemPrompt,
|
|
196
|
+
sections,
|
|
197
|
+
historyMessages: loaded.messages,
|
|
198
|
+
tools: agentTools,
|
|
199
|
+
userPreview: input.rawContent,
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
logPromptComposition({
|
|
204
|
+
config: host.promptTraceConfig,
|
|
205
|
+
sessionId,
|
|
206
|
+
label: 'chat',
|
|
207
|
+
systemPrompt,
|
|
208
|
+
historyMessages: loaded.messages,
|
|
209
|
+
tools: [],
|
|
210
|
+
userPreview: input.rawContent,
|
|
211
|
+
});
|
|
212
|
+
}
|
|
162
213
|
const harness = resolveModelHarness(host.getTurnProvider().name, modelId, host.config.modelHarness);
|
|
163
214
|
const maxIterations = hasTools
|
|
164
215
|
? (harness.maxIterations ?? host.config.maxIterations)
|
|
165
216
|
: 1;
|
|
166
217
|
let orchestrationPlugin = host.emitter.getHostPlugin() ?? undefined;
|
|
167
218
|
if (!orchestrationPlugin) {
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
}
|
|
171
|
-
catch {
|
|
219
|
+
orchestrationPlugin = getHostRootPlugin() ?? undefined;
|
|
220
|
+
if (!orchestrationPlugin) {
|
|
172
221
|
logger.warn(formatCompact({ warn: 'no_host_plugin' }));
|
|
173
222
|
}
|
|
174
223
|
}
|
|
@@ -206,6 +255,12 @@ export async function runAgentLoopTextTurn(input) {
|
|
|
206
255
|
model: llmModel,
|
|
207
256
|
maxIterations,
|
|
208
257
|
sessionId,
|
|
258
|
+
streamOptions: buildAgentPromptCacheStreamOptions(host.config, {
|
|
259
|
+
modelSdk: llmModel.sdk,
|
|
260
|
+
provider: providerAlias,
|
|
261
|
+
modelId,
|
|
262
|
+
label: hasTools ? 'orchestrator' : 'chat',
|
|
263
|
+
}),
|
|
209
264
|
convertToLlm: (messages) => messages,
|
|
210
265
|
transformContext: async (messages, ctxSignal) => transformContextWithCompaction(messages, ctxSignal, {
|
|
211
266
|
host,
|
|
@@ -282,6 +337,18 @@ export async function runAgentLoopTextTurn(input) {
|
|
|
282
337
|
const assistant = event.message;
|
|
283
338
|
lastAssistantText = assistantText(assistant);
|
|
284
339
|
lastUsage = assistant.usage;
|
|
340
|
+
const toolNames = assistant.content
|
|
341
|
+
.filter((b) => b.type === 'toolCall')
|
|
342
|
+
.map((b) => b.name)
|
|
343
|
+
.join(',');
|
|
344
|
+
logAgentLoopIterationEnd(host.phaseConfig, sessionId, {
|
|
345
|
+
iteration: iterations,
|
|
346
|
+
model: modelId,
|
|
347
|
+
label: hasTools ? 'orchestrator' : 'chat',
|
|
348
|
+
usage: assistant.usage,
|
|
349
|
+
stopReason: assistant.stopReason,
|
|
350
|
+
toolNames: toolNames || undefined,
|
|
351
|
+
});
|
|
285
352
|
onChunk?.(lastAssistantText, lastAssistantText);
|
|
286
353
|
}
|
|
287
354
|
if (event.type === 'agent_end') {
|
|
@@ -314,7 +381,7 @@ export async function runAgentLoopTextTurn(input) {
|
|
|
314
381
|
}
|
|
315
382
|
logPhase(host.phaseConfig, 'agent_loop.turn.end', sessionId, {
|
|
316
383
|
iterations,
|
|
317
|
-
...
|
|
384
|
+
...tokenUsageLogFields(lastUsage),
|
|
318
385
|
});
|
|
319
386
|
return {
|
|
320
387
|
reply: finalReply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop-turn.js","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-loop-turn.js","sourceRoot":"","sources":["../../src/zhin-agent/agent-loop-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AGENTS.md 合并链:子目录(近)→ workspace root(远),注入 Turn envelope。
|
|
3
|
+
*/
|
|
4
|
+
export declare function clearAgentsInstructionCache(): void;
|
|
5
|
+
export interface AgentsInstructionEntry {
|
|
6
|
+
path: string;
|
|
7
|
+
content: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* 收集 AGENTS.md 合并链:从 cwd 向上至 workspace root(近→远),root 使用 bootstrap 搜索(含 data/)。
|
|
11
|
+
*/
|
|
12
|
+
export declare function collectAgentsInstructionChain(workspaceDir?: string): Promise<AgentsInstructionEntry[]>;
|
|
13
|
+
/** 供 Turn envelope 的 AGENTS 块;无文件时返回 null */
|
|
14
|
+
export declare function buildAgentsEnvelopeContext(workspaceDir?: string): Promise<string | null>;
|
|
15
|
+
//# sourceMappingURL=agents-instruction.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agents-instruction.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/agents-instruction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAyBH,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAiBD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA2CnC;AAED,6CAA6C;AAC7C,wBAAsB,0BAA0B,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS9F"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AGENTS.md 合并链:子目录(近)→ workspace root(远),注入 Turn envelope。
|
|
3
|
+
*/
|
|
4
|
+
import * as fs from 'node:fs';
|
|
5
|
+
import * as path from 'node:path';
|
|
6
|
+
import { loadBootstrapFiles } from '../bootstrap.js';
|
|
7
|
+
const agentsFileCache = new Map();
|
|
8
|
+
async function readAgentsFile(filePath) {
|
|
9
|
+
try {
|
|
10
|
+
const stats = await fs.promises.stat(filePath);
|
|
11
|
+
const cached = agentsFileCache.get(filePath);
|
|
12
|
+
if (cached && cached.mtimeMs === stats.mtimeMs) {
|
|
13
|
+
return cached.content;
|
|
14
|
+
}
|
|
15
|
+
const content = (await fs.promises.readFile(filePath, 'utf-8')).trim();
|
|
16
|
+
if (!content)
|
|
17
|
+
return null;
|
|
18
|
+
agentsFileCache.set(filePath, { content, mtimeMs: stats.mtimeMs });
|
|
19
|
+
return content;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
agentsFileCache.delete(filePath);
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function clearAgentsInstructionCache() {
|
|
27
|
+
agentsFileCache.clear();
|
|
28
|
+
}
|
|
29
|
+
function displayAgentsPath(absPath, workspaceRoot) {
|
|
30
|
+
const root = normalizeAgentsPath(workspaceRoot);
|
|
31
|
+
const abs = normalizeAgentsPath(absPath);
|
|
32
|
+
const rel = path.relative(root, abs);
|
|
33
|
+
return rel && !rel.startsWith('..') ? rel : path.basename(abs);
|
|
34
|
+
}
|
|
35
|
+
function normalizeAgentsPath(filePath) {
|
|
36
|
+
try {
|
|
37
|
+
return fs.realpathSync.native(filePath);
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return path.resolve(filePath);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* 收集 AGENTS.md 合并链:从 cwd 向上至 workspace root(近→远),root 使用 bootstrap 搜索(含 data/)。
|
|
45
|
+
*/
|
|
46
|
+
export async function collectAgentsInstructionChain(workspaceDir) {
|
|
47
|
+
const workspaceRoot = path.resolve(workspaceDir || process.cwd());
|
|
48
|
+
const startDir = path.resolve(process.cwd());
|
|
49
|
+
const entries = [];
|
|
50
|
+
const seen = new Set();
|
|
51
|
+
let current = startDir;
|
|
52
|
+
while (true) {
|
|
53
|
+
const candidate = path.resolve(path.join(current, 'AGENTS.md'));
|
|
54
|
+
const normalized = normalizeAgentsPath(candidate);
|
|
55
|
+
if (!seen.has(normalized)) {
|
|
56
|
+
const content = await readAgentsFile(candidate);
|
|
57
|
+
if (content) {
|
|
58
|
+
entries.push({
|
|
59
|
+
path: displayAgentsPath(candidate, workspaceRoot),
|
|
60
|
+
content,
|
|
61
|
+
});
|
|
62
|
+
seen.add(normalized);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (path.resolve(current) === workspaceRoot)
|
|
66
|
+
break;
|
|
67
|
+
const parent = path.dirname(current);
|
|
68
|
+
if (parent === current)
|
|
69
|
+
break;
|
|
70
|
+
current = parent;
|
|
71
|
+
}
|
|
72
|
+
const bootstrapFiles = await loadBootstrapFiles(workspaceRoot);
|
|
73
|
+
const rootAgents = bootstrapFiles.find(f => f.name === 'AGENTS.md' && !f.missing);
|
|
74
|
+
if (rootAgents?.content?.trim() && rootAgents.path) {
|
|
75
|
+
const resolved = path.resolve(rootAgents.path);
|
|
76
|
+
const normalized = normalizeAgentsPath(resolved);
|
|
77
|
+
if (!seen.has(normalized)) {
|
|
78
|
+
entries.push({
|
|
79
|
+
path: displayAgentsPath(resolved, workspaceRoot),
|
|
80
|
+
content: rootAgents.content.trim(),
|
|
81
|
+
});
|
|
82
|
+
seen.add(normalized);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return entries;
|
|
86
|
+
}
|
|
87
|
+
/** 供 Turn envelope 的 AGENTS 块;无文件时返回 null */
|
|
88
|
+
export async function buildAgentsEnvelopeContext(workspaceDir) {
|
|
89
|
+
const chain = await collectAgentsInstructionChain(workspaceDir);
|
|
90
|
+
if (chain.length === 0)
|
|
91
|
+
return null;
|
|
92
|
+
const lines = ['[Agents instructions]'];
|
|
93
|
+
for (const entry of chain) {
|
|
94
|
+
lines.push('', `## ${entry.path}`, '', entry.content);
|
|
95
|
+
}
|
|
96
|
+
return lines.join('\n');
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=agents-instruction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agents-instruction.js","sourceRoot":"","sources":["../../src/zhin-agent/agents-instruction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-runtime.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,KAAK,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"compaction-runtime.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,KAAK,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGzE,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;CAC7C;AA2BD,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED,wBAAgB,mCAAmC,IAAI,MAAM,CAW5D;AAED,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAI5D;AAED,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAsDzB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,GAAG;IAChD,IAAI,EAAE,gBAAgB,CAAC;CACxB,GACA,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB3C"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { autoCompactAgentMessagesIfNeeded, createAgentCompactionState, estimateAgentMessagesTokens, } from '@zhin.js/ai';
|
|
2
|
+
import { resolveWorkspacePrompt } from './workspace-prompt.js';
|
|
2
3
|
function resolveAgentCompactionConfig(compaction, contextWindow) {
|
|
3
4
|
return {
|
|
4
5
|
enabled: compaction?.enabled !== false,
|
|
@@ -49,13 +50,18 @@ export async function transformContextWithCompaction(messages, signal, options)
|
|
|
49
50
|
return messages;
|
|
50
51
|
const beforeTokens = estimateAgentMessagesTokens(messages);
|
|
51
52
|
const state = getCompactionState(options.sessionId);
|
|
53
|
+
const compactionPrompt = resolveWorkspacePrompt('compaction', options.model.sdk);
|
|
54
|
+
const customInstructions = [
|
|
55
|
+
compactionPrompt?.trim(),
|
|
56
|
+
options.customInstructions?.trim(),
|
|
57
|
+
].filter(Boolean).join('\n\n') || undefined;
|
|
52
58
|
const result = await autoCompactAgentMessagesIfNeeded({
|
|
53
59
|
model: options.model,
|
|
54
60
|
messages,
|
|
55
61
|
config: cfg,
|
|
56
62
|
state,
|
|
57
63
|
force: options.force,
|
|
58
|
-
customInstructions
|
|
64
|
+
customInstructions,
|
|
59
65
|
});
|
|
60
66
|
if (result.summary?.trim()) {
|
|
61
67
|
const anchorId = await options.host.contextRepository.resolveCompactionAnchorId(options.sessionId, cfg.keepRecentTokens ?? 20_000, cfg.minKeepCount ?? 2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-runtime.js","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,0BAA0B,EAC1B,2BAA2B,GAK5B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"compaction-runtime.js","sourceRoot":"","sources":["../../src/zhin-agent/compaction-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,16 @@ export interface ZhinAgentConfig {
|
|
|
89
89
|
modelHarness?: ModelHarnessConfig;
|
|
90
90
|
/** 输出回合 phase 观测日志(或通过 ZHIN_AGENT_PHASE_TRACE 环境变量开启) */
|
|
91
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;
|
|
92
102
|
/** phase 观测回调(测试或自定义遥测;与 phaseTrace 同时生效) */
|
|
93
103
|
onPhaseTrace?: (event: {
|
|
94
104
|
phase: string;
|
|
@@ -122,10 +132,10 @@ export interface ZhinAgentConfig {
|
|
|
122
132
|
deferredAutoContinueMaxDepth?: number;
|
|
123
133
|
}
|
|
124
134
|
/** 主 Agent 默认常驻编排工具(不含 activate_skill:执行一律经 Worker;文生图走 deferred) */
|
|
125
|
-
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"];
|
|
126
136
|
/** 硬编排 v1 追加的总监工具 */
|
|
127
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"];
|
|
128
|
-
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"];
|
|
129
139
|
/** 不进入主编排也不进入 deferred 目录 */
|
|
130
140
|
export declare const DEFERRED_CATALOG_EXCLUDED_TOOLS: readonly ["activate_skill", "install_skill"];
|
|
131
141
|
/** @deprecated 使用 DEFERRED_CATALOG_EXCLUDED_TOOLS */
|
|
@@ -133,7 +143,7 @@ export declare const TOOL_SEARCH_EXCLUDED_TOOLS: readonly ["activate_skill", "in
|
|
|
133
143
|
/** Deferred Worker 默认基础工具 */
|
|
134
144
|
export declare const DEFAULT_WORKER_BASE_TOOLS: readonly ["bash", "read_file", "web_search"];
|
|
135
145
|
/** @deprecated 使用 DEFAULT_ORCHESTRATOR_TOOLS */
|
|
136
|
-
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"];
|
|
137
147
|
/** @deprecated 使用 DEFAULT_WORKER_BASE_TOOLS */
|
|
138
148
|
export declare const DEFAULT_TOOL_SEARCH_WORKER_BASE_TOOLS: readonly ["bash", "read_file", "web_search"];
|
|
139
149
|
/** ZhinAgent 运行依赖(通过 setter 或 configure() 注入) */
|
|
@@ -158,6 +168,21 @@ export interface ZhinAgentDependencies {
|
|
|
158
168
|
export declare const DEFAULT_CONFIG: Required<ZhinAgentConfig>;
|
|
159
169
|
/** `env` 参数主要用于测试注入,运行时默认读取 `process.env`。 */
|
|
160
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
|
+
};
|
|
161
186
|
/** run_deferred_task 外层超时:须覆盖 Worker 多轮 LLM + MCP(默认远高于 Agent 30s 工具超时) */
|
|
162
187
|
export declare function resolveDeferredTaskToolTimeout(config: Pick<Required<ZhinAgentConfig>, 'timeout' | 'subagentTurnWaitMs' | 'maxSubagentIterations'>): number;
|
|
163
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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"}
|