Repository navigation
fix(fork): merge upstream e313a12 into patch/bots - #199
Merged
Merged
Conversation
Add 8 px edge padding to usage breakdown tables shared by Cost and Tokens. Align thread status text and actions to a common baseline while keeping icons centered. Validated with check:changed, CI, usage-table before/after browser captures, and actual ThreadNow component captures at 100% and 91% CSS zoom. No behavior or calculation changes. Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…reenContent (pingdotgg#30500) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#30256) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…f chat (pingdotgg#30257) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#31016) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#31028) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#30501) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#30523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…intSigner (pingdotgg#30529) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…bile (pingdotgg#30540) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#31071) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he git-read timeout (pingdotgg#30554) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#31104) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#30900) Co-authored-by: Victor Romo <vic@Victors-MacBook-Pro.local> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Seth Dixon <333797056+seth-dixon@users.noreply.github.com>
…ingdotgg#31111) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ord (pingdotgg#30308) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…wser limit is full (pingdotgg#24186) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#26806) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#30929) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#30744) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…0085) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#28622) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29044) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ders (pingdotgg#24904) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…0421) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
…gg#28928) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#30704) Co-authored-by: Maxime Cathala <84846651+mcathala@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…onnection in a loop (pingdotgg#23758) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… it (pingdotgg#24946) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…7935) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#26464) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Albert Li <albertli_042@hotmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wake (pingdotgg#28204) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29838) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25341) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ironment disconnects (pingdotgg#31269) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#31218) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/web/src/components/Sidebar.tsx
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
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.
The fork's nightly build fails because
patch/botsconflicts with upstream e313a12 inapps/web/src/components/Sidebar.tsx.Upstream pingdotgg#31269 reverts pingdotgg#26195, so working threads stay in the Working shelf when their environment disconnects. The sidebar goes back to checking
workingShelfEnabledandisWorkingdirectly instead of callingbelongsInSidebarWorkingShelf. The patch sends bot threads to the Bots shelf before that check. I kept upstream's reverted check and put the patch's bot check in front of it.On a scratch stack of upstream e313a12 with all 23 patches and this branch,
pnpm install --no-frozen-lockfile,vp run typecheck(40 of 40) andvp test runon the 47 test files the patches touch (1118 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code