Repository navigation
fix(fork): merge upstream 19a2bad into patch/bots - #187
Merged
Merged
Conversation
…er a branch rename (pingdotgg#26125) Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#27913) Co-authored-by: maria-rcks <maria@kuuro.net>
…ation (pingdotgg#19599) Co-authored-by: maria-rcks <maria@kuuro.net>
…27495) Co-authored-by: maria-rcks <maria@kuuro.net>
…Code (pingdotgg#27438) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
… 512 characters (pingdotgg#29167) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…B" (pingdotgg#29165) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…eeps its real remote (pingdotgg#29180) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ature (pingdotgg#29124) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… output (pingdotgg#29126) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nch lists (pingdotgg#29161) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…character cap (pingdotgg#29158) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29163) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…mit (pingdotgg#29103) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s into a rename (pingdotgg#29571) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29563) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e rebuild (pingdotgg#29114) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29575) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…in half (pingdotgg#29572) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29115) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…r approvals (pingdotgg#29567) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erged (pingdotgg#29595) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#29620) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… hidden tab behind (pingdotgg#29865) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#29748) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he sparse cone (pingdotgg#29880) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29765) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… diffs show as renames (pingdotgg#29774) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… completed (pingdotgg#29824) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#29779) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29796) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29786) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#29827) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…iles (pingdotgg#29843) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29828) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rs (pingdotgg#29823) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…model (pingdotgg#29789) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29826) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…phe (pingdotgg#29759) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29693) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…s a thread's worktree (pingdotgg#29645) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…moji (pingdotgg#29653) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… line (pingdotgg#29844) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29852) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erver cannot open (pingdotgg#29819) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… project turned off (pingdotgg#29842) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29804) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#30350) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#30404) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pasted to check out (pingdotgg#29763) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/server/src/mcp/OrchestratorMcpService.ts
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 19a2bad inapps/server/src/mcp/OrchestratorMcpService.ts.Upstream pingdotgg#29842 imports
resolveProjectProviderInstanceEnabledfrom@t3tools/contracts, in the same spot where the patch importsbotThreadIdandthreadOwnerBotName. I kept all three imports.On a scratch stack of upstream 19a2bad with all 23 patches and the fix branches for bots and launcher-skip-backup,
pnpm install --no-frozen-lockfile,vp run typecheck(40 of 40) andvp test runon the 47 test files the patches touch (1090 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code