fix(shared): keep the newest shared usage scan - #10315
Conversation
ApprovabilityVerdict: Approved at Macroscope's review found this PR approvable — This is a focused correction to shared usage deduplication: duplicate transcript directories now retain the newest scan while preserving deterministic behavior and existing non-duplicate totals. The accompanying regression test covers both input orders, with no schema, deployment, or configuration changes. You can add or adjust custom eligibility rules. Learn more. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (2)
Included review availability: Your plan provides up to 10 included reviews per hour; 9 remain after this review. 📝 WalkthroughWalkthroughThe merge logic now assigns shared transcript sources to the environment with the newest ChangesUsage merge selection
Priority: ⬇️ Low Estimated code review effort: 2 (Simple) | ~10 minutes Change: Bug fix Suggested reviewers: Merge Risk: ⚪ Minimal · up to The usage winner-selection change is supported by order-independent regression coverage and is mergeable. 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
## What's Changed * fix(mobile): keep screen awake during dictation by @juliusmarminge in pingdotgg/t3code#12227 * feat(mobile): add favorites to model picker by @juliusmarminge in pingdotgg/t3code#12231 * fix(desktop): keep preview picking active across subframe navigation by @Lucenx9 in pingdotgg/t3code#9741 * fix(shared): keep the newest shared usage scan by @yashranaway in pingdotgg/t3code#10315 **Full Changelog**: pingdotgg/t3code@v0.0.43-nightly.20260917.1851...v0.0.43-nightly.20260917.1866 Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.43-nightly.20260917.1866
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Merges `pingdotgg/t3code` `6d1d549441..9946541` (50 commits) into the fork. Landed 304 files against 303 in the upstream range — the extra one is `docs/fork/inventory.json`. Fork delta is 777 files, unchanged from the last merge. Everything upstream changed landed. Six conflicts, each resolved with the verdict `preflight.mjs` printed; five were a single hunk. Details and reasoning are in [the merge tracker](docs/fork/upstream-merge-log.md). The two worth reading here: - **`ChatView.tsx`** — pingdotgg#12306 added `activeWorktreePath !== null` to the "Revert files too" button, on the line the fork gates with `FEATURES.checkpointFileRestore`. Kept both as a conjunction: upstream's condition is about a shared workspace, the fork's is about what Moatless serves, and they answer different questions. - **`FilePreviewPanel.tsx`** (the one `decide`) — pingdotgg#10909 restructured the file read so a folder is knowable as a folder, adding `isDirectory` / `previewPath`. Took that whole and re-stated the fork's `onRetargetFile` effect on top. `apps/web/src/routeTree.gen.ts` was regenerated rather than hand-resolved. One judgement call: pingdotgg#11598's new `/settings/storage` page is deliberately **not** given a `FEATURES` gate. It self-gates on two new capability booleans Moatless does not report and renders an explanatory notice, so a fork flag would duplicate a decision the wire already makes — and would have to be deleted again the day the capability is reported. ## Usable as-is - Diff files open from a right-click context menu (pingdotgg#11842). - Sidebar filtering from the thread menu (pingdotgg#8719). - Command palette matches thread IDs (pingdotgg#11185). - Mobile settings are easier to navigate and scope (pingdotgg#12272); favorites in the mobile model picker (pingdotgg#12231). - Thoughts collapse within tool groups (pingdotgg#12302); thoughts and failed tool calls stay in one activity row (pingdotgg#12270). - Folder links from chat open the file tree instead of a broken preview (pingdotgg#10909). - Chat no longer jumps when the scroll-to-end pill mounts (pingdotgg#12317); numbered jumps no longer steal browser tabs (pingdotgg#12315); composer banners stay compact (pingdotgg#12166). - A large batch of shared-component refactors across web and mobile (pingdotgg#12353–pingdotgg#12371). ## Unsupported in Moatless / needs implementation - **Pull request files marked as viewed** (pingdotgg#7721) — adds `pullRequests.filesViewed` and `pullRequests.setFilesViewed`, which record which files a reviewer has checked off, persisted server-side. Both declare `PullRequestRpcError` and so arrived already refusing; `unsupported-methods.mjs` reported ADD 0 / DROP 0 as a result. Closes with the rest of the `pullRequests.*` group, not separately. - **Multi-model threads in separate worktrees** (pingdotgg#12179) — one prompt starts a thread per selected model, each in its own worktree. The model picker is the same `worktree` send-mode control `FEATURES.worktreeSelection` already gates, so the fan-out is simply not offered. The same commit adds a `requiredWorktreeBootstrap` capability the backend does not report. - **Automatic storage cleanup settings** (pingdotgg#11598) — the `/settings/storage` page, gated by the backend's absent `storageCleanup` and `projectWorktreeCleanup` capabilities. Needs the sweeper below before the page means anything. - **Command palette entries for the pull requests and usage pages** (pingdotgg#12211) — the PR half is covered by `FEATURES.pullRequestSurface`. ## Backend behavior to consider reproducing in Moatless Eight items, recorded in full in [the gaps register](docs/fork/gaps.md) under _Runtime fixes upstream made to its own server_. Five are on the checkpoint and usage paths the previous merge already opened: - **Reject a file rewind on a shared or nested-owner cwd** (pingdotgg#12306, `CheckpointReactor.ts`) — a checkpoint holds the whole checkout, so restoring one erases a sibling's uncommitted work. Moatless isolates by sandbox, but a workspace with nested repositories has the same overlap inside one task. - **Capture a checkpoint when the baseline lookup fails** (pingdotgg#12307) — the case that silently leaves a turn with no restore point. - **Move the file-search refresh off the checkpoint path** (pingdotgg#12308) — it extended every capture by an index walk. - **Survive an empty nested repository, and clear a stale index lock** (pingdotgg#12181, `GitVcsDriver.ts`) — git cannot stage an embedded repository until it has a commit. The lock half matters most here: forced termination is the normal end of a sandboxed task. - **Bound the provider event log before serialization** (pingdotgg#12305, `EventNdjsonLogger.ts`) — otherwise it grows proportionally to tokens streamed. - **Keep usage totals across transcript cleanup** (pingdotgg#12304, `UsageService.ts`) and **resolve a contested fingerprint to the newest scan** (pingdotgg#10315, `usageMerge.ts`). Moatless serves `server.getUsageSummary` itself. - **Pass provider image attachments by path** (pingdotgg#11050, `CodexAdapter.ts`) — the turn/start request stops scaling with attachment size. A sandbox adds a hop, so an oversized request costs more there. - **Sweep stale worktrees and transcripts against retention rules** (pingdotgg#11598, `storageCleanup.ts`, with a workspace lease so two servers cannot sweep the same directory). A sandbox per task bounds the worktree half; transcripts outlive the sandbox. ## Verification `verify.mjs` — all 9 checks green on the first full pass, tests included (333 test files, 5071 tests). No flaky retries and no caveats. Contract drift: ADD 0 / DROP 0, so `packages/contracts/src/rpc.ts` needed no change. The `orchestration-decode-boilerplate` duplicate-add exception went stale — the colliding line is gone — and was deleted from `inventory.json` in this merge. Owned-concern sweep: the three new `apps/mobile/src/features/connection/` files are false positives, all upstream extracting shared mobile components out of files it already owned, with no fork delta in any of them. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/c83db5aa-7c47-47c6-93f4-fe2f6f9f548e
What Changed
Choose the most recently read usage summary for each shared transcript directory. Use environment IDs to break ties so selection remains stable.
Why
When two environments read the same directory, the merge always keeps the environment with the smallest ID. An older cached response can therefore hide tokens and costs present in a newer response, including while the older environment is failing to refresh.
The shared merge serves web, desktop, and mobile.
Testing
usageMerge.test.tspasses, 13/13.Checklist
Model: GPT-6 Astra
Harness: T3 code
Note
Fix
claimSourcesto keep newest shared usage scan byreadAtWhen environments report the same physical transcript directory,
mergeUsagenow keeps the provider buckets from the environment with the newest summaryreadAttime instead of using environment-id order.readAt, with environment id as tie-breaker; invalid or absent dates fall back to zero for ordering.readAtdates order as zero and may lose ownership to any environment with a valid date.Macroscope summarized 78eded7.
Summary by CodeRabbit