@burtson-labs/agent-core 1.6.15 → 1.6.17
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 +3 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/activation.js +16 -8
- package/dist/mcp/activation.js.map +1 -1
- package/dist/mcp/clientPool.js +40 -22
- package/dist/mcp/clientPool.js.map +1 -1
- package/dist/mcp/server.js +16 -10
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/toolAdapter.js +21 -11
- package/dist/mcp/toolAdapter.js.map +1 -1
- package/dist/providers/deterministic-provider.d.ts +1 -1
- package/dist/providers/deterministic-provider.d.ts.map +1 -1
- package/dist/runtime/AgentRuntime.d.ts +2 -2
- package/dist/runtime/AgentRuntime.d.ts.map +1 -1
- package/dist/security/secretPatterns.js +4 -2
- package/dist/security/secretPatterns.js.map +1 -1
- package/dist/telemetry/otlpExporter.d.ts +69 -0
- package/dist/telemetry/otlpExporter.d.ts.map +1 -0
- package/dist/telemetry/otlpExporter.js +321 -0
- package/dist/telemetry/otlpExporter.js.map +1 -0
- package/dist/tools/ask-user-tool.js +8 -4
- package/dist/tools/ask-user-tool.js.map +1 -1
- package/dist/tools/compactMessages.js +6 -3
- package/dist/tools/compactMessages.js.map +1 -1
- package/dist/tools/core-tools.js +145 -75
- package/dist/tools/core-tools.js.map +1 -1
- package/dist/tools/git-tools.js +22 -11
- package/dist/tools/git-tools.js.map +1 -1
- package/dist/tools/language-adapters.js +24 -12
- package/dist/tools/language-adapters.js.map +1 -1
- package/dist/tools/loop/finalAnswerNudges.js +12 -6
- package/dist/tools/loop/finalAnswerNudges.js.map +1 -1
- package/dist/tools/loop/llmStream.js +6 -3
- package/dist/tools/loop/llmStream.js.map +1 -1
- package/dist/tools/loop/parallelExecute.js +2 -1
- package/dist/tools/loop/parallelExecute.js.map +1 -1
- package/dist/tools/loop/singleToolExecute.js +8 -4
- package/dist/tools/loop/singleToolExecute.js.map +1 -1
- package/dist/tools/loop/turnSetup.js +6 -3
- package/dist/tools/loop/turnSetup.js.map +1 -1
- package/dist/tools/ocr.d.ts.map +1 -1
- package/dist/tools/ocr.js +7 -5
- package/dist/tools/ocr.js.map +1 -1
- package/dist/tools/post-edit-checks.js +25 -13
- package/dist/tools/post-edit-checks.js.map +1 -1
- package/dist/tools/skill-loader.d.ts +1 -1
- package/dist/tools/skill-loader.d.ts.map +1 -1
- package/dist/tools/skill-loader.js +14 -7
- package/dist/tools/skill-loader.js.map +1 -1
- package/dist/tools/skill-registry.js +2 -1
- package/dist/tools/skill-registry.js.map +1 -1
- package/dist/tools/skills/mail-search-skill.js +14 -7
- package/dist/tools/skills/mail-search-skill.js.map +1 -1
- package/dist/tools/skills/plan-skill.js +4 -2
- package/dist/tools/skills/plan-skill.js.map +1 -1
- package/dist/tools/skills/semantic-search-skill.js +12 -6
- package/dist/tools/skills/semantic-search-skill.js.map +1 -1
- package/dist/tools/skills/test-gen-skill.js +8 -4
- package/dist/tools/skills/test-gen-skill.js.map +1 -1
- package/dist/tools/tool-registry.js +10 -5
- package/dist/tools/tool-registry.js.map +1 -1
- package/dist/tools/tool-use-loop.d.ts +1 -1
- package/dist/tools/tool-use-loop.d.ts.map +1 -1
- package/dist/tools/tool-use-loop.js +26 -14
- package/dist/tools/tool-use-loop.js.map +1 -1
- package/dist/tools/tool-use-parser.js +56 -28
- package/dist/tools/tool-use-parser.js.map +1 -1
- package/dist/tools/toolAvailabilityDetector.js +2 -1
- package/dist/tools/toolAvailabilityDetector.js.map +1 -1
- package/dist/tools/unified-patch.js +16 -8
- package/dist/tools/unified-patch.js.map +1 -1
- package/dist/utils/event-emitter.d.ts +1 -1
- package/dist/utils/event-emitter.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -227,8 +227,9 @@ function redactSecrets(text, patterns = exports.BUILTIN_SECRET_PATTERNS) {
|
|
|
227
227
|
let redactionCount = 0;
|
|
228
228
|
const kinds = [];
|
|
229
229
|
const recordKind = (kind) => {
|
|
230
|
-
if (!kinds.includes(kind))
|
|
230
|
+
if (!kinds.includes(kind)) {
|
|
231
231
|
kinds.push(kind);
|
|
232
|
+
}
|
|
232
233
|
};
|
|
233
234
|
for (const pattern of patterns) {
|
|
234
235
|
// Reset lastIndex so the global regex starts at 0 every call.
|
|
@@ -275,8 +276,9 @@ function redactSecrets(text, patterns = exports.BUILTIN_SECRET_PATTERNS) {
|
|
|
275
276
|
}
|
|
276
277
|
// Defensive: regex with `g` flag carries state across calls. Reset
|
|
277
278
|
// again to guarantee no leftover lastIndex affects later callers.
|
|
278
|
-
if (mutated)
|
|
279
|
+
if (mutated) {
|
|
279
280
|
pattern.re.lastIndex = 0;
|
|
281
|
+
}
|
|
280
282
|
}
|
|
281
283
|
return { text: working, redactionCount, kinds };
|
|
282
284
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretPatterns.js","sourceRoot":"","sources":["../../src/security/secretPatterns.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"secretPatterns.js","sourceRoot":"","sources":["../../src/security/secretPatterns.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
export interface TelemetryConfig {
|
|
2
|
+
endpoint: string;
|
|
3
|
+
headers: Record<string, string>;
|
|
4
|
+
mode: 'metrics+traces' | 'metrics-only';
|
|
5
|
+
serviceName: string;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Resolve the effective telemetry config from a config block + env, or `null`
|
|
9
|
+
* when disabled. Precedence: env > config. Bearer defaults to the signed-in
|
|
10
|
+
* Bandit token unless an explicit Authorization header is supplied.
|
|
11
|
+
*/
|
|
12
|
+
export declare function resolveTelemetryConfig(opts: {
|
|
13
|
+
telemetry?: {
|
|
14
|
+
enabled?: boolean;
|
|
15
|
+
endpoint?: string;
|
|
16
|
+
mode?: 'metrics+traces' | 'metrics-only';
|
|
17
|
+
headers?: Record<string, string>;
|
|
18
|
+
};
|
|
19
|
+
banditApiKey?: string;
|
|
20
|
+
serviceName?: string;
|
|
21
|
+
env?: Record<string, string | undefined>;
|
|
22
|
+
}): TelemetryConfig | null;
|
|
23
|
+
type AttrVal = string | number | boolean;
|
|
24
|
+
export declare const TTFT_BUCKETS: number[];
|
|
25
|
+
export declare const DURATION_BUCKETS: number[];
|
|
26
|
+
interface SpanRec {
|
|
27
|
+
spanId: string;
|
|
28
|
+
parentSpanId?: string;
|
|
29
|
+
name: string;
|
|
30
|
+
startMs: number;
|
|
31
|
+
endMs?: number;
|
|
32
|
+
attrs: Record<string, AttrVal | undefined>;
|
|
33
|
+
error?: string;
|
|
34
|
+
}
|
|
35
|
+
export declare class TelemetryExporter {
|
|
36
|
+
private readonly cfg;
|
|
37
|
+
private readonly now;
|
|
38
|
+
private readonly sink?;
|
|
39
|
+
private readonly debug;
|
|
40
|
+
private traceId;
|
|
41
|
+
private turn;
|
|
42
|
+
private llm;
|
|
43
|
+
private llmFirstChunkMs;
|
|
44
|
+
private openTools;
|
|
45
|
+
private completedSpans;
|
|
46
|
+
private model;
|
|
47
|
+
private turnChunkChars;
|
|
48
|
+
private turnTokens;
|
|
49
|
+
private ttftSeconds;
|
|
50
|
+
constructor(cfg: TelemetryConfig, opts?: {
|
|
51
|
+
now?: () => number;
|
|
52
|
+
sink?: (path: string, body: unknown) => Promise<void>;
|
|
53
|
+
});
|
|
54
|
+
startTurn(goal: string, model: string): void;
|
|
55
|
+
/** Fed from the host's event funnel. Best-effort; swallows bad payloads. */
|
|
56
|
+
onEvent(type: string, payload: unknown): void;
|
|
57
|
+
private takeOpenTool;
|
|
58
|
+
/** Close the turn, build OTLP traces + metrics, and flush. Never rejects. */
|
|
59
|
+
endTurn(outcome?: {
|
|
60
|
+
error?: string;
|
|
61
|
+
}): Promise<void>;
|
|
62
|
+
private buildTraces;
|
|
63
|
+
private buildMetrics;
|
|
64
|
+
private post;
|
|
65
|
+
/** Expose payload builders for tests without hitting the network. */
|
|
66
|
+
_buildTracesForTest(traceId: string, spans: SpanRec[]): unknown;
|
|
67
|
+
}
|
|
68
|
+
export {};
|
|
69
|
+
//# sourceMappingURL=otlpExporter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otlpExporter.d.ts","sourceRoot":"","sources":["../../src/telemetry/otlpExporter.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,gBAAgB,GAAG,cAAc,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACjI,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C,GAAG,eAAe,GAAG,IAAI,CAiBzB;AAID,KAAK,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAsBzC,eAAO,MAAM,YAAY,UAAoC,CAAC;AAC9D,eAAO,MAAM,gBAAgB,UAAuC,CAAC;AA6BrE,UAAU,OAAO;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAiD;IAEvE,OAAO,CAAC,QAAQ,CAAC,KAAK,CACyG;IAE/H,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,IAAI,CAAwB;IACpC,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,WAAW,CAAuB;gBAE9B,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE;IAMtH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAkB5C,4EAA4E;IAC5E,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAuD7C,OAAO,CAAC,YAAY;IASpB,6EAA6E;IACvE,OAAO,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB1D,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,YAAY;YAmBN,IAAI;IAqBlB,qEAAqE;IACrE,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO;CAChE"}
|
|
@@ -0,0 +1,321 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TelemetryExporter = exports.DURATION_BUCKETS = exports.TTFT_BUCKETS = void 0;
|
|
4
|
+
exports.resolveTelemetryConfig = resolveTelemetryConfig;
|
|
5
|
+
/**
|
|
6
|
+
* SDK-less OTLP/HTTP telemetry exporter — shared by the CLI and the IDE host.
|
|
7
|
+
*
|
|
8
|
+
* Opt-in, off by default. Sends one trace per turn (root span `agent.turn`
|
|
9
|
+
* with child LLM + tool spans) plus a few usage metrics (tokens, TTFT, turn
|
|
10
|
+
* duration) to an OTLP/HTTP endpoint — by default `otlp.burtson.ai`, but
|
|
11
|
+
* `endpoint` + `headers` can point at ANY collector (App Insights, Datadog, a
|
|
12
|
+
* client's own), so the wire format stays vendor-neutral.
|
|
13
|
+
*
|
|
14
|
+
* No `@opentelemetry/*` dependency on purpose — hand-rolled OTLP JSON over
|
|
15
|
+
* `fetch`, so consumers carry zero telemetry weight. The collector's spanmetrics
|
|
16
|
+
* connector derives RED metrics from the spans, so the client only emits the
|
|
17
|
+
* traces + token/TTFT it uniquely knows.
|
|
18
|
+
*
|
|
19
|
+
* Host-agnostic: uses Web Crypto + global `fetch`, no Node-only imports, so it
|
|
20
|
+
* runs in the CLI, the extension host, or the browser. Privacy: prompt/
|
|
21
|
+
* completion text is NEVER attached; the only free-text attributes (turn goal,
|
|
22
|
+
* a tool's primary param) are truncated and run through `redactSecretsString`.
|
|
23
|
+
* `mode: 'metrics-only'` drops traces entirely.
|
|
24
|
+
*/
|
|
25
|
+
const secretPatterns_1 = require("../security/secretPatterns");
|
|
26
|
+
/**
|
|
27
|
+
* Resolve the effective telemetry config from a config block + env, or `null`
|
|
28
|
+
* when disabled. Precedence: env > config. Bearer defaults to the signed-in
|
|
29
|
+
* Bandit token unless an explicit Authorization header is supplied.
|
|
30
|
+
*/
|
|
31
|
+
function resolveTelemetryConfig(opts) {
|
|
32
|
+
const env = opts.env ?? (typeof process !== 'undefined' ? process.env : {});
|
|
33
|
+
const enabledEnv = env.BANDIT_TELEMETRY;
|
|
34
|
+
const enabled = enabledEnv === '1' || enabledEnv === 'true' ? true
|
|
35
|
+
: enabledEnv === '0' || enabledEnv === 'false' ? false
|
|
36
|
+
: (opts.telemetry?.enabled ?? false);
|
|
37
|
+
if (!enabled)
|
|
38
|
+
return null;
|
|
39
|
+
const endpoint = (env.BANDIT_OTLP_ENDPOINT ?? opts.telemetry?.endpoint ?? 'https://otlp.burtson.ai').replace(/\/+$/, '');
|
|
40
|
+
const headers = { ...(opts.telemetry?.headers ?? {}) };
|
|
41
|
+
const hasAuth = Object.keys(headers).some((k) => k.toLowerCase() === 'authorization');
|
|
42
|
+
if (!hasAuth) {
|
|
43
|
+
const token = env.BANDIT_OTLP_TOKEN ?? opts.banditApiKey;
|
|
44
|
+
if (token)
|
|
45
|
+
headers['Authorization'] = `Bearer ${token}`;
|
|
46
|
+
}
|
|
47
|
+
const mode = env.BANDIT_OTLP_MODE ?? opts.telemetry?.mode ?? 'metrics+traces';
|
|
48
|
+
return { endpoint, headers, mode, serviceName: opts.serviceName ?? 'bandit-cli' };
|
|
49
|
+
}
|
|
50
|
+
function toAttrs(rec) {
|
|
51
|
+
const out = [];
|
|
52
|
+
for (const [key, v] of Object.entries(rec)) {
|
|
53
|
+
if (v === undefined || v === null || v === '')
|
|
54
|
+
continue;
|
|
55
|
+
if (typeof v === 'boolean')
|
|
56
|
+
out.push({ key, value: { boolValue: v } });
|
|
57
|
+
else if (typeof v === 'number')
|
|
58
|
+
out.push({ key, value: Number.isInteger(v) ? { intValue: String(v) } : { doubleValue: v } });
|
|
59
|
+
else
|
|
60
|
+
out.push({ key, value: { stringValue: v } });
|
|
61
|
+
}
|
|
62
|
+
return out;
|
|
63
|
+
}
|
|
64
|
+
const webCrypto = globalThis.crypto;
|
|
65
|
+
function hex(bytes) {
|
|
66
|
+
const arr = new Uint8Array(bytes);
|
|
67
|
+
if (webCrypto?.getRandomValues)
|
|
68
|
+
webCrypto.getRandomValues(arr);
|
|
69
|
+
return Array.from(arr, (b) => b.toString(16).padStart(2, '0')).join('');
|
|
70
|
+
}
|
|
71
|
+
const nano = (ms) => String(Math.round(ms * 1e6));
|
|
72
|
+
exports.TTFT_BUCKETS = [0.1, 0.25, 0.5, 1, 2, 5, 10, 30];
|
|
73
|
+
exports.DURATION_BUCKETS = [0.5, 1, 2, 5, 10, 30, 60, 120, 300];
|
|
74
|
+
/** Single-observation DELTA histogram data point (the collector converts to
|
|
75
|
+
* cumulative). count=1, the value lands in exactly one bucket. */
|
|
76
|
+
function histogramPoint(value, bounds, attrs, startMs, endMs) {
|
|
77
|
+
const counts = new Array(bounds.length + 1).fill(0);
|
|
78
|
+
let idx = bounds.findIndex((b) => value <= b);
|
|
79
|
+
if (idx === -1)
|
|
80
|
+
idx = bounds.length;
|
|
81
|
+
counts[idx] = 1;
|
|
82
|
+
return {
|
|
83
|
+
attributes: toAttrs(attrs),
|
|
84
|
+
startTimeUnixNano: nano(startMs),
|
|
85
|
+
timeUnixNano: nano(endMs),
|
|
86
|
+
count: '1',
|
|
87
|
+
sum: value,
|
|
88
|
+
bucketCounts: counts.map(String),
|
|
89
|
+
explicitBounds: bounds
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function sumPoint(value, attrs, startMs, endMs) {
|
|
93
|
+
return {
|
|
94
|
+
attributes: toAttrs(attrs),
|
|
95
|
+
startTimeUnixNano: nano(startMs),
|
|
96
|
+
timeUnixNano: nano(endMs),
|
|
97
|
+
asInt: String(Math.round(value))
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
const clip = (s, n = 120) => (0, secretPatterns_1.redactSecretsString)(s.slice(0, n)).slice(0, n);
|
|
101
|
+
class TelemetryExporter {
|
|
102
|
+
constructor(cfg, opts) {
|
|
103
|
+
// Opt-in stderr tracing for "telemetry isn't sending" diagnosis. Zero overhead off.
|
|
104
|
+
this.debug = !!globalThis.process?.env?.BANDIT_TELEMETRY_DEBUG;
|
|
105
|
+
this.traceId = '';
|
|
106
|
+
this.turn = null;
|
|
107
|
+
this.llm = null;
|
|
108
|
+
this.llmFirstChunkMs = 0;
|
|
109
|
+
this.openTools = [];
|
|
110
|
+
this.completedSpans = [];
|
|
111
|
+
this.model = '';
|
|
112
|
+
this.turnChunkChars = 0;
|
|
113
|
+
this.turnTokens = 0;
|
|
114
|
+
this.ttftSeconds = null;
|
|
115
|
+
this.cfg = cfg;
|
|
116
|
+
this.now = opts?.now ?? (() => Date.now());
|
|
117
|
+
this.sink = opts?.sink;
|
|
118
|
+
}
|
|
119
|
+
startTurn(goal, model) {
|
|
120
|
+
this.traceId = hex(16);
|
|
121
|
+
this.model = model;
|
|
122
|
+
this.turnChunkChars = 0;
|
|
123
|
+
this.turnTokens = 0;
|
|
124
|
+
this.ttftSeconds = null;
|
|
125
|
+
this.llm = null;
|
|
126
|
+
this.llmFirstChunkMs = 0;
|
|
127
|
+
this.openTools = [];
|
|
128
|
+
this.completedSpans = [];
|
|
129
|
+
this.turn = {
|
|
130
|
+
spanId: hex(8),
|
|
131
|
+
name: 'agent.turn',
|
|
132
|
+
startMs: this.now(),
|
|
133
|
+
attrs: { 'gen_ai.request.model': model, 'bandit.turn.goal': clip(goal, 160) }
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
/** Fed from the host's event funnel. Best-effort; swallows bad payloads. */
|
|
137
|
+
onEvent(type, payload) {
|
|
138
|
+
if (!this.turn)
|
|
139
|
+
return;
|
|
140
|
+
try {
|
|
141
|
+
const p = (payload ?? {});
|
|
142
|
+
switch (type) {
|
|
143
|
+
case 'tool_loop:llm_start':
|
|
144
|
+
this.llm = { spanId: hex(8), parentSpanId: this.turn.spanId, name: 'llm.generate', startMs: this.now(), attrs: { 'gen_ai.request.model': this.model } };
|
|
145
|
+
this.llmFirstChunkMs = 0;
|
|
146
|
+
break;
|
|
147
|
+
case 'tool_loop:llm_chunk': {
|
|
148
|
+
const chunk = typeof p.chunk === 'string' ? p.chunk : '';
|
|
149
|
+
if (this.llm && this.llmFirstChunkMs === 0 && chunk.length > 0) {
|
|
150
|
+
this.llmFirstChunkMs = this.now();
|
|
151
|
+
const ttft = (this.llmFirstChunkMs - this.llm.startMs) / 1000;
|
|
152
|
+
if (this.ttftSeconds === null)
|
|
153
|
+
this.ttftSeconds = ttft;
|
|
154
|
+
this.llm.attrs['bandit.llm.ttft_seconds'] = ttft;
|
|
155
|
+
}
|
|
156
|
+
this.turnChunkChars += chunk.length;
|
|
157
|
+
this.turnTokens = Math.floor(this.turnChunkChars / 4);
|
|
158
|
+
break;
|
|
159
|
+
}
|
|
160
|
+
case 'tool_loop:llm_response':
|
|
161
|
+
if (this.llm) {
|
|
162
|
+
this.llm.endMs = this.now();
|
|
163
|
+
if (typeof p.llmDurationMs === 'number')
|
|
164
|
+
this.llm.attrs['bandit.llm.duration_ms'] = p.llmDurationMs;
|
|
165
|
+
if (typeof p.responseLength === 'number')
|
|
166
|
+
this.llm.attrs['bandit.llm.response_chars'] = p.responseLength;
|
|
167
|
+
this.completedSpans.push(this.llm);
|
|
168
|
+
this.llm = null;
|
|
169
|
+
}
|
|
170
|
+
break;
|
|
171
|
+
case 'tool_loop:tool_execute': {
|
|
172
|
+
const name = typeof p.name === 'string' ? p.name : 'tool';
|
|
173
|
+
const params = (p.params ?? {});
|
|
174
|
+
const primary = params.path ?? params.pattern ?? params.cmd ?? params.url ?? params.query ?? '';
|
|
175
|
+
this.openTools.push({ spanId: hex(8), parentSpanId: this.turn.spanId, name: `tool.${name}`, startMs: this.now(), attrs: { 'bandit.tool.name': name, 'bandit.tool.primary': primary ? clip(primary) : undefined } });
|
|
176
|
+
break;
|
|
177
|
+
}
|
|
178
|
+
case 'tool_loop:tool_result':
|
|
179
|
+
case 'tool_loop:tool_error':
|
|
180
|
+
case 'tool_loop:tool_blocked': {
|
|
181
|
+
const name = typeof p.name === 'string' ? p.name : undefined;
|
|
182
|
+
const span = this.takeOpenTool(name);
|
|
183
|
+
if (span) {
|
|
184
|
+
span.endMs = this.now();
|
|
185
|
+
if (type === 'tool_loop:tool_blocked')
|
|
186
|
+
span.error = typeof p.reason === 'string' ? p.reason : 'blocked';
|
|
187
|
+
else if (type === 'tool_loop:tool_error')
|
|
188
|
+
span.error = 'tool error';
|
|
189
|
+
else if (p.isError === true)
|
|
190
|
+
span.error = 'tool error';
|
|
191
|
+
this.completedSpans.push(span);
|
|
192
|
+
}
|
|
193
|
+
break;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
catch { /* telemetry must never break a turn */ }
|
|
198
|
+
}
|
|
199
|
+
takeOpenTool(name) {
|
|
200
|
+
if (name) {
|
|
201
|
+
for (let i = this.openTools.length - 1; i >= 0; i -= 1) {
|
|
202
|
+
if (this.openTools[i].name === `tool.${name}`)
|
|
203
|
+
return this.openTools.splice(i, 1)[0];
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
return this.openTools.shift();
|
|
207
|
+
}
|
|
208
|
+
/** Close the turn, build OTLP traces + metrics, and flush. Never rejects. */
|
|
209
|
+
async endTurn(outcome) {
|
|
210
|
+
const turn = this.turn;
|
|
211
|
+
if (!turn) {
|
|
212
|
+
if (this.debug)
|
|
213
|
+
process.stderr.write('[telemetry] endTurn: no active turn — startTurn was never called for this turn\n');
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
this.turn = null;
|
|
217
|
+
const end = this.now();
|
|
218
|
+
if (this.llm && !this.llm.endMs) {
|
|
219
|
+
this.llm.endMs = end;
|
|
220
|
+
this.completedSpans.push(this.llm);
|
|
221
|
+
this.llm = null;
|
|
222
|
+
}
|
|
223
|
+
for (const t of this.openTools.splice(0)) {
|
|
224
|
+
t.endMs = end;
|
|
225
|
+
t.error = t.error ?? 'incomplete';
|
|
226
|
+
this.completedSpans.push(t);
|
|
227
|
+
}
|
|
228
|
+
turn.endMs = end;
|
|
229
|
+
if (outcome?.error)
|
|
230
|
+
turn.error = outcome.error;
|
|
231
|
+
const traceId = this.traceId;
|
|
232
|
+
const spans = [turn, ...this.completedSpans];
|
|
233
|
+
const jobs = [];
|
|
234
|
+
if (this.cfg.mode === 'metrics+traces')
|
|
235
|
+
jobs.push(this.post('/v1/traces', this.buildTraces(traceId, spans)));
|
|
236
|
+
jobs.push(this.post('/v1/metrics', this.buildMetrics(turn)));
|
|
237
|
+
try {
|
|
238
|
+
await Promise.all(jobs);
|
|
239
|
+
}
|
|
240
|
+
catch { /* best-effort */ }
|
|
241
|
+
}
|
|
242
|
+
buildTraces(traceId, spans) {
|
|
243
|
+
return {
|
|
244
|
+
resourceSpans: [{
|
|
245
|
+
resource: { attributes: toAttrs({ 'service.name': this.cfg.serviceName }) },
|
|
246
|
+
scopeSpans: [{
|
|
247
|
+
scope: { name: this.cfg.serviceName },
|
|
248
|
+
spans: spans.map((s) => ({
|
|
249
|
+
traceId,
|
|
250
|
+
spanId: s.spanId,
|
|
251
|
+
parentSpanId: s.parentSpanId,
|
|
252
|
+
name: s.name,
|
|
253
|
+
kind: 1,
|
|
254
|
+
startTimeUnixNano: nano(s.startMs),
|
|
255
|
+
endTimeUnixNano: nano(s.endMs ?? s.startMs),
|
|
256
|
+
attributes: toAttrs(s.attrs),
|
|
257
|
+
status: s.error ? { code: 2, message: s.error.slice(0, 200) } : { code: 1 }
|
|
258
|
+
}))
|
|
259
|
+
}]
|
|
260
|
+
}]
|
|
261
|
+
};
|
|
262
|
+
}
|
|
263
|
+
buildMetrics(turn) {
|
|
264
|
+
const start = turn.startMs;
|
|
265
|
+
const end = turn.endMs ?? this.now();
|
|
266
|
+
const metrics = [];
|
|
267
|
+
if (this.turnTokens > 0) {
|
|
268
|
+
metrics.push({ name: 'bandit.llm.tokens', sum: { aggregationTemporality: 1, isMonotonic: true, dataPoints: [sumPoint(this.turnTokens, { type: 'output', 'gen_ai.request.model': this.model }, start, end)] } });
|
|
269
|
+
}
|
|
270
|
+
if (this.ttftSeconds !== null) {
|
|
271
|
+
metrics.push({ name: 'bandit.llm.ttft', unit: 's', histogram: { aggregationTemporality: 1, dataPoints: [histogramPoint(this.ttftSeconds, exports.TTFT_BUCKETS, { 'gen_ai.request.model': this.model }, start, end)] } });
|
|
272
|
+
}
|
|
273
|
+
metrics.push({ name: 'bandit.turn.duration', unit: 's', histogram: { aggregationTemporality: 1, dataPoints: [histogramPoint((end - start) / 1000, exports.DURATION_BUCKETS, { 'gen_ai.request.model': this.model }, start, end)] } });
|
|
274
|
+
return {
|
|
275
|
+
resourceMetrics: [{
|
|
276
|
+
resource: { attributes: toAttrs({ 'service.name': this.cfg.serviceName }) },
|
|
277
|
+
scopeMetrics: [{ scope: { name: this.cfg.serviceName }, metrics }]
|
|
278
|
+
}]
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
async post(path, body) {
|
|
282
|
+
if (this.sink) {
|
|
283
|
+
try {
|
|
284
|
+
await this.sink(path, body);
|
|
285
|
+
}
|
|
286
|
+
catch { /* ignore */ }
|
|
287
|
+
return;
|
|
288
|
+
}
|
|
289
|
+
const doFetch = globalThis.fetch;
|
|
290
|
+
if (!doFetch) {
|
|
291
|
+
if (this.debug)
|
|
292
|
+
process.stderr.write('[telemetry] no global fetch available\n');
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
const ctrl = new AbortController();
|
|
296
|
+
const timer = setTimeout(() => ctrl.abort(), 4000);
|
|
297
|
+
try {
|
|
298
|
+
const res = await doFetch(`${this.cfg.endpoint}${path}`, {
|
|
299
|
+
method: 'POST',
|
|
300
|
+
headers: { 'Content-Type': 'application/json', ...this.cfg.headers },
|
|
301
|
+
body: JSON.stringify(body),
|
|
302
|
+
signal: ctrl.signal
|
|
303
|
+
});
|
|
304
|
+
if (this.debug) {
|
|
305
|
+
const status = res?.status;
|
|
306
|
+
process.stderr.write(`[telemetry] POST ${this.cfg.endpoint}${path} -> ${status ?? '??'}\n`);
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
catch (e) {
|
|
310
|
+
if (this.debug)
|
|
311
|
+
process.stderr.write(`[telemetry] POST ${path} failed: ${e?.message ?? e}\n`);
|
|
312
|
+
}
|
|
313
|
+
finally {
|
|
314
|
+
clearTimeout(timer);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
/** Expose payload builders for tests without hitting the network. */
|
|
318
|
+
_buildTracesForTest(traceId, spans) { return this.buildTraces(traceId, spans); }
|
|
319
|
+
}
|
|
320
|
+
exports.TelemetryExporter = TelemetryExporter;
|
|
321
|
+
//# sourceMappingURL=otlpExporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otlpExporter.js","sourceRoot":"","sources":["../../src/telemetry/otlpExporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,15 +18,17 @@ const QUESTIONS_EXAMPLE = '[{"question":"Which database should we use?","header"
|
|
|
18
18
|
'[{"label":"Postgres","description":"Relational, strong consistency"},' +
|
|
19
19
|
'{"label":"MongoDB","description":"Flexible document store"}],"allowFreeform":true}]';
|
|
20
20
|
function coerceOption(raw) {
|
|
21
|
-
if (typeof raw === 'string')
|
|
21
|
+
if (typeof raw === 'string') {
|
|
22
22
|
return raw.trim() ? { label: raw.trim() } : null;
|
|
23
|
+
}
|
|
23
24
|
if (raw && typeof raw === 'object') {
|
|
24
25
|
const o = raw;
|
|
25
26
|
const label = typeof o.label === 'string' ? o.label
|
|
26
27
|
: typeof o.value === 'string' ? o.value
|
|
27
28
|
: typeof o.text === 'string' ? o.text : '';
|
|
28
|
-
if (!label.trim())
|
|
29
|
+
if (!label.trim()) {
|
|
29
30
|
return null;
|
|
31
|
+
}
|
|
30
32
|
return {
|
|
31
33
|
label: label.trim(),
|
|
32
34
|
description: typeof o.description === 'string' ? o.description : undefined
|
|
@@ -48,14 +50,16 @@ function parseAskUserQuestions(rawJson) {
|
|
|
48
50
|
const list = Array.isArray(parsed) ? parsed : [parsed];
|
|
49
51
|
const questions = [];
|
|
50
52
|
list.forEach((raw, i) => {
|
|
51
|
-
if (!raw || typeof raw !== 'object')
|
|
53
|
+
if (!raw || typeof raw !== 'object') {
|
|
52
54
|
return;
|
|
55
|
+
}
|
|
53
56
|
const r = raw;
|
|
54
57
|
const text = typeof r.question === 'string' ? r.question
|
|
55
58
|
: typeof r.text === 'string' ? r.text
|
|
56
59
|
: typeof r.prompt === 'string' ? r.prompt : '';
|
|
57
|
-
if (!text.trim())
|
|
60
|
+
if (!text.trim()) {
|
|
58
61
|
return;
|
|
62
|
+
}
|
|
59
63
|
const options = (Array.isArray(r.options) ? r.options : [])
|
|
60
64
|
.map(coerceOption)
|
|
61
65
|
.filter((o) => o !== null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask-user-tool.js","sourceRoot":"","sources":["../../src/tools/ask-user-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AA8BH,sDA4BC;AAtDD,MAAM,iBAAiB,GACrB,6EAA6E;IAC7E,uEAAuE;IACvE,qFAAqF,CAAC;AAIxF,SAAS,YAAY,CAAC,GAAY;IAChC,IAAI,OAAO,GAAG,KAAK,QAAQ;
|
|
1
|
+
{"version":3,"file":"ask-user-tool.js","sourceRoot":"","sources":["../../src/tools/ask-user-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,8 +83,9 @@ function compactToolMessages(messages, options = {}) {
|
|
|
83
83
|
// Index tool-result messages so we can decide which to summarize.
|
|
84
84
|
const toolResultIndices = [];
|
|
85
85
|
for (let i = 0; i < messages.length; i++) {
|
|
86
|
-
if (isToolResultMessage(messages[i]))
|
|
86
|
+
if (isToolResultMessage(messages[i])) {
|
|
87
87
|
toolResultIndices.push(i);
|
|
88
|
+
}
|
|
88
89
|
}
|
|
89
90
|
// Greedy compaction (2026-05-06): summarize OLDEST tool results first
|
|
90
91
|
// and stop the moment we drop under budget. Previously we summarized
|
|
@@ -103,8 +104,9 @@ function compactToolMessages(messages, options = {}) {
|
|
|
103
104
|
const summarized = new Set();
|
|
104
105
|
let estimatedAfter = beforeTokens;
|
|
105
106
|
for (const idx of summarizableIndices) {
|
|
106
|
-
if (estimatedAfter <= budget)
|
|
107
|
+
if (estimatedAfter <= budget) {
|
|
107
108
|
break;
|
|
109
|
+
}
|
|
108
110
|
const original = messages[idx].content;
|
|
109
111
|
const summary = summarizeToolResult(original);
|
|
110
112
|
estimatedAfter -= estimateTokens(original, cpt);
|
|
@@ -130,8 +132,9 @@ function compactToolMessages(messages, options = {}) {
|
|
|
130
132
|
const systemIndices = new Set();
|
|
131
133
|
const firstUserIndex = out.findIndex((m) => m.role === 'user');
|
|
132
134
|
out.forEach((m, i) => {
|
|
133
|
-
if (m.role === 'system')
|
|
135
|
+
if (m.role === 'system') {
|
|
134
136
|
systemIndices.add(i);
|
|
137
|
+
}
|
|
135
138
|
});
|
|
136
139
|
// Walk forward from iteration after the first user, drop messages
|
|
137
140
|
// until budget fits or we hit the last two (needed for model state).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compactMessages.js","sourceRoot":"","sources":["../../src/tools/compactMessages.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compactMessages.js","sourceRoot":"","sources":["../../src/tools/compactMessages.ts"],"names":[],"mappings":"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"}
|