@farmslot/agent-runtime 0.48.3 → 0.48.4
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 +7 -0
- package/dist/native/observation.d.ts +10 -0
- package/dist/native/observation.d.ts.map +1 -1
- package/dist/native/observation.js +50 -3
- package/dist/native/observation.js.map +1 -1
- package/dist/tool-usage/adapters/claude.d.ts.map +1 -1
- package/dist/tool-usage/adapters/claude.js +59 -20
- package/dist/tool-usage/adapters/claude.js.map +1 -1
- package/dist/tool-usage/adapters/codex.d.ts.map +1 -1
- package/dist/tool-usage/adapters/codex.js +78 -20
- package/dist/tool-usage/adapters/codex.js.map +1 -1
- package/dist/tool-usage/adapters/cursor.d.ts.map +1 -1
- package/dist/tool-usage/adapters/cursor.js +6 -1
- package/dist/tool-usage/adapters/cursor.js.map +1 -1
- package/dist/tool-usage/adapters/grok.d.ts.map +1 -1
- package/dist/tool-usage/adapters/grok.js +35 -4
- package/dist/tool-usage/adapters/grok.js.map +1 -1
- package/dist/tool-usage/adapters/jsonl.d.ts +4 -0
- package/dist/tool-usage/adapters/jsonl.d.ts.map +1 -1
- package/dist/tool-usage/adapters/jsonl.js +6 -0
- package/dist/tool-usage/adapters/jsonl.js.map +1 -1
- package/dist/tool-usage/adapters/native.d.ts.map +1 -1
- package/dist/tool-usage/adapters/native.js +6 -1
- package/dist/tool-usage/adapters/native.js.map +1 -1
- package/dist/tool-usage/adapters/pi.d.ts.map +1 -1
- package/dist/tool-usage/adapters/pi.js +53 -26
- package/dist/tool-usage/adapters/pi.js.map +1 -1
- package/dist/tool-usage/count.d.ts.map +1 -1
- package/dist/tool-usage/count.js +41 -2
- package/dist/tool-usage/count.js.map +1 -1
- package/dist/tool-usage/index.d.ts +8 -2
- package/dist/tool-usage/index.d.ts.map +1 -1
- package/dist/tool-usage/index.js +9 -1
- package/dist/tool-usage/index.js.map +1 -1
- package/dist/tool-usage/live.d.ts +44 -0
- package/dist/tool-usage/live.d.ts.map +1 -0
- package/dist/tool-usage/live.js +179 -0
- package/dist/tool-usage/live.js.map +1 -0
- package/dist/tool-usage/prices.d.ts +13 -0
- package/dist/tool-usage/prices.d.ts.map +1 -0
- package/dist/tool-usage/prices.js +23 -0
- package/dist/tool-usage/prices.js.map +1 -0
- package/dist/tool-usage/stream.d.ts +25 -0
- package/dist/tool-usage/stream.d.ts.map +1 -1
- package/dist/tool-usage/stream.js +9 -0
- package/dist/tool-usage/stream.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import { countToolUsage } from './count.js';
|
|
2
|
+
const add = (a, b) => a === null || b == null ? null : a + b;
|
|
3
|
+
const zero = () => ({ tokens: 0, costUsd: 0, compactions: 0, toolCalls: 0 });
|
|
4
|
+
const ms = (at) => (at ? Date.parse(at) : NaN);
|
|
5
|
+
/** Totals of the events at or after `from`. */
|
|
6
|
+
function streamTotals(stream, from) {
|
|
7
|
+
const totals = zero();
|
|
8
|
+
for (const sample of stream.tokens ?? [])
|
|
9
|
+
if (!(ms(sample.at) < from)) {
|
|
10
|
+
totals.tokens += sample.tokens;
|
|
11
|
+
totals.costUsd = add(totals.costUsd, sample.costUsd);
|
|
12
|
+
}
|
|
13
|
+
totals.compactions = (stream.compactions ?? []).filter((event) => !(ms(event.at) < from)).length;
|
|
14
|
+
totals.toolCalls = stream.tools.filter((tool) => !(ms(tool.issuedAt) < from)).length;
|
|
15
|
+
return totals;
|
|
16
|
+
}
|
|
17
|
+
export class LiveToolUsage {
|
|
18
|
+
constructor(runner, makeParser) {
|
|
19
|
+
this.runner = runner;
|
|
20
|
+
this.makeParser = makeParser;
|
|
21
|
+
/** Byte offset of the first unread byte. */
|
|
22
|
+
this.offset = 0;
|
|
23
|
+
this.carry = '';
|
|
24
|
+
this.frozen = [];
|
|
25
|
+
/** End (mark time) of each frozen step, ascending. */
|
|
26
|
+
this.boundaries = [];
|
|
27
|
+
this.frozenUntil = -Infinity;
|
|
28
|
+
this.frozenTotals = zero();
|
|
29
|
+
this.parser = makeParser();
|
|
30
|
+
}
|
|
31
|
+
/** Start again from byte 0, for a replaced transcript. */
|
|
32
|
+
reset(fileIdentity) {
|
|
33
|
+
this.offset = 0;
|
|
34
|
+
this.fileIdentity = fileIdentity;
|
|
35
|
+
this.carry = '';
|
|
36
|
+
this.parser = this.makeParser();
|
|
37
|
+
this.frozen = [];
|
|
38
|
+
this.boundaries = [];
|
|
39
|
+
this.frozenUntil = -Infinity;
|
|
40
|
+
this.frozenTotals = zero();
|
|
41
|
+
}
|
|
42
|
+
/** Bytes read at `this.offset`. A partial last line waits for the next read. */
|
|
43
|
+
append(bytes) {
|
|
44
|
+
this.offset += bytes.length;
|
|
45
|
+
const lines = (this.carry + bytes.toString('utf8')).split('\n');
|
|
46
|
+
this.carry = lines.pop() ?? '';
|
|
47
|
+
for (const line of lines) {
|
|
48
|
+
if (!line.trim())
|
|
49
|
+
continue;
|
|
50
|
+
let value;
|
|
51
|
+
try {
|
|
52
|
+
value = JSON.parse(line);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
// A complete line that does not parse is skipped, as the full read does.
|
|
56
|
+
if (error instanceof SyntaxError)
|
|
57
|
+
continue;
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
60
|
+
if (value && typeof value === 'object' && !Array.isArray(value))
|
|
61
|
+
this.parser.push(value);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Adds an event timed before the frozen boundary to the step whose mark interval holds it,
|
|
66
|
+
* creating that step's segment when the first read saw no activity in it.
|
|
67
|
+
*/
|
|
68
|
+
routeLate(at, marks, stream, change) {
|
|
69
|
+
const index = marks.findIndex((mark) => at < Date.parse(mark.checkedAt));
|
|
70
|
+
if (index < 0)
|
|
71
|
+
return;
|
|
72
|
+
const mark = marks[index];
|
|
73
|
+
let step = this.frozen.find((segment) => segment.markedAt === mark.checkedAt);
|
|
74
|
+
if (!step) {
|
|
75
|
+
const lower = index === 0 ? at : Math.max(at, Date.parse(marks[index - 1].checkedAt));
|
|
76
|
+
step = {
|
|
77
|
+
segment: index === 0 ? 'before-first-mark' : 'step',
|
|
78
|
+
stepNumber: mark.stepNumber,
|
|
79
|
+
title: mark.label,
|
|
80
|
+
markedAt: mark.checkedAt,
|
|
81
|
+
startedAt: new Date(lower).toISOString(),
|
|
82
|
+
endedAt: mark.checkedAt,
|
|
83
|
+
wallMs: Date.parse(mark.checkedAt) - lower,
|
|
84
|
+
toolCalls: 0,
|
|
85
|
+
toolCallsByName: {},
|
|
86
|
+
totalTokens: stream.tokens ? 0 : null,
|
|
87
|
+
compactions: stream.compactions ? 0 : null,
|
|
88
|
+
costUsd: stream.tokens ? 0 : null,
|
|
89
|
+
};
|
|
90
|
+
this.frozen.push(step);
|
|
91
|
+
this.frozen.sort((a, b) => Date.parse(a.markedAt) - Date.parse(b.markedAt));
|
|
92
|
+
}
|
|
93
|
+
const hasTokens = change.tokens !== undefined;
|
|
94
|
+
if (change.toolCalls) {
|
|
95
|
+
step.toolCalls += change.toolCalls;
|
|
96
|
+
const name = change.toolName ?? 'unknown';
|
|
97
|
+
step.toolCallsByName[name] = (step.toolCallsByName[name] ?? 0) + change.toolCalls;
|
|
98
|
+
}
|
|
99
|
+
if (hasTokens) {
|
|
100
|
+
step.totalTokens = (step.totalTokens ?? 0) + (change.tokens ?? 0);
|
|
101
|
+
// An unknown price stays unknown, as in the counter.
|
|
102
|
+
step.costUsd = add(step.costUsd === undefined ? 0 : step.costUsd, change.costUsd);
|
|
103
|
+
}
|
|
104
|
+
if (change.compactions)
|
|
105
|
+
step.compactions = (step.compactions ?? 0) + change.compactions;
|
|
106
|
+
this.frozenTotals = {
|
|
107
|
+
tokens: this.frozenTotals.tokens + (change.tokens ?? 0),
|
|
108
|
+
costUsd: hasTokens
|
|
109
|
+
? add(this.frozenTotals.costUsd, change.costUsd)
|
|
110
|
+
: this.frozenTotals.costUsd,
|
|
111
|
+
compactions: this.frozenTotals.compactions + (change.compactions ?? 0),
|
|
112
|
+
toolCalls: this.frozenTotals.toolCalls + (change.toolCalls ?? 0),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
/** Records appended since the last summary but timed before the frozen boundary. */
|
|
116
|
+
settleLateEvents(marks) {
|
|
117
|
+
if (!Number.isFinite(this.frozenUntil))
|
|
118
|
+
return;
|
|
119
|
+
const stream = this.parser.stream();
|
|
120
|
+
if (this.frozen.length) {
|
|
121
|
+
const sorted = [...marks].sort((a, b) => Date.parse(a.checkedAt) - Date.parse(b.checkedAt));
|
|
122
|
+
for (const tool of stream.tools)
|
|
123
|
+
if (ms(tool.issuedAt) < this.frozenUntil)
|
|
124
|
+
this.routeLate(ms(tool.issuedAt), sorted, stream, { toolCalls: 1, toolName: tool.name });
|
|
125
|
+
for (const sample of stream.tokens ?? [])
|
|
126
|
+
if (ms(sample.at) < this.frozenUntil)
|
|
127
|
+
this.routeLate(ms(sample.at), sorted, stream, {
|
|
128
|
+
tokens: sample.tokens,
|
|
129
|
+
costUsd: sample.costUsd ?? null,
|
|
130
|
+
});
|
|
131
|
+
for (const event of stream.compactions ?? [])
|
|
132
|
+
if (ms(event.at) < this.frozenUntil)
|
|
133
|
+
this.routeLate(ms(event.at), sorted, stream, { compactions: 1 });
|
|
134
|
+
}
|
|
135
|
+
this.parser.dropBefore(this.frozenUntil);
|
|
136
|
+
}
|
|
137
|
+
summary(marks) {
|
|
138
|
+
this.settleLateEvents(marks);
|
|
139
|
+
const stream = this.parser.stream();
|
|
140
|
+
// The last frozen mark stays, so the counter labels what follows it as a step or the tail;
|
|
141
|
+
// the segment it closes was frozen already and is dropped below.
|
|
142
|
+
const open = marks
|
|
143
|
+
.filter((mark) => Date.parse(mark.checkedAt) >= this.frozenUntil)
|
|
144
|
+
.sort((a, b) => Date.parse(a.checkedAt) - Date.parse(b.checkedAt));
|
|
145
|
+
const usage = countToolUsage(stream, open, Number.isFinite(this.frozenUntil)
|
|
146
|
+
? { startedAt: new Date(this.frozenUntil).toISOString() }
|
|
147
|
+
: {});
|
|
148
|
+
const latest = Math.max(...stream.tools.flatMap((tool) => (tool.issuedAt ? [ms(tool.issuedAt)] : [])), ...(stream.tokens ?? []).map((sample) => ms(sample.at)), ...(stream.compactions ?? []).map((event) => ms(event.at)), -Infinity);
|
|
149
|
+
const steps = usage.steps.filter((step) => !(this.frozen.length &&
|
|
150
|
+
step.markedAt !== undefined &&
|
|
151
|
+
Date.parse(step.markedAt) <= this.frozenUntil));
|
|
152
|
+
const closed = steps.filter((step) => step.markedAt !== undefined && Date.parse(step.markedAt) <= latest);
|
|
153
|
+
for (const step of closed) {
|
|
154
|
+
// Read past this mark: the step is final, except for late records routed above.
|
|
155
|
+
this.frozen.push(step);
|
|
156
|
+
this.boundaries.push(Date.parse(step.markedAt));
|
|
157
|
+
this.frozenTotals = {
|
|
158
|
+
tokens: this.frozenTotals.tokens + (step.totalTokens ?? 0),
|
|
159
|
+
costUsd: add(this.frozenTotals.costUsd, step.costUsd),
|
|
160
|
+
compactions: this.frozenTotals.compactions + (step.compactions ?? 0),
|
|
161
|
+
toolCalls: this.frozenTotals.toolCalls + step.toolCalls,
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
if (closed.length) {
|
|
165
|
+
this.frozenUntil = this.boundaries[this.boundaries.length - 1];
|
|
166
|
+
this.parser.dropBefore(this.frozenUntil);
|
|
167
|
+
}
|
|
168
|
+
const rest = streamTotals(this.parser.stream(), this.frozenUntil);
|
|
169
|
+
return {
|
|
170
|
+
runner: this.runner,
|
|
171
|
+
totalTokens: stream.tokens === null ? null : this.frozenTotals.tokens + rest.tokens,
|
|
172
|
+
costUsd: stream.tokens === null ? null : add(this.frozenTotals.costUsd, rest.costUsd),
|
|
173
|
+
compactions: stream.compactions === null ? null : this.frozenTotals.compactions + rest.compactions,
|
|
174
|
+
toolCalls: this.frozenTotals.toolCalls + rest.toolCalls,
|
|
175
|
+
steps: [...this.frozen, ...steps.filter((step) => !closed.includes(step))],
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=live.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../../src/tool-usage/live.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface ClaudePricing {
|
|
2
|
+
input: number;
|
|
3
|
+
output: number;
|
|
4
|
+
cache_write: number;
|
|
5
|
+
cache_read: number;
|
|
6
|
+
}
|
|
7
|
+
export interface OpenaiPricing {
|
|
8
|
+
input: number;
|
|
9
|
+
output: number;
|
|
10
|
+
}
|
|
11
|
+
export declare const CLAUDE_PRICING: Record<string, ClaudePricing>;
|
|
12
|
+
export declare const OPENAI_PRICING: Record<string, OpenaiPricing>;
|
|
13
|
+
//# sourceMappingURL=prices.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prices.d.ts","sourceRoot":"","sources":["../../src/tool-usage/prices.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAOxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAWxD,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// Conservative/optional estimates. If the model doesn't match any entry we omit
|
|
2
|
+
// cost_usd rather than inventing a value.
|
|
3
|
+
export const CLAUDE_PRICING = {
|
|
4
|
+
// Company LiteLLM catalog, USD per million tokens.
|
|
5
|
+
'claude-opus-5-5': { input: 4, output: 20, cache_write: 5, cache_read: 0.4 },
|
|
6
|
+
'claude-sonnet-5-5': { input: 2, output: 10, cache_write: 2.5, cache_read: 0.2 },
|
|
7
|
+
'claude-opus-4-6': { input: 15.0, output: 75.0, cache_write: 18.75, cache_read: 1.5 },
|
|
8
|
+
'claude-sonnet-4-6': { input: 3.0, output: 15.0, cache_write: 3.75, cache_read: 0.3 },
|
|
9
|
+
'claude-haiku-4-5': { input: 0.8, output: 4.0, cache_write: 1.0, cache_read: 0.08 },
|
|
10
|
+
};
|
|
11
|
+
export const OPENAI_PRICING = {
|
|
12
|
+
// https://developers.openai.com/api/docs/pricing (GPT-6 standard rates per 1M tokens).
|
|
13
|
+
'gpt-6-astra': { input: 10.0, output: 50.0 },
|
|
14
|
+
'gpt-6-sol': { input: 2.0, output: 10.0 },
|
|
15
|
+
// GPT-5.6 family (preview GA pricing, USD per 1M tokens).
|
|
16
|
+
'gpt-5.6-sol': { input: 5.0, output: 30.0 },
|
|
17
|
+
'gpt-5.6-terra': { input: 2.5, output: 15.0 },
|
|
18
|
+
'gpt-5.6-luna': { input: 1.0, output: 6.0 },
|
|
19
|
+
'gpt-5.6': { input: 5.0, output: 30.0 }, // bare alias → Sol
|
|
20
|
+
'gpt-5.5': { input: 5.0, output: 15.0 },
|
|
21
|
+
'gpt-5.4': { input: 5.0, output: 15.0 },
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=prices.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prices.js","sourceRoot":"","sources":["../../src/tool-usage/prices.ts"],"names":[],"mappings":"AAcA,gFAAgF;AAChF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,mDAAmD;IACnD,iBAAiB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE;IAC5E,mBAAmB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE;IAChF,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE;IACrF,mBAAmB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE;IACrF,kBAAkB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;CACpF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,uFAAuF;IACvF,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;IAC5C,WAAW,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;IACzC,0DAA0D;IAC1D,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;IAC3C,eAAe,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;IAC7C,cAAc,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;IAC3C,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,mBAAmB;IAC5D,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;IACvC,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE;CACxC,CAAC"}
|
|
@@ -10,11 +10,32 @@ export interface TokenSample {
|
|
|
10
10
|
at: string;
|
|
11
11
|
/** Tokens this record added (input + output + cache, as in the session totals). */
|
|
12
12
|
tokens: number;
|
|
13
|
+
/** USD this record cost: recorded by the runner, or priced from the static table; null when unknown. */
|
|
14
|
+
costUsd?: number | null;
|
|
15
|
+
}
|
|
16
|
+
/** The runner summarized its context to free space (Claude compact_boundary, Codex compacted, ...). */
|
|
17
|
+
export interface CompactionEvent {
|
|
18
|
+
at: string;
|
|
19
|
+
/** Context tokens before the compaction, when the transcript records them. */
|
|
20
|
+
tokensBefore?: number;
|
|
13
21
|
}
|
|
14
22
|
export interface ToolUsageStream {
|
|
15
23
|
tools: ToolCallEvent[];
|
|
16
24
|
/** Null when the runner records no timed token usage, so per-step tokens are unknown. */
|
|
17
25
|
tokens: TokenSample[] | null;
|
|
26
|
+
/** Null when the transcript records no compaction events; then `compactionsUnavailable` says why. */
|
|
27
|
+
compactions: CompactionEvent[] | null;
|
|
28
|
+
compactionsUnavailable?: string;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Builds the stream one transcript record at a time, so a live reader can feed it only the
|
|
32
|
+
* records appended since its last read. `dropBefore` forgets events before a time whose step
|
|
33
|
+
* the live reader has already closed.
|
|
34
|
+
*/
|
|
35
|
+
export interface StreamParser {
|
|
36
|
+
push(record: Record<string, unknown>): void;
|
|
37
|
+
stream(): ToolUsageStream;
|
|
38
|
+
dropBefore(time: number): void;
|
|
18
39
|
}
|
|
19
40
|
/** Translates one runner's transcript into the stream. Adding a runner means adding one. */
|
|
20
41
|
export interface ToolUsageAdapter {
|
|
@@ -23,7 +44,11 @@ export interface ToolUsageAdapter {
|
|
|
23
44
|
read(sessionPath: string, options?: {
|
|
24
45
|
home?: string;
|
|
25
46
|
}): Promise<ToolUsageStream>;
|
|
47
|
+
/** Single-file JSONL runners only: the parser `read` uses, for reading a live transcript tail. */
|
|
48
|
+
parser?(): StreamParser;
|
|
26
49
|
}
|
|
50
|
+
/** Drops events before `time`; events without a time stay. */
|
|
51
|
+
export declare function dropStreamBefore(stream: ToolUsageStream, time: number): void;
|
|
27
52
|
/** Pairs completions with calls by id. Unmatched completions are ignored; they have no call. */
|
|
28
53
|
export declare function pairToolEvents(calls: ToolCallEvent[], completions: Array<{
|
|
29
54
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/tool-usage/stream.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/tool-usage/stream.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAC;IACf,wGAAwG;IACxG,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,uGAAuG;AACvG,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,yFAAyF;IACzF,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7B,qGAAqG;IACrG,WAAW,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5C,MAAM,IAAI,eAAe,CAAC;IAC1B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,4FAA4F;AAC5F,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,4FAA4F;IAC5F,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACjF,kGAAkG;IAClG,MAAM,CAAC,IAAI,YAAY,CAAC;CACzB;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAmB5E;AAED,gGAAgG;AAChG,wBAAgB,cAAc,CAC5B,KAAK,EAAE,aAAa,EAAE,EACtB,WAAW,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GACtD,aAAa,EAAE,CAQjB"}
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
// The normalized stream every runner adapter produces. Tool calls carry the same fields as the
|
|
2
2
|
// native `tool.started` / `tool.completed` events; token samples let per-step cost use the same
|
|
3
3
|
// boundaries as the tool counts.
|
|
4
|
+
/** Drops events before `time`; events without a time stay. */
|
|
5
|
+
export function dropStreamBefore(stream, time) {
|
|
6
|
+
const keep = (at) => !at || !(Date.parse(at) < time);
|
|
7
|
+
stream.tools.splice(0, stream.tools.length, ...stream.tools.filter((tool) => keep(tool.issuedAt)));
|
|
8
|
+
if (stream.tokens)
|
|
9
|
+
stream.tokens.splice(0, stream.tokens.length, ...stream.tokens.filter((sample) => keep(sample.at)));
|
|
10
|
+
if (stream.compactions)
|
|
11
|
+
stream.compactions.splice(0, stream.compactions.length, ...stream.compactions.filter((event) => keep(event.at)));
|
|
12
|
+
}
|
|
4
13
|
/** Pairs completions with calls by id. Unmatched completions are ignored; they have no call. */
|
|
5
14
|
export function pairToolEvents(calls, completions) {
|
|
6
15
|
const byId = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/tool-usage/stream.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,iCAAiC;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/tool-usage/stream.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,iCAAiC;AAuDjC,8DAA8D;AAC9D,MAAM,UAAU,gBAAgB,CAAC,MAAuB,EAAE,IAAY;IACpE,MAAM,IAAI,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,CAAC,EACD,MAAM,CAAC,KAAK,CAAC,MAAM,EACnB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CACtD,CAAC;IACF,IAAI,MAAM,CAAC,MAAM;QACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAClB,CAAC,EACD,MAAM,CAAC,MAAM,CAAC,MAAM,EACpB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CACrD,CAAC;IACJ,IAAI,MAAM,CAAC,WAAW;QACpB,MAAM,CAAC,WAAW,CAAC,MAAM,CACvB,CAAC,EACD,MAAM,CAAC,WAAW,CAAC,MAAM,EACzB,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACN,CAAC;AAED,gGAAgG;AAChG,MAAM,UAAU,cAAc,CAC5B,KAAsB,EACtB,WAAuD;IAEvD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC9C,KAAK,MAAM,IAAI,IAAI,KAAK;QAAE,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAC3E,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@farmslot/agent-runtime",
|
|
3
|
-
"version": "0.48.
|
|
3
|
+
"version": "0.48.4",
|
|
4
4
|
"minimumRuntimeVersion": "0.42.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
"test:native-observation-live": "NATIVE_OBSERVATION_LIVE=1 node --import tsx --test --test-name-pattern='source admits the actual supervisor' src/native/observation.test.ts"
|
|
94
94
|
},
|
|
95
95
|
"dependencies": {
|
|
96
|
-
"@farmslot/adapter-sdk": "0.28.
|
|
96
|
+
"@farmslot/adapter-sdk": "0.28.1",
|
|
97
97
|
"@farmslot/protocol": "0.87.0"
|
|
98
98
|
},
|
|
99
99
|
"devDependencies": {
|