## Problem/motivation Follow-up to: #3586202 _**Verify this is still an issue and the solution approach before proceeding**_ _**Assess if this should be pre-RC1 or post-1.0 and move for the latter**_ `AiContextUsageTracker::recordUsage()` performs per-context entity query/load/save work. `attachEntity()` and `recordToolUsed()` can add additional loads and saves for all usage rows tied to a runner. This runs on the agent prompt path when tracking is enabled. Treat this as RC1 work if usage tracking is expected to be enabled in production by default or used heavily during RC1. ## Solution Recommended options: - Keep usage tracking disabled by default and document it as lightweight observability until a fuller AI observability layer replaces it. - Batch queries for existing usage rows. - Add storage-level indexes or explicit upsert-style behavior where supported. - Avoid repeated runner-wide loads/saves for every tool event when possible. ## Tasks - Check against other issues to make sure it wasn't separately reported - Verify this is still an issue before proceeding - Verify the solution approach before proceeding - Check against other issues to make sure it wasn't separately reported - Update code - Review and test ## AI usage disclosures - [x] AI Assisted Issue - [ ] AI Assisted Code - [ ] AI Generated Code