chore(fork): merge upstream f5c1142d2426 into atli

[gabynevada]

Upstream range: 62d98096ca0d..f5c1142d2426, 2 commits.

• f5c1142 fix(mobile): settings no longer tell you to update when you're up to date (fix(mobile): settings no longer tell you to update when you're up to date pingdotgg/t3code#21688)
• 1451e7c feat(web): choose the in-app browser's search engine (feat(web): choose the in-app browser's search engine pingdotgg/t3code#17688)

Conflicts

None. git merge --no-ff completed without conflicts. Two files were edited on both sides and git merged them automatically; I checked both by hand:

File	Upstream changed	Fork had	Resolution
packages/contracts/src/settings.ts	Added the browserSearchEngine and browserCustomSearchUrl client settings and their patch fields	The pull-request watching setting, default off	Automatic. Upstream's fields were added; the fork's setting and its default are unchanged
apps/web/src/components/settings/settingsSearch.ts	Added a "Search engine" search entry	Fork settings search entries	Automatic. Upstream's entry was added beside the fork's

No fork behaviour on the keep list (Claude MCP prompts, Working state and provider continuation, pull-request watching, scheduled-tasks settings, mobile Android variant and fold-aware previews, patches/, CI, release/recovery tooling) is touched by this range. pnpm-workspace.yaml and pnpm-lock.yaml are unchanged.

Validation

• vp i: done, lockfile unchanged.
• Typecheck: @t3tools/contracts, @t3tools/shared, @t3tools/web, @t3tools/mobile all pass.
• Tests: packages/shared/src/preview.test.ts, apps/web/src/components/settings/SettingsPanels.logic.test.ts, packages/contracts/src/settings.test.ts, apps/web/src/components/settings/settingsSearch.test.ts: 292 passed.
• vp lint and vp fmt --check on the 10 files this merge changes: pass. One lint warning (an unused DEFAULT_SERVER_SETTINGS import in SettingsPanels.logic.test.ts) is already on both atli and upstream.

Needs your decision

Fork Check fails at its first gate: upstream f5c1142 has no successful upstream Check run. Upstream's CI run on that commit (run 39255022998) failed only in Test Web, from an unhandled rejection inside Vitest's Playwright browser provider (route.fulfill: Route is already handled!). That looks like browser-test flakiness, not either of the two upstream commits. A fix push on this branch can't clear the gate, so pick one:

• Wait until upstream re-runs CI on f5c1142 and it goes green, then re-run Check here. Nothing else changes.
• Or close this PR and let the next run merge a later upstream commit whose CI passed. Upstream CI on 2532e64 was still running when I checked.

Merge with a merge commit, never squash or rebase.

Done by Claude Opus 5.5 in Claude Code (T3 Code).

🤖 Generated with Claude Code