@farmslot/agent-runtime 0.48.2 → 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.
Files changed (52) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/native/observation.d.ts +10 -0
  3. package/dist/native/observation.d.ts.map +1 -1
  4. package/dist/native/observation.js +50 -3
  5. package/dist/native/observation.js.map +1 -1
  6. package/dist/task-init/task-document.d.ts +13 -0
  7. package/dist/task-init/task-document.d.ts.map +1 -1
  8. package/dist/task-init/task-document.js +19 -1
  9. package/dist/task-init/task-document.js.map +1 -1
  10. package/dist/tool-usage/adapters/claude.d.ts.map +1 -1
  11. package/dist/tool-usage/adapters/claude.js +59 -20
  12. package/dist/tool-usage/adapters/claude.js.map +1 -1
  13. package/dist/tool-usage/adapters/codex.d.ts.map +1 -1
  14. package/dist/tool-usage/adapters/codex.js +78 -20
  15. package/dist/tool-usage/adapters/codex.js.map +1 -1
  16. package/dist/tool-usage/adapters/cursor.d.ts.map +1 -1
  17. package/dist/tool-usage/adapters/cursor.js +6 -1
  18. package/dist/tool-usage/adapters/cursor.js.map +1 -1
  19. package/dist/tool-usage/adapters/grok.d.ts.map +1 -1
  20. package/dist/tool-usage/adapters/grok.js +35 -4
  21. package/dist/tool-usage/adapters/grok.js.map +1 -1
  22. package/dist/tool-usage/adapters/jsonl.d.ts +4 -0
  23. package/dist/tool-usage/adapters/jsonl.d.ts.map +1 -1
  24. package/dist/tool-usage/adapters/jsonl.js +6 -0
  25. package/dist/tool-usage/adapters/jsonl.js.map +1 -1
  26. package/dist/tool-usage/adapters/native.d.ts.map +1 -1
  27. package/dist/tool-usage/adapters/native.js +6 -1
  28. package/dist/tool-usage/adapters/native.js.map +1 -1
  29. package/dist/tool-usage/adapters/pi.d.ts.map +1 -1
  30. package/dist/tool-usage/adapters/pi.js +53 -26
  31. package/dist/tool-usage/adapters/pi.js.map +1 -1
  32. package/dist/tool-usage/count.d.ts.map +1 -1
  33. package/dist/tool-usage/count.js +41 -2
  34. package/dist/tool-usage/count.js.map +1 -1
  35. package/dist/tool-usage/index.d.ts +8 -2
  36. package/dist/tool-usage/index.d.ts.map +1 -1
  37. package/dist/tool-usage/index.js +9 -1
  38. package/dist/tool-usage/index.js.map +1 -1
  39. package/dist/tool-usage/live.d.ts +44 -0
  40. package/dist/tool-usage/live.d.ts.map +1 -0
  41. package/dist/tool-usage/live.js +179 -0
  42. package/dist/tool-usage/live.js.map +1 -0
  43. package/dist/tool-usage/prices.d.ts +13 -0
  44. package/dist/tool-usage/prices.d.ts.map +1 -0
  45. package/dist/tool-usage/prices.js +23 -0
  46. package/dist/tool-usage/prices.js.map +1 -0
  47. package/dist/tool-usage/stream.d.ts +25 -0
  48. package/dist/tool-usage/stream.d.ts.map +1 -1
  49. package/dist/tool-usage/stream.js +9 -0
  50. package/dist/tool-usage/stream.js.map +1 -1
  51. package/package.json +3 -3
  52. package/scripts/mark-checklist-step.cjs +16 -7
@@ -3,11 +3,19 @@
3
3
  // publishes as tool events, so those are the calls. In code mode one model `exec` call runs
4
4
  // several of them. Rollouts without items fall back to `response_item` payloads whose type ends
5
5
  // in `_call`, completed by `<type>_output` with the same call_id. Token counts are cumulative,
6
- // so each sample is the increase.
7
- import { pairToolEvents } from '../stream.js';
6
+ // so each sample is the increase, priced from the static table by the turn's model. Each
7
+ // context compaction is one top-level `compacted` record.
8
+ import { OPENAI_PRICING } from '../prices.js';
9
+ import { dropStreamBefore, pairToolEvents, } from '../stream.js';
8
10
  import { count, isoTime, isRecord, readJsonLines, text } from './jsonl.js';
9
11
  /** Item types native Codex does not publish as tools (agent-runtime/src/native/codex.ts). */
