fix(usage): identify client version mismatches - #8208
Conversation
|
Navigate logical layers of code changes, visualize relationships, and explore their blast radius. No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository: pingdotgg/t3code/.coderabbit.yaml Review profile: CHILL Plan: Advanced Run ID: 📥 CommitsReviewing files that changed from the base of the PR and between 1c6518b404fe2a0ee034dc2fe66273ab241adda3 and 6ef11c7. 📒 Files selected for processing (1)
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review. 📝 WalkthroughWalkthroughUsage merging now records structured contract mismatches with direction and contract version. Web and mobile usage views use these records to report whether the server or client is behind. ChangesUsage contract mismatch reporting
Priority: ⬆️ High Estimated code review effort: 3 (Moderate) | ~20 minutes Change: Bug fix · Severity of issue fixed: High Suggested reviewers: Merge Risk: ⚪ Minimal · up to The web and mobile views consistently identify which side has the incompatible usage contract, while incompatible environments remain excluded from totals. No merge-blocking behavior is established. Security Architecture ReviewSecurity architecture risk: 🔵 Low · up to Incompatible usage data remains excluded from totals. The change improves the explanation shown to users without showing a new path to change settings or access data. Review of broader access controls remains outside the available evidence. Retained concerns Security review detailsSecurity Blast Radius
Trust Boundaries and Controls
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
ApprovabilityVerdict: Approved at Macroscope's review found this PR approvable — This is a focused usage bug fix that preserves existing totals and compatibility behavior while distinguishing older servers from older clients in web and mobile messaging. The shared metadata change is localized and covered by tests, with no deployment, security, billing, default, or static-analysis changes. You can add or adjust custom eligibility rules. Learn more. |
cf90780 to
213e2bd
Compare
Dismissing prior approval to re-evaluate 213e2bd
4cbd555 to
4ec785b
Compare
Dismissing prior approval to re-evaluate 4ec785b
4ec785b to
3b86bd7
Compare
Bugbot is paused — on-demand spend limit reachedBugbot uses usage-based billing for this team and has hit its on-demand spend limit. A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue. |
Dismissing prior approval to re-evaluate 3b86bd7
89a2088 to
1c6518b
Compare
1c6518b to
6ef11c7
Compare
Brings in 55 upstream commits, including keyboard navigation for Usage (pingdotgg#10158), forward-compatible usage summaries (pingdotgg#10076), and usage contract mismatch reporting (pingdotgg#8208). Merged without conflicts; the only files both sides changed were ClaudeAdapter.test.ts (upstream added a session test) and docs/user/usage.md (upstream added a keyboard shortcuts section and a provider-support note), and both auto-merged. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
## What's Changed * feat(observability): write a server heap snapshot on SIGUSR2 by @t3dotgg in pingdotgg/t3code#13694 * perf(server): shutdown no longer rewrites every stopped session row by @t3dotgg in pingdotgg/t3code#13688 * perf(server): build the thread list snapshot without decoding it twice by @t3dotgg in pingdotgg/t3code#13693 * fix(client): slow servers finish loading the thread list instead of loading it twice by @t3dotgg in pingdotgg/t3code#13683 * perf(web): hidden terminal drawers no longer keep full thread history in memory by @t3dotgg in pingdotgg/t3code#13686 * perf(server): per-thread settlement and PR checks no longer rebuild the whole thread list by @t3dotgg in pingdotgg/t3code#13691 * fix(mobile): running threads open at the latest message by @AKolenda in pingdotgg/t3code#13530 * feat(observability): record event loop stalls in the server trace by @t3dotgg in pingdotgg/t3code#13697 * perf(server): stop re-running git for every project each minute by @t3dotgg in pingdotgg/t3code#13689 * fix(usage): hide the Cursor keychain prompt when Cursor isn't set up by @Gigioxx in pingdotgg/t3code#13714 * feat(web): add chat width setting for wide screens by @otavio in pingdotgg/t3code#11594 * fix(opencode): accept v2 serve ready line when spawning server by @shirishpothi in pingdotgg/t3code#13651 * fix(editors): stop treating the agy CLI as the Antigravity IDE by @ishaanko in pingdotgg/t3code#7079 * fix(web): make the empty workspace draggable on desktop by @otavio in pingdotgg/t3code#13713 * fix(server): installed editors no longer vanish when discovery is slow by @bfowler in pingdotgg/t3code#13669 * fix(git): exclude SSH ports from provider URLs by @GaMeRaM in pingdotgg/t3code#12537 * fix(web): Mod+B bolds on non-Latin layouts by @ValeraZSD in pingdotgg/t3code#13409 * fix(server): prune expired replay-protection files from the secrets directory by @t3dotgg in pingdotgg/t3code#13695 * fix(web): terminal links drop a trailing colon by @ValeraZSD in pingdotgg/t3code#13408 * fix(server): bump node-pty to 1.2.0-beta.15 for linux-arm64 prebuild by @Ephraim-9 in pingdotgg/t3code#13748 * Show a focus ring on sidebar thread and draft rows by @ryanilano in pingdotgg/t3code#13344 * fix(mobile): keep composer within folded screen after resume by @PixPMusic in pingdotgg/t3code#13310 * fix(server): let OpenCode generate session titles by @macodev00 in pingdotgg/t3code#13368 * fix(server): let Antigravity inspect unsupported files by path by @Bil0000 in pingdotgg/t3code#13339 * fix(mobile): link URLs with ports and single-label hosts by @Yash-Singh1 in pingdotgg/t3code#13795 * feat(web): add keyboard navigation for usage by @tris203 in pingdotgg/t3code#10158 * perf(observability): stop writing empty spans on spawns, projected events, and idle polls by @t3dotgg in pingdotgg/t3code#13756 * perf(server): opening Diagnostics no longer loads the whole trace ring into memory by @t3dotgg in pingdotgg/t3code#13763 * perf(clients): sort projects and settled threads without re-parsing dates per comparison by @t3dotgg in pingdotgg/t3code#13759 * fix(observability): the renderer trace proxy stops tracing itself by @t3dotgg in pingdotgg/t3code#13761 * perf(server): background sweeps only read threads that can still settle by @t3dotgg in pingdotgg/t3code#13765 * perf(clients): saving the thread list cache no longer freezes the UI by @t3dotgg in pingdotgg/t3code#13767 * perf(server): cut idle wakeups from the Connect relay and session reaper by @t3dotgg in pingdotgg/t3code#13774 * fix(mobile): keep trailing underscores and tildes in autolinked URLs by @Yash-Singh1 in pingdotgg/t3code#13807 * fix(web): queued messages send while their thread is not open by @t3dotgg in pingdotgg/t3code#13764 * fix(server): background git status fetches no longer fill the disk with failed repacks by @t3dotgg in pingdotgg/t3code#13812 * fix(mobile): thread list shows the pull request icon instead of # by @flamboh in pingdotgg/t3code#13742 * fix(accessibility): correct control announcements and sidebar traversal by @blinding-pixels in pingdotgg/t3code#13491 * fix(usage): tolerate newer provider variants by @tris203 in pingdotgg/t3code#10076 * fix(usage): omit Cursor warning when no login is saved by @tris203 in pingdotgg/t3code#13820 * fix(usage): identify client version mismatches by @tris203 in pingdotgg/t3code#8208 * fix(web): stop mistaking offline servers for updates by @tris203 in pingdotgg/t3code#13083 * test(usage): assert contract mismatch details by @Yash-Singh1 in pingdotgg/t3code#13861 * fix(build): validate Linux node-pty prebuilds in Windows artifacts by @Yash-Singh1 in pingdotgg/t3code#13867 ## New Contributors * @otavio made their first contribution in pingdotgg/t3code#11594 * @shirishpothi made their first contribution in pingdotgg/t3code#13651 * @bfowler made their first contribution in pingdotgg/t3code#13669 * @GaMeRaM made their first contribution in pingdotgg/t3code#12537 * @ValeraZSD made their first contribution in pingdotgg/t3code#13409 * @Ephraim-9 made their first contribution in pingdotgg/t3code#13748 * @ryanilano made their first contribution in pingdotgg/t3code#13344 * @macodev00 made their first contribution in pingdotgg/t3code#13368 * @blinding-pixels made their first contribution in pingdotgg/t3code#13491 **Full Changelog**: pingdotgg/t3code@v0.0.43-nightly.20260926.2282...v0.0.43-nightly.20260926.2318 Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.43-nightly.20260926.2318
Merges `pingdotgg/t3code` `main` into the fork: `eeea71a88` → `ab099178a` (35 commits). Branched from `main`; no open merge PR to stack on. ## Merge - **Conflicts:** only `pnpm-lock.yaml`. I took upstream's copy and re-ran `install.mjs`, which put the fork's own entries back (`moatless-api`, `mermaid`). - **Silent merges:** git merged nine other files both sides had changed without stopping (`ChatView.tsx`, `Sidebar.tsx`, `MessagesTimeline.tsx`, `ui/sidebar.tsx`, `__root.tsx`, `settings.tsx`, `entities.ts`, `apps/web/package.json`, `GitVcsDriverCore.test.ts`). The duplicate-line and dropped-side checks found nothing, and every delta guard held, including `FEATURES.serverUpdateBanner` after pingdotgg#13083 rewrote the offline banner code. - **File counts:** 126 files landed, exactly the 126 upstream changed. The fork delta is 756 files, unchanged. - **New upstream files in fork-owned areas:** three matched the sweep. `auth/replayMarkers.ts` and its test are upstream's own server auth; `ConnectionFormField.test.tsx` is a mobile test. Neither touches a fork-owned surface. - **`UnsupportedMethodError` union:** no methods to add or drop. ## Verification `verify.mjs` (full run) passed all 10 checks: duplicate-adds, tripwires, resolution-check, unsupported-methods, lockfile, fmt, lint, typecheck, build and test. ## Usable as-is - Queued messages now send while their thread is not open (`QueuedMessageSender`, `sendQueuedMessage.ts`, pingdotgg#13764). - Keyboard navigation for Usage, plus `useNavigateBack` (pingdotgg#10158). - Usage identifies which side has the version mismatch (pingdotgg#8208) and tolerates newer provider variants (pingdotgg#10076). - Accessibility fixes: control announcements, sidebar traversal, focus rings (pingdotgg#13491, pingdotgg#13344). - Other web fixes: reasoning-arrow alignment, tooltip resize, Mod+B on non-Latin keyboard layouts, terminal links dropping a trailing colon. - Faster project and thread sorting, and saving the thread-list cache no longer freezes the UI (pingdotgg#13759, pingdotgg#13767). - Mobile link and composer fixes. ## Unsupported in Moatless / needs implementation - Nothing new. The upstream changes in this range to editor discovery (pingdotgg#13669), Cursor Keychain prompts (pingdotgg#13870) and device tools (pingdotgg#13908) sit behind surfaces the fork already gates (`openInEditor`, `providerConfiguration`, `deviceHub`). ## Backend behavior to consider reproducing in Moatless Added to `docs/fork/gaps.md` under *Runtime fixes upstream made to its own server*: - **pingdotgg#13812:** the background git status fetch passes `--no-auto-gc`. Without it, a failing auto gc leaves a full-size `tmp_pack_*` behind on every fetch and can fill the disk. - **pingdotgg#13765:** the settlement and PR sweeps read only threads that can still settle. - **pingdotgg#13774:** the relay and session reaper no longer wake up on idle sessions. Also relevant but not recorded as gaps: pingdotgg#13736 (`OTEL_*_EXPORTER=none` honoured per signal) and pingdotgg#13695 (expired replay-protection files pruned from the secrets directory). ## Caveat Running `vp install` again after committing changes two `type-fest` entries in the lockfile (5.7.0 → 5.10.0). I kept the committed re-derived lockfile, which passes the `lockfile` check. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/06f86e30-4ca2-4771-bf22-feb0699349ff
* test(relay): remove constant-restating database mode test (pingdotgg#13932) * fix(server): let agents use simctl and adb alongside device tools (pingdotgg#13908) * feat(observability): honor OTEL_*_EXPORTER=none per signal (pingdotgg#13736) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> * fix(clients): hide duplicate Cursor Keychain prompts (pingdotgg#13870) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> * fix(build): validate Linux node-pty prebuilds in Windows artifacts (pingdotgg#13867) * test(usage): assert contract mismatch details (pingdotgg#13861) * fix(usage): identify client version mismatches (pingdotgg#8208) * fix(usage): omit Cursor warning when no login is saved (pingdotgg#13820) * fix(usage): tolerate newer provider variants (pingdotgg#10076) * fix(server): background git status fetches no longer fill the disk with failed repacks (pingdotgg#13812) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): cut idle wakeups from the Connect relay and session reaper (pingdotgg#13774) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(clients): saving the thread list cache no longer freezes the UI (pingdotgg#13767) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): background sweeps only read threads that can still settle (pingdotgg#13765) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(observability): the renderer trace proxy stops tracing itself (pingdotgg#13761) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(clients): sort projects and settled threads without re-parsing dates per comparison (pingdotgg#13759) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): opening Diagnostics no longer loads the whole trace ring into memory (pingdotgg#13763) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(observability): stop writing empty spans on spawns, projected events, and idle polls (pingdotgg#13756) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): let Antigravity inspect unsupported files by path (pingdotgg#13339) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * Show a focus ring on sidebar thread and draft rows (pingdotgg#13344) * fix(server): bump node-pty to 1.2.0-beta.15 for linux-arm64 prebuild (pingdotgg#13748) * fix(server): prune expired replay-protection files from the secrets directory (pingdotgg#13695) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): installed editors no longer vanish when discovery is slow (pingdotgg#13669) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(editors): stop treating the agy CLI as the Antigravity IDE (pingdotgg#7079) * fix(opencode): accept v2 serve ready line when spawning server (pingdotgg#13651) * fix(usage): hide the Cursor keychain prompt when Cursor isn't set up (pingdotgg#13714) * perf(server): stop re-running git for every project each minute (pingdotgg#13689) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(observability): record event loop stalls in the server trace (pingdotgg#13697) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): per-thread settlement and PR checks no longer rebuild the whole thread list (pingdotgg#13691) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(client): slow servers finish loading the thread list instead of loading it twice (pingdotgg#13683) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): build the thread list snapshot without decoding it twice (pingdotgg#13693) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(observability): write a server heap snapshot on SIGUSR2 (pingdotgg#13694) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): pull request sync reads only threads with linked pull requests (pingdotgg#13704) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(cli): summarize the server trace file from the command line (pingdotgg#13698) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): the SQLite WAL file shrinks back after large writes (pingdotgg#13684) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(cli): t3 triage points agents at log files that exist (pingdotgg#13685) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(observability): name the command on subprocess spans (pingdotgg#13701) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(server): stop remapping every thread on each thread event (pingdotgg#13720) Co-authored-by: Claude <noreply@anthropic.com> * refactor(observability): name each service after its application (pingdotgg#13699) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> * fix(usage): price Cursor cache savings by base model (pingdotgg#13731) * perf(server): avoid rereading unchanged files in review previews (pingdotgg#13395) * fix(server): load Cursor keyring with createRequire (pingdotgg#13678) * fix(terminal): settling a thread closes its idle shells (pingdotgg#13673) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(observability): honor the standard OTLP endpoint, headers, and protocol variables (pingdotgg#13492) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> * fix(sqlite): retry failed statement preparations (pingdotgg#10584) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> * feat(usage): read cursor, opencode, and antigravity history (pingdotgg#10409) Co-authored-by: Yash Singh <saiansh2525@gmail.com> * fix(usage): price Claude fast-mode requests at the fast rate (pingdotgg#13599) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(dev): one t3.json setup action that works on every OS (pingdotgg#13589) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(release): ship a Linux .deb that updates itself (pingdotgg#13575) The Linux release build now also makes a .deb in the same electron-builder run as the AppImage, and the release publishes it. electron-builder lists it in latest-linux.yml and writes resources/package-type into it, so the app updates a .deb install through electron-updater, which installs the new .deb with dpkg. The desktop updater now allows that path. The .deb uses xz in threaded mode (XZ_DEFAULTS=-T0): 113 MB in place of 141 MB with gzip. The Linux arm64 release job moves to a 16-vCPU Blacksmith arm64 runner. The download page, README, install guide, and release docs list the .deb. Based on community work in pingdotgg#4071, pingdotgg#5139, pingdotgg#4900, and pingdotgg#4887. Co-authored-by: chukfinley <chuk@chuk.dev> Co-authored-by: Primož Ajdišek <bigpod@bigpod.si> Co-authored-by: benthecarman <benthecarman@live.com> Co-authored-by: NaveDanan <nave0712@gmail.com> Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(clients): a preview app no longer knocks the desktop's own server offline (pingdotgg#13577) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(mcp): preview errors tell agents what to do instead (pingdotgg#13559) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(mcp): preview snapshots fit in the agent's tool output again (pingdotgg#13558) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): newer Codex models get T3 Code's instructions again (pingdotgg#13547) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(clients): sync status no longer flickers when opening running threads (pingdotgg#13551) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * ci(relay): add a forced manual relay deploy (pingdotgg#13550) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): report the Grok account email so usage limits merge across environments (pingdotgg#12588) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com> * fix(server): Grok accounts with no usage yet no longer vanish from Limits (pingdotgg#12799) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(relay): export tunnel cleanup counters to Axiom (pingdotgg#13528) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * feat(grok): offer one-click updates through `grok update` (pingdotgg#13523) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(connect): remove tunnels after hosts go offline (pingdotgg#9386) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> * feat(codex): require Codex 0.156 and regenerate its protocol (pingdotgg#13481) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(codex): the protocol generator runs again on Effect rc.115 (pingdotgg#13480) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(antigravity): keep Windows runtime unpacking under MAX_PATH (pingdotgg#13389) Co-authored-by: javiergusart <42075376+javiergusart@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(acp): keep one answer when a running tool reports progress (pingdotgg#13386) Co-authored-by: adeebahmad01 <52380344+adeebahmad01@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(marketing): use the official OpenCode and Antigravity logos (pingdotgg#13365) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> * fix(observability): a malformed OTEL_RESOURCE_ATTRIBUTES no longer stops startup (pingdotgg#13469) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> * feat(server): show and redeem Claude banked resets (pingdotgg#13118) Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> * chore(ci): use GPT 6 Sol Max for check agents (pingdotgg#13473) * fix(server): keep Codex's reset answer when the re-probe fails (pingdotgg#13363) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(server): preserve racy edits in review diff previews (pingdotgg#12613) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> * feat(observability): honor the OpenTelemetry kill switch (pingdotgg#13355) Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> * fix(shared): preserve final quoted empty CSV records (pingdotgg#11425) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> * fix(server): stop replaying old agent alerts on restart (pingdotgg#13340) * fix(providers): restore compatibility ranges for every harness (pingdotgg#13328) * fix(ci): shard release tests like pull request CI (pingdotgg#13321) * fix(sync): resolve wave1 test/build fallout from upstream rebase After rebase of 78 upstream commits (78 picks, 70 drops) onto c37294d, the following merge-conflict artefacts remained because the rebase strategy kept fork-exclusive V2/Pi source while picking upstream implementations of shared files: - packages/shared/src/usageMerge.test.ts: removed orphan nested it() declaration from commit 9, removed dangling expect+}) from rebase residue, and renamed staleEnvironments -> contractMismatches to match the upstream field that commit 9/11/13 introduced (the fork exclusively uses the contractMismatches field name). - apps/server/src/usage/usagePricing.ts: collapsed the doubly-nested conflict markers left by commits 61 and 75 in cacheSavingsUsd into the upstream clause that resolves to rateModel ?? record.model. - apps/server/src/provider/Drivers/CursorDriver.ts: replaced with the upstream main implementation so the file matches the upstream auth/modelDiscovery shape; the fork V2 Cursor path was already covered by PiAdapterV2.test.ts (61/61 green) and is not touched. - apps/server/src/provider/Layers/CursorProvider.test.ts: restored the fork-main version (252 lines) because the upstream version exercises a CursorProvider path that this fork does not implement (fork ships only the V2 Pi adapter and the legacy Cursor provider layer tests); 7/7 green. Wave1 critical-point verification (vp test): packages/shared/src/usageMerge.test.ts 30/30 apps/server/src/orchestration-v2/Adapters/PiAdapterV2.test.ts 61/61 apps/server/src/usage/UsageService.test.ts 14/14 apps/server/src/provider/Layers/CursorProvider.test.ts 7/7 apps/server/src/provider/cursorCredentialStore.test.ts 1/1 packages/shared/src/usageFormat.test.ts 9/9 packages/client-runtime/src/state/usage.test.ts 9/9 apps/server/src/serverLogger.test.ts 6/6 137/137 --------- Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Tristan Knight <admin@snappeh.com> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Bilal Bakr <62337003+Bil0000@users.noreply.github.com> Co-authored-by: Ryan Ilano <ryanilano@users.noreply.github.com> Co-authored-by: Ephraim <ephraim39hr14m@gmail.com> Co-authored-by: Bob Fowler <bob@rjf.ca> Co-authored-by: Ishaan Kothari <ishaanko.mail@gmail.com> Co-authored-by: Shirish Pothi <183252392+shirishpothi@users.noreply.github.com> Co-authored-by: Guillermo Casanova <75276669+Gigioxx@users.noreply.github.com> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> Co-authored-by: Aditya Garud <153842990+yashranaway@users.noreply.github.com> Co-authored-by: maria <maria@kuuro.net> Co-authored-by: chukfinley <chuk@chuk.dev> Co-authored-by: Primož Ajdišek <bigpod@bigpod.si> Co-authored-by: benthecarman <benthecarman@live.com> Co-authored-by: NaveDanan <nave0712@gmail.com> Co-authored-by: Jake Leventhal <jakeleventhal@me.com> Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: javiergusart <42075376+javiergusart@users.noreply.github.com> Co-authored-by: adeebahmad01 <52380344+adeebahmad01@users.noreply.github.com> Co-authored-by: oliver <97427849+flamboh@users.noreply.github.com> Co-authored-by: Simone <lucenz@proton.me> Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Conflicts resolved keep-both: - usage (web + mobile): fork coverage notices / cost-omitted / partial totals kept; stale-environment exclusion moved onto upstream's contractMismatches (pingdotgg#8208) so client-behind is reported too - usageTranscriptReader: upstream's streaming reader (pingdotgg#13650) replaces the fork's skip-oversized-line reader; fork provider type kept - ClaudeAdapter Stop: fork's stop-live-tasks first, then upstream's settleInterruptedTurn (pingdotgg#13999) instead of the fork's bounded interrupt - Connect account menu: upstream's T3_CONNECT_ACCOUNT_PAGES, fork's relay gating + provider label Follow-ups: Cursor export source only when the Cursor driver is on (matches pingdotgg#13820's no-warning rule), Linux desktop icon test uses the fork's t3code.desktop name, fork recordCount in the streaming test, and the fork live-task interrupt test advances past Claude's abort grace. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Fixes #8145
Problem
When a connected environment reports a newer usage contract than the client expects, the usage page excludes its data but incorrectly says that the environment runs an older server version.
Changes
Screenshots
Before:

After:

Verification
pnpm exec vp test run packages/shared/src/usageMerge.test.tspnpm exec vp lint apps/mobile/src/features/usage/UsageRouteScreen.tsx apps/web/src/components/usage/UsagePage.tsx packages/shared/src/usageFormat.ts packages/shared/src/usageMerge.test.ts packages/shared/src/usageMerge.tspnpm --filter @t3tools/shared typecheckpnpm --filter @t3tools/web typecheckpnpm --filter @t3tools/mobile typecheckBuilt with GPT-5.6 using the Codex harness in T3 Code.
Note
Low Risk
Localized usage merge/UI messaging change with tests; breaking rename of
staleEnvironmentsis fully updated in-repo.Overview
Fixes incorrect usage coverage copy when a server reports a newer usage contract than the client expects: those environments were still excluded from totals, but the UI always blamed an older server.
mergeUsagenow emitscontractMismatches(replacingstaleEnvironments) withserverBehindvsclientBehindand the reported contract version. Incompatible environments are still dropped from aggregation.Shared
formatUsageContractMismatchcentralizes the two user-facing messages. Web and mobile coverage notices and the web environment filter consumecontractMismatchesand show the direction-specific text. Tests cover both mismatch directions.Reviewed by Cursor Bugbot for commit 4ec785bdbb6acb7fd7b0a5f26cc2116eae1cd136. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Replace stale environment IDs with
UsageContractMismatchrecords inmergeUsagemergeUsagefunction now recordsserver-behindorclient-behinddirection and the reported version for incompatible environments instead of just listing stale environment IDs.formatUsageContractMismatchformatter.MergedUsagereplaces the stale environment ID collection withcontractMismatches; consumers must handle the newUsageContractMismatchtype instead of string IDs.Macroscope summarized 4ec785b.
Summary by CodeRabbit