sync(upstream): merge upstream/main 239ef1c54 into fork/dev - #378
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
Adopts the seven upstream commits after #377: iOS terminal clear no longer resets the session (pingdotgg#5440), Android scroll padding above the nav bar (pingdotgg#5415), Android composer opacity (pingdotgg#5582), Clerk auth navigation headers (pingdotgg#5140), the mobile app version bump to 1.0.2 (pingdotgg#5588), click-to-unpin (pingdotgg#5578), and the correct new-thread shortcut in the sidebar tooltip (pingdotgg#5594). Three resolutions: - ThreadComposer: pingdotgg#5582 moves the backdrop gradient off Animated.View, where Reanimated silently drops experimental_backgroundImage on Android — the very bug it fixes. The fork's gradient was on that Animated.View, so it is removed there and the fork's stronger lower-band stops (0.82/0.96 dark, 0.88/0.98 light) ride on upstream's plain-View backdrop instead. - app.config: upstream's 1.0.2 version bump with the fork's MOBILE_RUNTIME_VERSION_OVERRIDE escape hatch kept; its default policy is the same fingerprint upstream documents. - SidebarV2: upstream's pingdotgg#5594 label ordering (chat.new before chat.newLocal) adopted — the fork's button has exactly the semantics upstream describes, routing multi-project setups through the palette picker and creating immediately otherwise. The fork's board and command-palette labels stay. Upstream's two new react-mocking harness tests (pingdotgg#4479) are added to the fork's isolatedUnitTestFiles. The fork's unit project runs isolate: false to reuse each worker's module graph; upstream has no such config, so those tests assume full isolation. Under a shared registry the component graph can already be bound to the real react/compiler-runtime by an earlier file, the vi.mock("react") never applies, and the compiled component reports a memo-cache hit and skips the hooks the test asserts on. That is what made AddProviderInstanceDialog.environment fail this PR's CI while passing in isolation. Two other react-mocking tests were already in that list. Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
omegent-app
Bot
force-pushed
the
sync/upstream-239ef1c54
branch
from
August 7, 2026 11:40
93c21f6 to
4fdb933
Compare
omegent-app Bot
added a commit
that referenced
this pull request
Aug 7, 2026
Adopts the two upstream commits after #378: reconnects no longer shift the mobile thread list (pingdotgg#5372) and the v0.0.32 release prep. pingdotgg#5372 moves connection status out of the lists into the header title slot (WorkspaceConnectionTitle / getConnectionAwareBrandHeaderOptions) and deletes WorkspaceConnectionStatus. The fork rendered that status in four places across HomeScreen and ThreadNavigationSidebar — exactly the row-shifting this fixes — so those in-list surfaces are removed and the header slots adopted. The auto-merge left one dangling {connectionStatus} in HomeScreen whose definition upstream had deleted; typecheck caught it. Fork surfaces kept around the new title: - multi-environment selection: HomeScreen keeps its selectedEnvironmentIds label derivation and environmentLabelById (BoardScreen consumes it) instead of upstream's single selectedEnvironmentId. - board mode: ThreadNavigationSidebar keeps its board branch, board-specific solid header, and board-gated search bar, with upstream's connection-aware brand slot merged into the same header options. - HomeRouteScreen keeps the fork's in-flow HomeHeader as title owner rather than also restoring upstream's native-stack title, which would surface the connection status twice. Adversarial review caught two holes in the first pass, both fixed here: getConnectionAwareBrandHeaderOptions hardcodes the brand lockup and "Threads", so spreading it over the fork's list-mode titles silently replaced "Board" / "Projects"; and iOS Home has its own IosHomeHeader owning the native title, so dropping upstream's route-level options left that path with no status surface at all. The helper now takes an optional title/brand, and both the sidebar and IosHomeHeader pass their mode title through it. Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
omegent-app Bot
added a commit
that referenced
this pull request
Aug 7, 2026
Adopts the two upstream commits after #378: reconnects no longer shift the mobile thread list (pingdotgg#5372) and the v0.0.32 release prep. pingdotgg#5372 moves connection status out of the lists into the header title slot (WorkspaceConnectionTitle / getConnectionAwareBrandHeaderOptions) and deletes WorkspaceConnectionStatus. The fork rendered that status in four places across HomeScreen and ThreadNavigationSidebar — exactly the row-shifting this fixes — so those in-list surfaces are removed and the header slots adopted. The auto-merge left one dangling {connectionStatus} in HomeScreen whose definition upstream had deleted; typecheck caught it. Fork surfaces kept around the new title: - multi-environment selection: HomeScreen keeps its selectedEnvironmentIds label derivation and environmentLabelById (BoardScreen consumes it) instead of upstream's single selectedEnvironmentId. - board mode: ThreadNavigationSidebar keeps its board branch, board-specific solid header, and board-gated search bar, with upstream's connection-aware brand slot merged into the same header options. - HomeRouteScreen keeps the fork's in-flow HomeHeader as title owner rather than also restoring upstream's native-stack title, which would surface the connection status twice. Adversarial review caught two holes in the first pass, both fixed here: getConnectionAwareBrandHeaderOptions hardcodes the brand lockup and "Threads", so spreading it over the fork's list-mode titles silently replaced "Board" / "Projects"; and iOS Home has its own IosHomeHeader owning the native title, so dropping upstream's route-level options left that path with no status surface at all. The helper now takes an optional title/brand, and both the sidebar and IosHomeHeader pass their mode title through it. A second review pass caught one more surface — the custom (Android split) sidebar large title still hardcoded "Threads" — plus the status offset being applied to caller-supplied titles that lack the brand lockup's inset. Both fixed, and mobileSurfaceExistence now asserts every adopting surface passes its own list-mode title (that assertion fails on the pre-fix tree). Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.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
6 participants
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.
Adopts upstream through
239ef1c54— the seven commits after #377, bringingfork/devlevel withupstream/main(HEAD..upstream/mainis empty).Important
Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.
Upstream commits entering the product
239ef1c5461b51ae0ebfc69e4b4af281c9fcbd422fd8d33a03c8a7a17459e8aAll seven verified as ancestors of the merge commit individually, not just by range.
Resolutions
Three conflicts, each a real judgement call:
ThreadComposer.tsxAnimated.Viewonto a plainView+StyleSheet.absoluteFill, because Reanimated silently dropsexperimental_backgroundImagethere on Android — which is the bug it fixes. The fork's gradient sat on exactly thatAnimated.View0.82/0.96dark,0.88/0.98light at 42%) moved onto upstream's backdrop, so the fork's tuning survives on the node that actually paintsapp.config.tsversionto 1.0.2; the fork wrapsruntimeVersionin aMOBILE_RUNTIME_VERSION_OVERRIDEescape hatch for OTA-to-installed-binary casesfingerprintupstream documentsSidebarV2.tsxchat.new, notchat.newLocalhandleNewThreadClick: the fork's button routes multi-project setups through the palette picker and creates immediately otherwise, i.e. exactlychat.newsemantics. The fork's board and command-palette labels stayPlus one integration fix the merge owns, found by this PR's own CI going red:
apps/web/vite.config.tsvi.mock("react")and drive components throughreactHookHarness. Upstream runs tests fully isolated; the fork's unit project setsisolate: falseto reuse each worker's module graph. Under a shared registry the component graph can already be bound to the realreact/compiler-runtimeby an earlier file, the mock never applies, and the compiled component reports a memo-cache hit — skipping the very hooks the test asserts onisolatedUnitTestFiles, where two other react-mocking tests already liveThat is the whole story behind the
AddProviderInstanceDialog.environment"flake": not timing (the test is synchronous) but worker scheduling deciding whether the mock lands. It failed this PR's first CI run and had flaked on earlier syncs. Three consecutive full-workspace runs are now identical (1 failed / 2,278 passed — the pre-existing Codex one).Adversarial review
grok-4.5 and gpt-5.6-sol over the
git show --ccsurface with worktree access — no defectsfrom either. Both independently confirmed: the gradient paints once, on the plain
Viewonly; theoverride still feeds Expo's
runtimeVersion; the shortcut label matches the command the buttonactually invokes; and no fixture is still pinned to
1.0.1(both checked thepackages/contractslatestVersion: "1.0.1"and identified it as unrelated Codex advisory fixture data).Verification
CodexTextGenerationlaunch-args one,which reproduces on unmerged
fork/dev.AddProviderInstanceDialog.environmentflake is root-caused and fixed (see above), notretried away: three consecutive full-workspace runs now give identical results.
Co-authored by @patroza
opened by Patrick Roza in chat thread Discord · Discord · T3