@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
@@ -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 type { TokenSample, ToolCallEvent, ToolUsageAdapter, ToolUsageStream } from './stream.js';
9
- export { pairToolEvents } from './stream.js';
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,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAW7C,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"}
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"}
@@ -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 { pairToolEvents } from './stream.js';
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;AAKlF,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,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"}
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"}
@@ -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":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAwB5C,MAAM,GAAG,GAAG,CAAC,CAAgB,EAAE,CAA4B,EAAE,EAAE,CAC7D,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACzC,MAAM,IAAI,GAAG,GAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;AACrF,MAAM,EAAE,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEnE,+CAA+C;AAC/C,SAAS,YAAY,CAAC,MAAuB,EAAE,IAAY;IACzD,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC;IACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE;QACtC,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;YAC/B,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;IACH,MAAM,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACjG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACrF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,aAAa;IAaxB,YACW,MAAc,EACN,UAA8B;QADtC,WAAM,GAAN,MAAM,CAAQ;QACN,eAAU,GAAV,UAAU,CAAoB;QAdjD,4CAA4C;QAC5C,WAAM,GAAG,CAAC,CAAC;QAGH,UAAK,GAAG,EAAE,CAAC;QAEX,WAAM,GAA8B,EAAE,CAAC;QAC/C,sDAAsD;QAC9C,eAAU,GAAa,EAAE,CAAC;QAC1B,gBAAW,GAAG,CAAC,QAAQ,CAAC;QACxB,iBAAY,GAAW,IAAI,EAAE,CAAC;QAMpC,IAAI,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;IAC7B,CAAC;IAED,0DAA0D;IAC1D,KAAK,CAAC,YAAqB;QACzB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,gFAAgF;IAChF,MAAM,CAAC,KAAa;QAClB,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBAAE,SAAS;YAC3B,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,yEAAyE;gBACzE,IAAI,KAAK,YAAY,WAAW;oBAAE,SAAS;gBAC3C,MAAM,KAAK,CAAC;YACd,CAAC;YACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,SAAS,CACf,EAAU,EACV,KAAsB,EACtB,MAAuB,EACvB,MAA+C;QAE/C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACzE,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO;QACtB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9E,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACtF,IAAI,GAAG;gBACL,OAAO,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM;gBACnD,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE;gBACxC,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,KAAK;gBAC1C,SAAS,EAAE,CAAC;gBACZ,eAAe,EAAE,EAAE;gBACnB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBACrC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;aAClC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAS,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC;QAC9C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC;YAC1C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;QACpF,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;YAClE,qDAAqD;YACrD,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACpF,CAAC;QACD,IAAI,MAAM,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC;QACxF,IAAI,CAAC,YAAY,GAAG;YAClB,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;YACvD,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO;YAC7B,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC;YACtE,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IAED,oFAAoF;IAC5E,gBAAgB,CAAC,KAAsB;QAC7C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;YAAE,OAAO;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5F,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK;gBAC7B,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW;oBACtC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7F,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE;gBACtC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW;oBAClC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;wBAC5C,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;qBAChC,CAAC,CAAC;YACP,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,WAAW,IAAI,EAAE;gBAC1C,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW;oBACjC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,KAAsB;QAC5B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACpC,2FAA2F;QAC3F,iEAAiE;QACjE,MAAM,IAAI,GAAG,KAAK;aACf,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC;aAChE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,cAAc,CAC1B,MAAM,EACN,IAAI,EACJ,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;YAC/B,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE;YACzD,CAAC,CAAC,EAAE,CACP,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CACrB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAC7E,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EACvD,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAC1D,CAAC,QAAQ,CACV,CAAC;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAC9B,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CACC,IAAI,CAAC,MAAM,CAAC,MAAM;YAClB,IAAI,CAAC,QAAQ,KAAK,SAAS;YAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,WAAW,CAC9C,CACJ,CAAC;QACF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CACzB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,CAC7E,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,gFAAgF;YAChF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAS,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,YAAY,GAAG;gBAClB,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;gBAC1D,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;gBACrD,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;gBACpE,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;aACxD,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAClE,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM;YACnF,OAAO,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YACrF,WAAW,EACT,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW;YACvF,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YACvD,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3E,CAAC;IACJ,CAAC;CACF"}
@@ -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;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,yFAAyF;IACzF,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;CAC9B;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;CAClF;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
+ {"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;AA8BjC,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"}
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.2",
3
+ "version": "0.48.4",
4
4
  "minimumRuntimeVersion": "0.42.0",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -93,8 +93,8 @@
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.27.10",
97
- "@farmslot/protocol": "0.86.1"
96
+ "@farmslot/adapter-sdk": "0.28.1",
97
+ "@farmslot/protocol": "0.87.0"
98
98
  },
99
99
  "devDependencies": {
100
100
  "@types/node": "^22.0.0",
@@ -863,11 +863,15 @@ if (stepNumber != null && readJson(signalPath).status === 'complete') {
863
863
  // a fresh attempt id while the gateway had already moved the run to review: the
864
864
  // worker went on marking steps nobody was watching.
865
865
  //
866
- // A legitimate re-dispatch never meets this: the gateway removes SIGNAL.json and
867
- // the role signals before replaying a step (methods/run/replay-step.ts, "cleared
868
- // worker terminal signals"), and an initial dispatch has no signal yet. So a
869
- // terminal signal still on disk means the worker is restarting itself inside a
870
- // run that is over, which is the case to refuse. The guard deliberately does not
866
+ // A legitimate re-dispatch never meets this: replaying any step that relaunches
867
+ // a worker removes a finished SIGNAL.json and the role signals first
868
+ // (methods/run/replay-step.ts, "cleared finished worker signals"), and an
869
+ // initial dispatch has no signal yet. A running signal is deliberately left
870
+ // there for admission to replace, and `blocked` stays resumable, so neither
871
+ // reaches the refusal below. A replay at or before write-task regenerates the
872
+ // task into a new directory instead, so this file is not reached at all. So a terminal signal still on disk means the
873
+ // worker is restarting itself inside a run that is over, which is the case to
874
+ // refuse. The guard deliberately does not
871
875
  // consult FARMSLOT_SIGNAL_ATTEMPT_ID: only the review terminal sets it
872
876
  // (agent-runtime/scripts/review-terminal.cjs), so for a worker run it would
873
877
  // never be present and would decide nothing.
@@ -881,9 +885,14 @@ if (isStartCommand) {
881
885
  // never exists. A successful verdict is different: nothing resumes a run that
882
886
  // finished, and before this a start on `complete` fell straight through and
883
887
  // destroyed the record of a run parked at its human gate.
884
- if (existing && ['complete', 'no-change'].includes(existing.status)) {
888
+ // `complete` covers a no-change run too: that command writes status
889
+ // 'complete' with disposition already_fixed or not_reproducible
890
+ // (resolveTerminalPreset above), so there is no 'no-change' status to test.
891
+ if (existing && existing.status === 'complete') {
885
892
  console.error(
886
- `signal already terminal: status=${existing.status}; start does not re-open it. ` +
893
+ `signal already terminal: status=${existing.status}` +
894
+ (existing.disposition ? ` (${existing.disposition})` : '') +
895
+ '; start does not re-open it. ' +
887
896
  'This run finished; a re-dispatch clears the signal first. ' +
888
897
  `Fix what the refusal reported and mark the run again, or stop with ${path.join(taskDir, 'mark')} blocked --reason "<why>".`,
889
898
  );