chore: merge upstream preview v0.0.45-preview.20261001.2518 into custom-nightly

[chamaquita-d3]

Fixes #33

Merges upstream preview v0.0.45-preview.20261001.2518 into custom-nightly with a merge commit, so the tag stays an ancestor. Every conflict except one was disjoint, so both sides are kept. In the keybindings sort, both sides fixed the same comparator, and upstream's equivalent fix is taken.

File:lines	Class	custom-nightly	Upstream	Kept	Why
apps/server/package.json:41-43	disjoint	adds ai dependency (dictation)	adds @opencode/client + @opencode/protocol	both	Unrelated dependencies
apps/server/src/serverSettings.ts:157-166	disjoint	DICTATION_API_KEY_* constants aliased to USAGE_LIMIT_SOURCE_KEY_REDACTED	Bitbucket secret names + redactSecret; renames the marker to SECRET_REDACTED	both, with the dictation alias pointing at SECRET_REDACTED	Upstream's rename removed the old constant, so the fork's alias now uses the new name. Same marker value
apps/server/src/serverSettings.ts:204-214	disjoint	redacts dictation.apiKey for clients	redacts Bitbucket tokens	both; returns bitbucket, dictation	Separate settings sections
apps/server/src/serverSettings.ts:875-906	disjoint	reads the dictation key from the secret store	reads Bitbucket tokens from the secret store	both, as sequential blocks	The hunks were interleaved, so each block was rebuilt whole
apps/server/src/serverSettings.ts:1048-1091	disjoint	writes/removes the dictation key secret	writes/removes Bitbucket token secrets	both, as sequential blocks	Separate secrets
apps/web/src/components/CommandPalette.tsx:50-51	disjoint	imports ImageIcon	imports MessageSquareDashedIcon	both	Both icons are used
apps/web/src/components/settings/KeybindingsSettings.logic.ts:28-46	same question, different answers	fork's transitive Usage-block comparator (2833460)	upstream's transitive Usage-block comparator	upstream	Both are total orders that keep Usage rows in page order. Taking upstream's version avoids repeat conflicts
apps/web/src/components/settings/KeybindingsSettings.logic.ts:238	same question, different answers	String key fn	(command) => command	upstream	Follows the comparator choice
apps/web/src/routes/__root.tsx:36-40	disjoint	Background studio/folder/theme sync imports	ChatGPT welcome + provider auth callback coordinators	both	Unrelated root components; the JSX merged cleanly with both
packages/contracts/src/settings.ts:1020-1050	disjoint	DictationSettings schema	BitbucketSettings schema	both	Both are referenced by ServerSettings, which merged cleanly
pnpm-lock.yaml	generated	—	—	upstream's lockfile, then pnpm install --lockfile-only	Regenerated from the merged manifests

Only vp fmt was run on the resolved files. CI runs the checks.

Follow-up fixes after the first CI run

These were not merge conflicts. Each one is fork code that upstream changes broke, or that was stale on custom-nightly already:

• apps/server/src/serverPush/ServerPush.test.ts: vite-plus 1.0 (chore: bump vite-plus to 1.0 pingdotgg/t3code#14462) dropped describe.sequential, so this test now uses describe(..., { concurrent: false }, ...), the same swap upstream made.
• apps/mobile/src/features/server-push/serverPushRegistration.ts: upstream now exports Effect services as namespaces (refactor(clients): import Effect services as namespaces pingdotgg/t3code#14389), so this file reads EnvironmentRegistry.EnvironmentRegistry and EnvironmentSupervisor.EnvironmentSupervisor. This also fixes the cascading type errors in connection/runtime.ts.
• knip.jsonc: added the fork's apps/mobile/fingerprint.config.cjs (from 53f2bbf) as a mobile entry, since Expo loads it by filename.
• apps/web/src/components/usage/*.refresh.test.tsx: fork commit c59d233 stopped the clients from probing usage limits when a page opens, but these tests still expected that probe. They now check the new behavior: opening never probes limits, the sidebar rescans spending once per 3-minute cooldown, and a manual refresh stays busy until it settles.

Model: Claude Opus 5.5, Claude Code (Chamaquita).

🤖 Generated with Claude Code