Skip to content

sync: classic-merge upstream/main (829af7b73a) into fork/dev - #480

Merged
patroza merged 93 commits into
fork/devfrom
sync/upstream-829af7b73a
Sep 23, 2026
Merged

sync: classic-merge upstream/main (829af7b73a) into fork/dev#480
patroza merged 93 commits into
fork/devfrom
sync/upstream-829af7b73a

Conversation

@patroza

@patroza patroza commented Sep 23, 2026

Copy link
Copy Markdown
Owner

Classic-merge pingdotgg/t3code main through 829af7b73a into fork/dev (88 commits after #477).

Incoming includes the no-restyle UI refactor, composer-owned look, mod+[ / mod+] navigation, mobile v2-only thread list, t3.json submodule init, GPT-6 Luna, Opus 5.5, mobile 1.3.0.

Weld: keep the fork's server-side queue (thread.message-queued). Do not take queuedMessageStore. Keep dfx: 1.0.16, msgpackr-extract: true, requireWorktree before thread.create. Ported fork home/list extras onto v2; retired classic grouped list.

Hold merge until an explicit signal. Merge with gh pr merge --merge only after that signal, pnpm pr:ready, and required checks are green.

maria-rcks and others added 30 commits September 21, 2026 14:39
@maria-rcks @claude
feat(web): answer pull request actions on the row at once (pingdotgg#…
371b52d 
…12843)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@juliusmarminge @claude
fix(mobile): stop iOS autocorrect from rewriting search queries (ping…
33cb911 
…dotgg#12949)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@flamboh
fix(web): pull request embed chip shows the state icon (pingdotgg#12951)
2c2fa8c
@Yash-Singh1
fix(web): dismiss selection actions when pressing buttons (pingdotgg#…
2d377bf 
…12950)
@saphid
fix(web): name message copy actions accurately (pingdotgg#12865)
d2a90b9
@Mnigos
fix(contracts): old message-sent events without turnId no longer stop…
80d9c18 
… the server from starting (pingdotgg#12763)
@Mnigos
fix(web): the custom snooze calendar starts the week where the locale…
e1cbb70 
… does (pingdotgg#12745)
@t3-code @codex
chore(mobile): bump app version to 1.3.0
76cc9b0 
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge @claude
feat(server): let t3.json limit or disable submodule init in new work…
1262d2f 
…trees (pingdotgg#12953)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(settings): resolve t3.json inside the project settings resolver (p…
742173a 
…ingdotgg#12954)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(settings): choose how new worktrees initialize submodules (pingd…
0141bc2 
…otgg#12955)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge
fix(web): show thread undo notice in the sidebar (pingdotgg#12972)
9a609a4
@Bil0000 @maria-rcks
feat(web): merge the comment and review buttons into one composer (pi…
5423ba0 
…ngdotgg#12945)

Co-authored-by: maria-rcks <maria@kuuro.net>
@carterwsmith
fix(web): allow text selection when renaming threads (pingdotgg#12935)
e65bc1c
@juliusmarminge @claude
chore(lint): report className restyling of components/ui exports (pin…
5a61f50 
…gdotgg#12982)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): drop className overrides that repeat the base styles (p…
c26119a 
…ingdotgg#12984)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@Gigioxx
fix(web): close menus when clicking into the browser tab (pingdotgg#1…
438bf46 
…1148)
@juliusmarminge @claude
refactor(web): give Spinner and RefreshIcon a size prop (pingdotgg#12985
b5a0f81 
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@StiensWout
fix(web): retry failed attachment uploads after reconnect (pingdotgg#…
aff9318 
…10338)
@gsimone
fix(web): respect panel motion in composer transitions (pingdotgg#11064)
da6a85b
@juliusmarminge @claude
fix(web): read panel animation settings in the composer (pingdotgg#13098
7c2702d 
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code @AJJPostma
@extoci @juliusmarminge
feat(models): add opus 5.5 without changing existing aliases (pingdot…
f25a8e4 
…gg#13094)

Co-authored-by: Anco <anco@bluebarry.ai>
Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Update model manifest with new timestamps and models
17e3477
@juliusmarminge @claude
refactor(web): use ghost-muted where ghost buttons restyled to muted (p…
c0490e9 
…ingdotgg#13020)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): fold repeated overrides into ui defaults (pingdotgg#13021
1a81ea8 
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): mark the current menu value with MenuRadioGroup (pingd…
ce98d41 
…otgg#13022)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): add an active prop to CommandItem (pingdotgg#13023)
ed85694 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
chore(lint): exempt CollapsibleTrigger from no-restyle (pingdotgg#13024)
bbd5cc0 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): use icon-xs where icon buttons were forced to size-6 (p…
9515016 
…ingdotgg#13025)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): add radius="none" to ScrollArea (pingdotgg#13026)
b4f1f18 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
juliusmarminge and others added 25 commits September 22, 2026 19:00
@juliusmarminge @claude
fix(web): the pull request badge reads at the meta size again (pingdo…
6975efd 
…tgg#13175)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge julusy
fix(mobile): uniwind platform variants stay guarded on both platforms (…
b919961 
…pingdotgg#13172)

Co-authored-by: julusy <julius@t3.codes>
@juliusmarminge
refactor(mobile): git sheets use uniwind platform variants instead of…
21be723 
… className ternaries (pingdotgg#13185)
@juliusmarminge julusy
refactor(mobile): remaining className platform ternaries become class…
db898a3 
… variants (pingdotgg#13188)

Co-authored-by: julusy <julius@t3.codes>
@Derpedyea
fix(web): align provider emails without clipping (pingdotgg#13174)
219c1d2
@juliusmarminge
perf(mobile): recycle the default v2 home list and scope the snooze m…
151324b 
…inute tick (pingdotgg#13149)
@juliusmarminge
refactor(mobile): retire the legacy grouped thread list (pingdotgg#13183
0c91f68 
)
@juliusmarminge @claude
fix(server): background PR checks spend less GitHub quota (pingdotgg#…
5975ec7 
…13189)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): background PR sync reads summaries in batches (pingdotgg…
18de6bb 
…#13198)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): GitHub PR lookups stop probing owner-qualified heads (pi…
eafb4a9 
…ngdotgg#13200)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge
chore(mobile): clear the legacy-list deletion fallout (pingdotgg#13203)
aca3c87
@juliusmarminge @claude
hatch/variant functions (pingdotgg#13191)
29931dd 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): context chips render through one ContextChip component (…
266d70c 
…pingdotgg#13192)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): ui components drop their secondary className props (pi…
361b047 
…ngdotgg#13193)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): menu triggers and items stop restyling ui/menu (pingdo…
866fc90 
…tgg#13205)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): field controls stop restyling Input, Select, Combobox …
2107939 
…and Command (pingdotgg#13206)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): app code stops restyling sidebar, popover, table and m…
f465227 
…isc ui exports (pingdotgg#13207)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): Button consumers outside the composer stop restyling it (
71c9b69 
pingdotgg#13208)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): composer controls own their look instead of restyling …
0e512db 
…ui components (pingdotgg#13209)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
chore(web): no-restyle fails lint, and the ceiling gate goes (pingdot…
10882be 
…gg#13210)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge
fix(mobile): recover from screen render errors (pingdotgg#13197)
23c7ab9
@juliusmarminge @claude
feat(web): navigate back and forward with mod+[ and mod+] (pingdotgg#…
829af7b 
…13212)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions
Merge remote-tracking branch 'upstream/main' into sync/upstream-829af…
51cc3f6 
…7b73a

# Conflicts:
#	apps/mobile/app.config.ts
#	apps/mobile/src/Stack.tsx
#	apps/mobile/src/features/home/HomeHeader.android.tsx
#	apps/mobile/src/features/home/HomeHeader.tsx
#	apps/mobile/src/features/home/HomeHeader.types.ts
#	apps/mobile/src/features/home/HomeRouteScreen.tsx
#	apps/mobile/src/features/home/HomeScreen.tsx
#	apps/mobile/src/features/home/home-list-filter-menu.test.ts
#	apps/mobile/src/features/home/home-list-filter-menu.ts
#	apps/mobile/src/features/home/home-list-options.test.ts
#	apps/mobile/src/features/home/home-list-options.ts
#	apps/mobile/src/features/home/homeListItems.test.ts
#	apps/mobile/src/features/home/homeListItems.ts
#	apps/mobile/src/features/home/homeThreadList.ts
#	apps/mobile/src/features/threads/ThreadDetailScreen.tsx
#	apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
#	apps/mobile/src/features/threads/ThreadRouteScreen.tsx
#	apps/mobile/src/features/threads/thread-list-items.tsx
#	apps/mobile/src/features/threads/threadListV2.ts
#	apps/mobile/src/features/threads/threadPresentation.ts
#	apps/mobile/src/persistence/mobile-preferences.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/BranchToolbarBranchSelector.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/LegacySidebar.tsx
#	apps/web/src/components/ProjectScriptsControl.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadStatusIndicators.tsx
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/components/chat/OpenInPicker.tsx
#	apps/web/src/components/chat/ProviderStatusBanner.tsx
#	apps/web/src/components/chat/ThreadErrorBanner.tsx
#	apps/web/src/components/ui/scroll-area.tsx
#	packages/contracts/src/settings.test.ts
#	packages/contracts/src/settings.ts
#	pnpm-lock.yaml
@github-actions
fix(web): stop restyling the environment filter Button and popover
b022e34 
PopoverPopup dropped viewportClassName; Button size owns padding/type.
@github-actions
fix(web): drop no-restyle classNames on fork-only chrome
ecb425e 
Full vp check lints the whole tree. Fork board/jump/identity/host
status still restyled SidebarInset, Spinner, TooltipPopup, DialogPanel.
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Sep 23, 2026
@github-actions
test(mobile): match iOS ownership menu title JSX
f3c9b53 
HomeHeader uses title=\"Ownership\" on NativeHeaderToolbar.Menu, not
the object form title: \"Ownership\".
@github-actions
test(web): include worktree-submodules in settings search for work
2a0d04b 
Incoming t3.json submodule-init setting matches \"work\" and must stay
in the catalog list.
@patroza
patroza marked this pull request as ready for review September 23, 2026 06:49
@patroza
patroza merged commit a54d5fb into fork/dev Sep 23, 2026
9 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.