Skip to content

An agentic browser harness: an AI side panel & orb in your own logged-in Chrome, Edge, Arc, Brave or even Firefox run by the agent/subscription you already use (Claude Code, Codex, Antigravity). Free, open source, no API key. Also an MCP server.

fix(claude): count generated tokens from each message's final usage, not the snapshot every content block repeats

Shahriarc9894e355504
diff --git a/src/daemon/agent/runners/claude.test.ts b/src/daemon/agent/runners/claude.test.ts
new file mode 100644
index 0000000..c50750b
--- /dev/null
+++ b/src/daemon/agent/runners/claude.test.ts
@@ -0,0 +1,50 @@
+import { readFileSync } from 'node:fs';
+import { describe, expect, test } from 'vitest';
+import { claudeRunner } from './claude';
+import type { StreamSink } from './types';
+
+type Signal = keyof StreamSink;
+type Call = [Signal, ...unknown[]];
+
+const transcript = (name: string) =>
+ readFileSync(new URL(`./fixtures/claude/${name}`, import.meta.url), 'utf8')
+ .split('\n')
+ .filter((line) => line.trim() && !line.startsWith('#'));
+
+const read = (lines: string[], only?: Signal): Call[] => {
+ const calls: Call[] = [];
+ const record = (signal: Signal) => (...args: unknown[]) => void calls.push([signal, ...args]);
+ const sink: StreamSink = {
+ text: record('text'),
+ tool: record('tool'),
+ session: record('session'),
+ usage: record('usage'),
+ done: record('done'),
+ fail: record('fail'),
+ };
+ const reader = claudeRunner.reader();
+ for (const line of lines) reader(line, sink);
+ return only ? calls.filter(([signal]) => signal === only) : calls;
+};
+
+describe('token usage', () => {
+ test('a turn reports what its message finally generated, once', () => {
+ expect(read(transcript('2.1.278-fresh.jsonl'), 'usage')).toEqual([['usage', { contextTokens: 7389, outputTokens: 41 }]]);
+ });
+
+ test('a resumed turn counts the cached conversation as context', () => {
+ expect(read(transcript('2.1.278-resumed.jsonl'), 'usage')).toEqual([['usage', { contextTokens: 7467, outputTokens: 31 }]]);
+ });
+
+ test('output adds up across the messages of one run, and context is the latest message', () => {
+ expect(read(transcript('tool-loop.hand-written.jsonl'), 'usage')).toEqual([
+ ['usage', { contextTokens: 8260, outputTokens: 60 }],
+ ['usage', { contextTokens: 9112, outputTokens: 72 }],
+ ]);
+ });
+
+ test('a stream with no message deltas falls back to the total on the result line', () => {
+ const result = { type: 'result', subtype: 'success', usage: { input_tokens: 10, cache_read_input_tokens: 90, output_tokens: 5 } };
+ expect(read([JSON.stringify(result)], 'usage')).toEqual([['usage', { contextTokens: 105, outputTokens: 5 }]]);
+ });
+});
diff --git a/src/daemon/agent/runners/claude.ts b/src/daemon/agent/runners/claude.ts
index 0a09275..673ea0a 100644
--- a/src/daemon/agent/runners/claude.ts
+++ b/src/daemon/agent/runners/claude.ts
@@ -59,9 +59,10 @@ type StreamLine =
type?: string;
delta?: { type?: string; text?: string };
content_block?: { type?: string; id?: string; name?: string };
+ message?: { usage?: UsageLine };
+ usage?: UsageLine;
};
}
- | { type: 'assistant'; parent_tool_use_id?: string | null; message?: { usage?: UsageLine } }
| {
type: 'result';
is_error?: boolean;
@@ -114,19 +115,19 @@ export const claudeRunner: Runner = {
},
reader(): StreamReader {
+ // A message's usage is only final in its message_delta. The assistant lines repeat the
+ // opening snapshot once per content block, so counting those under-reports and double-counts.
+ let prompt = 0;
let generated = 0;
+ let counted = false;
- const report = (usage: UsageLine | undefined, sink: StreamSink) => {
- if (!usage) return;
+ const promptOf = (usage: UsageLine) =>
+ (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0);
+
+ const report = (usage: UsageLine, sink: StreamSink) => {
+ counted = true;
generated += usage.output_tokens ?? 0;
- sink.usage({
- contextTokens:
- (usage.input_tokens ?? 0) +
- (usage.cache_read_input_tokens ?? 0) +
- (usage.cache_creation_input_tokens ?? 0) +
- (usage.output_tokens ?? 0),
- outputTokens: generated,
- });
+ sink.usage({ contextTokens: prompt + (usage.output_tokens ?? 0), outputTokens: generated });
};
return (line, sink) => {
@@ -152,18 +153,19 @@ export const claudeRunner: Runner = {
const name = event.content_block.name ?? 'tool';
if (WEB_TOOLS.includes(name)) sink.tool(event.content_block.id ?? randomUUID(), name);
}
+ if (event?.type === 'message_start') prompt = promptOf(event.message?.usage ?? {});
+ if (event?.type === 'message_delta' && event.usage) report(event.usage, sink);
return;
}
- case 'assistant':
- if (!message.parent_tool_use_id) report(message.message?.usage, sink);
- return;
-
case 'result':
if (message.is_error) {
return sink.fail('AGENT_FAILED', message.result || message.subtype || 'Claude Code reported an error');
}
- if (!generated) report(message.usage, sink);
+ if (!counted && message.usage) {
+ prompt = promptOf(message.usage);
+ report(message.usage, sink);
+ }
return sink.done(message.stop_reason || 'end_turn');
}
};
diff --git a/src/daemon/agent/runners/fixtures/claude/2.1.278-fresh.jsonl b/src/daemon/agent/runners/fixtures/claude/2.1.278-fresh.jsonl
new file mode 100644
index 0000000..14a914d
--- /dev/null
+++ b/src/daemon/agent/runners/fixtures/claude/2.1.278-fresh.jsonl
@@ -0,0 +1,16 @@
+{"type":"system","subtype":"init","cwd":"/Users/you/.browsentic","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","tools":[],"mcp_servers":[],"model":"claude-haiku-4-5-20251001","permissionMode":"default","slash_commands":[],"terminal_slash_commands":[],"apiKeySource":"none","claude_code_version":"2.1.278","output_style":"default","agents":[],"skills":[],"plugins":[],"capabilities":["interrupt_receipt_v1","interrupt_cancel_queued_v1","msg_lifecycle_v1"],"analytics_disabled":false,"product_feedback_disabled":false,"uuid":"f9b48e0b-e4dd-4de4-b7bc-1f62b79defeb","memory_paths":{},"fast_mode_state":"off","fast_mode_disabled_reason":"sdk_opt_in_required"}
+{"type":"system","subtype":"status","status":"requesting","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"32b5527e-9412-4560-bf71-aeeb0babf0f7"}
+{"type":"stream_event","event":{"type":"message_start","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9Ui3gcHGB26yeDse6f","type":"message","role":"assistant","content":[],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":7338,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":7338},"output_tokens":3,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"1f487d53-f0f8-49d5-80f0-9c2a4e0a451b","ttft_ms":638}
+{"type":"stream_event","event":{"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":"","signature":""}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"27cc84bc-4fe0-4f2e-848b-4ec4b0646088"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"thinking_delta","thinking":"","estimated_tokens":null}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"4bcbb9d7-3341-427f-93f0-23a6ca132abb"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"signature_delta","signature":"EpoDCrIBCBIYAipAXGcdMOeF4VgzQfOf78nIAYEMYF9y7YXYq36nCQBp1ENq90XBKtnLzV4/sw7CDAjQ0IFjAw+dBFJS4+KNVk1e9DIZY2xhdWRlLWhhaWt1LTQtNS0yMDI1MTAwMTgAQgh0aGlua2luZ1okZDQxM2I2ZWYtNDlhMy00OWEyLWE4MGQtZGM2MDZjZTJiMWQxchCIDMmQPjl0FQEWCi8T30wAiAEBqAGmjsbVBrABAhIMJTqqVIlKBLnQlC4MGgzWAD4NkpgFFSe9VG4iMF8P3YeG5c1YkiV7ZXaqoDHIdlkaVeiVYCODikyRnS3M+KmrV32tEMTHgcYHAV2tNSqUAdvIRockwe76jH49CD15MfpDN9uEjzCjrt2U42FzajUpqw4loKaxkYs0s7ZRtgZAQTBgQQqMxQ8RgLfrcG2W3aHto6M8acb8A1U/6wL8EqIc3z2KNMeYzMAOkbMrTgrLXvEsmBtNXrhAzzNp3pVre56YlpOdelNqvh4EzlcjlW/Cyc4lWkUxlUFRVb1vPdgw44y8wy0YAQ=="}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"f8852164-392c-4bf8-bbd1-c3639c2e0f63"}
+{"type":"assistant","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9Ui3gcHGB26yeDse6f","type":"message","role":"assistant","content":[{"type":"thinking","thinking":"","signature":"EpoDCrIBCBIYAipAXGcdMOeF4VgzQfOf78nIAYEMYF9y7YXYq36nCQBp1ENq90XBKtnLzV4/sw7CDAjQ0IFjAw+dBFJS4+KNVk1e9DIZY2xhdWRlLWhhaWt1LTQtNS0yMDI1MTAwMTgAQgh0aGlua2luZ1okZDQxM2I2ZWYtNDlhMy00OWEyLWE4MGQtZGM2MDZjZTJiMWQxchCIDMmQPjl0FQEWCi8T30wAiAEBqAGmjsbVBrABAhIMJTqqVIlKBLnQlC4MGgzWAD4NkpgFFSe9VG4iMF8P3YeG5c1YkiV7ZXaqoDHIdlkaVeiVYCODikyRnS3M+KmrV32tEMTHgcYHAV2tNSqUAdvIRockwe76jH49CD15MfpDN9uEjzCjrt2U42FzajUpqw4loKaxkYs0s7ZRtgZAQTBgQQqMxQ8RgLfrcG2W3aHto6M8acb8A1U/6wL8EqIc3z2KNMeYzMAOkbMrTgrLXvEsmBtNXrhAzzNp3pVre56YlpOdelNqvh4EzlcjlW/Cyc4lWkUxlUFRVb1vPdgw44y8wy0YAQ=="}],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":7338,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":7338},"output_tokens":3,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null},"parent_tool_use_id":null,"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"809da752-0ffc-4c5a-b967-22cb7fd06f98","timestamp":"2026-09-21T19:36:06.857Z","request_id":"req_011CfH9Uhe7kNKTwRsxNgpu5"}
+{"type":"stream_event","event":{"type":"content_block_stop","index":0},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"9973e61b-d92a-4491-ae8b-db68be788573"}
+{"type":"stream_event","event":{"type":"content_block_start","index":1,"content_block":{"type":"text","text":""}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"70535c05-f639-4494-a444-de8287e2ec62"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":1,"delta":{"type":"text_delta","text":"ok"}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"11653448-b7fb-438a-be3e-0028ddfc61a3"}
+{"type":"assistant","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9Ui3gcHGB26yeDse6f","type":"message","role":"assistant","content":[{"type":"text","text":"ok"}],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":7338,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":7338},"output_tokens":3,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null},"parent_tool_use_id":null,"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"e6b678f6-71b0-4f50-812f-3ad8a2731e45","timestamp":"2026-09-21T19:36:06.872Z","request_id":"req_011CfH9Uhe7kNKTwRsxNgpu5"}
+{"type":"stream_event","event":{"type":"content_block_stop","index":1},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"b0605654-326d-4383-91cb-648c033cd1bd"}
+{"type":"stream_event","event":{"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null,"stop_details":null,"container":null},"usage":{"input_tokens":10,"cache_creation_input_tokens":7338,"cache_read_input_tokens":0,"output_tokens":41,"output_tokens_details":{"thinking_tokens":34},"iterations":[{"input_tokens":10,"output_tokens":41,"cache_read_input_tokens":0,"cache_creation_input_tokens":7338,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":7338},"type":"message"}]},"context_management":{"applied_edits":[]}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"aec9d168-5092-4e38-9318-9d0c098a8529"}
+{"type":"stream_event","event":{"type":"message_stop"},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"242dfa09-c739-4af4-846d-23c539c809cf"}
+{"type":"rate_limit_event","rate_limit_info":{"status":"allowed","rateLimitType":"five_hour"},"uuid":"70e4774b-0b8b-4775-a91f-9e2755f20b19","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6"}
+{"duration_api_ms":954,"stop_reason":"end_turn","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","total_cost_usd":0.014891,"usage":{"input_tokens":10,"cache_creation_input_tokens":7338,"cache_read_input_tokens":0,"output_tokens":41,"output_tokens_details":{"thinking_tokens":34},"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":7338,"ephemeral_5m_input_tokens":0},"inference_geo":"not_available","iterations":[{"input_tokens":10,"output_tokens":41,"cache_read_input_tokens":0,"cache_creation_input_tokens":7338,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":7338},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-haiku-4-5-20251001":{"inputTokens":10,"outputTokens":41,"cacheReadInputTokens":0,"cacheCreationInputTokens":7338,"webSearchRequests":0,"costUSD":0.014891,"contextWindow":200000,"maxOutputTokens":32000,"thinkingTokens":34,"canonicalModel":"claude-haiku-4-5","provider":"firstParty","costBasis":"list"}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","fast_mode_disabled_reason":"sdk_opt_in_required","subagent_stats":{"spawned":0,"requested":{"background":0,"foreground":0,"unset":0},"started_in_background":0,"max_depth":0,"spawned_by_subagents":0,"completed":0,"failed":0,"killed":{"parent":0,"user":0,"system":0},"refused":{"depth_limit":0,"concurrency_limit":0,"budget":0},"by_type":{}},"is_error":false,"num_turns":1,"subtype":"success","api_error_status":null,"result":"ok","ttft_ms":954,"type":"result","duration_ms":1011,"uuid":"0d0ee7f4-5b43-427b-8fb0-83d0bf7f7d6d","ttft_stream_ms":690,"time_to_request_ms":51,"first_content_frame_ms":691,"queued_turn_count":0,"result_index":0}
diff --git a/src/daemon/agent/runners/fixtures/claude/2.1.278-resumed.jsonl b/src/daemon/agent/runners/fixtures/claude/2.1.278-resumed.jsonl
new file mode 100644
index 0000000..8613b77
--- /dev/null
+++ b/src/daemon/agent/runners/fixtures/claude/2.1.278-resumed.jsonl
@@ -0,0 +1,16 @@
+{"type":"system","subtype":"init","cwd":"/Users/you/.browsentic","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","tools":[],"mcp_servers":[],"model":"claude-haiku-4-5-20251001","permissionMode":"default","slash_commands":[],"terminal_slash_commands":[],"apiKeySource":"none","claude_code_version":"2.1.278","output_style":"default","agents":[],"skills":[],"plugins":[],"capabilities":["interrupt_receipt_v1","interrupt_cancel_queued_v1","msg_lifecycle_v1"],"analytics_disabled":false,"product_feedback_disabled":false,"uuid":"65f3bba3-e6a4-4f69-b5dd-cb6906279de5","memory_paths":{},"fast_mode_state":"off","fast_mode_disabled_reason":"sdk_opt_in_required"}
+{"type":"system","subtype":"status","status":"requesting","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"818d0575-6da1-4a32-a90d-640b6b18280d"}
+{"type":"stream_event","event":{"type":"message_start","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9WvUM3xzBR3JHr6gUu","type":"message","role":"assistant","content":[],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":88,"cache_read_input_tokens":7338,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":88},"output_tokens":4,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"390bab48-cae0-4955-a9d1-fe7a362648db","ttft_ms":580}
+{"type":"stream_event","event":{"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":"","signature":""}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"9a1a9c10-c2c5-4d32-854a-9d9117b23a52"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"thinking_delta","thinking":"","estimated_tokens":null}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"464895a8-0297-4657-b926-d956029bb286"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"signature_delta","signature":"EukCCrIBCBIYAipA3zhX4bv+4F1WVyokBQP1nsvbuXcXSigfnpp0uOs1K4Ber/xQYPrIxRkW+CYLvJeEt8aMzdkDwFTrdiwR6iFFijIZY2xhdWRlLWhhaWt1LTQtNS0yMDI1MTAwMTgAQgh0aGlua2luZ1okZDQxM2I2ZWYtNDlhMy00OWEyLWE4MGQtZGM2MDZjZTJiMWQxchCIDMmQPjl0FQEWCi8T30wAiAEBqAHEjsbVBrABAhIMguPTo270uYfPfODQGgwTqREDiNSOPLn7FQQiML2DaneXJHRpoJAFpJ9gBwxwXETVg69kbg6GmxMvDbmkscvfLK0Tc+cTqfr71eufCipkftFSK80ngvxyQJvTfOO+P8+m6MOkXglccRrR/6MFb4rmxwbTTtDTx6WfJUQYawXbNC7AVG9hbGyzi/U3imDc/HjGztawD55oPN6x7l3aYE0qrAAKd0Qg799+w/xEDRf5qqpGxBgB"}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"c3d42a33-10d7-4ec4-ac9a-bb8b172367a9"}
+{"type":"assistant","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9WvUM3xzBR3JHr6gUu","type":"message","role":"assistant","content":[{"type":"thinking","thinking":"","signature":"EukCCrIBCBIYAipA3zhX4bv+4F1WVyokBQP1nsvbuXcXSigfnpp0uOs1K4Ber/xQYPrIxRkW+CYLvJeEt8aMzdkDwFTrdiwR6iFFijIZY2xhdWRlLWhhaWt1LTQtNS0yMDI1MTAwMTgAQgh0aGlua2luZ1okZDQxM2I2ZWYtNDlhMy00OWEyLWE4MGQtZGM2MDZjZTJiMWQxchCIDMmQPjl0FQEWCi8T30wAiAEBqAHEjsbVBrABAhIMguPTo270uYfPfODQGgwTqREDiNSOPLn7FQQiML2DaneXJHRpoJAFpJ9gBwxwXETVg69kbg6GmxMvDbmkscvfLK0Tc+cTqfr71eufCipkftFSK80ngvxyQJvTfOO+P8+m6MOkXglccRrR/6MFb4rmxwbTTtDTx6WfJUQYawXbNC7AVG9hbGyzi/U3imDc/HjGztawD55oPN6x7l3aYE0qrAAKd0Qg799+w/xEDRf5qqpGxBgB"}],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":88,"cache_read_input_tokens":7338,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":88},"output_tokens":4,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null},"parent_tool_use_id":null,"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"11be5211-b17b-485b-87e0-d7063059370b","timestamp":"2026-09-21T19:36:36.771Z","request_id":"req_011CfH9Wv1KNsMAzpMmJ6xvh"}
+{"type":"stream_event","event":{"type":"content_block_stop","index":0},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"4a899ecd-edd8-461c-bd90-c413214d19cb"}
+{"type":"stream_event","event":{"type":"content_block_start","index":1,"content_block":{"type":"text","text":""}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"a1212133-f020-4c8b-9c4d-9de658b08b29"}
+{"type":"stream_event","event":{"type":"content_block_delta","index":1,"delta":{"type":"text_delta","text":"done"}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"b66c1a5e-551b-47e1-a1d6-29f60be4423e"}
+{"type":"assistant","message":{"model":"claude-haiku-4-5-20251001","id":"msg_011CfH9WvUM3xzBR3JHr6gUu","type":"message","role":"assistant","content":[{"type":"text","text":"done"}],"container":null,"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":10,"cache_creation_input_tokens":88,"cache_read_input_tokens":7338,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":88},"output_tokens":4,"service_tier":"standard","inference_geo":"not_available"},"input_transformations":[],"diagnostics":null,"context_management":null},"parent_tool_use_id":null,"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","uuid":"9c4d810c-1b82-485c-933b-b2d5ca0ed4c0","timestamp":"2026-09-21T19:36:36.774Z","request_id":"req_011CfH9Wv1KNsMAzpMmJ6xvh"}
+{"type":"stream_event","event":{"type":"content_block_stop","index":1},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"00cfb2f9-5781-46b3-a1fe-bebdb30f3217"}
+{"type":"stream_event","event":{"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null,"stop_details":null,"container":null},"usage":{"input_tokens":10,"cache_creation_input_tokens":88,"cache_read_input_tokens":7338,"output_tokens":31,"output_tokens_details":{"thinking_tokens":24},"iterations":[{"input_tokens":10,"output_tokens":31,"cache_read_input_tokens":7338,"cache_creation_input_tokens":88,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":88},"type":"message"}]},"context_management":{"applied_edits":[]}},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"9188ec8f-5de0-41e9-be85-51695de7f1dc"}
+{"type":"stream_event","event":{"type":"message_stop"},"session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","parent_tool_use_id":null,"uuid":"7335908a-4478-4e24-abe5-f36a92b7fbdc"}
+{"type":"rate_limit_event","rate_limit_info":{"status":"allowed","rateLimitType":"five_hour"},"uuid":"2b21873f-ecb3-4311-9be2-45dece5892c8","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6"}
+{"duration_api_ms":1760,"stop_reason":"end_turn","session_id":"2e281281-10ef-47b8-8a23-d6137f6770f6","total_cost_usd":0.0159658,"usage":{"input_tokens":10,"cache_creation_input_tokens":88,"cache_read_input_tokens":7338,"output_tokens":31,"output_tokens_details":{"thinking_tokens":24},"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":88,"ephemeral_5m_input_tokens":0},"inference_geo":"not_available","iterations":[{"input_tokens":10,"output_tokens":31,"cache_read_input_tokens":7338,"cache_creation_input_tokens":88,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":88},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-haiku-4-5-20251001":{"inputTokens":20,"outputTokens":72,"thinkingTokens":58,"cacheReadInputTokens":7338,"cacheCreationInputTokens":7426,"webSearchRequests":0,"costUSD":0.0159658,"contextWindow":200000,"maxOutputTokens":32000,"canonicalModel":"claude-haiku-4-5","provider":"firstParty","costBasis":"list"}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","fast_mode_disabled_reason":"sdk_opt_in_required","subagent_stats":{"spawned":0,"requested":{"background":0,"foreground":0,"unset":0},"started_in_background":0,"max_depth":0,"spawned_by_subagents":0,"completed":0,"failed":0,"killed":{"parent":0,"user":0,"system":0},"refused":{"depth_limit":0,"concurrency_limit":0,"budget":0},"by_type":{}},"is_error":false,"num_turns":1,"subtype":"success","api_error_status":null,"result":"done","ttft_ms":820,"type":"result","duration_ms":852,"uuid":"4b7c3c8f-dd16-4b05-8e51-b1ef967824c6","ttft_stream_ms":625,"time_to_request_ms":45,"first_content_frame_ms":626,"queued_turn_count":0,"result_index":0}
diff --git a/src/daemon/agent/runners/fixtures/claude/tool-loop.hand-written.jsonl b/src/daemon/agent/runners/fixtures/claude/tool-loop.hand-written.jsonl
new file mode 100644
index 0000000..71c751c
--- /dev/null
+++ b/src/daemon/agent/runners/fixtures/claude/tool-loop.hand-written.jsonl
@@ -0,0 +1,19 @@
+# Hand-written from claude.ts's reader, not recorded. A run that calls one browsentic tool and then answers: two API messages, each closing with its own message_delta usage.
+{"type":"system","subtype":"init","session_id":"5b0e8a52-3c71-4d7e-9f10-2a6c4b8d9e01","tools":["mcp__browsentic__page_getPageInfo"],"model":"claude-sonnet-5"}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_start","message":{"usage":{"input_tokens":1200,"cache_read_input_tokens":7000,"cache_creation_input_tokens":0,"output_tokens":2}}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_start","index":0,"content_block":{"type":"tool_use","id":"toolu_01","name":"mcp__browsentic__page_getPageInfo"}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_delta","index":0,"delta":{"type":"input_json_delta","partial_json":"{}"}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_stop","index":0}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_delta","delta":{"stop_reason":"tool_use"},"usage":{"input_tokens":1200,"cache_read_input_tokens":7000,"cache_creation_input_tokens":0,"output_tokens":60}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_stop"}}
+{"type":"assistant","parent_tool_use_id":null,"message":{"content":[{"type":"tool_use","id":"toolu_01","name":"mcp__browsentic__page_getPageInfo","input":{}}],"usage":{"input_tokens":1200,"cache_read_input_tokens":7000,"cache_creation_input_tokens":0,"output_tokens":2}}}
+{"type":"user","parent_tool_use_id":null,"message":{"content":[{"type":"tool_result","tool_use_id":"toolu_01","content":"{\"document\":{\"title\":\"Pricing\"}}"}]}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_start","message":{"usage":{"input_tokens":900,"cache_read_input_tokens":8200,"cache_creation_input_tokens":0,"output_tokens":1}}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"It costs "}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"$12 a month."}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"content_block_stop","index":0}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input_tokens":900,"cache_read_input_tokens":8200,"cache_creation_input_tokens":0,"output_tokens":12}}}
+{"type":"stream_event","parent_tool_use_id":null,"event":{"type":"message_stop"}}
+{"type":"assistant","parent_tool_use_id":null,"message":{"content":[{"type":"text","text":"It costs $12 a month."}],"usage":{"input_tokens":900,"cache_read_input_tokens":8200,"cache_creation_input_tokens":0,"output_tokens":1}}}
+{"type":"result","subtype":"success","is_error":false,"stop_reason":"end_turn","result":"It costs $12 a month.","session_id":"5b0e8a52-3c71-4d7e-9f10-2a6c4b8d9e01","usage":{"input_tokens":2100,"cache_read_input_tokens":15200,"cache_creation_input_tokens":0,"output_tokens":72}}