[Yarden-zamir]

Cause

Fork Sync run 40346250614 stopped on merge conflicts in 3 files. The batch has 10 upstream commits:

• refactor(web): root theme, toast and chrome sync start with the app pingdotgg/t3code#25461: the root theme, toast and browser chrome sync start from appInit.tsx, no longer from components in __root.tsx. The published theme palettes move from useEnvironmentTheme.ts into an atom in themePalette.ts.
• fix(mobile): queued edits end when their run starts, wherever you are pingdotgg/t3code#25468, fix(mobile): editing a queued message while a question is open no longer throws pingdotgg/t3code#25503, fix(mobile): describe when composer view commands can reject pingdotgg/t3code#25516: mobile queued message edits end when their run starts, and composer view commands no longer throw while a question hides the composer.
• fix(web): browser history and titles show up again pingdotgg/t3code#25491, fix(web): switching back to a thread no longer restores its tab's older title pingdotgg/t3code#25521, fix(web): browser viewport resizes work without an open preview panel pingdotgg/t3code#25462: browser history and titles, and viewport resizes without an open preview panel.
• Test-only commits (test(web): attachment preview omission tests no longer time out on CI pingdotgg/t3code#25515, test(web): say why the useStableCallback test renders without a router pingdotgg/t3code#25493).

Conflicts and resolution

• useEnvironmentTheme.ts: upstream's file. The fork useActiveThemeFonts hook stays.
• themePalette.ts (no conflict, but the fork style fields were lost): upstream's environmentThemeDefinition now builds the definitions. One fork line adds style: publishedThemeStyle(theme) to it.
• __root.tsx: upstream drops SlowRpcRequestToastCoordinator and BrowserChromeThemeSync. The fork ForkAccessChangeNotices stays. The fork machine paused and client pending screens no longer mount their own chrome sync, because the app now syncs it on every route render.
• Mobile ThreadComposer.tsx: upstream's useDerivedValue border radius. The fork theme radius and raised style stay as its input.

Fork fixes

• Theme style fields: the fork style code (applyThemeStyle, active theme fonts and icons, user CSS, publishedThemeStyle) moves from themePalette.ts into the new fork file apps/web/src/forkThemeStyle.ts. themePalette.ts keeps one import and two calls. appInit.tsx, AppIcon.tsx and useEnvironmentTheme.ts import from the fork file.
• themeStyle.browser.test.ts: upstream removed setEnvironmentThemes. The test now publishes themes through the server themes atom, as upstream's useEnvironmentTheme.test.ts does.

Upstream merge

Merges pingdotgg/t3code main at 3f94487 "fix(web): switching back to a thread no longer restores its tab's older title (pingdotgg#25521)".

Adopted upstream pull requests

All 7 entries are unchanged at their listed heads. No new merges.

Upstream changes in fork areas

16 files changed on both sides. Apart from the conflicts above, none affects a fork feature:

• Mobile queue (ThreadQueueControl.tsx, use-thread-composer-state.ts): upstream changes the drag state and the end of queued edits. The fork usage limit guard on Resume and Send merged without a change.
• Mobile composer editor: upstream settles view commands. The fork theme font hook is on other lines.
• Mobile thread settings: upstream removes the model and runtime mode callbacks from the composer. No fork code uses them.
• appInit.tsx: upstream adds the theme repaint and chrome sync next to the fork theme font sync.
• entities.ts: upstream removes the active environment id atom. No fork code uses it.
• Preview chrome row and hosted browser: the address bar focus and resize target change. No fork code depends on the old props.

Checks

• checks.py: typecheck, migration check, adopted pull request check, format and lint pass. Knip passes when run alone.
• fork_tests.py: 179 fork test files pass locally (117 root and 62 web). The apps/server fork test files are left to Fork CI.
• Upstream's useEnvironmentTheme.test.ts and themePalette.test.ts pass.

Fork repair skill changes

None.