10
- const NOT_TOOLS = new Set(['userMessage', 'agentMessage', 'reasoning', 'plan']);
12
+ const NOT_TOOLS = new Set([
13
+ 'userMessage',
14
+ 'agentMessage',
15
+ 'reasoning',
16
+ 'plan',
17
+ 'contextCompaction',
18
+ ]);
11
19
  function cumulativeTotal(usage) {
12
20
  return usage.total_tokens != null
13
21
  ? count(usage.total_tokens)
@@ -28,22 +36,42 @@ function itemStart(payload, completedAt) {
28
36
  const ms = count(duration.secs) * 1000 + count(duration.nanos) / 1e6;
29
37
  return new Date(Date.parse(completedAt) - ms).toISOString();
30
38
  }
31
- export const codexToolUsage = {
32
- runner: 'codex',
33
- async read(sessionPath) {
34
- const items = [];
35
- const calls = [];
36
- const completions = [];
37
- const tokens = [];
38
- let previous = 0;
39
- for (const record of await readJsonLines(sessionPath)) {
39
+ function codexParser() {
40
+ const items = [];
41
+ const calls = [];
42
+ const completions = [];
43
+ const tokens = [];
44
+ const compactions = [];
45
+ let model;
46
+ // Once a rollout has native items they are the calls; dropping old ones must not switch back.
47
+ let usesItems = false;
48
+ let previous = { total: 0, input: 0, output: 0 };
49
+ const parsed = { tools: items, tokens, compactions };
50
+ const current = () => ({
51
+ tools: usesItems ? items : pairToolEvents(calls, completions),
52
+ tokens,
53
+ compactions,
54
+ });
55
+ return {
56
+ push(record) {
40
57
  const payload = record.payload;
41
58
  const at = text(record.timestamp);
59
+ if (record.type === 'compacted' && at) {
60
+ compactions.push({ at });
61
+ return;
62
+ }
42
63
  if (!isRecord(payload) || !at)
43
- continue;
64
+ return;
44
65
  const type = text(payload.type) ?? '';
45
- if (record.type === 'event_msg' && type === 'item_completed' && isRecord(payload.item)) {
66
+ if (record.type === 'turn_context') {
67
+ model = text(payload.model) ?? model;
68
+ }
69
+ else if (record.type === 'event_msg' &&
70
+ type === 'item_completed' &&
71
+ isRecord(payload.item)) {
46
72
  const name = itemName(text(payload.item.type) ?? 'unknown');
73
+ if (!NOT_TOOLS.has(name))
74
+ usesItems = true;
47
75
  if (!NOT_TOOLS.has(name))
48
76
  items.push({
49
77
  id: text(payload.item.id),
@@ -68,14 +96,44 @@ export const codexToolUsage = {
68
96
  const info = isRecord(payload.info) ? payload.info : {};
69
97
  const usage = info.total_token_usage;
70
98
  if (!isRecord(usage))
71
- continue;
99
+ return;
72
100
  const total = cumulativeTotal(usage);
73
- if (total > previous)
74
- tokens.push({ at, tokens: total - previous });
75
- previous = Math.max(previous, total);
101
+ if (total > previous.total) {
102
+ const prices = model
103
+ ? Object.entries(OPENAI_PRICING).find(([key]) => model.startsWith(key))?.[1]
104
+ : undefined;
105
+ const input = Math.max(0, count(usage.input_tokens) - previous.input);
106
+ const output = Math.max(0, count(usage.output_tokens) - previous.output);
107
+ tokens.push({
108
+ at,
109
+ tokens: total - previous.total,
110
+ costUsd: prices ? (input * prices.input + output * prices.output) / 1_000_000 : null,
111
+ });
112
+ }
113
+ previous = {
114
+ total: Math.max(previous.total, total),
115
+ input: Math.max(previous.input, count(usage.input_tokens)),
116
+ output: Math.max(previous.output, count(usage.output_tokens)),
117
+ };
76
118
  }
77
- }
78
- return { tools: items.length ? items : pairToolEvents(calls, completions), tokens };
119
+ },
120
+ stream: current,
121
+ dropBefore(time) {
122
+ pairToolEvents(calls, completions);
123
+ completions.length = 0;
124
+ dropStreamBefore(parsed, time);
125
+ dropStreamBefore({ tools: calls, tokens: null, compactions: null }, time);
126
+ },
127
+ };
128
+ }
129
+ export const codexToolUsage = {
130
+ runner: 'codex',
131
+ parser: codexParser,
132
+ async read(sessionPath) {
133
+ const parser = codexParser();
134
+ for (const record of await readJsonLines(sessionPath))
135
+ parser.push(record);
136
+ return parser.stream();
79
137
  },
80
138
  };
81
139
  //# sourceMappingURL=codex.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/codex.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/codex.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/cursor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAuBpE,eAAO,MAAM,eAAe,EAAE,gBAc7B,CAAC"}
1
+ {"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/cursor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAuBpE,eAAO,MAAM,eAAe,EAAE,gBAmB7B,CAAC"}
@@ -41,7 +41,12 @@ export const cursorToolUsage = {
41
41
  if (isRecord(block) && block.type === 'tool_use')
42
42
  tools.push({ name: text(block.name) ?? 'unknown' });
43
43
  }
44
- return { tools, tokens: null };
44
+ return {
45
+ tools,
46
+ tokens: null,
47
+ compactions: null,
48
+ compactionsUnavailable: 'Cursor transcripts record no compaction events',
49
+ };
45
50
  },
46
51
  };
47
52
  //# sourceMappingURL=cursor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/cursor.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,8FAA8F;AAC9F,8FAA8F;AAC9F,iDAAiD;AACjD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE3D,KAAK,UAAU,cAAc,CAAC,WAAmB,EAAE,IAAY;IAC7D,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,WAAW,CAAC;IACvD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IACxE,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9F,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACxD,KAAK,MAAM,OAAO,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+EAA+E;YAC/E,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;QACtE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,EAAE,gBAAgB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,MAAM,EAAE,QAAQ;IAChB,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO;QAC7B,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,KAAK,MAAM,MAAM,IAAI,MAAM,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,SAAS;YAChE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACvE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;oBAC9C,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/tool-usage/adapters/cursor.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,8FAA8F;AAC9F,8FAA8F;AAC9F,iDAAiD;AACjD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE3D,KAAK,UAAU,cAAc,CAAC,WAAmB,EAAE,IAAY;IAC7D,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,WAAW,CAAC;IACvD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IACxE,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9F,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACxD,KAAK,MAAM,OAAO,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+EAA+E;YAC/E,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;QACtE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,EAAE,gBAAgB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,MAAM,EAAE,QAAQ;IAChB,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO;QAC7B,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,KAAK,MAAM,MAAM,IAAI,MAAM,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,SAAS;YAChE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACvE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;oBAC9C,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO;YACL,KAAK;YACL,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,IAAI;YACjB,sBAAsB,EAAE,gDAAgD;SACzE,CAAC;IACJ,CAAC;CACF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/grok.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQpE,eAAO,MAAM,aAAa,EAAE,gBAyC3B,CAAC"}
1
+ {"version":3,"file":"grok.d.ts","sourceRoot":"","sources":["../../../src/tool-usage/adapters/grok.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAkC,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQrF,eAAO,MAAM,aAAa,EAAE,gBAmE3B,CAAC"}
@@ -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
- import { stat } from 'node:fs/promises';
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
- return { tools, tokens };
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":"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"}
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,gBAuB7B,CAAC"}
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 { tools, tokens: null };
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,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;CACF,CAAC"}
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":"AACA,OAAO,EAAsC,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIzF,eAAO,MAAM,WAAW,EAAE,gBAqCzB,CAAC"}
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` content blocks; a `toolResult` message completes one.
2
- import { pairToolEvents } from '../stream.js';
3
- import { count, isRecord, readJsonLines, text } from './jsonl.js';
4
- export const piToolUsage = {
5
- runner: 'pi',
6
- async read(sessionPath) {
7
- const calls = [];
8
- const completions = [];
9
- const tokens = [];
10
- const seen = new Set();
11
- for (const record of await readJsonLines(sessionPath)) {
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
- continue;
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
- continue;
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
- continue;
32
+ return;
27
33
  }
28
34
  if (message.role !== 'assistant')
29
- continue;
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
- tokens.push({
36
- at,
37
- tokens: count(usage.input) +
38
- count(usage.output) +
39
- count(usage.cacheRead) +
40
- count(usage.cacheWrite),
41
- });
42
- }
43
- return { tools: pairToolEvents(calls, completions), tokens };
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,+FAA+F;AAC/F,OAAO,EAAE,cAAc,EAA6C,MAAM,cAAc,CAAC;AAEzF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElE,MAAM,CAAC,MAAM,WAAW,GAAqB;IAC3C,MAAM,EAAE,IAAI;IACZ,KAAK,CAAC,IAAI,CAAC,WAAW;QACpB,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,MAAM,WAAW,GAA+C,EAAE,CAAC;QACnE,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,KAAK,MAAM,MAAM,IAAI,MAAM,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAClC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAAE,SAAS;YACrE,gDAAgD;YAChD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,SAAS;YACvC,IAAI,KAAK;gBAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAClC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACpC,IAAI,EAAE;oBAAE,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClD,SAAS;YACX,CAAC;YACD,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW;gBAAE,SAAS;YAC3C,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACvE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;oBAC9C,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1F,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,QAAQ,CAAC,KAAK,CAAC;gBACjB,MAAM,CAAC,IAAI,CAAC;oBACV,EAAE;oBACF,MAAM,EACJ,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;wBAClB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;wBACnB,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;wBACtB,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;iBAC1B,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/D,CAAC;CACF,CAAC"}
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,CAoGX;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,IAAI,CA4CpE"}
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"}
@@ -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) => ({ at: Date.parse(sample.at), tokens: sample.tokens }))
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":"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"}
1
+ {"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"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"}