@farmslot/agent-runtime 0.48.1 → 0.48.2
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 +14 -0
- package/dist/task-init/required-skills.js +1 -1
- package/dist/task-init/required-skills.js.map +1 -1
- package/dist/task-init/task-document.d.ts.map +1 -1
- package/dist/task-init/task-document.js +1 -1
- package/dist/task-init/task-document.js.map +1 -1
- package/dist/task-init/write.d.ts.map +1 -1
- package/dist/task-init/write.js +12 -2
- package/dist/task-init/write.js.map +1 -1
- package/dist/tool-usage/adapters/claude.d.ts +3 -0
- package/dist/tool-usage/adapters/claude.d.ts.map +1 -0
- package/dist/tool-usage/adapters/claude.js +56 -0
- package/dist/tool-usage/adapters/claude.js.map +1 -0
- package/dist/tool-usage/adapters/codex.d.ts +3 -0
- package/dist/tool-usage/adapters/codex.d.ts.map +1 -0
- package/dist/tool-usage/adapters/codex.js +81 -0
- package/dist/tool-usage/adapters/codex.js.map +1 -0
- package/dist/tool-usage/adapters/cursor.d.ts +3 -0
- package/dist/tool-usage/adapters/cursor.d.ts.map +1 -0
- package/dist/tool-usage/adapters/cursor.js +47 -0
- package/dist/tool-usage/adapters/cursor.js.map +1 -0
- package/dist/tool-usage/adapters/grok.d.ts +3 -0
- package/dist/tool-usage/adapters/grok.d.ts.map +1 -0
- package/dist/tool-usage/adapters/grok.js +55 -0
- package/dist/tool-usage/adapters/grok.js.map +1 -0
- package/dist/tool-usage/adapters/jsonl.d.ts +9 -0
- package/dist/tool-usage/adapters/jsonl.d.ts.map +1 -0
- package/dist/tool-usage/adapters/jsonl.js +40 -0
- package/dist/tool-usage/adapters/jsonl.js.map +1 -0
- package/dist/tool-usage/adapters/native.d.ts +3 -0
- package/dist/tool-usage/adapters/native.d.ts.map +1 -0
- package/dist/tool-usage/adapters/native.js +31 -0
- package/dist/tool-usage/adapters/native.js.map +1 -0
- package/dist/tool-usage/adapters/pi.d.ts +3 -0
- package/dist/tool-usage/adapters/pi.d.ts.map +1 -0
- package/dist/tool-usage/adapters/pi.js +46 -0
- package/dist/tool-usage/adapters/pi.js.map +1 -0
- package/dist/tool-usage/count.d.ts +13 -0
- package/dist/tool-usage/count.d.ts.map +1 -0
- package/dist/tool-usage/count.js +160 -0
- package/dist/tool-usage/count.js.map +1 -0
- package/dist/tool-usage/index.d.ts +19 -0
- package/dist/tool-usage/index.d.ts.map +1 -0
- package/dist/tool-usage/index.js +32 -0
- package/dist/tool-usage/index.js.map +1 -0
- package/dist/tool-usage/ledger.d.ts +11 -0
- package/dist/tool-usage/ledger.d.ts.map +1 -0
- package/dist/tool-usage/ledger.js +29 -0
- package/dist/tool-usage/ledger.js.map +1 -0
- package/dist/tool-usage/stream.d.ts +32 -0
- package/dist/tool-usage/stream.d.ts.map +1 -0
- package/dist/tool-usage/stream.js +17 -0
- package/dist/tool-usage/stream.js.map +1 -0
- package/package.json +10 -4
- package/scripts/check-task-artifact-contract.mjs +36 -0
- package/scripts/checklist-order.cjs +165 -0
- package/scripts/checklist-target.cjs +20 -0
- package/scripts/mark-checklist-step.cjs +285 -23
- package/scripts/proof-artifacts.cjs +258 -0
- package/scripts/subtask-unit.cjs +22 -1
- package/scripts/worker-terminal-contract.cjs +4 -6
|
@@ -0,0 +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"}
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { isRecord, readJsonLines, text } from './jsonl.js';
|
|
2
|
+
export const nativeToolUsage = {
|
|
3
|
+
runner: 'native',
|
|
4
|
+
async read(sessionPath) {
|
|
5
|
+
const tools = [];
|
|
6
|
+
const byId = new Map();
|
|
7
|
+
for (const record of await readJsonLines(sessionPath)) {
|
|
8
|
+
const event = record.event;
|
|
9
|
+
if (!isRecord(event))
|
|
10
|
+
continue;
|
|
11
|
+
const at = text(event.at);
|
|
12
|
+
const id = text(event.nativeId);
|
|
13
|
+
if (event.type === 'tool.started') {
|
|
14
|
+
if (id && byId.has(id))
|
|
15
|
+
continue;
|
|
16
|
+
const tool = isRecord(event.tool) ? event.tool : {};
|
|
17
|
+
const call = { id, name: text(tool.name) ?? 'unknown', issuedAt: at };
|
|
18
|
+
tools.push(call);
|
|
19
|
+
if (id)
|
|
20
|
+
byId.set(id, call);
|
|
21
|
+
}
|
|
22
|
+
else if (event.type === 'tool.completed' && id && at) {
|
|
23
|
+
const call = byId.get(id);
|
|
24
|
+
if (call)
|
|
25
|
+
call.completedAt ??= at;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return { tools, tokens: null };
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
//# sourceMappingURL=native.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
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)) {
|
|
12
|
+
const message = record.message;
|
|
13
|
+
const at = text(record.timestamp);
|
|
14
|
+
if (record.type !== 'message' || !isRecord(message) || !at)
|
|
15
|
+
continue;
|
|
16
|
+
// Pi can replay an entry; its id identifies it.
|
|
17
|
+
const entry = text(record.id);
|
|
18
|
+
if (entry && seen.has(entry))
|
|
19
|
+
continue;
|
|
20
|
+
if (entry)
|
|
21
|
+
seen.add(entry);
|
|
22
|
+
if (message.role === 'toolResult') {
|
|
23
|
+
const id = text(message.toolCallId);
|
|
24
|
+
if (id)
|
|
25
|
+
completions.push({ id, completedAt: at });
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
if (message.role !== 'assistant')
|
|
29
|
+
continue;
|
|
30
|
+
for (const block of Array.isArray(message.content) ? message.content : [])
|
|
31
|
+
if (isRecord(block) && block.type === 'toolCall')
|
|
32
|
+
calls.push({ id: text(block.id), name: text(block.name) ?? 'unknown', issuedAt: at });
|
|
33
|
+
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 };
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
//# sourceMappingURL=pi.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { SessionToolUsage, SessionToolUsageSegment } from '@farmslot/protocol/contracts/runs';
|
|
2
|
+
import type { ChecklistMark } from './ledger.js';
|
|
3
|
+
import type { ToolUsageStream } from './stream.js';
|
|
4
|
+
export type ToolUsageSegment = SessionToolUsageSegment;
|
|
5
|
+
export type ToolUsage = SessionToolUsage;
|
|
6
|
+
export interface ToolUsageWindow {
|
|
7
|
+
startedAt?: string;
|
|
8
|
+
completedAt?: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function countToolUsage(stream: ToolUsageStream, marks: ChecklistMark[], window?: ToolUsageWindow): ToolUsage;
|
|
11
|
+
/** Sums the usage of several sessions of one run. They share one ledger, so segments align. */
|
|
12
|
+
export declare function mergeToolUsage(usages: ToolUsage[]): ToolUsage | null;
|
|
13
|
+
//# sourceMappingURL=count.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
function add(counts, name, n = 1) {
|
|
2
|
+
counts[name] = (counts[name] ?? 0) + n;
|
|
3
|
+
}
|
|
4
|
+
function inWindow(time, start, end) {
|
|
5
|
+
return time >= start && time <= end;
|
|
6
|
+
}
|
|
7
|
+
export function countToolUsage(stream, marks, window = {}) {
|
|
8
|
+
const times = [
|
|
9
|
+
...stream.tools.flatMap((tool) => (tool.issuedAt ? [Date.parse(tool.issuedAt)] : [])),
|
|
10
|
+
...(stream.tokens ?? []).map((sample) => Date.parse(sample.at)),
|
|
11
|
+
].filter(Number.isFinite);
|
|
12
|
+
const start = window.startedAt ? Date.parse(window.startedAt) : Math.min(...times);
|
|
13
|
+
// A mark after the last recorded activity still closes its step.
|
|
14
|
+
const markTimes = marks.map((mark) => Date.parse(mark.checkedAt)).filter(Number.isFinite);
|
|
15
|
+
const end = window.completedAt
|
|
16
|
+
? Date.parse(window.completedAt)
|
|
17
|
+
: Math.max(...times, ...markTimes);
|
|
18
|
+
const windowed = window.startedAt !== undefined || window.completedAt !== undefined;
|
|
19
|
+
const usage = {
|
|
20
|
+
attribution: 'issuedAt',
|
|
21
|
+
toolCalls: 0,
|
|
22
|
+
toolCallsByName: {},
|
|
23
|
+
toolCallsBeforeFirstMark: null,
|
|
24
|
+
untimedToolCalls: 0,
|
|
25
|
+
steps: [],
|
|
26
|
+
};
|
|
27
|
+
const timed = [];
|
|
28
|
+
for (const tool of stream.tools) {
|
|
29
|
+
const at = tool.issuedAt ? Date.parse(tool.issuedAt) : NaN;
|
|
30
|
+
if (!Number.isFinite(at)) {
|
|
31
|
+
// Without a time the call cannot be placed in a run window or a step.
|
|
32
|
+
if (windowed)
|
|
33
|
+
continue;
|
|
34
|
+
usage.untimedToolCalls += 1;
|
|
35
|
+
}
|
|
36
|
+
else if (!inWindow(at, start, end))
|
|
37
|
+
continue;
|
|
38
|
+
else
|
|
39
|
+
timed.push({ at, name: tool.name });
|
|
40
|
+
usage.toolCalls += 1;
|
|
41
|
+
add(usage.toolCallsByName, tool.name);
|
|
42
|
+
}
|
|
43
|
+
const tokens = (stream.tokens ?? [])
|
|
44
|
+
.map((sample) => ({ at: Date.parse(sample.at), tokens: sample.tokens }))
|
|
45
|
+
.filter((sample) => Number.isFinite(sample.at) && inWindow(sample.at, start, end));
|
|
46
|
+
const boundaries = marks
|
|
47
|
+
.map((mark) => ({ mark, at: Date.parse(mark.checkedAt) }))
|
|
48
|
+
.filter(({ at }) => Number.isFinite(at))
|
|
49
|
+
.sort((a, b) => a.at - b.at);
|
|
50
|
+
// Untimed calls cannot be placed between marks; empty zero-call steps would misreport them.
|
|
51
|
+
// A window drops them from the totals, so this asks the stream itself.
|
|
52
|
+
if (!timed.length && stream.tools.some((tool) => !tool.issuedAt)) {
|
|
53
|
+
usage.stepsUnavailable =
|
|
54
|
+
'The transcript records no call times, so calls cannot be placed in steps';
|
|
55
|
+
return usage;
|
|
56
|
+
}
|
|
57
|
+
if (!boundaries.length || !Number.isFinite(start) || !Number.isFinite(end)) {
|
|
58
|
+
usage.stepsUnavailable = 'The session has no checklist marks';
|
|
59
|
+
return usage;
|
|
60
|
+
}
|
|
61
|
+
// Segments are the run's checklist intervals, the same for every session of the run; each
|
|
62
|
+
// session reports the part it overlaps, from its first activity to its end.
|
|
63
|
+
const active = times.filter((at) => inWindow(at, start, end));
|
|
64
|
+
const sessionStart = active.length ? Math.min(...active) : start;
|
|
65
|
+
const edges = [
|
|
66
|
+
...boundaries.map(({ mark, at }, index) => ({
|
|
67
|
+
segment: index === 0 ? 'before-first-mark' : 'step',
|
|
68
|
+
mark,
|
|
69
|
+
at,
|
|
70
|
+
})),
|
|
71
|
+
{ segment: 'after-last-mark', mark: undefined, at: Infinity },
|
|
72
|
+
];
|
|
73
|
+
let previous = -Infinity;
|
|
74
|
+
for (const edge of edges) {
|
|
75
|
+
const lower = previous;
|
|
76
|
+
previous = edge.at;
|
|
77
|
+
const from = Math.max(lower, sessionStart);
|
|
78
|
+
const to = Math.min(edge.at, end);
|
|
79
|
+
if (from > to)
|
|
80
|
+
continue;
|
|
81
|
+
const inside = (at) => at >= lower && at < edge.at;
|
|
82
|
+
const segment = {
|
|
83
|
+
segment: edge.segment,
|
|
84
|
+
...(edge.mark
|
|
85
|
+
? {
|
|
86
|
+
stepNumber: edge.mark.stepNumber,
|
|
87
|
+
title: edge.mark.label,
|
|
88
|
+
markedAt: edge.mark.checkedAt,
|
|
89
|
+
}
|
|
90
|
+
: {}),
|
|
91
|
+
startedAt: new Date(from).toISOString(),
|
|
92
|
+
endedAt: new Date(to).toISOString(),
|
|
93
|
+
wallMs: to - from,
|
|
94
|
+
toolCalls: 0,
|
|
95
|
+
toolCallsByName: {},
|
|
96
|
+
totalTokens: stream.tokens ? 0 : null,
|
|
97
|
+
};
|
|
98
|
+
for (const tool of timed)
|
|
99
|
+
if (inside(tool.at)) {
|
|
100
|
+
segment.toolCalls += 1;
|
|
101
|
+
add(segment.toolCallsByName, tool.name);
|
|
102
|
+
}
|
|
103
|
+
for (const sample of tokens)
|
|
104
|
+
if (inside(sample.at))
|
|
105
|
+
segment.totalTokens = (segment.totalTokens ?? 0) + sample.tokens;
|
|
106
|
+
usage.steps.push(segment);
|
|
107
|
+
}
|
|
108
|
+
usage.toolCallsBeforeFirstMark = timed.filter((tool) => tool.at < boundaries[0].at).length;
|
|
109
|
+
return usage;
|
|
110
|
+
}
|
|
111
|
+
/** Sums the usage of several sessions of one run. They share one ledger, so segments align. */
|
|
112
|
+
export function mergeToolUsage(usages) {
|
|
113
|
+
if (!usages.length)
|
|
114
|
+
return null;
|
|
115
|
+
const merged = {
|
|
116
|
+
attribution: 'issuedAt',
|
|
117
|
+
toolCalls: 0,
|
|
118
|
+
toolCallsByName: {},
|
|
119
|
+
toolCallsBeforeFirstMark: null,
|
|
120
|
+
untimedToolCalls: 0,
|
|
121
|
+
steps: [],
|
|
122
|
+
};
|
|
123
|
+
const steps = new Map();
|
|
124
|
+
for (const usage of usages) {
|
|
125
|
+
merged.toolCalls += usage.toolCalls;
|
|
126
|
+
merged.untimedToolCalls += usage.untimedToolCalls;
|
|
127
|
+
for (const [name, n] of Object.entries(usage.toolCallsByName))
|
|
128
|
+
add(merged.toolCallsByName, name, n);
|
|
129
|
+
if (usage.toolCallsBeforeFirstMark !== null)
|
|
130
|
+
merged.toolCallsBeforeFirstMark =
|
|
131
|
+
(merged.toolCallsBeforeFirstMark ?? 0) + usage.toolCallsBeforeFirstMark;
|
|
132
|
+
for (const step of usage.steps) {
|
|
133
|
+
// The same checklist interval in every session: keyed by the mark that closes it.
|
|
134
|
+
const key = step.markedAt ? `${step.markedAt}:${step.stepNumber}` : 'end';
|
|
135
|
+
const known = steps.get(key);
|
|
136
|
+
if (!known) {
|
|
137
|
+
steps.set(key, { ...step, toolCallsByName: { ...step.toolCallsByName } });
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
known.toolCalls += step.toolCalls;
|
|
141
|
+
known.totalTokens =
|
|
142
|
+
known.totalTokens === null || step.totalTokens === null
|
|
143
|
+
? null
|
|
144
|
+
: known.totalTokens + step.totalTokens;
|
|
145
|
+
for (const [name, n] of Object.entries(step.toolCallsByName))
|
|
146
|
+
add(known.toolCallsByName, name, n);
|
|
147
|
+
if (step.startedAt < known.startedAt)
|
|
148
|
+
known.startedAt = step.startedAt;
|
|
149
|
+
if (step.endedAt > known.endedAt)
|
|
150
|
+
known.endedAt = step.endedAt;
|
|
151
|
+
known.wallMs = Date.parse(known.endedAt) - Date.parse(known.startedAt);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
const order = (step) => step.markedAt ?? '\uffff';
|
|
155
|
+
merged.steps = [...steps.values()].sort((a, b) => order(a).localeCompare(order(b)));
|
|
156
|
+
if (!merged.steps.length)
|
|
157
|
+
merged.stepsUnavailable = usages.find((usage) => usage.stepsUnavailable)?.stepsUnavailable;
|
|
158
|
+
return merged;
|
|
159
|
+
}
|
|
160
|
+
//# sourceMappingURL=count.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/tool-usage/count.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type ToolUsage, type ToolUsageWindow } from './count.js';
|
|
2
|
+
import type { ChecklistMark } from './ledger.js';
|
|
3
|
+
import type { ToolUsageAdapter } from './stream.js';
|
|
4
|
+
export type { ToolUsage, ToolUsageSegment, ToolUsageWindow } from './count.js';
|
|
5
|
+
export { countToolUsage, mergeToolUsage } from './count.js';
|
|
6
|
+
export type { ChecklistMark } from './ledger.js';
|
|
7
|
+
export { checklistMarks, checklistMarksFromSignal } from './ledger.js';
|
|
8
|
+
export type { TokenSample, ToolCallEvent, ToolUsageAdapter, ToolUsageStream } from './stream.js';
|
|
9
|
+
export { pairToolEvents } from './stream.js';
|
|
10
|
+
export declare function toolUsageAdapter(runner: string): ToolUsageAdapter | undefined;
|
|
11
|
+
/** Reads one session with its runner's adapter and counts it against the marks. */
|
|
12
|
+
export declare function measureToolUsage(params: {
|
|
13
|
+
runner: string;
|
|
14
|
+
sessionPath: string;
|
|
15
|
+
marks?: ChecklistMark[];
|
|
16
|
+
window?: ToolUsageWindow;
|
|
17
|
+
home?: string;
|
|
18
|
+
}): Promise<ToolUsage>;
|
|
19
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Tool-call usage per agent session: runner adapters translate a transcript into one stream,
|
|
2
|
+
// one counter splits it at the checklist marks. Farm accounting and the direct-skill path share it.
|
|
3
|
+
import { claudeToolUsage } from './adapters/claude.js';
|
|
4
|
+
import { codexToolUsage } from './adapters/codex.js';
|
|
5
|
+
import { cursorToolUsage } from './adapters/cursor.js';
|
|
6
|
+
import { grokToolUsage } from './adapters/grok.js';
|
|
7
|
+
import { nativeToolUsage } from './adapters/native.js';
|
|
8
|
+
import { piToolUsage } from './adapters/pi.js';
|
|
9
|
+
import { countToolUsage } from './count.js';
|
|
10
|
+
export { countToolUsage, mergeToolUsage } from './count.js';
|
|
11
|
+
export { checklistMarks, checklistMarksFromSignal } from './ledger.js';
|
|
12
|
+
export { pairToolEvents } from './stream.js';
|
|
13
|
+
const ADAPTERS = [
|
|
14
|
+
piToolUsage,
|
|
15
|
+
claudeToolUsage,
|
|
16
|
+
codexToolUsage,
|
|
17
|
+
grokToolUsage,
|
|
18
|
+
cursorToolUsage,
|
|
19
|
+
nativeToolUsage,
|
|
20
|
+
];
|
|
21
|
+
export function toolUsageAdapter(runner) {
|
|
22
|
+
return ADAPTERS.find((adapter) => adapter.runner === runner);
|
|
23
|
+
}
|
|
24
|
+
/** Reads one session with its runner's adapter and counts it against the marks. */
|
|
25
|
+
export async function measureToolUsage(params) {
|
|
26
|
+
const adapter = toolUsageAdapter(params.runner);
|
|
27
|
+
if (!adapter)
|
|
28
|
+
throw new Error(`No tool-usage adapter for runner ${params.runner}`);
|
|
29
|
+
const stream = await adapter.read(params.sessionPath, { home: params.home });
|
|
30
|
+
return countToolUsage(stream, params.marks ?? [], params.window);
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface ChecklistMark {
|
|
2
|
+
stepNumber: number;
|
|
3
|
+
label: string;
|
|
4
|
+
checkedAt: string;
|
|
5
|
+
skipped?: boolean;
|
|
6
|
+
}
|
|
7
|
+
/** Valid marks in ledger order. Malformed entries are dropped, as the gateway reader does. */
|
|
8
|
+
export declare function checklistMarks(timing: unknown): ChecklistMark[];
|
|
9
|
+
/** Marks from a parsed SIGNAL.json document. */
|
|
10
|
+
export declare function checklistMarksFromSignal(signal: unknown): ChecklistMark[];
|
|
11
|
+
//# sourceMappingURL=ledger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ledger.d.ts","sourceRoot":"","sources":["../../src/tool-usage/ledger.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAMD,8FAA8F;AAC9F,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa,EAAE,CAY/D;AAED,gDAAgD;AAChD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa,EAAE,CAEzE"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
// Checklist marks from the mark ledger: SIGNAL.json `checklistTiming` (schemaVersion 1), which
|
|
2
|
+
// the gateway also keeps as `run.metrics.checklistTiming`. Nothing here depends on the runner.
|
|
3
|
+
function isRecord(value) {
|
|
4
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
5
|
+
}
|
|
6
|
+
/** Valid marks in ledger order. Malformed entries are dropped, as the gateway reader does. */
|
|
7
|
+
export function checklistMarks(timing) {
|
|
8
|
+
if (!isRecord(timing) || timing.schemaVersion !== 1 || !Array.isArray(timing.events))
|
|
9
|
+
return [];
|
|
10
|
+
const marks = [];
|
|
11
|
+
for (const event of timing.events) {
|
|
12
|
+
if (!isRecord(event))
|
|
13
|
+
continue;
|
|
14
|
+
const { stepNumber, label, checkedAt, skipped } = event;
|
|
15
|
+
if (typeof stepNumber !== 'number' || !Number.isInteger(stepNumber) || stepNumber < 1)
|
|
16
|
+
continue;
|
|
17
|
+
if (typeof label !== 'string' || typeof checkedAt !== 'string')
|
|
18
|
+
continue;
|
|
19
|
+
if (!Number.isFinite(Date.parse(checkedAt)))
|
|
20
|
+
continue;
|
|
21
|
+
marks.push({ stepNumber, label, checkedAt, ...(skipped === true ? { skipped: true } : {}) });
|
|
22
|
+
}
|
|
23
|
+
return marks;
|
|
24
|
+
}
|
|
25
|
+
/** Marks from a parsed SIGNAL.json document. */
|
|
26
|
+
export function checklistMarksFromSignal(signal) {
|
|
27
|
+
return isRecord(signal) ? checklistMarks(signal.checklistTiming) : [];
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=ledger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/tool-usage/ledger.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,+FAA+F;AAS/F,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,cAAc,CAAC,MAAe;IAC5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IAChG,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QAC/B,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACxD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC;YAAE,SAAS;QAChG,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,SAAS;QACzE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAAE,SAAS;QACtD,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,wBAAwB,CAAC,MAAe;IACtD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
export interface ToolCallEvent {
|
|
2
|
+
/** Runner call id, used only to pair a completion with its call. */
|
|
3
|
+
id?: string;
|
|
4
|
+
name: string;
|
|
5
|
+
/** ISO time the model issued the call. Absent when the transcript records no times. */
|
|
6
|
+
issuedAt?: string;
|
|
7
|
+
completedAt?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface TokenSample {
|
|
10
|
+
at: string;
|
|
11
|
+
/** Tokens this record added (input + output + cache, as in the session totals). */
|
|
12
|
+
tokens: number;
|
|
13
|
+
}
|
|
14
|
+
export interface ToolUsageStream {
|
|
15
|
+
tools: ToolCallEvent[];
|
|
16
|
+
/** Null when the runner records no timed token usage, so per-step tokens are unknown. */
|
|
17
|
+
tokens: TokenSample[] | null;
|
|
18
|
+
}
|
|
19
|
+
/** Translates one runner's transcript into the stream. Adding a runner means adding one. */
|
|
20
|
+
export interface ToolUsageAdapter {
|
|
21
|
+
runner: string;
|
|
22
|
+
/** `sessionPath` is the transcript file or session directory the usage accounting reads. */
|
|
23
|
+
read(sessionPath: string, options?: {
|
|
24
|
+
home?: string;
|
|
25
|
+
}): Promise<ToolUsageStream>;
|
|
26
|
+
}
|
|
27
|
+
/** Pairs completions with calls by id. Unmatched completions are ignored; they have no call. */
|
|
28
|
+
export declare function pairToolEvents(calls: ToolCallEvent[], completions: Array<{
|
|
29
|
+
id: string;
|
|
30
|
+
completedAt: string;
|
|
31
|
+
}>): ToolCallEvent[];
|
|
32
|
+
//# sourceMappingURL=stream.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
// The normalized stream every runner adapter produces. Tool calls carry the same fields as the
|
|
2
|
+
// native `tool.started` / `tool.completed` events; token samples let per-step cost use the same
|
|
3
|
+
// boundaries as the tool counts.
|
|
4
|
+
/** Pairs completions with calls by id. Unmatched completions are ignored; they have no call. */
|
|
5
|
+
export function pairToolEvents(calls, completions) {
|
|
6
|
+
const byId = new Map();
|
|
7
|
+
for (const call of calls)
|
|
8
|
+
if (call.id && !byId.has(call.id))
|
|
9
|
+
byId.set(call.id, call);
|
|
10
|
+
for (const completion of completions) {
|
|
11
|
+
const call = byId.get(completion.id);
|
|
12
|
+
if (call && !call.completedAt)
|
|
13
|
+
call.completedAt = completion.completedAt;
|
|
14
|
+
}
|
|
15
|
+
return calls;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=stream.js.map
|
|
@@ -0,0 +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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@farmslot/agent-runtime",
|
|
3
|
-
"version": "0.48.
|
|
3
|
+
"version": "0.48.2",
|
|
4
4
|
"minimumRuntimeVersion": "0.42.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -29,6 +29,8 @@
|
|
|
29
29
|
"./scripts/acceptance-cli.cjs": "./scripts/acceptance-cli.cjs",
|
|
30
30
|
"./scripts/subtask-unit.cjs": "./scripts/subtask-unit.cjs",
|
|
31
31
|
"./scripts/worker-terminal-contract.cjs": "./scripts/worker-terminal-contract.cjs",
|
|
32
|
+
"./scripts/proof-artifacts.cjs": "./scripts/proof-artifacts.cjs",
|
|
33
|
+
"./scripts/checklist-order.cjs": "./scripts/checklist-order.cjs",
|
|
32
34
|
"./scripts/check-task-artifact-contract.mjs": "./scripts/check-task-artifact-contract.mjs",
|
|
33
35
|
"./scripts/retained-recipe-attempt.cjs": {
|
|
34
36
|
"types": "./scripts/retained-recipe-attempt.d.cts",
|
|
@@ -45,6 +47,10 @@
|
|
|
45
47
|
"types": "./dist/native/*.d.ts",
|
|
46
48
|
"import": "./dist/native/*.js"
|
|
47
49
|
},
|
|
50
|
+
"./tool-usage": {
|
|
51
|
+
"types": "./dist/tool-usage/index.d.ts",
|
|
52
|
+
"import": "./dist/tool-usage/index.js"
|
|
53
|
+
},
|
|
48
54
|
"./scripts/branch-update.mjs": "./scripts/branch-update.mjs",
|
|
49
55
|
"./scripts/git-diff.cjs": {
|
|
50
56
|
"types": "./scripts/git-diff.d.cts",
|
|
@@ -73,7 +79,7 @@
|
|
|
73
79
|
},
|
|
74
80
|
"scripts": {
|
|
75
81
|
"typecheck": "yarn workspace @farmslot/protocol build && tsc --noEmit --project tsconfig.json",
|
|
76
|
-
"test": "node --test --test-concurrency=2 test/*.test.cjs test/*.test.mjs && node --import tsx ../../scripts/e2e-subtask-mark.mts && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/execution-template && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/task-init && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/native",
|
|
82
|
+
"test": "node --test --test-concurrency=2 test/*.test.cjs test/*.test.mjs && node --import tsx ../../scripts/e2e-subtask-mark.mts && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/execution-template && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/task-init && node ../../scripts/quality/run-tsx-tests.mjs --cwd . --tsconfig tsconfig.json --workers 2 src/native src/tool-usage",
|
|
77
83
|
"format": "prettier --write --ignore-path ../../.prettierignore .",
|
|
78
84
|
"format:check": "prettier --check --ignore-path ../../.prettierignore .",
|
|
79
85
|
"lint": "eslint \"src/**/*.ts\"",
|
|
@@ -87,8 +93,8 @@
|
|
|
87
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"
|
|
88
94
|
},
|
|
89
95
|
"dependencies": {
|
|
90
|
-
"@farmslot/adapter-sdk": "0.27.
|
|
91
|
-
"@farmslot/protocol": "0.86.
|
|
96
|
+
"@farmslot/adapter-sdk": "0.27.10",
|
|
97
|
+
"@farmslot/protocol": "0.86.1"
|
|
92
98
|
},
|
|
93
99
|
"devDependencies": {
|
|
94
100
|
"@types/node": "^22.0.0",
|
|
@@ -14,6 +14,9 @@ const {
|
|
|
14
14
|
deterministicChecks,
|
|
15
15
|
} = require('./worker-terminal-contract.cjs');
|
|
16
16
|
const { SUBTASK_INDEX_REL, openSubtaskUnits } = require('./subtask-unit.cjs');
|
|
17
|
+
const proofArtifacts = require('./proof-artifacts.cjs');
|
|
18
|
+
const checklistOrder = require('./checklist-order.cjs');
|
|
19
|
+
const { resolveChecklistTarget } = require('./checklist-target.cjs');
|
|
17
20
|
const { acceptanceContractIssues, readAcceptanceLedger } = require('./acceptance-ledger.cjs');
|
|
18
21
|
const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
|
19
22
|
const workspaceProtocolRoot = path.resolve(packageRoot, '../protocol');
|
|
@@ -94,6 +97,8 @@ const rawArgs = process.argv.slice(3);
|
|
|
94
97
|
const flags = new Set();
|
|
95
98
|
let contractPath;
|
|
96
99
|
let terminalCommand;
|
|
100
|
+
let proofChecklist;
|
|
101
|
+
let proofSignal;
|
|
97
102
|
for (let i = 0; i < rawArgs.length; i += 1) {
|
|
98
103
|
const arg = rawArgs[i];
|
|
99
104
|
if (arg === '--contract') {
|
|
@@ -106,6 +111,18 @@ for (let i = 0; i < rawArgs.length; i += 1) {
|
|
|
106
111
|
i += 1;
|
|
107
112
|
continue;
|
|
108
113
|
}
|
|
114
|
+
// The caller's selection, when it has one: `mark --checklist X --signal Y`
|
|
115
|
+
// completes X and keeps its claims in Y, which the manifest need not name.
|
|
116
|
+
if (arg === '--proof-checklist') {
|
|
117
|
+
proofChecklist = rawArgs[i + 1];
|
|
118
|
+
i += 1;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
if (arg === '--proof-signal') {
|
|
122
|
+
proofSignal = rawArgs[i + 1];
|
|
123
|
+
i += 1;
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
109
126
|
flags.add(arg);
|
|
110
127
|
}
|
|
111
128
|
|
|
@@ -674,6 +691,25 @@ if (contractPath && terminalCommand && !existsSync(contractPath)) {
|
|
|
674
691
|
}
|
|
675
692
|
}
|
|
676
693
|
|
|
694
|
+
// A checked proof step must have the evidence it declared, written no later than
|
|
695
|
+
// the claim (proof-artifacts.cjs). A step that declares nothing is not inspected
|
|
696
|
+
// here, so a checklist without the marker reaches completion exactly as before.
|
|
697
|
+
if (terminalCommand !== 'blocked' && !proofMeasurement) {
|
|
698
|
+
try {
|
|
699
|
+
// Only the checklist that is completing: a reviewer finishing REVIEW.md
|
|
700
|
+
// answers for its own declarations, never for the worker's CHECKLIST.md,
|
|
701
|
+
// whose unproven steps are what the reviewer is reporting on. The caller's
|
|
702
|
+
// own selection wins over the manifest, which it may not have written.
|
|
703
|
+
const checklist = proofChecklist ?? resolveChecklistTarget(taskDir).checklist;
|
|
704
|
+
issues.push(...proofArtifacts.issues(taskDir, checklist, terminalContract, proofSignal));
|
|
705
|
+
// Steps are claimed in order, and only a step the template declared optional
|
|
706
|
+
// may be skipped. A checklist edited around the mark engine shows up here.
|
|
707
|
+
issues.push(...checklistOrder.issues(taskDir, checklist, terminalContract, proofSignal));
|
|
708
|
+
} catch (error) {
|
|
709
|
+
issues.push(`Proof declarations cannot be validated: ${error.message}`);
|
|
710
|
+
}
|
|
711
|
+
}
|
|
712
|
+
|
|
677
713
|
const deterministicResults = [];
|
|
678
714
|
if (terminalCommand !== 'blocked') {
|
|
679
715
|
const checklists = new Set(
|