sync(upstream): merge upstream/main 8100062a7 into fork/dev - #375
Merged
Conversation
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Adopts the three upstream commits after #374: mobile keyboard avoiding (pingdotgg#5451), dev-runner cold-start speedup (pingdotgg#5584), and rewritten --share instructions (pingdotgg#5586). Resolutions: dev-runner.ts unions the fork's METRO_PORT passthrough with upstream's launcher-env scrubbing (T3_SERVICE_LAUNCHER_CONTEXT / T3_BOOT_SERVICE_UNIT deletion). AGENTS.md's auto-union dropped upstream's rewritten "Dev servers" bullets into the fork's ship-gate section; the share/pairing guidance is folded into the fork's own Dev Servers section instead, replacing its older --share bullet. Lockfile regenerated. 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 four upstream commits after #375: thread actions from the chat header title (pingdotgg#5592), per-turn runtime-mode recording (pingdotgg#5593), chat timeline positioning stabilization (pingdotgg#5449), and the background-work banner no longer hiding behind the update notice (pingdotgg#5595). The chat header gains upstream's inline rename and title-menu (shared threadActionMenu.logic) woven around the fork's remote-VS-Code open and usage-dot/host-resource chrome. SidebarV2 adopts the shared menu builder in place of the fork's buildSidebarV2ThreadContextMenuItems; the fork's copy-thread-id entry moves into the shared menu (and gains a handler in useThreadActionMenu) so both surfaces offer it. ChatView takes upstream's folded reconnect/version banner logic (pingdotgg#5595, a superset of the fork's resuming-update suppression) and the anchor-clearing rAF scroll (pingdotgg#5449), keeping the fork's unread-flag clearing and its unread-activity observer. 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
3 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
8100062a7— the three commits after #374.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
8100062a7a1762fdd7388b43a27Resolutions
Three conflicted files, all small:
scripts/dev-runner.tsMETRO_PORTpassthrough vs upstream's launcher-env scrubbing (T3_SERVICE_LAUNCHER_CONTEXT/T3_BOOT_SERVICE_UNITdeletion, which stops "service launcher started a different t3 version" failures for agents inside T3)AGENTS.md--sharebullet. Upstream-only bullets referencing upstream's doc structure ("rule 1") deliberately not copiedpnpm-lock.yamlAdversarial review
grok-4.5 and gpt-5.6-sol over the
git show --ccsurface with worktree access.Verification
CodexTextGenerationlaunch-args one,which reproduces on unmerged
fork/dev.Co-authored by @patroza
opened by Patrick Roza in chat thread Discord · Discord · T3