Repository navigation
fix(fork): merge upstream 01a93e7 into patch/bots - #163
Merged
Merged
Conversation
pingdotgg#28104) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…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>
…gdotgg#28474) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…8593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28605) 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>
…ingdotgg#24362) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…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>
…dotgg#25428) 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>
…otgg#26077) 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>
pingdotgg#26691) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#26720) 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>
…7026) Co-authored-by: maria-rcks <maria@kuuro.net>
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>
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 01a93e7 inapps/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, withinput.botShelfExpandedin each dependency list.Two upstream changes also broke the patch without a conflict:
useThreadListV2.test.tsxbuilds the hook's input and an older-settled count without the patch's fields. It now passesbotShelfExpanded: falseand marks the project's older threads asuser-owned.ThreadIdimport tohandlers.test.tsnext 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) andvp test runon the 39 test files the patches touch plusDesktopUpdates.test.ts(1034 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code