[Yarden-zamir]

Cause

Fork Sync run 40048214300 stopped on a merge conflict in apps/mobile/src/features/threads/ThreadFeed.tsx. Upstream pingdotgg#22585 "fix(mobile): chat and composer chips stay readable in light mode" shows t3-thread:// links in chat as thread chips, with the project icon of the thread. The fork already shows thread links as chips with its "Thread link chips" feature (server setting threadLinkChips, off by default).

Conflicts and resolution

• ThreadFeed.tsx imports: kept upstream's useThreadChipIcons and the fork imports of forkThreadLinks and forkMessageLinks.
• ThreadFeed.tsx markdownLinkHandlers: both sides added linkCustomization. It now calls the fork pill first, then upstream's enrichedThreadLinkCustomization. With threadLinkChips off, the fork pill returns nothing, so links look as upstream shows them. With it on, the fork pill also covers thread web addresses, app links and message links, as before.

Upstream merge

Merges pingdotgg/t3code main at 6c21798 "fix(mobile): Home and pull request lists let UIKit own their top inset (pingdotgg#24284)".

Adopted upstream pull requests

All 7 entries (pingdotgg#16653, pingdotgg#16654, pingdotgg#16655, pingdotgg#16684, pingdotgg#16695, pingdotgg#16698, pingdotgg#16719) are unchanged at their listed heads. No new merges.

Upstream changes in fork areas

22 files changed on both sides. Effect on fork features:

• Thread link chips / Message links (mobile): upstream withChipIcon replaces a thread chip's icon with the project icon of the thread in chat messages. With messageLinks on, this also replaces the message icon of a message link when the project has an icon. I kept upstream's icon and wrote this limit in docs/fork/features.md. If the message icon matters, a fork guard in AssistantMarkdownContent and UserMessageContent can keep it.
• Pull request filters (web): upstream adds a pullRequests.filterOptions request (contracts, ws.ts, scopes, RPC instrumentation, GitHub queries). Author and label pickers now search the host, and PullRequestFiltersMenu takes a new optionScope prop. The fork owner filter and filter chips render through PullRequestsPage only, which passes the prop. No effect. The regenerated GraphQL types equal the merged file.
• Mobile theme: upstream adds OKLab helpers, isDarkThemeColor and themeAccentWithContrast. The fork published-theme branches in getMobileThemeColors stay. No effect.
• Home screen (mobile): upstream lets UIKit own the top inset. The fork sidebar tabs and card layout lines stay. No effect.
• Composer editor, ProjectFavicon, AppSymbol, MenuPopup, App.tsx, Stack.tsx, config.ts, vite.config.ts: additive upstream changes next to fork lines (font family hook, request headers, settings screens). No effect.

Checks

• checks.py: typecheck, migration check and adopted pull request check pass.
• vp lint on ThreadFeed.tsx: no errors.
• fork_tests.py: 154 of 245 fork test files pass locally (desktop, machine map, packages, scripts, web). The 91 apps/server fork test files are left to Fork CI, because these tests stop the agent session on this VPS. This merge changes server code only to add the new pull request request.

Fork repair skill changes

• fork_tests.py takes --only <prefix> and --exclude <prefix> (repeatable), with a test in test_scripts.py. SKILL.md lists them and says when to use them on the VPS. This replaces the hand-made file lists of the last two sync repairs.