Skip to content

fix(fork): merge upstream 5aea99a into patch/bots - #266

Merged
fireboltdude1357 merged 210 commits into
patch/botsfrom
fix/bots-upstream-5aea99a
Nov 13, 2026
Merged

fireboltdude1357 merged 210 commits into
patch/botsfrom
fix/bots-upstream-5aea99a

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 5aea99a in the @t3tools/contracts import of apps/server/src/orchestration-v2/ProjectionStore.ts.

Upstream pingdotgg#36233 imports applyOrchestrationV2ThreadVisit, and the patch imports threadOwnerBotName, from the same module. The import now names both, next to pendingGuestMessageCount.

On a scratch stack of upstream 5aea99a with all 26 patches and both fix branches, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the test files the patches touch, plus serviceLauncher.test.ts, all pass (49 files, 1378 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 12, 2026 15:38
pingdotgg#35574)

Co-authored-by: ixmxvii-hash <235766220+ixmxvii-hash@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ble (pingdotgg#33389)

Co-authored-by: Daniel D <1325654+complynx@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#24121)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ndroid (pingdotgg#27653)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#33243)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ompletes (pingdotgg#35709)

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

Co-authored-by: MacKinley Smith <1738501+mackinleysmith@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…y message (pingdotgg#26959)

Co-authored-by: Mariusz Mazur <mmazur@redhat.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Brandon Julio Thenaro <brandon.julio.t@icloud.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the next prompt (pingdotgg#35720)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 29 commits November 13, 2026 05:59
…put (pingdotgg#36115)

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
… forward (pingdotgg#30173)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…-upstream-5aea99a

# Conflicts:
#	apps/server/src/orchestration-v2/ProjectionStore.ts
@fireboltdude1357
fireboltdude1357 merged commit c2c51de into patch/bots Nov 13, 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.