@cicctencent/agent-core 0.1.99 → 0.1.101
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/agent/engine.d.ts +11 -0
- package/dist/cjs/agent/engine.d.ts.map +1 -1
- package/dist/cjs/agent/engine.js +191 -29
- package/dist/cjs/agent/engine.js.map +1 -1
- package/dist/cjs/agent/history-manager.d.ts +21 -0
- package/dist/cjs/agent/history-manager.d.ts.map +1 -1
- package/dist/cjs/agent/history-manager.js +72 -0
- package/dist/cjs/agent/history-manager.js.map +1 -1
- package/dist/cjs/agent/llm-caller.d.ts +5 -7
- package/dist/cjs/agent/llm-caller.d.ts.map +1 -1
- package/dist/cjs/agent/llm-caller.js +110 -20
- package/dist/cjs/agent/llm-caller.js.map +1 -1
- package/dist/cjs/agent/tool-executor.d.ts +6 -3
- package/dist/cjs/agent/tool-executor.d.ts.map +1 -1
- package/dist/cjs/agent/tool-executor.js +95 -26
- package/dist/cjs/agent/tool-executor.js.map +1 -1
- package/dist/cjs/agent/types.d.ts +5 -0
- package/dist/cjs/agent/types.d.ts.map +1 -1
- package/dist/cjs/agent/types.js.map +1 -1
- package/dist/cjs/hooks/types.d.ts +6 -1
- package/dist/cjs/hooks/types.d.ts.map +1 -1
- package/dist/cjs/observability/middleware.d.ts.map +1 -1
- package/dist/cjs/observability/middleware.js +63 -1
- package/dist/cjs/observability/middleware.js.map +1 -1
- package/dist/cjs/observability/sink.d.ts +4 -0
- package/dist/cjs/observability/sink.d.ts.map +1 -1
- package/dist/cjs/observability/sink.js +26 -3
- package/dist/cjs/observability/sink.js.map +1 -1
- package/dist/esm/agent/engine.d.ts +11 -0
- package/dist/esm/agent/engine.d.ts.map +1 -1
- package/dist/esm/agent/engine.js +191 -29
- package/dist/esm/agent/engine.js.map +1 -1
- package/dist/esm/agent/history-manager.d.ts +21 -0
- package/dist/esm/agent/history-manager.d.ts.map +1 -1
- package/dist/esm/agent/history-manager.js +72 -0
- package/dist/esm/agent/history-manager.js.map +1 -1
- package/dist/esm/agent/llm-caller.d.ts +5 -7
- package/dist/esm/agent/llm-caller.d.ts.map +1 -1
- package/dist/esm/agent/llm-caller.js +110 -20
- package/dist/esm/agent/llm-caller.js.map +1 -1
- package/dist/esm/agent/tool-executor.d.ts +6 -3
- package/dist/esm/agent/tool-executor.d.ts.map +1 -1
- package/dist/esm/agent/tool-executor.js +95 -26
- package/dist/esm/agent/tool-executor.js.map +1 -1
- package/dist/esm/agent/types.d.ts +5 -0
- package/dist/esm/agent/types.d.ts.map +1 -1
- package/dist/esm/agent/types.js.map +1 -1
- package/dist/esm/hooks/types.d.ts +6 -1
- package/dist/esm/hooks/types.d.ts.map +1 -1
- package/dist/esm/observability/middleware.d.ts.map +1 -1
- package/dist/esm/observability/middleware.js +63 -1
- package/dist/esm/observability/middleware.js.map +1 -1
- package/dist/esm/observability/sink.d.ts +4 -0
- package/dist/esm/observability/sink.d.ts.map +1 -1
- package/dist/esm/observability/sink.js +26 -3
- package/dist/esm/observability/sink.js.map +1 -1
- package/package.json +1 -1
|
@@ -65,8 +65,11 @@ export class ObservabilityManager {
|
|
|
65
65
|
return this.storage.run(context, async () => {
|
|
66
66
|
try {
|
|
67
67
|
const result = await fn();
|
|
68
|
-
//
|
|
69
|
-
|
|
68
|
+
// 若 on_complete 已结束 trace（含 error 状态），不再覆盖；
|
|
69
|
+
// 仅当 trace 仍未结束时才以 ok 兜底收尾
|
|
70
|
+
if (!context.ended) {
|
|
71
|
+
this.endTrace(handle.traceId, { status: 'ok', startTime: handle.startTime });
|
|
72
|
+
}
|
|
70
73
|
return result;
|
|
71
74
|
}
|
|
72
75
|
catch (err) {
|
|
@@ -93,6 +96,9 @@ export class ObservabilityManager {
|
|
|
93
96
|
const current = this.storage.getStore();
|
|
94
97
|
if (!this.isSampled(current))
|
|
95
98
|
return;
|
|
99
|
+
// 标记 trace 已结束，防止 runWithTrace 成功路径覆盖 on_complete 设置的 error 状态
|
|
100
|
+
if (current)
|
|
101
|
+
current.ended = true;
|
|
96
102
|
// fire-and-forget：sink 内部的 DB 写 / Otlp 导出在后台执行，不阻塞调用方
|
|
97
103
|
void Promise.resolve(this.sink.endTrace(traceId, this.sanitize(data))).catch(() => { });
|
|
98
104
|
}
|
|
@@ -106,18 +112,35 @@ export class ObservabilityManager {
|
|
|
106
112
|
startTime: Date.now(),
|
|
107
113
|
sampled,
|
|
108
114
|
};
|
|
115
|
+
// 自动维护父子嵌套：先读取栈顶作为 parent，再将新 observation 压栈
|
|
116
|
+
// 这样 iteration span 内创建的 generation/tool observation 自动成为其子节点
|
|
117
|
+
const parentObservationId = ctx.parentObservationId || current?.currentObservationId;
|
|
118
|
+
if (current) {
|
|
119
|
+
if (!current.observationStack)
|
|
120
|
+
current.observationStack = [];
|
|
121
|
+
current.observationStack.push(handle.observationId);
|
|
122
|
+
current.currentObservationId = handle.observationId;
|
|
123
|
+
}
|
|
109
124
|
if (!sampled)
|
|
110
125
|
return handle;
|
|
111
126
|
const safeCtx = this.sanitize({
|
|
112
127
|
...ctx,
|
|
113
128
|
traceId,
|
|
114
|
-
parentObservationId
|
|
129
|
+
parentObservationId,
|
|
115
130
|
});
|
|
116
131
|
const sinkHandle = await this.sink.startObservation(safeCtx);
|
|
117
132
|
return { ...handle, ...sinkHandle, traceId };
|
|
118
133
|
}
|
|
119
134
|
endObservation(observationId, data = {}) {
|
|
120
135
|
const current = this.storage.getStore();
|
|
136
|
+
// 从栈中弹出当前 observation，恢复上一层的 currentObservationId
|
|
137
|
+
if (current?.observationStack) {
|
|
138
|
+
const idx = current.observationStack.lastIndexOf(observationId);
|
|
139
|
+
if (idx >= 0) {
|
|
140
|
+
current.observationStack.splice(idx, 1);
|
|
141
|
+
current.currentObservationId = current.observationStack[current.observationStack.length - 1];
|
|
142
|
+
}
|
|
143
|
+
}
|
|
121
144
|
if (!this.isSampled(current))
|
|
122
145
|
return;
|
|
123
146
|
// fire-and-forget：sink 内部的 DB 写 / Otlp 导出在后台执行，不阻塞调用方
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sink.js","sourceRoot":"","sources":["../../../src/observability/sink.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,2DAA2D;AAC3D,+DAA+D;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"sink.js","sourceRoot":"","sources":["../../../src/observability/sink.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cicctencent/agent-core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.101",
|
|
4
4
|
"description": "Core engine for AI agent — LLM orchestration, tool execution, MCP, skill routing, security, and memory pipeline.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/cjs/index.js",
|