Anant GoelandBen Brandt
5f2eba257d
`Thread::cumulative_token_usage` has been dead code since the agent2 rewrite: the field was added as a persistence placeholder in #36483 with `#[allow(unused)]`, and the accumulation logic was deleted along with agent1 in #40495. Since then, every saved thread persists `cumulative_token_usage` as `{}` in `threads.db`, breaking offline token-usage analysis and silently degrading eval reporting (`eval_cli` prefers this value and was always falling back to the last request's snapshot, undercounting multi-step turns). This PR restores the accumulation, mirroring the original agent1 implementation: - Providers emit multiple cumulative-per-request `UsageUpdate` snapshots during a single request, so naive `+=` would double-count. We track the previous snapshot for the in-flight request (`current_request_token_usage`) and accumulate only the delta, resetting the tracker each time a new completion request is built in `run_turn_internal`. This counts each request exactly once, including tool-call rounds and retries within a turn. - Unlike agent1, the delta uses per-field `saturating_sub` instead of the panicking `Sub` impl, so a provider reporting a smaller snapshot can't crash Zed. - Removed the `#[allow(unused)]`; the value now round-trips through `to_db`/`from_db`, surviving restarts and continuing to grow when a thread is reopened. - Added a `cumulative_token_usage()` accessor following the `latest_request_token_usage` convention. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A --------- Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking discussion)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.