Skip to content

fix(fork): merge upstream 01a93e7 into patch/bots - #163

Merged
fireboltdude1357 merged 66 commits into
patch/botsfrom
fix/bots-upstream-01a93e7
Nov 1, 2026
Merged

fireboltdude1357 merged 66 commits into
patch/botsfrom
fix/bots-upstream-01a93e7

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 01a93e7 in apps/mobile/src/features/threads/useThreadListV2.ts.

Upstream pingdotgg#27026 wrapped the mobile thread list's layout and list items in useMemo. I kept upstream's memos and added the patch's bot shelf fields to both, with input.botShelfExpanded in each dependency list.

Two upstream changes also broke the patch without a conflict:

  • perf(mobile): reuse chat lists across navigation renders pingdotgg/t3code#27026's new useThreadListV2.test.tsx builds the hook's input and an older-settled count without the patch's fields. It now passes botShelfExpanded: false and marks the project's older threads as user-owned.
  • Upstream added a ThreadId import to handlers.test.ts next to the patch's own, so the merged file imported it twice. I removed the duplicate.

On a scratch stack of upstream 01a93e7 with all 19 patches and the fix branches for bots and desktop-update-capability, pnpm install --no-frozen-lockfile, vp run typecheck (39 of 39) and vp test run on the 39 test files the patches touch plus DesktopUpdates.test.ts (1034 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits October 31, 2026 22:30
…ledgement (pingdotgg#16419)

Co-authored-by: Codex (gpt-6.1-sol) <noreply@openai.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…#28027)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…8593)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Matthew Feroz <136640686+MatthewFeroz@users.noreply.github.com>
Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Adamulek123 <adam.bogucki2018@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: hbw00111 <196409728+hbw00111@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#14989)

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…gdotgg#18416)

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…g#22022)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
skyhong2002 and others added 29 commits November 1, 2026 20:55
…back a stage (pingdotgg#24719)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#25248)

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

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…5275)

Co-authored-by: Michael Feldstein <michael@feldstein-macbook-air.tail8b57b.ts.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#25496)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…linked (pingdotgg#25561)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#25591)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… left (pingdotgg#26095)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…navailable" (pingdotgg#26398)

Co-authored-by: Vikas - AWS Auto <vikasmaur.in.13@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…oment they start (pingdotgg#26459)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…es (pingdotgg#26936)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
# Conflicts:
#	apps/mobile/src/features/threads/useThreadListV2.ts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 94ca7cf into patch/bots Nov 1, 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.