Skip to content

fix(fork): merge upstream 19a2bad into patch/bots - #187

Merged
fireboltdude1357 merged 220 commits into
patch/botsfrom
fix/bots-upstream-19a2bad
Nov 3, 2026
Merged

fireboltdude1357 merged 220 commits into
patch/botsfrom
fix/bots-upstream-19a2bad

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 19a2bad in apps/server/src/mcp/OrchestratorMcpService.ts.

Upstream pingdotgg#29842 imports resolveProjectProviderInstanceEnabled from @t3tools/contracts, in the same spot where the patch imports botThreadId and threadOwnerBotName. 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) and vp test run on the 47 test files the patches touch (1090 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

tris203 and others added 30 commits November 3, 2026 01:31
…er a branch rename (pingdotgg#26125)

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>
… 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>
…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>
…e rebuild (pingdotgg#29114)

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>
saphid and others added 29 commits November 3, 2026 23:23
… 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>
… 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>
…iles (pingdotgg#29843)

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>
…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>
…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>
…pasted to check out (pingdotgg#29763)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/mcp/OrchestratorMcpService.ts
@fireboltdude1357
fireboltdude1357 merged commit 1425896 into patch/bots Nov 3, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.