@notic/agent-engine 1.0.0 → 1.1.0
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 +1 -0
- package/dist/adapter/AnthropicAdapter.d.ts.map +1 -1
- package/dist/adapter/AnthropicAdapter.js +8 -12
- package/dist/adapter/AnthropicAdapter.js.map +1 -1
- package/dist/adapter/GeminiAdapter.d.ts.map +1 -1
- package/dist/adapter/GeminiAdapter.js +11 -15
- package/dist/adapter/GeminiAdapter.js.map +1 -1
- package/dist/adapter/OpenAIAdapter.d.ts.map +1 -1
- package/dist/adapter/OpenAIAdapter.js +40 -23
- package/dist/adapter/OpenAIAdapter.js.map +1 -1
- package/dist/agent/Agent.d.ts +10 -0
- package/dist/agent/Agent.d.ts.map +1 -1
- package/dist/agent/Agent.js +69 -20
- package/dist/agent/Agent.js.map +1 -1
- package/dist/message/Message.d.ts +13 -1
- package/dist/message/Message.d.ts.map +1 -1
- package/dist/message/Message.js +68 -27
- package/dist/message/Message.js.map +1 -1
- package/dist/message/MessagePart.d.ts +1 -0
- package/dist/message/MessagePart.d.ts.map +1 -1
- package/dist/prompt/PromptBuilder.d.ts.map +1 -1
- package/dist/prompt/PromptBuilder.js +28 -11
- package/dist/prompt/PromptBuilder.js.map +1 -1
- package/dist/session/Session.d.ts +2 -0
- package/dist/session/Session.d.ts.map +1 -1
- package/dist/session/Session.js +13 -3
- package/dist/session/Session.js.map +1 -1
- package/dist/stream/StreamParser.d.ts +8 -4
- package/dist/stream/StreamParser.d.ts.map +1 -1
- package/dist/stream/StreamParser.js +24 -8
- package/dist/stream/StreamParser.js.map +1 -1
- package/dist/tool/Tool.js +1 -1
- package/dist/tool/Tool.js.map +1 -1
- package/dist/tool/ToolCall.d.ts +2 -1
- package/dist/tool/ToolCall.d.ts.map +1 -1
- package/dist/tool/ToolCall.js +3 -2
- package/dist/tool/ToolCall.js.map +1 -1
- package/dist/tool/ToolKit.d.ts.map +1 -1
- package/dist/tool/ToolKit.js +2 -2
- package/dist/tool/ToolKit.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -354,6 +354,7 @@ const finalEvents = parser.finish(); // TEXT_DONE, THINKING_DONE, MESSAGE_DONE
|
|
|
354
354
|
// 已组装的消息快照
|
|
355
355
|
parser.snapshot; // 当前 Message
|
|
356
356
|
parser.finishReason; // "stop" | "tool_calls" | ...
|
|
357
|
+
parser.usage; // 流返回的 Token 用量(如有 enable_usage)
|
|
357
358
|
```
|
|
358
359
|
|
|
359
360
|
#### 事件类型
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnthropicAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AnthropicAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;;;;GAcG;AACH,qBAAa,gBAAiB,YAAW,cAAc;IACrD,QAAQ,CAAC,YAAY;;;MAGnB;IAEF,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,QAAQ,CAAC,EAAE,aAAa;IAQ9B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2C3F,OAAO,CAAC,yBAAyB;YAuDnB,oBAAoB;
|
|
1
|
+
{"version":3,"file":"AnthropicAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AnthropicAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;;;;GAcG;AACH,qBAAa,gBAAiB,YAAW,cAAc;IACrD,QAAQ,CAAC,YAAY;;;MAGnB;IAEF,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,QAAQ,CAAC,EAAE,aAAa;IAQ9B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2C3F,OAAO,CAAC,yBAAyB;YAuDnB,oBAAoB;IA2BlC,OAAO,CAAC,oBAAoB;YAmBd,mBAAmB;YAsBnB,mBAAmB;YAanB,kBAAkB;IAsChC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA+DlC;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAwB1C;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,aAAa;CAOtB"}
|
|
@@ -118,25 +118,21 @@ class AnthropicAdapter {
|
|
|
118
118
|
}
|
|
119
119
|
// ---- User 消息 ----
|
|
120
120
|
async serializeUserMessage(msg) {
|
|
121
|
-
|
|
122
|
-
|
|
121
|
+
// 并行处理所有 part 以加速多媒体解析
|
|
122
|
+
const content = (await Promise.all(msg.parts.map(async (part) => {
|
|
123
123
|
switch (part.type) {
|
|
124
124
|
case "text":
|
|
125
|
-
|
|
126
|
-
break;
|
|
125
|
+
return { type: "text", text: part.text };
|
|
127
126
|
case "image":
|
|
128
|
-
|
|
129
|
-
break;
|
|
127
|
+
return await this.serializeImageBlock(part);
|
|
130
128
|
case "audio":
|
|
131
|
-
|
|
132
|
-
break;
|
|
129
|
+
return await this.serializeAudioBlock(part);
|
|
133
130
|
case "file":
|
|
134
|
-
|
|
135
|
-
break;
|
|
131
|
+
return await this.serializeFileBlock(part);
|
|
136
132
|
default:
|
|
137
|
-
|
|
133
|
+
return null;
|
|
138
134
|
}
|
|
139
|
-
}
|
|
135
|
+
}))).filter((c) => c !== null);
|
|
140
136
|
return {
|
|
141
137
|
role: "user",
|
|
142
138
|
content: content.length > 0 ? content : [{ type: "text", text: "" }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnthropicAdapter.js","sourceRoot":"","sources":["../../src/adapter/AnthropicAdapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AnthropicAdapter.js","sourceRoot":"","sources":["../../src/adapter/AnthropicAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeminiAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/GeminiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"GeminiAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/GeminiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD,QAAQ,CAAC,YAAY;;;MAGnB;IAEF,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,QAAQ,CAAC,EAAE,aAAa;IAQ9B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YA0C7E,qBAAqB;YA+CrB,oBAAoB;IA0BlC,OAAO,CAAC,oBAAoB;YAqBd,mBAAmB;YAqBnB,iBAAiB;IAgC/B,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA+ClC;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAgC1C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAsB7B,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,aAAa;CAiBtB"}
|
|
@@ -5,6 +5,7 @@ const Message_1 = require("../message/Message");
|
|
|
5
5
|
const Role_1 = require("../message/Role");
|
|
6
6
|
const Usage_1 = require("../message/Usage");
|
|
7
7
|
const DefaultMediaResolver_1 = require("../media/DefaultMediaResolver");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
8
9
|
const MessageAdapter_1 = require("./MessageAdapter");
|
|
9
10
|
/**
|
|
10
11
|
* Google Gemini 消息适配器
|
|
@@ -110,25 +111,20 @@ class GeminiAdapter {
|
|
|
110
111
|
}
|
|
111
112
|
// ---- User 消息 ----
|
|
112
113
|
async serializeUserMessage(msg) {
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
// 并行处理各 part 以加速多媒体解析
|
|
115
|
+
const parts = (await Promise.all(msg.parts.map(async (part) => {
|
|
115
116
|
switch (part.type) {
|
|
116
117
|
case "text":
|
|
117
|
-
|
|
118
|
-
break;
|
|
118
|
+
return { text: part.text };
|
|
119
119
|
case "image":
|
|
120
|
-
parts.push(await this.serializeInlineData(part));
|
|
121
|
-
break;
|
|
122
120
|
case "audio":
|
|
123
|
-
|
|
124
|
-
break;
|
|
121
|
+
return await this.serializeInlineData(part);
|
|
125
122
|
case "file":
|
|
126
|
-
|
|
127
|
-
break;
|
|
123
|
+
return await this.serializeFilePart(part);
|
|
128
124
|
default:
|
|
129
|
-
|
|
125
|
+
return null;
|
|
130
126
|
}
|
|
131
|
-
}
|
|
127
|
+
}))).filter((p) => p !== null);
|
|
132
128
|
return {
|
|
133
129
|
role: "user",
|
|
134
130
|
parts: parts.length > 0 ? parts : [{ text: "" }],
|
|
@@ -145,7 +141,7 @@ class GeminiAdapter {
|
|
|
145
141
|
parts: [
|
|
146
142
|
{
|
|
147
143
|
functionResponse: {
|
|
148
|
-
name: msg.metadata.toolName || "unknown",
|
|
144
|
+
name: toolResult.name || msg.metadata.toolName || "unknown",
|
|
149
145
|
response: this.safeParseJson(toolResult.result),
|
|
150
146
|
},
|
|
151
147
|
},
|
|
@@ -218,11 +214,11 @@ class GeminiAdapter {
|
|
|
218
214
|
}
|
|
219
215
|
}
|
|
220
216
|
else if (gPart.functionCall) {
|
|
221
|
-
// 工具调用
|
|
217
|
+
// 工具调用 —— Gemini 原生 functionCall 没有 id,生成唯一 id 避免批量冲突
|
|
222
218
|
const fc = gPart.functionCall;
|
|
223
219
|
parts.push({
|
|
224
220
|
type: "tool_call",
|
|
225
|
-
toolCallId: fc.name
|
|
221
|
+
toolCallId: (0, utils_1.generateId)(fc.name),
|
|
226
222
|
name: fc.name,
|
|
227
223
|
arguments: JSON.stringify(fc.args || {}),
|
|
228
224
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeminiAdapter.js","sourceRoot":"","sources":["../../src/adapter/GeminiAdapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GeminiAdapter.js","sourceRoot":"","sources":["../../src/adapter/GeminiAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAIAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpenAIAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAI7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD,QAAQ,CAAC,YAAY;;;MAGnB;IAEF,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,QAAQ,CAAC,EAAE,aAAa;IAQ9B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4C3F,OAAO,CAAC,yBAAyB;
|
|
1
|
+
{"version":3,"file":"OpenAIAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpenAIAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAI7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD,QAAQ,CAAC,YAAY;;;MAGnB;IAEF,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,QAAQ,CAAC,EAAE,aAAa;IAQ9B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4C3F,OAAO,CAAC,yBAAyB;YAsDnB,oBAAoB;IAsClC,OAAO,CAAC,oBAAoB;YAcd,kBAAkB;YAQlB,kBAAkB;YAYlB,iBAAiB;IAiC/B;;;;OAIG;YACW,eAAe;IAgB7B,OAAO,CAAC,WAAW;IAgBnB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAoElC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA6B1C,OAAO,CAAC,eAAe;CAOxB"}
|
|
@@ -77,9 +77,22 @@ class OpenAIAdapter {
|
|
|
77
77
|
}
|
|
78
78
|
// 文本内容
|
|
79
79
|
const text = msg.text;
|
|
80
|
-
|
|
80
|
+
const composed = thinking && thinkingMode === "message"
|
|
81
81
|
? `${thinkingPrefix}${thinking}\n\n${text}`
|
|
82
|
-
: text
|
|
82
|
+
: text;
|
|
83
|
+
// 当 assistant 仅有 tool_calls 而无文本时,用空字符串而非 null。
|
|
84
|
+
// —— OpenAI 标准对 null / "" / string 都接受,但部分 OpenAI 兼容代理
|
|
85
|
+
// (尤其 Anthropic 的 OpenAI 兼容层)会因 content: null 而丢弃 tool_calls,
|
|
86
|
+
// 导致下一轮 tool_result 找不到对应的 tool_use。
|
|
87
|
+
if (composed) {
|
|
88
|
+
result.content = composed;
|
|
89
|
+
}
|
|
90
|
+
else if (toolCalls.length > 0) {
|
|
91
|
+
result.content = "";
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
result.content = null;
|
|
95
|
+
}
|
|
83
96
|
// 工具调用
|
|
84
97
|
if (toolCalls.length > 0) {
|
|
85
98
|
result.tool_calls = toolCalls.map((tc) => ({
|
|
@@ -103,27 +116,22 @@ class OpenAIAdapter {
|
|
|
103
116
|
...this.extractNameMeta(msg),
|
|
104
117
|
};
|
|
105
118
|
}
|
|
106
|
-
// 多模态 → content
|
|
107
|
-
const contentParts =
|
|
108
|
-
for (const part of msg.parts) {
|
|
119
|
+
// 多模态 → content 数组(并行处理各 part 以加速多媒体解析)
|
|
120
|
+
const contentParts = (await Promise.all(msg.parts.map(async (part) => {
|
|
109
121
|
switch (part.type) {
|
|
110
122
|
case "text":
|
|
111
|
-
|
|
112
|
-
break;
|
|
123
|
+
return { type: "text", text: part.text };
|
|
113
124
|
case "image":
|
|
114
|
-
|
|
115
|
-
break;
|
|
125
|
+
return await this.serializeImagePart(part);
|
|
116
126
|
case "audio":
|
|
117
|
-
|
|
118
|
-
break;
|
|
127
|
+
return await this.serializeAudioPart(part);
|
|
119
128
|
case "file":
|
|
120
|
-
|
|
121
|
-
break;
|
|
129
|
+
return await this.serializeFilePart(part);
|
|
122
130
|
default:
|
|
123
131
|
// tool_call / tool_result 不该出现在 user 消息里,跳过
|
|
124
|
-
|
|
132
|
+
return null;
|
|
125
133
|
}
|
|
126
|
-
}
|
|
134
|
+
}))).filter((p) => p !== null);
|
|
127
135
|
return {
|
|
128
136
|
role: "user",
|
|
129
137
|
content: contentParts,
|
|
@@ -162,23 +170,32 @@ class OpenAIAdapter {
|
|
|
162
170
|
};
|
|
163
171
|
}
|
|
164
172
|
async serializeFilePart(part) {
|
|
165
|
-
// 文件作为文本附件或base64,目前以文本方式呈现
|
|
166
173
|
const resolved = await this.resolver.resolve(part.url);
|
|
167
174
|
const label = part.fileName || "file";
|
|
168
|
-
|
|
169
|
-
|
|
175
|
+
const mime = part.mimeType || resolved.mimeType;
|
|
176
|
+
// 文本文件:直接嵌入内容
|
|
177
|
+
if (mime.startsWith("text/") || mime === "application/json") {
|
|
170
178
|
const text = Buffer.from(resolved.base64, "base64").toString("utf-8");
|
|
171
179
|
return {
|
|
172
180
|
type: "text",
|
|
173
181
|
text: `[File: ${label}]\n${text}`,
|
|
174
182
|
};
|
|
175
183
|
}
|
|
176
|
-
//
|
|
184
|
+
// PDF:使用 OpenAI Chat Completions 的 file content part(GPT-4o 等支持 file_data)
|
|
185
|
+
if (mime === "application/pdf") {
|
|
186
|
+
return {
|
|
187
|
+
type: "file",
|
|
188
|
+
file: {
|
|
189
|
+
filename: label,
|
|
190
|
+
file_data: `data:${mime};base64,${resolved.base64}`,
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
// 其他二进制:用文本占位符提示模型;避免伪装为 image_url 触发模型解码失败
|
|
195
|
+
const approxBytes = Math.ceil(resolved.base64.length * 0.75);
|
|
177
196
|
return {
|
|
178
|
-
type: "
|
|
179
|
-
|
|
180
|
-
url: `data:${resolved.mimeType};base64,${resolved.base64}`,
|
|
181
|
-
},
|
|
197
|
+
type: "text",
|
|
198
|
+
text: `[Attached binary file: ${label} (${mime}, ~${approxBytes} bytes) — content not inlined]`,
|
|
182
199
|
};
|
|
183
200
|
}
|
|
184
201
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAIAdapter.js","sourceRoot":"","sources":["../../src/adapter/OpenAIAdapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpenAIAdapter.js","sourceRoot":"","sources":["../../src/adapter/OpenAIAdapter.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/Agent.d.ts
CHANGED
|
@@ -119,6 +119,8 @@ export interface CustomEvent {
|
|
|
119
119
|
}
|
|
120
120
|
/** 事件处理函数签名 */
|
|
121
121
|
type EventHandler = (event: StreamEvent | CustomEvent) => void;
|
|
122
|
+
/** 事件 handler 抛出异常时的回调。默认 console.error,可通过 setHandlerErrorHandler() 覆盖为 noop 或自定义 logger。 */
|
|
123
|
+
export type HandlerErrorHandler = (error: Error, event: StreamEvent | CustomEvent) => void;
|
|
122
124
|
/**
|
|
123
125
|
* 智能体 — 自动循环层
|
|
124
126
|
*
|
|
@@ -152,6 +154,7 @@ export declare class Agent {
|
|
|
152
154
|
private _handlers;
|
|
153
155
|
private _activeAbortController?;
|
|
154
156
|
private _lastRunState?;
|
|
157
|
+
private _handlerErrorHandler;
|
|
155
158
|
constructor(options: AgentOptions);
|
|
156
159
|
/**
|
|
157
160
|
* 注册事件监听(链式)
|
|
@@ -287,6 +290,13 @@ export declare class Agent {
|
|
|
287
290
|
* agent.emit({ type: "abort" });
|
|
288
291
|
*/
|
|
289
292
|
emit(event: StreamEvent | CustomEvent): void;
|
|
293
|
+
/**
|
|
294
|
+
* 设置事件 handler 报错时的处理器。
|
|
295
|
+
*
|
|
296
|
+
* 默认会调用 console.error 记录,可传入 noop 完全静默或接入自定义 logger。
|
|
297
|
+
* 传入 undefined 或不传参时恢复为默认行为。
|
|
298
|
+
*/
|
|
299
|
+
setHandlerErrorHandler(handler?: HandlerErrorHandler): this;
|
|
290
300
|
private emitAll;
|
|
291
301
|
private extractMessage;
|
|
292
302
|
private extractFinishReason;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/Agent.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Agent = exports.AgentTimeoutError = exports.AgentAbortError = void 0;
|
|
4
4
|
const Message_1 = require("../message/Message");
|
|
5
|
-
const Usage_1 = require("../message/Usage");
|
|
6
5
|
const OpenAIAdapter_1 = require("../adapter/OpenAIAdapter");
|
|
7
6
|
const ToolKit_1 = require("../tool/ToolKit");
|
|
8
7
|
const StreamParser_1 = require("../stream/StreamParser");
|
|
@@ -24,6 +23,11 @@ class AgentTimeoutError extends Error {
|
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
25
|
exports.AgentTimeoutError = AgentTimeoutError;
|
|
26
|
+
/** 默认 handler 错误处理器 */
|
|
27
|
+
const defaultHandlerErrorHandler = (error, event) => {
|
|
28
|
+
// eslint-disable-next-line no-console
|
|
29
|
+
console.error(`[AgentEngine] Event handler error [${event.type}]:`, error);
|
|
30
|
+
};
|
|
27
31
|
/**
|
|
28
32
|
* 智能体 — 自动循环层
|
|
29
33
|
*
|
|
@@ -57,6 +61,7 @@ class Agent {
|
|
|
57
61
|
_handlers = new Map();
|
|
58
62
|
_activeAbortController;
|
|
59
63
|
_lastRunState;
|
|
64
|
+
_handlerErrorHandler = defaultHandlerErrorHandler;
|
|
60
65
|
constructor(options) {
|
|
61
66
|
this._client = options.client;
|
|
62
67
|
this._model = options.model;
|
|
@@ -417,12 +422,8 @@ class Agent {
|
|
|
417
422
|
// 流式调用
|
|
418
423
|
const stream = await this.raceWithAbort(this._client.chat.completions.create(requestParams, this.createClientOptions(run.signal)), run.signal);
|
|
419
424
|
// 解析 chunks
|
|
420
|
-
let streamUsage;
|
|
421
425
|
for await (const chunk of stream) {
|
|
422
426
|
this.throwIfAborted(run.signal);
|
|
423
|
-
if (chunk.usage) {
|
|
424
|
-
streamUsage = Usage_1.Usage.fromRaw(chunk.usage);
|
|
425
|
-
}
|
|
426
427
|
const events = parser.feed(chunk);
|
|
427
428
|
this.emitAll(events);
|
|
428
429
|
}
|
|
@@ -433,11 +434,8 @@ class Agent {
|
|
|
433
434
|
// 提取组装好的 Message
|
|
434
435
|
const assistantMsg = this.extractMessage(finalEvents);
|
|
435
436
|
const finishReason = this.extractFinishReason(finalEvents);
|
|
436
|
-
// 填充 model
|
|
437
|
+
// 填充 model(usage 已由 StreamParser 在 buildMessage 中填入)
|
|
437
438
|
assistantMsg.model = this._model;
|
|
438
|
-
if (streamUsage) {
|
|
439
|
-
assistantMsg.usage = streamUsage;
|
|
440
|
-
}
|
|
441
439
|
return { assistantMsg, finishReason };
|
|
442
440
|
}
|
|
443
441
|
/**
|
|
@@ -451,7 +449,7 @@ class Agent {
|
|
|
451
449
|
.map((item) => item.toolCall);
|
|
452
450
|
const rejectedToolResults = approvalResults
|
|
453
451
|
.filter((item) => !item.approved)
|
|
454
|
-
.map((item) => Message_1.Message.tool(item.toolCall.toolCallId, JSON.stringify({ error: item.reason || "工具调用被拒绝", rejected: true })));
|
|
452
|
+
.map((item) => Message_1.Message.tool(item.toolCall.toolCallId, JSON.stringify({ error: item.reason || "工具调用被拒绝", rejected: true }), item.toolCall.name));
|
|
455
453
|
if (approvedToolCalls.length === 0) {
|
|
456
454
|
if (rejectedToolResults.length > 0) {
|
|
457
455
|
this._session.addTool(rejectedToolResults);
|
|
@@ -511,11 +509,27 @@ class Agent {
|
|
|
511
509
|
handler(event);
|
|
512
510
|
}
|
|
513
511
|
catch (e) {
|
|
514
|
-
// handler
|
|
515
|
-
|
|
512
|
+
// handler 异常不应中断流程,交给可配置的错误处理器
|
|
513
|
+
const error = e instanceof Error ? e : new Error(String(e));
|
|
514
|
+
try {
|
|
515
|
+
this._handlerErrorHandler(error, event);
|
|
516
|
+
}
|
|
517
|
+
catch {
|
|
518
|
+
// 错误处理器本身也抛错时静默吞掉,避免递归
|
|
519
|
+
}
|
|
516
520
|
}
|
|
517
521
|
}
|
|
518
522
|
}
|
|
523
|
+
/**
|
|
524
|
+
* 设置事件 handler 报错时的处理器。
|
|
525
|
+
*
|
|
526
|
+
* 默认会调用 console.error 记录,可传入 noop 完全静默或接入自定义 logger。
|
|
527
|
+
* 传入 undefined 或不传参时恢复为默认行为。
|
|
528
|
+
*/
|
|
529
|
+
setHandlerErrorHandler(handler) {
|
|
530
|
+
this._handlerErrorHandler = handler ?? defaultHandlerErrorHandler;
|
|
531
|
+
return this;
|
|
532
|
+
}
|
|
519
533
|
emitAll(events) {
|
|
520
534
|
for (const event of events) {
|
|
521
535
|
this.emit(event);
|
|
@@ -570,15 +584,25 @@ class Agent {
|
|
|
570
584
|
}
|
|
571
585
|
}
|
|
572
586
|
}
|
|
573
|
-
|
|
574
|
-
|
|
587
|
+
// 按 toolCallId 建索引,避免 O(n²) 查找,且不依赖顺序
|
|
588
|
+
const resultByCallId = new Map();
|
|
589
|
+
for (const result of toolResults) {
|
|
590
|
+
for (const part of result.parts) {
|
|
591
|
+
if (part.type === "tool_result") {
|
|
592
|
+
resultByCallId.set(part.toolCallId, result);
|
|
593
|
+
break;
|
|
594
|
+
}
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
for (const tc of approvedToolCalls) {
|
|
598
|
+
const result = resultByCallId.get(tc.toolCallId);
|
|
575
599
|
if (!result)
|
|
576
600
|
continue;
|
|
577
601
|
this.throwIfAborted(signal);
|
|
578
602
|
this.emit({
|
|
579
603
|
type: StreamEvent_1.StreamEventType.TOOL_EXECUTE_DONE,
|
|
580
|
-
toolCallId:
|
|
581
|
-
name:
|
|
604
|
+
toolCallId: tc.toolCallId,
|
|
605
|
+
name: tc.name,
|
|
582
606
|
result,
|
|
583
607
|
});
|
|
584
608
|
}
|
|
@@ -587,14 +611,14 @@ class Agent {
|
|
|
587
611
|
handleToolExecutionFailure(toolCall, errorLike, policy) {
|
|
588
612
|
const error = this.toError(errorLike);
|
|
589
613
|
if (policy === "pause") {
|
|
590
|
-
const result = Message_1.Message.tool(toolCall.toolCallId, JSON.stringify({ error: error.message, paused: true }));
|
|
614
|
+
const result = Message_1.Message.tool(toolCall.toolCallId, JSON.stringify({ error: error.message, paused: true }), toolCall.name);
|
|
591
615
|
this.emitToolExecutionError(error, toolCall, result);
|
|
592
616
|
this._session.addTool([result]);
|
|
593
617
|
this.failRunState(error, "tool_execution_error", result, true);
|
|
594
618
|
throw error;
|
|
595
619
|
}
|
|
596
620
|
this.emitToolExecutionError(error, toolCall);
|
|
597
|
-
return Message_1.Message.tool(toolCall.toolCallId, JSON.stringify({ error: error.message }));
|
|
621
|
+
return Message_1.Message.tool(toolCall.toolCallId, JSON.stringify({ error: error.message }), toolCall.name);
|
|
598
622
|
}
|
|
599
623
|
emitToolExecutionError(error, toolCall, result) {
|
|
600
624
|
const toolError = error instanceof ToolKit_1.ToolExecutionError ? error : undefined;
|
|
@@ -848,6 +872,27 @@ class Agent {
|
|
|
848
872
|
return "abort";
|
|
849
873
|
if (error instanceof ToolKit_1.ToolExecutionError || error.name === "ToolExecutionError")
|
|
850
874
|
return "tool_execution_error";
|
|
875
|
+
const name = (error.name || "").toLowerCase();
|
|
876
|
+
const message = (error.message || "").toLowerCase();
|
|
877
|
+
const code = error.code?.toLowerCase() ?? "";
|
|
878
|
+
const causeName = (error.cause?.name || "").toLowerCase();
|
|
879
|
+
if (name.includes("apiconnection") ||
|
|
880
|
+
name.includes("connection") ||
|
|
881
|
+
name.includes("network") ||
|
|
882
|
+
causeName.includes("connection") ||
|
|
883
|
+
code === "econnreset" ||
|
|
884
|
+
code === "econnrefused" ||
|
|
885
|
+
code === "etimedout" ||
|
|
886
|
+
code === "enotfound" ||
|
|
887
|
+
code === "eai_again" ||
|
|
888
|
+
message.includes("fetch failed") ||
|
|
889
|
+
message.includes("network error") ||
|
|
890
|
+
message.includes("socket hang up")) {
|
|
891
|
+
return "network_error";
|
|
892
|
+
}
|
|
893
|
+
if (name.includes("stream") || message.includes("stream error") || message.includes("premature close")) {
|
|
894
|
+
return "stream_error";
|
|
895
|
+
}
|
|
851
896
|
return "unknown_error";
|
|
852
897
|
}
|
|
853
898
|
persistPartialSnapshot(parser, reason) {
|
|
@@ -864,12 +909,16 @@ class Agent {
|
|
|
864
909
|
return partial;
|
|
865
910
|
}
|
|
866
911
|
isContinuableError(error) {
|
|
867
|
-
|
|
912
|
+
if (error instanceof AgentTimeoutError ||
|
|
868
913
|
error instanceof AgentAbortError ||
|
|
869
914
|
error instanceof ToolKit_1.ToolExecutionError ||
|
|
870
915
|
error.name === "TimeoutError" ||
|
|
871
916
|
error.name === "AbortError" ||
|
|
872
|
-
error.name === "ToolExecutionError"
|
|
917
|
+
error.name === "ToolExecutionError") {
|
|
918
|
+
return true;
|
|
919
|
+
}
|
|
920
|
+
const reason = this.classifyStopReason(error);
|
|
921
|
+
return reason === "network_error" || reason === "stream_error";
|
|
873
922
|
}
|
|
874
923
|
}
|
|
875
924
|
exports.Agent = Agent;
|