[chamaquita-d3]

Closes #184

Fixes #184

Merges upstream v0.1.4-nightly.20261028.3814 into custom-nightly with a merge commit. pnpm-lock.yaml is upstream's, reconciled with pnpm install --ignore-scripts. Nothing was typechecked or built locally; fork CI is the check.

File:lines	Class	custom-nightly	Upstream	Kept	Why
apps/mobile/src/features/connection/useConnectionController.ts:~84-113	disjoint	removeEnvironment unregisters the server push device first (useCallback style)	Dropped useCallback wrappers (React compiler style)	Upstream's plain functions, with the fork's unregisterServerPushDevice(...).then(removeEnvironmentMutation)	The sides touch different things: wrapper style vs. the fork's push unregistration
apps/mobile/src/features/voice-input/ComposerDictationControl.tsx:~308	disjoint	size={props.iconSize ?? (...)} icon override	Computes iconSize scaled by useAndroidControlSizing	size={props.iconSize ?? iconSize}	Keeps the fork's override and uses upstream's scaled default
apps/server/src/auth/RpcAuthorization.ts:~210	superseded	Scopes for subscribeBackgroundPolicy and ...SERVER_PUSH_RPC_SCOPES	Removed the subscribeBackgroundPolicy scope (upstream deleted that RPC)	...SERVER_PUSH_RPC_SCOPES only	WS_METHODS.subscribeBackgroundPolicy no longer exists in contracts, so its scope would not typecheck
apps/web/src/components/AppSidebarLayout.tsx:~487	disjoint	Usage/background-studio sidebar panels, LegacyThreadSidebar branch	Removed LegacySidebar	Fork's panel switch, with the LegacyThreadSidebar branch dropped	LegacySidebar.tsx no longer exists upstream
apps/web/src/components/ChatView.tsx:1-5	disjoint	CustomBackground import	workspaceAreaProps import	Both	Different imports
apps/web/src/components/ChatView.tsx:~3254	disjoint	Conversation div without bg-background, so the custom background shows	{...conversationArea} and bg-background	{...conversationArea}, no bg-background	Takes upstream's F6 focus area and keeps the fork's transparent container
apps/web/src/components/CommandPalette.tsx:~1532	disjoint	"Customize background" action	"Focus Next/Previous Workspace Area" actions	Both	Different palette actions
apps/web/src/components/NoProjectsHero.tsx:~18	disjoint	<CustomBackground routeKind="draft" />	{...contentArea} and role="main" on SidebarInset	Both	Different parts of the same element
apps/web/src/index.css:~2571	disjoint	@import "./custom.css" kept last	[data-workspace-area]:focus-visible rule	Both, with the @import still last	The fork's import must stay last so it overrides everything above
packages/contracts/src/ipc.ts:~1036	disjoint	Optional DesktopBridge members, including fork-only setDockMood, background-folder and dictation/fn-key methods	Made the shared bridge members required	Upstream's required members, with the fork-only members still optional	Follows upstream's contract and does not force the fork-only methods on other shells
apps/mobile/src/features/phone-background/PhoneBackgroundFolders.tsx, PhoneBackgroundRouteScreen.tsx, apps/mobile/src/features/updates/ApkUpdateRow.tsx (imports)	build fix (no conflict)	Imported SettingsActionRow and SettingsChoiceRow from settings/components/	Deleted those re-export shims (pingdotgg#26238)	Import ListActionRow and ListChoiceRow from components/ui/ under the old local names	Fixes the dangling imports
pnpm-lock.yaml	lockfile	Fork dependencies	Upstream's lockfile	Upstream's lockfile, reconciled with pnpm install --ignore-scripts	Per the merge procedure

🤖 Generated with Claude Code

[github-actions]

Superseded by v0.1.4-nightly.20261028.3824.