[chamaquita-d3]

Closes #186

Fixes #186. Merges upstream v0.1.4-nightly.20261028.3824 into custom-nightly as a merge commit, resolving the conflicts and adapting fork code to upstream's moves. Typecheck passes locally across all packages, and the server push and relay tests pass.

File:lines	Class	custom-nightly	Upstream	Kept	Why
apps/mobile/src/features/connection/useConnectionController.ts:84-114	disjoint	useCallback wrappers; removeEnvironment unregisters the server push device first	Plain functions, no useCallback	Upstream plain functions plus the fork's unregisterServerPushDevice(...).then(remove)	Upstream dropped useCallback; the push-device cleanup is the fork's behavior and still applies
apps/mobile/src/features/voice-input/ComposerDictationControl.tsx:308-312	disjoint	props.iconSize ?? <default> for the new stop button	iconSize scaled by useAndroidControlSizing	props.iconSize ?? iconSize	The fork's override and upstream's Android scaling both apply
apps/server/src/auth/RpcAuthorization.ts:210-214	disjoint	subscribeBackgroundPolicy scope and ...SERVER_PUSH_RPC_SCOPES	Removed subscribeBackgroundPolicy from WS_METHODS	...SERVER_PUSH_RPC_SCOPES only	Upstream deleted the method, so its scope would fail the satisfies check; the push scopes are the fork's
apps/web/src/components/AppSidebarLayout.tsx:487-506	disjoint	Usage and background-studio sidebar panels, with the legacy-sidebar fallback	Removed the legacy sidebar	Panels branch, then ThreadSidebar	Upstream deleted LegacySidebar and useLegacySidebarEnabled; the fork's panels stay
apps/web/src/components/NoProjectsHero.tsx:21-30	disjoint	<CustomBackground routeKind="draft" /> inside SidebarInset	workspaceAreaProps spread and role="main" on SidebarInset	Both	Different things were added to the same element
packages/contracts/src/ipc.ts:1035-1050	disjoint	Optional bridge members plus setDockMood	Bridge members made required	Upstream's required members plus the fork-only optional setDockMood	Upstream tightened the type; setDockMood is fork-only
packages/contracts/src/ipc.ts:1116-1128	disjoint	Optional picker members plus background-folder members	Picker members made required	Upstream's required pickers plus the fork-only optional background-folder members	Same as above
packages/contracts/src/ipc.ts:1142-1160	disjoint	Optional snapshot and quit members plus dictation-key and fn-key members	Snapshot and quit members made required	Upstream's required members plus the fork-only optional dictation-key and fn-key members	Same as above
apps/web/src/components/ChatView.tsx:1-5	disjoint	CustomBackground import	workspaceAreaProps import	Both imports	Different imports
apps/web/src/components/ChatView.tsx:3208-3215	disjoint	Dropped bg-background so the custom background shows	{...conversationArea} spread, with bg-background kept	Spread without bg-background	The spread is upstream's; the transparent background is the fork's
apps/web/src/components/CommandPalette.tsx:1532-1565	disjoint	"Customize background" action	"Focus Next/Previous Workspace Area" actions	Both	Two separate new actions
apps/web/src/components/chat/ChatComposer.tsx:2276-2323	superseded	Resting-layout calculations; voice.state.phase added to the expanded-chrome check	Removed the resting layout and expanded-chrome logic	Upstream	The voice check lived only in code upstream deleted, so voice no longer affects layout
apps/web/src/components/chat/ChatComposer.tsx:3517-3534	disjoint	ComposerVoiceControl and attach button in the actions row	Attach button moved before the actions row; controls div added	Upstream layout, with ComposerVoiceControl just before the primary actions	Voice control is the fork's; the attach button now sits where upstream put it
apps/web/src/components/chat/MessagesTimeline.tsx:1638-1682	disjoint	data-timeline-divider on the turn-fold row	Deferred-load wrapper and skeleton	Upstream's structure with data-timeline-divider on its outer div	The fork's attribute is applied to upstream's new markup
apps/web/src/index.css:2543-2552	disjoint	@import "./custom.css" last	[data-workspace-area]:focus-visible rule	Both, with the import still last	Fork CSS must override everything above
pnpm-lock.yaml	n/a	Fork dependencies	Upstream lockfile	Upstream's, then pnpm install --ignore-scripts	Reconciled with the merged manifests
apps/mobile/src/features/phone-background/PhoneBackgroundFolders.tsx, PhoneBackgroundRouteScreen.tsx, apps/mobile/src/features/updates/ApkUpdateRow.tsx	fix	Imported settings/components/SettingsActionRow and SettingsChoiceRow	Deleted both; they only re-exported ListActionRow and ListChoiceRow	Import ListActionRow and ListChoiceRow from components/ui	Fork code adapted to upstream's removal, so mobile still resolves
apps/mobile/src/features/updates/app-updates.ts:473	fix	Fork's apk-updates.ts imports shouldRecheckAppUpdateOnForeground	Un-exported it (unused-export cleanup)	Exported it again	Fork code still needs it; typecheck failed on the missing export
apps/server/src/serverPush/ServerPush.ts:292	fix	Fork's server push passes threadId to resolveAgentAwarenessRelayPublishSnapshot	Dropped threadId from that function's input	Argument removed	Typecheck failed on the unknown property; the function never used it

🤖 Generated with Claude Code