@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
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
// Grok session directory: events.jsonl records `tool_started` / `tool_completed` per call; token
|
|
2
|
-
// usage is per inference in ~/.grok/logs/unified.jsonl, keyed by session id.
|
|
3
|
-
|
|
2
|
+
// usage is per inference in ~/.grok/logs/unified.jsonl, keyed by session id. Context compactions
|
|
3
|
+
// are `auto_compact_completed` session updates in the directory's updates.jsonl.
|
|
4
|
+
import { access, stat } from 'node:fs/promises';
|
|
4
5
|
import os from 'node:os';
|
|
5
6
|
import path from 'node:path';
|
|
6
|
-
import { count, readJsonLines, text } from './jsonl.js';
|
|
7
|
+
import { count, isoTime, isRecord, readJsonLines, text, tokensBefore } from './jsonl.js';
|
|
7
8
|
async function sessionDirectory(sessionPath) {
|
|
8
9
|
return (await stat(sessionPath)).isDirectory() ? sessionPath : path.dirname(sessionPath);
|
|
9
10
|
}
|
|
@@ -49,7 +50,37 @@ export const grokToolUsage = {
|
|
|
49
50
|
count(Reflect.get(context, 'completion_tokens')),
|
|
50
51
|
});
|
|
51
52
|
}
|
|
52
|
-
|
|
53
|
+
const updates = path.join(directory, 'updates.jsonl');
|
|
54
|
+
try {
|
|
55
|
+
await access(updates);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
// Older sessions keep no update log: their compactions are unknown, not zero.
|
|
59
|
+
if (error.code !== 'ENOENT')
|
|
60
|
+
throw error;
|
|
61
|
+
return {
|
|
62
|
+
tools,
|
|
63
|
+
tokens,
|
|
64
|
+
compactions: null,
|
|
65
|
+
compactionsUnavailable: 'The Grok session has no updates.jsonl',
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
const compactions = [];
|
|
69
|
+
for (const record of await readJsonLines(updates)) {
|
|
70
|
+
const params = isRecord(record.params) ? record.params : {};
|
|
71
|
+
const update = isRecord(params.update) ? params.update : {};
|
|
72
|
+
if (update.sessionUpdate !== 'auto_compact_completed')
|
|
73
|
+
continue;
|
|
74
|
+
const meta = isRecord(record._meta)
|
|
75
|
+
? record._meta
|
|
76
|
+
: isRecord(params._meta)
|
|
77
|
+
? params._meta
|
|
78
|
+
: {};
|
|
79
|
+
const at = isoTime(meta.agentTimestampMs) ?? isoTime(record.timestamp);
|
|
80
|
+
if (at)
|
|
81
|
+
compactions.push({ at, ...tokensBefore(update.tokens_before) });
|
|
82
|
+
}
|
|
83
|
+
return { tools, tokens, compactions };
|
|
53
84
|
},
|
|
54
85
|
};
|
|
55
86
|
//# sourceMappingURL=grok.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grok.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/grok.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,
|
|
1
|
+
{"version":3,"file":"grok.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/grok.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,10 @@ export declare function isRecord(value: unknown): value is JsonRecord;
|
|
|
3
3
|
/** Complete JSONL objects. A missing file throws; a malformed line is skipped. */
|
|
4
4
|
export declare function readJsonLines(file: string): Promise<JsonRecord[]>;
|
|
5
5
|
export declare function text(value: unknown): string | undefined;
|
|
6
|
+
/** `{ tokensBefore }` when the transcript records a usable count, else nothing. */
|
|
7
|
+
export declare function tokensBefore(value: unknown): {
|
|
8
|
+
tokensBefore?: number;
|
|
9
|
+
};
|
|
6
10
|
export declare function count(value: unknown): number;
|
|
7
11
|
/** ISO time from an ISO string or epoch seconds/milliseconds. */
|
|
8
12
|
export declare function isoTime(value: unknown): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/jsonl.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAE5D;AAED,kFAAkF;AAClF,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAevE;AAED,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEvD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE5C;AAED,iEAAiE;AACjE,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI1D"}
|
|
1
|
+
{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/jsonl.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAE5D;AAED,kFAAkF;AAClF,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAevE;AAED,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEvD;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAItE;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE5C;AAED,iEAAiE;AACjE,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI1D"}
|
|
@@ -26,6 +26,12 @@ export async function readJsonLines(file) {
|
|
|
26
26
|
export function text(value) {
|
|
27
27
|
return typeof value === 'string' && value ? value : undefined;
|
|
28
28
|
}
|
|
29
|
+
/** `{ tokensBefore }` when the transcript records a usable count, else nothing. */
|
|
30
|
+
export function tokensBefore(value) {
|
|
31
|
+
return typeof value === 'number' && Number.isFinite(value) && value >= 0
|
|
32
|
+
? { tokensBefore: value }
|
|
33
|
+
: {};
|
|
34
|
+
}
|
|
29
35
|
export function count(value) {
|
|
30
36
|
return typeof value === 'number' && Number.isFinite(value) ? value : 0;
|
|
31
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonl.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/jsonl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI5C,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAY;IAC9C,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,SAAS;QAC3B,IAAI,KAAc,CAAC;QACnB,IAAI,CAAC;YACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iFAAiF;YACjF,IAAI,KAAK,YAAY,WAAW;gBAAE,SAAS;YAC3C,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,KAAc;IAClC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,OAAO,CAAC,KAAc;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AACrE,CAAC"}
|
|
1
|
+
{"version":3,"file":"jsonl.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/jsonl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI5C,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAY;IAC9C,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,SAAS;QAC3B,IAAI,KAAc,CAAC;QACnB,IAAI,CAAC;YACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iFAAiF;YACjF,IAAI,KAAK,YAAY,WAAW;gBAAE,SAAS;YAC3C,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAChE,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QACtE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE;QACzB,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,KAAc;IAClC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,OAAO,CAAC,KAAc;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AACrE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/native.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIpE,eAAO,MAAM,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/native.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIpE,eAAO,MAAM,eAAe,EAAE,gBA4B7B,CAAC"}
|
|
@@ -25,7 +25,12 @@ export const nativeToolUsage = {
|
|
|
25
25
|
call.completedAt ??= at;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
return {
|
|
28
|
+
return {
|
|
29
|
+
tools,
|
|
30
|
+
tokens: null,
|
|
31
|
+
compactions: null,
|
|
32
|
+
compactionsUnavailable: 'The native journal records no compaction events',
|
|
33
|
+
};
|
|
29
34
|
},
|
|
30
35
|
};
|
|
31
36
|
//# sourceMappingURL=native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/native.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,MAAM,EAAE,QAAQ;IAChB,KAAK,CAAC,IAAI,CAAC,WAAW;QACpB,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAyB,CAAC;QAC9C,KAAK,MAAM,MAAM,IAAI,MAAM,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAClC,IAAI,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAAE,SAAS;gBACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,GAAkB,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;gBACrF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,EAAE;oBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;gBACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC1B,IAAI,IAAI;oBAAE,IAAI,CAAC,WAAW,KAAK,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,OAAO,
|
|
1
|
+
{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/native.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,MAAM,EAAE,QAAQ;IAChB,KAAK,CAAC,IAAI,CAAC,WAAW;QACpB,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAyB,CAAC;QAC9C,KAAK,MAAM,MAAM,IAAI,MAAM,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAClC,IAAI,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAAE,SAAS;gBACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,GAAkB,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;gBACrF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,EAAE;oBAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;gBACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC1B,IAAI,IAAI;oBAAE,IAAI,CAAC,WAAW,KAAK,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,OAAO;YACL,KAAK;YACL,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,IAAI;YACjB,sBAAsB,EAAE,iDAAiD;SAC1E,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/pi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/pi.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAC;AA0DtB,eAAO,MAAM,WAAW,EAAE,gBAQzB,CAAC"}
|
|
@@ -1,46 +1,73 @@
|
|
|
1
|
-
// Pi session JSONL: assistant `toolCall`
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
// Pi session JSONL: assistant `toolCall` blocks, completed by `toolResult` messages; each
|
|
2
|
+
// assistant message carries its own usage and cost; `compaction` entries mark context compactions.
|
|
3
|
+
import { dropStreamBefore, pairToolEvents, } from '../stream.js';
|
|
4
|
+
import { count, isRecord, readJsonLines, text, tokensBefore } from './jsonl.js';
|
|
5
|
+
function piParser() {
|
|
6
|
+
const calls = [];
|
|
7
|
+
const completions = [];
|
|
8
|
+
const tokens = [];
|
|
9
|
+
const compactions = [];
|
|
10
|
+
const seen = new Set();
|
|
11
|
+
const parsed = { tools: calls, tokens, compactions };
|
|
12
|
+
return {
|
|
13
|
+
push(record) {
|
|
12
14
|
const message = record.message;
|
|
13
15
|
const at = text(record.timestamp);
|
|
16
|
+
if (record.type === 'compaction' && at) {
|
|
17
|
+
// Session entry written when pi summarizes its context (auto or /compact).
|
|
18
|
+
compactions.push({ at, ...tokensBefore(record.tokensBefore) });
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
14
21
|
if (record.type !== 'message' || !isRecord(message) || !at)
|
|
15
|
-
|
|
16
|
-
// Pi can replay an entry; its id identifies it.
|
|
22
|
+
return;
|
|
17
23
|
const entry = text(record.id);
|
|
18
24
|
if (entry && seen.has(entry))
|
|
19
|
-
|
|
25
|
+
return;
|
|
20
26
|
if (entry)
|
|
21
27
|
seen.add(entry);
|
|
22
28
|
if (message.role === 'toolResult') {
|
|
23
29
|
const id = text(message.toolCallId);
|
|
24
30
|
if (id)
|
|
25
31
|
completions.push({ id, completedAt: at });
|
|
26
|
-
|
|
32
|
+
return;
|
|
27
33
|
}
|
|
28
34
|
if (message.role !== 'assistant')
|
|
29
|
-
|
|
35
|
+
return;
|
|
30
36
|
for (const block of Array.isArray(message.content) ? message.content : [])
|
|
31
37
|
if (isRecord(block) && block.type === 'toolCall')
|
|
32
38
|
calls.push({ id: text(block.id), name: text(block.name) ?? 'unknown', issuedAt: at });
|
|
33
39
|
const usage = message.usage;
|
|
34
|
-
if (isRecord(usage))
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
if (!isRecord(usage))
|
|
41
|
+
return;
|
|
42
|
+
const cost = isRecord(usage.cost) ? usage.cost.total : undefined;
|
|
43
|
+
tokens.push({
|
|
44
|
+
at,
|
|
45
|
+
tokens: count(usage.input) +
|
|
46
|
+
count(usage.output) +
|
|
47
|
+
count(usage.cacheRead) +
|
|
48
|
+
count(usage.cacheWrite),
|
|
49
|
+
costUsd: typeof cost === 'number' && Number.isFinite(cost) ? cost : null,
|
|
50
|
+
});
|
|
51
|
+
},
|
|
52
|
+
stream() {
|
|
53
|
+
pairToolEvents(calls, completions);
|
|
54
|
+
return parsed;
|
|
55
|
+
},
|
|
56
|
+
dropBefore(time) {
|
|
57
|
+
pairToolEvents(calls, completions);
|
|
58
|
+
completions.length = 0;
|
|
59
|
+
dropStreamBefore(parsed, time);
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
export const piToolUsage = {
|
|
64
|
+
runner: 'pi',
|
|
65
|
+
parser: piParser,
|
|
66
|
+
async read(sessionPath) {
|
|
67
|
+
const parser = piParser();
|
|
68
|
+
for (const record of await readJsonLines(sessionPath))
|
|
69
|
+
parser.push(record);
|
|
70
|
+
return parser.stream();
|
|
44
71
|
},
|
|
45
72
|
};
|
|
46
73
|
//# sourceMappingURL=pi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/pi.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/pi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAEnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEzC,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAUD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,GAAE,eAAoB,GAC3B,SAAS,
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAEnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEzC,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAUD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,GAAE,eAAoB,GAC3B,SAAS,CA+HX;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,IAAI,CA2DpE"}
|
package/dist/tool-usage/count.js
CHANGED
|
@@ -8,6 +8,8 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
8
8
|
const times = [
|
|
9
9
|
...stream.tools.flatMap((tool) => (tool.issuedAt ? [Date.parse(tool.issuedAt)] : [])),
|
|
10
10
|
...(stream.tokens ?? []).map((sample) => Date.parse(sample.at)),
|
|
11
|
+
// A compaction before the first call or after the last record is still in the session.
|
|
12
|
+
...(stream.compactions ?? []).map((event) => Date.parse(event.at)),
|
|
11
13
|
].filter(Number.isFinite);
|
|
12
14
|
const start = window.startedAt ? Date.parse(window.startedAt) : Math.min(...times);
|
|
13
15
|
// A mark after the last recorded activity still closes its step.
|
|
@@ -16,6 +18,11 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
16
18
|
? Date.parse(window.completedAt)
|
|
17
19
|
: Math.max(...times, ...markTimes);
|
|
18
20
|
const windowed = window.startedAt !== undefined || window.completedAt !== undefined;
|
|
21
|
+
const compactions = stream.compactions === null
|
|
22
|
+
? null
|
|
23
|
+
: stream.compactions
|
|
24
|
+
.map((event) => Date.parse(event.at))
|
|
25
|
+
.filter((at) => Number.isFinite(at) && inWindow(at, start, end));
|
|
19
26
|
const usage = {
|
|
20
27
|
attribution: 'issuedAt',
|
|
21
28
|
toolCalls: 0,
|
|
@@ -23,6 +30,12 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
23
30
|
toolCallsBeforeFirstMark: null,
|
|
24
31
|
untimedToolCalls: 0,
|
|
25
32
|
steps: [],
|
|
33
|
+
compactions: compactions?.length ?? null,
|
|
34
|
+
...(compactions === null
|
|
35
|
+
? {
|
|
36
|
+
compactionsUnavailable: stream.compactionsUnavailable ?? 'The transcript records no compactions',
|
|
37
|
+
}
|
|
38
|
+
: {}),
|
|
26
39
|
};
|
|
27
40
|
const timed = [];
|
|
28
41
|
for (const tool of stream.tools) {
|
|
@@ -41,7 +54,11 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
41
54
|
add(usage.toolCallsByName, tool.name);
|
|
42
55
|
}
|
|
43
56
|
const tokens = (stream.tokens ?? [])
|
|
44
|
-
.map((sample) => ({
|
|
57
|
+
.map((sample) => ({
|
|
58
|
+
at: Date.parse(sample.at),
|
|
59
|
+
tokens: sample.tokens,
|
|
60
|
+
costUsd: sample.costUsd,
|
|
61
|
+
}))
|
|
45
62
|
.filter((sample) => Number.isFinite(sample.at) && inWindow(sample.at, start, end));
|
|
46
63
|
const boundaries = marks
|
|
47
64
|
.map((mark) => ({ mark, at: Date.parse(mark.checkedAt) }))
|
|
@@ -94,6 +111,8 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
94
111
|
toolCalls: 0,
|
|
95
112
|
toolCallsByName: {},
|
|
96
113
|
totalTokens: stream.tokens ? 0 : null,
|
|
114
|
+
compactions: compactions ? compactions.filter(inside).length : null,
|
|
115
|
+
costUsd: stream.tokens ? 0 : null,
|
|
97
116
|
};
|
|
98
117
|
for (const tool of timed)
|
|
99
118
|
if (inside(tool.at)) {
|
|
@@ -101,8 +120,13 @@ export function countToolUsage(stream, marks, window = {}) {
|
|
|
101
120
|
add(segment.toolCallsByName, tool.name);
|
|
102
121
|
}
|
|
103
122
|
for (const sample of tokens)
|
|
104
|
-
if (inside(sample.at))
|
|
123
|
+
if (inside(sample.at)) {
|
|
105
124
|
segment.totalTokens = (segment.totalTokens ?? 0) + sample.tokens;
|
|
125
|
+
segment.costUsd =
|
|
126
|
+
segment.costUsd == null || sample.costUsd == null
|
|
127
|
+
? null
|
|
128
|
+
: segment.costUsd + sample.costUsd;
|
|
129
|
+
}
|
|
106
130
|
usage.steps.push(segment);
|
|
107
131
|
}
|
|
108
132
|
usage.toolCallsBeforeFirstMark = timed.filter((tool) => tool.at < boundaries[0].at).length;
|
|
@@ -119,11 +143,15 @@ export function mergeToolUsage(usages) {
|
|
|
119
143
|
toolCallsBeforeFirstMark: null,
|
|
120
144
|
untimedToolCalls: 0,
|
|
121
145
|
steps: [],
|
|
146
|
+
compactions: 0,
|
|
122
147
|
};
|
|
148
|
+
// Older records carry no count; a session whose runner records none makes the run's total unknown.
|
|
149
|
+
const unknownCompactions = usages.find((usage) => (usage.compactions ?? null) === null);
|
|
123
150
|
const steps = new Map();
|
|
124
151
|
for (const usage of usages) {
|
|
125
152
|
merged.toolCalls += usage.toolCalls;
|
|
126
153
|
merged.untimedToolCalls += usage.untimedToolCalls;
|
|
154
|
+
merged.compactions = (merged.compactions ?? 0) + (usage.compactions ?? 0);
|
|
127
155
|
for (const [name, n] of Object.entries(usage.toolCallsByName))
|
|
128
156
|
add(merged.toolCallsByName, name, n);
|
|
129
157
|
if (usage.toolCallsBeforeFirstMark !== null)
|
|
@@ -138,6 +166,12 @@ export function mergeToolUsage(usages) {
|
|
|
138
166
|
continue;
|
|
139
167
|
}
|
|
140
168
|
known.toolCalls += step.toolCalls;
|
|
169
|
+
known.costUsd =
|
|
170
|
+
known.costUsd == null || step.costUsd == null ? null : known.costUsd + step.costUsd;
|
|
171
|
+
known.compactions =
|
|
172
|
+
(known.compactions ?? null) === null || (step.compactions ?? null) === null
|
|
173
|
+
? null
|
|
174
|
+
: (known.compactions ?? 0) + (step.compactions ?? 0);
|
|
141
175
|
known.totalTokens =
|
|
142
176
|
known.totalTokens === null || step.totalTokens === null
|
|
143
177
|
? null
|
|
@@ -155,6 +189,11 @@ export function mergeToolUsage(usages) {
|
|
|
155
189
|
merged.steps = [...steps.values()].sort((a, b) => order(a).localeCompare(order(b)));
|
|
156
190
|
if (!merged.steps.length)
|
|
157
191
|
merged.stepsUnavailable = usages.find((usage) => usage.stepsUnavailable)?.stepsUnavailable;
|
|
192
|
+
if (unknownCompactions) {
|
|
193
|
+
merged.compactions = null;
|
|
194
|
+
merged.compactionsUnavailable =
|
|
195
|
+
unknownCompactions.compactionsUnavailable ?? 'A session records no compaction count';
|
|
196
|
+
}
|
|
158
197
|
return merged;
|
|
159
198
|
}
|
|
160
199
|
//# sourceMappingURL=count.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"AAeA,SAAS,GAAG,CAAC,MAA8B,EAAE,IAAY,EAAE,CAAC,GAAG,CAAC;IAC9D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;IACxD,OAAO,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAAuB,EACvB,KAAsB,EACtB,SAA0B,EAAE;IAE5B,MAAM,KAAK,GAAG;QACZ,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrF,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"AAeA,SAAS,GAAG,CAAC,MAA8B,EAAE,IAAY,EAAE,CAAC,GAAG,CAAC;IAC9D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;IACxD,OAAO,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAAuB,EACvB,KAAsB,EACtB,SAA0B,EAAE;IAE5B,MAAM,KAAK,GAAG;QACZ,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrF,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/D,uFAAuF;QACvF,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACnE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IACnF,iEAAiE;IACjE,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW;QAC5B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,SAAS,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC;IAEpF,MAAM,WAAW,GACf,MAAM,CAAC,WAAW,KAAK,IAAI;QACzB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,MAAM,CAAC,WAAW;aACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACpC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACzE,MAAM,KAAK,GAAc;QACvB,WAAW,EAAE,UAAU;QACvB,SAAS,EAAE,CAAC;QACZ,eAAe,EAAE,EAAE;QACnB,wBAAwB,EAAE,IAAI;QAC9B,gBAAgB,EAAE,CAAC;QACnB,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,WAAW,EAAE,MAAM,IAAI,IAAI;QACxC,GAAG,CAAC,WAAW,KAAK,IAAI;YACtB,CAAC,CAAC;gBACE,sBAAsB,EACpB,MAAM,CAAC,sBAAsB,IAAI,uCAAuC;aAC3E;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IACF,MAAM,KAAK,GAAwC,EAAE,CAAC;IACtD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,sEAAsE;YACtE,IAAI,QAAQ;gBAAE,SAAS;YACvB,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC9B,CAAC;aAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC;YAAE,SAAS;;YAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;SACjC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAErF,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SACzD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/B,4FAA4F;IAC5F,uEAAuE;IACvE,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjE,KAAK,CAAC,gBAAgB;YACpB,0EAA0E,CAAC;QAC7E,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3E,KAAK,CAAC,gBAAgB,GAAG,oCAAoC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,0FAA0F;IAC1F,4EAA4E;IAC5E,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACjE,MAAM,KAAK,GAAG;QACZ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,OAAO,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAE,mBAA6B,CAAC,CAAC,CAAE,MAAgB;YACzE,IAAI;YACJ,EAAE;SACH,CAAC,CAAC;QACH,EAAE,OAAO,EAAE,iBAA0B,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE;KACvE,CAAC;IACF,IAAI,QAAQ,GAAG,CAAC,QAAQ,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,QAAQ,CAAC;QACvB,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC3C,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAClC,IAAI,IAAI,GAAG,EAAE;YAAE,SAAS;QACxB,MAAM,MAAM,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,IAAI,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAC3D,MAAM,OAAO,GAAqB;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,CAAC,IAAI,CAAC,IAAI;gBACX,CAAC,CAAC;oBACE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;oBAChC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;oBACtB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;iBAC9B;gBACH,CAAC,CAAC,EAAE,CAAC;YACP,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;YACvC,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;YACnC,MAAM,EAAE,EAAE,GAAG,IAAI;YACjB,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,EAAE;YACnB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YACrC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;YACnE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;SAClC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK;YACtB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpB,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvB,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,CAAC;QACH,KAAK,MAAM,MAAM,IAAI,MAAM;YACzB,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,WAAW,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;gBACjE,OAAO,CAAC,OAAO;oBACb,OAAO,CAAC,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI;wBAC/C,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YACzC,CAAC;QACH,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,KAAK,CAAC,wBAAwB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;IAC3F,OAAO,KAAK,CAAC;AACf,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,cAAc,CAAC,MAAmB;IAChD,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAChC,MAAM,MAAM,GAAc;QACxB,WAAW,EAAE,UAAU;QACvB,SAAS,EAAE,CAAC;QACZ,eAAe,EAAE,EAAE;QACnB,wBAAwB,EAAE,IAAI;QAC9B,gBAAgB,EAAE,CAAC;QACnB,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,CAAC;KACf,CAAC;IACF,mGAAmG;IACnG,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,IAAI,GAAG,EAA4B,CAAC;IAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC;QACpC,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,CAAC;QAClD,MAAM,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;QAC1E,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,wBAAwB,KAAK,IAAI;YACzC,MAAM,CAAC,wBAAwB;gBAC7B,CAAC,MAAM,CAAC,wBAAwB,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,wBAAwB,CAAC;QAC5E,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,kFAAkF;YAClF,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1E,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;gBAC1E,SAAS;YACX,CAAC;YACD,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;YAClC,KAAK,CAAC,OAAO;gBACX,KAAK,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACtF,KAAK,CAAC,WAAW;gBACf,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,IAAI;oBACzE,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;YACzD,KAAK,CAAC,WAAW;gBACf,KAAK,CAAC,WAAW,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI;oBACrD,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC3C,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC1D,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS;gBAAE,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACvE,IAAI,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO;gBAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC/D,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,IAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC;IACpE,MAAM,CAAC,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM;QACtB,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAC7F,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,MAAM,CAAC,sBAAsB;YAC3B,kBAAkB,CAAC,sBAAsB,IAAI,uCAAuC,CAAC;IACzF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { type ToolUsage, type ToolUsageWindow } from './count.js';
|
|
2
2
|
import type { ChecklistMark } from './ledger.js';
|
|
3
|
+
import { LiveToolUsage } from './live.js';
|
|
3
4
|
import type { ToolUsageAdapter } from './stream.js';
|
|
4
5
|
export type { ToolUsage, ToolUsageSegment, ToolUsageWindow } from './count.js';
|
|
5
6
|
export { countToolUsage, mergeToolUsage } from './count.js';
|
|
6
7
|
export type { ChecklistMark } from './ledger.js';
|
|
7
8
|
export { checklistMarks, checklistMarksFromSignal } from './ledger.js';
|
|
8
|
-
export
|
|
9
|
-
export {
|
|
9
|
+
export { LiveToolUsage, type LiveUsageSummary } from './live.js';
|
|
10
|
+
export { CLAUDE_PRICING, type ClaudePricing, OPENAI_PRICING, type OpenaiPricing, } from './prices.js';
|
|
11
|
+
export type { CompactionEvent, TokenSample, ToolCallEvent, ToolUsageAdapter, ToolUsageStream, } from './stream.js';
|
|
12
|
+
export type { StreamParser } from './stream.js';
|
|
13
|
+
export { dropStreamBefore, pairToolEvents } from './stream.js';
|
|
10
14
|
export declare function toolUsageAdapter(runner: string): ToolUsageAdapter | undefined;
|
|
11
15
|
/** Reads one session with its runner's adapter and counts it against the marks. */
|
|
12
16
|
export declare function measureToolUsage(params: {
|
|
@@ -16,4 +20,6 @@ export declare function measureToolUsage(params: {
|
|
|
16
20
|
window?: ToolUsageWindow;
|
|
17
21
|
home?: string;
|
|
18
22
|
}): Promise<ToolUsage>;
|
|
23
|
+
/** A live reader for the runner's transcript; undefined when it is not one appendable JSONL file. */
|
|
24
|
+
export declare function createLiveToolUsage(runner: string): LiveToolUsage | undefined;
|
|
19
25
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tool-usage/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAkB,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5D,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tool-usage/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAkB,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5D,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,cAAc,EACd,KAAK,aAAa,EAClB,cAAc,EACd,KAAK,aAAa,GACnB,MAAM,aAAa,CAAC;AACrB,YAAY,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAW/D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAE7E;AAED,mFAAmF;AACnF,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,SAAS,CAAC,CAKrB;AAED,qGAAqG;AACrG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAG7E"}
|
package/dist/tool-usage/index.js
CHANGED
|
@@ -7,9 +7,12 @@ import { grokToolUsage } from './adapters/grok.js';
|
|
|
7
7
|
import { nativeToolUsage } from './adapters/native.js';
|
|
8
8
|
import { piToolUsage } from './adapters/pi.js';
|
|
9
9
|
import { countToolUsage } from './count.js';
|
|
10
|
+
import { LiveToolUsage } from './live.js';
|
|
10
11
|
export { countToolUsage, mergeToolUsage } from './count.js';
|
|
11
12
|
export { checklistMarks, checklistMarksFromSignal } from './ledger.js';
|
|
12
|
-
export {
|
|
13
|
+
export { LiveToolUsage } from './live.js';
|
|
14
|
+
export { CLAUDE_PRICING, OPENAI_PRICING, } from './prices.js';
|
|
15
|
+
export { dropStreamBefore, pairToolEvents } from './stream.js';
|
|
13
16
|
const ADAPTERS = [
|
|
14
17
|
piToolUsage,
|
|
15
18
|
claudeToolUsage,
|
|
@@ -29,4 +32,9 @@ export async function measureToolUsage(params) {
|
|
|
29
32
|
const stream = await adapter.read(params.sessionPath, { home: params.home });
|
|
30
33
|
return countToolUsage(stream, params.marks ?? [], params.window);
|
|
31
34
|
}
|
|
35
|
+
/** A live reader for the runner's transcript; undefined when it is not one appendable JSONL file. */
|
|
36
|
+
export function createLiveToolUsage(runner) {
|
|
37
|
+
const parser = toolUsageAdapter(runner)?.parser;
|
|
38
|
+
return parser ? new LiveToolUsage(runner, parser) : undefined;
|
|
39
|
+
}
|
|
32
40
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool-usage/index.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,oGAAoG;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAwC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool-usage/index.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,oGAAoG;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAwC,MAAM,YAAY,CAAC;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAAyB,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,cAAc,EAEd,cAAc,GAEf,MAAM,aAAa,CAAC;AASrB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,QAAQ,GAAgC;IAC5C,WAAW;IACX,eAAe;IACf,cAAc;IACd,aAAa;IACb,eAAe;IACf,eAAe;CAChB,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AAC/D,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAMtC;IACC,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7E,OAAO,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AACnE,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChD,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChE,CAAC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { SessionToolUsageSegment } from '@farmslot/protocol/contracts/runs';
|
|
2
|
+
import type { ChecklistMark } from './ledger.js';
|
|
3
|
+
import type { StreamParser } from './stream.js';
|
|
4
|
+
export interface LiveUsageSummary {
|
|
5
|
+
runner: string;
|
|
6
|
+
/** Null when the runner records no timed token usage. */
|
|
7
|
+
totalTokens: number | null;
|
|
8
|
+
/** Null when any token record has no recorded or listed price. */
|
|
9
|
+
costUsd: number | null;
|
|
10
|
+
/** Null when the runner records no compaction events. */
|
|
11
|
+
compactions: number | null;
|
|
12
|
+
toolCalls: number;
|
|
13
|
+
/** Closed steps, then the open one (after the last mark). Empty before the first mark is read. */
|
|
14
|
+
steps: SessionToolUsageSegment[];
|
|
15
|
+
}
|
|
16
|
+
export declare class LiveToolUsage {
|
|
17
|
+
readonly runner: string;
|
|
18
|
+
private readonly makeParser;
|
|
19
|
+
/** Byte offset of the first unread byte. */
|
|
20
|
+
offset: number;
|
|
21
|
+
/** The transcript incarnation being read; another one starts the count again. */
|
|
22
|
+
fileIdentity?: string;
|
|
23
|
+
private carry;
|
|
24
|
+
private parser;
|
|
25
|
+
private frozen;
|
|
26
|
+
/** End (mark time) of each frozen step, ascending. */
|
|
27
|
+
private boundaries;
|
|
28
|
+
private frozenUntil;
|
|
29
|
+
private frozenTotals;
|
|
30
|
+
constructor(runner: string, makeParser: () => StreamParser);
|
|
31
|
+
/** Start again from byte 0, for a replaced transcript. */
|
|
32
|
+
reset(fileIdentity?: string): void;
|
|
33
|
+
/** Bytes read at `this.offset`. A partial last line waits for the next read. */
|
|
34
|
+
append(bytes: Buffer): void;
|
|
35
|
+
/**
|
|
36
|
+
* Adds an event timed before the frozen boundary to the step whose mark interval holds it,
|
|
37
|
+
* creating that step's segment when the first read saw no activity in it.
|
|
38
|
+
*/
|
|
39
|
+
private routeLate;
|
|
40
|
+
/** Records appended since the last summary but timed before the frozen boundary. */
|
|
41
|
+
private settleLateEvents;
|
|
42
|
+
summary(marks: ChecklistMark[]): LiveUsageSummary;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=live.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../src/tool-usage/live.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,aAAa,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,kEAAkE;IAClE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,yDAAyD;IACzD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,kGAAkG;IAClG,KAAK,EAAE,uBAAuB,EAAE,CAAC;CAClC;AA2BD,qBAAa,aAAa;IActB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAd7B,4CAA4C;IAC5C,MAAM,SAAK;IACX,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAiC;IAC/C,sDAAsD;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAkB;gBAG3B,MAAM,EAAE,MAAM,EACN,UAAU,EAAE,MAAM,YAAY;IAKjD,0DAA0D;IAC1D,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAWlC,gFAAgF;IAChF,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB3B;;;OAGG;IACH,OAAO,CAAC,SAAS;IAmDjB,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,gBAAgB;CA0DlD"}
|