@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../src/session/Session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../src/session/Session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Message } from "../message/Message";
|
|
2
|
+
import { Usage } from "../message/Usage";
|
|
2
3
|
import { FinishReason, StreamEvent } from "./StreamEvent";
|
|
3
4
|
/**
|
|
4
5
|
* 流式解析器
|
|
@@ -22,9 +23,10 @@ export declare class StreamParser {
|
|
|
22
23
|
private _toolCalls;
|
|
23
24
|
private _finishReason?;
|
|
24
25
|
private _finished;
|
|
26
|
+
private _usage?;
|
|
25
27
|
/**
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
* 喂入一个 OpenAI stream chunk,返回本次产出的事件
|
|
29
|
+
*/
|
|
28
30
|
feed(chunk: any): StreamEvent[];
|
|
29
31
|
/**
|
|
30
32
|
* 通知流结束,产出最终事件(TEXT_DONE、TOOL_CALL_DONE、MESSAGE_DONE)
|
|
@@ -38,9 +40,11 @@ export declare class StreamParser {
|
|
|
38
40
|
get finishReason(): FinishReason | undefined;
|
|
39
41
|
/** 当前是否已累积任何 assistant 内容 */
|
|
40
42
|
get hasSnapshotContent(): boolean;
|
|
43
|
+
/** 当前累积的 Usage(如流尚未传回则为 undefined) */
|
|
44
|
+
get usage(): Usage | undefined;
|
|
41
45
|
/**
|
|
42
|
-
|
|
43
|
-
|
|
46
|
+
* 重置解析器状态,可复用于下一轮
|
|
47
|
+
*/
|
|
44
48
|
reset(): void;
|
|
45
49
|
private buildMessage;
|
|
46
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamParser.d.ts","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EACL,YAAY,EACZ,WAAW,EAEZ,MAAM,eAAe,CAAC;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAkB;
|
|
1
|
+
{"version":3,"file":"StreamParser.d.ts","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,WAAW,EAEZ,MAAM,eAAe,CAAC;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,MAAM,CAAC,CAAQ;IAMvB;;KAEC;IACD,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,WAAW,EAAE;IA0G/B;;OAEG;IACH,MAAM,IAAI,WAAW,EAAE;IAgDvB;;OAEG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,2CAA2C;IAC3C,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAED,6BAA6B;IAC7B,IAAI,kBAAkB,IAAI,OAAO,CAIhC;IAED,sCAAsC;IACtC,IAAI,KAAK,IAAI,KAAK,GAAG,SAAS,CAE7B;IAMD;;KAEC;IACD,KAAK,IAAI,IAAI;IAab,OAAO,CAAC,YAAY;CA6BrB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.StreamParser = void 0;
|
|
4
4
|
const Message_1 = require("../message/Message");
|
|
5
5
|
const Role_1 = require("../message/Role");
|
|
6
|
+
const Usage_1 = require("../message/Usage");
|
|
6
7
|
const StreamEvent_1 = require("./StreamEvent");
|
|
7
8
|
/**
|
|
8
9
|
* 流式解析器
|
|
@@ -26,16 +27,22 @@ class StreamParser {
|
|
|
26
27
|
_toolCalls = new Map();
|
|
27
28
|
_finishReason;
|
|
28
29
|
_finished = false;
|
|
30
|
+
_usage;
|
|
29
31
|
//========================
|
|
30
32
|
//喂入Chunk
|
|
31
33
|
// ========================
|
|
32
34
|
/**
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
* 喂入一个 OpenAI stream chunk,返回本次产出的事件
|
|
36
|
+
*/
|
|
35
37
|
feed(chunk) {
|
|
36
38
|
const events = [];
|
|
37
39
|
try {
|
|
38
|
-
|
|
40
|
+
// 先处理 usage —— OpenAI stream 启用 include_usage 时,
|
|
41
|
+
// 最后一个 chunk 通常 choices 为空但 usage 有值,必须先于 choices 短路捕获。
|
|
42
|
+
if (chunk?.usage) {
|
|
43
|
+
this._usage = Usage_1.Usage.fromRaw(chunk.usage);
|
|
44
|
+
}
|
|
45
|
+
const choices = chunk?.choices;
|
|
39
46
|
if (!choices || choices.length === 0)
|
|
40
47
|
return events;
|
|
41
48
|
const choice = choices[0];
|
|
@@ -48,7 +55,7 @@ class StreamParser {
|
|
|
48
55
|
// ---- 思考/推理增量 ----
|
|
49
56
|
//兼容多种字段名:reasoning_content (DeepSeek/Qwen), thinking (Claude)
|
|
50
57
|
const thinkingDelta = delta.reasoning_content ?? delta.thinking ?? null;
|
|
51
|
-
if (thinkingDelta) {
|
|
58
|
+
if (thinkingDelta !== null && thinkingDelta !== undefined) {
|
|
52
59
|
this._thinkingBuffer += thinkingDelta;
|
|
53
60
|
events.push({
|
|
54
61
|
type: StreamEvent_1.StreamEventType.THINKING_DELTA,
|
|
@@ -57,7 +64,7 @@ class StreamParser {
|
|
|
57
64
|
});
|
|
58
65
|
}
|
|
59
66
|
// ---- 文本增量 ----
|
|
60
|
-
if (delta.content) {
|
|
67
|
+
if (delta.content !== null && delta.content !== undefined) {
|
|
61
68
|
this._textBuffer += delta.content;
|
|
62
69
|
events.push({
|
|
63
70
|
type: StreamEvent_1.StreamEventType.TEXT_DELTA,
|
|
@@ -183,18 +190,23 @@ class StreamParser {
|
|
|
183
190
|
this._textBuffer.length > 0 ||
|
|
184
191
|
this._toolCalls.size > 0;
|
|
185
192
|
}
|
|
193
|
+
/** 当前累积的 Usage(如流尚未传回则为 undefined) */
|
|
194
|
+
get usage() {
|
|
195
|
+
return this._usage;
|
|
196
|
+
}
|
|
186
197
|
// ========================
|
|
187
198
|
// 重置
|
|
188
199
|
// ========================
|
|
189
200
|
/**
|
|
190
|
-
|
|
191
|
-
|
|
201
|
+
* 重置解析器状态,可复用于下一轮
|
|
202
|
+
*/
|
|
192
203
|
reset() {
|
|
193
204
|
this._thinkingBuffer = "";
|
|
194
205
|
this._textBuffer = "";
|
|
195
206
|
this._toolCalls.clear();
|
|
196
207
|
this._finishReason = undefined;
|
|
197
208
|
this._finished = false;
|
|
209
|
+
this._usage = undefined;
|
|
198
210
|
}
|
|
199
211
|
// ========================
|
|
200
212
|
// 内部
|
|
@@ -218,7 +230,11 @@ class StreamParser {
|
|
|
218
230
|
arguments: acc.argsBuffer,
|
|
219
231
|
});
|
|
220
232
|
}
|
|
221
|
-
|
|
233
|
+
const msg = new Message_1.Message(Role_1.Role.Assistant, parts);
|
|
234
|
+
if (this._usage) {
|
|
235
|
+
msg.usage = this._usage;
|
|
236
|
+
}
|
|
237
|
+
return msg;
|
|
222
238
|
}
|
|
223
239
|
}
|
|
224
240
|
exports.StreamParser = StreamParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamParser.js","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,0CAAuC;AAEvC,+CAIuB;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,MAAa,YAAY;IACf,eAAe,GAAW,EAAE,CAAC;IAC7B,WAAW,GAAW,EAAE,CAAC;IACzB,UAAU,GAAqC,IAAI,GAAG,EAAE,CAAC;IACzD,aAAa,CAAgB;IAC7B,SAAS,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"StreamParser.js","sourceRoot":"","sources":["../../src/stream/StreamParser.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,0CAAuC;AAEvC,4CAAyC;AACzC,+CAIuB;AAUvB;;;;;;;;;;;;;;;GAeG;AACH,MAAa,YAAY;IACf,eAAe,GAAW,EAAE,CAAC;IAC7B,WAAW,GAAW,EAAE,CAAC;IACzB,UAAU,GAAqC,IAAI,GAAG,EAAE,CAAC;IACzD,aAAa,CAAgB;IAC7B,SAAS,GAAY,KAAK,CAAC;IAC3B,MAAM,CAAS;IAEvB,0BAA0B;IAC1B,SAAS;IACT,2BAA2B;IAE3B;;KAEC;IACD,IAAI,CAAC,KAAU;QACb,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,IAAI,CAAC;YACH,iDAAiD;YACjD,wDAAwD;YACxD,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,GAAG,aAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YAED,MAAM,OAAO,GAAG,KAAK,EAAE,OAAO,CAAC;YAC/B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,MAAM,CAAC;YAEpD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACzB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;YAC5C,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,KAAK;gBAAE,OAAO,MAAM,CAAC;YAE1B,oBAAoB;YACpB,8DAA8D;YAC9D,MAAM,aAAa,GACjB,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC;YAEpD,IAAI,aAAa,KAAK,IAAI,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAC1D,IAAI,CAAC,eAAe,IAAI,aAAa,CAAC;gBACtC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,6BAAe,CAAC,cAAc;oBACpC,KAAK,EAAE,aAAa;oBACpB,QAAQ,EAAE,IAAI,CAAC,eAAe;iBAC/B,CAAC,CAAC;YACL,CAAC;YAED,iBAAiB;YACjB,IAAI,KAAK,CAAC,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1D,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,6BAAe,CAAC,UAAU;oBAChC,KAAK,EAAE,KAAK,CAAC,OAAO;oBACpB,QAAQ,EAAE,IAAI,CAAC,WAAW;iBAC3B,CAAC,CAAC;YACL,CAAC;YAED,mBAAmB;YACnB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACrB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;oBAClC,MAAM,KAAK,GAAW,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC;oBAEpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;wBAChC,SAAS;wBACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE;4BACzB,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE;4BACf,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE;4BAC7B,UAAU,EAAE,EAAE,CAAC,QAAQ,EAAE,SAAS,IAAI,EAAE;4BACxC,OAAO,EAAE,KAAK;yBACf,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,KAAK;wBACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;wBACxC,IAAI,EAAE,CAAC,EAAE;4BAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;wBAC1B,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI;4BAAE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACnD,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;4BAC3B,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAC1C,CAAC;oBACH,CAAC;oBAED,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;oBAExC,0BAA0B;oBAC1B,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;wBACvC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;wBACnB,MAAM,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,6BAAe,CAAC,eAAe;4BACrC,KAAK;4BACL,UAAU,EAAE,GAAG,CAAC,EAAE;4BAClB,IAAI,EAAE,GAAG,CAAC,IAAI;yBACf,CAAC,CAAC;oBACL,CAAC;oBAED,OAAO;oBACP,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,6BAAe,CAAC,eAAe;4BACrC,KAAK;4BACL,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;4BAChC,YAAY,EAAE,GAAG,CAAC,UAAU;yBAC7B,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,6BAAe,CAAC,KAAK;gBAC3B,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACrD,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2BAA2B;IAC3B,MAAM;IACN,2BAA2B;IAE3B;;OAEG;IACH,MAAM;QACJ,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,gBAAgB;QAChB,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,6BAAe,CAAC,aAAa;gBACnC,QAAQ,EAAE,IAAI,CAAC,eAAe;aAC/B,CAAC,CAAC;QACL,CAAC;QAED,YAAY;QACZ,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,6BAAe,CAAC,SAAS;gBAC/B,IAAI,EAAE,IAAI,CAAC,WAAW;aACvB,CAAC,CAAC;QACL,CAAC;QAED,iBAAiB;QACjB,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,6BAAe,CAAC,cAAc;gBACpC,KAAK;gBACL,UAAU,EAAE,GAAG,CAAC,EAAE;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,SAAS,EAAE,GAAG,CAAC,UAAU;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,eAAe;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,6BAAe,CAAC,YAAY;YAClC,OAAO;YACP,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2BAA2B;IAC3B,MAAM;IACN,2BAA2B;IAE3B;;OAEG;IACH,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,2CAA2C;IAC3C,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,6BAA6B;IAC7B,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,sCAAsC;IACtC,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,2BAA2B;IAC3B,MAAM;IACN,2BAA2B;IAE3B;;KAEC;IACD,KAAK;QACH,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,2BAA2B;IAC3B,MAAM;IACN,2BAA2B;IAEnB,YAAY;QAClB,MAAM,KAAK,GAAkB,EAAE,CAAC;QAEhC,KAAK;QACL,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,KAAK;QACL,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO;QACP,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,GAAG,CAAC,EAAE;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,SAAS,EAAE,GAAG,CAAC,UAAU;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,WAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AArPD,oCAqPC"}
|
package/dist/tool/Tool.js
CHANGED
package/dist/tool/Tool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tool.js","sourceRoot":"","sources":["../../src/tool/Tool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Tool.js","sourceRoot":"","sources":["../../src/tool/Tool.ts"],"names":[],"mappings":"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"}
|
package/dist/tool/ToolCall.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Context } from "./Context";
|
|
1
2
|
import { Message } from "../message";
|
|
2
3
|
import type { Tool } from "./Tool";
|
|
3
4
|
/**
|
|
@@ -16,7 +17,7 @@ export declare class ToolCall {
|
|
|
16
17
|
private _executed;
|
|
17
18
|
private _error?;
|
|
18
19
|
private _ctx?;
|
|
19
|
-
constructor(template: Tool, id: string, name: string, args: Record<string, unknown>, signal?: AbortSignal);
|
|
20
|
+
constructor(template: Tool, id: string, name: string, args: Record<string, unknown>, signal?: AbortSignal, ctx?: Context);
|
|
20
21
|
execute(): Promise<unknown>;
|
|
21
22
|
/**
|
|
22
23
|
* 将执行结果序列化为 Message.tool(),回传给 LLM
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolCall.d.ts","sourceRoot":"","sources":["../../src/tool/ToolCall.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ToolCall.d.ts","sourceRoot":"","sources":["../../src/tool/ToolCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC;;;;;GAKG;AACH,qBAAa,QAAQ;IACnB,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEnD,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,OAAO,CAAC,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,IAAI,CAAC,CAAU;gBAGrB,QAAQ,EAAE,IAAI,EACd,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,CAAC,EAAE,WAAW,EACpB,GAAG,CAAC,EAAE,OAAO;IAcT,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IA6CjC;;OAEG;IACH,SAAS,IAAI,OAAO;IAmBpB,IAAI,MAAM,IAAI,OAAO,CAKpB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,KAAK,IAAI,KAAK,GAAG,SAAS,CAE7B;IAMD;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAM3B"}
|
package/dist/tool/ToolCall.js
CHANGED
|
@@ -20,12 +20,13 @@ class ToolCall {
|
|
|
20
20
|
_executed = false;
|
|
21
21
|
_error;
|
|
22
22
|
_ctx;
|
|
23
|
-
constructor(template, id, name, args, signal) {
|
|
23
|
+
constructor(template, id, name, args, signal, ctx) {
|
|
24
24
|
this._template = template;
|
|
25
25
|
this._signal = signal;
|
|
26
26
|
this.id = id;
|
|
27
27
|
this.name = name;
|
|
28
28
|
this.arguments = args;
|
|
29
|
+
this._ctx = ctx;
|
|
29
30
|
}
|
|
30
31
|
// ========================
|
|
31
32
|
// 执行(完整生命周期)
|
|
@@ -80,7 +81,7 @@ class ToolCall {
|
|
|
80
81
|
const content = typeof ctx.result === "string"
|
|
81
82
|
? ctx.result
|
|
82
83
|
: JSON.stringify(ctx.result ?? null);
|
|
83
|
-
return message_1.Message.tool(this.id, content);
|
|
84
|
+
return message_1.Message.tool(this.id, content, this.name);
|
|
84
85
|
}
|
|
85
86
|
// ========================
|
|
86
87
|
// 状态 Getter
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolCall.js","sourceRoot":"","sources":["../../src/tool/ToolCall.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AACpC,iCAA8B;AAC9B,wCAAqC;AAIrC;;;;;GAKG;AACH,MAAa,QAAQ;IACH,EAAE,CAAS;IACX,IAAI,CAAS;IACb,SAAS,CAA0B;IAE3C,SAAS,CAAO;IAChB,OAAO,CAAe;IACtB,OAAO,CAAW;IAClB,SAAS,GAAY,KAAK,CAAC;IAC3B,MAAM,CAAS;IACf,IAAI,CAAW;IAEvB,YACE,QAAc,EACd,EAAU,EACV,IAAY,EACZ,IAA6B,EAC7B,MAAoB;
|
|
1
|
+
{"version":3,"file":"ToolCall.js","sourceRoot":"","sources":["../../src/tool/ToolCall.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolKit.d.ts","sourceRoot":"","sources":["../../src/tool/ToolKit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,MAAM,eAAe,GAAG,iBAAiB,GAAG,OAAO,CAAC;AAE1D,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;gBAEb,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;CAQjE;AAED,MAAM,WAAW,oBAAoB;IACnC,qCAAqC;IACrC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,gCAAgC;IAChC,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAgC;IAM9C;;OAEG;IACH,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAU3B;;;;OAIG;IACG,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAelD,cAAc;IACd,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAInC,eAAe;IACf,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,oCAAoC;IACpC,IAAI,OAAO,IAAI,UAAU,EAAE,CAE1B;IAED,WAAW;IACX,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,WAAW;IACX,IAAI,IAAI,IAAI,MAAM,CAEjB;IAMD;;;;OAIG;IACG,OAAO,CACX,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolKit.d.ts","sourceRoot":"","sources":["../../src/tool/ToolKit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,MAAM,eAAe,GAAG,iBAAiB,GAAG,OAAO,CAAC;AAE1D,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;gBAEb,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;CAQjE;AAED,MAAM,WAAW,oBAAoB;IACnC,qCAAqC;IACrC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,gCAAgC;IAChC,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAgC;IAM9C;;OAEG;IACH,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAU3B;;;;OAIG;IACG,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAelD,cAAc;IACd,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAInC,eAAe;IACf,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,oCAAoC;IACpC,IAAI,OAAO,IAAI,UAAU,EAAE,CAE1B;IAED,WAAW;IACX,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,WAAW;IACX,IAAI,IAAI,IAAI,MAAM,CAEjB;IAMD;;;;OAIG;IACG,OAAO,CACX,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,OAAO,CAAC;IAiCnB;;OAEG;IACG,UAAU,CACd,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,OAAO,EAAE,CAAC;IAQrB,OAAO,CAAC,cAAc;CAWvB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,IAAI,OAAO,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC;YACX,IAAI,EAAE,MAAM,CAAC;YACb,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACtC,CAAC,CAAC;KACJ,CAAC,CAAC;IACH,QAAQ,CAAC,MAAM,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrC,GAAG,OAAO,CAAC;QACV,OAAO,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACjD,CAAC,CAAC;CACJ"}
|
package/dist/tool/ToolKit.js
CHANGED
|
@@ -130,7 +130,7 @@ class ToolKit {
|
|
|
130
130
|
const tool = this._tools.get(toolCallPart.name);
|
|
131
131
|
if (!tool) {
|
|
132
132
|
//工具不存在,返回错误消息
|
|
133
|
-
return Message_1.Message.tool(toolCallPart.toolCallId, JSON.stringify({ error: `未知工具: ${toolCallPart.name}` }));
|
|
133
|
+
return Message_1.Message.tool(toolCallPart.toolCallId, JSON.stringify({ error: `未知工具: ${toolCallPart.name}` }), toolCallPart.name);
|
|
134
134
|
}
|
|
135
135
|
const args = this.parseArguments(toolCallPart.arguments);
|
|
136
136
|
const call = tool.create(toolCallPart.toolCallId, args, options?.signal);
|
|
@@ -143,7 +143,7 @@ class ToolKit {
|
|
|
143
143
|
}
|
|
144
144
|
// 执行失败,返回错误消息
|
|
145
145
|
const errorMsg = e instanceof Error ? e.message : String(e);
|
|
146
|
-
return Message_1.Message.tool(toolCallPart.toolCallId, JSON.stringify({ error: errorMsg }));
|
|
146
|
+
return Message_1.Message.tool(toolCallPart.toolCallId, JSON.stringify({ error: errorMsg }), toolCallPart.name);
|
|
147
147
|
}
|
|
148
148
|
return call.toMessage();
|
|
149
149
|
}
|
package/dist/tool/ToolKit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolKit.js","sourceRoot":"","sources":["../../src/tool/ToolKit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,gDAA6C;AAI7C,MAAa,kBAAmB,SAAQ,KAAK;IAClC,UAAU,CAAS;IACnB,QAAQ,CAAS;IACjB,KAAK,CAAW;IAEzB,YAAY,UAAkB,EAAE,QAAgB,EAAE,KAAc;QAC9D,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,KAAK,CAAC,WAAW,QAAQ,MAAM,OAAO,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAbD,gDAaC;AASD;;;;;;;;;;;;;GAaG;AACH,MAAa,OAAO;IACV,MAAM,GAAsB,IAAI,GAAG,EAAE,CAAC;IAE9C,2BAA2B;IAC3B,QAAQ;IACR,2BAA2B;IAE3B;;OAEG;IACH,GAAG,CAAC,GAAG,KAAa;QAClB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7C,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,MAAqB;QAChC,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACtD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2BAA2B;IAC3B,MAAM;IACN,2BAA2B;IAE3B,cAAc;IACd,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,eAAe;IACf,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,oCAAoC;IACpC,IAAI,OAAO;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,WAAW;IACX,IAAI,KAAK;QACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,WAAW;IACX,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,2BAA2B;IAC3B,uBAAuB;IACvB,2BAA2B;IAE3B;;;;OAIG;IACH,KAAK,CAAC,OAAO,CACX,YAA0B,EAC1B,OAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,cAAc;YACd,OAAO,iBAAO,CAAC,IAAI,CACjB,YAAY,CAAC,UAAU,EACvB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,SAAS,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"ToolKit.js","sourceRoot":"","sources":["../../src/tool/ToolKit.ts"],"names":[],"mappings":"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"}
|