Repository navigation
fix(fork): merge upstream fcb20e4 into patch/cache-expiry-compaction - #58
Merged
fireboltdude1357 merged 32 commits intoOct 21, 2026
Conversation
…ter (pingdotgg#19964) (pingdotgg#22395) Co-authored-by: Julius Marminge <julius@marminge.se>
…tgg#22253) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22187) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22390) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ap (pingdotgg#22408) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#20812) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Upstream's steer test fix (pingdotgg#22533) and the fork's empty CLAUDE_CONFIG_DIR for the same test added lines at the same spot. Keep both. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fireboltdude1357
merged commit Oct 21, 2026
80604b0
into
patch/cache-expiry-compaction
1 check passed
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
9 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.
The fork's nightly build fails because this patch conflicts with upstream commit fcb20e4.
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts: in the steer backgrounding test, upstream's test(server): Claude steer test no longer hangs for 120s under CI load pingdotgg/t3code#22533 added alateAnswerdeferred right where the patch adds an empty tempCLAUDE_CONFIG_DIR. The two changes are independent, so I kept both. The patch's comment about simulated clock ticks still holds, because upstream's newawaitSteerTimeoutalso ticks up to 100 times.Verification:
pnpm install --no-frozen-lockfile: done.tsc --noEmitinapps/server: 0 errors.vp test runinapps/serverforClaudeAdapterV2.test.ts,CacheExpiryCompactionWorker.test.ts,ProjectionStore.test.tsandProviderTurnControlService.test.ts: 403 passed.patch/release,patch/voice,patch/home,patch/bots, this branch andfix/mobile-launch-crash-upstream-fcb20e4merge with no conflicts.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code