@migor/agentia 0.10.3 → 0.10.5
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/CHANGELOG.md +572 -30
- package/LICENSE +1 -1
- package/README.en.md +93 -38
- package/README.md +105 -218
- package/dist/AGENTS.md +227 -30
- package/dist/core/limits.d.ts +8 -0
- package/dist/core/limits.js +9 -0
- package/dist/core/limits.js.map +1 -1
- package/dist/core/tool.d.ts +18 -0
- package/dist/core/trace-sink.d.ts +8 -0
- package/dist/core/trace-sink.js +24 -0
- package/dist/core/trace-sink.js.map +1 -0
- package/dist/core/trace.d.ts +4 -1
- package/dist/core/trace.js +14 -0
- package/dist/core/trace.js.map +1 -1
- package/dist/engine/forwarded.d.ts +3 -1
- package/dist/engine/forwarded.js +5 -0
- package/dist/engine/forwarded.js.map +1 -1
- package/dist/engine/loop-result.d.ts +1 -1
- package/dist/engine/loop.d.ts +5 -1
- package/dist/engine/loop.js +16 -1
- package/dist/engine/loop.js.map +1 -1
- package/dist/engine/mcp-server.d.ts +2 -2
- package/dist/engine/mcp-server.js +3 -9
- package/dist/engine/mcp-server.js.map +1 -1
- package/dist/engine/run-config.js +3 -0
- package/dist/engine/run-config.js.map +1 -1
- package/dist/engine/spec.d.ts +5 -1
- package/dist/engine/spec.js.map +1 -1
- package/dist/engine/tool-context.d.ts +3 -1
- package/dist/engine/tool-context.js +3 -1
- package/dist/engine/tool-context.js.map +1 -1
- package/dist/engine/tool-events.d.ts +6 -2
- package/dist/engine/tool-events.js +17 -3
- package/dist/engine/tool-events.js.map +1 -1
- package/dist/engine/turn.d.ts +5 -1
- package/dist/engine/turn.js +9 -4
- package/dist/engine/turn.js.map +1 -1
- package/dist/engine/types.d.ts +14 -3
- package/dist/engine/types.js +1 -0
- package/dist/engine/types.js.map +1 -1
- package/dist/eval/harvest.d.ts +4 -1
- package/dist/eval/harvest.js +32 -6
- package/dist/eval/harvest.js.map +1 -1
- package/dist/index.d.ts +13 -3
- package/dist/index.js +10 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/file-sink.d.ts +0 -16
- package/dist/integrations/file-sink.js +22 -4
- package/dist/integrations/file-sink.js.map +1 -1
- package/dist/integrations/mcp-stdio.js +63 -42
- package/dist/integrations/mcp-stdio.js.map +1 -1
- package/dist/integrations/metrics-render.js +16 -5
- package/dist/integrations/metrics-render.js.map +1 -1
- package/dist/runtime/run.d.ts +1 -1
- package/dist/runtime/run.js +19 -17
- package/dist/runtime/run.js.map +1 -1
- package/dist/store/store.d.ts +6 -1
- package/dist/store/store.js +9 -2
- package/dist/store/store.js.map +1 -1
- package/dist/toolkit/capability-loop.d.ts +92 -0
- package/dist/toolkit/capability-loop.js +81 -0
- package/dist/toolkit/capability-loop.js.map +1 -0
- package/dist/toolkit/discover.js +27 -1
- package/dist/toolkit/discover.js.map +1 -1
- package/dist/toolkit/manifest.d.ts +21 -0
- package/dist/toolkit/manifest.js +38 -0
- package/dist/toolkit/manifest.js.map +1 -0
- package/dist/toolkit/module.d.ts +5 -0
- package/dist/toolkit/module.js +113 -49
- package/dist/toolkit/module.js.map +1 -1
- package/dist/toolkit/prompt.d.ts +3 -1
- package/dist/toolkit/prompt.js +10 -0
- package/dist/toolkit/prompt.js.map +1 -1
- package/dist/toolkit/skill.d.ts +3 -1
- package/dist/toolkit/skill.js +2 -0
- package/dist/toolkit/skill.js.map +1 -1
- package/dist/toolkit/subagent.d.ts +4 -2
- package/dist/toolkit/subagent.js +2 -0
- package/dist/toolkit/subagent.js.map +1 -1
- package/dist/toolkit/tool.d.ts +3 -1
- package/dist/toolkit/tool.js +2 -0
- package/dist/toolkit/tool.js.map +1 -1
- package/dist/transport/async.d.ts +2 -4
- package/dist/transport/async.js +14 -7
- package/dist/transport/async.js.map +1 -1
- package/dist/transport/http-endpoints.d.ts +13 -0
- package/dist/transport/http-endpoints.js +101 -28
- package/dist/transport/http-endpoints.js.map +1 -1
- package/dist/transport/http-shapes.d.ts +26 -3
- package/dist/transport/http-shapes.js +12 -2
- package/dist/transport/http-shapes.js.map +1 -1
- package/dist/transport/http.d.ts +46 -2
- package/dist/transport/http.js +43 -18
- package/dist/transport/http.js.map +1 -1
- package/dist/transport/run-call-options.js +3 -0
- package/dist/transport/run-call-options.js.map +1 -1
- package/dist/transport/run-options.d.ts +98 -0
- package/dist/transport/run-options.js +121 -0
- package/dist/transport/run-options.js.map +1 -0
- package/dist/transport/run-outcome.js +3 -0
- package/dist/transport/run-outcome.js.map +1 -1
- package/dist/transport/serve.d.ts +92 -0
- package/dist/transport/serve.js +155 -0
- package/dist/transport/serve.js.map +1 -0
- package/package.json +23 -10
|
@@ -90,7 +90,6 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
90
90
|
let proc = null;
|
|
91
91
|
let fatal = null;
|
|
92
92
|
let closed = false;
|
|
93
|
-
let buf = '';
|
|
94
93
|
let nextId = 1;
|
|
95
94
|
let ready = null;
|
|
96
95
|
/** spawn 时建立(`close()` 靠它等真的退出);从未 spawn 过则为 null */
|
|
@@ -133,51 +132,17 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
133
132
|
p.stdin?.on('error', () => {
|
|
134
133
|
/* 吞掉:EPIPE 是「进程没了」的次生现象,不是根因 */
|
|
135
134
|
});
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
// 超限的处置:一次性拒绝全部在途请求(`fail` 置 fatal)并**终止子进程** ——
|
|
142
|
-
// 帧边界已经丢了,再读下去既救不回那条「一行」,也答不出任何在途请求。
|
|
143
|
-
if (buf.length + chunk.length > MAX_FRAME_CHARS) {
|
|
144
|
-
buf = '';
|
|
135
|
+
// stdout 的「分帧 → 按 id 派发」整段抽成 `attachResponseReader`(见其定义处):
|
|
136
|
+
// 它在构造里占近四成行数(本构造 235 行 / 方法级阈值 240)。超限的处置留在**工厂侧**
|
|
137
|
+
// —— 它要终止子进程、置 fatal,那两件事属于工厂的状态。
|
|
138
|
+
if (p.stdout) {
|
|
139
|
+
attachResponseReader(p.stdout, pending, () => {
|
|
145
140
|
p.stdout?.destroy();
|
|
146
141
|
p.kill();
|
|
147
142
|
fail(new Error(`MCP server 的 stdout 单条报文超过分帧上限(${frameLimitText()})—— ` +
|
|
148
143
|
'对端没有按换行分隔报文(或吐了一条巨型「日志行」);已丢弃缓冲并终止连接'));
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
buf += chunk;
|
|
152
|
-
for (;;) {
|
|
153
|
-
const nl = buf.indexOf('\n');
|
|
154
|
-
if (nl < 0)
|
|
155
|
-
break;
|
|
156
|
-
const line = buf.slice(0, nl);
|
|
157
|
-
buf = buf.slice(nl + 1);
|
|
158
|
-
if (line.trim() === '')
|
|
159
|
-
continue;
|
|
160
|
-
let msg;
|
|
161
|
-
try {
|
|
162
|
-
msg = JSON.parse(line);
|
|
163
|
-
}
|
|
164
|
-
catch {
|
|
165
|
-
continue; // MCP 规定 stdout 只走协议,但 server 混日志进来是常事
|
|
166
|
-
}
|
|
167
|
-
if (!isJsonRpcResponse(msg))
|
|
168
|
-
continue; // 通知(无 id)不配对
|
|
169
|
-
const waiter = pending.get(msg.id);
|
|
170
|
-
if (!waiter)
|
|
171
|
-
continue;
|
|
172
|
-
pending.delete(msg.id);
|
|
173
|
-
try {
|
|
174
|
-
waiter.resolve(unwrap(msg, 'response'));
|
|
175
|
-
}
|
|
176
|
-
catch (e) {
|
|
177
|
-
waiter.reject(e instanceof Error ? e : new Error(String(e)));
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
});
|
|
144
|
+
});
|
|
145
|
+
}
|
|
181
146
|
return p;
|
|
182
147
|
};
|
|
183
148
|
const write = (payload) => {
|
|
@@ -288,4 +253,60 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
288
253
|
},
|
|
289
254
|
};
|
|
290
255
|
}
|
|
256
|
+
/**
|
|
257
|
+
* 把子进程 stdout 的「字节流 → 已配对响应」接上:**分帧 → 按 id 派发**。
|
|
258
|
+
*
|
|
259
|
+
* 抽出来的原因(方法级体量闸):它在 `createStdioMcpConnector` 里占近四成行数,而它与
|
|
260
|
+
* 连接器其余状态的交互只有三处 —— `stream`(输入)、`pending`(派发目标)、`onOverflow`
|
|
261
|
+
* (超限处置)。缓冲(`buf`)只在这个 reader 里用(已核:文件其余位置零引用)⇒ 随它搬进来
|
|
262
|
+
* 当局部状态,不外泄。
|
|
263
|
+
*
|
|
264
|
+
* 三条口径**是搬移、不是重写**:
|
|
265
|
+
* - **帧上限**(2026-09-28 外部深评 S6):对端一直吐不带换行的字节 ⇒ 缓冲无界增长 ⇒ 先 OOM
|
|
266
|
+
* 再谈协议。这不是罕见输入:stdout 混日志的 server 本来就常见,而**一个不换行的日志行**
|
|
267
|
+
* 正是这形态。超限交给调用方处置(终止子进程 + 置 fatal)—— 帧边界已经丢了,再读下去
|
|
268
|
+
* 既救不回那条「一行」,也答不出任何在途请求;
|
|
269
|
+
* - **JSON 解析失败就跳过**:MCP 规定 stdout 只走协议,但 server 混日志进来是常事;
|
|
270
|
+
* - **没有 id 的通知不配对**(`isJsonRpcResponse` 判定)。
|
|
271
|
+
*/
|
|
272
|
+
function attachResponseReader(stream, pending, onOverflow) {
|
|
273
|
+
let buf = '';
|
|
274
|
+
stream.setEncoding('utf8');
|
|
275
|
+
stream.on('data', (chunk) => {
|
|
276
|
+
if (buf.length + chunk.length > MAX_FRAME_CHARS) {
|
|
277
|
+
buf = '';
|
|
278
|
+
onOverflow();
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
buf += chunk;
|
|
282
|
+
for (;;) {
|
|
283
|
+
const nl = buf.indexOf('\n');
|
|
284
|
+
if (nl < 0)
|
|
285
|
+
break;
|
|
286
|
+
const line = buf.slice(0, nl);
|
|
287
|
+
buf = buf.slice(nl + 1);
|
|
288
|
+
if (line.trim() === '')
|
|
289
|
+
continue;
|
|
290
|
+
let msg;
|
|
291
|
+
try {
|
|
292
|
+
msg = JSON.parse(line);
|
|
293
|
+
}
|
|
294
|
+
catch {
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
if (!isJsonRpcResponse(msg))
|
|
298
|
+
continue;
|
|
299
|
+
const waiter = pending.get(msg.id);
|
|
300
|
+
if (!waiter)
|
|
301
|
+
continue;
|
|
302
|
+
pending.delete(msg.id);
|
|
303
|
+
try {
|
|
304
|
+
waiter.resolve(unwrap(msg, 'response'));
|
|
305
|
+
}
|
|
306
|
+
catch (e) {
|
|
307
|
+
waiter.reject(e instanceof Error ? e : new Error(String(e)));
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
});
|
|
311
|
+
}
|
|
291
312
|
//# sourceMappingURL=mcp-stdio.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-stdio.js","sourceRoot":"","sources":["../../src/integrations/mcp-stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-stdio.js","sourceRoot":"","sources":["../../src/integrations/mcp-stdio.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,10 +42,17 @@ const labeledSamples = (state, pick) => {
|
|
|
42
42
|
}
|
|
43
43
|
return out;
|
|
44
44
|
};
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
/**
|
|
46
|
+
* 四个 **run 级家族**(`runs_total` / `runs_failed_total` / `tokens_total` / `cost_usd_total`):
|
|
47
|
+
* 全局样本在前,紧跟其后的是**归因标签**(R8-P4)样本。
|
|
48
|
+
*
|
|
49
|
+
* ⚠️ 全局那行(无 label)必须保持**第一个** —— `renderOpenMetrics` 靠精确匹配它挂 exemplar。
|
|
50
|
+
* ⚠️ 带标签的 token 样本是**四类之和**(combo 标签不再拆 kind —— 两类标签叉乘会把序列数打飞)。
|
|
51
|
+
*
|
|
52
|
+
* 抽出来的原因:这四块是同一件事(「全局 + 每类标签」的并列展开),与 `renderPrometheus`
|
|
53
|
+
* 其余部分不同源;抽前它是全仓最大的可调用体(224 行 / 方法级阈值 240,余量 16)。
|
|
54
|
+
*/
|
|
55
|
+
function appendRunFamilies(out, state, p) {
|
|
49
56
|
const labelRuns = labeledSamples(state, (a) => a.runs);
|
|
50
57
|
out.push(family(`${p}runs_total`, 'counter', 'run 总数(成功 + 失败)', [
|
|
51
58
|
`${p}runs_total ${state.runs}`,
|
|
@@ -56,7 +63,6 @@ export function renderPrometheus(state, p) {
|
|
|
56
63
|
`${p}runs_failed_total ${state.failed}`,
|
|
57
64
|
...labelFailed.map((s) => `${p}runs_failed_total${s.text} ${s.value}`),
|
|
58
65
|
]));
|
|
59
|
-
// 带标签的 token 样本是**四类之和**(combo 标签不再拆 kind —— 两类标签叉乘会把序列数打飞)
|
|
60
66
|
const labelTokens = labeledSamples(state, (a) => a.tokens);
|
|
61
67
|
out.push(family(`${p}tokens_total`, 'counter', 'token 累计(kind 分项:input / output / cache_read / cache_creation)', [
|
|
62
68
|
`${p}tokens_total{kind="input"} ${state.tokens.input}`,
|
|
@@ -70,6 +76,11 @@ export function renderPrometheus(state, p) {
|
|
|
70
76
|
`${p}cost_usd_total ${state.costUsd}`,
|
|
71
77
|
...labelCost.map((s) => `${p}cost_usd_total${s.text} ${s.value}`),
|
|
72
78
|
]));
|
|
79
|
+
}
|
|
80
|
+
export function renderPrometheus(state, p) {
|
|
81
|
+
const out = [];
|
|
82
|
+
// 四个 run 级家族(全局样本 + 归因标签样本)⇒ 抽成 `appendRunFamilies`(见其定义处)
|
|
83
|
+
appendRunFamilies(out, state, p);
|
|
73
84
|
// 基数上限的**可见性**:被折叠掉的不同键数。与 `snapshot()` 的同名字段一一对应 ——
|
|
74
85
|
// 此前只有 snapshot() 有、render() 没有,于是「按文档把 metricsSink 接到 /metrics」的部署
|
|
75
86
|
// **完全看不见折叠发生**(静默丢失);而同一份文件对「算不出成本的 turn」专门发了
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-render.js","sourceRoot":"","sources":["../../src/integrations/metrics-render.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metrics-render.js","sourceRoot":"","sources":["../../src/integrations/metrics-render.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/run.d.ts
CHANGED
|
@@ -84,7 +84,7 @@ export interface ExecuteRunOptions<S extends JsonSchema = JsonSchema> extends Ru
|
|
|
84
84
|
* 意外抛出等);rethrow:false 时这些同样收成 result 返回。
|
|
85
85
|
*/
|
|
86
86
|
rethrow?: boolean;
|
|
87
|
-
/** trace 出口(观测):run
|
|
87
|
+
/** trace 出口(观测):run 收尾后逐个投递;抛错或超时只告警并放弃等待,不影响 run */
|
|
88
88
|
sinks?: TraceSink[];
|
|
89
89
|
/**
|
|
90
90
|
* trace 交给 sinks **之前**的最后一笔账(`run.finish` 之后、`flushSinks` 之前调一次,
|
package/dist/runtime/run.js
CHANGED
|
@@ -3,6 +3,7 @@ import { runAgent } from '../engine/loop.js';
|
|
|
3
3
|
import { TraceRecorder, resolveTraceLimits } from '../engine/tracer.js';
|
|
4
4
|
import { classifyError } from '../engine/errors.js';
|
|
5
5
|
import { RunContext, withRunContext } from './context.js';
|
|
6
|
+
import { flushTraceSinks } from '../core/trace-sink.js';
|
|
6
7
|
/**
|
|
7
8
|
* Run —— 一次运行的生命周期容器(spec §2/§6.1)。
|
|
8
9
|
* runId == recorder.traceId == traceId(1:1)。
|
|
@@ -217,6 +218,12 @@ const EMPTY_REPLY_MARK = '(本次无文本输出)';
|
|
|
217
218
|
/**
|
|
218
219
|
* 读会话历史,拼在传入 messages 之前。失败当「无历史」继续 ——
|
|
219
220
|
* 与 memory 水合同款防护:辅助动作失败不得击穿 run。
|
|
221
|
+
*
|
|
222
|
+
* ⚠️ 但**不再零信号**(2026-10-16 ref-session-failure-loud,与 `flushSinks` / memory 回写
|
|
223
|
+
* 同款纪律):吞之前落一条 `console.warn`。理由是本处失败的**形状最坏** —— 它没有
|
|
224
|
+
* 「报错」,只是让本次 run 变成「第一轮」,而下一次 `append` 会把坏的那份覆盖掉 ⇒
|
|
225
|
+
* **整段对话历史无声消失**,使用者只会觉得「它忘了」。没有这条告警时,唯一的可见性
|
|
226
|
+
* 出口是 dev runner 启动期那次探测(生产路径根本没有)。
|
|
220
227
|
*/
|
|
221
228
|
async function loadSession(session, incoming) {
|
|
222
229
|
if (!session)
|
|
@@ -225,12 +232,16 @@ async function loadSession(session, incoming) {
|
|
|
225
232
|
const history = await session.store.load(session.id);
|
|
226
233
|
return history.length > 0 ? [...history, ...incoming] : incoming;
|
|
227
234
|
}
|
|
228
|
-
catch {
|
|
235
|
+
catch (e) {
|
|
236
|
+
console.warn('[agentia] 会话历史读取失败,本次 run 按「没有历史」继续(多轮会表现为这是第一轮):' +
|
|
237
|
+
(e instanceof Error ? e.message : String(e)));
|
|
229
238
|
return incoming;
|
|
230
239
|
}
|
|
231
240
|
}
|
|
232
241
|
/**
|
|
233
|
-
* 把本轮消息 + 回复追加回会话(**只在成功路径调用**)。失败吞掉(同 memory
|
|
242
|
+
* 把本轮消息 + 回复追加回会话(**只在成功路径调用**)。失败吞掉(同 memory 回写防护),
|
|
243
|
+
* 但**不再零信号**:吞之前落一条 `console.warn`(2026-10-16 ref-session-failure-loud,
|
|
244
|
+
* 同 `loadSession` 那条理由 —— 写失败 = 这一轮白聊,下一个 run 看不到它)。
|
|
234
245
|
*
|
|
235
246
|
* 三条不变量(都是为了下一轮还能把这个历史发出去):
|
|
236
247
|
* 1. **只有成功路径回写** —— 失败时若只存下用户的提问,历史就会以 user 结尾,
|
|
@@ -252,8 +263,9 @@ async function appendSession(session, incoming, finalText) {
|
|
|
252
263
|
{ role: 'assistant', content: finalText || EMPTY_REPLY_MARK },
|
|
253
264
|
]);
|
|
254
265
|
}
|
|
255
|
-
catch {
|
|
256
|
-
|
|
266
|
+
catch (e) {
|
|
267
|
+
console.warn('[agentia] 会话历史回写失败,本轮对话不会被记住:' +
|
|
268
|
+
(e instanceof Error ? e.message : String(e)));
|
|
257
269
|
}
|
|
258
270
|
}
|
|
259
271
|
/**
|
|
@@ -271,21 +283,11 @@ async function runBeforeFlush(hook, trace, result) {
|
|
|
271
283
|
}
|
|
272
284
|
}
|
|
273
285
|
/**
|
|
274
|
-
* 投递 trace 给所有 sink
|
|
275
|
-
*
|
|
276
|
-
* 否则 sink 天天挂、面板一切如常,「trace 根本没落盘」要等下游消费时才发现。
|
|
286
|
+
* 投递 trace 给所有 sink:抛错或永久挂起都不得影响 run 结果;
|
|
287
|
+
* 失败与超时均有 console.warn,后续 sink 仍照常接收(实现与 MCP 反向桥共用)。
|
|
277
288
|
*/
|
|
278
289
|
async function flushSinks(sinks, trace) {
|
|
279
|
-
|
|
280
|
-
return;
|
|
281
|
-
for (const sink of sinks) {
|
|
282
|
-
try {
|
|
283
|
-
await sink.export(trace);
|
|
284
|
-
}
|
|
285
|
-
catch (e) {
|
|
286
|
-
console.warn('[agentia] trace sink 投递失败:', e instanceof Error ? e.message : e);
|
|
287
|
-
}
|
|
288
|
-
}
|
|
290
|
+
await flushTraceSinks(sinks, trace);
|
|
289
291
|
}
|
|
290
292
|
/** 水合:store 值注入 blackboard;contextInit 已写的同名 key 不覆盖(用户种子优先)。
|
|
291
293
|
* 返回本次读到的**版本句柄**(没实现 CAS 的 store 恒为 `undefined`)—— 回写时原样递回。 */
|
package/dist/runtime/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":"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"}
|
package/dist/store/store.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AgentRunResult } from '../engine/types.js';
|
|
2
|
-
import type { SpanError } from '../core/trace.js';
|
|
2
|
+
import type { SpanError, Usage } from '../core/trace.js';
|
|
3
|
+
import type { MessageParam } from '../core/message.js';
|
|
3
4
|
import type { RunStatus, SuspendedReason, TaskEvent } from '../core/run.js';
|
|
4
5
|
import type { ApprovalDecision } from '../core/tool.js';
|
|
5
6
|
import type { RunSpec } from '../engine/spec.js';
|
|
@@ -84,6 +85,10 @@ export interface TaskRecord {
|
|
|
84
85
|
* 簿记有界,恰好一次的承诺也就有界)。
|
|
85
86
|
*/
|
|
86
87
|
deliveredEventIds?: string[] | undefined;
|
|
88
|
+
/** 首个挂起段的本轮用户输入;随记录落库,恢复成功后补写会话,终态清除 */
|
|
89
|
+
sessionInput?: MessageParam[] | undefined;
|
|
90
|
+
/** 本任务所有已收尾 run 段的累计用量;恢复段把它作为预算 offset */
|
|
91
|
+
usageTotal?: Usage | undefined;
|
|
87
92
|
}
|
|
88
93
|
export interface TaskStore {
|
|
89
94
|
/**
|
package/dist/store/store.js
CHANGED
|
@@ -29,8 +29,15 @@ function cloneData(value) {
|
|
|
29
29
|
if (proto !== Object.prototype && proto !== null)
|
|
30
30
|
return value;
|
|
31
31
|
const out = {};
|
|
32
|
-
for (const [k, v] of Object.entries(value))
|
|
33
|
-
|
|
32
|
+
for (const [k, v] of Object.entries(value)) {
|
|
33
|
+
// 直接赋值 '__proto__' 会走原型 setter:自有键丢失且副本原型被改。
|
|
34
|
+
Object.defineProperty(out, k, {
|
|
35
|
+
value: cloneData(v),
|
|
36
|
+
writable: true,
|
|
37
|
+
enumerable: true,
|
|
38
|
+
configurable: true,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
34
41
|
return out;
|
|
35
42
|
}
|
|
36
43
|
return value;
|
package/dist/store/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/store/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/store/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import type { MessageParam } from '../core/message.js';
|
|
2
|
+
import type { AgentTool, JsonSchema, SchemaType, ToolRunContext } from '../core/tool.js';
|
|
3
|
+
import type { SpanError, SpanId } from '../core/trace.js';
|
|
4
|
+
import type { AgentStopReason, ContextPolicy, SystemParam } from '../engine/types.js';
|
|
5
|
+
/**
|
|
6
|
+
* Agentia —— **代码控制顺序的子循环**原语(spec §10 2026-11-04 run-capability-loop)。
|
|
7
|
+
*
|
|
8
|
+
* ## 它补的是哪一格
|
|
9
|
+
*
|
|
10
|
+
* 四类能力里,「谁定流程」有两个极端:`@SubAgent` / `@Skill` 的子循环由**模型**驱动
|
|
11
|
+
* (前者整段交给模型,后者由你的方法体决定何时调 `ctx.llm`),而「这件事会不会活过
|
|
12
|
+
* 这次请求」的判据又把长跑 / 要审批的活儿推给 `AsyncRunner` 的 task。中间那一格是空的:
|
|
13
|
+
*
|
|
14
|
+
* > 顺序由**我的代码**定(不是模型)、生命周期**不超出**这次请求(不进 task 状态机)、
|
|
15
|
+
* > 但要能挂到**同一棵** trace 上、要能裁剪上下文、要能被外层工具的 `approval` 拦住。
|
|
16
|
+
*
|
|
17
|
+
* 从前做这件事只有一条路:手写 `runAgentScoped` + 自己逐个转发 `ToolRunContext` 的旋钮。
|
|
18
|
+
* 那条路在 `engine/forwarded.ts` 的文件头里有完整的事故记录 —— 漏一个 `toolTimeoutMs`
|
|
19
|
+
* 是**静默**的(TS 的可选字段不会报错),后果还是反的(子循环永不超时)。所以本模块
|
|
20
|
+
* **不是**把 `runAgentScoped` 直接搬上公共面,而是把它包成「旋钮不可漏」的形状:
|
|
21
|
+
* `...forwardToolContext(ctx)` 一次取自单源,使用方接触不到那七个键。
|
|
22
|
+
*
|
|
23
|
+
* ## 与另外三行的分工(选型只看两个问题)
|
|
24
|
+
*
|
|
25
|
+
* | 问题 | 是 ⇒ | 否 ⇒ |
|
|
26
|
+
* |---|---|---|
|
|
27
|
+
* | 顺序要不要模型定? | `@SubAgent`(整段)/ `@Skill`(方法体里 `ctx.llm`) | **本模块** |
|
|
28
|
+
* | 会不会活过这次请求? | `AsyncRunner.submit`(task:耐久 / 崩溃续跑 / 审批原生) | **本模块** |
|
|
29
|
+
*
|
|
30
|
+
* 要审批的动作:把调用本模块的那个方法标成 `@Tool({ approval: 'required' })` ——
|
|
31
|
+
* 审批发生在**外层工具调用**上,于是一个「子循环里要改数据」的活儿既能挂起等人批
|
|
32
|
+
* (`POST /tasks/:id/approve`),又不必为它造一条任务。这正是 `@SubAgent` / `@Skill`
|
|
33
|
+
* 做不到的那半(子循环内部的 `approval` 无法挂起整条 run,见 usage-guide §7)。
|
|
34
|
+
*
|
|
35
|
+
* ## 边界(都是刻意留白,不是缺口)
|
|
36
|
+
*
|
|
37
|
+
* - **不做策略**:不替你拆步、不重试、不汇总多个子循环 —— 顺序写在你的方法体里。
|
|
38
|
+
* - **不自开 run 根**:`llm.turn` 挂在 `ctx.parentSpanId` 下的一个 `capability` span 里,
|
|
39
|
+
* 与本条 run 同树;`traceId` 不变,`runId` 也不会多出来一个。
|
|
40
|
+
* - **不给 `client` 缺省之外的聪明**:不传 `model` 就走引擎缺省;子循环**不继承**主 run
|
|
41
|
+
* 的 `fallbacks` 链(同 `runAgentScoped` 的有意边界)。
|
|
42
|
+
* - **挂起不穿透**:子循环里调用了 `deferUntil` / 触发审批挂起时,语义同其它嵌套能力 ——
|
|
43
|
+
* 以 `is_error` 交回,整条 run 不挂起。要挂起请用 task。
|
|
44
|
+
*/
|
|
45
|
+
export interface CapabilityLoopOptions<S extends JsonSchema = JsonSchema> {
|
|
46
|
+
/**
|
|
47
|
+
* trace 里那个 `capability` span 的名字。缺省 `'capability-loop'` ——
|
|
48
|
+
* 建议给一个业务名(`'ledger-review'`),否则看板上一排同名 span 分不出是谁。
|
|
49
|
+
*/
|
|
50
|
+
name?: string;
|
|
51
|
+
/** 子循环的输入:一段文本或完整 messages(与 `app.run` 同一套规整口径) */
|
|
52
|
+
input: string | MessageParam[];
|
|
53
|
+
/** 子循环的 system(独立上下文:主 agent 的历史**不可见**) */
|
|
54
|
+
system?: SystemParam;
|
|
55
|
+
/** 子循环可见的工具(缺省空 = 纯文本回合) */
|
|
56
|
+
tools?: AgentTool[];
|
|
57
|
+
model?: string;
|
|
58
|
+
maxTokens?: number;
|
|
59
|
+
maxIterations?: number;
|
|
60
|
+
/**
|
|
61
|
+
* 子循环自己的上下文裁剪策略。**这是本原语存在的理由之一** ——
|
|
62
|
+
* 应用级 `contextPolicy` 不进子循环(usage-guide §7),长跑子循环想不撞上限
|
|
63
|
+
* 只能在这里显式给。
|
|
64
|
+
*/
|
|
65
|
+
contextPolicy?: ContextPolicy;
|
|
66
|
+
/** 结构化结果 schema:给出后追加隐藏 `submit_result` 工具,校验结果落在 `typed` */
|
|
67
|
+
resultSchema?: S;
|
|
68
|
+
/** 逐字回调(转发给子循环的 `llm.turn`,不写 trace 时也能做流式) */
|
|
69
|
+
onText?: (delta: string) => void;
|
|
70
|
+
}
|
|
71
|
+
/** 子循环的产物(只回「这次子循环发生了什么」,不夹带整棵 trace) */
|
|
72
|
+
export interface CapabilityLoopResult<S extends JsonSchema = JsonSchema> {
|
|
73
|
+
/** 子循环最终文本(隔离报告:中间往返不外传) */
|
|
74
|
+
text: string;
|
|
75
|
+
/** `resultSchema` 校验通过的结构化结果;未给 schema 或模型未提交时为 undefined */
|
|
76
|
+
typed: SchemaType<S> | undefined;
|
|
77
|
+
/** 收尾原因。调用方自己判成败(`isSuccessStopReason`)—— 框架不替它抛 */
|
|
78
|
+
stopReason: AgentStopReason;
|
|
79
|
+
iterations: number;
|
|
80
|
+
/** 本次子循环的 capability span id(要补事件 / 属性时用) */
|
|
81
|
+
spanId: SpanId;
|
|
82
|
+
/** 非正常收尾时的错误(与 `stopReason` 同源,不另造一份口径) */
|
|
83
|
+
error?: SpanError;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* 在**当前工具调用**里拉起一条子循环。
|
|
87
|
+
*
|
|
88
|
+
* `ctx` 必须是引擎注入的 `ToolRunContext`(`AgentTool.run` 的第二个参数)——
|
|
89
|
+
* 它带着 recorder / 父 span / 取消信号 / 预算与超时护栏。从别处手搓一个 ctx 只会
|
|
90
|
+
* 得到一个「看起来在跑、实际不进树、护栏全离线」的子循环,所以这里不做任何兜底。
|
|
91
|
+
*/
|
|
92
|
+
export declare function runCapabilityLoop<S extends JsonSchema = JsonSchema>(ctx: ToolRunContext, opts: CapabilityLoopOptions<S>): Promise<CapabilityLoopResult<S>>;
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { combineSignals, releaseCombinedSignal } from '../core/abort.js';
|
|
2
|
+
import { runAgentScoped } from '../engine/loop.js';
|
|
3
|
+
import { classifyError } from '../engine/errors.js';
|
|
4
|
+
import { forwardToolContext } from '../engine/forwarded.js';
|
|
5
|
+
import { normalizeMessages } from '../engine/spec.js';
|
|
6
|
+
import { withCurrentSpan } from '../engine/span-scope.js';
|
|
7
|
+
import { isSuccessStopReason } from '../engine/types.js';
|
|
8
|
+
/**
|
|
9
|
+
* 在**当前工具调用**里拉起一条子循环。
|
|
10
|
+
*
|
|
11
|
+
* `ctx` 必须是引擎注入的 `ToolRunContext`(`AgentTool.run` 的第二个参数)——
|
|
12
|
+
* 它带着 recorder / 父 span / 取消信号 / 预算与超时护栏。从别处手搓一个 ctx 只会
|
|
13
|
+
* 得到一个「看起来在跑、实际不进树、护栏全离线」的子循环,所以这里不做任何兜底。
|
|
14
|
+
*/
|
|
15
|
+
export async function runCapabilityLoop(ctx, opts) {
|
|
16
|
+
const messages = normalizeMessages(opts.input);
|
|
17
|
+
const name = opts.name ?? 'capability-loop';
|
|
18
|
+
const recorder = ctx.recorder;
|
|
19
|
+
const spanId = recorder.begin('capability', name, ctx.parentSpanId);
|
|
20
|
+
let closed = false;
|
|
21
|
+
const finish = (status, error) => {
|
|
22
|
+
if (closed)
|
|
23
|
+
return;
|
|
24
|
+
closed = true;
|
|
25
|
+
recorder.end(spanId, { status, ...(error !== undefined ? { error } : {}) });
|
|
26
|
+
};
|
|
27
|
+
// 引擎超时「放弃等待」时:capability span 立刻以 error 收尾(与 @SubAgent / @Skill 同口径)
|
|
28
|
+
// —— 等子循环自己 settle 再关,交付的 trace 里会留一个永不闭合的半截 span。
|
|
29
|
+
const onAbandoned = () => {
|
|
30
|
+
finish('error', {
|
|
31
|
+
type: 'timeout',
|
|
32
|
+
message: `capability-loop(${name}) 执行超时被引擎放弃等待`,
|
|
33
|
+
retryable: true,
|
|
34
|
+
});
|
|
35
|
+
};
|
|
36
|
+
ctx.abandoned?.addEventListener('abort', onAbandoned, { once: true });
|
|
37
|
+
// 子循环除了本 run 的取消,还要能被「放弃等待」打断(在飞请求掐掉,不再后台烧 token)
|
|
38
|
+
const combined = combineSignals(ctx.signal, ctx.abandoned);
|
|
39
|
+
try {
|
|
40
|
+
const loop = await withCurrentSpan({ traceId: recorder.traceId, spanId }, () => runAgentScoped({
|
|
41
|
+
// 七个「必须往下交」的旋钮一次取自单源(engine/forwarded.ts)——
|
|
42
|
+
// 手写清单的代价是静默漏字段,历史事故就是 toolTimeoutMs 跨三层没人发现。
|
|
43
|
+
...forwardToolContext(ctx),
|
|
44
|
+
client: ctx.client,
|
|
45
|
+
model: opts.model,
|
|
46
|
+
maxTokens: opts.maxTokens,
|
|
47
|
+
maxIterations: opts.maxIterations,
|
|
48
|
+
system: opts.system,
|
|
49
|
+
messages,
|
|
50
|
+
tools: opts.tools ?? [],
|
|
51
|
+
recorder,
|
|
52
|
+
parentSpanId: spanId,
|
|
53
|
+
// 唯一需要**覆盖**的一项(见 engine/forwarded.ts 文件头对 combineSignals 的说明)
|
|
54
|
+
signal: combined,
|
|
55
|
+
contextPolicy: opts.contextPolicy,
|
|
56
|
+
resultSchema: opts.resultSchema,
|
|
57
|
+
onText: opts.onText,
|
|
58
|
+
}));
|
|
59
|
+
recorder.setAttribute(spanId, 'stop_reason', loop.stopReason);
|
|
60
|
+
finish(isSuccessStopReason(loop.stopReason) ? 'ok' : 'error', loop.error);
|
|
61
|
+
return {
|
|
62
|
+
text: loop.finalText,
|
|
63
|
+
typed: loop.typed,
|
|
64
|
+
stopReason: loop.stopReason,
|
|
65
|
+
iterations: loop.iterations,
|
|
66
|
+
spanId,
|
|
67
|
+
...(loop.error !== undefined ? { error: loop.error } : {}),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
catch (e) {
|
|
71
|
+
// 请求级异常(recorder / 输入校验)此前还没收尾 —— 兜底标记,别留半截 span
|
|
72
|
+
finish('error', classifyError(e));
|
|
73
|
+
throw e;
|
|
74
|
+
}
|
|
75
|
+
finally {
|
|
76
|
+
// 摘除监听:宿主级共享 signal 是长寿的,不摘会按调用次数累积
|
|
77
|
+
ctx.abandoned?.removeEventListener('abort', onAbandoned);
|
|
78
|
+
releaseCombinedSignal(combined);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=capability-loop.js.map
|