Repository navigation
chore: sync upstream mobile and branch-status fixes - #79
Merged
Merged
Conversation
…#31277) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#31317) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
github-actions
Bot
added
the
vouch:trusted
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.
Problem
The fork is missing three upstream fixes for stale branch divergence, duplicate mobile ChatGPT limit notices, and composer focus after queued-message edits.
Change
Merge upstream through
337c5858c3, preserving fork commits and ancestry. The merge completed without conflicts.Scope and approval
Maintainer-requested upstream sync. The Android late-event race documented in upstream #31317 remains an upstream follow-up. Retaining the previous Android remount would reverse the intended keyboard fix.
Verification
pnpm exec vp run check:changed origin/mainpassed on this exact merge tree: formatting, lint, both knip checks, server GraphQL validation, four affected-package typechecks, 109 tests across five files, and nine React Compiler checks for four changed files.Upstream device captures and recordings are available in the sharing-limit fix and the composer keyboard fix. This sync had no additional device run.
Reviewed with sol-loop: 3 rounds with gpt-6.1-sol on high.
Sol verdict: approved. The documented Android event race is deferred to upstream's native follow-up.
Merge and validation by GPT-6.1 Sol in the Codex harness.