Repository navigation
Sync/upstream wave1 20260928 - #11
Merged
Merged
Conversation
…#13736) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…th failed repacks (pingdotgg#13812) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…per (pingdotgg#13774) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#13767) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…le (pingdotgg#13765) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ngdotgg#13761) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ates per comparison (pingdotgg#13759) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g into memory (pingdotgg#13763) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ents, and idle polls (pingdotgg#13756) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#13339) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…irectory (pingdotgg#13695) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#13669) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…dotgg#13689) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ngdotgg#13697) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…he whole thread list (pingdotgg#13691) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…oading it twice (pingdotgg#13683) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#13693) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… offline (pingdotgg#13577) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#13558) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#13547) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…eads (pingdotgg#13551) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ss 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>
…mits (pingdotgg#12799) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…13523) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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>
…gg#13481) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#13480) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…dotgg#13389) Co-authored-by: javiergusart <42075376+javiergusart@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#13386) Co-authored-by: adeebahmad01 <52380344+adeebahmad01@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…dotgg#13365) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ops startup (pingdotgg#13469) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
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>
…otgg#13363) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…2613) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…3355) 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>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
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
github-actions
Bot
added
vouch:trusted
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed
Why
UI Changes
Checklist