@cicctencent/agent-core 0.1.70 → 0.1.72
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/dist/cjs/a2a/client.d.ts +39 -11
- package/dist/cjs/a2a/client.d.ts.map +1 -1
- package/dist/cjs/a2a/client.js +69 -22
- package/dist/cjs/a2a/client.js.map +1 -1
- package/dist/cjs/a2a/rest-client.d.ts +35 -9
- package/dist/cjs/a2a/rest-client.d.ts.map +1 -1
- package/dist/cjs/a2a/rest-client.js +65 -18
- package/dist/cjs/a2a/rest-client.js.map +1 -1
- package/dist/cjs/a2a/rest-runner.d.ts +6 -0
- package/dist/cjs/a2a/rest-runner.d.ts.map +1 -1
- package/dist/cjs/a2a/rest-runner.js +19 -7
- package/dist/cjs/a2a/rest-runner.js.map +1 -1
- package/dist/cjs/a2a/runner.d.ts +6 -0
- package/dist/cjs/a2a/runner.d.ts.map +1 -1
- package/dist/cjs/a2a/runner.js +24 -7
- package/dist/cjs/a2a/runner.js.map +1 -1
- package/dist/cjs/index.d.ts +5 -2
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +15 -10
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/llm/debug.d.ts.map +1 -1
- package/dist/cjs/llm/debug.js +4 -1
- package/dist/cjs/llm/debug.js.map +1 -1
- package/dist/cjs/mcp/base-client.d.ts +19 -4
- package/dist/cjs/mcp/base-client.d.ts.map +1 -1
- package/dist/cjs/mcp/base-client.js +28 -8
- package/dist/cjs/mcp/base-client.js.map +1 -1
- package/dist/cjs/mcp/http-client.d.ts +5 -5
- package/dist/cjs/mcp/http-client.d.ts.map +1 -1
- package/dist/cjs/mcp/http-client.js +26 -21
- package/dist/cjs/mcp/http-client.js.map +1 -1
- package/dist/cjs/mcp/proxy-agent.d.ts +2 -50
- package/dist/cjs/mcp/proxy-agent.d.ts.map +1 -1
- package/dist/cjs/mcp/proxy-agent.js +12 -174
- package/dist/cjs/mcp/proxy-agent.js.map +1 -1
- package/dist/cjs/mcp/stdio-client.d.ts +1 -1
- package/dist/cjs/mcp/stdio-client.d.ts.map +1 -1
- package/dist/cjs/mcp/stdio-client.js +1 -1
- package/dist/cjs/mcp/stdio-client.js.map +1 -1
- package/dist/cjs/mcp/types.d.ts +8 -2
- package/dist/cjs/mcp/types.d.ts.map +1 -1
- package/dist/cjs/tool/delegate.d.ts +12 -1
- package/dist/cjs/tool/delegate.d.ts.map +1 -1
- package/dist/cjs/tool/delegate.js +21 -5
- package/dist/cjs/tool/delegate.js.map +1 -1
- package/dist/cjs/utils/header-vars.d.ts +18 -0
- package/dist/cjs/utils/header-vars.d.ts.map +1 -0
- package/dist/cjs/utils/header-vars.js +71 -0
- package/dist/cjs/utils/header-vars.js.map +1 -0
- package/dist/cjs/utils/proxy-agent.d.ts +53 -0
- package/dist/cjs/utils/proxy-agent.d.ts.map +1 -0
- package/dist/cjs/utils/proxy-agent.js +154 -0
- package/dist/cjs/utils/proxy-agent.js.map +1 -0
- package/dist/cjs/utils/proxy.d.ts +53 -0
- package/dist/cjs/utils/proxy.d.ts.map +1 -0
- package/dist/cjs/utils/proxy.js +148 -0
- package/dist/cjs/utils/proxy.js.map +1 -0
- package/dist/cjs/utils/system-proxy.d.ts +15 -0
- package/dist/cjs/utils/system-proxy.d.ts.map +1 -0
- package/dist/cjs/utils/system-proxy.js +133 -0
- package/dist/cjs/utils/system-proxy.js.map +1 -0
- package/dist/esm/a2a/client.d.ts +39 -11
- package/dist/esm/a2a/client.d.ts.map +1 -1
- package/dist/esm/a2a/client.js +69 -22
- package/dist/esm/a2a/client.js.map +1 -1
- package/dist/esm/a2a/rest-client.d.ts +35 -9
- package/dist/esm/a2a/rest-client.d.ts.map +1 -1
- package/dist/esm/a2a/rest-client.js +65 -18
- package/dist/esm/a2a/rest-client.js.map +1 -1
- package/dist/esm/a2a/rest-runner.d.ts +6 -0
- package/dist/esm/a2a/rest-runner.d.ts.map +1 -1
- package/dist/esm/a2a/rest-runner.js +19 -7
- package/dist/esm/a2a/rest-runner.js.map +1 -1
- package/dist/esm/a2a/runner.d.ts +6 -0
- package/dist/esm/a2a/runner.d.ts.map +1 -1
- package/dist/esm/a2a/runner.js +24 -7
- package/dist/esm/a2a/runner.js.map +1 -1
- package/dist/esm/index.d.ts +5 -2
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/llm/debug.d.ts.map +1 -1
- package/dist/esm/llm/debug.js +4 -1
- package/dist/esm/llm/debug.js.map +1 -1
- package/dist/esm/mcp/base-client.d.ts +19 -4
- package/dist/esm/mcp/base-client.d.ts.map +1 -1
- package/dist/esm/mcp/base-client.js +28 -8
- package/dist/esm/mcp/base-client.js.map +1 -1
- package/dist/esm/mcp/http-client.d.ts +5 -5
- package/dist/esm/mcp/http-client.d.ts.map +1 -1
- package/dist/esm/mcp/http-client.js +25 -20
- package/dist/esm/mcp/http-client.js.map +1 -1
- package/dist/esm/mcp/proxy-agent.d.ts +2 -50
- package/dist/esm/mcp/proxy-agent.d.ts.map +1 -1
- package/dist/esm/mcp/proxy-agent.js +7 -168
- package/dist/esm/mcp/proxy-agent.js.map +1 -1
- package/dist/esm/mcp/stdio-client.d.ts +1 -1
- package/dist/esm/mcp/stdio-client.d.ts.map +1 -1
- package/dist/esm/mcp/stdio-client.js +1 -1
- package/dist/esm/mcp/stdio-client.js.map +1 -1
- package/dist/esm/mcp/types.d.ts +8 -2
- package/dist/esm/mcp/types.d.ts.map +1 -1
- package/dist/esm/tool/delegate.d.ts +12 -1
- package/dist/esm/tool/delegate.d.ts.map +1 -1
- package/dist/esm/tool/delegate.js +21 -5
- package/dist/esm/tool/delegate.js.map +1 -1
- package/dist/esm/utils/header-vars.d.ts +18 -0
- package/dist/esm/utils/header-vars.d.ts.map +1 -0
- package/dist/esm/utils/header-vars.js +65 -0
- package/dist/esm/utils/header-vars.js.map +1 -0
- package/dist/esm/utils/proxy-agent.d.ts +53 -0
- package/dist/esm/utils/proxy-agent.d.ts.map +1 -0
- package/dist/esm/utils/proxy-agent.js +115 -0
- package/dist/esm/utils/proxy-agent.js.map +1 -0
- package/dist/esm/utils/proxy.d.ts +53 -0
- package/dist/esm/utils/proxy.d.ts.map +1 -0
- package/dist/esm/utils/proxy.js +109 -0
- package/dist/esm/utils/proxy.js.map +1 -0
- package/dist/esm/utils/system-proxy.d.ts +15 -0
- package/dist/esm/utils/system-proxy.d.ts.map +1 -0
- package/dist/esm/utils/system-proxy.js +128 -0
- package/dist/esm/utils/system-proxy.js.map +1 -0
- package/package.json +1 -1
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.RestA2AClient = void 0;
|
|
18
18
|
const client_ts_1 = require("./client.js");
|
|
19
|
+
const proxy_ts_1 = require("../utils/proxy.js");
|
|
20
|
+
const header_vars_ts_1 = require("../utils/header-vars.js");
|
|
19
21
|
// ---- RestA2AClient ----
|
|
20
22
|
/**
|
|
21
23
|
* REST 风格 A2A 协议客户端
|
|
@@ -30,19 +32,52 @@ class RestA2AClient {
|
|
|
30
32
|
connectTimeout;
|
|
31
33
|
chunkTimeout;
|
|
32
34
|
fetchFn;
|
|
33
|
-
|
|
35
|
+
/** 鉴权配置(构造时保存,发送时结合运行时变量解析) */
|
|
36
|
+
authConfig;
|
|
37
|
+
/** 自定义请求头模板(值可含 ${vars.x} / ${env.x} 占位符,发送时解析) */
|
|
38
|
+
headerTemplates;
|
|
39
|
+
/** 默认运行时变量 */
|
|
40
|
+
contextVars;
|
|
34
41
|
onDebugTrace;
|
|
42
|
+
proxyUrl;
|
|
43
|
+
proxyDispatcher;
|
|
35
44
|
constructor(options = {}) {
|
|
36
45
|
this.timeout = options.timeout ?? 300_000;
|
|
37
46
|
this.connectTimeout = options.connectTimeout ?? 30_000;
|
|
38
47
|
this.chunkTimeout = options.chunkTimeout ?? 60_000;
|
|
39
48
|
this.fetchFn = options.fetch ?? globalThis.fetch.bind(globalThis);
|
|
40
|
-
this.
|
|
49
|
+
this.authConfig = options.auth;
|
|
50
|
+
this.headerTemplates = { ...(options.headers ?? {}) };
|
|
51
|
+
this.contextVars = options.vars;
|
|
41
52
|
this.onDebugTrace = options.onDebugTrace;
|
|
53
|
+
this.proxyUrl = options.proxy;
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* 更新运行时变量(如 userId / userMail)。
|
|
57
|
+
* 后续请求将使用更新后的值解析 ${vars.x} 占位符。
|
|
58
|
+
*/
|
|
59
|
+
setContextVars(vars) {
|
|
60
|
+
this.contextVars = { ...(this.contextVars || {}), ...vars };
|
|
61
|
+
}
|
|
62
|
+
/** 合并运行时变量:构造时默认 vars + 本次调用传入的 vars(后者优先) */
|
|
63
|
+
mergeVars(callVars) {
|
|
64
|
+
return { ...(this.contextVars || {}), ...(callVars || {}) };
|
|
65
|
+
}
|
|
66
|
+
/** 解析本次请求生效的请求头(合并 auth + 自定义头,并应用 ${vars.x}/${env.x} 模板) */
|
|
67
|
+
resolveHeaders(callVars) {
|
|
68
|
+
const vars = this.mergeVars(callVars);
|
|
69
|
+
return {
|
|
70
|
+
...(0, client_ts_1.buildAuthHeaders)(this.authConfig, vars),
|
|
71
|
+
...(0, header_vars_ts_1.resolveHeaderTemplates)(this.headerTemplates, vars),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
/** 对请求体参数进行变量插值(${vars.x}/${env.x}/${x}),深拷贝不改原对象 */
|
|
75
|
+
resolveBody(body, callVars) {
|
|
76
|
+
return (0, header_vars_ts_1.interpolateValue)(body, this.mergeVars(callVars));
|
|
42
77
|
}
|
|
43
78
|
// ---- Capability 发现 ----
|
|
44
79
|
/** 获取 Capability Card:GET /capabilities/{capabilityId},失败时尝试 :stream 探测 */
|
|
45
|
-
async discoverCapability(baseUrl, capabilityId, streamAction) {
|
|
80
|
+
async discoverCapability(baseUrl, capabilityId, streamAction, vars) {
|
|
46
81
|
const url = this.buildCapabilityUrl(baseUrl, capabilityId);
|
|
47
82
|
console.log(`[REST-A2A] discoverCapability -> GET ${url}`);
|
|
48
83
|
try {
|
|
@@ -67,7 +102,7 @@ class RestA2AClient {
|
|
|
67
102
|
const timer = setTimeout(() => controller.abort(), 10_000);
|
|
68
103
|
const res = await this.fetchFn(streamUrl, {
|
|
69
104
|
method: 'POST',
|
|
70
|
-
headers: { 'Content-Type': 'application/json', ...this.
|
|
105
|
+
headers: { 'Content-Type': 'application/json', ...this.resolveHeaders(vars) },
|
|
71
106
|
body: JSON.stringify({}),
|
|
72
107
|
signal: controller.signal,
|
|
73
108
|
});
|
|
@@ -116,18 +151,18 @@ class RestA2AClient {
|
|
|
116
151
|
}
|
|
117
152
|
// ---- 同步调用 ----
|
|
118
153
|
/** 同步调用:POST /api/v1/a2a/capabilities/{capabilityId}:{action} */
|
|
119
|
-
async invoke(baseUrl, capabilityId, input, action) {
|
|
154
|
+
async invoke(baseUrl, capabilityId, input, action, vars) {
|
|
120
155
|
const url = this.buildCapabilityUrl(baseUrl, capabilityId, action || 'invoke');
|
|
121
156
|
console.log(`[REST-A2A-Client] invoke start: POST ${url}`);
|
|
122
157
|
console.log(`[REST-A2A-Client] invoke input: ${JSON.stringify(input, null, 2).slice(0, 500)}`);
|
|
123
158
|
const startTime = Date.now();
|
|
124
|
-
const requestHeaders = { 'Content-Type': 'application/json', ...this.
|
|
159
|
+
const requestHeaders = { 'Content-Type': 'application/json', ...this.resolveHeaders(vars) };
|
|
125
160
|
let res;
|
|
126
161
|
try {
|
|
127
162
|
res = await this.fetchWithTimeout(url, {
|
|
128
163
|
method: 'POST',
|
|
129
164
|
headers: requestHeaders,
|
|
130
|
-
body: JSON.stringify(input),
|
|
165
|
+
body: JSON.stringify(this.resolveBody(input, vars)),
|
|
131
166
|
});
|
|
132
167
|
}
|
|
133
168
|
catch (err) {
|
|
@@ -184,7 +219,7 @@ class RestA2AClient {
|
|
|
184
219
|
*
|
|
185
220
|
* @returns 最后一个 result 事件的数据,或 null(流中断且无 result)
|
|
186
221
|
*/
|
|
187
|
-
async invokeStreaming(baseUrl, capabilityId, input, onEvent, abortSignal, action) {
|
|
222
|
+
async invokeStreaming(baseUrl, capabilityId, input, onEvent, abortSignal, action, vars) {
|
|
188
223
|
const url = this.buildCapabilityUrl(baseUrl, capabilityId, action || 'stream');
|
|
189
224
|
console.log(`[REST-A2A-Client] invokeStreaming start: POST ${url}`);
|
|
190
225
|
console.log(`[REST-A2A-Client] invokeStreaming input: ${JSON.stringify(input, null, 2).slice(0, 500)}`);
|
|
@@ -201,12 +236,12 @@ class RestA2AClient {
|
|
|
201
236
|
}
|
|
202
237
|
let res;
|
|
203
238
|
const connectStartTime = Date.now();
|
|
204
|
-
const requestHeaders = { 'Content-Type': 'application/json', ...this.
|
|
239
|
+
const requestHeaders = { 'Content-Type': 'application/json', ...this.resolveHeaders(vars) };
|
|
205
240
|
try {
|
|
206
241
|
res = await this.fetchFn(url, {
|
|
207
242
|
method: 'POST',
|
|
208
243
|
headers: requestHeaders,
|
|
209
|
-
body: JSON.stringify(input),
|
|
244
|
+
body: JSON.stringify(this.resolveBody(input, vars)),
|
|
210
245
|
signal: connectAbort.signal,
|
|
211
246
|
});
|
|
212
247
|
console.log(`[REST-A2A-Client] invokeStreaming connected: HTTP ${res.status} (${Date.now() - connectStartTime}ms)`);
|
|
@@ -368,14 +403,14 @@ class RestA2AClient {
|
|
|
368
403
|
}
|
|
369
404
|
// ---- 异步任务 ----
|
|
370
405
|
/** 异步提交:POST /api/v1/a2a/capabilities/{capabilityId}:submit */
|
|
371
|
-
async submit(baseUrl, capabilityId, input) {
|
|
406
|
+
async submit(baseUrl, capabilityId, input, vars) {
|
|
372
407
|
const url = this.buildCapabilityUrl(baseUrl, capabilityId, 'submit');
|
|
373
408
|
console.log(`[REST-A2A-Client] submit start: POST ${url}`);
|
|
374
409
|
console.log(`[REST-A2A-Client] submit input: ${JSON.stringify(input, null, 2).slice(0, 500)}`);
|
|
375
410
|
const res = await this.fetchWithTimeout(url, {
|
|
376
411
|
method: 'POST',
|
|
377
|
-
headers: { 'Content-Type': 'application/json', ...this.
|
|
378
|
-
body: JSON.stringify(input),
|
|
412
|
+
headers: { 'Content-Type': 'application/json', ...this.resolveHeaders(vars) },
|
|
413
|
+
body: JSON.stringify(this.resolveBody(input, vars)),
|
|
379
414
|
});
|
|
380
415
|
if (!res.ok) {
|
|
381
416
|
let bodyText = '';
|
|
@@ -391,11 +426,14 @@ class RestA2AClient {
|
|
|
391
426
|
return result;
|
|
392
427
|
}
|
|
393
428
|
/** 查询任务状态:GET /api/v1/a2a/tasks/{taskId} */
|
|
394
|
-
async getTask(baseUrl, taskId) {
|
|
429
|
+
async getTask(baseUrl, taskId, vars) {
|
|
395
430
|
const trimmed = baseUrl.replace(/\/+$/, '');
|
|
396
431
|
const url = `${trimmed}/api/v1/a2a/tasks/${taskId}`;
|
|
397
432
|
console.log(`[REST-A2A-Client] getTask: GET ${url}`);
|
|
398
|
-
const res = await this.fetchWithTimeout(url, {
|
|
433
|
+
const res = await this.fetchWithTimeout(url, {
|
|
434
|
+
method: 'GET',
|
|
435
|
+
headers: this.resolveHeaders(vars),
|
|
436
|
+
});
|
|
399
437
|
if (!res.ok) {
|
|
400
438
|
let bodyText = '';
|
|
401
439
|
try {
|
|
@@ -446,14 +484,23 @@ class RestA2AClient {
|
|
|
446
484
|
clearTimeout(timer);
|
|
447
485
|
}
|
|
448
486
|
}
|
|
449
|
-
/** 带超时的 fetch */
|
|
487
|
+
/** 带超时的 fetch(自动应用代理 dispatcher,无代理时直连) */
|
|
450
488
|
async fetchWithTimeout(url, init) {
|
|
451
489
|
const controller = new AbortController();
|
|
452
490
|
const timer = setTimeout(() => controller.abort(), this.timeout);
|
|
453
491
|
console.log(`[REST-A2A-Client] fetchWithTimeout: ${init.method || 'GET'} ${url} (timeout=${this.timeout}ms)`);
|
|
454
492
|
const startTime = Date.now();
|
|
455
493
|
try {
|
|
456
|
-
|
|
494
|
+
// 懒加载 ProxyAgent dispatcher(仅在有代理时创建一次)
|
|
495
|
+
if (this.proxyUrl && !this.proxyDispatcher) {
|
|
496
|
+
this.proxyDispatcher = await (0, proxy_ts_1.createProxyDispatcher)(this.proxyUrl);
|
|
497
|
+
}
|
|
498
|
+
const dispatcher = this.proxyDispatcher;
|
|
499
|
+
const res = await this.fetchFn(url, {
|
|
500
|
+
...init,
|
|
501
|
+
signal: controller.signal,
|
|
502
|
+
...(dispatcher ? { dispatcher } : {}),
|
|
503
|
+
});
|
|
457
504
|
console.log(`[REST-A2A-Client] fetchWithTimeout response: HTTP ${res.status} (${Date.now() - startTime}ms)`);
|
|
458
505
|
return res;
|
|
459
506
|
}
|
|
@@ -488,7 +535,7 @@ class RestA2AClient {
|
|
|
488
535
|
if (!this.onDebugTrace)
|
|
489
536
|
return;
|
|
490
537
|
try {
|
|
491
|
-
this.onDebugTrace(trace);
|
|
538
|
+
this.onDebugTrace({ ...trace, proxy: this.proxyUrl });
|
|
492
539
|
}
|
|
493
540
|
catch { /* ignore debug hook errors */ }
|
|
494
541
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-client.js","sourceRoot":"","sources":["../../../src/a2a/rest-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rest-client.js","sourceRoot":"","sources":["../../../src/a2a/rest-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,12 @@ export interface RestA2ARemoteRunnerConfig {
|
|
|
40
40
|
streamAction?: string;
|
|
41
41
|
/** 同步调用的 action 后缀(默认 'invoke'),如 URL 为 .../cap_id:run 则填 'run' */
|
|
42
42
|
invokeAction?: string;
|
|
43
|
+
/**
|
|
44
|
+
* 静态运行时变量默认值(如 { userId, userMail })。
|
|
45
|
+
* 构造时固定;运行时还会与 `ToolContext.custom.vars` 合并(调用方每次 run 携带的系统变量优先)。
|
|
46
|
+
* 最终用于解析 headers / auth 中的 ${vars.x} 占位符,决定"带哪些变量去请求"远端。
|
|
47
|
+
*/
|
|
48
|
+
vars?: Record<string, unknown>;
|
|
43
49
|
}
|
|
44
50
|
/**
|
|
45
51
|
* 创建 REST 风格远程 A2A Agent 的 SubAgentRunner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-runner.d.ts","sourceRoot":"","sources":["../../../src/a2a/rest-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"rest-runner.d.ts","sourceRoot":"","sources":["../../../src/a2a/rest-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,qBAAqB,CAAC;AAE9E,OAAO,KAAK,EAAE,aAAa,EAAsC,MAAM,kBAAkB,CAAC;AAE1F,iEAAiE;AACjE,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,oCAAoC;AACpC,MAAM,WAAW,yBAAyB;IACxC,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,MAAM,EAAE,aAAa,CAAC;IACtB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,+DAA+D;IAC/D,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,sBAAsB;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,yBAAyB,GAAG,cAAc,CA8M3F"}
|
|
@@ -23,6 +23,13 @@ exports.createRestA2ARemoteRunner = createRestA2ARemoteRunner;
|
|
|
23
23
|
*/
|
|
24
24
|
function createRestA2ARemoteRunner(config) {
|
|
25
25
|
const { baseUrl, capabilityId, name: runnerName, description: runnerDesc, client, staticFields = {}, taskField = 'analysis_focus', dynamicFields, inputSchema, streaming = true, fallbackToSync = true, streamAction, invokeAction, } = config;
|
|
26
|
+
// 合并静态默认变量 + 运行时从 ctx.custom.vars 携带的系统变量(后者优先),
|
|
27
|
+
// 透传到 client.invoke / invokeStreaming 的 ${vars.x} 占位符解析。
|
|
28
|
+
const resolveCallVars = (ctx) => {
|
|
29
|
+
const ctxVars = ctx?.custom?.vars;
|
|
30
|
+
const merged = { ...(config.vars || {}), ...(ctxVars || {}) };
|
|
31
|
+
return Object.keys(merged).length > 0 ? merged : undefined;
|
|
32
|
+
};
|
|
26
33
|
/**
|
|
27
34
|
* 允许 LLM 动态填写的字段白名单。
|
|
28
35
|
* - 优先用 dynamicFields;
|
|
@@ -89,13 +96,13 @@ function createRestA2ARemoteRunner(config) {
|
|
|
89
96
|
return JSON.stringify(result.result || result, null, 2);
|
|
90
97
|
}
|
|
91
98
|
// ---- 同步执行 ----
|
|
92
|
-
const runSync = async (task) => {
|
|
99
|
+
const runSync = async (task, ctx) => {
|
|
93
100
|
console.log(`[REST-A2A-Runner] '${runnerName}' runSync start`);
|
|
94
101
|
try {
|
|
95
102
|
const input = buildInput(task);
|
|
96
103
|
console.log(`[REST-A2A-Runner] '${runnerName}' invoking sync...`);
|
|
97
104
|
const startTime = Date.now();
|
|
98
|
-
const result = await client.invoke(baseUrl, capabilityId, input, invokeAction);
|
|
105
|
+
const result = await client.invoke(baseUrl, capabilityId, input, invokeAction, resolveCallVars(ctx));
|
|
99
106
|
const elapsed = Date.now() - startTime;
|
|
100
107
|
console.log(`[REST-A2A-Runner] '${runnerName}' sync response (${elapsed}ms): status=${result.status}`);
|
|
101
108
|
if (result.status === 'failed' || result.error) {
|
|
@@ -113,9 +120,10 @@ function createRestA2ARemoteRunner(config) {
|
|
|
113
120
|
}
|
|
114
121
|
};
|
|
115
122
|
// ---- 流式执行 ----
|
|
116
|
-
const runStreaming = async (task, ctx) => {
|
|
123
|
+
const runStreaming = async (task, ctx, runOpts) => {
|
|
117
124
|
const emit = ctx.emitSubEvent;
|
|
118
125
|
const parentCallId = ctx.currentToolCallId || `rest_a2a_${Date.now()}`;
|
|
126
|
+
const onPartial = runOpts?.onPartial;
|
|
119
127
|
console.log(`[REST-A2A-Runner] '${runnerName}' runStreaming start: parentCallId=${parentCallId}`);
|
|
120
128
|
emitStart(emit, parentCallId, runnerName, task);
|
|
121
129
|
try {
|
|
@@ -126,7 +134,11 @@ function createRestA2ARemoteRunner(config) {
|
|
|
126
134
|
const finalResult = await client.invokeStreaming(baseUrl, capabilityId, input, (event) => {
|
|
127
135
|
eventCount++;
|
|
128
136
|
forwardRestSSEEvent(emit, parentCallId, runnerName, event);
|
|
129
|
-
|
|
137
|
+
// 通知 executor 部分结果(用于超时容错)
|
|
138
|
+
if (onPartial && event.event === 'message_chunk' && event.data?.content) {
|
|
139
|
+
onPartial(event.data.content);
|
|
140
|
+
}
|
|
141
|
+
}, ctx.abortSignal, streamAction, resolveCallVars(ctx));
|
|
130
142
|
const elapsed = Date.now() - startTime;
|
|
131
143
|
console.log(`[REST-A2A-Runner] '${runnerName}' streaming completed (${elapsed}ms, ${eventCount} events): hasResult=${!!finalResult}`);
|
|
132
144
|
if (finalResult?.status === 'failed' || finalResult?.error) {
|
|
@@ -148,7 +160,7 @@ function createRestA2ARemoteRunner(config) {
|
|
|
148
160
|
// 流式失败,自动回退到同步模式
|
|
149
161
|
if (fallbackToSync) {
|
|
150
162
|
console.log(`[REST-A2A-Runner] '${runnerName}' falling back to sync`);
|
|
151
|
-
return runSync(task);
|
|
163
|
+
return runSync(task, ctx);
|
|
152
164
|
}
|
|
153
165
|
emitError(emit, parentCallId, runnerName, errMsg);
|
|
154
166
|
return `[REST A2A '${runnerName}'] Error: ${errMsg}`;
|
|
@@ -178,8 +190,8 @@ function createRestA2ARemoteRunner(config) {
|
|
|
178
190
|
const useStreaming = streaming && ctx?.emitSubEvent;
|
|
179
191
|
console.log(`[REST-A2A] '${runnerName}' run: streaming=${streaming}, hasCtx=${!!ctx}, hasEmitSubEvent=${!!ctx?.emitSubEvent}, hasCurrentToolCallId=${!!ctx?.currentToolCallId}, useStreaming=${useStreaming}`);
|
|
180
192
|
return useStreaming
|
|
181
|
-
? runStreaming(task, ctx)
|
|
182
|
-
: runSync(task);
|
|
193
|
+
? runStreaming(task, ctx, _options)
|
|
194
|
+
: runSync(task, ctx);
|
|
183
195
|
},
|
|
184
196
|
};
|
|
185
197
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-runner.js","sourceRoot":"","sources":["../../../src/a2a/rest-runner.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,mEAAmE;AACnE,kDAAkD;AAClD,+DAA+D;;
|
|
1
|
+
{"version":3,"file":"rest-runner.js","sourceRoot":"","sources":["../../../src/a2a/rest-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/a2a/runner.d.ts
CHANGED
|
@@ -28,6 +28,12 @@ export interface A2ARemoteRunnerConfig {
|
|
|
28
28
|
/** content 增量过滤:文本增长多少字符后才转发,默认 30 */
|
|
29
29
|
contentMinDelta?: number;
|
|
30
30
|
};
|
|
31
|
+
/**
|
|
32
|
+
* 静态运行时变量默认值(如 { userId, userMail })。
|
|
33
|
+
* 构造时固定;运行时还会与 `ToolContext.custom.vars` 合并(调用方每次 run 携带的系统变量优先)。
|
|
34
|
+
* 最终用于解析 headers / auth 中的 ${vars.x} 占位符,决定"带哪些变量去请求"远端。
|
|
35
|
+
*/
|
|
36
|
+
vars?: Record<string, unknown>;
|
|
31
37
|
}
|
|
32
38
|
/**
|
|
33
39
|
* 创建远程 A2A Agent 的 SubAgentRunner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/a2a/runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/a2a/runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,qBAAqB,CAAC;AAE9E,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,4BAA4B;AAC5B,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAMnE;AAED,gCAAgC;AAChC,MAAM,WAAW,qBAAqB;IACpC,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iCAAiC;IACjC,MAAM,EAAE,SAAS,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,8BAA8B;IAC9B,WAAW,CAAC,EAAE;QACZ,kCAAkC;QAClC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,kCAAkC;QAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,sCAAsC;QACtC,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,cAAc,CA4HnF"}
|
package/dist/cjs/a2a/runner.js
CHANGED
|
@@ -39,8 +39,15 @@ function createA2ARemoteRunner(config) {
|
|
|
39
39
|
thinkingFlushInterval: config.eventFilter?.thinkingFlushInterval ?? 3000,
|
|
40
40
|
contentMinDelta: config.eventFilter?.contentMinDelta ?? 30,
|
|
41
41
|
};
|
|
42
|
+
// 合并静态默认变量 + 运行时从 ctx.custom.vars 携带的系统变量(后者优先),
|
|
43
|
+
// 透传到 client.sendTask / sendTaskStreaming 的 ${vars.x} 占位符解析。
|
|
44
|
+
const resolveCallVars = (ctx) => {
|
|
45
|
+
const ctxVars = ctx?.custom?.vars;
|
|
46
|
+
const merged = { ...(config.vars || {}), ...(ctxVars || {}) };
|
|
47
|
+
return Object.keys(merged).length > 0 ? merged : undefined;
|
|
48
|
+
};
|
|
42
49
|
// ---- 同步执行(tasks/send,无事件转发)----
|
|
43
|
-
const runSync = async (task) => {
|
|
50
|
+
const runSync = async (task, callVars) => {
|
|
44
51
|
try {
|
|
45
52
|
const result = await client.sendTask(agentUrl, {
|
|
46
53
|
id: crypto.randomUUID(),
|
|
@@ -51,7 +58,7 @@ function createA2ARemoteRunner(config) {
|
|
|
51
58
|
parts: [{ kind: 'text', text: task }],
|
|
52
59
|
},
|
|
53
60
|
metadata,
|
|
54
|
-
});
|
|
61
|
+
}, callVars);
|
|
55
62
|
const textParts = result.status?.message?.parts
|
|
56
63
|
?.filter((p) => p.kind === 'text')
|
|
57
64
|
.map(p => p.text) ?? [];
|
|
@@ -65,10 +72,11 @@ function createA2ARemoteRunner(config) {
|
|
|
65
72
|
}
|
|
66
73
|
};
|
|
67
74
|
// ---- 流式执行(tasks/sendSubscribe + 智能事件过滤)----
|
|
68
|
-
const runStreaming = async (task, ctx) => {
|
|
75
|
+
const runStreaming = async (task, ctx, runOpts) => {
|
|
69
76
|
const emit = ctx.emitSubEvent;
|
|
70
77
|
const parentCallId = ctx.currentToolCallId || `a2a_${Date.now()}`;
|
|
71
78
|
const taskId = crypto.randomUUID();
|
|
79
|
+
const onPartial = runOpts?.onPartial;
|
|
72
80
|
// 智能事件过滤器状态
|
|
73
81
|
const filterState = createEventFilterState();
|
|
74
82
|
emitStart(emit, parentCallId, runnerName, task);
|
|
@@ -82,7 +90,16 @@ function createA2ARemoteRunner(config) {
|
|
|
82
90
|
parts: [{ kind: 'text', text: task }],
|
|
83
91
|
},
|
|
84
92
|
metadata,
|
|
85
|
-
}, (event) =>
|
|
93
|
+
}, (event) => {
|
|
94
|
+
forwardSSEEventFiltered(emit, parentCallId, runnerName, event, filterState, filterCfg);
|
|
95
|
+
// 通知 executor 部分结果(用于超时容错)
|
|
96
|
+
if (onPartial && event.kind === 'status-update' && event.status?.state === 'working') {
|
|
97
|
+
const meta = event.metadata;
|
|
98
|
+
if (meta?.type === 'content' && typeof meta.content === 'string') {
|
|
99
|
+
onPartial(meta.content);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}, ctx.abortSignal, resolveCallVars(ctx));
|
|
86
103
|
// 刷出 thinking 缓冲
|
|
87
104
|
flushThinking(emit, parentCallId, runnerName, filterState);
|
|
88
105
|
if (finalEvent?.kind === 'status-update' && finalEvent.status?.state === 'failed') {
|
|
@@ -101,7 +118,7 @@ function createA2ARemoteRunner(config) {
|
|
|
101
118
|
// 流式失败,自动回退到同步模式
|
|
102
119
|
if (fallbackToSync) {
|
|
103
120
|
console.log(`[A2A] '${runnerName}' 回退到同步模式`);
|
|
104
|
-
return runSync(task);
|
|
121
|
+
return runSync(task, resolveCallVars(ctx));
|
|
105
122
|
}
|
|
106
123
|
emitError(emit, parentCallId, runnerName, errMsg);
|
|
107
124
|
return `[A2A Remote Agent '${runnerName}'] Error: ${errMsg}`;
|
|
@@ -114,8 +131,8 @@ function createA2ARemoteRunner(config) {
|
|
|
114
131
|
const useStreaming = streaming && ctx?.emitSubEvent;
|
|
115
132
|
console.log(`[A2A] '${runnerName}' run: streaming=${streaming}, hasCtx=${!!ctx}, hasEmitSubEvent=${!!ctx?.emitSubEvent}, hasCurrentToolCallId=${!!ctx?.currentToolCallId}, useStreaming=${useStreaming}`);
|
|
116
133
|
return useStreaming
|
|
117
|
-
? runStreaming(task, ctx)
|
|
118
|
-
: runSync(task);
|
|
134
|
+
? runStreaming(task, ctx, _options)
|
|
135
|
+
: runSync(task, resolveCallVars(ctx));
|
|
119
136
|
},
|
|
120
137
|
};
|
|
121
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/a2a/runner.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,0DAA0D;AAC1D,2BAA2B;AAC3B,+DAA+D;;AAQ/D,wDAMC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/a2a/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -49,8 +49,9 @@ export type { TransportFactory } from './mcp/factory.js';
|
|
|
49
49
|
export { MCPClientBase } from './mcp/base-client.js';
|
|
50
50
|
export { StdioMCPClient } from './mcp/stdio-client.js';
|
|
51
51
|
export { HttpMCPClient } from './mcp/http-client.js';
|
|
52
|
-
export { resolveProxyAgentForCategory, resolveProxyUrlForCategory,
|
|
53
|
-
export
|
|
52
|
+
export { resolveProxyAgentForCategory, resolveProxyUrlForCategory, DEFAULT_PROXY_SETTINGS, } from './utils/proxy.js';
|
|
53
|
+
export { getSystemProxyUrl, getWindowsSystemProxy, clearSystemProxyCache, } from './utils/system-proxy.js';
|
|
54
|
+
export type { ProxyMode, ProxyCategoryConfig, ProxySettings, } from './utils/proxy.js';
|
|
54
55
|
export type { MCPClient, MCPServerConfig, MCPTransport, } from './mcp/types.js';
|
|
55
56
|
export { SecurityGuard } from './security/guard.js';
|
|
56
57
|
export type { SanitizeResult, SecurityRule, SecurityPolicy, Severity, } from './security/types.js';
|
|
@@ -115,6 +116,8 @@ export type { EngineRunResult } from './utils/event-collector.js';
|
|
|
115
116
|
export { createAgentEventCollectorState, defaultResolveToolDisplayName, mapAgentEvent, mapAgentEventStream } from './utils/event-adapter.js';
|
|
116
117
|
export type { AgentEventAdapterOptions, AgentEventCollectorState, AgentEventPreset, MappedAgentEvent } from './utils/event-adapter.js';
|
|
117
118
|
export { formatLocalDateTime, formatDate } from './utils/date.js';
|
|
119
|
+
export { resolveHeaderTemplates, interpolateHeaderValue, interpolateValue } from './utils/header-vars.js';
|
|
120
|
+
export type { HeaderVars } from './utils/header-vars.js';
|
|
118
121
|
export { parseDSML, StreamingDSMLParser, containsDSML } from './utils/dsml-parser.js';
|
|
119
122
|
export type { DSMLParseResult } from './utils/dsml-parser.js';
|
|
120
123
|
export { MAX_ITEM_CHARS, MAX_SAVE_CHARS, MAX_ENTRY_CHARS, MAX_TOTAL_CHARS, MAX_SUMMARY_CHARS, MAX_RECOMMENDATION_CHARS, truncateStr, truncateHead, truncateTail, buildAssistantContext, } from './utils/safe-truncate.js';
|