Skip to content

fix(fork): merge upstream 5099695 into patch/bots - #231

Merged
fireboltdude1357 merged 348 commits into
patch/botsfrom
fix/bots-upstream-5099695
Nov 11, 2026
Merged

fireboltdude1357 merged 348 commits into
patch/botsfrom
fix/bots-upstream-5099695

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 5099695 in OrchestratorMcpService.test.ts.

Upstream pingdotgg#33426 adds a test that rechecks a delegated model's availability. It lands in the same spot as the patch's test that marks threads a bot creates as that bot's, and git interleaved the two. I rebuilt the file from upstream's version and re-added the patch's three changes whole: the threadBotName import, the parent's lineage, and its test. The file now differs from upstream only by the patch's 85 lines.

On a scratch stack of upstream 5099695 with all 25 patches and the five fix branches for this upstream, pnpm install --no-frozen-lockfile, vp run typecheck, and vp test run on the test files the patches touch all pass (49 files, 1310 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

rgrvlsk and others added 30 commits November 11, 2026 02:35
…ngdotgg#18187)

Co-authored-by: Roger Vilaseca <roger@tres65.es>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#22155)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Alan Justino da Silva <155623+alanjds@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hread title (pingdotgg#25743)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng the desktop's T3 home (pingdotgg#21661)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#22874)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nterrupted (pingdotgg#21676)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#21530)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gs default (pingdotgg#16546)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ils the turn (pingdotgg#26743)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…key (pingdotgg#26408)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#34326)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
… server (pingdotgg#26763)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#21968)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24138)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#30575)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… answers (pingdotgg#26992)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#17042)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…host returns without this update's outcome (pingdotgg#27275)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…me (pingdotgg#20809)

Co-authored-by: Yannic Charlon <52761674+JustYannicc@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
…ock (pingdotgg#23001)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ar file (pingdotgg#26594)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
romil-bijarnia and others added 29 commits November 11, 2026 23:21
…ingdotgg#34343)

Co-authored-by: Aaron Zingerle <aaron.zingerle@avoautomation.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…-upstream-5099695

# Conflicts:
#	apps/server/src/mcp/OrchestratorMcpService.test.ts
@fireboltdude1357
fireboltdude1357 merged commit a384bfd into patch/bots Nov 11, 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.