@zhin.js/agent 1.1.0 → 1.1.2
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/lib/builtin/deferred-tool-meta.d.ts +5 -0
- package/lib/builtin/deferred-tool-meta.d.ts.map +1 -1
- package/lib/builtin/deferred-tool-meta.js +13 -0
- package/lib/builtin/deferred-tool-meta.js.map +1 -1
- package/lib/core/agent-loop-standalone.d.ts.map +1 -1
- package/lib/core/agent-loop-standalone.js +84 -34
- package/lib/core/agent-loop-standalone.js.map +1 -1
- package/package.json +7 -7
|
@@ -19,6 +19,11 @@ export interface DeferredToolRuntime {
|
|
|
19
19
|
onSkillLoaded?: (name: string, instructions: string, toolNames: string[]) => void;
|
|
20
20
|
skillLoadOpts: LoadSkillToolOptions;
|
|
21
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* 在独立 deferred runtime 下执行：load_tool / discover 的 snapshot 变更只影响本上下文，
|
|
24
|
+
* 不会污染父会话（此前 subagent 的 load_tool 会写父会话 snapshot）。
|
|
25
|
+
*/
|
|
26
|
+
export declare function runWithDeferredToolRuntime<T>(runtime: DeferredToolRuntime, fn: () => Promise<T>): Promise<T>;
|
|
22
27
|
export declare function bindDeferredToolRuntime(message: Message, runtime: DeferredToolRuntime): void;
|
|
23
28
|
export declare function getDeferredToolRuntime(message?: Message): DeferredToolRuntime | undefined;
|
|
24
29
|
export declare class DiscoverBuiltinTool extends BuiltinBaseTool {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred-tool-meta.d.ts","sourceRoot":"","sources":["../../src/builtin/deferred-tool-meta.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAkB,KAAK,2BAA2B,EAAiE,MAAM,aAAa,CAAC;AAC9I,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAMvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAyB,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,2BAA2B,CAAC;IACtC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAClF,aAAa,EAAE,oBAAoB,CAAC;CACrC;
|
|
1
|
+
{"version":3,"file":"deferred-tool-meta.d.ts","sourceRoot":"","sources":["../../src/builtin/deferred-tool-meta.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAkB,KAAK,2BAA2B,EAAiE,MAAM,aAAa,CAAC;AAC9I,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAMvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAyB,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,2BAA2B,CAAC;IACtC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAClF,aAAa,EAAE,oBAAoB,CAAC;CACrC;AAQD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAC1C,OAAO,EAAE,mBAAmB,EAC5B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAE5F;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,mBAAmB,GAAG,SAAS,CAKzF;AAeD,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,iIAC4G;IAChI,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAOvC;IAEI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAkBrF;AAED,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,uEAAuE;IAC3F,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAMvC;IAEI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAUrF;AAED,qBAAa,wBAAyB,SAAQ,eAAe;IAY/C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAXtC,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,WAAW,gFAC2D;IAC/E,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAMvC;gBAE2B,SAAS,EAAE,oBAAoB;IAItD,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAiBrF;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI,EAAE,CAM/E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAGhE"}
|
|
@@ -7,10 +7,23 @@ import { readSkillInstructions } from './load-skill-tool.js';
|
|
|
7
7
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
8
8
|
export const TOOLS_MUTATED_MARKER = '__zhin_tools_mutated__';
|
|
9
9
|
const deferredRuntime = new WeakMap();
|
|
10
|
+
/** 异步上下文级 runtime：优先于 WeakMap——subagent / standalone loop 的隔离通道 */
|
|
11
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
12
|
+
const deferredRuntimeAls = new AsyncLocalStorage();
|
|
13
|
+
/**
|
|
14
|
+
* 在独立 deferred runtime 下执行：load_tool / discover 的 snapshot 变更只影响本上下文，
|
|
15
|
+
* 不会污染父会话（此前 subagent 的 load_tool 会写父会话 snapshot）。
|
|
16
|
+
*/
|
|
17
|
+
export function runWithDeferredToolRuntime(runtime, fn) {
|
|
18
|
+
return deferredRuntimeAls.run(runtime, fn);
|
|
19
|
+
}
|
|
10
20
|
export function bindDeferredToolRuntime(message, runtime) {
|
|
11
21
|
deferredRuntime.set(message, runtime);
|
|
12
22
|
}
|
|
13
23
|
export function getDeferredToolRuntime(message) {
|
|
24
|
+
const scoped = deferredRuntimeAls.getStore();
|
|
25
|
+
if (scoped)
|
|
26
|
+
return scoped;
|
|
14
27
|
if (!message)
|
|
15
28
|
return undefined;
|
|
16
29
|
return deferredRuntime.get(message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred-tool-meta.js","sourceRoot":"","sources":["../../src/builtin/deferred-tool-meta.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deferred-tool-meta.js","sourceRoot":"","sources":["../../src/builtin/deferred-tool-meta.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop-standalone.d.ts","sourceRoot":"","sources":["../../src/core/agent-loop-standalone.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"agent-loop-standalone.d.ts","sourceRoot":"","sources":["../../src/core/agent-loop-standalone.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAuU,KAAK,mBAAmB,EAAsB,MAAM,aAAa,CAAC;AAE7b,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,mCAAmC,CAAC;AAChG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,4BAA4B,CAAC;AAgE7F,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACvE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAC5D;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,UAAU,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,CAAC;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,EAAE,aAAa,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,EAAE,4BAA4B,CAAC;IACzC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sCAAsC;IACtC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IAC3C,mDAAmD;IACnD,cAAc,CAAC,EAAE;QAAE,MAAM,EAAE,gBAAgB,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjF,mDAAmD;IACnD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC,CA+LpC"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
* Standalone agentLoop runner (subagent / deferred worker) — isolated memory context.
|
|
3
3
|
*/
|
|
4
4
|
import { formatCompact, getLogger } from '@zhin.js/logger';
|
|
5
|
-
import { agentLoop, agentContextFrom, assistantText, createUserMessage, createMemoryContextRepository, getLlmTransportModel, agentToolsToLlmTools, registerLlmApiFromProviders, sdkEntryFromProvider } from '@zhin.js/ai';
|
|
5
|
+
import { agentLoop, agentContextFrom, assistantText, createUserMessage, createMemoryContextRepository, getLlmTransportModel, agentToolsToLlmTools, registerLlmApiFromProviders, sdkEntryFromProvider, getLoadedToolNamesFromSnapshot } from '@zhin.js/ai';
|
|
6
6
|
import { runWithCommMessage, runWithDirectAgentExecution } from '../security/comm-message-context.js';
|
|
7
7
|
import { sanitizeAssistantReply, unwrapJsonStringLayers } from '../core/text-sanitize.js';
|
|
8
8
|
import { formatToolCallsForUser } from '../core/tool-calls-user-format.js';
|
|
9
9
|
import { logAgentLoopIterationEnd } from '../internal/phase-trace.js';
|
|
10
|
+
import { getDeferredToolRuntime, runWithDeferredToolRuntime, TOOLS_MUTATED_MARKER, } from '../builtin/deferred-tool-meta.js';
|
|
11
|
+
import { catalogToolByName } from '../tool-catalog/tool-catalog.js';
|
|
10
12
|
const logger = getLogger('AgentLoopStandalone');
|
|
11
13
|
function tokenUsageToLegacy(usage) {
|
|
12
14
|
return {
|
|
@@ -62,7 +64,31 @@ export async function runAgentLoopStandaloneTurn(input) {
|
|
|
62
64
|
const loaded = await repository.loadContext(sessionId);
|
|
63
65
|
const promptMessages = buildUserMessages(userInput);
|
|
64
66
|
const legacyByName = new Map(tools.map((t) => [t.name, t]));
|
|
65
|
-
|
|
67
|
+
let llmTools = agentToolsToLlmTools(tools);
|
|
68
|
+
// 子 agent 专属 deferred runtime：snapshot 从父会话克隆（看得见父已加载工具），
|
|
69
|
+
// 但 load_tool 的变更只活在本 loop（不写回父会话、不落库）。
|
|
70
|
+
const parentDeferred = getDeferredToolRuntime(commMessage);
|
|
71
|
+
const childDeferred = parentDeferred
|
|
72
|
+
? {
|
|
73
|
+
...parentDeferred,
|
|
74
|
+
snapshot: structuredClone(parentDeferred.snapshot),
|
|
75
|
+
persistSnapshot: async () => { },
|
|
76
|
+
}
|
|
77
|
+
: undefined;
|
|
78
|
+
/** load_tool 命中后把 catalog 里的完整工具并入可执行集并重建 schema 列表 */
|
|
79
|
+
const reloadDeferredTools = () => {
|
|
80
|
+
if (!childDeferred)
|
|
81
|
+
return;
|
|
82
|
+
const byName = catalogToolByName(childDeferred.catalog);
|
|
83
|
+
for (const name of getLoadedToolNamesFromSnapshot(childDeferred.snapshot)) {
|
|
84
|
+
if (legacyByName.has(name))
|
|
85
|
+
continue;
|
|
86
|
+
const item = byName.get(name);
|
|
87
|
+
if (item)
|
|
88
|
+
legacyByName.set(name, item.fullTool);
|
|
89
|
+
}
|
|
90
|
+
llmTools = agentToolsToLlmTools([...legacyByName.values()]);
|
|
91
|
+
};
|
|
66
92
|
const toolCalls = [];
|
|
67
93
|
let iterations = 0;
|
|
68
94
|
let lastAssistantText = '';
|
|
@@ -118,43 +144,67 @@ export async function runAgentLoopStandaloneTurn(input) {
|
|
|
118
144
|
return undefined;
|
|
119
145
|
},
|
|
120
146
|
executeTool: async (toolCall) => runTool(toolCall),
|
|
147
|
+
// 延迟加载：load_tool 命中标记后重建工具集再补全一轮（与主 loop 同一机制）
|
|
148
|
+
...(childDeferred
|
|
149
|
+
? {
|
|
150
|
+
refreshTools: async () => {
|
|
151
|
+
reloadDeferredTools();
|
|
152
|
+
return llmTools;
|
|
153
|
+
},
|
|
154
|
+
shouldRecompleteAfterTool: (result) => result.role === 'toolResult'
|
|
155
|
+
&& Array.isArray(result.content)
|
|
156
|
+
&& result.content.some((block) => block.type === 'text'
|
|
157
|
+
&& typeof block.text === 'string'
|
|
158
|
+
&& block.text.includes(TOOLS_MUTATED_MARKER)),
|
|
159
|
+
maxRecompletePerIteration: 1,
|
|
160
|
+
}
|
|
161
|
+
: {}),
|
|
121
162
|
};
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
|
127
|
-
const assistant = event.message;
|
|
128
|
-
for (const block of assistant.content) {
|
|
129
|
-
if (block.type === 'text' && block.text) {
|
|
130
|
-
block.text = unwrapJsonStringLayers(block.text);
|
|
131
|
-
}
|
|
163
|
+
const drive = async () => {
|
|
164
|
+
for await (const event of agentLoop(promptMessages, loopContext, loopConfig, signal)) {
|
|
165
|
+
if (event.type === 'turn_start') {
|
|
166
|
+
iterations += 1;
|
|
132
167
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
168
|
+
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
|
169
|
+
const assistant = event.message;
|
|
170
|
+
for (const block of assistant.content) {
|
|
171
|
+
if (block.type === 'text' && block.text) {
|
|
172
|
+
block.text = unwrapJsonStringLayers(block.text);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
lastAssistantText = assistantText(assistant);
|
|
176
|
+
if (!lastAssistantText.trim() && assistant.errorMessage) {
|
|
177
|
+
lastAssistantText = `Something went wrong: ${assistant.errorMessage}. Please try again or rephrase your request.`;
|
|
178
|
+
}
|
|
179
|
+
lastUsage = assistant.usage;
|
|
180
|
+
const trace = input.iterationTrace;
|
|
181
|
+
if (trace) {
|
|
182
|
+
const toolNames = assistant.content
|
|
183
|
+
.filter((b) => b.type === 'toolCall')
|
|
184
|
+
.map((b) => b.name)
|
|
185
|
+
.join(',');
|
|
186
|
+
logAgentLoopIterationEnd(trace.config, trace.sessionId, {
|
|
187
|
+
iteration: iterations,
|
|
188
|
+
model,
|
|
189
|
+
label: trace.label ?? 'standalone',
|
|
190
|
+
usage: assistant.usage,
|
|
191
|
+
stopReason: assistant.stopReason,
|
|
192
|
+
toolNames: toolNames || undefined,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
136
195
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
const toolNames = assistant.content
|
|
141
|
-
.filter((b) => b.type === 'toolCall')
|
|
142
|
-
.map((b) => b.name)
|
|
143
|
-
.join(',');
|
|
144
|
-
logAgentLoopIterationEnd(trace.config, trace.sessionId, {
|
|
145
|
-
iteration: iterations,
|
|
146
|
-
model,
|
|
147
|
-
label: trace.label ?? 'standalone',
|
|
148
|
-
usage: assistant.usage,
|
|
149
|
-
stopReason: assistant.stopReason,
|
|
150
|
-
toolNames: toolNames || undefined,
|
|
151
|
-
});
|
|
196
|
+
if (event.type === 'agent_end') {
|
|
197
|
+
const userBatch = event.userMessages ?? promptMessages;
|
|
198
|
+
await repository.appendMessages(sessionId, [...userBatch, ...event.messages]);
|
|
152
199
|
}
|
|
153
200
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
201
|
+
};
|
|
202
|
+
// 独立 deferred runtime 下驱动 loop：load_tool 变更不污染父会话
|
|
203
|
+
if (childDeferred) {
|
|
204
|
+
await runWithDeferredToolRuntime(childDeferred, drive);
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
await drive();
|
|
158
208
|
}
|
|
159
209
|
const content = sanitizeAssistantReply(lastAssistantText, {
|
|
160
210
|
toolSummary: formatToolCallsForUser(toolCalls),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop-standalone.js","sourceRoot":"","sources":["../../src/core/agent-loop-standalone.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAuE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,oBAAoB,EAAgI,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-loop-standalone.js","sourceRoot":"","sources":["../../src/core/agent-loop-standalone.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/agent",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "Zhin AI Agent — session, ZhinAgent, init; composes @zhin.js/core providers and tools",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -124,16 +124,16 @@
|
|
|
124
124
|
"@a2a-js/sdk": "1.0.0-beta.0",
|
|
125
125
|
"he": "^1.2.0",
|
|
126
126
|
"js-yaml": "^5.2.2",
|
|
127
|
-
"@zhin.js/agent-feature": "1.0.
|
|
127
|
+
"@zhin.js/agent-feature": "1.0.5",
|
|
128
|
+
"@zhin.js/core": "1.5.1",
|
|
128
129
|
"@zhin.js/ai": "1.5.0",
|
|
129
|
-
"@zhin.js/core": "1.5.0",
|
|
130
130
|
"@zhin.js/kernel": "1.0.5",
|
|
131
131
|
"@zhin.js/logger": "1.0.75",
|
|
132
|
-
"@zhin.js/
|
|
133
|
-
"@zhin.js/
|
|
132
|
+
"@zhin.js/plugin-runtime": "1.1.2",
|
|
133
|
+
"@zhin.js/mcp-feature": "1.0.5",
|
|
134
134
|
"@zhin.js/schedule": "0.0.4",
|
|
135
|
-
"@zhin.js/skill": "1.0.
|
|
136
|
-
"@zhin.js/tool": "1.0.
|
|
135
|
+
"@zhin.js/skill": "1.0.5",
|
|
136
|
+
"@zhin.js/tool": "1.0.5"
|
|
137
137
|
},
|
|
138
138
|
"peerDependencies": {
|
|
139
139
|
"@modelcontextprotocol/sdk": "^1.29.0",
|